From 5abbbe8e16b6f1696856116ffe8b76b6cd9ae269 Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Wed, 26 Sep 2018 19:12:12 +0300 Subject: [PATCH 1/6] Fixed wrong item tags --- P3D/Content/Data/maps/fortune/valley.dat | 2 +- P3D/Content/Data/maps/kin/berry.dat | Bin 182176 -> 182204 bytes P3D/Content/Data/maps/liberty/garden.dat | 2 +- .../Data/maps/nationalpark/nationalpark0.dat | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/P3D/Content/Data/maps/fortune/valley.dat b/P3D/Content/Data/maps/fortune/valley.dat index ddcd9866d..ae2e49f1e 100644 --- a/P3D/Content/Data/maps/fortune/valley.dat +++ b/P3D/Content/Data/maps/fortune/valley.dat @@ -551,7 +551,7 @@ Items: {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[5,-0.375,33]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,26]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[43,-0.375,32]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[1,169]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[19,1.625,12]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[2,14]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[39,0.625,35]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[2,445]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} +{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[39,0.625,35]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[3,445]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} Pillars: {"Entity"{ENT[{"Position"{sngArr[22.75,0.25,24.5]}}{"Scale"{sngArr[1,1.5,1]}}{"EntityID"{str[WallBlock]}}{"TexturePath"{str[Sevii]}}{"Textures"{recArr[[16,144,16,16][32,144,16,24][48,144,16,24]]}}{"TextureIndex"{intArr[2,2,1,1,1,1,1,1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} diff --git a/P3D/Content/Data/maps/kin/berry.dat b/P3D/Content/Data/maps/kin/berry.dat index b7cc036601e558c9a01fa836e5ba6e46bf969ac9..0d0a884cf7dd37119ab3210537470d0cfc1218a2 100644 GIT binary patch delta 81 zcmZ3`&%LLgyP<_~3)7bgoW=|~3?>Z53}(|C`6mWHOWhMKq@?N-{Z5KiAIWv|VHpQ;#VC%$OFH delta 47 zcmV+~0MP%uj|-rW3xI?Hv;y>y2{HgI05kwI05+F_jskm=&=v%je31ealZ2K+x9*Vw F&NYlz5m*2K diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat index 7e5d59364..bf258394b 100644 --- a/P3D/Content/Data/maps/liberty/garden.dat +++ b/P3D/Content/Data/maps/liberty/garden.dat @@ -450,7 +450,7 @@ Items: {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[4,2,22]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[0,32]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[5,0.625,17]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[1,124]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[35,0.625,8]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[2,21]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[12,0.625,28]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[2,447]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} +{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[12,0.625,28]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[3,447]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} NPC: {"NPC"{NPC[{"Position"{sngArr[11,2,11]}}{"TextureID"{str[32]}}{"ID"{int[0]}}{"Name"{str[Sailor]}}{"Action"{int[1]}}{"AdditionalValue"{str[faraway\dockhand]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} diff --git a/P3D/Content/Data/maps/nationalpark/nationalpark0.dat b/P3D/Content/Data/maps/nationalpark/nationalpark0.dat index 2a3ce4bca..37cea0e87 100644 --- a/P3D/Content/Data/maps/nationalpark/nationalpark0.dat +++ b/P3D/Content/Data/maps/nationalpark/nationalpark0.dat @@ -494,7 +494,7 @@ Items: {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[37,-0.375,13]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,13]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[8,-0.375,47]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[1,38]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[3,-0.375,43]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[2,218]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[22,-0.375,15]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[2,148]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} +{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[22,-0.375,15]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[3,148]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} Mega Stone (Pinsirite): {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[17,-0.2,47]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[2]}}{"AdditionalValue"{str[3,531]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.3,0.3,0.3]}}]}} \ No newline at end of file From 4a6a4eab8e1df71138f99dc031a8321e763d701d Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Wed, 26 Sep 2018 19:52:15 +0300 Subject: [PATCH 2/6] replaced black belt with expert belt --- P3D/Content/Data/maps/mtsilver/1f.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/P3D/Content/Data/maps/mtsilver/1f.dat b/P3D/Content/Data/maps/mtsilver/1f.dat index 011986ab2..cb56ccdcd 100644 --- a/P3D/Content/Data/maps/mtsilver/1f.dat +++ b/P3D/Content/Data/maps/mtsilver/1f.dat @@ -753,7 +753,7 @@ Items: {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[36,4.625,30]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[1,44]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[36,6.625,2]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[2,39]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[45,8.625,0]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[3,14]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[15,3.625,19]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[4,98]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} +{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[15,3.625,19]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[4,591]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} Warps: mt base: From 95426250c9205e2a644b3204695b69c729b62a8d Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Wed, 26 Sep 2018 20:49:34 +0300 Subject: [PATCH 3/6] Fixed liberty map keyitem again.... --- P3D/Content/Data/Scripts/trainer/fortune/north/006.dat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat b/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat index 9c0d8b28e..2436df1cc 100644 --- a/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat +++ b/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat @@ -1,5 +1,5 @@ version=2 -@text.show(Stay back, kid!*I was asked not to let~anyone enter this cave.*It's home to Pokémon from~different locations and~we're investigating that.*...) +@text.show(Stay back, kid!*I was asked not to let~anyone enter this crucial~spot for our future~operations.*...) @battle.starttrainer(fortune\north\006) @text.show(My Pokémon...*Gah!~Who even cares~about those stupid islands~and their weird Pokémon~anyway?*I'll go back to the~Unova branch...) @screen.fadeout @@ -9,6 +9,7 @@ version=2 @level.update @level.wait(15) @screen.fadein -@text.show(He left something behind.*It's a boat pass!) -@item.messagegive(500,1) +@text.show(He left something behind.*It's a sea map!) +@item.messagegive(592,1) +@item.give(592,1) :end \ No newline at end of file From c4dc2aab8e2f7d4741700d76e51380bda07be738 Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Wed, 26 Sep 2018 21:23:34 +0300 Subject: [PATCH 4/6] Added altering cave's poke file to the project. --- P3D/Content/Data/maps/poke/fortune/altering.poke | 2 +- P3D/P3D.vbproj | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/P3D/Content/Data/maps/poke/fortune/altering.poke b/P3D/Content/Data/maps/poke/fortune/altering.poke index 320382efc..c06e1148c 100644 --- a/P3D/Content/Data/maps/poke/fortune/altering.poke +++ b/P3D/Content/Data/maps/poke/fortune/altering.poke @@ -1,5 +1,5 @@ name=Altering Cave type=Cave -{0|42|60|-1|35,45} +{0|41|60|-1|35,45} {0|528|35|-1|35,45} {0|714|5|-1|35,45} \ No newline at end of file diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index a27edef35..9e999706a 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -25634,6 +25634,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest From 0c658973ea471b8c8974e5436f300e6c9667aef0 Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Thu, 27 Sep 2018 16:17:29 +0300 Subject: [PATCH 5/6] *Fixed missing wild pokemon in route 28. *Fixed pokemon encounters in altering cave. *Removed Items in altering cave. *Replaced the berries in "berry forest". --- .../Scripts/kin/berryforestitems/2004.dat | Bin 190 -> 0 bytes .../Scripts/kin/berryforestitems/2006.dat | Bin 190 -> 0 bytes .../Scripts/kin/berryforestitems/2007.dat | Bin 190 -> 0 bytes .../Scripts/kin/berryforestitems/2008.dat | Bin 190 -> 0 bytes .../Scripts/kin/berryforestitems/2015.dat | Bin 190 -> 0 bytes .../Scripts/kin/berryforestitems/2016.dat | Bin 190 -> 0 bytes .../Scripts/kin/berryforestitems/2017.dat | Bin 190 -> 0 bytes .../Scripts/kin/berryforestitems/2018.dat | Bin 190 -> 0 bytes .../Scripts/kin/berryforestitems/2019.dat | Bin 190 -> 0 bytes .../berryforestitems/{2000.dat => 2051.dat} | Bin 190 -> 190 bytes .../berryforestitems/{2001.dat => 2052.dat} | Bin 190 -> 190 bytes .../berryforestitems/{2002.dat => 2053.dat} | Bin 190 -> 190 bytes .../berryforestitems/{2003.dat => 2054.dat} | Bin 190 -> 190 bytes .../Scripts/kin/berryforestitems/2055.dat | Bin 0 -> 190 bytes .../Scripts/kin/berryforestitems/2056.dat | Bin 0 -> 190 bytes .../Scripts/kin/berryforestitems/2057.dat | Bin 0 -> 190 bytes .../Scripts/kin/berryforestitems/2058.dat | Bin 0 -> 190 bytes .../Scripts/kin/berryforestitems/2059.dat | Bin 0 -> 190 bytes .../Scripts/kin/berryforestitems/2060.dat | Bin 0 -> 190 bytes .../Scripts/kin/berryforestitems/2061.dat | Bin 0 -> 190 bytes .../Scripts/kin/berryforestitems/2062.dat | Bin 0 -> 190 bytes .../Scripts/kin/berryforestitems/2063.dat | Bin 0 -> 190 bytes P3D/Content/Data/maps/fortune/altering.dat | 8 -- P3D/Content/Data/maps/kin/berry.dat | Bin 182204 -> 182204 bytes .../Data/maps/poke/fortune/altering.poke | 5 +- P3D/P3D.vbproj | 85 +++++++++--------- 26 files changed, 45 insertions(+), 53 deletions(-) delete mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2004.dat delete mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2006.dat delete mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2007.dat delete mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2008.dat delete mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2015.dat delete mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2016.dat delete mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2017.dat delete mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2018.dat delete mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2019.dat rename P3D/Content/Data/Scripts/kin/berryforestitems/{2000.dat => 2051.dat} (66%) rename P3D/Content/Data/Scripts/kin/berryforestitems/{2001.dat => 2052.dat} (66%) rename P3D/Content/Data/Scripts/kin/berryforestitems/{2002.dat => 2053.dat} (66%) rename P3D/Content/Data/Scripts/kin/berryforestitems/{2003.dat => 2054.dat} (66%) create mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2055.dat create mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2056.dat create mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2057.dat create mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2058.dat create mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2059.dat create mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2060.dat create mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2061.dat create mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2062.dat create mode 100644 P3D/Content/Data/Scripts/kin/berryforestitems/2063.dat diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2004.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2004.dat deleted file mode 100644 index de8d184aa5c5e1f6d9049b3fa1385f6e8ab7ba6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmX|)(F%e<5Jk_k(0?dMi1ZW$KJ?N*_+qt%NL!2|^z+)?iDF=fdpUD0B7^_{ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2007.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2007.dat deleted file mode 100644 index 6b37c7ac96924429f9b59c55a1c5883329afcf84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmX|)(F%e<5Jk_k(0?dMh%Z49_|QxL;EUB3B5g5>(9dgkCyId`?&ZwcWo0H{jPyK- z9H`ll(Wsf!7#(*JTjii87ZCGA3)N?6l+cS1^x%vC;EUB3BCRq?;LlfgCyIqx?&Zvx*PAB+W1?dq za-?9*ij$gIjnQ%!u~iOgGI3FV@YcwcQ+iNSDHZJ4b71qgT;%8&MJ2~9pJ`_FZfZDd Z+w>N0elIxnvraT}x6Xc@rTEA-`9F#jB7^_{ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2016.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2016.dat deleted file mode 100644 index b314970e00bf9127f6bf34ca6f75b56626c86118..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmX|)!3u&<5Jk^A=syf3%0&wyXyL|xaAWlfk)AS2;Llh0O%xC2aW7}iyxu$s7!w@> zks}3bR-Dw#YK)eYz a+ord0^LxRmpLL>?6lrMo0^x%vC;EUB3BCRq?;LlfgCyIqx?&Zvx*PAB+W1?dq za-?9*ij$gIjnQ%!u~iOgGI3FV@YcwcQ+iNSDHZJ4b71qgT;%8&MJ2~9pJ`_FZfZDd Z+w>N0elIxnvraT}x6Xc@rTEA-`9F%{B8C6} diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2018.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2018.dat deleted file mode 100644 index 6fb7956038abfa2dccb70edb8f19340828365026..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmX|)(F%e<5Jk^((0>?6lusc9J^123_+qt%NUMwz`194>iDF@vdpUFF_2x;ynCKXY z94T0{;-qF)W3=2wY?XtWOkC6-yft#=lpfSnN(DRi9N7FV7dbjcQOPmOXPOzkn;OpA ZHob+L-wRIttP_pgt+QWeDL!&d{tt^uB8LC~ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2019.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2019.dat deleted file mode 100644 index 3ec1088aa899fbb3af0368fbfceaaae87b8e3337..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmX|)(F%e<5Jk^((0>?6ly3<^55D*hzF2J`(ki0_{(NYQo)Wr2R47pMUIY9RC3JnnPx`sriQb& ZO>g1m_kvSD>qH}W>+IKAijQ2A{{xG#B8UJ0 diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2000.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2051.dat similarity index 66% rename from P3D/Content/Data/Scripts/kin/berryforestitems/2000.dat rename to P3D/Content/Data/Scripts/kin/berryforestitems/2051.dat index c7d95cc227d1ab36611aba540843d665170adbf2..71217006cf33aa87be25e35a517ce0e63c603241 100644 GIT binary patch delta 13 UcmdnTxQ}r{D6=Vp;lzkE03M438~^|S delta 13 UcmdnTxQ}r{D6;{B!NiC(03K-s761SM diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2001.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2052.dat similarity index 66% rename from P3D/Content/Data/Scripts/kin/berryforestitems/2001.dat rename to P3D/Content/Data/Scripts/kin/berryforestitems/2052.dat index b98417444d794d00126e7f40b140e0355e6aa886..dd3768987464f11eb63123689a8a0d70e33dcaa5 100644 GIT binary patch delta 13 UcmdnTxQ}r{D6=Vp(Zq-}03MG79RL6T delta 13 UcmdnTxQ}r{D6;{B;lzkE03K}w7XSbN diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2002.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2053.dat similarity index 66% rename from P3D/Content/Data/Scripts/kin/berryforestitems/2002.dat rename to P3D/Content/Data/Scripts/kin/berryforestitems/2053.dat index d570f53e4ba6456195aae9fb999b47704f1dd534..e953c8a0ec52089a5d0649df63b6610720cb31b0 100644 GIT binary patch delta 13 UcmdnTxQ}r{D6=Vp@x+KU03MSB9smFU delta 13 UcmdnTxQ}r{D6;{B(Zq-}03LA!7ytkO diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2003.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2054.dat similarity index 66% rename from P3D/Content/Data/Scripts/kin/berryforestitems/2003.dat rename to P3D/Content/Data/Scripts/kin/berryforestitems/2054.dat index 3593443be024fbce2379cfc2fb70174a4332a63c..8ab9d1ba3698b6835df094c6d38c71deea93f0bb 100644 GIT binary patch delta 13 UcmdnTxQ}r{D6=Vp$;5~>03MeF9{>OV delta 13 UcmdnTxQ}r{D6;{B@x+KU03LM&82|tP diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2055.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2055.dat new file mode 100644 index 0000000000000000000000000000000000000000..cdf3742705efbf7d1473b721f9a22e2b63f4c182 GIT binary patch literal 190 zcmX|)(F%e<5Jk_k(0?dMh|o(A_|QxL;EUB3B5g5>(9dgkCyId`?&ZwcWo0H{jPyK- z9H`ll(Wsf!7#(*JTjii87ZCGA3)N?6gkTSX&_gf%gD+N_h`7ZlLO);KohTM&xtB9%UT+ox#zfDZ zNKL_-6$dr58l$BXu~iOgGI3FV@YcwcQyMvOR4Uj}vS;(RT;%9^h)RxGKGVz?+|+Q^ aw&^{&`Mu!O&pOe_-8%bqR^lVq?6gdl++^w3NH;EUBJB5pB?(9c(QCyIqx?&Zvx*PDfaG0}4; zQd6*I#X-%i#%Sq8Y?XtWOkC6-yft#=ltxY*l?ry0?AiP+7dd(!qLO2l&onazH#MBK ZZF)~`elIxnvraT}x6Xc@mH5at`9F+?B8mV2 literal 0 HcmV?d00001 diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2058.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2058.dat new file mode 100644 index 0000000000000000000000000000000000000000..6c9ac7cae03864077d67b65ea994ebdcf259299e GIT binary patch literal 190 zcmX|)(F%e<5Jk^((0>?6gdl_<^w3NH;EUBJB5pB?(9c(QCyIqx?&Zvx*PDfaG0}4; zQd6*I#X-%i#%Sq8Y?XtWOkC6-yft#=ltxY*l?ry0?AiP+7dd(!qLO2l&onazH#MBK ZZF)~`elIxnvraT}x6Xc@mH5at`9F;9B8vb3 literal 0 HcmV?d00001 diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2059.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2059.dat new file mode 100644 index 0000000000000000000000000000000000000000..99233bd4b6eceb6a2ea4e395337eac3b6bc4f524 GIT binary patch literal 190 zcmX|)(F%e<5Jk^((0>?6gy2Jh&_gf%gD+N_h`7ZlLO);KohTM&xtB9%UT+ox#zfDZ zNKL_-6$dr58l$BXu~iOgGI3FV@YcwcQyMvOR4Uj}vS;(RT;%9^h)RxGKGVz?+|+Q^ aw&^{&`Mu!O&pOe_-8%bqR^lVq zks}3bR-Dw#YK)eYz a+ord0^LxRmpLL>IWMUI}AsN|UBGtHdAO)Y0_ Zo8Ft7-wRIttRt=5owHx(UVP-5{2z+!B8C6} literal 0 HcmV?d00001 diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2063.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2063.dat new file mode 100644 index 0000000000000000000000000000000000000000..b2adf4a3a47088874a08981d6aecd28a063e1daf GIT binary patch literal 190 zcmX|)(F%e<5Jk^((0>?6ghCI3&_gf%gD+N_h`7ZlLO);KohTM&xtB9%UT+ox#zfDZ zNKL_-6$dr58l$BXu~iOgGI3FV@YcwcQyMvOR4Ul9r)2ZDT;%9^h)RxGKGVz?+|+Q^ aw&^{&`Mu!O&pOe_-8%bqR^lVqnNBe>n=%+pKe(Rh=ky2v z8CkYR%wjsj2vqrT9@Fpb3Uiq*fE1W)2P)uY+_r#e4_IyuP;SQ}rb{5s{`E}1Cnxl? zZSPqM)Cp8<4mNFj$O@)&Ag%?3E4Lb`9LTkVaNn#2am^SEKqjANVl+cIZPIj}=~}Cq pxVB%|0JILM2I{||QQ2LNyyUaSBB delta 231 zcmdnf&%LLgyP<_~3scWDMuX}5*E9W|JnuT&_P*&%rx<|(jtNYL(?6_dIyL>le@2$= z5wn=iFfto37)?L8p6Tayg}F=@KwRVPKrS!iwgpUkK$)$0DXnAUQLz(#Z+^ zY}U047B diff --git a/P3D/Content/Data/maps/poke/fortune/altering.poke b/P3D/Content/Data/maps/poke/fortune/altering.poke index c06e1148c..ebe2f18b8 100644 --- a/P3D/Content/Data/maps/poke/fortune/altering.poke +++ b/P3D/Content/Data/maps/poke/fortune/altering.poke @@ -1,5 +1,4 @@ name=Altering Cave type=Cave -{0|41|60|-1|35,45} -{0|528|35|-1|35,45} -{0|714|5|-1|35,45} \ No newline at end of file +{0|41|95|-1|35,45} +{0|528|5|-1|35,45} diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 9e999706a..9242dd7b0 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -5201,45 +5201,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -25637,9 +25598,51 @@ PreserveNewest + + PreserveNewest + PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -27432,9 +27435,7 @@ GameDevCommon - - - + From 4f018bfbfbfc3f7a3ccc371593726c1cd6d72506 Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Thu, 27 Sep 2018 16:59:08 +0300 Subject: [PATCH 6/6] *Removed emb tower files from the repo. *Fixed some dialogue typos. --- .../Data/Scripts/cherrygrove/oldguide.dat | Bin 8186 -> 8184 bytes .../Data/Scripts/route30/mrpokemon.dat | Bin 5946 -> 5948 bytes .../Scripts/trainer/quest/tanoby/002.trainer | 2 +- P3D/Content/Data/maps/route30.dat | Bin 121512 -> 121512 bytes P3D/P3D.vbproj | 6 ------ 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/P3D/Content/Data/Scripts/cherrygrove/oldguide.dat b/P3D/Content/Data/Scripts/cherrygrove/oldguide.dat index 4449f6c2c8547a431d9bc90e280294aa2ccc5c36..1acf31e0029329c9fc3ae076190e5a9911366bd8 100644 GIT binary patch delta 12 Tcmexm|HFR60p`tzm@Q-gEKUWm delta 12 Tcmexi|I2>E0p`v7n5|?0EItLU diff --git a/P3D/Content/Data/Scripts/route30/mrpokemon.dat b/P3D/Content/Data/Scripts/route30/mrpokemon.dat index 533d121807fd0ecba3d3dd0a6fc5544e9c9cc000..20260e8dc097fb3c22c7501e071779b431253f82 100644 GIT binary patch delta 14 Vcmdm`w?}V72^*vO=3=(v0sty%1t PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest