From 52c9f4a7dc5652affbdc9174c69d97f6f6196426 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 11 Oct 2015 01:20:41 -0700 Subject: type names --- data/data2.s | 6 ++++-- data/text/type_names.s | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 data/text/type_names.s (limited to 'data') 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 -- cgit v1.2.3