summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-11 01:46:54 -0700
committerYamaArashi <shadow962@live.com>2015-10-11 01:46:54 -0700
commitbc7f744daaa2cc97165e92ae228687bb2dd99ee3 (patch)
tree855a07ed64f1b684354c8ae2eac6aadb6c5ef96d
parent52c9f4a7dc5652affbdc9174c69d97f6f6196426 (diff)
ability names
-rw-r--r--asm/emerald.s6
-rw-r--r--data/data2.s6
-rw-r--r--data/text/ability_names.s79
3 files changed, 86 insertions, 5 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index 0c7343fd9..1a75c0eed 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -644929,7 +644929,7 @@ sub_814E764: ; 814E764
ldrb r1, [r0]
movs r0, 0xD
muls r1, r0
- ldr r0, =gUnknown_0831B6DB
+ ldr r0, =gAbilityNames
adds r4, r1, r0
b @0814F5C0
.align 2, 0
@@ -645854,7 +645854,7 @@ sub_814F648: ; 814F648
ldrb r1, [r0, 0x1]
movs r0, 0xD
muls r1, r0
- ldr r0, =gUnknown_0831B6DB
+ ldr r0, =gAbilityNames
@0814F846:
adds r1, r0
@0814F848:
@@ -871139,7 +871139,7 @@ sub_81C2FD8: ; 81C2FD8
lsrs r0, 24
movs r1, 0xD
muls r1, r4
- ldr r2, =gUnknown_0831B6DB
+ ldr r2, =gAbilityNames
adds r1, r2
movs r2, 0
str r2, [sp]
diff --git a/data/data2.s b/data/data2.s
index c1e94ee41..faf079e14 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1489,8 +1489,10 @@ gUnknown_0831ACE8: ; 831ACE8
gUnknown_0831AEB8: ; 831AEB8
.incbin "base_emerald.gba", 0x31aeb8, 0x823
-gUnknown_0831B6DB: ; 831B6DB
- .incbin "base_emerald.gba", 0x31b6db, 0x3f9
+; 831B6DB
+ .include "data/text/ability_names.s"
+
+ .align 2, 0
gUnknown_0831BAD4: ; 831BAD4
.incbin "base_emerald.gba", 0x31bad4, 0x138
diff --git a/data/text/ability_names.s b/data/text/ability_names.s
new file mode 100644
index 000000000..df328fbdf
--- /dev/null
+++ b/data/text/ability_names.s
@@ -0,0 +1,79 @@
+gAbilityNames: ; 831B6DB
+ .charmapstr "-------$", 13
+ .charmapstr "STENCH$", 13
+ .charmapstr "DRIZZLE$", 13
+ .charmapstr "SPEED BOOST$", 13
+ .charmapstr "BATTLE ARMOR$", 13
+ .charmapstr "STURDY$", 13
+ .charmapstr "DAMP$", 13
+ .charmapstr "LIMBER$", 13
+ .charmapstr "SAND VEIL$", 13
+ .charmapstr "STATIC$", 13
+ .charmapstr "VOLT ABSORB$", 13
+ .charmapstr "WATER ABSORB$", 13
+ .charmapstr "OBLIVIOUS$", 13
+ .charmapstr "CLOUD NINE$", 13
+ .charmapstr "COMPOUNDEYES$", 13
+ .charmapstr "INSOMNIA$", 13
+ .charmapstr "COLOR CHANGE$", 13
+ .charmapstr "IMMUNITY$", 13
+ .charmapstr "FLASH FIRE$", 13
+ .charmapstr "SHIELD DUST$", 13
+ .charmapstr "OWN TEMPO$", 13
+ .charmapstr "SUCTION CUPS$", 13
+ .charmapstr "INTIMIDATE$", 13
+ .charmapstr "SHADOW TAG$", 13
+ .charmapstr "ROUGH SKIN$", 13
+ .charmapstr "WONDER GUARD$", 13
+ .charmapstr "LEVITATE$", 13
+ .charmapstr "EFFECT SPORE$", 13
+ .charmapstr "SYNCHRONIZE$", 13
+ .charmapstr "CLEAR BODY$", 13
+ .charmapstr "NATURAL CURE$", 13
+ .charmapstr "LIGHTNINGROD$", 13
+ .charmapstr "SERENE GRACE$", 13
+ .charmapstr "SWIFT SWIM$", 13
+ .charmapstr "CHLOROPHYLL$", 13
+ .charmapstr "ILLUMINATE$", 13
+ .charmapstr "TRACE$", 13
+ .charmapstr "HUGE POWER$", 13
+ .charmapstr "POISON POINT$", 13
+ .charmapstr "INNER FOCUS$", 13
+ .charmapstr "MAGMA ARMOR$", 13
+ .charmapstr "WATER VEIL$", 13
+ .charmapstr "MAGNET PULL$", 13
+ .charmapstr "SOUNDPROOF$", 13
+ .charmapstr "RAIN DISH$", 13
+ .charmapstr "SAND STREAM$", 13
+ .charmapstr "PRESSURE$", 13
+ .charmapstr "THICK FAT$", 13
+ .charmapstr "EARLY BIRD$", 13
+ .charmapstr "FLAME BODY$", 13
+ .charmapstr "RUN AWAY$", 13
+ .charmapstr "KEEN EYE$", 13
+ .charmapstr "HYPER CUTTER$", 13
+ .charmapstr "PICKUP$", 13
+ .charmapstr "TRUANT$", 13
+ .charmapstr "HUSTLE$", 13
+ .charmapstr "CUTE CHARM$", 13
+ .charmapstr "PLUS$", 13
+ .charmapstr "MINUS$", 13
+ .charmapstr "FORECAST$", 13
+ .charmapstr "STICKY HOLD$", 13
+ .charmapstr "SHED SKIN$", 13
+ .charmapstr "GUTS$", 13
+ .charmapstr "MARVEL SCALE$", 13
+ .charmapstr "LIQUID OOZE$", 13
+ .charmapstr "OVERGROW$", 13
+ .charmapstr "BLAZE$", 13
+ .charmapstr "TORRENT$", 13
+ .charmapstr "SWARM$", 13
+ .charmapstr "ROCK HEAD$", 13
+ .charmapstr "DROUGHT$", 13
+ .charmapstr "ARENA TRAP$", 13
+ .charmapstr "VITAL SPIRIT$", 13
+ .charmapstr "WHITE SMOKE$", 13
+ .charmapstr "PURE POWER$", 13
+ .charmapstr "SHELL ARMOR$", 13
+ .charmapstr "CACOPHONY$", 13
+ .charmapstr "AIR LOCK$", 13