diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 12:56:45 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 12:56:45 +0200 |
| commit | 28da80e19af3270b827e98c2e7c69c0199d14d05 (patch) | |
| tree | 6afb2df5bfa686bbb8f1d5e1c912361633f96733 /asm/battle_2.s | |
| parent | b4875d82d50b0649c2289b9e470ca0a9ae23782d (diff) | |
battle 4 up to SetMoveEffect
Diffstat (limited to 'asm/battle_2.s')
| -rw-r--r-- | asm/battle_2.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index debf0eb03..7567daa4b 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -6510,7 +6510,7 @@ _0803A0AE: ldr r0, [r0, 0xC] adds r0, 0x20 strb r2, [r0] - ldr r5, =gUnknown_0202432C + ldr r5, =gPauseCounterBattle ldr r6, =gBattleMoveDamage ldr r7, =gUnknown_020243FC ldr r0, =gUnknown_03005D54 @@ -14058,14 +14058,14 @@ _0803E480: cmp r0, 0x1F bne _0803E4CE adds r0, r2, 0 - bl sub_8048728 + bl BankGetTurnOrder lsls r0, 24 lsrs r0, 24 ldr r3, [sp] cmp r0, r3 bcs _0803E4CE ldrb r0, [r4] - bl sub_8048728 + bl BankGetTurnOrder lsls r0, 24 lsrs r0, 24 str r0, [sp] |