mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
split more battle buffer files
This commit is contained in:
DizzyEggg
parent
ddf85539c1
commit
9dedb3a8bd
@ -1601,7 +1601,7 @@ _080408F6:
|
||||
bne _080408FE
|
||||
b _0804025E
|
||||
_080408FE:
|
||||
ldr r0, =gUnknown_03005D04
|
||||
ldr r0, =gBattleMainFunc
|
||||
ldr r1, [r0]
|
||||
ldr r0, =sub_803B9BC
|
||||
eors r1, r0
|
||||
@ -8138,7 +8138,7 @@ b_call_bc_move_exec: @ 8044458
|
||||
lsls r0, 24
|
||||
lsrs r0, 22
|
||||
adds r2, r0
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, [r1]
|
||||
str r0, [r2]
|
||||
ldr r0, =bc_move_exec_returning
|
||||
@ -8168,7 +8168,7 @@ b_push_move_exec: @ 8044498
|
||||
lsls r0, 24
|
||||
lsrs r0, 22
|
||||
adds r2, r0
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, [r1]
|
||||
str r0, [r2]
|
||||
ldr r0, =sub_803E08C
|
||||
|
||||
@ -10013,7 +10013,7 @@ atk3F_end3: @ 804B6BC
|
||||
subs r0, 0x1
|
||||
strb r0, [r1]
|
||||
_0804B6D6:
|
||||
ldr r2, =gUnknown_03005D04
|
||||
ldr r2, =gBattleMainFunc
|
||||
ldr r0, [r3]
|
||||
ldr r1, [r0, 0xC]
|
||||
adds r0, r1, 0
|
||||
|
||||
@ -11,21 +11,21 @@ nullsub_26: @ 805F160
|
||||
bx lr
|
||||
thumb_func_end nullsub_26
|
||||
|
||||
thumb_func_start sub_805F164
|
||||
sub_805F164: @ 805F164
|
||||
thumb_func_start SetBankFuncToOpponentBufferRunCommand
|
||||
SetBankFuncToOpponentBufferRunCommand: @ 805F164
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r1, =bx_exec_buffer_A_ch0_tbl7
|
||||
ldr r1, =OpponentBufferRunCommand
|
||||
str r1, [r0]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_805F164
|
||||
thumb_func_end SetBankFuncToOpponentBufferRunCommand
|
||||
|
||||
thumb_func_start bx_exec_buffer_A_ch0_tbl7
|
||||
bx_exec_buffer_A_ch0_tbl7: @ 805F180
|
||||
thumb_func_start OpponentBufferRunCommand
|
||||
OpponentBufferRunCommand: @ 805F180
|
||||
push {lr}
|
||||
ldr r2, =gBattleExecBuffer
|
||||
ldr r1, =gBitTable
|
||||
@ -44,7 +44,7 @@ bx_exec_buffer_A_ch0_tbl7: @ 805F180
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0x38
|
||||
bhi _0805F1C8
|
||||
ldr r0, =gUnknown_0831C6C8
|
||||
ldr r0, =gOpponentBufferCommands
|
||||
ldrb r1, [r1]
|
||||
lsls r1, 2
|
||||
adds r1, r0
|
||||
@ -53,11 +53,11 @@ bx_exec_buffer_A_ch0_tbl7: @ 805F180
|
||||
b _0805F1CC
|
||||
.pool
|
||||
_0805F1C8:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805F1CC:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end bx_exec_buffer_A_ch0_tbl7
|
||||
thumb_func_end OpponentBufferRunCommand
|
||||
|
||||
thumb_func_start sub_805F1D0
|
||||
sub_805F1D0: @ 805F1D0
|
||||
@ -77,7 +77,7 @@ sub_805F1D0: @ 805F1D0
|
||||
ldr r0, =SpriteCallbackDummy
|
||||
cmp r1, r0
|
||||
bne _0805F1F4
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805F1F4:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -102,7 +102,7 @@ sub_805F208: @ 805F208
|
||||
ldr r0, =SpriteCallbackDummy
|
||||
cmp r1, r0
|
||||
bne _0805F22C
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805F22C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -147,7 +147,7 @@ sub_805F240: @ 805F240
|
||||
lsls r0, 2
|
||||
adds r0, r5
|
||||
bl DestroySprite
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805F292:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@ -183,7 +183,7 @@ sub_805F2A8: @ 805F2A8
|
||||
adds r0, r2
|
||||
movs r1, 0
|
||||
strb r1, [r0, 0x9]
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805F2E0:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@ -1043,7 +1043,7 @@ _0805F9E0:
|
||||
bl FreeSpriteTilesByTag
|
||||
adds r0, r4, 0
|
||||
bl FreeSpritePaletteByTag
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805FA48:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
@ -1083,7 +1083,7 @@ sub_805FA70: @ 805FA70
|
||||
b _0805FABC
|
||||
.pool
|
||||
_0805FAB8:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805FABC:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@ -1112,7 +1112,7 @@ sub_805FAC4: @ 805FAC4
|
||||
adds r0, r3, r0
|
||||
ldrb r0, [r0]
|
||||
bl sub_8072984
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805FAF2:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -1160,7 +1160,7 @@ sub_805FB08: @ 805FB08
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
bl sub_8072984
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805FB62:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@ -1176,7 +1176,7 @@ bx_t7_button_a: @ 805FB7C
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _0805FB8E
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805FB8E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -1210,7 +1210,7 @@ bx_blink_t7: @ 805FB94
|
||||
strb r0, [r2]
|
||||
ldr r0, =gDoingBattleAnim
|
||||
strb r3, [r0]
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
b _0805FC0A
|
||||
.pool
|
||||
_0805FBE0:
|
||||
@ -1333,7 +1333,7 @@ _0805FCCA:
|
||||
movs r2, 0x80
|
||||
lsls r2, 1
|
||||
bl m4aMPlayVolumeControl
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805FCDA:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@ -1538,7 +1538,7 @@ sub_805FEB8: @ 805FEB8
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _0805FEDA
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805FEDA:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -1562,15 +1562,15 @@ bx_803B0F4: @ 805FEE8
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _0805FF0A
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_0805FF0A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end bx_803B0F4
|
||||
|
||||
thumb_func_start dp01_tbl7_exec_completed
|
||||
dp01_tbl7_exec_completed: @ 805FF18
|
||||
thumb_func_start OpponentBufferExecCompleted
|
||||
OpponentBufferExecCompleted: @ 805FF18
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
ldr r1, =gBattleBankFunc
|
||||
@ -1578,7 +1578,7 @@ dp01_tbl7_exec_completed: @ 805FF18
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 2
|
||||
adds r0, r1
|
||||
ldr r1, =bx_exec_buffer_A_ch0_tbl7
|
||||
ldr r1, =OpponentBufferRunCommand
|
||||
str r1, [r0]
|
||||
ldr r0, =gBattleTypeFlags
|
||||
ldr r0, [r0]
|
||||
@ -1617,7 +1617,7 @@ _0805FF7E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end dp01_tbl7_exec_completed
|
||||
thumb_func_end OpponentBufferExecCompleted
|
||||
|
||||
thumb_func_start dp01t_00_7_getattr
|
||||
dp01t_00_7_getattr: @ 805FF90
|
||||
@ -1667,7 +1667,7 @@ _0805FFEA:
|
||||
movs r0, 0x1
|
||||
mov r2, sp
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
add sp, 0x100
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@ -2608,7 +2608,7 @@ _08060806:
|
||||
movs r0, 0x1
|
||||
adds r2, r4, 0
|
||||
bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
add sp, 0x58
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@ -2653,7 +2653,7 @@ _0806087A:
|
||||
cmp r5, 0x5
|
||||
bls _0806086C
|
||||
_08060886:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -3692,7 +3692,7 @@ _080611E6:
|
||||
cmp r3, r0
|
||||
bcc _080611E6
|
||||
_08061208:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -4110,7 +4110,7 @@ _080615B4:
|
||||
adds r0, r1
|
||||
ldrb r0, [r0]
|
||||
bl sub_8072984
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_080615F0:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@ -4818,7 +4818,7 @@ _08061C2C:
|
||||
thumb_func_start sub_8061C48
|
||||
sub_8061C48: @ 8061C48
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8061C48
|
||||
@ -4826,7 +4826,7 @@ sub_8061C48: @ 8061C48
|
||||
thumb_func_start sub_8061C54
|
||||
sub_8061C54: @ 8061C54
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8061C54
|
||||
@ -4834,7 +4834,7 @@ sub_8061C54: @ 8061C54
|
||||
thumb_func_start sub_8061C60
|
||||
sub_8061C60: @ 8061C60
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8061C60
|
||||
@ -4842,7 +4842,7 @@ sub_8061C60: @ 8061C60
|
||||
thumb_func_start sub_8061C6C
|
||||
sub_8061C6C: @ 8061C6C
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8061C6C
|
||||
@ -4958,7 +4958,7 @@ _08061C8A:
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0
|
||||
beq _08061D80
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
b _08061D9E
|
||||
.pool
|
||||
_08061D80:
|
||||
@ -5157,7 +5157,7 @@ _08061EE8:
|
||||
lsls r0, 2
|
||||
adds r0, r2
|
||||
strb r4, [r0, 0x4]
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_08061F24:
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
@ -5204,7 +5204,7 @@ sub_8061F34: @ 8061F34
|
||||
thumb_func_start sub_8061F90
|
||||
sub_8061F90: @ 8061F90
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8061F90
|
||||
@ -5213,7 +5213,7 @@ sub_8061F90: @ 8061F90
|
||||
sub_8061F9C: @ 8061F9C
|
||||
push {lr}
|
||||
bl sub_8063880
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8061F9C
|
||||
@ -5221,7 +5221,7 @@ sub_8061F9C: @ 8061F9C
|
||||
thumb_func_start sub_8061FAC
|
||||
sub_8061FAC: @ 8061FAC
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8061FAC
|
||||
@ -5245,7 +5245,7 @@ sub_8061FB8: @ 8061FB8
|
||||
_08061FD6:
|
||||
bl dp01_build_cmdbuf_x21_a_bb
|
||||
_08061FDA:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
b _08062156
|
||||
.pool
|
||||
_08061FE4:
|
||||
@ -5415,7 +5415,7 @@ _0806213C:
|
||||
movs r1, 0xA
|
||||
bl dp01_build_cmdbuf_x21_a_bb
|
||||
_08062152:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_08062156:
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@ -5436,7 +5436,7 @@ sub_806215C: @ 806215C
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
bl dp01_build_cmdbuf_x23_aa_0
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@ -5551,7 +5551,7 @@ _0806225A:
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl dp01_build_cmdbuf_x22_a_three_bytes
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -5561,7 +5561,7 @@ _0806225A:
|
||||
thumb_func_start sub_8062288
|
||||
sub_8062288: @ 8062288
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8062288
|
||||
@ -5665,7 +5665,7 @@ _0806234E:
|
||||
thumb_func_start sub_8062384
|
||||
sub_8062384: @ 8062384
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8062384
|
||||
@ -5769,7 +5769,7 @@ _08062458:
|
||||
thumb_func_start sub_8062470
|
||||
sub_8062470: @ 8062470
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8062470
|
||||
@ -5777,7 +5777,7 @@ sub_8062470: @ 8062470
|
||||
thumb_func_start sub_806247C
|
||||
sub_806247C: @ 806247C
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_806247C
|
||||
@ -5785,7 +5785,7 @@ sub_806247C: @ 806247C
|
||||
thumb_func_start sub_8062488
|
||||
sub_8062488: @ 8062488
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8062488
|
||||
@ -5793,7 +5793,7 @@ sub_8062488: @ 8062488
|
||||
thumb_func_start sub_8062494
|
||||
sub_8062494: @ 8062494
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8062494
|
||||
@ -5801,7 +5801,7 @@ sub_8062494: @ 8062494
|
||||
thumb_func_start sub_80624A0
|
||||
sub_80624A0: @ 80624A0
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80624A0
|
||||
@ -5809,7 +5809,7 @@ sub_80624A0: @ 80624A0
|
||||
thumb_func_start sub_80624AC
|
||||
sub_80624AC: @ 80624AC
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80624AC
|
||||
@ -5817,7 +5817,7 @@ sub_80624AC: @ 80624AC
|
||||
thumb_func_start sub_80624B8
|
||||
sub_80624B8: @ 80624B8
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80624B8
|
||||
@ -5825,7 +5825,7 @@ sub_80624B8: @ 80624B8
|
||||
thumb_func_start sub_80624C4
|
||||
sub_80624C4: @ 80624C4
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80624C4
|
||||
@ -5833,7 +5833,7 @@ sub_80624C4: @ 80624C4
|
||||
thumb_func_start sub_80624D0
|
||||
sub_80624D0: @ 80624D0
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80624D0
|
||||
@ -5847,7 +5847,7 @@ sub_80624DC: @ 80624DC
|
||||
negs r0, r0
|
||||
ands r0, r1
|
||||
strb r0, [r2]
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@ -5872,7 +5872,7 @@ sub_80624F8: @ 80624F8
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r3]
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@ -5886,7 +5886,7 @@ sub_8062530: @ 8062530
|
||||
movs r0, 0x7F
|
||||
ands r0, r1
|
||||
strb r0, [r2]
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@ -5907,7 +5907,7 @@ sub_8062548: @ 8062548
|
||||
ands r0, r2
|
||||
orrs r0, r1
|
||||
strb r0, [r3]
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@ -5931,7 +5931,7 @@ dp01t_29_7_blink: @ 8062570
|
||||
lsls r0, 29
|
||||
cmp r0, 0
|
||||
bge _080625A4
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
b _080625CE
|
||||
.pool
|
||||
_080625A4:
|
||||
@ -5965,7 +5965,7 @@ _080625CE:
|
||||
thumb_func_start sub_80625E0
|
||||
sub_80625E0: @ 80625E0
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80625E0
|
||||
@ -5996,7 +5996,7 @@ _08062600:
|
||||
lsls r1, r3, 24
|
||||
asrs r1, 24
|
||||
bl PlaySE12WithPanning
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -6040,7 +6040,7 @@ _0806266C:
|
||||
orrs r0, r1
|
||||
bl PlayFanfare
|
||||
_08062680:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -6066,7 +6066,7 @@ sub_806268C: @ 806268C
|
||||
movs r1, 0x19
|
||||
movs r2, 0x5
|
||||
bl PlayCry3
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@ -6088,7 +6088,7 @@ dp01t_2E_7_battle_intro: @ 80626C8
|
||||
movs r1, 0x1
|
||||
orrs r0, r1
|
||||
strh r0, [r2]
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@ -6344,7 +6344,7 @@ dp01t_30_7_0803D67C: @ 8062918
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _08062948
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
b _08062A12
|
||||
.pool
|
||||
_08062948:
|
||||
@ -6480,7 +6480,7 @@ bx_0803D790_t7: @ 8062A2C
|
||||
adds r0, r2
|
||||
movs r1, 0
|
||||
strb r1, [r0, 0x5]
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
_08062A64:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@ -6516,7 +6516,7 @@ sub_8062A74: @ 8062A74
|
||||
ldr r1, =sub_8073C30
|
||||
str r1, [r0]
|
||||
_08062AA6:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@ -6525,7 +6525,7 @@ _08062AA6:
|
||||
thumb_func_start sub_8062AC4
|
||||
sub_8062AC4: @ 8062AC4
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8062AC4
|
||||
@ -6566,7 +6566,7 @@ sub_8062AD0: @ 8062AD0
|
||||
ldrb r0, [r4]
|
||||
bl sub_805E408
|
||||
_08062B16:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -6604,7 +6604,7 @@ dp01t_34_7_move_anim_start_t3: @ 8062B30
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08062B7C
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
b _08062B88
|
||||
.pool
|
||||
_08062B7C:
|
||||
@ -6625,7 +6625,7 @@ _08062B88:
|
||||
thumb_func_start sub_8062B98
|
||||
sub_8062B98: @ 8062B98
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8062B98
|
||||
@ -6633,7 +6633,7 @@ sub_8062B98: @ 8062B98
|
||||
thumb_func_start sub_8062BA4
|
||||
sub_8062BA4: @ 8062BA4
|
||||
push {lr}
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8062BA4
|
||||
@ -6661,7 +6661,7 @@ sub_8062BB0: @ 8062BB0
|
||||
ldr r0, [r2, 0x8]
|
||||
bl SetMainCallback2
|
||||
_08062BDA:
|
||||
bl dp01_tbl7_exec_completed
|
||||
bl OpponentBufferExecCompleted
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
|
||||
5969
asm/battle_controller_recorded_opponent.s
Normal file
5969
asm/battle_controller_recorded_opponent.s
Normal file
File diff suppressed because it is too large
Load Diff
6144
asm/battle_controller_recorded_player.s
Normal file
6144
asm/battle_controller_recorded_player.s
Normal file
File diff suppressed because it is too large
Load Diff
56
asm/rom3.s
56
asm/rom3.s
@ -40,7 +40,7 @@ _08032686:
|
||||
sub_803269C: @ 803269C
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x14
|
||||
ldr r0, =gUnknown_03005D04
|
||||
ldr r0, =gBattleMainFunc
|
||||
ldr r1, =nullsub_20
|
||||
str r1, [r0]
|
||||
movs r0, 0
|
||||
@ -221,7 +221,7 @@ b_setup_bx: @ 8032824
|
||||
ands r5, r3
|
||||
cmp r5, 0
|
||||
beq _080328E4
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_8039ECC
|
||||
str r0, [r1]
|
||||
movs r4, 0x80
|
||||
@ -230,7 +230,7 @@ b_setup_bx: @ 8032824
|
||||
cmp r4, 0
|
||||
beq _08032874
|
||||
ldr r2, =gBattleBankFunc
|
||||
ldr r0, =sub_818994C
|
||||
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
|
||||
str r0, [r2]
|
||||
ldr r1, =gBanksBySide
|
||||
movs r0, 0
|
||||
@ -244,7 +244,7 @@ _08032874:
|
||||
ldr r1, =gBanksBySide
|
||||
strb r4, [r1]
|
||||
_0803287E:
|
||||
ldr r3, =sub_805F164
|
||||
ldr r3, =SetBankFuncToOpponentBufferRunCommand
|
||||
str r3, [r2, 0x4]
|
||||
movs r0, 0x1
|
||||
strb r0, [r1, 0x1]
|
||||
@ -285,7 +285,7 @@ _080328E4:
|
||||
beq _080328F0
|
||||
b _080329E0
|
||||
_080328F0:
|
||||
ldr r0, =gUnknown_03005D04
|
||||
ldr r0, =gBattleMainFunc
|
||||
ldr r2, =sub_8039ECC
|
||||
str r2, [r0]
|
||||
movs r1, 0x80
|
||||
@ -319,7 +319,7 @@ _08032934:
|
||||
mov r1, r9
|
||||
strb r1, [r4]
|
||||
mov r5, r10
|
||||
ldr r2, =sub_805F164
|
||||
ldr r2, =SetBankFuncToOpponentBufferRunCommand
|
||||
mov r8, r2
|
||||
str r2, [r5, 0x4]
|
||||
movs r6, 0x1
|
||||
@ -347,30 +347,30 @@ _08032964:
|
||||
cmp r1, 0
|
||||
beq _080329B4
|
||||
mov r1, r12
|
||||
ldr r0, =gUnknown_03005D04
|
||||
ldr r0, =gBattleMainFunc
|
||||
str r1, [r0]
|
||||
ldr r0, =sub_818994C
|
||||
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
|
||||
str r0, [r5]
|
||||
mov r1, r9
|
||||
strb r1, [r4]
|
||||
ldr r0, =sub_81864EC
|
||||
ldr r0, =SetBankFuncToRecordedOpponentBufferRunCommand
|
||||
str r0, [r5, 0x4]
|
||||
strb r6, [r4, 0x1]
|
||||
strb r7, [r2]
|
||||
b _08032CB2
|
||||
.pool
|
||||
_080329B4:
|
||||
ldr r0, =sub_818994C
|
||||
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
|
||||
str r0, [r5, 0x4]
|
||||
strb r1, [r4, 0x1]
|
||||
ldr r0, =sub_81864EC
|
||||
ldr r0, =SetBankFuncToRecordedOpponentBufferRunCommand
|
||||
str r0, [r5]
|
||||
strb r6, [r4]
|
||||
strb r7, [r2]
|
||||
b _08032CB2
|
||||
.pool
|
||||
_080329CC:
|
||||
ldr r0, =sub_818994C
|
||||
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
|
||||
mov r2, r10
|
||||
str r0, [r2]
|
||||
strb r1, [r4]
|
||||
@ -381,14 +381,14 @@ _080329CC:
|
||||
.pool
|
||||
_080329E0:
|
||||
ldr r1, =sub_8039ECC
|
||||
ldr r2, =gUnknown_03005D04
|
||||
ldr r2, =gBattleMainFunc
|
||||
str r1, [r2]
|
||||
ldr r2, =gBattleBankFunc
|
||||
ldr r0, =SetBankFuncToPlayerBufferRunCommand
|
||||
str r0, [r2]
|
||||
ldr r4, =gBanksBySide
|
||||
strb r5, [r4]
|
||||
ldr r6, =sub_805F164
|
||||
ldr r6, =SetBankFuncToOpponentBufferRunCommand
|
||||
str r6, [r2, 0x4]
|
||||
strb r7, [r4, 0x1]
|
||||
str r0, [r2, 0x8]
|
||||
@ -420,9 +420,9 @@ _08032A20:
|
||||
cmp r0, r1
|
||||
bne _08032AA0
|
||||
ldr r0, =sub_8039ECC
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
str r0, [r1]
|
||||
ldr r0, =sub_818994C
|
||||
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
|
||||
str r0, [r2]
|
||||
strb r5, [r4]
|
||||
str r6, [r2, 0x4]
|
||||
@ -513,7 +513,7 @@ _08032B06:
|
||||
lsls r1, 2
|
||||
ldr r2, =gBattleBankFunc
|
||||
adds r1, r2
|
||||
ldr r2, =sub_818994C
|
||||
ldr r2, =SetBankFuncToRecordedPlayerBufferRunCommand
|
||||
str r2, [r1]
|
||||
ldrh r1, [r3, 0x18]
|
||||
mov r12, r0
|
||||
@ -581,7 +581,7 @@ _08032B92:
|
||||
lsls r0, 2
|
||||
ldr r1, =gBattleBankFunc
|
||||
adds r0, r1
|
||||
ldr r1, =sub_818994C
|
||||
ldr r1, =SetBankFuncToRecordedPlayerBufferRunCommand
|
||||
str r1, [r0]
|
||||
ldrh r1, [r2, 0x18]
|
||||
cmp r1, 0x2
|
||||
@ -616,7 +616,7 @@ _08032BD8:
|
||||
lsls r0, 2
|
||||
ldr r1, =gBattleBankFunc
|
||||
adds r0, r1
|
||||
ldr r1, =sub_81864EC
|
||||
ldr r1, =SetBankFuncToRecordedOpponentBufferRunCommand
|
||||
str r1, [r0]
|
||||
ldrh r0, [r2, 0x18]
|
||||
cmp r0, 0x2
|
||||
@ -670,7 +670,7 @@ _08032C3C:
|
||||
ands r1, r3
|
||||
cmp r1, 0
|
||||
beq _08032C7C
|
||||
ldr r0, =sub_818994C
|
||||
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
|
||||
str r0, [r2]
|
||||
strb r5, [r4]
|
||||
str r0, [r2, 0x8]
|
||||
@ -681,7 +681,7 @@ _08032C3C:
|
||||
ands r3, r0
|
||||
cmp r3, 0
|
||||
beq _08032C70
|
||||
ldr r0, =sub_81864EC
|
||||
ldr r0, =SetBankFuncToRecordedOpponentBufferRunCommand
|
||||
str r0, [r2, 0x4]
|
||||
strb r7, [r4, 0x1]
|
||||
str r0, [r2, 0xC]
|
||||
@ -697,7 +697,7 @@ _08032C70:
|
||||
strb r2, [r4, 0x3]
|
||||
b _08032CB2
|
||||
_08032C7C:
|
||||
ldr r0, =sub_818994C
|
||||
ldr r0, =SetBankFuncToRecordedPlayerBufferRunCommand
|
||||
str r0, [r2, 0x4]
|
||||
strb r1, [r4, 0x1]
|
||||
str r0, [r2, 0xC]
|
||||
@ -708,7 +708,7 @@ _08032C7C:
|
||||
ands r3, r0
|
||||
cmp r3, 0
|
||||
beq _08032CA8
|
||||
ldr r0, =sub_81864EC
|
||||
ldr r0, =SetBankFuncToRecordedOpponentBufferRunCommand
|
||||
str r0, [r2]
|
||||
strb r7, [r4]
|
||||
str r0, [r2, 0x8]
|
||||
@ -750,7 +750,7 @@ b_setup_bx_link: @ 8032CC0
|
||||
ands r4, r1
|
||||
cmp r4, 0
|
||||
beq _08032D1C
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_8039ECC
|
||||
str r0, [r1]
|
||||
ldr r2, =gBattleBankFunc
|
||||
@ -788,7 +788,7 @@ _08032D48:
|
||||
ands r3, r1
|
||||
cmp r3, 0
|
||||
beq _08032D98
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_8039ECC
|
||||
str r0, [r1]
|
||||
ldr r2, =gBattleBankFunc
|
||||
@ -839,7 +839,7 @@ _08032DD0:
|
||||
ands r3, r1
|
||||
cmp r3, 0
|
||||
beq _08032E1C
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_8039ECC
|
||||
str r0, [r1]
|
||||
ldr r2, =gBattleBankFunc
|
||||
@ -848,7 +848,7 @@ _08032DD0:
|
||||
ldr r1, =gBanksBySide
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
ldr r3, =sub_805F164
|
||||
ldr r3, =SetBankFuncToOpponentBufferRunCommand
|
||||
str r3, [r2, 0x4]
|
||||
strb r5, [r1, 0x1]
|
||||
ldr r0, =SetBankFuncToLinkPartnerBufferRunCommand
|
||||
@ -903,7 +903,7 @@ _08032E8C:
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
beq _08032EA4
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_8039ECC
|
||||
str r0, [r1]
|
||||
_08032EA4:
|
||||
|
||||
@ -9346,7 +9346,7 @@ sub_8039ECC: @ 8039ECC
|
||||
ldr r1, =gBattleCommunication
|
||||
movs r0, 0
|
||||
strb r0, [r1, 0x1]
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_8012FAC
|
||||
str r0, [r1]
|
||||
pop {r0}
|
||||
@ -9357,7 +9357,7 @@ sub_8039ECC: @ 8039ECC
|
||||
thumb_func_start sub_8039EF0
|
||||
sub_8039EF0: @ 8039EF0
|
||||
push {r4,r5,lr}
|
||||
ldr r0, =gUnknown_03005D04
|
||||
ldr r0, =gBattleMainFunc
|
||||
ldr r0, [r0]
|
||||
bl _call_via_r0
|
||||
ldr r1, =gActiveBank
|
||||
@ -10884,7 +10884,7 @@ _0803ABF8:
|
||||
ldrb r1, [r1]
|
||||
cmp r0, r1
|
||||
bne _0803AC2C
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_load_battlefield
|
||||
str r0, [r1]
|
||||
b _0803AC2E
|
||||
@ -10914,7 +10914,7 @@ bc_load_battlefield: @ 803AC34
|
||||
bl dp01_build_cmdbuf_x2E_a
|
||||
ldrb r0, [r4]
|
||||
bl dp01_battle_side_mark_buffer_for_execution
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803AC84
|
||||
str r0, [r1]
|
||||
ldr r0, =gBattleCommunication
|
||||
@ -11251,7 +11251,7 @@ _0803AF32:
|
||||
bcs _0803AF48
|
||||
b _0803ACB4
|
||||
_0803AF48:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_801333C
|
||||
str r0, [r1]
|
||||
_0803AF4E:
|
||||
@ -11391,7 +11391,7 @@ _0803B072:
|
||||
bl dp01_build_cmdbuf_x30_TODO
|
||||
ldrb r0, [r4]
|
||||
bl dp01_battle_side_mark_buffer_for_execution
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_battle_begin_message
|
||||
b _0803B10A
|
||||
.pool
|
||||
@ -11438,7 +11438,7 @@ _0803B0FA:
|
||||
adds r7, 0x1
|
||||
cmp r7, 0x5
|
||||
ble _0803B0B2
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_8013568
|
||||
_0803B10A:
|
||||
str r0, [r1]
|
||||
@ -11466,7 +11466,7 @@ bc_battle_begin_message: @ 803B120
|
||||
ldrb r1, [r1]
|
||||
movs r0, 0
|
||||
bl b_std_message
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B180
|
||||
str r0, [r1]
|
||||
_0803B142:
|
||||
@ -11482,7 +11482,7 @@ bc_8013568: @ 803B158
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _0803B170
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B3CC
|
||||
str r0, [r1]
|
||||
movs r0, 0
|
||||
@ -11530,7 +11530,7 @@ _0803B1BA:
|
||||
lsrs r1, 24
|
||||
movs r0, 0x1
|
||||
bl b_std_message
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B25C
|
||||
str r0, [r1]
|
||||
_0803B1D0:
|
||||
@ -11590,7 +11590,7 @@ _0803B228:
|
||||
cmp r0, r1
|
||||
bcc _0803B20E
|
||||
_0803B23A:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_801362C
|
||||
str r0, [r1]
|
||||
pop {r4,r5}
|
||||
@ -11623,7 +11623,7 @@ sub_803B25C: @ 803B25C
|
||||
b _0803B29A
|
||||
.pool
|
||||
_0803B288:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B1DC
|
||||
b _0803B2F0
|
||||
.pool
|
||||
@ -11671,7 +11671,7 @@ _0803B2D8:
|
||||
cmp r0, r1
|
||||
bcc _0803B2B2
|
||||
_0803B2EC:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_801362C
|
||||
_0803B2F0:
|
||||
str r0, [r1]
|
||||
@ -11737,7 +11737,7 @@ _0803B36C:
|
||||
cmp r0, r1
|
||||
bcc _0803B334
|
||||
_0803B37E:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B3CC
|
||||
str r0, [r1]
|
||||
_0803B384:
|
||||
@ -11754,7 +11754,7 @@ sub_803B3AC: @ 803B3AC
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _0803B3BC
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B3CC
|
||||
str r0, [r1]
|
||||
_0803B3BC:
|
||||
@ -11801,7 +11801,7 @@ _0803B3F6:
|
||||
movs r0, 0x1
|
||||
bl b_std_message
|
||||
_0803B412:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B4C8
|
||||
str r0, [r1]
|
||||
_0803B418:
|
||||
@ -11874,7 +11874,7 @@ _0803B48A:
|
||||
lsls r2, 1
|
||||
adds r0, r2
|
||||
strb r1, [r0]
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B628
|
||||
str r0, [r1]
|
||||
pop {r4,r5}
|
||||
@ -11904,7 +11904,7 @@ sub_803B4C8: @ 803B4C8
|
||||
b _0803B500
|
||||
.pool
|
||||
_0803B4F0:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B42C
|
||||
b _0803B572
|
||||
.pool
|
||||
@ -11965,7 +11965,7 @@ _0803B554:
|
||||
lsls r2, 1
|
||||
adds r0, r2
|
||||
strb r1, [r0]
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B628
|
||||
_0803B572:
|
||||
str r0, [r1]
|
||||
@ -12030,7 +12030,7 @@ _0803B5E6:
|
||||
lsls r2, 1
|
||||
adds r0, r2
|
||||
strb r1, [r0]
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B628
|
||||
str r0, [r1]
|
||||
_0803B606:
|
||||
@ -12294,7 +12294,7 @@ _0803B7EA:
|
||||
ldr r0, =gUnknown_085CC23E
|
||||
movs r1, 0
|
||||
bl battle_show_message_maybe
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803BE74
|
||||
str r0, [r1]
|
||||
bl sub_803F988
|
||||
@ -12383,7 +12383,7 @@ bc_8013B1C: @ 803B904
|
||||
ldr r0, [r0]
|
||||
cmp r0, 0
|
||||
bne _0803B994
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803B9BC
|
||||
str r0, [r1]
|
||||
ldr r3, =gNoOfAllBanks
|
||||
@ -12538,7 +12538,7 @@ _0803BA40:
|
||||
ldr r1, =gFightStateTracker
|
||||
movs r0, 0xC
|
||||
strb r0, [r1]
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_bs_exec
|
||||
str r0, [r1]
|
||||
b _0803BB78
|
||||
@ -12603,7 +12603,7 @@ _0803BAE6:
|
||||
mov r0, r9
|
||||
movs r1, 0
|
||||
bl battle_show_message_maybe
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803BE74
|
||||
str r0, [r1]
|
||||
bl Random
|
||||
@ -14556,7 +14556,7 @@ _0803CD1E:
|
||||
bne _0803CD70
|
||||
movs r0, 0x1
|
||||
bl sub_818603C
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803D2E8
|
||||
str r0, [r1]
|
||||
ldr r0, =gBattleTypeFlags
|
||||
@ -15358,7 +15358,7 @@ _0803D3C0:
|
||||
movs r3, 0x1
|
||||
movs r5, 0
|
||||
adds r4, r1, 0
|
||||
ldr r7, =gUnknown_03005D04
|
||||
ldr r7, =gBattleMainFunc
|
||||
mov r10, r7
|
||||
ldr r0, =bc_80154A0
|
||||
mov r12, r0
|
||||
@ -15529,7 +15529,7 @@ _0803D540:
|
||||
cmp r5, r0
|
||||
blt _0803D4E8
|
||||
_0803D54A:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_80154A0
|
||||
str r0, [r1]
|
||||
ldr r0, =gBattleStruct
|
||||
@ -15822,7 +15822,7 @@ _0803D7AE:
|
||||
ldr r0, =gBattleStruct
|
||||
ldr r0, [r0]
|
||||
strb r2, [r0, 0x13]
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_bs_exec
|
||||
str r0, [r1]
|
||||
ldr r0, =gBattleCommunication
|
||||
@ -15875,7 +15875,7 @@ _0803D828:
|
||||
ldr r1, =0xffefffff
|
||||
ands r0, r1
|
||||
str r0, [r2]
|
||||
ldr r3, =gUnknown_03005D04
|
||||
ldr r3, =gBattleMainFunc
|
||||
ldr r2, =gUnknown_0831BC44
|
||||
ldrb r1, [r6]
|
||||
movs r0, 0x7F
|
||||
@ -16069,7 +16069,7 @@ _0803DA9E:
|
||||
ldr r0, =gUnknown_082DA96A
|
||||
str r0, [r1]
|
||||
_0803DAA4:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803DCD8
|
||||
str r0, [r1]
|
||||
pop {r4}
|
||||
@ -16148,7 +16148,7 @@ _0803DB7C:
|
||||
ldr r0, =gUnknown_082DA96D
|
||||
str r0, [r1]
|
||||
_0803DB82:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803DCD8
|
||||
str r0, [r1]
|
||||
pop {r4}
|
||||
@ -16232,7 +16232,7 @@ _0803DC64:
|
||||
_0803DC68:
|
||||
str r0, [r1]
|
||||
_0803DC6A:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803DCD8
|
||||
str r0, [r1]
|
||||
pop {r0}
|
||||
@ -16264,7 +16264,7 @@ bc_80158BC: @ 803DC84
|
||||
ldr r1, =gBattlescriptCurrInstr
|
||||
ldr r0, =gUnknown_082DAAF7
|
||||
str r0, [r1]
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803DCD8
|
||||
str r0, [r1]
|
||||
bx lr
|
||||
@ -16387,7 +16387,7 @@ _0803DDD2:
|
||||
bl BeginFastPaletteFade
|
||||
movs r0, 0x5
|
||||
bl FadeOutMapMusic
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =sub_803DE40
|
||||
str r0, [r1]
|
||||
ldr r1, =gUnknown_030061E8
|
||||
@ -16436,13 +16436,13 @@ sub_803DE40: @ 803DE40
|
||||
cmp r0, 0x1
|
||||
beq _0803DE80
|
||||
_0803DE62:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =c4_overworld
|
||||
str r0, [r1]
|
||||
b _0803DEA2
|
||||
.pool
|
||||
_0803DE80:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_evolution_cutscene
|
||||
str r0, [r1]
|
||||
_0803DE86:
|
||||
@ -16497,7 +16497,7 @@ _0803DEC2:
|
||||
cmp r4, 0
|
||||
beq _0803DF20
|
||||
bl FreeAllWindowBuffers
|
||||
ldr r0, =gUnknown_03005D04
|
||||
ldr r0, =gBattleMainFunc
|
||||
ldr r1, =sub_803DF48
|
||||
str r1, [r0]
|
||||
lsls r3, r6, 24
|
||||
@ -16517,7 +16517,7 @@ _0803DF20:
|
||||
cmp r0, 0
|
||||
bne _0803DEC0
|
||||
_0803DF2E:
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =c4_overworld
|
||||
str r0, [r1]
|
||||
_0803DF34:
|
||||
@ -16535,7 +16535,7 @@ sub_803DF48: @ 803DF48
|
||||
ldr r0, =sub_8038420
|
||||
cmp r1, r0
|
||||
bne _0803DF5A
|
||||
ldr r1, =gUnknown_03005D04
|
||||
ldr r1, =gBattleMainFunc
|
||||
ldr r0, =bc_evolution_cutscene
|
||||
str r0, [r1]
|
||||
_0803DF5A:
|
||||
@ -16634,7 +16634,7 @@ bc_move_exec_returning: @ 803E018
|
||||
subs r0, 0x1
|
||||
strb r0, [r1]
|
||||
_0803E03C:
|
||||
ldr r2, =gUnknown_03005D04
|
||||
ldr r2, =gBattleMainFunc
|
||||
ldr r0, [r3]
|
||||
ldr r1, [r0, 0xC]
|
||||
adds r0, r1, 0
|
||||
|
||||
98965
asm/rom_8184DA4.s
98965
asm/rom_8184DA4.s
File diff suppressed because it is too large
Load Diff
86880
asm/rom_818CFC8.s
Normal file
86880
asm/rom_818CFC8.s
Normal file
File diff suppressed because it is too large
Load Diff
@ -584,7 +584,7 @@ gUnknown_0831C6A0:: @ 831C6A0
|
||||
gUnknown_0831C6B0:: @ 831C6B0
|
||||
.incbin "baserom.gba", 0x31c6b0, 0x18
|
||||
|
||||
gUnknown_0831C6C8:: @ 831C6C8
|
||||
gOpponentBufferCommands:: @ 831C6C8
|
||||
.incbin "baserom.gba", 0x31c6c8, 0xec
|
||||
|
||||
gUnknown_0831C7B4:: @ 831C7B4
|
||||
|
||||
@ -48,10 +48,10 @@ gUnknown_0860AE7C:: @ 860AE7C
|
||||
gUnknown_0860AE88:: @ 860AE88
|
||||
.incbin "baserom.gba", 0x60ae88, 0x8
|
||||
|
||||
gUnknown_0860AE90:: @ 860AE90
|
||||
gRecordedOpponentBufferCommands:: @ 860AE90
|
||||
.incbin "baserom.gba", 0x60ae90, 0xe4
|
||||
|
||||
gUnknown_0860AF74:: @ 860AF74
|
||||
gRecordedPlayerBufferCommands:: @ 860AF74
|
||||
.incbin "baserom.gba", 0x60af74, 0xe4
|
||||
|
||||
gUnknown_0860B058:: @ 860B058
|
||||
|
||||
@ -209,6 +209,9 @@ SECTIONS {
|
||||
asm/rom_817C95C.o(.text);
|
||||
asm/front_pic_anim.o(.text);
|
||||
asm/rom_8184DA4.o(.text);
|
||||
asm/battle_controller_recorded_opponent.o(.text);
|
||||
asm/battle_controller_recorded_player.o(.text);
|
||||
asm/rom_818CFC8.o(.text);
|
||||
src/multiboot.o(.text);
|
||||
asm/rom_81BAD84.o(.text);
|
||||
asm/battle_controller_player_partner.o(.text);
|
||||
|
||||
@ -206,7 +206,7 @@ gUnknown_03005CDE: @ 3005CDE
|
||||
gUnknown_03005D00: @ 3005D00
|
||||
.space 0x4
|
||||
|
||||
gUnknown_03005D04: @ 3005D04
|
||||
gBattleMainFunc: @ 3005D04
|
||||
.space 0xC
|
||||
|
||||
gUnknown_03005D10: @ 3005D10
|
||||
|
||||
Loading…
Reference in New Issue
Block a user