diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/btl_attrs.s | 12 | ||||
| -rw-r--r-- | data/enemy_mon_elevation.inc | 415 | ||||
| -rw-r--r-- | data/graphics/trainers/back_pic_coords.inc | 5 | ||||
| -rw-r--r-- | data/graphics/trainers/back_pic_palette_table.inc | 5 | ||||
| -rw-r--r-- | data/graphics/trainers/back_pic_table.inc | 5 | 
5 files changed, 0 insertions, 442 deletions
| diff --git a/data/btl_attrs.s b/data/btl_attrs.s index 1bd5ed6e5..ebd898993 100644 --- a/data/btl_attrs.s +++ b/data/btl_attrs.s @@ -8,18 +8,6 @@  	.section .rodata -@ 81ECAD8 -	.include "data/graphics/trainers/back_pic_coords.inc" - -@ 81ECAE4 -	.include "data/graphics/trainers/back_pic_table.inc" - -@ 81ECAFC -	.include "data/graphics/trainers/back_pic_palette_table.inc" - -@ 81ECB14 -	.include "data/enemy_mon_elevation.inc" -  @ 81ECCB0  	.include "data/trainer_parties.inc" diff --git a/data/enemy_mon_elevation.inc b/data/enemy_mon_elevation.inc deleted file mode 100644 index 7e13f20d5..000000000 --- a/data/enemy_mon_elevation.inc +++ /dev/null @@ -1,415 +0,0 @@ -@ This determines how much higher above the usual position the enemy Pokémon -@ is during battle. Species that float or fly have nonzero values. -gEnemyMonElevation:: @ 81ECB14 -	.byte  0 @ 0 -	.byte  0 @ SPECIES_BULBASAUR -	.byte  0 @ SPECIES_IVYSAUR -	.byte  0 @ SPECIES_VENUSAUR -	.byte  0 @ SPECIES_CHARMANDER -	.byte  0 @ SPECIES_CHARMELEON -	.byte  0 @ SPECIES_CHARIZARD -	.byte  0 @ SPECIES_SQUIRTLE -	.byte  0 @ SPECIES_WARTORTLE -	.byte  0 @ SPECIES_BLASTOISE -	.byte  0 @ SPECIES_CATERPIE -	.byte  0 @ SPECIES_METAPOD -	.byte  8 @ SPECIES_BUTTERFREE -	.byte  0 @ SPECIES_WEEDLE -	.byte  0 @ SPECIES_KAKUNA -	.byte  8 @ SPECIES_BEEDRILL -	.byte 16 @ SPECIES_PIDGEY -	.byte  0 @ SPECIES_PIDGEOTTO -	.byte  4 @ SPECIES_PIDGEOT -	.byte  0 @ SPECIES_RATTATA -	.byte  0 @ SPECIES_RATICATE -	.byte  0 @ SPECIES_SPEAROW -	.byte  4 @ SPECIES_FEAROW -	.byte  0 @ SPECIES_EKANS -	.byte  0 @ SPECIES_ARBOK -	.byte  0 @ SPECIES_PIKACHU -	.byte  0 @ SPECIES_RAICHU -	.byte  0 @ SPECIES_SANDSHREW -	.byte  0 @ SPECIES_SANDSLASH -	.byte  0 @ SPECIES_NIDORAN_F -	.byte  0 @ SPECIES_NIDORINA -	.byte  0 @ SPECIES_NIDOQUEEN -	.byte  0 @ SPECIES_NIDORAN_M -	.byte  0 @ SPECIES_NIDORINO -	.byte  0 @ SPECIES_NIDOKING -	.byte  0 @ SPECIES_CLEFAIRY -	.byte  0 @ SPECIES_CLEFABLE -	.byte  0 @ SPECIES_VULPIX -	.byte  0 @ SPECIES_NINETALES -	.byte  0 @ SPECIES_JIGGLYPUFF -	.byte  0 @ SPECIES_WIGGLYTUFF -	.byte  8 @ SPECIES_ZUBAT -	.byte  8 @ SPECIES_GOLBAT -	.byte  0 @ SPECIES_ODDISH -	.byte  0 @ SPECIES_GLOOM -	.byte  0 @ SPECIES_VILEPLUME -	.byte  0 @ SPECIES_PARAS -	.byte  0 @ SPECIES_PARASECT -	.byte  0 @ SPECIES_VENONAT -	.byte  8 @ SPECIES_VENOMOTH -	.byte  0 @ SPECIES_DIGLETT -	.byte  0 @ SPECIES_DUGTRIO -	.byte  0 @ SPECIES_MEOWTH -	.byte  0 @ SPECIES_PERSIAN -	.byte  0 @ SPECIES_PSYDUCK -	.byte  0 @ SPECIES_GOLDUCK -	.byte  0 @ SPECIES_MANKEY -	.byte  0 @ SPECIES_PRIMEAPE -	.byte  0 @ SPECIES_GROWLITHE -	.byte  0 @ SPECIES_ARCANINE -	.byte  0 @ SPECIES_POLIWAG -	.byte  0 @ SPECIES_POLIWHIRL -	.byte  0 @ SPECIES_POLIWRATH -	.byte  0 @ SPECIES_ABRA -	.byte  0 @ SPECIES_KADABRA -	.byte  0 @ SPECIES_ALAKAZAM -	.byte  0 @ SPECIES_MACHOP -	.byte  0 @ SPECIES_MACHOKE -	.byte  0 @ SPECIES_MACHAMP -	.byte  0 @ SPECIES_BELLSPROUT -	.byte  0 @ SPECIES_WEEPINBELL -	.byte  0 @ SPECIES_VICTREEBEL -	.byte  0 @ SPECIES_TENTACOOL -	.byte  0 @ SPECIES_TENTACRUEL -	.byte 16 @ SPECIES_GEODUDE -	.byte  0 @ SPECIES_GRAVELER -	.byte  0 @ SPECIES_GOLEM -	.byte  0 @ SPECIES_PONYTA -	.byte  0 @ SPECIES_RAPIDASH -	.byte  0 @ SPECIES_SLOWPOKE -	.byte  0 @ SPECIES_SLOWBRO -	.byte 16 @ SPECIES_MAGNEMITE -	.byte  8 @ SPECIES_MAGNETON -	.byte  0 @ SPECIES_FARFETCHD -	.byte  0 @ SPECIES_DODUO -	.byte  0 @ SPECIES_DODRIO -	.byte  0 @ SPECIES_SEEL -	.byte  0 @ SPECIES_DEWGONG -	.byte  0 @ SPECIES_GRIMER -	.byte  0 @ SPECIES_MUK -	.byte  0 @ SPECIES_SHELLDER -	.byte  0 @ SPECIES_CLOYSTER -	.byte  4 @ SPECIES_GASTLY -	.byte  4 @ SPECIES_HAUNTER -	.byte  0 @ SPECIES_GENGAR -	.byte  0 @ SPECIES_ONIX -	.byte  0 @ SPECIES_DROWZEE -	.byte  0 @ SPECIES_HYPNO -	.byte  0 @ SPECIES_KRABBY -	.byte  0 @ SPECIES_KINGLER -	.byte 10 @ SPECIES_VOLTORB -	.byte 12 @ SPECIES_ELECTRODE -	.byte  0 @ SPECIES_EXEGGCUTE -	.byte  0 @ SPECIES_EXEGGUTOR -	.byte  0 @ SPECIES_CUBONE -	.byte  0 @ SPECIES_MAROWAK -	.byte  0 @ SPECIES_HITMONLEE -	.byte  0 @ SPECIES_HITMONCHAN -	.byte  0 @ SPECIES_LICKITUNG -	.byte  8 @ SPECIES_KOFFING -	.byte  6 @ SPECIES_WEEZING -	.byte  0 @ SPECIES_RHYHORN -	.byte  0 @ SPECIES_RHYDON -	.byte  0 @ SPECIES_CHANSEY -	.byte  0 @ SPECIES_TANGELA -	.byte  0 @ SPECIES_KANGASKHAN -	.byte  0 @ SPECIES_HORSEA -	.byte  0 @ SPECIES_SEADRA -	.byte  0 @ SPECIES_GOLDEEN -	.byte  0 @ SPECIES_SEAKING -	.byte  0 @ SPECIES_STARYU -	.byte  0 @ SPECIES_STARMIE -	.byte  0 @ SPECIES_MR_MIME -	.byte  0 @ SPECIES_SCYTHER -	.byte  0 @ SPECIES_JYNX -	.byte  0 @ SPECIES_ELECTABUZZ -	.byte  0 @ SPECIES_MAGMAR -	.byte  0 @ SPECIES_PINSIR -	.byte  0 @ SPECIES_TAUROS -	.byte  0 @ SPECIES_MAGIKARP -	.byte  0 @ SPECIES_GYARADOS -	.byte  0 @ SPECIES_LAPRAS -	.byte  0 @ SPECIES_DITTO -	.byte  0 @ SPECIES_EEVEE -	.byte  0 @ SPECIES_VAPOREON -	.byte  0 @ SPECIES_JOLTEON -	.byte  0 @ SPECIES_FLAREON -	.byte  0 @ SPECIES_PORYGON -	.byte  0 @ SPECIES_OMANYTE -	.byte  0 @ SPECIES_OMASTAR -	.byte  0 @ SPECIES_KABUTO -	.byte  0 @ SPECIES_KABUTOPS -	.byte  6 @ SPECIES_AERODACTYL -	.byte  0 @ SPECIES_SNORLAX -	.byte  6 @ SPECIES_ARTICUNO -	.byte  8 @ SPECIES_ZAPDOS -	.byte  5 @ SPECIES_MOLTRES -	.byte  0 @ SPECIES_DRATINI -	.byte  0 @ SPECIES_DRAGONAIR -	.byte  3 @ SPECIES_DRAGONITE -	.byte  0 @ SPECIES_MEWTWO -	.byte  8 @ SPECIES_MEW -	.byte  0 @ SPECIES_CHIKORITA -	.byte  0 @ SPECIES_BAYLEEF -	.byte  0 @ SPECIES_MEGANIUM -	.byte  0 @ SPECIES_CYNDAQUIL -	.byte  0 @ SPECIES_QUILAVA -	.byte  0 @ SPECIES_TYPHLOSION -	.byte  0 @ SPECIES_TOTODILE -	.byte  0 @ SPECIES_CROCONAW -	.byte  0 @ SPECIES_FERALIGATR -	.byte  0 @ SPECIES_SENTRET -	.byte  0 @ SPECIES_FURRET -	.byte  0 @ SPECIES_HOOTHOOT -	.byte  0 @ SPECIES_NOCTOWL -	.byte  0 @ SPECIES_LEDYBA -	.byte  8 @ SPECIES_LEDIAN -	.byte  0 @ SPECIES_SPINARAK -	.byte  0 @ SPECIES_ARIADOS -	.byte  6 @ SPECIES_CROBAT -	.byte  0 @ SPECIES_CHINCHOU -	.byte  0 @ SPECIES_LANTURN -	.byte  0 @ SPECIES_PICHU -	.byte  0 @ SPECIES_CLEFFA -	.byte  0 @ SPECIES_IGGLYBUFF -	.byte  0 @ SPECIES_TOGEPI -	.byte  0 @ SPECIES_TOGETIC -	.byte  0 @ SPECIES_NATU -	.byte  0 @ SPECIES_XATU -	.byte  0 @ SPECIES_MAREEP -	.byte  0 @ SPECIES_FLAAFFY -	.byte  0 @ SPECIES_AMPHAROS -	.byte  0 @ SPECIES_BELLOSSOM -	.byte  0 @ SPECIES_MARILL -	.byte  0 @ SPECIES_AZUMARILL -	.byte  0 @ SPECIES_SUDOWOODO -	.byte  0 @ SPECIES_POLITOED -	.byte 11 @ SPECIES_HOPPIP -	.byte 12 @ SPECIES_SKIPLOOM -	.byte  6 @ SPECIES_JUMPLUFF -	.byte  0 @ SPECIES_AIPOM -	.byte  0 @ SPECIES_SUNKERN -	.byte  0 @ SPECIES_SUNFLORA -	.byte  8 @ SPECIES_YANMA -	.byte  0 @ SPECIES_WOOPER -	.byte  0 @ SPECIES_QUAGSIRE -	.byte  0 @ SPECIES_ESPEON -	.byte  0 @ SPECIES_UMBREON -	.byte  0 @ SPECIES_MURKROW -	.byte  0 @ SPECIES_SLOWKING -	.byte  8 @ SPECIES_MISDREAVUS -	.byte  5 @ SPECIES_UNOWN -	.byte  0 @ SPECIES_WOBBUFFET -	.byte  0 @ SPECIES_GIRAFARIG -	.byte  0 @ SPECIES_PINECO -	.byte  0 @ SPECIES_FORRETRESS -	.byte  0 @ SPECIES_DUNSPARCE -	.byte  6 @ SPECIES_GLIGAR -	.byte  0 @ SPECIES_STEELIX -	.byte  0 @ SPECIES_SNUBBULL -	.byte  0 @ SPECIES_GRANBULL -	.byte  0 @ SPECIES_QWILFISH -	.byte  0 @ SPECIES_SCIZOR -	.byte  0 @ SPECIES_SHUCKLE -	.byte  0 @ SPECIES_HERACROSS -	.byte  0 @ SPECIES_SNEASEL -	.byte  0 @ SPECIES_TEDDIURSA -	.byte  0 @ SPECIES_URSARING -	.byte  0 @ SPECIES_SLUGMA -	.byte  0 @ SPECIES_MAGCARGO -	.byte  0 @ SPECIES_SWINUB -	.byte  0 @ SPECIES_PILOSWINE -	.byte  0 @ SPECIES_CORSOLA -	.byte  0 @ SPECIES_REMORAID -	.byte  0 @ SPECIES_OCTILLERY -	.byte  0 @ SPECIES_DELIBIRD -	.byte  0 @ SPECIES_MANTINE -	.byte  0 @ SPECIES_SKARMORY -	.byte  0 @ SPECIES_HOUNDOUR -	.byte  0 @ SPECIES_HOUNDOOM -	.byte  0 @ SPECIES_KINGDRA -	.byte  0 @ SPECIES_PHANPY -	.byte  0 @ SPECIES_DONPHAN -	.byte  0 @ SPECIES_PORYGON2 -	.byte  0 @ SPECIES_STANTLER -	.byte  0 @ SPECIES_SMEARGLE -	.byte  0 @ SPECIES_TYROGUE -	.byte  0 @ SPECIES_HITMONTOP -	.byte  0 @ SPECIES_SMOOCHUM -	.byte  0 @ SPECIES_ELEKID -	.byte  0 @ SPECIES_MAGBY -	.byte  0 @ SPECIES_MILTANK -	.byte  0 @ SPECIES_BLISSEY -	.byte  0 @ SPECIES_RAIKOU -	.byte  0 @ SPECIES_ENTEI -	.byte  0 @ SPECIES_SUICUNE -	.byte  0 @ SPECIES_LARVITAR -	.byte  0 @ SPECIES_PUPITAR -	.byte  0 @ SPECIES_TYRANITAR -	.byte  3 @ SPECIES_LUGIA -	.byte  6 @ SPECIES_HO_OH -	.byte 15 @ SPECIES_CELEBI -	.byte  0 @ 252 -	.byte  0 @ 253 -	.byte  0 @ 254 -	.byte  0 @ 255 -	.byte  0 @ 256 -	.byte  0 @ 257 -	.byte  0 @ 258 -	.byte  0 @ 259 -	.byte  0 @ 260 -	.byte  0 @ 261 -	.byte  0 @ 262 -	.byte  0 @ 263 -	.byte  0 @ 264 -	.byte  0 @ 265 -	.byte  0 @ 266 -	.byte  0 @ 267 -	.byte  0 @ 268 -	.byte  0 @ 269 -	.byte  0 @ 270 -	.byte  0 @ 271 -	.byte  0 @ 272 -	.byte  0 @ 273 -	.byte  0 @ 274 -	.byte  0 @ 275 -	.byte  0 @ 276 -	.byte  0 @ SPECIES_TREECKO -	.byte  0 @ SPECIES_GROVYLE -	.byte  0 @ SPECIES_SCEPTILE -	.byte  0 @ SPECIES_TORCHIC -	.byte  0 @ SPECIES_COMBUSKEN -	.byte  0 @ SPECIES_BLAZIKEN -	.byte  0 @ SPECIES_MUDKIP -	.byte  0 @ SPECIES_MARSHTOMP -	.byte  0 @ SPECIES_SWAMPERT -	.byte  0 @ SPECIES_POOCHYENA -	.byte  0 @ SPECIES_MIGHTYENA -	.byte  0 @ SPECIES_ZIGZAGOON -	.byte  0 @ SPECIES_LINOONE -	.byte  0 @ SPECIES_WURMPLE -	.byte  0 @ SPECIES_SILCOON -	.byte  8 @ SPECIES_BEAUTIFLY -	.byte  0 @ SPECIES_CASCOON -	.byte 10 @ SPECIES_DUSTOX -	.byte  0 @ SPECIES_LOTAD -	.byte  0 @ SPECIES_LOMBRE -	.byte  0 @ SPECIES_LUDICOLO -	.byte  0 @ SPECIES_SEEDOT -	.byte  0 @ SPECIES_NUZLEAF -	.byte  0 @ SPECIES_SHIFTRY -	.byte  0 @ SPECIES_NINCADA -	.byte 10 @ SPECIES_NINJASK -	.byte  8 @ SPECIES_SHEDINJA -	.byte  0 @ SPECIES_TAILLOW -	.byte  0 @ SPECIES_SWELLOW -	.byte  0 @ SPECIES_SHROOMISH -	.byte  0 @ SPECIES_BRELOOM -	.byte  0 @ SPECIES_SPINDA -	.byte 16 @ SPECIES_WINGULL -	.byte  8 @ SPECIES_PELIPPER -	.byte  0 @ SPECIES_SURSKIT -	.byte 10 @ SPECIES_MASQUERAIN -	.byte  0 @ SPECIES_WAILMER -	.byte  0 @ SPECIES_WAILORD -	.byte  0 @ SPECIES_SKITTY -	.byte  0 @ SPECIES_DELCATTY -	.byte  0 @ SPECIES_KECLEON -	.byte  4 @ SPECIES_BALTOY -	.byte  4 @ SPECIES_CLAYDOL -	.byte  0 @ SPECIES_NOSEPASS -	.byte  0 @ SPECIES_TORKOAL -	.byte  0 @ SPECIES_SABLEYE -	.byte  0 @ SPECIES_BARBOACH -	.byte  0 @ SPECIES_WHISCASH -	.byte  0 @ SPECIES_LUVDISC -	.byte  0 @ SPECIES_CORPHISH -	.byte  0 @ SPECIES_CRAWDAUNT -	.byte  0 @ SPECIES_FEEBAS -	.byte  0 @ SPECIES_MILOTIC -	.byte  0 @ SPECIES_CARVANHA -	.byte  0 @ SPECIES_SHARPEDO -	.byte  0 @ SPECIES_TRAPINCH -	.byte  0 @ SPECIES_VIBRAVA -	.byte  3 @ SPECIES_FLYGON -	.byte  0 @ SPECIES_MAKUHITA -	.byte  0 @ SPECIES_HARIYAMA -	.byte  0 @ SPECIES_ELECTRIKE -	.byte  0 @ SPECIES_MANECTRIC -	.byte  0 @ SPECIES_NUMEL -	.byte  0 @ SPECIES_CAMERUPT -	.byte  0 @ SPECIES_SPHEAL -	.byte  0 @ SPECIES_SEALEO -	.byte  0 @ SPECIES_WALREIN -	.byte  0 @ SPECIES_CACNEA -	.byte  0 @ SPECIES_CACTURNE -	.byte  0 @ SPECIES_SNORUNT -	.byte 12 @ SPECIES_GLALIE -	.byte 13 @ SPECIES_LUNATONE -	.byte  4 @ SPECIES_SOLROCK -	.byte  0 @ SPECIES_AZURILL -	.byte  0 @ SPECIES_SPOINK -	.byte  0 @ SPECIES_GRUMPIG -	.byte  0 @ SPECIES_PLUSLE -	.byte  0 @ SPECIES_MINUN -	.byte  0 @ SPECIES_MAWILE -	.byte  0 @ SPECIES_MEDITITE -	.byte  0 @ SPECIES_MEDICHAM -	.byte 12 @ SPECIES_SWABLU -	.byte  8 @ SPECIES_ALTARIA -	.byte  0 @ SPECIES_WYNAUT -	.byte  4 @ SPECIES_DUSKULL -	.byte  0 @ SPECIES_DUSCLOPS -	.byte  0 @ SPECIES_ROSELIA -	.byte  0 @ SPECIES_SLAKOTH -	.byte  0 @ SPECIES_VIGOROTH -	.byte  0 @ SPECIES_SLAKING -	.byte  0 @ SPECIES_GULPIN -	.byte  0 @ SPECIES_SWALOT -	.byte  0 @ SPECIES_TROPIUS -	.byte  0 @ SPECIES_WHISMUR -	.byte  0 @ SPECIES_LOUDRED -	.byte  0 @ SPECIES_EXPLOUD -	.byte  0 @ SPECIES_CLAMPERL -	.byte  0 @ SPECIES_HUNTAIL -	.byte  0 @ SPECIES_GOREBYSS -	.byte  0 @ SPECIES_ABSOL -	.byte 12 @ SPECIES_SHUPPET -	.byte  8 @ SPECIES_BANETTE -	.byte  0 @ SPECIES_SEVIPER -	.byte  0 @ SPECIES_ZANGOOSE -	.byte  0 @ SPECIES_RELICANTH -	.byte  0 @ SPECIES_ARON -	.byte  0 @ SPECIES_LAIRON -	.byte  0 @ SPECIES_AGGRON -	.byte 16 @ SPECIES_CASTFORM -	.byte  0 @ SPECIES_VOLBEAT -	.byte  0 @ SPECIES_ILLUMISE -	.byte  0 @ SPECIES_LILEEP -	.byte  0 @ SPECIES_CRADILY -	.byte  0 @ SPECIES_ANORITH -	.byte  0 @ SPECIES_ARMALDO -	.byte  0 @ SPECIES_RALTS -	.byte  0 @ SPECIES_KIRLIA -	.byte  0 @ SPECIES_GARDEVOIR -	.byte  0 @ SPECIES_BAGON -	.byte  0 @ SPECIES_SHELGON -	.byte  0 @ SPECIES_SALAMENCE -	.byte  8 @ SPECIES_BELDUM -	.byte  0 @ SPECIES_METANG -	.byte  0 @ SPECIES_METAGROSS -	.byte  0 @ SPECIES_REGIROCK -	.byte  0 @ SPECIES_REGICE -	.byte  0 @ SPECIES_REGISTEEL -	.byte  0 @ SPECIES_KYOGRE -	.byte  0 @ SPECIES_GROUDON -	.byte  6 @ SPECIES_RAYQUAZA -	.byte  6 @ SPECIES_LATIAS -	.byte  6 @ SPECIES_LATIOS -	.byte 12 @ SPECIES_JIRACHI -	.byte  4 @ SPECIES_DEOXYS -	.byte 12 @ SPECIES_CHIMECHO diff --git a/data/graphics/trainers/back_pic_coords.inc b/data/graphics/trainers/back_pic_coords.inc deleted file mode 100644 index e1c0b0e60..000000000 --- a/data/graphics/trainers/back_pic_coords.inc +++ /dev/null @@ -1,5 +0,0 @@ -	.align 2 -gTrainerBackPicCoords:: @ 81ECAD8 -	.byte 8, 4, 0, 0 -	.byte 8, 4, 0, 0 -	.byte 8, 4, 0, 0 diff --git a/data/graphics/trainers/back_pic_palette_table.inc b/data/graphics/trainers/back_pic_palette_table.inc deleted file mode 100644 index 143becca4..000000000 --- a/data/graphics/trainers/back_pic_palette_table.inc +++ /dev/null @@ -1,5 +0,0 @@ -	.align 2 -gTrainerBackPicPaletteTable:: @ 81ECAFC -	obj_pal gTrainerPalette_Brendan, 0 -	obj_pal gTrainerPalette_May, 1 -	obj_pal gTrainerPalette_Wally, 2 diff --git a/data/graphics/trainers/back_pic_table.inc b/data/graphics/trainers/back_pic_table.inc deleted file mode 100644 index c4c243c87..000000000 --- a/data/graphics/trainers/back_pic_table.inc +++ /dev/null @@ -1,5 +0,0 @@ -	.align 2 -gTrainerBackPicTable:: @ 81ECAE4 -	obj_tiles gTrainerBackPic_Brendan, 0x2000, 0 -	obj_tiles gTrainerBackPic_May, 0x2000, 1 -	obj_tiles gTrainerBackPic_Wally, 0x2000, 2 | 
