diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 7 | ||||
| -rw-r--r-- | data/graphics/trainers/front_pic_palette_table.s | 4 | ||||
| -rw-r--r-- | data/graphics/trainers/front_pic_table.s | 4 | ||||
| -rw-r--r-- | data/graphics/trainers/graphics.s | 16 | ||||
| -rw-r--r-- | data/text/trainer_class_names.s | 4 | ||||
| -rw-r--r-- | data/trainer_class_index_tables.s | 157 |
6 files changed, 173 insertions, 19 deletions
diff --git a/data/data2.s b/data/data2.s index e7ffa7f28..06f57bf7b 100644 --- a/data/data2.s +++ b/data/data2.s @@ -635,11 +635,8 @@ gUnknown_081FC1D0: ; 81FC1D0 ; 81FD0F0 .include "data/tm_hm_learnsets.s" -gUnknown_081FDDD0: ; 81FDDD0 - .incbin "baserom.gba", 0x001fddd0, 0x4d - -gUnknown_081FDE1D: ; 81FDE1D - .incbin "baserom.gba", 0x001fde1d, 0x4d +; 81FDDD0 + .include "data/trainer_class_index_tables.s" gUnknown_081FDE6A: ; 81FDE6A .incbin "baserom.gba", 0x001fde6a, 0x10e diff --git a/data/graphics/trainers/front_pic_palette_table.s b/data/graphics/trainers/front_pic_palette_table.s index 8a8ed2eac..c8dae1c75 100644 --- a/data/graphics/trainers/front_pic_palette_table.s +++ b/data/graphics/trainers/front_pic_palette_table.s @@ -37,7 +37,7 @@ gTrainerFrontPicPaletteTable: ; 81EC7D4 obj_pal gTrainerPalette_BattleGirl, 33 obj_pal gTrainerPalette_CyclingTriathleteF, 34 obj_pal gTrainerPalette_SwimmerM, 35 - obj_pal gTrainerPalette_WinstrateF, 36 + obj_pal gTrainerPalette_PokefanF, 36 obj_pal gTrainerPalette_ExpertM, 37 obj_pal gTrainerPalette_ExpertF, 38 obj_pal gTrainerPalette_SwimmingTriathleteM, 39 @@ -65,7 +65,7 @@ gTrainerFrontPicPaletteTable: ; 81EC7D4 obj_pal gTrainerPalette_PsychicM, 61 obj_pal gTrainerPalette_PsychicF, 62 obj_pal gTrainerPalette_SchoolKidF, 63 - obj_pal gTrainerPalette_WinstrateM, 64 + obj_pal gTrainerPalette_PokefanM, 64 obj_pal gTrainerPalette_SisAndBro, 65 obj_pal gTrainerPalette_OldCouple, 66 obj_pal gTrainerPalette_AquaAdminM, 67 diff --git a/data/graphics/trainers/front_pic_table.s b/data/graphics/trainers/front_pic_table.s index e91a072dd..03c9ef3e3 100644 --- a/data/graphics/trainers/front_pic_table.s +++ b/data/graphics/trainers/front_pic_table.s @@ -37,7 +37,7 @@ gTrainerFrontPicTable: ; 81EC53C obj_tiles gTrainerFrontPic_BattleGirl, 0x1000, 33 obj_tiles gTrainerFrontPic_CyclingTriathleteF, 0x800, 34 obj_tiles gTrainerFrontPic_SwimmerM, 0x800, 35 - obj_tiles gTrainerFrontPic_WinstrateF, 0x800, 36 + obj_tiles gTrainerFrontPic_PokefanF, 0x800, 36 obj_tiles gTrainerFrontPic_ExpertM, 0x800, 37 obj_tiles gTrainerFrontPic_ExpertF, 0x800, 38 obj_tiles gTrainerFrontPic_SwimmingTriathleteM, 0x800, 39 @@ -65,7 +65,7 @@ gTrainerFrontPicTable: ; 81EC53C obj_tiles gTrainerFrontPic_PsychicM, 0x800, 61 obj_tiles gTrainerFrontPic_PsychicF, 0x800, 62 obj_tiles gTrainerFrontPic_SchoolKidF, 0x800, 63 - obj_tiles gTrainerFrontPic_WinstrateM, 0x1000, 64 + obj_tiles gTrainerFrontPic_PokefanM, 0x1000, 64 obj_tiles gTrainerFrontPic_SisAndBro, 0x800, 65 obj_tiles gTrainerFrontPic_OldCouple, 0x800, 66 obj_tiles gTrainerFrontPic_AquaAdminM, 0x800, 67 diff --git a/data/graphics/trainers/graphics.s b/data/graphics/trainers/graphics.s index 43fdce762..b33194e10 100644 --- a/data/graphics/trainers/graphics.s +++ b/data/graphics/trainers/graphics.s @@ -180,8 +180,8 @@ gTrainerFrontPic_SwimmerM: ; 8E500C8 .align 2 -gTrainerFrontPic_WinstrateF: ; 8E50388 - .incbin "graphics/trainers/winstrate_f/front.4bpp.lz" +gTrainerFrontPic_PokefanF: ; 8E50388 + .incbin "graphics/trainers/pokefan_f/front.4bpp.lz" .align 2 @@ -320,8 +320,8 @@ gTrainerFrontPic_SchoolKidF: ; 8E55CE4 .align 2 -gTrainerFrontPic_WinstrateM: ; 8E55F80 - .incbin "graphics/trainers/winstrate_m/front.4bpp.lz" +gTrainerFrontPic_PokefanM: ; 8E55F80 + .incbin "graphics/trainers/pokefan_m/front.4bpp.lz" .align 2 @@ -550,8 +550,8 @@ gTrainerPalette_SwimmerM: ; 8E5A550 .align 2 -gTrainerPalette_WinstrateF: ; 8E5A578 - .incbin "graphics/trainers/winstrate_f/palette.gbapal.lz" +gTrainerPalette_PokefanF: ; 8E5A578 + .incbin "graphics/trainers/pokefan_f/palette.gbapal.lz" .align 2 @@ -690,8 +690,8 @@ gTrainerPalette_SchoolKidF: ; 8E5A9B0 .align 2 -gTrainerPalette_WinstrateM: ; 8E5A9D8 - .incbin "graphics/trainers/winstrate_m/palette.gbapal.lz" +gTrainerPalette_PokefanM: ; 8E5A9D8 + .incbin "graphics/trainers/pokefan_m/palette.gbapal.lz" .align 2 diff --git a/data/text/trainer_class_names.s b/data/text/trainer_class_names.s index 68f8545b3..bec24bcf5 100644 --- a/data/text/trainer_class_names.s +++ b/data/text/trainer_class_names.s @@ -7,8 +7,8 @@ gTrainerClassNames: ; 81F0208 .charmapstr "AROMA LADY$", 13 .charmapstr "RUIN MANIAC$", 13 .charmapstr "INTERVIEWER$", 13 - .charmapstr "TUBER$", 13 - .charmapstr "TUBER$", 13 + .charmapstr "TUBER$", 13 ; うきわガール (Inner Tube Girl) in Japanese + .charmapstr "TUBER$", 13 ; うきわボーイ (Inner Tube Boy) in Japanese .charmapstr "COOLTRAINER$", 13 .charmapstr "HEX MANIAC$", 13 .charmapstr "LADY$", 13 diff --git a/data/trainer_class_index_tables.s b/data/trainer_class_index_tables.s new file mode 100644 index 000000000..f0edf1226 --- /dev/null +++ b/data/trainer_class_index_tables.s @@ -0,0 +1,157 @@ +gTrainerClassToPicIndex: ; 81FDDD0 + .byte TRAINER_PIC_ARCHIE ; AQUA_LEADER + .byte TRAINER_PIC_AQUA_GRUNT_M ; TEAM_AQUA_M + .byte TRAINER_PIC_AQUA_GRUNT_F ; TEAM_AQUA_F + .byte TRAINER_PIC_AROMA_LADY ; AROMA_LADY + .byte TRAINER_PIC_RUIN_MANIAC ; RUIN_MANIAC + .byte TRAINER_PIC_INTERVIEWER ; INTERVIEWER + .byte TRAINER_PIC_TUBER_F ; TUBER_F + .byte TRAINER_PIC_TUBER_M ; TUBER_M + .byte TRAINER_PIC_COOL_TRAINER_M ; COOL_TRAINER_M + .byte TRAINER_PIC_COOL_TRAINER_F ; COOL_TRAINER_F + .byte TRAINER_PIC_HEX_MANIAC ; HEX_MANIAC + .byte TRAINER_PIC_LADY ; LADY + .byte TRAINER_PIC_BEAUTY ; BEAUTY + .byte TRAINER_PIC_RICH_BOY ; RICH_BOY + .byte TRAINER_PIC_POKEMANIAC ; POKEMANIAC + .byte TRAINER_PIC_SWIMMER_M ; SWIMMER_M + .byte TRAINER_PIC_BLACK_BELT ; BLACK_BELT + .byte TRAINER_PIC_GUITARIST ; GUITARIST + .byte TRAINER_PIC_KINDLER ; KINDLER + .byte TRAINER_PIC_CAMPER ; CAMPER + .byte TRAINER_PIC_BUG_MANIAC ; BUG_MANIAC + .byte TRAINER_PIC_PSYCHIC_M ; PSYCHIC_M + .byte TRAINER_PIC_PSYCHIC_F ; PSYCHIC_F + .byte TRAINER_PIC_GENTLEMAN ; GENTLEMAN + .byte TRAINER_PIC_SIDNEY ; ELITE_FOUR_M + .byte TRAINER_PIC_PHOEBE ; ELITE_FOUR_F + .byte TRAINER_PIC_ROXANNE ; LEADER_F + .byte TRAINER_PIC_BRAWLY ; LEADER_M + .byte TRAINER_PIC_TATE_AND_LIZA ; LEADER_MF + .byte TRAINER_PIC_SCHOOL_KID_M ; SCHOOL_KID_M + .byte TRAINER_PIC_SCHOOL_KID_F ; SCHOOL_KID_F + .byte TRAINER_PIC_SR_AND_JR ; SR_AND_JR + .byte TRAINER_PIC_POKEFAN_M ; POKEFAN_M + .byte TRAINER_PIC_POKEFAN_F ; POKEFAN_F + .byte TRAINER_PIC_EXPERT_M ; EXPERT_M + .byte TRAINER_PIC_EXPERT_F ; EXPERT_F + .byte TRAINER_PIC_YOUNGSTER ; YOUNGSTER + .byte TRAINER_PIC_STEVEN ; CHAMPION + .byte TRAINER_PIC_FISHERMAN ; FISHERMAN + .byte TRAINER_PIC_CYCLING_TRIATHLETE_M ; CYCLING_TRIATHLETE_M + .byte TRAINER_PIC_CYCLING_TRIATHLETE_F ; CYCLING_TRIATHLETE_F + .byte TRAINER_PIC_RUNNING_TRIATHLETE_M ; RUNNING_TRIATHLETE_M + .byte TRAINER_PIC_RUNNING_TRIATHLETE_F ; RUNNING_TRIATHLETE_F + .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M ; SWIMMING_TRIATHLETE_M + .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F ; SWIMMING_TRIATHLETE_F + .byte TRAINER_PIC_DRAGON_TAMER ; DRAGON_TAMER + .byte TRAINER_PIC_BIRD_KEEPER ; BIRD_KEEPER + .byte TRAINER_PIC_NINJA_BOY ; NINJA_BOY + .byte TRAINER_PIC_BATTLE_GIRL ; BATTLE_GIRL + .byte TRAINER_PIC_PARASOL_LADY ; PARASOL_LADY + .byte TRAINER_PIC_SWIMMER_F ; SWIMMER_F + .byte TRAINER_PIC_PICNICKER ; PICNICKER + .byte TRAINER_PIC_TWINS ; TWINS + .byte TRAINER_PIC_SAILOR ; SAILOR + .byte TRAINER_PIC_YOUNGSTER ; BOARDER_1 + .byte TRAINER_PIC_YOUNGSTER ; BOARDER_2 + .byte TRAINER_PIC_COLLECTOR ; COLLECTOR + .byte TRAINER_PIC_WALLY ; WALLY + .byte TRAINER_PIC_BRENDAN ; BRENDAN_1 + .byte TRAINER_PIC_BRENDAN ; BRENDAN_2 + .byte TRAINER_PIC_BRENDAN ; BRENDAN_3 + .byte TRAINER_PIC_MAY ; MAY_1 + .byte TRAINER_PIC_MAY ; MAY_2 + .byte TRAINER_PIC_MAY ; MAY_3 + .byte TRAINER_PIC_POKEMON_BREEDER_M ; POKEMON_BREEDER_M + .byte TRAINER_PIC_POKEMON_BREEDER_F ; POKEMON_BREEDER_F + .byte TRAINER_PIC_POKEMON_RANGER_M ; POKEMON_RANGER_M + .byte TRAINER_PIC_POKEMON_RANGER_F ; POKEMON_RANGER_F + .byte TRAINER_PIC_MAXIE ; MAGMA_LEADER + .byte TRAINER_PIC_MAGMA_GRUNT_M ; TEAM_MAGMA_M + .byte TRAINER_PIC_MAGMA_GRUNT_F ; TEAM_MAGMA_F + .byte TRAINER_PIC_LASS ; LASS + .byte TRAINER_PIC_BUG_CATCHER ; BUG_CATCHER + .byte TRAINER_PIC_HIKER ; HIKER + .byte TRAINER_PIC_YOUNG_COUPLE ; YOUNG_COUPLE + .byte TRAINER_PIC_OLD_COUPLE ; OLD_COUPLE + .byte TRAINER_PIC_SIS_AND_BRO ; SIS_AND_BRO + +gTrainerClassToNameIndex: ; 81FDE1D + .byte TRAINER_CLASS_NAME_AQUA_LEADER ; AQUA_LEADER + .byte TRAINER_CLASS_NAME_TEAM_AQUA ; TEAM_AQUA_M + .byte TRAINER_CLASS_NAME_TEAM_AQUA ; TEAM_AQUA_F + .byte TRAINER_CLASS_NAME_AROMA_LADY ; AROMA_LADY + .byte TRAINER_CLASS_NAME_RUIN_MANIAC ; RUIN_MANIAC + .byte TRAINER_CLASS_NAME_INTERVIEWER ; INTERVIEWER + .byte TRAINER_CLASS_NAME_TUBER_F ; TUBER_F + .byte TRAINER_CLASS_NAME_TUBER_M ; TUBER_M + .byte TRAINER_CLASS_NAME_COOL_TRAINER ; COOL_TRAINER_M + .byte TRAINER_CLASS_NAME_COOL_TRAINER ; COOL_TRAINER_F + .byte TRAINER_CLASS_NAME_HEX_MANIAC ; HEX_MANIAC + .byte TRAINER_CLASS_NAME_LADY ; LADY + .byte TRAINER_CLASS_NAME_BEAUTY ; BEAUTY + .byte TRAINER_CLASS_NAME_RICH_BOY ; RICH_BOY + .byte TRAINER_CLASS_NAME_POKEMANIAC ; POKEMANIAC + .byte TRAINER_CLASS_NAME_SWIMMER_M ; SWIMMER_M + .byte TRAINER_CLASS_NAME_BLACK_BELT ; BLACK_BELT + .byte TRAINER_CLASS_NAME_GUITARIST ; GUITARIST + .byte TRAINER_CLASS_NAME_KINDLER ; KINDLER + .byte TRAINER_CLASS_NAME_CAMPER ; CAMPER + .byte TRAINER_CLASS_NAME_BUG_MANIAC ; BUG_MANIAC + .byte TRAINER_CLASS_NAME_PSYCHIC ; PSYCHIC_M + .byte TRAINER_CLASS_NAME_PSYCHIC ; PSYCHIC_F + .byte TRAINER_CLASS_NAME_GENTLEMAN ; GENTLEMAN + .byte TRAINER_CLASS_NAME_ELITE_FOUR ; ELITE_FOUR_M + .byte TRAINER_CLASS_NAME_ELITE_FOUR ; ELITE_FOUR_F + .byte TRAINER_CLASS_NAME_LEADER ; LEADER_F + .byte TRAINER_CLASS_NAME_LEADER ; LEADER_M + .byte TRAINER_CLASS_NAME_LEADER ; LEADER_MF + .byte TRAINER_CLASS_NAME_SCHOOL_KID ; SCHOOL_KID_M + .byte TRAINER_CLASS_NAME_SCHOOL_KID ; SCHOOL_KID_F + .byte TRAINER_CLASS_NAME_SR_AND_JR ; SR_AND_JR + .byte TRAINER_CLASS_NAME_POKEFAN ; POKEFAN_M + .byte TRAINER_CLASS_NAME_POKEFAN ; POKEFAN_F + .byte TRAINER_CLASS_NAME_EXPERT ; EXPERT_M + .byte TRAINER_CLASS_NAME_EXPERT ; EXPERT_F + .byte TRAINER_CLASS_NAME_YOUNGSTER ; YOUNGSTER + .byte TRAINER_CLASS_NAME_CHAMPION ; CHAMPION + .byte TRAINER_CLASS_NAME_FISHERMAN ; FISHERMAN + .byte TRAINER_CLASS_NAME_TRIATHLETE ; CYCLING_TRIATHLETE_M + .byte TRAINER_CLASS_NAME_TRIATHLETE ; CYCLING_TRIATHLETE_F + .byte TRAINER_CLASS_NAME_TRIATHLETE ; RUNNING_TRIATHLETE_M + .byte TRAINER_CLASS_NAME_TRIATHLETE ; RUNNING_TRIATHLETE_F + .byte TRAINER_CLASS_NAME_TRIATHLETE ; SWIMMING_TRIATHLETE_M + .byte TRAINER_CLASS_NAME_TRIATHLETE ; SWIMMING_TRIATHLETE_F + .byte TRAINER_CLASS_NAME_DRAGON_TAMER ; DRAGON_TAMER + .byte TRAINER_CLASS_NAME_BIRD_KEEPER ; BIRD_KEEPER + .byte TRAINER_CLASS_NAME_NINJA_BOY ; NINJA_BOY + .byte TRAINER_CLASS_NAME_BATTLE_GIRL ; BATTLE_GIRL + .byte TRAINER_CLASS_NAME_PARASOL_LADY ; PARASOL_LADY + .byte TRAINER_CLASS_NAME_SWIMMER_F ; SWIMMER_F + .byte TRAINER_CLASS_NAME_PICNICKER ; PICNICKER + .byte TRAINER_CLASS_NAME_TWINS ; TWINS + .byte TRAINER_CLASS_NAME_SAILOR ; SAILOR + .byte TRAINER_CLASS_NAME_BOARDER ; BOARDER_1 + .byte TRAINER_CLASS_NAME_BOARDER ; BOARDER_2 + .byte TRAINER_CLASS_NAME_COLLECTOR ; COLLECTOR + .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; WALLY + .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; BRENDAN_1 + .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; BRENDAN_2 + .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; BRENDAN_3 + .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; MAY_1 + .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; MAY_2 + .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 ; MAY_3 + .byte TRAINER_CLASS_NAME_POKEMON_BREEDER ; POKEMON_BREEDER_M + .byte TRAINER_CLASS_NAME_POKEMON_BREEDER ; POKEMON_BREEDER_F + .byte TRAINER_CLASS_NAME_POKEMON_RANGER ; POKEMON_RANGER_M + .byte TRAINER_CLASS_NAME_POKEMON_RANGER ; POKEMON_RANGER_F + .byte TRAINER_CLASS_NAME_MAGMA_LEADER ; MAGMA_LEADER + .byte TRAINER_CLASS_NAME_TEAM_MAGMA ; TEAM_MAGMA_M + .byte TRAINER_CLASS_NAME_TEAM_MAGMA ; TEAM_MAGMA_F + .byte TRAINER_CLASS_NAME_LASS ; LASS + .byte TRAINER_CLASS_NAME_BUG_CATCHER ; BUG_CATCHER + .byte TRAINER_CLASS_NAME_HIKER ; HIKER + .byte TRAINER_CLASS_NAME_YOUNG_COUPLE ; YOUNG_COUPLE + .byte TRAINER_CLASS_NAME_OLD_COUPLE ; OLD_COUPLE + .byte TRAINER_CLASS_NAME_SIS_AND_BRO ; SIS_AND_BRO |