diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-11 01:20:41 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-11 01:20:41 -0700 |
| commit | 52c9f4a7dc5652affbdc9174c69d97f6f6196426 (patch) | |
| tree | 7b4500cd25feaaf8ccd040f4c30c15d47cfb6f93 | |
| parent | 1874db5e8a560a3c8eebbae83ac479333a119f6e (diff) | |
type names
| -rw-r--r-- | asm/emerald.s | 10 | ||||
| -rw-r--r-- | data/data2.s | 6 | ||||
| -rw-r--r-- | data/text/type_names.s | 19 |
3 files changed, 28 insertions, 7 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index 8a9a705a2..0c7343fd9 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -27021,7 +27021,7 @@ sub_80156E0: ; 80156E0 lsrs r2, 2 lsls r1, r2, 3 subs r1, r2 - ldr r2, =gUnknown_0831AE38 + ldr r2, =gTypeNames adds r1, r2 bl gf_strcpy ldr r1, =gUnknown_082EF6E4 @@ -27040,7 +27040,7 @@ sub_80156E0: ; 80156E0 lsrs r2, 2 lsls r1, r2, 3 subs r1, r2 - ldr r2, =gUnknown_0831AE38 + ldr r2, =gTypeNames adds r1, r2 bl gf_strcpy ldr r1, =gUnknown_082EF718 @@ -157037,7 +157037,7 @@ sub_8059BB0: ; 8059BB0 ldrb r2, [r1, 0x2] lsls r1, r2, 3 subs r1, r2 - ldr r2, =gUnknown_0831AE38 + ldr r2, =gTypeNames adds r1, r2 bl gf_strcpy adds r0, r6, 0 @@ -645730,7 +645730,7 @@ sub_814F648: ; 814F648 ldrb r0, [r0, 0x1] lsls r1, r0, 3 subs r1, r0 - ldr r0, =gUnknown_0831AE38 + ldr r0, =gTypeNames b @0814F846 .align 2, 0 .pool @@ -902977,7 +902977,7 @@ sub_81D28FC: ; 81D28FC ldrb r1, [r6, 0x2] lsls r0, r1, 3 subs r0, r1 - ldr r1, =gUnknown_0831AE38 + ldr r1, =gTypeNames adds r5, r0, r1 movs r0, 0x19 str r0, [sp] diff --git a/data/data2.s b/data/data2.s index dca57af76..c1e94ee41 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1481,8 +1481,10 @@ gUnknown_0831ACE0: ; 831ACE0 gUnknown_0831ACE8: ; 831ACE8 .incbin "base_emerald.gba", 0x31ace8, 0x150 -gUnknown_0831AE38: ; 831AE38 - .incbin "base_emerald.gba", 0x31ae38, 0x80 +; 831AE38 + .include "data/text/type_names.s" + + .align 2, 0 gUnknown_0831AEB8: ; 831AEB8 .incbin "base_emerald.gba", 0x31aeb8, 0x823 diff --git a/data/text/type_names.s b/data/text/type_names.s new file mode 100644 index 000000000..ff7e8e2c7 --- /dev/null +++ b/data/text/type_names.s @@ -0,0 +1,19 @@ +gTypeNames: ; 831AE38 + .charmapstr "NORMAL$", 7 + .charmapstr "FIGHT$", 7 + .charmapstr "FLYING$", 7 + .charmapstr "POISON$", 7 + .charmapstr "GROUND$", 7 + .charmapstr "ROCK$", 7 + .charmapstr "BUG$", 7 + .charmapstr "GHOST$", 7 + .charmapstr "STEEL$", 7 + .charmapstr "???$", 7 + .charmapstr "FIRE$", 7 + .charmapstr "WATER$", 7 + .charmapstr "GRASS$", 7 + .charmapstr "ELECTR$", 7 + .charmapstr "PSYCHC$", 7 + .charmapstr "ICE$", 7 + .charmapstr "DRAGON$", 7 + .charmapstr "DARK$", 7 |