Split trainers and port species and move names
This commit is contained in:
PikalaxALT
@@ -4953,7 +4953,7 @@ _080CCBEA:
|
||||
cmp r7, 0
|
||||
bne _080CCC34
|
||||
ldr r0, _080CCC24 @ =gStringVar2
|
||||
ldr r1, _080CCC28 @ =gUnknown_82481BE
|
||||
ldr r1, _080CCC28 @ =gMoveNames + 0x112A FRENZY PLANT
|
||||
bl StringCopy
|
||||
ldr r1, _080CCC2C @ =gSpecialVar_0x8005
|
||||
movs r0, 0xF
|
||||
@@ -4964,14 +4964,14 @@ _080CCBEA:
|
||||
_080CCC1C: .4byte gUnknown_83F6203
|
||||
_080CCC20: .4byte gPlayerParty
|
||||
_080CCC24: .4byte gStringVar2
|
||||
_080CCC28: .4byte gUnknown_82481BE
|
||||
_080CCC28: .4byte gMoveNames + 0x112A
|
||||
_080CCC2C: .4byte gSpecialVar_0x8005
|
||||
_080CCC30: .4byte 0x000002de
|
||||
_080CCC34:
|
||||
cmp r7, 0x1
|
||||
bne _080CCC5C
|
||||
ldr r0, _080CCC4C @ =gStringVar2
|
||||
ldr r1, _080CCC50 @ =gUnknown_824802B
|
||||
ldr r1, _080CCC50 @ =gMoveNames + 0xF97 BLAST BURN
|
||||
bl StringCopy
|
||||
ldr r1, _080CCC54 @ =gSpecialVar_0x8005
|
||||
movs r0, 0x10
|
||||
@@ -4980,12 +4980,12 @@ _080CCC34:
|
||||
b _080CCC6E
|
||||
.align 2, 0
|
||||
_080CCC4C: .4byte gStringVar2
|
||||
_080CCC50: .4byte gUnknown_824802B
|
||||
_080CCC50: .4byte gMoveNames + 0xF97
|
||||
_080CCC54: .4byte gSpecialVar_0x8005
|
||||
_080CCC58: .4byte 0x000002df
|
||||
_080CCC5C:
|
||||
ldr r0, _080CCC80 @ =gStringVar2
|
||||
ldr r1, _080CCC84 @ =gUnknown_8248038
|
||||
ldr r1, _080CCC84 @ =gMoveNames + 0xFA4 HYDRO CANNON
|
||||
bl StringCopy
|
||||
ldr r1, _080CCC88 @ =gSpecialVar_0x8005
|
||||
movs r0, 0x11
|
||||
@@ -5003,7 +5003,7 @@ _080CCC7A:
|
||||
b _080CCCE4
|
||||
.align 2, 0
|
||||
_080CCC80: .4byte gStringVar2
|
||||
_080CCC84: .4byte gUnknown_8248038
|
||||
_080CCC84: .4byte gMoveNames + 0xFA4
|
||||
_080CCC88: .4byte gSpecialVar_0x8005
|
||||
_080CCC8C:
|
||||
movs r0, 0x64
|
||||
|
||||
+2
-33
@@ -8,41 +8,10 @@
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
gAnimCmd_8239EBC:: @ 8239EBC
|
||||
.incbin "baserom.gba", 0x239EBC, 0xB8
|
||||
|
||||
gTrainerBackAnimsPtrTable:: @ 8239F74
|
||||
.incbin "baserom.gba", 0x239F74, 0x18
|
||||
|
||||
gTrainerBackPicCoords:: @ 8239F8C
|
||||
.incbin "baserom.gba", 0x239F8C, 0x18
|
||||
|
||||
gTrainerBackPicTable:: @ 8239FA4
|
||||
.incbin "baserom.gba", 0x239FA4, 0x30
|
||||
|
||||
gTrainerBackPicPaletteTable:: @ 8239FD4
|
||||
.incbin "baserom.gba", 0x239FD4, 0x30
|
||||
|
||||
gEnemyMonElevation:: @ 823A004
|
||||
.incbin "baserom.gba", 0x23A004, 0x19C
|
||||
|
||||
.section .rodata.8245EE0
|
||||
.align 2, 0
|
||||
gSpeciesNames:: @ 8245EE0
|
||||
.include "data/text/species_names.inc"
|
||||
|
||||
gMoveNames:: @ 8247094
|
||||
.incbin "baserom.gba", 0x247094, 0xF97
|
||||
|
||||
gUnknown_824802B:: @ 824802B
|
||||
.incbin "baserom.gba", 0x24802B, 0xD
|
||||
|
||||
gUnknown_8248038:: @ 8248038
|
||||
.incbin "baserom.gba", 0x248038, 0x186
|
||||
|
||||
gUnknown_82481BE:: @ 82481BE
|
||||
.incbin "baserom.gba", 0x2481BE, 0x12A
|
||||
gUnknown_824829C:: @ 824829C
|
||||
.incbin "baserom.gba", 0x24829C, 0x4c
|
||||
|
||||
gUnknown_82482E8:: @ 82482E8
|
||||
.incbin "baserom.gba", 0x2482E8, 0x18
|
||||
|
||||
+2
-2
@@ -13420,11 +13420,11 @@ gTrainerBackPic_RSMay:: @ 8E74EBC
|
||||
.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
|
||||
|
||||
.align 2
|
||||
gTrainerPalette_LeafBackPic:: @ 8E76EBC
|
||||
gTrainerPalette_RedBackPic:: @ 8E76EBC
|
||||
.incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gTrainerPalette_RedBackPic:: @ 8E76EE4
|
||||
gTrainerPalette_LeafBackPic:: @ 8E76EE4
|
||||
.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
|
||||
@@ -1,412 +0,0 @@
|
||||
.string "??????????$", 11
|
||||
.string "BULBASAUR$", 11
|
||||
.string "IVYSAUR$", 11
|
||||
.string "VENUSAUR$", 11
|
||||
.string "CHARMANDER$", 11
|
||||
.string "CHARMELEON$", 11
|
||||
.string "CHARIZARD$", 11
|
||||
.string "SQUIRTLE$", 11
|
||||
.string "WARTORTLE$", 11
|
||||
.string "BLASTOISE$", 11
|
||||
.string "CATERPIE$", 11
|
||||
.string "METAPOD$", 11
|
||||
.string "BUTTERFREE$", 11
|
||||
.string "WEEDLE$", 11
|
||||
.string "KAKUNA$", 11
|
||||
.string "BEEDRILL$", 11
|
||||
.string "PIDGEY$", 11
|
||||
.string "PIDGEOTTO$", 11
|
||||
.string "PIDGEOT$", 11
|
||||
.string "RATTATA$", 11
|
||||
.string "RATICATE$", 11
|
||||
.string "SPEAROW$", 11
|
||||
.string "FEAROW$", 11
|
||||
.string "EKANS$", 11
|
||||
.string "ARBOK$", 11
|
||||
.string "PIKACHU$", 11
|
||||
.string "RAICHU$", 11
|
||||
.string "SANDSHREW$", 11
|
||||
.string "SANDSLASH$", 11
|
||||
.string "NIDORAN♀$", 11
|
||||
.string "NIDORINA$", 11
|
||||
.string "NIDOQUEEN$", 11
|
||||
.string "NIDORAN♂$", 11
|
||||
.string "NIDORINO$", 11
|
||||
.string "NIDOKING$", 11
|
||||
.string "CLEFAIRY$", 11
|
||||
.string "CLEFABLE$", 11
|
||||
.string "VULPIX$", 11
|
||||
.string "NINETALES$", 11
|
||||
.string "JIGGLYPUFF$", 11
|
||||
.string "WIGGLYTUFF$", 11
|
||||
.string "ZUBAT$", 11
|
||||
.string "GOLBAT$", 11
|
||||
.string "ODDISH$", 11
|
||||
.string "GLOOM$", 11
|
||||
.string "VILEPLUME$", 11
|
||||
.string "PARAS$", 11
|
||||
.string "PARASECT$", 11
|
||||
.string "VENONAT$", 11
|
||||
.string "VENOMOTH$", 11
|
||||
.string "DIGLETT$", 11
|
||||
.string "DUGTRIO$", 11
|
||||
.string "MEOWTH$", 11
|
||||
.string "PERSIAN$", 11
|
||||
.string "PSYDUCK$", 11
|
||||
.string "GOLDUCK$", 11
|
||||
.string "MANKEY$", 11
|
||||
.string "PRIMEAPE$", 11
|
||||
.string "GROWLITHE$", 11
|
||||
.string "ARCANINE$", 11
|
||||
.string "POLIWAG$", 11
|
||||
.string "POLIWHIRL$", 11
|
||||
.string "POLIWRATH$", 11
|
||||
.string "ABRA$", 11
|
||||
.string "KADABRA$", 11
|
||||
.string "ALAKAZAM$", 11
|
||||
.string "MACHOP$", 11
|
||||
.string "MACHOKE$", 11
|
||||
.string "MACHAMP$", 11
|
||||
.string "BELLSPROUT$", 11
|
||||
.string "WEEPINBELL$", 11
|
||||
.string "VICTREEBEL$", 11
|
||||
.string "TENTACOOL$", 11
|
||||
.string "TENTACRUEL$", 11
|
||||
.string "GEODUDE$", 11
|
||||
.string "GRAVELER$", 11
|
||||
.string "GOLEM$", 11
|
||||
.string "PONYTA$", 11
|
||||
.string "RAPIDASH$", 11
|
||||
.string "SLOWPOKE$", 11
|
||||
.string "SLOWBRO$", 11
|
||||
.string "MAGNEMITE$", 11
|
||||
.string "MAGNETON$", 11
|
||||
.string "FARFETCH'D$", 11
|
||||
.string "DODUO$", 11
|
||||
.string "DODRIO$", 11
|
||||
.string "SEEL$", 11
|
||||
.string "DEWGONG$", 11
|
||||
.string "GRIMER$", 11
|
||||
.string "MUK$", 11
|
||||
.string "SHELLDER$", 11
|
||||
.string "CLOYSTER$", 11
|
||||
.string "GASTLY$", 11
|
||||
.string "HAUNTER$", 11
|
||||
.string "GENGAR$", 11
|
||||
.string "ONIX$", 11
|
||||
.string "DROWZEE$", 11
|
||||
.string "HYPNO$", 11
|
||||
.string "KRABBY$", 11
|
||||
.string "KINGLER$", 11
|
||||
.string "VOLTORB$", 11
|
||||
.string "ELECTRODE$", 11
|
||||
.string "EXEGGCUTE$", 11
|
||||
.string "EXEGGUTOR$", 11
|
||||
.string "CUBONE$", 11
|
||||
.string "MAROWAK$", 11
|
||||
.string "HITMONLEE$", 11
|
||||
.string "HITMONCHAN$", 11
|
||||
.string "LICKITUNG$", 11
|
||||
.string "KOFFING$", 11
|
||||
.string "WEEZING$", 11
|
||||
.string "RHYHORN$", 11
|
||||
.string "RHYDON$", 11
|
||||
.string "CHANSEY$", 11
|
||||
.string "TANGELA$", 11
|
||||
.string "KANGASKHAN$", 11
|
||||
.string "HORSEA$", 11
|
||||
.string "SEADRA$", 11
|
||||
.string "GOLDEEN$", 11
|
||||
.string "SEAKING$", 11
|
||||
.string "STARYU$", 11
|
||||
.string "STARMIE$", 11
|
||||
.string "MR. MIME$", 11
|
||||
.string "SCYTHER$", 11
|
||||
.string "JYNX$", 11
|
||||
.string "ELECTABUZZ$", 11
|
||||
.string "MAGMAR$", 11
|
||||
.string "PINSIR$", 11
|
||||
.string "TAUROS$", 11
|
||||
.string "MAGIKARP$", 11
|
||||
.string "GYARADOS$", 11
|
||||
.string "LAPRAS$", 11
|
||||
.string "DITTO$", 11
|
||||
.string "EEVEE$", 11
|
||||
.string "VAPOREON$", 11
|
||||
.string "JOLTEON$", 11
|
||||
.string "FLAREON$", 11
|
||||
.string "PORYGON$", 11
|
||||
.string "OMANYTE$", 11
|
||||
.string "OMASTAR$", 11
|
||||
.string "KABUTO$", 11
|
||||
.string "KABUTOPS$", 11
|
||||
.string "AERODACTYL$", 11
|
||||
.string "SNORLAX$", 11
|
||||
.string "ARTICUNO$", 11
|
||||
.string "ZAPDOS$", 11
|
||||
.string "MOLTRES$", 11
|
||||
.string "DRATINI$", 11
|
||||
.string "DRAGONAIR$", 11
|
||||
.string "DRAGONITE$", 11
|
||||
.string "MEWTWO$", 11
|
||||
.string "MEW$", 11
|
||||
.string "CHIKORITA$", 11
|
||||
.string "BAYLEEF$", 11
|
||||
.string "MEGANIUM$", 11
|
||||
.string "CYNDAQUIL$", 11
|
||||
.string "QUILAVA$", 11
|
||||
.string "TYPHLOSION$", 11
|
||||
.string "TOTODILE$", 11
|
||||
.string "CROCONAW$", 11
|
||||
.string "FERALIGATR$", 11
|
||||
.string "SENTRET$", 11
|
||||
.string "FURRET$", 11
|
||||
.string "HOOTHOOT$", 11
|
||||
.string "NOCTOWL$", 11
|
||||
.string "LEDYBA$", 11
|
||||
.string "LEDIAN$", 11
|
||||
.string "SPINARAK$", 11
|
||||
.string "ARIADOS$", 11
|
||||
.string "CROBAT$", 11
|
||||
.string "CHINCHOU$", 11
|
||||
.string "LANTURN$", 11
|
||||
.string "PICHU$", 11
|
||||
.string "CLEFFA$", 11
|
||||
.string "IGGLYBUFF$", 11
|
||||
.string "TOGEPI$", 11
|
||||
.string "TOGETIC$", 11
|
||||
.string "NATU$", 11
|
||||
.string "XATU$", 11
|
||||
.string "MAREEP$", 11
|
||||
.string "FLAAFFY$", 11
|
||||
.string "AMPHAROS$", 11
|
||||
.string "BELLOSSOM$", 11
|
||||
.string "MARILL$", 11
|
||||
.string "AZUMARILL$", 11
|
||||
.string "SUDOWOODO$", 11
|
||||
.string "POLITOED$", 11
|
||||
.string "HOPPIP$", 11
|
||||
.string "SKIPLOOM$", 11
|
||||
.string "JUMPLUFF$", 11
|
||||
.string "AIPOM$", 11
|
||||
.string "SUNKERN$", 11
|
||||
.string "SUNFLORA$", 11
|
||||
.string "YANMA$", 11
|
||||
.string "WOOPER$", 11
|
||||
.string "QUAGSIRE$", 11
|
||||
.string "ESPEON$", 11
|
||||
.string "UMBREON$", 11
|
||||
.string "MURKROW$", 11
|
||||
.string "SLOWKING$", 11
|
||||
.string "MISDREAVUS$", 11
|
||||
.string "UNOWN$", 11
|
||||
.string "WOBBUFFET$", 11
|
||||
.string "GIRAFARIG$", 11
|
||||
.string "PINECO$", 11
|
||||
.string "FORRETRESS$", 11
|
||||
.string "DUNSPARCE$", 11
|
||||
.string "GLIGAR$", 11
|
||||
.string "STEELIX$", 11
|
||||
.string "SNUBBULL$", 11
|
||||
.string "GRANBULL$", 11
|
||||
.string "QWILFISH$", 11
|
||||
.string "SCIZOR$", 11
|
||||
.string "SHUCKLE$", 11
|
||||
.string "HERACROSS$", 11
|
||||
.string "SNEASEL$", 11
|
||||
.string "TEDDIURSA$", 11
|
||||
.string "URSARING$", 11
|
||||
.string "SLUGMA$", 11
|
||||
.string "MAGCARGO$", 11
|
||||
.string "SWINUB$", 11
|
||||
.string "PILOSWINE$", 11
|
||||
.string "CORSOLA$", 11
|
||||
.string "REMORAID$", 11
|
||||
.string "OCTILLERY$", 11
|
||||
.string "DELIBIRD$", 11
|
||||
.string "MANTINE$", 11
|
||||
.string "SKARMORY$", 11
|
||||
.string "HOUNDOUR$", 11
|
||||
.string "HOUNDOOM$", 11
|
||||
.string "KINGDRA$", 11
|
||||
.string "PHANPY$", 11
|
||||
.string "DONPHAN$", 11
|
||||
.string "PORYGON2$", 11
|
||||
.string "STANTLER$", 11
|
||||
.string "SMEARGLE$", 11
|
||||
.string "TYROGUE$", 11
|
||||
.string "HITMONTOP$", 11
|
||||
.string "SMOOCHUM$", 11
|
||||
.string "ELEKID$", 11
|
||||
.string "MAGBY$", 11
|
||||
.string "MILTANK$", 11
|
||||
.string "BLISSEY$", 11
|
||||
.string "RAIKOU$", 11
|
||||
.string "ENTEI$", 11
|
||||
.string "SUICUNE$", 11
|
||||
.string "LARVITAR$", 11
|
||||
.string "PUPITAR$", 11
|
||||
.string "TYRANITAR$", 11
|
||||
.string "LUGIA$", 11
|
||||
.string "HO-OH$", 11
|
||||
.string "CELEBI$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "?$", 11
|
||||
.string "TREECKO$", 11
|
||||
.string "GROVYLE$", 11
|
||||
.string "SCEPTILE$", 11
|
||||
.string "TORCHIC$", 11
|
||||
.string "COMBUSKEN$", 11
|
||||
.string "BLAZIKEN$", 11
|
||||
.string "MUDKIP$", 11
|
||||
.string "MARSHTOMP$", 11
|
||||
.string "SWAMPERT$", 11
|
||||
.string "POOCHYENA$", 11
|
||||
.string "MIGHTYENA$", 11
|
||||
.string "ZIGZAGOON$", 11
|
||||
.string "LINOONE$", 11
|
||||
.string "WURMPLE$", 11
|
||||
.string "SILCOON$", 11
|
||||
.string "BEAUTIFLY$", 11
|
||||
.string "CASCOON$", 11
|
||||
.string "DUSTOX$", 11
|
||||
.string "LOTAD$", 11
|
||||
.string "LOMBRE$", 11
|
||||
.string "LUDICOLO$", 11
|
||||
.string "SEEDOT$", 11
|
||||
.string "NUZLEAF$", 11
|
||||
.string "SHIFTRY$", 11
|
||||
.string "NINCADA$", 11
|
||||
.string "NINJASK$", 11
|
||||
.string "SHEDINJA$", 11
|
||||
.string "TAILLOW$", 11
|
||||
.string "SWELLOW$", 11
|
||||
.string "SHROOMISH$", 11
|
||||
.string "BRELOOM$", 11
|
||||
.string "SPINDA$", 11
|
||||
.string "WINGULL$", 11
|
||||
.string "PELIPPER$", 11
|
||||
.string "SURSKIT$", 11
|
||||
.string "MASQUERAIN$", 11
|
||||
.string "WAILMER$", 11
|
||||
.string "WAILORD$", 11
|
||||
.string "SKITTY$", 11
|
||||
.string "DELCATTY$", 11
|
||||
.string "KECLEON$", 11
|
||||
.string "BALTOY$", 11
|
||||
.string "CLAYDOL$", 11
|
||||
.string "NOSEPASS$", 11
|
||||
.string "TORKOAL$", 11
|
||||
.string "SABLEYE$", 11
|
||||
.string "BARBOACH$", 11
|
||||
.string "WHISCASH$", 11
|
||||
.string "LUVDISC$", 11
|
||||
.string "CORPHISH$", 11
|
||||
.string "CRAWDAUNT$", 11
|
||||
.string "FEEBAS$", 11
|
||||
.string "MILOTIC$", 11
|
||||
.string "CARVANHA$", 11
|
||||
.string "SHARPEDO$", 11
|
||||
.string "TRAPINCH$", 11
|
||||
.string "VIBRAVA$", 11
|
||||
.string "FLYGON$", 11
|
||||
.string "MAKUHITA$", 11
|
||||
.string "HARIYAMA$", 11
|
||||
.string "ELECTRIKE$", 11
|
||||
.string "MANECTRIC$", 11
|
||||
.string "NUMEL$", 11
|
||||
.string "CAMERUPT$", 11
|
||||
.string "SPHEAL$", 11
|
||||
.string "SEALEO$", 11
|
||||
.string "WALREIN$", 11
|
||||
.string "CACNEA$", 11
|
||||
.string "CACTURNE$", 11
|
||||
.string "SNORUNT$", 11
|
||||
.string "GLALIE$", 11
|
||||
.string "LUNATONE$", 11
|
||||
.string "SOLROCK$", 11
|
||||
.string "AZURILL$", 11
|
||||
.string "SPOINK$", 11
|
||||
.string "GRUMPIG$", 11
|
||||
.string "PLUSLE$", 11
|
||||
.string "MINUN$", 11
|
||||
.string "MAWILE$", 11
|
||||
.string "MEDITITE$", 11
|
||||
.string "MEDICHAM$", 11
|
||||
.string "SWABLU$", 11
|
||||
.string "ALTARIA$", 11
|
||||
.string "WYNAUT$", 11
|
||||
.string "DUSKULL$", 11
|
||||
.string "DUSCLOPS$", 11
|
||||
.string "ROSELIA$", 11
|
||||
.string "SLAKOTH$", 11
|
||||
.string "VIGOROTH$", 11
|
||||
.string "SLAKING$", 11
|
||||
.string "GULPIN$", 11
|
||||
.string "SWALOT$", 11
|
||||
.string "TROPIUS$", 11
|
||||
.string "WHISMUR$", 11
|
||||
.string "LOUDRED$", 11
|
||||
.string "EXPLOUD$", 11
|
||||
.string "CLAMPERL$", 11
|
||||
.string "HUNTAIL$", 11
|
||||
.string "GOREBYSS$", 11
|
||||
.string "ABSOL$", 11
|
||||
.string "SHUPPET$", 11
|
||||
.string "BANETTE$", 11
|
||||
.string "SEVIPER$", 11
|
||||
.string "ZANGOOSE$", 11
|
||||
.string "RELICANTH$", 11
|
||||
.string "ARON$", 11
|
||||
.string "LAIRON$", 11
|
||||
.string "AGGRON$", 11
|
||||
.string "CASTFORM$", 11
|
||||
.string "VOLBEAT$", 11
|
||||
.string "ILLUMISE$", 11
|
||||
.string "LILEEP$", 11
|
||||
.string "CRADILY$", 11
|
||||
.string "ANORITH$", 11
|
||||
.string "ARMALDO$", 11
|
||||
.string "RALTS$", 11
|
||||
.string "KIRLIA$", 11
|
||||
.string "GARDEVOIR$", 11
|
||||
.string "BAGON$", 11
|
||||
.string "SHELGON$", 11
|
||||
.string "SALAMENCE$", 11
|
||||
.string "BELDUM$", 11
|
||||
.string "METANG$", 11
|
||||
.string "METAGROSS$", 11
|
||||
.string "REGIROCK$", 11
|
||||
.string "REGICE$", 11
|
||||
.string "REGISTEEL$", 11
|
||||
.string "KYOGRE$", 11
|
||||
.string "GROUDON$", 11
|
||||
.string "RAYQUAZA$", 11
|
||||
.string "LATIAS$", 11
|
||||
.string "LATIOS$", 11
|
||||
.string "JIRACHI$", 11
|
||||
.string "DEOXYS$", 11
|
||||
.string "CHIMECHO$", 11
|
||||
@@ -2654,6 +2654,10 @@ extern const u32 gTrainerPalette_Collector[];
|
||||
extern const u32 gTrainerPalette_Wally[];
|
||||
extern const u32 gTrainerPalette_RSBrendan1[];
|
||||
extern const u32 gTrainerPalette_RSMay1[];
|
||||
extern const u32 gTrainerPalette_LeafBackPic[];
|
||||
extern const u32 gTrainerPalette_RedBackPic[];
|
||||
extern const u32 gTrainerPalette_PokeDudeBackPic[];
|
||||
extern const u32 gTrainerPalette_OldManBackPic[];
|
||||
extern const u32 gTrainerPalette_PokemonBreederM[];
|
||||
extern const u32 gTrainerPalette_RSPokemonBreederF[];
|
||||
extern const u32 gTrainerPalette_RSPokemonRangerM[];
|
||||
|
||||
@@ -385,8 +385,6 @@ SECTIONS {
|
||||
src/main_menu.o(.rodata);
|
||||
src/data.o(.rodata);
|
||||
data/data.o(.rodata);
|
||||
src/trainers.o(.rodata);
|
||||
data/data.o(.rodata.8245EE0);
|
||||
src/battle_util.o(.rodata);
|
||||
src/battle_script_commands.o(.rodata);
|
||||
src/battle_controller_player.o(.rodata);
|
||||
|
||||
+11
@@ -8,6 +8,7 @@
|
||||
#include "constants/species.h"
|
||||
#include "constants/trainers.h"
|
||||
#include "constants/battle_ai.h"
|
||||
#include "constants/trainer_classes.h"
|
||||
|
||||
const struct SpriteFrameImage gUnknown_8234698[] =
|
||||
{
|
||||
@@ -287,3 +288,13 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] =
|
||||
|
||||
#include "data/trainer_graphics/front_pic_anims.h"
|
||||
#include "data/trainer_graphics/front_pic_tables.h"
|
||||
#include "data/trainer_graphics/back_pic_anims.h"
|
||||
#include "data/trainer_graphics/back_pic_tables.h"
|
||||
|
||||
#include "data/pokemon_graphics/enemy_mon_elevation.h"
|
||||
|
||||
#include "data/trainer_parties.h"
|
||||
#include "data/text/trainer_class_names.h"
|
||||
#include "data/trainers.h"
|
||||
#include "data/text/species_names.h"
|
||||
#include "data/text/move_names.h"
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
// This determines how much higher above the usual position the enemy Pokémon
|
||||
// is during battle. Species that float or fly have nonzero values.
|
||||
const u8 gEnemyMonElevation[NUM_SPECIES] =
|
||||
{
|
||||
[SPECIES_BUTTERFREE] = 8,
|
||||
[SPECIES_BEEDRILL] = 8,
|
||||
[SPECIES_PIDGEOT] = 4,
|
||||
[SPECIES_FEAROW] = 6,
|
||||
[SPECIES_ZUBAT] = 8,
|
||||
[SPECIES_GOLBAT] = 8,
|
||||
[SPECIES_VENOMOTH] = 8,
|
||||
[SPECIES_GEODUDE] = 16,
|
||||
[SPECIES_MAGNEMITE] = 16,
|
||||
[SPECIES_MAGNETON] = 8,
|
||||
[SPECIES_GASTLY] = 4,
|
||||
[SPECIES_HAUNTER] = 4,
|
||||
[SPECIES_VOLTORB] = 10,
|
||||
[SPECIES_ELECTRODE] = 12,
|
||||
[SPECIES_KOFFING] = 8,
|
||||
[SPECIES_WEEZING] = 6,
|
||||
[SPECIES_AERODACTYL] = 7,
|
||||
[SPECIES_ARTICUNO] = 6,
|
||||
[SPECIES_ZAPDOS] = 8,
|
||||
[SPECIES_MOLTRES] = 5,
|
||||
[SPECIES_DRAGONITE] = 6,
|
||||
[SPECIES_MEW] = 8,
|
||||
[SPECIES_LEDIAN] = 8,
|
||||
[SPECIES_CROBAT] = 6,
|
||||
[SPECIES_HOPPIP] = 11,
|
||||
[SPECIES_SKIPLOOM] = 12,
|
||||
[SPECIES_JUMPLUFF] = 9,
|
||||
[SPECIES_YANMA] = 8,
|
||||
[SPECIES_MISDREAVUS] = 8,
|
||||
[SPECIES_UNOWN] = 8,
|
||||
[SPECIES_GLIGAR] = 6,
|
||||
[SPECIES_LUGIA] = 6,
|
||||
[SPECIES_HO_OH] = 6,
|
||||
[SPECIES_CELEBI] = 15,
|
||||
[SPECIES_BEAUTIFLY] = 8,
|
||||
[SPECIES_DUSTOX] = 10,
|
||||
[SPECIES_NINJASK] = 10,
|
||||
[SPECIES_SHEDINJA] = 8,
|
||||
[SPECIES_WINGULL] = 16,
|
||||
[SPECIES_PELIPPER] = 8,
|
||||
[SPECIES_MASQUERAIN] = 10,
|
||||
[SPECIES_BALTOY] = 4,
|
||||
[SPECIES_CLAYDOL] = 10,
|
||||
[SPECIES_FLYGON] = 7,
|
||||
[SPECIES_GLALIE] = 12,
|
||||
[SPECIES_LUNATONE] = 13,
|
||||
[SPECIES_SOLROCK] = 4,
|
||||
[SPECIES_SWABLU] = 12,
|
||||
[SPECIES_ALTARIA] = 8,
|
||||
[SPECIES_DUSKULL] = 9,
|
||||
[SPECIES_SHUPPET] = 12,
|
||||
[SPECIES_BANETTE] = 8,
|
||||
[SPECIES_CASTFORM] = 16,
|
||||
[SPECIES_BELDUM] = 8,
|
||||
[SPECIES_RAYQUAZA] = 6,
|
||||
[SPECIES_LATIAS] = 6,
|
||||
[SPECIES_LATIOS] = 6,
|
||||
[SPECIES_JIRACHI] = 12,
|
||||
[SPECIES_DEOXYS] = 8,
|
||||
[SPECIES_CHIMECHO] = 12,
|
||||
};
|
||||
@@ -0,0 +1,357 @@
|
||||
const u8 gMoveNames[][13] = {
|
||||
_("-$$$$$$"),
|
||||
_("POUND"),
|
||||
_("KARATE CHOP"),
|
||||
_("DOUBLESLAP"),
|
||||
_("COMET PUNCH"),
|
||||
_("MEGA PUNCH"),
|
||||
_("PAY DAY"),
|
||||
_("FIRE PUNCH"),
|
||||
_("ICE PUNCH"),
|
||||
_("THUNDERPUNCH"),
|
||||
_("SCRATCH"),
|
||||
_("VICEGRIP"),
|
||||
_("GUILLOTINE"),
|
||||
_("RAZOR WIND"),
|
||||
_("SWORDS DANCE"),
|
||||
_("CUT"),
|
||||
_("GUST"),
|
||||
_("WING ATTACK"),
|
||||
_("WHIRLWIND"),
|
||||
_("FLY"),
|
||||
_("BIND"),
|
||||
_("SLAM"),
|
||||
_("VINE WHIP"),
|
||||
_("STOMP"),
|
||||
_("DOUBLE KICK"),
|
||||
_("MEGA KICK"),
|
||||
_("JUMP KICK"),
|
||||
_("ROLLING KICK"),
|
||||
_("SAND-ATTACK"),
|
||||
_("HEADBUTT"),
|
||||
_("HORN ATTACK"),
|
||||
_("FURY ATTACK"),
|
||||
_("HORN DRILL"),
|
||||
_("TACKLE"),
|
||||
_("BODY SLAM"),
|
||||
_("WRAP"),
|
||||
_("TAKE DOWN"),
|
||||
_("THRASH"),
|
||||
_("DOUBLE-EDGE"),
|
||||
_("TAIL WHIP"),
|
||||
_("POISON STING"),
|
||||
_("TWINEEDLE"),
|
||||
_("PIN MISSILE"),
|
||||
_("LEER"),
|
||||
_("BITE"),
|
||||
_("GROWL"),
|
||||
_("ROAR"),
|
||||
_("SING"),
|
||||
_("SUPERSONIC"),
|
||||
_("SONICBOOM"),
|
||||
_("DISABLE"),
|
||||
_("ACID"),
|
||||
_("EMBER"),
|
||||
_("FLAMETHROWER"),
|
||||
_("MIST"),
|
||||
_("WATER GUN"),
|
||||
_("HYDRO PUMP"),
|
||||
_("SURF"),
|
||||
_("ICE BEAM"),
|
||||
_("BLIZZARD"),
|
||||
_("PSYBEAM"),
|
||||
_("BUBBLEBEAM"),
|
||||
_("AURORA BEAM"),
|
||||
_("HYPER BEAM"),
|
||||
_("PECK"),
|
||||
_("DRILL PECK"),
|
||||
_("SUBMISSION"),
|
||||
_("LOW KICK"),
|
||||
_("COUNTER"),
|
||||
_("SEISMIC TOSS"),
|
||||
_("STRENGTH"),
|
||||
_("ABSORB"),
|
||||
_("MEGA DRAIN"),
|
||||
_("LEECH SEED"),
|
||||
_("GROWTH"),
|
||||
_("RAZOR LEAF"),
|
||||
_("SOLARBEAM"),
|
||||
_("POISONPOWDER"),
|
||||
_("STUN SPORE"),
|
||||
_("SLEEP POWDER"),
|
||||
_("PETAL DANCE"),
|
||||
_("STRING SHOT"),
|
||||
_("DRAGON RAGE"),
|
||||
_("FIRE SPIN"),
|
||||
_("THUNDERSHOCK"),
|
||||
_("THUNDERBOLT"),
|
||||
_("THUNDER WAVE"),
|
||||
_("THUNDER"),
|
||||
_("ROCK THROW"),
|
||||
_("EARTHQUAKE"),
|
||||
_("FISSURE"),
|
||||
_("DIG"),
|
||||
_("TOXIC"),
|
||||
_("CONFUSION"),
|
||||
_("PSYCHIC"),
|
||||
_("HYPNOSIS"),
|
||||
_("MEDITATE"),
|
||||
_("AGILITY"),
|
||||
_("QUICK ATTACK"),
|
||||
_("RAGE"),
|
||||
_("TELEPORT"),
|
||||
_("NIGHT SHADE"),
|
||||
_("MIMIC"),
|
||||
_("SCREECH"),
|
||||
_("DOUBLE TEAM"),
|
||||
_("RECOVER"),
|
||||
_("HARDEN"),
|
||||
_("MINIMIZE"),
|
||||
_("SMOKESCREEN"),
|
||||
_("CONFUSE RAY"),
|
||||
_("WITHDRAW"),
|
||||
_("DEFENSE CURL"),
|
||||
_("BARRIER"),
|
||||
_("LIGHT SCREEN"),
|
||||
_("HAZE"),
|
||||
_("REFLECT"),
|
||||
_("FOCUS ENERGY"),
|
||||
_("BIDE"),
|
||||
_("METRONOME"),
|
||||
_("MIRROR MOVE"),
|
||||
_("SELFDESTRUCT"),
|
||||
_("EGG BOMB"),
|
||||
_("LICK"),
|
||||
_("SMOG"),
|
||||
_("SLUDGE"),
|
||||
_("BONE CLUB"),
|
||||
_("FIRE BLAST"),
|
||||
_("WATERFALL"),
|
||||
_("CLAMP"),
|
||||
_("SWIFT"),
|
||||
_("SKULL BASH"),
|
||||
_("SPIKE CANNON"),
|
||||
_("CONSTRICT"),
|
||||
_("AMNESIA"),
|
||||
_("KINESIS"),
|
||||
_("SOFTBOILED"),
|
||||
_("HI JUMP KICK"),
|
||||
_("GLARE"),
|
||||
_("DREAM EATER"),
|
||||
_("POISON GAS"),
|
||||
_("BARRAGE"),
|
||||
_("LEECH LIFE"),
|
||||
_("LOVELY KISS"),
|
||||
_("SKY ATTACK"),
|
||||
_("TRANSFORM"),
|
||||
_("BUBBLE"),
|
||||
_("DIZZY PUNCH"),
|
||||
_("SPORE"),
|
||||
_("FLASH"),
|
||||
_("PSYWAVE"),
|
||||
_("SPLASH"),
|
||||
_("ACID ARMOR"),
|
||||
_("CRABHAMMER"),
|
||||
_("EXPLOSION"),
|
||||
_("FURY SWIPES"),
|
||||
_("BONEMERANG"),
|
||||
_("REST"),
|
||||
_("ROCK SLIDE"),
|
||||
_("HYPER FANG"),
|
||||
_("SHARPEN"),
|
||||
_("CONVERSION"),
|
||||
_("TRI ATTACK"),
|
||||
_("SUPER FANG"),
|
||||
_("SLASH"),
|
||||
_("SUBSTITUTE"),
|
||||
_("STRUGGLE"),
|
||||
_("SKETCH"),
|
||||
_("TRIPLE KICK"),
|
||||
_("THIEF"),
|
||||
_("SPIDER WEB"),
|
||||
_("MIND READER"),
|
||||
_("NIGHTMARE"),
|
||||
_("FLAME WHEEL"),
|
||||
_("SNORE"),
|
||||
_("CURSE"),
|
||||
_("FLAIL"),
|
||||
_("CONVERSION 2"),
|
||||
_("AEROBLAST"),
|
||||
_("COTTON SPORE"),
|
||||
_("REVERSAL"),
|
||||
_("SPITE"),
|
||||
_("POWDER SNOW"),
|
||||
_("PROTECT"),
|
||||
_("MACH PUNCH"),
|
||||
_("SCARY FACE"),
|
||||
_("FAINT ATTACK"),
|
||||
_("SWEET KISS"),
|
||||
_("BELLY DRUM"),
|
||||
_("SLUDGE BOMB"),
|
||||
_("MUD-SLAP"),
|
||||
_("OCTAZOOKA"),
|
||||
_("SPIKES"),
|
||||
_("ZAP CANNON"),
|
||||
_("FORESIGHT"),
|
||||
_("DESTINY BOND"),
|
||||
_("PERISH SONG"),
|
||||
_("ICY WIND"),
|
||||
_("DETECT"),
|
||||
_("BONE RUSH"),
|
||||
_("LOCK-ON"),
|
||||
_("OUTRAGE"),
|
||||
_("SANDSTORM"),
|
||||
_("GIGA DRAIN"),
|
||||
_("ENDURE"),
|
||||
_("CHARM"),
|
||||
_("ROLLOUT"),
|
||||
_("FALSE SWIPE"),
|
||||
_("SWAGGER"),
|
||||
_("MILK DRINK"),
|
||||
_("SPARK"),
|
||||
_("FURY CUTTER"),
|
||||
_("STEEL WING"),
|
||||
_("MEAN LOOK"),
|
||||
_("ATTRACT"),
|
||||
_("SLEEP TALK"),
|
||||
_("HEAL BELL"),
|
||||
_("RETURN"),
|
||||
_("PRESENT"),
|
||||
_("FRUSTRATION"),
|
||||
_("SAFEGUARD"),
|
||||
_("PAIN SPLIT"),
|
||||
_("SACRED FIRE"),
|
||||
_("MAGNITUDE"),
|
||||
_("DYNAMICPUNCH"),
|
||||
_("MEGAHORN"),
|
||||
_("DRAGONBREATH"),
|
||||
_("BATON PASS"),
|
||||
_("ENCORE"),
|
||||
_("PURSUIT"),
|
||||
_("RAPID SPIN"),
|
||||
_("SWEET SCENT"),
|
||||
_("IRON TAIL"),
|
||||
_("METAL CLAW"),
|
||||
_("VITAL THROW"),
|
||||
_("MORNING SUN"),
|
||||
_("SYNTHESIS"),
|
||||
_("MOONLIGHT"),
|
||||
_("HIDDEN POWER"),
|
||||
_("CROSS CHOP"),
|
||||
_("TWISTER"),
|
||||
_("RAIN DANCE"),
|
||||
_("SUNNY DAY"),
|
||||
_("CRUNCH"),
|
||||
_("MIRROR COAT"),
|
||||
_("PSYCH UP"),
|
||||
_("EXTREMESPEED"),
|
||||
_("ANCIENTPOWER"),
|
||||
_("SHADOW BALL"),
|
||||
_("FUTURE SIGHT"),
|
||||
_("ROCK SMASH"),
|
||||
_("WHIRLPOOL"),
|
||||
_("BEAT UP"),
|
||||
_("FAKE OUT"),
|
||||
_("UPROAR"),
|
||||
_("STOCKPILE"),
|
||||
_("SPIT UP"),
|
||||
_("SWALLOW"),
|
||||
_("HEAT WAVE"),
|
||||
_("HAIL"),
|
||||
_("TORMENT"),
|
||||
_("FLATTER"),
|
||||
_("WILL-O-WISP"),
|
||||
_("MEMENTO"),
|
||||
_("FACADE"),
|
||||
_("FOCUS PUNCH"),
|
||||
_("SMELLINGSALT"),
|
||||
_("FOLLOW ME"),
|
||||
_("NATURE POWER"),
|
||||
_("CHARGE"),
|
||||
_("TAUNT"),
|
||||
_("HELPING HAND"),
|
||||
_("TRICK"),
|
||||
_("ROLE PLAY"),
|
||||
_("WISH"),
|
||||
_("ASSIST"),
|
||||
_("INGRAIN"),
|
||||
_("SUPERPOWER"),
|
||||
_("MAGIC COAT"),
|
||||
_("RECYCLE"),
|
||||
_("REVENGE"),
|
||||
_("BRICK BREAK"),
|
||||
_("YAWN"),
|
||||
_("KNOCK OFF"),
|
||||
_("ENDEAVOR"),
|
||||
_("ERUPTION"),
|
||||
_("SKILL SWAP"),
|
||||
_("IMPRISON"),
|
||||
_("REFRESH"),
|
||||
_("GRUDGE"),
|
||||
_("SNATCH"),
|
||||
_("SECRET POWER"),
|
||||
_("DIVE"),
|
||||
_("ARM THRUST"),
|
||||
_("CAMOUFLAGE"),
|
||||
_("TAIL GLOW"),
|
||||
_("LUSTER PURGE"),
|
||||
_("MIST BALL"),
|
||||
_("FEATHERDANCE"),
|
||||
_("TEETER DANCE"),
|
||||
_("BLAZE KICK"),
|
||||
_("MUD SPORT"),
|
||||
_("ICE BALL"),
|
||||
_("NEEDLE ARM"),
|
||||
_("SLACK OFF"),
|
||||
_("HYPER VOICE"),
|
||||
_("POISON FANG"),
|
||||
_("CRUSH CLAW"),
|
||||
_("BLAST BURN"),
|
||||
_("HYDRO CANNON"),
|
||||
_("METEOR MASH"),
|
||||
_("ASTONISH"),
|
||||
_("WEATHER BALL"),
|
||||
_("AROMATHERAPY"),
|
||||
_("FAKE TEARS"),
|
||||
_("AIR CUTTER"),
|
||||
_("OVERHEAT"),
|
||||
_("ODOR SLEUTH"),
|
||||
_("ROCK TOMB"),
|
||||
_("SILVER WIND"),
|
||||
_("METAL SOUND"),
|
||||
_("GRASSWHISTLE"),
|
||||
_("TICKLE"),
|
||||
_("COSMIC POWER"),
|
||||
_("WATER SPOUT"),
|
||||
_("SIGNAL BEAM"),
|
||||
_("SHADOW PUNCH"),
|
||||
_("EXTRASENSORY"),
|
||||
_("SKY UPPERCUT"),
|
||||
_("SAND TOMB"),
|
||||
_("SHEER COLD"),
|
||||
_("MUDDY WATER"),
|
||||
_("BULLET SEED"),
|
||||
_("AERIAL ACE"),
|
||||
_("ICICLE SPEAR"),
|
||||
_("IRON DEFENSE"),
|
||||
_("BLOCK"),
|
||||
_("HOWL"),
|
||||
_("DRAGON CLAW"),
|
||||
_("FRENZY PLANT"),
|
||||
_("BULK UP"),
|
||||
_("BOUNCE"),
|
||||
_("MUD SHOT"),
|
||||
_("POISON TAIL"),
|
||||
_("COVET"),
|
||||
_("VOLT TACKLE"),
|
||||
_("MAGICAL LEAF"),
|
||||
_("WATER SPORT"),
|
||||
_("CALM MIND"),
|
||||
_("LEAF BLADE"),
|
||||
_("DRAGON DANCE"),
|
||||
_("ROCK BLAST"),
|
||||
_("SHOCK WAVE"),
|
||||
_("WATER PULSE"),
|
||||
_("DOOM DESIRE"),
|
||||
_("PSYCHO BOOST")
|
||||
};
|
||||
@@ -0,0 +1,414 @@
|
||||
const u8 gSpeciesNames[][11] = {
|
||||
_("??????????"),
|
||||
_("BULBASAUR"),
|
||||
_("IVYSAUR"),
|
||||
_("VENUSAUR"),
|
||||
_("CHARMANDER"),
|
||||
_("CHARMELEON"),
|
||||
_("CHARIZARD"),
|
||||
_("SQUIRTLE"),
|
||||
_("WARTORTLE"),
|
||||
_("BLASTOISE"),
|
||||
_("CATERPIE"),
|
||||
_("METAPOD"),
|
||||
_("BUTTERFREE"),
|
||||
_("WEEDLE"),
|
||||
_("KAKUNA"),
|
||||
_("BEEDRILL"),
|
||||
_("PIDGEY"),
|
||||
_("PIDGEOTTO"),
|
||||
_("PIDGEOT"),
|
||||
_("RATTATA"),
|
||||
_("RATICATE"),
|
||||
_("SPEAROW"),
|
||||
_("FEAROW"),
|
||||
_("EKANS"),
|
||||
_("ARBOK"),
|
||||
_("PIKACHU"),
|
||||
_("RAICHU"),
|
||||
_("SANDSHREW"),
|
||||
_("SANDSLASH"),
|
||||
_("NIDORAN♀"),
|
||||
_("NIDORINA"),
|
||||
_("NIDOQUEEN"),
|
||||
_("NIDORAN♂"),
|
||||
_("NIDORINO"),
|
||||
_("NIDOKING"),
|
||||
_("CLEFAIRY"),
|
||||
_("CLEFABLE"),
|
||||
_("VULPIX"),
|
||||
_("NINETALES"),
|
||||
_("JIGGLYPUFF"),
|
||||
_("WIGGLYTUFF"),
|
||||
_("ZUBAT"),
|
||||
_("GOLBAT"),
|
||||
_("ODDISH"),
|
||||
_("GLOOM"),
|
||||
_("VILEPLUME"),
|
||||
_("PARAS"),
|
||||
_("PARASECT"),
|
||||
_("VENONAT"),
|
||||
_("VENOMOTH"),
|
||||
_("DIGLETT"),
|
||||
_("DUGTRIO"),
|
||||
_("MEOWTH"),
|
||||
_("PERSIAN"),
|
||||
_("PSYDUCK"),
|
||||
_("GOLDUCK"),
|
||||
_("MANKEY"),
|
||||
_("PRIMEAPE"),
|
||||
_("GROWLITHE"),
|
||||
_("ARCANINE"),
|
||||
_("POLIWAG"),
|
||||
_("POLIWHIRL"),
|
||||
_("POLIWRATH"),
|
||||
_("ABRA"),
|
||||
_("KADABRA"),
|
||||
_("ALAKAZAM"),
|
||||
_("MACHOP"),
|
||||
_("MACHOKE"),
|
||||
_("MACHAMP"),
|
||||
_("BELLSPROUT"),
|
||||
_("WEEPINBELL"),
|
||||
_("VICTREEBEL"),
|
||||
_("TENTACOOL"),
|
||||
_("TENTACRUEL"),
|
||||
_("GEODUDE"),
|
||||
_("GRAVELER"),
|
||||
_("GOLEM"),
|
||||
_("PONYTA"),
|
||||
_("RAPIDASH"),
|
||||
_("SLOWPOKE"),
|
||||
_("SLOWBRO"),
|
||||
_("MAGNEMITE"),
|
||||
_("MAGNETON"),
|
||||
_("FARFETCH'D"),
|
||||
_("DODUO"),
|
||||
_("DODRIO"),
|
||||
_("SEEL"),
|
||||
_("DEWGONG"),
|
||||
_("GRIMER"),
|
||||
_("MUK"),
|
||||
_("SHELLDER"),
|
||||
_("CLOYSTER"),
|
||||
_("GASTLY"),
|
||||
_("HAUNTER"),
|
||||
_("GENGAR"),
|
||||
_("ONIX"),
|
||||
_("DROWZEE"),
|
||||
_("HYPNO"),
|
||||
_("KRABBY"),
|
||||
_("KINGLER"),
|
||||
_("VOLTORB"),
|
||||
_("ELECTRODE"),
|
||||
_("EXEGGCUTE"),
|
||||
_("EXEGGUTOR"),
|
||||
_("CUBONE"),
|
||||
_("MAROWAK"),
|
||||
_("HITMONLEE"),
|
||||
_("HITMONCHAN"),
|
||||
_("LICKITUNG"),
|
||||
_("KOFFING"),
|
||||
_("WEEZING"),
|
||||
_("RHYHORN"),
|
||||
_("RHYDON"),
|
||||
_("CHANSEY"),
|
||||
_("TANGELA"),
|
||||
_("KANGASKHAN"),
|
||||
_("HORSEA"),
|
||||
_("SEADRA"),
|
||||
_("GOLDEEN"),
|
||||
_("SEAKING"),
|
||||
_("STARYU"),
|
||||
_("STARMIE"),
|
||||
_("MR. MIME"),
|
||||
_("SCYTHER"),
|
||||
_("JYNX"),
|
||||
_("ELECTABUZZ"),
|
||||
_("MAGMAR"),
|
||||
_("PINSIR"),
|
||||
_("TAUROS"),
|
||||
_("MAGIKARP"),
|
||||
_("GYARADOS"),
|
||||
_("LAPRAS"),
|
||||
_("DITTO"),
|
||||
_("EEVEE"),
|
||||
_("VAPOREON"),
|
||||
_("JOLTEON"),
|
||||
_("FLAREON"),
|
||||
_("PORYGON"),
|
||||
_("OMANYTE"),
|
||||
_("OMASTAR"),
|
||||
_("KABUTO"),
|
||||
_("KABUTOPS"),
|
||||
_("AERODACTYL"),
|
||||
_("SNORLAX"),
|
||||
_("ARTICUNO"),
|
||||
_("ZAPDOS"),
|
||||
_("MOLTRES"),
|
||||
_("DRATINI"),
|
||||
_("DRAGONAIR"),
|
||||
_("DRAGONITE"),
|
||||
_("MEWTWO"),
|
||||
_("MEW"),
|
||||
_("CHIKORITA"),
|
||||
_("BAYLEEF"),
|
||||
_("MEGANIUM"),
|
||||
_("CYNDAQUIL"),
|
||||
_("QUILAVA"),
|
||||
_("TYPHLOSION"),
|
||||
_("TOTODILE"),
|
||||
_("CROCONAW"),
|
||||
_("FERALIGATR"),
|
||||
_("SENTRET"),
|
||||
_("FURRET"),
|
||||
_("HOOTHOOT"),
|
||||
_("NOCTOWL"),
|
||||
_("LEDYBA"),
|
||||
_("LEDIAN"),
|
||||
_("SPINARAK"),
|
||||
_("ARIADOS"),
|
||||
_("CROBAT"),
|
||||
_("CHINCHOU"),
|
||||
_("LANTURN"),
|
||||
_("PICHU"),
|
||||
_("CLEFFA"),
|
||||
_("IGGLYBUFF"),
|
||||
_("TOGEPI"),
|
||||
_("TOGETIC"),
|
||||
_("NATU"),
|
||||
_("XATU"),
|
||||
_("MAREEP"),
|
||||
_("FLAAFFY"),
|
||||
_("AMPHAROS"),
|
||||
_("BELLOSSOM"),
|
||||
_("MARILL"),
|
||||
_("AZUMARILL"),
|
||||
_("SUDOWOODO"),
|
||||
_("POLITOED"),
|
||||
_("HOPPIP"),
|
||||
_("SKIPLOOM"),
|
||||
_("JUMPLUFF"),
|
||||
_("AIPOM"),
|
||||
_("SUNKERN"),
|
||||
_("SUNFLORA"),
|
||||
_("YANMA"),
|
||||
_("WOOPER"),
|
||||
_("QUAGSIRE"),
|
||||
_("ESPEON"),
|
||||
_("UMBREON"),
|
||||
_("MURKROW"),
|
||||
_("SLOWKING"),
|
||||
_("MISDREAVUS"),
|
||||
_("UNOWN"),
|
||||
_("WOBBUFFET"),
|
||||
_("GIRAFARIG"),
|
||||
_("PINECO"),
|
||||
_("FORRETRESS"),
|
||||
_("DUNSPARCE"),
|
||||
_("GLIGAR"),
|
||||
_("STEELIX"),
|
||||
_("SNUBBULL"),
|
||||
_("GRANBULL"),
|
||||
_("QWILFISH"),
|
||||
_("SCIZOR"),
|
||||
_("SHUCKLE"),
|
||||
_("HERACROSS"),
|
||||
_("SNEASEL"),
|
||||
_("TEDDIURSA"),
|
||||
_("URSARING"),
|
||||
_("SLUGMA"),
|
||||
_("MAGCARGO"),
|
||||
_("SWINUB"),
|
||||
_("PILOSWINE"),
|
||||
_("CORSOLA"),
|
||||
_("REMORAID"),
|
||||
_("OCTILLERY"),
|
||||
_("DELIBIRD"),
|
||||
_("MANTINE"),
|
||||
_("SKARMORY"),
|
||||
_("HOUNDOUR"),
|
||||
_("HOUNDOOM"),
|
||||
_("KINGDRA"),
|
||||
_("PHANPY"),
|
||||
_("DONPHAN"),
|
||||
_("PORYGON2"),
|
||||
_("STANTLER"),
|
||||
_("SMEARGLE"),
|
||||
_("TYROGUE"),
|
||||
_("HITMONTOP"),
|
||||
_("SMOOCHUM"),
|
||||
_("ELEKID"),
|
||||
_("MAGBY"),
|
||||
_("MILTANK"),
|
||||
_("BLISSEY"),
|
||||
_("RAIKOU"),
|
||||
_("ENTEI"),
|
||||
_("SUICUNE"),
|
||||
_("LARVITAR"),
|
||||
_("PUPITAR"),
|
||||
_("TYRANITAR"),
|
||||
_("LUGIA"),
|
||||
_("HO-OH"),
|
||||
_("CELEBI"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("?"),
|
||||
_("TREECKO"),
|
||||
_("GROVYLE"),
|
||||
_("SCEPTILE"),
|
||||
_("TORCHIC"),
|
||||
_("COMBUSKEN"),
|
||||
_("BLAZIKEN"),
|
||||
_("MUDKIP"),
|
||||
_("MARSHTOMP"),
|
||||
_("SWAMPERT"),
|
||||
_("POOCHYENA"),
|
||||
_("MIGHTYENA"),
|
||||
_("ZIGZAGOON"),
|
||||
_("LINOONE"),
|
||||
_("WURMPLE"),
|
||||
_("SILCOON"),
|
||||
_("BEAUTIFLY"),
|
||||
_("CASCOON"),
|
||||
_("DUSTOX"),
|
||||
_("LOTAD"),
|
||||
_("LOMBRE"),
|
||||
_("LUDICOLO"),
|
||||
_("SEEDOT"),
|
||||
_("NUZLEAF"),
|
||||
_("SHIFTRY"),
|
||||
_("NINCADA"),
|
||||
_("NINJASK"),
|
||||
_("SHEDINJA"),
|
||||
_("TAILLOW"),
|
||||
_("SWELLOW"),
|
||||
_("SHROOMISH"),
|
||||
_("BRELOOM"),
|
||||
_("SPINDA"),
|
||||
_("WINGULL"),
|
||||
_("PELIPPER"),
|
||||
_("SURSKIT"),
|
||||
_("MASQUERAIN"),
|
||||
_("WAILMER"),
|
||||
_("WAILORD"),
|
||||
_("SKITTY"),
|
||||
_("DELCATTY"),
|
||||
_("KECLEON"),
|
||||
_("BALTOY"),
|
||||
_("CLAYDOL"),
|
||||
_("NOSEPASS"),
|
||||
_("TORKOAL"),
|
||||
_("SABLEYE"),
|
||||
_("BARBOACH"),
|
||||
_("WHISCASH"),
|
||||
_("LUVDISC"),
|
||||
_("CORPHISH"),
|
||||
_("CRAWDAUNT"),
|
||||
_("FEEBAS"),
|
||||
_("MILOTIC"),
|
||||
_("CARVANHA"),
|
||||
_("SHARPEDO"),
|
||||
_("TRAPINCH"),
|
||||
_("VIBRAVA"),
|
||||
_("FLYGON"),
|
||||
_("MAKUHITA"),
|
||||
_("HARIYAMA"),
|
||||
_("ELECTRIKE"),
|
||||
_("MANECTRIC"),
|
||||
_("NUMEL"),
|
||||
_("CAMERUPT"),
|
||||
_("SPHEAL"),
|
||||
_("SEALEO"),
|
||||
_("WALREIN"),
|
||||
_("CACNEA"),
|
||||
_("CACTURNE"),
|
||||
_("SNORUNT"),
|
||||
_("GLALIE"),
|
||||
_("LUNATONE"),
|
||||
_("SOLROCK"),
|
||||
_("AZURILL"),
|
||||
_("SPOINK"),
|
||||
_("GRUMPIG"),
|
||||
_("PLUSLE"),
|
||||
_("MINUN"),
|
||||
_("MAWILE"),
|
||||
_("MEDITITE"),
|
||||
_("MEDICHAM"),
|
||||
_("SWABLU"),
|
||||
_("ALTARIA"),
|
||||
_("WYNAUT"),
|
||||
_("DUSKULL"),
|
||||
_("DUSCLOPS"),
|
||||
_("ROSELIA"),
|
||||
_("SLAKOTH"),
|
||||
_("VIGOROTH"),
|
||||
_("SLAKING"),
|
||||
_("GULPIN"),
|
||||
_("SWALOT"),
|
||||
_("TROPIUS"),
|
||||
_("WHISMUR"),
|
||||
_("LOUDRED"),
|
||||
_("EXPLOUD"),
|
||||
_("CLAMPERL"),
|
||||
_("HUNTAIL"),
|
||||
_("GOREBYSS"),
|
||||
_("ABSOL"),
|
||||
_("SHUPPET"),
|
||||
_("BANETTE"),
|
||||
_("SEVIPER"),
|
||||
_("ZANGOOSE"),
|
||||
_("RELICANTH"),
|
||||
_("ARON"),
|
||||
_("LAIRON"),
|
||||
_("AGGRON"),
|
||||
_("CASTFORM"),
|
||||
_("VOLBEAT"),
|
||||
_("ILLUMISE"),
|
||||
_("LILEEP"),
|
||||
_("CRADILY"),
|
||||
_("ANORITH"),
|
||||
_("ARMALDO"),
|
||||
_("RALTS"),
|
||||
_("KIRLIA"),
|
||||
_("GARDEVOIR"),
|
||||
_("BAGON"),
|
||||
_("SHELGON"),
|
||||
_("SALAMENCE"),
|
||||
_("BELDUM"),
|
||||
_("METANG"),
|
||||
_("METAGROSS"),
|
||||
_("REGIROCK"),
|
||||
_("REGICE"),
|
||||
_("REGISTEEL"),
|
||||
_("KYOGRE"),
|
||||
_("GROUDON"),
|
||||
_("RAYQUAZA"),
|
||||
_("LATIAS"),
|
||||
_("LATIOS"),
|
||||
_("JIRACHI"),
|
||||
_("DEOXYS"),
|
||||
_("CHIMECHO")
|
||||
};
|
||||
@@ -0,0 +1,109 @@
|
||||
const u8 gTrainerClassNames[][13] = {
|
||||
_("{PKMN} TRAINER"),
|
||||
_("{PKMN} TRAINER"),
|
||||
_("AQUA LEADER"),
|
||||
_("TEAM AQUA"),
|
||||
_("AROMA LADY"),
|
||||
_("RUIN MANIAC"),
|
||||
_("INTERVIEWER"),
|
||||
_("TUBER"),
|
||||
_("TUBER"),
|
||||
_("COOLTRAINER"),
|
||||
_("HEX MANIAC"),
|
||||
_("LADY"),
|
||||
_("BEAUTY"),
|
||||
_("RICH BOY"),
|
||||
_("POKéMANIAC"),
|
||||
_("SWIMMER♂"),
|
||||
_("BLACK BELT"),
|
||||
_("GUITARIST"),
|
||||
_("KINDLER"),
|
||||
_("CAMPER"),
|
||||
_("BUG MANIAC"),
|
||||
_("PSYCHIC"),
|
||||
_("GENTLEMAN"),
|
||||
_("ELITE FOUR"),
|
||||
_("LEADER"),
|
||||
_("SCHOOL KID"),
|
||||
_("SR. AND JR."),
|
||||
_("POKéFAN"),
|
||||
_("EXPERT"),
|
||||
_("YOUNGSTER"),
|
||||
_("CHAMPION"),
|
||||
_("FISHERMAN"),
|
||||
_("TRIATHLETE"),
|
||||
_("DRAGON TAMER"),
|
||||
_("BIRD KEEPER"),
|
||||
_("NINJA BOY"),
|
||||
_("BATTLE GIRL"),
|
||||
_("PARASOL LADY"),
|
||||
_("SWIMMER♀"),
|
||||
_("PICNICKER"),
|
||||
_("TWINS"),
|
||||
_("SAILOR"),
|
||||
_("BOARDER"),
|
||||
_("COLLECTOR"),
|
||||
_("{PKMN} TRAINER"),
|
||||
_("{PKMN} BREEDER"),
|
||||
_("{PKMN} RANGER"),
|
||||
_("MAGMA LEADER"),
|
||||
_("TEAM MAGMA"),
|
||||
_("LASS"),
|
||||
_("BUG CATCHER"),
|
||||
_("HIKER"),
|
||||
_("YOUNG COUPLE"),
|
||||
_("OLD COUPLE"),
|
||||
_("SIS AND BRO"),
|
||||
_("AQUA ADMIN"),
|
||||
_("MAGMA ADMIN"),
|
||||
_("YOUNGSTER"),
|
||||
_("BUG CATCHER"),
|
||||
_("LASS"),
|
||||
_("SAILOR"),
|
||||
_("CAMPER"),
|
||||
_("PICNICKER"),
|
||||
_("POKéMANIAC"),
|
||||
_("SUPER NERD"),
|
||||
_("HIKER"),
|
||||
_("BIKER"),
|
||||
_("BURGLAR"),
|
||||
_("ENGINEER"),
|
||||
_("FISHERMAN"),
|
||||
_("SWIMMER♂"),
|
||||
_("CUE BALL"),
|
||||
_("GAMER"),
|
||||
_("BEAUTY"),
|
||||
_("SWIMMER♀"),
|
||||
_("PSYCHIC"),
|
||||
_("ROCKER"),
|
||||
_("JUGGLER"),
|
||||
_("TAMER"),
|
||||
_("BIRD KEEPER"),
|
||||
_("BLACK BELT"),
|
||||
_("RIVAL"),
|
||||
_("SCIENTIST"),
|
||||
_("BOSS"),
|
||||
_("LEADER"),
|
||||
_("TEAM ROCKET"),
|
||||
_("COOLTRAINER"),
|
||||
_("ELITE FOUR"),
|
||||
_("GENTLEMAN"),
|
||||
_("RIVAL"),
|
||||
_("CHAMPION"),
|
||||
_("CHANNELER"),
|
||||
_("TWINS"),
|
||||
_("COOL COUPLE"),
|
||||
_("YOUNG COUPLE"),
|
||||
_("CRUSH KIN"),
|
||||
_("SIS AND BRO"),
|
||||
_("{PKMN} PROF."),
|
||||
_("PLAYER"),
|
||||
_("CRUSH GIRL"),
|
||||
_("TUBER"),
|
||||
_("{PKMN} BREEDER"),
|
||||
_("{PKMN} RANGER"),
|
||||
_("AROMA LADY"),
|
||||
_("RUIN MANIAC"),
|
||||
_("LADY"),
|
||||
_("PAINTER"),
|
||||
};
|
||||
@@ -0,0 +1,91 @@
|
||||
|
||||
static const union AnimCmd sAnimCmd_Red_1[] = {
|
||||
ANIMCMD_FRAME(1, 20),
|
||||
ANIMCMD_FRAME(2, 6),
|
||||
ANIMCMD_FRAME(3, 6),
|
||||
ANIMCMD_FRAME(4, 24),
|
||||
ANIMCMD_FRAME(0, 1),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd sAnimCmd_Leaf_1[] = {
|
||||
ANIMCMD_FRAME(1, 20),
|
||||
ANIMCMD_FRAME(2, 6),
|
||||
ANIMCMD_FRAME(3, 6),
|
||||
ANIMCMD_FRAME(4, 24),
|
||||
ANIMCMD_FRAME(0, 1),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd sAnimCmd_PokeDude_1[] = {
|
||||
ANIMCMD_FRAME(1, 24),
|
||||
ANIMCMD_FRAME(2, 9),
|
||||
ANIMCMD_FRAME(3, 24),
|
||||
ANIMCMD_FRAME(0, 9),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd sAnimCmd_OldMan_1[] = {
|
||||
ANIMCMD_FRAME(1, 24),
|
||||
ANIMCMD_FRAME(2, 9),
|
||||
ANIMCMD_FRAME(3, 24),
|
||||
ANIMCMD_FRAME(0, 9),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd sAnimCmd_RSBrendan_1[] = {
|
||||
ANIMCMD_FRAME(0, 24),
|
||||
ANIMCMD_FRAME(1, 9),
|
||||
ANIMCMD_FRAME(2, 24),
|
||||
ANIMCMD_FRAME(0, 9),
|
||||
ANIMCMD_FRAME(3, 50),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd sAnimCmd_RSMay_1[] = {
|
||||
ANIMCMD_FRAME(0, 24),
|
||||
ANIMCMD_FRAME(1, 9),
|
||||
ANIMCMD_FRAME(2, 24),
|
||||
ANIMCMD_FRAME(0, 9),
|
||||
ANIMCMD_FRAME(3, 50),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
const union AnimCmd *const sBackAnims_Red[] = {
|
||||
sAnim_GeneralFrame0,
|
||||
sAnimCmd_Red_1
|
||||
};
|
||||
|
||||
const union AnimCmd *const sBackAnims_Leaf[] = {
|
||||
sAnim_GeneralFrame0,
|
||||
sAnimCmd_Leaf_1
|
||||
};
|
||||
|
||||
const union AnimCmd *const sBackAnims_PokeDude[] = {
|
||||
sAnim_GeneralFrame0,
|
||||
sAnimCmd_PokeDude_1
|
||||
};
|
||||
|
||||
const union AnimCmd *const sBackAnims_OldMan[] = {
|
||||
sAnim_GeneralFrame0,
|
||||
sAnimCmd_OldMan_1
|
||||
};
|
||||
|
||||
const union AnimCmd *const sBackAnims_RSBrendan[] = {
|
||||
sAnim_GeneralFrame3,
|
||||
sAnimCmd_RSBrendan_1
|
||||
};
|
||||
|
||||
const union AnimCmd *const sBackAnims_RSMay[] = {
|
||||
sAnim_GeneralFrame3,
|
||||
sAnimCmd_RSMay_1
|
||||
};
|
||||
|
||||
const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] = {
|
||||
sBackAnims_Red,
|
||||
sBackAnims_Leaf,
|
||||
sBackAnims_RSBrendan,
|
||||
sBackAnims_RSMay,
|
||||
sBackAnims_PokeDude,
|
||||
sBackAnims_OldMan
|
||||
};
|
||||
@@ -0,0 +1,27 @@
|
||||
const struct MonCoords gTrainerBackPicCoords[] = {
|
||||
{.size = 8, .y_offset = 5},
|
||||
{.size = 8, .y_offset = 5},
|
||||
{.size = 8, .y_offset = 4},
|
||||
{.size = 8, .y_offset = 4},
|
||||
{.size = 8, .y_offset = 4},
|
||||
{.size = 8, .y_offset = 4}
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gTrainerBackPicTable[] = {
|
||||
{ (const u32 *)gTrainerBackPic_Red, 0x2800, 0 },
|
||||
{ (const u32 *)gTrainerBackPic_Leaf, 0x2800, 1 },
|
||||
{ (const u32 *)gTrainerBackPic_RSBrendan, 0x2000, 2 },
|
||||
{ (const u32 *)gTrainerBackPic_RSMay, 0x2000, 3 },
|
||||
{ (const u32 *)gTrainerBackPic_PokeDude, 0x2000, 4 },
|
||||
{ (const u32 *)gTrainerBackPic_OldMan, 0x2000, 5 }
|
||||
};
|
||||
|
||||
const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = {
|
||||
{ gTrainerPalette_RedBackPic, 0 },
|
||||
{ gTrainerPalette_LeafBackPic, 1 },
|
||||
{ gTrainerPalette_RSBrendan1, 2 },
|
||||
{ gTrainerPalette_RSMay1, 3 },
|
||||
{ gTrainerPalette_PokeDudeBackPic, 4 },
|
||||
{ gTrainerPalette_OldManBackPic, 5 }
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user