summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-16 16:57:46 -0700
committerYamaArashi <shadow962@live.com>2015-10-16 16:57:46 -0700
commit8ce02b461e8af735308af20fec675f39d1ef0952 (patch)
treea2da48376991fad8c4ca78a4e6fd019573e6584d /asm
parentfc49fe46fded5de2c0d7ee671b4cbf0f94633a23 (diff)
easy chat words by letter
Diffstat (limited to 'asm')
-rw-r--r--asm/emerald.s14
1 files changed, 2 insertions, 12 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index 87b91f28d..dcfc7fe2a 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -1,14 +1,4 @@
- .include "constants/gba_constants.s"
- .include "constants/misc_constants.s"
- .include "constants/species_constants.s"
- .include "constants/ability_constants.s"
- .include "constants/move_constants.s"
- .include "constants/item_constants.s"
- .include "constants/type_constants.s"
- .include "constants/contest_constants.s"
- .include "constants/pokemon_data_constants.s"
- .include "constants/item_data_constants.s"
- .include "constants/battle_move_constants.s"
+ .include "constants/constants.s"
.include "asm/macros.s"
.include "asm/charmap.s"
@@ -550795,7 +550785,7 @@ sub_811F46C: ; 811F46C
sub sp, 0x10
movs r3, 0
@0811F47A:
- ldr r2, =gUnknown_0859E46C
+ ldr r2, =gEasyChatWordsByLetterPointers
lsls r1, r3, 3
adds r0, r2, 0x4
adds r0, r1, r0