summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-01-25 01:25:22 -0800
committerYamaArashi <shadow962@live.com>2016-01-25 01:25:22 -0800
commitddad400c60ed99c3b0b82456fa8e32ffacdf3cf8 (patch)
treeed2f271c86a81ce4224a0787c78ba4e5e7f65700
parent8b06424f1ab88ad88fe0bede55c098765fc44ae7 (diff)
type names
-rw-r--r--asm/rom.s6
-rw-r--r--data/data2.s6
-rw-r--r--data/text/type_names.s19
3 files changed, 26 insertions, 5 deletions
diff --git a/asm/rom.s b/asm/rom.s
index 673d2db5e..ed91f9c20 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -93035,7 +93035,7 @@ _0802E398: .4byte 0x020238cc
_0802E39C: .4byte gUnknown_08400D49
_0802E3A0: .4byte gBattleMoves
_0802E3A4: .4byte 0x02024e64
-_0802E3A8: .4byte gUnknown_081F9870
+_0802E3A8: .4byte gTypeNames
_0802E3AC: .4byte 0x03004210
_0802E3B0: .4byte 0x00001016
thumb_func_end sub_802E2D4
@@ -595114,7 +595114,7 @@ _08121B54:
ldr r0, _08121B60
b _08121C66
.align 2
-_08121B60: .4byte gUnknown_081F9870
+_08121B60: .4byte gTypeNames
_08121B64:
ldrb r0, [r4, 0x1]
bl battle_side_get_owner
@@ -632368,7 +632368,7 @@ _08133916:
pop {r0}
bx r0
.align 2
-_08133938: .4byte gUnknown_081F9870
+_08133938: .4byte gTypeNames
_0813393C: .4byte 0x02039360
thumb_func_end sub_8133800
diff --git a/data/data2.s b/data/data2.s
index 59fe48b18..bb30a1219 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -475,8 +475,10 @@ gUnknown_081F96D0: ; 81F96D0
gUnknown_081F9720: ; 81F9720
.incbin "baserom.gba", 0x001f9720, 0x150
-gUnknown_081F9870: ; 81F9870
- .incbin "baserom.gba", 0x001f9870, 0x80
+; 81F9870
+ .include "data/text/type_names.s"
+
+ .align 2
gUnknown_081F98F0: ; 81F98F0
.incbin "baserom.gba", 0x001f98f0, 0xdc
diff --git a/data/text/type_names.s b/data/text/type_names.s
new file mode 100644
index 000000000..3ca8ea4a6
--- /dev/null
+++ b/data/text/type_names.s
@@ -0,0 +1,19 @@
+gTypeNames: ; 81F9870
+ .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