summaryrefslogtreecommitdiff
path: root/asm/battle_tower.s
diff options
context:
space:
mode:
authorCameron Hall <camthesaxman@users.noreply.github.com>2018-02-07 12:46:12 -0600
committerGitHub <noreply@github.com>2018-02-07 12:46:12 -0600
commit13bc7a8dd26fd489b4d83e8d9044c424b526aff3 (patch)
tree199cc6a98e9a05858fb98fb591e7f37259438360 /asm/battle_tower.s
parent3fb2471016b97e4a2e1ee4d73d7d4e3e632eda7a (diff)
parentc3dc14ba66b31c8f2556e9a19b6be7a5e860a376 (diff)
Merge pull request #166 from camthesaxman/battle_refactor
rename/refactor battle code
Diffstat (limited to 'asm/battle_tower.s')
-rw-r--r--asm/battle_tower.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index b5b06c4e1..6156d6890 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -5354,7 +5354,7 @@ sub_8164E04: @ 8164E04
adds r0, r2
ldrh r1, [r5]
bl sub_8165B88
- ldr r6, =gBattlePartyID
+ ldr r6, =gBattlerPartyIndexes
ldrh r0, [r6, 0x2]
movs r5, 0x64
muls r0, r5