diff options
| -rw-r--r-- | asm/battle_message.s | 4 | ||||
| -rw-r--r-- | asm/link_rfu_3.s | 4 | ||||
| -rw-r--r-- | data/data.s | 5 | ||||
| -rw-r--r-- | data/text/trainer_class_names.inc | 107 |
4 files changed, 114 insertions, 6 deletions
diff --git a/asm/battle_message.s b/asm/battle_message.s index 9a9ca1f2f..dcd4b41e4 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -1726,12 +1726,12 @@ _080D8084: movs r0, 0xD _080D8094: muls r1, r0 - ldr r0, _080D80A0 @ =gUnknown_823E558 + ldr r0, _080D80A0 @ =gTrainerClassNames adds r4, r1, r0 b _080D8382 .align 2, 0 _080D809C: .4byte gTrainers -_080D80A0: .4byte gUnknown_823E558 +_080D80A0: .4byte gTrainerClassNames _080D80A4: ldr r0, _080D80E8 @ =gTrainerBattleOpponent_A ldrh r2, [r0] diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index f4e12b60f..1cdc807b3 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -10960,7 +10960,7 @@ sub_811B31C: @ 811B31C lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _0811B4B4 @ =gUnknown_823E558 + ldr r0, _0811B4B4 @ =gTrainerClassNames adds r1, r0 adds r0, r6, 0 bl StringCopy @@ -11109,7 +11109,7 @@ _0811B45E: b _0811B4F0 .align 2, 0 _0811B4B0: .4byte gUnknown_2039624 -_0811B4B4: .4byte gUnknown_823E558 +_0811B4B4: .4byte gTrainerClassNames _0811B4B8: .4byte gUnknown_84594B0 _0811B4BC: .4byte gUnknown_84594C4 _0811B4C0: .4byte gStringVar4 diff --git a/data/data.s b/data/data.s index 7f2b474aa..16dc5b93c 100644 --- a/data/data.s +++ b/data/data.s @@ -115,9 +115,10 @@ gUnknown_8239FD4:: @ 8239FD4 gUnknown_823A004:: @ 823A004 .incbin "baserom.gba", 0x23A004, 0x4554 -gUnknown_823E558:: @ 823E558 - .incbin "baserom.gba", 0x23E558, 0x570 +gTrainerClassNames:: @ 823E558 + .include "data/text/trainer_class_names.inc" + .align 2, 0 gTrainers:: @ 823EAD8 .incbin "baserom.gba", 0x23EAC8, 0x7418 diff --git a/data/text/trainer_class_names.inc b/data/text/trainer_class_names.inc new file mode 100644 index 000000000..29194851d --- /dev/null +++ b/data/text/trainer_class_names.inc @@ -0,0 +1,107 @@ + .string "{PKMN} TRAINER$ " + .string "{PKMN} TRAINER$ " + .string "AQUA LEADER$ " + .string "TEAM AQUA$ " + .string "AROMA LADY$ " + .string "RUIN MANIAC$ " + .string "INTERVIEWER$ " + .string "TUBER$ " + .string "TUBER$ " + .string "COOLTRAINER$ " + .string "HEX MANIAC$ " + .string "LADY$ " + .string "BEAUTY$ " + .string "RICH BOY$ " + .string "POKéMANIAC$ " + .string "SWIMMER♂$ " + .string "BLACK BELT$ " + .string "GUITARIST$ " + .string "KINDLER$ " + .string "CAMPER$ " + .string "BUG MANIAC$ " + .string "PSYCHIC$ " + .string "GENTLEMAN$ " + .string "ELITE FOUR$ " + .string "LEADER$ " + .string "SCHOOL KID$ " + .string "SR. AND JR.$ " + .string "POKéFAN$ " + .string "EXPERT$ " + .string "YOUNGSTER$ " + .string "CHAMPION$ " + .string "FISHERMAN$ " + .string "TRIATHLETE$ " + .string "DRAGON TAMER$" + .string "BIRD KEEPER$ " + .string "NINJA BOY$ " + .string "BATTLE GIRL$ " + .string "PARASOL LADY$" + .string "SWIMMER♀$ " + .string "PICNICKER$ " + .string "TWINS$ " + .string "SAILOR$ " + .string "BOARDER$ " + .string "COLLECTOR$ " + .string "{PKMN} TRAINER$ " + .string "{PKMN} BREEDER$ " + .string "{PKMN} RANGER$ " + .string "MAGMA LEADER$" + .string "TEAM MAGMA$ " + .string "LASS$ " + .string "BUG CATCHER$ " + .string "HIKER$ " + .string "YOUNG COUPLE$" + .string "OLD COUPLE$ " + .string "SIS AND BRO$ " + .string "AQUA ADMIN$ " + .string "MAGMA ADMIN$ " + .string "YOUNGSTER$ " + .string "BUG CATCHER$ " + .string "LASS$ " + .string "SAILOR$ " + .string "CAMPER$ " + .string "PICNICKER$ " + .string "POKéMANIAC$ " + .string "SUPER NERD$ " + .string "HIKER$ " + .string "BIKER$ " + .string "BURGLAR$ " + .string "ENGINEER$ " + .string "FISHERMAN$ " + .string "SWIMMER♂$ " + .string "CUE BALL$ " + .string "GAMER$ " + .string "BEAUTY$ " + .string "SWIMMER♀$ " + .string "PSYCHIC$ " + .string "ROCKER$ " + .string "JUGGLER$ " + .string "TAMER$ " + .string "BIRD KEEPER$ " + .string "BLACK BELT$ " + .string "RIVAL$ " + .string "SCIENTIST$ " + .string "BOSS$ " + .string "LEADER$ " + .string "TEAM ROCKET$ " + .string "COOLTRAINER$ " + .string "ELITE FOUR$ " + .string "GENTLEMAN$ " + .string "RIVAL$ " + .string "CHAMPION$ " + .string "CHANNELER$ " + .string "TWINS$ " + .string "COOL COUPLE$ " + .string "YOUNG COUPLE$" + .string "CRUSH KIN$ " + .string "SIS AND BRO$ " + .string "{PKMN} PROF.$ " + .string "PLAYER$ " + .string "CRUSH GIRL$ " + .string "TUBER$ " + .string "{PKMN} BREEDER$ " + .string "{PKMN} RANGER$ " + .string "AROMA LADY$ " + .string "RUIN MANIAC$ " + .string "LADY$ " + .string "PAINTER$ " |