diff options
| -rw-r--r-- | asm/charmap.s | 2 | ||||
| -rw-r--r-- | asm/emerald.s | 12 | ||||
| -rw-r--r-- | data/data2.s | 10 | ||||
| -rw-r--r-- | data/text/trainer_class_names.s | 67 |
4 files changed, 81 insertions, 10 deletions
diff --git a/asm/charmap.s b/asm/charmap.s index 8c703aef1..7ab496501 100644 --- a/asm/charmap.s +++ b/asm/charmap.s @@ -79,3 +79,5 @@ .charmap "y", 0xED .charmap "z", 0xEE .charmap "$", 0xFF + + .charmapconst PKMN, 0x53, 0x54 diff --git a/asm/emerald.s b/asm/emerald.s index ba4624aff..8a9a705a2 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -30595,7 +30595,7 @@ sub_8018220: ; 8018220 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, =gUnknown_0830FCD4 + ldr r0, =gTrainerClassNames adds r1, r0 adds r0, r6, 0 bl gf_strcpy @@ -198261,7 +198261,7 @@ sub_806F07C: ; 806F07C ldrb r1, [r0, 0x1] movs r0, 0xD muls r0, r1 - ldr r1, =gUnknown_0830FCD4 + ldr r1, =gTrainerClassNames adds r0, r1 pop {r1} bx r1 @@ -645515,7 +645515,7 @@ sub_814E764: ; 814E764 movs r1, 0xD @0814F5A2: muls r1, r0 - ldr r0, =gUnknown_0830FCD4 + ldr r0, =gTrainerClassNames adds r4, r1, r0 b @0814F5C0 .align 2, 0 @@ -776594,7 +776594,7 @@ sub_81924E0: ; 81924E0 lsls r0, 24 lsrs r5, r0, 24 @081927A2: - ldr r2, =gUnknown_0830FCD4 + ldr r2, =gTrainerClassNames movs r0, 0xD adds r1, r5, 0 muls r1, r0 @@ -887220,7 +887220,7 @@ sub_81CB050: ; 81CB050 ldrb r2, [r1, 0x1] movs r0, 0xD muls r0, r2 - ldr r2, =gUnknown_0830FCD4 + ldr r2, =gTrainerClassNames adds r0, r2 str r0, [sp] adds r1, 0x4 @@ -901020,7 +901020,7 @@ sub_81D1B0C: ; 81D1B0C ldrb r2, [r1, 0x1] movs r0, 0xD muls r0, r2 - ldr r2, =gUnknown_0830FCD4 + ldr r2, =gTrainerClassNames adds r0, r2 str r0, [r4] adds r1, 0x4 diff --git a/data/data2.s b/data/data2.s index c59eb8c9b..dca57af76 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1420,8 +1420,10 @@ gUnknown_08309AAC: ; 8309AAC gUnknown_0830A18C: ; 830A18C .incbin "base_emerald.gba", 0x30a18c, 0x5b48 -gUnknown_0830FCD4: ; 830FCD4 - .incbin "base_emerald.gba", 0x30fcd4, 0x35c +; 830FCD4 + .include "data/text/trainer_class_names.s" + + .align 2, 0 gUnknown_08310030: ; 8310030 .incbin "base_emerald.gba", 0x310030, 0x4 @@ -1438,10 +1440,10 @@ gUnknown_08317DD4: ; 8317DD4 gUnknown_08317E24: ; 8317E24 .incbin "base_emerald.gba", 0x317e24, 0x7a4 -gSpeciesNames: ; 83185C8 +; 83185C8 .include "data/text/species_names.s" -gMoveNames: ; 831977C +; 831977C .include "data/text/move_names.s" .incbin "base_emerald.gba", 0x31a983, 0x4d diff --git a/data/text/trainer_class_names.s b/data/text/trainer_class_names.s new file mode 100644 index 000000000..c0cca7d6e --- /dev/null +++ b/data/text/trainer_class_names.s @@ -0,0 +1,67 @@ +gTrainerClassNames: ; 830FCD4 + .charmapstr "{PKMN} TRAINER$", 13 + .charmapstr "{PKMN} TRAINER$", 13 + .charmapstr "HIKER$", 13 + .charmapstr "TEAM AQUA$", 13 + .charmapstr "{PKMN} BREEDER$", 13 + .charmapstr "COOLTRAINER$", 13 + .charmapstr "BIRD KEEPER$", 13 + .charmapstr "COLLECTOR$", 13 + .charmapstr "SWIMMER♂$", 13 + .charmapstr "TEAM MAGMA$", 13 + .charmapstr "EXPERT$", 13 + .charmapstr "AQUA ADMIN$", 13 + .charmapstr "BLACK BELT$", 13 + .charmapstr "AQUA LEADER$", 13 + .charmapstr "HEX MANIAC$", 13 + .charmapstr "AROMA LADY$", 13 + .charmapstr "RUIN MANIAC$", 13 + .charmapstr "INTERVIEWER$", 13 + .charmapstr "TUBER$", 13 + .charmapstr "TUBER$", 13 + .charmapstr "LADY$", 13 + .charmapstr "BEAUTY$", 13 + .charmapstr "RICH BOY$", 13 + .charmapstr "POKéMANIAC$", 13 + .charmapstr "GUITARIST$", 13 + .charmapstr "KINDLER$", 13 + .charmapstr "CAMPER$", 13 + .charmapstr "PICNICKER$", 13 + .charmapstr "BUG MANIAC$", 13 + .charmapstr "PSYCHIC$", 13 + .charmapstr "GENTLEMAN$", 13 + .charmapstr "ELITE FOUR$", 13 + .charmapstr "LEADER$", 13 + .charmapstr "SCHOOL KID$", 13 + .charmapstr "SR. AND JR.$", 13 + .charmapstr "WINSTRATE$", 13 + .charmapstr "POKéFAN$", 13 + .charmapstr "YOUNGSTER$", 13 + .charmapstr "CHAMPION$", 13 + .charmapstr "FISHERMAN$", 13 + .charmapstr "TRIATHLETE$", 13 + .charmapstr "DRAGON TAMER$", 13 + .charmapstr "NINJA BOY$", 13 + .charmapstr "BATTLE GIRL$", 13 + .charmapstr "PARASOL LADY$", 13 + .charmapstr "SWIMMER♀$", 13 + .charmapstr "TWINS$", 13 + .charmapstr "SAILOR$", 13 + .charmapstr "COOLTRAINER$", 13 + .charmapstr "MAGMA ADMIN$", 13 + .charmapstr "{PKMN} TRAINER$", 13 + .charmapstr "BUG CATCHER$", 13 + .charmapstr "{PKMN} RANGER$", 13 + .charmapstr "MAGMA LEADER$", 13 + .charmapstr "LASS$", 13 + .charmapstr "YOUNG COUPLE$", 13 + .charmapstr "OLD COUPLE$", 13 + .charmapstr "SIS AND BRO$", 13 + .charmapstr "SALON MAIDEN$", 13 + .charmapstr "DOME ACE$", 13 + .charmapstr "PALACE MAVEN$", 13 + .charmapstr "ARENA TYCOON$", 13 + .charmapstr "FACTORY HEAD$", 13 + .charmapstr "PIKE QUEEN$", 13 + .charmapstr "PYRAMID KING$", 13 + .charmapstr "{PKMN} TRAINER$", 13 |