diff options
Diffstat (limited to 'asm/battle_controller_linkopponent.s')
-rw-r--r-- | asm/battle_controller_linkopponent.s | 216 |
1 files changed, 108 insertions, 108 deletions
diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s index bfeafd0f4..e07ec2dbb 100644 --- a/asm/battle_controller_linkopponent.s +++ b/asm/battle_controller_linkopponent.s @@ -18,14 +18,14 @@ SetBankFuncToLinkOpponentBufferRunCommand: @ 8064394 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80643B0 + ldr r1, =LinkOpponentBufferRunCommand str r1, [r0] bx lr .pool thumb_func_end SetBankFuncToLinkOpponentBufferRunCommand - thumb_func_start sub_80643B0 -sub_80643B0: @ 80643B0 + thumb_func_start LinkOpponentBufferRunCommand +LinkOpponentBufferRunCommand: @ 80643B0 push {lr} ldr r2, =gBattleExecBuffer ldr r1, =gBitTable @@ -44,7 +44,7 @@ sub_80643B0: @ 80643B0 ldrb r0, [r1] cmp r0, 0x38 bhi _080643F8 - ldr r0, =gUnknown_0831C7B4 + ldr r0, =gLinkOpponentBufferCommands ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -53,11 +53,11 @@ sub_80643B0: @ 80643B0 b _080643FC .pool _080643F8: - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _080643FC: pop {r0} bx r0 - thumb_func_end sub_80643B0 + thumb_func_end LinkOpponentBufferRunCommand thumb_func_start sub_8064400 sub_8064400: @ 8064400 @@ -77,7 +77,7 @@ sub_8064400: @ 8064400 ldr r0, =SpriteCallbackDummy cmp r1, r0 bne _08064424 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08064424: pop {r0} bx r0 @@ -102,7 +102,7 @@ sub_8064438: @ 8064438 ldr r0, =SpriteCallbackDummy cmp r1, r0 bne _0806445C - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _0806445C: pop {r0} bx r0 @@ -147,7 +147,7 @@ sub_8064470: @ 8064470 lsls r0, 2 adds r0, r5 bl DestroySprite - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _080644C2: pop {r4-r6} pop {r0} @@ -183,7 +183,7 @@ sub_80644D8: @ 80644D8 adds r0, r2 movs r1, 0 strb r1, [r0, 0x9] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08064510: pop {r4} pop {r0} @@ -215,7 +215,7 @@ sub_8064520: @ 8064520 beq _08064584 _0806454C: ldr r2, =gSprites - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldr r3, =gActiveBank ldrb r0, [r3] adds r0, r1 @@ -234,7 +234,7 @@ _0806454C: .pool _08064584: ldr r3, =gSprites - ldr r6, =gUnknown_03005D70 + ldr r6, =gHealthBoxesIds ldr r2, =gActiveBank ldrb r4, [r2] adds r0, r4, r6 @@ -541,7 +541,7 @@ _080647B4: ands r0, r1 cmp r0, 0 bne _0806484A - ldr r4, =gUnknown_03005D70 + ldr r4, =gHealthBoxesIds mov r1, r9 ldrb r0, [r1] adds r1, r7, 0 @@ -569,7 +569,7 @@ _080647B4: ldrb r0, [r0] bl sub_80729D0 _0806484A: - ldr r5, =gUnknown_03005D70 + ldr r5, =gHealthBoxesIds ldr r4, =gActiveBank ldrb r1, [r4] adds r0, r1, r5 @@ -949,7 +949,7 @@ _08064B7C: bl FreeSpriteTilesByTag adds r0, r4, 0 bl FreeSpritePaletteByTag - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08064BB6: pop {r4-r7} pop {r0} @@ -962,7 +962,7 @@ sub_8064BC0: @ 8064BC0 push {r4-r6,lr} ldr r6, =gActiveBank ldrb r0, [r6] - ldr r5, =gUnknown_03005D70 + ldr r5, =gHealthBoxesIds adds r1, r0, r5 ldrb r1, [r1] movs r2, 0 @@ -989,7 +989,7 @@ sub_8064BC0: @ 8064BC0 b _08064C0C .pool _08064C08: - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08064C0C: pop {r4-r6} pop {r0} @@ -1014,11 +1014,11 @@ sub_8064C14: @ 8064C14 lsls r0, 31 cmp r0, 0 bne _08064C42 - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds adds r0, r3, r0 ldrb r0, [r0] bl sub_8072984 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08064C42: pop {r0} bx r0 @@ -1061,12 +1061,12 @@ sub_8064C58: @ 8064C58 bl DestroySprite ldrb r0, [r6] bl sub_805EEE0 - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] bl sub_8072984 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08064CB2: pop {r4-r6} pop {r0} @@ -1082,7 +1082,7 @@ sub_8064CCC: @ 8064CCC lsls r0, 16 cmp r0, 0 bne _08064CDE - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08064CDE: pop {r0} bx r0 @@ -1116,7 +1116,7 @@ sub_8064CE4: @ 8064CE4 strb r0, [r2] ldr r0, =gDoingBattleAnim strb r3, [r0] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted b _08064D5A .pool _08064D30: @@ -1152,7 +1152,7 @@ _08064D5A: sub_8064D60: @ 8064D60 push {r4,lr} ldr r2, =gSprites - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds ldr r4, =gActiveBank ldrb r3, [r4] adds r0, r3, r0 @@ -1239,7 +1239,7 @@ _08064E1A: movs r2, 0x80 lsls r2, 1 bl m4aMPlayVolumeControl - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08064E2A: pop {r4} pop {r0} @@ -1308,7 +1308,7 @@ sub_8064E50: @ 8064E50 adds r0, r7 movs r1, 0 bl StartSpriteAnim - ldr r4, =gUnknown_03005D70 + ldr r4, =gHealthBoxesIds ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] @@ -1444,7 +1444,7 @@ sub_8065008: @ 8065008 ands r0, r1 cmp r0, 0 bne _0806502A - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _0806502A: pop {r0} bx r0 @@ -1468,15 +1468,15 @@ sub_8065038: @ 8065038 ands r0, r1 cmp r0, 0 bne _0806505A - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _0806505A: pop {r0} bx r0 .pool thumb_func_end sub_8065038 - thumb_func_start sub_8065068 -sub_8065068: @ 8065068 + thumb_func_start LinkOpponentBufferExecCompleted +LinkOpponentBufferExecCompleted: @ 8065068 push {r4,lr} sub sp, 0x4 ldr r1, =gBattleBankFunc @@ -1484,7 +1484,7 @@ sub_8065068: @ 8065068 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80643B0 + ldr r1, =LinkOpponentBufferRunCommand str r1, [r0] ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -1492,7 +1492,7 @@ sub_8065068: @ 8065068 ands r0, r1 cmp r0, 0 beq _080650BC - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 @@ -1523,7 +1523,7 @@ _080650CE: pop {r0} bx r0 .pool - thumb_func_end sub_8065068 + thumb_func_end LinkOpponentBufferExecCompleted thumb_func_start dp01t_00_2_getattr dp01t_00_2_getattr: @ 80650E0 @@ -1573,7 +1573,7 @@ _0806513A: movs r0, 0x1 mov r2, sp bl dp01_build_cmdbuf_x1D_1D_numargs_varargs - bl sub_8065068 + bl LinkOpponentBufferExecCompleted add sp, 0x100 pop {r4-r6} pop {r0} @@ -2461,7 +2461,7 @@ _080658EA: thumb_func_start sub_8065900 sub_8065900: @ 8065900 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8065900 @@ -2503,7 +2503,7 @@ _0806594E: cmp r5, 0x5 bls _08065940 _0806595A: - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r4,r5} pop {r0} bx r0 @@ -2522,7 +2522,7 @@ sub_8065964: @ 8065964 ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 - ldr r2, =gUnknown_02023067 + ldr r2, =gBattleBufferA + 3 adds r4, r0, r2 adds r7, r4, 0 subs r1, r2, 0x2 @@ -3542,7 +3542,7 @@ _080662BA: cmp r3, r0 bcc _080662BA _080662DC: - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r4-r7} pop {r0} bx r0 @@ -3943,12 +3943,12 @@ _0806666C: bl DestroySprite ldrb r0, [r6] bl sub_805EEE0 - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] bl sub_8072984 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _080666A8: pop {r4-r6} pop {r0} @@ -4057,11 +4057,11 @@ _08066770: ldrb r0, [r5] cmp r0, 0x1 bne _08066794 - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A b _08066796 .pool _08066794: - ldr r0, =gUnknown_02038BCC + ldr r0, =gTrainerBattleOpponent_B _08066796: ldrh r0, [r0] bl sub_8162AA0 @@ -4072,7 +4072,7 @@ _08066796: _080667A8: ldrb r0, [r5] bl sub_806D864 - ldr r6, =gUnknown_020229E8 + ldr r6, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -4143,7 +4143,7 @@ _08066838: b _0806693A _08066840: movs r7, 0xB0 - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 @@ -4153,8 +4153,8 @@ _08066840: b _08066948 .pool _08066858: - bl link_get_multiplayer_id - ldr r6, =gUnknown_020229E8 + bl GetMultiplayerId + ldr r6, =gLinkPlayers movs r5, 0x1 eors r0, r5 lsls r0, 24 @@ -4167,7 +4167,7 @@ _08066858: ldrb r0, [r1] cmp r0, 0x4 beq _08066892 - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4181,7 +4181,7 @@ _08066858: cmp r0, 0x5 bne _080668C8 _08066892: - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4205,7 +4205,7 @@ _080668BC: b _0806694C .pool _080668C8: - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4218,7 +4218,7 @@ _080668C8: ands r0, r1 cmp r0, 0x2 beq _080668FE - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4231,7 +4231,7 @@ _080668C8: cmp r4, 0x1 bne _08066930 _080668FE: - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4255,7 +4255,7 @@ _08066924: b _0806694C .pool _08066930: - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4389,11 +4389,11 @@ sub_8066A58: @ 8066A58 ldrb r0, [r0] cmp r0, 0x1 bne _08066A74 - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A b _08066A76 .pool _08066A74: - ldr r0, =gUnknown_02038BCC + ldr r0, =gTrainerBattleOpponent_B _08066A76: ldrh r0, [r0] bl sub_8162AA0 @@ -4503,7 +4503,7 @@ _08066A76: adds r0, r1 ldr r1, =sub_8064438 str r1, [r0] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r3} mov r8, r3 pop {r4-r6} @@ -4573,7 +4573,7 @@ sub_8066B94: @ 8066B94 lsls r0, 2 adds r0, r5 ldr r1, =SpriteCallbackDummy - bl oamt_set_x3A_32 + bl StoreSpriteCallbackInData6 ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 @@ -4666,7 +4666,7 @@ _08066CD0: thumb_func_start sub_8066CEC sub_8066CEC: @ 8066CEC push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8066CEC @@ -4674,7 +4674,7 @@ sub_8066CEC: @ 8066CEC thumb_func_start sub_8066CF8 sub_8066CF8: @ 8066CF8 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8066CF8 @@ -4682,7 +4682,7 @@ sub_8066CF8: @ 8066CF8 thumb_func_start sub_8066D04 sub_8066D04: @ 8066D04 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8066D04 @@ -4690,7 +4690,7 @@ sub_8066D04: @ 8066D04 thumb_func_start sub_8066D10 sub_8066D10: @ 8066D10 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8066D10 @@ -4812,7 +4812,7 @@ _08066D32: lsrs r3, r0, 24 cmp r3, 0 beq _08066E30 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted b _08066E58 .pool _08066E30: @@ -5017,7 +5017,7 @@ _08066FA8: lsls r0, 2 adds r0, r2 strb r4, [r0, 0x4] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08066FE4: pop {r3-r5} mov r8, r3 @@ -5039,11 +5039,11 @@ sub_8066FF4: @ 8066FF4 ldr r5, =gActiveBank ldrb r4, [r5] lsls r4, 9 - ldr r0, =gUnknown_02023066 + ldr r0, =gBattleBufferA + 2 adds r4, r0 ldrh r0, [r4] - bl battle_pick_message - ldr r0, =gUnknown_02022E2C + bl BufferStringBattle + ldr r0, =gDisplayedStringBattle movs r1, 0 bl battle_show_message_maybe ldr r1, =gBattleBankFunc @@ -5063,7 +5063,7 @@ sub_8066FF4: @ 8066FF4 thumb_func_start sub_806704C sub_806704C: @ 806704C push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_806704C @@ -5071,7 +5071,7 @@ sub_806704C: @ 806704C thumb_func_start sub_8067058 sub_8067058: @ 8067058 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8067058 @@ -5079,7 +5079,7 @@ sub_8067058: @ 8067058 thumb_func_start sub_8067064 sub_8067064: @ 8067064 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8067064 @@ -5087,7 +5087,7 @@ sub_8067064: @ 8067064 thumb_func_start sub_8067070 sub_8067070: @ 8067070 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8067070 @@ -5095,7 +5095,7 @@ sub_8067070: @ 8067070 thumb_func_start sub_806707C sub_806707C: @ 806707C push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_806707C @@ -5103,7 +5103,7 @@ sub_806707C: @ 806707C thumb_func_start sub_8067088 sub_8067088: @ 8067088 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8067088 @@ -5111,7 +5111,7 @@ sub_8067088: @ 8067088 thumb_func_start sub_8067094 sub_8067094: @ 8067094 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8067094 @@ -5166,7 +5166,7 @@ sub_80670A0: @ 80670A0 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -5188,7 +5188,7 @@ _08067130: adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, =gUnknown_03005D70 + ldr r1, =gHealthBoxesIds adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -5215,7 +5215,7 @@ _0806715A: thumb_func_start sub_8067190 sub_8067190: @ 8067190 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8067190 @@ -5229,7 +5229,7 @@ sub_806719C: @ 806719C lsls r0, 24 cmp r0, 0 bne _080671F0 - ldr r0, =gUnknown_03005D70 + ldr r0, =gHealthBoxesIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -5319,7 +5319,7 @@ _08067264: thumb_func_start sub_806727C sub_806727C: @ 806727C push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_806727C @@ -5327,7 +5327,7 @@ sub_806727C: @ 806727C thumb_func_start sub_8067288 sub_8067288: @ 8067288 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8067288 @@ -5335,7 +5335,7 @@ sub_8067288: @ 8067288 thumb_func_start sub_8067294 sub_8067294: @ 8067294 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8067294 @@ -5343,7 +5343,7 @@ sub_8067294: @ 8067294 thumb_func_start sub_80672A0 sub_80672A0: @ 80672A0 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80672A0 @@ -5351,7 +5351,7 @@ sub_80672A0: @ 80672A0 thumb_func_start sub_80672AC sub_80672AC: @ 80672AC push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80672AC @@ -5359,7 +5359,7 @@ sub_80672AC: @ 80672AC thumb_func_start sub_80672B8 sub_80672B8: @ 80672B8 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80672B8 @@ -5367,7 +5367,7 @@ sub_80672B8: @ 80672B8 thumb_func_start sub_80672C4 sub_80672C4: @ 80672C4 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80672C4 @@ -5375,7 +5375,7 @@ sub_80672C4: @ 80672C4 thumb_func_start sub_80672D0 sub_80672D0: @ 80672D0 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80672D0 @@ -5383,7 +5383,7 @@ sub_80672D0: @ 80672D0 thumb_func_start sub_80672DC sub_80672DC: @ 80672DC push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80672DC @@ -5397,7 +5397,7 @@ sub_80672E8: @ 80672E8 negs r0, r0 ands r0, r1 strb r0, [r2] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .pool @@ -5422,7 +5422,7 @@ sub_8067304: @ 8067304 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .pool @@ -5436,7 +5436,7 @@ sub_806733C: @ 806733C movs r0, 0x7F ands r0, r1 strb r0, [r2] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .pool @@ -5457,7 +5457,7 @@ sub_8067354: @ 8067354 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .pool @@ -5481,7 +5481,7 @@ sub_806737C: @ 806737C lsls r0, 29 cmp r0, 0 bge _080673B0 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted b _080673DA .pool _080673B0: @@ -5515,7 +5515,7 @@ _080673DA: thumb_func_start sub_80673EC sub_80673EC: @ 80673EC push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80673EC @@ -5546,7 +5546,7 @@ _0806740C: lsls r1, r3, 24 asrs r1, 24 bl PlaySE12WithPanning - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -5590,7 +5590,7 @@ _08067478: orrs r0, r1 bl PlayFanfare _0806748C: - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r4,r5} pop {r0} bx r0 @@ -5616,7 +5616,7 @@ sub_8067498: @ 8067498 movs r1, 0x19 movs r2, 0x5 bl PlayCry3 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .pool @@ -5638,7 +5638,7 @@ sub_80674D4: @ 80674D4 movs r1, 0x1 orrs r0, r1 strh r0, [r2] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .pool @@ -5705,7 +5705,7 @@ sub_8067508: @ 8067508 lsls r0, 2 adds r0, r4 ldr r1, =sub_80676FC - bl oamt_set_x3A_32 + bl StoreSpriteCallbackInData6 ldr r0, =c3_08038DC4 movs r1, 0x5 bl CreateTask @@ -5889,7 +5889,7 @@ sub_8067718: @ 8067718 lsls r0, 24 cmp r0, 0 bne _08067748 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted b _08067812 .pool _08067748: @@ -5946,7 +5946,7 @@ _080677B4: adds r5, r7, 0 ldrb r0, [r5] lsls r3, r0, 9 - ldr r4, =gUnknown_02023068 + ldr r4, =gBattleBufferA + 4 adds r1, r3, r4 subs r2, r4, 0x3 adds r2, r3, r2 @@ -6025,7 +6025,7 @@ sub_806782C: @ 806782C adds r0, r2 movs r1, 0 strb r1, [r0, 0x5] - bl sub_8065068 + bl LinkOpponentBufferExecCompleted _08067864: pop {r4} pop {r0} @@ -6061,7 +6061,7 @@ sub_8067874: @ 8067874 ldr r1, =sub_8073C30 str r1, [r0] _080678A6: - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .pool @@ -6070,7 +6070,7 @@ _080678A6: thumb_func_start sub_80678C4 sub_80678C4: @ 80678C4 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80678C4 @@ -6111,7 +6111,7 @@ sub_80678D0: @ 80678D0 ldrb r0, [r4] bl sub_805E408 _08067916: - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -6150,7 +6150,7 @@ sub_8067930: @ 8067930 lsls r0, 24 cmp r0, 0 beq _08067980 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted b _0806798C .pool _08067980: @@ -6177,10 +6177,10 @@ sub_80679A4: @ 80679A4 ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 - ldr r1, =gUnknown_02023066 + ldr r1, =gBattleBufferA + 2 adds r0, r1 bl sub_81851A8 - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 .pool @@ -6189,7 +6189,7 @@ sub_80679A4: @ 80679A4 thumb_func_start sub_80679C4 sub_80679C4: @ 80679C4 push {lr} - bl sub_8065068 + bl LinkOpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80679C4 @@ -6200,7 +6200,7 @@ sub_80679D0: @ 80679D0 ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 9 - ldr r4, =gUnknown_02023068 + ldr r4, =gBattleBufferA + 4 adds r0, r4 bl sub_81851A8 ldrb r0, [r5] @@ -6244,7 +6244,7 @@ _08067A08: bl FadeOutMapMusic movs r0, 0x3 bl BeginFastPaletteFade - bl sub_8065068 + bl LinkOpponentBufferExecCompleted ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 |