From db939092520d633e48e50f872be68468417f54da Mon Sep 17 00:00:00 2001
From: darkfire006 <blazer257@live.com>
Date: Mon, 24 Jul 2023 01:33:10 -0500
Subject: [PATCH] camper todd phone stuff incl bargain shop

---
 .../Data/Scripts/goldenrod/mapscript.dat      | Bin 0 -> 250 bytes
 .../Data/Scripts/goldenrod/mart/sunmap.dat    | Bin 224 -> 442 bytes
 .../Data/Scripts/marts/goldenrodbargain.dat   | Bin 0 -> 754 bytes
 P3D/Content/Data/Scripts/phone/010.dat        | Bin 1698 -> 3708 bytes
 .../Data/Scripts/route34/daycare_pokemon.dat  | Bin 758 -> 938 bytes
 .../Data/Scripts/trainer/route34/005.dat      | Bin 2322 -> 2788 bytes
 .../Scripts/trainer/route34/005_3.trainer     | Bin 1002 -> 1130 bytes
 P3D/Content/Data/maps/goldenrod.dat           |   3 ++-
 P3D/P3D.vbproj                                |   6 ++++++
 9 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 P3D/Content/Data/Scripts/goldenrod/mapscript.dat
 create mode 100644 P3D/Content/Data/Scripts/marts/goldenrodbargain.dat

diff --git a/P3D/Content/Data/Scripts/goldenrod/mapscript.dat b/P3D/Content/Data/Scripts/goldenrod/mapscript.dat
new file mode 100644
index 0000000000000000000000000000000000000000..aa0aacf62d86f6ffe18c2684dbf9441f1c50f27f
GIT binary patch
literal 250
zcmZXP!4AP-5QM)giT9{P8YyuQ#H*D4ttO(4mXl}4_ty!B-R#axW@lf|JAo@5H4PWG
zWK0;db}#K4xj^OC(GSY>4+#_`9LQxVd#z8$NxzmUJ3UL$vsf6sN9<L!97(x3{a#3P
sY19|$BilHoR&Iia`R4XkG-mFtm^<PNW~{7?rFTDHM2A96`L##x4U+3DRsaA1

literal 0
HcmV?d00001

diff --git a/P3D/Content/Data/Scripts/goldenrod/mart/sunmap.dat b/P3D/Content/Data/Scripts/goldenrod/mart/sunmap.dat
index 60e017f7d3bae6de82411748122328bd609d2450..f12de1c4204be6862c4efdbb5fda3065ed300246 100644
GIT binary patch
literal 442
zcmZusK@NgI44kVb{sR*vibf4l;~#thx(kvh5I_uxZ&#<)0}6+Bx6^iJ`h1~=MS&6t
zGNjnT#|T3NtRv<PdloUP5|vJR9mK-G!4V-lF>^wm5@+(|7-L7yi0FlwRqg@yoXBy4
zhZ}$Y3JzH^&Ku54H{;J^gmmzrzbSK0R6JJ<@h$iqE|v@*3+jHZ5C+4UNbBFrq*t>i
y3MsCtR(+Kk^?gu(qTF<x--#CV;iw}QD=M$KJ>%Qf@4vfmd(yk#_8+K6BVOK{Ek_jq

delta 9
QcmdnR{D5(S^2EP;0Th=6od5s;

diff --git a/P3D/Content/Data/Scripts/marts/goldenrodbargain.dat b/P3D/Content/Data/Scripts/marts/goldenrodbargain.dat
new file mode 100644
index 0000000000000000000000000000000000000000..68b060fd8e8b8565b7b33fbfb30de4d5cb41b45e
GIT binary patch
literal 754
zcmb7?OHTqp5QOWBiT?p^lB~pCA1Lv4GJ5g=iSa~;46X^Uu%Ht4ud83rz_KKJ&=4j)
z)xFhK-ShMPDyNw;y=bDbE|h3jJG#~!{GGEwE+zM-Jw1R8^~7yNR8v*AK2zo1(~|og
z|I}AaiI!v+x>9|`d9Nvqp;NZS+y<YZ!zogm)A98qoVC@r6}3=c%wwWWwP~&JYr#6;
zJog;W+%oTAMi*l(B2In0+)!h_=jwV*=BSIel&&Lm29<SPGLr$=kXq+`SicGr%BVJO
z)6`IhxCgU?`$Nb2)V^ZQnD{_nU`IJ-NWfw>OVC4|mZE1l8ndUs5&6yw`bKzK>kJbQ
zld+xsM|-T3LLck0*1B;Jx(7TdtxgKgn)q3>lzID$hcUCY9fyr?zlP#_v3$$#q@TZ-
GBK8X~WOnTU

literal 0
HcmV?d00001

diff --git a/P3D/Content/Data/Scripts/phone/010.dat b/P3D/Content/Data/Scripts/phone/010.dat
index 26d1b314b30925f6bcdd97c4770274302d9ebdcf..f9d6aa90f100802b1bff9b47376c3a8dd8dbd9a3 100644
GIT binary patch
literal 3708
zcmb`KZBNrs6vxk7O#BYzl}MHb5PU%t@gWi4iU~0>A(M4L80)fi;1bi1uKs`b^sc2F
zAWD|owddZR$Nzcg?_XDz+1Ms_Zn+KZwQbo`dt$qK?(6zWdzqc;X<|h<nJ!Q=>)D!p
zx2|?hbv+lKiJghx$e!Dtc=kmdh?WK3E4Hr_BRjFwrn+lOSQD3A=X*NOZmzpjt1AtD
zO1}+VN1~#0p@rViUs%UpYHiuJ<hm7b=;=(qWz{I?H<W}_dZ67vX9l`E4H~1<iPpJY
zX$?h%ADZKZAG)TZ=0Sd6C*TovS+n<gx|EK1HnA_kf}XA0=LN3GTzV>w^{-<)vU5Y$
z>{P2Ge)trfziDSv%dK2doZQZ3HbdJF(aWU`_F*%zC=@kpD<t7k&lCN8zcc6ka2(WH
z9#@e)o@)yh3Q?z$7X1mX9-`T1!|KPx=uN$d^g}h<YG~HRT_$YR_<u~V9?O5{A%4qq
z4Rl05O>7pd%5<JQ?kf5{dH+&K0Bht8G1?GnUsbz%;l7=tw^aeM^~5d$x{d?7uEZx+
z7ZA}6`IuLd+Ld7?<QRE!cg=}5uQjrwjkivy2;|IEa$~Nzg!}EOB`mLOcX5x^tu5v8
zDjQaS(f{>Sv@+&sM|GtWYVEA$v4777uTM?<qkD}?a)l}jc7_4T)FiL?vw)$#cE;MN
zYb+?GS`{I-^oCieVw@X>cVfkko_eVMb)AVE?)UXwXl&w-dfoO%(<5~aUEZBy$MViZ
zu41=m>U}v*mD<y9qpHAe-M`ekwuk->kALeUM@_SPyQZ<%#hwmzk=CZPpS@F3kq25Q
z!V$Ah8zc0}+q)!w^e(n**XqsSc(>u#eRcjgD;$R2eXTlsAR5y~F1!-Ck?uh+vjQ^(
zlS3xXspf@GI&mfnGa7f9?#If`L|Q>Ftd!2wZ}jvoFsXLo$6LISg>y_fba`mS{8VWl
zL>-Beigu`fu*8hu@~_1geUtDu5@$Lw)$@h4&1HF_6MfNLTh}qsPG37dufXeFurZxi
zm8Q=&=U80sv#;WFx3@~^eI`Ay&aZLma=%534l0e^D@kR`n+0Egmj{R^o~CD!X`XFm
zh{jlNdTfXX_8sXIb&EH0UFjNye)v4{uYC#sM81PFkz>LvgSQgZbo|SlnW%$pi+ijc
zO`rLk4*Hujsn6Zu>~>_~$+2Xf%43CeD}~dWzC)*u==c;ZJc{U>*|Q3bJ~Lydd#Y?%
zlPLZmX;r@YsJol<d{Uu~I27}m-^AZD#j<RDRV1Q0ier?~EYSjoNUEcN4NTXbHKSl>
zdzUOM#FO}Z(EU)>@z$lh!!+!9=6G7Pp$y!KI$sJ%KTzDxf+TW*%;fuqd>x1*QxUlb
zZl-$YLMQy23i(IcCC`Ws)u5|WsXPEDaDq1I#p2yq`#na?bNtrrtt8IE8+62o@EA3|
ytZIyUeT#99^#V!g?!I-&G3V(#!(i*7bi|&xLltvtRx7;5nj34Q*Ib{Bx&H%LWoRA%

delta 269
zcmew(vxs+s#Kc#6lee++3Gy;<F<3E_Fk~>KGUPD;d6WCO#O(tZ@)@!jUNWQuMH3l{
zfGX-3oPn$yAj|}+OJ~r-12rcnG7C?hz$K=QX^sNeoLq(ipvgrH3Jf7Yn^J(VZgMW8
zHlya`vy76H6`0}#QQQP_*XDjMS;omp%tFi{M^>^WPnKY@n7o470+&)h4mY@Rpr1Au
Wak4Q^KF26A`4XcDhZWenDGUHPUpFiO

diff --git a/P3D/Content/Data/Scripts/route34/daycare_pokemon.dat b/P3D/Content/Data/Scripts/route34/daycare_pokemon.dat
index 39eba5a6320b2a987f71c0da22b681f77abd5dac..9bb0b5d0159e9396e8db51d3cbc6125e8f0a9373 100644
GIT binary patch
delta 305
zcmZWk%?bfw6g}Tae9B77M#^eP2#pe&th~lBKa|Y)+bJu1)3@*n@)GhY9>Ur&SYUDQ
zckaFCo^!u@{G2%Cb{$ONqJu7$aNx08VNJ9|^{?Z=hK>;|PCVu*=44OcBR~m#^r&QE
z#-4*TQjjpo2r#DBhUnKphi7tmMp-8s`$ScS#S^w@pw1kSv7*(Q;gj|3H&KDXXrQGo
zT3($*E;PzQhKqenLaMe_P(?9_@L1F`k{^6J*wk=er-h52x{2YNZbk1=tEIoF>Z)av
GpVbEnfjgi8

delta 102
zcmZ3*{*85l#Kd<VoK_4a3>gfm40#h@Do<`;Qkq=C=)nsYWZ-4sn!KMeadHr|*kmgv
iiHZ00fQqs(6v$8JVRiy4(wlfsY~lkEHlTS7DGUGzARM#+

diff --git a/P3D/Content/Data/Scripts/trainer/route34/005.dat b/P3D/Content/Data/Scripts/trainer/route34/005.dat
index 313fe45b094e32599eaf985393bd4be1a93ada4a..f7e7bd1442bcef676a38737ce513dfb1eb3241c1 100644
GIT binary patch
delta 761
zcmZuv%`O8`7(HWV%nWHHk_JIc7osIdBO?A<EHolvVaKBWMolnn+6op}T2gmm?F}j(
z#ImuJco1jqbZQzF^UeM4J?FdUoZRQ$@A%W!{UHueMuF9ZhYC(nL<uQmu#75CF5w`C
zE?8J$@8Ftss)@To5<5*sN%9M@$?$MYWSQ$KPaXa%IKvGR7{><pY@Be{!8s~x^03J2
zalnxTUsAvwWq8~@;8*6lNJ>>oo1(Zt&;rrCO1x=tv9D)pyS8H09$pkn3@e+g1;t_g
zP*T=xlVORxJ|i+6$(W5L&h~|7V2g&5=$;EP2vPl_q-q1vAlg~?9TVAgsxH%B6?uLx
zE~qI_AE%stK_9O4@n4)4Bele!HZO)$b5M5h9WfNvz+r$%t2rY$5Ab!>oczW69$cmq
zGX9w%(rPxAZskTU?_C}9XEZa6O!&hmc23l_PG-5Mjj%Sf9BV?KRQ*YL-PNU<_fK6{
zf~ENCoNh_(G5RbCkcLN%vq<-7Y(%<-u^s6~&D++DS2MmC%m@Wv$(QA|*=~;_L^2%z
IiI`#k15oaIBme*a

delta 397
zcmaDNI!S1P-()Lxp2<m!3cOYfB@7u1sSJ4xybN5En;EB1mSOT@c3=pa+{mgpxrfPt
z86<v|Nt53Qq=EsiezH8H`Q&5F5|h1{1$eQ^Xb7T+g3UK%GoL(%g$rnFDnkxKF^~kA
zevrj|vJsmZYdnJygXUy@MsaRbS^LR*SUEr{Cb4l%7GV@Zkv3$r1&RqkEkoAW&*lzx
z{B<^6G;hi?I!`{wDKR;YT}Tk_A+Yy=&e>eb&dLbZSkIv^YQ<0v4Ie9pNT7R*!7jea
ukv-Xq(*qh#%99UqYE1sZStE?B+K(Y0tac)o=wty#5g6uygbFCcQy2hvqfo>E

diff --git a/P3D/Content/Data/Scripts/trainer/route34/005_3.trainer b/P3D/Content/Data/Scripts/trainer/route34/005_3.trainer
index b05bd9973b47296d157c6319ee4b0e36868e9818..124cf34a44db8ef01f6bde436bd75b60b04cbc01 100644
GIT binary patch
delta 191
zcmaFG{)%J6C#Ga01_K6d1{;O~h8%`OhDwH1h9U+%h9n?6g&`ftD`v1`;AP-q2w=!(
u$OiIrfpi{&5kn1wIfEI44v=L*NdII}W_e{}BGj2P%PN}?cF*K+=E(r>MkG%F

delta 63
zcmaFG@rr%JCnjZM1~Ud;1}=sGhJ1!>hE#@JAf3lx#8AUv&S1)*!(hT-GC7o4p4k*g
PPiK||(q@ydGfxHp%5M$e

diff --git a/P3D/Content/Data/maps/goldenrod.dat b/P3D/Content/Data/maps/goldenrod.dat
index 1780d1539..4eba921f7 100644
--- a/P3D/Content/Data/maps/goldenrod.dat
+++ b/P3D/Content/Data/maps/goldenrod.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Goldenrod City]}}{"MusicLoop"{str[Goldenrod]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"MapScript"{str[goldenrod\mapscript]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
 
 Brick:
 {"Floor"{ENT[{"Size"{intArr[4,36]}}{"Position"{intArr[18,0,0]}}{"TexturePath"{str[Goldenrod]}}{"Texture"{rec[0,0,16,16]}}]}}
@@ -649,6 +649,7 @@ Signs:
 
 NPCs:
 {"NPC"{NPC[{"Position"{sngArr[25,6,25]}}{"TextureID"{str[49]}}{"ID"{int[0]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[Do you listen to~Lucky Channel?*If you want to~win, trade Pokémon*with as many people as~possible to get~different ID numbers.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[23,5,24]}}{"TextureID"{str[12]}}{"ID"{int[20]}}{"Name"{str[bargain]}}{"Action"{int[1]}}{"AdditionalValue"{str[marts\goldenrodbargain]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 
 {"NPC"{NPC[{"Position"{sngArr[20,0,26]}}{"TextureID"{str[10]}}{"ID"{int[1]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[The Radio Tower in~Goldenrod City is~a landmark.*They're running a~promotional campaign right now.*They'll modify~your Pokégear,*so it can also~serve as a radio.]}}{"Rotation"{int[1]}}{"Movement"{str[Walk]}}{"MoveRectangles"{recArr[[18,26,4,2]]}}]}}
 {"NPC"{NPC[{"Position"{sngArr[19,0,16]}}{"TextureID"{str[14]}}{"ID"{int[2]}}{"Name"{str[random]}}{"Action"{int[0]}}{"AdditionalValue"{str[E-he-he-he...*I got in trouble~for playing in the*basement of the~Dept. Store.]}}{"Rotation"{int[2]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}}
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index a64f13b37..442bb966f 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -29403,6 +29403,9 @@
     <Content Include="Content\Data\Scripts\frontier\shops\mints.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Data\Scripts\goldenrod\mapscript.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\Scripts\kin\berryforestitems\2051.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -29724,6 +29727,9 @@
     <None Include="Content\Data\Scripts\kolben\AlexCorruptor.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <Content Include="Content\Data\Scripts\marts\goldenrodbargain.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\Scripts\mtmortar\bf1map.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>