Added class GameData::BodyShape, some bug fixes, updated some PBS files

This commit is contained in:
Maruno17
2021-02-22 00:21:52 +00:00
parent bcab462ef0
commit f302d8346a
16 changed files with 3008 additions and 3246 deletions

View File

@@ -1,471 +1,291 @@
# See the documentation on the wiki to learn how to edit this file.
#-------------------------------
002 # Lappet Town
25,10,10
Water
TENTACOOL,14,19
MANTYKE,15,16
REMORAID,14,16
REMORAID,14,16
REMORAID,14,16
[002] # Lappet Town
Water,10
60,TENTACOOL,14,19
30,MANTYKE,15,16
10,REMORAID,14,16
OldRod
MAGIKARP,16,19
MAGIKARP,16,19
100,MAGIKARP,16,19
GoodRod
BARBOACH,17,18
SHELLDER,16,19
KRABBY,15,16
60,BARBOACH,17,18
20,KRABBY,15,16
20,SHELLDER,16,19
SuperRod
CHINCHOU,17,19
QWILFISH,16,19
CORSOLA,15,18
STARYU,15,17
STARYU,15,17
40,CHINCHOU,17,19
40,QWILFISH,16,19
15,CORSOLA,15,18
5,STARYU,15,17
#-------------------------------
005 # Route 1
25,10,10
Land
RATTATA,11,14
PIDGEY,11,14
RATTATA,11,14
PIDGEY,11,14
RATTATA,11,14
PIDGEY,11,14
RATTATA,11,13
PIDGEY,11,13
RATTATA,11,13
PIDGEY,11,13
RATTATA,14
PIDGEY,14
LandNight
RATTATA,10,14
HOOTHOOT,10,13
RATTATA,10,14
HOOTHOOT,10,13
SPINARAK,8,12
SPINARAK,8,12
RATTATA,10,14
HOOTHOOT,10,14
RATTATA,10,14
HOOTHOOT,10,14
RATTATA,15
HOOTHOOT,14
[005] # Route 1
Land,25
40,PIDGEY,11,14
40,RATTATA,11,14
9,PIDGEY,11,13
9,RATTATA,11,13
1,PIDGEY,14
1,RATTATA,14
LandNight,25
39,RATTATA,10,14
30,HOOTHOOT,10,13
20,SPINARAK,8,12
9,HOOTHOOT,10,14
1,HOOTHOOT,14
1,RATTATA,15
#-------------------------------
021 # Route 2
25,10,10
Land
RATTATA,12,15
RATTATA,12,15
RATTATA,12,15
POOCHYENA,11,15
POOCHYENA,11,15
POOCHYENA,11,15
SHINX,10,12
SHINX,10,12
SHINX,10,11
SHINX,10,11
SHINX,10,11
SHINX,10,11
Water
MAGIKARP,7,10
GOLDEEN,11,14
STARYU,12,15
STARYU,12,15
STARYU,12,15
[021] # Route 2
Land,25
50,RATTATA,12,15
30,POOCHYENA,11,15
10,SHINX,10,12
10,SHINX,10,11
Water,10
60,MAGIKARP,7,10
30,GOLDEEN,11,14
10,STARYU,12,15
OldRod
MAGIKARP,7,10
MAGIKARP,9,15
70,MAGIKARP,7,10
30,MAGIKARP,9,15
GoodRod
GOLDEEN,12,14
FINNEON,12,15
MAGIKARP,12,17
60,GOLDEEN,12,14
20,FINNEON,12,15
20,MAGIKARP,12,17
SuperRod
GOLDEEN,12,14
FINNEON,12,15
STARYU,12,15
STARYU,14,17
STARYU,14,17
40,FINNEON,12,15
40,GOLDEEN,12,14
15,STARYU,12,15
5,STARYU,14,17
HeadbuttLow
PINECO,11,13
LEDYBA,6,8
PINECO,11,13
SPINARAK,9,12
LEDYBA,6,8
SPINARAK,9,12
SPINARAK,9,12
MUNCHLAX,11,14
50,PINECO,11,13
30,LEDYBA,6,8
19,SPINARAK,9,12
1,MUNCHLAX,11,14
HeadbuttHigh
PINECO,11,13
WURMPLE,6,8
PINECO,11,13
SPINARAK,9,12
WURMPLE,6,8
SPINARAK,9,12
SPINARAK,9,12
SPINARAK,9,12
50,PINECO,11,13
30,WURMPLE,6,8
20,SPINARAK,9,12
#-------------------------------
028 # Natural Park
25,10,10
Land
CATERPIE,10
WEEDLE,10
PIDGEY,10,14
PIDGEY,12,14
SUNKERN,12
SUNKERN,12
METAPOD,10
KAKUNA,10
PIDGEY,10,14
PIDGEY,12,14
PIDGEY,10,14
PIDGEY,12,14
LandMorning
CATERPIE,10,12
WEEDLE,10,12
PIDGEY,10,14
PIDGEY,10,14
METAPOD,10
KAKUNA,10
METAPOD,10
KAKUNA,10
CATERPIE,10,12
WEEDLE,10,12
CATERPIE,10,12
WEEDLE,10,12
LandNight
HOOTHOOT,10,14
SPINARAK,10,15
HOOTHOOT,10,14
SPINARAK,10,15
PINECO,9,13
PINECO,9,13
NATU,12,14
NATU,12,14
DROWZEE,9,15
DROWZEE,9,15
DROWZEE,9,15
DROWZEE,9,15
BugContest
CATERPIE,7,18
WEEDLE,7,18
METAPOD,9,18
KAKUNA,9,18
PARAS,10,17
VENONAT,10,16
BUTTERFREE,12,15
BEEDRILL,12,15
SCYTHER,13,14
PINSIR,13,14
SCYTHER,13,14
PINSIR,13,14
[028] # Natural Park
Land,25
20,CATERPIE,10
20,SUNKERN,12
20,WEEDLE,10
15,PIDGEY,10,14
15,PIDGEY,12,14
5,KAKUNA,10
5,METAPOD,10
LandNight,25
30,HOOTHOOT,10,14
30,SPINARAK,10,15
20,PINECO,9,13
10,DROWZEE,9,15
10,NATU,12,14
LandMorning,25
25,CATERPIE,10,12
25,WEEDLE,10,12
20,PIDGEY,10,14
15,KAKUNA,10
15,METAPOD,10
BugContest,25
20,CATERPIE,7,18
20,WEEDLE,7,18
10,KAKUNA,9,18
10,METAPOD,9,18
10,PARAS,10,17
10,VENONAT,10,16
5,BEEDRILL,12,15
5,BUTTERFREE,12,15
5,PINSIR,13,14
5,SCYTHER,13,14
#-------------------------------
031 # Route 3
25,10,10
Land
NIDORANfE,12,15
NIDORANmA,12,15
NIDORANfE,12,15
NIDORANmA,12,15
PIKACHU,14,17
PIKACHU,14,17
PONYTA,13,15
PONYTA,13,15
EEVEE,15
EEVEE,15
EEVEE,15
EEVEE,15
Water
SURSKIT,13,14
LOTAD,14
LOTAD,14
LOTAD,15
LOTAD,15
RockSmash
NOSEPASS,13,14
GEODUDE,12,15
GEODUDE,12,15
GEODUDE,12,15
GEODUDE,12,15
[031] # Route 3
Land,25
30,NIDORANfE,12,15
30,NIDORANmA,12,15
20,PIKACHU,14,17
10,EEVEE,15
10,PONYTA,13,15
Water,10
60,SURSKIT,13,14
35,LOTAD,14
5,LOTAD,15
OldRod
MAGIKARP,6,11
MAGIKARP,10,17
70,MAGIKARP,6,11
30,MAGIKARP,10,17
GoodRod
POLIWAG,12,15
PSYDUCK,11,14
WOOPER,13,17
60,POLIWAG,12,15
20,PSYDUCK,11,14
20,WOOPER,13,17
SuperRod
CHINCHOU,11,12
REMORAID,12,14
LUVDISC,10,16
LUVDISC,10,16
LUVDISC,10,16
40,CHINCHOU,11,12
40,REMORAID,12,14
20,LUVDISC,10,16
RockSmash
60,NOSEPASS,13,14
40,GEODUDE,12,15
HeadbuttLow
PINECO,14,17
COMBEE,15,17
PINECO,14,16
HERACROSS,16,18
COMBEE,15,16
HERACROSS,16,17
HERACROSS,16,17
MUNCHLAX,13,18
30,PINECO,14,17
25,COMBEE,15,17
20,PINECO,14,16
10,HERACROSS,16,18
9,HERACROSS,16,17
5,COMBEE,15,16
1,MUNCHLAX,13,18
HeadbuttHigh
SEEDOT,14,17
SHROOMISH,14,17
SEEDOT,14,17
BURMY,12,15
SHROOMISH,14,17
BURMY,12,15
BURMY,12,15
BURMY,12,15
50,SEEDOT,14,17
30,SHROOMISH,14,17
20,BURMY,12,15
#-------------------------------
034 # Ice Cave
25,10,10
Cave
SWINUB,16,18
SWINUB,16,18
SNEASEL,14,16
SNEASEL,14,16
SNORUNT,12,15
SNORUNT,12,15
SNOVER,14
SNOVER,14
SMOOCHUM,11,14
SMOOCHUM,11,14
SMOOCHUM,11,14
SMOOCHUM,11,14
[034] # Ice Cave
Cave,10
40,SWINUB,16,18
20,SNEASEL,14,16
20,SNORUNT,12,15
10,SMOOCHUM,11,14
10,SNOVER,14
#-------------------------------
039 # Route 4
25,10,10
Land
SHELLOS_1,12,15
SHELLOS_1,12,15
SHELLOS_1,12,15
GRIMER,13,15
GRIMER,13,15
GRIMER,13,15
GRIMER,13,15
GRIMER,13,15
MURKROW,12,14
MURKROW,12,14
MURKROW,12,14
MURKROW,12,14
[039] # Route 4
Land,25
50,SHELLOS_1,12,15
40,GRIMER,13,15
10,MURKROW,12,14
#-------------------------------
041 # Route 5
25,10,10
Land
GRIMER,13,15
GRIMER,13,15
GRIMER,13,15
SPEAROW,13,16
SPEAROW,13,16
SPEAROW,13,16
SPEAROW,13,16
SPEAROW,13,16
SLUGMA,13,14
SLUGMA,13,14
SLUGMA,13,14
SLUGMA,13,14
[041] # Route 5
Land,25
50,GRIMER,13,15
40,SPEAROW,13,16
10,SLUGMA,13,14
#-------------------------------
044 # Route 6
25,10,10
Land
SHELLOS_1,12,15
SHELLOS_1,12,15
SHELLOS_1,12,15
GRIMER,13,15
GRIMER,13,15
GRIMER,13,15
GRIMER,13,15
GRIMER,13,15
MURKROW,12,14
MURKROW,12,14
MURKROW,12,14
MURKROW,12,14
[044] # Route 6
Land,25
50,SHELLOS_1,12,15
40,GRIMER,13,15
10,MURKROW,12,14
#-------------------------------
047 # Route 7
25,10,10
Land
SHELLOS,12,15
SHELLOS,12,15
SHELLOS,12,15
BIDOOF,14,17
BIDOOF,14,17
BIDOOF,14,17
MURKROW,12,14
MURKROW,12,14
WURMPLE,9,12
WURMPLE,9,12
WURMPLE,9,12
WURMPLE,9,12
[047] # Route 7
Land,25
50,SHELLOS,12,15
30,BIDOOF,14,17
10,MURKROW,12,14
10,WURMPLE,9,12
RockSmash
NOSEPASS,13,14
NOSEPASS,13,14
GEODUDE,12,15
GEODUDE,12,15
GEODUDE,12,15
90,NOSEPASS,13,14
10,GEODUDE,12,15
#-------------------------------
049 # Rock Cave
25,10,10
Cave
NOSEPASS,14,15
NOSEPASS,13,14
MAGNETON,14,17
MAGNETON,14,17
MAGNETON,14,16
MAGNETON,14,16
GEODUDE,13,15
GEODUDE,13,15
MAWILE,14,16
MAWILE,14,16
MAWILE,14,16
MAWILE,14,16
[049] # Rock Cave
Cave,10
20,MAGNETON,14,16
20,MAGNETON,14,17
20,NOSEPASS,14,15
20,NOSEPASS,13,14
10,GEODUDE,13,15
10,MAWILE,14,16
#-------------------------------
050 # Rock Cave
25,10,10
Cave
NOSEPASS,14,15
NOSEPASS,13,14
MAGNETON,14,17
MAGNETON,14,17
MAGNETON,14,16
MAGNETON,14,16
GEODUDE,13,15
GEODUDE,13,15
BURMY,14,16
BURMY,14,16
BURMY,14,16
BURMY,14,16
[050] # Rock Cave
Cave,10
20,MAGNETON,14,16
20,MAGNETON,14,17
20,NOSEPASS,14,15
20,NOSEPASS,13,14
10,BURMY,14,16
10,GEODUDE,13,15
#-------------------------------
051 # Dungeon
25,10,10
Cave
PICHU,1
CLEFFA,1
IGGLYBUFF,1
IGGLYBUFF,1
CHINGLING,1
CHINGLING,1
RIOLU,1
RIOLU,1
TYROGUE,1
TYROGUE,1
TYROGUE,1
TYROGUE,1
[051] # Dungeon
Cave,10
20,CHINGLING,1
20,CLEFFA,1
20,IGGLYBUFF,1
20,PICHU,1
10,RIOLU,1
10,TYROGUE,1
#-------------------------------
066 # Safari Zone
25,10,10
Land
NIDORANfE,15,16
NIDORANmA,15,16
DODUO,13,15
DODUO,13,15
ABRA,12,15
ABRA,12,15
TANGELA,14,16
TANGELA,14,16
HOPPIP,13,17
HOPPIP,13,17
HOPPIP,13,17
HOPPIP,13,17
[066] # Safari Zone
Land,25
20,ABRA,12,15
20,DODUO,13,15
20,NIDORANfE,15,16
20,NIDORANmA,15,16
10,HOPPIP,13,17
10,TANGELA,14,16
#-------------------------------
068 # Safari Zone
25,10,10
Land
RHYHORN,16,18
EXEGGCUTE,15,18
VENONAT,15,17
VENONAT,15,18
AIPOM,14,17
GIRAFARIG,16,17
TAUROS,15,16
HERACROSS,15,17
SCYTHER,16
PINSIR,16
KANGASKHAN,19
CHANSEY,17
Water
PSYDUCK,16,18
MARILL,15,18
SLOWPOKE,14,16
BUIZEL,15,17
BUIZEL,15,17
[068] # Safari Zone
Land,25
20,EXEGGCUTE,15,18
20,RHYHORN,16,18
10,AIPOM,14,17
10,GIRAFARIG,16,17
10,VENONAT,15,17
10,VENONAT,15,18
5,HERACROSS,15,17
5,TAUROS,15,16
4,PINSIR,16
4,SCYTHER,16
1,CHANSEY,17
1,KANGASKHAN,19
Water,10
60,PSYDUCK,16,18
30,MARILL,15,18
5,BUIZEL,15,17
5,SLOWPOKE,14,16
OldRod
MAGIKARP,17,21
MAGIKARP,17,20
70,MAGIKARP,17,21
30,MAGIKARP,17,20
GoodRod
MAGIKARP,16,20
FEEBAS,16,20
POLIWAG,17,18
60,MAGIKARP,16,20
20,FEEBAS,16,20
20,POLIWAG,17,18
SuperRod
GOLDEEN,16,18
REMORAID,17,19
CARVANHA,16,17
FINNEON,15,18
DRATINI,17
40,GOLDEEN,16,18
40,REMORAID,17,19
15,CARVANHA,16,17
4,FINNEON,15,18
1,DRATINI,17
#-------------------------------
069 # Route 8
25,10,10
Land
ODDISH,15,17
MAREEP,16,18
LOTAD,15,17
LOTAD,15,18
DITTO,15,17
DITTO,16,18
BONSLY,14,17
BONSLY,14,16
BONSLY,14,16
BONSLY,14,16
BONSLY,15,16
BONSLY,15
Water
TENTACOOL,14,19
MANTYKE,15,16
REMORAID,14,16
REMORAID,14,16
REMORAID,14,16
[069] # Route 8
Land,25
20,MAREEP,16,18
20,ODDISH,15,17
13,BONSLY,14,16
10,DITTO,15,17
10,DITTO,16,18
10,LOTAD,15,18
10,LOTAD,15,17
5,BONSLY,14,17
1,BONSLY,15,16
1,BONSLY,15
Water,10
60,TENTACOOL,14,19
30,MANTYKE,15,16
10,REMORAID,14,16
OldRod
MAGIKARP,16,19
MAGIKARP,16,19
100,MAGIKARP,16,19
GoodRod
BARBOACH,17,18
SHELLDER,16,19
KRABBY,15,16
60,BARBOACH,17,18
20,KRABBY,15,16
20,SHELLDER,16,19
SuperRod
CHINCHOU,17,19
QWILFISH,16,19
CORSOLA,15,18
STARYU,15,17
STARYU,15,17
40,CHINCHOU,17,19
40,QWILFISH,16,19
15,CORSOLA,15,18
5,STARYU,15,17
#-------------------------------
070 # Underwater
25,10,10
Land
CLAMPERL,18,20
SHELLDER,18,20
CLAMPERL,18,19
SHELLDER,18,19
CHINCHOU,17,21
CHINCHOU,17,21
CORSOLA,17,20
CORSOLA,17,20
RELICANTH,16,19
RELICANTH,16,19
RELICANTH,16,19
RELICANTH,16,19
[070] # Underwater
Land,25
20,CHINCHOU,17,21
20,CLAMPERL,18,20
20,SHELLDER,18,20
10,CLAMPERL,18,19
10,CORSOLA,17,20
10,RELICANTH,16,19
10,SHELLDER,18,19
#-------------------------------
075 # Tiall Region
25,10,10
Land
RATTATA,11,14
GEODUDE,11,14
SANDSHREW,11,14
VULPIX,11,14
DIGLETT,11,14
MEOWTH,11,14
PIKACHU,11,14
PIKACHU,11,14
CUBONE,11,14
CUBONE,11,14
CUBONE,11,14
CUBONE,11,14
[075] # Tiall Region
Land,25
20,GEODUDE,11,14
20,RATTATA,11,14
10,CUBONE,11,14
10,DIGLETT,11,14
10,MEOWTH,11,14
10,PIKACHU,11,14
10,SANDSHREW,11,14
10,VULPIX,11,14

File diff suppressed because it is too large Load Diff

View File

@@ -231,7 +231,7 @@ HiddenAbility = LEVITATE
TutorMoves = AERIALACE,AIRCUTTER,ANCIENTPOWER,AQUATAIL,BULLDOZE,CALMMIND,CHARGEBEAM,CUT,DARKPULSE,DOUBLETEAM,DRACOMETEOR,DRAGONCLAW,DRAGONPULSE,DRAGONTAIL,DREAMEATER,EARTHPOWER,EARTHQUAKE,ECHOEDVOICE,ENERGYBALL,FACADE,FLY,FRUSTRATION,FURYCUTTER,GIGAIMPACT,GRAVITY,HEADBUTT,HIDDENPOWER,HONECLAWS,HYPERBEAM,HYPERVOICE,ICYWIND,IRONHEAD,IRONTAIL,MAGICCOAT,MUDSLAP,OMINOUSWIND,OUTRAGE,PAYBACK,PROTECT,PSYCHIC,PSYCHUP,RAINDANCE,REST,RETURN,ROAR,ROCKSMASH,ROLEPLAY,ROUND,SAFEGUARD,SHADOWBALL,SHADOWCLAW,SLEEPTALK,SNORE,SPITE,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SWAGGER,SWIFT,TAILWIND,TELEKINESIS,THUNDER,THUNDERBOLT,THUNDERWAVE,TOXIC,TWISTER,WILLOWISP
Height = 6.9
Weight = 650.0
Shape = 2
Shape = Serpentine
BattlerEnemyX = -2
BattlerEnemyY = -8
#-------------------------------
@@ -359,7 +359,7 @@ EffortPoints = 0,0,0,3,0,0
Abilities = REGENERATOR
HiddenAbility = REGENERATOR
Height = 1.4
Shape = 9
Shape = Winged
BattlerPlayerX = -2
BattlerEnemyX = 8
BattlerEnemyY = 11
@@ -371,7 +371,7 @@ EffortPoints = 0,0,0,0,3,0
Abilities = VOLTABSORB
HiddenAbility = VOLTABSORB
Height = 3.0
Shape = 6
Shape = BipedalTail
BattlerPlayerX = -3
BattlerEnemyX = 2
BattlerEnemyY = 5
@@ -383,7 +383,7 @@ EffortPoints = 0,3,0,0,0,0
Abilities = INTIMIDATE
HiddenAbility = INTIMIDATE
Height = 1.3
Shape = 8
Shape = Quadruped
BattlerPlayerX = -8
BattlerEnemyX = 3
BattlerEnemyY = 14