diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-10 22:52:58 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-10 22:52:58 -0700 |
| commit | 1874db5e8a560a3c8eebbae83ac479333a119f6e (patch) | |
| tree | 171438ac3aac8729587319a0180e1c9e2789dfb7 /asm | |
| parent | 9fa2098029ee1fa7d1d1344cb03287a4d409ae39 (diff) | |
add trainer class names
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/charmap.s | 2 | ||||
| -rw-r--r-- | asm/emerald.s | 12 |
2 files changed, 8 insertions, 6 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 |