diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_6.s | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/asm/battle_6.s b/asm/battle_6.s index ddbb9f2ce..bede22650 100644 --- a/asm/battle_6.s +++ b/asm/battle_6.s @@ -3673,101 +3673,4 @@ _08030378: bx r0 thumb_func_end PlayerHandlePrintStringPlayerOnly -.section .text_8030464 - - thumb_func_start PlayerHandleResetActionMoveSelection -PlayerHandleResetActionMoveSelection: @ 8031238 - push {r4,lr} - ldr r1, _08031258 @ =gBattleBufferA - ldr r4, _0803125C @ =gActiveBank - ldrb r3, [r4] - lsls r0, r3, 9 - adds r1, 0x1 - adds r0, r1 - ldrb r2, [r0] - cmp r2, 0x1 - beq _08031280 - cmp r2, 0x1 - bgt _08031260 - cmp r2, 0 - beq _08031266 - b _08031290 - .align 2, 0 -_08031258: .4byte gBattleBufferA -_0803125C: .4byte gActiveBank -_08031260: - cmp r2, 0x2 - beq _08031288 - b _08031290 -_08031266: - ldr r0, _08031278 @ =gActionSelectionCursor - adds r0, r3, r0 - strb r2, [r0] - ldr r1, _0803127C @ =gMoveSelectionCursor - ldrb r0, [r4] - adds r0, r1 - strb r2, [r0] - b _08031290 - .align 2, 0 -_08031278: .4byte gActionSelectionCursor -_0803127C: .4byte gMoveSelectionCursor -_08031280: - ldr r0, _08031284 @ =gActionSelectionCursor - b _0803128A - .align 2, 0 -_08031284: .4byte gActionSelectionCursor -_08031288: - ldr r0, _0803129C @ =gMoveSelectionCursor -_0803128A: - adds r0, r3, r0 - movs r1, 0 - strb r1, [r0] -_08031290: - bl PlayerBufferExecCompleted - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0803129C: .4byte gMoveSelectionCursor - thumb_func_end PlayerHandleResetActionMoveSelection - - thumb_func_start sub_80312A0 -sub_80312A0: @ 80312A0 - push {r4,lr} - ldr r2, _080312D8 @ =gBattleOutcome - ldr r1, _080312DC @ =gBattleBufferA - ldr r4, _080312E0 @ =gActiveBank - ldrb r0, [r4] - lsls r0, 9 - adds r1, 0x1 - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - movs r0, 0x5 - bl FadeOutMapMusic - movs r0, 0x3 - bl BeginFastPaletteFade - bl PlayerBufferExecCompleted - ldr r1, _080312E4 @ =gBattleBankFunc - ldrb r0, [r4] - lsls r0, 2 - adds r0, r1 - ldr r1, _080312E8 @ =sub_802D18C - str r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080312D8: .4byte gBattleOutcome -_080312DC: .4byte gBattleBufferA -_080312E0: .4byte gActiveBank -_080312E4: .4byte gBattleBankFunc -_080312E8: .4byte sub_802D18C - thumb_func_end sub_80312A0 - - thumb_func_start nullsub_43 -nullsub_43: @ 80312EC - bx lr - thumb_func_end nullsub_43 - .align 2, 0 @ Don't pad with nop. |