summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-14 14:37:16 -0700
committerYamaArashi <shadow962@live.com>2015-10-14 14:37:16 -0700
commita6f32421bbe51ab0593e65d284039ff456f750e2 (patch)
tree36d3359c642f59b6674d09c061653a52f7847ba9 /asm
parent27061f496eaeb745c7f135ebaafcf90ef861bdd8 (diff)
renaming
Diffstat (limited to 'asm')
-rw-r--r--asm/emerald.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index aeae448c9..7dc3a62fe 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -435941,7 +435941,7 @@ AreMovesContestCombo: ; 80E5414
cmp r4, r1
bne @080E5470
@080E545E:
- ldr r0, =gComboStarterLut
+ ldr r0, =gComboStarterLookupTable
adds r0, r4, r0
ldrb r0, [r0]
b @080E5472
@@ -436945,7 +436945,7 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4
ldr r1, =gContestMoves
adds r0, r1
ldrb r0, [r0, 0x2]
- ldr r2, =gComboStarterLut
+ ldr r2, =gComboStarterLookupTable
adds r0, r2
ldrb r1, [r0]
lsls r0, r1, 2