diff options
65 files changed, 12117 insertions, 12117 deletions
diff --git a/asm/battle_10.s b/asm/battle_10.s index f7844a25a..548c77bce 100644 --- a/asm/battle_10.s +++ b/asm/battle_10.s @@ -6,13 +6,13 @@ .text - thumb_func_start dp01t_00_4_getattr -dp01t_00_4_getattr: @ 803807C + thumb_func_start LinkOpponentHandleGetAttributes +LinkOpponentHandleGetAttributes: @ 803807C push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _080380A8 @ =gUnknown_02023A60 - ldr r0, _080380AC @ =gUnknown_02024A60 + ldr r1, _080380A8 @ =gBattleBufferA + ldr r0, _080380AC @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -20,7 +20,7 @@ dp01t_00_4_getattr: @ 803807C ldrb r0, [r1] cmp r0, 0 bne _080380B4 - ldr r0, _080380B0 @ =gUnknown_02024A6A + ldr r0, _080380B0 @ =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -29,9 +29,9 @@ dp01t_00_4_getattr: @ 803807C adds r6, r0, 0 b _080380D6 .align 2, 0 -_080380A8: .4byte gUnknown_02023A60 -_080380AC: .4byte gUnknown_02024A60 -_080380B0: .4byte gUnknown_02024A6A +_080380A8: .4byte gBattleBufferA +_080380AC: .4byte gActiveBank +_080380B0: .4byte gBattlePartyID _080380B4: ldrb r4, [r1] movs r5, 0 @@ -62,7 +62,7 @@ _080380D6: pop {r4-r6} pop {r0} bx r0 - thumb_func_end dp01t_00_4_getattr + thumb_func_end LinkOpponentHandleGetAttributes thumb_func_start dp01_getattr_by_ch1_for_player_pokemon__ dp01_getattr_by_ch1_for_player_pokemon__: @ 80380F0 @@ -76,8 +76,8 @@ dp01_getattr_by_ch1_for_player_pokemon__: @ 80380F0 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _08038124 @ =gUnknown_02023A60 - ldr r3, _08038128 @ =gUnknown_02024A60 + ldr r2, _08038124 @ =gBattleBufferA + ldr r3, _08038128 @ =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -93,8 +93,8 @@ _0803811A: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08038124: .4byte gUnknown_02023A60 -_08038128: .4byte gUnknown_02024A60 +_08038124: .4byte gBattleBufferA +_08038128: .4byte gActiveBank _0803812C: .4byte _08038130 .align 2, 0 _08038130: @@ -1009,8 +1009,8 @@ sub_803889C: @ 803889C thumb_func_start sub_80388A8 sub_80388A8: @ 80388A8 push {r4,r5,lr} - ldr r1, _080388CC @ =gUnknown_02023A60 - ldr r0, _080388D0 @ =gUnknown_02024A60 + ldr r1, _080388CC @ =gBattleBufferA + ldr r0, _080388D0 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -1018,16 +1018,16 @@ sub_80388A8: @ 80388A8 ldrb r0, [r1] cmp r0, 0 bne _080388D8 - ldr r0, _080388D4 @ =gUnknown_02024A6A + ldr r0, _080388D4 @ =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_8038900 b _080388F6 .align 2, 0 -_080388CC: .4byte gUnknown_02023A60 -_080388D0: .4byte gUnknown_02024A60 -_080388D4: .4byte gUnknown_02024A6A +_080388CC: .4byte gBattleBufferA +_080388D0: .4byte gActiveBank +_080388D4: .4byte gBattlePartyID _080388D8: ldrb r4, [r1] movs r5, 0 @@ -1062,7 +1062,7 @@ sub_8038900: @ 8038900 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, _08038938 @ =gUnknown_02024A60 + ldr r3, _08038938 @ =gActiveBank ldrb r0, [r3] lsls r0, 9 ldr r2, _0803893C @ =gUnknown_02023A63 @@ -1083,7 +1083,7 @@ _0803892E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08038938: .4byte gUnknown_02024A60 +_08038938: .4byte gActiveBank _0803893C: .4byte gUnknown_02023A63 _08038940: .4byte _08038944 .align 2, 0 @@ -1402,7 +1402,7 @@ _08038C58: muls r0, r5 ldr r1, _08038C70 @ =gEnemyParty adds r0, r1 - ldr r3, _08038C74 @ =gUnknown_02023A60 + ldr r3, _08038C74 @ =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -1412,7 +1412,7 @@ _08038C58: b _08038CF6 .align 2, 0 _08038C70: .4byte gEnemyParty -_08038C74: .4byte gUnknown_02023A60 +_08038C74: .4byte gBattleBufferA _08038C78: movs r0, 0x64 adds r4, r5, 0 @@ -1466,7 +1466,7 @@ _08038CE0: muls r0, r5 ldr r1, _08038D00 @ =gEnemyParty adds r0, r1 - ldr r3, _08038D04 @ =gUnknown_02023A60 + ldr r3, _08038D04 @ =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -1480,7 +1480,7 @@ _08038CF6: b _0803920C .align 2, 0 _08038D00: .4byte gEnemyParty -_08038D04: .4byte gUnknown_02023A60 +_08038D04: .4byte gBattleBufferA _08038D08: movs r0, 0x64 muls r0, r5 @@ -2095,8 +2095,8 @@ _0803921C: .4byte gEnemyParty thumb_func_start sub_8039220 sub_8039220: @ 8039220 push {r4-r7,lr} - ldr r1, _08039284 @ =gUnknown_02024A6A - ldr r7, _08039288 @ =gUnknown_02024A60 + ldr r1, _08039284 @ =gBattlePartyID + ldr r7, _08039288 @ =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -2104,7 +2104,7 @@ sub_8039220: @ 8039220 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _0803928C @ =gUnknown_02023A60 + ldr r4, _0803928C @ =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -2145,9 +2145,9 @@ _08039278: pop {r0} bx r0 .align 2, 0 -_08039284: .4byte gUnknown_02024A6A -_08039288: .4byte gUnknown_02024A60 -_0803928C: .4byte gUnknown_02023A60 +_08039284: .4byte gBattlePartyID +_08039288: .4byte gActiveBank +_0803928C: .4byte gBattleBufferA _08039290: .4byte gEnemyParty thumb_func_end sub_8039220 @@ -2158,8 +2158,8 @@ sub_8039294: @ 8039294 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r7, _080393BC @ =gUnknown_02024A6A - ldr r6, _080393C0 @ =gUnknown_02024A60 + ldr r7, _080393BC @ =gBattlePartyID + ldr r6, _080393C0 @ =gActiveBank ldrb r0, [r6] lsls r0, 1 adds r0, r7 @@ -2187,7 +2187,7 @@ sub_8039294: @ 8039294 add r0, r9 bl sub_8031794 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2215,7 +2215,7 @@ sub_8039294: @ 8039294 adds r1, r5, 0 adds r2, r4, 0 bl CreateSprite - ldr r4, _080393CC @ =gUnknown_02024BE0 + ldr r4, _080393CC @ =gObjectBankIDs ldrb r1, [r6] adds r1, r4 strb r0, [r1] @@ -2276,7 +2276,7 @@ sub_8039294: @ 8039294 lsrs r1, 16 adds r0, r4, 0 bl sub_8032984 - ldr r1, _080393DC @ =gUnknown_03004330 + ldr r1, _080393DC @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -2290,27 +2290,27 @@ sub_8039294: @ 8039294 pop {r0} bx r0 .align 2, 0 -_080393BC: .4byte gUnknown_02024A6A -_080393C0: .4byte gUnknown_02024A60 +_080393BC: .4byte gBattlePartyID +_080393C0: .4byte gActiveBank _080393C4: .4byte gEnemyParty _080393C8: .4byte gUnknown_02024E8C -_080393CC: .4byte gUnknown_02024BE0 +_080393CC: .4byte gObjectBankIDs _080393D0: .4byte gSprites _080393D4: .4byte 0x0000ff10 _080393D8: .4byte gBattleMonForms -_080393DC: .4byte gUnknown_03004330 +_080393DC: .4byte gBattleBankFunc _080393E0: .4byte sub_8037A74 thumb_func_end sub_8039294 thumb_func_start sub_80393E4 sub_80393E4: @ 80393E4 push {r4,lr} - ldr r1, _0803941C @ =gUnknown_02024A6A - ldr r4, _08039420 @ =gUnknown_02024A60 + ldr r1, _0803941C @ =gBattlePartyID + ldr r4, _08039420 @ =gActiveBank ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 - ldr r3, _08039424 @ =gUnknown_02023A60 + ldr r3, _08039424 @ =gBattleBufferA lsls r0, 9 adds r1, r3, 0x1 adds r0, r1 @@ -2322,7 +2322,7 @@ sub_80393E4: @ 80393E4 adds r1, r3 ldrb r1, [r1] bl sub_8039430 - ldr r1, _08039428 @ =gUnknown_03004330 + ldr r1, _08039428 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -2332,10 +2332,10 @@ sub_80393E4: @ 80393E4 pop {r0} bx r0 .align 2, 0 -_0803941C: .4byte gUnknown_02024A6A -_08039420: .4byte gUnknown_02024A60 -_08039424: .4byte gUnknown_02023A60 -_08039428: .4byte gUnknown_03004330 +_0803941C: .4byte gBattlePartyID +_08039420: .4byte gActiveBank +_08039424: .4byte gBattleBufferA +_08039428: .4byte gBattleBankFunc _0803942C: .4byte sub_8037E30 thumb_func_end sub_80393E4 @@ -2353,10 +2353,10 @@ sub_8039430: @ 8039430 lsrs r1, 24 adds r0, r6, 0 bl sub_8032AA8 - ldr r0, _0803958C @ =gUnknown_02024A6A + ldr r0, _0803958C @ =gBattlePartyID lsls r4, r6, 1 adds r4, r0 - ldr r0, _08039590 @ =gUnknown_02023A60 + ldr r0, _08039590 @ =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -2391,7 +2391,7 @@ sub_8039430: @ 8039430 adds r1, r6, 0 bl sub_8031794 adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2419,7 +2419,7 @@ sub_8039430: @ 8039430 adds r1, r5, 0 adds r2, r4, 0 bl CreateSprite - ldr r4, _080395A4 @ =gUnknown_02024BE0 + ldr r4, _080395A4 @ =gObjectBankIDs adds r4, r6, r4 strb r0, [r4] ldr r5, _080395A8 @ =gSprites @@ -2503,13 +2503,13 @@ sub_8039430: @ 8039430 pop {r0} bx r0 .align 2, 0 -_0803958C: .4byte gUnknown_02024A6A -_08039590: .4byte gUnknown_02023A60 +_0803958C: .4byte gBattlePartyID +_08039590: .4byte gBattleBufferA _08039594: .4byte gEnemyParty _08039598: .4byte sub_80312F0 _0803959C: .4byte gUnknown_0300434C _080395A0: .4byte gUnknown_02024E8C -_080395A4: .4byte gUnknown_02024BE0 +_080395A4: .4byte gObjectBankIDs _080395A8: .4byte gSprites _080395AC: .4byte gBattleMonForms _080395B0: .4byte SpriteCallbackDummy @@ -2518,8 +2518,8 @@ _080395B0: .4byte SpriteCallbackDummy thumb_func_start sub_80395B4 sub_80395B4: @ 80395B4 push {r4-r6,lr} - ldr r1, _080395E4 @ =gUnknown_02023A60 - ldr r6, _080395E8 @ =gUnknown_02024A60 + ldr r1, _080395E4 @ =gBattleBufferA + ldr r6, _080395E8 @ =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -2533,7 +2533,7 @@ sub_80395B4: @ 80395B4 ldr r1, _080395EC @ =0x02017810 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _080395F0 @ =gUnknown_03004330 + ldr r1, _080395F0 @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -2541,13 +2541,13 @@ sub_80395B4: @ 80395B4 str r1, [r0] b _08039634 .align 2, 0 -_080395E4: .4byte gUnknown_02023A60 -_080395E8: .4byte gUnknown_02024A60 +_080395E4: .4byte gBattleBufferA +_080395E8: .4byte gActiveBank _080395EC: .4byte 0x02017810 -_080395F0: .4byte gUnknown_03004330 +_080395F0: .4byte gBattleBankFunc _080395F4: .4byte sub_8039648 _080395F8: - ldr r5, _0803963C @ =gUnknown_02024BE0 + ldr r5, _0803963C @ =gObjectBankIDs adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 @@ -2566,7 +2566,7 @@ _080395F8: bl DestroySprite ldrb r0, [r6] bl sub_8032A08 - ldr r1, _08039644 @ =gUnknown_03004340 + ldr r1, _08039644 @ =gHealthboxIDs ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -2577,15 +2577,15 @@ _08039634: pop {r0} bx r0 .align 2, 0 -_0803963C: .4byte gUnknown_02024BE0 +_0803963C: .4byte gObjectBankIDs _08039640: .4byte gSprites -_08039644: .4byte gUnknown_03004340 +_08039644: .4byte gHealthboxIDs thumb_func_end sub_80395B4 thumb_func_start sub_8039648 sub_8039648: @ 8039648 push {r4,r5,lr} - ldr r5, _08039664 @ =gUnknown_02024A60 + ldr r5, _08039664 @ =gActiveBank ldrb r2, [r5] lsls r0, r2, 1 adds r0, r2 @@ -2599,7 +2599,7 @@ sub_8039648: @ 8039648 beq _08039698 b _080396C0 .align 2, 0 -_08039664: .4byte gUnknown_02024A60 +_08039664: .4byte gActiveBank _08039668: .4byte 0x02017810 _0803966C: lsls r0, r2, 2 @@ -2638,7 +2638,7 @@ _08039698: adds r1, r2, 0 movs r3, 0x2 bl move_anim_start_t4 - ldr r1, _080396C8 @ =gUnknown_03004330 + ldr r1, _080396C8 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -2649,7 +2649,7 @@ _080396C0: pop {r0} bx r0 .align 2, 0 -_080396C8: .4byte gUnknown_03004330 +_080396C8: .4byte gBattleBankFunc _080396CC: .4byte sub_8037BBC thumb_func_end sub_8039648 @@ -2665,9 +2665,9 @@ sub_80396D0: @ 80396D0 ands r0, r1 cmp r0, 0 beq _08039714 - ldr r6, _08039708 @ =gUnknown_02024A60 + ldr r6, _08039708 @ =gActiveBank ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 ands r1, r0 movs r5, 0x10 @@ -2681,7 +2681,7 @@ _080396F8: b _08039724 .align 2, 0 _08039704: .4byte gBattleTypeFlags -_08039708: .4byte gUnknown_02024A60 +_08039708: .4byte gActiveBank _0803970C: .4byte 0x0000fff0 _08039710: .4byte gLinkPlayers _08039714: @@ -2699,14 +2699,14 @@ _08039724: adds r1, r4 ldrb r0, [r1, 0x13] mov r9, r0 - ldr r0, _08039870 @ =gUnknown_02024A60 + ldr r0, _08039870 @ =gActiveBank mov r8, r0 ldrb r1, [r0] mov r0, r9 bl sub_8031A6C mov r1, r8 ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2740,7 +2740,7 @@ _08039724: adds r1, r5, 0 adds r2, r4, 0 bl CreateSprite - ldr r5, _0803987C @ =gUnknown_02024BE0 + ldr r5, _0803987C @ =gObjectBankIDs mov r2, r8 ldrb r1, [r2] adds r1, r5 @@ -2836,7 +2836,7 @@ _08039724: adds r0, r4 ldr r1, _08039898 @ =sub_80313A0 str r1, [r0] - ldr r1, _0803989C @ =gUnknown_03004330 + ldr r1, _0803989C @ =gBattleBankFunc mov r2, r8 ldrb r0, [r2] lsls r0, 2 @@ -2851,10 +2851,10 @@ _08039724: bx r0 .align 2, 0 _0803986C: .4byte gLinkPlayers -_08039870: .4byte gUnknown_02024A60 +_08039870: .4byte gActiveBank _08039874: .4byte gUnknown_02024E8C _08039878: .4byte gTrainerFrontPicCoords -_0803987C: .4byte gUnknown_02024BE0 +_0803987C: .4byte gObjectBankIDs _08039880: .4byte gSprites _08039884: .4byte 0x0000ff10 _08039888: .4byte gTrainerFrontPicPaletteTable @@ -2862,7 +2862,7 @@ _0803988C: .4byte gTrainerFrontPicTable _08039890: .4byte 0x000003ff _08039894: .4byte 0xfffffc00 _08039898: .4byte sub_80313A0 -_0803989C: .4byte gUnknown_03004330 +_0803989C: .4byte gBattleBankFunc _080398A0: .4byte sub_803757C thumb_func_end sub_80396D0 @@ -2877,8 +2877,8 @@ sub_80398A4: @ 80398A4 thumb_func_start sub_80398B0 sub_80398B0: @ 80398B0 push {r4-r6,lr} - ldr r6, _08039940 @ =gUnknown_02024BE0 - ldr r4, _08039944 @ =gUnknown_02024A60 + ldr r6, _08039940 @ =gObjectBankIDs + ldr r4, _08039944 @ =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -2936,7 +2936,7 @@ sub_80398B0: @ 80398B0 adds r0, r5 ldr r1, _08039950 @ =SpriteCallbackDummy bl oamt_set_x3A_32 - ldr r1, _08039954 @ =gUnknown_03004330 + ldr r1, _08039954 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -2946,19 +2946,19 @@ sub_80398B0: @ 80398B0 pop {r0} bx r0 .align 2, 0 -_08039940: .4byte gUnknown_02024BE0 -_08039944: .4byte gUnknown_02024A60 +_08039940: .4byte gObjectBankIDs +_08039944: .4byte gActiveBank _08039948: .4byte gSprites _0803994C: .4byte sub_8078B34 _08039950: .4byte SpriteCallbackDummy -_08039954: .4byte gUnknown_03004330 +_08039954: .4byte gBattleBankFunc _08039958: .4byte sub_80375B4 thumb_func_end sub_80398B0 thumb_func_start sub_803995C sub_803995C: @ 803995C push {r4,r5,lr} - ldr r5, _080399A0 @ =gUnknown_02024A60 + ldr r5, _080399A0 @ =gActiveBank ldrb r2, [r5] lsls r0, r2, 1 adds r0, r2 @@ -2992,7 +2992,7 @@ _0803998E: strb r0, [r1, 0x4] b _080399E4 .align 2, 0 -_080399A0: .4byte gUnknown_02024A60 +_080399A0: .4byte gActiveBank _080399A4: .4byte 0x02017810 _080399A8: ldrb r1, [r3] @@ -3007,7 +3007,7 @@ _080399A8: movs r1, 0x3F bl PlaySE12WithPanning ldr r2, _080399EC @ =gSprites - ldr r1, _080399F0 @ =gUnknown_02024BE0 + ldr r1, _080399F0 @ =gObjectBankIDs ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -3018,7 +3018,7 @@ _080399A8: adds r0, r2 ldr r1, _080399F4 @ =sub_8010384 str r1, [r0] - ldr r1, _080399F8 @ =gUnknown_03004330 + ldr r1, _080399F8 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3030,9 +3030,9 @@ _080399E4: bx r0 .align 2, 0 _080399EC: .4byte gSprites -_080399F0: .4byte gUnknown_02024BE0 +_080399F0: .4byte gObjectBankIDs _080399F4: .4byte sub_8010384 -_080399F8: .4byte gUnknown_03004330 +_080399F8: .4byte gBattleBankFunc _080399FC: .4byte sub_8037B78 thumb_func_end sub_803995C @@ -3071,7 +3071,7 @@ sub_8039A24: @ 8039A24 thumb_func_start sub_8039A30 sub_8039A30: @ 8039A30 push {r4-r6,lr} - ldr r6, _08039B14 @ =gUnknown_02024A60 + ldr r6, _08039B14 @ =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -3079,7 +3079,7 @@ sub_8039A30: @ 8039A30 beq _08039A42 b _08039B52 _08039A42: - ldr r0, _08039B18 @ =gUnknown_02023A60 + ldr r0, _08039B18 @ =gBattleBufferA mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -3098,7 +3098,7 @@ _08039A42: adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, _08039B20 @ =gUnknown_0202F7BC + ldr r4, _08039B20 @ =gMovePowerMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3112,7 +3112,7 @@ _08039A42: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, _08039B24 @ =gUnknown_0202F7B8 + ldr r4, _08039B24 @ =gMoveDmgMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3138,7 +3138,7 @@ _08039A42: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, _08039B28 @ =gUnknown_0202F7BE + ldr r3, _08039B28 @ =gHappinessMoveAnim ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -3146,7 +3146,7 @@ _08039A42: adds r1, r2 ldrb r1, [r1] strb r1, [r3] - ldr r4, _08039B2C @ =gUnknown_0202F7C0 + ldr r4, _08039B2C @ =gWeatherMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3160,14 +3160,14 @@ _08039A42: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, _08039B30 @ =gUnknown_0202F7B4 + ldr r3, _08039B30 @ =gDisableStructMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 adds r1, 0x10 adds r2, r1 str r2, [r3] - ldr r3, _08039B34 @ =gUnknown_02024E70 + ldr r3, _08039B34 @ =gPID_perBank ldrb r1, [r6] lsls r1, 2 adds r1, r3 @@ -3182,15 +3182,15 @@ _08039A42: bl dp01_tbl4_exec_completed b _08039B52 .align 2, 0 -_08039B14: .4byte gUnknown_02024A60 -_08039B18: .4byte gUnknown_02023A60 +_08039B14: .4byte gActiveBank +_08039B18: .4byte gBattleBufferA _08039B1C: .4byte gUnknown_0202F7C4 -_08039B20: .4byte gUnknown_0202F7BC -_08039B24: .4byte gUnknown_0202F7B8 -_08039B28: .4byte gUnknown_0202F7BE -_08039B2C: .4byte gUnknown_0202F7C0 -_08039B30: .4byte gUnknown_0202F7B4 -_08039B34: .4byte gUnknown_02024E70 +_08039B20: .4byte gMovePowerMoveAnim +_08039B24: .4byte gMoveDmgMoveAnim +_08039B28: .4byte gHappinessMoveAnim +_08039B2C: .4byte gWeatherMoveAnim +_08039B30: .4byte gDisableStructMoveAnim +_08039B34: .4byte gPID_perBank _08039B38: ldrb r1, [r6] lsls r0, r1, 1 @@ -3199,7 +3199,7 @@ _08039B38: ldr r1, _08039B58 @ =0x02017810 adds r0, r1 strb r2, [r0, 0x4] - ldr r1, _08039B5C @ =gUnknown_03004330 + ldr r1, _08039B5C @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -3211,7 +3211,7 @@ _08039B52: bx r0 .align 2, 0 _08039B58: .4byte 0x02017810 -_08039B5C: .4byte gUnknown_03004330 +_08039B5C: .4byte gBattleBankFunc _08039B60: .4byte sub_8039B64 thumb_func_end sub_8039A30 @@ -3221,8 +3221,8 @@ sub_8039B64: @ 8039B64 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r2, _08039BA8 @ =gUnknown_02023A60 - ldr r5, _08039BAC @ =gUnknown_02024A60 + ldr r2, _08039BA8 @ =gBattleBufferA + ldr r5, _08039BAC @ =gActiveBank ldrb r3, [r5] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -3252,8 +3252,8 @@ sub_8039B64: @ 8039B64 beq _08039BBE b _08039CBC .align 2, 0 -_08039BA8: .4byte gUnknown_02023A60 -_08039BAC: .4byte gUnknown_02024A60 +_08039BA8: .4byte gBattleBufferA +_08039BAC: .4byte gActiveBank _08039BB0: .4byte 0x02017810 _08039BB4: cmp r2, 0x2 @@ -3341,7 +3341,7 @@ _08039C18: ands r1, r2 strb r1, [r0] _08039C60: - ldr r0, _08039C7C @ =gUnknown_02024A60 + ldr r0, _08039C7C @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3354,7 +3354,7 @@ _08039C60: .align 2, 0 _08039C74: .4byte gAnimScriptCallback _08039C78: .4byte gAnimScriptActive -_08039C7C: .4byte gUnknown_02024A60 +_08039C7C: .4byte gActiveBank _08039C80: .4byte 0x02017810 _08039C84: ldrb r1, [r0] @@ -3400,21 +3400,21 @@ sub_8039CC8: @ 8039CC8 strh r1, [r0] ldr r0, _08039D10 @ =gUnknown_030042A0 strh r1, [r0] - ldr r4, _08039D14 @ =gUnknown_02024A60 + ldr r4, _08039D14 @ =gActiveBank ldrb r0, [r4] lsls r0, 9 ldr r1, _08039D18 @ =gUnknown_02023A62 adds r0, r1 ldrh r0, [r0] - bl sub_8120AA8 + bl BufferStringBattle ldr r0, _08039D1C @ =gUnknown_03004210 - ldr r1, _08039D20 @ =gUnknown_020238CC + ldr r1, _08039D20 @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 movs r3, 0x2 bl sub_8002EB0 - ldr r1, _08039D24 @ =gUnknown_03004330 + ldr r1, _08039D24 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3427,11 +3427,11 @@ sub_8039CC8: @ 8039CC8 .align 2, 0 _08039D0C: .4byte gUnknown_030042A4 _08039D10: .4byte gUnknown_030042A0 -_08039D14: .4byte gUnknown_02024A60 +_08039D14: .4byte gActiveBank _08039D18: .4byte gUnknown_02023A62 _08039D1C: .4byte gUnknown_03004210 -_08039D20: .4byte gUnknown_020238CC -_08039D24: .4byte gUnknown_03004330 +_08039D20: .4byte gDisplayedStringBattle +_08039D24: .4byte gBattleBankFunc _08039D28: .4byte sub_8037C2C thumb_func_end sub_8039CC8 @@ -3500,8 +3500,8 @@ sub_8039D80: @ 8039D80 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _08039DF8 @ =gUnknown_02023A60 - ldr r0, _08039DFC @ =gUnknown_02024A60 + ldr r3, _08039DF8 @ =gBattleBufferA + ldr r0, _08039DFC @ =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -3518,7 +3518,7 @@ sub_8039D80: @ 8039D80 ldr r0, _08039E00 @ =0x00007fff cmp r7, r0 beq _08039E10 - ldr r6, _08039E04 @ =gUnknown_02024A6A + ldr r6, _08039E04 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -3541,7 +3541,7 @@ sub_8039D80: @ 8039D80 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _08039E0C @ =gUnknown_03004340 + ldr r1, _08039E0C @ =gHealthboxIDs adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -3549,14 +3549,14 @@ sub_8039D80: @ 8039D80 bl sub_8043D84 b _08039E3A .align 2, 0 -_08039DF8: .4byte gUnknown_02023A60 -_08039DFC: .4byte gUnknown_02024A60 +_08039DF8: .4byte gBattleBufferA +_08039DFC: .4byte gActiveBank _08039E00: .4byte 0x00007fff -_08039E04: .4byte gUnknown_02024A6A +_08039E04: .4byte gBattlePartyID _08039E08: .4byte gEnemyParty -_08039E0C: .4byte gUnknown_03004340 +_08039E0C: .4byte gHealthboxIDs _08039E10: - ldr r1, _08039E58 @ =gUnknown_02024A6A + ldr r1, _08039E58 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -3569,15 +3569,15 @@ _08039E10: adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _08039E60 @ =gUnknown_03004340 + ldr r1, _08039E60 @ =gHealthboxIDs adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] movs r3, 0 bl sub_8043D84 _08039E3A: - ldr r1, _08039E64 @ =gUnknown_03004330 - ldr r0, _08039E68 @ =gUnknown_02024A60 + ldr r1, _08039E64 @ =gBattleBankFunc + ldr r0, _08039E68 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -3591,11 +3591,11 @@ _08039E3A: pop {r0} bx r0 .align 2, 0 -_08039E58: .4byte gUnknown_02024A6A +_08039E58: .4byte gBattlePartyID _08039E5C: .4byte gEnemyParty -_08039E60: .4byte gUnknown_03004340 -_08039E64: .4byte gUnknown_03004330 -_08039E68: .4byte gUnknown_02024A60 +_08039E60: .4byte gHealthboxIDs +_08039E64: .4byte gBattleBankFunc +_08039E68: .4byte gActiveBank _08039E6C: .4byte sub_8037B24 thumb_func_end sub_8039D80 @@ -3610,17 +3610,17 @@ sub_8039E70: @ 8039E70 thumb_func_start sub_8039E7C sub_8039E7C: @ 8039E7C push {r4,lr} - ldr r4, _08039ED4 @ =gUnknown_02024A60 + ldr r4, _08039ED4 @ =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08039ECC - ldr r0, _08039ED8 @ =gUnknown_03004340 + ldr r0, _08039ED8 @ =gHealthboxIDs ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _08039EDC @ =gUnknown_02024A6A + ldr r2, _08039EDC @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -3641,7 +3641,7 @@ sub_8039E7C: @ 8039E7C negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _08039EE8 @ =gUnknown_03004330 + ldr r1, _08039EE8 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3652,25 +3652,25 @@ _08039ECC: pop {r0} bx r0 .align 2, 0 -_08039ED4: .4byte gUnknown_02024A60 -_08039ED8: .4byte gUnknown_03004340 -_08039EDC: .4byte gUnknown_02024A6A +_08039ED4: .4byte gActiveBank +_08039ED8: .4byte gHealthboxIDs +_08039EDC: .4byte gBattlePartyID _08039EE0: .4byte gEnemyParty _08039EE4: .4byte 0x02017810 -_08039EE8: .4byte gUnknown_03004330 +_08039EE8: .4byte gBattleBankFunc _08039EEC: .4byte sub_8037FAC thumb_func_end sub_8039E7C thumb_func_start sub_8039EF0 sub_8039EF0: @ 8039EF0 push {r4,r5,lr} - ldr r5, _08039F48 @ =gUnknown_02024A60 + ldr r5, _08039F48 @ =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08039F40 - ldr r4, _08039F4C @ =gUnknown_02023A60 + ldr r4, _08039F4C @ =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -3695,7 +3695,7 @@ sub_8039EF0: @ 8039EF0 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _08039F50 @ =gUnknown_03004330 + ldr r1, _08039F50 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3706,9 +3706,9 @@ _08039F40: pop {r0} bx r0 .align 2, 0 -_08039F48: .4byte gUnknown_02024A60 -_08039F4C: .4byte gUnknown_02023A60 -_08039F50: .4byte gUnknown_03004330 +_08039F48: .4byte gActiveBank +_08039F4C: .4byte gBattleBufferA +_08039F50: .4byte gBattleBankFunc _08039F54: .4byte sub_8037FAC thumb_func_end sub_8039EF0 @@ -3804,8 +3804,8 @@ _08039FDC: .4byte gUnknown_020238C8 sub_8039FE0: @ 8039FE0 push {lr} ldr r3, _0803A00C @ =gUnknown_020238C8 - ldr r1, _0803A010 @ =gUnknown_02023A60 - ldr r0, _0803A014 @ =gUnknown_02024A60 + ldr r1, _0803A010 @ =gBattleBufferA + ldr r0, _0803A014 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -3824,8 +3824,8 @@ sub_8039FE0: @ 8039FE0 bx r0 .align 2, 0 _0803A00C: .4byte gUnknown_020238C8 -_0803A010: .4byte gUnknown_02023A60 -_0803A014: .4byte gUnknown_02024A60 +_0803A010: .4byte gBattleBufferA +_0803A014: .4byte gActiveBank thumb_func_end sub_8039FE0 thumb_func_start sub_803A018 @@ -3869,8 +3869,8 @@ _0803A054: .4byte gUnknown_020238C8 dp01t_29_4_blink: @ 803A058 push {r4,lr} ldr r3, _0803A080 @ =gSprites - ldr r2, _0803A084 @ =gUnknown_02024BE0 - ldr r4, _0803A088 @ =gUnknown_02024A60 + ldr r2, _0803A084 @ =gObjectBankIDs + ldr r4, _0803A088 @ =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -3887,10 +3887,10 @@ dp01t_29_4_blink: @ 803A058 b _0803A0B6 .align 2, 0 _0803A080: .4byte gSprites -_0803A084: .4byte gUnknown_02024BE0 -_0803A088: .4byte gUnknown_02024A60 +_0803A084: .4byte gObjectBankIDs +_0803A088: .4byte gActiveBank _0803A08C: - ldr r1, _0803A0BC @ =gUnknown_02024E6D + ldr r1, _0803A0BC @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -3904,7 +3904,7 @@ _0803A08C: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_8047858 - ldr r1, _0803A0C0 @ =gUnknown_03004330 + ldr r1, _0803A0C0 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3915,8 +3915,8 @@ _0803A0B6: pop {r0} bx r0 .align 2, 0 -_0803A0BC: .4byte gUnknown_02024E6D -_0803A0C0: .4byte gUnknown_03004330 +_0803A0BC: .4byte gDoingBattleAnim +_0803A0C0: .4byte gBattleBankFunc _0803A0C4: .4byte dp01t_0F_4_move_anim thumb_func_end dp01t_29_4_blink @@ -3931,16 +3931,16 @@ sub_803A0C8: @ 803A0C8 thumb_func_start sub_803A0D4 sub_803A0D4: @ 803A0D4 push {r4,lr} - ldr r4, _0803A110 @ =gUnknown_02024A60 + ldr r4, _0803A110 @ =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _0803A0E8 movs r3, 0xC0 _0803A0E8: - ldr r2, _0803A114 @ =gUnknown_02023A60 + ldr r2, _0803A114 @ =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -3959,15 +3959,15 @@ _0803A0E8: pop {r0} bx r0 .align 2, 0 -_0803A110: .4byte gUnknown_02024A60 -_0803A114: .4byte gUnknown_02023A60 +_0803A110: .4byte gActiveBank +_0803A114: .4byte gBattleBufferA thumb_func_end sub_803A0D4 thumb_func_start sub_803A118 sub_803A118: @ 803A118 push {lr} - ldr r2, _0803A140 @ =gUnknown_02023A60 - ldr r0, _0803A144 @ =gUnknown_02024A60 + ldr r2, _0803A140 @ =gBattleBufferA + ldr r0, _0803A144 @ =gActiveBank ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -3983,15 +3983,15 @@ sub_803A118: @ 803A118 pop {r0} bx r0 .align 2, 0 -_0803A140: .4byte gUnknown_02023A60 -_0803A144: .4byte gUnknown_02024A60 +_0803A140: .4byte gBattleBufferA +_0803A144: .4byte gActiveBank thumb_func_end sub_803A118 thumb_func_start sub_803A148 sub_803A148: @ 803A148 push {lr} - ldr r1, _0803A178 @ =gUnknown_02024A6A - ldr r0, _0803A17C @ =gUnknown_02024A60 + ldr r1, _0803A178 @ =gBattlePartyID + ldr r0, _0803A17C @ =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -4011,16 +4011,16 @@ sub_803A148: @ 803A148 pop {r0} bx r0 .align 2, 0 -_0803A178: .4byte gUnknown_02024A6A -_0803A17C: .4byte gUnknown_02024A60 +_0803A178: .4byte gBattlePartyID +_0803A17C: .4byte gActiveBank _0803A180: .4byte gEnemyParty thumb_func_end sub_803A148 thumb_func_start dp01t_2E_4_battle_intro dp01t_2E_4_battle_intro: @ 803A184 push {lr} - ldr r1, _0803A1AC @ =gUnknown_02023A60 - ldr r0, _0803A1B0 @ =gUnknown_02024A60 + ldr r1, _0803A1AC @ =gBattleBufferA + ldr r0, _0803A1B0 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4036,16 +4036,16 @@ dp01t_2E_4_battle_intro: @ 803A184 pop {r0} bx r0 .align 2, 0 -_0803A1AC: .4byte gUnknown_02023A60 -_0803A1B0: .4byte gUnknown_02024A60 +_0803A1AC: .4byte gBattleBufferA +_0803A1B0: .4byte gActiveBank _0803A1B4: .4byte gUnknown_02024DE8 thumb_func_end dp01t_2E_4_battle_intro thumb_func_start sub_803A1B8 sub_803A1B8: @ 803A1B8 push {r4-r6,lr} - ldr r5, _0803A294 @ =gUnknown_02024BE0 - ldr r6, _0803A298 @ =gUnknown_02024A60 + ldr r5, _0803A294 @ =gObjectBankIDs + ldr r6, _0803A298 @ =gActiveBank ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -4141,7 +4141,7 @@ _0803A276: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _0803A2BC @ =gUnknown_03004330 + ldr r1, _0803A2BC @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -4151,8 +4151,8 @@ _0803A276: pop {r0} bx r0 .align 2, 0 -_0803A294: .4byte gUnknown_02024BE0 -_0803A298: .4byte gUnknown_02024A60 +_0803A294: .4byte gObjectBankIDs +_0803A298: .4byte gActiveBank _0803A29C: .4byte gSprites _0803A2A0: .4byte sub_8078B34 _0803A2A4: .4byte sub_803A3A8 @@ -4161,7 +4161,7 @@ _0803A2AC: .4byte gTasks _0803A2B0: .4byte 0x02017810 _0803A2B4: .4byte gUnknown_02024E68 _0803A2B8: .4byte sub_8044CA0 -_0803A2BC: .4byte gUnknown_03004330 +_0803A2BC: .4byte gBattleBankFunc _0803A2C0: .4byte nullsub_47 thumb_func_end sub_803A1B8 @@ -4174,7 +4174,7 @@ sub_803A2C4: @ 803A2C4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, _0803A31C @ =gUnknown_02024A60 + ldr r7, _0803A31C @ =gActiveBank ldrb r0, [r7] mov r9, r0 ldr r1, _0803A320 @ =gTasks @@ -4196,12 +4196,12 @@ sub_803A2C4: @ 803A2C4 cmp r0, 0 beq _0803A330 _0803A2FE: - ldr r0, _0803A328 @ =gUnknown_02023A60 + ldr r0, _0803A328 @ =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _0803A32C @ =gUnknown_02024A6A + ldr r0, _0803A32C @ =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -4211,18 +4211,18 @@ _0803A2FE: bl sub_8039430 b _0803A370 .align 2, 0 -_0803A31C: .4byte gUnknown_02024A60 +_0803A31C: .4byte gActiveBank _0803A320: .4byte gTasks _0803A324: .4byte gBattleTypeFlags -_0803A328: .4byte gUnknown_02023A60 -_0803A32C: .4byte gUnknown_02024A6A +_0803A328: .4byte gBattleBufferA +_0803A32C: .4byte gBattlePartyID _0803A330: - ldr r4, _0803A394 @ =gUnknown_02023A60 + ldr r4, _0803A394 @ =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, _0803A398 @ =gUnknown_02024A6A + ldr r6, _0803A398 @ =gBattlePartyID lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -4248,8 +4248,8 @@ _0803A330: eors r0, r5 strb r0, [r7] _0803A370: - ldr r1, _0803A39C @ =gUnknown_03004330 - ldr r2, _0803A3A0 @ =gUnknown_02024A60 + ldr r1, _0803A39C @ =gBattleBankFunc + ldr r2, _0803A3A0 @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -4266,10 +4266,10 @@ _0803A370: pop {r0} bx r0 .align 2, 0 -_0803A394: .4byte gUnknown_02023A60 -_0803A398: .4byte gUnknown_02024A6A -_0803A39C: .4byte gUnknown_03004330 -_0803A3A0: .4byte gUnknown_02024A60 +_0803A394: .4byte gBattleBufferA +_0803A398: .4byte gBattlePartyID +_0803A39C: .4byte gBattleBankFunc +_0803A3A0: .4byte gActiveBank _0803A3A4: .4byte sub_8037840 thumb_func_end sub_803A2C4 @@ -4302,8 +4302,8 @@ _0803A3D8: .4byte 0xfffffc00 thumb_func_start sub_803A3DC sub_803A3DC: @ 803A3DC push {r4-r6,lr} - ldr r1, _0803A404 @ =gUnknown_02023A60 - ldr r0, _0803A408 @ =gUnknown_02024A60 + ldr r1, _0803A404 @ =gBattleBufferA + ldr r0, _0803A408 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -4312,17 +4312,17 @@ sub_803A3DC: @ 803A3DC cmp r0, 0 beq _0803A40C adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803A40C bl dp01_tbl4_exec_completed b _0803A4C6 .align 2, 0 -_0803A404: .4byte gUnknown_02023A60 -_0803A408: .4byte gUnknown_02024A60 +_0803A404: .4byte gBattleBufferA +_0803A408: .4byte gActiveBank _0803A40C: - ldr r3, _0803A45C @ =gUnknown_02024A60 + ldr r3, _0803A45C @ =gActiveBank ldrb r1, [r3] lsls r0, r1, 1 adds r0, r1 @@ -4333,7 +4333,7 @@ _0803A40C: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - ldr r1, _0803A464 @ =gUnknown_02023A60 + ldr r1, _0803A464 @ =gBattleBufferA ldrb r2, [r3] lsls r0, r2, 9 adds r1, 0x2 @@ -4362,9 +4362,9 @@ _0803A40C: strb r1, [r3, 0x1] b _0803A4C6 .align 2, 0 -_0803A45C: .4byte gUnknown_02024A60 +_0803A45C: .4byte gActiveBank _0803A460: .4byte 0x02017810 -_0803A464: .4byte gUnknown_02023A60 +_0803A464: .4byte gBattleBufferA _0803A468: movs r0, 0x3F negs r0, r0 @@ -4408,7 +4408,7 @@ _0803A470: movs r1, 0x5D strb r1, [r0, 0x5] _0803A4BA: - ldr r0, _0803A4D8 @ =gUnknown_03004330 + ldr r0, _0803A4D8 @ =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -4422,14 +4422,14 @@ _0803A4C6: _0803A4CC: .4byte gUnknown_02023A64 _0803A4D0: .4byte gUnknown_02024E68 _0803A4D4: .4byte 0x02017810 -_0803A4D8: .4byte gUnknown_03004330 +_0803A4D8: .4byte gBattleBankFunc _0803A4DC: .4byte sub_803A4E0 thumb_func_end sub_803A3DC thumb_func_start sub_803A4E0 sub_803A4E0: @ 803A4E0 push {r4,lr} - ldr r4, _0803A518 @ =gUnknown_02024A60 + ldr r4, _0803A518 @ =gActiveBank ldrb r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -4456,14 +4456,14 @@ _0803A510: pop {r0} bx r0 .align 2, 0 -_0803A518: .4byte gUnknown_02024A60 +_0803A518: .4byte gActiveBank _0803A51C: .4byte 0x02017810 thumb_func_end sub_803A4E0 thumb_func_start sub_803A520 sub_803A520: @ 803A520 push {lr} - ldr r0, _0803A558 @ =gUnknown_02024A60 + ldr r0, _0803A558 @ =gActiveBank ldrb r3, [r0] lsls r0, r3, 1 adds r0, r3 @@ -4490,7 +4490,7 @@ _0803A54E: pop {r0} bx r0 .align 2, 0 -_0803A558: .4byte gUnknown_02024A60 +_0803A558: .4byte gActiveBank _0803A55C: .4byte 0x02017810 _0803A560: .4byte gTasks _0803A564: .4byte gUnknown_02024E68 @@ -4508,14 +4508,14 @@ sub_803A56C: @ 803A56C thumb_func_start sub_803A578 sub_803A578: @ 803A578 push {r4,lr} - ldr r4, _0803A5C8 @ =gUnknown_02024A60 + ldr r4, _0803A5C8 @ =gActiveBank ldrb r0, [r4] bl sub_8078874 lsls r0, 24 cmp r0, 0 beq _0803A5BE ldr r3, _0803A5CC @ =gSprites - ldr r0, _0803A5D0 @ =gUnknown_02024BE0 + ldr r0, _0803A5D0 @ =gObjectBankIDs ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -4523,7 +4523,7 @@ sub_803A578: @ 803A578 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _0803A5D4 @ =gUnknown_02023A60 + ldr r0, _0803A5D4 @ =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -4546,23 +4546,23 @@ _0803A5BE: pop {r0} bx r0 .align 2, 0 -_0803A5C8: .4byte gUnknown_02024A60 +_0803A5C8: .4byte gActiveBank _0803A5CC: .4byte gSprites -_0803A5D0: .4byte gUnknown_02024BE0 -_0803A5D4: .4byte gUnknown_02023A60 +_0803A5D0: .4byte gObjectBankIDs +_0803A5D4: .4byte gBattleBufferA thumb_func_end sub_803A578 thumb_func_start bx_exec_buffer_A_ch0_tbl4 bx_exec_buffer_A_ch0_tbl4: @ 803A5D8 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _0803A61C @ =gUnknown_02024A60 + ldr r6, _0803A61C @ =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0803A630 - ldr r5, _0803A620 @ =gUnknown_02023A60 + ldr r5, _0803A620 @ =gBattleBufferA ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -4586,10 +4586,10 @@ bx_exec_buffer_A_ch0_tbl4: @ 803A5D8 bl dp01_tbl4_exec_completed b _0803A630 .align 2, 0 -_0803A61C: .4byte gUnknown_02024A60 -_0803A620: .4byte gUnknown_02023A60 +_0803A61C: .4byte gActiveBank +_0803A620: .4byte gBattleBufferA _0803A624: - ldr r0, _0803A638 @ =gUnknown_03004330 + ldr r0, _0803A638 @ =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -4601,7 +4601,7 @@ _0803A630: pop {r0} bx r0 .align 2, 0 -_0803A638: .4byte gUnknown_03004330 +_0803A638: .4byte gBattleBankFunc _0803A63C: .4byte sub_8037FD8 thumb_func_end bx_exec_buffer_A_ch0_tbl4 @@ -4624,8 +4624,8 @@ sub_803A64C: @ 803A64C thumb_func_start sub_803A658 sub_803A658: @ 803A658 push {lr} - ldr r1, _0803A674 @ =gUnknown_02023A60 - ldr r0, _0803A678 @ =gUnknown_02024A60 + ldr r1, _0803A674 @ =gBattleBufferA + ldr r0, _0803A678 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4633,15 +4633,15 @@ sub_803A658: @ 803A658 ldrb r2, [r0] cmp r2, 0x3 bne _0803A680 - ldr r0, _0803A67C @ =gUnknown_02024D26 + ldr r0, _0803A67C @ =gBattleOutcome strb r2, [r0] b _0803A688 .align 2, 0 -_0803A674: .4byte gUnknown_02023A60 -_0803A678: .4byte gUnknown_02024A60 -_0803A67C: .4byte gUnknown_02024D26 +_0803A674: .4byte gBattleBufferA +_0803A678: .4byte gActiveBank +_0803A67C: .4byte gBattleOutcome _0803A680: - ldr r0, _0803A6AC @ =gUnknown_02024D26 + ldr r0, _0803A6AC @ =gBattleOutcome movs r1, 0x3 eors r1, r2 strb r1, [r0] @@ -4651,8 +4651,8 @@ _0803A688: movs r0, 0x3 bl BeginFastPaletteFade bl dp01_tbl4_exec_completed - ldr r1, _0803A6B0 @ =gUnknown_03004330 - ldr r0, _0803A6B4 @ =gUnknown_02024A60 + ldr r1, _0803A6B0 @ =gBattleBankFunc + ldr r0, _0803A6B4 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4661,9 +4661,9 @@ _0803A688: pop {r0} bx r0 .align 2, 0 -_0803A6AC: .4byte gUnknown_02024D26 -_0803A6B0: .4byte gUnknown_03004330 -_0803A6B4: .4byte gUnknown_02024A60 +_0803A6AC: .4byte gBattleOutcome +_0803A6B0: .4byte gBattleBankFunc +_0803A6B4: .4byte gActiveBank _0803A6B8: .4byte sub_8037F34 thumb_func_end sub_803A658 diff --git a/asm/battle_2.s b/asm/battle_2.s index cff6efe06..c1f75dad5 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -14,24 +14,24 @@ sub_8012324: @ 8012324 mov r5, r8 push {r5-r7} sub sp, 0x1C - ldr r0, _08012340 @ =gUnknown_02024D1E + ldr r0, _08012340 @ =gBattleCommunication movs r1, 0 strb r1, [r0, 0x4] - ldr r0, _08012344 @ =gUnknown_02024A60 + ldr r0, _08012344 @ =gActiveBank strb r1, [r0] - ldr r0, _08012348 @ =gUnknown_02024A68 + ldr r0, _08012348 @ =gNoOfAllBanks bl _08012F74 .align 2, 0 -_08012340: .4byte gUnknown_02024D1E -_08012344: .4byte gUnknown_02024A60 -_08012348: .4byte gUnknown_02024A68 +_08012340: .4byte gBattleCommunication +_08012344: .4byte gActiveBank +_08012348: .4byte gNoOfAllBanks _0801234C: - ldr r4, _08012374 @ =gUnknown_02024A60 + ldr r4, _08012374 @ =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08012378 @ =gUnknown_02024D1E + ldr r1, _08012378 @ =gBattleCommunication ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -45,8 +45,8 @@ _08012368: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08012374: .4byte gUnknown_02024A60 -_08012378: .4byte gUnknown_02024D1E +_08012374: .4byte gActiveBank +_08012378: .4byte gBattleCommunication _0801237C: .4byte _08012380 .align 2, 0 _08012380: @@ -59,7 +59,7 @@ _08012380: .4byte _08012F38 _0801239C: ldr r4, _08012434 @ =0x02000000 - ldr r0, _08012438 @ =gUnknown_02024A60 + ldr r0, _08012438 @ =gActiveBank ldrb r0, [r0] ldr r1, _0801243C @ =0x00016068 adds r0, r1 @@ -79,7 +79,7 @@ _0801239C: beq _080123F8 eors r5, r1 adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r2, _08012444 @ =0x000160a6 adds r1, r4, r2 ldrb r1, [r1] @@ -91,9 +91,9 @@ _0801239C: ands r1, r0 cmp r1, 0 bne _080123F8 - ldr r4, _0801244C @ =gUnknown_02024D1E + ldr r4, _0801244C @ =gBattleCommunication adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -107,7 +107,7 @@ _080123F8: adds r0, r3 ldrb r3, [r0] ldr r1, _08012448 @ =gBitTable - ldr r4, _08012438 @ =gUnknown_02024A60 + ldr r4, _08012438 @ =gActiveBank ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -115,7 +115,7 @@ _080123F8: ands r3, r0 cmp r3, 0 beq _08012468 - ldr r0, _08012450 @ =gUnknown_02024C18 + ldr r0, _08012450 @ =gActionForBanks adds r0, r2, r0 movs r1, 0xD strb r1, [r0] @@ -125,7 +125,7 @@ _080123F8: ands r0, r1 cmp r0, 0 bne _08012454 - ldr r0, _0801244C @ =gUnknown_02024D1E + ldr r0, _0801244C @ =gBattleCommunication ldrb r1, [r4] adds r1, r0 movs r0, 0x4 @@ -133,22 +133,22 @@ _080123F8: bl _08012F66 .align 2, 0 _08012434: .4byte 0x02000000 -_08012438: .4byte gUnknown_02024A60 +_08012438: .4byte gActiveBank _0801243C: .4byte 0x00016068 _08012440: .4byte gBattleTypeFlags _08012444: .4byte 0x000160a6 _08012448: .4byte gBitTable -_0801244C: .4byte gUnknown_02024D1E -_08012450: .4byte gUnknown_02024C18 +_0801244C: .4byte gBattleCommunication +_08012450: .4byte gActionForBanks _08012454: - ldr r0, _08012464 @ =gUnknown_02024D1E + ldr r0, _08012464 @ =gBattleCommunication ldrb r1, [r4] adds r1, r0 movs r0, 0x3 strb r0, [r1] bl _08012F66 .align 2, 0 -_08012464: .4byte gUnknown_02024D1E +_08012464: .4byte gBattleCommunication _08012468: ldr r1, _0801249C @ =gBattleMons movs r0, 0x58 @@ -167,10 +167,10 @@ _08012468: cmp r1, 0 beq _080124A8 _08012488: - ldr r0, _080124A0 @ =gUnknown_02024C18 + ldr r0, _080124A0 @ =gActionForBanks adds r0, r2, r0 strb r3, [r0] - ldr r1, _080124A4 @ =gUnknown_02024D1E + ldr r1, _080124A4 @ =gBattleCommunication ldrb r0, [r4] adds r0, r1 movs r1, 0x3 @@ -178,12 +178,12 @@ _08012488: bl _08012F66 .align 2, 0 _0801249C: .4byte gBattleMons -_080124A0: .4byte gUnknown_02024C18 -_080124A4: .4byte gUnknown_02024D1E +_080124A0: .4byte gActionForBanks +_080124A4: .4byte gBattleCommunication _080124A8: - ldr r0, _080124C0 @ =gUnknown_02024C18 + ldr r0, _080124C0 @ =gActionForBanks ldrb r1, [r0] - ldr r0, _080124C4 @ =gUnknown_02024260 + ldr r0, _080124C4 @ =gBattleBufferB ldrb r2, [r0, 0x1] ldrb r0, [r0, 0x2] lsls r0, 8 @@ -192,12 +192,12 @@ _080124A8: bl dp01_build_cmdbuf_x12_a_bb bl _08012E32 .align 2, 0 -_080124C0: .4byte gUnknown_02024C18 -_080124C4: .4byte gUnknown_02024260 +_080124C0: .4byte gActionForBanks +_080124C4: .4byte gBattleBufferB _080124C8: - ldr r4, _08012520 @ =gUnknown_02024A64 + ldr r4, _08012520 @ =gBattleExecBuffer ldr r1, _08012524 @ =gBitTable - ldr r3, _08012528 @ =gUnknown_02024A60 + ldr r3, _08012528 @ =gActiveBank ldrb r5, [r3] lsls r0, r5, 2 adds r0, r1 @@ -218,9 +218,9 @@ _080124C8: beq _080124F6 bl _08012F66 _080124F6: - ldr r2, _0801252C @ =gUnknown_02024C18 + ldr r2, _0801252C @ =gActionForBanks adds r2, r5, r2 - ldr r1, _08012530 @ =gUnknown_02024260 + ldr r1, _08012530 @ =gBattleBufferB lsls r0, r5, 9 adds r1, 0x1 adds r0, r1 @@ -240,11 +240,11 @@ _08012514: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08012520: .4byte gUnknown_02024A64 +_08012520: .4byte gBattleExecBuffer _08012524: .4byte gBitTable -_08012528: .4byte gUnknown_02024A60 -_0801252C: .4byte gUnknown_02024C18 -_08012530: .4byte gUnknown_02024260 +_08012528: .4byte gActiveBank +_0801252C: .4byte gActionForBanks +_08012530: .4byte gBattleBufferB _08012534: .4byte _08012538 .align 2, 0 _08012538: @@ -266,8 +266,8 @@ _0801256C: lsls r0, 24 cmp r0, 0 beq _080125D0 - ldr r0, _080125B4 @ =gUnknown_02024D1E - ldr r2, _080125B8 @ =gUnknown_02024A60 + ldr r0, _080125B4 @ =gBattleCommunication + ldr r2, _080125B8 @ =gActiveBank ldrb r1, [r2] adds r1, r0 movs r4, 0 @@ -289,7 +289,7 @@ _0801256C: ldr r0, _080125C8 @ =0x00016010 adds r2, r1, r0 adds r2, r3 - ldr r0, _080125CC @ =gUnknown_02024260 + ldr r0, _080125CC @ =gBattleBufferB lsls r1, 9 adds r0, 0x3 adds r1, r0 @@ -297,16 +297,16 @@ _0801256C: strb r0, [r2] bl _08012F90 .align 2, 0 -_080125B4: .4byte gUnknown_02024D1E -_080125B8: .4byte gUnknown_02024A60 +_080125B4: .4byte gBattleCommunication +_080125B8: .4byte gActiveBank _080125BC: .4byte 0x02000000 _080125C0: .4byte 0x00016060 _080125C4: .4byte 0x00016094 _080125C8: .4byte 0x00016010 -_080125CC: .4byte gUnknown_02024260 +_080125CC: .4byte gBattleBufferB _080125D0: - ldr r1, _080125FC @ =gUnknown_02024CA8 - ldr r5, _08012600 @ =gUnknown_02024A60 + ldr r1, _080125FC @ =gDisableStructs + ldr r5, _08012600 @ =gActiveBank ldrb r4, [r5] lsls r0, r4, 3 subs r0, r4 @@ -315,21 +315,21 @@ _080125D0: ldrh r2, [r0, 0x6] cmp r2, 0 beq _0801260C - ldr r1, _08012604 @ =gUnknown_02024C60 + ldr r1, _08012604 @ =gChosenMovesByBanks lsls r0, r4, 1 adds r0, r1 strh r2, [r0] - ldr r1, _08012608 @ =gUnknown_02024D1E + ldr r1, _08012608 @ =gBattleCommunication ldrb r0, [r5] adds r0, r1 movs r1, 0x3 strb r1, [r0] bl _08012F90 .align 2, 0 -_080125FC: .4byte gUnknown_02024CA8 -_08012600: .4byte gUnknown_02024A60 -_08012604: .4byte gUnknown_02024C60 -_08012608: .4byte gUnknown_02024D1E +_080125FC: .4byte gDisableStructs +_08012600: .4byte gActiveBank +_08012604: .4byte gChosenMovesByBanks +_08012608: .4byte gBattleCommunication _0801260C: add r2, sp, 0x4 ldr r3, _080126AC @ =gBattleMons @@ -436,12 +436,12 @@ _080126D8: .4byte gUnknown_02024C1C _080126DC: .4byte gUnknown_081D9B29 _080126E0: ldr r3, _08012738 @ =0x02000000 - ldr r5, _0801273C @ =gUnknown_02024A60 + ldr r5, _0801273C @ =gActiveBank ldrb r0, [r5] ldr r4, _08012740 @ =0x00016064 adds r1, r0, r4 adds r1, r3 - ldr r2, _08012744 @ =gUnknown_02024A6A + ldr r2, _08012744 @ =gBattlePartyID lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -459,7 +459,7 @@ _080126E0: ands r0, r1 cmp r0, 0 bne _08012722 - ldr r0, _08012750 @ =gUnknown_02024C98 + ldr r0, _08012750 @ =gStatuses3 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -481,12 +481,12 @@ _08012722: b _0801286C .align 2, 0 _08012738: .4byte 0x02000000 -_0801273C: .4byte gUnknown_02024A60 +_0801273C: .4byte gActiveBank _08012740: .4byte 0x00016064 -_08012744: .4byte gUnknown_02024A6A +_08012744: .4byte gBattlePartyID _08012748: .4byte gBattleMons _0801274C: .4byte 0x0400e000 -_08012750: .4byte gUnknown_02024C98 +_08012750: .4byte gStatuses3 _08012754: .4byte 0x0001606c _08012758: str r1, [sp] @@ -494,7 +494,7 @@ _08012758: adds r1, r2, 0 movs r2, 0x17 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -504,7 +504,7 @@ _08012758: movs r0, 0xC movs r2, 0x47 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -528,14 +528,14 @@ _08012758: cmp r0, 0x1A bne _080127E0 _080127A8: - ldr r5, _08012808 @ =gUnknown_02024A60 + ldr r5, _08012808 @ =gActiveBank ldrb r1, [r5] movs r0, 0 str r0, [sp] movs r0, 0xF movs r2, 0x2A movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -562,9 +562,9 @@ _080127E0: orrs r1, r0 lsls r1, 24 lsrs r1, 24 - ldr r0, _08012810 @ =byte_2024C06 + ldr r0, _08012810 @ =gLastUsedAbility ldrb r3, [r0] - ldr r0, _08012808 @ =gUnknown_02024A60 + ldr r0, _08012808 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 1 adds r0, r2 @@ -576,17 +576,17 @@ _080127E0: bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f b _0801289E .align 2, 0 -_08012808: .4byte gUnknown_02024A60 +_08012808: .4byte gActiveBank _0801280C: .4byte gBattleMons -_08012810: .4byte byte_2024C06 +_08012810: .4byte gLastUsedAbility _08012814: .4byte 0x0201606c _08012818: - ldr r0, _08012830 @ =gUnknown_02024A60 + ldr r0, _08012830 @ =gActiveBank ldrb r1, [r0] mov r8, r0 cmp r1, 0x2 bne _08012840 - ldr r0, _08012834 @ =gUnknown_02024C18 + ldr r0, _08012834 @ =gActionForBanks ldrb r0, [r0] cmp r0, 0x2 bne _08012840 @@ -594,8 +594,8 @@ _08012818: ldr r4, _0801283C @ =0x00016068 b _08012854 .align 2, 0 -_08012830: .4byte gUnknown_02024A60 -_08012834: .4byte gUnknown_02024C18 +_08012830: .4byte gActiveBank +_08012834: .4byte gActionForBanks _08012838: .4byte 0x02000000 _0801283C: .4byte 0x00016068 _08012840: @@ -603,7 +603,7 @@ _08012840: ldrb r0, [r2] cmp r0, 0x3 bne _08012884 - ldr r0, _08012874 @ =gUnknown_02024C18 + ldr r0, _08012874 @ =gActionForBanks ldrb r0, [r0, 0x1] cmp r0, 0x2 bne _08012884 @@ -627,12 +627,12 @@ _0801286C: bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f b _0801289E .align 2, 0 -_08012874: .4byte gUnknown_02024C18 +_08012874: .4byte gActionForBanks _08012878: .4byte 0x02000000 _0801287C: .4byte 0x00016069 _08012880: .4byte 0x0001606c _08012884: - ldr r0, _080128A8 @ =gUnknown_02024A60 + ldr r0, _080128A8 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -645,12 +645,12 @@ _08012884: movs r3, 0 bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f _0801289E: - ldr r0, _080128A8 @ =gUnknown_02024A60 + ldr r0, _080128A8 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08012968 .align 2, 0 -_080128A8: .4byte gUnknown_02024A60 +_080128A8: .4byte gActiveBank _080128AC: .4byte 0x0201606c _080128B0: bl PlayerPartyAndPokemonStorageFull @@ -658,13 +658,13 @@ _080128B0: cmp r0, 0 beq _08012968 ldr r1, _080128EC @ =gUnknown_02024C1C - ldr r2, _080128F0 @ =gUnknown_02024A60 + ldr r2, _080128F0 @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 ldr r1, _080128F4 @ =gUnknown_081D8E4A str r1, [r0] - ldr r0, _080128F8 @ =gUnknown_02024D1E + ldr r0, _080128F8 @ =gBattleCommunication ldrb r1, [r2] adds r1, r0 movs r3, 0 @@ -684,14 +684,14 @@ _080128B0: b _08012F90 .align 2, 0 _080128EC: .4byte gUnknown_02024C1C -_080128F0: .4byte gUnknown_02024A60 +_080128F0: .4byte gActiveBank _080128F4: .4byte gUnknown_081D8E4A -_080128F8: .4byte gUnknown_02024D1E +_080128F8: .4byte gBattleCommunication _080128FC: .4byte 0x02000000 _08012900: .4byte 0x00016060 _08012904: .4byte 0x00016094 _08012908: - ldr r4, _08012924 @ =gUnknown_02024A60 + ldr r4, _08012924 @ =gActiveBank ldrb r0, [r4] lsls r1, r0, 1 adds r1, r0 @@ -700,13 +700,13 @@ _08012908: movs r0, 0 bl sub_800CBE0 ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08012968 .align 2, 0 -_08012924: .4byte gUnknown_02024A60 +_08012924: .4byte gActiveBank _08012928: .4byte 0x0201606c _0801292C: - ldr r4, _08012964 @ =gUnknown_02024D1E + ldr r4, _08012964 @ =gBattleCommunication mov r3, r8 ldrb r1, [r3] adds r1, r4 @@ -714,12 +714,12 @@ _0801292C: movs r0, 0x6 strb r0, [r1] ldrb r0, [r3] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -728,10 +728,10 @@ _0801292C: bl dp01_build_cmdbuf_x32_32_32_32 mov r4, r8 ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08012F90 .align 2, 0 -_08012964: .4byte gUnknown_02024D1E +_08012964: .4byte gBattleCommunication _08012968: ldr r0, _08012994 @ =gBattleTypeFlags ldrh r1, [r0] @@ -739,8 +739,8 @@ _08012968: ands r0, r1 cmp r0, 0x8 bne _080129A8 - ldr r0, _08012998 @ =gUnknown_02024260 - ldr r4, _0801299C @ =gUnknown_02024A60 + ldr r0, _08012998 @ =gBattleBufferB + ldr r4, _0801299C @ =gActiveBank ldrb r1, [r4] lsls r1, 9 adds r0, 0x1 @@ -750,23 +750,23 @@ _08012968: bne _080129A8 ldr r0, _080129A0 @ =gUnknown_081D8E37 bl b_call_bc_move_exec - ldr r1, _080129A4 @ =gUnknown_02024D1E + ldr r1, _080129A4 @ =gBattleCommunication ldrb r0, [r4] adds r0, r1 b _08012BFE .align 2, 0 _08012994: .4byte gBattleTypeFlags -_08012998: .4byte gUnknown_02024260 -_0801299C: .4byte gUnknown_02024A60 +_08012998: .4byte gBattleBufferB +_0801299C: .4byte gActiveBank _080129A0: .4byte gUnknown_081D8E37 -_080129A4: .4byte gUnknown_02024D1E +_080129A4: .4byte gBattleCommunication _080129A8: - bl sub_8012028 + bl CanRunFromBattle lsls r0, 24 cmp r0, 0 beq _08012A14 - ldr r0, _080129F4 @ =gUnknown_02024260 - ldr r3, _080129F8 @ =gUnknown_02024A60 + ldr r0, _080129F4 @ =gBattleBufferB + ldr r3, _080129F8 @ =gActiveBank ldrb r2, [r3] lsls r1, r2, 9 adds r0, 0x1 @@ -780,7 +780,7 @@ _080129A8: ldr r1, _08012A00 @ =gUnknown_081D8E44 _080129CC: str r1, [r0] - ldr r0, _08012A04 @ =gUnknown_02024D1E + ldr r0, _08012A04 @ =gBattleCommunication ldrb r1, [r3] adds r1, r0 movs r2, 0 @@ -799,27 +799,27 @@ _080129CC: strb r2, [r0] b _08012F90 .align 2, 0 -_080129F4: .4byte gUnknown_02024260 -_080129F8: .4byte gUnknown_02024A60 +_080129F4: .4byte gBattleBufferB +_080129F8: .4byte gActiveBank _080129FC: .4byte gUnknown_02024C1C _08012A00: .4byte gUnknown_081D8E44 -_08012A04: .4byte gUnknown_02024D1E +_08012A04: .4byte gBattleCommunication _08012A08: .4byte 0x02000000 _08012A0C: .4byte 0x00016060 _08012A10: .4byte 0x00016094 _08012A14: - ldr r2, _08012A20 @ =gUnknown_02024D1E - ldr r0, _08012A24 @ =gUnknown_02024A60 + ldr r2, _08012A20 @ =gBattleCommunication + ldr r0, _08012A24 @ =gActiveBank ldrb r1, [r0] adds r1, r2 b _08012E3E .align 2, 0 -_08012A20: .4byte gUnknown_02024D1E -_08012A24: .4byte gUnknown_02024A60 +_08012A20: .4byte gBattleCommunication +_08012A24: .4byte gActiveBank _08012A28: - ldr r4, _08012A6C @ =gUnknown_02024A64 + ldr r4, _08012A6C @ =gBattleExecBuffer ldr r1, _08012A70 @ =gBitTable - ldr r3, _08012A74 @ =gUnknown_02024A60 + ldr r3, _08012A74 @ =gActiveBank ldrb r5, [r3] lsls r0, r5, 2 adds r0, r1 @@ -840,7 +840,7 @@ _08012A28: beq _08012A54 b _08012F66 _08012A54: - ldr r1, _08012A78 @ =gUnknown_02024C18 + ldr r1, _08012A78 @ =gActionForBanks adds r0, r5, r1 ldrb r0, [r0] adds r3, r1, 0 @@ -854,10 +854,10 @@ _08012A62: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08012A6C: .4byte gUnknown_02024A64 +_08012A6C: .4byte gBattleExecBuffer _08012A70: .4byte gBitTable -_08012A74: .4byte gUnknown_02024A60 -_08012A78: .4byte gUnknown_02024C18 +_08012A74: .4byte gActiveBank +_08012A78: .4byte gActionForBanks _08012A7C: .4byte _08012A80 .align 2, 0 _08012A80: @@ -872,7 +872,7 @@ _08012A80: .4byte _08012D70 .4byte _08012D94 _08012AA8: - ldr r0, _08012AC8 @ =gUnknown_02024260 + ldr r0, _08012AC8 @ =gBattleBufferB mov r1, r8 ldrb r4, [r1] lsls r1, r4, 9 @@ -888,7 +888,7 @@ _08012AA8: strb r1, [r0] b _08012F90 .align 2, 0 -_08012AC8: .4byte gUnknown_02024260 +_08012AC8: .4byte gBattleBufferB _08012ACC: adds r3, r6, 0 mov r5, r8 @@ -906,18 +906,18 @@ _08012ACC: ldr r0, _08012AF4 @ =0x0000ffff cmp r2, r0 bne _08012AFC - ldr r0, _08012AF8 @ =gUnknown_02024D1E + ldr r0, _08012AF8 @ =gBattleCommunication adds r0, r4, r0 b _08012BFE .align 2, 0 _08012AF4: .4byte 0x0000ffff -_08012AF8: .4byte gUnknown_02024D1E +_08012AF8: .4byte gBattleCommunication _08012AFC: bl sub_8015894 lsls r0, 24 cmp r0, 0 beq _08012B48 - ldr r0, _08012B38 @ =gUnknown_02024D1E + ldr r0, _08012B38 @ =gBattleCommunication ldrb r1, [r5] adds r1, r0 movs r2, 0 @@ -942,7 +942,7 @@ _08012AFC: strb r1, [r0] b _08012F90 .align 2, 0 -_08012B38: .4byte gUnknown_02024D1E +_08012B38: .4byte gBattleCommunication _08012B3C: .4byte 0x02000000 _08012B40: .4byte 0x00016060 _08012B44: .4byte 0x00016094 @@ -957,7 +957,7 @@ _08012B48: adds r0, r7 ldrb r0, [r0] strb r0, [r1] - ldr r0, _08012BA0 @ =gUnknown_02024C60 + ldr r0, _08012BA0 @ =gChosenMovesByBanks mov r4, r8 ldrb r3, [r4] lsls r5, r3, 1 @@ -983,20 +983,20 @@ _08012B48: add r0, r9 ldrb r0, [r0] strb r0, [r1] - ldr r0, _08012BAC @ =gUnknown_02024D1E + ldr r0, _08012BAC @ =gBattleCommunication mov r3, r8 ldrb r1, [r3] b _08012E3C .align 2, 0 _08012B98: .4byte 0x02000000 _08012B9C: .4byte 0x0001608c -_08012BA0: .4byte gUnknown_02024C60 +_08012BA0: .4byte gChosenMovesByBanks _08012BA4: .4byte gBattleMons _08012BA8: .4byte 0x00016010 -_08012BAC: .4byte gUnknown_02024D1E +_08012BAC: .4byte gBattleCommunication _08012BB0: - ldr r2, _08012BD8 @ =gUnknown_02024260 - ldr r5, _08012BDC @ =gUnknown_02024A60 + ldr r2, _08012BD8 @ =gBattleBufferB + ldr r5, _08012BDC @ =gActiveBank ldrb r4, [r5] lsls r1, r4, 9 adds r0, r2, 0x1 @@ -1011,19 +1011,19 @@ _08012BB0: bne _08012BCE b _08012F60 _08012BCE: - ldr r0, _08012BE0 @ =gUnknown_02024C04 + ldr r0, _08012BE0 @ =gLastUsedItem strh r3, [r0] - ldr r0, _08012BE4 @ =gUnknown_02024D1E + ldr r0, _08012BE4 @ =gBattleCommunication ldrb r1, [r5] b _08012E3C .align 2, 0 -_08012BD8: .4byte gUnknown_02024260 -_08012BDC: .4byte gUnknown_02024A60 -_08012BE0: .4byte gUnknown_02024C04 -_08012BE4: .4byte gUnknown_02024D1E +_08012BD8: .4byte gBattleBufferB +_08012BDC: .4byte gActiveBank +_08012BE0: .4byte gLastUsedItem +_08012BE4: .4byte gBattleCommunication _08012BE8: - ldr r4, _08012C04 @ =gUnknown_02024260 - ldr r7, _08012C08 @ =gUnknown_02024A60 + ldr r4, _08012C04 @ =gBattleBufferB + ldr r7, _08012C08 @ =gActiveBank ldrb r2, [r7] lsls r0, r2, 9 adds r1, r4, 0x1 @@ -1031,16 +1031,16 @@ _08012BE8: ldrb r1, [r0] cmp r1, 0x6 bne _08012C10 - ldr r0, _08012C0C @ =gUnknown_02024D1E + ldr r0, _08012C0C @ =gBattleCommunication adds r0, r2, r0 _08012BFE: movs r1, 0 strb r1, [r0] b _08012F66 .align 2, 0 -_08012C04: .4byte gUnknown_02024260 -_08012C08: .4byte gUnknown_02024A60 -_08012C0C: .4byte gUnknown_02024D1E +_08012C04: .4byte gBattleBufferB +_08012C08: .4byte gActiveBank +_08012C0C: .4byte gBattleCommunication _08012C10: ldr r0, _08012CC4 @ =0x02000000 mov r12, r0 @@ -1130,7 +1130,7 @@ _08012C10: ldrb r0, [r0] strb r0, [r1] _08012CBE: - ldr r0, _08012CDC @ =gUnknown_02024D1E + ldr r0, _08012CDC @ =gBattleCommunication ldrb r1, [r7] b _08012E3C .align 2, 0 @@ -1140,44 +1140,44 @@ _08012CCC: .4byte gBattleTypeFlags _08012CD0: .4byte 0x0001606c _08012CD4: .4byte 0x0001606d _08012CD8: .4byte 0x0001606e -_08012CDC: .4byte gUnknown_02024D1E +_08012CDC: .4byte gBattleCommunication _08012CE0: - ldr r2, _08012CF8 @ =gUnknown_02024C6C + ldr r2, _08012CF8 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 8 orrs r0, r1 str r0, [r2] - ldr r2, _08012CFC @ =gUnknown_02024D1E - ldr r0, _08012D00 @ =gUnknown_02024A60 + ldr r2, _08012CFC @ =gBattleCommunication + ldr r0, _08012D00 @ =gActiveBank ldrb r1, [r0] adds r1, r2 b _08012E3E .align 2, 0 -_08012CF8: .4byte gUnknown_02024C6C -_08012CFC: .4byte gUnknown_02024D1E -_08012D00: .4byte gUnknown_02024A60 +_08012CF8: .4byte gHitMarker +_08012CFC: .4byte gBattleCommunication +_08012D00: .4byte gActiveBank _08012D04: - ldr r2, _08012D10 @ =gUnknown_02024D1E - ldr r0, _08012D14 @ =gUnknown_02024A60 + ldr r2, _08012D10 @ =gBattleCommunication + ldr r0, _08012D14 @ =gActiveBank ldrb r1, [r0] adds r1, r2 b _08012E3E .align 2, 0 -_08012D10: .4byte gUnknown_02024D1E -_08012D14: .4byte gUnknown_02024A60 +_08012D10: .4byte gBattleCommunication +_08012D14: .4byte gActiveBank _08012D18: - ldr r2, _08012D24 @ =gUnknown_02024D1E - ldr r0, _08012D28 @ =gUnknown_02024A60 + ldr r2, _08012D24 @ =gBattleCommunication + ldr r0, _08012D28 @ =gActiveBank ldrb r1, [r0] adds r1, r2 b _08012E3E .align 2, 0 -_08012D24: .4byte gUnknown_02024D1E -_08012D28: .4byte gUnknown_02024A60 +_08012D24: .4byte gBattleCommunication +_08012D28: .4byte gActiveBank _08012D2C: - ldr r2, _08012D50 @ =gUnknown_02024260 - ldr r0, _08012D54 @ =gUnknown_02024A60 + ldr r2, _08012D50 @ =gBattleBufferB + ldr r0, _08012D54 @ =gActiveBank ldrb r4, [r0] lsls r1, r4, 9 adds r0, r2, 0x1 @@ -1192,51 +1192,51 @@ _08012D2C: bne _08012D4A b _08012F60 _08012D4A: - ldr r1, _08012D58 @ =gUnknown_02024D1E + ldr r1, _08012D58 @ =gBattleCommunication adds r1, r4, r1 b _08012E3E .align 2, 0 -_08012D50: .4byte gUnknown_02024260 -_08012D54: .4byte gUnknown_02024A60 -_08012D58: .4byte gUnknown_02024D1E +_08012D50: .4byte gBattleBufferB +_08012D54: .4byte gActiveBank +_08012D58: .4byte gBattleCommunication _08012D5C: - ldr r2, _08012D68 @ =gUnknown_02024D1E - ldr r0, _08012D6C @ =gUnknown_02024A60 + ldr r2, _08012D68 @ =gBattleCommunication + ldr r0, _08012D6C @ =gActiveBank ldrb r1, [r0] adds r1, r2 b _08012E3E .align 2, 0 -_08012D68: .4byte gUnknown_02024D1E -_08012D6C: .4byte gUnknown_02024A60 +_08012D68: .4byte gBattleCommunication +_08012D6C: .4byte gActiveBank _08012D70: - ldr r2, _08012D88 @ =gUnknown_02024C6C + ldr r2, _08012D88 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 8 orrs r0, r1 str r0, [r2] - ldr r2, _08012D8C @ =gUnknown_02024D1E - ldr r0, _08012D90 @ =gUnknown_02024A60 + ldr r2, _08012D8C @ =gBattleCommunication + ldr r0, _08012D90 @ =gActiveBank ldrb r1, [r0] adds r1, r2 b _08012E3E .align 2, 0 -_08012D88: .4byte gUnknown_02024C6C -_08012D8C: .4byte gUnknown_02024D1E -_08012D90: .4byte gUnknown_02024A60 +_08012D88: .4byte gHitMarker +_08012D8C: .4byte gBattleCommunication +_08012D90: .4byte gActiveBank _08012D94: - ldr r2, _08012DA0 @ =gUnknown_02024D1E - ldr r0, _08012DA4 @ =gUnknown_02024A60 + ldr r2, _08012DA0 @ =gBattleCommunication + ldr r0, _08012DA4 @ =gActiveBank ldrb r1, [r0] adds r1, r2 b _08012E3E .align 2, 0 -_08012DA0: .4byte gUnknown_02024D1E -_08012DA4: .4byte gUnknown_02024A60 +_08012DA0: .4byte gBattleCommunication +_08012DA4: .4byte gActiveBank _08012DA8: - ldr r3, _08012E10 @ =gUnknown_02024A64 + ldr r3, _08012E10 @ =gBattleExecBuffer ldr r4, _08012E14 @ =gBitTable - ldr r0, _08012E18 @ =gUnknown_02024A60 + ldr r0, _08012E18 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r4 @@ -1269,7 +1269,7 @@ _08012DD2: bne _08012E06 adds r0, r5, 0 eors r0, r1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, _08012E20 @ =0x02000000 ldr r2, _08012E24 @ =0x000160a6 adds r1, r2 @@ -1284,25 +1284,25 @@ _08012DD2: _08012E06: movs r0, 0 movs r1, 0 - bl sub_800D1D8 + bl EmitLinkStandbyMsg b _08012E30 .align 2, 0 -_08012E10: .4byte gUnknown_02024A64 +_08012E10: .4byte gBattleExecBuffer _08012E14: .4byte gBitTable -_08012E18: .4byte gUnknown_02024A60 +_08012E18: .4byte gActiveBank _08012E1C: .4byte gBattleTypeFlags _08012E20: .4byte 0x02000000 _08012E24: .4byte 0x000160a6 _08012E28: movs r0, 0 movs r1, 0x1 - bl sub_800D1D8 + bl EmitLinkStandbyMsg _08012E30: - ldr r4, _08012E48 @ =gUnknown_02024A60 + ldr r4, _08012E48 @ =gActiveBank _08012E32: ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r0, _08012E4C @ =gUnknown_02024D1E + bl MarkBufferBankForExecution + ldr r0, _08012E4C @ =gBattleCommunication ldrb r1, [r4] _08012E3C: adds r1, r0 @@ -1312,12 +1312,12 @@ _08012E3E: strb r0, [r1] b _08012F66 .align 2, 0 -_08012E48: .4byte gUnknown_02024A60 -_08012E4C: .4byte gUnknown_02024D1E +_08012E48: .4byte gActiveBank +_08012E4C: .4byte gBattleCommunication _08012E50: - ldr r3, _08012E84 @ =gUnknown_02024A64 + ldr r3, _08012E84 @ =gBattleExecBuffer ldr r1, _08012E88 @ =gBitTable - ldr r0, _08012E8C @ =gUnknown_02024A60 + ldr r0, _08012E8C @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -1335,19 +1335,19 @@ _08012E50: ands r0, r1 cmp r0, 0 bne _08012F66 - ldr r1, _08012E90 @ =gUnknown_02024D1E + ldr r1, _08012E90 @ =gBattleCommunication ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] b _08012F66 .align 2, 0 -_08012E84: .4byte gUnknown_02024A64 +_08012E84: .4byte gBattleExecBuffer _08012E88: .4byte gBitTable -_08012E8C: .4byte gUnknown_02024A60 -_08012E90: .4byte gUnknown_02024D1E +_08012E8C: .4byte gActiveBank +_08012E90: .4byte gBattleCommunication _08012E94: ldr r2, _08012EB8 @ =0x02000000 - ldr r5, _08012EBC @ =gUnknown_02024A60 + ldr r5, _08012EBC @ =gActiveBank ldrb r1, [r5] ldr r3, _08012EC0 @ =0x00016060 adds r0, r1, r3 @@ -1355,7 +1355,7 @@ _08012E94: ldrb r0, [r0] cmp r0, 0 beq _08012ECC - ldr r0, _08012EC4 @ =gUnknown_02024D1E + ldr r0, _08012EC4 @ =gBattleCommunication adds r0, r1, r0 ldr r4, _08012EC8 @ =0x00016094 adds r1, r4 @@ -1365,21 +1365,21 @@ _08012E94: b _08012F66 .align 2, 0 _08012EB8: .4byte 0x02000000 -_08012EBC: .4byte gUnknown_02024A60 +_08012EBC: .4byte gActiveBank _08012EC0: .4byte 0x00016060 -_08012EC4: .4byte gUnknown_02024D1E +_08012EC4: .4byte gBattleCommunication _08012EC8: .4byte 0x00016094 _08012ECC: - ldr r0, _08012F20 @ =gPlayerMonIndex + ldr r0, _08012F20 @ =gBankAttacker strb r1, [r0] - ldr r7, _08012F24 @ =gUnknown_02024C10 + ldr r7, _08012F24 @ =gBattlescriptCurrInstr ldr r6, _08012F28 @ =gUnknown_02024C1C ldrb r0, [r5] lsls r0, 2 adds r0, r6 ldr r4, [r0] str r4, [r7] - ldr r3, _08012F2C @ =gUnknown_02024A64 + ldr r3, _08012F2C @ =gBattleExecBuffer ldr r1, _08012F30 @ =gBitTable ldrb r0, [r5] lsls r0, 2 @@ -1398,7 +1398,7 @@ _08012ECC: ands r0, r1 cmp r0, 0 bne _08012F12 - ldr r0, _08012F34 @ =gUnknown_081FA73C + ldr r0, _08012F34 @ =gBattleScriptingCommandsTable ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -1412,16 +1412,16 @@ _08012F12: str r1, [r0] b _08012F66 .align 2, 0 -_08012F20: .4byte gPlayerMonIndex -_08012F24: .4byte gUnknown_02024C10 +_08012F20: .4byte gBankAttacker +_08012F24: .4byte gBattlescriptCurrInstr _08012F28: .4byte gUnknown_02024C1C -_08012F2C: .4byte gUnknown_02024A64 +_08012F2C: .4byte gBattleExecBuffer _08012F30: .4byte gBitTable -_08012F34: .4byte gUnknown_081FA73C +_08012F34: .4byte gBattleScriptingCommandsTable _08012F38: - ldr r3, _08012FA0 @ =gUnknown_02024A64 + ldr r3, _08012FA0 @ =gBattleExecBuffer ldr r1, _08012FA4 @ =gBitTable - ldr r0, _08012FA8 @ =gUnknown_02024A60 + ldr r0, _08012FA8 @ =gActiveBank ldrb r4, [r0] lsls r0, r4, 2 adds r0, r1 @@ -1440,15 +1440,15 @@ _08012F38: cmp r3, 0 bne _08012F66 _08012F60: - ldr r0, _08012FAC @ =gUnknown_02024D1E + ldr r0, _08012FAC @ =gBattleCommunication adds r0, r4, r0 strb r3, [r0] _08012F66: - ldr r0, _08012FA8 @ =gUnknown_02024A60 + ldr r0, _08012FA8 @ =gActiveBank ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, _08012FB0 @ =gUnknown_02024A68 + ldr r0, _08012FB0 @ =gNoOfAllBanks lsls r1, 24 lsrs r1, 24 _08012F74: @@ -1458,12 +1458,12 @@ _08012F74: bcs _08012F80 bl _0801234C _08012F80: - ldr r0, _08012FAC @ =gUnknown_02024D1E + ldr r0, _08012FAC @ =gBattleCommunication ldrb r0, [r0, 0x4] ldrb r2, [r2] cmp r0, r2 bne _08012F90 - ldr r1, _08012FB4 @ =gUnknown_030042D4 + ldr r1, _08012FB4 @ =gBattleMainFunc ldr r0, _08012FB8 @ =sub_80133C8 str r0, [r1] _08012F90: @@ -1476,12 +1476,12 @@ _08012F90: pop {r0} bx r0 .align 2, 0 -_08012FA0: .4byte gUnknown_02024A64 +_08012FA0: .4byte gBattleExecBuffer _08012FA4: .4byte gBitTable -_08012FA8: .4byte gUnknown_02024A60 -_08012FAC: .4byte gUnknown_02024D1E -_08012FB0: .4byte gUnknown_02024A68 -_08012FB4: .4byte gUnknown_030042D4 +_08012FA8: .4byte gActiveBank +_08012FAC: .4byte gBattleCommunication +_08012FB0: .4byte gNoOfAllBanks +_08012FB4: .4byte gBattleMainFunc _08012FB8: .4byte sub_80133C8 thumb_func_end sub_8012324 @@ -1499,7 +1499,7 @@ sub_8012FBC: @ 8012FBC ldrb r3, [r2] strb r3, [r4] strb r5, [r2] - ldr r2, _08012FEC @ =gUnknown_02024A7A + ldr r2, _08012FEC @ =gTurnOrder adds r0, r2 ldrb r5, [r0] adds r1, r2 @@ -1511,7 +1511,7 @@ sub_8012FBC: @ 8012FBC bx r0 .align 2, 0 _08012FE8: .4byte gUnknown_02024A76 -_08012FEC: .4byte gUnknown_02024A7A +_08012FEC: .4byte gTurnOrder thumb_func_end sub_8012FBC thumb_func_start b_first_side @@ -1538,7 +1538,7 @@ b_first_side: @ 8012FF0 movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _080130B8 @@ -1548,7 +1548,7 @@ b_first_side: @ 8012FF0 movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _080130B8 @@ -1680,7 +1680,7 @@ _08013120: cmp r0, 0 beq _08013154 mov r0, r9 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08013154 @@ -1716,7 +1716,7 @@ _0801315E: _0801317C: cmp r6, 0x1A bne _08013198 - ldr r0, _080131E8 @ =gUnknown_02024D1C + ldr r0, _080131E8 @ =gRandomTurnNumber ldrh r4, [r0] lsls r0, r5, 16 subs r0, r5 @@ -1765,7 +1765,7 @@ _08013198: _080131DC: .4byte gBattleTypeFlags _080131E0: .4byte 0x00000809 _080131E4: .4byte gBattleMons -_080131E8: .4byte gUnknown_02024D1C +_080131E8: .4byte gRandomTurnNumber _080131EC: .4byte gStatStageRatios _080131F0: .4byte gEnigmaBerries _080131F4: @@ -1790,7 +1790,7 @@ _08013208: cmp r0, 0 beq _08013238 mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08013238 @@ -1821,7 +1821,7 @@ _0801323E: _0801325A: cmp r6, 0x1A bne _08013274 - ldr r0, _0801328C @ =gUnknown_02024D1C + ldr r0, _0801328C @ =gRandomTurnNumber ldrh r4, [r0] lsls r0, r5, 16 subs r0, r5 @@ -1841,16 +1841,16 @@ _08013274: _08013280: .4byte gBattleTypeFlags _08013284: .4byte 0x00000809 _08013288: .4byte gBattleMons -_0801328C: .4byte gUnknown_02024D1C +_0801328C: .4byte gRandomTurnNumber _08013290: - ldr r0, _080132B0 @ =gUnknown_02024C18 + ldr r0, _080132B0 @ =gActionForBanks mov r3, r9 adds r1, r3, r0 ldrb r1, [r1] adds r2, r0, 0 cmp r1, 0 bne _080132E4 - ldr r0, _080132B4 @ =gUnknown_02024D28 + ldr r0, _080132B4 @ =gProtectStructs lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] @@ -1860,8 +1860,8 @@ _08013290: movs r3, 0xA5 b _080132E6 .align 2, 0 -_080132B0: .4byte gUnknown_02024C18 -_080132B4: .4byte gUnknown_02024D28 +_080132B0: .4byte gActionForBanks +_080132B4: .4byte gProtectStructs _080132B8: ldr r1, _080132D8 @ =0x02000000 ldr r0, _080132DC @ =0x0001608c @@ -1891,7 +1891,7 @@ _080132E6: ldrb r0, [r0] cmp r0, 0 bne _08013334 - ldr r0, _08013304 @ =gUnknown_02024D28 + ldr r0, _08013304 @ =gProtectStructs lsls r1, 4 adds r1, r0 ldrb r0, [r1] @@ -1901,7 +1901,7 @@ _080132E6: movs r2, 0xA5 b _08013336 .align 2, 0 -_08013304: .4byte gUnknown_02024D28 +_08013304: .4byte gProtectStructs _08013308: ldr r1, _08013328 @ =0x02000000 ldr r0, _0801332C @ =0x0001608c @@ -2019,9 +2019,9 @@ sub_80133C8: @ 80133C8 ands r0, r1 cmp r0, 0 beq _08013434 - ldr r0, _08013420 @ =gUnknown_02024A60 + ldr r0, _08013420 @ =gActiveBank strb r3, [r0] - ldr r4, _08013424 @ =gUnknown_02024A68 + ldr r4, _08013424 @ =gNoOfAllBanks mov r8, r0 ldrb r0, [r4] cmp r3, r0 @@ -2029,9 +2029,9 @@ sub_80133C8: @ 80133C8 b _08013622 _080133F0: ldr r7, _08013428 @ =gUnknown_02024A76 - ldr r6, _0801342C @ =gUnknown_02024C18 + ldr r6, _0801342C @ =gActionForBanks mov r2, r8 - ldr r5, _08013430 @ =gUnknown_02024A7A + ldr r5, _08013430 @ =gTurnOrder _080133F8: adds r1, r3, r7 ldrb r0, [r2] @@ -2053,25 +2053,25 @@ _080133F8: b _08013622 .align 2, 0 _0801341C: .4byte gBattleTypeFlags -_08013420: .4byte gUnknown_02024A60 -_08013424: .4byte gUnknown_02024A68 +_08013420: .4byte gActiveBank +_08013424: .4byte gNoOfAllBanks _08013428: .4byte gUnknown_02024A76 -_0801342C: .4byte gUnknown_02024C18 -_08013430: .4byte gUnknown_02024A7A +_0801342C: .4byte gActionForBanks +_08013430: .4byte gTurnOrder _08013434: movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _08013484 - ldr r0, _08013478 @ =gUnknown_02024A60 + ldr r0, _08013478 @ =gActiveBank strb r3, [r0] - ldr r1, _0801347C @ =gUnknown_02024A68 + ldr r1, _0801347C @ =gNoOfAllBanks mov r8, r0 adds r2, r1, 0 ldrb r2, [r2] cmp r3, r2 bcs _08013494 - ldr r0, _08013480 @ =gUnknown_02024C18 + ldr r0, _08013480 @ =gActionForBanks ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x3 @@ -2083,7 +2083,7 @@ _08013456: strb r0, [r7] lsls r0, 24 lsrs r0, 24 - ldr r1, _0801347C @ =gUnknown_02024A68 + ldr r1, _0801347C @ =gNoOfAllBanks ldrb r1, [r1] cmp r0, r1 bcs _08013494 @@ -2094,13 +2094,13 @@ _08013456: bne _08013456 b _08013492 .align 2, 0 -_08013478: .4byte gUnknown_02024A60 -_0801347C: .4byte gUnknown_02024A68 -_08013480: .4byte gUnknown_02024C18 +_08013478: .4byte gActiveBank +_0801347C: .4byte gNoOfAllBanks +_08013480: .4byte gActionForBanks _08013484: - ldr r0, _080134FC @ =gUnknown_02024C18 + ldr r0, _080134FC @ =gActionForBanks ldrb r0, [r0] - ldr r2, _08013500 @ =gUnknown_02024A60 + ldr r2, _08013500 @ =gActiveBank mov r8, r2 cmp r0, 0x3 bne _08013494 @@ -2111,32 +2111,32 @@ _08013494: cmp r3, 0x5 bne _08013520 ldr r6, _08013504 @ =gUnknown_02024A76 - ldr r1, _080134FC @ =gUnknown_02024C18 + ldr r1, _080134FC @ =gActionForBanks mov r3, r8 ldrb r0, [r3] adds r0, r1 ldrb r0, [r0] strb r0, [r6] - ldr r2, _08013508 @ =gUnknown_02024A7A + ldr r2, _08013508 @ =gTurnOrder ldrb r0, [r3] strb r0, [r2] movs r3, 0x1 movs r5, 0 adds r4, r1, 0 - ldr r7, _0801350C @ =gUnknown_030042D4 + ldr r7, _0801350C @ =gBattleMainFunc mov r9, r7 ldr r0, _08013510 @ =bc_80154A0 mov r12, r0 ldr r1, _08013514 @ =0x02000000 mov r10, r1 - ldr r7, _08013518 @ =gUnknown_02024A68 + ldr r7, _08013518 @ =gNoOfAllBanks ldrb r7, [r7] cmp r5, r7 bge _080134EC adds r7, r6, 0 adds r6, r4, 0 adds r4, r2, 0 - ldr r2, _08013518 @ =gUnknown_02024A68 + ldr r2, _08013518 @ =gNoOfAllBanks _080134CE: mov r0, r8 ldrb r0, [r0] @@ -2164,27 +2164,27 @@ _080134EC: strb r0, [r1] b _08013632 .align 2, 0 -_080134FC: .4byte gUnknown_02024C18 -_08013500: .4byte gUnknown_02024A60 +_080134FC: .4byte gActionForBanks +_08013500: .4byte gActiveBank _08013504: .4byte gUnknown_02024A76 -_08013508: .4byte gUnknown_02024A7A -_0801350C: .4byte gUnknown_030042D4 +_08013508: .4byte gTurnOrder +_0801350C: .4byte gBattleMainFunc _08013510: .4byte bc_80154A0 _08013514: .4byte 0x02000000 -_08013518: .4byte gUnknown_02024A68 +_08013518: .4byte gNoOfAllBanks _0801351C: .4byte 0x0001601d _08013520: movs r0, 0 mov r7, r8 strb r0, [r7] - ldr r1, _080135B0 @ =gUnknown_02024A68 + ldr r1, _080135B0 @ =gNoOfAllBanks ldrb r0, [r1] cmp r0, 0 beq _08013566 - ldr r6, _080135B4 @ =gUnknown_02024C18 + ldr r6, _080135B4 @ =gActionForBanks mov r2, r8 ldr r5, _080135B8 @ =gUnknown_02024A76 - ldr r4, _080135BC @ =gUnknown_02024A7A + ldr r4, _080135BC @ =gTurnOrder _08013536: ldrb r0, [r2] adds r0, r6 @@ -2207,7 +2207,7 @@ _08013554: strb r0, [r2] lsls r0, 24 lsrs r0, 24 - ldr r1, _080135B0 @ =gUnknown_02024A68 + ldr r1, _080135B0 @ =gNoOfAllBanks ldrb r1, [r1] cmp r0, r1 bcc _08013536 @@ -2215,13 +2215,13 @@ _08013566: movs r0, 0 mov r2, r8 strb r0, [r2] - ldr r7, _080135B0 @ =gUnknown_02024A68 + ldr r7, _080135B0 @ =gNoOfAllBanks ldrb r0, [r7] cmp r0, 0 beq _080135AA - ldr r6, _080135B4 @ =gUnknown_02024C18 + ldr r6, _080135B4 @ =gActionForBanks ldr r5, _080135B8 @ =gUnknown_02024A76 - ldr r4, _080135BC @ =gUnknown_02024A7A + ldr r4, _080135BC @ =gTurnOrder _0801357A: ldrb r0, [r2] adds r0, r6 @@ -2244,7 +2244,7 @@ _08013598: strb r0, [r2] lsls r0, 24 lsrs r0, 24 - ldr r1, _080135B0 @ =gUnknown_02024A68 + ldr r1, _080135B0 @ =gNoOfAllBanks ldrb r1, [r1] cmp r0, r1 bcc _0801357A @@ -2252,10 +2252,10 @@ _080135AA: movs r5, 0 b _08013618 .align 2, 0 -_080135B0: .4byte gUnknown_02024A68 -_080135B4: .4byte gUnknown_02024C18 +_080135B0: .4byte gNoOfAllBanks +_080135B4: .4byte gActionForBanks _080135B8: .4byte gUnknown_02024A76 -_080135BC: .4byte gUnknown_02024A7A +_080135BC: .4byte gTurnOrder _080135C0: adds r4, r5, 0x1 adds r7, r4, 0 @@ -2266,7 +2266,7 @@ _080135C0: lsls r2, r5, 24 mov r8, r2 _080135D0: - ldr r0, _08013644 @ =gUnknown_02024A7A + ldr r0, _08013644 @ =gTurnOrder adds r1, r5, r0 ldrb r3, [r1] adds r0, r4, r0 @@ -2296,20 +2296,20 @@ _080135D0: bl sub_8012FBC _0801360C: adds r4, 0x1 - ldr r0, _08013648 @ =gUnknown_02024A68 + ldr r0, _08013648 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _080135D0 _08013616: adds r5, r7, 0 _08013618: - ldr r1, _08013648 @ =gUnknown_02024A68 + ldr r1, _08013648 @ =gNoOfAllBanks ldrb r0, [r1] subs r0, 0x1 cmp r5, r0 blt _080135C0 _08013622: - ldr r1, _0801364C @ =gUnknown_030042D4 + ldr r1, _0801364C @ =gBattleMainFunc ldr r0, _08013650 @ =bc_80154A0 str r0, [r1] ldr r0, _08013654 @ =0x02000000 @@ -2327,16 +2327,16 @@ _08013632: bx r0 .align 2, 0 _08013640: .4byte gUnknown_02024A76 -_08013644: .4byte gUnknown_02024A7A -_08013648: .4byte gUnknown_02024A68 -_0801364C: .4byte gUnknown_030042D4 +_08013644: .4byte gTurnOrder +_08013648: .4byte gNoOfAllBanks +_0801364C: .4byte gBattleMainFunc _08013650: .4byte bc_80154A0 _08013654: .4byte 0x02000000 _08013658: .4byte 0x0001601d thumb_func_end sub_80133C8 - thumb_func_start sub_801365C -sub_801365C: @ 801365C + thumb_func_start TurnValuesCleanUp +TurnValuesCleanUp: @ 801365C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2345,19 +2345,19 @@ sub_801365C: @ 801365C lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _080136B4 @ =gUnknown_02024A60 + ldr r1, _080136B4 @ =gActiveBank movs r0, 0 strb r0, [r1] - ldr r0, _080136B8 @ =gUnknown_02024A68 + ldr r0, _080136B8 @ =gNoOfAllBanks ldrb r2, [r0] adds r5, r1, 0 cmp r2, 0 beq _08013754 - ldr r7, _080136BC @ =gUnknown_02024D28 + ldr r7, _080136BC @ =gProtectStructs adds r6, r5, 0 ldr r0, _080136C0 @ =gUnknown_02024AD0 mov r12, r0 - ldr r1, _080136C4 @ =gUnknown_02024CA8 + ldr r1, _080136C4 @ =gDisableStructs mov r8, r1 mov r10, r8 _0801368A: @@ -2382,11 +2382,11 @@ _0801368A: strb r0, [r1] b _08013724 .align 2, 0 -_080136B4: .4byte gUnknown_02024A60 -_080136B8: .4byte gUnknown_02024A68 -_080136BC: .4byte gUnknown_02024D28 +_080136B4: .4byte gActiveBank +_080136B8: .4byte gNoOfAllBanks +_080136BC: .4byte gProtectStructs _080136C0: .4byte gUnknown_02024AD0 -_080136C4: .4byte gUnknown_02024CA8 +_080136C4: .4byte gDisableStructs _080136C8: ldrb r0, [r6] lsls r0, 4 @@ -2458,13 +2458,13 @@ _08013742: strb r0, [r5] lsls r0, 24 lsrs r0, 24 - ldr r1, _08013774 @ =gUnknown_02024A68 + ldr r1, _08013774 @ =gNoOfAllBanks ldrb r1, [r1] cmp r0, r1 bcc _0801368A _08013754: movs r0, 0 - ldr r2, _08013778 @ =gUnknown_02024C80 + ldr r2, _08013778 @ =gSideTimer strb r0, [r2, 0x8] strb r0, [r2, 0x14] pop {r3-r5} @@ -2477,24 +2477,24 @@ _08013754: .align 2, 0 _0801376C: .4byte 0xffbfffff _08013770: .4byte 0xfeffffff -_08013774: .4byte gUnknown_02024A68 -_08013778: .4byte gUnknown_02024C80 - thumb_func_end sub_801365C +_08013774: .4byte gNoOfAllBanks +_08013778: .4byte gSideTimer + thumb_func_end TurnValuesCleanUp - thumb_func_start sub_801377C -sub_801377C: @ 801377C + thumb_func_start SpecialStatusesClear +SpecialStatusesClear: @ 801377C push {r4-r6,lr} - ldr r2, _080137C0 @ =gUnknown_02024A60 + ldr r2, _080137C0 @ =gActiveBank movs r0, 0 strb r0, [r2] - ldr r0, _080137C4 @ =gUnknown_02024A68 + ldr r0, _080137C4 @ =gNoOfAllBanks ldrb r1, [r0] adds r6, r0, 0 cmp r1, 0 beq _080137BA adds r3, r2, 0 movs r4, 0 - ldr r5, _080137C8 @ =gUnknown_02024D68 + ldr r5, _080137C8 @ =gSpecialStatuses _08013794: ldrb r1, [r3] lsls r0, r1, 2 @@ -2521,15 +2521,15 @@ _080137BA: pop {r0} bx r0 .align 2, 0 -_080137C0: .4byte gUnknown_02024A60 -_080137C4: .4byte gUnknown_02024A68 -_080137C8: .4byte gUnknown_02024D68 - thumb_func_end sub_801377C +_080137C0: .4byte gActiveBank +_080137C4: .4byte gNoOfAllBanks +_080137C8: .4byte gSpecialStatuses + thumb_func_end SpecialStatusesClear thumb_func_start bc_80154A0 bc_80154A0: @ 80137CC push {r4-r7,lr} - ldr r0, _08013850 @ =gUnknown_02024C6C + ldr r0, _08013850 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 8 @@ -2539,14 +2539,14 @@ bc_80154A0: @ 80137CC ldr r0, _08013854 @ =0x02000000 ldr r1, _08013858 @ =0x0001601d adds r2, r0, r1 - ldr r0, _0801385C @ =gUnknown_02024A68 + ldr r0, _0801385C @ =gNoOfAllBanks ldrb r1, [r2] adds r7, r0, 0 ldrb r0, [r7] cmp r1, r0 bcs _08013884 - ldr r6, _08013860 @ =gUnknown_02024A60 - ldr r5, _08013864 @ =gPlayerMonIndex + ldr r6, _08013860 @ =gActiveBank + ldr r5, _08013864 @ =gBankAttacker adds r4, r2, 0 movs r1, 0x84 lsls r1, 1 @@ -2557,7 +2557,7 @@ _080137FA: strb r0, [r6] adds r0, 0x1 strb r0, [r4] - ldr r1, _08013868 @ =gUnknown_02024C60 + ldr r1, _08013868 @ =gChosenMovesByBanks ldrb r3, [r6] lsls r0, r3, 1 adds r0, r1 @@ -2574,7 +2574,7 @@ _080137FA: ands r0, r1 cmp r0, 0 bne _0801387C - ldr r2, _08013870 @ =gUnknown_02024CA8 + ldr r2, _08013870 @ =gDisableStructs ldrb r1, [r5] lsls r0, r1, 3 subs r0, r1 @@ -2584,7 +2584,7 @@ _080137FA: lsls r0, 31 cmp r0, 0 bne _0801387C - ldr r0, _08013874 @ =gUnknown_02024D28 + ldr r0, _08013874 @ =gProtectStructs lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] @@ -2595,16 +2595,16 @@ _080137FA: bl b_call_bc_move_exec b _080138BE .align 2, 0 -_08013850: .4byte gUnknown_02024C6C +_08013850: .4byte gHitMarker _08013854: .4byte 0x02000000 _08013858: .4byte 0x0001601d -_0801385C: .4byte gUnknown_02024A68 -_08013860: .4byte gUnknown_02024A60 -_08013864: .4byte gPlayerMonIndex -_08013868: .4byte gUnknown_02024C60 +_0801385C: .4byte gNoOfAllBanks +_08013860: .4byte gActiveBank +_08013864: .4byte gBankAttacker +_08013868: .4byte gChosenMovesByBanks _0801386C: .4byte gBattleMons -_08013870: .4byte gUnknown_02024CA8 -_08013874: .4byte gUnknown_02024D28 +_08013870: .4byte gDisableStructs +_08013874: .4byte gProtectStructs _08013878: .4byte gUnknown_081D94DA _0801387C: ldrb r0, [r4] @@ -2613,25 +2613,25 @@ _0801387C: bcc _080137FA _08013884: bl b_clear_atk_up_if_hit_flag_unless_enraged - ldr r1, _080138C4 @ =gUnknown_02024A7E + ldr r1, _080138C4 @ =gCurrentMoveTurn movs r0, 0 strb r0, [r1] - ldr r1, _080138C8 @ =gUnknown_02024A7F + ldr r1, _080138C8 @ =gFightStateTracker ldr r0, _080138CC @ =gUnknown_02024A76 movs r2, 0 ldrb r0, [r0] strb r0, [r1] - ldr r0, _080138D0 @ =gUnknown_02024DEC + ldr r0, _080138D0 @ =gDynamicBasePower movs r3, 0 strh r2, [r0] ldr r1, _080138D4 @ =0x02000000 ldr r2, _080138D8 @ =0x0001601c adds r0, r1, r2 strb r3, [r0] - ldr r2, _080138DC @ =gUnknown_030042D4 + ldr r2, _080138DC @ =gBattleMainFunc ldr r0, _080138E0 @ =sub_80138F0 str r0, [r2] - ldr r0, _080138E4 @ =gUnknown_02024D1E + ldr r0, _080138E4 @ =gBattleCommunication strb r3, [r0, 0x3] strb r3, [r0, 0x4] ldr r2, _080138E8 @ =0x00016112 @@ -2645,15 +2645,15 @@ _080138BE: pop {r0} bx r0 .align 2, 0 -_080138C4: .4byte gUnknown_02024A7E -_080138C8: .4byte gUnknown_02024A7F +_080138C4: .4byte gCurrentMoveTurn +_080138C8: .4byte gFightStateTracker _080138CC: .4byte gUnknown_02024A76 -_080138D0: .4byte gUnknown_02024DEC +_080138D0: .4byte gDynamicBasePower _080138D4: .4byte 0x02000000 _080138D8: .4byte 0x0001601c -_080138DC: .4byte gUnknown_030042D4 +_080138DC: .4byte gBattleMainFunc _080138E0: .4byte sub_80138F0 -_080138E4: .4byte gUnknown_02024D1E +_080138E4: .4byte gBattleCommunication _080138E8: .4byte 0x00016112 _080138EC: .4byte 0x00017130 thumb_func_end bc_80154A0 @@ -2661,16 +2661,16 @@ _080138EC: .4byte 0x00017130 thumb_func_start sub_80138F0 sub_80138F0: @ 80138F0 push {r4-r6,lr} - ldr r6, _08013944 @ =gUnknown_02024D26 + ldr r6, _08013944 @ =gBattleOutcome ldrb r0, [r6] - ldr r2, _08013948 @ =gUnknown_02024A7F + ldr r2, _08013948 @ =gFightStateTracker cmp r0, 0 beq _08013900 movs r0, 0xC strb r0, [r2] _08013900: ldr r1, _0801394C @ =0x02000000 - ldr r4, _08013950 @ =gUnknown_02024A7E + ldr r4, _08013950 @ =gCurrentMoveTurn ldrb r0, [r4] ldr r3, _08013954 @ =0x00016057 adds r5, r1, r3 @@ -2681,17 +2681,17 @@ _08013900: adds r0, r1 ldr r0, [r0] bl _call_via_r0 - ldr r0, _0801395C @ =gUnknown_02024A68 + ldr r0, _0801395C @ =gNoOfAllBanks ldrb r1, [r4] ldrb r0, [r0] cmp r1, r0 bcc _08013970 - ldr r2, _08013960 @ =gUnknown_02024C6C + ldr r2, _08013960 @ =gHitMarker ldr r0, [r2] ldr r1, _08013964 @ =0xffefffff ands r0, r1 str r0, [r2] - ldr r3, _08013968 @ =gUnknown_030042D4 + ldr r3, _08013968 @ =gBattleMainFunc ldr r2, _0801396C @ =gUnknown_081FA678 ldrb r1, [r6] movs r0, 0x7F @@ -2702,22 +2702,22 @@ _08013900: str r0, [r3] b _08013984 .align 2, 0 -_08013944: .4byte gUnknown_02024D26 -_08013948: .4byte gUnknown_02024A7F +_08013944: .4byte gBattleOutcome +_08013948: .4byte gFightStateTracker _0801394C: .4byte 0x02000000 -_08013950: .4byte gUnknown_02024A7E +_08013950: .4byte gCurrentMoveTurn _08013954: .4byte 0x00016057 _08013958: .4byte gUnknown_081FA640 -_0801395C: .4byte gUnknown_02024A68 -_08013960: .4byte gUnknown_02024C6C +_0801395C: .4byte gNoOfAllBanks +_08013960: .4byte gHitMarker _08013964: .4byte 0xffefffff -_08013968: .4byte gUnknown_030042D4 +_08013968: .4byte gBattleMainFunc _0801396C: .4byte gUnknown_081FA678 _08013970: ldrb r0, [r5] cmp r0, r1 beq _08013984 - ldr r2, _0801398C @ =gUnknown_02024C6C + ldr r2, _0801398C @ =gHitMarker ldr r0, [r2] ldr r1, _08013990 @ =0xfffffdff ands r0, r1 @@ -2729,7 +2729,7 @@ _08013984: pop {r0} bx r0 .align 2, 0 -_0801398C: .4byte gUnknown_02024C6C +_0801398C: .4byte gHitMarker _08013990: .4byte 0xfffffdff _08013994: .4byte 0xfff7ffff thumb_func_end sub_80138F0 @@ -2737,7 +2737,7 @@ _08013994: .4byte 0xfff7ffff thumb_func_start sub_8013998 sub_8013998: @ 8013998 push {r4,lr} - ldr r1, _080139D0 @ =gUnknown_02024A7F + ldr r1, _080139D0 @ =gFightStateTracker movs r0, 0 strb r0, [r1] ldr r0, _080139D4 @ =gBattleTypeFlags @@ -2746,15 +2746,15 @@ sub_8013998: @ 8013998 ands r0, r1 cmp r0, 0 beq _080139EC - ldr r1, _080139D8 @ =gUnknown_030041C0 - ldr r4, _080139DC @ =gUnknown_02024D26 + ldr r1, _080139D8 @ =gBattleTextBuff1 + ldr r4, _080139DC @ =gBattleOutcome ldrb r0, [r4] strb r0, [r1] movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, _080139E0 @ =gPlayerMonIndex + bl GetBankByPlayerAI + ldr r1, _080139E0 @ =gBankAttacker strb r0, [r1] - ldr r1, _080139E4 @ =gUnknown_02024C10 + ldr r1, _080139E4 @ =gBattlescriptCurrInstr ldr r0, _080139E8 @ =gUnknown_081D8E02 str r0, [r1] ldrb r1, [r4] @@ -2763,12 +2763,12 @@ sub_8013998: @ 8013998 strb r0, [r4] b _08013B48 .align 2, 0 -_080139D0: .4byte gUnknown_02024A7F +_080139D0: .4byte gFightStateTracker _080139D4: .4byte gBattleTypeFlags -_080139D8: .4byte gUnknown_030041C0 -_080139DC: .4byte gUnknown_02024D26 -_080139E0: .4byte gPlayerMonIndex -_080139E4: .4byte gUnknown_02024C10 +_080139D8: .4byte gBattleTextBuff1 +_080139DC: .4byte gBattleOutcome +_080139E0: .4byte gBankAttacker +_080139E4: .4byte gBattlescriptCurrInstr _080139E8: .4byte gUnknown_081D8E02 _080139EC: movs r0, 0x90 @@ -2776,11 +2776,11 @@ _080139EC: ands r0, r1 cmp r0, 0 beq _08013A04 - ldr r1, _080139FC @ =gUnknown_02024C10 + ldr r1, _080139FC @ =gBattlescriptCurrInstr ldr r0, _08013A00 @ =gUnknown_081D8E0D b _08013B46 .align 2, 0 -_080139FC: .4byte gUnknown_02024C10 +_080139FC: .4byte gBattlescriptCurrInstr _08013A00: .4byte gUnknown_081D8E0D _08013A04: movs r0, 0xA @@ -2790,7 +2790,7 @@ _08013A04: b _08013B42 _08013A0E: bl sub_80325B8 - ldr r1, _08013A3C @ =gUnknown_02024C10 + ldr r1, _08013A3C @ =gBattlescriptCurrInstr ldr r0, _08013A40 @ =gUnknown_081D8DBE str r0, [r1] ldr r2, _08013A44 @ =gTrainers @@ -2812,7 +2812,7 @@ _08013A30: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08013A3C: .4byte gUnknown_02024C10 +_08013A3C: .4byte gBattlescriptCurrInstr _08013A40: .4byte gUnknown_081D8DBE _08013A44: .4byte gTrainers _08013A48: .4byte gTrainerBattleOpponent @@ -2891,28 +2891,28 @@ _08013B38: bl PlayBGM b _08013B48 _08013B42: - ldr r1, _08013B54 @ =gUnknown_02024C10 + ldr r1, _08013B54 @ =gBattlescriptCurrInstr ldr r0, _08013B58 @ =gUnknown_081D8DCE _08013B46: str r0, [r1] _08013B48: - ldr r1, _08013B5C @ =gUnknown_030042D4 + ldr r1, _08013B5C @ =gBattleMainFunc ldr r0, _08013B60 @ =sub_8013C9C str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_08013B54: .4byte gUnknown_02024C10 +_08013B54: .4byte gBattlescriptCurrInstr _08013B58: .4byte gUnknown_081D8DCE -_08013B5C: .4byte gUnknown_030042D4 +_08013B5C: .4byte gBattleMainFunc _08013B60: .4byte sub_8013C9C thumb_func_end sub_8013998 thumb_func_start sub_8013B64 sub_8013B64: @ 8013B64 push {r4,lr} - ldr r1, _08013B9C @ =gUnknown_02024A7F + ldr r1, _08013B9C @ =gFightStateTracker movs r0, 0 strb r0, [r1] ldr r0, _08013BA0 @ =gBattleTypeFlags @@ -2921,15 +2921,15 @@ sub_8013B64: @ 8013B64 ands r0, r1 cmp r0, 0 beq _08013BB8 - ldr r1, _08013BA4 @ =gUnknown_030041C0 - ldr r4, _08013BA8 @ =gUnknown_02024D26 + ldr r1, _08013BA4 @ =gBattleTextBuff1 + ldr r4, _08013BA8 @ =gBattleOutcome ldrb r0, [r4] strb r0, [r1] movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, _08013BAC @ =gPlayerMonIndex + bl GetBankByPlayerAI + ldr r1, _08013BAC @ =gBankAttacker strb r0, [r1] - ldr r1, _08013BB0 @ =gUnknown_02024C10 + ldr r1, _08013BB0 @ =gBattlescriptCurrInstr ldr r0, _08013BB4 @ =gUnknown_081D8E02 str r0, [r1] ldrb r1, [r4] @@ -2938,39 +2938,39 @@ sub_8013B64: @ 8013B64 strb r0, [r4] b _08013BBE .align 2, 0 -_08013B9C: .4byte gUnknown_02024A7F +_08013B9C: .4byte gFightStateTracker _08013BA0: .4byte gBattleTypeFlags -_08013BA4: .4byte gUnknown_030041C0 -_08013BA8: .4byte gUnknown_02024D26 -_08013BAC: .4byte gPlayerMonIndex -_08013BB0: .4byte gUnknown_02024C10 +_08013BA4: .4byte gBattleTextBuff1 +_08013BA8: .4byte gBattleOutcome +_08013BAC: .4byte gBankAttacker +_08013BB0: .4byte gBattlescriptCurrInstr _08013BB4: .4byte gUnknown_081D8E02 _08013BB8: - ldr r1, _08013BCC @ =gUnknown_02024C10 + ldr r1, _08013BCC @ =gBattlescriptCurrInstr ldr r0, _08013BD0 @ =gUnknown_081D8DD1 str r0, [r1] _08013BBE: - ldr r1, _08013BD4 @ =gUnknown_030042D4 + ldr r1, _08013BD4 @ =gBattleMainFunc ldr r0, _08013BD8 @ =sub_8013C9C str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_08013BCC: .4byte gUnknown_02024C10 +_08013BCC: .4byte gBattlescriptCurrInstr _08013BD0: .4byte gUnknown_081D8DD1 -_08013BD4: .4byte gUnknown_030042D4 +_08013BD4: .4byte gBattleMainFunc _08013BD8: .4byte sub_8013C9C thumb_func_end sub_8013B64 thumb_func_start sub_8013BDC sub_8013BDC: @ 8013BDC push {lr} - ldr r1, _08013C04 @ =gUnknown_02024A7F + ldr r1, _08013C04 @ =gFightStateTracker movs r0, 0 strb r0, [r1] - ldr r1, _08013C08 @ =gUnknown_02024D28 - ldr r0, _08013C0C @ =gPlayerMonIndex + ldr r1, _08013C08 @ =gProtectStructs + ldr r0, _08013C0C @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -2981,53 +2981,53 @@ sub_8013BDC: @ 8013BDC beq _08013C18 cmp r0, 0x2 beq _08013C28 - ldr r1, _08013C10 @ =gUnknown_02024C10 + ldr r1, _08013C10 @ =gBattlescriptCurrInstr ldr r0, _08013C14 @ =gUnknown_081D8E29 b _08013C2C .align 2, 0 -_08013C04: .4byte gUnknown_02024A7F -_08013C08: .4byte gUnknown_02024D28 -_08013C0C: .4byte gPlayerMonIndex -_08013C10: .4byte gUnknown_02024C10 +_08013C04: .4byte gFightStateTracker +_08013C08: .4byte gProtectStructs +_08013C0C: .4byte gBankAttacker +_08013C10: .4byte gBattlescriptCurrInstr _08013C14: .4byte gUnknown_081D8E29 _08013C18: - ldr r1, _08013C20 @ =gUnknown_02024C10 + ldr r1, _08013C20 @ =gBattlescriptCurrInstr ldr r0, _08013C24 @ =gUnknown_081D8E14 b _08013C2C .align 2, 0 -_08013C20: .4byte gUnknown_02024C10 +_08013C20: .4byte gBattlescriptCurrInstr _08013C24: .4byte gUnknown_081D8E14 _08013C28: - ldr r1, _08013C38 @ =gUnknown_02024C10 + ldr r1, _08013C38 @ =gBattlescriptCurrInstr ldr r0, _08013C3C @ =gUnknown_081D8E22 _08013C2C: str r0, [r1] - ldr r1, _08013C40 @ =gUnknown_030042D4 + ldr r1, _08013C40 @ =gBattleMainFunc ldr r0, _08013C44 @ =sub_8013C9C str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08013C38: .4byte gUnknown_02024C10 +_08013C38: .4byte gBattlescriptCurrInstr _08013C3C: .4byte gUnknown_081D8E22 -_08013C40: .4byte gUnknown_030042D4 +_08013C40: .4byte gBattleMainFunc _08013C44: .4byte sub_8013C9C thumb_func_end sub_8013BDC thumb_func_start sub_8013C48 sub_8013C48: @ 8013C48 - ldr r1, _08013C7C @ =gUnknown_02024A7F + ldr r1, _08013C7C @ =gFightStateTracker movs r0, 0 strb r0, [r1] - ldr r1, _08013C80 @ =gUnknown_030041C0 + ldr r1, _08013C80 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] - ldr r2, _08013C84 @ =gPlayerMonIndex + ldr r2, _08013C84 @ =gBankAttacker ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, _08013C88 @ =gUnknown_02024A6A + ldr r3, _08013C88 @ =gBattlePartyID ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -3035,28 +3035,28 @@ sub_8013C48: @ 8013C48 strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08013C8C @ =gUnknown_02024C10 + ldr r1, _08013C8C @ =gBattlescriptCurrInstr ldr r0, _08013C90 @ =gUnknown_081D8E30 str r0, [r1] - ldr r1, _08013C94 @ =gUnknown_030042D4 + ldr r1, _08013C94 @ =gBattleMainFunc ldr r0, _08013C98 @ =sub_8013C9C str r0, [r1] bx lr .align 2, 0 -_08013C7C: .4byte gUnknown_02024A7F -_08013C80: .4byte gUnknown_030041C0 -_08013C84: .4byte gPlayerMonIndex -_08013C88: .4byte gUnknown_02024A6A -_08013C8C: .4byte gUnknown_02024C10 +_08013C7C: .4byte gFightStateTracker +_08013C80: .4byte gBattleTextBuff1 +_08013C84: .4byte gBankAttacker +_08013C88: .4byte gBattlePartyID +_08013C8C: .4byte gBattlescriptCurrInstr _08013C90: .4byte gUnknown_081D8E30 -_08013C94: .4byte gUnknown_030042D4 +_08013C94: .4byte gBattleMainFunc _08013C98: .4byte sub_8013C9C thumb_func_end sub_8013C48 thumb_func_start sub_8013C9C sub_8013C9C: @ 8013C9C push {r4-r7,lr} - ldr r0, _08013D00 @ =gUnknown_02024A7F + ldr r0, _08013D00 @ =gFightStateTracker ldrb r0, [r0] subs r0, 0xB lsls r0, 24 @@ -3069,9 +3069,9 @@ sub_8013C9C: @ 8013C9C ands r1, r0 cmp r1, 0 bne _08013D4C - ldr r2, _08013D0C @ =gUnknown_02024A60 + ldr r2, _08013D0C @ =gActiveBank strb r1, [r2] - ldr r0, _08013D10 @ =gUnknown_02024A68 + ldr r0, _08013D10 @ =gNoOfAllBanks ldrb r0, [r0] cmp r1, r0 bcs _08013D48 @@ -3082,11 +3082,11 @@ sub_8013C9C: @ 8013C9C adds r7, 0x30 _08013CCE: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08013D36 - ldr r2, _08013D18 @ =gUnknown_030042E0 + ldr r2, _08013D18 @ =gBattleResults ldrh r0, [r2, 0x6] cmp r0, 0 bne _08013D1C @@ -3104,13 +3104,13 @@ _08013CCE: bl StringCopy b _08013D36 .align 2, 0 -_08013D00: .4byte gUnknown_02024A7F +_08013D00: .4byte gFightStateTracker _08013D04: .4byte gBattleTypeFlags _08013D08: .4byte 0x00000b92 -_08013D0C: .4byte gUnknown_02024A60 -_08013D10: .4byte gUnknown_02024A68 +_08013D0C: .4byte gActiveBank +_08013D10: .4byte gNoOfAllBanks _08013D14: .4byte gBattleMons -_08013D18: .4byte gUnknown_030042E0 +_08013D18: .4byte gBattleResults _08013D1C: ldrb r0, [r4] muls r0, r5 @@ -3128,7 +3128,7 @@ _08013D36: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _08013D68 @ =gUnknown_02024A68 + ldr r1, _08013D68 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -3141,7 +3141,7 @@ _08013D4C: bl BeginFastPaletteFade movs r0, 0x5 bl FadeOutMapMusic - ldr r1, _08013D6C @ =gUnknown_030042D4 + ldr r1, _08013D6C @ =gBattleMainFunc ldr r0, _08013D70 @ =sub_8013DA8 str r0, [r1] ldr r1, _08013D74 @ =gUnknown_03005E94 @@ -3149,18 +3149,18 @@ _08013D4C: str r0, [r1] b _08013D96 .align 2, 0 -_08013D68: .4byte gUnknown_02024A68 -_08013D6C: .4byte gUnknown_030042D4 +_08013D68: .4byte gNoOfAllBanks +_08013D6C: .4byte gBattleMainFunc _08013D70: .4byte sub_8013DA8 _08013D74: .4byte gUnknown_03005E94 _08013D78: .4byte sub_800F808 _08013D7C: - ldr r0, _08013D9C @ =gUnknown_02024A64 + ldr r0, _08013D9C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08013D96 - ldr r1, _08013DA0 @ =gUnknown_081FA73C - ldr r0, _08013DA4 @ =gUnknown_02024C10 + ldr r1, _08013DA0 @ =gBattleScriptingCommandsTable + ldr r0, _08013DA4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -3172,9 +3172,9 @@ _08013D96: pop {r0} bx r0 .align 2, 0 -_08013D9C: .4byte gUnknown_02024A64 -_08013DA0: .4byte gUnknown_081FA73C -_08013DA4: .4byte gUnknown_02024C10 +_08013D9C: .4byte gBattleExecBuffer +_08013DA0: .4byte gBattleScriptingCommandsTable +_08013DA4: .4byte gBattlescriptCurrInstr thumb_func_end sub_8013C9C thumb_func_start sub_8013DA8 @@ -3187,26 +3187,26 @@ sub_8013DA8: @ 8013DA8 cmp r0, 0 bne _08013DEA bl ResetSpriteData - ldr r0, _08013DD4 @ =gUnknown_03004324 + ldr r0, _08013DD4 @ =gLeveledUpInBattle ldrb r0, [r0] cmp r0, 0 beq _08013DCA - ldr r0, _08013DD8 @ =gUnknown_02024D26 + ldr r0, _08013DD8 @ =gBattleOutcome ldrb r0, [r0] cmp r0, 0x1 beq _08013DE4 _08013DCA: - ldr r1, _08013DDC @ =gUnknown_030042D4 + ldr r1, _08013DDC @ =gBattleMainFunc ldr r0, _08013DE0 @ =c4_overworld b _08013DE8 .align 2, 0 _08013DD0: .4byte gPaletteFade -_08013DD4: .4byte gUnknown_03004324 -_08013DD8: .4byte gUnknown_02024D26 -_08013DDC: .4byte gUnknown_030042D4 +_08013DD4: .4byte gLeveledUpInBattle +_08013DD8: .4byte gBattleOutcome +_08013DDC: .4byte gBattleMainFunc _08013DE0: .4byte c4_overworld _08013DE4: - ldr r1, _08013DF0 @ =gUnknown_030042D4 + ldr r1, _08013DF0 @ =gBattleMainFunc ldr r0, _08013DF4 @ =bc_evolution_cutscene _08013DE8: str r0, [r1] @@ -3214,14 +3214,14 @@ _08013DEA: pop {r0} bx r0 .align 2, 0 -_08013DF0: .4byte gUnknown_030042D4 +_08013DF0: .4byte gBattleMainFunc _08013DF4: .4byte bc_evolution_cutscene thumb_func_end sub_8013DA8 thumb_func_start bc_evolution_cutscene bc_evolution_cutscene: @ 8013DF8 push {r4,r5,lr} - ldr r0, _08013E4C @ =gUnknown_03004324 + ldr r0, _08013E4C @ =gLeveledUpInBattle ldrb r1, [r0] adds r3, r0, 0 cmp r1, 0 @@ -3252,7 +3252,7 @@ _08013E06: lsrs r2, r0, 16 cmp r2, 0 beq _08013E60 - ldr r0, _08013E58 @ =gUnknown_030042D4 + ldr r0, _08013E58 @ =gBattleMainFunc ldr r1, _08013E5C @ =sub_8013E88 str r1, [r0] lsls r3, r5, 24 @@ -3263,21 +3263,21 @@ _08013E06: bl EvolutionScene b _08013E74 .align 2, 0 -_08013E4C: .4byte gUnknown_03004324 +_08013E4C: .4byte gLeveledUpInBattle _08013E50: .4byte gBitTable _08013E54: .4byte gPlayerParty -_08013E58: .4byte gUnknown_030042D4 +_08013E58: .4byte gBattleMainFunc _08013E5C: .4byte sub_8013E88 _08013E60: adds r5, 0x1 - ldr r3, _08013E7C @ =gUnknown_03004324 + ldr r3, _08013E7C @ =gLeveledUpInBattle cmp r5, 0x5 ble _08013E06 ldrb r0, [r3] cmp r0, 0 bne _08013E04 _08013E6E: - ldr r1, _08013E80 @ =gUnknown_030042D4 + ldr r1, _08013E80 @ =gBattleMainFunc ldr r0, _08013E84 @ =c4_overworld str r0, [r1] _08013E74: @@ -3285,8 +3285,8 @@ _08013E74: pop {r0} bx r0 .align 2, 0 -_08013E7C: .4byte gUnknown_03004324 -_08013E80: .4byte gUnknown_030042D4 +_08013E7C: .4byte gLeveledUpInBattle +_08013E80: .4byte gBattleMainFunc _08013E84: .4byte c4_overworld thumb_func_end bc_evolution_cutscene @@ -3298,7 +3298,7 @@ sub_8013E88: @ 8013E88 ldr r0, _08013EA4 @ =sub_800F808 cmp r1, r0 bne _08013E9A - ldr r1, _08013EA8 @ =gUnknown_030042D4 + ldr r1, _08013EA8 @ =gBattleMainFunc ldr r0, _08013EAC @ =bc_evolution_cutscene str r0, [r1] _08013E9A: @@ -3307,7 +3307,7 @@ _08013E9A: .align 2, 0 _08013EA0: .4byte gMain _08013EA4: .4byte sub_800F808 -_08013EA8: .4byte gUnknown_030042D4 +_08013EA8: .4byte gBattleMainFunc _08013EAC: .4byte bc_evolution_cutscene thumb_func_end sub_8013E88 @@ -3338,7 +3338,7 @@ _08013ECE: bne _08013F2A _08013EE0: ldr r1, _08013F3C @ =gScriptResult - ldr r5, _08013F40 @ =gUnknown_02024D26 + ldr r5, _08013F40 @ =gBattleOutcome ldrb r0, [r5] strh r0, [r1] ldr r3, _08013F44 @ =gMain @@ -3349,7 +3349,7 @@ _08013EE0: negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _08013F4C @ =gUnknown_030042D0 + ldr r0, _08013F4C @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r3] movs r0, 0x80 @@ -3381,17 +3381,17 @@ _08013F30: .4byte gBattleTypeFlags _08013F34: .4byte gPlayerParty _08013F38: .4byte gReceivedRemoteLinkPlayers _08013F3C: .4byte gScriptResult -_08013F40: .4byte gUnknown_02024D26 +_08013F40: .4byte gBattleOutcome _08013F44: .4byte gMain _08013F48: .4byte 0x0000043d -_08013F4C: .4byte gUnknown_030042D0 +_08013F4C: .4byte gPreBattleCallback1 _08013F50: .4byte gEnemyParty thumb_func_end c4_overworld thumb_func_start sub_8013F54 sub_8013F54: @ 8013F54 push {lr} - ldr r0, _08013F84 @ =gUnknown_02024A7F + ldr r0, _08013F84 @ =gFightStateTracker ldrb r0, [r0] subs r0, 0xB lsls r0, 24 @@ -3407,7 +3407,7 @@ sub_8013F54: @ 8013F54 subs r0, 0x1 strb r0, [r1] _08013F74: - ldr r0, _08013F8C @ =gUnknown_030042D4 + ldr r0, _08013F8C @ =gBattleMainFunc ldrb r1, [r1] lsls r1, 2 adds r1, r2 @@ -3415,16 +3415,16 @@ _08013F74: str r1, [r0] b _08013FAA .align 2, 0 -_08013F84: .4byte gUnknown_02024A7F +_08013F84: .4byte gFightStateTracker _08013F88: .4byte 0x02017140 -_08013F8C: .4byte gUnknown_030042D4 +_08013F8C: .4byte gBattleMainFunc _08013F90: - ldr r0, _08013FB0 @ =gUnknown_02024A64 + ldr r0, _08013FB0 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08013FAA - ldr r1, _08013FB4 @ =gUnknown_081FA73C - ldr r0, _08013FB8 @ =gUnknown_02024C10 + ldr r1, _08013FB4 @ =gBattleScriptingCommandsTable + ldr r0, _08013FB8 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -3435,20 +3435,20 @@ _08013FAA: pop {r0} bx r0 .align 2, 0 -_08013FB0: .4byte gUnknown_02024A64 -_08013FB4: .4byte gUnknown_081FA73C -_08013FB8: .4byte gUnknown_02024C10 +_08013FB0: .4byte gBattleExecBuffer +_08013FB4: .4byte gBattleScriptingCommandsTable +_08013FB8: .4byte gBattlescriptCurrInstr thumb_func_end sub_8013F54 thumb_func_start sub_8013FBC sub_8013FBC: @ 8013FBC push {lr} - ldr r0, _08013FDC @ =gUnknown_02024A64 + ldr r0, _08013FDC @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08013FD8 - ldr r1, _08013FE0 @ =gUnknown_081FA73C - ldr r0, _08013FE4 @ =gUnknown_02024C10 + ldr r1, _08013FE0 @ =gBattleScriptingCommandsTable + ldr r0, _08013FE4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -3459,9 +3459,9 @@ _08013FD8: pop {r0} bx r0 .align 2, 0 -_08013FDC: .4byte gUnknown_02024A64 -_08013FE0: .4byte gUnknown_081FA73C -_08013FE4: .4byte gUnknown_02024C10 +_08013FDC: .4byte gBattleExecBuffer +_08013FE0: .4byte gBattleScriptingCommandsTable +_08013FE4: .4byte gBattlescriptCurrInstr thumb_func_end sub_8013FBC thumb_func_start sub_8013FE8 @@ -3474,9 +3474,9 @@ sub_8013FE8: @ 8013FE8 sub sp, 0xC movs r0, 0x4 str r0, [sp] - ldr r7, _08014028 @ =gPlayerMonIndex - ldr r1, _0801402C @ =gUnknown_02024A7A - ldr r0, _08014030 @ =gUnknown_02024A7E + ldr r7, _08014028 @ =gBankAttacker + ldr r1, _0801402C @ =gTurnOrder + ldr r0, _08014030 @ =gCurrentMoveTurn ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -3494,17 +3494,17 @@ sub_8013FE8: @ 8013FE8 ands r2, r0 cmp r2, 0 beq _08014044 - ldr r1, _08014040 @ =gUnknown_02024A7F + ldr r1, _08014040 @ =gFightStateTracker movs r0, 0xC b _080146CC .align 2, 0 -_08014028: .4byte gPlayerMonIndex -_0801402C: .4byte gUnknown_02024A7A -_08014030: .4byte gUnknown_02024A7E +_08014028: .4byte gBankAttacker +_0801402C: .4byte gTurnOrder +_08014030: .4byte gCurrentMoveTurn _08014034: .4byte 0x02000000 _08014038: .4byte 0x000160a6 _0801403C: .4byte gBitTable -_08014040: .4byte gUnknown_02024A7F +_08014040: .4byte gFightStateTracker _08014044: ldr r1, _080140B8 @ =gCritMultiplier movs r0, 0x1 @@ -3518,11 +3518,11 @@ _08014044: strb r2, [r0] ldr r0, _080140C4 @ =gBattleMoveFlags strb r2, [r0] - ldr r0, _080140C8 @ =gUnknown_02024C0E + ldr r0, _080140C8 @ =gMultiHitCounter strb r2, [r0] - ldr r0, _080140CC @ =gUnknown_02024D1E + ldr r0, _080140CC @ =gBattleCommunication strb r2, [r0, 0x6] - ldr r3, _080140D0 @ =gUnknown_02024BE4 + ldr r3, _080140D0 @ =gCurrMovePos ldrb r0, [r7] ldr r2, _080140D4 @ =0x0001608c adds r0, r2 @@ -3531,7 +3531,7 @@ _08014044: ldr r4, _080140D8 @ =gUnknown_02024BE5 strb r0, [r4] strb r0, [r3] - ldr r1, _080140DC @ =gUnknown_02024D28 + ldr r1, _080140DC @ =gProtectStructs ldrb r2, [r7] lsls r0, r2, 4 adds r5, r0, r1 @@ -3545,12 +3545,12 @@ _08014044: negs r0, r0 ands r0, r1 strb r0, [r5] - ldr r2, _080140E0 @ =gUnknown_02024BE6 + ldr r2, _080140E0 @ =gCurrentMove ldr r1, _080140E4 @ =gUnknown_02024BE8 movs r0, 0xA5 strh r0, [r1] strh r0, [r2] - ldr r2, _080140E8 @ =gUnknown_02024C6C + ldr r2, _080140E8 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 4 @@ -3568,15 +3568,15 @@ _080140B8: .4byte gCritMultiplier _080140BC: .4byte 0x0001601f _080140C0: .4byte 0x000160e7 _080140C4: .4byte gBattleMoveFlags -_080140C8: .4byte gUnknown_02024C0E -_080140CC: .4byte gUnknown_02024D1E -_080140D0: .4byte gUnknown_02024BE4 +_080140C8: .4byte gMultiHitCounter +_080140CC: .4byte gBattleCommunication +_080140D0: .4byte gCurrMovePos _080140D4: .4byte 0x0001608c _080140D8: .4byte gUnknown_02024BE5 -_080140DC: .4byte gUnknown_02024D28 -_080140E0: .4byte gUnknown_02024BE6 +_080140DC: .4byte gProtectStructs +_080140E0: .4byte gCurrentMove _080140E4: .4byte gUnknown_02024BE8 -_080140E8: .4byte gUnknown_02024C6C +_080140E8: .4byte gHitMarker _080140EC: .4byte 0x00016010 _080140F0: ldr r1, _08014128 @ =gBattleMons @@ -3598,9 +3598,9 @@ _080140F0: cmp r6, 0 beq _08014138 _08014114: - ldr r3, _0801412C @ =gUnknown_02024BE6 + ldr r3, _0801412C @ =gCurrentMove ldr r2, _08014130 @ =gUnknown_02024BE8 - ldr r1, _08014134 @ =gUnknown_02024C54 + ldr r1, _08014134 @ =gLockedMove lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -3609,11 +3609,11 @@ _08014114: b _08014280 .align 2, 0 _08014128: .4byte gBattleMons -_0801412C: .4byte gUnknown_02024BE6 +_0801412C: .4byte gCurrentMove _08014130: .4byte gUnknown_02024BE8 -_08014134: .4byte gUnknown_02024C54 +_08014134: .4byte gLockedMove _08014138: - ldr r3, _08014188 @ =gUnknown_02024CA8 + ldr r3, _08014188 @ =gDisableStructs mov r12, r3 lsls r0, r4, 3 subs r0, r4 @@ -3635,7 +3635,7 @@ _08014138: ldrh r0, [r0] cmp r1, r0 bne _080141A0 - ldr r1, _08014190 @ =gUnknown_02024BE6 + ldr r1, _08014190 @ =gCurrentMove ldr r0, _08014194 @ =gUnknown_02024BE8 strh r4, [r0] strh r4, [r1] @@ -3652,9 +3652,9 @@ _08014138: adds r1, r4 b _08014200 .align 2, 0 -_08014188: .4byte gUnknown_02024CA8 +_08014188: .4byte gDisableStructs _0801418C: .4byte gBattleMons -_08014190: .4byte gUnknown_02024BE6 +_08014190: .4byte gCurrentMove _08014194: .4byte gUnknown_02024BE8 _08014198: .4byte gUnknown_02024BE5 _0801419C: .4byte 0x00016010 @@ -3667,7 +3667,7 @@ _080141A0: strb r3, [r0] mov r1, r8 strb r3, [r1] - ldr r3, _0801420C @ =gUnknown_02024BE6 + ldr r3, _0801420C @ =gCurrentMove ldr r1, _08014210 @ =gUnknown_02024BE8 mov r2, r8 ldrb r0, [r2] @@ -3712,14 +3712,14 @@ _08014200: b _08014280 .align 2, 0 _08014208: .4byte gUnknown_02024BE5 -_0801420C: .4byte gUnknown_02024BE6 +_0801420C: .4byte gCurrentMove _08014210: .4byte gUnknown_02024BE8 _08014214: .4byte 0x00016010 _08014218: mov r4, r8 ldrb r0, [r4] lsls r0, 1 - ldr r4, _0801425C @ =gPlayerMonIndex + ldr r4, _0801425C @ =gBankAttacker ldrb r2, [r4] movs r1, 0x58 muls r1, r2 @@ -3727,14 +3727,14 @@ _08014218: ldr r1, _08014260 @ =gBattleMons adds r1, 0xC adds r0, r1 - ldr r1, _08014264 @ =gUnknown_02024C60 + ldr r1, _08014264 @ =gChosenMovesByBanks lsls r2, 1 adds r2, r1 ldrh r3, [r0] ldrh r2, [r2] cmp r3, r2 beq _08014278 - ldr r1, _08014268 @ =gUnknown_02024BE6 + ldr r1, _08014268 @ =gCurrentMove ldr r0, _0801426C @ =gUnknown_02024BE8 strh r3, [r0] strh r3, [r1] @@ -3749,49 +3749,49 @@ _08014218: strb r0, [r1] b _08014280 .align 2, 0 -_0801425C: .4byte gPlayerMonIndex +_0801425C: .4byte gBankAttacker _08014260: .4byte gBattleMons -_08014264: .4byte gUnknown_02024C60 -_08014268: .4byte gUnknown_02024BE6 +_08014264: .4byte gChosenMovesByBanks +_08014268: .4byte gCurrentMove _0801426C: .4byte gUnknown_02024BE8 _08014270: .4byte 0x02000000 _08014274: .4byte 0x00016010 _08014278: - ldr r1, _08014298 @ =gUnknown_02024BE6 + ldr r1, _08014298 @ =gCurrentMove ldr r0, _0801429C @ =gUnknown_02024BE8 strh r3, [r0] strh r3, [r1] _08014280: - ldr r0, _080142A0 @ =gPlayerMonIndex + ldr r0, _080142A0 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080142A8 - ldr r0, _080142A4 @ =gUnknown_030042E0 - ldr r1, _08014298 @ =gUnknown_02024BE6 + ldr r0, _080142A4 @ =gBattleResults + ldr r1, _08014298 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0, 0x22] b _080142B0 .align 2, 0 -_08014298: .4byte gUnknown_02024BE6 +_08014298: .4byte gCurrentMove _0801429C: .4byte gUnknown_02024BE8 -_080142A0: .4byte gPlayerMonIndex -_080142A4: .4byte gUnknown_030042E0 +_080142A0: .4byte gBankAttacker +_080142A4: .4byte gBattleResults _080142A8: - ldr r0, _08014314 @ =gUnknown_030042E0 - ldr r1, _08014318 @ =gUnknown_02024BE6 + ldr r0, _08014314 @ =gBattleResults + ldr r1, _08014318 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0, 0x24] _080142B0: - ldr r4, _0801431C @ =gPlayerMonIndex + ldr r4, _0801431C @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08014320 @ =gUnknown_02024C80 + ldr r1, _08014320 @ =gSideTimer lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -3801,7 +3801,7 @@ _080142B0: cmp r0, 0 beq _08014330 ldr r2, _08014324 @ =gBattleMoves - ldr r0, _08014318 @ =gUnknown_02024BE6 + ldr r0, _08014318 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3811,10 +3811,10 @@ _080142B0: cmp r0, 0 bne _08014330 ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r5, 0x9] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -3827,29 +3827,29 @@ _080142B0: ldrh r0, [r0, 0x28] cmp r0, 0 beq _08014330 - ldr r0, _0801432C @ =gEnemyMonIndex + ldr r0, _0801432C @ =gBankTarget strb r2, [r0] b _080146AC .align 2, 0 -_08014314: .4byte gUnknown_030042E0 -_08014318: .4byte gUnknown_02024BE6 -_0801431C: .4byte gPlayerMonIndex -_08014320: .4byte gUnknown_02024C80 +_08014314: .4byte gBattleResults +_08014318: .4byte gCurrentMove +_0801431C: .4byte gBankAttacker +_08014320: .4byte gSideTimer _08014324: .4byte gBattleMoves _08014328: .4byte gBattleMons -_0801432C: .4byte gEnemyMonIndex +_0801432C: .4byte gBankTarget _08014330: ldr r2, _08014454 @ =gBattleTypeFlags ldrh r1, [r2] movs r0, 0x1 ands r0, r1 - ldr r3, _08014458 @ =gPlayerMonIndex + ldr r3, _08014458 @ =gBankAttacker mov r9, r2 cmp r0, 0 bne _08014342 b _0801461C _08014342: - ldr r1, _0801445C @ =gUnknown_02024C80 + ldr r1, _0801445C @ =gSideTimer lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -3860,7 +3860,7 @@ _08014342: b _08014570 _08014354: ldr r2, _08014460 @ =gBattleMoves - ldr r0, _08014464 @ =gUnknown_02024BE6 + ldr r0, _08014464 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3877,7 +3877,7 @@ _08014370: ldr r3, _08014468 @ =gBattleMons ldr r0, _0801446C @ =0x02000000 mov r8, r0 - ldr r2, _08014458 @ =gPlayerMonIndex + ldr r2, _08014458 @ =gBankAttacker ldrb r5, [r2] ldr r1, _08014470 @ =0x00016010 adds r0, r5, r1 @@ -3899,12 +3899,12 @@ _08014394: b _08014570 _0801439C: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08014474 @ =gUnknown_02024A60 + ldr r1, _08014474 @ =gActiveBank strb r7, [r1] - ldr r0, _08014478 @ =gUnknown_02024A68 + ldr r0, _08014478 @ =gNoOfAllBanks ldrb r0, [r0] cmp r7, r0 bcs _08014416 @@ -3912,12 +3912,12 @@ _0801439C: mov r5, r8 _080143B6: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r6, r0 beq _08014404 - ldr r0, _08014458 @ =gPlayerMonIndex + ldr r0, _08014458 @ =gBankAttacker ldrb r0, [r0] ldr r2, _08014470 @ =0x00016010 adds r0, r2 @@ -3951,7 +3951,7 @@ _08014404: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _08014478 @ =gUnknown_02024A68 + ldr r1, _08014478 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -3975,9 +3975,9 @@ _0801441E: ands r3, r0 cmp r3, 0 beq _080144A4 - ldr r0, _08014458 @ =gPlayerMonIndex + ldr r0, _08014458 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08014484 @@ -3990,15 +3990,15 @@ _0801441E: b _08014496 .align 2, 0 _08014454: .4byte gBattleTypeFlags -_08014458: .4byte gPlayerMonIndex -_0801445C: .4byte gUnknown_02024C80 +_08014458: .4byte gBankAttacker +_0801445C: .4byte gSideTimer _08014460: .4byte gBattleMoves -_08014464: .4byte gUnknown_02024BE6 +_08014464: .4byte gCurrentMove _08014468: .4byte gBattleMons _0801446C: .4byte 0x02000000 _08014470: .4byte 0x00016010 -_08014474: .4byte gUnknown_02024A60 -_08014478: .4byte gUnknown_02024A68 +_08014474: .4byte gActiveBank +_08014478: .4byte gNoOfAllBanks _0801447C: .4byte gUnknown_02024BE8 _08014480: movs r0, 0x3 @@ -4014,16 +4014,16 @@ _08014484: _08014494: movs r0, 0x2 _08014496: - bl battle_get_side_with_given_state - ldr r1, _080144A0 @ =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r1, _080144A0 @ =gBankTarget strb r0, [r1] b _080144B6 .align 2, 0 -_080144A0: .4byte gEnemyMonIndex +_080144A0: .4byte gBankTarget _080144A4: - ldr r2, _080144EC @ =gEnemyMonIndex + ldr r2, _080144EC @ =gBankTarget ldr r1, _080144F0 @ =0x02000000 - ldr r0, _080144F4 @ =gPlayerMonIndex + ldr r0, _080144F4 @ =gBankAttacker ldrb r0, [r0] ldr r4, _080144F8 @ =0x00016010 adds r0, r4 @@ -4031,11 +4031,11 @@ _080144A4: ldrb r0, [r0] strb r0, [r2] _080144B6: - ldr r7, _080144FC @ =gUnknown_02024C0C + ldr r7, _080144FC @ =gAbsentBankFlags ldrb r0, [r7] ldr r1, _08014500 @ =gBitTable mov r8, r1 - ldr r5, _080144EC @ =gEnemyMonIndex + ldr r5, _080144EC @ =gBankTarget ldrb r1, [r5] lsls r1, 2 add r1, r8 @@ -4045,12 +4045,12 @@ _080144B6: bne _080144D0 b _080146AC _080144D0: - ldr r6, _080144F4 @ =gPlayerMonIndex + ldr r6, _080144F4 @ =gBankAttacker ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -4058,20 +4058,20 @@ _080144D0: ldrb r0, [r5] b _0801469A .align 2, 0 -_080144EC: .4byte gEnemyMonIndex +_080144EC: .4byte gBankTarget _080144F0: .4byte 0x02000000 -_080144F4: .4byte gPlayerMonIndex +_080144F4: .4byte gBankAttacker _080144F8: .4byte 0x00016010 -_080144FC: .4byte gUnknown_02024C0C +_080144FC: .4byte gAbsentBankFlags _08014500: .4byte gBitTable _08014504: ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] ldrb r1, [r7] ldrb r2, [r5] @@ -4079,8 +4079,8 @@ _08014504: add r0, r8 b _08014690 _08014522: - ldr r4, _0801455C @ =gUnknown_02024A60 - ldr r0, _08014560 @ =gUnknown_02024A7A + ldr r4, _0801455C @ =gActiveBank + ldr r0, _08014560 @ =gTurnOrder ldr r2, [sp] adds r0, r2, r0 ldrb r0, [r0] @@ -4093,7 +4093,7 @@ _08014522: adds r1, 0x20 ldrb r1, [r1] bl sub_81074C4 - ldr r2, _08014568 @ =gUnknown_02024D68 + ldr r2, _08014568 @ =gSpecialStatuses ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -4103,16 +4103,16 @@ _08014522: movs r2, 0x2 orrs r1, r2 strb r1, [r0] - ldr r1, _0801456C @ =gEnemyMonIndex + ldr r1, _0801456C @ =gBankTarget ldrb r0, [r4] strb r0, [r1] b _080146AC .align 2, 0 -_0801455C: .4byte gUnknown_02024A60 -_08014560: .4byte gUnknown_02024A7A +_0801455C: .4byte gActiveBank +_08014560: .4byte gTurnOrder _08014564: .4byte gBattleMons -_08014568: .4byte gUnknown_02024D68 -_0801456C: .4byte gEnemyMonIndex +_08014568: .4byte gSpecialStatuses +_0801456C: .4byte gBankTarget _08014570: mov r4, r9 ldrh r1, [r4] @@ -4134,7 +4134,7 @@ _08014570: cmp r0, 0 beq _0801461C ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080145C0 @@ -4162,13 +4162,13 @@ _080145C0: _080145D0: movs r0, 0x2 _080145D2: - bl battle_get_side_with_given_state - ldr r1, _0801460C @ =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r1, _0801460C @ =gBankTarget strb r0, [r1] - ldr r0, _08014610 @ =gUnknown_02024C0C + ldr r0, _08014610 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _08014614 @ =gBitTable - ldr r5, _0801460C @ =gEnemyMonIndex + ldr r5, _0801460C @ =gBankTarget ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -4176,12 +4176,12 @@ _080145D2: ands r1, r0 cmp r1, 0 beq _080146AC - ldr r0, _08014618 @ =gPlayerMonIndex + ldr r0, _08014618 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -4189,12 +4189,12 @@ _080145D2: ldrb r0, [r5] b _0801469A .align 2, 0 -_0801460C: .4byte gEnemyMonIndex -_08014610: .4byte gUnknown_02024C0C +_0801460C: .4byte gBankTarget +_08014610: .4byte gAbsentBankFlags _08014614: .4byte gBitTable -_08014618: .4byte gPlayerMonIndex +_08014618: .4byte gBankAttacker _0801461C: - ldr r5, _08014660 @ =gEnemyMonIndex + ldr r5, _08014660 @ =gBankTarget ldr r1, _08014664 @ =0x02000000 adds r2, r3, 0 ldrb r0, [r2] @@ -4203,7 +4203,7 @@ _0801461C: adds r0, r1 ldrb r0, [r0] strb r0, [r5] - ldr r6, _0801466C @ =gUnknown_02024C0C + ldr r6, _0801466C @ =gAbsentBankFlags ldrb r1, [r6] ldr r7, _08014670 @ =gBitTable ldrb r0, [r5] @@ -4215,10 +4215,10 @@ _0801461C: beq _080146AC ldrb r0, [r2] str r3, [sp, 0x4] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 ldr r3, [sp, 0x4] @@ -4227,19 +4227,19 @@ _0801461C: ldrb r0, [r5] b _0801469A .align 2, 0 -_08014660: .4byte gEnemyMonIndex +_08014660: .4byte gBankTarget _08014664: .4byte 0x02000000 _08014668: .4byte 0x00016010 -_0801466C: .4byte gUnknown_02024C0C +_0801466C: .4byte gAbsentBankFlags _08014670: .4byte gBitTable _08014674: ldrb r0, [r3] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] ldrb r1, [r6] ldrb r2, [r5] @@ -4252,18 +4252,18 @@ _08014690: beq _080146AC adds r0, r2, 0 _0801469A: - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] _080146AC: - ldr r4, _080146E0 @ =gUnknown_02024C10 + ldr r4, _080146E0 @ =gBattlescriptCurrInstr ldr r3, _080146E4 @ =gUnknown_081D6BBC ldr r2, _080146E8 @ =gBattleMoves - ldr r0, _080146EC @ =gUnknown_02024BE6 + ldr r0, _080146EC @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4274,7 +4274,7 @@ _080146AC: adds r0, r3 ldr r0, [r0] str r0, [r4] - ldr r1, _080146F0 @ =gUnknown_02024A7F + ldr r1, _080146F0 @ =gFightStateTracker movs r0, 0xA _080146CC: strb r0, [r1] @@ -4287,19 +4287,19 @@ _080146CC: pop {r0} bx r0 .align 2, 0 -_080146E0: .4byte gUnknown_02024C10 +_080146E0: .4byte gBattlescriptCurrInstr _080146E4: .4byte gUnknown_081D6BBC _080146E8: .4byte gBattleMoves -_080146EC: .4byte gUnknown_02024BE6 -_080146F0: .4byte gUnknown_02024A7F +_080146EC: .4byte gCurrentMove +_080146F0: .4byte gFightStateTracker thumb_func_end sub_8013FE8 thumb_func_start sub_80146F4 sub_80146F4: @ 80146F4 push {r4,lr} - ldr r3, _08014764 @ =gPlayerMonIndex - ldr r1, _08014768 @ =gUnknown_02024A7A - ldr r0, _0801476C @ =gUnknown_02024A7E + ldr r3, _08014764 @ =gBankAttacker + ldr r1, _08014768 @ =gTurnOrder + ldr r0, _0801476C @ =gCurrentMoveTurn ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -4309,15 +4309,15 @@ sub_80146F4: @ 80146F4 strh r2, [r0] ldr r0, _08014774 @ =gUnknown_030042A0 strh r2, [r0] - ldr r1, _08014778 @ =gUnknown_02024E60 + ldr r1, _08014778 @ =gActionSelectionCursor ldrb r0, [r3] adds r0, r1 strb r2, [r0] - ldr r1, _0801477C @ =gUnknown_02024E64 + ldr r1, _0801477C @ =gMoveSelectionCursor ldrb r0, [r3] adds r0, r1 strb r2, [r0] - ldr r2, _08014780 @ =gUnknown_030041C0 + ldr r2, _08014780 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r2] movs r0, 0x7 @@ -4336,13 +4336,13 @@ sub_80146F4: @ 80146F4 ldr r0, _0801478C @ =0x00016003 adds r1, r0 strb r4, [r1] - ldr r1, _08014790 @ =gUnknown_02024C10 + ldr r1, _08014790 @ =gBattlescriptCurrInstr ldr r0, _08014794 @ =gUnknown_081D8E4E str r0, [r1] - ldr r1, _08014798 @ =gUnknown_02024A7F + ldr r1, _08014798 @ =gFightStateTracker movs r0, 0xA strb r0, [r1] - ldr r1, _0801479C @ =gUnknown_030042E0 + ldr r1, _0801479C @ =gBattleResults ldrb r0, [r1, 0x2] cmp r0, 0xFE bhi _0801475C @@ -4353,21 +4353,21 @@ _0801475C: pop {r0} bx r0 .align 2, 0 -_08014764: .4byte gPlayerMonIndex -_08014768: .4byte gUnknown_02024A7A -_0801476C: .4byte gUnknown_02024A7E +_08014764: .4byte gBankAttacker +_08014768: .4byte gTurnOrder +_0801476C: .4byte gCurrentMoveTurn _08014770: .4byte gUnknown_030042A4 _08014774: .4byte gUnknown_030042A0 -_08014778: .4byte gUnknown_02024E60 -_0801477C: .4byte gUnknown_02024E64 -_08014780: .4byte gUnknown_030041C0 +_08014778: .4byte gActionSelectionCursor +_0801477C: .4byte gMoveSelectionCursor +_08014780: .4byte gBattleTextBuff1 _08014784: .4byte 0x02000000 _08014788: .4byte 0x00016064 _0801478C: .4byte 0x00016003 -_08014790: .4byte gUnknown_02024C10 +_08014790: .4byte gBattlescriptCurrInstr _08014794: .4byte gUnknown_081D8E4E -_08014798: .4byte gUnknown_02024A7F -_0801479C: .4byte gUnknown_030042E0 +_08014798: .4byte gFightStateTracker +_0801479C: .4byte gBattleResults thumb_func_end sub_80146F4 thumb_func_start sub_80147A0 @@ -4377,10 +4377,10 @@ sub_80147A0: @ 80147A0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _08014804 @ =gPlayerMonIndex - ldr r2, _08014808 @ =gEnemyMonIndex - ldr r1, _0801480C @ =gUnknown_02024A7A - ldr r0, _08014810 @ =gUnknown_02024A7E + ldr r4, _08014804 @ =gBankAttacker + ldr r2, _08014808 @ =gBankTarget + ldr r1, _0801480C @ =gTurnOrder + ldr r0, _08014810 @ =gCurrentMoveTurn ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -4391,15 +4391,15 @@ sub_80147A0: @ 80147A0 strh r2, [r0] ldr r0, _08014818 @ =gUnknown_030042A0 strh r2, [r0] - ldr r3, _0801481C @ =gUnknown_02024CA8 + ldr r3, _0801481C @ =gDisableStructs ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r3 strb r2, [r0, 0x10] - ldr r5, _08014820 @ =gUnknown_02024C04 - ldr r2, _08014824 @ =gUnknown_02024260 + ldr r5, _08014820 @ =gLastUsedItem + ldr r2, _08014824 @ =gBattleBufferB ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -4413,7 +4413,7 @@ sub_80147A0: @ 80147A0 strh r3, [r5] cmp r3, 0xC bhi _08014830 - ldr r2, _08014828 @ =gUnknown_02024C10 + ldr r2, _08014828 @ =gBattlescriptCurrInstr ldr r1, _0801482C @ =gUnknown_081D9E48 ldrh r0, [r5] lsls r0, 2 @@ -4422,16 +4422,16 @@ sub_80147A0: @ 80147A0 str r0, [r2] b _08014A8C .align 2, 0 -_08014804: .4byte gPlayerMonIndex -_08014808: .4byte gEnemyMonIndex -_0801480C: .4byte gUnknown_02024A7A -_08014810: .4byte gUnknown_02024A7E +_08014804: .4byte gBankAttacker +_08014808: .4byte gBankTarget +_0801480C: .4byte gTurnOrder +_08014810: .4byte gCurrentMoveTurn _08014814: .4byte gUnknown_030042A4 _08014818: .4byte gUnknown_030042A0 -_0801481C: .4byte gUnknown_02024CA8 -_08014820: .4byte gUnknown_02024C04 -_08014824: .4byte gUnknown_02024260 -_08014828: .4byte gUnknown_02024C10 +_0801481C: .4byte gDisableStructs +_08014820: .4byte gLastUsedItem +_08014824: .4byte gBattleBufferB +_08014828: .4byte gBattlescriptCurrInstr _0801482C: .4byte gUnknown_081D9E48 _08014830: adds r0, r3, 0 @@ -4440,26 +4440,26 @@ _08014830: lsrs r0, 16 cmp r0, 0x1 bhi _0801484C - ldr r0, _08014844 @ =gUnknown_02024C10 + ldr r0, _08014844 @ =gBattlescriptCurrInstr ldr r1, _08014848 @ =gUnknown_081D9E94 b _0801485C .align 2, 0 -_08014844: .4byte gUnknown_02024C10 +_08014844: .4byte gBattlescriptCurrInstr _08014848: .4byte gUnknown_081D9E94 _0801484C: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0801486C - ldr r0, _08014864 @ =gUnknown_02024C10 + ldr r0, _08014864 @ =gBattlescriptCurrInstr ldr r1, _08014868 @ =gUnknown_081D9E7C _0801485C: ldr r1, [r1] str r1, [r0] b _08014A8C .align 2, 0 -_08014864: .4byte gUnknown_02024C10 +_08014864: .4byte gBattlescriptCurrInstr _08014868: .4byte gUnknown_081D9E7C _0801486C: ldr r2, _080148A0 @ =0x02000000 @@ -4475,7 +4475,7 @@ _0801486C: ldrb r0, [r0] subs r0, 0x1 mov r8, r4 - ldr r3, _080148AC @ =gUnknown_02024C10 + ldr r3, _080148AC @ =gBattlescriptCurrInstr mov r9, r3 ldr r1, _080148B0 @ =gUnknown_081D9E7C mov r10, r1 @@ -4493,7 +4493,7 @@ _08014896: _080148A0: .4byte 0x02000000 _080148A4: .4byte 0x00016003 _080148A8: .4byte 0x000160d8 -_080148AC: .4byte gUnknown_02024C10 +_080148AC: .4byte gBattlescriptCurrInstr _080148B0: .4byte gUnknown_081D9E7C _080148B4: .4byte _080148B8 .align 2, 0 @@ -4504,10 +4504,10 @@ _080148B8: .4byte _08014958 .4byte _08014A30 _080148CC: - ldr r2, _08014904 @ =gUnknown_02024D1E + ldr r2, _08014904 @ =gBattleCommunication movs r0, 0 strb r0, [r2, 0x5] - ldr r1, _08014908 @ =gPlayerMonIndex + ldr r1, _08014908 @ =gBankAttacker ldrb r0, [r1] lsrs r0, 1 ldr r6, _0801490C @ =0x000160da @@ -4521,7 +4521,7 @@ _080148CC: beq _08014918 movs r0, 0x3E ands r0, r3 - ldr r3, _08014910 @ =gUnknown_02024C10 + ldr r3, _08014910 @ =gBattlescriptCurrInstr mov r9, r3 ldr r1, _08014914 @ =gUnknown_081D9E7C mov r10, r1 @@ -4533,13 +4533,13 @@ _080148FC: strb r0, [r2, 0x5] b _08014A74 .align 2, 0 -_08014904: .4byte gUnknown_02024D1E -_08014908: .4byte gPlayerMonIndex +_08014904: .4byte gBattleCommunication +_08014908: .4byte gBankAttacker _0801490C: .4byte 0x000160da -_08014910: .4byte gUnknown_02024C10 +_08014910: .4byte gBattlescriptCurrInstr _08014914: .4byte gUnknown_081D9E7C _08014918: - ldr r3, _08014950 @ =gUnknown_02024C10 + ldr r3, _08014950 @ =gBattlescriptCurrInstr mov r9, r3 ldr r0, _08014954 @ =gUnknown_081D9E7C mov r10, r0 @@ -4568,13 +4568,13 @@ _08014926: beq _08014926 b _08014A74 .align 2, 0 -_08014950: .4byte gUnknown_02024C10 +_08014950: .4byte gBattlescriptCurrInstr _08014954: .4byte gUnknown_081D9E7C _08014958: - ldr r3, _0801498C @ =gUnknown_02024D1E + ldr r3, _0801498C @ =gBattleCommunication movs r0, 0x4 strb r0, [r3, 0x5] - ldr r2, _08014990 @ =gPlayerMonIndex + ldr r2, _08014990 @ =gBankAttacker ldrb r0, [r2] lsrs r0, 1 ldr r1, _08014994 @ =0x000160da @@ -4591,19 +4591,19 @@ _08014958: beq _080149A0 movs r0, 0x5 strb r0, [r3, 0x5] - ldr r2, _08014998 @ =gUnknown_02024C10 + ldr r2, _08014998 @ =gBattlescriptCurrInstr mov r9, r2 ldr r3, _0801499C @ =gUnknown_081D9E7C mov r10, r3 b _08014A74 .align 2, 0 -_0801498C: .4byte gUnknown_02024D1E -_08014990: .4byte gPlayerMonIndex +_0801498C: .4byte gBattleCommunication +_08014990: .4byte gBankAttacker _08014994: .4byte 0x000160da -_08014998: .4byte gUnknown_02024C10 +_08014998: .4byte gBattlescriptCurrInstr _0801499C: .4byte gUnknown_081D9E7C _080149A0: - ldr r3, _08014A18 @ =gUnknown_030041C0 + ldr r3, _08014A18 @ =gBattleTextBuff1 movs r4, 0xFD strb r4, [r3] movs r0, 0x5 @@ -4612,7 +4612,7 @@ _080149A0: strb r2, [r3, 0x2] movs r0, 0xFF strb r0, [r3, 0x3] - ldr r1, _08014A1C @ =gUnknown_03004290 + ldr r1, _08014A1C @ =gBattleTextBuff2 strb r4, [r1] strb r5, [r1, 0x1] movs r0, 0xD2 @@ -4622,7 +4622,7 @@ _080149A0: strb r0, [r1, 0x4] ldrb r0, [r6] ands r2, r0 - ldr r0, _08014A20 @ =gUnknown_02024C10 + ldr r0, _08014A20 @ =gBattlescriptCurrInstr mov r9, r0 ldr r1, _08014A24 @ =gUnknown_081D9E7C mov r10, r1 @@ -4665,9 +4665,9 @@ _08014A02: strb r2, [r0] b _08014A74 .align 2, 0 -_08014A18: .4byte gUnknown_030041C0 -_08014A1C: .4byte gUnknown_03004290 -_08014A20: .4byte gUnknown_02024C10 +_08014A18: .4byte gBattleTextBuff1 +_08014A1C: .4byte gBattleTextBuff2 +_08014A20: .4byte gBattlescriptCurrInstr _08014A24: .4byte gUnknown_081D9E7C _08014A28: .4byte 0x000160a4 _08014A2C: .4byte 0x000160a5 @@ -4678,28 +4678,28 @@ _08014A30: ands r1, r0 cmp r1, 0 beq _08014A64 - ldr r1, _08014A54 @ =gUnknown_02024D1E + ldr r1, _08014A54 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] - ldr r0, _08014A58 @ =gPlayerMonIndex + ldr r0, _08014A58 @ =gBankAttacker mov r8, r0 - ldr r1, _08014A5C @ =gUnknown_02024C10 + ldr r1, _08014A5C @ =gBattlescriptCurrInstr mov r9, r1 ldr r2, _08014A60 @ =gUnknown_081D9E7C mov r10, r2 b _08014A74 .align 2, 0 _08014A50: .4byte gBattleTypeFlags -_08014A54: .4byte gUnknown_02024D1E -_08014A58: .4byte gPlayerMonIndex -_08014A5C: .4byte gUnknown_02024C10 +_08014A54: .4byte gBattleCommunication +_08014A58: .4byte gBankAttacker +_08014A5C: .4byte gBattlescriptCurrInstr _08014A60: .4byte gUnknown_081D9E7C _08014A64: - ldr r0, _08014AA0 @ =gUnknown_02024D1E + ldr r0, _08014AA0 @ =gBattleCommunication strb r1, [r0, 0x5] - ldr r3, _08014AA4 @ =gPlayerMonIndex + ldr r3, _08014AA4 @ =gBankAttacker mov r8, r3 - ldr r0, _08014AA8 @ =gUnknown_02024C10 + ldr r0, _08014AA8 @ =gBattlescriptCurrInstr mov r9, r0 ldr r1, _08014AAC @ =gUnknown_081D9E7C mov r10, r1 @@ -4718,7 +4718,7 @@ _08014A74: str r0, [r1] _08014A8C: movs r0, 0xA - ldr r2, _08014AB4 @ =gUnknown_02024A7F + ldr r2, _08014AB4 @ =gFightStateTracker strb r0, [r2] pop {r3-r5} mov r8, r3 @@ -4728,12 +4728,12 @@ _08014A8C: pop {r0} bx r0 .align 2, 0 -_08014AA0: .4byte gUnknown_02024D1E -_08014AA4: .4byte gPlayerMonIndex -_08014AA8: .4byte gUnknown_02024C10 +_08014AA0: .4byte gBattleCommunication +_08014AA4: .4byte gBankAttacker +_08014AA8: .4byte gBattlescriptCurrInstr _08014AAC: .4byte gUnknown_081D9E7C _08014AB0: .4byte 0x000160d8 -_08014AB4: .4byte gUnknown_02024A7F +_08014AB4: .4byte gFightStateTracker thumb_func_end sub_80147A0 thumb_func_start sub_8014AB8 @@ -4765,18 +4765,18 @@ _08014AE4: lsls r0, 24 lsrs r1, r0, 24 _08014AEE: - ldr r0, _08014B18 @ =gUnknown_02024C0B + ldr r0, _08014B18 @ =gStringBank strb r4, [r0] cmp r1, 0x25 bne _08014B28 - ldr r2, _08014B1C @ =gUnknown_02024C04 + ldr r2, _08014B1C @ =gLastUsedItem ldr r1, _08014B20 @ =gBattleMons movs r0, 0x58 muls r0, r4 adds r0, r1 ldrh r0, [r0, 0x2E] strh r0, [r2] - ldr r0, _08014B24 @ =gUnknown_02024D28 + ldr r0, _08014B24 @ =gProtectStructs lsls r2, r4, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -4786,10 +4786,10 @@ _08014AEE: movs r1, 0x8 b _08014B50 .align 2, 0 -_08014B18: .4byte gUnknown_02024C0B -_08014B1C: .4byte gUnknown_02024C04 +_08014B18: .4byte gStringBank +_08014B1C: .4byte gLastUsedItem _08014B20: .4byte gBattleMons -_08014B24: .4byte gUnknown_02024D28 +_08014B24: .4byte gProtectStructs _08014B28: ldr r6, _08014B5C @ =gBattleMons movs r2, 0x58 @@ -4801,9 +4801,9 @@ _08014B28: ldrb r1, [r0] cmp r1, 0x32 bne _08014B68 - ldr r0, _08014B60 @ =byte_2024C06 + ldr r0, _08014B60 @ =gLastUsedAbility strb r1, [r0] - ldr r0, _08014B64 @ =gUnknown_02024D28 + ldr r0, _08014B64 @ =gProtectStructs lsls r2, r4, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -4820,8 +4820,8 @@ _08014B50: b _08014BC2 .align 2, 0 _08014B5C: .4byte gBattleMons -_08014B60: .4byte byte_2024C06 -_08014B64: .4byte gUnknown_02024D28 +_08014B60: .4byte gLastUsedAbility +_08014B64: .4byte gProtectStructs _08014B68: ldr r0, _08014BDC @ =gBattleTypeFlags ldrh r1, [r0] @@ -4871,11 +4871,11 @@ _08014BB6: _08014BC2: cmp r5, 0 beq _08014BD4 - ldr r1, _08014BE8 @ =gUnknown_02024A7E - ldr r0, _08014BEC @ =gUnknown_02024A68 + ldr r1, _08014BE8 @ =gCurrentMoveTurn + ldr r0, _08014BEC @ =gNoOfAllBanks ldrb r0, [r0] strb r0, [r1] - ldr r1, _08014BF0 @ =gUnknown_02024D26 + ldr r1, _08014BF0 @ =gBattleOutcome movs r0, 0x4 strb r0, [r1] _08014BD4: @@ -4887,17 +4887,17 @@ _08014BD4: _08014BDC: .4byte gBattleTypeFlags _08014BE0: .4byte 0x02000000 _08014BE4: .4byte 0x00016078 -_08014BE8: .4byte gUnknown_02024A7E -_08014BEC: .4byte gUnknown_02024A68 -_08014BF0: .4byte gUnknown_02024D26 +_08014BE8: .4byte gCurrentMoveTurn +_08014BEC: .4byte gNoOfAllBanks +_08014BF0: .4byte gBattleOutcome thumb_func_end sub_8014AB8 thumb_func_start sub_8014BF4 sub_8014BF4: @ 8014BF4 push {r4-r6,lr} - ldr r4, _08014C44 @ =gPlayerMonIndex - ldr r1, _08014C48 @ =gUnknown_02024A7A - ldr r5, _08014C4C @ =gUnknown_02024A7E + ldr r4, _08014C44 @ =gBankAttacker + ldr r1, _08014C48 @ =gTurnOrder + ldr r5, _08014C4C @ =gCurrentMoveTurn ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -4908,21 +4908,21 @@ sub_8014BF4: @ 8014BF4 ands r0, r1 cmp r0, 0 beq _08014C9C - ldr r0, _08014C54 @ =gUnknown_02024A68 + ldr r0, _08014C54 @ =gNoOfAllBanks ldrb r1, [r0] strb r1, [r5] - ldr r2, _08014C58 @ =gUnknown_02024A60 + ldr r2, _08014C58 @ =gActiveBank movs r0, 0 strb r0, [r2] lsls r1, 24 cmp r1, 0 beq _08014C88 adds r4, r2, 0 - ldr r6, _08014C5C @ =gUnknown_02024C18 - ldr r5, _08014C60 @ =gUnknown_02024D26 + ldr r6, _08014C5C @ =gActionForBanks + ldr r5, _08014C60 @ =gBattleOutcome _08014C28: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08014C64 @@ -4935,14 +4935,14 @@ _08014C28: movs r1, 0x2 b _08014C72 .align 2, 0 -_08014C44: .4byte gPlayerMonIndex -_08014C48: .4byte gUnknown_02024A7A -_08014C4C: .4byte gUnknown_02024A7E +_08014C44: .4byte gBankAttacker +_08014C48: .4byte gTurnOrder +_08014C4C: .4byte gCurrentMoveTurn _08014C50: .4byte gBattleTypeFlags -_08014C54: .4byte gUnknown_02024A68 -_08014C58: .4byte gUnknown_02024A60 -_08014C5C: .4byte gUnknown_02024C18 -_08014C60: .4byte gUnknown_02024D26 +_08014C54: .4byte gNoOfAllBanks +_08014C58: .4byte gActiveBank +_08014C5C: .4byte gActionForBanks +_08014C60: .4byte gBattleOutcome _08014C64: ldrb r0, [r4] adds r0, r6 @@ -4958,25 +4958,25 @@ _08014C76: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _08014C94 @ =gUnknown_02024A68 + ldr r1, _08014C94 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bcc _08014C28 _08014C88: - ldr r0, _08014C98 @ =gUnknown_02024D26 + ldr r0, _08014C98 @ =gBattleOutcome ldrb r1, [r0] movs r2, 0x80 orrs r1, r2 strb r1, [r0] b _08014D40 .align 2, 0 -_08014C94: .4byte gUnknown_02024A68 -_08014C98: .4byte gUnknown_02024D26 +_08014C94: .4byte gNoOfAllBanks +_08014C98: .4byte gBattleOutcome _08014C9C: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08014CF4 @@ -4995,22 +4995,22 @@ _08014C9C: ldr r1, _08014CE0 @ =0xfdffffff ands r0, r1 str r0, [r2] - ldr r1, _08014CE4 @ =gUnknown_02024D1E + ldr r1, _08014CE4 @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x5] - ldr r1, _08014CE8 @ =gUnknown_02024C10 + ldr r1, _08014CE8 @ =gBattlescriptCurrInstr ldr r0, _08014CEC @ =gUnknown_081D8E3B str r0, [r1] - ldr r1, _08014CF0 @ =gUnknown_02024A7F + ldr r1, _08014CF0 @ =gFightStateTracker movs r0, 0xA b _08014D3E .align 2, 0 _08014CDC: .4byte gBattleMons _08014CE0: .4byte 0xfdffffff -_08014CE4: .4byte gUnknown_02024D1E -_08014CE8: .4byte gUnknown_02024C10 +_08014CE4: .4byte gBattleCommunication +_08014CE8: .4byte gBattlescriptCurrInstr _08014CEC: .4byte gUnknown_081D8E3B -_08014CF0: .4byte gUnknown_02024A7F +_08014CF0: .4byte gFightStateTracker _08014CF4: ldr r1, _08014D1C @ =gBattleMons ldrb r2, [r4] @@ -5023,27 +5023,27 @@ _08014CF4: ands r0, r1 cmp r0, 0 beq _08014D34 - ldr r1, _08014D24 @ =gUnknown_02024D1E + ldr r1, _08014D24 @ =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] - ldr r1, _08014D28 @ =gUnknown_02024C10 + ldr r1, _08014D28 @ =gBattlescriptCurrInstr ldr r0, _08014D2C @ =gUnknown_081D8E3B str r0, [r1] - ldr r1, _08014D30 @ =gUnknown_02024A7F + ldr r1, _08014D30 @ =gFightStateTracker movs r0, 0xA b _08014D3E .align 2, 0 _08014D1C: .4byte gBattleMons _08014D20: .4byte 0x0400e000 -_08014D24: .4byte gUnknown_02024D1E -_08014D28: .4byte gUnknown_02024C10 +_08014D24: .4byte gBattleCommunication +_08014D28: .4byte gBattlescriptCurrInstr _08014D2C: .4byte gUnknown_081D8E3B -_08014D30: .4byte gUnknown_02024A7F +_08014D30: .4byte gFightStateTracker _08014D34: - ldr r0, _08014D48 @ =gUnknown_02024A68 + ldr r0, _08014D48 @ =gNoOfAllBanks ldrb r0, [r0] strb r0, [r5] - ldr r1, _08014D4C @ =gUnknown_02024D26 + ldr r1, _08014D4C @ =gBattleOutcome movs r0, 0x6 _08014D3E: strb r0, [r1] @@ -5052,15 +5052,15 @@ _08014D40: pop {r0} bx r0 .align 2, 0 -_08014D48: .4byte gUnknown_02024A68 -_08014D4C: .4byte gUnknown_02024D26 +_08014D48: .4byte gNoOfAllBanks +_08014D4C: .4byte gBattleOutcome thumb_func_end sub_8014BF4 thumb_func_start sub_8014D50 sub_8014D50: @ 8014D50 - ldr r2, _08014D78 @ =gPlayerMonIndex - ldr r1, _08014D7C @ =gUnknown_02024A7A - ldr r0, _08014D80 @ =gUnknown_02024A7E + ldr r2, _08014D78 @ =gBankAttacker + ldr r1, _08014D7C @ =gTurnOrder + ldr r0, _08014D80 @ =gCurrentMoveTurn ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -5070,30 +5070,30 @@ sub_8014D50: @ 8014D50 strh r1, [r0] ldr r0, _08014D88 @ =gUnknown_030042A0 strh r1, [r0] - ldr r1, _08014D8C @ =gUnknown_02024C10 + ldr r1, _08014D8C @ =gBattlescriptCurrInstr ldr r0, _08014D90 @ =gUnknown_081D9E98 ldr r0, [r0] str r0, [r1] - ldr r1, _08014D94 @ =gUnknown_02024A7F + ldr r1, _08014D94 @ =gFightStateTracker movs r0, 0xA strb r0, [r1] bx lr .align 2, 0 -_08014D78: .4byte gPlayerMonIndex -_08014D7C: .4byte gUnknown_02024A7A -_08014D80: .4byte gUnknown_02024A7E +_08014D78: .4byte gBankAttacker +_08014D7C: .4byte gTurnOrder +_08014D80: .4byte gCurrentMoveTurn _08014D84: .4byte gUnknown_030042A4 _08014D88: .4byte gUnknown_030042A0 -_08014D8C: .4byte gUnknown_02024C10 +_08014D8C: .4byte gBattlescriptCurrInstr _08014D90: .4byte gUnknown_081D9E98 -_08014D94: .4byte gUnknown_02024A7F +_08014D94: .4byte gFightStateTracker thumb_func_end sub_8014D50 thumb_func_start sub_8014D98 sub_8014D98: @ 8014D98 - ldr r2, _08014DD0 @ =gPlayerMonIndex - ldr r1, _08014DD4 @ =gUnknown_02024A7A - ldr r0, _08014DD8 @ =gUnknown_02024A7E + ldr r2, _08014DD0 @ =gBankAttacker + ldr r1, _08014DD4 @ =gTurnOrder + ldr r0, _08014DD8 @ =gCurrentMoveTurn ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -5107,36 +5107,36 @@ sub_8014D98: @ 8014D98 ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] - ldr r1, _08014DE8 @ =gUnknown_02024C04 + ldr r1, _08014DE8 @ =gLastUsedItem movs r0, 0x5 strh r0, [r1] - ldr r1, _08014DEC @ =gUnknown_02024C10 + ldr r1, _08014DEC @ =gBattlescriptCurrInstr ldr r0, _08014DF0 @ =gUnknown_081D9E48 ldr r0, [r0, 0x14] str r0, [r1] - ldr r1, _08014DF4 @ =gUnknown_02024A7F + ldr r1, _08014DF4 @ =gFightStateTracker movs r0, 0xA strb r0, [r1] bx lr .align 2, 0 -_08014DD0: .4byte gPlayerMonIndex -_08014DD4: .4byte gUnknown_02024A7A -_08014DD8: .4byte gUnknown_02024A7E +_08014DD0: .4byte gBankAttacker +_08014DD4: .4byte gTurnOrder +_08014DD8: .4byte gCurrentMoveTurn _08014DDC: .4byte gUnknown_030042A4 _08014DE0: .4byte gUnknown_030042A0 _08014DE4: .4byte gNumSafariBalls -_08014DE8: .4byte gUnknown_02024C04 -_08014DEC: .4byte gUnknown_02024C10 +_08014DE8: .4byte gLastUsedItem +_08014DEC: .4byte gBattlescriptCurrInstr _08014DF0: .4byte gUnknown_081D9E48 -_08014DF4: .4byte gUnknown_02024A7F +_08014DF4: .4byte gFightStateTracker thumb_func_end sub_8014D98 thumb_func_start sub_8014DF8 sub_8014DF8: @ 8014DF8 push {r4-r6,lr} - ldr r3, _08014E68 @ =gPlayerMonIndex - ldr r1, _08014E6C @ =gUnknown_02024A7A - ldr r0, _08014E70 @ =gUnknown_02024A7E + ldr r3, _08014E68 @ =gBankAttacker + ldr r1, _08014E6C @ =gTurnOrder + ldr r0, _08014E70 @ =gCurrentMoveTurn ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -5146,8 +5146,8 @@ sub_8014DF8: @ 8014DF8 strh r1, [r0] ldr r0, _08014E78 @ =gUnknown_030042A0 strh r1, [r0] - ldr r6, _08014E7C @ =gUnknown_02024D1E - ldr r2, _08014E80 @ =gUnknown_02024260 + ldr r6, _08014E7C @ =gBattleCommunication + ldr r2, _08014E80 @ =gBattleBufferB ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -5155,7 +5155,7 @@ sub_8014DF8: @ 8014DF8 ldrb r0, [r0] subs r0, 0x1 strb r0, [r6, 0x5] - ldr r1, _08014E84 @ =gUnknown_02024C04 + ldr r1, _08014E84 @ =gLastUsedItem ldrb r0, [r3] lsls r0, 9 adds r2, 0x2 @@ -5190,14 +5190,14 @@ _08014E42: movs r0, 0x1 b _08014E9A .align 2, 0 -_08014E68: .4byte gPlayerMonIndex -_08014E6C: .4byte gUnknown_02024A7A -_08014E70: .4byte gUnknown_02024A7E +_08014E68: .4byte gBankAttacker +_08014E6C: .4byte gTurnOrder +_08014E70: .4byte gCurrentMoveTurn _08014E74: .4byte gUnknown_030042A4 _08014E78: .4byte gUnknown_030042A0 -_08014E7C: .4byte gUnknown_02024D1E -_08014E80: .4byte gUnknown_02024260 -_08014E84: .4byte gUnknown_02024C04 +_08014E7C: .4byte gBattleCommunication +_08014E80: .4byte gBattleBufferB +_08014E84: .4byte gLastUsedItem _08014E88: .4byte 0x02000000 _08014E8C: .4byte 0x00016087 _08014E90: .4byte 0x00016088 @@ -5207,28 +5207,28 @@ _08014E98: _08014E9A: strb r0, [r4] _08014E9C: - ldr r1, _08014EB0 @ =gUnknown_02024C10 + ldr r1, _08014EB0 @ =gBattlescriptCurrInstr ldr r0, _08014EB4 @ =gUnknown_081D9E98 ldr r0, [r0, 0x8] str r0, [r1] - ldr r1, _08014EB8 @ =gUnknown_02024A7F + ldr r1, _08014EB8 @ =gFightStateTracker movs r0, 0xA strb r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08014EB0: .4byte gUnknown_02024C10 +_08014EB0: .4byte gBattlescriptCurrInstr _08014EB4: .4byte gUnknown_081D9E98 -_08014EB8: .4byte gUnknown_02024A7F +_08014EB8: .4byte gFightStateTracker thumb_func_end sub_8014DF8 thumb_func_start sub_8014EBC sub_8014EBC: @ 8014EBC push {r4,r5,lr} - ldr r2, _08014F28 @ =gPlayerMonIndex - ldr r1, _08014F2C @ =gUnknown_02024A7A - ldr r0, _08014F30 @ =gUnknown_02024A7E + ldr r2, _08014F28 @ =gBankAttacker + ldr r1, _08014F2C @ =gTurnOrder + ldr r0, _08014F30 @ =gCurrentMoveTurn ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -5278,13 +5278,13 @@ _08014F18: bhi _08014F54 adds r0, 0x1 strb r0, [r4] - ldr r0, _08014F50 @ =gUnknown_02024D1E + ldr r0, _08014F50 @ =gBattleCommunication strb r5, [r0, 0x5] b _08014F5A .align 2, 0 -_08014F28: .4byte gPlayerMonIndex -_08014F2C: .4byte gUnknown_02024A7A -_08014F30: .4byte gUnknown_02024A7E +_08014F28: .4byte gBankAttacker +_08014F2C: .4byte gTurnOrder +_08014F30: .4byte gCurrentMoveTurn _08014F34: .4byte gUnknown_030042A4 _08014F38: .4byte gUnknown_030042A0 _08014F3C: .4byte 0x02000000 @@ -5292,63 +5292,63 @@ _08014F40: .4byte 0x00016089 _08014F44: .4byte gUnknown_081FA71B _08014F48: .4byte 0x00016088 _08014F4C: .4byte gUnknown_081FA71F -_08014F50: .4byte gUnknown_02024D1E +_08014F50: .4byte gBattleCommunication _08014F54: - ldr r1, _08014F70 @ =gUnknown_02024D1E + ldr r1, _08014F70 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _08014F5A: - ldr r1, _08014F74 @ =gUnknown_02024C10 + ldr r1, _08014F74 @ =gBattlescriptCurrInstr ldr r0, _08014F78 @ =gUnknown_081D9E98 ldr r0, [r0, 0x4] str r0, [r1] - ldr r1, _08014F7C @ =gUnknown_02024A7F + ldr r1, _08014F7C @ =gFightStateTracker movs r0, 0xA strb r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08014F70: .4byte gUnknown_02024D1E -_08014F74: .4byte gUnknown_02024C10 +_08014F70: .4byte gBattleCommunication +_08014F74: .4byte gBattlescriptCurrInstr _08014F78: .4byte gUnknown_081D9E98 -_08014F7C: .4byte gUnknown_02024A7F +_08014F7C: .4byte gFightStateTracker thumb_func_end sub_8014EBC thumb_func_start bs8_exit_by_flight bs8_exit_by_flight: @ 8014F80 push {r4,lr} - ldr r2, _08014FA8 @ =gPlayerMonIndex - ldr r1, _08014FAC @ =gUnknown_02024A7A - ldr r4, _08014FB0 @ =gUnknown_02024A7E + ldr r2, _08014FA8 @ =gBankAttacker + ldr r1, _08014FAC @ =gTurnOrder + ldr r4, _08014FB0 @ =gCurrentMoveTurn ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] strb r0, [r2] movs r0, 0x11 bl PlaySE - ldr r0, _08014FB4 @ =gUnknown_02024A68 + ldr r0, _08014FB4 @ =gNoOfAllBanks ldrb r0, [r0] strb r0, [r4] - ldr r1, _08014FB8 @ =gUnknown_02024D26 + ldr r1, _08014FB8 @ =gBattleOutcome movs r0, 0x4 strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_08014FA8: .4byte gPlayerMonIndex -_08014FAC: .4byte gUnknown_02024A7A -_08014FB0: .4byte gUnknown_02024A7E -_08014FB4: .4byte gUnknown_02024A68 -_08014FB8: .4byte gUnknown_02024D26 +_08014FA8: .4byte gBankAttacker +_08014FAC: .4byte gTurnOrder +_08014FB0: .4byte gCurrentMoveTurn +_08014FB4: .4byte gNoOfAllBanks +_08014FB8: .4byte gBattleOutcome thumb_func_end bs8_exit_by_flight thumb_func_start sub_8014FBC sub_8014FBC: @ 8014FBC - ldr r3, _08015008 @ =gPlayerMonIndex - ldr r1, _0801500C @ =gUnknown_02024A7A - ldr r0, _08015010 @ =gUnknown_02024A7E + ldr r3, _08015008 @ =gBankAttacker + ldr r1, _0801500C @ =gTurnOrder + ldr r0, _08015010 @ =gCurrentMoveTurn ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -5358,13 +5358,13 @@ sub_8014FBC: @ 8014FBC strh r1, [r0] ldr r0, _08015018 @ =gUnknown_030042A0 strh r1, [r0] - ldr r1, _0801501C @ =gUnknown_030041C0 + ldr r1, _0801501C @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] strb r2, [r1, 0x2] - ldr r2, _08015020 @ =gUnknown_02024A6A + ldr r2, _08015020 @ =gBattlePartyID ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -5372,11 +5372,11 @@ sub_8014FBC: @ 8014FBC strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08015024 @ =gUnknown_02024C10 + ldr r1, _08015024 @ =gBattlescriptCurrInstr ldr r0, _08015028 @ =gUnknown_081D9E98 ldr r0, [r0, 0xC] str r0, [r1] - ldr r1, _0801502C @ =gUnknown_02024A7F + ldr r1, _0801502C @ =gFightStateTracker movs r0, 0xA strb r0, [r1] ldr r1, _08015030 @ =gUnknown_02024A76 @@ -5384,16 +5384,16 @@ sub_8014FBC: @ 8014FBC strb r0, [r1, 0x1] bx lr .align 2, 0 -_08015008: .4byte gPlayerMonIndex -_0801500C: .4byte gUnknown_02024A7A -_08015010: .4byte gUnknown_02024A7E +_08015008: .4byte gBankAttacker +_0801500C: .4byte gTurnOrder +_08015010: .4byte gCurrentMoveTurn _08015014: .4byte gUnknown_030042A4 _08015018: .4byte gUnknown_030042A0 -_0801501C: .4byte gUnknown_030041C0 -_08015020: .4byte gUnknown_02024A6A -_08015024: .4byte gUnknown_02024C10 +_0801501C: .4byte gBattleTextBuff1 +_08015020: .4byte gBattlePartyID +_08015024: .4byte gBattlescriptCurrInstr _08015028: .4byte gUnknown_081D9E98 -_0801502C: .4byte gUnknown_02024A7F +_0801502C: .4byte gFightStateTracker _08015030: .4byte gUnknown_02024A76 thumb_func_end sub_8014FBC @@ -5409,7 +5409,7 @@ bsB_exit_by_move: @ 8015034 ldr r2, _08015058 @ =0x00016059 adds r0, r2 strb r1, [r0] - ldr r1, _0801505C @ =gUnknown_02024A7F + ldr r1, _0801505C @ =gFightStateTracker movs r0, 0xC strb r0, [r1] _08015050: @@ -5418,50 +5418,50 @@ _08015050: .align 2, 0 _08015054: .4byte 0x02000000 _08015058: .4byte 0x00016059 -_0801505C: .4byte gUnknown_02024A7F +_0801505C: .4byte gFightStateTracker thumb_func_end bsB_exit_by_move thumb_func_start sub_8015060 sub_8015060: @ 8015060 - ldr r1, _08015080 @ =gUnknown_02024A7E + ldr r1, _08015080 @ =gCurrentMoveTurn ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r3, _08015084 @ =gUnknown_02024A7F + ldr r3, _08015084 @ =gFightStateTracker ldr r2, _08015088 @ =gUnknown_02024A76 ldrb r0, [r1] adds r0, r2 ldrb r0, [r0] strb r0, [r3] - ldr r2, _0801508C @ =gUnknown_02024C6C + ldr r2, _0801508C @ =gHitMarker ldr r0, [r2] ldr r1, _08015090 @ =0xf1e892af ands r0, r1 str r0, [r2] bx lr .align 2, 0 -_08015080: .4byte gUnknown_02024A7E -_08015084: .4byte gUnknown_02024A7F +_08015080: .4byte gCurrentMoveTurn +_08015084: .4byte gFightStateTracker _08015088: .4byte gUnknown_02024A76 -_0801508C: .4byte gUnknown_02024C6C +_0801508C: .4byte gHitMarker _08015090: .4byte 0xf1e892af thumb_func_end sub_8015060 thumb_func_start bsC_8016D70 bsC_8016D70: @ 8015094 push {r4,r5,lr} - ldr r1, _0801510C @ =gUnknown_02024A7E + ldr r1, _0801510C @ =gCurrentMoveTurn ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r3, _08015110 @ =gUnknown_02024A7F + ldr r3, _08015110 @ =gFightStateTracker ldr r2, _08015114 @ =gUnknown_02024A76 ldrb r0, [r1] adds r0, r2 ldrb r0, [r0] strb r0, [r3] - bl sub_801377C - ldr r2, _08015118 @ =gUnknown_02024C6C + bl SpecialStatusesClear + ldr r2, _08015118 @ =gHitMarker ldr r0, [r2] ldr r1, _0801511C @ =0xf1e892af ands r0, r1 @@ -5476,8 +5476,8 @@ bsC_8016D70: @ 8015094 ldr r3, _0801512C @ =0x000160a1 adds r0, r1, r3 strb r4, [r0] - ldr r2, _08015130 @ =gUnknown_02024C3C - ldr r5, _08015134 @ =gPlayerMonIndex + ldr r2, _08015130 @ =gMoveHitWith + ldr r5, _08015134 @ =gBankAttacker ldrb r0, [r5] lsls r0, 1 adds r0, r2 @@ -5491,12 +5491,12 @@ bsC_8016D70: @ 8015094 ldr r3, _0801513C @ =0x0001601c adds r0, r1, r3 strb r2, [r0] - ldr r0, _08015140 @ =gUnknown_02024DEC + ldr r0, _08015140 @ =gDynamicBasePower strh r4, [r0] subs r3, 0x10 adds r0, r1, r3 strb r2, [r0] - ldr r0, _08015144 @ =gUnknown_02024D1E + ldr r0, _08015144 @ =gBattleCommunication strb r2, [r0, 0x3] strb r2, [r0, 0x4] ldr r3, _08015148 @ =0x00016112 @@ -5509,21 +5509,21 @@ bsC_8016D70: @ 8015094 pop {r0} bx r0 .align 2, 0 -_0801510C: .4byte gUnknown_02024A7E -_08015110: .4byte gUnknown_02024A7F +_0801510C: .4byte gCurrentMoveTurn +_08015110: .4byte gFightStateTracker _08015114: .4byte gUnknown_02024A76 -_08015118: .4byte gUnknown_02024C6C +_08015118: .4byte gHitMarker _0801511C: .4byte 0xf1e892af _08015120: .4byte gBattleMoveDamage _08015124: .4byte 0x02000000 _08015128: .4byte 0x00016002 _0801512C: .4byte 0x000160a1 -_08015130: .4byte gUnknown_02024C3C -_08015134: .4byte gPlayerMonIndex +_08015130: .4byte gMoveHitWith +_08015134: .4byte gBankAttacker _08015138: .4byte gUnknown_02024C44 _0801513C: .4byte 0x0001601c -_08015140: .4byte gUnknown_02024DEC -_08015144: .4byte gUnknown_02024D1E +_08015140: .4byte gDynamicBasePower +_08015144: .4byte gBattleCommunication _08015148: .4byte 0x00016112 _0801514C: .4byte 0x00017130 thumb_func_end bsC_8016D70 @@ -5557,20 +5557,20 @@ _0801516C: .4byte _080151C8 .4byte _080151B4 _08015198: - ldr r0, _0801519C @ =gEnemyMonIndex + ldr r0, _0801519C @ =gBankTarget b _080151C6 .align 2, 0 -_0801519C: .4byte gEnemyMonIndex +_0801519C: .4byte gBankTarget _080151A0: - ldr r0, _080151A4 @ =gPlayerMonIndex + ldr r0, _080151A4 @ =gBankAttacker b _080151C6 .align 2, 0 -_080151A4: .4byte gPlayerMonIndex +_080151A4: .4byte gBankAttacker _080151A8: - ldr r0, _080151AC @ =gUnknown_02024C0A + ldr r0, _080151AC @ =gEffectBank b _080151C6 .align 2, 0 -_080151AC: .4byte gUnknown_02024C0A +_080151AC: .4byte gEffectBank _080151B0: movs r2, 0 b _080151C8 @@ -5583,7 +5583,7 @@ _080151B4: _080151BC: .4byte 0x02000000 _080151C0: .4byte 0x00016003 _080151C4: - ldr r0, _080151D0 @ =gUnknown_02024C09 + ldr r0, _080151D0 @ =gBank1 _080151C6: ldrb r2, [r0] _080151C8: @@ -5591,7 +5591,7 @@ _080151C8: pop {r1} bx r1 .align 2, 0 -_080151D0: .4byte gUnknown_02024C09 +_080151D0: .4byte gBank1 thumb_func_end sub_8015150 thumb_func_start sub_80151D4 @@ -5655,7 +5655,7 @@ _08015232: ands r0, r1 cmp r0, 0 bne _08015286 - ldr r1, _08015290 @ =gUnknown_02024CA8 + ldr r1, _08015290 @ =gDisableStructs lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -5669,7 +5669,7 @@ _08015232: ands r1, r0 cmp r1, 0 bne _08015286 - ldr r4, _08015298 @ =gUnknown_02024A60 + ldr r4, _08015298 @ =gActiveBank strb r5, [r4] adds r1, r3, 0 adds r1, 0x9 @@ -5683,18 +5683,18 @@ _08015232: movs r0, 0 movs r2, 0 movs r3, 0x1 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08015286: add sp, 0x4 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08015290: .4byte gUnknown_02024CA8 +_08015290: .4byte gDisableStructs _08015294: .4byte gBitTable -_08015298: .4byte gUnknown_02024A60 +_08015298: .4byte gActiveBank thumb_func_end sub_80151D4 thumb_func_start sub_801529C @@ -5710,12 +5710,12 @@ sub_801529C: @ 801529C movs r0, 0x4 mov r8, r0 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 mov r9, r0 movs r4, 0 - ldr r0, _080153BC @ =gUnknown_02024A68 + ldr r0, _080153BC @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bge _08015344 @@ -5728,7 +5728,7 @@ sub_801529C: @ 801529C _080152D2: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 adds r6, r4, 0x1 @@ -5781,7 +5781,7 @@ _08015322: strb r0, [r1] _0801533A: adds r4, r6, 0 - ldr r0, _080153BC @ =gUnknown_02024A68 + ldr r0, _080153BC @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _080152D2 @@ -5802,7 +5802,7 @@ _08015344: ands r0, r1 cmp r0, 0 bne _080153AC - ldr r1, _080153C4 @ =gUnknown_02024CA8 + ldr r1, _080153C4 @ =gDisableStructs lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -5817,7 +5817,7 @@ _08015344: ands r1, r0 cmp r1, 0 bne _080153AC - ldr r4, _080153CC @ =gUnknown_02024A60 + ldr r4, _080153CC @ =gActiveBank strb r5, [r4] mov r1, r8 adds r1, 0x9 @@ -5833,9 +5833,9 @@ _08015344: movs r0, 0 movs r2, 0 movs r3, 0x1 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _080153AC: add sp, 0x4 pop {r3-r5} @@ -5846,11 +5846,11 @@ _080153AC: pop {r0} bx r0 .align 2, 0 -_080153BC: .4byte gUnknown_02024A68 +_080153BC: .4byte gNoOfAllBanks _080153C0: .4byte gBattleMons -_080153C4: .4byte gUnknown_02024CA8 +_080153C4: .4byte gDisableStructs _080153C8: .4byte gBitTable -_080153CC: .4byte gUnknown_02024A60 +_080153CC: .4byte gActiveBank thumb_func_end sub_801529C thumb_func_start sub_80153D0 @@ -5865,7 +5865,7 @@ sub_80153D0: @ 80153D0 lsrs r3, r0, 24 movs r6, 0x4 movs r1, 0 - ldr r0, _080154C8 @ =gUnknown_02024A68 + ldr r0, _080154C8 @ =gNoOfAllBanks mov r8, r0 ldrb r0, [r0] cmp r1, r0 @@ -5940,7 +5940,7 @@ _08015452: ands r0, r1 cmp r0, 0 bne _080154B6 - ldr r1, _080154D8 @ =gUnknown_02024CA8 + ldr r1, _080154D8 @ =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -5954,7 +5954,7 @@ _08015452: ands r1, r0 cmp r1, 0 bne _080154B6 - ldr r4, _080154E0 @ =gUnknown_02024A60 + ldr r4, _080154E0 @ =gActiveBank strb r3, [r4] adds r1, r6, 0 adds r1, 0x9 @@ -5970,9 +5970,9 @@ _08015452: movs r0, 0 movs r2, 0 movs r3, 0x1 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _080154B6: add sp, 0x4 pop {r3-r5} @@ -5983,13 +5983,13 @@ _080154B6: pop {r0} bx r0 .align 2, 0 -_080154C8: .4byte gUnknown_02024A68 +_080154C8: .4byte gNoOfAllBanks _080154CC: .4byte gBattleMons _080154D0: .4byte gUnknown_02024A8C _080154D4: .4byte gUnknown_02024AA4 -_080154D8: .4byte gUnknown_02024CA8 +_080154D8: .4byte gDisableStructs _080154DC: .4byte gBitTable -_080154E0: .4byte gUnknown_02024A60 +_080154E0: .4byte gActiveBank thumb_func_end sub_80153D0 thumb_func_start unref_sub_80154E4 @@ -6002,11 +6002,11 @@ unref_sub_80154E4: @ 80154E4 cmp r0, 0 beq _08015524 movs r2, 0 - ldr r4, _08015518 @ =gUnknown_02024A68 + ldr r4, _08015518 @ =gNoOfAllBanks ldrb r0, [r4] cmp r2, r0 bge _08015542 - ldr r3, _0801551C @ =gUnknown_02024A64 + ldr r3, _0801551C @ =gBattleExecBuffer ldr r5, _08015520 @ =gBitTable _08015500: ldm r5!, {r1} @@ -6021,16 +6021,16 @@ _08015500: b _08015542 .align 2, 0 _08015514: .4byte gBattleTypeFlags -_08015518: .4byte gUnknown_02024A68 -_0801551C: .4byte gUnknown_02024A64 +_08015518: .4byte gNoOfAllBanks +_0801551C: .4byte gBattleExecBuffer _08015520: .4byte gBitTable _08015524: movs r2, 0 - ldr r4, _08015548 @ =gUnknown_02024A68 + ldr r4, _08015548 @ =gNoOfAllBanks ldrb r0, [r4] cmp r2, r0 bge _08015542 - ldr r3, _0801554C @ =gUnknown_02024A64 + ldr r3, _0801554C @ =gBattleExecBuffer ldr r5, _08015550 @ =gBitTable _08015532: ldr r0, [r3] @@ -6046,13 +6046,13 @@ _08015542: pop {r0} bx r0 .align 2, 0 -_08015548: .4byte gUnknown_02024A68 -_0801554C: .4byte gUnknown_02024A64 +_08015548: .4byte gNoOfAllBanks +_0801554C: .4byte gBattleExecBuffer _08015550: .4byte gBitTable thumb_func_end unref_sub_80154E4 - thumb_func_start dp01_battle_side_mark_buffer_for_execution -dp01_battle_side_mark_buffer_for_execution: @ 8015554 + thumb_func_start MarkBufferBankForExecution +MarkBufferBankForExecution: @ 8015554 push {lr} lsls r0, 24 lsrs r3, r0, 24 @@ -6062,7 +6062,7 @@ dp01_battle_side_mark_buffer_for_execution: @ 8015554 ands r0, r1 cmp r0, 0 beq _08015588 - ldr r2, _08015580 @ =gUnknown_02024A64 + ldr r2, _08015580 @ =gBattleExecBuffer ldr r1, _08015584 @ =gBitTable lsls r0, r3, 2 adds r0, r1 @@ -6074,10 +6074,10 @@ dp01_battle_side_mark_buffer_for_execution: @ 8015554 b _08015598 .align 2, 0 _0801557C: .4byte gBattleTypeFlags -_08015580: .4byte gUnknown_02024A64 +_08015580: .4byte gBattleExecBuffer _08015584: .4byte gBitTable _08015588: - ldr r2, _0801559C @ =gUnknown_02024A64 + ldr r2, _0801559C @ =gBattleExecBuffer ldr r1, _080155A0 @ =gBitTable lsls r0, r3, 2 adds r0, r1 @@ -6089,9 +6089,9 @@ _08015598: pop {r0} bx r0 .align 2, 0 -_0801559C: .4byte gUnknown_02024A64 +_0801559C: .4byte gBattleExecBuffer _080155A0: .4byte gBitTable - thumb_func_end dp01_battle_side_mark_buffer_for_execution + thumb_func_end MarkBufferBankForExecution thumb_func_start sub_80155A4 sub_80155A4: @ 80155A4 @@ -6099,13 +6099,13 @@ sub_80155A4: @ 80155A4 lsls r0, 24 lsrs r7, r0, 24 movs r4, 0 - ldr r5, _080155B8 @ =gUnknown_02024A64 + ldr r5, _080155B8 @ =gBattleExecBuffer ldr r1, _080155BC @ =gBitTable lsls r0, r7, 2 adds r6, r0, r1 b _080155CE .align 2, 0 -_080155B8: .4byte gUnknown_02024A64 +_080155B8: .4byte gBattleExecBuffer _080155BC: .4byte gBitTable _080155C0: lsls r0, r4, 2 @@ -6121,7 +6121,7 @@ _080155CE: lsrs r0, 24 cmp r4, r0 blt _080155C0 - ldr r2, _080155F0 @ =gUnknown_02024A64 + ldr r2, _080155F0 @ =gBattleExecBuffer movs r1, 0x80 lsls r1, 21 lsls r1, r7 @@ -6132,11 +6132,11 @@ _080155CE: pop {r0} bx r0 .align 2, 0 -_080155F0: .4byte gUnknown_02024A64 +_080155F0: .4byte gBattleExecBuffer thumb_func_end sub_80155A4 - thumb_func_start b_cancel_multi_turn_move_maybe -b_cancel_multi_turn_move_maybe: @ 80155F4 + thumb_func_start CancelMultiTurnMoves +CancelMultiTurnMoves: @ 80155F4 lsls r0, 24 lsrs r0, 24 ldr r1, _08015644 @ =gBattleMons @@ -6156,14 +6156,14 @@ b_cancel_multi_turn_move_maybe: @ 80155F4 ldr r2, _08015650 @ =0xfffffcff ands r1, r2 str r1, [r3] - ldr r1, _08015654 @ =gUnknown_02024C98 + ldr r1, _08015654 @ =gStatuses3 lsls r2, r0, 2 adds r2, r1 ldr r1, [r2] ldr r3, _08015658 @ =0xfffbff3f ands r1, r3 str r1, [r2] - ldr r2, _0801565C @ =gUnknown_02024CA8 + ldr r2, _0801565C @ =gDisableStructs lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -6181,16 +6181,16 @@ _08015644: .4byte gBattleMons _08015648: .4byte 0xffffefff _0801564C: .4byte 0xfffff3ff _08015650: .4byte 0xfffffcff -_08015654: .4byte gUnknown_02024C98 +_08015654: .4byte gStatuses3 _08015658: .4byte 0xfffbff3f -_0801565C: .4byte gUnknown_02024CA8 - thumb_func_end b_cancel_multi_turn_move_maybe +_0801565C: .4byte gDisableStructs + thumb_func_end CancelMultiTurnMoves thumb_func_start sub_8015660 sub_8015660: @ 8015660 push {lr} lsls r0, 24 - ldr r1, _080156AC @ =gUnknown_02024D28 + ldr r1, _080156AC @ =gProtectStructs lsrs r0, 20 adds r1, r0, r1 ldrb r0, [r1] @@ -6227,7 +6227,7 @@ _080156A6: movs r0, 0x1 b _080156B2 .align 2, 0 -_080156AC: .4byte gUnknown_02024D28 +_080156AC: .4byte gProtectStructs _080156B0: movs r0, 0 _080156B2: @@ -6235,42 +6235,42 @@ _080156B2: bx r1 thumb_func_end sub_8015660 - thumb_func_start b_std_message -b_std_message: @ 80156B8 + thumb_func_start PrepareStringBattle +PrepareStringBattle: @ 80156B8 push {r4,lr} adds r2, r0, 0 lsls r2, 16 lsrs r2, 16 - ldr r4, _080156D8 @ =gUnknown_02024A60 + ldr r4, _080156D8 @ =gActiveBank strb r1, [r4] movs r0, 0 adds r1, r2, 0 - bl dp01_build_cmdbuf_x10_TODO + bl EmitPrintString ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution pop {r4} pop {r0} bx r0 .align 2, 0 -_080156D8: .4byte gUnknown_02024A60 - thumb_func_end b_std_message +_080156D8: .4byte gActiveBank + thumb_func_end PrepareStringBattle thumb_func_start sub_80156DC sub_80156DC: @ 80156DC push {r4-r6,lr} movs r3, 0 - ldr r0, _08015730 @ =gUnknown_02024DEA + ldr r0, _08015730 @ =gSentPokesToOpponent strb r3, [r0] strb r3, [r0, 0x1] movs r1, 0 - ldr r0, _08015734 @ =gUnknown_02024A68 + ldr r0, _08015734 @ =gNoOfAllBanks ldrb r2, [r0] adds r6, r0, 0 cmp r1, r2 bge _0801570A ldr r5, _08015738 @ =gBitTable adds r4, r2, 0 - ldr r2, _0801573C @ =gUnknown_02024A6A + ldr r2, _0801573C @ =gBattlePartyID _080156F8: ldrh r0, [r2] lsls r0, 2 @@ -6287,7 +6287,7 @@ _0801570A: ldrb r0, [r2] cmp r1, r0 bge _0801572A - ldr r5, _08015730 @ =gUnknown_02024DEA + ldr r5, _08015730 @ =gSentPokesToOpponent movs r4, 0x2 _08015718: adds r0, r1, 0 @@ -6304,10 +6304,10 @@ _0801572A: pop {r0} bx r0 .align 2, 0 -_08015730: .4byte gUnknown_02024DEA -_08015734: .4byte gUnknown_02024A68 +_08015730: .4byte gSentPokesToOpponent +_08015734: .4byte gNoOfAllBanks _08015738: .4byte gBitTable -_0801573C: .4byte gUnknown_02024A6A +_0801573C: .4byte gBattlePartyID thumb_func_end sub_80156DC thumb_func_start sub_8015740 @@ -6319,7 +6319,7 @@ sub_8015740: @ 8015740 lsrs r5, r0, 24 movs r4, 0 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6329,20 +6329,20 @@ sub_8015740: @ 8015740 lsls r0, 24 lsrs r0, 25 mov r12, r0 - ldr r1, _080157B0 @ =gUnknown_02024DEA + ldr r1, _080157B0 @ =gSentPokesToOpponent adds r0, r1 strb r4, [r0] adds r5, r4, 0 - ldr r0, _080157B4 @ =gUnknown_02024A68 + ldr r0, _080157B4 @ =gNoOfAllBanks ldrb r2, [r0] mov r8, r1 cmp r4, r2 bge _0801579E - ldr r0, _080157B8 @ =gUnknown_02024C0C + ldr r0, _080157B8 @ =gAbsentBankFlags ldrb r7, [r0] ldr r1, _080157BC @ =gBitTable adds r6, r2, 0 - ldr r3, _080157C0 @ =gUnknown_02024A6A + ldr r3, _080157C0 @ =gBattlePartyID adds r2, r1, 0 _08015782: ldr r0, [r2] @@ -6371,11 +6371,11 @@ _080157A4: pop {r0} bx r0 .align 2, 0 -_080157B0: .4byte gUnknown_02024DEA -_080157B4: .4byte gUnknown_02024A68 -_080157B8: .4byte gUnknown_02024C0C +_080157B0: .4byte gSentPokesToOpponent +_080157B4: .4byte gNoOfAllBanks +_080157B8: .4byte gAbsentBankFlags _080157BC: .4byte gBitTable -_080157C0: .4byte gUnknown_02024A6A +_080157C0: .4byte gBattlePartyID thumb_func_end sub_8015740 thumb_func_start sub_80157C4 @@ -6384,7 +6384,7 @@ sub_80157C4: @ 80157C4 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6394,15 +6394,15 @@ sub_80157C4: @ 80157C4 b _08015816 _080157E0: movs r3, 0x1 - ldr r5, _0801581C @ =gUnknown_02024A68 + ldr r5, _0801581C @ =gNoOfAllBanks ldrb r0, [r5] cmp r3, r0 bge _08015816 - ldr r0, _08015820 @ =gUnknown_02024DEA + ldr r0, _08015820 @ =gSentPokesToOpponent mov r12, r0 movs r7, 0x2 ldr r6, _08015824 @ =gBitTable - ldr r1, _08015828 @ =gUnknown_02024A6A + ldr r1, _08015828 @ =gBattlePartyID lsls r0, r4, 1 adds r4, r0, r1 _080157F8: @@ -6426,10 +6426,10 @@ _08015816: pop {r0} bx r0 .align 2, 0 -_0801581C: .4byte gUnknown_02024A68 -_08015820: .4byte gUnknown_02024DEA +_0801581C: .4byte gNoOfAllBanks +_08015820: .4byte gSentPokesToOpponent _08015824: .4byte gBitTable -_08015828: .4byte gUnknown_02024A6A +_08015828: .4byte gBattlePartyID thumb_func_end sub_80157C4 .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_3.s b/asm/battle_3.s index 4252e7222..ffe32f27b 100644 --- a/asm/battle_3.s +++ b/asm/battle_3.s @@ -37,18 +37,18 @@ b_movescr_stack_push_cursor: @ 801584C lsls r0, 24 lsrs r0, 22 adds r0, r3 - ldr r1, _0801586C @ =gUnknown_02024C10 + ldr r1, _0801586C @ =gBattlescriptCurrInstr ldr r1, [r1] str r1, [r0] bx lr .align 2, 0 _08015868: .4byte 0x02017110 -_0801586C: .4byte gUnknown_02024C10 +_0801586C: .4byte gBattlescriptCurrInstr thumb_func_end b_movescr_stack_push_cursor thumb_func_start b_movescr_stack_pop_cursor b_movescr_stack_pop_cursor: @ 8015870 - ldr r3, _0801588C @ =gUnknown_02024C10 + ldr r3, _0801588C @ =gBattlescriptCurrInstr ldr r2, _08015890 @ =0x02017110 adds r1, r2, 0 adds r1, 0x20 @@ -62,7 +62,7 @@ b_movescr_stack_pop_cursor: @ 8015870 str r0, [r3] bx lr .align 2, 0 -_0801588C: .4byte gUnknown_02024C10 +_0801588C: .4byte gBattlescriptCurrInstr _08015890: .4byte 0x02017110 thumb_func_end b_movescr_stack_pop_cursor @@ -73,8 +73,8 @@ sub_8015894: @ 8015894 push {r7} movs r6, 0 ldr r2, _080159AC @ =gBattleMons - ldr r1, _080159B0 @ =gUnknown_02024260 - ldr r5, _080159B4 @ =gUnknown_02024A60 + ldr r1, _080159B0 @ =gBattleBufferB + ldr r5, _080159B4 @ =gActiveBank ldrb r3, [r5] lsls r0, r3, 9 adds r1, 0x2 @@ -91,7 +91,7 @@ sub_8015894: @ 8015894 ldr r2, _080159B8 @ =0x020160e8 adds r0, r2 mov r8, r0 - ldr r1, _080159BC @ =gUnknown_02024CA8 + ldr r1, _080159BC @ =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -104,7 +104,7 @@ sub_8015894: @ 8015894 adds r0, r2, 0 subs r0, 0xE5 strb r3, [r0] - ldr r0, _080159C0 @ =gUnknown_02024BE6 + ldr r0, _080159C0 @ =gCurrentMove strh r4, [r0] ldr r1, _080159C4 @ =gUnknown_02024C1C ldrb r0, [r5] @@ -114,8 +114,8 @@ sub_8015894: @ 8015894 str r1, [r0] movs r6, 0x1 _080158EE: - ldr r1, _080159CC @ =gUnknown_02024C34 - ldr r5, _080159B4 @ =gUnknown_02024A60 + ldr r1, _080159CC @ =gLastUsedMove + ldr r5, _080159B4 @ =gActiveBank ldrb r2, [r5] lsls r0, r2, 1 adds r0, r1 @@ -133,7 +133,7 @@ _080158EE: cmp r0, 0 bge _0801592A adds r0, r2, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves ldr r1, _080159C4 @ =gUnknown_02024C1C ldrb r0, [r5] lsls r0, 2 @@ -144,8 +144,8 @@ _080158EE: lsls r0, 24 lsrs r6, r0, 24 _0801592A: - ldr r2, _080159BC @ =gUnknown_02024CA8 - ldr r3, _080159B4 @ =gUnknown_02024A60 + ldr r2, _080159BC @ =gDisableStructs + ldr r3, _080159B4 @ =gActiveBank ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -163,7 +163,7 @@ _0801592A: ldrb r0, [r1, 0x1] cmp r0, 0 bne _08015966 - ldr r0, _080159C0 @ =gUnknown_02024BE6 + ldr r0, _080159C0 @ =gCurrentMove strh r4, [r0] ldr r1, _080159C4 @ =gUnknown_02024C1C ldrb r0, [r3] @@ -175,14 +175,14 @@ _0801592A: lsls r0, 24 lsrs r6, r0, 24 _08015966: - ldr r5, _080159B4 @ =gUnknown_02024A60 + ldr r5, _080159B4 @ =gActiveBank ldrb r0, [r5] adds r1, r4, 0 bl sub_8015D5C lsls r0, 24 cmp r0, 0 beq _0801598C - ldr r0, _080159C0 @ =gUnknown_02024BE6 + ldr r0, _080159C0 @ =gCurrentMove strh r4, [r0] ldr r1, _080159C4 @ =gUnknown_02024C1C ldrb r0, [r5] @@ -211,14 +211,14 @@ _0801598C: b _080159EE .align 2, 0 _080159AC: .4byte gBattleMons -_080159B0: .4byte gUnknown_02024260 -_080159B4: .4byte gUnknown_02024A60 +_080159B0: .4byte gBattleBufferB +_080159B4: .4byte gActiveBank _080159B8: .4byte 0x020160e8 -_080159BC: .4byte gUnknown_02024CA8 -_080159C0: .4byte gUnknown_02024BE6 +_080159BC: .4byte gDisableStructs +_080159C0: .4byte gCurrentMove _080159C4: .4byte gUnknown_02024C1C _080159C8: .4byte gUnknown_081D9144 -_080159CC: .4byte gUnknown_02024C34 +_080159CC: .4byte gLastUsedMove _080159D0: .4byte gUnknown_081D937C _080159D4: .4byte gBattleMoves _080159D8: .4byte gUnknown_081D938B @@ -230,8 +230,8 @@ _080159E4: lsls r0, 24 lsrs r3, r0, 24 _080159EE: - ldr r2, _08015A70 @ =gUnknown_02024C0B - ldr r1, _08015A74 @ =gUnknown_02024A60 + ldr r2, _08015A70 @ =gStringBank + ldr r1, _08015A74 @ =gActiveBank ldrb r0, [r1] strb r0, [r2] ldr r7, _08015A78 @ =gBattleMons @@ -248,9 +248,9 @@ _080159EE: beq _08015A36 cmp r1, r4 beq _08015A36 - ldr r0, _08015A80 @ =gUnknown_02024BE6 + ldr r0, _08015A80 @ =gCurrentMove strh r2, [r0] - ldr r2, _08015A84 @ =gUnknown_02024C04 + ldr r2, _08015A84 @ =gLastUsedItem ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -267,7 +267,7 @@ _080159EE: lsls r0, 24 lsrs r6, r0, 24 _08015A36: - ldr r0, _08015A90 @ =gUnknown_02024260 + ldr r0, _08015A90 @ =gBattleBufferB ldrb r2, [r5] lsls r1, r2, 9 adds r0, 0x2 @@ -298,15 +298,15 @@ _08015A64: pop {r1} bx r1 .align 2, 0 -_08015A70: .4byte gUnknown_02024C0B -_08015A74: .4byte gUnknown_02024A60 +_08015A70: .4byte gStringBank +_08015A74: .4byte gActiveBank _08015A78: .4byte gBattleMons _08015A7C: .4byte 0x0000ffff -_08015A80: .4byte gUnknown_02024BE6 -_08015A84: .4byte gUnknown_02024C04 +_08015A80: .4byte gCurrentMove +_08015A84: .4byte gLastUsedItem _08015A88: .4byte gUnknown_02024C1C _08015A8C: .4byte gUnknown_081D9AC2 -_08015A90: .4byte gUnknown_02024260 +_08015A90: .4byte gBattleBufferB _08015A94: .4byte gUnknown_081D9369 thumb_func_end sub_8015894 @@ -357,13 +357,13 @@ _08015AE4: lsls r1, r7, 3 ldr r3, [sp, 0x14] _08015AF6: - ldr r0, _08015C70 @ =gUnknown_02024C0B + ldr r0, _08015C70 @ =gStringBank strb r7, [r0] movs r0, 0 mov r9, r0 lsls r2, r7, 1 str r2, [sp, 0xC] - ldr r5, _08015C74 @ =gUnknown_02024CA8 + ldr r5, _08015C74 @ =gDisableStructs mov r12, r5 ldr r0, _08015C78 @ =gBattleMons movs r2, 0x58 @@ -432,7 +432,7 @@ _08015B74: ldr r1, _08015C7C @ =gUnknown_02024A8C adds r0, r1 mov r12, r0 - ldr r1, _08015C84 @ =gUnknown_02024C34 + ldr r1, _08015C84 @ =gLastUsedMove ldr r0, [sp, 0xC] adds r1, r0, r1 str r1, [sp, 0x18] @@ -458,7 +458,7 @@ _08015B74: lsls r0, r4, 24 lsrs r4, r0, 24 _08015BB6: - ldr r0, _08015C74 @ =gUnknown_02024CA8 + ldr r0, _08015C74 @ =gDisableStructs add r0, r8 ldrb r0, [r0, 0x13] lsls r0, 28 @@ -499,7 +499,7 @@ _08015BE4: lsls r0, r4, 24 lsrs r4, r0, 24 _08015C06: - ldr r1, _08015C74 @ =gUnknown_02024CA8 + ldr r1, _08015C74 @ =gDisableStructs mov r0, r8 adds r2, r0, r1 ldrb r0, [r2, 0xE] @@ -556,12 +556,12 @@ _08015C5E: pop {r1} bx r1 .align 2, 0 -_08015C70: .4byte gUnknown_02024C0B -_08015C74: .4byte gUnknown_02024CA8 +_08015C70: .4byte gStringBank +_08015C74: .4byte gDisableStructs _08015C78: .4byte gBattleMons _08015C7C: .4byte gUnknown_02024A8C _08015C80: .4byte gBitTable -_08015C84: .4byte gUnknown_02024C34 +_08015C84: .4byte gLastUsedMove _08015C88: .4byte gBattleMoves _08015C8C: .4byte 0x0000ffff thumb_func_end sub_8015A98 @@ -569,7 +569,7 @@ _08015C8C: .4byte 0x0000ffff thumb_func_start sub_8015C90 sub_8015C90: @ 8015C90 push {r4-r6,lr} - ldr r5, _08015CFC @ =gUnknown_02024A60 + ldr r5, _08015CFC @ =gActiveBank ldrb r0, [r5] movs r1, 0 movs r2, 0xFF @@ -578,7 +578,7 @@ sub_8015C90: @ 8015C90 lsrs r6, r0, 24 cmp r6, 0xF bne _08015D38 - ldr r0, _08015D00 @ =gUnknown_02024D28 + ldr r0, _08015D00 @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -599,7 +599,7 @@ sub_8015C90: @ 8015C90 cmp r0, 0 beq _08015D14 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r4, r0, 0 bl Random movs r1, 0x1 @@ -610,38 +610,38 @@ sub_8015C90: @ 8015C90 lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl battle_get_side_with_given_state - ldr r2, _08015D10 @ =gUnknown_02024260 + bl GetBankByPlayerAI + ldr r2, _08015D10 @ =gBattleBufferB ldrb r1, [r5] lsls r1, 9 adds r2, 0x3 adds r1, r2 b _08015D48 .align 2, 0 -_08015CFC: .4byte gUnknown_02024A60 -_08015D00: .4byte gUnknown_02024D28 +_08015CFC: .4byte gActiveBank +_08015D00: .4byte gProtectStructs _08015D04: .4byte gUnknown_02024C1C _08015D08: .4byte gUnknown_081D9365 _08015D0C: .4byte gBattleTypeFlags -_08015D10: .4byte gUnknown_02024260 +_08015D10: .4byte gBattleBufferB _08015D14: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r2, _08015D34 @ =gUnknown_02024260 + bl GetBankByPlayerAI + ldr r2, _08015D34 @ =gBattleBufferB ldrb r1, [r5] lsls r1, 9 adds r2, 0x3 adds r1, r2 b _08015D48 .align 2, 0 -_08015D34: .4byte gUnknown_02024260 +_08015D34: .4byte gBattleBufferB _08015D38: - ldr r0, _08015D58 @ =gUnknown_02024D28 + ldr r0, _08015D58 @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -660,7 +660,7 @@ _08015D52: pop {r1} bx r1 .align 2, 0 -_08015D58: .4byte gUnknown_02024D28 +_08015D58: .4byte gProtectStructs thumb_func_end sub_8015C90 thumb_func_start sub_8015D5C @@ -674,12 +674,12 @@ sub_8015D5C: @ 8015D5C lsls r1, 16 lsrs r5, r1, 16 movs r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 mov r9, r0 movs r4, 0 - ldr r0, _08015DF0 @ =gUnknown_02024A68 + ldr r0, _08015DF0 @ =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bge _08015DE0 @@ -688,13 +688,13 @@ sub_8015D5C: @ 8015D5C _08015D86: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 adds r3, r4, 0x1 cmp r9, r0 beq _08015DD6 - ldr r1, _08015DF8 @ =gUnknown_02024C98 + ldr r1, _08015DF8 @ =gStatuses3 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -729,7 +729,7 @@ _08015DCC: lsrs r6, r0, 24 _08015DD6: adds r4, r3, 0 - ldr r0, _08015DF0 @ =gUnknown_02024A68 + ldr r0, _08015DF0 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08015D86 @@ -742,13 +742,13 @@ _08015DE0: pop {r1} bx r1 .align 2, 0 -_08015DF0: .4byte gUnknown_02024A68 +_08015DF0: .4byte gNoOfAllBanks _08015DF4: .4byte gUnknown_02024A8C -_08015DF8: .4byte gUnknown_02024C98 +_08015DF8: .4byte gStatuses3 thumb_func_end sub_8015D5C - thumb_func_start sub_8015DFC -sub_8015DFC: @ 8015DFC + thumb_func_start UpdateTurnCounters +UpdateTurnCounters: @ 8015DFC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -756,19 +756,19 @@ sub_8015DFC: @ 8015DFC push {r5-r7} movs r0, 0 mov r9, r0 - ldr r1, _08015EA0 @ =gPlayerMonIndex + ldr r1, _08015EA0 @ =gBankAttacker mov r2, r9 strb r2, [r1] - ldr r0, _08015EA4 @ =gUnknown_02024A68 + ldr r0, _08015EA4 @ =gNoOfAllBanks ldrb r4, [r0] adds r6, r1, 0 mov r10, r0 - ldr r7, _08015EA8 @ =gEnemyMonIndex + ldr r7, _08015EA8 @ =gBankTarget ldr r3, _08015EAC @ =0x02000000 mov r12, r3 cmp r9, r4 bcs _08015E50 - ldr r2, _08015EB0 @ =gUnknown_02024C0C + ldr r2, _08015EB0 @ =gAbsentBankFlags ldrb r1, [r2] ldr r5, _08015EB4 @ =gBitTable ldr r0, [r5] @@ -799,7 +799,7 @@ _08015E50: ldrb r4, [r0] cmp r4, 0 beq _08015E8A - ldr r2, _08015EB0 @ =gUnknown_02024C0C + ldr r2, _08015EB0 @ =gAbsentBankFlags ldrb r1, [r2] ldr r5, _08015EB4 @ =gBitTable ldr r0, [r5] @@ -837,11 +837,11 @@ _08015E96: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08015EA0: .4byte gPlayerMonIndex -_08015EA4: .4byte gUnknown_02024A68 -_08015EA8: .4byte gEnemyMonIndex +_08015EA0: .4byte gBankAttacker +_08015EA4: .4byte gNoOfAllBanks +_08015EA8: .4byte gBankTarget _08015EAC: .4byte 0x02000000 -_08015EB0: .4byte gUnknown_02024C0C +_08015EB0: .4byte gAbsentBankFlags _08015EB4: .4byte gBitTable _08015EB8: .4byte 0x0001600e _08015EBC: .4byte _08015EC0 @@ -860,12 +860,12 @@ _08015EC0: .4byte _08016520 _08015EEC: movs r5, 0 - ldr r1, _08015F0C @ =gUnknown_02024A68 + ldr r1, _08015F0C @ =gNoOfAllBanks mov r10, r1 ldrb r2, [r1] cmp r5, r2 bge _08015F06 - ldr r2, _08015F10 @ =gUnknown_02024A7A + ldr r2, _08015F10 @ =gTurnOrder _08015EFA: adds r0, r5, r2 strb r5, [r0] @@ -877,16 +877,16 @@ _08015F06: movs r5, 0 b _08015F54 .align 2, 0 -_08015F0C: .4byte gUnknown_02024A68 -_08015F10: .4byte gUnknown_02024A7A +_08015F0C: .4byte gNoOfAllBanks +_08015F10: .4byte gTurnOrder _08015F14: adds r4, r5, 0x1 adds r6, r4, 0 ldrb r1, [r1] cmp r6, r1 bge _08015F52 - ldr r7, _08016004 @ =gUnknown_02024A7A - ldr r0, _08016008 @ =gUnknown_02024A68 + ldr r7, _08016004 @ =gTurnOrder + ldr r0, _08016008 @ =gNoOfAllBanks mov r10, r0 lsls r1, r5, 24 mov r8, r1 @@ -907,7 +907,7 @@ _08015F28: bl sub_8012FBC _08015F48: adds r4, 0x1 - ldr r0, _08016008 @ =gUnknown_02024A68 + ldr r0, _08016008 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08015F28 @@ -938,18 +938,18 @@ _08015F74: bls _08015F80 b _08016236 _08015F80: - ldr r3, _08016018 @ =gUnknown_02024A60 + ldr r3, _08016018 @ =gActiveBank mov r8, r3 adds r6, r1, 0 movs r7, 0 - ldr r5, _0801601C @ =gUnknown_030041C0 + ldr r5, _0801601C @ =gBattleTextBuff1 _08015F8A: - ldr r0, _08016020 @ =gPlayerMonIndex + ldr r0, _08016020 @ =gBankAttacker ldrb r4, [r6] strb r4, [r0] mov r0, r8 strb r4, [r0] - ldr r0, _08016024 @ =gUnknown_02024C7A + ldr r0, _08016024 @ =gSideAffecting lsls r2, r4, 1 adds r3, r2, r0 ldrh r1, [r3] @@ -957,7 +957,7 @@ _08015F8A: ands r0, r1 cmp r0, 0 beq _08015FE8 - ldr r0, _08016028 @ =gUnknown_02024C80 + ldr r0, _08016028 @ =gSideTimer adds r1, r2, r4 lsls r1, 2 adds r1, r0 @@ -1007,16 +1007,16 @@ _08015FFA: bls _08015F8A b _08016236 .align 2, 0 -_08016004: .4byte gUnknown_02024A7A -_08016008: .4byte gUnknown_02024A68 +_08016004: .4byte gTurnOrder +_08016008: .4byte gNoOfAllBanks _0801600C: .4byte 0x02000000 _08016010: .4byte 0x0001600e _08016014: .4byte 0x000160fc -_08016018: .4byte gUnknown_02024A60 -_0801601C: .4byte gUnknown_030041C0 -_08016020: .4byte gPlayerMonIndex -_08016024: .4byte gUnknown_02024C7A -_08016028: .4byte gUnknown_02024C80 +_08016018: .4byte gActiveBank +_0801601C: .4byte gBattleTextBuff1 +_08016020: .4byte gBankAttacker +_08016024: .4byte gSideAffecting +_08016028: .4byte gSideTimer _0801602C: .4byte 0x0000fffe _08016030: .4byte gUnknown_081D9030 _08016034: @@ -1032,14 +1032,14 @@ _08016040: mov r10, r3 movs r0, 0 mov r8, r0 - ldr r5, _080160D0 @ =gUnknown_030041C0 + ldr r5, _080160D0 @ =gBattleTextBuff1 _0801604C: - ldr r0, _080160D4 @ =gPlayerMonIndex + ldr r0, _080160D4 @ =gBankAttacker ldrb r4, [r7] strb r4, [r0] - ldr r1, _080160D8 @ =gUnknown_02024A60 + ldr r1, _080160D8 @ =gActiveBank strb r4, [r1] - ldr r0, _080160DC @ =gUnknown_02024C7A + ldr r0, _080160DC @ =gSideAffecting lsls r2, r4, 1 adds r3, r2, r0 ldrh r1, [r3] @@ -1047,7 +1047,7 @@ _0801604C: ands r0, r1 cmp r0, 0 beq _080160B0 - ldr r0, _080160E0 @ =gUnknown_02024C80 + ldr r0, _080160E0 @ =gSideTimer adds r1, r2, r4 lsls r1, 2 adds r1, r0 @@ -1065,7 +1065,7 @@ _0801604C: strh r0, [r3] ldr r0, _080160E8 @ =gUnknown_081D9030 bl b_call_bc_move_exec - ldr r0, _080160EC @ =gUnknown_02024D1E + ldr r0, _080160EC @ =gBattleCommunication strb r4, [r0, 0x5] movs r0, 0xFD strb r0, [r5] @@ -1101,14 +1101,14 @@ _080160C2: b _08016182 .align 2, 0 _080160CC: .4byte 0x000160fc -_080160D0: .4byte gUnknown_030041C0 -_080160D4: .4byte gPlayerMonIndex -_080160D8: .4byte gUnknown_02024A60 -_080160DC: .4byte gUnknown_02024C7A -_080160E0: .4byte gUnknown_02024C80 +_080160D0: .4byte gBattleTextBuff1 +_080160D4: .4byte gBankAttacker +_080160D8: .4byte gActiveBank +_080160DC: .4byte gSideAffecting +_080160E0: .4byte gSideTimer _080160E4: .4byte 0x0000fffd _080160E8: .4byte gUnknown_081D9030 -_080160EC: .4byte gUnknown_02024D1E +_080160EC: .4byte gBattleCommunication _080160F0: .4byte 0x02000000 _080160F4: ldr r1, _0801619C @ =0x000160fc @@ -1116,19 +1116,19 @@ _080160F4: ldrb r0, [r1] cmp r0, 0x1 bhi _08016182 - ldr r0, _080161A0 @ =gUnknown_02024A60 + ldr r0, _080161A0 @ =gActiveBank mov r10, r0 adds r7, r1, 0 movs r1, 0 mov r8, r1 - ldr r5, _080161A4 @ =gUnknown_030041C0 + ldr r5, _080161A4 @ =gBattleTextBuff1 _0801610A: - ldr r0, _080161A8 @ =gPlayerMonIndex + ldr r0, _080161A8 @ =gBankAttacker ldrb r4, [r7] strb r4, [r0] mov r2, r10 strb r4, [r2] - ldr r1, _080161AC @ =gUnknown_02024C80 + ldr r1, _080161AC @ =gSideTimer lsls r3, r4, 1 adds r0, r3, r4 lsls r0, 2 @@ -1142,7 +1142,7 @@ _0801610A: lsls r0, 24 cmp r0, 0 bne _08016168 - ldr r2, _080161B0 @ =gUnknown_02024C7A + ldr r2, _080161B0 @ =gSideAffecting adds r2, r3, r2 ldrh r0, [r2] ldr r3, _080161B4 @ =0x0000feff @@ -1151,7 +1151,7 @@ _0801610A: strh r0, [r2] ldr r0, _080161B8 @ =gUnknown_081D9030 bl b_call_bc_move_exec - ldr r0, _080161BC @ =gUnknown_02024D1E + ldr r0, _080161BC @ =gBattleCommunication strb r4, [r0, 0x5] movs r0, 0xFD strb r0, [r5] @@ -1201,14 +1201,14 @@ _0801618A: b _0801652A .align 2, 0 _0801619C: .4byte 0x000160fc -_080161A0: .4byte gUnknown_02024A60 -_080161A4: .4byte gUnknown_030041C0 -_080161A8: .4byte gPlayerMonIndex -_080161AC: .4byte gUnknown_02024C80 -_080161B0: .4byte gUnknown_02024C7A +_080161A0: .4byte gActiveBank +_080161A4: .4byte gBattleTextBuff1 +_080161A8: .4byte gBankAttacker +_080161AC: .4byte gSideTimer +_080161B0: .4byte gSideAffecting _080161B4: .4byte 0x0000feff _080161B8: .4byte gUnknown_081D9030 -_080161BC: .4byte gUnknown_02024D1E +_080161BC: .4byte gBattleCommunication _080161C0: .4byte 0x02000000 _080161C4: .4byte 0x0001600e _080161C8: @@ -1217,14 +1217,14 @@ _080161C8: ldrb r0, [r1] cmp r0, 0x1 bhi _08016236 - ldr r7, _08016254 @ =gUnknown_02024A60 + ldr r7, _08016254 @ =gActiveBank adds r5, r1, 0 - ldr r6, _08016258 @ =gPlayerMonIndex + ldr r6, _08016258 @ =gBankAttacker _080161D8: ldrb r4, [r5] strb r4, [r6] strb r4, [r7] - ldr r0, _0801625C @ =gUnknown_02024C7A + ldr r0, _0801625C @ =gSideAffecting lsls r2, r4, 1 adds r3, r2, r0 ldrh r1, [r3] @@ -1232,7 +1232,7 @@ _080161D8: ands r0, r1 cmp r0, 0 beq _0801621C - ldr r0, _08016260 @ =gUnknown_02024C80 + ldr r0, _08016260 @ =gSideTimer adds r1, r2, r4 lsls r1, 2 adds r1, r0 @@ -1286,10 +1286,10 @@ _0801623E: b _0801652A .align 2, 0 _08016250: .4byte 0x000160fc -_08016254: .4byte gUnknown_02024A60 -_08016258: .4byte gPlayerMonIndex -_0801625C: .4byte gUnknown_02024C7A -_08016260: .4byte gUnknown_02024C80 +_08016254: .4byte gActiveBank +_08016258: .4byte gBankAttacker +_0801625C: .4byte gSideAffecting +_08016260: .4byte gSideTimer _08016264: .4byte 0x0000ffdf _08016268: .4byte gUnknown_081D9041 _0801626C: .4byte 0x02000000 @@ -1297,16 +1297,16 @@ _08016270: .4byte 0x0001600e _08016274: ldr r2, _080162FC @ =0x000160fc add r2, r12 - ldr r1, _08016300 @ =gUnknown_02024A68 + ldr r1, _08016300 @ =gNoOfAllBanks ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 bcs _080162E8 - ldr r5, _08016304 @ =gUnknown_02024A60 + ldr r5, _08016304 @ =gActiveBank adds r4, r2, 0 ldr r6, _08016308 @ =gUnknown_02024DDC _08016288: - ldr r1, _0801630C @ =gUnknown_02024A7A + ldr r1, _0801630C @ =gTurnOrder ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -1329,7 +1329,7 @@ _08016288: ldrh r0, [r0, 0x28] cmp r0, 0 beq _080162CA - ldr r0, _08016314 @ =gEnemyMonIndex + ldr r0, _08016314 @ =gBankTarget strb r2, [r0] ldr r0, _08016318 @ =gUnknown_081D939A bl b_call_bc_move_exec @@ -1349,7 +1349,7 @@ _080162CA: beq _080162DC b _08016532 _080162DC: - ldr r1, _08016300 @ =gUnknown_02024A68 + ldr r1, _08016300 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -1369,12 +1369,12 @@ _080162F0: b _0801652A .align 2, 0 _080162FC: .4byte 0x000160fc -_08016300: .4byte gUnknown_02024A68 -_08016304: .4byte gUnknown_02024A60 +_08016300: .4byte gNoOfAllBanks +_08016304: .4byte gActiveBank _08016308: .4byte gUnknown_02024DDC -_0801630C: .4byte gUnknown_02024A7A +_0801630C: .4byte gTurnOrder _08016310: .4byte gBattleMons -_08016314: .4byte gEnemyMonIndex +_08016314: .4byte gBankTarget _08016318: .4byte gUnknown_081D939A _0801631C: .4byte 0x02000000 _08016320: .4byte 0x0001600e @@ -1391,7 +1391,7 @@ _08016332: ands r0, r2 cmp r0, 0 bne _0801637E - ldr r1, _08016360 @ =gUnknown_02024DBC + ldr r1, _08016360 @ =gWishFutureKnock adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -1404,16 +1404,16 @@ _08016332: ldr r1, _08016368 @ =0x0000fffd ands r0, r1 strh r0, [r3] - ldr r1, _0801636C @ =gUnknown_02024D1E + ldr r1, _0801636C @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _0801639C .align 2, 0 _0801635C: .4byte gBattleWeather -_08016360: .4byte gUnknown_02024DBC +_08016360: .4byte gWishFutureKnock _08016364: .4byte 0x0000fffe _08016368: .4byte 0x0000fffd -_0801636C: .4byte gUnknown_02024D1E +_0801636C: .4byte gBattleCommunication _08016370: movs r0, 0x2 ands r0, r2 @@ -1430,20 +1430,20 @@ _0801637E: cmp r1, 0 beq _08016398 _0801638A: - ldr r1, _08016394 @ =gUnknown_02024D1E + ldr r1, _08016394 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _0801639C .align 2, 0 -_08016394: .4byte gUnknown_02024D1E +_08016394: .4byte gBattleCommunication _08016398: - ldr r0, _080163A0 @ =gUnknown_02024D1E + ldr r0, _080163A0 @ =gBattleCommunication strb r1, [r0, 0x5] _0801639C: ldr r0, _080163A4 @ =gUnknown_081D8F62 b _080164EA .align 2, 0 -_080163A0: .4byte gUnknown_02024D1E +_080163A0: .4byte gBattleCommunication _080163A4: .4byte gUnknown_081D8F62 _080163A8: ldr r3, _080163DC @ =gBattleWeather @@ -1458,7 +1458,7 @@ _080163B6: ands r0, r2 cmp r0, 0 bne _080163F0 - ldr r1, _080163E0 @ =gUnknown_02024DBC + ldr r1, _080163E0 @ =gWishFutureKnock adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -1469,17 +1469,17 @@ _080163B6: ldr r0, _080163E4 @ =0x0000fff7 ands r0, r2 strh r0, [r3] - ldr r1, _080163E8 @ =gUnknown_02024C10 + ldr r1, _080163E8 @ =gBattlescriptCurrInstr ldr r0, _080163EC @ =gUnknown_081D8FFF b _080163F4 .align 2, 0 _080163DC: .4byte gBattleWeather -_080163E0: .4byte gUnknown_02024DBC +_080163E0: .4byte gWishFutureKnock _080163E4: .4byte 0x0000fff7 -_080163E8: .4byte gUnknown_02024C10 +_080163E8: .4byte gBattlescriptCurrInstr _080163EC: .4byte gUnknown_081D8FFF _080163F0: - ldr r1, _0801640C @ =gUnknown_02024C10 + ldr r1, _0801640C @ =gBattlescriptCurrInstr ldr r0, _08016410 @ =gUnknown_081D8F7D _080163F4: str r0, [r1] @@ -1490,15 +1490,15 @@ _080163F4: movs r2, 0 movs r0, 0xC strb r0, [r1] - ldr r0, _0801641C @ =gUnknown_02024D1E + ldr r0, _0801641C @ =gBattleCommunication strb r2, [r0, 0x5] b _080164E8 .align 2, 0 -_0801640C: .4byte gUnknown_02024C10 +_0801640C: .4byte gBattlescriptCurrInstr _08016410: .4byte gUnknown_081D8F7D _08016414: .4byte 0x02000000 _08016418: .4byte 0x000160a4 -_0801641C: .4byte gUnknown_02024D1E +_0801641C: .4byte gBattleCommunication _08016420: ldr r3, _08016450 @ =gBattleWeather ldrh r2, [r3] @@ -1510,7 +1510,7 @@ _08016420: ands r0, r2 cmp r0, 0 bne _08016464 - ldr r1, _08016454 @ =gUnknown_02024DBC + ldr r1, _08016454 @ =gWishFutureKnock adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -1521,17 +1521,17 @@ _08016420: ldr r0, _08016458 @ =0x0000ffdf ands r0, r2 strh r0, [r3] - ldr r1, _0801645C @ =gUnknown_02024C10 + ldr r1, _0801645C @ =gBattlescriptCurrInstr ldr r0, _08016460 @ =gUnknown_081D9016 b _08016468 .align 2, 0 _08016450: .4byte gBattleWeather -_08016454: .4byte gUnknown_02024DBC +_08016454: .4byte gWishFutureKnock _08016458: .4byte 0x0000ffdf -_0801645C: .4byte gUnknown_02024C10 +_0801645C: .4byte gBattlescriptCurrInstr _08016460: .4byte gUnknown_081D9016 _08016464: - ldr r1, _08016484 @ =gUnknown_02024C10 + ldr r1, _08016484 @ =gBattlescriptCurrInstr ldr r0, _08016488 @ =gUnknown_081D9008 _08016468: str r0, [r1] @@ -1549,7 +1549,7 @@ _0801647C: adds r1, r2, r0 b _080164FE .align 2, 0 -_08016484: .4byte gUnknown_02024C10 +_08016484: .4byte gBattlescriptCurrInstr _08016488: .4byte gUnknown_081D9008 _0801648C: .4byte 0x02000000 _08016490: .4byte 0x0001600e @@ -1560,7 +1560,7 @@ _08016494: ands r0, r2 cmp r0, 0 beq _080164F8 - ldr r1, _080164C0 @ =gUnknown_02024DBC + ldr r1, _080164C0 @ =gWishFutureKnock adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -1571,17 +1571,17 @@ _08016494: ldr r0, _080164C4 @ =0x0000ff7f ands r0, r2 strh r0, [r3] - ldr r1, _080164C8 @ =gUnknown_02024C10 + ldr r1, _080164C8 @ =gBattlescriptCurrInstr ldr r0, _080164CC @ =gUnknown_081D8FFF b _080164D4 .align 2, 0 _080164BC: .4byte gBattleWeather -_080164C0: .4byte gUnknown_02024DBC +_080164C0: .4byte gWishFutureKnock _080164C4: .4byte 0x0000ff7f -_080164C8: .4byte gUnknown_02024C10 +_080164C8: .4byte gBattlescriptCurrInstr _080164CC: .4byte gUnknown_081D8FFF _080164D0: - ldr r1, _08016508 @ =gUnknown_02024C10 + ldr r1, _08016508 @ =gBattlescriptCurrInstr ldr r0, _0801650C @ =gUnknown_081D8F7D _080164D4: str r0, [r1] @@ -1591,7 +1591,7 @@ _080164D4: adds r0, r1 movs r1, 0xD strb r1, [r0] - ldr r1, _08016518 @ =gUnknown_02024D1E + ldr r1, _08016518 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _080164E8: @@ -1614,11 +1614,11 @@ _080164FE: mov r12, r2 b _0801652A .align 2, 0 -_08016508: .4byte gUnknown_02024C10 +_08016508: .4byte gBattlescriptCurrInstr _0801650C: .4byte gUnknown_081D8F7D _08016510: .4byte 0x02000000 _08016514: .4byte 0x000160a4 -_08016518: .4byte gUnknown_02024D1E +_08016518: .4byte gBattleCommunication _0801651C: .4byte 0x0001600e _08016520: mov r0, r9 @@ -1632,9 +1632,9 @@ _0801652A: bne _08016532 b _08015E8A _08016532: - ldr r0, _08016550 @ =gUnknown_030042D4 + ldr r0, _08016550 @ =gBattleMainFunc ldr r1, [r0] - ldr r0, _08016554 @ =sub_8011E8C + ldr r0, _08016554 @ =BattleTurnPassed eors r1, r0 negs r0, r1 orrs r0, r1 @@ -1647,12 +1647,12 @@ _08016532: pop {r1} bx r1 .align 2, 0 -_08016550: .4byte gUnknown_030042D4 -_08016554: .4byte sub_8011E8C - thumb_func_end sub_8015DFC +_08016550: .4byte gBattleMainFunc +_08016554: .4byte BattleTurnPassed + thumb_func_end UpdateTurnCounters - thumb_func_start sub_8016558 -sub_8016558: @ 8016558 + thumb_func_start TurnBasedEffects +TurnBasedEffects: @ 8016558 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1661,26 +1661,26 @@ sub_8016558: @ 8016558 sub sp, 0x8 movs r0, 0 mov r9, r0 - ldr r2, _08016578 @ =gUnknown_02024C6C + ldr r2, _08016578 @ =gHitMarker ldr r0, [r2] ldr r1, _0801657C @ =0x01000020 orrs r0, r1 str r0, [r2] bl _08017088 .align 2, 0 -_08016578: .4byte gUnknown_02024C6C +_08016578: .4byte gHitMarker _0801657C: .4byte 0x01000020 _08016580: - ldr r3, _080165B4 @ =gUnknown_02024A60 - ldr r4, _080165B8 @ =gPlayerMonIndex - ldr r1, _080165BC @ =gUnknown_02024A7A + ldr r3, _080165B4 @ =gActiveBank + ldr r4, _080165B8 @ =gBankAttacker + ldr r1, _080165BC @ =gTurnOrder adds r5, r7, r2 ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] strb r0, [r4] strb r0, [r3] - ldr r0, _080165C0 @ =gUnknown_02024C0C + ldr r0, _080165C0 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _080165C4 @ =gBitTable ldrb r0, [r3] @@ -1696,10 +1696,10 @@ _08016580: strb r0, [r5] bl _08017088 .align 2, 0 -_080165B4: .4byte gUnknown_02024A60 -_080165B8: .4byte gPlayerMonIndex -_080165BC: .4byte gUnknown_02024A7A -_080165C0: .4byte gUnknown_02024C0C +_080165B4: .4byte gActiveBank +_080165B8: .4byte gBankAttacker +_080165BC: .4byte gTurnOrder +_080165C0: .4byte gAbsentBankFlags _080165C4: .4byte gBitTable _080165C8: movs r5, 0xB0 @@ -1740,7 +1740,7 @@ _080165E8: .4byte _08016704 .4byte _08017064 _08016638: - ldr r1, _08016694 @ =gUnknown_02024C98 + ldr r1, _08016694 @ =gStatuses3 ldrb r3, [r6] lsls r0, r3, 2 adds r0, r1 @@ -1786,7 +1786,7 @@ _08016686: adds r1, r0 bl _08017072 .align 2, 0 -_08016694: .4byte gUnknown_02024C98 +_08016694: .4byte gStatuses3 _08016698: .4byte gBattleMons _0801669C: .4byte gBattleMoveDamage _080166A0: .4byte gUnknown_081D93D1 @@ -1798,7 +1798,7 @@ _080166A8: movs r0, 0x1 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080166C8 @@ -1858,7 +1858,7 @@ _0801671E: .align 2, 0 _0801672C: .4byte 0x02000000 _08016730: - ldr r0, _080167A8 @ =gUnknown_02024C98 + ldr r0, _080167A8 @ =gStatuses3 ldrb r2, [r6] lsls r1, r2, 2 adds r1, r0 @@ -1883,7 +1883,7 @@ _08016730: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0801679C - ldr r0, _080167B0 @ =gEnemyMonIndex + ldr r0, _080167B0 @ =gBankTarget strb r5, [r0] ldr r2, _080167B4 @ =gBattleMoveDamage ldrb r0, [r6] @@ -1919,9 +1919,9 @@ _0801679C: adds r1, r3 bl _08017072 .align 2, 0 -_080167A8: .4byte gUnknown_02024C98 +_080167A8: .4byte gStatuses3 _080167AC: .4byte gBattleMons -_080167B0: .4byte gEnemyMonIndex +_080167B0: .4byte gBankTarget _080167B4: .4byte gBattleMoveDamage _080167B8: .4byte 0x02000000 _080167BC: .4byte 0x000160a4 @@ -2235,7 +2235,7 @@ _080169DC: ldr r5, _08016AA0 @ =0x000160a5 adds r0, r2, r5 strb r1, [r0] - ldr r1, _08016AA4 @ =gUnknown_030041C0 + ldr r1, _08016AA4 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -2254,7 +2254,7 @@ _080169DC: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08016AA8 @ =gUnknown_02024C10 + ldr r1, _08016AA8 @ =gBattlescriptCurrInstr ldr r0, _08016AAC @ =gUnknown_081D95E2 str r0, [r1] ldr r2, _08016AB0 @ =gBattleMoveDamage @@ -2278,12 +2278,12 @@ _08016A94: .4byte 0x02000000 _08016A98: .4byte 0x00016004 _08016A9C: .4byte 0x000160a4 _08016AA0: .4byte 0x000160a5 -_08016AA4: .4byte gUnknown_030041C0 -_08016AA8: .4byte gUnknown_02024C10 +_08016AA4: .4byte gBattleTextBuff1 +_08016AA8: .4byte gBattlescriptCurrInstr _08016AAC: .4byte gUnknown_081D95E2 _08016AB0: .4byte gBattleMoveDamage _08016AB4: - ldr r1, _08016B00 @ =gUnknown_030041C0 + ldr r1, _08016B00 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -2305,7 +2305,7 @@ _08016AB4: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08016B10 @ =gUnknown_02024C10 + ldr r1, _08016B10 @ =gBattlescriptCurrInstr ldr r0, _08016B14 @ =gUnknown_081D95F4 str r0, [r1] _08016AE6: @@ -2323,11 +2323,11 @@ _08016AF6: adds r1, r7 b _08017072 .align 2, 0 -_08016B00: .4byte gUnknown_030041C0 +_08016B00: .4byte gBattleTextBuff1 _08016B04: .4byte 0x02000000 _08016B08: .4byte 0x00016004 _08016B0C: .4byte 0x00016005 -_08016B10: .4byte gUnknown_02024C10 +_08016B10: .4byte gBattlescriptCurrInstr _08016B14: .4byte gUnknown_081D95F4 _08016B18: movs r0, 0x8 @@ -2344,12 +2344,12 @@ _08016B18: ldr r1, _08016B68 @ =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r1, _08016B6C @ =gUnknown_02024D1E + ldr r1, _08016B6C @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] ldr r0, _08016B70 @ =gUnknown_081D950F bl b_call_bc_move_exec - ldr r4, _08016B74 @ =gUnknown_02024A60 + ldr r4, _08016B74 @ =gActiveBank ldrb r0, [r6] strb r0, [r4] ldrb r0, [r4] @@ -2362,15 +2362,15 @@ _08016B18: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08016BE0 .align 2, 0 _08016B68: .4byte 0xf7ffffff -_08016B6C: .4byte gUnknown_02024D1E +_08016B6C: .4byte gBattleCommunication _08016B70: .4byte gUnknown_081D950F -_08016B74: .4byte gUnknown_02024A60 +_08016B74: .4byte gActiveBank _08016B78: ldr r2, _08016BF4 @ =gBattleMons ldrb r1, [r6] @@ -2427,8 +2427,8 @@ _08016BD2: cmp r0, r1 bcc _08016BB2 _08016BE0: - ldr r2, _08016BF8 @ =gPlayerMonIndex - ldr r1, _08016BFC @ =gUnknown_02024A68 + ldr r2, _08016BF8 @ =gBankAttacker + ldr r1, _08016BFC @ =gNoOfAllBanks ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 @@ -2438,10 +2438,10 @@ _08016BE0: b _0801707E .align 2, 0 _08016BF4: .4byte gBattleMons -_08016BF8: .4byte gPlayerMonIndex -_08016BFC: .4byte gUnknown_02024A68 +_08016BF8: .4byte gBankAttacker +_08016BFC: .4byte gNoOfAllBanks _08016C00: - ldr r5, _08016C38 @ =gUnknown_02024A60 + ldr r5, _08016C38 @ =gActiveBank ldrb r0, [r5] strb r0, [r2] ldr r2, _08016C3C @ =gBattleMons @@ -2462,15 +2462,15 @@ _08016C00: cmp r4, 0 beq _08016C44 ldrb r0, [r5] - bl b_cancel_multi_turn_move_maybe - ldr r1, _08016C40 @ =gUnknown_02024D1E + bl CancelMultiTurnMoves + ldr r1, _08016C40 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08016C78 .align 2, 0 -_08016C38: .4byte gUnknown_02024A60 +_08016C38: .4byte gActiveBank _08016C3C: .4byte gBattleMons -_08016C40: .4byte gUnknown_02024D1E +_08016C40: .4byte gBattleCommunication _08016C44: ldrb r3, [r5] adds r0, r3, 0 @@ -2481,7 +2481,7 @@ _08016C44: ands r0, r1 cmp r0, 0 beq _08016C6C - ldr r0, _08016C68 @ =gUnknown_02024D1E + ldr r0, _08016C68 @ =gBattleCommunication strb r4, [r0, 0x5] ldr r0, [r2] movs r1, 0x80 @@ -2490,13 +2490,13 @@ _08016C44: str r0, [r2] b _08016C78 .align 2, 0 -_08016C68: .4byte gUnknown_02024D1E +_08016C68: .4byte gBattleCommunication _08016C6C: - ldr r1, _08016C94 @ =gUnknown_02024D1E + ldr r1, _08016C94 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] adds r0, r3, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves _08016C78: ldr r0, _08016C98 @ =gUnknown_081D957E bl b_call_bc_move_exec @@ -2514,7 +2514,7 @@ _08016C8A: adds r1, r7 b _08017072 .align 2, 0 -_08016C94: .4byte gUnknown_02024D1E +_08016C94: .4byte gBattleCommunication _08016C98: .4byte gUnknown_081D957E _08016C9C: .4byte 0x02000000 _08016CA0: @@ -2541,7 +2541,7 @@ _08016CA0: cmp r0, 0 beq _08016CE0 ldrb r0, [r6] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves b _08016D3C .align 2, 0 _08016CD8: .4byte gBattleMons @@ -2571,7 +2571,7 @@ _08016CE0: ands r0, r4 cmp r0, 0 bne _08016D3C - ldr r1, _08016D4C @ =gUnknown_02024D1E + ldr r1, _08016D4C @ =gBattleCommunication movs r0, 0x47 strb r0, [r1, 0x3] movs r0, 0x1 @@ -2600,11 +2600,11 @@ _08016D3C: b _08017072 .align 2, 0 _08016D48: .4byte 0xffffefff -_08016D4C: .4byte gUnknown_02024D1E +_08016D4C: .4byte gBattleCommunication _08016D50: .4byte gUnknown_081D9587 _08016D54: .4byte 0x02000000 _08016D58: - ldr r0, _08016DD4 @ =gUnknown_02024CA8 + ldr r0, _08016DD4 @ =gDisableStructs ldrb r3, [r6] lsls r1, r3, 3 subs r1, r3 @@ -2669,7 +2669,7 @@ _08016DAC: strb r0, [r1, 0xB] b _08016E1E .align 2, 0 -_08016DD4: .4byte gUnknown_02024CA8 +_08016DD4: .4byte gDisableStructs _08016DD8: .4byte gBattleMons _08016DDC: ldrb r0, [r6] @@ -2714,7 +2714,7 @@ _08016E1E: _08016E28: .4byte gUnknown_081D9148 _08016E2C: .4byte 0x02000000 _08016E30: - ldr r3, _08016E7C @ =gUnknown_02024CA8 + ldr r3, _08016E7C @ =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -2752,7 +2752,7 @@ _08016E30: strb r0, [r1, 0xE] b _08016EE8 .align 2, 0 -_08016E7C: .4byte gUnknown_02024CA8 +_08016E7C: .4byte gDisableStructs _08016E80: .4byte gBattleMons _08016E84: lsrs r1, r4, 28 @@ -2815,7 +2815,7 @@ _08016EE8: _08016EF4: .4byte gUnknown_081D914F _08016EF8: .4byte 0x02000000 _08016EFC: - ldr r0, _08016F1C @ =gUnknown_02024C98 + ldr r0, _08016F1C @ =gStatuses3 ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -2832,9 +2832,9 @@ _08016F14: lsls r1, 9 b _08017070 .align 2, 0 -_08016F1C: .4byte gUnknown_02024C98 +_08016F1C: .4byte gStatuses3 _08016F20: - ldr r2, _08016F60 @ =gUnknown_02024CA8 + ldr r2, _08016F60 @ =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -2855,7 +2855,7 @@ _08016F20: strb r0, [r3, 0x12] cmp r1, 0 bne _08016F5A - ldr r0, _08016F64 @ =gUnknown_02024C98 + ldr r0, _08016F64 @ =gStatuses3 ldrb r2, [r6] lsls r2, 2 adds r2, r0 @@ -2868,11 +2868,11 @@ _08016F5A: lsls r1, 9 b _08017070 .align 2, 0 -_08016F60: .4byte gUnknown_02024CA8 -_08016F64: .4byte gUnknown_02024C98 +_08016F60: .4byte gDisableStructs +_08016F64: .4byte gStatuses3 _08016F68: .4byte 0xfffffdff _08016F6C: - ldr r2, _08016F98 @ =gUnknown_02024CA8 + ldr r2, _08016F98 @ =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -2896,9 +2896,9 @@ _08016F92: lsls r1, 9 b _08017070 .align 2, 0 -_08016F98: .4byte gUnknown_02024CA8 +_08016F98: .4byte gDisableStructs _08016F9C: - ldr r4, _0801704C @ =gUnknown_02024C98 + ldr r4, _0801704C @ =gStatuses3 ldrb r0, [r6] lsls r0, 2 adds r2, r0, r4 @@ -2942,7 +2942,7 @@ _08016F9C: cmp r0, 0 bne _08017042 ldrb r0, [r6] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves bl Random ldrb r1, [r6] adds r2, r1, 0 @@ -2962,10 +2962,10 @@ _08016F9C: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r6] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08017058 @ =gUnknown_02024C0A + bl MarkBufferBankForExecution + ldr r1, _08017058 @ =gEffectBank ldrb r0, [r6] strb r0, [r1] ldr r0, _0801705C @ =gUnknown_081D964C @@ -2982,10 +2982,10 @@ _08017042: adds r1, r7 b _08017072 .align 2, 0 -_0801704C: .4byte gUnknown_02024C98 +_0801704C: .4byte gStatuses3 _08017050: .4byte 0xfffff800 _08017054: .4byte gBattleMons -_08017058: .4byte gUnknown_02024C0A +_08017058: .4byte gEffectBank _0801705C: .4byte gUnknown_081D964C _08017060: .4byte 0x02000000 _08017064: @@ -3014,7 +3014,7 @@ _08017088: ldr r7, _080170C8 @ =0x02000000 ldr r2, _080170CC @ =0x00016001 adds r0, r7, r2 - ldr r1, _080170D0 @ =gUnknown_02024A68 + ldr r1, _080170D0 @ =gNoOfAllBanks ldrb r0, [r0] mov r10, r7 mov r8, r1 @@ -3029,7 +3029,7 @@ _08017088: bhi _080170AC bl _08016580 _080170AC: - ldr r0, _080170D4 @ =gUnknown_02024C6C + ldr r0, _080170D4 @ =gHitMarker ldr r1, [r0] ldr r2, _080170D8 @ =0xfeffffdf ands r1, r2 @@ -3047,10 +3047,10 @@ _080170B8: .align 2, 0 _080170C8: .4byte 0x02000000 _080170CC: .4byte 0x00016001 -_080170D0: .4byte gUnknown_02024A68 -_080170D4: .4byte gUnknown_02024C6C +_080170D0: .4byte gNoOfAllBanks +_080170D4: .4byte gHitMarker _080170D8: .4byte 0xfeffffdf - thumb_func_end sub_8016558 + thumb_func_end TurnBasedEffects thumb_func_start sub_80170DC sub_80170DC: @ 80170DC @@ -3059,7 +3059,7 @@ sub_80170DC: @ 80170DC mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _08017108 @ =gUnknown_02024C6C + ldr r2, _08017108 @ =gHitMarker ldr r0, [r2] ldr r1, _0801710C @ =0x01000020 orrs r0, r1 @@ -3077,14 +3077,14 @@ sub_80170DC: @ 80170DC _08017104: b _08017380 .align 2, 0 -_08017108: .4byte gUnknown_02024C6C +_08017108: .4byte gHitMarker _0801710C: .4byte 0x01000020 _08017110: .4byte 0x02000000 _08017114: .4byte 0x00016110 _08017118: ldr r2, _0801715C @ =0x00016111 add r2, r8 - ldr r0, _08017160 @ =gUnknown_02024A68 + ldr r0, _08017160 @ =gNoOfAllBanks ldrb r1, [r2] mov r9, r0 ldrb r0, [r0] @@ -3092,20 +3092,20 @@ _08017118: bcc _0801712A b _08017248 _0801712A: - ldr r4, _08017164 @ =gUnknown_02024A60 + ldr r4, _08017164 @ =gActiveBank adds r5, r2, 0 - ldr r1, _08017168 @ =gUnknown_02024DBC + ldr r1, _08017168 @ =gWishFutureKnock mov r12, r1 movs r2, 0x8 add r2, r12 mov r10, r2 mov r7, r12 adds r7, 0x18 - ldr r6, _0801716C @ =gUnknown_030041C0 + ldr r6, _0801716C @ =gBattleTextBuff1 _0801713E: ldrb r3, [r5] strb r3, [r4] - ldr r0, _08017170 @ =gUnknown_02024C0C + ldr r0, _08017170 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _08017174 @ =gBitTable ldrb r0, [r4] @@ -3120,16 +3120,16 @@ _0801713E: b _0801723C .align 2, 0 _0801715C: .4byte 0x00016111 -_08017160: .4byte gUnknown_02024A68 -_08017164: .4byte gUnknown_02024A60 -_08017168: .4byte gUnknown_02024DBC -_0801716C: .4byte gUnknown_030041C0 -_08017170: .4byte gUnknown_02024C0C +_08017160: .4byte gNoOfAllBanks +_08017164: .4byte gActiveBank +_08017168: .4byte gWishFutureKnock +_0801716C: .4byte gBattleTextBuff1 +_08017170: .4byte gAbsentBankFlags _08017174: .4byte gBitTable _08017178: adds r0, r3, 0x1 strb r0, [r5] - ldr r1, _080171B4 @ =gUnknown_02024DBC + ldr r1, _080171B4 @ =gWishFutureKnock ldrb r0, [r4] adds r1, r0, r1 ldrb r0, [r1] @@ -3154,15 +3154,15 @@ _08017178: ldrh r0, [r0] cmp r0, 0xF8 bne _080171C0 - ldr r0, _080171BC @ =gUnknown_02024D1E + ldr r0, _080171BC @ =gBattleCommunication strb r3, [r0, 0x5] b _080171C6 .align 2, 0 -_080171B4: .4byte gUnknown_02024DBC +_080171B4: .4byte gWishFutureKnock _080171B8: .4byte gBattleMons -_080171BC: .4byte gUnknown_02024D1E +_080171BC: .4byte gBattleCommunication _080171C0: - ldr r1, _08017220 @ =gUnknown_02024D1E + ldr r1, _08017220 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _080171C6: @@ -3183,10 +3183,10 @@ _080171C6: strb r0, [r6, 0x3] movs r0, 0xFF strb r0, [r6, 0x4] - ldr r3, _08017224 @ =gEnemyMonIndex + ldr r3, _08017224 @ =gBankTarget ldrb r0, [r4] strb r0, [r3] - ldr r1, _08017228 @ =gPlayerMonIndex + ldr r1, _08017228 @ =gBankAttacker mov r0, r12 adds r0, 0x4 ldrb r2, [r4] @@ -3199,7 +3199,7 @@ _080171C6: add r0, r10 ldr r0, [r0] str r0, [r1] - ldr r2, _08017230 @ =gUnknown_02024D68 + ldr r2, _08017230 @ =gSpecialStatuses ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -3211,11 +3211,11 @@ _080171C6: ldr r0, _08017238 @ =gUnknown_081D92D7 b _08017364 .align 2, 0 -_08017220: .4byte gUnknown_02024D1E -_08017224: .4byte gEnemyMonIndex -_08017228: .4byte gPlayerMonIndex +_08017220: .4byte gBattleCommunication +_08017224: .4byte gBankTarget +_08017228: .4byte gBankAttacker _0801722C: .4byte gBattleMoveDamage -_08017230: .4byte gUnknown_02024D68 +_08017230: .4byte gSpecialStatuses _08017234: .4byte 0x0000ffff _08017238: .4byte gUnknown_081D92D7 _0801723C: @@ -3237,7 +3237,7 @@ _08017248: _08017258: ldr r2, _080172A0 @ =0x00016111 add r2, r8 - ldr r0, _080172A4 @ =gUnknown_02024A68 + ldr r0, _080172A4 @ =gNoOfAllBanks ldrb r1, [r2] mov r9, r0 ldrb r0, [r0] @@ -3245,19 +3245,19 @@ _08017258: bcc _0801726A b _08017380 _0801726A: - ldr r5, _080172A8 @ =gUnknown_02024A60 + ldr r5, _080172A8 @ =gActiveBank adds r3, r2, 0 - ldr r4, _080172AC @ =gUnknown_030041C0 - ldr r7, _080172B0 @ =gUnknown_02024CA8 + ldr r4, _080172AC @ =gBattleTextBuff1 + ldr r7, _080172B0 @ =gDisableStructs _08017272: - ldr r2, _080172B4 @ =gPlayerMonIndex - ldr r1, _080172B8 @ =gUnknown_02024A7A + ldr r2, _080172B4 @ =gBankAttacker + ldr r1, _080172B8 @ =gTurnOrder ldrb r0, [r3] adds r0, r1 ldrb r0, [r0] strb r0, [r2] strb r0, [r5] - ldr r0, _080172BC @ =gUnknown_02024C0C + ldr r0, _080172BC @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _080172C0 @ =gBitTable ldrb r0, [r5] @@ -3274,19 +3274,19 @@ _08017272: .align 2, 0 _0801729C: .4byte 0x00016110 _080172A0: .4byte 0x00016111 -_080172A4: .4byte gUnknown_02024A68 -_080172A8: .4byte gUnknown_02024A60 -_080172AC: .4byte gUnknown_030041C0 -_080172B0: .4byte gUnknown_02024CA8 -_080172B4: .4byte gPlayerMonIndex -_080172B8: .4byte gUnknown_02024A7A -_080172BC: .4byte gUnknown_02024C0C +_080172A4: .4byte gNoOfAllBanks +_080172A8: .4byte gActiveBank +_080172AC: .4byte gBattleTextBuff1 +_080172B0: .4byte gDisableStructs +_080172B4: .4byte gBankAttacker +_080172B8: .4byte gTurnOrder +_080172BC: .4byte gAbsentBankFlags _080172C0: .4byte gBitTable _080172C4: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] - ldr r6, _08017334 @ =gUnknown_02024C98 + ldr r6, _08017334 @ =gStatuses3 ldrb r2, [r5] lsls r0, r2, 2 adds r0, r6 @@ -3335,14 +3335,14 @@ _080172C4: adds r0, r2 ldrh r0, [r0, 0x28] str r0, [r3] - ldr r1, _08017340 @ =gUnknown_02024C10 + ldr r1, _08017340 @ =gBattlescriptCurrInstr ldr r0, _08017344 @ =gUnknown_081D9202 b _08017360 .align 2, 0 -_08017334: .4byte gUnknown_02024C98 +_08017334: .4byte gStatuses3 _08017338: .4byte gBattleMoveDamage _0801733C: .4byte gBattleMons -_08017340: .4byte gUnknown_02024C10 +_08017340: .4byte gBattlescriptCurrInstr _08017344: .4byte gUnknown_081D9202 _08017348: lsrs r1, 28 @@ -3355,7 +3355,7 @@ _08017348: ands r0, r3 orrs r0, r1 strb r0, [r4, 0xF] - ldr r1, _0801736C @ =gUnknown_02024C10 + ldr r1, _0801736C @ =gBattlescriptCurrInstr ldr r0, _08017370 @ =gUnknown_081D921D _08017360: str r0, [r1] @@ -3365,7 +3365,7 @@ _08017364: movs r0, 0x1 b _0801738C .align 2, 0 -_0801736C: .4byte gUnknown_02024C10 +_0801736C: .4byte gBattlescriptCurrInstr _08017370: .4byte gUnknown_081D921D _08017374: ldrb r0, [r3] @@ -3375,7 +3375,7 @@ _08017374: bcs _08017380 b _08017272 _08017380: - ldr r2, _0801739C @ =gUnknown_02024C6C + ldr r2, _0801739C @ =gHitMarker ldr r0, [r2] ldr r1, _080173A0 @ =0xfeffffdf ands r0, r1 @@ -3390,7 +3390,7 @@ _0801738C: pop {r1} bx r1 .align 2, 0 -_0801739C: .4byte gUnknown_02024C6C +_0801739C: .4byte gHitMarker _080173A0: .4byte 0xfeffffdf thumb_func_end sub_80170DC @@ -3476,11 +3476,11 @@ _08017440: adds r0, 0x1 strb r0, [r1] movs r5, 0 - ldr r0, _08017510 @ =gUnknown_02024A68 + ldr r0, _08017510 @ =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 bge _08017490 - ldr r6, _08017514 @ =gUnknown_02024C0C + ldr r6, _08017514 @ =gAbsentBankFlags _0801745E: ldrb r0, [r6] ldr r2, _08017518 @ =gBitTable @@ -3503,16 +3503,16 @@ _0801745E: strb r0, [r6] _08017486: adds r5, 0x1 - ldr r0, _08017510 @ =gUnknown_02024A68 + ldr r0, _08017510 @ =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _0801745E _08017490: ldr r1, _0801751C @ =0x02000000 mov r9, r1 - ldr r0, _08017520 @ =gUnknown_02024C09 + ldr r0, _08017520 @ =gBank1 mov r12, r0 - ldr r1, _08017524 @ =gEnemyMonIndex + ldr r1, _08017524 @ =gBankTarget mov r8, r1 mov r10, r9 ldr r5, _08017508 @ =0x0001605a @@ -3535,7 +3535,7 @@ _080174A8: bne _080174EA ldrb r2, [r6] ldr r4, _08017518 @ =gBitTable - ldr r1, _08017530 @ =gUnknown_02024A6A + ldr r1, _08017530 @ =gBattlePartyID lsls r0, r3, 1 adds r0, r1 ldrh r0, [r0] @@ -3545,7 +3545,7 @@ _080174A8: ands r2, r0 cmp r2, 0 bne _080174EA - ldr r0, _08017514 @ =gUnknown_02024C0C + ldr r0, _08017514 @ =gAbsentBankFlags ldrb r1, [r0] lsls r0, r3, 2 adds r0, r4 @@ -3558,7 +3558,7 @@ _080174EA: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r1, _08017510 @ =gUnknown_02024A68 + ldr r1, _08017510 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -3572,17 +3572,17 @@ _080174EA: .align 2, 0 _08017508: .4byte 0x0001605a _0801750C: .4byte 0x00016059 -_08017510: .4byte gUnknown_02024A68 -_08017514: .4byte gUnknown_02024C0C +_08017510: .4byte gNoOfAllBanks +_08017514: .4byte gAbsentBankFlags _08017518: .4byte gBitTable _0801751C: .4byte 0x02000000 -_08017520: .4byte gUnknown_02024C09 -_08017524: .4byte gEnemyMonIndex +_08017520: .4byte gBank1 +_08017524: .4byte gBankTarget _08017528: .4byte gBattleMons _0801752C: .4byte 0x00016113 -_08017530: .4byte gUnknown_02024A6A +_08017530: .4byte gBattlePartyID _08017534: - ldr r0, _0801755C @ =gUnknown_02024C09 + ldr r0, _0801755C @ =gBank1 ldrb r0, [r0] bl sub_8015740 ldr r2, _08017560 @ =0x02000000 @@ -3591,7 +3591,7 @@ _08017534: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, _08017568 @ =gUnknown_02024A68 + ldr r1, _08017568 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -3602,10 +3602,10 @@ _08017534: movs r0, 0x3 b _0801769C .align 2, 0 -_0801755C: .4byte gUnknown_02024C09 +_0801755C: .4byte gBank1 _08017560: .4byte 0x02000000 _08017564: .4byte 0x0001605a -_08017568: .4byte gUnknown_02024A68 +_08017568: .4byte gNoOfAllBanks _0801756C: .4byte 0x00016059 _08017570: ldr r0, _08017578 @ =0x00016059 @@ -3625,8 +3625,8 @@ _0801757C: adds r0, 0x1 strb r0, [r1] _0801758E: - ldr r7, _080175E0 @ =gUnknown_02024C09 - ldr r6, _080175E4 @ =gEnemyMonIndex + ldr r7, _080175E0 @ =gBank1 + ldr r6, _080175E4 @ =gBankTarget ldr r1, _080175E8 @ =0x02000000 mov r8, r1 ldr r3, _080175D8 @ =0x0001605a @@ -3644,7 +3644,7 @@ _0801759E: ldrh r0, [r0, 0x28] cmp r0, 0 bne _080175C4 - ldr r0, _080175F4 @ =gUnknown_02024C0C + ldr r0, _080175F4 @ =gAbsentBankFlags ldrb r1, [r0] lsls r0, r2, 2 adds r0, r4 @@ -3656,7 +3656,7 @@ _0801759E: _080175C4: adds r0, r2, 0x1 strb r0, [r3] - ldr r1, _080175F8 @ =gUnknown_02024A68 + ldr r1, _080175F8 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -3666,20 +3666,20 @@ _080175C4: .align 2, 0 _080175D8: .4byte 0x0001605a _080175DC: .4byte 0x00016059 -_080175E0: .4byte gUnknown_02024C09 -_080175E4: .4byte gEnemyMonIndex +_080175E0: .4byte gBank1 +_080175E4: .4byte gBankTarget _080175E8: .4byte 0x02000000 _080175EC: .4byte gBattleMons _080175F0: .4byte gBitTable -_080175F4: .4byte gUnknown_02024C0C -_080175F8: .4byte gUnknown_02024A68 +_080175F4: .4byte gAbsentBankFlags +_080175F8: .4byte gNoOfAllBanks _080175FC: ldr r0, _0801761C @ =0x0001605a add r0, r9 ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, _08017620 @ =gUnknown_02024A68 + ldr r0, _08017620 @ =gNoOfAllBanks lsls r1, 24 lsrs r1, 24 ldrb r0, [r0] @@ -3693,7 +3693,7 @@ _08017612: b _080176A0 .align 2, 0 _0801761C: .4byte 0x0001605a -_08017620: .4byte gUnknown_02024A68 +_08017620: .4byte gNoOfAllBanks _08017624: .4byte 0x00016059 _08017628: ldr r1, _08017634 @ =0x00016059 @@ -3710,7 +3710,7 @@ _08017638: movs r1, 0 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -3722,7 +3722,7 @@ _08017652: movs r1, 0 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08017668 @@ -3743,7 +3743,7 @@ _0801767C: movs r1, 0 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08017692 @@ -3784,12 +3784,12 @@ _080176C4: .4byte 0x00016059 b_clear_atk_up_if_hit_flag_unless_enraged: @ 80176C8 push {r4-r6,lr} movs r3, 0 - ldr r0, _08017708 @ =gUnknown_02024A68 + ldr r0, _08017708 @ =gNoOfAllBanks adds r5, r0, 0 ldrb r0, [r5] cmp r3, r0 bge _08017700 - ldr r4, _0801770C @ =gUnknown_02024C60 + ldr r4, _0801770C @ =gChosenMovesByBanks movs r6, 0x80 lsls r6, 16 ldr r2, _08017710 @ =gUnknown_02024AD0 @@ -3817,8 +3817,8 @@ _08017700: pop {r0} bx r0 .align 2, 0 -_08017708: .4byte gUnknown_02024A68 -_0801770C: .4byte gUnknown_02024C60 +_08017708: .4byte gNoOfAllBanks +_0801770C: .4byte gChosenMovesByBanks _08017710: .4byte gUnknown_02024AD0 _08017714: .4byte 0xff7fffff thumb_func_end b_clear_atk_up_if_hit_flag_unless_enraged @@ -3882,7 +3882,7 @@ _08017768: .4byte _08017F9E _080177A4: ldr r1, _080177D0 @ =gBattleMons - ldr r3, _080177D4 @ =gPlayerMonIndex + ldr r3, _080177D4 @ =gBankAttacker ldrb r2, [r3] movs r0, 0x58 muls r2, r0 @@ -3892,7 +3892,7 @@ _080177A4: ldr r1, _080177D8 @ =0xfdffffff ands r0, r1 str r0, [r2] - ldr r0, _080177DC @ =gUnknown_02024C98 + ldr r0, _080177DC @ =gStatuses3 ldrb r2, [r3] lsls r2, 2 adds r2, r0 @@ -3903,13 +3903,13 @@ _080177A4: bl _08017F94 .align 2, 0 _080177D0: .4byte gBattleMons -_080177D4: .4byte gPlayerMonIndex +_080177D4: .4byte gBankAttacker _080177D8: .4byte 0xfdffffff -_080177DC: .4byte gUnknown_02024C98 +_080177DC: .4byte gStatuses3 _080177E0: .4byte 0xffffbfff _080177E4: ldr r7, _0801784C @ =gBattleMons - ldr r4, _08017850 @ =gPlayerMonIndex + ldr r4, _08017850 @ =gBankAttacker ldrb r1, [r4] movs r5, 0x58 adds r0, r1, 0 @@ -3950,10 +3950,10 @@ _08017804: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08017858 @ =gUnknown_02024D1E + ldr r1, _08017858 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] - ldr r1, _0801785C @ =gUnknown_02024C10 + ldr r1, _0801785C @ =gBattlescriptCurrInstr ldr r0, _08017860 @ =gUnknown_081D94FB str r0, [r1] movs r4, 0x2 @@ -3961,10 +3961,10 @@ _08017804: b _08017D90 .align 2, 0 _0801784C: .4byte gBattleMons -_08017850: .4byte gPlayerMonIndex +_08017850: .4byte gBankAttacker _08017854: .4byte 0xf7ffffff -_08017858: .4byte gUnknown_02024D1E -_0801785C: .4byte gUnknown_02024C10 +_08017858: .4byte gBattleCommunication +_0801785C: .4byte gBattlescriptCurrInstr _08017860: .4byte gUnknown_081D94FB _08017864: ldrb r0, [r4] @@ -3995,7 +3995,7 @@ _08017890: str r0, [r2] _08017894: ldr r2, _080178D8 @ =gBattleMons - ldr r0, _080178DC @ =gPlayerMonIndex + ldr r0, _080178DC @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -4007,7 +4007,7 @@ _08017894: ands r4, r0 cmp r4, 0 beq _080178F0 - ldr r0, _080178E0 @ =gUnknown_02024BE6 + ldr r0, _080178E0 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xAD bne _080178B8 @@ -4017,10 +4017,10 @@ _080178B8: bne _080178BE b _08017D90 _080178BE: - ldr r1, _080178E4 @ =gUnknown_02024C10 + ldr r1, _080178E4 @ =gBattlescriptCurrInstr ldr r0, _080178E8 @ =gUnknown_081D94EE str r0, [r1] - ldr r2, _080178EC @ =gUnknown_02024C6C + ldr r2, _080178EC @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4031,11 +4031,11 @@ _080178BE: b _08017D90 .align 2, 0 _080178D8: .4byte gBattleMons -_080178DC: .4byte gPlayerMonIndex -_080178E0: .4byte gUnknown_02024BE6 -_080178E4: .4byte gUnknown_02024C10 +_080178DC: .4byte gBankAttacker +_080178E0: .4byte gCurrentMove +_080178E4: .4byte gBattlescriptCurrInstr _080178E8: .4byte gUnknown_081D94EE -_080178EC: .4byte gUnknown_02024C6C +_080178EC: .4byte gHitMarker _080178F0: adds r2, 0x50 adds r2, r1, r2 @@ -4044,21 +4044,21 @@ _080178F0: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r0, _08017914 @ =gUnknown_02024D1E + ldr r0, _08017914 @ =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, _08017918 @ =gUnknown_02024C10 + ldr r1, _08017918 @ =gBattlescriptCurrInstr ldr r0, _0801791C @ =gUnknown_081D94FB str r0, [r1] movs r1, 0x2 b _08017D8E .align 2, 0 _08017910: .4byte 0xf7ffffff -_08017914: .4byte gUnknown_02024D1E -_08017918: .4byte gUnknown_02024C10 +_08017914: .4byte gBattleCommunication +_08017918: .4byte gBattlescriptCurrInstr _0801791C: .4byte gUnknown_081D94FB _08017920: ldr r1, _0801797C @ =gBattleMons - ldr r7, _08017980 @ =gPlayerMonIndex + ldr r7, _08017980 @ =gBankAttacker ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -4082,7 +4082,7 @@ _0801793C: cmp r4, 0 beq _080179A8 ldr r2, _08017984 @ =gBattleMoves - ldr r0, _08017988 @ =gUnknown_02024BE6 + ldr r0, _08017988 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4091,10 +4091,10 @@ _0801793C: ldrb r0, [r0] cmp r0, 0x7D beq _08017998 - ldr r1, _0801798C @ =gUnknown_02024C10 + ldr r1, _0801798C @ =gBattlescriptCurrInstr ldr r0, _08017990 @ =gUnknown_081D9545 str r0, [r1] - ldr r2, _08017994 @ =gUnknown_02024C6C + ldr r2, _08017994 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 2 @@ -4103,12 +4103,12 @@ _0801793C: b _080179C8 .align 2, 0 _0801797C: .4byte gBattleMons -_08017980: .4byte gPlayerMonIndex +_08017980: .4byte gBankAttacker _08017984: .4byte gBattleMoves -_08017988: .4byte gUnknown_02024BE6 -_0801798C: .4byte gUnknown_02024C10 +_08017988: .4byte gCurrentMove +_0801798C: .4byte gBattlescriptCurrInstr _08017990: .4byte gUnknown_081D9545 -_08017994: .4byte gUnknown_02024C6C +_08017994: .4byte gHitMarker _08017998: ldr r2, _080179A0 @ =0x02000000 ldr r7, _080179A4 @ =0x000160e7 @@ -4128,21 +4128,21 @@ _080179A8: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _080179CC @ =gUnknown_02024C10 + ldr r1, _080179CC @ =gBattlescriptCurrInstr ldr r0, _080179D0 @ =gUnknown_081D9552 str r0, [r1] - ldr r0, _080179D4 @ =gUnknown_02024D1E + ldr r0, _080179D4 @ =gBattleCommunication strb r4, [r0, 0x5] _080179C8: movs r0, 0x2 b _08017E3C .align 2, 0 -_080179CC: .4byte gUnknown_02024C10 +_080179CC: .4byte gBattlescriptCurrInstr _080179D0: .4byte gUnknown_081D9552 -_080179D4: .4byte gUnknown_02024D1E +_080179D4: .4byte gBattleCommunication _080179D8: ldr r1, _08017A30 @ =gBattleMons - ldr r0, _08017A34 @ =gPlayerMonIndex + ldr r0, _08017A34 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -4153,7 +4153,7 @@ _080179D8: beq _080179EE b _08017D90 _080179EE: - ldr r0, _08017A38 @ =gUnknown_02024CA8 + ldr r0, _08017A38 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -4165,17 +4165,17 @@ _080179EE: b _08017D90 _08017A02: adds r0, r2, 0 - bl b_cancel_multi_turn_move_maybe - ldr r2, _08017A3C @ =gUnknown_02024C6C + bl CancelMultiTurnMoves + ldr r2, _08017A3C @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] - ldr r1, _08017A40 @ =gUnknown_02024D1E + ldr r1, _08017A40 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] - ldr r1, _08017A44 @ =gUnknown_02024C10 + ldr r1, _08017A44 @ =gBattlescriptCurrInstr ldr r0, _08017A48 @ =gUnknown_081D9977 str r0, [r1] ldr r2, _08017A4C @ =gBattleMoveFlags @@ -4188,16 +4188,16 @@ _08017A02: b _08017D90 .align 2, 0 _08017A30: .4byte gBattleMons -_08017A34: .4byte gPlayerMonIndex -_08017A38: .4byte gUnknown_02024CA8 -_08017A3C: .4byte gUnknown_02024C6C -_08017A40: .4byte gUnknown_02024D1E -_08017A44: .4byte gUnknown_02024C10 +_08017A34: .4byte gBankAttacker +_08017A38: .4byte gDisableStructs +_08017A3C: .4byte gHitMarker +_08017A40: .4byte gBattleCommunication +_08017A44: .4byte gBattlescriptCurrInstr _08017A48: .4byte gUnknown_081D9977 _08017A4C: .4byte gBattleMoveFlags _08017A50: ldr r1, _08017AA4 @ =gBattleMons - ldr r3, _08017AA8 @ =gPlayerMonIndex + ldr r3, _08017AA8 @ =gBankAttacker ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -4212,7 +4212,7 @@ _08017A50: ldr r0, _08017AAC @ =0xffbfffff ands r1, r0 str r1, [r2] - ldr r2, _08017AB0 @ =gUnknown_02024CA8 + ldr r2, _08017AB0 @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -4221,11 +4221,11 @@ _08017A50: movs r1, 0 strb r1, [r0, 0x19] ldrb r0, [r3] - bl b_cancel_multi_turn_move_maybe - ldr r1, _08017AB4 @ =gUnknown_02024C10 + bl CancelMultiTurnMoves + ldr r1, _08017AB4 @ =gBattlescriptCurrInstr ldr r0, _08017AB8 @ =gUnknown_081D7956 str r0, [r1] - ldr r2, _08017ABC @ =gUnknown_02024C6C + ldr r2, _08017ABC @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4240,17 +4240,17 @@ _08017A9C: b _08017D96 .align 2, 0 _08017AA4: .4byte gBattleMons -_08017AA8: .4byte gPlayerMonIndex +_08017AA8: .4byte gBankAttacker _08017AAC: .4byte 0xffbfffff -_08017AB0: .4byte gUnknown_02024CA8 -_08017AB4: .4byte gUnknown_02024C10 +_08017AB0: .4byte gDisableStructs +_08017AB4: .4byte gBattlescriptCurrInstr _08017AB8: .4byte gUnknown_081D7956 -_08017ABC: .4byte gUnknown_02024C6C +_08017ABC: .4byte gHitMarker _08017AC0: .4byte 0x02000000 _08017AC4: .4byte 0x000160e7 _08017AC8: ldr r1, _08017B08 @ =gBattleMons - ldr r3, _08017B0C @ =gPlayerMonIndex + ldr r3, _08017B0C @ =gBankAttacker ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -4267,7 +4267,7 @@ _08017AE2: negs r0, r0 ands r1, r0 str r1, [r2] - ldr r0, _08017B10 @ =gUnknown_02024D28 + ldr r0, _08017B10 @ =gProtectStructs ldrb r2, [r3] lsls r2, 4 adds r2, r0 @@ -4276,25 +4276,25 @@ _08017AE2: orrs r0, r1 strb r0, [r2, 0x2] ldrb r0, [r3] - bl b_cancel_multi_turn_move_maybe - ldr r1, _08017B14 @ =gUnknown_02024C10 + bl CancelMultiTurnMoves + ldr r1, _08017B14 @ =gBattlescriptCurrInstr ldr r0, _08017B18 @ =gUnknown_081D9573 b _08017D7E .align 2, 0 _08017B08: .4byte gBattleMons -_08017B0C: .4byte gPlayerMonIndex -_08017B10: .4byte gUnknown_02024D28 -_08017B14: .4byte gUnknown_02024C10 +_08017B0C: .4byte gBankAttacker +_08017B10: .4byte gProtectStructs +_08017B14: .4byte gBattlescriptCurrInstr _08017B18: .4byte gUnknown_081D9573 _08017B1C: - ldr r0, _08017B74 @ =gUnknown_02024CA8 - ldr r3, _08017B78 @ =gPlayerMonIndex + ldr r0, _08017B74 @ =gDisableStructs + ldr r3, _08017B78 @ =gBankAttacker ldrb r2, [r3] lsls r1, r2, 3 subs r1, r2 lsls r1, 2 adds r1, r0 - ldr r0, _08017B7C @ =gUnknown_02024BE6 + ldr r0, _08017B7C @ =gCurrentMove ldrh r1, [r1, 0x4] ldrh r0, [r0] cmp r1, r0 @@ -4305,7 +4305,7 @@ _08017B36: bne _08017B3C b _08017D90 _08017B3C: - ldr r0, _08017B80 @ =gUnknown_02024D28 + ldr r0, _08017B80 @ =gProtectStructs lsls r2, 4 adds r2, r0 ldrb r0, [r2, 0x1] @@ -4318,11 +4318,11 @@ _08017B3C: adds r0, r7 strb r1, [r0] ldrb r0, [r3] - bl b_cancel_multi_turn_move_maybe - ldr r1, _08017B8C @ =gUnknown_02024C10 + bl CancelMultiTurnMoves + ldr r1, _08017B8C @ =gBattlescriptCurrInstr ldr r0, _08017B90 @ =gUnknown_081D9139 str r0, [r1] - ldr r2, _08017B94 @ =gUnknown_02024C6C + ldr r2, _08017B94 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4332,18 +4332,18 @@ _08017B3C: mov r9, r0 b _08017D90 .align 2, 0 -_08017B74: .4byte gUnknown_02024CA8 -_08017B78: .4byte gPlayerMonIndex -_08017B7C: .4byte gUnknown_02024BE6 -_08017B80: .4byte gUnknown_02024D28 +_08017B74: .4byte gDisableStructs +_08017B78: .4byte gBankAttacker +_08017B7C: .4byte gCurrentMove +_08017B80: .4byte gProtectStructs _08017B84: .4byte 0x02000000 _08017B88: .4byte 0x00016003 -_08017B8C: .4byte gUnknown_02024C10 +_08017B8C: .4byte gBattlescriptCurrInstr _08017B90: .4byte gUnknown_081D9139 -_08017B94: .4byte gUnknown_02024C6C +_08017B94: .4byte gHitMarker _08017B98: - ldr r0, _08017BF4 @ =gUnknown_02024CA8 - ldr r4, _08017BF8 @ =gPlayerMonIndex + ldr r0, _08017BF4 @ =gDisableStructs + ldr r4, _08017BF8 @ =gBankAttacker ldrb r3, [r4] lsls r1, r3, 3 subs r1, r3 @@ -4354,7 +4354,7 @@ _08017B98: cmp r0, 0 beq _08017BEC ldr r2, _08017BFC @ =gBattleMoves - ldr r0, _08017C00 @ =gUnknown_02024BE6 + ldr r0, _08017C00 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4363,7 +4363,7 @@ _08017B98: ldrb r0, [r0, 0x1] cmp r0, 0 bne _08017BEC - ldr r0, _08017C04 @ =gUnknown_02024D28 + ldr r0, _08017C04 @ =gProtectStructs lsls r2, r3, 4 adds r2, r0 ldrb r0, [r2, 0x2] @@ -4371,11 +4371,11 @@ _08017B98: orrs r0, r1 strb r0, [r2, 0x2] ldrb r0, [r4] - bl b_cancel_multi_turn_move_maybe - ldr r1, _08017C08 @ =gUnknown_02024C10 + bl CancelMultiTurnMoves + ldr r1, _08017C08 @ =gBattlescriptCurrInstr ldr r0, _08017C0C @ =gUnknown_081D938F str r0, [r1] - ldr r2, _08017C10 @ =gUnknown_02024C6C + ldr r2, _08017C10 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4389,20 +4389,20 @@ _08017BEC: adds r1, r2, r0 b _08017D96 .align 2, 0 -_08017BF4: .4byte gUnknown_02024CA8 -_08017BF8: .4byte gPlayerMonIndex +_08017BF4: .4byte gDisableStructs +_08017BF8: .4byte gBankAttacker _08017BFC: .4byte gBattleMoves -_08017C00: .4byte gUnknown_02024BE6 -_08017C04: .4byte gUnknown_02024D28 -_08017C08: .4byte gUnknown_02024C10 +_08017C00: .4byte gCurrentMove +_08017C04: .4byte gProtectStructs +_08017C08: .4byte gBattlescriptCurrInstr _08017C0C: .4byte gUnknown_081D938F -_08017C10: .4byte gUnknown_02024C6C +_08017C10: .4byte gHitMarker _08017C14: .4byte 0x02000000 _08017C18: .4byte 0x000160e7 _08017C1C: - ldr r4, _08017C4C @ =gPlayerMonIndex + ldr r4, _08017C4C @ =gBankAttacker ldrb r0, [r4] - ldr r1, _08017C50 @ =gUnknown_02024BE6 + ldr r1, _08017C50 @ =gCurrentMove ldrh r1, [r1] bl sub_8015D5C lsls r0, 24 @@ -4410,7 +4410,7 @@ _08017C1C: bne _08017C30 b _08017D90 _08017C30: - ldr r0, _08017C54 @ =gUnknown_02024D28 + ldr r0, _08017C54 @ =gProtectStructs ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -4419,19 +4419,19 @@ _08017C30: orrs r0, r1 strb r0, [r2, 0x1] ldrb r0, [r4] - bl b_cancel_multi_turn_move_maybe - ldr r1, _08017C58 @ =gUnknown_02024C10 + bl CancelMultiTurnMoves + ldr r1, _08017C58 @ =gBattlescriptCurrInstr ldr r0, _08017C5C @ =gUnknown_081D9459 b _08017D7E .align 2, 0 -_08017C4C: .4byte gPlayerMonIndex -_08017C50: .4byte gUnknown_02024BE6 -_08017C54: .4byte gUnknown_02024D28 -_08017C58: .4byte gUnknown_02024C10 +_08017C4C: .4byte gBankAttacker +_08017C50: .4byte gCurrentMove +_08017C54: .4byte gProtectStructs +_08017C58: .4byte gBattlescriptCurrInstr _08017C5C: .4byte gUnknown_081D9459 _08017C60: ldr r7, _08017CAC @ =gBattleMons - ldr r5, _08017CB0 @ =gPlayerMonIndex + ldr r5, _08017CB0 @ =gBankAttacker ldrb r0, [r5] movs r6, 0x58 muls r0, r6 @@ -4461,20 +4461,20 @@ _08017C7E: ands r2, r0 cmp r2, 0 beq _08017CB8 - ldr r1, _08017CB4 @ =gUnknown_02024D1E + ldr r1, _08017CB4 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] bl b_movescr_stack_push_cursor b _08017D02 .align 2, 0 _08017CAC: .4byte gBattleMons -_08017CB0: .4byte gPlayerMonIndex -_08017CB4: .4byte gUnknown_02024D1E +_08017CB0: .4byte gBankAttacker +_08017CB4: .4byte gBattleCommunication _08017CB8: - ldr r0, _08017D08 @ =gUnknown_02024D1E + ldr r0, _08017D08 @ =gBattleCommunication movs r4, 0x1 strb r1, [r0, 0x5] - ldr r1, _08017D0C @ =gEnemyMonIndex + ldr r1, _08017D0C @ =gBankTarget ldrb r0, [r5] strb r0, [r1] ldrb r0, [r5] @@ -4494,45 +4494,45 @@ _08017CB8: bl CalculateBaseDamage ldr r1, _08017D10 @ =gBattleMoveDamage str r0, [r1] - ldr r0, _08017D14 @ =gUnknown_02024D28 + ldr r0, _08017D14 @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 ldrb r0, [r1, 0x1] orrs r0, r4 strb r0, [r1, 0x1] - ldr r2, _08017D18 @ =gUnknown_02024C6C + ldr r2, _08017D18 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] _08017D02: - ldr r1, _08017D1C @ =gUnknown_02024C10 + ldr r1, _08017D1C @ =gBattlescriptCurrInstr ldr r0, _08017D20 @ =gUnknown_081D9595 b _08017D2C .align 2, 0 -_08017D08: .4byte gUnknown_02024D1E -_08017D0C: .4byte gEnemyMonIndex +_08017D08: .4byte gBattleCommunication +_08017D0C: .4byte gBankTarget _08017D10: .4byte gBattleMoveDamage -_08017D14: .4byte gUnknown_02024D28 -_08017D18: .4byte gUnknown_02024C6C -_08017D1C: .4byte gUnknown_02024C10 +_08017D14: .4byte gProtectStructs +_08017D18: .4byte gHitMarker +_08017D1C: .4byte gBattlescriptCurrInstr _08017D20: .4byte gUnknown_081D9595 _08017D24: bl b_movescr_stack_push_cursor - ldr r1, _08017D34 @ =gUnknown_02024C10 + ldr r1, _08017D34 @ =gBattlescriptCurrInstr ldr r0, _08017D38 @ =gUnknown_081D95D4 _08017D2C: str r0, [r1] movs r7, 0x1 b _08017F8E .align 2, 0 -_08017D34: .4byte gUnknown_02024C10 +_08017D34: .4byte gBattlescriptCurrInstr _08017D38: .4byte gUnknown_081D95D4 _08017D3C: ldr r1, _08017DA0 @ =gBattleMons - ldr r4, _08017DA4 @ =gPlayerMonIndex + ldr r4, _08017DA4 @ =gBankAttacker ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -4550,7 +4550,7 @@ _08017D3C: ands r1, r0 cmp r1, 0 bne _08017D90 - ldr r0, _08017DA8 @ =gUnknown_02024D28 + ldr r0, _08017DA8 @ =gProtectStructs ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -4559,12 +4559,12 @@ _08017D3C: orrs r0, r1 strb r0, [r2] ldrb r0, [r4] - bl b_cancel_multi_turn_move_maybe - ldr r1, _08017DAC @ =gUnknown_02024C10 + bl CancelMultiTurnMoves + ldr r1, _08017DAC @ =gBattlescriptCurrInstr ldr r0, _08017DB0 @ =gUnknown_081D9566 _08017D7E: str r0, [r1] - ldr r2, _08017DB4 @ =gUnknown_02024C6C + ldr r2, _08017DB4 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4585,16 +4585,16 @@ _08017D96: b _08017F9E .align 2, 0 _08017DA0: .4byte gBattleMons -_08017DA4: .4byte gPlayerMonIndex -_08017DA8: .4byte gUnknown_02024D28 -_08017DAC: .4byte gUnknown_02024C10 +_08017DA4: .4byte gBankAttacker +_08017DA8: .4byte gProtectStructs +_08017DAC: .4byte gBattlescriptCurrInstr _08017DB0: .4byte gUnknown_081D9566 -_08017DB4: .4byte gUnknown_02024C6C +_08017DB4: .4byte gHitMarker _08017DB8: .4byte 0x02000000 _08017DBC: .4byte 0x000160e7 _08017DC0: ldr r1, _08017DFC @ =gBattleMons - ldr r4, _08017E00 @ =gPlayerMonIndex + ldr r4, _08017E00 @ =gBankAttacker ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -4623,19 +4623,19 @@ _08017DDC: b _08017E34 .align 2, 0 _08017DFC: .4byte gBattleMons -_08017E00: .4byte gPlayerMonIndex +_08017E00: .4byte gBankAttacker _08017E04: .4byte 0x02000000 _08017E08: .4byte 0x00016003 _08017E0C: ldr r0, _08017E44 @ =gUnknown_081D9608 bl b_movescr_stack_push - ldr r2, _08017E48 @ =gUnknown_02024C6C + ldr r2, _08017E48 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] - ldr r0, _08017E4C @ =gUnknown_02024D28 + ldr r0, _08017E4C @ =gProtectStructs ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -4644,9 +4644,9 @@ _08017E0C: orrs r0, r1 strb r0, [r2, 0x1] ldrb r0, [r4] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves _08017E34: - ldr r1, _08017E50 @ =gUnknown_02024C10 + ldr r1, _08017E50 @ =gBattlescriptCurrInstr ldr r0, _08017E54 @ =gUnknown_081D95FB str r0, [r1] movs r0, 0x1 @@ -4657,14 +4657,14 @@ _08017E3C: b _08017F94 .align 2, 0 _08017E44: .4byte gUnknown_081D9608 -_08017E48: .4byte gUnknown_02024C6C -_08017E4C: .4byte gUnknown_02024D28 -_08017E50: .4byte gUnknown_02024C10 +_08017E48: .4byte gHitMarker +_08017E4C: .4byte gProtectStructs +_08017E50: .4byte gBattlescriptCurrInstr _08017E54: .4byte gUnknown_081D95FB _08017E58: .4byte 0x02000000 _08017E5C: ldr r1, _08017E98 @ =gBattleMons - ldr r6, _08017E9C @ =gPlayerMonIndex + ldr r6, _08017E9C @ =gBankAttacker ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -4690,27 +4690,27 @@ _08017E7A: ands r0, r4 cmp r0, 0 beq _08017EAC - ldr r1, _08017EA4 @ =gUnknown_02024C10 + ldr r1, _08017EA4 @ =gBattlescriptCurrInstr ldr r0, _08017EA8 @ =gUnknown_081D90A7 b _08017F38 .align 2, 0 _08017E98: .4byte gBattleMons -_08017E9C: .4byte gPlayerMonIndex +_08017E9C: .4byte gBankAttacker _08017EA0: .4byte 0xffffff00 -_08017EA4: .4byte gUnknown_02024C10 +_08017EA4: .4byte gBattlescriptCurrInstr _08017EA8: .4byte gUnknown_081D90A7 _08017EAC: ldr r0, _08017F0C @ =0xffffefff ands r2, r0 str r2, [r1] - ldr r2, _08017F10 @ =gUnknown_02024BF4 + ldr r2, _08017F10 @ =gTakenDmg ldrb r0, [r6] lsls r0, 2 adds r0, r2 ldr r0, [r0] cmp r0, 0 beq _08017F34 - ldr r1, _08017F14 @ =gUnknown_02024BE6 + ldr r1, _08017F14 @ =gCurrentMove movs r0, 0x75 strh r0, [r1] ldrb r0, [r6] @@ -4720,13 +4720,13 @@ _08017EAC: lsls r0, 1 mov r1, r10 str r0, [r1] - ldr r4, _08017F18 @ =gEnemyMonIndex - ldr r1, _08017F1C @ =gUnknown_02024C74 + ldr r4, _08017F18 @ =gBankTarget + ldr r1, _08017F1C @ =gTakenDmgBanks ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] strb r0, [r4] - ldr r0, _08017F20 @ =gUnknown_02024C0C + ldr r0, _08017F20 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _08017F24 @ =gBitTable ldrb r0, [r4] @@ -4741,7 +4741,7 @@ _08017EAC: bl sub_801B5C0 strb r0, [r4] _08017EFE: - ldr r1, _08017F28 @ =gUnknown_02024C10 + ldr r1, _08017F28 @ =gBattlescriptCurrInstr ldr r0, _08017F2C @ =gUnknown_081D90B2 str r0, [r1] ldr r2, _08017F30 @ =0x02000000 @@ -4749,17 +4749,17 @@ _08017EFE: b _08017F3A .align 2, 0 _08017F0C: .4byte 0xffffefff -_08017F10: .4byte gUnknown_02024BF4 -_08017F14: .4byte gUnknown_02024BE6 -_08017F18: .4byte gEnemyMonIndex -_08017F1C: .4byte gUnknown_02024C74 -_08017F20: .4byte gUnknown_02024C0C +_08017F10: .4byte gTakenDmg +_08017F14: .4byte gCurrentMove +_08017F18: .4byte gBankTarget +_08017F1C: .4byte gTakenDmgBanks +_08017F20: .4byte gAbsentBankFlags _08017F24: .4byte gBitTable -_08017F28: .4byte gUnknown_02024C10 +_08017F28: .4byte gBattlescriptCurrInstr _08017F2C: .4byte gUnknown_081D90B2 _08017F30: .4byte 0x02000000 _08017F34: - ldr r1, _08017F40 @ =gUnknown_02024C10 + ldr r1, _08017F40 @ =gBattlescriptCurrInstr ldr r0, _08017F44 @ =gUnknown_081D90F1 _08017F38: str r0, [r1] @@ -4768,11 +4768,11 @@ _08017F3A: mov r9, r4 b _08017F94 .align 2, 0 -_08017F40: .4byte gUnknown_02024C10 +_08017F40: .4byte gBattlescriptCurrInstr _08017F44: .4byte gUnknown_081D90F1 _08017F48: ldr r1, _08017FEC @ =gBattleMons - ldr r0, _08017FF0 @ =gPlayerMonIndex + ldr r0, _08017FF0 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -4784,7 +4784,7 @@ _08017F48: cmp r0, 0 beq _08017F94 ldr r2, _08017FF4 @ =gBattleMoves - ldr r0, _08017FF8 @ =gUnknown_02024BE6 + ldr r0, _08017FF8 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4798,10 +4798,10 @@ _08017F48: ands r3, r0 str r3, [r4] bl b_movescr_stack_push_cursor - ldr r1, _08017FFC @ =gUnknown_02024C10 + ldr r1, _08017FFC @ =gBattlescriptCurrInstr ldr r0, _08018000 @ =gUnknown_081D9552 str r0, [r1] - ldr r1, _08018004 @ =gUnknown_02024D1E + ldr r1, _08018004 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _08017F8C: @@ -4827,8 +4827,8 @@ _08017FAC: mov r1, r9 cmp r1, 0x2 bne _08017FD8 - ldr r4, _08018010 @ =gUnknown_02024A60 - ldr r0, _08017FF0 @ =gPlayerMonIndex + ldr r4, _08018010 @ =gActiveBank + ldr r0, _08017FF0 @ =gBankAttacker ldrb r0, [r0] strb r0, [r4] ldrb r1, [r4] @@ -4841,9 +4841,9 @@ _08017FAC: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08017FD8: mov r0, r9 add sp, 0x10 @@ -4856,15 +4856,15 @@ _08017FD8: bx r1 .align 2, 0 _08017FEC: .4byte gBattleMons -_08017FF0: .4byte gPlayerMonIndex +_08017FF0: .4byte gBankAttacker _08017FF4: .4byte gBattleMoves -_08017FF8: .4byte gUnknown_02024BE6 -_08017FFC: .4byte gUnknown_02024C10 +_08017FF8: .4byte gCurrentMove +_08017FFC: .4byte gBattlescriptCurrInstr _08018000: .4byte gUnknown_081D9552 -_08018004: .4byte gUnknown_02024D1E +_08018004: .4byte gBattleCommunication _08018008: .4byte 0x02000000 _0801800C: .4byte 0x000160e7 -_08018010: .4byte gUnknown_02024A60 +_08018010: .4byte gActiveBank _08018014: .4byte gUnknown_02024ACC thumb_func_end sub_8017718 @@ -4904,7 +4904,7 @@ _08018048: lsls r0, 24 lsrs r7, r0, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, _080180CC @ =gEnemyParty mov r8, r1 @@ -4965,17 +4965,17 @@ _080180CC: .4byte gEnemyParty _080180D0: .4byte gPlayerParty _080180D4: adds r0, r3, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08018100 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 ldr r2, _080180FC @ =gEnemyParty @@ -4985,11 +4985,11 @@ _080180D4: _080180FC: .4byte gEnemyParty _08018100: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 ldr r0, _080181A8 @ =gPlayerParty @@ -4998,7 +4998,7 @@ _08018118: mov r1, r10 cmp r1, 0x6 bne _08018128 - ldr r1, _080181AC @ =gUnknown_02024A6A + ldr r1, _080181AC @ =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrb r0, [r0] @@ -5007,7 +5007,7 @@ _08018128: mov r2, r9 cmp r2, 0x6 bne _08018138 - ldr r1, _080181AC @ =gUnknown_02024A6A + ldr r1, _080181AC @ =gBattlePartyID lsls r0, r6, 1 adds r0, r1 ldrb r0, [r0] @@ -5071,7 +5071,7 @@ _08018198: bx r1 .align 2, 0 _080181A8: .4byte gPlayerParty -_080181AC: .4byte gUnknown_02024A6A +_080181AC: .4byte gBattlePartyID _080181B0: .4byte 0x02000000 _080181B4: .4byte 0x00016068 thumb_func_end sub_8018018 @@ -5104,7 +5104,7 @@ castform_switch: @ 80181B8 movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0801820A @@ -5113,7 +5113,7 @@ castform_switch: @ 80181B8 movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08018230 @@ -5142,7 +5142,7 @@ _08018230: movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5152,7 +5152,7 @@ _08018230: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08018260 @@ -5264,8 +5264,8 @@ _0801831C: .4byte gBattleWeather _08018320: .4byte gBattleMons thumb_func_end castform_switch - thumb_func_start sub_8018324 -sub_8018324: @ 8018324 + thumb_func_start AbilityBattleEffects +AbilityBattleEffects: @ 8018324 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -5288,8 +5288,8 @@ sub_8018324: @ 8018324 lsrs r4, 16 movs r0, 0 mov r9, r0 - ldr r5, _08018380 @ =gPlayerMonIndex - ldr r1, _08018384 @ =gUnknown_02024A68 + ldr r5, _08018380 @ =gBankAttacker + ldr r1, _08018384 @ =gNoOfAllBanks ldrb r0, [r5] ldrb r1, [r1] cmp r0, r1 @@ -5298,11 +5298,11 @@ sub_8018324: @ 8018324 strb r1, [r5] _08018360: ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08018390 - ldr r1, _08018388 @ =gUnknown_02024A6A + ldr r1, _08018388 @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -5312,12 +5312,12 @@ _08018360: ldr r0, _0801838C @ =gPlayerParty b _080183A0 .align 2, 0 -_08018380: .4byte gPlayerMonIndex -_08018384: .4byte gUnknown_02024A68 -_08018388: .4byte gUnknown_02024A6A +_08018380: .4byte gBankAttacker +_08018384: .4byte gNoOfAllBanks +_08018388: .4byte gBattlePartyID _0801838C: .4byte gPlayerParty _08018390: - ldr r1, _080183D0 @ =gUnknown_02024A6A + ldr r1, _080183D0 @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -5327,8 +5327,8 @@ _08018390: ldr r0, _080183D4 @ =gEnemyParty _080183A0: adds r7, r1, r0 - ldr r5, _080183D8 @ =gEnemyMonIndex - ldr r1, _080183DC @ =gUnknown_02024A68 + ldr r5, _080183D8 @ =gBankTarget + ldr r1, _080183DC @ =gNoOfAllBanks ldrb r0, [r5] ldrb r1, [r1] cmp r0, r1 @@ -5337,11 +5337,11 @@ _080183A0: strb r2, [r5] _080183B2: ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080183E4 - ldr r1, _080183D0 @ =gUnknown_02024A6A + ldr r1, _080183D0 @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -5351,13 +5351,13 @@ _080183B2: ldr r0, _080183E0 @ =gPlayerParty b _080183F4 .align 2, 0 -_080183D0: .4byte gUnknown_02024A6A +_080183D0: .4byte gBattlePartyID _080183D4: .4byte gEnemyParty -_080183D8: .4byte gEnemyMonIndex -_080183DC: .4byte gUnknown_02024A68 +_080183D8: .4byte gBankTarget +_080183DC: .4byte gNoOfAllBanks _080183E0: .4byte gPlayerParty _080183E4: - ldr r1, _08018444 @ =gUnknown_02024A6A + ldr r1, _08018444 @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -5398,17 +5398,17 @@ _08018436: mov r3, r8 cmp r3, 0 beq _08018454 - ldr r0, _08018450 @ =byte_2024C06 + ldr r0, _08018450 @ =gLastUsedAbility strb r3, [r0] mov r8, r0 b _0801846A .align 2, 0 -_08018444: .4byte gUnknown_02024A6A +_08018444: .4byte gBattlePartyID _08018448: .4byte gEnemyParty _0801844C: .4byte gBattleTypeFlags -_08018450: .4byte byte_2024C06 +_08018450: .4byte gLastUsedAbility _08018454: - ldr r2, _08018474 @ =byte_2024C06 + ldr r2, _08018474 @ =gLastUsedAbility ldr r1, _08018478 @ =gBattleMons movs r0, 0x58 mov r5, r10 @@ -5425,10 +5425,10 @@ _0801846A: adds r3, r4, 0 b _08018480 .align 2, 0 -_08018474: .4byte byte_2024C06 +_08018474: .4byte gLastUsedAbility _08018478: .4byte gBattleMons _0801847C: - ldr r0, _08018494 @ =gUnknown_02024BE6 + ldr r0, _08018494 @ =gCurrentMove ldrh r3, [r0] _08018480: ldr r1, _08018498 @ =0x02000000 @@ -5442,7 +5442,7 @@ _08018480: ands r4, r0 b _080184AC .align 2, 0 -_08018494: .4byte gUnknown_02024BE6 +_08018494: .4byte gCurrentMove _08018498: .4byte 0x02000000 _0801849C: .4byte 0x0001601c _080184A0: @@ -5489,8 +5489,8 @@ _080184C8: .4byte _08019F44 .4byte _08019CD4 _08018518: - ldr r2, _0801854C @ =gPlayerMonIndex - ldr r0, _08018550 @ =gUnknown_02024A68 + ldr r2, _0801854C @ =gBankAttacker + ldr r0, _08018550 @ =gNoOfAllBanks ldrb r1, [r2] adds r5, r0, 0 ldrb r0, [r5] @@ -5519,8 +5519,8 @@ _0801853E: _08018548: bl _08019F76 .align 2, 0 -_0801854C: .4byte gPlayerMonIndex -_08018550: .4byte gUnknown_02024A68 +_0801854C: .4byte gBankAttacker +_08018550: .4byte gNoOfAllBanks _08018554: cmp r0, 0x16 bne _0801855A @@ -5645,7 +5645,7 @@ _0801864C: bl _08019F92 _08018656: bl weather_get_current - ldr r1, _08018678 @ =gUnknown_02024D1E + ldr r1, _08018678 @ =gBattleCommunication strb r0, [r1, 0x5] ldr r0, _0801867C @ =gUnknown_081D901D bl b_push_move_exec @@ -5655,7 +5655,7 @@ _08018668: .4byte gBattleWeather _0801866C: .4byte 0x02000000 _08018670: .4byte 0x000160a4 _08018674: .4byte 0x00016003 -_08018678: .4byte gUnknown_02024D1E +_08018678: .4byte gBattleCommunication _0801867C: .4byte gUnknown_081D901D _08018680: ldr r2, _080186A8 @ =gBattleWeather @@ -5730,7 +5730,7 @@ _0801871C: .4byte gUnknown_081D97FE _08018720: .4byte 0x02000000 _08018724: .4byte 0x00016003 _08018728: - ldr r0, _08018754 @ =gUnknown_02024D68 + ldr r0, _08018754 @ =gSpecialStatuses mov r1, r10 lsls r2, r1, 2 adds r1, r2, r1 @@ -5742,7 +5742,7 @@ _08018728: bge _08018740 bl _08019F76 _08018740: - ldr r1, _08018758 @ =gUnknown_02024C98 + ldr r1, _08018758 @ =gStatuses3 adds r1, r2, r1 ldr r0, [r1] movs r2, 0x80 @@ -5753,8 +5753,8 @@ _08018740: movs r1, 0x8 b _080187CA .align 2, 0 -_08018754: .4byte gUnknown_02024D68 -_08018758: .4byte gUnknown_02024C98 +_08018754: .4byte gSpecialStatuses +_08018758: .4byte gStatuses3 _0801875C: mov r0, r10 bl castform_switch @@ -5784,7 +5784,7 @@ _08018794: .4byte 0x02000000 _08018798: .4byte 0x00016003 _0801879C: .4byte 0x0001609b _080187A0: - ldr r0, _080187D4 @ =gUnknown_02024D68 + ldr r0, _080187D4 @ =gSpecialStatuses mov r1, r10 lsls r2, r1, 2 adds r1, r2, r1 @@ -5796,7 +5796,7 @@ _080187A0: bge _080187B8 bl _08019F76 _080187B8: - ldr r1, _080187D8 @ =gUnknown_02024C98 + ldr r1, _080187D8 @ =gStatuses3 adds r1, r2, r1 ldr r0, [r1] movs r2, 0x80 @@ -5810,8 +5810,8 @@ _080187CA: strb r0, [r3] bl _08019F76 .align 2, 0 -_080187D4: .4byte gUnknown_02024D68 -_080187D8: .4byte gUnknown_02024C98 +_080187D4: .4byte gSpecialStatuses +_080187D8: .4byte gStatuses3 _080187DC: movs r6, 0 ldrb r5, [r5] @@ -5831,13 +5831,13 @@ _080187FC: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08018810 @ =gUnknown_02024A68 + ldr r0, _08018810 @ =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bcc _080187E8 bl _08019F76 .align 2, 0 -_08018810: .4byte gUnknown_02024A68 +_08018810: .4byte gNoOfAllBanks _08018814: ldr r2, _08018844 @ =gBattleMons movs r0, 0x58 @@ -5849,7 +5849,7 @@ _08018814: bne _08018828 bl _08019F76 _08018828: - ldr r0, _08018848 @ =gPlayerMonIndex + ldr r0, _08018848 @ =gBankAttacker mov r3, r10 strb r3, [r0] mov r3, r8 @@ -5865,7 +5865,7 @@ _08018840: bl _08019F76 .align 2, 0 _08018844: .4byte gBattleMons -_08018848: .4byte gPlayerMonIndex +_08018848: .4byte gBankAttacker _0801884C: cmp r5, 0x36 bne _08018852 @@ -5881,7 +5881,7 @@ _0801885A: movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5893,7 +5893,7 @@ _08018876: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0801888E @@ -5959,7 +5959,7 @@ _08018906: ands r0, r1 cmp r0, 0 beq _08018918 - ldr r0, _08018990 @ =gUnknown_030041C0 + ldr r0, _08018990 @ =gBattleTextBuff1 ldr r1, _08018994 @ =gStatusConditionString_PoisonJpn bl StringCopy _08018918: @@ -5968,7 +5968,7 @@ _08018918: ands r0, r1 cmp r0, 0 beq _0801892A - ldr r0, _08018990 @ =gUnknown_030041C0 + ldr r0, _08018990 @ =gBattleTextBuff1 ldr r1, _08018998 @ =gStatusConditionString_SleepJpn bl StringCopy _0801892A: @@ -5977,7 +5977,7 @@ _0801892A: ands r0, r1 cmp r0, 0 beq _0801893C - ldr r0, _08018990 @ =gUnknown_030041C0 + ldr r0, _08018990 @ =gBattleTextBuff1 ldr r1, _0801899C @ =gStatusConditionString_ParalysisJpn bl StringCopy _0801893C: @@ -5986,7 +5986,7 @@ _0801893C: ands r0, r1 cmp r0, 0 beq _0801894E - ldr r0, _08018990 @ =gUnknown_030041C0 + ldr r0, _08018990 @ =gBattleTextBuff1 ldr r1, _080189A0 @ =gStatusConditionString_BurnJpn bl StringCopy _0801894E: @@ -5995,13 +5995,13 @@ _0801894E: ands r0, r1 cmp r0, 0 beq _08018960 - ldr r0, _08018990 @ =gUnknown_030041C0 + ldr r0, _08018990 @ =gBattleTextBuff1 ldr r1, _080189A4 @ =gStatusConditionString_IceJpn bl StringCopy _08018960: str r4, [r5] ldr r0, _080189A8 @ =0x02000000 - ldr r4, _080189AC @ =gUnknown_02024A60 + ldr r4, _080189AC @ =gActiveBank mov r3, r10 strb r3, [r4] ldr r1, _080189B0 @ =0x00016003 @@ -6014,19 +6014,19 @@ _08018960: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution bl _08019F22 .align 2, 0 -_08018990: .4byte gUnknown_030041C0 +_08018990: .4byte gBattleTextBuff1 _08018994: .4byte gStatusConditionString_PoisonJpn _08018998: .4byte gStatusConditionString_SleepJpn _0801899C: .4byte gStatusConditionString_ParalysisJpn _080189A0: .4byte gStatusConditionString_BurnJpn _080189A4: .4byte gStatusConditionString_IceJpn _080189A8: .4byte 0x02000000 -_080189AC: .4byte gUnknown_02024A60 +_080189AC: .4byte gActiveBank _080189B0: .4byte 0x00016003 _080189B4: .4byte gUnknown_081D9758 _080189B8: @@ -6037,7 +6037,7 @@ _080189B8: ble _080189C6 bl _08019F76 _080189C6: - ldr r0, _08018A04 @ =gUnknown_02024CA8 + ldr r0, _08018A04 @ =gDisableStructs mov r3, r10 lsls r1, r3, 3 subs r1, r3 @@ -6066,13 +6066,13 @@ _080189DC: strb r3, [r0] bl _08019F22 .align 2, 0 -_08018A04: .4byte gUnknown_02024CA8 +_08018A04: .4byte gDisableStructs _08018A08: .4byte 0x000160a4 _08018A0C: .4byte 0x000160a5 _08018A10: .4byte gUnknown_081D9718 _08018A14: .4byte 0x00016003 _08018A18: - ldr r2, _08018A3C @ =gUnknown_02024CA8 + ldr r2, _08018A3C @ =gDisableStructs ldrb r0, [r0] lsls r1, r0, 3 subs r1, r0 @@ -6090,7 +6090,7 @@ _08018A18: strb r0, [r1, 0x18] bl _08019F76 .align 2, 0 -_08018A3C: .4byte gUnknown_02024CA8 +_08018A3C: .4byte gDisableStructs _08018A40: mov r5, r8 ldrb r0, [r5] @@ -6130,7 +6130,7 @@ _08018A76: bl _08019F76 _08018A86: ldr r1, _08018AC4 @ =gBattleMons - ldr r0, _08018AC8 @ =gPlayerMonIndex + ldr r0, _08018AC8 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6142,14 +6142,14 @@ _08018A86: ands r0, r1 cmp r0, 0 beq _08018AAC - ldr r0, _08018ACC @ =gUnknown_02024C6C + ldr r0, _08018ACC @ =gHitMarker ldr r1, [r0] movs r2, 0x80 lsls r2, 4 orrs r1, r2 str r1, [r0] _08018AAC: - ldr r1, _08018AD0 @ =gUnknown_02024C10 + ldr r1, _08018AD0 @ =gBattlescriptCurrInstr ldr r0, _08018AD4 @ =gUnknown_081D98F3 str r0, [r1] movs r0, 0x1 @@ -6159,9 +6159,9 @@ _08018AAC: _08018ABC: .4byte gUnknown_081FA724 _08018AC0: .4byte 0x0000ffff _08018AC4: .4byte gBattleMons -_08018AC8: .4byte gPlayerMonIndex -_08018ACC: .4byte gUnknown_02024C6C -_08018AD0: .4byte gUnknown_02024C10 +_08018AC8: .4byte gBankAttacker +_08018ACC: .4byte gHitMarker +_08018AD0: .4byte gBattlescriptCurrInstr _08018AD4: .4byte gUnknown_081D98F3 _08018AD8: cmp r3, 0 @@ -6196,8 +6196,8 @@ _08018AFE: bne _08018B10 b _08018C6A _08018B10: - ldr r1, _08018B2C @ =gUnknown_02024D28 - ldr r0, _08018B30 @ =gPlayerMonIndex + ldr r1, _08018B2C @ =gProtectStructs + ldr r0, _08018B30 @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -6205,24 +6205,24 @@ _08018B10: lsls r0, 28 cmp r0, 0 bge _08018B3C - ldr r1, _08018B34 @ =gUnknown_02024C10 + ldr r1, _08018B34 @ =gBattlescriptCurrInstr ldr r0, _08018B38 @ =gUnknown_081D9843 b _08018B40 .align 2, 0 _08018B28: .4byte gBattleMoves -_08018B2C: .4byte gUnknown_02024D28 -_08018B30: .4byte gPlayerMonIndex -_08018B34: .4byte gUnknown_02024C10 +_08018B2C: .4byte gProtectStructs +_08018B30: .4byte gBankAttacker +_08018B34: .4byte gBattlescriptCurrInstr _08018B38: .4byte gUnknown_081D9843 _08018B3C: - ldr r1, _08018B48 @ =gUnknown_02024C10 + ldr r1, _08018B48 @ =gBattlescriptCurrInstr ldr r0, _08018B4C @ =gUnknown_081D9842 _08018B40: str r0, [r1] movs r2, 0x1 b _08018C68 .align 2, 0 -_08018B48: .4byte gUnknown_02024C10 +_08018B48: .4byte gBattlescriptCurrInstr _08018B4C: .4byte gUnknown_081D9842 _08018B50: cmp r4, 0xB @@ -6239,8 +6239,8 @@ _08018B56: bne _08018B68 b _08018C6A _08018B68: - ldr r1, _08018B84 @ =gUnknown_02024D28 - ldr r0, _08018B88 @ =gPlayerMonIndex + ldr r1, _08018B84 @ =gProtectStructs + ldr r0, _08018B88 @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -6248,17 +6248,17 @@ _08018B68: lsls r0, 28 cmp r0, 0 bge _08018B94 - ldr r1, _08018B8C @ =gUnknown_02024C10 + ldr r1, _08018B8C @ =gBattlescriptCurrInstr ldr r0, _08018B90 @ =gUnknown_081D9843 b _08018B98 .align 2, 0 _08018B80: .4byte gBattleMoves -_08018B84: .4byte gUnknown_02024D28 -_08018B88: .4byte gPlayerMonIndex -_08018B8C: .4byte gUnknown_02024C10 +_08018B84: .4byte gProtectStructs +_08018B88: .4byte gBankAttacker +_08018B8C: .4byte gBattlescriptCurrInstr _08018B90: .4byte gUnknown_081D9843 _08018B94: - ldr r1, _08018BA0 @ =gUnknown_02024C10 + ldr r1, _08018BA0 @ =gBattlescriptCurrInstr ldr r0, _08018BA4 @ =gUnknown_081D9842 _08018B98: str r0, [r1] @@ -6266,7 +6266,7 @@ _08018B98: mov r9, r3 b _08018C6A .align 2, 0 -_08018BA0: .4byte gUnknown_02024C10 +_08018BA0: .4byte gBattlescriptCurrInstr _08018BA4: .4byte gUnknown_081D9842 _08018BA8: cmp r4, 0xA @@ -6293,10 +6293,10 @@ _08018BA8: adds r5, r1, 0 cmp r3, 0 bne _08018C30 - ldr r0, _08018BFC @ =gUnknown_02024D1E + ldr r0, _08018BFC @ =gBattleCommunication strb r3, [r0, 0x5] - ldr r1, _08018C00 @ =gUnknown_02024D28 - ldr r0, _08018C04 @ =gPlayerMonIndex + ldr r1, _08018C00 @ =gProtectStructs + ldr r0, _08018C04 @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -6304,19 +6304,19 @@ _08018BA8: lsls r0, 28 cmp r0, 0 bge _08018C10 - ldr r1, _08018C08 @ =gUnknown_02024C10 + ldr r1, _08018C08 @ =gBattlescriptCurrInstr ldr r0, _08018C0C @ =gUnknown_081D987C b _08018C14 .align 2, 0 _08018BF4: .4byte gBattleMons _08018BF8: .4byte 0x02017100 -_08018BFC: .4byte gUnknown_02024D1E -_08018C00: .4byte gUnknown_02024D28 -_08018C04: .4byte gPlayerMonIndex -_08018C08: .4byte gUnknown_02024C10 +_08018BFC: .4byte gBattleCommunication +_08018C00: .4byte gProtectStructs +_08018C04: .4byte gBankAttacker +_08018C08: .4byte gBattlescriptCurrInstr _08018C0C: .4byte gUnknown_081D987C _08018C10: - ldr r1, _08018C28 @ =gUnknown_02024C10 + ldr r1, _08018C28 @ =gBattlescriptCurrInstr ldr r0, _08018C2C @ =gUnknown_081D987B _08018C14: str r0, [r1] @@ -6329,13 +6329,13 @@ _08018C14: mov r9, r1 b _08018C6A .align 2, 0 -_08018C28: .4byte gUnknown_02024C10 +_08018C28: .4byte gBattlescriptCurrInstr _08018C2C: .4byte gUnknown_081D987B _08018C30: - ldr r0, _08018C4C @ =gUnknown_02024D1E + ldr r0, _08018C4C @ =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, _08018C50 @ =gUnknown_02024D28 - ldr r0, _08018C54 @ =gPlayerMonIndex + ldr r1, _08018C50 @ =gProtectStructs + ldr r0, _08018C54 @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -6343,17 +6343,17 @@ _08018C30: lsls r0, 28 cmp r0, 0 bge _08018C60 - ldr r1, _08018C58 @ =gUnknown_02024C10 + ldr r1, _08018C58 @ =gBattlescriptCurrInstr ldr r0, _08018C5C @ =gUnknown_081D987C b _08018C64 .align 2, 0 -_08018C4C: .4byte gUnknown_02024D1E -_08018C50: .4byte gUnknown_02024D28 -_08018C54: .4byte gPlayerMonIndex -_08018C58: .4byte gUnknown_02024C10 +_08018C4C: .4byte gBattleCommunication +_08018C50: .4byte gProtectStructs +_08018C54: .4byte gBankAttacker +_08018C58: .4byte gBattlescriptCurrInstr _08018C5C: .4byte gUnknown_081D987C _08018C60: - ldr r1, _08018CA4 @ =gUnknown_02024C10 + ldr r1, _08018CA4 @ =gBattlescriptCurrInstr ldr r0, _08018CA8 @ =gUnknown_081D987B _08018C64: str r0, [r1] @@ -6376,8 +6376,8 @@ _08018C74: ldrh r2, [r1, 0x28] cmp r0, r2 bne _08018CD0 - ldr r1, _08018CB0 @ =gUnknown_02024D28 - ldr r0, _08018CB4 @ =gPlayerMonIndex + ldr r1, _08018CB0 @ =gProtectStructs + ldr r0, _08018CB4 @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -6385,24 +6385,24 @@ _08018C74: lsls r0, 28 cmp r0, 0 bge _08018CBC - ldr r1, _08018CA4 @ =gUnknown_02024C10 + ldr r1, _08018CA4 @ =gBattlescriptCurrInstr ldr r0, _08018CB8 @ =gUnknown_081D9866 str r0, [r1] bl _08019F76 .align 2, 0 -_08018CA4: .4byte gUnknown_02024C10 +_08018CA4: .4byte gBattlescriptCurrInstr _08018CA8: .4byte gUnknown_081D987B _08018CAC: .4byte gBattleMons -_08018CB0: .4byte gUnknown_02024D28 -_08018CB4: .4byte gPlayerMonIndex +_08018CB0: .4byte gProtectStructs +_08018CB4: .4byte gBankAttacker _08018CB8: .4byte gUnknown_081D9866 _08018CBC: - ldr r1, _08018CC8 @ =gUnknown_02024C10 + ldr r1, _08018CC8 @ =gBattlescriptCurrInstr ldr r0, _08018CCC @ =gUnknown_081D9865 str r0, [r1] bl _08019F76 .align 2, 0 -_08018CC8: .4byte gUnknown_02024C10 +_08018CC8: .4byte gBattlescriptCurrInstr _08018CCC: .4byte gUnknown_081D9865 _08018CD0: ldr r2, _08018CEC @ =gBattleMoveDamage @@ -6508,8 +6508,8 @@ _08018DE4: bne _08018DF8 bl _08019F76 _08018DF8: - ldr r2, _08018E7C @ =gUnknown_02024D68 - ldr r0, _08018E80 @ =gEnemyMonIndex + ldr r2, _08018E7C @ =gSpecialStatuses + ldr r0, _08018E80 @ =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6555,7 +6555,7 @@ _08018E48: _08018E52: strb r4, [r3] strb r4, [r2] - ldr r1, _08018E88 @ =gUnknown_030041C0 + ldr r1, _08018E88 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -6564,18 +6564,18 @@ _08018E52: movs r0, 0xFF strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _08018E8C @ =gUnknown_02024C10 + ldr r1, _08018E8C @ =gBattlescriptCurrInstr ldr r0, _08018E90 @ =gUnknown_081D9921 str r0, [r1] bl _08019F22 .align 2, 0 _08018E74: .4byte gBattleMoveFlags _08018E78: .4byte gBattleMoves -_08018E7C: .4byte gUnknown_02024D68 -_08018E80: .4byte gEnemyMonIndex +_08018E7C: .4byte gSpecialStatuses +_08018E80: .4byte gBankTarget _08018E84: .4byte gBattleMons -_08018E88: .4byte gUnknown_030041C0 -_08018E8C: .4byte gUnknown_02024C10 +_08018E88: .4byte gBattleTextBuff1 +_08018E8C: .4byte gBattlescriptCurrInstr _08018E90: .4byte gUnknown_081D9921 _08018E94: ldr r0, _08018F2C @ =gBattleMoveFlags @@ -6587,7 +6587,7 @@ _08018E94: bl _08019F76 _08018EA4: ldr r1, _08018F30 @ =gBattleMons - ldr r0, _08018F34 @ =gPlayerMonIndex + ldr r0, _08018F34 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6597,7 +6597,7 @@ _08018EA4: bne _08018EBA bl _08019F76 _08018EBA: - ldr r0, _08018F38 @ =gUnknown_02024D28 + ldr r0, _08018F38 @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6606,8 +6606,8 @@ _08018EBA: beq _08018ECC bl _08019F76 _08018ECC: - ldr r2, _08018F3C @ =gUnknown_02024D68 - ldr r0, _08018F40 @ =gEnemyMonIndex + ldr r2, _08018F3C @ =gSpecialStatuses + ldr r0, _08018F40 @ =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6648,20 +6648,20 @@ _08018F0E: str r2, [r1] _08018F1C: bl b_movescr_stack_push_cursor - ldr r1, _08018F4C @ =gUnknown_02024C10 + ldr r1, _08018F4C @ =gBattlescriptCurrInstr ldr r0, _08018F50 @ =gUnknown_081D9928 str r0, [r1] bl _08019F22 .align 2, 0 _08018F2C: .4byte gBattleMoveFlags _08018F30: .4byte gBattleMons -_08018F34: .4byte gPlayerMonIndex -_08018F38: .4byte gUnknown_02024D28 -_08018F3C: .4byte gUnknown_02024D68 -_08018F40: .4byte gEnemyMonIndex +_08018F34: .4byte gBankAttacker +_08018F38: .4byte gProtectStructs +_08018F3C: .4byte gSpecialStatuses +_08018F40: .4byte gBankTarget _08018F44: .4byte gBattleMoves _08018F48: .4byte gBattleMoveDamage -_08018F4C: .4byte gUnknown_02024C10 +_08018F4C: .4byte gBattlescriptCurrInstr _08018F50: .4byte gUnknown_081D9928 _08018F54: ldr r0, _08019020 @ =gBattleMoveFlags @@ -6673,7 +6673,7 @@ _08018F54: bl _08019F76 _08018F64: ldr r1, _08019024 @ =gBattleMons - ldr r0, _08019028 @ =gPlayerMonIndex + ldr r0, _08019028 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6683,7 +6683,7 @@ _08018F64: bne _08018F7A bl _08019F76 _08018F7A: - ldr r0, _0801902C @ =gUnknown_02024D28 + ldr r0, _0801902C @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6692,8 +6692,8 @@ _08018F7A: beq _08018F8C bl _08019F76 _08018F8C: - ldr r2, _08019030 @ =gUnknown_02024D68 - ldr r0, _08019034 @ =gEnemyMonIndex + ldr r2, _08019030 @ =gSpecialStatuses + ldr r0, _08019034 @ =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6734,7 +6734,7 @@ _08018FCC: beq _08018FE4 bl _08019F76 _08018FE4: - ldr r5, _0801903C @ =gUnknown_02024D1E + ldr r5, _0801903C @ =gBattleCommunication movs r4, 0x3 _08018FE8: bl Random @@ -6742,7 +6742,7 @@ _08018FE8: strb r0, [r5, 0x3] cmp r0, 0 beq _08018FE8 - ldr r1, _0801903C @ =gUnknown_02024D1E + ldr r1, _0801903C @ =gBattleCommunication ldrb r0, [r1, 0x3] cmp r0, 0x3 bne _08019000 @@ -6753,10 +6753,10 @@ _08019000: adds r0, 0x40 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _08019040 @ =gUnknown_02024C10 + ldr r1, _08019040 @ =gBattlescriptCurrInstr ldr r0, _08019044 @ =gUnknown_081D9950 str r0, [r1] - ldr r2, _08019048 @ =gUnknown_02024C6C + ldr r2, _08019048 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -6766,15 +6766,15 @@ _08019000: .align 2, 0 _08019020: .4byte gBattleMoveFlags _08019024: .4byte gBattleMons -_08019028: .4byte gPlayerMonIndex -_0801902C: .4byte gUnknown_02024D28 -_08019030: .4byte gUnknown_02024D68 -_08019034: .4byte gEnemyMonIndex +_08019028: .4byte gBankAttacker +_0801902C: .4byte gProtectStructs +_08019030: .4byte gSpecialStatuses +_08019034: .4byte gBankTarget _08019038: .4byte gBattleMoves -_0801903C: .4byte gUnknown_02024D1E -_08019040: .4byte gUnknown_02024C10 +_0801903C: .4byte gBattleCommunication +_08019040: .4byte gBattlescriptCurrInstr _08019044: .4byte gUnknown_081D9950 -_08019048: .4byte gUnknown_02024C6C +_08019048: .4byte gHitMarker _0801904C: ldr r0, _080190FC @ =gBattleMoveFlags ldrb r1, [r0] @@ -6785,7 +6785,7 @@ _0801904C: bl _08019F76 _0801905C: ldr r1, _08019100 @ =gBattleMons - ldr r0, _08019104 @ =gPlayerMonIndex + ldr r0, _08019104 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6795,7 +6795,7 @@ _0801905C: bne _08019072 bl _08019F76 _08019072: - ldr r0, _08019108 @ =gUnknown_02024D28 + ldr r0, _08019108 @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6804,8 +6804,8 @@ _08019072: beq _08019084 bl _08019F76 _08019084: - ldr r2, _0801910C @ =gUnknown_02024D68 - ldr r0, _08019110 @ =gEnemyMonIndex + ldr r2, _0801910C @ =gSpecialStatuses + ldr r0, _08019110 @ =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6846,14 +6846,14 @@ _080190C4: beq _080190DC bl _08019F76 _080190DC: - ldr r1, _08019118 @ =gUnknown_02024D1E + ldr r1, _08019118 @ =gBattleCommunication movs r0, 0x42 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _0801911C @ =gUnknown_02024C10 + ldr r1, _0801911C @ =gBattlescriptCurrInstr ldr r0, _08019120 @ =gUnknown_081D9950 str r0, [r1] - ldr r2, _08019124 @ =gUnknown_02024C6C + ldr r2, _08019124 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -6863,15 +6863,15 @@ _080190DC: .align 2, 0 _080190FC: .4byte gBattleMoveFlags _08019100: .4byte gBattleMons -_08019104: .4byte gPlayerMonIndex -_08019108: .4byte gUnknown_02024D28 -_0801910C: .4byte gUnknown_02024D68 -_08019110: .4byte gEnemyMonIndex +_08019104: .4byte gBankAttacker +_08019108: .4byte gProtectStructs +_0801910C: .4byte gSpecialStatuses +_08019110: .4byte gBankTarget _08019114: .4byte gBattleMoves -_08019118: .4byte gUnknown_02024D1E -_0801911C: .4byte gUnknown_02024C10 +_08019118: .4byte gBattleCommunication +_0801911C: .4byte gBattlescriptCurrInstr _08019120: .4byte gUnknown_081D9950 -_08019124: .4byte gUnknown_02024C6C +_08019124: .4byte gHitMarker _08019128: ldr r0, _080191D8 @ =gBattleMoveFlags ldrb r1, [r0] @@ -6882,7 +6882,7 @@ _08019128: bl _08019F76 _08019138: ldr r1, _080191DC @ =gBattleMons - ldr r0, _080191E0 @ =gPlayerMonIndex + ldr r0, _080191E0 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6892,7 +6892,7 @@ _08019138: bne _0801914E bl _08019F76 _0801914E: - ldr r0, _080191E4 @ =gUnknown_02024D28 + ldr r0, _080191E4 @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6901,8 +6901,8 @@ _0801914E: beq _08019160 bl _08019F76 _08019160: - ldr r2, _080191E8 @ =gUnknown_02024D68 - ldr r0, _080191EC @ =gEnemyMonIndex + ldr r2, _080191E8 @ =gSpecialStatuses + ldr r0, _080191EC @ =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6943,14 +6943,14 @@ _080191A0: beq _080191B8 bl _08019F76 _080191B8: - ldr r1, _080191F4 @ =gUnknown_02024D1E + ldr r1, _080191F4 @ =gBattleCommunication movs r0, 0x45 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _080191F8 @ =gUnknown_02024C10 + ldr r1, _080191F8 @ =gBattlescriptCurrInstr ldr r0, _080191FC @ =gUnknown_081D9950 str r0, [r1] - ldr r2, _08019200 @ =gUnknown_02024C6C + ldr r2, _08019200 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -6960,15 +6960,15 @@ _080191B8: .align 2, 0 _080191D8: .4byte gBattleMoveFlags _080191DC: .4byte gBattleMons -_080191E0: .4byte gPlayerMonIndex -_080191E4: .4byte gUnknown_02024D28 -_080191E8: .4byte gUnknown_02024D68 -_080191EC: .4byte gEnemyMonIndex +_080191E0: .4byte gBankAttacker +_080191E4: .4byte gProtectStructs +_080191E8: .4byte gSpecialStatuses +_080191EC: .4byte gBankTarget _080191F0: .4byte gBattleMoves -_080191F4: .4byte gUnknown_02024D1E -_080191F8: .4byte gUnknown_02024C10 +_080191F4: .4byte gBattleCommunication +_080191F8: .4byte gBattlescriptCurrInstr _080191FC: .4byte gUnknown_081D9950 -_08019200: .4byte gUnknown_02024C6C +_08019200: .4byte gHitMarker _08019204: ldr r0, _080192B4 @ =gBattleMoveFlags ldrb r1, [r0] @@ -6979,7 +6979,7 @@ _08019204: bl _08019F76 _08019214: ldr r1, _080192B8 @ =gBattleMons - ldr r0, _080192BC @ =gPlayerMonIndex + ldr r0, _080192BC @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6989,7 +6989,7 @@ _08019214: bne _0801922A bl _08019F76 _0801922A: - ldr r0, _080192C0 @ =gUnknown_02024D28 + ldr r0, _080192C0 @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -7010,8 +7010,8 @@ _0801923C: bne _08019254 bl _08019F76 _08019254: - ldr r2, _080192C8 @ =gUnknown_02024D68 - ldr r0, _080192CC @ =gEnemyMonIndex + ldr r2, _080192C8 @ =gSpecialStatuses + ldr r0, _080192CC @ =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -7040,14 +7040,14 @@ _0801927C: beq _08019294 bl _08019F76 _08019294: - ldr r1, _080192D0 @ =gUnknown_02024D1E + ldr r1, _080192D0 @ =gBattleCommunication movs r0, 0x43 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _080192D4 @ =gUnknown_02024C10 + ldr r1, _080192D4 @ =gBattlescriptCurrInstr ldr r0, _080192D8 @ =gUnknown_081D9950 str r0, [r1] - ldr r2, _080192DC @ =gUnknown_02024C6C + ldr r2, _080192DC @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -7057,15 +7057,15 @@ _08019294: .align 2, 0 _080192B4: .4byte gBattleMoveFlags _080192B8: .4byte gBattleMons -_080192BC: .4byte gPlayerMonIndex -_080192C0: .4byte gUnknown_02024D28 +_080192BC: .4byte gBankAttacker +_080192C0: .4byte gProtectStructs _080192C4: .4byte gBattleMoves -_080192C8: .4byte gUnknown_02024D68 -_080192CC: .4byte gEnemyMonIndex -_080192D0: .4byte gUnknown_02024D1E -_080192D4: .4byte gUnknown_02024C10 +_080192C8: .4byte gSpecialStatuses +_080192CC: .4byte gBankTarget +_080192D0: .4byte gBattleCommunication +_080192D4: .4byte gBattlescriptCurrInstr _080192D8: .4byte gUnknown_081D9950 -_080192DC: .4byte gUnknown_02024C6C +_080192DC: .4byte gHitMarker _080192E0: ldr r0, _08019420 @ =gBattleMoveFlags ldrb r1, [r0] @@ -7076,7 +7076,7 @@ _080192E0: bl _08019F76 _080192F0: ldr r5, _08019424 @ =gBattleMons - ldr r7, _08019428 @ =gPlayerMonIndex + ldr r7, _08019428 @ =gBankAttacker ldrb r1, [r7] movs r6, 0x58 adds r0, r1, 0 @@ -7087,7 +7087,7 @@ _080192F0: bne _08019308 bl _08019F76 _08019308: - ldr r0, _0801942C @ =gUnknown_02024D28 + ldr r0, _0801942C @ =gProtectStructs lsls r1, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -7108,8 +7108,8 @@ _0801931A: bne _08019332 bl _08019F76 _08019332: - ldr r3, _08019434 @ =gUnknown_02024D68 - ldr r0, _08019438 @ =gEnemyMonIndex + ldr r3, _08019434 @ =gSpecialStatuses + ldr r0, _08019438 @ =gBankTarget mov r8, r0 ldrb r1, [r0] lsls r0, r1, 2 @@ -7215,25 +7215,25 @@ _080193F6: orrs r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08019440 @ =gUnknown_02024C10 + ldr r1, _08019440 @ =gBattlescriptCurrInstr ldr r0, _08019444 @ =gUnknown_081D9943 str r0, [r1] bl _08019F22 .align 2, 0 _08019420: .4byte gBattleMoveFlags _08019424: .4byte gBattleMons -_08019428: .4byte gPlayerMonIndex -_0801942C: .4byte gUnknown_02024D28 +_08019428: .4byte gBankAttacker +_0801942C: .4byte gProtectStructs _08019430: .4byte gBattleMoves -_08019434: .4byte gUnknown_02024D68 -_08019438: .4byte gEnemyMonIndex +_08019434: .4byte gSpecialStatuses +_08019438: .4byte gBankTarget _0801943C: .4byte gBitTable -_08019440: .4byte gUnknown_02024C10 +_08019440: .4byte gBattlescriptCurrInstr _08019444: .4byte gUnknown_081D9943 _08019448: movs r5, 0 mov r10, r5 - ldr r0, _0801947C @ =gUnknown_02024A68 + ldr r0, _0801947C @ =gNoOfAllBanks ldrb r0, [r0] cmp r10, r0 bcc _08019458 @@ -7259,7 +7259,7 @@ _08019472: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801947C: .4byte gUnknown_02024A68 +_0801947C: .4byte gNoOfAllBanks _08019480: .4byte gBattleMons _08019484: .4byte _08019488 .align 2, 0 @@ -7345,12 +7345,12 @@ _08019590: bne _080195AA b _080196D6 _080195AA: - ldr r0, _080195B4 @ =gUnknown_030041C0 + ldr r0, _080195B4 @ =gBattleTextBuff1 ldr r1, _080195B8 @ =gStatusConditionString_PoisonJpn b _0801969C .align 2, 0 _080195B0: .4byte 0x00000f88 -_080195B4: .4byte gUnknown_030041C0 +_080195B4: .4byte gBattleTextBuff1 _080195B8: .4byte gStatusConditionString_PoisonJpn _080195BC: movs r0, 0x58 @@ -7367,14 +7367,14 @@ _080195BC: bne _080195D6 b _080196D6 _080195D6: - ldr r0, _080195E4 @ =gUnknown_030041C0 + ldr r0, _080195E4 @ =gBattleTextBuff1 ldr r1, _080195E8 @ =gStatusConditionString_ConfusionJpn bl StringCopy movs r2, 0x2 mov r9, r2 b _080196DC .align 2, 0 -_080195E4: .4byte gUnknown_030041C0 +_080195E4: .4byte gBattleTextBuff1 _080195E8: .4byte gStatusConditionString_ConfusionJpn _080195EC: movs r0, 0x58 @@ -7389,11 +7389,11 @@ _080195EC: ands r0, r1 cmp r0, 0 beq _080196D6 - ldr r0, _0801960C @ =gUnknown_030041C0 + ldr r0, _0801960C @ =gBattleTextBuff1 ldr r1, _08019610 @ =gStatusConditionString_ParalysisJpn b _0801969C .align 2, 0 -_0801960C: .4byte gUnknown_030041C0 +_0801960C: .4byte gBattleTextBuff1 _08019610: .4byte gStatusConditionString_ParalysisJpn _08019614: movs r0, 0x58 @@ -7413,7 +7413,7 @@ _08019614: ldr r1, _08019644 @ =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r0, _08019648 @ =gUnknown_030041C0 + ldr r0, _08019648 @ =gBattleTextBuff1 ldr r1, _0801964C @ =gStatusConditionString_SleepJpn bl StringCopy movs r0, 0x1 @@ -7421,7 +7421,7 @@ _08019614: b _080196DC .align 2, 0 _08019644: .4byte 0xf7ffffff -_08019648: .4byte gUnknown_030041C0 +_08019648: .4byte gBattleTextBuff1 _0801964C: .4byte gStatusConditionString_SleepJpn _08019650: movs r0, 0x58 @@ -7436,14 +7436,14 @@ _08019650: ands r0, r1 cmp r0, 0 beq _080196D6 - ldr r0, _08019678 @ =gUnknown_030041C0 + ldr r0, _08019678 @ =gBattleTextBuff1 ldr r1, _0801967C @ =gStatusConditionString_BurnJpn bl StringCopy movs r2, 0x1 mov r9, r2 b _080196DC .align 2, 0 -_08019678: .4byte gUnknown_030041C0 +_08019678: .4byte gBattleTextBuff1 _0801967C: .4byte gStatusConditionString_BurnJpn _08019680: movs r0, 0x58 @@ -7458,7 +7458,7 @@ _08019680: ands r0, r1 cmp r0, 0 beq _080196D6 - ldr r0, _080196A8 @ =gUnknown_030041C0 + ldr r0, _080196A8 @ =gBattleTextBuff1 ldr r1, _080196AC @ =gStatusConditionString_IceJpn _0801969C: bl StringCopy @@ -7466,7 +7466,7 @@ _0801969C: mov r9, r5 b _080196DC .align 2, 0 -_080196A8: .4byte gUnknown_030041C0 +_080196A8: .4byte gBattleTextBuff1 _080196AC: .4byte gStatusConditionString_IceJpn _080196B0: movs r0, 0x58 @@ -7482,7 +7482,7 @@ _080196B0: ands r0, r1 cmp r0, 0 beq _080196D6 - ldr r0, _080196EC @ =gUnknown_030041C0 + ldr r0, _080196EC @ =gBattleTextBuff1 ldr r1, _080196F0 @ =gStatusConditionString_LoveJpn bl StringCopy movs r2, 0x3 @@ -7501,7 +7501,7 @@ _080196DC: beq _080196FC b _0801973C .align 2, 0 -_080196EC: .4byte gUnknown_030041C0 +_080196EC: .4byte gBattleTextBuff1 _080196F0: .4byte gStatusConditionString_LoveJpn _080196F4: mov r0, r9 @@ -7547,7 +7547,7 @@ _0801973A: str r0, [r2] _0801973C: bl b_movescr_stack_push_cursor - ldr r1, _08019780 @ =gUnknown_02024C10 + ldr r1, _08019780 @ =gBattlescriptCurrInstr ldr r0, _08019784 @ =gUnknown_081D9956 str r0, [r1] ldr r0, _08019788 @ =0x02000000 @@ -7555,7 +7555,7 @@ _0801973C: adds r0, r1 mov r2, r10 strb r2, [r0] - ldr r4, _08019790 @ =gUnknown_02024A60 + ldr r4, _08019790 @ =gActiveBank strb r2, [r4] ldrb r1, [r4] movs r0, 0x58 @@ -7567,18 +7567,18 @@ _0801973C: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution bl _08019F92 .align 2, 0 _08019778: .4byte gBattleMons _0801977C: .4byte 0xfff0ffff -_08019780: .4byte gUnknown_02024C10 +_08019780: .4byte gBattlescriptCurrInstr _08019784: .4byte gUnknown_081D9956 _08019788: .4byte 0x02000000 _0801978C: .4byte 0x00016003 -_08019790: .4byte gUnknown_02024A60 +_08019790: .4byte gActiveBank _08019794: .4byte gUnknown_02024ACC _08019798: mov r0, r10 @@ -7586,7 +7586,7 @@ _08019798: lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _080197B0 @ =gUnknown_02024A68 + ldr r0, _080197B0 @ =gNoOfAllBanks ldrb r0, [r0] cmp r10, r0 bcs _080197AC @@ -7594,11 +7594,11 @@ _08019798: _080197AC: bl _08019F76 .align 2, 0 -_080197B0: .4byte gUnknown_02024A68 +_080197B0: .4byte gNoOfAllBanks _080197B4: movs r3, 0 mov r10, r3 - ldr r0, _080197FC @ =gUnknown_02024A68 + ldr r0, _080197FC @ =gNoOfAllBanks ldrb r0, [r0] cmp r10, r0 bcc _080197C2 @@ -7629,13 +7629,13 @@ _080197E8: lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _080197FC @ =gUnknown_02024A68 + ldr r0, _080197FC @ =gNoOfAllBanks ldrb r0, [r0] cmp r10, r0 bcc _080197C4 b _08019F76 .align 2, 0 -_080197FC: .4byte gUnknown_02024A68 +_080197FC: .4byte gNoOfAllBanks _08019800: .4byte gBattleMons _08019804: mov r1, r8 @@ -7644,7 +7644,7 @@ _08019804: beq _0801980E b _08019F76 _0801980E: - ldr r4, _08019860 @ =gUnknown_02024C6C + ldr r4, _08019860 @ =gHitMarker ldr r1, [r4] movs r0, 0x80 lsls r0, 7 @@ -7667,17 +7667,17 @@ _0801981E: movs r0, 0x2 strb r0, [r2] _08019838: - ldr r1, _0801986C @ =gUnknown_02024D1E + ldr r1, _0801986C @ =gBattleCommunication ldrb r0, [r2] adds r0, 0x40 strb r0, [r1, 0x3] - ldr r0, _08019870 @ =gEnemyMonIndex + ldr r0, _08019870 @ =gBankTarget ldrb r1, [r0] ldr r5, _08019874 @ =0x00016003 adds r0, r7, r5 strb r1, [r0] bl b_movescr_stack_push_cursor - ldr r1, _08019878 @ =gUnknown_02024C10 + ldr r1, _08019878 @ =gBattlescriptCurrInstr ldr r0, _0801987C @ =gUnknown_081D9953 str r0, [r1] ldr r0, [r4] @@ -7687,13 +7687,13 @@ _08019838: str r0, [r4] b _08019F22 .align 2, 0 -_08019860: .4byte gUnknown_02024C6C +_08019860: .4byte gHitMarker _08019864: .4byte 0xffffbfff _08019868: .4byte 0x000160ca -_0801986C: .4byte gUnknown_02024D1E -_08019870: .4byte gEnemyMonIndex +_0801986C: .4byte gBattleCommunication +_08019870: .4byte gBankTarget _08019874: .4byte 0x00016003 -_08019878: .4byte gUnknown_02024C10 +_08019878: .4byte gBattlescriptCurrInstr _0801987C: .4byte gUnknown_081D9953 _08019880: mov r1, r8 @@ -7702,7 +7702,7 @@ _08019880: beq _0801988A b _08019F76 _0801988A: - ldr r4, _080198DC @ =gUnknown_02024C6C + ldr r4, _080198DC @ =gHitMarker ldr r1, [r4] movs r0, 0x80 lsls r0, 7 @@ -7725,16 +7725,16 @@ _0801989A: movs r0, 0x2 strb r0, [r2] _080198B4: - ldr r1, _080198E8 @ =gUnknown_02024D1E + ldr r1, _080198E8 @ =gBattleCommunication ldrb r0, [r2] strb r0, [r1, 0x3] - ldr r0, _080198EC @ =gPlayerMonIndex + ldr r0, _080198EC @ =gBankAttacker ldrb r1, [r0] ldr r5, _080198F0 @ =0x00016003 adds r0, r7, r5 strb r1, [r0] bl b_movescr_stack_push_cursor - ldr r1, _080198F4 @ =gUnknown_02024C10 + ldr r1, _080198F4 @ =gBattlescriptCurrInstr ldr r0, _080198F8 @ =gUnknown_081D9953 str r0, [r1] ldr r0, [r4] @@ -7744,17 +7744,17 @@ _080198B4: str r0, [r4] b _08019F22 .align 2, 0 -_080198DC: .4byte gUnknown_02024C6C +_080198DC: .4byte gHitMarker _080198E0: .4byte 0xffffbfff _080198E4: .4byte 0x000160ca -_080198E8: .4byte gUnknown_02024D1E -_080198EC: .4byte gPlayerMonIndex +_080198E8: .4byte gBattleCommunication +_080198EC: .4byte gBankAttacker _080198F0: .4byte 0x00016003 -_080198F4: .4byte gUnknown_02024C10 +_080198F4: .4byte gBattlescriptCurrInstr _080198F8: .4byte gUnknown_081D9953 _080198FC: movs r4, 0 - ldr r0, _08019934 @ =gUnknown_02024A68 + ldr r0, _08019934 @ =gNoOfAllBanks ldrb r1, [r0] cmp r4, r1 blt _08019908 @@ -7762,7 +7762,7 @@ _080198FC: _08019908: ldr r0, _08019938 @ =gBattleMons adds r5, r1, 0 - ldr r2, _0801993C @ =gUnknown_02024C98 + ldr r2, _0801993C @ =gStatuses3 adds r3, r0, 0 adds r3, 0x20 movs r6, 0x80 @@ -7784,18 +7784,18 @@ _08019926: blt _08019916 b _08019F76 .align 2, 0 -_08019934: .4byte gUnknown_02024A68 +_08019934: .4byte gNoOfAllBanks _08019938: .4byte gBattleMons -_0801993C: .4byte gUnknown_02024C98 +_0801993C: .4byte gStatuses3 _08019940: movs r4, 0 - ldr r0, _08019A1C @ =gUnknown_02024A68 + ldr r0, _08019A1C @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0801994C b _08019F76 _0801994C: - ldr r0, _08019A20 @ =gUnknown_02024A60 + ldr r0, _08019A20 @ =gActiveBank mov r8, r0 ldr r1, _08019A24 @ =gBattleMons adds r1, 0x20 @@ -7809,7 +7809,7 @@ _0801995A: beq _08019964 b _08019AF6 _08019964: - ldr r0, _08019A28 @ =gUnknown_02024C98 + ldr r0, _08019A28 @ =gStatuses3 ldr r5, [sp, 0x20] adds r0, r5, r0 ldr r1, [r0] @@ -7823,17 +7823,17 @@ _08019964: _0801997A: lsls r0, r4, 24 lsrs r0, 24 - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 adds r5, r0, 0 eors r5, r1 ands r5, r1 adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 adds r0, r5, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 ldr r0, _08019A2C @ =gBattleTypeFlags @@ -7878,7 +7878,7 @@ _080199AE: lsls r1, 1 orrs r5, r1 adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI mov r2, r8 strb r0, [r2] ldrb r0, [r2] @@ -7895,16 +7895,16 @@ _080199AE: adds r0, r5 adds r0, 0x20 ldrb r0, [r0] - ldr r2, _08019A30 @ =byte_2024C06 + ldr r2, _08019A30 @ =gLastUsedAbility strb r0, [r2] b _08019AE4 .align 2, 0 -_08019A1C: .4byte gUnknown_02024A68 -_08019A20: .4byte gUnknown_02024A60 +_08019A1C: .4byte gNoOfAllBanks +_08019A20: .4byte gActiveBank _08019A24: .4byte gBattleMons -_08019A28: .4byte gUnknown_02024C98 +_08019A28: .4byte gStatuses3 _08019A2C: .4byte gBattleTypeFlags -_08019A30: .4byte byte_2024C06 +_08019A30: .4byte gLastUsedAbility _08019A34: ldr r3, _08019A74 @ =gBattleMons movs r2, 0x58 @@ -7993,7 +7993,7 @@ _08019ABC: strb r1, [r0] ldrb r0, [r2] _08019AE0: - ldr r1, _08019B14 @ =byte_2024C06 + ldr r1, _08019B14 @ =gLastUsedAbility strb r0, [r1] _08019AE4: mov r0, r9 @@ -8014,7 +8014,7 @@ _08019AF6: adds r5, 0x4 str r5, [sp, 0x20] adds r4, 0x1 - ldr r0, _08019B18 @ =gUnknown_02024A68 + ldr r0, _08019B18 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bge _08019B0E @@ -8023,11 +8023,11 @@ _08019B0E: b _08019F76 .align 2, 0 _08019B10: .4byte gBattleMons -_08019B14: .4byte byte_2024C06 -_08019B18: .4byte gUnknown_02024A68 +_08019B14: .4byte gLastUsedAbility +_08019B18: .4byte gNoOfAllBanks _08019B1C: movs r4, 0 - ldr r0, _08019B54 @ =gUnknown_02024A68 + ldr r0, _08019B54 @ =gNoOfAllBanks ldrb r1, [r0] cmp r4, r1 blt _08019B28 @@ -8035,7 +8035,7 @@ _08019B1C: _08019B28: ldr r0, _08019B58 @ =gBattleMons adds r5, r1, 0 - ldr r2, _08019B5C @ =gUnknown_02024C98 + ldr r2, _08019B5C @ =gStatuses3 adds r3, r0, 0 adds r3, 0x20 movs r6, 0x80 @@ -8057,16 +8057,16 @@ _08019B46: blt _08019B36 b _08019F76 .align 2, 0 -_08019B54: .4byte gUnknown_02024A68 +_08019B54: .4byte gNoOfAllBanks _08019B58: .4byte gBattleMons -_08019B5C: .4byte gUnknown_02024C98 +_08019B5C: .4byte gStatuses3 _08019B60: mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _08019BB0 @ =gUnknown_02024A68 + ldr r0, _08019BB0 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019B76 @@ -8076,7 +8076,7 @@ _08019B76: _08019B78: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 adds r3, r4, 0x1 @@ -8089,29 +8089,29 @@ _08019B78: ldrb r0, [r0] cmp r0, r6 bne _08019BA2 - ldr r0, _08019BB8 @ =byte_2024C06 + ldr r0, _08019BB8 @ =gLastUsedAbility strb r6, [r0] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 _08019BA2: adds r4, r3, 0 - ldr r0, _08019BB0 @ =gUnknown_02024A68 + ldr r0, _08019BB0 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019B78 b _08019F76 .align 2, 0 -_08019BB0: .4byte gUnknown_02024A68 +_08019BB0: .4byte gNoOfAllBanks _08019BB4: .4byte gBattleMons -_08019BB8: .4byte byte_2024C06 +_08019BB8: .4byte gLastUsedAbility _08019BBC: mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _08019C0C @ =gUnknown_02024A68 + ldr r0, _08019C0C @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019BD2 @@ -8121,7 +8121,7 @@ _08019BD2: _08019BD4: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 adds r3, r4, 0x1 @@ -8134,22 +8134,22 @@ _08019BD4: ldrb r0, [r0] cmp r0, r6 bne _08019BFE - ldr r0, _08019C14 @ =byte_2024C06 + ldr r0, _08019C14 @ =gLastUsedAbility strb r6, [r0] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 _08019BFE: adds r4, r3, 0 - ldr r0, _08019C0C @ =gUnknown_02024A68 + ldr r0, _08019C0C @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019BD4 b _08019F76 .align 2, 0 -_08019C0C: .4byte gUnknown_02024A68 +_08019C0C: .4byte gNoOfAllBanks _08019C10: .4byte gBattleMons -_08019C14: .4byte byte_2024C06 +_08019C14: .4byte gLastUsedAbility _08019C18: mov r1, r8 ldrb r0, [r1] @@ -8158,7 +8158,7 @@ _08019C18: cmp r0, 0xFE beq _08019C78 movs r4, 0 - ldr r0, _08019C38 @ =gUnknown_02024A68 + ldr r0, _08019C38 @ =gNoOfAllBanks adds r5, r0, 0 ldrb r2, [r5] cmp r4, r2 @@ -8168,17 +8168,17 @@ _08019C32: ldr r2, _08019C3C @ =gBattleMons b _08019CB0 .align 2, 0 -_08019C38: .4byte gUnknown_02024A68 +_08019C38: .4byte gNoOfAllBanks _08019C3C: .4byte gBattleMons _08019C40: movs r4, 0 - ldr r0, _08019C70 @ =gUnknown_02024A68 + ldr r0, _08019C70 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019C4C b _08019F76 _08019C4C: - ldr r5, _08019C74 @ =gUnknown_02024C98 + ldr r5, _08019C74 @ =gStatuses3 movs r2, 0x80 lsls r2, 9 adds r1, r0, 0 @@ -8199,17 +8199,17 @@ _08019C68: blt _08019C54 b _08019F76 .align 2, 0 -_08019C70: .4byte gUnknown_02024A68 -_08019C74: .4byte gUnknown_02024C98 +_08019C70: .4byte gNoOfAllBanks +_08019C74: .4byte gStatuses3 _08019C78: movs r4, 0 - ldr r0, _08019CA8 @ =gUnknown_02024A68 + ldr r0, _08019CA8 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019C84 b _08019F76 _08019C84: - ldr r5, _08019CAC @ =gUnknown_02024C98 + ldr r5, _08019CAC @ =gStatuses3 movs r2, 0x80 lsls r2, 10 adds r1, r0, 0 @@ -8230,8 +8230,8 @@ _08019CA0: blt _08019C8C b _08019F76 .align 2, 0 -_08019CA8: .4byte gUnknown_02024A68 -_08019CAC: .4byte gUnknown_02024C98 +_08019CA8: .4byte gNoOfAllBanks +_08019CAC: .4byte gStatuses3 _08019CB0: movs r0, 0x58 muls r0, r4 @@ -8254,7 +8254,7 @@ _08019CCA: b _08019F76 _08019CD4: movs r4, 0 - ldr r0, _08019D10 @ =gUnknown_02024A68 + ldr r0, _08019D10 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019CE0 @@ -8287,11 +8287,11 @@ _08019D08: blt _08019CE6 b _08019F76 .align 2, 0 -_08019D10: .4byte gUnknown_02024A68 +_08019D10: .4byte gNoOfAllBanks _08019D14: .4byte gBattleMons _08019D18: movs r4, 0 - ldr r0, _08019D50 @ =gUnknown_02024A68 + ldr r0, _08019D50 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019D24 @@ -8300,7 +8300,7 @@ _08019D24: ldr r7, _08019D54 @ =gBattleMons adds r1, r0, 0 movs r5, 0x58 - ldr r2, _08019D58 @ =byte_2024C06 + ldr r2, _08019D58 @ =gLastUsedAbility _08019D2C: adds r0, r4, 0 muls r0, r5 @@ -8322,16 +8322,16 @@ _08019D48: blt _08019D2C b _08019F76 .align 2, 0 -_08019D50: .4byte gUnknown_02024A68 +_08019D50: .4byte gNoOfAllBanks _08019D54: .4byte gBattleMons -_08019D58: .4byte byte_2024C06 +_08019D58: .4byte gLastUsedAbility _08019D5C: mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _08019DAC @ =gUnknown_02024A68 + ldr r0, _08019DAC @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019D72 @@ -8341,7 +8341,7 @@ _08019D72: _08019D74: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, r5 @@ -8353,7 +8353,7 @@ _08019D74: ldrb r0, [r0] cmp r0, r6 bne _08019DA0 - ldr r0, _08019DB4 @ =byte_2024C06 + ldr r0, _08019DB4 @ =gLastUsedAbility strb r6, [r0] mov r0, r9 adds r0, 0x1 @@ -8362,22 +8362,22 @@ _08019D74: mov r9, r0 _08019DA0: adds r4, 0x1 - ldr r0, _08019DAC @ =gUnknown_02024A68 + ldr r0, _08019DAC @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019D74 b _08019F76 .align 2, 0 -_08019DAC: .4byte gUnknown_02024A68 +_08019DAC: .4byte gNoOfAllBanks _08019DB0: .4byte gBattleMons -_08019DB4: .4byte byte_2024C06 +_08019DB4: .4byte gLastUsedAbility _08019DB8: mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _08019E08 @ =gUnknown_02024A68 + ldr r0, _08019E08 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019DCE @@ -8387,7 +8387,7 @@ _08019DCE: _08019DD0: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, r5 @@ -8399,7 +8399,7 @@ _08019DD0: ldrb r0, [r0] cmp r0, r6 bne _08019DFC - ldr r0, _08019E10 @ =byte_2024C06 + ldr r0, _08019E10 @ =gLastUsedAbility strb r6, [r0] mov r0, r9 adds r0, 0x1 @@ -8408,15 +8408,15 @@ _08019DD0: mov r9, r0 _08019DFC: adds r4, 0x1 - ldr r0, _08019E08 @ =gUnknown_02024A68 + ldr r0, _08019E08 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08019DD0 b _08019F76 .align 2, 0 -_08019E08: .4byte gUnknown_02024A68 +_08019E08: .4byte gNoOfAllBanks _08019E0C: .4byte gBattleMons -_08019E10: .4byte byte_2024C06 +_08019E10: .4byte gLastUsedAbility _08019E14: ldr r0, _08019E30 @ =gUnknown_081D977D bl b_push_move_exec @@ -8470,7 +8470,7 @@ _08019E84: .4byte gUnknown_081D978C _08019E88: ldr r0, _08019EDC @ =gUnknown_081D9726 bl b_push_move_exec - ldr r1, _08019EE0 @ =gUnknown_02024C98 + ldr r1, _08019EE0 @ =gStatuses3 ldr r2, [sp, 0x18] adds r1, r2, r1 ldr r0, [r1] @@ -8481,15 +8481,15 @@ _08019E88: ldr r3, _08019EEC @ =0x00016003 adds r0, r3 strb r4, [r0] - ldr r1, _08019EF0 @ =gUnknown_030041C0 + ldr r1, _08019EF0 @ =gBattleTextBuff1 movs r4, 0xFD strb r4, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r2, _08019EF4 @ =gUnknown_02024A60 + ldr r2, _08019EF4 @ =gActiveBank ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, _08019EF8 @ =gUnknown_02024A6A + ldr r3, _08019EF8 @ =gBattlePartyID ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -8497,11 +8497,11 @@ _08019E88: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08019EFC @ =gUnknown_03004290 + ldr r1, _08019EFC @ =gBattleTextBuff2 strb r4, [r1] movs r0, 0x9 strb r0, [r1, 0x1] - ldr r0, _08019F00 @ =byte_2024C06 + ldr r0, _08019F00 @ =gLastUsedAbility ldrb r0, [r0] strb r0, [r1, 0x2] movs r0, 0x1 @@ -8510,15 +8510,15 @@ _08019E88: b _08019F76 .align 2, 0 _08019EDC: .4byte gUnknown_081D9726 -_08019EE0: .4byte gUnknown_02024C98 +_08019EE0: .4byte gStatuses3 _08019EE4: .4byte 0xffefffff _08019EE8: .4byte 0x02000000 _08019EEC: .4byte 0x00016003 -_08019EF0: .4byte gUnknown_030041C0 -_08019EF4: .4byte gUnknown_02024A60 -_08019EF8: .4byte gUnknown_02024A6A -_08019EFC: .4byte gUnknown_03004290 -_08019F00: .4byte byte_2024C06 +_08019EF0: .4byte gBattleTextBuff1 +_08019EF4: .4byte gActiveBank +_08019EF8: .4byte gBattlePartyID +_08019EFC: .4byte gBattleTextBuff2 +_08019F00: .4byte gLastUsedAbility _08019F04: mov r5, r8 strb r1, [r5] @@ -8527,7 +8527,7 @@ _08019F04: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08019F34 @ =gUnknown_02024C10 + ldr r1, _08019F34 @ =gBattlescriptCurrInstr ldr r0, _08019F38 @ =gUnknown_081D9795 str r0, [r1] _08019F1A: @@ -8544,13 +8544,13 @@ _08019F22: b _08019F76 .align 2, 0 _08019F30: .4byte 0xfff7ffff -_08019F34: .4byte gUnknown_02024C10 +_08019F34: .4byte gBattlescriptCurrInstr _08019F38: .4byte gUnknown_081D9795 _08019F3C: .4byte 0x02000000 _08019F40: .4byte 0x000160dd _08019F44: movs r4, 0 - ldr r0, _08019FA4 @ =gUnknown_02024A68 + ldr r0, _08019FA4 @ =gNoOfAllBanks ldrb r1, [r0] cmp r4, r1 bge _08019F76 @@ -8558,7 +8558,7 @@ _08019F44: adds r2, r1, 0 adds r1, r0, 0 adds r1, 0x20 - ldr r3, _08019FAC @ =byte_2024C06 + ldr r3, _08019FAC @ =gLastUsedAbility _08019F58: ldrb r0, [r1] cmp r0, r6 @@ -8584,7 +8584,7 @@ _08019F7C: ldr r3, [sp, 0x4] cmp r3, 0xB bhi _08019F92 - ldr r1, _08019FAC @ =byte_2024C06 + ldr r1, _08019FAC @ =gLastUsedAbility ldrb r0, [r1] cmp r0, 0xFF beq _08019F92 @@ -8602,14 +8602,14 @@ _08019F92: pop {r1} bx r1 .align 2, 0 -_08019FA4: .4byte gUnknown_02024A68 +_08019FA4: .4byte gNoOfAllBanks _08019FA8: .4byte gBattleMons -_08019FAC: .4byte byte_2024C06 - thumb_func_end sub_8018324 +_08019FAC: .4byte gLastUsedAbility + thumb_func_end AbilityBattleEffects thumb_func_start b_call_bc_move_exec b_call_bc_move_exec: @ 8019FB0 - ldr r1, _08019FD8 @ =gUnknown_02024C10 + ldr r1, _08019FD8 @ =gBattlescriptCurrInstr str r0, [r1] ldr r3, _08019FDC @ =0x02017140 adds r2, r3, 0 @@ -8620,21 +8620,21 @@ b_call_bc_move_exec: @ 8019FB0 lsls r0, 24 lsrs r0, 22 adds r0, r3 - ldr r2, _08019FE0 @ =gUnknown_030042D4 + ldr r2, _08019FE0 @ =gBattleMainFunc ldr r1, [r2] str r1, [r0] ldr r0, _08019FE4 @ =sub_8013F54 str r0, [r2] - ldr r1, _08019FE8 @ =gUnknown_02024A7F + ldr r1, _08019FE8 @ =gFightStateTracker movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_08019FD8: .4byte gUnknown_02024C10 +_08019FD8: .4byte gBattlescriptCurrInstr _08019FDC: .4byte 0x02017140 -_08019FE0: .4byte gUnknown_030042D4 +_08019FE0: .4byte gBattleMainFunc _08019FE4: .4byte sub_8013F54 -_08019FE8: .4byte gUnknown_02024A7F +_08019FE8: .4byte gFightStateTracker thumb_func_end b_call_bc_move_exec thumb_func_start b_push_move_exec @@ -8642,7 +8642,7 @@ b_push_move_exec: @ 8019FEC push {r4,lr} adds r4, r0, 0 bl b_movescr_stack_push_cursor - ldr r0, _0801A01C @ =gUnknown_02024C10 + ldr r0, _0801A01C @ =gBattlescriptCurrInstr str r4, [r0] ldr r3, _0801A020 @ =0x02017140 adds r2, r3, 0 @@ -8653,7 +8653,7 @@ b_push_move_exec: @ 8019FEC lsls r0, 24 lsrs r0, 22 adds r0, r3 - ldr r2, _0801A024 @ =gUnknown_030042D4 + ldr r2, _0801A024 @ =gBattleMainFunc ldr r1, [r2] str r1, [r0] ldr r0, _0801A028 @ =sub_8013FBC @@ -8662,9 +8662,9 @@ b_push_move_exec: @ 8019FEC pop {r0} bx r0 .align 2, 0 -_0801A01C: .4byte gUnknown_02024C10 +_0801A01C: .4byte gBattlescriptCurrInstr _0801A020: .4byte 0x02017140 -_0801A024: .4byte gUnknown_030042D4 +_0801A024: .4byte gBattleMainFunc _0801A028: .4byte sub_8013FBC thumb_func_end b_push_move_exec @@ -8689,7 +8689,7 @@ sub_801A02C: @ 801A02C str r1, [sp, 0xC] add r0, sp, 0x4 strb r1, [r0] - ldr r4, _0801A078 @ =gUnknown_02024C04 + ldr r4, _0801A078 @ =gLastUsedItem ldr r1, _0801A07C @ =gBattleMons movs r0, 0x58 muls r0, r7 @@ -8709,7 +8709,7 @@ sub_801A02C: @ 801A02C ldrb r0, [r0, 0x1A] b _0801A098 .align 2, 0 -_0801A078: .4byte gUnknown_02024C04 +_0801A078: .4byte gLastUsedItem _0801A07C: .4byte gBattleMons _0801A080: .4byte gEnigmaBerries _0801A084: @@ -8724,7 +8724,7 @@ _0801A084: _0801A098: mov r9, r0 ldr r1, _0801A0C0 @ =gBattleMons - ldr r0, _0801A0C4 @ =gPlayerMonIndex + ldr r0, _0801A0C4 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -8744,7 +8744,7 @@ _0801A098: b _0801A0E2 .align 2, 0 _0801A0C0: .4byte gBattleMons -_0801A0C4: .4byte gPlayerMonIndex +_0801A0C4: .4byte gBankAttacker _0801A0C8: .4byte gEnigmaBerries _0801A0CC: ldr r0, [sp, 0x14] @@ -8759,7 +8759,7 @@ _0801A0CC: _0801A0E2: str r0, [sp, 0x10] ldr r2, _0801A118 @ =gBattleMons - ldr r0, _0801A11C @ =gEnemyMonIndex + ldr r0, _0801A11C @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -8784,7 +8784,7 @@ _0801A10C: mov pc, r0 .align 2, 0 _0801A118: .4byte gBattleMons -_0801A11C: .4byte gEnemyMonIndex +_0801A11C: .4byte gBankTarget _0801A120: .4byte _0801A124 .align 2, 0 _0801A124: @@ -8846,10 +8846,10 @@ _0801A198: ldr r2, _0801A1C0 @ =0x00016003 adds r0, r2 strb r7, [r0] - ldr r0, _0801A1C4 @ =gUnknown_02024C0B + ldr r0, _0801A1C4 @ =gStringBank strb r7, [r0] - ldr r1, _0801A1C8 @ =gUnknown_02024A60 - ldr r0, _0801A1CC @ =gPlayerMonIndex + ldr r1, _0801A1C8 @ =gActiveBank + ldr r0, _0801A1CC @ =gBankAttacker strb r7, [r0] strb r7, [r1] ldr r0, _0801A1D0 @ =gUnknown_081D9A5E @@ -8859,9 +8859,9 @@ _0801A198: _0801A1B8: .4byte gBattleMons _0801A1BC: .4byte 0x02000000 _0801A1C0: .4byte 0x00016003 -_0801A1C4: .4byte gUnknown_02024C0B -_0801A1C8: .4byte gUnknown_02024A60 -_0801A1CC: .4byte gPlayerMonIndex +_0801A1C4: .4byte gStringBank +_0801A1C8: .4byte gActiveBank +_0801A1CC: .4byte gBankAttacker _0801A1D0: .4byte gUnknown_081D9A5E _0801A1D4: ldr r1, _0801A1FC @ =gBattleMons @@ -8974,11 +8974,11 @@ _0801A2F8: bl _0801AD5A _0801A300: adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0801A324 - ldr r1, _0801A31C @ =gUnknown_02024A6A + ldr r1, _0801A31C @ =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -8987,10 +8987,10 @@ _0801A300: ldr r0, _0801A320 @ =gPlayerParty b _0801A332 .align 2, 0 -_0801A31C: .4byte gUnknown_02024A6A +_0801A31C: .4byte gBattlePartyID _0801A320: .4byte gPlayerParty _0801A324: - ldr r1, _0801A3A0 @ =gUnknown_02024A6A + ldr r1, _0801A3A0 @ =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -9052,13 +9052,13 @@ _0801A37E: strb r2, [r0] b _0801A3AC .align 2, 0 -_0801A3A0: .4byte gUnknown_02024A6A +_0801A3A0: .4byte gBattlePartyID _0801A3A4: .4byte gEnemyParty _0801A3A8: add r0, sp, 0x4 strb r1, [r0] _0801A3AC: - ldr r1, _0801A3EC @ =gUnknown_030041C0 + ldr r1, _0801A3EC @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -9079,17 +9079,17 @@ _0801A3AC: movs r0, 0 movs r2, 0 movs r3, 0x1 - bl dp01_build_cmdbuf_x02_a_b_varargs - ldr r0, _0801A3F4 @ =gUnknown_02024A60 + bl EmitSetAttributes + ldr r0, _0801A3F4 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution movs r1, 0x3 str r1, [sp, 0xC] bl _0801AD62 .align 2, 0 -_0801A3EC: .4byte gUnknown_030041C0 +_0801A3EC: .4byte gBattleTextBuff1 _0801A3F0: .4byte gUnknown_081D9A91 -_0801A3F4: .4byte gUnknown_02024A60 +_0801A3F4: .4byte gActiveBank _0801A3F8: ldr r0, _0801A450 @ =gBattleMons movs r1, 0x58 @@ -9126,10 +9126,10 @@ _0801A432: ldr r3, _0801A458 @ =0x00016003 adds r0, r3 strb r7, [r0] - ldr r0, _0801A45C @ =gUnknown_02024C0B + ldr r0, _0801A45C @ =gStringBank strb r7, [r0] - ldr r1, _0801A460 @ =gUnknown_02024A60 - ldr r0, _0801A464 @ =gPlayerMonIndex + ldr r1, _0801A460 @ =gActiveBank + ldr r0, _0801A464 @ =gBankAttacker strb r7, [r0] strb r7, [r1] ldr r0, _0801A468 @ =gUnknown_081D9A5E @@ -9139,9 +9139,9 @@ _0801A432: _0801A450: .4byte gBattleMons _0801A454: .4byte 0x02000000 _0801A458: .4byte 0x00016003 -_0801A45C: .4byte gUnknown_02024C0B -_0801A460: .4byte gUnknown_02024A60 -_0801A464: .4byte gPlayerMonIndex +_0801A45C: .4byte gStringBank +_0801A460: .4byte gActiveBank +_0801A464: .4byte gBankAttacker _0801A468: .4byte gUnknown_081D9A5E _0801A46C: movs r0, 0x58 @@ -9207,7 +9207,7 @@ _0801A4E4: beq _0801A4EC bl _0801AD5A _0801A4EC: - ldr r1, _0801A540 @ =gUnknown_030041C0 + ldr r1, _0801A540 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -9252,7 +9252,7 @@ _0801A532: _0801A53E: b _0801A74C .align 2, 0 -_0801A540: .4byte gUnknown_030041C0 +_0801A540: .4byte gBattleTextBuff1 _0801A544: .4byte gBattleMoveDamage _0801A548: movs r0, 0x58 @@ -9272,7 +9272,7 @@ _0801A562: beq _0801A56A bl _0801AD5A _0801A56A: - ldr r1, _0801A5BC @ =gUnknown_030041C0 + ldr r1, _0801A5BC @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -9314,7 +9314,7 @@ _0801A59E: blt _0801A6A4 b _0801A6B8 .align 2, 0 -_0801A5BC: .4byte gUnknown_030041C0 +_0801A5BC: .4byte gBattleTextBuff1 _0801A5C0: .4byte gBattleMoveDamage _0801A5C4: movs r0, 0x58 @@ -9334,7 +9334,7 @@ _0801A5DC: beq _0801A5E2 b _0801AD5A _0801A5E2: - ldr r1, _0801A62C @ =gUnknown_030041C0 + ldr r1, _0801A62C @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -9373,7 +9373,7 @@ _0801A618: movs r1, 0x2 b _0801A532 .align 2, 0 -_0801A62C: .4byte gUnknown_030041C0 +_0801A62C: .4byte gBattleTextBuff1 _0801A630: .4byte gBattleMoveDamage _0801A634: movs r0, 0x58 @@ -9393,7 +9393,7 @@ _0801A64C: beq _0801A652 b _0801AD5A _0801A652: - ldr r1, _0801A6AC @ =gUnknown_030041C0 + ldr r1, _0801A6AC @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -9439,7 +9439,7 @@ _0801A6A4: bl b_call_bc_move_exec b _0801A6BE .align 2, 0 -_0801A6AC: .4byte gUnknown_030041C0 +_0801A6AC: .4byte gBattleTextBuff1 _0801A6B0: .4byte gBattleMoveDamage _0801A6B4: .4byte gUnknown_081D9AD4 _0801A6B8: @@ -9469,7 +9469,7 @@ _0801A6E0: beq _0801A6E6 b _0801AD5A _0801A6E6: - ldr r1, _0801A740 @ =gUnknown_030041C0 + ldr r1, _0801A740 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -9515,7 +9515,7 @@ _0801A738: bl b_call_bc_move_exec b _0801A752 .align 2, 0 -_0801A740: .4byte gUnknown_030041C0 +_0801A740: .4byte gBattleTextBuff1 _0801A744: .4byte gBattleMoveDamage _0801A748: .4byte gUnknown_081D9AD4 _0801A74C: @@ -9550,7 +9550,7 @@ _0801A77A: ble _0801A784 b _0801AD5A _0801A784: - ldr r1, _0801A7BC @ =gUnknown_030041C0 + ldr r1, _0801A7BC @ =gBattleTextBuff1 movs r2, 0xFD strb r2, [r1] movs r0, 0x5 @@ -9559,7 +9559,7 @@ _0801A784: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _0801A7C0 @ =gUnknown_03004290 + ldr r1, _0801A7C0 @ =gBattleTextBuff2 strb r2, [r1] strb r6, [r1, 0x1] movs r0, 0xD2 @@ -9567,7 +9567,7 @@ _0801A784: strb r6, [r1, 0x3] subs r0, 0xD3 strb r0, [r1, 0x4] - ldr r0, _0801A7C4 @ =gUnknown_02024C0A + ldr r0, _0801A7C4 @ =gEffectBank strb r7, [r0] ldr r1, _0801A7C8 @ =0x02000000 ldr r3, _0801A7CC @ =0x0001601e @@ -9579,9 +9579,9 @@ _0801A784: movs r0, 0xF b _0801A94C .align 2, 0 -_0801A7BC: .4byte gUnknown_030041C0 -_0801A7C0: .4byte gUnknown_03004290 -_0801A7C4: .4byte gUnknown_02024C0A +_0801A7BC: .4byte gBattleTextBuff1 +_0801A7C0: .4byte gBattleTextBuff2 +_0801A7C4: .4byte gEffectBank _0801A7C8: .4byte 0x02000000 _0801A7CC: .4byte 0x0001601e _0801A7D0: .4byte 0x000160a4 @@ -9608,7 +9608,7 @@ _0801A7F2: ble _0801A7FC b _0801AD5A _0801A7FC: - ldr r1, _0801A824 @ =gUnknown_030041C0 + ldr r1, _0801A824 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -9617,7 +9617,7 @@ _0801A7FC: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _0801A828 @ =gUnknown_02024C0A + ldr r0, _0801A828 @ =gEffectBank strb r7, [r0] ldr r1, _0801A82C @ =0x02000000 ldr r3, _0801A830 @ =0x0001601e @@ -9629,8 +9629,8 @@ _0801A7FC: movs r0, 0x10 b _0801A94C .align 2, 0 -_0801A824: .4byte gUnknown_030041C0 -_0801A828: .4byte gUnknown_02024C0A +_0801A824: .4byte gBattleTextBuff1 +_0801A828: .4byte gEffectBank _0801A82C: .4byte 0x02000000 _0801A830: .4byte 0x0001601e _0801A834: .4byte 0x000160a4 @@ -9657,7 +9657,7 @@ _0801A856: ble _0801A860 b _0801AD5A _0801A860: - ldr r1, _0801A888 @ =gUnknown_030041C0 + ldr r1, _0801A888 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -9666,7 +9666,7 @@ _0801A860: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _0801A88C @ =gUnknown_02024C0A + ldr r0, _0801A88C @ =gEffectBank strb r7, [r0] ldr r1, _0801A890 @ =0x02000000 ldr r3, _0801A894 @ =0x0001601e @@ -9678,8 +9678,8 @@ _0801A860: movs r0, 0x11 b _0801A94C .align 2, 0 -_0801A888: .4byte gUnknown_030041C0 -_0801A88C: .4byte gUnknown_02024C0A +_0801A888: .4byte gBattleTextBuff1 +_0801A88C: .4byte gEffectBank _0801A890: .4byte 0x02000000 _0801A894: .4byte 0x0001601e _0801A898: .4byte 0x000160a4 @@ -9706,7 +9706,7 @@ _0801A8BA: ble _0801A8C4 b _0801AD5A _0801A8C4: - ldr r1, _0801A8EC @ =gUnknown_030041C0 + ldr r1, _0801A8EC @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -9715,7 +9715,7 @@ _0801A8C4: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _0801A8F0 @ =gUnknown_02024C0A + ldr r0, _0801A8F0 @ =gEffectBank strb r7, [r0] ldr r1, _0801A8F4 @ =0x02000000 ldr r3, _0801A8F8 @ =0x0001601e @@ -9727,8 +9727,8 @@ _0801A8C4: movs r0, 0x12 b _0801A94C .align 2, 0 -_0801A8EC: .4byte gUnknown_030041C0 -_0801A8F0: .4byte gUnknown_02024C0A +_0801A8EC: .4byte gBattleTextBuff1 +_0801A8F0: .4byte gEffectBank _0801A8F4: .4byte 0x02000000 _0801A8F8: .4byte 0x0001601e _0801A8FC: .4byte 0x000160a4 @@ -9755,7 +9755,7 @@ _0801A91E: ble _0801A928 b _0801AD5A _0801A928: - ldr r1, _0801A960 @ =gUnknown_030041C0 + ldr r1, _0801A960 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -9763,7 +9763,7 @@ _0801A928: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _0801A964 @ =gUnknown_02024C0A + ldr r0, _0801A964 @ =gEffectBank strb r7, [r0] ldr r1, _0801A968 @ =0x02000000 ldr r3, _0801A96C @ =0x0001601e @@ -9784,8 +9784,8 @@ _0801A94C: str r0, [sp, 0xC] b _0801AD62 .align 2, 0 -_0801A960: .4byte gUnknown_030041C0 -_0801A964: .4byte gUnknown_02024C0A +_0801A960: .4byte gBattleTextBuff1 +_0801A964: .4byte gEffectBank _0801A968: .4byte 0x02000000 _0801A96C: .4byte 0x0001601e _0801A970: .4byte 0x000160a4 @@ -9899,7 +9899,7 @@ _0801AA28: asrs r0, 24 cmp r0, 0xC beq _0801AA28 - ldr r1, _0801AAA8 @ =gUnknown_030041C0 + ldr r1, _0801AAA8 @ =gBattleTextBuff1 movs r3, 0 movs r2, 0xFD strb r2, [r1] @@ -9910,7 +9910,7 @@ _0801AA28: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _0801AAAC @ =gUnknown_03004290 + ldr r0, _0801AAAC @ =gBattleTextBuff2 strb r2, [r0] strb r3, [r0, 0x1] movs r1, 0xD1 @@ -9922,7 +9922,7 @@ _0801AA28: strb r3, [r0, 0x6] subs r1, 0xD3 strb r1, [r0, 0x7] - ldr r0, _0801AAB0 @ =gUnknown_02024C0A + ldr r0, _0801AAB0 @ =gEffectBank strb r7, [r0] ldr r1, _0801AAB4 @ =0x02000000 mov r2, r10 @@ -9944,9 +9944,9 @@ _0801AA28: b _0801AD62 .align 2, 0 _0801AAA4: .4byte gUnknown_02024A98 -_0801AAA8: .4byte gUnknown_030041C0 -_0801AAAC: .4byte gUnknown_03004290 -_0801AAB0: .4byte gUnknown_02024C0A +_0801AAA8: .4byte gBattleTextBuff1 +_0801AAAC: .4byte gBattleTextBuff2 +_0801AAB0: .4byte gEffectBank _0801AAB4: .4byte 0x02000000 _0801AAB8: .4byte 0x0001601e _0801AABC: .4byte 0x000160a4 @@ -10134,7 +10134,7 @@ _0801AC1E: ands r2, r0 cmp r2, 0 beq _0801AC36 - ldr r0, _0801ACC4 @ =gUnknown_030041C0 + ldr r0, _0801ACC4 @ =gBattleTextBuff1 ldr r1, _0801ACC8 @ =gStatusConditionString_PoisonJpn bl StringCopy movs r0, 0x1 @@ -10153,7 +10153,7 @@ _0801AC36: ldr r1, _0801ACCC @ =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r0, _0801ACC4 @ =gUnknown_030041C0 + ldr r0, _0801ACC4 @ =gBattleTextBuff1 ldr r1, _0801ACD0 @ =gStatusConditionString_SleepJpn bl StringCopy movs r2, 0x1 @@ -10164,7 +10164,7 @@ _0801AC5C: ands r0, r1 cmp r0, 0 beq _0801AC72 - ldr r0, _0801ACC4 @ =gUnknown_030041C0 + ldr r0, _0801ACC4 @ =gBattleTextBuff1 ldr r1, _0801ACD4 @ =gStatusConditionString_ParalysisJpn bl StringCopy movs r3, 0x1 @@ -10175,7 +10175,7 @@ _0801AC72: ands r0, r1 cmp r0, 0 beq _0801AC88 - ldr r0, _0801ACC4 @ =gUnknown_030041C0 + ldr r0, _0801ACC4 @ =gBattleTextBuff1 ldr r1, _0801ACD8 @ =gStatusConditionString_BurnJpn bl StringCopy movs r0, 0x1 @@ -10186,7 +10186,7 @@ _0801AC88: ands r0, r1 cmp r0, 0 beq _0801AC9E - ldr r0, _0801ACC4 @ =gUnknown_030041C0 + ldr r0, _0801ACC4 @ =gBattleTextBuff1 ldr r1, _0801ACDC @ =gStatusConditionString_IceJpn bl StringCopy movs r1, 0x1 @@ -10198,7 +10198,7 @@ _0801AC9E: ands r0, r2 cmp r0, 0 beq _0801ACB6 - ldr r0, _0801ACC4 @ =gUnknown_030041C0 + ldr r0, _0801ACC4 @ =gBattleTextBuff1 ldr r1, _0801ACE0 @ =gStatusConditionString_ConfusionJpn bl StringCopy movs r3, 0x1 @@ -10207,11 +10207,11 @@ _0801ACB6: mov r4, r10 cmp r4, 0x1 bgt _0801ACE8 - ldr r1, _0801ACE4 @ =gUnknown_02024D1E + ldr r1, _0801ACE4 @ =gBattleCommunication movs r0, 0 b _0801ACEC .align 2, 0 -_0801ACC4: .4byte gUnknown_030041C0 +_0801ACC4: .4byte gBattleTextBuff1 _0801ACC8: .4byte gStatusConditionString_PoisonJpn _0801ACCC: .4byte 0xf7ffffff _0801ACD0: .4byte gStatusConditionString_SleepJpn @@ -10219,9 +10219,9 @@ _0801ACD4: .4byte gStatusConditionString_ParalysisJpn _0801ACD8: .4byte gStatusConditionString_BurnJpn _0801ACDC: .4byte gStatusConditionString_IceJpn _0801ACE0: .4byte gStatusConditionString_ConfusionJpn -_0801ACE4: .4byte gUnknown_02024D1E +_0801ACE4: .4byte gBattleCommunication _0801ACE8: - ldr r1, _0801AD18 @ =gUnknown_02024D1E + ldr r1, _0801AD18 @ =gBattleCommunication movs r0, 0x1 _0801ACEC: strb r0, [r1, 0x5] @@ -10247,7 +10247,7 @@ _0801AD0E: str r5, [sp, 0xC] b _0801AD62 .align 2, 0 -_0801AD18: .4byte gUnknown_02024D1E +_0801AD18: .4byte gBattleCommunication _0801AD1C: .4byte gBattleMons _0801AD20: .4byte gUnknown_081D9A44 _0801AD24: @@ -10266,12 +10266,12 @@ _0801AD24: ldr r0, _0801AD84 @ =0xfff0ffff ands r2, r0 str r2, [r1] - ldr r0, _0801AD88 @ =gUnknown_030041C0 + ldr r0, _0801AD88 @ =gBattleTextBuff1 ldr r1, _0801AD8C @ =gStatusConditionString_LoveJpn bl StringCopy ldr r0, _0801AD90 @ =gUnknown_081D9A44 bl b_call_bc_move_exec - ldr r1, _0801AD94 @ =gUnknown_02024D1E + ldr r1, _0801AD94 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] movs r0, 0x2 @@ -10286,10 +10286,10 @@ _0801AD62: ldr r2, _0801AD9C @ =0x00016003 adds r0, r2 strb r7, [r0] - ldr r0, _0801ADA0 @ =gUnknown_02024C0B + ldr r0, _0801ADA0 @ =gStringBank strb r7, [r0] - ldr r4, _0801ADA4 @ =gUnknown_02024A60 - ldr r0, _0801ADA8 @ =gPlayerMonIndex + ldr r4, _0801ADA4 @ =gActiveBank + ldr r0, _0801ADA8 @ =gBankAttacker strb r7, [r0] strb r7, [r4] ldr r3, [sp, 0xC] @@ -10300,15 +10300,15 @@ _0801AD62: b _0801B3CA .align 2, 0 _0801AD84: .4byte 0xfff0ffff -_0801AD88: .4byte gUnknown_030041C0 +_0801AD88: .4byte gBattleTextBuff1 _0801AD8C: .4byte gStatusConditionString_LoveJpn _0801AD90: .4byte gUnknown_081D9A44 -_0801AD94: .4byte gUnknown_02024D1E +_0801AD94: .4byte gBattleCommunication _0801AD98: .4byte 0x02000000 _0801AD9C: .4byte 0x00016003 -_0801ADA0: .4byte gUnknown_02024C0B -_0801ADA4: .4byte gUnknown_02024A60 -_0801ADA8: .4byte gPlayerMonIndex +_0801ADA0: .4byte gStringBank +_0801ADA4: .4byte gActiveBank +_0801ADA8: .4byte gBankAttacker _0801ADAC: movs r0, 0x58 muls r0, r7 @@ -10329,7 +10329,7 @@ _0801ADB2: beq _0801ADCE b _0801B3CA _0801ADCE: - ldr r1, _0801AE04 @ =gUnknown_02024CA8 + ldr r1, _0801AE04 @ =gDisableStructs lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -10356,17 +10356,17 @@ _0801ADEE: b _0801B3CA .align 2, 0 _0801AE00: .4byte gBattleMons -_0801AE04: .4byte gUnknown_02024CA8 +_0801AE04: .4byte gDisableStructs _0801AE08: .4byte gBitTable _0801AE0C: movs r7, 0 - ldr r0, _0801AE3C @ =gUnknown_02024A68 + ldr r0, _0801AE3C @ =gNoOfAllBanks ldrb r0, [r0] cmp r7, r0 bcc _0801AE18 b _0801B3CA _0801AE18: - ldr r4, _0801AE40 @ =gUnknown_02024C04 + ldr r4, _0801AE40 @ =gLastUsedItem ldr r1, _0801AE44 @ =gBattleMons movs r0, 0x58 muls r0, r7 @@ -10385,8 +10385,8 @@ _0801AE18: ldrb r5, [r0, 0x7] b _0801AE5C .align 2, 0 -_0801AE3C: .4byte gUnknown_02024A68 -_0801AE40: .4byte gUnknown_02024C04 +_0801AE3C: .4byte gNoOfAllBanks +_0801AE40: .4byte gLastUsedItem _0801AE44: .4byte gBattleMons _0801AE48: .4byte gEnigmaBerries _0801AE4C: @@ -10456,7 +10456,7 @@ _0801AEF6: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _0801AF14 @ =gUnknown_02024C10 + ldr r1, _0801AF14 @ =gBattlescriptCurrInstr ldr r0, _0801AF18 @ =gUnknown_081D99BC str r0, [r1] movs r0, 0x1 @@ -10464,7 +10464,7 @@ _0801AEF6: b _0801B20E .align 2, 0 _0801AF10: .4byte gBattleMons -_0801AF14: .4byte gUnknown_02024C10 +_0801AF14: .4byte gBattlescriptCurrInstr _0801AF18: .4byte gUnknown_081D99BC _0801AF1C: ldr r1, _0801AF48 @ =gBattleMons @@ -10483,7 +10483,7 @@ _0801AF32: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _0801AF50 @ =gUnknown_02024C10 + ldr r1, _0801AF50 @ =gBattlescriptCurrInstr ldr r0, _0801AF54 @ =gUnknown_081D99D4 str r0, [r1] movs r1, 0x1 @@ -10492,7 +10492,7 @@ _0801AF32: .align 2, 0 _0801AF48: .4byte gBattleMons _0801AF4C: .4byte 0xfffff077 -_0801AF50: .4byte gUnknown_02024C10 +_0801AF50: .4byte gBattlescriptCurrInstr _0801AF54: .4byte gUnknown_081D99D4 _0801AF58: ldr r1, _0801AF88 @ =gBattleMons @@ -10512,7 +10512,7 @@ _0801AF6E: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _0801AF8C @ =gUnknown_02024C10 + ldr r1, _0801AF8C @ =gBattlescriptCurrInstr ldr r0, _0801AF90 @ =gUnknown_081D99EC str r0, [r1] movs r2, 0x1 @@ -10520,7 +10520,7 @@ _0801AF6E: b _0801B20E .align 2, 0 _0801AF88: .4byte gBattleMons -_0801AF8C: .4byte gUnknown_02024C10 +_0801AF8C: .4byte gBattlescriptCurrInstr _0801AF90: .4byte gUnknown_081D99EC _0801AF94: ldr r1, _0801AFBC @ =gBattleMons @@ -10540,12 +10540,12 @@ _0801AFAA: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _0801AFC0 @ =gUnknown_02024C10 + ldr r1, _0801AFC0 @ =gBattlescriptCurrInstr ldr r0, _0801AFC4 @ =gUnknown_081D9A04 b _0801B168 .align 2, 0 _0801AFBC: .4byte gBattleMons -_0801AFC0: .4byte gUnknown_02024C10 +_0801AFC0: .4byte gBattlescriptCurrInstr _0801AFC4: .4byte gUnknown_081D9A04 _0801AFC8: ldr r2, _0801B008 @ =gBattleMons @@ -10573,7 +10573,7 @@ _0801AFE2: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _0801B010 @ =gUnknown_02024C10 + ldr r1, _0801B010 @ =gBattlescriptCurrInstr ldr r0, _0801B014 @ =gUnknown_081D9A1C str r0, [r1] movs r4, 0x1 @@ -10582,7 +10582,7 @@ _0801AFE2: .align 2, 0 _0801B008: .4byte gBattleMons _0801B00C: .4byte 0xf7ffffff -_0801B010: .4byte gUnknown_02024C10 +_0801B010: .4byte gBattlescriptCurrInstr _0801B014: .4byte gUnknown_081D9A1C _0801B018: ldr r1, _0801B048 @ =gBattleMons @@ -10602,7 +10602,7 @@ _0801B02E: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _0801B04C @ =gUnknown_02024C10 + ldr r1, _0801B04C @ =gBattlescriptCurrInstr ldr r0, _0801B050 @ =gUnknown_081D9A34 str r0, [r1] movs r5, 0x2 @@ -10610,7 +10610,7 @@ _0801B02E: b _0801B20E .align 2, 0 _0801B048: .4byte gBattleMons -_0801B04C: .4byte gUnknown_02024C10 +_0801B04C: .4byte gBattlescriptCurrInstr _0801B050: .4byte gUnknown_081D9A34 _0801B054: ldr r1, _0801B090 @ =gBattleMons @@ -10629,14 +10629,14 @@ _0801B06C: ldr r0, _0801B094 @ =0xfff0ffff ands r1, r0 str r1, [r2] - ldr r0, _0801B098 @ =gUnknown_030041C0 + ldr r0, _0801B098 @ =gBattleTextBuff1 ldr r1, _0801B09C @ =gStatusConditionString_LoveJpn bl StringCopy bl b_movescr_stack_push_cursor - ldr r1, _0801B0A0 @ =gUnknown_02024D1E + ldr r1, _0801B0A0 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] - ldr r1, _0801B0A4 @ =gUnknown_02024C10 + ldr r1, _0801B0A4 @ =gBattlescriptCurrInstr ldr r0, _0801B0A8 @ =gUnknown_081D9A4A str r0, [r1] movs r0, 0x2 @@ -10645,10 +10645,10 @@ _0801B06C: .align 2, 0 _0801B090: .4byte gBattleMons _0801B094: .4byte 0xfff0ffff -_0801B098: .4byte gUnknown_030041C0 +_0801B098: .4byte gBattleTextBuff1 _0801B09C: .4byte gStatusConditionString_LoveJpn -_0801B0A0: .4byte gUnknown_02024D1E -_0801B0A4: .4byte gUnknown_02024C10 +_0801B0A0: .4byte gBattleCommunication +_0801B0A4: .4byte gBattlescriptCurrInstr _0801B0A8: .4byte gUnknown_081D9A4A _0801B0AC: ldr r4, _0801B170 @ =gBattleMons @@ -10676,7 +10676,7 @@ _0801B0D4: ands r2, r0 cmp r2, 0 beq _0801B0E4 - ldr r0, _0801B174 @ =gUnknown_030041C0 + ldr r0, _0801B174 @ =gBattleTextBuff1 ldr r1, _0801B178 @ =gStatusConditionString_PoisonJpn bl StringCopy _0801B0E4: @@ -10692,7 +10692,7 @@ _0801B0E4: ldr r1, _0801B17C @ =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r0, _0801B174 @ =gUnknown_030041C0 + ldr r0, _0801B174 @ =gBattleTextBuff1 ldr r1, _0801B180 @ =gStatusConditionString_SleepJpn bl StringCopy _0801B104: @@ -10701,7 +10701,7 @@ _0801B104: ands r0, r1 cmp r0, 0 beq _0801B116 - ldr r0, _0801B174 @ =gUnknown_030041C0 + ldr r0, _0801B174 @ =gBattleTextBuff1 ldr r1, _0801B184 @ =gStatusConditionString_ParalysisJpn bl StringCopy _0801B116: @@ -10710,7 +10710,7 @@ _0801B116: ands r0, r1 cmp r0, 0 beq _0801B128 - ldr r0, _0801B174 @ =gUnknown_030041C0 + ldr r0, _0801B174 @ =gBattleTextBuff1 ldr r1, _0801B188 @ =gStatusConditionString_BurnJpn bl StringCopy _0801B128: @@ -10719,7 +10719,7 @@ _0801B128: ands r0, r1 cmp r0, 0 beq _0801B13A - ldr r0, _0801B174 @ =gUnknown_030041C0 + ldr r0, _0801B174 @ =gBattleTextBuff1 ldr r1, _0801B18C @ =gStatusConditionString_IceJpn bl StringCopy _0801B13A: @@ -10729,7 +10729,7 @@ _0801B13A: ands r0, r2 cmp r0, 0 beq _0801B14E - ldr r0, _0801B174 @ =gUnknown_030041C0 + ldr r0, _0801B174 @ =gBattleTextBuff1 ldr r1, _0801B190 @ =gStatusConditionString_ConfusionJpn bl StringCopy _0801B14E: @@ -10741,9 +10741,9 @@ _0801B14E: ands r0, r1 str r0, [r5] bl b_movescr_stack_push_cursor - ldr r0, _0801B194 @ =gUnknown_02024D1E + ldr r0, _0801B194 @ =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, _0801B198 @ =gUnknown_02024C10 + ldr r1, _0801B198 @ =gBattlescriptCurrInstr ldr r0, _0801B19C @ =gUnknown_081D9A4A _0801B168: str r0, [r1] @@ -10752,7 +10752,7 @@ _0801B168: b _0801B20E .align 2, 0 _0801B170: .4byte gBattleMons -_0801B174: .4byte gUnknown_030041C0 +_0801B174: .4byte gBattleTextBuff1 _0801B178: .4byte gStatusConditionString_PoisonJpn _0801B17C: .4byte 0xf7ffffff _0801B180: .4byte gStatusConditionString_SleepJpn @@ -10760,8 +10760,8 @@ _0801B184: .4byte gStatusConditionString_ParalysisJpn _0801B188: .4byte gStatusConditionString_BurnJpn _0801B18C: .4byte gStatusConditionString_IceJpn _0801B190: .4byte gStatusConditionString_ConfusionJpn -_0801B194: .4byte gUnknown_02024D1E -_0801B198: .4byte gUnknown_02024C10 +_0801B194: .4byte gBattleCommunication +_0801B198: .4byte gBattlescriptCurrInstr _0801B19C: .4byte gUnknown_081D9A4A _0801B1A0: ldr r4, _0801B1F0 @ =gBattleMons @@ -10798,10 +10798,10 @@ _0801B1C4: ldr r1, _0801B1F8 @ =0x00016003 adds r0, r1 strb r7, [r0] - ldr r0, _0801B1FC @ =gUnknown_02024C0B + ldr r0, _0801B1FC @ =gStringBank strb r7, [r0] bl b_movescr_stack_push_cursor - ldr r1, _0801B200 @ =gUnknown_02024C10 + ldr r1, _0801B200 @ =gBattlescriptCurrInstr ldr r0, _0801B204 @ =gUnknown_081D9A64 str r0, [r1] b _0801B3CA @@ -10809,8 +10809,8 @@ _0801B1C4: _0801B1F0: .4byte gBattleMons _0801B1F4: .4byte 0x02000000 _0801B1F8: .4byte 0x00016003 -_0801B1FC: .4byte gUnknown_02024C0B -_0801B200: .4byte gUnknown_02024C10 +_0801B1FC: .4byte gStringBank +_0801B200: .4byte gBattlescriptCurrInstr _0801B204: .4byte gUnknown_081D9A64 _0801B208: ldr r2, [sp, 0xC] @@ -10821,9 +10821,9 @@ _0801B20E: ldr r3, _0801B244 @ =0x00016003 adds r0, r3 strb r7, [r0] - ldr r0, _0801B248 @ =gUnknown_02024C0B + ldr r0, _0801B248 @ =gStringBank strb r7, [r0] - ldr r4, _0801B24C @ =gUnknown_02024A60 + ldr r4, _0801B24C @ =gActiveBank strb r7, [r4] ldrb r1, [r4] movs r0, 0x58 @@ -10836,21 +10836,21 @@ _0801B224: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _0801B3CA .align 2, 0 _0801B240: .4byte 0x02000000 _0801B244: .4byte 0x00016003 -_0801B248: .4byte gUnknown_02024C0B -_0801B24C: .4byte gUnknown_02024A60 +_0801B248: .4byte gStringBank +_0801B24C: .4byte gActiveBank _0801B250: .4byte gUnknown_02024ACC _0801B254: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0801B268 @ =gUnknown_02024A68 + ldr r0, _0801B268 @ =gNoOfAllBanks ldrb r0, [r0] cmp r7, r0 bcs _0801B264 @@ -10858,7 +10858,7 @@ _0801B254: _0801B264: b _0801B3CA .align 2, 0 -_0801B268: .4byte gUnknown_02024A68 +_0801B268: .4byte gNoOfAllBanks _0801B26C: ldr r7, _0801B284 @ =gBattleMoveDamage ldr r0, [r7] @@ -10883,8 +10883,8 @@ _0801B288: beq _0801B296 b _0801B3CA _0801B296: - ldr r2, _0801B318 @ =gUnknown_02024D68 - ldr r4, _0801B31C @ =gEnemyMonIndex + ldr r2, _0801B318 @ =gSpecialStatuses + ldr r4, _0801B31C @ =gBankTarget ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -10913,7 +10913,7 @@ _0801B2BC: cmp r0, r9 bcs _0801B3CA ldr r2, _0801B320 @ =gBattleMoves - ldr r0, _0801B324 @ =gUnknown_02024BE6 + ldr r0, _0801B324 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -10932,7 +10932,7 @@ _0801B2BC: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0801B3CA - ldr r1, _0801B32C @ =gUnknown_02024D1E + ldr r1, _0801B32C @ =gBattleCommunication movs r0, 0x8 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor @@ -10943,12 +10943,12 @@ _0801B2BC: b _0801B3CA .align 2, 0 _0801B314: .4byte gBattleMoveFlags -_0801B318: .4byte gUnknown_02024D68 -_0801B31C: .4byte gEnemyMonIndex +_0801B318: .4byte gSpecialStatuses +_0801B31C: .4byte gBankTarget _0801B320: .4byte gBattleMoves -_0801B324: .4byte gUnknown_02024BE6 +_0801B324: .4byte gCurrentMove _0801B328: .4byte gBattleMons -_0801B32C: .4byte gUnknown_02024D1E +_0801B32C: .4byte gBattleCommunication _0801B330: ldr r0, _0801B3DC @ =gBattleMoveFlags ldrb r0, [r0] @@ -10956,8 +10956,8 @@ _0801B330: ands r4, r0 cmp r4, 0 bne _0801B3CA - ldr r1, _0801B3E0 @ =gUnknown_02024D68 - ldr r5, _0801B3E4 @ =gEnemyMonIndex + ldr r1, _0801B3E0 @ =gSpecialStatuses + ldr r5, _0801B3E4 @ =gBankTarget ldrb r2, [r5] lsls r0, r2, 2 adds r0, r2 @@ -10970,7 +10970,7 @@ _0801B330: ldr r0, _0801B3E8 @ =0x0000ffff cmp r1, r0 beq _0801B3CA - ldr r0, _0801B3EC @ =gPlayerMonIndex + ldr r0, _0801B3EC @ =gBankAttacker ldrb r3, [r0] cmp r3, r2 beq _0801B3CA @@ -10985,11 +10985,11 @@ _0801B330: beq _0801B3CA cmp r1, 0 beq _0801B3CA - ldr r0, _0801B3F4 @ =gUnknown_02024C04 + ldr r0, _0801B3F4 @ =gLastUsedItem mov r1, sp ldrh r1, [r1, 0x14] strh r1, [r0] - ldr r0, _0801B3F8 @ =gUnknown_02024C0B + ldr r0, _0801B3F8 @ =gStringBank strb r3, [r0] ldr r0, _0801B3FC @ =0x02000000 ldr r2, _0801B400 @ =0x00016003 @@ -11018,7 +11018,7 @@ _0801B3AC: adds r0, r6 str r4, [r0] bl b_movescr_stack_push_cursor - ldr r1, _0801B404 @ =gUnknown_02024C10 + ldr r1, _0801B404 @ =gBattlescriptCurrInstr ldr r0, _0801B408 @ =gUnknown_081D9AA7 str r0, [r1] ldr r0, [sp, 0xC] @@ -11038,16 +11038,16 @@ _0801B3CA: bx r1 .align 2, 0 _0801B3DC: .4byte gBattleMoveFlags -_0801B3E0: .4byte gUnknown_02024D68 -_0801B3E4: .4byte gEnemyMonIndex +_0801B3E0: .4byte gSpecialStatuses +_0801B3E4: .4byte gBankTarget _0801B3E8: .4byte 0x0000ffff -_0801B3EC: .4byte gPlayerMonIndex +_0801B3EC: .4byte gBankAttacker _0801B3F0: .4byte gBattleMons -_0801B3F4: .4byte gUnknown_02024C04 -_0801B3F8: .4byte gUnknown_02024C0B +_0801B3F4: .4byte gLastUsedItem +_0801B3F8: .4byte gStringBank _0801B3FC: .4byte 0x02000000 _0801B400: .4byte 0x00016003 -_0801B404: .4byte gUnknown_02024C10 +_0801B404: .4byte gBattlescriptCurrInstr _0801B408: .4byte gUnknown_081D9AA7 thumb_func_end sub_801A02C @@ -11078,7 +11078,7 @@ _0801B42E: adds r2, 0x1 str r2, [sp, 0x4] _0801B438: - ldr r0, _0801B46C @ =gUnknown_02024C0C + ldr r0, _0801B46C @ =gAbsentBankFlags ldrb r2, [r0] ldr r3, _0801B470 @ =gBitTable lsls r0, r5, 2 @@ -11103,14 +11103,14 @@ _0801B45A: .align 2, 0 _0801B464: .4byte gBattleTypeFlags _0801B468: .4byte gUnknown_081FC1D0 -_0801B46C: .4byte gUnknown_02024C0C +_0801B46C: .4byte gAbsentBankFlags _0801B470: .4byte gBitTable _0801B474: ldr r0, _0801B580 @ =gUnknown_081FC1D0 ldr r2, [sp] lsls r1, r2, 3 adds r6, r1, r0 - ldr r4, _0801B584 @ =gUnknown_02024C60 + ldr r4, _0801B584 @ =gChosenMovesByBanks lsls r0, r5, 1 adds r3, r0, r4 ldrh r2, [r6] @@ -11126,34 +11126,34 @@ _0801B474: cmp r1, r0 bne _0801B4E4 adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity mov r2, r9 ands r2, r0 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 - ldr r0, _0801B588 @ =gUnknown_02024C80 + ldr r0, _0801B588 @ =gSideTimer adds r1, r0 lsls r0, r7, 4 orrs r0, r5 strb r0, [r1, 0x3] adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity mov r1, r9 ands r1, r0 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _0801B588 @ =gUnknown_02024C80 + ldr r1, _0801B588 @ =gSideTimer adds r0, r1 ldrh r1, [r6, 0x4] strh r1, [r0, 0x4] adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity mov r1, r9 ands r1, r0 lsls r1, 1 - ldr r2, _0801B58C @ =gUnknown_02024C7A + ldr r2, _0801B58C @ =gSideAffecting adds r1, r2 ldrh r0, [r1] movs r2, 0x4 @@ -11163,7 +11163,7 @@ _0801B4E4: ldr r0, _0801B580 @ =gUnknown_081FC1D0 mov r1, r8 adds r4, r1, r0 - ldr r2, _0801B584 @ =gUnknown_02024C60 + ldr r2, _0801B584 @ =gChosenMovesByBanks lsls r0, r7, 1 adds r0, r2 ldrh r1, [r4] @@ -11177,34 +11177,34 @@ _0801B4E4: cmp r0, r1 bne _0801B54E adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity mov r2, r9 ands r2, r0 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 - ldr r2, _0801B588 @ =gUnknown_02024C80 + ldr r2, _0801B588 @ =gSideTimer adds r1, r2 lsls r0, r5, 4 orrs r0, r7 strb r0, [r1, 0x3] adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity mov r1, r9 ands r1, r0 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _0801B588 @ =gUnknown_02024C80 + ldr r1, _0801B588 @ =gSideTimer adds r0, r1 ldrh r1, [r4, 0x4] strh r1, [r0, 0x4] adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity mov r1, r9 ands r1, r0 lsls r1, 1 - ldr r2, _0801B58C @ =gUnknown_02024C7A + ldr r2, _0801B58C @ =gSideAffecting adds r1, r2 ldrh r0, [r1] movs r2, 0x4 @@ -11240,21 +11240,21 @@ _0801B56E: bx r0 .align 2, 0 _0801B580: .4byte gUnknown_081FC1D0 -_0801B584: .4byte gUnknown_02024C60 -_0801B588: .4byte gUnknown_02024C80 -_0801B58C: .4byte gUnknown_02024C7A +_0801B584: .4byte gChosenMovesByBanks +_0801B588: .4byte gSideTimer +_0801B58C: .4byte gSideAffecting _0801B590: .4byte 0x0000ffff thumb_func_end unref_sub_801B40C thumb_func_start sub_801B594 sub_801B594: @ 801B594 push {lr} - ldr r0, _0801B5B4 @ =gUnknown_02024A64 + ldr r0, _0801B5B4 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0801B5B0 - ldr r1, _0801B5B8 @ =gUnknown_081FA73C - ldr r0, _0801B5BC @ =gUnknown_02024C10 + ldr r1, _0801B5B8 @ =gBattleScriptingCommandsTable + ldr r0, _0801B5BC @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -11265,9 +11265,9 @@ _0801B5B0: pop {r0} bx r0 .align 2, 0 -_0801B5B4: .4byte gUnknown_02024A64 -_0801B5B8: .4byte gUnknown_081FA73C -_0801B5BC: .4byte gUnknown_02024C10 +_0801B5B4: .4byte gBattleExecBuffer +_0801B5B8: .4byte gBattleScriptingCommandsTable +_0801B5BC: .4byte gBattlescriptCurrInstr thumb_func_end sub_801B594 thumb_func_start sub_801B5C0 @@ -11375,14 +11375,14 @@ _0801B604: .4byte _0801B900 .4byte _0801B808 _0801B708: - ldr r0, _0801B7E8 @ =gPlayerMonIndex + ldr r0, _0801B7E8 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0801B7EC @ =gUnknown_02024C80 + ldr r1, _0801B7EC @ =gSideTimer lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -11400,9 +11400,9 @@ _0801B708: beq _0801B73A b _0801B850 _0801B73A: - ldr r0, _0801B7E8 @ =gPlayerMonIndex + ldr r0, _0801B7E8 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 lsls r0, r7, 1 @@ -11411,22 +11411,22 @@ _0801B74A: bl Random lsls r0, 16 lsrs r0, 16 - ldr r1, _0801B7F4 @ =gUnknown_02024A68 + ldr r1, _0801B7F4 @ =gNoOfAllBanks ldrb r1, [r1] bl __modsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0801B7E8 @ =gPlayerMonIndex + ldr r6, _0801B7E8 @ =gBankAttacker ldrb r2, [r6] cmp r5, r2 beq _0801B74A adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _0801B74A - ldr r0, _0801B7F8 @ =gUnknown_02024C0C + ldr r0, _0801B7F8 @ =gAbsentBankFlags ldrb r2, [r0] ldr r1, _0801B7FC @ =gBitTable lsls r0, r5, 2 @@ -11450,7 +11450,7 @@ _0801B798: movs r0, 0x10 movs r2, 0x1F movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0801B7AE @@ -11476,7 +11476,7 @@ _0801B7C2: ldrb r1, [r0] adds r0, r5, 0 bl sub_81074C4 - ldr r1, _0801B804 @ =gUnknown_02024D68 + ldr r1, _0801B804 @ =gSpecialStatuses lsls r0, r5, 2 adds r0, r5 lsls r0, 2 @@ -11486,18 +11486,18 @@ _0801B7C2: strb r1, [r0] b _0801B900 .align 2, 0 -_0801B7E8: .4byte gPlayerMonIndex -_0801B7EC: .4byte gUnknown_02024C80 +_0801B7E8: .4byte gBankAttacker +_0801B7EC: .4byte gSideTimer _0801B7F0: .4byte gBattleMons -_0801B7F4: .4byte gUnknown_02024A68 -_0801B7F8: .4byte gUnknown_02024C0C +_0801B7F4: .4byte gNoOfAllBanks +_0801B7F8: .4byte gAbsentBankFlags _0801B7FC: .4byte gBitTable _0801B800: .4byte gBattleMoves -_0801B804: .4byte gUnknown_02024D68 +_0801B804: .4byte gSpecialStatuses _0801B808: - ldr r0, _0801B81C @ =gPlayerMonIndex + ldr r0, _0801B81C @ =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r2, 0x1 movs r0, 0x1 @@ -11505,16 +11505,16 @@ _0801B808: eors r0, r2 b _0801B8B2 .align 2, 0 -_0801B81C: .4byte gPlayerMonIndex +_0801B81C: .4byte gBankAttacker _0801B820: - ldr r0, _0801B854 @ =gPlayerMonIndex + ldr r0, _0801B854 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0801B858 @ =gUnknown_02024C80 + ldr r1, _0801B858 @ =gSideTimer lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -11534,8 +11534,8 @@ _0801B850: adds r5, r4, 0 b _0801B900 .align 2, 0 -_0801B854: .4byte gPlayerMonIndex -_0801B858: .4byte gUnknown_02024C80 +_0801B854: .4byte gBankAttacker +_0801B858: .4byte gSideTimer _0801B85C: .4byte gBattleMons _0801B860: ldr r0, _0801B894 @ =gBattleTypeFlags @@ -11549,9 +11549,9 @@ _0801B860: ands r6, r0 cmp r6, 0 beq _0801B8DC - ldr r0, _0801B898 @ =gPlayerMonIndex + ldr r0, _0801B898 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0801B8A0 @@ -11564,7 +11564,7 @@ _0801B860: b _0801B8B2 .align 2, 0 _0801B894: .4byte gBattleTypeFlags -_0801B898: .4byte gPlayerMonIndex +_0801B898: .4byte gBankAttacker _0801B89C: movs r0, 0x3 b _0801B8B2 @@ -11579,10 +11579,10 @@ _0801B8A0: _0801B8B0: movs r0, 0x2 _0801B8B2: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0801B8D4 @ =gUnknown_02024C0C + ldr r0, _0801B8D4 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _0801B8D8 @ =gBitTable lsls r0, r5, 2 @@ -11595,29 +11595,29 @@ _0801B8B2: eors r5, r0 b _0801B900 .align 2, 0 -_0801B8D4: .4byte gUnknown_02024C0C +_0801B8D4: .4byte gAbsentBankFlags _0801B8D8: .4byte gBitTable _0801B8DC: - ldr r0, _0801B8F8 @ =gPlayerMonIndex + ldr r0, _0801B8F8 @ =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r2, 0x1 movs r0, 0x1 ands r0, r1 eors r0, r2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 b _0801B900 .align 2, 0 -_0801B8F8: .4byte gPlayerMonIndex +_0801B8F8: .4byte gBankAttacker _0801B8FC: - ldr r0, _0801B91C @ =gPlayerMonIndex + ldr r0, _0801B91C @ =gBankAttacker ldrb r5, [r0] _0801B900: ldr r1, _0801B920 @ =0x02000000 - ldr r0, _0801B91C @ =gPlayerMonIndex + ldr r0, _0801B91C @ =gBankAttacker ldrb r0, [r0] ldr r2, _0801B924 @ =0x00016010 adds r0, r2 @@ -11631,7 +11631,7 @@ _0801B900: pop {r1} bx r1 .align 2, 0 -_0801B91C: .4byte gPlayerMonIndex +_0801B91C: .4byte gBankAttacker _0801B920: .4byte 0x02000000 _0801B924: .4byte 0x00016010 thumb_func_end sub_801B5C0 @@ -11649,9 +11649,9 @@ sub_801B928: @ 801B928 ands r0, r1 cmp r0, 0 bne _0801B9DA - ldr r7, _0801B9E4 @ =gPlayerMonIndex + ldr r7, _0801B9E4 @ =gBankAttacker ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -11728,14 +11728,14 @@ _0801B9DA: b _0801BC24 .align 2, 0 _0801B9E0: .4byte gBattleTypeFlags -_0801B9E4: .4byte gPlayerMonIndex +_0801B9E4: .4byte gBankAttacker _0801B9E8: .4byte gBattleMons _0801B9EC: .4byte 0x0000080e _0801B9F0: .4byte 0x00000808 _0801B9F4: .4byte 0x0000080a _0801B9F8: .4byte 0x0000080c _0801B9FC: - ldr r3, _0801BA3C @ =gUnknown_02024BE6 + ldr r3, _0801BA3C @ =gCurrentMove ldrh r0, [r3] cmp r0, 0x63 bne _0801BA12 @@ -11765,13 +11765,13 @@ _0801BA12: cmp r0, 0xD6 bne _0801BA4C _0801BA34: - ldr r1, _0801BA44 @ =gUnknown_02024C10 + ldr r1, _0801BA44 @ =gBattlescriptCurrInstr ldr r0, _0801BA48 @ =gUnknown_081D995F b _0801BBCE .align 2, 0 -_0801BA3C: .4byte gUnknown_02024BE6 +_0801BA3C: .4byte gCurrentMove _0801BA40: .4byte 0xff7fffff -_0801BA44: .4byte gUnknown_02024C10 +_0801BA44: .4byte gBattlescriptCurrInstr _0801BA48: .4byte gUnknown_081D995F _0801BA4C: bl Random @@ -11779,7 +11779,7 @@ _0801BA4C: adds r1, r5, 0 ands r1, r0 ldr r7, _0801BB04 @ =gBattleMons - ldr r2, _0801BB08 @ =gPlayerMonIndex + ldr r2, _0801BB08 @ =gBankAttacker mov r9, r2 ldrb r3, [r2] movs r0, 0x58 @@ -11795,7 +11795,7 @@ _0801BA4C: cmp r4, r6 bge _0801BB3C ldr r7, _0801BB0C @ =gBitTable - ldr r5, _0801BB10 @ =gUnknown_02024BE4 + ldr r5, _0801BB10 @ =gCurrMovePos ldrb r0, [r5] lsls r0, 2 adds r0, r7 @@ -11830,10 +11830,10 @@ _0801BA9E: bne _0801BA9E ldr r4, _0801BB18 @ =gUnknown_02024BEA ldr r3, _0801BB04 @ =gBattleMons - ldr r0, _0801BB10 @ =gUnknown_02024BE4 + ldr r0, _0801BB10 @ =gCurrMovePos ldrb r0, [r0] lsls r0, 1 - ldr r1, _0801BB08 @ =gPlayerMonIndex + ldr r1, _0801BB08 @ =gBankAttacker ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -11842,43 +11842,43 @@ _0801BA9E: adds r0, r3 ldrh r0, [r0] strh r0, [r4] - ldr r0, _0801BB1C @ =gUnknown_02024D1E + ldr r0, _0801BB1C @ =gBattleCommunication strb r5, [r0, 0x3] - ldr r0, _0801BB20 @ =gUnknown_02024DEC + ldr r0, _0801BB20 @ =gDynamicBasePower movs r1, 0 strh r5, [r0] ldr r0, _0801BB24 @ =0x02000000 ldr r2, _0801BB28 @ =0x0001601c adds r0, r2 strb r1, [r0] - ldr r1, _0801BB2C @ =gUnknown_02024C10 + ldr r1, _0801BB2C @ =gBattlescriptCurrInstr ldr r0, _0801BB30 @ =gUnknown_081D996F str r0, [r1] ldrh r0, [r4] movs r1, 0 bl sub_801B5C0 - ldr r1, _0801BB34 @ =gEnemyMonIndex + ldr r1, _0801BB34 @ =gBankTarget strb r0, [r1] - ldr r2, _0801BB38 @ =gUnknown_02024C6C + ldr r2, _0801BB38 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 14 b _0801BC1E .align 2, 0 _0801BB04: .4byte gBattleMons -_0801BB08: .4byte gPlayerMonIndex +_0801BB08: .4byte gBankAttacker _0801BB0C: .4byte gBitTable -_0801BB10: .4byte gUnknown_02024BE4 +_0801BB10: .4byte gCurrMovePos _0801BB14: .4byte gUnknown_02024BE5 _0801BB18: .4byte gUnknown_02024BEA -_0801BB1C: .4byte gUnknown_02024D1E -_0801BB20: .4byte gUnknown_02024DEC +_0801BB1C: .4byte gBattleCommunication +_0801BB20: .4byte gDynamicBasePower _0801BB24: .4byte 0x02000000 _0801BB28: .4byte 0x0001601c -_0801BB2C: .4byte gUnknown_02024C10 +_0801BB2C: .4byte gBattlescriptCurrInstr _0801BB30: .4byte gUnknown_081D996F -_0801BB34: .4byte gEnemyMonIndex -_0801BB38: .4byte gUnknown_02024C6C +_0801BB34: .4byte gBankTarget +_0801BB38: .4byte gHitMarker _0801BB3C: subs r0, r2, r6 lsls r0, 24 @@ -11907,7 +11907,7 @@ _0801BB3C: cmp r0, 0xF beq _0801BBB8 movs r2, 0 - ldr r0, _0801BBAC @ =gUnknown_02024A68 + ldr r0, _0801BBAC @ =gNoOfAllBanks ldrb r3, [r0] mov r8, r0 cmp r2, r3 @@ -11934,12 +11934,12 @@ _0801BB9E: ldrb r0, [r0] cmp r2, r0 bne _0801BBB8 - ldr r1, _0801BBB0 @ =gUnknown_02024C10 + ldr r1, _0801BBB0 @ =gBattlescriptCurrInstr ldr r0, _0801BBB4 @ =gUnknown_081D9989 b _0801BBCE .align 2, 0 -_0801BBAC: .4byte gUnknown_02024A68 -_0801BBB0: .4byte gUnknown_02024C10 +_0801BBAC: .4byte gNoOfAllBanks +_0801BBB0: .4byte gBattlescriptCurrInstr _0801BBB4: .4byte gUnknown_081D9989 _0801BBB8: subs r4, r6 @@ -11947,22 +11947,22 @@ _0801BBB8: blt _0801BBE0 _0801BBBE: bl Random - ldr r2, _0801BBD4 @ =gUnknown_02024D1E + ldr r2, _0801BBD4 @ =gBattleCommunication movs r1, 0x3 ands r1, r0 strb r1, [r2, 0x5] - ldr r1, _0801BBD8 @ =gUnknown_02024C10 + ldr r1, _0801BBD8 @ =gBattlescriptCurrInstr ldr r0, _0801BBDC @ =gUnknown_081D9977 _0801BBCE: str r0, [r1] movs r0, 0x1 b _0801BC24 .align 2, 0 -_0801BBD4: .4byte gUnknown_02024D1E -_0801BBD8: .4byte gUnknown_02024C10 +_0801BBD4: .4byte gBattleCommunication +_0801BBD8: .4byte gBattlescriptCurrInstr _0801BBDC: .4byte gUnknown_081D9977 _0801BBE0: - ldr r4, _0801BC34 @ =gPlayerMonIndex + ldr r4, _0801BC34 @ =gBankAttacker ldrb r1, [r4] movs r0, 0x58 muls r1, r0 @@ -11982,13 +11982,13 @@ _0801BBE0: bl CalculateBaseDamage ldr r1, _0801BC3C @ =gBattleMoveDamage str r0, [r1] - ldr r1, _0801BC40 @ =gEnemyMonIndex + ldr r1, _0801BC40 @ =gBankTarget ldrb r0, [r4] strb r0, [r1] - ldr r1, _0801BC44 @ =gUnknown_02024C10 + ldr r1, _0801BC44 @ =gBattlescriptCurrInstr ldr r0, _0801BC48 @ =gUnknown_081D99A0 str r0, [r1] - ldr r2, _0801BC4C @ =gUnknown_02024C6C + ldr r2, _0801BC4C @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -12005,13 +12005,13 @@ _0801BC24: pop {r1} bx r1 .align 2, 0 -_0801BC34: .4byte gPlayerMonIndex +_0801BC34: .4byte gBankAttacker _0801BC38: .4byte gBattleMons _0801BC3C: .4byte gBattleMoveDamage -_0801BC40: .4byte gEnemyMonIndex -_0801BC44: .4byte gUnknown_02024C10 +_0801BC40: .4byte gBankTarget +_0801BC44: .4byte gBattlescriptCurrInstr _0801BC48: .4byte gUnknown_081D99A0 -_0801BC4C: .4byte gUnknown_02024C6C +_0801BC4C: .4byte gHitMarker thumb_func_end sub_801B928 .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_4.s b/asm/battle_4.s index bbdeb1c6e..5436d3e55 100644 --- a/asm/battle_4.s +++ b/asm/battle_4.s @@ -13,20 +13,20 @@ atk00_attackcanceler: @ 801BC50 mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r0, _0801BC6C @ =gUnknown_02024D26 + ldr r0, _0801BC6C @ =gBattleOutcome ldrb r0, [r0] cmp r0, 0 beq _0801BC74 - ldr r1, _0801BC70 @ =gUnknown_02024A7F + ldr r1, _0801BC70 @ =gFightStateTracker movs r0, 0xC strb r0, [r1] b _0801BFF4 .align 2, 0 -_0801BC6C: .4byte gUnknown_02024D26 -_0801BC70: .4byte gUnknown_02024A7F +_0801BC6C: .4byte gBattleOutcome +_0801BC70: .4byte gFightStateTracker _0801BC74: ldr r2, _0801BCA4 @ =gBattleMons - ldr r0, _0801BCA8 @ =gPlayerMonIndex + ldr r0, _0801BCA8 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -34,7 +34,7 @@ _0801BC74: ldrh r0, [r0, 0x28] cmp r0, 0 bne _0801BCB8 - ldr r2, _0801BCAC @ =gUnknown_02024C6C + ldr r2, _0801BCAC @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 2 @@ -45,15 +45,15 @@ _0801BC74: lsls r0, 12 orrs r1, r0 str r1, [r2] - ldr r1, _0801BCB0 @ =gUnknown_02024C10 - ldr r0, _0801BCB4 @ =BattleScript_1D6F62 + ldr r1, _0801BCB0 @ =gBattlescriptCurrInstr + ldr r0, _0801BCB4 @ =BattleScript_EndTurn b _0801BFF2 .align 2, 0 _0801BCA4: .4byte gBattleMons -_0801BCA8: .4byte gPlayerMonIndex -_0801BCAC: .4byte gUnknown_02024C6C -_0801BCB0: .4byte gUnknown_02024C10 -_0801BCB4: .4byte BattleScript_1D6F62 +_0801BCA8: .4byte gBankAttacker +_0801BCAC: .4byte gHitMarker +_0801BCB0: .4byte gBattlescriptCurrInstr +_0801BCB4: .4byte BattleScript_EndTurn _0801BCB8: bl sub_8017718 lsls r0, 24 @@ -62,22 +62,22 @@ _0801BCB8: beq _0801BCC6 b _0801BFF4 _0801BCC6: - ldr r0, _0801BD34 @ =gEnemyMonIndex + ldr r0, _0801BD34 @ =gBankTarget ldrb r1, [r0] str r2, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0801BCDE b _0801BFF4 _0801BCDE: ldr r4, _0801BD38 @ =gBattleMons - ldr r0, _0801BD3C @ =gUnknown_02024BE4 + ldr r0, _0801BD3C @ =gCurrMovePos ldrb r1, [r0] - ldr r3, _0801BD40 @ =gPlayerMonIndex + ldr r3, _0801BD40 @ =gBankAttacker ldrb r2, [r3] movs r0, 0x58 muls r2, r0 @@ -86,10 +86,10 @@ _0801BCDE: adds r0, 0x24 adds r1, r0 ldrb r0, [r1] - ldr r5, _0801BD44 @ =gUnknown_02024C6C + ldr r5, _0801BD44 @ =gHitMarker cmp r0, 0 bne _0801BD5C - ldr r0, _0801BD48 @ =gUnknown_02024BE6 + ldr r0, _0801BD48 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xA5 beq _0801BD5C @@ -107,8 +107,8 @@ _0801BCDE: ands r0, r1 cmp r0, 0 bne _0801BD5C - ldr r1, _0801BD50 @ =gUnknown_02024C10 - ldr r0, _0801BD54 @ =gUnknown_081D936D + ldr r1, _0801BD50 @ =gBattlescriptCurrInstr + ldr r0, _0801BD54 @ =BattleScript_NoPPForMove str r0, [r1] ldr r2, _0801BD58 @ =gBattleMoveFlags ldrb r0, [r2] @@ -117,15 +117,15 @@ _0801BCDE: strb r0, [r2] b _0801BFF4 .align 2, 0 -_0801BD34: .4byte gEnemyMonIndex +_0801BD34: .4byte gBankTarget _0801BD38: .4byte gBattleMons -_0801BD3C: .4byte gUnknown_02024BE4 -_0801BD40: .4byte gPlayerMonIndex -_0801BD44: .4byte gUnknown_02024C6C -_0801BD48: .4byte gUnknown_02024BE6 +_0801BD3C: .4byte gCurrMovePos +_0801BD40: .4byte gBankAttacker +_0801BD44: .4byte gHitMarker +_0801BD48: .4byte gCurrentMove _0801BD4C: .4byte 0x00800200 -_0801BD50: .4byte gUnknown_02024C10 -_0801BD54: .4byte gUnknown_081D936D +_0801BD50: .4byte gBattlescriptCurrInstr +_0801BD54: .4byte BattleScript_NoPPForMove _0801BD58: .4byte gBattleMoveFlags _0801BD5C: ldr r0, [r5] @@ -172,14 +172,14 @@ _0801BDA4: .align 2, 0 _0801BDB0: .4byte gBattleMoveFlags _0801BDB4: - ldr r2, _0801BE18 @ =gUnknown_02024C6C + ldr r2, _0801BE18 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 18 orrs r0, r1 str r0, [r2] - ldr r2, _0801BE1C @ =gUnknown_02024D28 - ldr r1, _0801BE20 @ =gEnemyMonIndex + ldr r2, _0801BE1C @ =gProtectStructs + ldr r1, _0801BE20 @ =gBankTarget ldrb r3, [r1] lsls r0, r3, 4 adds r0, r2 @@ -190,7 +190,7 @@ _0801BDB4: cmp r0, 0 bge _0801BE3C ldr r2, _0801BE24 @ =gBattleMoves - ldr r0, _0801BE28 @ =gUnknown_02024BE6 + ldr r0, _0801BE28 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -201,7 +201,7 @@ _0801BDB4: ands r0, r1 cmp r0, 0 beq _0801BE3C - ldr r0, _0801BE2C @ =gPlayerMonIndex + ldr r0, _0801BE2C @ =gBankAttacker ldrb r0, [r0] ldr r2, _0801BE30 @ =0x00000115 adds r1, r3, 0 @@ -216,30 +216,30 @@ _0801BDB4: ands r0, r2 strb r0, [r1] bl b_movescr_stack_push_cursor - ldr r1, _0801BE34 @ =gUnknown_02024C10 - ldr r0, _0801BE38 @ =gUnknown_081D946F + ldr r1, _0801BE34 @ =gBattlescriptCurrInstr + ldr r0, _0801BE38 @ =BattleScript_MagicCoatBounce b _0801BFF2 .align 2, 0 -_0801BE18: .4byte gUnknown_02024C6C -_0801BE1C: .4byte gUnknown_02024D28 -_0801BE20: .4byte gEnemyMonIndex +_0801BE18: .4byte gHitMarker +_0801BE1C: .4byte gProtectStructs +_0801BE20: .4byte gBankTarget _0801BE24: .4byte gBattleMoves -_0801BE28: .4byte gUnknown_02024BE6 -_0801BE2C: .4byte gPlayerMonIndex +_0801BE28: .4byte gCurrentMove +_0801BE2C: .4byte gBankAttacker _0801BE30: .4byte 0x00000115 -_0801BE34: .4byte gUnknown_02024C10 -_0801BE38: .4byte gUnknown_081D946F +_0801BE34: .4byte gBattlescriptCurrInstr +_0801BE38: .4byte BattleScript_MagicCoatBounce _0801BE3C: movs r2, 0 - ldr r0, _0801BEB8 @ =gUnknown_02024A68 + ldr r0, _0801BEB8 @ =gNoOfAllBanks ldrb r0, [r0] cmp r2, r0 bge _0801BE7E - ldr r6, _0801BEBC @ =gUnknown_02024D28 + ldr r6, _0801BEBC @ =gProtectStructs ldr r1, _0801BEC0 @ =gBattleMoves mov r12, r1 adds r5, r0, 0 - ldr r7, _0801BEC4 @ =gUnknown_02024A7A + ldr r7, _0801BEC4 @ =gTurnOrder _0801BE50: adds r4, r2, r7 ldrb r3, [r4] @@ -249,7 +249,7 @@ _0801BE50: lsls r0, 26 cmp r0, 0 bge _0801BE78 - ldr r0, _0801BEC8 @ =gUnknown_02024BE6 + ldr r0, _0801BEC8 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -266,7 +266,7 @@ _0801BE78: cmp r2, r5 blt _0801BE50 _0801BE7E: - ldr r0, _0801BECC @ =gUnknown_02024D68 + ldr r0, _0801BECC @ =gSpecialStatuses mov r1, r8 ldrb r2, [r1] lsls r1, r2, 2 @@ -281,12 +281,12 @@ _0801BE7E: negs r0, r0 ands r0, r3 strb r0, [r1] - ldr r4, _0801BED0 @ =byte_2024C06 + ldr r4, _0801BED0 @ =gLastUsedAbility movs r0, 0x1F strb r0, [r4] bl b_movescr_stack_push_cursor - ldr r1, _0801BED4 @ =gUnknown_02024C10 - ldr r0, _0801BED8 @ =gUnknown_081D9812 + ldr r1, _0801BED4 @ =gBattlescriptCurrInstr + ldr r0, _0801BED8 @ =BattleScript_TookAttack str r0, [r1] mov r2, r8 ldrb r0, [r2] @@ -294,15 +294,15 @@ _0801BE7E: bl sub_81074C4 b _0801BFF4 .align 2, 0 -_0801BEB8: .4byte gUnknown_02024A68 -_0801BEBC: .4byte gUnknown_02024D28 +_0801BEB8: .4byte gNoOfAllBanks +_0801BEBC: .4byte gProtectStructs _0801BEC0: .4byte gBattleMoves -_0801BEC4: .4byte gUnknown_02024A7A -_0801BEC8: .4byte gUnknown_02024BE6 -_0801BECC: .4byte gUnknown_02024D68 -_0801BED0: .4byte byte_2024C06 -_0801BED4: .4byte gUnknown_02024C10 -_0801BED8: .4byte gUnknown_081D9812 +_0801BEC4: .4byte gTurnOrder +_0801BEC8: .4byte gCurrentMove +_0801BECC: .4byte gSpecialStatuses +_0801BED0: .4byte gLastUsedAbility +_0801BED4: .4byte gBattlescriptCurrInstr +_0801BED8: .4byte BattleScript_TookAttack _0801BEDC: lsls r0, r2, 4 add r0, r9 @@ -313,7 +313,7 @@ _0801BEDC: b _0801BFEC _0801BEEA: ldr r1, _0801BF80 @ =gBattleMoves - ldr r2, _0801BF84 @ =gUnknown_02024BE6 + ldr r2, _0801BF84 @ =gCurrentMove ldrh r3, [r2] lsls r0, r3, 1 adds r0, r3 @@ -328,7 +328,7 @@ _0801BEEA: cmp r3, 0xAE bne _0801BF28 ldr r2, _0801BF88 @ =gBattleMons - ldr r0, _0801BF8C @ =gPlayerMonIndex + ldr r0, _0801BF8C @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -350,7 +350,7 @@ _0801BF28: cmp r0, 0 beq _0801BF4E ldr r1, _0801BF88 @ =gBattleMons - ldr r0, _0801BF8C @ =gPlayerMonIndex + ldr r0, _0801BF8C @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -363,16 +363,16 @@ _0801BF28: cmp r0, 0 beq _0801BFEC _0801BF4E: - ldr r0, _0801BF8C @ =gPlayerMonIndex + ldr r0, _0801BF8C @ =gBankAttacker ldrb r0, [r0] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves ldr r2, _0801BF90 @ =gBattleMoveFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _0801BF94 @ =gUnknown_02024C3C - ldr r3, _0801BF98 @ =gEnemyMonIndex + ldr r1, _0801BF94 @ =gMoveHitWith + ldr r3, _0801BF98 @ =gBankTarget ldrb r0, [r3] lsls r0, 1 adds r0, r1 @@ -383,22 +383,22 @@ _0801BF4E: lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r1, _0801BFA0 @ =gUnknown_02024D1E + ldr r1, _0801BFA0 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x6] b _0801BFEC .align 2, 0 _0801BF80: .4byte gBattleMoves -_0801BF84: .4byte gUnknown_02024BE6 +_0801BF84: .4byte gCurrentMove _0801BF88: .4byte gBattleMons -_0801BF8C: .4byte gPlayerMonIndex +_0801BF8C: .4byte gBankAttacker _0801BF90: .4byte gBattleMoveFlags -_0801BF94: .4byte gUnknown_02024C3C -_0801BF98: .4byte gEnemyMonIndex +_0801BF94: .4byte gMoveHitWith +_0801BF98: .4byte gBankTarget _0801BF9C: .4byte gUnknown_02024C44 -_0801BFA0: .4byte gUnknown_02024D1E +_0801BFA0: .4byte gBattleCommunication _0801BFA4: - ldr r0, _0801BFD4 @ =gPlayerMonIndex + ldr r0, _0801BFD4 @ =gBankAttacker ldrb r0, [r0] ldr r2, _0801BFD8 @ =0x00000121 adds r1, r3, 0 @@ -417,18 +417,18 @@ _0801BFA4: adds r0, r2 strb r1, [r0] bl b_movescr_stack_push_cursor - ldr r1, _0801BFE4 @ =gUnknown_02024C10 - ldr r0, _0801BFE8 @ =gUnknown_081D9487 + ldr r1, _0801BFE4 @ =gBattlescriptCurrInstr + ldr r0, _0801BFE8 @ =BattleScript_SnatchedMove b _0801BFF2 .align 2, 0 -_0801BFD4: .4byte gPlayerMonIndex +_0801BFD4: .4byte gBankAttacker _0801BFD8: .4byte 0x00000121 _0801BFDC: .4byte 0x02000000 _0801BFE0: .4byte 0x00016003 -_0801BFE4: .4byte gUnknown_02024C10 -_0801BFE8: .4byte gUnknown_081D9487 +_0801BFE4: .4byte gBattlescriptCurrInstr +_0801BFE8: .4byte BattleScript_SnatchedMove _0801BFEC: - ldr r1, _0801C004 @ =gUnknown_02024C10 + ldr r1, _0801C004 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 _0801BFF2: @@ -442,7 +442,7 @@ _0801BFF4: pop {r0} bx r0 .align 2, 0 -_0801C004: .4byte gUnknown_02024C10 +_0801C004: .4byte gBattlescriptCurrInstr thumb_func_end atk00_attackcanceler thumb_func_start mcmd_jump_if_move_not_executed @@ -453,7 +453,7 @@ mcmd_jump_if_move_not_executed: @ 801C008 lsrs r0, 24 lsls r1, 16 lsrs r6, r1, 16 - ldr r1, _0801C054 @ =gUnknown_02024C10 + ldr r1, _0801C054 @ =gBattlescriptCurrInstr ldr r5, [r1] adds r4, r5, r0 ldr r0, _0801C058 @ =gBattleMoveFlags @@ -462,8 +462,8 @@ mcmd_jump_if_move_not_executed: @ 801C008 ands r0, r1 cmp r0, 0 beq _0801C068 - ldr r1, _0801C05C @ =gUnknown_02024C3C - ldr r3, _0801C060 @ =gEnemyMonIndex + ldr r1, _0801C05C @ =gMoveHitWith + ldr r3, _0801C060 @ =gBankTarget ldrb r0, [r3] lsls r0, 1 adds r0, r1 @@ -486,25 +486,25 @@ mcmd_jump_if_move_not_executed: @ 801C008 orrs r4, r0 b _0801C082 .align 2, 0 -_0801C054: .4byte gUnknown_02024C10 +_0801C054: .4byte gBattlescriptCurrInstr _0801C058: .4byte gBattleMoveFlags -_0801C05C: .4byte gUnknown_02024C3C -_0801C060: .4byte gEnemyMonIndex +_0801C05C: .4byte gMoveHitWith +_0801C060: .4byte gBankTarget _0801C064: .4byte gUnknown_02024C44 _0801C068: bl b_feature_update_destiny_bond - ldr r0, _0801C090 @ =gEnemyMonIndex + ldr r0, _0801C090 @ =gBankTarget ldrb r1, [r0] str r6, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0801C086 _0801C082: - ldr r0, _0801C094 @ =gUnknown_02024C10 + ldr r0, _0801C094 @ =gBattlescriptCurrInstr str r4, [r0] _0801C086: add sp, 0x4 @@ -512,15 +512,15 @@ _0801C086: pop {r0} bx r0 .align 2, 0 -_0801C090: .4byte gEnemyMonIndex -_0801C094: .4byte gUnknown_02024C10 +_0801C090: .4byte gBankTarget +_0801C094: .4byte gBattlescriptCurrInstr thumb_func_end mcmd_jump_if_move_not_executed - thumb_func_start atk40_801DBA0 -atk40_801DBA0: @ 801C098 + thumb_func_start atk40_jump_if_move_affected_by_protect +atk40_jump_if_move_affected_by_protect: @ 801C098 push {lr} - ldr r1, _0801C0E0 @ =gUnknown_02024D28 - ldr r0, _0801C0E4 @ =gEnemyMonIndex + ldr r1, _0801C0E0 @ =gProtectStructs + ldr r0, _0801C0E4 @ =gBankTarget ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -529,7 +529,7 @@ atk40_801DBA0: @ 801C098 cmp r0, 0 beq _0801C0F8 ldr r2, _0801C0E8 @ =gBattleMoves - ldr r0, _0801C0EC @ =gUnknown_02024BE6 + ldr r0, _0801C0EC @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -548,19 +548,19 @@ atk40_801DBA0: @ 801C098 movs r0, 0x5 movs r1, 0 bl mcmd_jump_if_move_not_executed - ldr r1, _0801C0F4 @ =gUnknown_02024D1E + ldr r1, _0801C0F4 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x6] b _0801C100 .align 2, 0 -_0801C0E0: .4byte gUnknown_02024D28 -_0801C0E4: .4byte gEnemyMonIndex +_0801C0E0: .4byte gProtectStructs +_0801C0E4: .4byte gBankTarget _0801C0E8: .4byte gBattleMoves -_0801C0EC: .4byte gUnknown_02024BE6 +_0801C0EC: .4byte gCurrentMove _0801C0F0: .4byte gBattleMoveFlags -_0801C0F4: .4byte gUnknown_02024D1E +_0801C0F4: .4byte gBattleCommunication _0801C0F8: - ldr r1, _0801C104 @ =gUnknown_02024C10 + ldr r1, _0801C104 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -568,8 +568,8 @@ _0801C100: pop {r0} bx r0 .align 2, 0 -_0801C104: .4byte gUnknown_02024C10 - thumb_func_end atk40_801DBA0 +_0801C104: .4byte gBattlescriptCurrInstr + thumb_func_end atk40_jump_if_move_affected_by_protect thumb_func_start sub_801C108 sub_801C108: @ 801C108 @@ -577,8 +577,8 @@ sub_801C108: @ 801C108 lsls r0, 16 lsrs r3, r0, 16 movs r4, 0 - ldr r1, _0801C15C @ =gUnknown_02024D28 - ldr r0, _0801C160 @ =gEnemyMonIndex + ldr r1, _0801C15C @ =gProtectStructs + ldr r0, _0801C160 @ =gBankTarget ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -587,7 +587,7 @@ sub_801C108: @ 801C108 cmp r0, 0 beq _0801C154 ldr r2, _0801C164 @ =gBattleMoves - ldr r0, _0801C168 @ =gUnknown_02024BE6 + ldr r0, _0801C168 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -606,7 +606,7 @@ sub_801C108: @ 801C108 movs r0, 0x7 adds r1, r3, 0 bl mcmd_jump_if_move_not_executed - ldr r1, _0801C170 @ =gUnknown_02024D1E + ldr r1, _0801C170 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x6] movs r4, 0x1 @@ -616,12 +616,12 @@ _0801C154: pop {r1} bx r1 .align 2, 0 -_0801C15C: .4byte gUnknown_02024D28 -_0801C160: .4byte gEnemyMonIndex +_0801C15C: .4byte gProtectStructs +_0801C160: .4byte gBankTarget _0801C164: .4byte gBattleMoves -_0801C168: .4byte gUnknown_02024BE6 +_0801C168: .4byte gCurrentMove _0801C16C: .4byte gBattleMoveFlags -_0801C170: .4byte gUnknown_02024D1E +_0801C170: .4byte gBattleCommunication thumb_func_end sub_801C108 thumb_func_start sub_801C174 @@ -630,8 +630,8 @@ sub_801C174: @ 801C174 sub sp, 0x4 lsls r0, 16 lsrs r5, r0, 16 - ldr r2, _0801C1D4 @ =gUnknown_02024C98 - ldr r3, _0801C1D8 @ =gEnemyMonIndex + ldr r2, _0801C1D4 @ =gStatuses3 + ldr r3, _0801C1D8 @ =gBankTarget ldrb r4, [r3] lsls r0, r4, 2 adds r0, r2 @@ -641,18 +641,18 @@ sub_801C174: @ 801C174 adds r6, r2, 0 cmp r1, 0 beq _0801C1A6 - ldr r1, _0801C1DC @ =gUnknown_02024CA8 + ldr r1, _0801C1DC @ =gDisableStructs lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r1 - ldr r1, _0801C1E0 @ =gPlayerMonIndex + ldr r1, _0801C1E0 @ =gBankAttacker ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 beq _0801C290 _0801C1A6: - ldr r0, _0801C1E4 @ =gUnknown_02024C6C + ldr r0, _0801C1E4 @ =gHitMarker ldr r1, [r0] movs r2, 0x80 lsls r2, 9 @@ -676,11 +676,11 @@ _0801C1C6: strb r1, [r0] b _0801C290 .align 2, 0 -_0801C1D4: .4byte gUnknown_02024C98 -_0801C1D8: .4byte gEnemyMonIndex -_0801C1DC: .4byte gUnknown_02024CA8 -_0801C1E0: .4byte gPlayerMonIndex -_0801C1E4: .4byte gUnknown_02024C6C +_0801C1D4: .4byte gStatuses3 +_0801C1D8: .4byte gBankTarget +_0801C1DC: .4byte gDisableStructs +_0801C1E0: .4byte gBankAttacker +_0801C1E4: .4byte gHitMarker _0801C1E8: .4byte gBattleMoveFlags _0801C1EC: ldr r0, [r2] @@ -728,7 +728,7 @@ _0801C22E: movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 lsls r4, r5, 1 @@ -739,7 +739,7 @@ _0801C22E: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0801C27E @@ -795,7 +795,7 @@ atk01_accuracycheck: @ 801C2BC mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _0801C314 @ =gUnknown_02024C10 + ldr r0, _0801C314 @ =gBattlescriptCurrInstr ldr r5, [r0] ldrb r6, [r5, 0x5] ldrb r1, [r5, 0x6] @@ -807,8 +807,8 @@ atk01_accuracycheck: @ 801C2BC adds r7, r0, 0 cmp r1, 0x1 bhi _0801C378 - ldr r2, _0801C318 @ =gUnknown_02024C98 - ldr r3, _0801C31C @ =gEnemyMonIndex + ldr r2, _0801C318 @ =gStatuses3 + ldr r3, _0801C31C @ =gBankTarget ldrb r4, [r3] lsls r0, r4, 2 adds r0, r2 @@ -820,12 +820,12 @@ atk01_accuracycheck: @ 801C2BC ldr r0, _0801C320 @ =0x0000ffff cmp r6, r0 bne _0801C32C - ldr r1, _0801C324 @ =gUnknown_02024CA8 + ldr r1, _0801C324 @ =gDisableStructs lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r1 - ldr r1, _0801C328 @ =gPlayerMonIndex + ldr r1, _0801C328 @ =gBankAttacker ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 @@ -834,12 +834,12 @@ atk01_accuracycheck: @ 801C2BC str r0, [r7] b _0801C632 .align 2, 0 -_0801C314: .4byte gUnknown_02024C10 -_0801C318: .4byte gUnknown_02024C98 -_0801C31C: .4byte gEnemyMonIndex +_0801C314: .4byte gBattlescriptCurrInstr +_0801C318: .4byte gStatuses3 +_0801C31C: .4byte gBankTarget _0801C320: .4byte 0x0000ffff -_0801C324: .4byte gUnknown_02024CA8 -_0801C328: .4byte gPlayerMonIndex +_0801C324: .4byte gDisableStructs +_0801C328: .4byte gBankAttacker _0801C32C: ldrb r0, [r3] lsls r0, 2 @@ -872,17 +872,17 @@ _0801C35C: beq _0801C36A b _0801C632 _0801C36A: - ldr r1, _0801C374 @ =gUnknown_02024C10 + ldr r1, _0801C374 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x7 str r0, [r1] b _0801C632 .align 2, 0 -_0801C374: .4byte gUnknown_02024C10 +_0801C374: .4byte gBattlescriptCurrInstr _0801C378: cmp r6, 0 bne _0801C380 - ldr r0, _0801C398 @ =gUnknown_02024BE6 + ldr r0, _0801C398 @ =gCurrentMove ldrh r6, [r0] _0801C380: ldr r0, _0801C39C @ =0x02000000 @@ -898,7 +898,7 @@ _0801C380: mov r10, r3 b _0801C3B2 .align 2, 0 -_0801C398: .4byte gUnknown_02024BE6 +_0801C398: .4byte gCurrentMove _0801C39C: .4byte 0x02000000 _0801C3A0: .4byte 0x0001601c _0801C3A4: @@ -925,7 +925,7 @@ _0801C3C0: b _0801C632 _0801C3CE: ldr r3, _0801C3FC @ =gBattleMons - ldr r0, _0801C400 @ =gEnemyMonIndex + ldr r0, _0801C400 @ =gBankTarget ldrb r0, [r0] movs r2, 0x58 adds r4, r0, 0 @@ -939,7 +939,7 @@ _0801C3CE: ands r0, r1 cmp r0, 0 beq _0801C408 - ldr r0, _0801C404 @ =gPlayerMonIndex + ldr r0, _0801C404 @ =gBankAttacker ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -948,10 +948,10 @@ _0801C3CE: .align 2, 0 _0801C3F8: .4byte gBattleMoves _0801C3FC: .4byte gBattleMons -_0801C400: .4byte gEnemyMonIndex -_0801C404: .4byte gPlayerMonIndex +_0801C400: .4byte gBankTarget +_0801C404: .4byte gBankAttacker _0801C408: - ldr r0, _0801C56C @ =gPlayerMonIndex + ldr r0, _0801C56C @ =gBankAttacker ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -987,7 +987,7 @@ _0801C430: movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 str r4, [sp, 0x4] @@ -998,7 +998,7 @@ _0801C430: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0801C482 @@ -1027,7 +1027,7 @@ _0801C482: lsls r0, 16 lsrs r4, r0, 16 ldr r7, _0801C57C @ =gBattleMons - ldr r0, _0801C56C @ =gPlayerMonIndex + ldr r0, _0801C56C @ =gBankAttacker ldrb r0, [r0] movs r5, 0x58 muls r0, r5 @@ -1050,7 +1050,7 @@ _0801C4C0: movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -1060,11 +1060,11 @@ _0801C4C0: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0801C518 - ldr r0, _0801C580 @ =gEnemyMonIndex + ldr r0, _0801C580 @ =gBankTarget ldrb r0, [r0] muls r0, r5 adds r0, r7 @@ -1087,7 +1087,7 @@ _0801C4C0: lsrs r4, r0, 16 _0801C518: ldr r2, _0801C57C @ =gBattleMons - ldr r0, _0801C56C @ =gPlayerMonIndex + ldr r0, _0801C56C @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -1108,7 +1108,7 @@ _0801C518: lsls r0, 16 lsrs r4, r0, 16 _0801C544: - ldr r3, _0801C580 @ =gEnemyMonIndex + ldr r3, _0801C580 @ =gBankTarget mov r8, r3 ldrb r2, [r3] movs r7, 0x58 @@ -1128,12 +1128,12 @@ _0801C544: ldrb r2, [r0, 0x1A] b _0801C5A4 .align 2, 0 -_0801C56C: .4byte gPlayerMonIndex +_0801C56C: .4byte gBankAttacker _0801C570: .4byte gBattleMoves _0801C574: .4byte gBattleWeather _0801C578: .4byte gAccuracyStageRatios _0801C57C: .4byte gBattleMons -_0801C580: .4byte gEnemyMonIndex +_0801C580: .4byte gBankTarget _0801C584: .4byte gEnigmaBerries _0801C588: ldrh r0, [r1, 0x2E] @@ -1149,8 +1149,8 @@ _0801C588: lsls r0, 24 lsrs r2, r0, 24 _0801C5A4: - ldr r0, _0801C608 @ =gUnknown_02024C0B - ldr r1, _0801C60C @ =gEnemyMonIndex + ldr r0, _0801C608 @ =gStringBank + ldr r1, _0801C60C @ =gBankTarget ldrb r1, [r1] strb r1, [r0] cmp r5, 0x16 @@ -1195,18 +1195,18 @@ _0801C5C0: cmp r0, 0x20 bne _0801C620 _0801C602: - ldr r1, _0801C61C @ =gUnknown_02024D1E + ldr r1, _0801C61C @ =gBattleCommunication movs r0, 0x2 b _0801C624 .align 2, 0 -_0801C608: .4byte gUnknown_02024C0B -_0801C60C: .4byte gEnemyMonIndex +_0801C608: .4byte gStringBank +_0801C60C: .4byte gBankTarget _0801C610: .4byte gBattleMoveFlags _0801C614: .4byte gBattleTypeFlags _0801C618: .4byte gBattleMoves -_0801C61C: .4byte gUnknown_02024D1E +_0801C61C: .4byte gBattleCommunication _0801C620: - ldr r1, _0801C644 @ =gUnknown_02024D1E + ldr r1, _0801C644 @ =gBattleCommunication movs r0, 0 _0801C624: strb r0, [r1, 0x6] @@ -1225,49 +1225,49 @@ _0801C632: pop {r0} bx r0 .align 2, 0 -_0801C644: .4byte gUnknown_02024D1E +_0801C644: .4byte gBattleCommunication thumb_func_end atk01_accuracycheck thumb_func_start atk02_attackstring atk02_attackstring: @ 801C648 push {r4,r5,lr} - ldr r0, _0801C688 @ =gUnknown_02024A64 + ldr r0, _0801C688 @ =gBattleExecBuffer ldr r5, [r0] cmp r5, 0 bne _0801C680 - ldr r4, _0801C68C @ =gUnknown_02024C6C + ldr r4, _0801C68C @ =gHitMarker ldr r0, [r4] movs r1, 0xC0 lsls r1, 3 ands r0, r1 cmp r0, 0 bne _0801C674 - ldr r0, _0801C690 @ =gPlayerMonIndex + ldr r0, _0801C690 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x4 - bl b_std_message + bl PrepareStringBattle ldr r0, [r4] movs r1, 0x80 lsls r1, 3 orrs r0, r1 str r0, [r4] _0801C674: - ldr r0, _0801C694 @ =gUnknown_02024C10 + ldr r0, _0801C694 @ =gBattlescriptCurrInstr ldr r1, [r0] adds r1, 0x1 str r1, [r0] - ldr r0, _0801C698 @ =gUnknown_02024D1E + ldr r0, _0801C698 @ =gBattleCommunication strb r5, [r0, 0x7] _0801C680: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0801C688: .4byte gUnknown_02024A64 -_0801C68C: .4byte gUnknown_02024C6C -_0801C690: .4byte gPlayerMonIndex -_0801C694: .4byte gUnknown_02024C10 -_0801C698: .4byte gUnknown_02024D1E +_0801C688: .4byte gBattleExecBuffer +_0801C68C: .4byte gHitMarker +_0801C690: .4byte gBankAttacker +_0801C694: .4byte gBattlescriptCurrInstr +_0801C698: .4byte gBattleCommunication thumb_func_end atk02_attackstring thumb_func_start atk03_ppreduce @@ -1279,14 +1279,14 @@ atk03_ppreduce: @ 801C69C push {r5-r7} sub sp, 0x4 movs r6, 0x1 - ldr r0, _0801C6EC @ =gUnknown_02024A64 + ldr r0, _0801C6EC @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0801C6B4 b _0801C84E _0801C6B4: - ldr r1, _0801C6F0 @ =gUnknown_02024D68 - ldr r2, _0801C6F4 @ =gPlayerMonIndex + ldr r1, _0801C6F0 @ =gSpecialStatuses + ldr r2, _0801C6F4 @ =gBankAttacker ldrb r3, [r2] lsls r0, r3, 2 adds r0, r3 @@ -1299,7 +1299,7 @@ _0801C6B4: cmp r4, 0 bne _0801C756 ldr r2, _0801C6F8 @ =gBattleMoves - ldr r0, _0801C6FC @ =gUnknown_02024BE6 + ldr r0, _0801C6FC @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1314,11 +1314,11 @@ _0801C6B4: beq _0801C71C b _0801C736 .align 2, 0 -_0801C6EC: .4byte gUnknown_02024A64 -_0801C6F0: .4byte gUnknown_02024D68 -_0801C6F4: .4byte gPlayerMonIndex +_0801C6EC: .4byte gBattleExecBuffer +_0801C6F0: .4byte gSpecialStatuses +_0801C6F4: .4byte gBankAttacker _0801C6F8: .4byte gBattleMoves -_0801C6FC: .4byte gUnknown_02024BE6 +_0801C6FC: .4byte gCurrentMove _0801C700: cmp r0, 0x40 beq _0801C71C @@ -1329,7 +1329,7 @@ _0801C706: adds r1, r3, 0 movs r2, 0x2E movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 adds r6, r0, 0x1 @@ -1342,13 +1342,13 @@ _0801C71C: movs r0, 0x10 movs r2, 0x2E movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 adds r6, r0 b _0801C756 _0801C736: - ldr r1, _0801C7B8 @ =gEnemyMonIndex + ldr r1, _0801C7B8 @ =gBankTarget mov r2, r9 ldrb r0, [r2] ldrb r7, [r1] @@ -1365,7 +1365,7 @@ _0801C736: bne _0801C756 adds r6, 0x1 _0801C756: - ldr r0, _0801C7C0 @ =gUnknown_02024C6C + ldr r0, _0801C7C0 @ =gHitMarker ldr r4, [r0] movs r0, 0xA0 lsls r0, 4 @@ -1373,8 +1373,8 @@ _0801C756: cmp r4, 0 bne _0801C83C ldr r2, _0801C7BC @ =gBattleMons - ldr r3, _0801C7C4 @ =gUnknown_02024BE4 - ldr r1, _0801C7C8 @ =gPlayerMonIndex + ldr r3, _0801C7C4 @ =gCurrMovePos + ldr r1, _0801C7C8 @ =gBankAttacker ldrb r5, [r1] movs r0, 0x58 mov r8, r0 @@ -1392,7 +1392,7 @@ _0801C756: adds r7, r3, 0 cmp r0, 0 beq _0801C83C - ldr r0, _0801C7CC @ =gUnknown_02024D28 + ldr r0, _0801C7CC @ =gProtectStructs lsls r1, r5, 4 adds r1, r0 ldrb r0, [r1, 0x2] @@ -1415,12 +1415,12 @@ _0801C756: strb r0, [r2] b _0801C7D2 .align 2, 0 -_0801C7B8: .4byte gEnemyMonIndex +_0801C7B8: .4byte gBankTarget _0801C7BC: .4byte gBattleMons -_0801C7C0: .4byte gUnknown_02024C6C -_0801C7C4: .4byte gUnknown_02024BE4 -_0801C7C8: .4byte gPlayerMonIndex -_0801C7CC: .4byte gUnknown_02024D28 +_0801C7C0: .4byte gHitMarker +_0801C7C4: .4byte gCurrMovePos +_0801C7C8: .4byte gBankAttacker +_0801C7CC: .4byte gProtectStructs _0801C7D0: strb r4, [r2] _0801C7D2: @@ -1438,7 +1438,7 @@ _0801C7D2: ands r0, r1 cmp r0, 0 bne _0801C83C - ldr r1, _0801C860 @ =gUnknown_02024CA8 + ldr r1, _0801C860 @ =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -1453,7 +1453,7 @@ _0801C7D2: ands r1, r0 cmp r1, 0 bne _0801C83C - ldr r0, _0801C868 @ =gUnknown_02024A60 + ldr r0, _0801C868 @ =gActiveBank strb r3, [r0] ldrb r1, [r7] adds r1, 0x9 @@ -1471,17 +1471,17 @@ _0801C7D2: movs r0, 0 movs r2, 0 movs r3, 0x1 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes mov r7, r9 ldrb r0, [r7] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _0801C83C: - ldr r2, _0801C86C @ =gUnknown_02024C6C + ldr r2, _0801C86C @ =gHitMarker ldr r0, [r2] ldr r1, _0801C870 @ =0xfffff7ff ands r0, r1 str r0, [r2] - ldr r1, _0801C874 @ =gUnknown_02024C10 + ldr r1, _0801C874 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -1495,19 +1495,19 @@ _0801C84E: pop {r0} bx r0 .align 2, 0 -_0801C860: .4byte gUnknown_02024CA8 +_0801C860: .4byte gDisableStructs _0801C864: .4byte gBitTable -_0801C868: .4byte gUnknown_02024A60 -_0801C86C: .4byte gUnknown_02024C6C +_0801C868: .4byte gActiveBank +_0801C86C: .4byte gHitMarker _0801C870: .4byte 0xfffff7ff -_0801C874: .4byte gUnknown_02024C10 +_0801C874: .4byte gBattlescriptCurrInstr thumb_func_end atk03_ppreduce thumb_func_start atk04_critcalc atk04_critcalc: @ 801C878 push {r4-r7,lr} ldr r1, _0801C89C @ =gBattleMons - ldr r0, _0801C8A0 @ =gPlayerMonIndex + ldr r0, _0801C8A0 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -1524,15 +1524,15 @@ atk04_critcalc: @ 801C878 b _0801C8B0 .align 2, 0 _0801C89C: .4byte gBattleMons -_0801C8A0: .4byte gPlayerMonIndex +_0801C8A0: .4byte gBankAttacker _0801C8A4: .4byte gEnigmaBerries _0801C8A8: bl ItemId_GetHoldEffect lsls r0, 24 lsrs r6, r0, 24 _0801C8B0: - ldr r1, _0801C93C @ =gUnknown_02024C0B - ldr r3, _0801C940 @ =gPlayerMonIndex + ldr r1, _0801C93C @ =gStringBank + ldr r3, _0801C940 @ =gBankAttacker ldrb r0, [r3] strb r0, [r1] ldr r4, _0801C944 @ =gBattleMons @@ -1552,7 +1552,7 @@ _0801C8B0: movs r0, 0x2 ands r5, r0 ldr r2, _0801C948 @ =gBattleMoves - ldr r0, _0801C94C @ =gUnknown_02024BE6 + ldr r0, _0801C94C @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1608,11 +1608,11 @@ _0801C930: adds r0, r2, r0 b _0801C952 .align 2, 0 -_0801C93C: .4byte gUnknown_02024C0B -_0801C940: .4byte gPlayerMonIndex +_0801C93C: .4byte gStringBank +_0801C940: .4byte gBankAttacker _0801C944: .4byte gBattleMons _0801C948: .4byte gBattleMoves -_0801C94C: .4byte gUnknown_02024BE6 +_0801C94C: .4byte gCurrentMove _0801C950: adds r0, r2, r5 _0801C952: @@ -1624,7 +1624,7 @@ _0801C952: bls _0801C960 movs r5, 0x4 _0801C960: - ldr r0, _0801C9BC @ =gEnemyMonIndex + ldr r0, _0801C9BC @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -1635,7 +1635,7 @@ _0801C960: beq _0801C9D0 cmp r4, 0x4B beq _0801C9D0 - ldr r1, _0801C9C0 @ =gUnknown_02024C98 + ldr r1, _0801C9C0 @ =gStatuses3 mov r2, r12 ldrb r0, [r2] lsls r0, 2 @@ -1668,8 +1668,8 @@ _0801C960: movs r0, 0x2 b _0801C9D4 .align 2, 0 -_0801C9BC: .4byte gEnemyMonIndex -_0801C9C0: .4byte gUnknown_02024C98 +_0801C9BC: .4byte gBankTarget +_0801C9C0: .4byte gStatuses3 _0801C9C4: .4byte gBattleTypeFlags _0801C9C8: .4byte gCriticalHitChance _0801C9CC: .4byte gCritMultiplier @@ -1678,7 +1678,7 @@ _0801C9D0: movs r0, 0x1 _0801C9D4: strb r0, [r1] - ldr r1, _0801C9E8 @ =gUnknown_02024C10 + ldr r1, _0801C9E8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -1687,7 +1687,7 @@ _0801C9D4: bx r0 .align 2, 0 _0801C9E4: .4byte gCritMultiplier -_0801C9E8: .4byte gUnknown_02024C10 +_0801C9E8: .4byte gBattlescriptCurrInstr thumb_func_end atk04_critcalc thumb_func_start atk05_damagecalc1 @@ -1697,16 +1697,16 @@ atk05_damagecalc1: @ 801C9EC mov r6, r8 push {r6,r7} sub sp, 0x10 - ldr r4, _0801CABC @ =gUnknown_02024C7A - ldr r6, _0801CAC0 @ =gEnemyMonIndex + ldr r4, _0801CABC @ =gSideAffecting + ldr r6, _0801CAC0 @ =gBankTarget ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 lsls r1, 1 adds r1, r4 ldrh r3, [r1] - ldr r0, _0801CAC4 @ =gPlayerMonIndex + ldr r0, _0801CAC4 @ =gBankAttacker mov r8, r0 ldrb r0, [r0] movs r4, 0x58 @@ -1716,10 +1716,10 @@ atk05_damagecalc1: @ 801C9EC ldrb r1, [r6] muls r1, r4 adds r1, r2 - ldr r2, _0801CACC @ =gUnknown_02024BE6 + ldr r2, _0801CACC @ =gCurrentMove mov r9, r2 ldrh r2, [r2] - ldr r4, _0801CAD0 @ =gUnknown_02024DEC + ldr r4, _0801CAD0 @ =gDynamicBasePower ldrh r4, [r4] str r4, [sp] ldr r5, _0801CAD4 @ =0x02000000 @@ -1743,7 +1743,7 @@ atk05_damagecalc1: @ 801C9EC adds r3, r1, 0 muls r3, r0 str r3, [r4] - ldr r1, _0801CAE8 @ =gUnknown_02024C98 + ldr r1, _0801CAE8 @ =gStatuses3 ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -1766,8 +1766,8 @@ atk05_damagecalc1: @ 801C9EC lsls r0, r3, 1 str r0, [r4] _0801CA82: - ldr r1, _0801CAF0 @ =gUnknown_02024D28 - ldr r0, _0801CAC4 @ =gPlayerMonIndex + ldr r1, _0801CAF0 @ =gProtectStructs + ldr r0, _0801CAC4 @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -1783,7 +1783,7 @@ _0801CA82: bl __divsi3 str r0, [r4] _0801CAA4: - ldr r1, _0801CAF4 @ =gUnknown_02024C10 + ldr r1, _0801CAF4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -1795,21 +1795,21 @@ _0801CAA4: pop {r0} bx r0 .align 2, 0 -_0801CABC: .4byte gUnknown_02024C7A -_0801CAC0: .4byte gEnemyMonIndex -_0801CAC4: .4byte gPlayerMonIndex +_0801CABC: .4byte gSideAffecting +_0801CAC0: .4byte gBankTarget +_0801CAC4: .4byte gBankAttacker _0801CAC8: .4byte gBattleMons -_0801CACC: .4byte gUnknown_02024BE6 -_0801CAD0: .4byte gUnknown_02024DEC +_0801CACC: .4byte gCurrentMove +_0801CAD0: .4byte gDynamicBasePower _0801CAD4: .4byte 0x02000000 _0801CAD8: .4byte 0x0001601c _0801CADC: .4byte gBattleMoveDamage _0801CAE0: .4byte gCritMultiplier _0801CAE4: .4byte 0x0001601f -_0801CAE8: .4byte gUnknown_02024C98 +_0801CAE8: .4byte gStatuses3 _0801CAEC: .4byte gBattleMoves -_0801CAF0: .4byte gUnknown_02024D28 -_0801CAF4: .4byte gUnknown_02024C10 +_0801CAF0: .4byte gProtectStructs +_0801CAF4: .4byte gBattlescriptCurrInstr thumb_func_end atk05_damagecalc1 thumb_func_start sub_801CAF8 @@ -1824,9 +1824,9 @@ sub_801CAF8: @ 801CAF8 lsrs r7, r0, 24 lsls r5, 24 lsrs r5, 24 - ldr r4, _0801CBBC @ =gUnknown_02024C7A + ldr r4, _0801CBBC @ =gSideAffecting adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 lsls r1, 1 @@ -1839,10 +1839,10 @@ sub_801CAF8: @ 801CAF8 adds r0, r2 muls r1, r5 adds r1, r2 - ldr r2, _0801CBC4 @ =gUnknown_02024BE6 + ldr r2, _0801CBC4 @ =gCurrentMove mov r9, r2 ldrh r2, [r2] - ldr r4, _0801CBC8 @ =gUnknown_02024DEC + ldr r4, _0801CBC8 @ =gDynamicBasePower mov r8, r4 ldrh r4, [r4] str r4, [sp] @@ -1866,7 +1866,7 @@ sub_801CAF8: @ 801CAF8 adds r3, r1, 0 muls r3, r0 str r3, [r4] - ldr r1, _0801CBE0 @ =gUnknown_02024C98 + ldr r1, _0801CBE0 @ =gStatuses3 lsls r0, r7, 2 adds r0, r1 ldr r0, [r0] @@ -1888,7 +1888,7 @@ sub_801CAF8: @ 801CAF8 lsls r0, r3, 1 str r0, [r4] _0801CB8E: - ldr r0, _0801CBE8 @ =gUnknown_02024D28 + ldr r0, _0801CBE8 @ =gProtectStructs lsls r1, r7, 4 adds r1, r0 ldrb r0, [r1] @@ -1911,18 +1911,18 @@ _0801CBAC: pop {r0} bx r0 .align 2, 0 -_0801CBBC: .4byte gUnknown_02024C7A +_0801CBBC: .4byte gSideAffecting _0801CBC0: .4byte gBattleMons -_0801CBC4: .4byte gUnknown_02024BE6 -_0801CBC8: .4byte gUnknown_02024DEC +_0801CBC4: .4byte gCurrentMove +_0801CBC8: .4byte gDynamicBasePower _0801CBCC: .4byte 0x02000000 _0801CBD0: .4byte 0x0001601c _0801CBD4: .4byte gBattleMoveDamage _0801CBD8: .4byte gCritMultiplier _0801CBDC: .4byte 0x0001601f -_0801CBE0: .4byte gUnknown_02024C98 +_0801CBE0: .4byte gStatuses3 _0801CBE4: .4byte gBattleMoves -_0801CBE8: .4byte gUnknown_02024D28 +_0801CBE8: .4byte gProtectStructs thumb_func_end sub_801CAF8 thumb_func_start battle_attack_damage_modulate_by_effectivity @@ -1970,7 +1970,7 @@ _0801CC26: _0801CC38: .4byte gBattleMoveFlags _0801CC3C: ldr r2, _0801CC6C @ =gBattleMoves - ldr r0, _0801CC70 @ =gUnknown_02024BE6 + ldr r0, _0801CC70 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1994,14 +1994,14 @@ _0801CC3C: b _0801CCBC .align 2, 0 _0801CC6C: .4byte gBattleMoves -_0801CC70: .4byte gUnknown_02024BE6 +_0801CC70: .4byte gCurrentMove _0801CC74: .4byte gBattleMoveFlags _0801CC78: movs r0, 0x4 b _0801CCBA _0801CC7C: ldr r2, _0801CCAC @ =gBattleMoves - ldr r0, _0801CCB0 @ =gUnknown_02024BE6 + ldr r0, _0801CCB0 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -2025,7 +2025,7 @@ _0801CC7C: b _0801CCBC .align 2, 0 _0801CCAC: .4byte gBattleMoves -_0801CCB0: .4byte gUnknown_02024BE6 +_0801CCB0: .4byte gCurrentMove _0801CCB4: .4byte gBattleMoveFlags _0801CCB8: movs r0, 0x2 @@ -2039,14 +2039,14 @@ _0801CCBE: bx r0 thumb_func_end battle_attack_damage_modulate_by_effectivity - thumb_func_start atk06_damagecalc2 -atk06_damagecalc2: @ 801CCC4 + thumb_func_start atk06_typecalc +atk06_typecalc: @ 801CCC4 push {r4-r7,lr} mov r7, r8 push {r7} sub sp, 0x8 movs r3, 0 - ldr r1, _0801CCF0 @ =gUnknown_02024BE6 + ldr r1, _0801CCF0 @ =gCurrentMove ldrh r0, [r1] cmp r0, 0xA5 bne _0801CCD8 @@ -2065,7 +2065,7 @@ _0801CCD8: mov r8, r2 b _0801CD0C .align 2, 0 -_0801CCF0: .4byte gUnknown_02024BE6 +_0801CCF0: .4byte gCurrentMove _0801CCF4: .4byte 0x02000000 _0801CCF8: .4byte 0x0001601c _0801CCFC: @@ -2079,7 +2079,7 @@ _0801CCFC: mov r8, r0 _0801CD0C: ldr r2, _0801CD98 @ =gBattleMons - ldr r0, _0801CD9C @ =gPlayerMonIndex + ldr r0, _0801CD9C @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -2107,7 +2107,7 @@ _0801CD2E: str r0, [r4] ldr r3, [sp, 0x4] _0801CD44: - ldr r2, _0801CDA4 @ =gEnemyMonIndex + ldr r2, _0801CDA4 @ =gBankTarget ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -2120,14 +2120,14 @@ _0801CD44: mov r1, r8 cmp r1, 0x4 bne _0801CDBC - ldr r3, _0801CDA8 @ =byte_2024C06 + ldr r3, _0801CDA8 @ =gLastUsedAbility strb r0, [r3] ldr r2, _0801CDAC @ =gBattleMoveFlags ldrb r0, [r2] movs r1, 0x9 orrs r0, r1 strb r0, [r2] - ldr r1, _0801CDB0 @ =gUnknown_02024C3C + ldr r1, _0801CDB0 @ =gMoveHitWith ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -2138,7 +2138,7 @@ _0801CD44: lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r0, _0801CDB8 @ =gUnknown_02024D1E + ldr r0, _0801CDB8 @ =gBattleCommunication mov r2, r8 strb r2, [r0, 0x6] ldrb r0, [r4] @@ -2148,14 +2148,14 @@ _0801CD44: .align 2, 0 _0801CD94: .4byte gBattleMoves _0801CD98: .4byte gBattleMons -_0801CD9C: .4byte gPlayerMonIndex +_0801CD9C: .4byte gBankAttacker _0801CDA0: .4byte gBattleMoveDamage -_0801CDA4: .4byte gEnemyMonIndex -_0801CDA8: .4byte byte_2024C06 +_0801CDA4: .4byte gBankTarget +_0801CDA8: .4byte gLastUsedAbility _0801CDAC: .4byte gBattleMoveFlags -_0801CDB0: .4byte gUnknown_02024C3C +_0801CDB0: .4byte gMoveHitWith _0801CDB4: .4byte gUnknown_02024C44 -_0801CDB8: .4byte gUnknown_02024D1E +_0801CDB8: .4byte gBattleCommunication _0801CDBC: ldr r1, _0801CDC8 @ =gTypeEffectiveness adds r0, r3, r1 @@ -2176,7 +2176,7 @@ _0801CDD0: adds r1, r3, 0x1 adds r1, r5 ldr r2, _0801CF0C @ =gBattleMons - ldr r7, _0801CF10 @ =gEnemyMonIndex + ldr r7, _0801CF10 @ =gBankTarget ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -2216,7 +2216,7 @@ _0801CE06: _0801CE2C: adds r3, 0x3 ldr r5, _0801CF0C @ =gBattleMons - ldr r4, _0801CF10 @ =gEnemyMonIndex + ldr r4, _0801CF10 @ =gBankTarget ldr r2, _0801CF08 @ =gTypeEffectiveness _0801CE34: adds r0, r3, r2 @@ -2240,7 +2240,7 @@ _0801CE38: beq _0801CDCC _0801CE58: ldr r2, _0801CF0C @ =gBattleMons - ldr r5, _0801CF10 @ =gEnemyMonIndex + ldr r5, _0801CF10 @ =gBankTarget ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -2249,9 +2249,9 @@ _0801CE58: ldrb r6, [r0] cmp r6, 0x19 bne _0801CED6 - ldr r0, _0801CF14 @ =gPlayerMonIndex + ldr r0, _0801CF14 @ =gBankAttacker ldrb r0, [r0] - ldr r7, _0801CF18 @ =gUnknown_02024BE6 + ldr r7, _0801CF18 @ =gCurrentMove ldrh r1, [r7] bl move_weather_interaction lsls r0, 24 @@ -2278,13 +2278,13 @@ _0801CE94: ldrb r0, [r0, 0x1] cmp r0, 0 beq _0801CED6 - ldr r3, _0801CF24 @ =byte_2024C06 + ldr r3, _0801CF24 @ =gLastUsedAbility strb r6, [r3] movs r0, 0x1 orrs r0, r4 mov r2, r8 strb r0, [r2] - ldr r1, _0801CF28 @ =gUnknown_02024C3C + ldr r1, _0801CF28 @ =gMoveHitWith ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -2295,7 +2295,7 @@ _0801CE94: lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r1, _0801CF30 @ =gUnknown_02024D1E + ldr r1, _0801CF30 @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x6] ldrb r0, [r5] @@ -2308,8 +2308,8 @@ _0801CED6: ands r0, r1 cmp r0, 0 beq _0801CEF4 - ldr r2, _0801CF34 @ =gUnknown_02024D28 - ldr r0, _0801CF14 @ =gPlayerMonIndex + ldr r2, _0801CF34 @ =gProtectStructs + ldr r0, _0801CF14 @ =gBankAttacker ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -2318,7 +2318,7 @@ _0801CED6: orrs r0, r2 strb r0, [r1, 0x1] _0801CEF4: - ldr r1, _0801CF38 @ =gUnknown_02024C10 + ldr r1, _0801CF38 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -2331,18 +2331,18 @@ _0801CEF4: .align 2, 0 _0801CF08: .4byte gTypeEffectiveness _0801CF0C: .4byte gBattleMons -_0801CF10: .4byte gEnemyMonIndex -_0801CF14: .4byte gPlayerMonIndex -_0801CF18: .4byte gUnknown_02024BE6 +_0801CF10: .4byte gBankTarget +_0801CF14: .4byte gBankAttacker +_0801CF18: .4byte gCurrentMove _0801CF1C: .4byte gBattleMoveFlags _0801CF20: .4byte gBattleMoves -_0801CF24: .4byte byte_2024C06 -_0801CF28: .4byte gUnknown_02024C3C +_0801CF24: .4byte gLastUsedAbility +_0801CF28: .4byte gMoveHitWith _0801CF2C: .4byte gUnknown_02024C44 -_0801CF30: .4byte gUnknown_02024D1E -_0801CF34: .4byte gUnknown_02024D28 -_0801CF38: .4byte gUnknown_02024C10 - thumb_func_end atk06_damagecalc2 +_0801CF30: .4byte gBattleCommunication +_0801CF34: .4byte gProtectStructs +_0801CF38: .4byte gBattlescriptCurrInstr + thumb_func_end atk06_typecalc thumb_func_start b_wonderguard_and_levitate b_wonderguard_and_levitate: @ 801CF3C @@ -2352,7 +2352,7 @@ b_wonderguard_and_levitate: @ 801CF3C push {r6,r7} movs r6, 0 movs r5, 0 - ldr r0, _0801CF80 @ =gUnknown_02024BE6 + ldr r0, _0801CF80 @ =gCurrentMove ldrh r1, [r0] mov r9, r0 cmp r1, 0xA5 @@ -2382,7 +2382,7 @@ _0801CF66: mov r12, r2 b _0801CF94 .align 2, 0 -_0801CF80: .4byte gUnknown_02024BE6 +_0801CF80: .4byte gCurrentMove _0801CF84: .4byte gBattleMoves _0801CF88: .4byte 0x02000000 _0801CF8C: .4byte 0x0001601c @@ -2391,7 +2391,7 @@ _0801CF90: mov r12, r1 _0801CF94: ldr r2, _0801CFC8 @ =gBattleMons - ldr r3, _0801CFCC @ =gEnemyMonIndex + ldr r3, _0801CFCC @ =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -2405,9 +2405,9 @@ _0801CF94: mov r0, r12 cmp r0, 0x4 bne _0801CFD8 - ldr r0, _0801CFD0 @ =byte_2024C06 + ldr r0, _0801CFD0 @ =gLastUsedAbility strb r1, [r0] - ldr r0, _0801CFD4 @ =gUnknown_02024D1E + ldr r0, _0801CFD4 @ =gBattleCommunication mov r1, r12 strb r1, [r0, 0x6] ldrb r0, [r3] @@ -2416,9 +2416,9 @@ _0801CF94: b _0801D1A4 .align 2, 0 _0801CFC8: .4byte gBattleMons -_0801CFCC: .4byte gEnemyMonIndex -_0801CFD0: .4byte byte_2024C06 -_0801CFD4: .4byte gUnknown_02024D1E +_0801CFCC: .4byte gBankTarget +_0801CFD0: .4byte gLastUsedAbility +_0801CFD4: .4byte gBattleCommunication _0801CFD8: ldr r1, _0801CFE4 @ =gTypeEffectiveness adds r0, r5, r1 @@ -2457,8 +2457,8 @@ _0801CFF2: movs r1, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, _0801D1B4 @ =gUnknown_02024D28 - ldr r0, _0801D1B8 @ =gPlayerMonIndex + ldr r1, _0801D1B4 @ =gProtectStructs + ldr r0, _0801D1B8 @ =gBankAttacker ldrb r2, [r0] lsls r2, 4 adds r2, r1 @@ -2493,8 +2493,8 @@ _0801D032: movs r1, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, _0801D1B4 @ =gUnknown_02024D28 - ldr r0, _0801D1B8 @ =gPlayerMonIndex + ldr r1, _0801D1B4 @ =gProtectStructs + ldr r0, _0801D1B8 @ =gBankAttacker ldrb r2, [r0] lsls r2, 4 adds r2, r1 @@ -2626,7 +2626,7 @@ _0801D14E: ldrb r4, [r0] cmp r4, 0x19 bne _0801D1A4 - ldr r0, _0801D1B8 @ =gPlayerMonIndex + ldr r0, _0801D1B8 @ =gBankAttacker ldrb r0, [r0] mov r2, r9 ldrh r1, [r2] @@ -2649,9 +2649,9 @@ _0801D14E: ldrb r0, [r0, 0x1] cmp r0, 0 beq _0801D1A4 - ldr r0, _0801D1C0 @ =byte_2024C06 + ldr r0, _0801D1C0 @ =gLastUsedAbility strb r4, [r0] - ldr r1, _0801D1C4 @ =gUnknown_02024D1E + ldr r1, _0801D1C4 @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x6] mov r1, r8 @@ -2667,11 +2667,11 @@ _0801D1A4: bx r0 .align 2, 0 _0801D1B0: .4byte gBattleMoveFlags -_0801D1B4: .4byte gUnknown_02024D28 -_0801D1B8: .4byte gPlayerMonIndex +_0801D1B4: .4byte gProtectStructs +_0801D1B8: .4byte gBankAttacker _0801D1BC: .4byte gBattleMoves -_0801D1C0: .4byte byte_2024C06 -_0801D1C4: .4byte gUnknown_02024D1E +_0801D1C0: .4byte gLastUsedAbility +_0801D1C4: .4byte gBattleCommunication thumb_func_end b_wonderguard_and_levitate thumb_func_start b_attack_effectivity_adapt @@ -2918,7 +2918,7 @@ _0801D388: ldrb r0, [r0] cmp r4, r0 bne _0801D3B0 - ldr r0, _0801D454 @ =gEnemyMonIndex + ldr r0, _0801D454 @ =gBankTarget ldrb r0, [r0] muls r0, r3 add r0, r8 @@ -3018,7 +3018,7 @@ _0801D43A: .align 2, 0 _0801D44C: .4byte gTypeEffectiveness _0801D450: .4byte gBattleMons -_0801D454: .4byte gEnemyMonIndex +_0801D454: .4byte gBankTarget _0801D458: .4byte gBattleMoves thumb_func_end move_effectiveness_something @@ -3100,7 +3100,7 @@ _0801D4D2: _0801D4EE: cmp r5, r8 bne _0801D510 - ldr r0, _0801D568 @ =gEnemyMonIndex + ldr r0, _0801D568 @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -3163,7 +3163,7 @@ _0801D554: bx r1 .align 2, 0 _0801D564: .4byte gTypeEffectiveness -_0801D568: .4byte gEnemyMonIndex +_0801D568: .4byte gBankTarget _0801D56C: .4byte gBattleMons _0801D570: .4byte gBattleMoves thumb_func_end ai_rate_move @@ -3201,8 +3201,8 @@ _0801D5A6: _0801D5AC: .4byte gBattleMoveDamage thumb_func_end unref_sub_801D574 - thumb_func_start atk07_damagecalc3 -atk07_damagecalc3: @ 801D5B0 + thumb_func_start atk07_dmg_adjustment +atk07_dmg_adjustment: @ 801D5B0 push {r4-r7,lr} bl Random lsls r0, 16 @@ -3228,7 +3228,7 @@ atk07_damagecalc3: @ 801D5B0 str r0, [r4] _0801D5E2: ldr r7, _0801D60C @ =gBattleMons - ldr r6, _0801D610 @ =gEnemyMonIndex + ldr r6, _0801D610 @ =gBankTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -3248,7 +3248,7 @@ _0801D5E2: .align 2, 0 _0801D608: .4byte gBattleMoveDamage _0801D60C: .4byte gBattleMons -_0801D610: .4byte gEnemyMonIndex +_0801D610: .4byte gBankTarget _0801D614: .4byte gEnigmaBerries _0801D618: ldrh r0, [r1, 0x2E] @@ -3263,8 +3263,8 @@ _0801D618: lsls r0, 24 lsrs r6, r0, 24 _0801D632: - ldr r1, _0801D6F4 @ =gUnknown_02024C0B - ldr r5, _0801D6F8 @ =gEnemyMonIndex + ldr r1, _0801D6F4 @ =gStringBank + ldr r5, _0801D6F8 @ =gBankTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -3281,7 +3281,7 @@ _0801D632: ldrb r0, [r5] movs r1, 0x27 bl sub_81074F8 - ldr r2, _0801D6FC @ =gUnknown_02024D68 + ldr r2, _0801D6FC @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -3293,7 +3293,7 @@ _0801D632: strb r1, [r0] _0801D670: ldr r2, _0801D700 @ =gBattleMons - ldr r3, _0801D6F8 @ =gEnemyMonIndex + ldr r3, _0801D6F8 @ =gBankTarget ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -3308,7 +3308,7 @@ _0801D670: cmp r1, 0 bne _0801D740 ldr r2, _0801D704 @ =gBattleMoves - ldr r0, _0801D708 @ =gUnknown_02024BE6 + ldr r0, _0801D708 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3317,14 +3317,14 @@ _0801D670: ldrb r0, [r0] cmp r0, 0x65 beq _0801D6C2 - ldr r0, _0801D70C @ =gUnknown_02024D28 + ldr r0, _0801D70C @ =gProtectStructs lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 blt _0801D6C2 - ldr r0, _0801D6FC @ =gUnknown_02024D68 + ldr r0, _0801D6FC @ =gSpecialStatuses lsls r1, r4, 2 adds r1, r4 lsls r1, 2 @@ -3345,7 +3345,7 @@ _0801D6C2: bgt _0801D740 subs r0, r1, 0x1 str r0, [r2] - ldr r1, _0801D70C @ =gUnknown_02024D28 + ldr r1, _0801D70C @ =gProtectStructs ldrb r3, [r3] lsls r0, r3, 4 adds r0, r1 @@ -3360,17 +3360,17 @@ _0801D6C2: strb r1, [r0] b _0801D740 .align 2, 0 -_0801D6F4: .4byte gUnknown_02024C0B -_0801D6F8: .4byte gEnemyMonIndex -_0801D6FC: .4byte gUnknown_02024D68 +_0801D6F4: .4byte gStringBank +_0801D6F8: .4byte gBankTarget +_0801D6FC: .4byte gSpecialStatuses _0801D700: .4byte gBattleMons _0801D704: .4byte gBattleMoves -_0801D708: .4byte gUnknown_02024BE6 -_0801D70C: .4byte gUnknown_02024D28 +_0801D708: .4byte gCurrentMove +_0801D70C: .4byte gProtectStructs _0801D710: .4byte gBattleMoveDamage _0801D714: .4byte gBattleMoveFlags _0801D718: - ldr r0, _0801D750 @ =gUnknown_02024D68 + ldr r0, _0801D750 @ =gSpecialStatuses lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -3384,14 +3384,14 @@ _0801D718: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _0801D758 @ =gUnknown_02024C04 + ldr r1, _0801D758 @ =gLastUsedItem adds r0, r3, 0 muls r0, r4 adds r0, r5 ldrh r0, [r0, 0x2E] strh r0, [r1] _0801D740: - ldr r1, _0801D75C @ =gUnknown_02024C10 + ldr r1, _0801D75C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3399,14 +3399,14 @@ _0801D740: pop {r0} bx r0 .align 2, 0 -_0801D750: .4byte gUnknown_02024D68 +_0801D750: .4byte gSpecialStatuses _0801D754: .4byte gBattleMoveFlags -_0801D758: .4byte gUnknown_02024C04 -_0801D75C: .4byte gUnknown_02024C10 - thumb_func_end atk07_damagecalc3 +_0801D758: .4byte gLastUsedItem +_0801D75C: .4byte gBattlescriptCurrInstr + thumb_func_end atk07_dmg_adjustment - thumb_func_start atk08_cmd8 -atk08_cmd8: @ 801D760 + thumb_func_start atk08_dmg_adjustment2 +atk08_dmg_adjustment2: @ 801D760 push {r4-r7,lr} bl Random lsls r0, 16 @@ -3432,7 +3432,7 @@ atk08_cmd8: @ 801D760 str r0, [r4] _0801D792: ldr r7, _0801D7BC @ =gBattleMons - ldr r6, _0801D7C0 @ =gEnemyMonIndex + ldr r6, _0801D7C0 @ =gBankTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -3452,7 +3452,7 @@ _0801D792: .align 2, 0 _0801D7B8: .4byte gBattleMoveDamage _0801D7BC: .4byte gBattleMons -_0801D7C0: .4byte gEnemyMonIndex +_0801D7C0: .4byte gBankTarget _0801D7C4: .4byte gEnigmaBerries _0801D7C8: ldrh r0, [r1, 0x2E] @@ -3467,8 +3467,8 @@ _0801D7C8: lsls r0, 24 lsrs r6, r0, 24 _0801D7E2: - ldr r1, _0801D888 @ =gUnknown_02024C0B - ldr r5, _0801D88C @ =gEnemyMonIndex + ldr r1, _0801D888 @ =gStringBank + ldr r5, _0801D88C @ =gBankTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -3485,7 +3485,7 @@ _0801D7E2: ldrb r0, [r5] movs r1, 0x27 bl sub_81074F8 - ldr r2, _0801D890 @ =gUnknown_02024D68 + ldr r2, _0801D890 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -3497,7 +3497,7 @@ _0801D7E2: strb r1, [r0] _0801D820: ldr r4, _0801D894 @ =gBattleMons - ldr r6, _0801D88C @ =gEnemyMonIndex + ldr r6, _0801D88C @ =gBankTarget ldrb r2, [r6] movs r7, 0x58 adds r3, r2, 0 @@ -3511,14 +3511,14 @@ _0801D820: ands r0, r1 cmp r0, 0 bne _0801D8CC - ldr r5, _0801D898 @ =gUnknown_02024D28 + ldr r5, _0801D898 @ =gProtectStructs lsls r0, r2, 4 adds r0, r5 ldrb r0, [r0] lsls r0, 30 cmp r0, 0 blt _0801D85E - ldr r0, _0801D890 @ =gUnknown_02024D68 + ldr r0, _0801D890 @ =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -3550,15 +3550,15 @@ _0801D85E: strb r1, [r0] b _0801D8CC .align 2, 0 -_0801D888: .4byte gUnknown_02024C0B -_0801D88C: .4byte gEnemyMonIndex -_0801D890: .4byte gUnknown_02024D68 +_0801D888: .4byte gStringBank +_0801D88C: .4byte gBankTarget +_0801D890: .4byte gSpecialStatuses _0801D894: .4byte gBattleMons -_0801D898: .4byte gUnknown_02024D28 +_0801D898: .4byte gProtectStructs _0801D89C: .4byte gBattleMoveDamage _0801D8A0: .4byte gBattleMoveFlags _0801D8A4: - ldr r0, _0801D8DC @ =gUnknown_02024D68 + ldr r0, _0801D8DC @ =gSpecialStatuses lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -3572,14 +3572,14 @@ _0801D8A4: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _0801D8E4 @ =gUnknown_02024C04 + ldr r1, _0801D8E4 @ =gLastUsedItem adds r0, r3, 0 muls r0, r7 adds r0, r4 ldrh r0, [r0, 0x2E] strh r0, [r1] _0801D8CC: - ldr r1, _0801D8E8 @ =gUnknown_02024C10 + ldr r1, _0801D8E8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3587,30 +3587,30 @@ _0801D8CC: pop {r0} bx r0 .align 2, 0 -_0801D8DC: .4byte gUnknown_02024D68 +_0801D8DC: .4byte gSpecialStatuses _0801D8E0: .4byte gBattleMoveFlags -_0801D8E4: .4byte gUnknown_02024C04 -_0801D8E8: .4byte gUnknown_02024C10 - thumb_func_end atk08_cmd8 +_0801D8E4: .4byte gLastUsedItem +_0801D8E8: .4byte gBattlescriptCurrInstr + thumb_func_end atk08_dmg_adjustment2 - thumb_func_start sub_801D8EC -sub_801D8EC: @ 801D8EC + thumb_func_start atk09_attackanimation +atk09_attackanimation: @ 801D8EC push {r4-r6,lr} mov r6, r9 mov r5, r8 push {r5,r6} sub sp, 0xC - ldr r0, _0801D940 @ =gUnknown_02024A64 + ldr r0, _0801D940 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0801D900 b _0801DA4A _0801D900: - ldr r0, _0801D944 @ =gUnknown_02024C6C + ldr r0, _0801D944 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 - ldr r3, _0801D948 @ =gUnknown_02024BE6 + ldr r3, _0801D948 @ =gCurrentMove cmp r0, 0 beq _0801D960 ldrh r0, [r3] @@ -3618,11 +3618,11 @@ _0801D900: beq _0801D960 cmp r0, 0xA4 beq _0801D960 - ldr r4, _0801D94C @ =gUnknown_02024C10 + ldr r4, _0801D94C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801D950 @ =gUnknown_081D8EEF + ldr r0, _0801D950 @ =BattleScript_Pausex20 str r0, [r4] ldr r1, _0801D954 @ =0x02000000 ldr r0, _0801D958 @ =0x00016002 @@ -3637,11 +3637,11 @@ _0801D900: strb r0, [r1] b _0801DA4A .align 2, 0 -_0801D940: .4byte gUnknown_02024A64 -_0801D944: .4byte gUnknown_02024C6C -_0801D948: .4byte gUnknown_02024BE6 -_0801D94C: .4byte gUnknown_02024C10 -_0801D950: .4byte gUnknown_081D8EEF +_0801D940: .4byte gBattleExecBuffer +_0801D944: .4byte gHitMarker +_0801D948: .4byte gCurrentMove +_0801D94C: .4byte gBattlescriptCurrInstr +_0801D950: .4byte BattleScript_Pausex20 _0801D954: .4byte 0x02000000 _0801D958: .4byte 0x00016002 _0801D95C: .4byte 0x000160a1 @@ -3679,8 +3679,8 @@ _0801D992: ands r0, r1 cmp r0, 0 bne _0801DA3C - ldr r1, _0801DA1C @ =gUnknown_02024A60 - ldr r2, _0801DA20 @ =gPlayerMonIndex + ldr r1, _0801DA1C @ =gActiveBank + ldr r2, _0801DA20 @ =gBankAttacker mov r9, r2 ldrb r0, [r2] strb r0, [r1] @@ -3709,11 +3709,11 @@ _0801D992: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r4, _0801DA34 @ =gUnknown_02024CA8 + ldr r4, _0801DA34 @ =gDisableStructs adds r0, r4 str r0, [sp, 0x8] movs r0, 0 - bl dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes + bl EmitMoveAnimation mov r1, r8 ldrb r0, [r1] adds r0, 0x1 @@ -3725,9 +3725,9 @@ _0801D992: strb r0, [r6] mov r1, r9 ldrb r0, [r1] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _0801DA00: - ldr r1, _0801DA38 @ =gUnknown_02024C10 + ldr r1, _0801DA38 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3737,20 +3737,20 @@ _0801DA0C: .4byte gBattleMoves _0801DA10: .4byte 0x02000000 _0801DA14: .4byte 0x000160a1 _0801DA18: .4byte gBattleMoveFlags -_0801DA1C: .4byte gUnknown_02024A60 -_0801DA20: .4byte gPlayerMonIndex +_0801DA1C: .4byte gActiveBank +_0801DA20: .4byte gBankAttacker _0801DA24: .4byte 0x00016002 _0801DA28: .4byte gBattleMovePower _0801DA2C: .4byte gBattleMoveDamage _0801DA30: .4byte gBattleMons -_0801DA34: .4byte gUnknown_02024CA8 -_0801DA38: .4byte gUnknown_02024C10 +_0801DA34: .4byte gDisableStructs +_0801DA38: .4byte gBattlescriptCurrInstr _0801DA3C: - ldr r4, _0801DA58 @ =gUnknown_02024C10 + ldr r4, _0801DA58 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801DA5C @ =gUnknown_081D8EEF + ldr r0, _0801DA5C @ =BattleScript_Pausex20 str r0, [r4] _0801DA4A: add sp, 0xC @@ -3761,18 +3761,18 @@ _0801DA4A: pop {r0} bx r0 .align 2, 0 -_0801DA58: .4byte gUnknown_02024C10 -_0801DA5C: .4byte gUnknown_081D8EEF - thumb_func_end sub_801D8EC +_0801DA58: .4byte gBattlescriptCurrInstr +_0801DA5C: .4byte BattleScript_Pausex20 + thumb_func_end atk09_attackanimation - thumb_func_start sub_801DA60 -sub_801DA60: @ 801DA60 + thumb_func_start atk0A_waitanimation +atk0A_waitanimation: @ 801DA60 push {lr} - ldr r0, _0801DA78 @ =gUnknown_02024A64 + ldr r0, _0801DA78 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0801DA72 - ldr r1, _0801DA7C @ =gUnknown_02024C10 + ldr r1, _0801DA7C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3780,14 +3780,14 @@ _0801DA72: pop {r0} bx r0 .align 2, 0 -_0801DA78: .4byte gUnknown_02024A64 -_0801DA7C: .4byte gUnknown_02024C10 - thumb_func_end sub_801DA60 +_0801DA78: .4byte gBattleExecBuffer +_0801DA7C: .4byte gBattlescriptCurrInstr + thumb_func_end atk0A_waitanimation - thumb_func_start sub_801DA80 -sub_801DA80: @ 801DA80 + thumb_func_start atk0B_healthbarupdate +atk0B_healthbarupdate: @ 801DA80 push {r4,r5,lr} - ldr r0, _0801DAE4 @ =gUnknown_02024A64 + ldr r0, _0801DAE4 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0801DB36 @@ -3797,11 +3797,11 @@ sub_801DA80: @ 801DA80 ands r0, r1 cmp r0, 0 bne _0801DB2E - ldr r0, _0801DAEC @ =gUnknown_02024C10 + ldr r0, _0801DAEC @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r2, _0801DAF0 @ =gUnknown_02024A60 + ldr r2, _0801DAF0 @ =gActiveBank strb r0, [r2] ldr r1, _0801DAF4 @ =gBattleMons ldrb r2, [r2] @@ -3815,7 +3815,7 @@ sub_801DA80: @ 801DA80 ands r0, r1 cmp r0, 0 beq _0801DB00 - ldr r0, _0801DAF8 @ =gUnknown_02024CA8 + ldr r0, _0801DAF8 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -3823,7 +3823,7 @@ sub_801DA80: @ 801DA80 ldrb r0, [r1, 0xA] cmp r0, 0 beq _0801DB00 - ldr r0, _0801DAFC @ =gUnknown_02024C6C + ldr r0, _0801DAFC @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -3832,39 +3832,39 @@ sub_801DA80: @ 801DA80 bne _0801DB00 movs r0, 0x80 adds r1, r2, 0 - bl b_std_message + bl PrepareStringBattle b _0801DB2E .align 2, 0 -_0801DAE4: .4byte gUnknown_02024A64 +_0801DAE4: .4byte gBattleExecBuffer _0801DAE8: .4byte gBattleMoveFlags -_0801DAEC: .4byte gUnknown_02024C10 -_0801DAF0: .4byte gUnknown_02024A60 +_0801DAEC: .4byte gBattlescriptCurrInstr +_0801DAF0: .4byte gActiveBank _0801DAF4: .4byte gBattleMons -_0801DAF8: .4byte gUnknown_02024CA8 -_0801DAFC: .4byte gUnknown_02024C6C +_0801DAF8: .4byte gDisableStructs +_0801DAFC: .4byte gHitMarker _0801DB00: ldr r5, _0801DB3C @ =gBattleMoveDamage ldrh r1, [r5] movs r0, 0 - bl dp01_build_cmdbuf_x18_0_aa_health_bar_update - ldr r4, _0801DB40 @ =gUnknown_02024A60 + bl EmitHealthBarUpdate + ldr r4, _0801DB40 @ =gActiveBank ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0801DB2E ldr r0, [r5] cmp r0, 0 ble _0801DB2E - ldr r0, _0801DB44 @ =gUnknown_030042E0 + ldr r0, _0801DB44 @ =gBattleResults ldrb r1, [r0, 0x5] movs r2, 0x1 orrs r1, r2 strb r1, [r0, 0x5] _0801DB2E: - ldr r1, _0801DB48 @ =gUnknown_02024C10 + ldr r1, _0801DB48 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -3874,16 +3874,16 @@ _0801DB36: bx r0 .align 2, 0 _0801DB3C: .4byte gBattleMoveDamage -_0801DB40: .4byte gUnknown_02024A60 -_0801DB44: .4byte gUnknown_030042E0 -_0801DB48: .4byte gUnknown_02024C10 - thumb_func_end sub_801DA80 +_0801DB40: .4byte gActiveBank +_0801DB44: .4byte gBattleResults +_0801DB48: .4byte gBattlescriptCurrInstr + thumb_func_end atk0B_healthbarupdate thumb_func_start atk0C_datahpupdate atk0C_datahpupdate: @ 801DB4C push {r4-r7,lr} sub sp, 0x4 - ldr r0, _0801DB74 @ =gUnknown_02024A64 + ldr r0, _0801DB74 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0801DB5A @@ -3903,12 +3903,12 @@ _0801DB5A: ands r6, r1 b _0801DB90 .align 2, 0 -_0801DB74: .4byte gUnknown_02024A64 +_0801DB74: .4byte gBattleExecBuffer _0801DB78: .4byte 0x02000000 _0801DB7C: .4byte 0x0001601c _0801DB80: ldr r2, _0801DC1C @ =gBattleMoves - ldr r0, _0801DC20 @ =gUnknown_02024BE6 + ldr r0, _0801DC20 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3924,11 +3924,11 @@ _0801DB90: beq _0801DB9E b _0801DF00 _0801DB9E: - ldr r0, _0801DC28 @ =gUnknown_02024C10 + ldr r0, _0801DC28 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r7, _0801DC2C @ =gUnknown_02024A60 + ldr r7, _0801DC2C @ =gActiveBank strb r0, [r7] ldr r1, _0801DC30 @ =gBattleMons ldrb r2, [r7] @@ -3942,7 +3942,7 @@ _0801DB9E: ands r0, r1 cmp r0, 0 beq _0801DCB4 - ldr r0, _0801DC34 @ =gUnknown_02024CA8 + ldr r0, _0801DC34 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -3951,7 +3951,7 @@ _0801DB9E: mov r12, r0 cmp r1, 0 beq _0801DCB4 - ldr r0, _0801DC38 @ =gUnknown_02024C6C + ldr r0, _0801DC38 @ =gHitMarker ldr r3, [r0] movs r0, 0x80 lsls r0, 1 @@ -3963,7 +3963,7 @@ _0801DB9E: ldr r4, [r6] cmp r5, r4 blt _0801DC48 - ldr r0, _0801DC40 @ =gUnknown_02024D68 + ldr r0, _0801DC40 @ =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -3983,24 +3983,24 @@ _0801DC02: ldrb r0, [r1, 0xA] subs r0, r2 strb r0, [r1, 0xA] - ldr r1, _0801DC44 @ =gUnknown_02024BF0 + ldr r1, _0801DC44 @ =gHP_dealt ldr r0, [r6] str r0, [r1] b _0801DC78 .align 2, 0 _0801DC1C: .4byte gBattleMoves -_0801DC20: .4byte gUnknown_02024BE6 +_0801DC20: .4byte gCurrentMove _0801DC24: .4byte gBattleMoveFlags -_0801DC28: .4byte gUnknown_02024C10 -_0801DC2C: .4byte gUnknown_02024A60 +_0801DC28: .4byte gBattlescriptCurrInstr +_0801DC2C: .4byte gActiveBank _0801DC30: .4byte gBattleMons -_0801DC34: .4byte gUnknown_02024CA8 -_0801DC38: .4byte gUnknown_02024C6C +_0801DC34: .4byte gDisableStructs +_0801DC38: .4byte gHitMarker _0801DC3C: .4byte gBattleMoveDamage -_0801DC40: .4byte gUnknown_02024D68 -_0801DC44: .4byte gUnknown_02024BF0 +_0801DC40: .4byte gSpecialStatuses +_0801DC44: .4byte gHP_dealt _0801DC48: - ldr r0, _0801DCA0 @ =gUnknown_02024D68 + ldr r0, _0801DCA0 @ =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -4011,7 +4011,7 @@ _0801DC48: bne _0801DC5C str r5, [r1] _0801DC5C: - ldr r2, _0801DCA4 @ =gUnknown_02024BF0 + ldr r2, _0801DCA4 @ =gHP_dealt ldrb r1, [r7] lsls r0, r1, 3 subs r0, r1 @@ -4026,7 +4026,7 @@ _0801DC5C: add r0, r12 strb r3, [r0, 0xA] _0801DC78: - ldr r0, _0801DCA8 @ =gUnknown_02024A60 + ldr r0, _0801DCA8 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -4037,22 +4037,22 @@ _0801DC78: beq _0801DC8C b _0801DF26 _0801DC8C: - ldr r4, _0801DCAC @ =gUnknown_02024C10 + ldr r4, _0801DCAC @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x2 str r0, [r4] bl b_movescr_stack_push_cursor - ldr r0, _0801DCB0 @ =gUnknown_081D99AB + ldr r0, _0801DCB0 @ =BattleScript_SubstituteFade str r0, [r4] b _0801DF2E .align 2, 0 -_0801DCA0: .4byte gUnknown_02024D68 -_0801DCA4: .4byte gUnknown_02024BF0 -_0801DCA8: .4byte gUnknown_02024A60 -_0801DCAC: .4byte gUnknown_02024C10 -_0801DCB0: .4byte gUnknown_081D99AB +_0801DCA0: .4byte gSpecialStatuses +_0801DCA4: .4byte gHP_dealt +_0801DCA8: .4byte gActiveBank +_0801DCAC: .4byte gBattlescriptCurrInstr +_0801DCB0: .4byte BattleScript_SubstituteFade _0801DCB4: - ldr r0, _0801DCF4 @ =gUnknown_02024C6C + ldr r0, _0801DCF4 @ =gHitMarker ldr r2, [r0] ldr r1, _0801DCF8 @ =0xfffffeff ands r2, r1 @@ -4064,7 +4064,7 @@ _0801DCB4: cmp r5, 0 bge _0801DD08 ldr r4, _0801DD00 @ =gBattleMons - ldr r2, _0801DD04 @ =gUnknown_02024A60 + ldr r2, _0801DD04 @ =gActiveBank ldrb r0, [r2] movs r3, 0x58 adds r1, r0, 0 @@ -4086,11 +4086,11 @@ _0801DCF0: strh r3, [r1, 0x28] b _0801DEC6 .align 2, 0 -_0801DCF4: .4byte gUnknown_02024C6C +_0801DCF4: .4byte gHitMarker _0801DCF8: .4byte 0xfffffeff _0801DCFC: .4byte gBattleMoveDamage _0801DD00: .4byte gBattleMons -_0801DD04: .4byte gUnknown_02024A60 +_0801DD04: .4byte gActiveBank _0801DD08: movs r0, 0x20 ands r0, r2 @@ -4101,41 +4101,41 @@ _0801DD08: ands r2, r0 mov r0, r12 str r2, [r0] - ldr r5, _0801DD20 @ =gUnknown_02024A60 + ldr r5, _0801DD20 @ =gActiveBank b _0801DD6C .align 2, 0 -_0801DD20: .4byte gUnknown_02024A60 +_0801DD20: .4byte gActiveBank _0801DD24: - ldr r0, _0801DD4C @ =gUnknown_02024BF4 - ldr r2, _0801DD50 @ =gUnknown_02024A60 + ldr r0, _0801DD4C @ =gTakenDmg + ldr r2, _0801DD50 @ =gActiveBank ldrb r1, [r2] lsls r1, 2 adds r1, r0 ldr r0, [r1] adds r0, r5 str r0, [r1] - ldr r0, _0801DD54 @ =gUnknown_02024C10 + ldr r0, _0801DD54 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] adds r5, r2, 0 cmp r0, 0 bne _0801DD60 - ldr r1, _0801DD58 @ =gUnknown_02024C74 + ldr r1, _0801DD58 @ =gTakenDmgBanks ldrb r0, [r5] adds r0, r1 - ldr r1, _0801DD5C @ =gPlayerMonIndex + ldr r1, _0801DD5C @ =gBankAttacker b _0801DD68 .align 2, 0 -_0801DD4C: .4byte gUnknown_02024BF4 -_0801DD50: .4byte gUnknown_02024A60 -_0801DD54: .4byte gUnknown_02024C10 -_0801DD58: .4byte gUnknown_02024C74 -_0801DD5C: .4byte gPlayerMonIndex +_0801DD4C: .4byte gTakenDmg +_0801DD50: .4byte gActiveBank +_0801DD54: .4byte gBattlescriptCurrInstr +_0801DD58: .4byte gTakenDmgBanks +_0801DD5C: .4byte gBankAttacker _0801DD60: - ldr r1, _0801DD8C @ =gUnknown_02024C74 + ldr r1, _0801DD8C @ =gTakenDmgBanks ldrb r0, [r5] adds r0, r1 - ldr r1, _0801DD90 @ =gEnemyMonIndex + ldr r1, _0801DD90 @ =gBankTarget _0801DD68: ldrb r1, [r1] strb r1, [r0] @@ -4151,17 +4151,17 @@ _0801DD6C: ble _0801DD9C subs r0, r1 strh r0, [r2, 0x28] - ldr r0, _0801DD98 @ =gUnknown_02024BF0 + ldr r0, _0801DD98 @ =gHP_dealt str r1, [r0] adds r7, r0, 0 b _0801DDAC .align 2, 0 -_0801DD8C: .4byte gUnknown_02024C74 -_0801DD90: .4byte gEnemyMonIndex +_0801DD8C: .4byte gTakenDmgBanks +_0801DD90: .4byte gBankTarget _0801DD94: .4byte gBattleMons -_0801DD98: .4byte gUnknown_02024BF0 +_0801DD98: .4byte gHP_dealt _0801DD9C: - ldr r2, _0801DE20 @ =gUnknown_02024BF0 + ldr r2, _0801DE20 @ =gHP_dealt str r0, [r2] ldrb r0, [r5] muls r0, r3 @@ -4170,7 +4170,7 @@ _0801DD9C: strh r1, [r0, 0x28] adds r7, r2, 0 _0801DDAC: - ldr r2, _0801DE24 @ =gUnknown_02024D68 + ldr r2, _0801DE24 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -4200,11 +4200,11 @@ _0801DDD4: ands r0, r1 cmp r0, 0 bne _0801DE58 - ldr r0, _0801DE28 @ =gUnknown_02024BE6 + ldr r0, _0801DE28 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xDC beq _0801DE58 - ldr r3, _0801DE2C @ =gUnknown_02024D28 + ldr r3, _0801DE2C @ =gProtectStructs ldrb r0, [r5] lsls r0, 4 adds r1, r3, 0x4 @@ -4219,7 +4219,7 @@ _0801DDD4: adds r1, 0x8 adds r0, r1 str r2, [r0] - ldr r0, _0801DE30 @ =gUnknown_02024C10 + ldr r0, _0801DE30 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -4227,20 +4227,20 @@ _0801DDD4: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _0801DE34 @ =gPlayerMonIndex + ldr r2, _0801DE34 @ =gBankAttacker b _0801DE40 .align 2, 0 -_0801DE20: .4byte gUnknown_02024BF0 -_0801DE24: .4byte gUnknown_02024D68 -_0801DE28: .4byte gUnknown_02024BE6 -_0801DE2C: .4byte gUnknown_02024D28 -_0801DE30: .4byte gUnknown_02024C10 -_0801DE34: .4byte gPlayerMonIndex +_0801DE20: .4byte gHP_dealt +_0801DE24: .4byte gSpecialStatuses +_0801DE28: .4byte gCurrentMove +_0801DE2C: .4byte gProtectStructs +_0801DE30: .4byte gBattlescriptCurrInstr +_0801DE34: .4byte gBankAttacker _0801DE38: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _0801DE54 @ =gEnemyMonIndex + ldr r2, _0801DE54 @ =gBankTarget _0801DE40: ldrb r1, [r2] strb r1, [r0, 0xC] @@ -4253,7 +4253,7 @@ _0801DE40: strb r1, [r0, 0x10] b _0801DEC6 .align 2, 0 -_0801DE54: .4byte gEnemyMonIndex +_0801DE54: .4byte gBankTarget _0801DE58: cmp r6, 0x8 bls _0801DEC6 @@ -4265,7 +4265,7 @@ _0801DE5C: ands r0, r1 cmp r0, 0 bne _0801DEC6 - ldr r3, _0801DEA0 @ =gUnknown_02024D28 + ldr r3, _0801DEA0 @ =gProtectStructs ldrb r0, [r5] lsls r0, 4 adds r1, r3, 0 @@ -4281,7 +4281,7 @@ _0801DE5C: adds r1, 0xC adds r0, r1 str r2, [r0] - ldr r0, _0801DEA4 @ =gUnknown_02024C10 + ldr r0, _0801DEA4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -4289,17 +4289,17 @@ _0801DE5C: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _0801DEA8 @ =gPlayerMonIndex + ldr r2, _0801DEA8 @ =gBankAttacker b _0801DEB4 .align 2, 0 -_0801DEA0: .4byte gUnknown_02024D28 -_0801DEA4: .4byte gUnknown_02024C10 -_0801DEA8: .4byte gPlayerMonIndex +_0801DEA0: .4byte gProtectStructs +_0801DEA4: .4byte gBattlescriptCurrInstr +_0801DEA8: .4byte gBankAttacker _0801DEAC: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _0801DEF4 @ =gEnemyMonIndex + ldr r2, _0801DEF4 @ =gBankTarget _0801DEB4: ldrb r1, [r2] strb r1, [r0, 0xD] @@ -4327,22 +4327,22 @@ _0801DEC6: movs r1, 0x2A movs r2, 0 movs r3, 0x2 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _0801DF26 .align 2, 0 -_0801DEF4: .4byte gEnemyMonIndex +_0801DEF4: .4byte gBankTarget _0801DEF8: .4byte 0xffefffff _0801DEFC: .4byte gUnknown_02024AA8 _0801DF00: - ldr r0, _0801DF38 @ =gUnknown_02024C10 + ldr r0, _0801DF38 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r1, _0801DF3C @ =gUnknown_02024A60 + ldr r1, _0801DF3C @ =gActiveBank strb r0, [r1] - ldr r2, _0801DF40 @ =gUnknown_02024D68 + ldr r2, _0801DF40 @ =gSpecialStatuses ldrb r1, [r1] lsls r0, r1, 2 adds r0, r1 @@ -4355,7 +4355,7 @@ _0801DF00: ldr r0, _0801DF44 @ =0x0000ffff str r0, [r1] _0801DF26: - ldr r1, _0801DF38 @ =gUnknown_02024C10 + ldr r1, _0801DF38 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -4365,16 +4365,16 @@ _0801DF2E: pop {r0} bx r0 .align 2, 0 -_0801DF38: .4byte gUnknown_02024C10 -_0801DF3C: .4byte gUnknown_02024A60 -_0801DF40: .4byte gUnknown_02024D68 +_0801DF38: .4byte gBattlescriptCurrInstr +_0801DF3C: .4byte gActiveBank +_0801DF40: .4byte gSpecialStatuses _0801DF44: .4byte 0x0000ffff thumb_func_end atk0C_datahpupdate thumb_func_start atk0D_critmessage atk0D_critmessage: @ 801DF48 push {lr} - ldr r0, _0801DF84 @ =gUnknown_02024A64 + ldr r0, _0801DF84 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0801DF7E @@ -4388,15 +4388,15 @@ atk0D_critmessage: @ 801DF48 ands r0, r1 cmp r0, 0 bne _0801DF76 - ldr r0, _0801DF90 @ =gPlayerMonIndex + ldr r0, _0801DF90 @ =gBankAttacker ldrb r1, [r0] movs r0, 0xD9 - bl b_std_message - ldr r1, _0801DF94 @ =gUnknown_02024D1E + bl PrepareStringBattle + ldr r1, _0801DF94 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x7] _0801DF76: - ldr r1, _0801DF98 @ =gUnknown_02024C10 + ldr r1, _0801DF98 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -4404,23 +4404,23 @@ _0801DF7E: pop {r0} bx r0 .align 2, 0 -_0801DF84: .4byte gUnknown_02024A64 +_0801DF84: .4byte gBattleExecBuffer _0801DF88: .4byte gCritMultiplier _0801DF8C: .4byte gBattleMoveFlags -_0801DF90: .4byte gPlayerMonIndex -_0801DF94: .4byte gUnknown_02024D1E -_0801DF98: .4byte gUnknown_02024C10 +_0801DF90: .4byte gBankAttacker +_0801DF94: .4byte gBattleCommunication +_0801DF98: .4byte gBattlescriptCurrInstr thumb_func_end atk0D_critmessage - thumb_func_start atk0E_missmessage -atk0E_missmessage: @ 801DF9C + thumb_func_start atk0E_effectiveness_sound +atk0E_effectiveness_sound: @ 801DF9C push {r4,lr} - ldr r0, _0801DFD4 @ =gUnknown_02024A64 + ldr r0, _0801DFD4 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0801E05C - ldr r4, _0801DFD8 @ =gUnknown_02024A60 - ldr r0, _0801DFDC @ =gEnemyMonIndex + ldr r4, _0801DFD8 @ =gActiveBank + ldr r0, _0801DFDC @ =gBankTarget ldrb r0, [r0] strb r0, [r4] ldr r1, _0801DFE0 @ =gBattleMoveFlags @@ -4443,9 +4443,9 @@ atk0E_missmessage: @ 801DF9C beq _0801DFF8 b _0801E00E .align 2, 0 -_0801DFD4: .4byte gUnknown_02024A64 -_0801DFD8: .4byte gUnknown_02024A60 -_0801DFDC: .4byte gEnemyMonIndex +_0801DFD4: .4byte gBattleExecBuffer +_0801DFD8: .4byte gActiveBank +_0801DFDC: .4byte gBankTarget _0801DFE0: .4byte gBattleMoveFlags _0801DFE4: cmp r0, 0x8 @@ -4467,9 +4467,9 @@ _0801DFFE: movs r0, 0 movs r1, 0xC _0801E002: - bl dp01_build_cmdbuf_x2B_aa_0 + bl EmitEffectivenessSound ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _0801E054 _0801E00E: ldrb r1, [r1] @@ -4488,13 +4488,13 @@ _0801E01E: movs r0, 0 movs r1, 0xC _0801E02A: - bl dp01_build_cmdbuf_x2B_aa_0 - ldr r0, _0801E038 @ =gUnknown_02024A60 + bl EmitEffectivenessSound + ldr r0, _0801E038 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _0801E054 .align 2, 0 -_0801E038: .4byte gUnknown_02024A60 +_0801E038: .4byte gActiveBank _0801E03C: movs r0, 0x28 ands r0, r1 @@ -4502,12 +4502,12 @@ _0801E03C: bne _0801E054 movs r0, 0 movs r1, 0xD - bl dp01_build_cmdbuf_x2B_aa_0 - ldr r0, _0801E064 @ =gUnknown_02024A60 + bl EmitEffectivenessSound + ldr r0, _0801E064 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _0801E054: - ldr r1, _0801E068 @ =gUnknown_02024C10 + ldr r1, _0801E068 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -4516,15 +4516,15 @@ _0801E05C: pop {r0} bx r0 .align 2, 0 -_0801E064: .4byte gUnknown_02024A60 -_0801E068: .4byte gUnknown_02024C10 - thumb_func_end atk0E_missmessage +_0801E064: .4byte gActiveBank +_0801E068: .4byte gBattlescriptCurrInstr + thumb_func_end atk0E_effectiveness_sound thumb_func_start atk0F_resultmessage atk0F_resultmessage: @ 801E06C push {r4-r7,lr} movs r3, 0 - ldr r0, _0801E0A8 @ =gUnknown_02024A64 + ldr r0, _0801E0A8 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0801E07A @@ -4536,7 +4536,7 @@ _0801E07A: adds r0, r4, 0 ands r0, r2 adds r6, r1, 0 - ldr r7, _0801E0B0 @ =gUnknown_02024D1E + ldr r7, _0801E0B0 @ =gBattleCommunication cmp r0, 0 beq _0801E0B8 movs r0, 0x8 @@ -4547,7 +4547,7 @@ _0801E07A: cmp r0, 0x2 bls _0801E0B8 _0801E09A: - ldr r1, _0801E0B4 @ =gUnknown_08401508 + ldr r1, _0801E0B4 @ =gMissStrings ldrb r0, [r7, 0x6] lsls r0, 1 adds r0, r1 @@ -4555,10 +4555,10 @@ _0801E09A: strb r4, [r7, 0x7] b _0801E1F6 .align 2, 0 -_0801E0A8: .4byte gUnknown_02024A64 +_0801E0A8: .4byte gBattleExecBuffer _0801E0AC: .4byte gBattleMoveFlags -_0801E0B0: .4byte gUnknown_02024D1E -_0801E0B4: .4byte gUnknown_08401508 +_0801E0B0: .4byte gBattleCommunication +_0801E0B4: .4byte gMissStrings _0801E0B8: movs r0, 0x1 strb r0, [r7, 0x7] @@ -4607,32 +4607,32 @@ _0801E100: movs r3, 0x99 b _0801E1FA _0801E104: - ldr r4, _0801E12C @ =gUnknown_02024C04 + ldr r4, _0801E12C @ =gLastUsedItem ldr r2, _0801E130 @ =gBattleMons - ldr r3, _0801E134 @ =gEnemyMonIndex + ldr r3, _0801E134 @ =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 adds r0, r2 ldrh r0, [r0, 0x2E] strh r0, [r4] - ldr r1, _0801E138 @ =gUnknown_02024C0B + ldr r1, _0801E138 @ =gStringBank ldrb r0, [r3] strb r0, [r1] movs r0, 0x3F ands r0, r5 strb r0, [r6] bl b_movescr_stack_push_cursor - ldr r1, _0801E13C @ =gUnknown_02024C10 - ldr r0, _0801E140 @ =gUnknown_081D9AC6 + ldr r1, _0801E13C @ =gBattlescriptCurrInstr + ldr r0, _0801E140 @ =BattleScript_HangedOnMsg b _0801E20A .align 2, 0 -_0801E12C: .4byte gUnknown_02024C04 +_0801E12C: .4byte gLastUsedItem _0801E130: .4byte gBattleMons -_0801E134: .4byte gEnemyMonIndex -_0801E138: .4byte gUnknown_02024C0B -_0801E13C: .4byte gUnknown_02024C10 -_0801E140: .4byte gUnknown_081D9AC6 +_0801E134: .4byte gBankTarget +_0801E138: .4byte gStringBank +_0801E13C: .4byte gBattlescriptCurrInstr +_0801E140: .4byte BattleScript_HangedOnMsg _0801E144: adds r2, r6, 0 ldrb r5, [r2] @@ -4656,12 +4656,12 @@ _0801E154: ands r0, r1 strb r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _0801E174 @ =gUnknown_02024C10 - ldr r0, _0801E178 @ =gUnknown_081D94A9 + ldr r1, _0801E174 @ =gBattlescriptCurrInstr + ldr r0, _0801E178 @ =BattleScript_OneHitKOMsg b _0801E20A .align 2, 0 -_0801E174: .4byte gUnknown_02024C10 -_0801E178: .4byte gUnknown_081D94A9 +_0801E174: .4byte gBattlescriptCurrInstr +_0801E178: .4byte BattleScript_OneHitKOMsg _0801E17C: movs r0, 0x40 ands r0, r5 @@ -4671,43 +4671,43 @@ _0801E17C: ands r0, r5 strb r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _0801E194 @ =gUnknown_02024C10 - ldr r0, _0801E198 @ =gUnknown_081D94A2 + ldr r1, _0801E194 @ =gBattlescriptCurrInstr + ldr r0, _0801E198 @ =BattleScript_EnduredMsg b _0801E20A .align 2, 0 -_0801E194: .4byte gUnknown_02024C10 -_0801E198: .4byte gUnknown_081D94A2 +_0801E194: .4byte gBattlescriptCurrInstr +_0801E198: .4byte BattleScript_EnduredMsg _0801E19C: movs r0, 0x80 ands r0, r5 cmp r0, 0 beq _0801E1E4 - ldr r4, _0801E1CC @ =gUnknown_02024C04 + ldr r4, _0801E1CC @ =gLastUsedItem ldr r2, _0801E1D0 @ =gBattleMons - ldr r3, _0801E1D4 @ =gEnemyMonIndex + ldr r3, _0801E1D4 @ =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 adds r0, r2 ldrh r0, [r0, 0x2E] strh r0, [r4] - ldr r1, _0801E1D8 @ =gUnknown_02024C0B + ldr r1, _0801E1D8 @ =gStringBank ldrb r0, [r3] strb r0, [r1] movs r0, 0x3F ands r0, r5 strb r0, [r6] bl b_movescr_stack_push_cursor - ldr r1, _0801E1DC @ =gUnknown_02024C10 - ldr r0, _0801E1E0 @ =gUnknown_081D9AC6 + ldr r1, _0801E1DC @ =gBattlescriptCurrInstr + ldr r0, _0801E1E0 @ =BattleScript_HangedOnMsg b _0801E20A .align 2, 0 -_0801E1CC: .4byte gUnknown_02024C04 +_0801E1CC: .4byte gLastUsedItem _0801E1D0: .4byte gBattleMons -_0801E1D4: .4byte gEnemyMonIndex -_0801E1D8: .4byte gUnknown_02024C0B -_0801E1DC: .4byte gUnknown_02024C10 -_0801E1E0: .4byte gUnknown_081D9AC6 +_0801E1D4: .4byte gBankTarget +_0801E1D8: .4byte gStringBank +_0801E1DC: .4byte gBattlescriptCurrInstr +_0801E1E0: .4byte BattleScript_HangedOnMsg _0801E1E4: movs r0, 0x20 ands r0, r5 @@ -4725,11 +4725,11 @@ _0801E1F6: beq _0801E204 _0801E1FA: adds r0, r3, 0 - ldr r1, _0801E214 @ =gPlayerMonIndex + ldr r1, _0801E214 @ =gBankAttacker ldrb r1, [r1] - bl b_std_message + bl PrepareStringBattle _0801E204: - ldr r1, _0801E218 @ =gUnknown_02024C10 + ldr r1, _0801E218 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 _0801E20A: @@ -4739,30 +4739,30 @@ _0801E20C: pop {r0} bx r0 .align 2, 0 -_0801E214: .4byte gPlayerMonIndex -_0801E218: .4byte gUnknown_02024C10 +_0801E214: .4byte gBankAttacker +_0801E218: .4byte gBattlescriptCurrInstr thumb_func_end atk0F_resultmessage thumb_func_start atk10_printstring atk10_printstring: @ 801E21C push {r4,lr} - ldr r0, _0801E24C @ =gUnknown_02024A64 + ldr r0, _0801E24C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0801E246 - ldr r4, _0801E250 @ =gUnknown_02024C10 + ldr r4, _0801E250 @ =gBattlescriptCurrInstr ldr r1, [r4] ldrb r0, [r1, 0x1] ldrb r1, [r1, 0x2] lsls r1, 8 orrs r0, r1 - ldr r1, _0801E254 @ =gPlayerMonIndex + ldr r1, _0801E254 @ =gBankAttacker ldrb r1, [r1] - bl b_std_message + bl PrepareStringBattle ldr r0, [r4] adds r0, 0x3 str r0, [r4] - ldr r1, _0801E258 @ =gUnknown_02024D1E + ldr r1, _0801E258 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x7] _0801E246: @@ -4770,73 +4770,73 @@ _0801E246: pop {r0} bx r0 .align 2, 0 -_0801E24C: .4byte gUnknown_02024A64 -_0801E250: .4byte gUnknown_02024C10 -_0801E254: .4byte gPlayerMonIndex -_0801E258: .4byte gUnknown_02024D1E +_0801E24C: .4byte gBattleExecBuffer +_0801E250: .4byte gBattlescriptCurrInstr +_0801E254: .4byte gBankAttacker +_0801E258: .4byte gBattleCommunication thumb_func_end atk10_printstring - thumb_func_start atk11_printstring2 -atk11_printstring2: @ 801E25C + thumb_func_start atk11_printstring_playeronly +atk11_printstring_playeronly: @ 801E25C push {r4,r5,lr} - ldr r5, _0801E290 @ =gUnknown_02024A60 - ldr r0, _0801E294 @ =gPlayerMonIndex + ldr r5, _0801E290 @ =gActiveBank + ldr r0, _0801E294 @ =gBankAttacker ldrb r0, [r0] strb r0, [r5] - ldr r4, _0801E298 @ =gUnknown_02024C10 + ldr r4, _0801E298 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] lsls r0, 8 orrs r1, r0 movs r0, 0 - bl dp01_build_cmdbuf_x11_TODO + bl EmitPrintStringPlayerOnly ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r4] adds r0, 0x3 str r0, [r4] - ldr r1, _0801E29C @ =gUnknown_02024D1E + ldr r1, _0801E29C @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x7] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0801E290: .4byte gUnknown_02024A60 -_0801E294: .4byte gPlayerMonIndex -_0801E298: .4byte gUnknown_02024C10 -_0801E29C: .4byte gUnknown_02024D1E - thumb_func_end atk11_printstring2 +_0801E290: .4byte gActiveBank +_0801E294: .4byte gBankAttacker +_0801E298: .4byte gBattlescriptCurrInstr +_0801E29C: .4byte gBattleCommunication + thumb_func_end atk11_printstring_playeronly thumb_func_start atk12_waitmessage atk12_waitmessage: @ 801E2A0 push {r4-r6,lr} - ldr r0, _0801E2BC @ =gUnknown_02024A64 + ldr r0, _0801E2BC @ =gBattleExecBuffer ldr r4, [r0] cmp r4, 0 bne _0801E2EE - ldr r6, _0801E2C0 @ =gUnknown_02024D1E + ldr r6, _0801E2C0 @ =gBattleCommunication ldrb r0, [r6, 0x7] cmp r0, 0 bne _0801E2C8 - ldr r1, _0801E2C4 @ =gUnknown_02024C10 + ldr r1, _0801E2C4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 str r0, [r1] b _0801E2EE .align 2, 0 -_0801E2BC: .4byte gUnknown_02024A64 -_0801E2C0: .4byte gUnknown_02024D1E -_0801E2C4: .4byte gUnknown_02024C10 +_0801E2BC: .4byte gBattleExecBuffer +_0801E2C0: .4byte gBattleCommunication +_0801E2C4: .4byte gBattlescriptCurrInstr _0801E2C8: - ldr r5, _0801E2F4 @ =gUnknown_02024C10 + ldr r5, _0801E2F4 @ =gBattlescriptCurrInstr ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 orrs r1, r0 - ldr r3, _0801E2F8 @ =gUnknown_02024D18 + ldr r3, _0801E2F8 @ =gPauseCounterBattle ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] @@ -4854,18 +4854,18 @@ _0801E2EE: pop {r0} bx r0 .align 2, 0 -_0801E2F4: .4byte gUnknown_02024C10 -_0801E2F8: .4byte gUnknown_02024D18 +_0801E2F4: .4byte gBattlescriptCurrInstr +_0801E2F8: .4byte gPauseCounterBattle thumb_func_end atk12_waitmessage thumb_func_start atk13_printfromtable atk13_printfromtable: @ 801E2FC push {r4,r5,lr} - ldr r0, _0801E340 @ =gUnknown_02024A64 + ldr r0, _0801E340 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0801E33A - ldr r4, _0801E344 @ =gUnknown_02024C10 + ldr r4, _0801E344 @ =gBattlescriptCurrInstr ldr r2, [r4] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -4877,14 +4877,14 @@ atk13_printfromtable: @ 801E2FC ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r5, _0801E348 @ =gUnknown_02024D1E + ldr r5, _0801E348 @ =gBattleCommunication ldrb r0, [r5, 0x5] lsls r0, 1 adds r1, r0 ldrh r0, [r1] - ldr r1, _0801E34C @ =gPlayerMonIndex + ldr r1, _0801E34C @ =gBankAttacker ldrb r1, [r1] - bl b_std_message + bl PrepareStringBattle ldr r0, [r4] adds r0, 0x5 str r0, [r4] @@ -4895,20 +4895,20 @@ _0801E33A: pop {r0} bx r0 .align 2, 0 -_0801E340: .4byte gUnknown_02024A64 -_0801E344: .4byte gUnknown_02024C10 -_0801E348: .4byte gUnknown_02024D1E -_0801E34C: .4byte gPlayerMonIndex +_0801E340: .4byte gBattleExecBuffer +_0801E344: .4byte gBattlescriptCurrInstr +_0801E348: .4byte gBattleCommunication +_0801E34C: .4byte gBankAttacker thumb_func_end atk13_printfromtable - thumb_func_start atk14_printfromtable2 -atk14_printfromtable2: @ 801E350 + thumb_func_start atk14_printfromtable_playeronly +atk14_printfromtable_playeronly: @ 801E350 push {r4-r6,lr} - ldr r0, _0801E3A0 @ =gUnknown_02024A64 + ldr r0, _0801E3A0 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0801E39A - ldr r5, _0801E3A4 @ =gUnknown_02024C10 + ldr r5, _0801E3A4 @ =gBattlescriptCurrInstr ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -4920,19 +4920,19 @@ atk14_printfromtable2: @ 801E350 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r6, _0801E3A8 @ =gUnknown_02024D1E + ldr r6, _0801E3A8 @ =gBattleCommunication ldrb r0, [r6, 0x5] lsls r0, 1 adds r1, r0 - ldr r4, _0801E3AC @ =gUnknown_02024A60 - ldr r0, _0801E3B0 @ =gPlayerMonIndex + ldr r4, _0801E3AC @ =gActiveBank + ldr r0, _0801E3B0 @ =gBankAttacker ldrb r0, [r0] strb r0, [r4] ldrh r1, [r1] movs r0, 0 - bl dp01_build_cmdbuf_x11_TODO + bl EmitPrintStringPlayerOnly ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r5] adds r0, 0x5 str r0, [r5] @@ -4943,12 +4943,12 @@ _0801E39A: pop {r0} bx r0 .align 2, 0 -_0801E3A0: .4byte gUnknown_02024A64 -_0801E3A4: .4byte gUnknown_02024C10 -_0801E3A8: .4byte gUnknown_02024D1E -_0801E3AC: .4byte gUnknown_02024A60 -_0801E3B0: .4byte gPlayerMonIndex - thumb_func_end atk14_printfromtable2 +_0801E3A0: .4byte gBattleExecBuffer +_0801E3A4: .4byte gBattlescriptCurrInstr +_0801E3A8: .4byte gBattleCommunication +_0801E3AC: .4byte gActiveBank +_0801E3B0: .4byte gBankAttacker + thumb_func_end atk14_printfromtable_playeronly thumb_func_start sub_801E3B4 sub_801E3B4: @ 801E3B4 @@ -4956,11 +4956,11 @@ sub_801E3B4: @ 801E3B4 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r0, _0801E3E4 @ =gUnknown_02024A68 + ldr r0, _0801E3E4 @ =gNoOfAllBanks ldrb r3, [r0] cmp r1, r3 bge _0801E3DA - ldr r4, _0801E3E8 @ =gUnknown_02024A7A + ldr r4, _0801E3E8 @ =gTurnOrder ldrb r0, [r4] cmp r0, r2 beq _0801E3DA @@ -4979,8 +4979,8 @@ _0801E3DA: pop {r1} bx r1 .align 2, 0 -_0801E3E4: .4byte gUnknown_02024A68 -_0801E3E8: .4byte gUnknown_02024A7A +_0801E3E4: .4byte gNoOfAllBanks +_0801E3E8: .4byte gTurnOrder thumb_func_end sub_801E3B4 thumb_func_start sub_801E3EC @@ -5000,15 +5000,15 @@ sub_801E3EC: @ 801E3EC movs r6, 0 movs r1, 0x1 str r1, [sp, 0x4] - ldr r1, _0801E430 @ =gUnknown_02024D1E + ldr r1, _0801E430 @ =gBattleCommunication ldrb r3, [r1, 0x3] movs r0, 0x40 ands r0, r3 adds r7, r1, 0 cmp r0, 0 beq _0801E444 - ldr r2, _0801E434 @ =gUnknown_02024C0A - ldr r0, _0801E438 @ =gPlayerMonIndex + ldr r2, _0801E434 @ =gEffectBank + ldr r0, _0801E438 @ =gBankAttacker ldrb r0, [r0] strb r0, [r2] movs r0, 0xBF @@ -5016,21 +5016,21 @@ sub_801E3EC: @ 801E3EC strb r0, [r7, 0x3] movs r6, 0x40 ldr r0, _0801E43C @ =0x02000000 - ldr r1, _0801E440 @ =gEnemyMonIndex + ldr r1, _0801E440 @ =gBankTarget b _0801E450 .align 2, 0 -_0801E430: .4byte gUnknown_02024D1E -_0801E434: .4byte gUnknown_02024C0A -_0801E438: .4byte gPlayerMonIndex +_0801E430: .4byte gBattleCommunication +_0801E434: .4byte gEffectBank +_0801E438: .4byte gBankAttacker _0801E43C: .4byte 0x02000000 -_0801E440: .4byte gEnemyMonIndex +_0801E440: .4byte gBankTarget _0801E444: - ldr r2, _0801E538 @ =gUnknown_02024C0A - ldr r0, _0801E53C @ =gEnemyMonIndex + ldr r2, _0801E538 @ =gEffectBank + ldr r0, _0801E53C @ =gBankTarget ldrb r0, [r0] strb r0, [r2] ldr r0, _0801E540 @ =0x02000000 - ldr r1, _0801E544 @ =gPlayerMonIndex + ldr r1, _0801E544 @ =gBankAttacker _0801E450: ldrb r1, [r1] ldr r3, _0801E548 @ =0x00016003 @@ -5047,7 +5047,7 @@ _0801E450: ldrb r0, [r0] cmp r0, 0x13 bne _0801E48A - ldr r0, _0801E550 @ =gUnknown_02024C6C + ldr r0, _0801E550 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5063,8 +5063,8 @@ _0801E450: _0801E48A: mov r1, r8 ldrb r0, [r1] - bl battle_get_per_side_status - ldr r2, _0801E554 @ =gUnknown_02024C7A + bl GetBankIdentity + ldr r2, _0801E554 @ =gSideAffecting movs r1, 0x1 ands r1, r0 lsls r1, 1 @@ -5074,7 +5074,7 @@ _0801E48A: ands r0, r1 cmp r0, 0 beq _0801E4C4 - ldr r0, _0801E550 @ =gUnknown_02024C6C + ldr r0, _0801E550 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5083,14 +5083,14 @@ _0801E48A: bne _0801E4C4 cmp r4, 0 bne _0801E4C4 - ldr r0, _0801E558 @ =gUnknown_02024D1E + ldr r0, _0801E558 @ =gBattleCommunication ldrb r0, [r0, 0x3] cmp r0, 0x7 bhi _0801E4C4 bl _0801F5DC _0801E4C4: ldr r3, _0801E54C @ =gBattleMons - ldr r2, _0801E538 @ =gUnknown_02024C0A + ldr r2, _0801E538 @ =gEffectBank ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -5100,7 +5100,7 @@ _0801E4C4: mov r9, r3 cmp r0, 0 bne _0801E4EA - ldr r0, _0801E558 @ =gUnknown_02024D1E + ldr r0, _0801E558 @ =gBattleCommunication ldrb r0, [r0, 0x3] cmp r0, 0xB beq _0801E4EA @@ -5125,14 +5125,14 @@ _0801E4EA: beq _0801E50C bl _0801F5DC _0801E50C: - ldr r0, _0801E558 @ =gUnknown_02024D1E + ldr r0, _0801E558 @ =gBattleCommunication ldrb r1, [r0, 0x3] adds r7, r0, 0 cmp r1, 0x6 bls _0801E518 b _0801EB4A _0801E518: - ldr r1, _0801E55C @ =gUnknown_081FAB5C + ldr r1, _0801E55C @ =gStatusFlagsForMoveEffects ldrb r0, [r7, 0x3] lsls r0, 2 adds r0, r1 @@ -5151,16 +5151,16 @@ _0801E528: _0801E536: b _0801EA14 .align 2, 0 -_0801E538: .4byte gUnknown_02024C0A -_0801E53C: .4byte gEnemyMonIndex +_0801E538: .4byte gEffectBank +_0801E53C: .4byte gBankTarget _0801E540: .4byte 0x02000000 -_0801E544: .4byte gPlayerMonIndex +_0801E544: .4byte gBankAttacker _0801E548: .4byte 0x00016003 _0801E54C: .4byte gBattleMons -_0801E550: .4byte gUnknown_02024C6C -_0801E554: .4byte gUnknown_02024C7A -_0801E558: .4byte gUnknown_02024D1E -_0801E55C: .4byte gUnknown_081FAB5C +_0801E550: .4byte gHitMarker +_0801E554: .4byte gSideAffecting +_0801E558: .4byte gBattleCommunication +_0801E55C: .4byte gStatusFlagsForMoveEffects _0801E560: cmp r0, 0x40 bne _0801E566 @@ -5189,10 +5189,10 @@ _0801E57A: ldrb r0, [r0] cmp r0, 0x2B beq _0801E5DC - ldr r0, _0801E5D4 @ =gUnknown_02024A60 + ldr r0, _0801E5D4 @ =gActiveBank movs r1, 0 strb r1, [r0] - ldr r1, _0801E5D8 @ =gUnknown_02024A68 + ldr r1, _0801E5D8 @ =gNoOfAllBanks ldrb r3, [r1] adds r7, r0, 0 mov r12, r1 @@ -5226,11 +5226,11 @@ _0801E5B4: beq _0801E5B4 b _0801E5E8 .align 2, 0 -_0801E5D4: .4byte gUnknown_02024A60 -_0801E5D8: .4byte gUnknown_02024A68 +_0801E5D4: .4byte gActiveBank +_0801E5D8: .4byte gNoOfAllBanks _0801E5DC: - ldr r0, _0801E628 @ =gUnknown_02024A60 - ldr r2, _0801E62C @ =gUnknown_02024A68 + ldr r0, _0801E628 @ =gActiveBank + ldr r2, _0801E62C @ =gNoOfAllBanks ldrb r1, [r2] strb r1, [r0] adds r7, r0, 0 @@ -5269,11 +5269,11 @@ _0801E61A: b _0801EA14 _0801E620: adds r0, r2, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves b _0801EA04 .align 2, 0 -_0801E628: .4byte gUnknown_02024A60 -_0801E62C: .4byte gUnknown_02024A68 +_0801E628: .4byte gActiveBank +_0801E62C: .4byte gNoOfAllBanks _0801E630: mov r2, r8 ldrb r1, [r2] @@ -5289,20 +5289,20 @@ _0801E630: cmp r5, 0x80 bne _0801E688 _0801E64A: - ldr r0, _0801E678 @ =byte_2024C06 + ldr r0, _0801E678 @ =gLastUsedAbility strb r1, [r0] mov r3, r8 ldrb r0, [r3] movs r1, 0x11 bl sub_81074C4 - ldr r4, _0801E67C @ =gUnknown_02024C10 + ldr r4, _0801E67C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801E680 @ =BattleScript_1D98BD + ldr r0, _0801E680 @ =BattleScript_PSNPrevention _0801E664: str r0, [r4] - ldr r2, _0801E684 @ =gUnknown_02024C6C + ldr r2, _0801E684 @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -5313,10 +5313,10 @@ _0801E664: _0801E676: b _0801E94C .align 2, 0 -_0801E678: .4byte byte_2024C06 -_0801E67C: .4byte gUnknown_02024C10 -_0801E680: .4byte BattleScript_1D98BD -_0801E684: .4byte gUnknown_02024C6C +_0801E678: .4byte gLastUsedAbility +_0801E67C: .4byte gBattlescriptCurrInstr +_0801E680: .4byte BattleScript_PSNPrevention +_0801E684: .4byte gHitMarker _0801E688: mov r1, r8 ldrb r0, [r1] @@ -5337,7 +5337,7 @@ _0801E688: cmp r0, 0x8 bne _0801E6C6 _0801E6AC: - ldr r0, _0801E710 @ =gUnknown_02024C6C + ldr r0, _0801E710 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5396,7 +5396,7 @@ _0801E702: _0801E70E: b _0801EA04 .align 2, 0 -_0801E710: .4byte gUnknown_02024C6C +_0801E710: .4byte gHitMarker _0801E714: mov r2, r8 ldrb r1, [r2] @@ -5412,22 +5412,22 @@ _0801E714: cmp r5, 0x80 bne _0801E758 _0801E72E: - ldr r0, _0801E74C @ =byte_2024C06 + ldr r0, _0801E74C @ =gLastUsedAbility strb r1, [r0] mov r3, r8 ldrb r0, [r3] movs r1, 0x29 bl sub_81074C4 - ldr r4, _0801E750 @ =gUnknown_02024C10 + ldr r4, _0801E750 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801E754 @ =BattleScript_1D98A5 + ldr r0, _0801E754 @ =BattleScript_BRNPrevention b _0801E664 .align 2, 0 -_0801E74C: .4byte byte_2024C06 -_0801E750: .4byte gUnknown_02024C10 -_0801E754: .4byte BattleScript_1D98A5 +_0801E74C: .4byte gLastUsedAbility +_0801E750: .4byte gBattlescriptCurrInstr +_0801E754: .4byte BattleScript_BRNPrevention _0801E758: mov r0, r8 ldrb r1, [r0] @@ -5446,7 +5446,7 @@ _0801E758: cmp r0, 0xA bne _0801E7A8 _0801E778: - ldr r0, _0801E79C @ =gUnknown_02024C6C + ldr r0, _0801E79C @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5458,16 +5458,16 @@ _0801E778: cmp r5, 0x80 bne _0801E7A8 _0801E78E: - ldr r4, _0801E7A0 @ =gUnknown_02024C10 + ldr r4, _0801E7A0 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801E7A4 @ =BattleScript_1D98A5 + ldr r0, _0801E7A4 @ =BattleScript_BRNPrevention b _0801E998 .align 2, 0 -_0801E79C: .4byte gUnknown_02024C6C -_0801E7A0: .4byte gUnknown_02024C10 -_0801E7A4: .4byte BattleScript_1D98A5 +_0801E79C: .4byte gHitMarker +_0801E7A0: .4byte gBattlescriptCurrInstr +_0801E7A4: .4byte BattleScript_BRNPrevention _0801E7A8: mov r3, r8 ldrb r0, [r3] @@ -5513,7 +5513,7 @@ _0801E7EA: movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5523,7 +5523,7 @@ _0801E7EA: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0801E826 @@ -5537,7 +5537,7 @@ _0801E7EA: str r1, [sp, 0x4] _0801E826: ldr r4, _0801E880 @ =gBattleMons - ldr r0, _0801E884 @ =gUnknown_02024C0A + ldr r0, _0801E884 @ =gEffectBank ldrb r3, [r0] movs r0, 0x58 adds r2, r3, 0 @@ -5578,14 +5578,14 @@ _0801E862: b _0801EA14 _0801E86E: adds r0, r3, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves movs r3, 0x1 mov r10, r3 b _0801EA14 .align 2, 0 _0801E87C: .4byte gBattleWeather _0801E880: .4byte gBattleMons -_0801E884: .4byte gUnknown_02024C0A +_0801E884: .4byte gEffectBank _0801E888: mov r0, r8 ldrb r1, [r0] @@ -5603,22 +5603,22 @@ _0801E888: beq _0801E8A6 b _0801EA14 _0801E8A6: - ldr r0, _0801E8C4 @ =byte_2024C06 + ldr r0, _0801E8C4 @ =gLastUsedAbility strb r2, [r0] mov r3, r8 ldrb r0, [r3] movs r1, 0x7 bl sub_81074C4 - ldr r4, _0801E8C8 @ =gUnknown_02024C10 + ldr r4, _0801E8C8 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801E8CC @ =BattleScript_1D98B1 + ldr r0, _0801E8CC @ =BattleScript_PRLZPrevention b _0801E664 .align 2, 0 -_0801E8C4: .4byte byte_2024C06 -_0801E8C8: .4byte gUnknown_02024C10 -_0801E8CC: .4byte BattleScript_1D98B1 +_0801E8C4: .4byte gLastUsedAbility +_0801E8C8: .4byte gBattlescriptCurrInstr +_0801E8CC: .4byte BattleScript_PRLZPrevention _0801E8D0: mov r0, r9 adds r0, 0x4C @@ -5646,19 +5646,19 @@ _0801E8E4: cmp r5, 0x80 bne _0801E952 _0801E8FE: - ldr r0, _0801E938 @ =byte_2024C06 + ldr r0, _0801E938 @ =gLastUsedAbility strb r1, [r0] mov r1, r8 ldrb r0, [r1] movs r1, 0x11 bl sub_81074C4 - ldr r4, _0801E93C @ =gUnknown_02024C10 + ldr r4, _0801E93C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801E940 @ =BattleScript_1D98BD + ldr r0, _0801E940 @ =BattleScript_PSNPrevention str r0, [r4] - ldr r2, _0801E944 @ =gUnknown_02024C6C + ldr r2, _0801E944 @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -5673,10 +5673,10 @@ _0801E928: str r1, [r2] bl _0801F5FA .align 2, 0 -_0801E938: .4byte byte_2024C06 -_0801E93C: .4byte gUnknown_02024C10 -_0801E940: .4byte BattleScript_1D98BD -_0801E944: .4byte gUnknown_02024C6C +_0801E938: .4byte gLastUsedAbility +_0801E93C: .4byte gBattlescriptCurrInstr +_0801E940: .4byte BattleScript_PSNPrevention +_0801E944: .4byte gHitMarker _0801E948: .4byte 0xffffdfff _0801E94C: strb r0, [r7, 0x5] @@ -5701,7 +5701,7 @@ _0801E952: cmp r0, 0x8 bne _0801E9B4 _0801E976: - ldr r0, _0801E9A4 @ =gUnknown_02024C6C + ldr r0, _0801E9A4 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5713,22 +5713,22 @@ _0801E976: cmp r5, 0x80 bne _0801E9B4 _0801E98C: - ldr r4, _0801E9A8 @ =gUnknown_02024C10 + ldr r4, _0801E9A8 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801E9AC @ =BattleScript_1D98BD + ldr r0, _0801E9AC @ =BattleScript_PSNPrevention _0801E998: str r0, [r4] - ldr r1, _0801E9B0 @ =gUnknown_02024D1E + ldr r1, _0801E9B0 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] bl _0801F5FA .align 2, 0 -_0801E9A4: .4byte gUnknown_02024C6C -_0801E9A8: .4byte gUnknown_02024C10 -_0801E9AC: .4byte BattleScript_1D98BD -_0801E9B0: .4byte gUnknown_02024D1E +_0801E9A4: .4byte gHitMarker +_0801E9A8: .4byte gBattlescriptCurrInstr +_0801E9AC: .4byte BattleScript_PSNPrevention +_0801E9B0: .4byte gBattleCommunication _0801E9B4: mov r3, r8 ldrb r0, [r3] @@ -5786,12 +5786,12 @@ _0801EA14: beq _0801EA1C b _0801EB3C _0801EA1C: - ldr r0, _0801EA5C @ =gUnknown_02024C10 + ldr r0, _0801EA5C @ =gBattlescriptCurrInstr ldr r0, [r0] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _0801EA60 @ =gUnknown_081FAB5C - ldr r0, _0801EA64 @ =gUnknown_02024D1E + ldr r1, _0801EA60 @ =gStatusFlagsForMoveEffects + ldr r0, _0801EA64 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -5800,7 +5800,7 @@ _0801EA1C: bne _0801EA70 bl Random ldr r2, _0801EA68 @ =gBattleMons - ldr r1, _0801EA6C @ =gUnknown_02024C0A + ldr r1, _0801EA6C @ =gEffectBank ldrb r3, [r1] movs r1, 0x58 muls r3, r1 @@ -5815,14 +5815,14 @@ _0801EA1C: b _0801EA84 .align 2, 0 _0801EA58: .4byte gBattleMoveFlags -_0801EA5C: .4byte gUnknown_02024C10 -_0801EA60: .4byte gUnknown_081FAB5C -_0801EA64: .4byte gUnknown_02024D1E +_0801EA5C: .4byte gBattlescriptCurrInstr +_0801EA60: .4byte gStatusFlagsForMoveEffects +_0801EA64: .4byte gBattleCommunication _0801EA68: .4byte gBattleMons -_0801EA6C: .4byte gUnknown_02024C0A +_0801EA6C: .4byte gEffectBank _0801EA70: ldr r2, _0801EAD4 @ =gBattleMons - ldr r0, _0801EAD8 @ =gUnknown_02024C0A + ldr r0, _0801EAD8 @ =gEffectBank ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -5832,16 +5832,16 @@ _0801EA70: orrs r0, r3 str r0, [r1] _0801EA84: - ldr r2, _0801EADC @ =gUnknown_02024C10 - ldr r1, _0801EAE0 @ =gUnknown_081FAC4C - ldr r5, _0801EAE4 @ =gUnknown_02024D1E + ldr r2, _0801EADC @ =gBattlescriptCurrInstr + ldr r1, _0801EAE0 @ =gMoveEffectBS_Ptrs + ldr r5, _0801EAE4 @ =gBattleCommunication ldrb r0, [r5, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r4, _0801EAE8 @ =gUnknown_02024A60 - ldr r1, _0801EAD8 @ =gUnknown_02024C0A + ldr r4, _0801EAE8 @ =gActiveBank + ldr r1, _0801EAD8 @ =gEffectBank ldrb r0, [r1] strb r0, [r4] ldrb r1, [r1] @@ -5854,10 +5854,10 @@ _0801EA84: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r2, _0801EAF0 @ =gUnknown_02024C6C + bl MarkBufferBankForExecution + ldr r2, _0801EAF0 @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -5872,18 +5872,18 @@ _0801EA84: b _0801EAFA .align 2, 0 _0801EAD4: .4byte gBattleMons -_0801EAD8: .4byte gUnknown_02024C0A -_0801EADC: .4byte gUnknown_02024C10 -_0801EAE0: .4byte gUnknown_081FAC4C -_0801EAE4: .4byte gUnknown_02024D1E -_0801EAE8: .4byte gUnknown_02024A60 +_0801EAD8: .4byte gEffectBank +_0801EADC: .4byte gBattlescriptCurrInstr +_0801EAE0: .4byte gMoveEffectBS_Ptrs +_0801EAE4: .4byte gBattleCommunication +_0801EAE8: .4byte gActiveBank _0801EAEC: .4byte gUnknown_02024ACC -_0801EAF0: .4byte gUnknown_02024C6C +_0801EAF0: .4byte gHitMarker _0801EAF4: .4byte 0xffffdfff _0801EAF8: strb r0, [r5, 0x5] _0801EAFA: - ldr r0, _0801EB2C @ =gUnknown_02024D1E + ldr r0, _0801EB2C @ =gBattleCommunication ldrb r2, [r0, 0x3] adds r7, r0, 0 cmp r2, 0x2 @@ -5901,16 +5901,16 @@ _0801EB14: ldr r2, _0801EB34 @ =0x000160ca adds r0, r2 strb r1, [r0] - ldr r2, _0801EB38 @ =gUnknown_02024C6C + ldr r2, _0801EB38 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 7 bl _0801F4F2 .align 2, 0 -_0801EB2C: .4byte gUnknown_02024D1E +_0801EB2C: .4byte gBattleCommunication _0801EB30: .4byte 0x02000000 _0801EB34: .4byte 0x000160ca -_0801EB38: .4byte gUnknown_02024C6C +_0801EB38: .4byte gHitMarker _0801EB3C: mov r3, r10 cmp r3, 0 @@ -5926,7 +5926,7 @@ _0801EB4A: mov r0, r9 adds r0, 0x50 adds r1, r0 - ldr r2, _0801EB84 @ =gUnknown_081FAB5C + ldr r2, _0801EB84 @ =gStatusFlagsForMoveEffects ldrb r3, [r7, 0x3] lsls r0, r3, 2 adds r0, r2 @@ -5948,7 +5948,7 @@ _0801EB78: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801EB84: .4byte gUnknown_081FAB5C +_0801EB84: .4byte gStatusFlagsForMoveEffects _0801EB88: .4byte _0801EB8C .align 2, 0 _0801EB8C: @@ -6044,21 +6044,21 @@ _0801EC8E: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r4, _0801ECC8 @ =gUnknown_02024C10 + ldr r4, _0801ECC8 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _0801ECCC @ =gUnknown_081FAC4C - ldr r0, _0801ECD0 @ =gUnknown_02024D1E + ldr r1, _0801ECCC @ =gMoveEffectBS_Ptrs + ldr r0, _0801ECD0 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _0801F5F8 .align 2, 0 -_0801ECC8: .4byte gUnknown_02024C10 -_0801ECCC: .4byte gUnknown_081FAC4C -_0801ECD0: .4byte gUnknown_02024D1E +_0801ECC8: .4byte gBattlescriptCurrInstr +_0801ECCC: .4byte gMoveEffectBS_Ptrs +_0801ECD0: .4byte gBattleCommunication _0801ECD4: mov r0, r8 ldrb r2, [r0] @@ -6076,24 +6076,24 @@ _0801ECD4: beq _0801ECF4 bl _0801F5DC _0801ECF4: - ldr r0, _0801ED0C @ =byte_2024C06 + ldr r0, _0801ED0C @ =gLastUsedAbility strb r1, [r0] mov r1, r8 ldrb r0, [r1] movs r1, 0x27 bl sub_81074C4 - ldr r1, _0801ED10 @ =gUnknown_02024C10 - ldr r0, _0801ED14 @ =gUnknown_081D98D7 + ldr r1, _0801ED10 @ =gBattlescriptCurrInstr + ldr r0, _0801ED14 @ =BattleScript_FlinchPrevention str r0, [r1] bl _0801F5FA .align 2, 0 -_0801ED0C: .4byte byte_2024C06 -_0801ED10: .4byte gUnknown_02024C10 -_0801ED14: .4byte gUnknown_081D98D7 +_0801ED0C: .4byte gLastUsedAbility +_0801ED10: .4byte gBattlescriptCurrInstr +_0801ED14: .4byte BattleScript_FlinchPrevention _0801ED18: adds r0, r2, 0 bl sub_801E3B4 - ldr r1, _0801ED54 @ =gUnknown_02024A7E + ldr r1, _0801ED54 @ =gCurrentMoveTurn lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -6108,8 +6108,8 @@ _0801ED2E: mov r0, r9 adds r0, 0x50 adds r2, r0 - ldr r1, _0801ED58 @ =gUnknown_081FAB5C - ldr r0, _0801ED5C @ =gUnknown_02024D1E + ldr r1, _0801ED58 @ =gStatusFlagsForMoveEffects + ldr r0, _0801ED5C @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -6119,9 +6119,9 @@ _0801ED2E: str r1, [r2] bl _0801F5DC .align 2, 0 -_0801ED54: .4byte gUnknown_02024A7E -_0801ED58: .4byte gUnknown_081FAB5C -_0801ED5C: .4byte gUnknown_02024D1E +_0801ED54: .4byte gCurrentMoveTurn +_0801ED58: .4byte gStatusFlagsForMoveEffects +_0801ED5C: .4byte gBattleCommunication _0801ED60: mov r3, r8 ldrb r0, [r3] @@ -6141,11 +6141,11 @@ _0801ED7C: lsls r0, 5 orrs r1, r0 str r1, [r2] - ldr r1, _0801EDC8 @ =gUnknown_02024C54 + ldr r1, _0801EDC8 @ =gLockedMove ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _0801EDCC @ =gUnknown_02024BE6 + ldr r1, _0801EDCC @ =gCurrentMove ldrh r1, [r1] strh r1, [r0] bl Random @@ -6161,32 +6161,32 @@ _0801ED7C: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r4, _0801EDD0 @ =gUnknown_02024C10 + ldr r4, _0801EDD0 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _0801EDD4 @ =gUnknown_081FAC4C - ldr r0, _0801EDD8 @ =gUnknown_02024D1E + ldr r1, _0801EDD4 @ =gMoveEffectBS_Ptrs + ldr r0, _0801EDD8 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _0801F5F8 .align 2, 0 -_0801EDC8: .4byte gUnknown_02024C54 -_0801EDCC: .4byte gUnknown_02024BE6 -_0801EDD0: .4byte gUnknown_02024C10 -_0801EDD4: .4byte gUnknown_081FAC4C -_0801EDD8: .4byte gUnknown_02024D1E +_0801EDC8: .4byte gLockedMove +_0801EDCC: .4byte gCurrentMove +_0801EDD0: .4byte gBattlescriptCurrInstr +_0801EDD4: .4byte gMoveEffectBS_Ptrs +_0801EDD8: .4byte gBattleCommunication _0801EDDC: - ldr r5, _0801EE30 @ =gPlayerMonIndex + ldr r5, _0801EE30 @ =gBankAttacker ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 cmp r1, 0 bne _0801EE14 - ldr r4, _0801EE34 @ =gUnknown_02024D1A + ldr r4, _0801EE34 @ =gPaydayMoney ldrh r3, [r4] ldr r2, _0801EE38 @ =gBattleMons ldrb r1, [r5] @@ -6207,25 +6207,25 @@ _0801EDDC: adds r0, r3, 0 strh r0, [r4] _0801EE14: - ldr r4, _0801EE40 @ =gUnknown_02024C10 + ldr r4, _0801EE40 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _0801EE44 @ =gUnknown_081FAC4C - ldr r0, _0801EE48 @ =gUnknown_02024D1E + ldr r1, _0801EE44 @ =gMoveEffectBS_Ptrs + ldr r0, _0801EE48 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _0801F5F8 .align 2, 0 -_0801EE30: .4byte gPlayerMonIndex -_0801EE34: .4byte gUnknown_02024D1A +_0801EE30: .4byte gBankAttacker +_0801EE34: .4byte gPaydayMoney _0801EE38: .4byte gBattleMons _0801EE3C: .4byte 0x0000ffff -_0801EE40: .4byte gUnknown_02024C10 -_0801EE44: .4byte gUnknown_081FAC4C -_0801EE48: .4byte gUnknown_02024D1E +_0801EE40: .4byte gBattlescriptCurrInstr +_0801EE44: .4byte gMoveEffectBS_Ptrs +_0801EE48: .4byte gBattleCommunication _0801EE4C: mov r4, r8 ldrb r1, [r4] @@ -6240,7 +6240,7 @@ _0801EE4C: b _0801F5DC _0801EE62: bl Random - ldr r4, _0801EE80 @ =gUnknown_02024D1E + ldr r4, _0801EE80 @ =gBattleCommunication lsls r0, 16 lsrs r0, 16 movs r1, 0x3 @@ -6252,7 +6252,7 @@ _0801EE62: bl sub_801E3EC b _0801F5FA .align 2, 0 -_0801EE80: .4byte gUnknown_02024D1E +_0801EE80: .4byte gBattleCommunication _0801EE84: mov r0, r8 ldrb r1, [r0] @@ -6267,15 +6267,15 @@ _0801EE84: lsls r1, 5 orrs r0, r1 str r0, [r2] - ldr r1, _0801EEC0 @ =gUnknown_02024C54 + ldr r1, _0801EEC0 @ =gLockedMove mov r2, r8 ldrb r0, [r2] lsls r0, 1 adds r0, r1 - ldr r1, _0801EEC4 @ =gUnknown_02024BE6 + ldr r1, _0801EEC4 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0] - ldr r0, _0801EEC8 @ =gUnknown_02024D28 + ldr r0, _0801EEC8 @ =gProtectStructs ldrb r1, [r2] lsls r1, 4 adds r1, r0 @@ -6285,9 +6285,9 @@ _0801EE84: strb r0, [r1, 0x1] b _0801F5DC .align 2, 0 -_0801EEC0: .4byte gUnknown_02024C54 -_0801EEC4: .4byte gUnknown_02024BE6 -_0801EEC8: .4byte gUnknown_02024D28 +_0801EEC0: .4byte gLockedMove +_0801EEC4: .4byte gCurrentMove +_0801EEC8: .4byte gProtectStructs _0801EECC: mov r3, r8 ldrb r0, [r3] @@ -6324,7 +6324,7 @@ _0801EEE8: ldr r4, _0801EF84 @ =0x00016004 adds r0, r4 adds r0, r2 - ldr r6, _0801EF88 @ =gUnknown_02024BE6 + ldr r6, _0801EF88 @ =gCurrentMove ldrh r1, [r6] strb r1, [r0] ldrb r0, [r3] @@ -6339,22 +6339,22 @@ _0801EEE8: ldr r3, _0801EF90 @ =0x00016020 adds r0, r3 adds r0, r2 - ldr r1, _0801EF94 @ =gPlayerMonIndex + ldr r1, _0801EF94 @ =gBankAttacker ldrb r1, [r1] strb r1, [r0] - ldr r4, _0801EF98 @ =gUnknown_02024C10 + ldr r4, _0801EF98 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _0801EF9C @ =gUnknown_081FAC4C - ldr r2, _0801EFA0 @ =gUnknown_02024D1E + ldr r1, _0801EF9C @ =gMoveEffectBS_Ptrs + ldr r2, _0801EFA0 @ =gBattleCommunication ldrb r0, [r2, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] str r0, [r4] strb r5, [r2, 0x5] - ldr r1, _0801EFA4 @ =gUnknown_0840164C + ldr r1, _0801EFA4 @ =gTrappingMoves ldrh r0, [r1] ldrh r4, [r6] cmp r0, r4 @@ -6384,17 +6384,17 @@ _0801EF70: .align 2, 0 _0801EF80: .4byte 0x02000000 _0801EF84: .4byte 0x00016004 -_0801EF88: .4byte gUnknown_02024BE6 +_0801EF88: .4byte gCurrentMove _0801EF8C: .4byte 0x00016005 _0801EF90: .4byte 0x00016020 -_0801EF94: .4byte gPlayerMonIndex -_0801EF98: .4byte gUnknown_02024C10 -_0801EF9C: .4byte gUnknown_081FAC4C -_0801EFA0: .4byte gUnknown_02024D1E -_0801EFA4: .4byte gUnknown_0840164C +_0801EF94: .4byte gBankAttacker +_0801EF98: .4byte gBattlescriptCurrInstr +_0801EF9C: .4byte gMoveEffectBS_Ptrs +_0801EFA0: .4byte gBattleCommunication +_0801EFA4: .4byte gTrappingMoves _0801EFA8: ldr r1, _0801EFD8 @ =gBattleMoveDamage - ldr r0, _0801EFDC @ =gUnknown_02024BF0 + ldr r0, _0801EFDC @ =gHP_dealt ldr r0, [r0] cmp r0, 0 bge _0801EFB4 @@ -6407,12 +6407,12 @@ _0801EFB4: movs r0, 0x1 str r0, [r1] _0801EFC0: - ldr r4, _0801EFE0 @ =gUnknown_02024C10 + ldr r4, _0801EFE0 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _0801EFE4 @ =gUnknown_081FAC4C - ldr r0, _0801EFE8 @ =gUnknown_02024D1E + ldr r1, _0801EFE4 @ =gMoveEffectBS_Ptrs + ldr r0, _0801EFE8 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -6420,10 +6420,10 @@ _0801EFC0: b _0801F5F8 .align 2, 0 _0801EFD8: .4byte gBattleMoveDamage -_0801EFDC: .4byte gUnknown_02024BF0 -_0801EFE0: .4byte gUnknown_02024C10 -_0801EFE4: .4byte gUnknown_081FAC4C -_0801EFE8: .4byte gUnknown_02024D1E +_0801EFDC: .4byte gHP_dealt +_0801EFE0: .4byte gBattlescriptCurrInstr +_0801EFE4: .4byte gMoveEffectBS_Ptrs +_0801EFE8: .4byte gBattleCommunication _0801EFEC: ldrb r1, [r7, 0x3] adds r1, 0xF2 @@ -6449,18 +6449,18 @@ _0801F008: ldr r0, _0801F034 @ =0x000160a5 adds r2, r0 strb r3, [r2] - ldr r4, _0801F038 @ =gUnknown_02024C10 + ldr r4, _0801F038 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801F03C @ =gUnknown_081D71E5 + ldr r0, _0801F03C @ =BattleScript_StatUp b _0801F5F8 .align 2, 0 _0801F02C: .4byte 0x02000000 _0801F030: .4byte 0x000160a4 _0801F034: .4byte 0x000160a5 -_0801F038: .4byte gUnknown_02024C10 -_0801F03C: .4byte gUnknown_081D71E5 +_0801F038: .4byte gBattlescriptCurrInstr +_0801F03C: .4byte BattleScript_StatUp _0801F040: movs r0, 0x70 negs r0, r0 @@ -6487,18 +6487,18 @@ _0801F05E: ldr r0, _0801F088 @ =0x000160a5 adds r2, r0 strb r3, [r2] - ldr r4, _0801F08C @ =gUnknown_02024C10 + ldr r4, _0801F08C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801F090 @ =gUnknown_081D7276 + ldr r0, _0801F090 @ =BattleScript_StatDown b _0801F5F8 .align 2, 0 _0801F080: .4byte 0x02000000 _0801F084: .4byte 0x000160a4 _0801F088: .4byte 0x000160a5 -_0801F08C: .4byte gUnknown_02024C10 -_0801F090: .4byte gUnknown_081D7276 +_0801F08C: .4byte gBattlescriptCurrInstr +_0801F090: .4byte BattleScript_StatDown _0801F094: ldrb r1, [r7, 0x3] adds r1, 0xDA @@ -6524,18 +6524,18 @@ _0801F0B0: ldr r0, _0801F0DC @ =0x000160a5 adds r2, r0 strb r3, [r2] - ldr r4, _0801F0E0 @ =gUnknown_02024C10 + ldr r4, _0801F0E0 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801F0E4 @ =gUnknown_081D71E5 + ldr r0, _0801F0E4 @ =BattleScript_StatUp b _0801F5F8 .align 2, 0 _0801F0D4: .4byte 0x02000000 _0801F0D8: .4byte 0x000160a4 _0801F0DC: .4byte 0x000160a5 -_0801F0E0: .4byte gUnknown_02024C10 -_0801F0E4: .4byte gUnknown_081D71E5 +_0801F0E0: .4byte gBattlescriptCurrInstr +_0801F0E4: .4byte BattleScript_StatUp _0801F0E8: movs r0, 0x60 negs r0, r0 @@ -6562,18 +6562,18 @@ _0801F106: ldr r0, _0801F130 @ =0x000160a5 adds r2, r0 strb r3, [r2] - ldr r4, _0801F134 @ =gUnknown_02024C10 + ldr r4, _0801F134 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801F138 @ =gUnknown_081D7276 + ldr r0, _0801F138 @ =BattleScript_StatDown b _0801F5F8 .align 2, 0 _0801F128: .4byte 0x02000000 _0801F12C: .4byte 0x000160a4 _0801F130: .4byte 0x000160a5 -_0801F134: .4byte gUnknown_02024C10 -_0801F138: .4byte gUnknown_081D7276 +_0801F134: .4byte gBattlescriptCurrInstr +_0801F138: .4byte BattleScript_StatDown _0801F13C: mov r2, r8 ldrb r1, [r2] @@ -6588,7 +6588,7 @@ _0801F13C: lsls r1, 15 orrs r0, r1 str r0, [r2] - ldr r2, _0801F178 @ =gUnknown_02024CA8 + ldr r2, _0801F178 @ =gDisableStructs mov r3, r8 ldrb r1, [r3] lsls r0, r1, 3 @@ -6597,20 +6597,20 @@ _0801F13C: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x19] - ldr r1, _0801F17C @ =gUnknown_02024C54 + ldr r1, _0801F17C @ =gLockedMove ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _0801F180 @ =gUnknown_02024BE6 + ldr r1, _0801F180 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0] b _0801F5DC .align 2, 0 -_0801F178: .4byte gUnknown_02024CA8 -_0801F17C: .4byte gUnknown_02024C54 -_0801F180: .4byte gUnknown_02024BE6 +_0801F178: .4byte gDisableStructs +_0801F17C: .4byte gLockedMove +_0801F180: .4byte gCurrentMove _0801F184: - ldr r0, _0801F1A0 @ =gPlayerMonIndex + ldr r0, _0801F1A0 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 adds r2, r1, 0 @@ -6626,15 +6626,15 @@ _0801F19A: str r0, [r2] b _0801F5DC .align 2, 0 -_0801F1A0: .4byte gPlayerMonIndex +_0801F1A0: .4byte gBankAttacker _0801F1A4: - ldr r4, _0801F254 @ =gPlayerMonIndex + ldr r4, _0801F254 @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6665,13 +6665,13 @@ _0801F1D8: lsls r0, 3 cmp r1, r0 beq _0801F214 - ldr r0, _0801F264 @ =gUnknown_02024DBC + ldr r0, _0801F264 @ =gWishFutureKnock adds r0, 0x29 adds r0, r6, r0 ldrb r1, [r0] ldr r3, _0801F268 @ =gBitTable - ldr r2, _0801F26C @ =gUnknown_02024A6A - ldr r0, _0801F254 @ =gPlayerMonIndex + ldr r2, _0801F26C @ =gBattlePartyID + ldr r0, _0801F254 @ =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r2 @@ -6685,7 +6685,7 @@ _0801F1D8: b _0801F5DC _0801F214: ldr r2, _0801F270 @ =gBattleMons - ldr r1, _0801F274 @ =gEnemyMonIndex + ldr r1, _0801F274 @ =gBankTarget ldrb r0, [r1] movs r3, 0x58 muls r0, r3 @@ -6700,10 +6700,10 @@ _0801F214: ldrb r0, [r0] cmp r0, 0x3C bne _0801F284 - ldr r1, _0801F278 @ =gUnknown_02024C10 - ldr r0, _0801F27C @ =gUnknown_081D9913 + ldr r1, _0801F278 @ =gBattlescriptCurrInstr + ldr r0, _0801F27C @ =BattleScript_NoItemSteal str r0, [r1] - ldr r1, _0801F280 @ =byte_2024C06 + ldr r1, _0801F280 @ =gLastUsedAbility ldrb r0, [r7] muls r0, r3 add r0, r9 @@ -6715,20 +6715,20 @@ _0801F214: bl sub_81074C4 b _0801F5FA .align 2, 0 -_0801F254: .4byte gPlayerMonIndex +_0801F254: .4byte gBankAttacker _0801F258: .4byte gBattleTypeFlags _0801F25C: .4byte 0x00000902 _0801F260: .4byte gTrainerBattleOpponent -_0801F264: .4byte gUnknown_02024DBC +_0801F264: .4byte gWishFutureKnock _0801F268: .4byte gBitTable -_0801F26C: .4byte gUnknown_02024A6A +_0801F26C: .4byte gBattlePartyID _0801F270: .4byte gBattleMons -_0801F274: .4byte gEnemyMonIndex -_0801F278: .4byte gUnknown_02024C10 -_0801F27C: .4byte gUnknown_081D9913 -_0801F280: .4byte byte_2024C06 +_0801F274: .4byte gBankTarget +_0801F278: .4byte gBattlescriptCurrInstr +_0801F27C: .4byte BattleScript_NoItemSteal +_0801F280: .4byte gLastUsedAbility _0801F284: - ldr r4, _0801F340 @ =gPlayerMonIndex + ldr r4, _0801F340 @ =gBankAttacker mov r10, r4 ldrb r1, [r4] movs r0, 0x58 @@ -6759,7 +6759,7 @@ _0801F2B6: lsls r0, r1, 1 ldr r5, _0801F344 @ =0x020160f0 adds r0, r5 - ldr r1, _0801F348 @ =gUnknown_02024C04 + ldr r1, _0801F348 @ =gLastUsedItem strh r2, [r0] strh r2, [r1] ldrb r0, [r7] @@ -6769,7 +6769,7 @@ _0801F2B6: add r0, r9 movs r6, 0 strh r3, [r0, 0x2E] - ldr r4, _0801F34C @ =gUnknown_02024A60 + ldr r4, _0801F34C @ =gActiveBank mov r2, r10 ldrb r0, [r2] strb r0, [r4] @@ -6778,10 +6778,10 @@ _0801F2B6: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes mov r3, r10 ldrb r0, [r3] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldrb r0, [r7] strb r0, [r4] ldrb r0, [r7] @@ -6796,14 +6796,14 @@ _0801F2B6: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r7] - bl dp01_battle_side_mark_buffer_for_execution - ldr r4, _0801F350 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r4, _0801F350 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801F354 @ =gUnknown_081D96F6 + ldr r0, _0801F354 @ =BattleScript_ItemSteal str r0, [r4] ldr r0, _0801F358 @ =0xfffe9f10 adds r5, r0 @@ -6821,17 +6821,17 @@ _0801F2B6: strb r6, [r0] b _0801F5FA .align 2, 0 -_0801F340: .4byte gPlayerMonIndex +_0801F340: .4byte gBankAttacker _0801F344: .4byte 0x020160f0 -_0801F348: .4byte gUnknown_02024C04 -_0801F34C: .4byte gUnknown_02024A60 -_0801F350: .4byte gUnknown_02024C10 -_0801F354: .4byte gUnknown_081D96F6 +_0801F348: .4byte gLastUsedItem +_0801F34C: .4byte gActiveBank +_0801F350: .4byte gBattlescriptCurrInstr +_0801F354: .4byte BattleScript_ItemSteal _0801F358: .4byte 0xfffe9f10 _0801F35C: .4byte 0x000160e8 _0801F360: .4byte 0x000160e9 _0801F364: - ldr r3, _0801F394 @ =gEnemyMonIndex + ldr r3, _0801F394 @ =gBankTarget ldrb r1, [r3] movs r0, 0x58 adds r2, r1, 0 @@ -6844,22 +6844,22 @@ _0801F364: lsls r1, 19 orrs r0, r1 str r0, [r2] - ldr r2, _0801F398 @ =gUnknown_02024CA8 + ldr r2, _0801F398 @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _0801F39C @ =gPlayerMonIndex + ldr r1, _0801F39C @ =gBankAttacker ldrb r1, [r1] strb r1, [r0, 0x14] b _0801F5DC .align 2, 0 -_0801F394: .4byte gEnemyMonIndex -_0801F398: .4byte gUnknown_02024CA8 -_0801F39C: .4byte gPlayerMonIndex +_0801F394: .4byte gBankTarget +_0801F398: .4byte gDisableStructs +_0801F39C: .4byte gBankAttacker _0801F3A0: - ldr r0, _0801F3B8 @ =gEnemyMonIndex + ldr r0, _0801F3B8 @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 adds r2, r1, 0 @@ -6872,29 +6872,29 @@ _0801F3A0: lsls r1, 20 b _0801F19A .align 2, 0 -_0801F3B8: .4byte gEnemyMonIndex +_0801F3B8: .4byte gBankTarget _0801F3BC: - ldr r4, _0801F3CC @ =gUnknown_02024C10 + ldr r4, _0801F3CC @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, _0801F3D0 @ =gUnknown_081D9224 b _0801F5F8 .align 2, 0 -_0801F3CC: .4byte gUnknown_02024C10 +_0801F3CC: .4byte gBattlescriptCurrInstr _0801F3D0: .4byte gUnknown_081D9224 _0801F3D4: - ldr r4, _0801F3E4 @ =gUnknown_02024C10 + ldr r4, _0801F3E4 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801F3E8 @ =gUnknown_081D92C0 + ldr r0, _0801F3E8 @ =BattleScript_RapidSpinAway b _0801F5F8 .align 2, 0 -_0801F3E4: .4byte gUnknown_02024C10 -_0801F3E8: .4byte gUnknown_081D92C0 +_0801F3E4: .4byte gBattlescriptCurrInstr +_0801F3E8: .4byte BattleScript_RapidSpinAway _0801F3EC: - ldr r6, _0801F43C @ =gEnemyMonIndex + ldr r6, _0801F43C @ =gBankTarget ldrb r0, [r6] movs r2, 0x58 muls r0, r2 @@ -6912,7 +6912,7 @@ _0801F406: negs r0, r0 ands r4, r0 str r4, [r5] - ldr r4, _0801F440 @ =gUnknown_02024A60 + ldr r4, _0801F440 @ =gActiveBank ldrb r0, [r6] strb r0, [r4] ldrb r0, [r4] @@ -6923,33 +6923,33 @@ _0801F406: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r4, _0801F444 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r4, _0801F444 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801F448 @ =gUnknown_081D9635 + ldr r0, _0801F448 @ =BattleScript_TargetPRLZHeal b _0801F5F8 .align 2, 0 -_0801F43C: .4byte gEnemyMonIndex -_0801F440: .4byte gUnknown_02024A60 -_0801F444: .4byte gUnknown_02024C10 -_0801F448: .4byte gUnknown_081D9635 +_0801F43C: .4byte gBankTarget +_0801F440: .4byte gActiveBank +_0801F444: .4byte gBattlescriptCurrInstr +_0801F448: .4byte BattleScript_TargetPRLZHeal _0801F44C: - ldr r4, _0801F45C @ =gUnknown_02024C10 + ldr r4, _0801F45C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, _0801F460 @ =gUnknown_081D93FA b _0801F5F8 .align 2, 0 -_0801F45C: .4byte gUnknown_02024C10 +_0801F45C: .4byte gBattlescriptCurrInstr _0801F460: .4byte gUnknown_081D93FA _0801F464: ldr r4, _0801F494 @ =gBattleMoveDamage - ldr r0, _0801F498 @ =gUnknown_02024BF0 + ldr r0, _0801F498 @ =gHP_dealt ldr r0, [r0] movs r1, 0x3 bl __divsi3 @@ -6959,12 +6959,12 @@ _0801F464: movs r0, 0x1 str r0, [r4] _0801F47A: - ldr r4, _0801F49C @ =gUnknown_02024C10 + ldr r4, _0801F49C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _0801F4A0 @ =gUnknown_081FAC4C - ldr r0, _0801F4A4 @ =gUnknown_02024D1E + ldr r1, _0801F4A0 @ =gMoveEffectBS_Ptrs + ldr r0, _0801F4A4 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -6972,10 +6972,10 @@ _0801F47A: b _0801F5F8 .align 2, 0 _0801F494: .4byte gBattleMoveDamage -_0801F498: .4byte gUnknown_02024BF0 -_0801F49C: .4byte gUnknown_02024C10 -_0801F4A0: .4byte gUnknown_081FAC4C -_0801F4A4: .4byte gUnknown_02024D1E +_0801F498: .4byte gHP_dealt +_0801F49C: .4byte gBattlescriptCurrInstr +_0801F4A0: .4byte gMoveEffectBS_Ptrs +_0801F4A4: .4byte gBattleCommunication _0801F4A8: mov r3, r8 ldrb r0, [r3] @@ -6996,11 +6996,11 @@ _0801F4C4: lsls r0, 5 orrs r1, r0 str r1, [r2] - ldr r1, _0801F4F8 @ =gUnknown_02024C54 + ldr r1, _0801F4F8 @ =gLockedMove ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _0801F4FC @ =gUnknown_02024BE6 + ldr r1, _0801F4FC @ =gCurrentMove ldrh r1, [r1] strh r1, [r0] bl Random @@ -7019,8 +7019,8 @@ _0801F4F2: str r0, [r2] b _0801F5FA .align 2, 0 -_0801F4F8: .4byte gUnknown_02024C54 -_0801F4FC: .4byte gUnknown_02024BE6 +_0801F4F8: .4byte gLockedMove +_0801F4FC: .4byte gCurrentMove _0801F500: mov r5, r8 ldrb r3, [r5] @@ -7037,28 +7037,28 @@ _0801F500: ldrh r0, [r1, 0x2E] cmp r0, 0 beq _0801F5DC - ldr r0, _0801F534 @ =byte_2024C06 + ldr r0, _0801F534 @ =gLastUsedAbility strb r2, [r0] - ldr r1, _0801F538 @ =gUnknown_02024C10 - ldr r0, _0801F53C @ =gUnknown_081D9913 + ldr r1, _0801F538 @ =gBattlescriptCurrInstr + ldr r0, _0801F53C @ =BattleScript_NoItemSteal str r0, [r1] ldrb r0, [r5] movs r1, 0x3C bl sub_81074C4 b _0801F5FA .align 2, 0 -_0801F534: .4byte byte_2024C06 -_0801F538: .4byte gUnknown_02024C10 -_0801F53C: .4byte gUnknown_081D9913 +_0801F534: .4byte gLastUsedAbility +_0801F538: .4byte gBattlescriptCurrInstr +_0801F53C: .4byte BattleScript_NoItemSteal _0801F540: ldrh r0, [r1, 0x2E] cmp r0, 0 beq _0801F5DC adds r0, r3, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0801F5B8 @ =gUnknown_02024C04 + ldr r1, _0801F5B8 @ =gLastUsedItem mov r3, r8 ldrb r0, [r3] muls r0, r4 @@ -7071,11 +7071,11 @@ _0801F540: movs r5, 0 movs r1, 0 strh r1, [r0, 0x2E] - ldr r2, _0801F5BC @ =gUnknown_02024DBC + ldr r2, _0801F5BC @ =gWishFutureKnock adds r2, 0x29 adds r2, r6, r2 ldr r3, _0801F5C0 @ =gBitTable - ldr r1, _0801F5C4 @ =gUnknown_02024A6A + ldr r1, _0801F5C4 @ =gBattlePartyID mov r4, r8 ldrb r0, [r4] lsls r0, 1 @@ -7087,11 +7087,11 @@ _0801F540: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r4, _0801F5C8 @ =gUnknown_02024C10 + ldr r4, _0801F5C8 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0801F5CC @ =gUnknown_081D944B + ldr r0, _0801F5CC @ =BattleScript_KnockedOff str r0, [r4] ldr r1, _0801F5D0 @ =0x02000000 mov r2, r8 @@ -7109,25 +7109,25 @@ _0801F540: strb r5, [r0] b _0801F5FA .align 2, 0 -_0801F5B8: .4byte gUnknown_02024C04 -_0801F5BC: .4byte gUnknown_02024DBC +_0801F5B8: .4byte gLastUsedItem +_0801F5BC: .4byte gWishFutureKnock _0801F5C0: .4byte gBitTable -_0801F5C4: .4byte gUnknown_02024A6A -_0801F5C8: .4byte gUnknown_02024C10 -_0801F5CC: .4byte gUnknown_081D944B +_0801F5C4: .4byte gBattlePartyID +_0801F5C8: .4byte gBattlescriptCurrInstr +_0801F5CC: .4byte BattleScript_KnockedOff _0801F5D0: .4byte 0x02000000 _0801F5D4: .4byte 0x000160e8 _0801F5D8: .4byte 0x000160e9 _0801F5DC: - ldr r1, _0801F5E8 @ =gUnknown_02024C10 + ldr r1, _0801F5E8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] b _0801F5FA .align 2, 0 -_0801F5E8: .4byte gUnknown_02024C10 +_0801F5E8: .4byte gBattlescriptCurrInstr _0801F5EC: - ldr r4, _0801F60C @ =gUnknown_02024C10 + ldr r4, _0801F60C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -7144,7 +7144,7 @@ _0801F5FA: pop {r0} bx r0 .align 2, 0 -_0801F60C: .4byte gUnknown_02024C10 +_0801F60C: .4byte gBattlescriptCurrInstr _0801F610: .4byte gUnknown_081D94B0 thumb_func_end sub_801E3EC @@ -7152,7 +7152,7 @@ _0801F610: .4byte gUnknown_081D94B0 atk15_seteffectwithchancetarget: @ 801F614 push {r4,lr} ldr r2, _0801F640 @ =gBattleMons - ldr r0, _0801F644 @ =gPlayerMonIndex + ldr r0, _0801F644 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -7162,7 +7162,7 @@ atk15_seteffectwithchancetarget: @ 801F614 cmp r0, 0x20 bne _0801F650 ldr r2, _0801F648 @ =gBattleMoves - ldr r0, _0801F64C @ =gUnknown_02024BE6 + ldr r0, _0801F64C @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -7173,12 +7173,12 @@ atk15_seteffectwithchancetarget: @ 801F614 b _0801F660 .align 2, 0 _0801F640: .4byte gBattleMons -_0801F644: .4byte gPlayerMonIndex +_0801F644: .4byte gBankAttacker _0801F648: .4byte gBattleMoves -_0801F64C: .4byte gUnknown_02024BE6 +_0801F64C: .4byte gCurrentMove _0801F650: ldr r2, _0801F680 @ =gBattleMoves - ldr r0, _0801F684 @ =gUnknown_02024BE6 + ldr r0, _0801F684 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -7186,7 +7186,7 @@ _0801F650: adds r0, r2 ldrb r4, [r0, 0x5] _0801F660: - ldr r3, _0801F688 @ =gUnknown_02024D1E + ldr r3, _0801F688 @ =gBattleCommunication ldrb r2, [r3, 0x3] movs r0, 0x80 ands r0, r2 @@ -7204,8 +7204,8 @@ _0801F660: b _0801F6BE .align 2, 0 _0801F680: .4byte gBattleMoves -_0801F684: .4byte gUnknown_02024BE6 -_0801F688: .4byte gUnknown_02024D1E +_0801F684: .4byte gCurrentMove +_0801F688: .4byte gBattleCommunication _0801F68C: .4byte gBattleMoveFlags _0801F690: bl Random @@ -7217,7 +7217,7 @@ _0801F690: lsrs r0, 16 cmp r0, r4 bhi _0801F6DA - ldr r0, _0801F6C8 @ =gUnknown_02024D1E + ldr r0, _0801F6C8 @ =gBattleCommunication ldrb r0, [r0, 0x3] cmp r0, 0 beq _0801F6DA @@ -7235,7 +7235,7 @@ _0801F6BE: bl sub_801E3EC b _0801F6E2 .align 2, 0 -_0801F6C8: .4byte gUnknown_02024D1E +_0801F6C8: .4byte gBattleCommunication _0801F6CC: .4byte gBattleMoveFlags _0801F6D0: movs r0, 0 @@ -7243,12 +7243,12 @@ _0801F6D0: bl sub_801E3EC b _0801F6E2 _0801F6DA: - ldr r1, _0801F6F8 @ =gUnknown_02024C10 + ldr r1, _0801F6F8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] _0801F6E2: - ldr r0, _0801F6FC @ =gUnknown_02024D1E + ldr r0, _0801F6FC @ =gBattleCommunication movs r1, 0 strb r1, [r0, 0x3] ldr r0, _0801F700 @ =0x02000000 @@ -7259,42 +7259,42 @@ _0801F6E2: pop {r0} bx r0 .align 2, 0 -_0801F6F8: .4byte gUnknown_02024C10 -_0801F6FC: .4byte gUnknown_02024D1E +_0801F6F8: .4byte gBattlescriptCurrInstr +_0801F6FC: .4byte gBattleCommunication _0801F700: .4byte 0x02000000 _0801F704: .4byte 0x00016112 thumb_func_end atk15_seteffectwithchancetarget - thumb_func_start sub_801F708 -sub_801F708: @ 801F708 + thumb_func_start atk16_seteffectprimary +atk16_seteffectprimary: @ 801F708 push {lr} movs r0, 0x1 movs r1, 0 bl sub_801E3EC pop {r0} bx r0 - thumb_func_end sub_801F708 + thumb_func_end atk16_seteffectprimary - thumb_func_start sub_801F718 -sub_801F718: @ 801F718 + thumb_func_start atk17_seteffectsecondary +atk17_seteffectsecondary: @ 801F718 push {lr} movs r0, 0 movs r1, 0 bl sub_801E3EC pop {r0} bx r0 - thumb_func_end sub_801F718 + thumb_func_end atk17_seteffectsecondary - thumb_func_start sub_801F728 -sub_801F728: @ 801F728 + thumb_func_start atk18_status_effect_clear +atk18_status_effect_clear: @ 801F728 push {lr} - ldr r0, _0801F74C @ =gUnknown_02024C10 + ldr r0, _0801F74C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r2, _0801F750 @ =gUnknown_02024A60 + ldr r2, _0801F750 @ =gActiveBank strb r0, [r2] - ldr r3, _0801F754 @ =gUnknown_02024D1E + ldr r3, _0801F754 @ =gBattleCommunication ldrb r0, [r3, 0x3] cmp r0, 0x6 bhi _0801F75C @@ -7305,9 +7305,9 @@ sub_801F728: @ 801F728 adds r1, 0x4C b _0801F766 .align 2, 0 -_0801F74C: .4byte gUnknown_02024C10 -_0801F750: .4byte gUnknown_02024A60 -_0801F754: .4byte gUnknown_02024D1E +_0801F74C: .4byte gBattlescriptCurrInstr +_0801F750: .4byte gActiveBank +_0801F754: .4byte gBattleCommunication _0801F758: .4byte gBattleMons _0801F75C: ldr r1, _0801F794 @ =gBattleMons @@ -7317,7 +7317,7 @@ _0801F75C: adds r1, 0x50 _0801F766: adds r2, r1 - ldr r1, _0801F798 @ =gUnknown_081FAB5C + ldr r1, _0801F798 @ =gStatusFlagsForMoveEffects ldrb r0, [r3, 0x3] lsls r0, 2 adds r0, r1 @@ -7325,10 +7325,10 @@ _0801F766: ldr r0, [r2] bics r0, r1 str r0, [r2] - ldr r0, _0801F79C @ =gUnknown_02024D1E + ldr r0, _0801F79C @ =gBattleCommunication movs r2, 0 strb r2, [r0, 0x3] - ldr r1, _0801F7A0 @ =gUnknown_02024C10 + ldr r1, _0801F7A0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -7340,22 +7340,22 @@ _0801F766: bx r0 .align 2, 0 _0801F794: .4byte gBattleMons -_0801F798: .4byte gUnknown_081FAB5C -_0801F79C: .4byte gUnknown_02024D1E -_0801F7A0: .4byte gUnknown_02024C10 +_0801F798: .4byte gStatusFlagsForMoveEffects +_0801F79C: .4byte gBattleCommunication +_0801F7A0: .4byte gBattlescriptCurrInstr _0801F7A4: .4byte 0x02000000 _0801F7A8: .4byte 0x00016112 - thumb_func_end sub_801F728 + thumb_func_end atk18_status_effect_clear - thumb_func_start sub_801F7AC -sub_801F7AC: @ 801F7AC + thumb_func_start atk19_faint_pokemon +atk19_faint_pokemon: @ 801F7AC push {r4-r7,lr} mov r7, r10 mov r6, r9 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _0801F81C @ =gUnknown_02024C10 + ldr r0, _0801F81C @ =gBattlescriptCurrInstr ldr r2, [r0] ldrb r1, [r2, 0x2] adds r6, r0, 0 @@ -7363,9 +7363,9 @@ sub_801F7AC: @ 801F7AC beq _0801F834 ldrb r0, [r2, 0x1] bl sub_8015150 - ldr r5, _0801F820 @ =gUnknown_02024A60 + ldr r5, _0801F820 @ =gActiveBank strb r0, [r5] - ldr r2, _0801F824 @ =gUnknown_02024C6C + ldr r2, _0801F824 @ =gHitMarker ldr r1, _0801F828 @ =gBitTable ldrb r0, [r5] lsls r0, 2 @@ -7392,8 +7392,8 @@ _0801F7E6: bl b_movescr_stack_pop_cursor str r4, [r6] ldrb r0, [r5] - bl battle_side_get_owner - ldr r1, _0801F82C @ =gUnknown_02024C7A + bl GetBankSide + ldr r1, _0801F82C @ =gSideAffecting lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -7403,43 +7403,43 @@ _0801F7E6: strh r1, [r0] b _0801FB22 .align 2, 0 -_0801F81C: .4byte gUnknown_02024C10 -_0801F820: .4byte gUnknown_02024A60 -_0801F824: .4byte gUnknown_02024C6C +_0801F81C: .4byte gBattlescriptCurrInstr +_0801F820: .4byte gActiveBank +_0801F824: .4byte gHitMarker _0801F828: .4byte gBitTable -_0801F82C: .4byte gUnknown_02024C7A +_0801F82C: .4byte gSideAffecting _0801F830: .4byte 0x0000fdff _0801F834: ldrb r0, [r2, 0x1] cmp r0, 0x1 bne _0801F85C - ldr r1, _0801F84C @ =gUnknown_02024A60 - ldr r0, _0801F850 @ =gPlayerMonIndex + ldr r1, _0801F84C @ =gActiveBank + ldr r0, _0801F850 @ =gBankAttacker ldrb r0, [r0] strb r0, [r1] - ldr r0, _0801F854 @ =gEnemyMonIndex + ldr r0, _0801F854 @ =gBankTarget ldrb r7, [r0] ldr r4, _0801F858 @ =gUnknown_081D8C58 b _0801F86A .align 2, 0 -_0801F84C: .4byte gUnknown_02024A60 -_0801F850: .4byte gPlayerMonIndex -_0801F854: .4byte gEnemyMonIndex +_0801F84C: .4byte gActiveBank +_0801F850: .4byte gBankAttacker +_0801F854: .4byte gBankTarget _0801F858: .4byte gUnknown_081D8C58 _0801F85C: - ldr r1, _0801F954 @ =gUnknown_02024A60 - ldr r0, _0801F958 @ =gEnemyMonIndex + ldr r1, _0801F954 @ =gActiveBank + ldr r0, _0801F958 @ =gBankTarget ldrb r0, [r0] strb r0, [r1] - ldr r0, _0801F95C @ =gPlayerMonIndex + ldr r0, _0801F95C @ =gBankAttacker ldrb r7, [r0] ldr r4, _0801F960 @ =gUnknown_081D8C65 _0801F86A: - ldr r0, _0801F964 @ =gUnknown_02024C0C + ldr r0, _0801F964 @ =gAbsentBankFlags ldrb r1, [r0] ldr r0, _0801F968 @ =gBitTable mov r12, r0 - ldr r2, _0801F954 @ =gUnknown_02024A60 + ldr r2, _0801F954 @ =gActiveBank mov r8, r2 ldrb r2, [r2] lsls r0, r2, 2 @@ -7489,7 +7489,7 @@ _0801F89C: adds r1, r0 adds r1, r2 strb r3, [r1] - ldr r5, _0801F980 @ =gUnknown_02024C6C + ldr r5, _0801F980 @ =gHitMarker mov r1, r8 ldrb r0, [r1] lsls r0, 2 @@ -7505,7 +7505,7 @@ _0801F89C: str r4, [r6] mov r2, r8 ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0801F9B0 @@ -7514,7 +7514,7 @@ _0801F89C: lsls r1, 15 orrs r0, r1 str r0, [r5] - ldr r1, _0801F984 @ =gUnknown_030042E0 + ldr r1, _0801F984 @ =gBattleResults ldrb r0, [r1] cmp r0, 0xFE bhi _0801F914 @@ -7541,7 +7541,7 @@ _0801F914: subs r0, r1 cmp r0, 0x1D ble _0801F990 - ldr r1, _0801F988 @ =gUnknown_02024A6A + ldr r1, _0801F988 @ =gBattlePartyID lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] @@ -7553,23 +7553,23 @@ _0801F914: bl AdjustFriendship b _0801F9CC .align 2, 0 -_0801F954: .4byte gUnknown_02024A60 -_0801F958: .4byte gEnemyMonIndex -_0801F95C: .4byte gPlayerMonIndex +_0801F954: .4byte gActiveBank +_0801F958: .4byte gBankTarget +_0801F95C: .4byte gBankAttacker _0801F960: .4byte gUnknown_081D8C65 -_0801F964: .4byte gUnknown_02024C0C +_0801F964: .4byte gAbsentBankFlags _0801F968: .4byte gBitTable _0801F96C: .4byte gBattleMons _0801F970: .4byte 0x02000000 _0801F974: .4byte 0x000160ac _0801F978: .4byte 0x000160ad _0801F97C: .4byte 0x00016103 -_0801F980: .4byte gUnknown_02024C6C -_0801F984: .4byte gUnknown_030042E0 -_0801F988: .4byte gUnknown_02024A6A +_0801F980: .4byte gHitMarker +_0801F984: .4byte gBattleResults +_0801F988: .4byte gBattlePartyID _0801F98C: .4byte gPlayerParty _0801F990: - ldr r1, _0801F9A8 @ =gUnknown_02024A6A + ldr r1, _0801F9A8 @ =gBattlePartyID lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] @@ -7581,17 +7581,17 @@ _0801F990: bl AdjustFriendship b _0801F9CC .align 2, 0 -_0801F9A8: .4byte gUnknown_02024A6A +_0801F9A8: .4byte gBattlePartyID _0801F9AC: .4byte gPlayerParty _0801F9B0: - ldr r1, _0801FAE0 @ =gUnknown_030042E0 + ldr r1, _0801FAE0 @ =gBattleResults ldrb r0, [r1, 0x1] cmp r0, 0xFE bhi _0801F9BC adds r0, 0x1 strb r0, [r1, 0x1] _0801F9BC: - ldr r2, _0801FAE4 @ =gUnknown_02024A60 + ldr r2, _0801FAE4 @ =gActiveBank ldrb r0, [r2] mov r3, r9 muls r3, r0 @@ -7600,14 +7600,14 @@ _0801F9BC: ldrh r0, [r0] strh r0, [r1, 0x20] _0801F9CC: - ldr r0, _0801FAE8 @ =gUnknown_02024C6C + ldr r0, _0801FAE8 @ =gHitMarker ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0801FA02 ldr r6, _0801FAEC @ =gBattleMons - ldr r0, _0801FAF0 @ =gPlayerMonIndex + ldr r0, _0801FAF0 @ =gBankAttacker ldrb r0, [r0] movs r5, 0x58 muls r0, r5 @@ -7615,7 +7615,7 @@ _0801F9CC: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0801FA02 - ldr r4, _0801FAF4 @ =gUnknown_02024C10 + ldr r4, _0801FAF4 @ =gBattlescriptCurrInstr ldr r0, [r4] bl b_movescr_stack_push ldr r1, _0801FAF8 @ =gBattleMoveDamage @@ -7627,8 +7627,8 @@ _0801F9CC: ldr r0, _0801FAFC @ =gUnknown_081D9156 str r0, [r4] _0801FA02: - ldr r1, _0801FB00 @ =gUnknown_02024C98 - ldr r6, _0801FB04 @ =gEnemyMonIndex + ldr r1, _0801FB00 @ =gStatuses3 + ldr r6, _0801FB04 @ =gBankTarget ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -7640,20 +7640,20 @@ _0801FA02: bne _0801FA1A b _0801FB22 _0801FA1A: - ldr r0, _0801FAE8 @ =gUnknown_02024C6C + ldr r0, _0801FAE8 @ =gHitMarker ldr r5, [r0] movs r0, 0x80 lsls r0, 17 ands r5, r0 cmp r5, 0 bne _0801FB22 - ldr r4, _0801FAF0 @ =gPlayerMonIndex + ldr r4, _0801FAF0 @ =gBankAttacker mov r8, r4 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -7669,7 +7669,7 @@ _0801FA1A: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0801FB22 - ldr r0, _0801FB08 @ =gUnknown_02024BE6 + ldr r0, _0801FB08 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xA5 beq _0801FB22 @@ -7683,12 +7683,12 @@ _0801FA1A: adds r6, 0x24 adds r0, r6 strb r5, [r0] - ldr r5, _0801FAF4 @ =gUnknown_02024C10 + ldr r5, _0801FAF4 @ =gBattlescriptCurrInstr ldr r0, [r5] bl b_movescr_stack_push ldr r0, _0801FB14 @ =gUnknown_081D9468 str r0, [r5] - ldr r5, _0801FAE4 @ =gUnknown_02024A60 + ldr r5, _0801FAE4 @ =gActiveBank mov r1, r8 ldrb r0, [r1] strb r0, [r5] @@ -7704,10 +7704,10 @@ _0801FA1A: movs r0, 0 movs r2, 0 movs r3, 0x1 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0801FB18 @ =gUnknown_030041C0 + bl MarkBufferBankForExecution + ldr r1, _0801FB18 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -7734,21 +7734,21 @@ _0801FA1A: strb r0, [r1, 0x4] b _0801FB22 .align 2, 0 -_0801FAE0: .4byte gUnknown_030042E0 -_0801FAE4: .4byte gUnknown_02024A60 -_0801FAE8: .4byte gUnknown_02024C6C +_0801FAE0: .4byte gBattleResults +_0801FAE4: .4byte gActiveBank +_0801FAE8: .4byte gHitMarker _0801FAEC: .4byte gBattleMons -_0801FAF0: .4byte gPlayerMonIndex -_0801FAF4: .4byte gUnknown_02024C10 +_0801FAF0: .4byte gBankAttacker +_0801FAF4: .4byte gBattlescriptCurrInstr _0801FAF8: .4byte gBattleMoveDamage _0801FAFC: .4byte gUnknown_081D9156 -_0801FB00: .4byte gUnknown_02024C98 -_0801FB04: .4byte gEnemyMonIndex -_0801FB08: .4byte gUnknown_02024BE6 +_0801FB00: .4byte gStatuses3 +_0801FB04: .4byte gBankTarget +_0801FB08: .4byte gCurrentMove _0801FB0C: .4byte 0x02000000 _0801FB10: .4byte 0x0001608c _0801FB14: .4byte gUnknown_081D9468 -_0801FB18: .4byte gUnknown_030041C0 +_0801FB18: .4byte gBattleTextBuff1 _0801FB1C: ldr r0, [r6] adds r0, 0x7 @@ -7762,25 +7762,25 @@ _0801FB22: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_801F7AC + thumb_func_end atk19_faint_pokemon - thumb_func_start sub_801FB34 -sub_801FB34: @ 801FB34 + thumb_func_start atk1A_faint_animation +atk1A_faint_animation: @ 801FB34 push {r4,r5,lr} - ldr r0, _0801FB64 @ =gUnknown_02024A64 + ldr r0, _0801FB64 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0801FB5E - ldr r5, _0801FB68 @ =gUnknown_02024C10 + ldr r5, _0801FB68 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _0801FB6C @ =gUnknown_02024A60 + ldr r4, _0801FB6C @ =gActiveBank strb r0, [r4] movs r0, 0 - bl dp01_build_cmdbuf_x0A_A_A_A + bl EmitFaintAnimation ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -7789,24 +7789,24 @@ _0801FB5E: pop {r0} bx r0 .align 2, 0 -_0801FB64: .4byte gUnknown_02024A64 -_0801FB68: .4byte gUnknown_02024C10 -_0801FB6C: .4byte gUnknown_02024A60 - thumb_func_end sub_801FB34 +_0801FB64: .4byte gBattleExecBuffer +_0801FB68: .4byte gBattlescriptCurrInstr +_0801FB6C: .4byte gActiveBank + thumb_func_end atk1A_faint_animation - thumb_func_start atkE2_cmde2 -atkE2_cmde2: @ 801FB70 + thumb_func_start atk1B_faint_effects_clear +atk1B_faint_effects_clear: @ 801FB70 push {r4-r6,lr} sub sp, 0x4 - ldr r0, _0801FBC4 @ =gUnknown_02024A64 + ldr r0, _0801FBC4 @ =gBattleExecBuffer ldr r6, [r0] cmp r6, 0 bne _0801FBBC - ldr r5, _0801FBC8 @ =gUnknown_02024C10 + ldr r5, _0801FBC8 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _0801FBCC @ =gUnknown_02024A60 + ldr r4, _0801FBCC @ =gActiveBank strb r0, [r4] ldr r1, _0801FBD0 @ =gBattleMons ldrb r0, [r4] @@ -7823,10 +7823,10 @@ atkE2_cmde2: @ 801FB70 movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - bl sub_8010F48 + bl MarkBufferBankForExecution + bl UndoEffectsAfterFainting ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -7836,16 +7836,16 @@ _0801FBBC: pop {r0} bx r0 .align 2, 0 -_0801FBC4: .4byte gUnknown_02024A64 -_0801FBC8: .4byte gUnknown_02024C10 -_0801FBCC: .4byte gUnknown_02024A60 +_0801FBC4: .4byte gBattleExecBuffer +_0801FBC8: .4byte gBattlescriptCurrInstr +_0801FBCC: .4byte gActiveBank _0801FBD0: .4byte gBattleMons - thumb_func_end atkE2_cmde2 + thumb_func_end atk1B_faint_effects_clear thumb_func_start atk1C_jumpifstatus atk1C_jumpifstatus: @ 801FBD4 push {r4,r5,lr} - ldr r5, _0801FC30 @ =gUnknown_02024C10 + ldr r5, _0801FC30 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 @@ -7889,10 +7889,10 @@ atk1C_jumpifstatus: @ 801FBD4 str r3, [r5] b _0801FC40 .align 2, 0 -_0801FC30: .4byte gUnknown_02024C10 +_0801FC30: .4byte gBattlescriptCurrInstr _0801FC34: .4byte gBattleMons _0801FC38: - ldr r1, _0801FC48 @ =gUnknown_02024C10 + ldr r1, _0801FC48 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -7901,13 +7901,13 @@ _0801FC40: pop {r0} bx r0 .align 2, 0 -_0801FC48: .4byte gUnknown_02024C10 +_0801FC48: .4byte gBattlescriptCurrInstr thumb_func_end atk1C_jumpifstatus - thumb_func_start atk1D_jumpifsecondarystatus -atk1D_jumpifsecondarystatus: @ 801FC4C + thumb_func_start atk1D_jumpifstatus2 +atk1D_jumpifstatus2: @ 801FC4C push {r4,r5,lr} - ldr r5, _0801FCA8 @ =gUnknown_02024C10 + ldr r5, _0801FCA8 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 @@ -7951,10 +7951,10 @@ atk1D_jumpifsecondarystatus: @ 801FC4C str r3, [r5] b _0801FCB8 .align 2, 0 -_0801FCA8: .4byte gUnknown_02024C10 +_0801FCA8: .4byte gBattlescriptCurrInstr _0801FCAC: .4byte gBattleMons _0801FCB0: - ldr r1, _0801FCC0 @ =gUnknown_02024C10 + ldr r1, _0801FCC0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -7963,8 +7963,8 @@ _0801FCB8: pop {r0} bx r0 .align 2, 0 -_0801FCC0: .4byte gUnknown_02024C10 - thumb_func_end atk1D_jumpifsecondarystatus +_0801FCC0: .4byte gBattlescriptCurrInstr + thumb_func_end atk1D_jumpifstatus2 thumb_func_start atk1E_jumpifability atk1E_jumpifability: @ 801FCC4 @@ -7972,7 +7972,7 @@ atk1E_jumpifability: @ 801FCC4 mov r7, r8 push {r7} sub sp, 0x4 - ldr r6, _0801FD18 @ =gUnknown_02024C10 + ldr r6, _0801FD18 @ =gBattlescriptCurrInstr ldr r2, [r6] ldrb r5, [r2, 0x2] mov r8, r5 @@ -7989,19 +7989,19 @@ atk1E_jumpifability: @ 801FCC4 ldrb r0, [r2, 0x1] cmp r0, 0x8 bne _0801FD24 - ldr r0, _0801FD1C @ =gPlayerMonIndex + ldr r0, _0801FD1C @ =gBankAttacker ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0xD adds r2, r5, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 beq _0801FDA0 - ldr r1, _0801FD20 @ =byte_2024C06 + ldr r1, _0801FD20 @ =gLastUsedAbility strb r5, [r1] str r7, [r6] subs r4, 0x1 @@ -8010,25 +8010,25 @@ atk1E_jumpifability: @ 801FCC4 ldrb r1, [r1] b _0801FD80 .align 2, 0 -_0801FD18: .4byte gUnknown_02024C10 -_0801FD1C: .4byte gPlayerMonIndex -_0801FD20: .4byte byte_2024C06 +_0801FD18: .4byte gBattlescriptCurrInstr +_0801FD1C: .4byte gBankAttacker +_0801FD20: .4byte gLastUsedAbility _0801FD24: cmp r0, 0x9 bne _0801FD5C - ldr r0, _0801FD54 @ =gPlayerMonIndex + ldr r0, _0801FD54 @ =gBankAttacker ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0xC adds r2, r5, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 beq _0801FDA0 - ldr r1, _0801FD58 @ =byte_2024C06 + ldr r1, _0801FD58 @ =gLastUsedAbility strb r5, [r1] str r7, [r6] subs r4, 0x1 @@ -8037,8 +8037,8 @@ _0801FD24: ldrb r1, [r1] b _0801FD80 .align 2, 0 -_0801FD54: .4byte gPlayerMonIndex -_0801FD58: .4byte byte_2024C06 +_0801FD54: .4byte gBankAttacker +_0801FD58: .4byte gLastUsedAbility _0801FD5C: ldrb r0, [r2, 0x1] bl sub_8015150 @@ -8052,7 +8052,7 @@ _0801FD5C: ldrb r1, [r0] cmp r1, r8 bne _0801FDA0 - ldr r0, _0801FD94 @ =byte_2024C06 + ldr r0, _0801FD94 @ =gLastUsedAbility strb r1, [r0] str r7, [r6] ldrb r1, [r0] @@ -8066,7 +8066,7 @@ _0801FD80: b _0801FDA6 .align 2, 0 _0801FD90: .4byte gBattleMons -_0801FD94: .4byte byte_2024C06 +_0801FD94: .4byte gLastUsedAbility _0801FD98: .4byte 0x02000000 _0801FD9C: .4byte 0x000160f8 _0801FDA0: @@ -8082,29 +8082,29 @@ _0801FDA6: bx r0 thumb_func_end atk1E_jumpifability - thumb_func_start sub_801FDB4 -sub_801FDB4: @ 801FDB4 + thumb_func_start atk1F_jumpifsideaffecting +atk1F_jumpifsideaffecting: @ 801FDB4 push {r4-r6,lr} - ldr r0, _0801FDCC @ =gUnknown_02024C10 + ldr r0, _0801FDCC @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r4, [r0, 0x1] cmp r4, 0x1 bne _0801FDD4 - ldr r0, _0801FDD0 @ =gPlayerMonIndex + ldr r0, _0801FDD0 @ =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity b _0801FDDE .align 2, 0 -_0801FDCC: .4byte gUnknown_02024C10 -_0801FDD0: .4byte gPlayerMonIndex +_0801FDCC: .4byte gBattlescriptCurrInstr +_0801FDD0: .4byte gBankAttacker _0801FDD4: - ldr r0, _0801FE14 @ =gEnemyMonIndex + ldr r0, _0801FE14 @ =gBankTarget ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r4, 0x1 _0801FDDE: ands r4, r0 - ldr r6, _0801FE18 @ =gUnknown_02024C10 + ldr r6, _0801FE18 @ =gBattlescriptCurrInstr ldr r3, [r6] ldrb r2, [r3, 0x2] ldrb r0, [r3, 0x3] @@ -8120,7 +8120,7 @@ _0801FDDE: ldrb r0, [r3, 0x7] lsls r0, 24 adds r5, r1, r0 - ldr r1, _0801FE1C @ =gUnknown_02024C7A + ldr r1, _0801FE1C @ =gSideAffecting lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -8130,9 +8130,9 @@ _0801FDDE: str r5, [r6] b _0801FE26 .align 2, 0 -_0801FE14: .4byte gEnemyMonIndex -_0801FE18: .4byte gUnknown_02024C10 -_0801FE1C: .4byte gUnknown_02024C7A +_0801FE14: .4byte gBankTarget +_0801FE18: .4byte gBattlescriptCurrInstr +_0801FE1C: .4byte gSideAffecting _0801FE20: adds r0, r3, 0 adds r0, 0x8 @@ -8141,13 +8141,13 @@ _0801FE26: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_801FDB4 + thumb_func_end atk1F_jumpifsideaffecting - thumb_func_start sub_801FE2C -sub_801FE2C: @ 801FE2C + thumb_func_start atk20_jumpifstat +atk20_jumpifstat: @ 801FE2C push {r4,r5,lr} movs r5, 0 - ldr r4, _0801FE60 @ =gUnknown_02024C10 + ldr r4, _0801FE60 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 @@ -8171,7 +8171,7 @@ sub_801FE2C: @ 801FE2C ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801FE60: .4byte gUnknown_02024C10 +_0801FE60: .4byte gBattlescriptCurrInstr _0801FE64: .4byte gBattleMons _0801FE68: .4byte _0801FE6C .align 2, 0 @@ -8183,43 +8183,43 @@ _0801FE6C: .4byte _0801FEC4 .4byte _0801FED8 _0801FE84: - ldr r0, _0801FE90 @ =gUnknown_02024C10 + ldr r0, _0801FE90 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 bne _0801FEEA b _0801FEE4 .align 2, 0 -_0801FE90: .4byte gUnknown_02024C10 +_0801FE90: .4byte gBattlescriptCurrInstr _0801FE94: - ldr r0, _0801FEA0 @ =gUnknown_02024C10 + ldr r0, _0801FEA0 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 beq _0801FEEA b _0801FEE4 .align 2, 0 -_0801FEA0: .4byte gUnknown_02024C10 +_0801FEA0: .4byte gBattlescriptCurrInstr _0801FEA4: - ldr r0, _0801FEB0 @ =gUnknown_02024C10 + ldr r0, _0801FEB0 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 bls _0801FEEA b _0801FEE4 .align 2, 0 -_0801FEB0: .4byte gUnknown_02024C10 +_0801FEB0: .4byte gBattlescriptCurrInstr _0801FEB4: - ldr r0, _0801FEC0 @ =gUnknown_02024C10 + ldr r0, _0801FEC0 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 bcs _0801FEEA b _0801FEE4 .align 2, 0 -_0801FEC0: .4byte gUnknown_02024C10 +_0801FEC0: .4byte gBattlescriptCurrInstr _0801FEC4: - ldr r0, _0801FED4 @ =gUnknown_02024C10 + ldr r0, _0801FED4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 @@ -8227,9 +8227,9 @@ _0801FEC4: beq _0801FEEA b _0801FEE4 .align 2, 0 -_0801FED4: .4byte gUnknown_02024C10 +_0801FED4: .4byte gBattlescriptCurrInstr _0801FED8: - ldr r0, _0801FF0C @ =gUnknown_02024C10 + ldr r0, _0801FF0C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 @@ -8242,7 +8242,7 @@ _0801FEE4: _0801FEEA: cmp r5, 0 beq _0801FF10 - ldr r3, _0801FF0C @ =gUnknown_02024C10 + ldr r3, _0801FF0C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -8257,9 +8257,9 @@ _0801FEEA: str r1, [r3] b _0801FF18 .align 2, 0 -_0801FF0C: .4byte gUnknown_02024C10 +_0801FF0C: .4byte gBattlescriptCurrInstr _0801FF10: - ldr r1, _0801FF20 @ =gUnknown_02024C10 + ldr r1, _0801FF20 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x9 str r0, [r1] @@ -8268,17 +8268,17 @@ _0801FF18: pop {r0} bx r0 .align 2, 0 -_0801FF20: .4byte gUnknown_02024C10 - thumb_func_end sub_801FE2C +_0801FF20: .4byte gBattlescriptCurrInstr + thumb_func_end atk20_jumpifstat - thumb_func_start atk21_jumpifspecialstatusflag -atk21_jumpifspecialstatusflag: @ 801FF24 + thumb_func_start atk21_jumpifstatus3 +atk21_jumpifstatus3: @ 801FF24 push {r4-r6,lr} - ldr r4, _0801FF78 @ =gUnknown_02024C10 + ldr r4, _0801FF78 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r5, _0801FF7C @ =gUnknown_02024A60 + ldr r5, _0801FF7C @ =gActiveBank strb r0, [r5] ldr r2, [r4] ldrb r1, [r2, 0x2] @@ -8304,7 +8304,7 @@ atk21_jumpifspecialstatusflag: @ 801FF24 ldrb r0, [r2, 0x6] cmp r0, 0 beq _0801FF84 - ldr r0, _0801FF80 @ =gUnknown_02024C98 + ldr r0, _0801FF80 @ =gStatuses3 ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -8314,11 +8314,11 @@ atk21_jumpifspecialstatusflag: @ 801FF24 bne _0801FF9C b _0801FF94 .align 2, 0 -_0801FF78: .4byte gUnknown_02024C10 -_0801FF7C: .4byte gUnknown_02024A60 -_0801FF80: .4byte gUnknown_02024C98 +_0801FF78: .4byte gBattlescriptCurrInstr +_0801FF7C: .4byte gActiveBank +_0801FF80: .4byte gStatuses3 _0801FF84: - ldr r0, _0801FF98 @ =gUnknown_02024C98 + ldr r0, _0801FF98 @ =gStatuses3 ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -8330,7 +8330,7 @@ _0801FF94: str r3, [r4] b _0801FFA2 .align 2, 0 -_0801FF98: .4byte gUnknown_02024C98 +_0801FF98: .4byte gStatuses3 _0801FF9C: adds r0, r2, 0 adds r0, 0xB @@ -8339,12 +8339,12 @@ _0801FFA2: pop {r4-r6} pop {r0} bx r0 - thumb_func_end atk21_jumpifspecialstatusflag + thumb_func_end atk21_jumpifstatus3 - thumb_func_start sub_801FFA8 -sub_801FFA8: @ 801FFA8 + thumb_func_start atk22_jumpiftype +atk22_jumpiftype: @ 801FFA8 push {r4-r6,lr} - ldr r4, _0801FFF0 @ =gUnknown_02024C10 + ldr r4, _0801FFF0 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 @@ -8380,7 +8380,7 @@ _0801FFEC: str r6, [r4] b _0801FFFC .align 2, 0 -_0801FFF0: .4byte gUnknown_02024C10 +_0801FFF0: .4byte gBattlescriptCurrInstr _0801FFF4: .4byte gBattleMons _0801FFF8: adds r0, r3, 0x7 @@ -8389,10 +8389,10 @@ _0801FFFC: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_801FFA8 + thumb_func_end atk22_jumpiftype - thumb_func_start sub_8020004 -sub_8020004: @ 8020004 + thumb_func_start atk23_getexp +atk23_getexp: @ 8020004 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -8401,13 +8401,13 @@ sub_8020004: @ 8020004 movs r6, 0 ldr r0, _0802004C @ =0x0201605c mov r10, r0 - ldr r0, _08020050 @ =gUnknown_02024C10 + ldr r0, _08020050 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r1, _08020054 @ =gUnknown_02024C09 + ldr r1, _08020054 @ =gBank1 strb r0, [r1] - ldr r2, _08020058 @ =gUnknown_02024DEA + ldr r2, _08020058 @ =gSentPokesToOpponent movs r1, 0x2 ands r1, r0 lsls r1, 24 @@ -8429,9 +8429,9 @@ _08020040: mov pc, r0 .align 2, 0 _0802004C: .4byte 0x0201605c -_08020050: .4byte gUnknown_02024C10 -_08020054: .4byte gUnknown_02024C09 -_08020058: .4byte gUnknown_02024DEA +_08020050: .4byte gBattlescriptCurrInstr +_08020054: .4byte gBank1 +_08020058: .4byte gSentPokesToOpponent _0802005C: .4byte _08020060 .align 2, 0 _08020060: @@ -8443,9 +8443,9 @@ _08020060: .4byte _08020910 .4byte _0802096C _0802007C: - ldr r4, _080200A8 @ =gUnknown_02024C09 + ldr r4, _080200A8 @ =gBank1 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8464,7 +8464,7 @@ _08020098: strb r1, [r0] bl _08020996 .align 2, 0 -_080200A8: .4byte gUnknown_02024C09 +_080200A8: .4byte gBank1 _080200AC: .4byte gBattleTypeFlags _080200B0: .4byte 0x00000982 _080200B4: .4byte 0x02000000 @@ -8479,7 +8479,7 @@ _080200BC: ldr r0, _080200F0 @ =0x00016113 adds r2, r0 ldr r3, _080200F4 @ =gBitTable - ldr r1, _080200F8 @ =gUnknown_02024A6A + ldr r1, _080200F8 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -8496,7 +8496,7 @@ _080200E8: .4byte 0x02000000 _080200EC: .4byte 0x0001600f _080200F0: .4byte 0x00016113 _080200F4: .4byte gBitTable -_080200F8: .4byte gUnknown_02024A6A +_080200F8: .4byte gBattlePartyID _080200FC: movs r5, 0 movs r7, 0 @@ -8556,7 +8556,7 @@ _0802016A: ble _08020104 ldr r3, _080201D0 @ =gBaseStats ldr r2, _080201D4 @ =gBattleMons - ldr r0, _080201D8 @ =gUnknown_02024C09 + ldr r0, _080201D8 @ =gBank1 ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -8588,7 +8588,7 @@ _0802016A: movs r0, 0x1 strh r0, [r1] _080201B6: - ldr r5, _080201DC @ =gUnknown_02024DEE + ldr r5, _080201DC @ =gExpShareExp adds r0, r4, 0 adds r1, r6, 0 bl __divsi3 @@ -8602,8 +8602,8 @@ _080201B6: .align 2, 0 _080201D0: .4byte gBaseStats _080201D4: .4byte gBattleMons -_080201D8: .4byte gUnknown_02024C09 -_080201DC: .4byte gUnknown_02024DEE +_080201D8: .4byte gBank1 +_080201DC: .4byte gExpShareExp _080201E0: adds r0, r1, 0 adds r1, r5, 0 @@ -8616,7 +8616,7 @@ _080201E0: movs r0, 0x1 strh r0, [r2] _080201F6: - ldr r0, _08020248 @ =gUnknown_02024DEE + ldr r0, _08020248 @ =gExpShareExp strh r6, [r0] _080201FA: ldr r1, _0802024C @ =0x02000000 @@ -8634,7 +8634,7 @@ _080201FA: mov r0, r8 strb r0, [r1] _08020216: - ldr r0, _0802025C @ =gUnknown_02024A64 + ldr r0, _0802025C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _08020220 @@ -8660,12 +8660,12 @@ _08020220: ldrb r4, [r0] b _08020274 .align 2, 0 -_08020248: .4byte gUnknown_02024DEE +_08020248: .4byte gExpShareExp _0802024C: .4byte 0x02000000 _08020250: .4byte 0x0001600f _08020254: .4byte 0x00016018 _08020258: .4byte 0x0001605f -_0802025C: .4byte gUnknown_02024A64 +_0802025C: .4byte gBattleExecBuffer _08020260: .4byte gPlayerParty _08020264: .4byte gSaveBlock1 _08020268: .4byte 0x00003688 @@ -8792,7 +8792,7 @@ _08020370: _08020376: cmp r4, 0x19 bne _08020386 - ldr r0, _080203F0 @ =gUnknown_02024DEE + ldr r0, _080203F0 @ =gExpShareExp ldrh r1, [r0] mov r2, r8 ldr r0, [r2] @@ -8849,7 +8849,7 @@ _080203B8: b _0802040A .align 2, 0 _080203EC: .4byte gBattleMoveDamage -_080203F0: .4byte gUnknown_02024DEE +_080203F0: .4byte gExpShareExp _080203F4: .4byte gBattleTypeFlags _080203F8: .4byte 0x02000000 _080203FC: .4byte 0x00016018 @@ -8865,14 +8865,14 @@ _0802040A: ands r1, r0 cmp r1, 0 beq _08020488 - ldr r1, _08020448 @ =gUnknown_02024A6A + ldr r1, _08020448 @ =gBattlePartyID ldr r0, _0802044C @ =0x02000000 ldr r3, _08020450 @ =0x00016018 adds r2, r0, r3 ldrh r1, [r1, 0x4] adds r5, r0, 0 ldr r4, _08020454 @ =gBitTable - ldr r3, _08020458 @ =gUnknown_02024C0C + ldr r3, _08020458 @ =gAbsentBankFlags ldrb r2, [r2] cmp r1, r2 bne _08020460 @@ -8888,11 +8888,11 @@ _0802040A: _0802043C: .4byte 0x00000149 _08020440: .4byte gBattleMoveDamage _08020444: .4byte gBattleTypeFlags -_08020448: .4byte gUnknown_02024A6A +_08020448: .4byte gBattlePartyID _0802044C: .4byte 0x02000000 _08020450: .4byte 0x00016018 _08020454: .4byte gBitTable -_08020458: .4byte gUnknown_02024C0C +_08020458: .4byte gAbsentBankFlags _0802045C: .4byte 0x000160a2 _08020460: ldrb r2, [r3] @@ -8921,7 +8921,7 @@ _08020488: adds r0, r3 strb r1, [r0] _08020490: - ldr r1, _08020538 @ =gUnknown_030041C0 + ldr r1, _08020538 @ =gBattleTextBuff1 movs r3, 0 movs r2, 0xFD strb r2, [r1] @@ -8938,7 +8938,7 @@ _08020490: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08020540 @ =gUnknown_03004290 + ldr r1, _08020540 @ =gBattleTextBuff2 strb r2, [r1] strb r3, [r1, 0x1] strb r7, [r1, 0x2] @@ -8950,7 +8950,7 @@ _08020490: movs r0, 0x1 negs r0, r0 strb r0, [r1, 0x4] - ldr r1, _08020544 @ =gUnknown_030042B0 + ldr r1, _08020544 @ =gBattleTextBuff3 strb r2, [r1] movs r0, 0x1 strb r0, [r1, 0x1] @@ -8976,14 +8976,14 @@ _08020490: strb r0, [r1, 0x8] ldrb r1, [r6] movs r0, 0xD - bl b_std_message + bl PrepareStringBattle ldrb r1, [r4] movs r0, 0x64 muls r0, r1 ldr r1, _08020548 @ =gPlayerParty adds r0, r1 ldr r3, _0802054C @ =gBattleMons - ldr r1, _08020550 @ =gUnknown_02024C09 + ldr r1, _08020550 @ =gBank1 ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -9003,23 +9003,23 @@ _0802051E: .align 2, 0 _08020530: .4byte 0x02000000 _08020534: .4byte 0x000160a2 -_08020538: .4byte gUnknown_030041C0 +_08020538: .4byte gBattleTextBuff1 _0802053C: .4byte 0x00016018 -_08020540: .4byte gUnknown_03004290 -_08020544: .4byte gUnknown_030042B0 +_08020540: .4byte gBattleTextBuff2 +_08020544: .4byte gBattleTextBuff3 _08020548: .4byte gPlayerParty _0802054C: .4byte gBattleMons -_08020550: .4byte gUnknown_02024C09 +_08020550: .4byte gBank1 _08020554: .4byte 0x0001605f _08020558: .4byte 0x0001600f _0802055C: - ldr r0, _08020620 @ =gUnknown_02024A64 + ldr r0, _08020620 @ =gBattleExecBuffer ldr r2, [r0] cmp r2, 0 beq _08020566 b _08020996 _08020566: - ldr r1, _08020624 @ =gUnknown_02024260 + ldr r1, _08020624 @ =gBattleBufferB ldr r4, _08020628 @ =0x02000000 ldr r3, _0802062C @ =0x000160a2 adds r3, r4 @@ -9084,7 +9084,7 @@ _08020566: movs r1, 0x3F bl GetMonData strh r0, [r4, 0xA] - ldr r4, _0802063C @ =gUnknown_02024A60 + ldr r4, _0802063C @ =gActiveBank mov r2, r8 ldrb r0, [r2] strb r0, [r4] @@ -9092,9 +9092,9 @@ _08020566: ldr r0, _08020640 @ =gBattleMoveDamage ldrh r2, [r0] movs r0, 0 - bl dp01_build_cmdbuf_x19_a_bb + bl EmitExpBarUpdate ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08020612: ldr r1, _08020628 @ =0x02000000 ldr r3, _08020644 @ =0x0001600f @@ -9105,30 +9105,30 @@ _08020618: strb r0, [r1] b _08020996 .align 2, 0 -_08020620: .4byte gUnknown_02024A64 -_08020624: .4byte gUnknown_02024260 +_08020620: .4byte gBattleExecBuffer +_08020624: .4byte gBattleBufferB _08020628: .4byte 0x02000000 _0802062C: .4byte 0x000160a2 _08020630: .4byte 0x00016018 _08020634: .4byte gPlayerParty _08020638: .4byte 0x00017180 -_0802063C: .4byte gUnknown_02024A60 +_0802063C: .4byte gActiveBank _08020640: .4byte gBattleMoveDamage _08020644: .4byte 0x0001600f _08020648: - ldr r0, _080208AC @ =gUnknown_02024A64 + ldr r0, _080208AC @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _08020652 b _08020996 _08020652: - ldr r1, _080208B0 @ =gUnknown_02024A60 + ldr r1, _080208B0 @ =gActiveBank ldr r4, _080208B4 @ =0x02000000 ldr r2, _080208B8 @ =0x000160a2 adds r0, r4, r2 ldrb r0, [r0] strb r0, [r1] - ldr r2, _080208BC @ =gUnknown_02024260 + ldr r2, _080208BC @ =gBattleBufferB ldrb r3, [r1] lsls r1, r3, 9 adds r0, r1, r2 @@ -9150,7 +9150,7 @@ _0802067A: ands r0, r1 cmp r0, 0 beq _080206A8 - ldr r1, _080208C4 @ =gUnknown_02024A6A + ldr r1, _080208C4 @ =gBattlePartyID lsls r0, r3, 1 adds r2, r0, r1 ldr r0, _080208C8 @ =0x00016018 @@ -9167,12 +9167,12 @@ _0802067A: adds r1, r3, 0 bl sub_80324F8 _080206A8: - ldr r1, _080208D0 @ =gUnknown_030041C0 + ldr r1, _080208D0 @ =gBattleTextBuff1 movs r2, 0xFD strb r2, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r5, _080208B0 @ =gUnknown_02024A60 + ldr r5, _080208B0 @ =gActiveBank ldrb r0, [r5] strb r0, [r1, 0x2] ldr r0, _080208B4 @ =0x02000000 @@ -9182,7 +9182,7 @@ _080206A8: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r4, _080208D4 @ =gUnknown_03004290 + ldr r4, _080208D4 @ =gBattleTextBuff2 strb r2, [r4] movs r0, 0x1 strb r0, [r4, 0x1] @@ -9204,7 +9204,7 @@ _080206A8: negs r0, r0 strb r0, [r4, 0x5] bl b_movescr_stack_push_cursor - ldr r2, _080208D8 @ =gUnknown_03004324 + ldr r2, _080208D8 @ =gLeveledUpInBattle ldr r1, _080208DC @ =gBitTable ldrb r0, [r6] lsls r0, 2 @@ -9213,11 +9213,11 @@ _080206A8: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r1, _080208E0 @ =gUnknown_02024C10 - ldr r0, _080208E4 @ =gUnknown_081D8EF3 + ldr r1, _080208E0 @ =gBattlescriptCurrInstr + ldr r0, _080208E4 @ =BattleScript_LevelUp str r0, [r1] ldr r4, _080208E8 @ =gBattleMoveDamage - ldr r2, _080208BC @ =gUnknown_02024260 + ldr r2, _080208BC @ =gBattleBufferB ldrb r1, [r5] lsls r1, 9 adds r0, r2, 0x2 @@ -9236,7 +9236,7 @@ _080206A8: adds r0, r7 movs r1, 0 bl AdjustFriendship - ldr r0, _080208C4 @ =gUnknown_02024A6A + ldr r0, _080208C4 @ =gBattlePartyID ldrb r1, [r6] ldrh r0, [r0] cmp r0, r1 @@ -9318,7 +9318,7 @@ _080206A8: bl GetMonData strh r0, [r4, 0xA] _080207EC: - ldr r0, _080208C4 @ =gUnknown_02024A6A + ldr r0, _080208C4 @ =gBattlePartyID ldr r1, _080208B4 @ =0x02000000 ldr r3, _080208C8 @ =0x00016018 adds r7, r1, r3 @@ -9406,21 +9406,21 @@ _080207EC: strh r0, [r1] b _080208F6 .align 2, 0 -_080208AC: .4byte gUnknown_02024A64 -_080208B0: .4byte gUnknown_02024A60 +_080208AC: .4byte gBattleExecBuffer +_080208B0: .4byte gActiveBank _080208B4: .4byte 0x02000000 _080208B8: .4byte 0x000160a2 -_080208BC: .4byte gUnknown_02024260 +_080208BC: .4byte gBattleBufferB _080208C0: .4byte gBattleTypeFlags -_080208C4: .4byte gUnknown_02024A6A +_080208C4: .4byte gBattlePartyID _080208C8: .4byte 0x00016018 _080208CC: .4byte gPlayerParty -_080208D0: .4byte gUnknown_030041C0 -_080208D4: .4byte gUnknown_03004290 -_080208D8: .4byte gUnknown_03004324 +_080208D0: .4byte gBattleTextBuff1 +_080208D4: .4byte gBattleTextBuff2 +_080208D8: .4byte gLeveledUpInBattle _080208DC: .4byte gBitTable -_080208E0: .4byte gUnknown_02024C10 -_080208E4: .4byte gUnknown_081D8EF3 +_080208E0: .4byte gBattlescriptCurrInstr +_080208E4: .4byte BattleScript_LevelUp _080208E8: .4byte gBattleMoveDamage _080208EC: .4byte gBattleMons _080208F0: @@ -9482,12 +9482,12 @@ _0802095C: .align 2, 0 _08020968: .4byte 0x0001600f _0802096C: - ldr r0, _080209A4 @ =gUnknown_02024A64 + ldr r0, _080209A4 @ =gBattleExecBuffer ldr r5, [r0] cmp r5, 0 bne _08020996 ldr r4, _080209A8 @ =gBattleMons - ldr r2, _080209AC @ =gUnknown_02024C09 + ldr r2, _080209AC @ =gBank1 ldrb r0, [r2] movs r1, 0x58 muls r0, r1 @@ -9499,7 +9499,7 @@ _0802096C: adds r0, r4 adds r0, 0x20 strb r3, [r0] - ldr r1, _080209B0 @ =gUnknown_02024C10 + ldr r1, _080209B0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -9512,19 +9512,19 @@ _08020996: pop {r0} bx r0 .align 2, 0 -_080209A4: .4byte gUnknown_02024A64 +_080209A4: .4byte gBattleExecBuffer _080209A8: .4byte gBattleMons -_080209AC: .4byte gUnknown_02024C09 -_080209B0: .4byte gUnknown_02024C10 - thumb_func_end sub_8020004 +_080209AC: .4byte gBank1 +_080209B0: .4byte gBattlescriptCurrInstr + thumb_func_end atk23_getexp - thumb_func_start sub_80209B4 -sub_80209B4: @ 80209B4 + thumb_func_start atk24 +atk24: @ 80209B4 push {r4-r7,lr} mov r7, r8 push {r7} movs r6, 0 - ldr r0, _08020AF0 @ =gUnknown_02024A64 + ldr r0, _08020AF0 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _080209C6 @@ -9559,7 +9559,7 @@ _080209F8: ble _080209C8 cmp r6, 0 bne _08020A0C - ldr r0, _08020AF8 @ =gUnknown_02024D26 + ldr r0, _08020AF8 @ =gBattleOutcome ldrb r1, [r0] movs r2, 0x2 orrs r1, r2 @@ -9593,7 +9593,7 @@ _08020A40: adds r5, 0x1 cmp r5, 0x5 ble _08020A10 - ldr r2, _08020AF8 @ =gUnknown_02024D26 + ldr r2, _08020AF8 @ =gBattleOutcome cmp r6, 0 bne _08020A54 ldrb r0, [r2] @@ -9613,18 +9613,18 @@ _08020A54: beq _08020B3E movs r2, 0 movs r5, 0 - ldr r0, _08020B04 @ =gUnknown_02024A68 + ldr r0, _08020B04 @ =gNoOfAllBanks ldrb r3, [r0] mov r12, r0 - ldr r7, _08020B08 @ =gUnknown_02024C10 + ldr r7, _08020B08 @ =gBattlescriptCurrInstr cmp r2, r3 bge _08020AA0 - ldr r0, _08020B0C @ =gUnknown_02024C6C + ldr r0, _08020B0C @ =gHitMarker movs r1, 0x80 lsls r1, 21 ldr r6, [r0] adds r4, r3, 0 - ldr r3, _08020B10 @ =gUnknown_02024D68 + ldr r3, _08020B10 @ =gSpecialStatuses _08020A84: adds r0, r1, 0 lsls r0, r5 @@ -9648,12 +9648,12 @@ _08020AA0: ldrb r3, [r0] cmp r5, r3 bge _08020ADA - ldr r0, _08020B0C @ =gUnknown_02024C6C + ldr r0, _08020B0C @ =gHitMarker movs r1, 0x80 lsls r1, 21 mov r12, r1 ldr r1, [r0] - ldr r0, _08020B10 @ =gUnknown_02024D68 + ldr r0, _08020B10 @ =gSpecialStatuses adds r6, r3, 0 adds r3, r0, 0 adds r3, 0x14 @@ -9685,15 +9685,15 @@ _08020ADA: bgt _08020B1C b _08020B36 .align 2, 0 -_08020AF0: .4byte gUnknown_02024A64 +_08020AF0: .4byte gBattleExecBuffer _08020AF4: .4byte gPlayerParty -_08020AF8: .4byte gUnknown_02024D26 +_08020AF8: .4byte gBattleOutcome _08020AFC: .4byte gEnemyParty _08020B00: .4byte gBattleTypeFlags -_08020B04: .4byte gUnknown_02024A68 -_08020B08: .4byte gUnknown_02024C10 -_08020B0C: .4byte gUnknown_02024C6C -_08020B10: .4byte gUnknown_02024D68 +_08020B04: .4byte gNoOfAllBanks +_08020B08: .4byte gBattlescriptCurrInstr +_08020B0C: .4byte gHitMarker +_08020B10: .4byte gSpecialStatuses _08020B14: cmp r4, 0 beq _08020B36 @@ -9719,7 +9719,7 @@ _08020B36: str r0, [r7] b _08020B46 _08020B3E: - ldr r1, _08020B50 @ =gUnknown_02024C10 + ldr r1, _08020B50 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -9730,8 +9730,8 @@ _08020B46: pop {r0} bx r0 .align 2, 0 -_08020B50: .4byte gUnknown_02024C10 - thumb_func_end sub_80209B4 +_08020B50: .4byte gBattlescriptCurrInstr + thumb_func_end atk24 thumb_func_start sub_8020B54 sub_8020B54: @ 8020B54 @@ -9746,10 +9746,10 @@ sub_8020B54: @ 8020B54 strb r1, [r0] ldr r0, _08020B8C @ =gCritMultiplier strb r1, [r0] - ldr r0, _08020B90 @ =gUnknown_02024D1E + ldr r0, _08020B90 @ =gBattleCommunication strb r2, [r0, 0x3] strb r2, [r0, 0x6] - ldr r2, _08020B94 @ =gUnknown_02024C6C + ldr r2, _08020B94 @ =gHitMarker ldr r0, [r2] subs r1, 0x42 ands r0, r1 @@ -9762,29 +9762,29 @@ _08020B80: .4byte gBattleMoveFlags _08020B84: .4byte 0x02000000 _08020B88: .4byte 0x0001601f _08020B8C: .4byte gCritMultiplier -_08020B90: .4byte gUnknown_02024D1E -_08020B94: .4byte gUnknown_02024C6C +_08020B90: .4byte gBattleCommunication +_08020B94: .4byte gHitMarker _08020B98: .4byte 0xffffbfff thumb_func_end sub_8020B54 - thumb_func_start atk25_resetflags -atk25_resetflags: @ 8020B9C + thumb_func_start atk25_move_values_cleanup +atk25_move_values_cleanup: @ 8020B9C push {lr} bl sub_8020B54 - ldr r1, _08020BB0 @ =gUnknown_02024C10 + ldr r1, _08020BB0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08020BB0: .4byte gUnknown_02024C10 - thumb_func_end atk25_resetflags +_08020BB0: .4byte gBattlescriptCurrInstr + thumb_func_end atk25_move_values_cleanup - thumb_func_start sub_8020BB4 -sub_8020BB4: @ 8020BB4 - ldr r3, _08020BC4 @ =gUnknown_02024C0E - ldr r2, _08020BC8 @ =gUnknown_02024C10 + thumb_func_start atk26_set_multihit +atk26_set_multihit: @ 8020BB4 + ldr r3, _08020BC4 @ =gMultiHitCounter + ldr r2, _08020BC8 @ =gBattlescriptCurrInstr ldr r0, [r2] ldrb r1, [r0, 0x1] strb r1, [r3] @@ -9792,30 +9792,30 @@ sub_8020BB4: @ 8020BB4 str r0, [r2] bx lr .align 2, 0 -_08020BC4: .4byte gUnknown_02024C0E -_08020BC8: .4byte gUnknown_02024C10 - thumb_func_end sub_8020BB4 +_08020BC4: .4byte gMultiHitCounter +_08020BC8: .4byte gBattlescriptCurrInstr + thumb_func_end atk26_set_multihit - thumb_func_start atk27_cmd27 -atk27_cmd27: @ 8020BCC + thumb_func_start atk27_decrement_multihit +atk27_decrement_multihit: @ 8020BCC push {lr} - ldr r1, _08020BE8 @ =gUnknown_02024C0E + ldr r1, _08020BE8 @ =gMultiHitCounter ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] lsls r0, 24 cmp r0, 0 bne _08020BF0 - ldr r1, _08020BEC @ =gUnknown_02024C10 + ldr r1, _08020BEC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08020C0A .align 2, 0 -_08020BE8: .4byte gUnknown_02024C0E -_08020BEC: .4byte gUnknown_02024C10 +_08020BE8: .4byte gMultiHitCounter +_08020BEC: .4byte gBattlescriptCurrInstr _08020BF0: - ldr r3, _08020C10 @ =gUnknown_02024C10 + ldr r3, _08020C10 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9832,12 +9832,12 @@ _08020C0A: pop {r0} bx r0 .align 2, 0 -_08020C10: .4byte gUnknown_02024C10 - thumb_func_end atk27_cmd27 +_08020C10: .4byte gBattlescriptCurrInstr + thumb_func_end atk27_decrement_multihit - thumb_func_start sub_8020C14 -sub_8020C14: @ 8020C14 - ldr r3, _08020C30 @ =gUnknown_02024C10 + thumb_func_start atk28_goto +atk28_goto: @ 8020C14 + ldr r3, _08020C30 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9852,13 +9852,13 @@ sub_8020C14: @ 8020C14 str r1, [r3] bx lr .align 2, 0 -_08020C30: .4byte gUnknown_02024C10 - thumb_func_end sub_8020C14 +_08020C30: .4byte gBattlescriptCurrInstr + thumb_func_end atk28_goto thumb_func_start atk29_jumpifbyte atk29_jumpifbyte: @ 8020C34 push {r4-r6,lr} - ldr r3, _08020C78 @ =gUnknown_02024C10 + ldr r3, _08020C78 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -9892,7 +9892,7 @@ atk29_jumpifbyte: @ 8020C34 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08020C78: .4byte gUnknown_02024C10 +_08020C78: .4byte gBattlescriptCurrInstr _08020C7C: .4byte _08020C80 .align 2, 0 _08020C80: @@ -9941,10 +9941,10 @@ _08020CCC: bx r0 thumb_func_end atk29_jumpifbyte - thumb_func_start sub_8020CD4 -sub_8020CD4: @ 8020CD4 + thumb_func_start atk2A_jumpifhalfword +atk2A_jumpifhalfword: @ 8020CD4 push {r4-r6,lr} - ldr r3, _08020D20 @ =gUnknown_02024C10 + ldr r3, _08020D20 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -9981,7 +9981,7 @@ sub_8020CD4: @ 8020CD4 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08020D20: .4byte gUnknown_02024C10 +_08020D20: .4byte gBattlescriptCurrInstr _08020D24: .4byte _08020D28 .align 2, 0 _08020D28: @@ -10028,12 +10028,12 @@ _08020D74: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8020CD4 + thumb_func_end atk2A_jumpifhalfword - thumb_func_start sub_8020D7C -sub_8020D7C: @ 8020D7C + thumb_func_start atk2B_jumpifword +atk2B_jumpifword: @ 8020D7C push {r4-r6,lr} - ldr r3, _08020DD4 @ =gUnknown_02024C10 + ldr r3, _08020DD4 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -10076,7 +10076,7 @@ sub_8020D7C: @ 8020D7C ldr r0, [r0] mov pc, r0 .align 2, 0 -_08020DD4: .4byte gUnknown_02024C10 +_08020DD4: .4byte gBattlescriptCurrInstr _08020DD8: .4byte _08020DDC .align 2, 0 _08020DDC: @@ -10123,12 +10123,12 @@ _08020E28: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_8020D7C + thumb_func_end atk2B_jumpifword - thumb_func_start sub_8020E30 -sub_8020E30: @ 8020E30 + thumb_func_start atk2C_jumpifarrayequal +atk2C_jumpifarrayequal: @ 8020E30 push {r4-r7,lr} - ldr r2, _08020E88 @ =gUnknown_02024C10 + ldr r2, _08020E88 @ =gBattlescriptCurrInstr ldr r3, [r2] ldrb r1, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -10172,7 +10172,7 @@ sub_8020E30: @ 8020E30 adds r0, r3, 0 b _08020EA4 .align 2, 0 -_08020E88: .4byte gUnknown_02024C10 +_08020E88: .4byte gBattlescriptCurrInstr _08020E8C: adds r5, 0x1 adds r4, 0x1 @@ -10198,13 +10198,13 @@ _08020EB0: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8020E30 + thumb_func_end atk2C_jumpifarrayequal - thumb_func_start sub_8020EB8 -sub_8020EB8: @ 8020EB8 + thumb_func_start atk2D_jumpifarraynotequal +atk2D_jumpifarraynotequal: @ 8020EB8 push {r4-r7,lr} movs r7, 0 - ldr r3, _08020F2C @ =gUnknown_02024C10 + ldr r3, _08020F2C @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -10263,7 +10263,7 @@ _08020F22: mov r0, r12 b _08020F34 .align 2, 0 -_08020F2C: .4byte gUnknown_02024C10 +_08020F2C: .4byte gBattlescriptCurrInstr _08020F30: ldr r0, [r3] adds r0, 0xE @@ -10272,11 +10272,11 @@ _08020F34: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8020EB8 + thumb_func_end atk2D_jumpifarraynotequal - thumb_func_start sub_8020F3C -sub_8020F3C: @ 8020F3C - ldr r3, _08020F60 @ =gUnknown_02024C10 + thumb_func_start atk2E_setbyte +atk2E_setbyte: @ 8020F3C + ldr r3, _08020F60 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10295,12 +10295,12 @@ sub_8020F3C: @ 8020F3C str r0, [r3] bx lr .align 2, 0 -_08020F60: .4byte gUnknown_02024C10 - thumb_func_end sub_8020F3C +_08020F60: .4byte gBattlescriptCurrInstr + thumb_func_end atk2E_setbyte - thumb_func_start sub_8020F64 -sub_8020F64: @ 8020F64 - ldr r3, _08020F8C @ =gUnknown_02024C10 + thumb_func_start atk2F_addbyte +atk2F_addbyte: @ 8020F64 + ldr r3, _08020F8C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10321,12 +10321,12 @@ sub_8020F64: @ 8020F64 str r0, [r3] bx lr .align 2, 0 -_08020F8C: .4byte gUnknown_02024C10 - thumb_func_end sub_8020F64 +_08020F8C: .4byte gBattlescriptCurrInstr + thumb_func_end atk2F_addbyte - thumb_func_start sub_8020F90 -sub_8020F90: @ 8020F90 - ldr r3, _08020FB8 @ =gUnknown_02024C10 + thumb_func_start atk30_subbyte +atk30_subbyte: @ 8020F90 + ldr r3, _08020FB8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10347,13 +10347,13 @@ sub_8020F90: @ 8020F90 str r0, [r3] bx lr .align 2, 0 -_08020FB8: .4byte gUnknown_02024C10 - thumb_func_end sub_8020F90 +_08020FB8: .4byte gBattlescriptCurrInstr + thumb_func_end atk30_subbyte thumb_func_start atk31_copyarray atk31_copyarray: @ 8020FBC push {r4-r6,lr} - ldr r3, _0802100C @ =gUnknown_02024C10 + ldr r3, _0802100C @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -10395,13 +10395,13 @@ _08021000: pop {r0} bx r0 .align 2, 0 -_0802100C: .4byte gUnknown_02024C10 +_0802100C: .4byte gBattlescriptCurrInstr thumb_func_end atk31_copyarray - thumb_func_start atk32_memcpy_with_offset -atk32_memcpy_with_offset: @ 8021010 + thumb_func_start atk32_copyarray_withindex +atk32_copyarray_withindex: @ 8021010 push {r4-r7,lr} - ldr r3, _08021078 @ =gUnknown_02024C10 + ldr r3, _08021078 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -10455,12 +10455,12 @@ _0802106C: pop {r0} bx r0 .align 2, 0 -_08021078: .4byte gUnknown_02024C10 - thumb_func_end atk32_memcpy_with_offset +_08021078: .4byte gBattlescriptCurrInstr + thumb_func_end atk32_copyarray_withindex - thumb_func_start sub_802107C -sub_802107C: @ 802107C - ldr r3, _080210A4 @ =gUnknown_02024C10 + thumb_func_start atk33_orbyte +atk33_orbyte: @ 802107C + ldr r3, _080210A4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10481,13 +10481,13 @@ sub_802107C: @ 802107C str r0, [r3] bx lr .align 2, 0 -_080210A4: .4byte gUnknown_02024C10 - thumb_func_end sub_802107C +_080210A4: .4byte gBattlescriptCurrInstr + thumb_func_end atk33_orbyte thumb_func_start atk34_orhalfword atk34_orhalfword: @ 80210A8 push {r4,lr} - ldr r4, _080210DC @ =gUnknown_02024C10 + ldr r4, _080210DC @ =gBattlescriptCurrInstr ldr r3, [r4] ldrb r2, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -10513,13 +10513,13 @@ atk34_orhalfword: @ 80210A8 pop {r0} bx r0 .align 2, 0 -_080210DC: .4byte gUnknown_02024C10 +_080210DC: .4byte gBattlescriptCurrInstr thumb_func_end atk34_orhalfword thumb_func_start atk35_orword atk35_orword: @ 80210E0 push {r4,lr} - ldr r4, _08021120 @ =gUnknown_02024C10 + ldr r4, _08021120 @ =gBattlescriptCurrInstr ldr r2, [r4] ldrb r3, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10551,12 +10551,12 @@ atk35_orword: @ 80210E0 pop {r0} bx r0 .align 2, 0 -_08021120: .4byte gUnknown_02024C10 +_08021120: .4byte gBattlescriptCurrInstr thumb_func_end atk35_orword - thumb_func_start sub_8021124 -sub_8021124: @ 8021124 - ldr r3, _0802114C @ =gUnknown_02024C10 + thumb_func_start atk36_bicbyte +atk36_bicbyte: @ 8021124 + ldr r3, _0802114C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10577,13 +10577,13 @@ sub_8021124: @ 8021124 str r0, [r3] bx lr .align 2, 0 -_0802114C: .4byte gUnknown_02024C10 - thumb_func_end sub_8021124 +_0802114C: .4byte gBattlescriptCurrInstr + thumb_func_end atk36_bicbyte thumb_func_start atk37_bichalfword atk37_bichalfword: @ 8021150 push {r4,lr} - ldr r4, _08021184 @ =gUnknown_02024C10 + ldr r4, _08021184 @ =gBattlescriptCurrInstr ldr r3, [r4] ldrb r1, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -10609,13 +10609,13 @@ atk37_bichalfword: @ 8021150 pop {r0} bx r0 .align 2, 0 -_08021184: .4byte gUnknown_02024C10 +_08021184: .4byte gBattlescriptCurrInstr thumb_func_end atk37_bichalfword thumb_func_start atk38_bicword atk38_bicword: @ 8021188 push {r4,lr} - ldr r4, _080211C8 @ =gUnknown_02024C10 + ldr r4, _080211C8 @ =gBattlescriptCurrInstr ldr r2, [r4] ldrb r3, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10647,23 +10647,23 @@ atk38_bicword: @ 8021188 pop {r0} bx r0 .align 2, 0 -_080211C8: .4byte gUnknown_02024C10 +_080211C8: .4byte gBattlescriptCurrInstr thumb_func_end atk38_bicword thumb_func_start atk39_pause atk39_pause: @ 80211CC push {r4,r5,lr} - ldr r0, _08021200 @ =gUnknown_02024A64 + ldr r0, _08021200 @ =gBattleExecBuffer ldr r4, [r0] cmp r4, 0 bne _080211F8 - ldr r5, _08021204 @ =gUnknown_02024C10 + ldr r5, _08021204 @ =gBattlescriptCurrInstr ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 orrs r1, r0 - ldr r3, _08021208 @ =gUnknown_02024D18 + ldr r3, _08021208 @ =gPauseCounterBattle ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] @@ -10679,19 +10679,19 @@ _080211F8: pop {r0} bx r0 .align 2, 0 -_08021200: .4byte gUnknown_02024A64 -_08021204: .4byte gUnknown_02024C10 -_08021208: .4byte gUnknown_02024D18 +_08021200: .4byte gBattleExecBuffer +_08021204: .4byte gBattlescriptCurrInstr +_08021208: .4byte gPauseCounterBattle thumb_func_end atk39_pause - thumb_func_start sub_802120C -sub_802120C: @ 802120C + thumb_func_start atk3A_waitstate +atk3A_waitstate: @ 802120C push {lr} - ldr r0, _08021224 @ =gUnknown_02024A64 + ldr r0, _08021224 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0802121E - ldr r1, _08021228 @ =gUnknown_02024C10 + ldr r1, _08021228 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -10699,50 +10699,50 @@ _0802121E: pop {r0} bx r0 .align 2, 0 -_08021224: .4byte gUnknown_02024A64 -_08021228: .4byte gUnknown_02024C10 - thumb_func_end sub_802120C +_08021224: .4byte gBattleExecBuffer +_08021228: .4byte gBattlescriptCurrInstr + thumb_func_end atk3A_waitstate - thumb_func_start atk3B_8022C68 -atk3B_8022C68: @ 802122C + thumb_func_start atk3B_healthbar_update +atk3B_healthbar_update: @ 802122C push {lr} - ldr r0, _08021240 @ =gUnknown_02024C10 + ldr r0, _08021240 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 bne _0802124C - ldr r0, _08021244 @ =gUnknown_02024A60 - ldr r1, _08021248 @ =gEnemyMonIndex + ldr r0, _08021244 @ =gActiveBank + ldr r1, _08021248 @ =gBankTarget b _08021250 .align 2, 0 -_08021240: .4byte gUnknown_02024C10 -_08021244: .4byte gUnknown_02024A60 -_08021248: .4byte gEnemyMonIndex +_08021240: .4byte gBattlescriptCurrInstr +_08021244: .4byte gActiveBank +_08021248: .4byte gBankTarget _0802124C: - ldr r0, _08021274 @ =gUnknown_02024A60 - ldr r1, _08021278 @ =gPlayerMonIndex + ldr r0, _08021274 @ =gActiveBank + ldr r1, _08021278 @ =gBankAttacker _08021250: ldrb r1, [r1] strb r1, [r0] ldr r0, _0802127C @ =gBattleMoveDamage ldrh r1, [r0] movs r0, 0 - bl dp01_build_cmdbuf_x18_0_aa_health_bar_update - ldr r0, _08021274 @ =gUnknown_02024A60 + bl EmitHealthBarUpdate + ldr r0, _08021274 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08021280 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _08021280 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08021274: .4byte gUnknown_02024A60 -_08021278: .4byte gPlayerMonIndex +_08021274: .4byte gActiveBank +_08021278: .4byte gBankAttacker _0802127C: .4byte gBattleMoveDamage -_08021280: .4byte gUnknown_02024C10 - thumb_func_end atk3B_8022C68 +_08021280: .4byte gBattlescriptCurrInstr + thumb_func_end atk3B_healthbar_update thumb_func_start atk3C_return atk3C_return: @ 8021284 @@ -10752,36 +10752,36 @@ atk3C_return: @ 8021284 bx r0 thumb_func_end atk3C_return - thumb_func_start sub_8021290 -sub_8021290: @ 8021290 + thumb_func_start atk3D_end +atk3D_end: @ 8021290 ldr r0, _080212A4 @ =gBattleMoveFlags movs r1, 0 strb r1, [r0] - ldr r0, _080212A8 @ =gUnknown_02024A60 + ldr r0, _080212A8 @ =gActiveBank strb r1, [r0] - ldr r1, _080212AC @ =gUnknown_02024A7F + ldr r1, _080212AC @ =gFightStateTracker movs r0, 0xB strb r0, [r1] bx lr .align 2, 0 _080212A4: .4byte gBattleMoveFlags -_080212A8: .4byte gUnknown_02024A60 -_080212AC: .4byte gUnknown_02024A7F - thumb_func_end sub_8021290 +_080212A8: .4byte gActiveBank +_080212AC: .4byte gFightStateTracker + thumb_func_end atk3D_end - thumb_func_start sub_80212B0 -sub_80212B0: @ 80212B0 - ldr r1, _080212C0 @ =gUnknown_02024A60 + thumb_func_start atk3E_end2 +atk3E_end2: @ 80212B0 + ldr r1, _080212C0 @ =gActiveBank movs r0, 0 strb r0, [r1] - ldr r1, _080212C4 @ =gUnknown_02024A7F + ldr r1, _080212C4 @ =gFightStateTracker movs r0, 0xB strb r0, [r1] bx lr .align 2, 0 -_080212C0: .4byte gUnknown_02024A60 -_080212C4: .4byte gUnknown_02024A7F - thumb_func_end sub_80212B0 +_080212C0: .4byte gActiveBank +_080212C4: .4byte gFightStateTracker + thumb_func_end atk3E_end2 thumb_func_start atk3F_end3 atk3F_end3: @ 80212C8 @@ -10796,7 +10796,7 @@ atk3F_end3: @ 80212C8 subs r0, 0x1 strb r0, [r1] _080212DE: - ldr r0, _080212F4 @ =gUnknown_030042D4 + ldr r0, _080212F4 @ =gBattleMainFunc ldrb r1, [r1] lsls r1, 2 adds r1, r2 @@ -10806,13 +10806,13 @@ _080212DE: bx r0 .align 2, 0 _080212F0: .4byte 0x02017140 -_080212F4: .4byte gUnknown_030042D4 +_080212F4: .4byte gBattleMainFunc thumb_func_end atk3F_end3 thumb_func_start atk41_call atk41_call: @ 80212F8 push {r4,lr} - ldr r4, _08021324 @ =gUnknown_02024C10 + ldr r4, _08021324 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x5 bl b_movescr_stack_push @@ -10832,13 +10832,13 @@ atk41_call: @ 80212F8 pop {r0} bx r0 .align 2, 0 -_08021324: .4byte gUnknown_02024C10 +_08021324: .4byte gBattlescriptCurrInstr thumb_func_end atk41_call thumb_func_start atk42_jumpiftype2 atk42_jumpiftype2: @ 8021328 push {r4,lr} - ldr r4, _08021370 @ =gUnknown_02024C10 + ldr r4, _08021370 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 @@ -10873,7 +10873,7 @@ _08021356: str r1, [r4] b _0802137C .align 2, 0 -_08021370: .4byte gUnknown_02024C10 +_08021370: .4byte gBattlescriptCurrInstr _08021374: .4byte gBattleMons _08021378: adds r0, r3, 0x7 @@ -10884,11 +10884,11 @@ _0802137C: bx r0 thumb_func_end atk42_jumpiftype2 - thumb_func_start sub_8021384 -sub_8021384: @ 8021384 + thumb_func_start atk43_jumpifabilitypresent +atk43_jumpifabilitypresent: @ 8021384 push {r4,lr} sub sp, 0x4 - ldr r4, _080213BC @ =gUnknown_02024C10 + ldr r4, _080213BC @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r2, [r0, 0x1] movs r0, 0 @@ -10896,7 +10896,7 @@ sub_8021384: @ 8021384 movs r0, 0x13 movs r1, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080213C0 @@ -10914,7 +10914,7 @@ sub_8021384: @ 8021384 str r1, [r4] b _080213C6 .align 2, 0 -_080213BC: .4byte gUnknown_02024C10 +_080213BC: .4byte gBattlescriptCurrInstr _080213C0: ldr r0, [r4] adds r0, 0x6 @@ -10924,12 +10924,12 @@ _080213C6: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8021384 + thumb_func_end atk43_jumpifabilitypresent - thumb_func_start sub_80213D0 -sub_80213D0: @ 80213D0 + thumb_func_start atk44 +atk44: @ 80213D0 ldr r1, _080213E4 @ =0x02000000 - ldr r0, _080213E8 @ =gPlayerMonIndex + ldr r0, _080213E8 @ =gBankAttacker ldrb r0, [r0] ldr r2, _080213EC @ =0x00016060 adds r0, r2 @@ -10939,18 +10939,18 @@ sub_80213D0: @ 80213D0 bx lr .align 2, 0 _080213E4: .4byte 0x02000000 -_080213E8: .4byte gPlayerMonIndex +_080213E8: .4byte gBankAttacker _080213EC: .4byte 0x00016060 - thumb_func_end sub_80213D0 + thumb_func_end atk44 - thumb_func_start atk46_cmd46 -atk46_cmd46: @ 80213F0 + thumb_func_start atk45_playanimation +atk45_playanimation: @ 80213F0 push {r4-r6,lr} - ldr r5, _08021444 @ =gUnknown_02024C10 + ldr r5, _08021444 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r6, _08021448 @ =gUnknown_02024A60 + ldr r6, _08021448 @ =gActiveBank strb r0, [r6] ldr r2, [r5] ldrb r1, [r2, 0x3] @@ -10972,24 +10972,24 @@ atk46_cmd46: @ 80213F0 cmp r0, 0x2 bne _0802144C _08021426: - ldr r4, _08021444 @ =gUnknown_02024C10 + ldr r4, _08021444 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x2] ldrh r2, [r3] movs r0, 0 - bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim - ldr r0, _08021448 @ =gUnknown_02024A60 + bl EmitBattleAnimation + ldr r0, _08021448 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r4] adds r0, 0x7 str r0, [r4] b _080214AE .align 2, 0 -_08021444: .4byte gUnknown_02024C10 -_08021448: .4byte gUnknown_02024A60 +_08021444: .4byte gBattlescriptCurrInstr +_08021448: .4byte gActiveBank _0802144C: - ldr r0, _08021464 @ =gUnknown_02024C6C + ldr r0, _08021464 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -10997,11 +10997,11 @@ _0802144C: beq _0802146C adds r0, r2, 0x7 bl b_movescr_stack_push - ldr r0, _08021468 @ =gUnknown_081D8EEF + ldr r0, _08021468 @ =BattleScript_Pausex20 b _080214AC .align 2, 0 -_08021464: .4byte gUnknown_02024C6C -_08021468: .4byte gUnknown_081D8EEF +_08021464: .4byte gHitMarker +_08021468: .4byte BattleScript_Pausex20 _0802146C: adds r0, r4, 0 subs r0, 0xA @@ -11009,7 +11009,7 @@ _0802146C: lsrs r0, 24 cmp r0, 0x3 bls _08021498 - ldr r1, _08021490 @ =gUnknown_02024C98 + ldr r1, _08021490 @ =gStatuses3 ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -11021,15 +11021,15 @@ _0802146C: adds r0, r2, 0x7 b _080214AC .align 2, 0 -_08021490: .4byte gUnknown_02024C98 +_08021490: .4byte gStatuses3 _08021494: .4byte 0x000400c0 _08021498: ldrb r1, [r2, 0x2] ldrh r2, [r3] movs r0, 0 - bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim + bl EmitBattleAnimation ldrb r0, [r6] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r5] adds r0, 0x7 _080214AC: @@ -11038,16 +11038,16 @@ _080214AE: pop {r4-r6} pop {r0} bx r0 - thumb_func_end atk46_cmd46 + thumb_func_end atk45_playanimation - thumb_func_start sub_80214B4 -sub_80214B4: @ 80214B4 + thumb_func_start atk46_playanimation2 +atk46_playanimation2: @ 80214B4 push {r4-r7,lr} - ldr r6, _0802151C @ =gUnknown_02024C10 + ldr r6, _0802151C @ =gBattlescriptCurrInstr ldr r0, [r6] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r7, _08021520 @ =gUnknown_02024A60 + ldr r7, _08021520 @ =gActiveBank strb r0, [r7] ldr r2, [r6] ldrb r1, [r2, 0x2] @@ -11082,20 +11082,20 @@ _080214FE: ldrb r1, [r3] ldrh r2, [r4] movs r0, 0 - bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim - ldr r0, _08021520 @ =gUnknown_02024A60 + bl EmitBattleAnimation + ldr r0, _08021520 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0802151C @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _0802151C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] b _0802157A .align 2, 0 -_0802151C: .4byte gUnknown_02024C10 -_08021520: .4byte gUnknown_02024A60 +_0802151C: .4byte gBattlescriptCurrInstr +_08021520: .4byte gActiveBank _08021524: - ldr r0, _08021534 @ =gUnknown_02024C6C + ldr r0, _08021534 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -11104,7 +11104,7 @@ _08021524: adds r0, r2, 0 b _08021576 .align 2, 0 -_08021534: .4byte gUnknown_02024C6C +_08021534: .4byte gHitMarker _08021538: adds r0, r5, 0 subs r0, 0xA @@ -11112,7 +11112,7 @@ _08021538: lsrs r0, 24 cmp r0, 0x3 bls _08021564 - ldr r1, _0802155C @ =gUnknown_02024C98 + ldr r1, _0802155C @ =gStatuses3 ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -11124,15 +11124,15 @@ _08021538: adds r0, r2, 0 b _08021576 .align 2, 0 -_0802155C: .4byte gUnknown_02024C98 +_0802155C: .4byte gStatuses3 _08021560: .4byte 0x000400c0 _08021564: ldrb r1, [r3] ldrh r2, [r4] movs r0, 0 - bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim + bl EmitBattleAnimation ldrb r0, [r7] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r6] _08021576: adds r0, 0xA @@ -11141,10 +11141,10 @@ _0802157A: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_80214B4 + thumb_func_end atk46_playanimation2 - thumb_func_start atk47 -atk47: @ 8021580 + thumb_func_start atk47_setgraphicalstatchangevalues_setgraphicalstatchangevalues_setgraphicalstatchangevalues +atk47_setgraphicalstatchangevalues_setgraphicalstatchangevalues_setgraphicalstatchangevalues: @ 8021580 push {r4,lr} movs r3, 0 ldr r0, _080215A0 @ =0x02000000 @@ -11196,7 +11196,7 @@ _080215C0: ldr r1, _080215F4 @ =0x000160a5 adds r0, r4, r1 strb r2, [r0] - ldr r1, _080215F8 @ =gUnknown_02024C10 + ldr r1, _080215F8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -11207,8 +11207,8 @@ _080215C0: _080215EC: .4byte 0x0001601e _080215F0: .4byte 0x000160a4 _080215F4: .4byte 0x000160a5 -_080215F8: .4byte gUnknown_02024C10 - thumb_func_end atk47 +_080215F8: .4byte gBattlescriptCurrInstr + thumb_func_end atk47_setgraphicalstatchangevalues_setgraphicalstatchangevalues_setgraphicalstatchangevalues thumb_func_start atk48_playstatchangeanimation atk48_playstatchangeanimation: @ 80215FC @@ -11222,12 +11222,12 @@ atk48_playstatchangeanimation: @ 80215FC movs r0, 0 mov r8, r0 movs r3, 0 - ldr r5, _08021670 @ =gUnknown_02024C10 + ldr r5, _08021670 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] str r3, [sp] bl sub_8015150 - ldr r2, _08021674 @ =gUnknown_02024A60 + ldr r2, _08021674 @ =gActiveBank strb r0, [r2] ldr r0, [r5] ldrb r4, [r0, 0x2] @@ -11257,34 +11257,34 @@ _0802164A: ands r0, r1 cmp r0, 0 beq _080216D6 - ldr r0, _08021670 @ =gUnknown_02024C10 + ldr r0, _08021670 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _0802167C - ldr r0, _08021674 @ =gUnknown_02024A60 + ldr r0, _08021674 @ =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 adds r0, r7, r0 b _080216C4 .align 2, 0 -_08021670: .4byte gUnknown_02024C10 -_08021674: .4byte gUnknown_02024A60 +_08021670: .4byte gBattlescriptCurrInstr +_08021674: .4byte gActiveBank _08021678: .4byte gUnknown_02024A98 _0802167C: - ldr r6, _08021700 @ =gUnknown_02024A60 + ldr r6, _08021700 @ =gActiveBank ldrb r0, [r6] str r3, [sp] - bl battle_get_per_side_status + bl GetBankIdentity mov r1, r10 ands r1, r0 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _08021704 @ =gUnknown_02024C80 + ldr r1, _08021704 @ =gSideTimer adds r0, r1 ldrb r0, [r0, 0x2] ldr r3, [sp] @@ -11331,7 +11331,7 @@ _080216D6: cmp r4, 0 bne _0802164A _080216E4: - ldr r0, _0802170C @ =gUnknown_02024C10 + ldr r0, _0802170C @ =gBattlescriptCurrInstr mov r9, r0 cmp r3, 0x1 ble _08021772 @@ -11346,10 +11346,10 @@ _080216E4: movs r0, 0x3A b _08021770 .align 2, 0 -_08021700: .4byte gUnknown_02024A60 -_08021704: .4byte gUnknown_02024C80 +_08021700: .4byte gActiveBank +_08021704: .4byte gSideTimer _08021708: .4byte gBattleMons -_0802170C: .4byte gUnknown_02024C10 +_0802170C: .4byte gBattlescriptCurrInstr _08021710: movs r0, 0x2 ands r0, r1 @@ -11433,11 +11433,11 @@ _08021790: movs r1, 0x1 mov r2, r8 str r3, [sp] - bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim - ldr r0, _080217D8 @ =gUnknown_02024A60 + bl EmitBattleAnimation + ldr r0, _080217D8 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution - ldr r0, _080217DC @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r0, _080217DC @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x4 @@ -11450,13 +11450,13 @@ _08021790: movs r0, 0x1 strb r0, [r4] _080217CC: - ldr r1, _080217DC @ =gUnknown_02024C10 + ldr r1, _080217DC @ =gBattlescriptCurrInstr b _080217E2 .align 2, 0 _080217D0: .4byte 0x02000000 _080217D4: .4byte 0x000160dc -_080217D8: .4byte gUnknown_02024A60 -_080217DC: .4byte gUnknown_02024C10 +_080217D8: .4byte gActiveBank +_080217DC: .4byte gBattlescriptCurrInstr _080217E0: mov r1, r9 _080217E2: @@ -11484,14 +11484,14 @@ sub_80217F8: @ 80217F8 sub sp, 0x18 movs r0, 0 mov r10, r0 - ldr r0, _08021834 @ =gUnknown_02024C10 + ldr r0, _08021834 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x1] str r1, [sp, 0x10] ldrb r0, [r0, 0x2] str r0, [sp, 0x14] ldr r1, _08021838 @ =gBattleMons - ldr r0, _0802183C @ =gPlayerMonIndex + ldr r0, _0802183C @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -11507,9 +11507,9 @@ sub_80217F8: @ 80217F8 ldrb r0, [r0, 0x7] b _0802184E .align 2, 0 -_08021834: .4byte gUnknown_02024C10 +_08021834: .4byte gBattlescriptCurrInstr _08021838: .4byte gBattleMons -_0802183C: .4byte gPlayerMonIndex +_0802183C: .4byte gBankAttacker _08021840: .4byte gEnigmaBerries _08021844: ldrh r0, [r1, 0x2E] @@ -11518,7 +11518,7 @@ _08021844: lsrs r0, 24 _0802184E: str r0, [sp, 0x8] - ldr r0, _0802186C @ =gPlayerMonIndex + ldr r0, _0802186C @ =gBankAttacker ldrb r1, [r0] lsls r1, 1 ldr r0, _08021870 @ =0x020160e8 @@ -11533,7 +11533,7 @@ _0802184E: str r2, [sp, 0x4] b _080218D2 .align 2, 0 -_0802186C: .4byte gPlayerMonIndex +_0802186C: .4byte gBankAttacker _08021870: .4byte 0x020160e8 _08021874: strb r2, [r7] @@ -11557,18 +11557,18 @@ _08021874: adds r0, r2 ldr r0, [r0] bl b_movescr_stack_push - ldr r1, _080218B8 @ =gUnknown_02024C10 + ldr r1, _080218B8 @ =gBattlescriptCurrInstr ldr r0, _080218BC @ =gUnknown_081D9B2D bl _0802229C .align 2, 0 _080218AC: .4byte 0x02000000 _080218B0: .4byte 0x0001600c _080218B4: .4byte gUnknown_081D6BBC -_080218B8: .4byte gUnknown_02024C10 +_080218B8: .4byte gBattlescriptCurrInstr _080218BC: .4byte gUnknown_081D9B2D _080218C0: ldr r2, _080218D8 @ =gBattleMoves - ldr r0, _080218DC @ =gUnknown_02024BE6 + ldr r0, _080218DC @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -11582,7 +11582,7 @@ _080218D2: b _080218EE .align 2, 0 _080218D8: .4byte gBattleMoves -_080218DC: .4byte gUnknown_02024BE6 +_080218DC: .4byte gCurrentMove _080218E0: .4byte 0x02000000 _080218E4: mov r0, r10 @@ -11627,7 +11627,7 @@ _08021910: .4byte _0802224E _08021958: ldr r5, _08021A08 @ =gBattleMons - ldr r2, _08021A0C @ =gEnemyMonIndex + ldr r2, _08021A0C @ =gBankTarget ldrb r4, [r2] movs r6, 0x58 adds r3, r4, 0 @@ -11645,16 +11645,16 @@ _08021958: ldrh r0, [r0, 0x28] cmp r0, 0 beq _080219FE - ldr r0, _08021A10 @ =gPlayerMonIndex + ldr r0, _08021A10 @ =gBankAttacker ldrb r1, [r0] cmp r1, r4 beq _080219FE adds r0, r1, 0 - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 - ldr r1, _08021A0C @ =gEnemyMonIndex + ldr r1, _08021A0C @ =gBankTarget ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -11665,8 +11665,8 @@ _08021958: ands r0, r1 cmp r0, 0 bne _080219FE - ldr r2, _08021A18 @ =gUnknown_02024D28 - ldr r4, _08021A0C @ =gEnemyMonIndex + ldr r2, _08021A18 @ =gProtectStructs + ldr r4, _08021A0C @ =gBankTarget ldrb r3, [r4] lsls r1, r3, 4 adds r0, r2, 0x4 @@ -11682,7 +11682,7 @@ _08021958: beq _080219FE _080219C8: ldr r2, _08021A1C @ =gBattleMoves - ldr r0, _08021A20 @ =gUnknown_02024BE6 + ldr r0, _08021A20 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -11702,7 +11702,7 @@ _080219C8: adds r0, r2, 0x1 strb r0, [r1, 0x19] bl b_movescr_stack_push_cursor - ldr r1, _08021A24 @ =gUnknown_02024C10 + ldr r1, _08021A24 @ =gBattlescriptCurrInstr ldr r0, _08021A28 @ =gUnknown_081D9132 str r0, [r1] movs r5, 0x1 @@ -11714,19 +11714,19 @@ _080219FE: b _08021E00 .align 2, 0 _08021A08: .4byte gBattleMons -_08021A0C: .4byte gEnemyMonIndex -_08021A10: .4byte gPlayerMonIndex +_08021A0C: .4byte gBankTarget +_08021A10: .4byte gBankAttacker _08021A14: .4byte gBattleMoveFlags -_08021A18: .4byte gUnknown_02024D28 +_08021A18: .4byte gProtectStructs _08021A1C: .4byte gBattleMoves -_08021A20: .4byte gUnknown_02024BE6 -_08021A24: .4byte gUnknown_02024C10 +_08021A20: .4byte gCurrentMove +_08021A24: .4byte gBattlescriptCurrInstr _08021A28: .4byte gUnknown_081D9132 _08021A2C: .4byte 0x02000000 _08021A30: .4byte 0x0001600c _08021A34: ldr r2, _08021AD0 @ =gBattleMons - ldr r1, _08021AD4 @ =gEnemyMonIndex + ldr r1, _08021AD4 @ =gBankTarget ldrb r4, [r1] movs r3, 0x58 mov r12, r3 @@ -11748,13 +11748,13 @@ _08021A54: bne _08021A5E b _08021DFA _08021A5E: - ldr r0, _08021AD8 @ =gPlayerMonIndex + ldr r0, _08021AD8 @ =gBankAttacker ldrb r0, [r0] cmp r0, r4 bne _08021A68 b _08021DFA _08021A68: - ldr r0, _08021ADC @ =gUnknown_02024D68 + ldr r0, _08021ADC @ =gSpecialStatuses lsls r1, r4, 2 adds r1, r4 lsls r1, 2 @@ -11782,8 +11782,8 @@ _08021A92: negs r0, r0 ands r5, r0 str r5, [r6] - ldr r4, _08021AE4 @ =gUnknown_02024A60 - ldr r5, _08021AD4 @ =gEnemyMonIndex + ldr r4, _08021AE4 @ =gActiveBank + ldr r5, _08021AD4 @ =gBankTarget ldrb r0, [r5] strb r0, [r4] ldrb r0, [r5] @@ -11796,11 +11796,11 @@ _08021A92: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution bl b_movescr_stack_push_cursor - ldr r1, _08021AE8 @ =gUnknown_02024C10 + ldr r1, _08021AE8 @ =gBattlescriptCurrInstr ldr r0, _08021AEC @ =gUnknown_081D955D str r0, [r1] movs r2, 0x1 @@ -11808,22 +11808,22 @@ _08021A92: b _08021DFA .align 2, 0 _08021AD0: .4byte gBattleMons -_08021AD4: .4byte gEnemyMonIndex -_08021AD8: .4byte gPlayerMonIndex -_08021ADC: .4byte gUnknown_02024D68 +_08021AD4: .4byte gBankTarget +_08021AD8: .4byte gBankAttacker +_08021ADC: .4byte gSpecialStatuses _08021AE0: .4byte gBattleMoveFlags -_08021AE4: .4byte gUnknown_02024A60 -_08021AE8: .4byte gUnknown_02024C10 +_08021AE4: .4byte gActiveBank +_08021AE8: .4byte gBattlescriptCurrInstr _08021AEC: .4byte gUnknown_081D955D _08021AF0: - ldr r0, _08021B14 @ =gEnemyMonIndex + ldr r0, _08021B14 @ =gBankTarget ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0x7 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08021B0C @@ -11835,18 +11835,18 @@ _08021B0C: adds r1, r2, r5 b _08021E00 .align 2, 0 -_08021B14: .4byte gEnemyMonIndex +_08021B14: .4byte gBankTarget _08021B18: .4byte 0x02000000 _08021B1C: .4byte 0x0001600c _08021B20: - ldr r0, _08021B40 @ =gEnemyMonIndex + ldr r0, _08021B40 @ =gBankTarget ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0x4 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08021B3A @@ -11856,7 +11856,7 @@ _08021B3A: mov r10, r0 b _08021DFA .align 2, 0 -_08021B40: .4byte gEnemyMonIndex +_08021B40: .4byte gBankTarget _08021B44: movs r0, 0 str r0, [sp] @@ -11864,7 +11864,7 @@ _08021B44: movs r1, 0 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08021B68 @@ -11884,14 +11884,14 @@ _08021B68: _08021B70: .4byte 0x02000000 _08021B74: .4byte 0x0001600c _08021B78: - ldr r0, _08021B98 @ =gPlayerMonIndex + ldr r0, _08021B98 @ =gBankAttacker ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0x8 movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08021B92 @@ -11901,9 +11901,9 @@ _08021B92: mov r10, r1 b _08021DFA .align 2, 0 -_08021B98: .4byte gPlayerMonIndex +_08021B98: .4byte gBankAttacker _08021B9C: - ldr r0, _08021C28 @ =gUnknown_02024C6C + ldr r0, _08021C28 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 18 @@ -11942,7 +11942,7 @@ _08021BDA: _08021BE0: movs r4, 0 ldr r2, _08021C38 @ =gBattleMons - ldr r3, _08021C3C @ =gPlayerMonIndex + ldr r3, _08021C3C @ =gBankAttacker ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -11980,15 +11980,15 @@ _08021C22: strh r0, [r1] b _08022244 .align 2, 0 -_08021C28: .4byte gUnknown_02024C6C +_08021C28: .4byte gHitMarker _08021C2C: .4byte gUnknown_02024BE8 _08021C30: .4byte 0x0000ffff _08021C34: .4byte gBattleMoveFlags _08021C38: .4byte gBattleMons -_08021C3C: .4byte gPlayerMonIndex +_08021C3C: .4byte gBankAttacker _08021C40: movs r4, 0 - ldr r0, _08021C6C @ =gUnknown_02024A68 + ldr r0, _08021C6C @ =gNoOfAllBanks ldrb r2, [r0] cmp r4, r2 blt _08021C4C @@ -12012,7 +12012,7 @@ _08021C5C: blt _08021C52 b _08022244 .align 2, 0 -_08021C6C: .4byte gUnknown_02024A68 +_08021C6C: .4byte gNoOfAllBanks _08021C70: .4byte 0x020160f0 _08021C74: .4byte gBattleMons _08021C78: @@ -12057,8 +12057,8 @@ _08021CBC: _08021CC4: .4byte 0x02000000 _08021CC8: .4byte 0x0001600c _08021CCC: - ldr r1, _08021D04 @ =gUnknown_02024C98 - ldr r0, _08021D08 @ =gPlayerMonIndex + ldr r1, _08021D04 @ =gStatuses3 + ldr r0, _08021D08 @ =gBankAttacker ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -12069,7 +12069,7 @@ _08021CCC: bne _08021CE2 b _08021DFA _08021CE2: - ldr r0, _08021D10 @ =gUnknown_02024C6C + ldr r0, _08021D10 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -12077,20 +12077,20 @@ _08021CE2: bne _08021CF0 b _08021DFA _08021CF0: - ldr r4, _08021D14 @ =gUnknown_02024A60 + ldr r4, _08021D14 @ =gActiveBank strb r2, [r4] movs r0, 0 movs r1, 0x1 - bl dp01_build_cmdbuf_x33_a_33_33 + bl EmitSpriteInvisibility ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08021DFA .align 2, 0 -_08021D04: .4byte gUnknown_02024C98 -_08021D08: .4byte gPlayerMonIndex +_08021D04: .4byte gStatuses3 +_08021D08: .4byte gBankAttacker _08021D0C: .4byte 0x000400c0 -_08021D10: .4byte gUnknown_02024C6C -_08021D14: .4byte gUnknown_02024A60 +_08021D10: .4byte gHitMarker +_08021D14: .4byte gActiveBank _08021D18: ldr r0, _08021D88 @ =gBattleMoveFlags ldrb r1, [r0] @@ -12098,8 +12098,8 @@ _08021D18: ands r0, r1 cmp r0, 0 bne _08021D44 - ldr r1, _08021D8C @ =gUnknown_02024C98 - ldr r0, _08021D90 @ =gPlayerMonIndex + ldr r1, _08021D8C @ =gStatuses3 + ldr r0, _08021D90 @ =gBankAttacker ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -12114,16 +12114,16 @@ _08021D18: cmp r0, 0 beq _08021D7E _08021D44: - ldr r4, _08021D98 @ =gUnknown_02024A60 - ldr r5, _08021D90 @ =gPlayerMonIndex + ldr r4, _08021D98 @ =gActiveBank + ldr r5, _08021D90 @ =gBankAttacker ldrb r0, [r5] strb r0, [r4] movs r0, 0 movs r1, 0 - bl dp01_build_cmdbuf_x33_a_33_33 + bl EmitSpriteInvisibility ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r0, _08021D8C @ =gUnknown_02024C98 + bl MarkBufferBankForExecution + ldr r0, _08021D8C @ =gStatuses3 ldrb r2, [r5] lsls r2, 2 adds r2, r0 @@ -12131,7 +12131,7 @@ _08021D44: ldr r1, _08021D9C @ =0xfffbff3f ands r0, r1 str r0, [r2] - ldr r2, _08021DA0 @ =gUnknown_02024D68 + ldr r2, _08021DA0 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -12148,17 +12148,17 @@ _08021D7E: b _08021E00 .align 2, 0 _08021D88: .4byte gBattleMoveFlags -_08021D8C: .4byte gUnknown_02024C98 -_08021D90: .4byte gPlayerMonIndex +_08021D8C: .4byte gStatuses3 +_08021D90: .4byte gBankAttacker _08021D94: .4byte 0x000400c0 -_08021D98: .4byte gUnknown_02024A60 +_08021D98: .4byte gActiveBank _08021D9C: .4byte 0xfffbff3f -_08021DA0: .4byte gUnknown_02024D68 +_08021DA0: .4byte gSpecialStatuses _08021DA4: .4byte 0x02000000 _08021DA8: .4byte 0x0001600c _08021DAC: - ldr r2, _08021E0C @ =gUnknown_02024D68 - ldr r1, _08021E10 @ =gEnemyMonIndex + ldr r2, _08021E0C @ =gSpecialStatuses + ldr r1, _08021E10 @ =gBankTarget ldrb r3, [r1] lsls r4, r3, 2 adds r0, r4, r3 @@ -12168,25 +12168,25 @@ _08021DAC: lsls r0, 29 cmp r0, 0 blt _08021DFA - ldr r0, _08021E14 @ =gUnknown_02024A68 + ldr r0, _08021E14 @ =gNoOfAllBanks ldrb r0, [r0] cmp r3, r0 bcs _08021DFA - ldr r5, _08021E18 @ =gUnknown_02024C98 + ldr r5, _08021E18 @ =gStatuses3 adds r0, r4, r5 ldr r0, [r0] ldr r1, _08021E1C @ =0x000400c0 ands r0, r1 cmp r0, 0 bne _08021DFA - ldr r4, _08021E20 @ =gUnknown_02024A60 + ldr r4, _08021E20 @ =gActiveBank strb r3, [r4] movs r0, 0 movs r1, 0 - bl dp01_build_cmdbuf_x33_a_33_33 + bl EmitSpriteInvisibility ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r0, _08021E10 @ =gEnemyMonIndex + bl MarkBufferBankForExecution + ldr r0, _08021E10 @ =gBankTarget ldrb r2, [r0] lsls r2, 2 adds r2, r5 @@ -12205,24 +12205,24 @@ _08021E00: mov r12, r2 b _0802224E .align 2, 0 -_08021E0C: .4byte gUnknown_02024D68 -_08021E10: .4byte gEnemyMonIndex -_08021E14: .4byte gUnknown_02024A68 -_08021E18: .4byte gUnknown_02024C98 +_08021E0C: .4byte gSpecialStatuses +_08021E10: .4byte gBankTarget +_08021E14: .4byte gNoOfAllBanks +_08021E18: .4byte gStatuses3 _08021E1C: .4byte 0x000400c0 -_08021E20: .4byte gUnknown_02024A60 +_08021E20: .4byte gActiveBank _08021E24: .4byte 0xfffbff3f _08021E28: .4byte 0x02000000 _08021E2C: .4byte 0x0001600c _08021E30: movs r4, 0 - ldr r0, _08021E60 @ =gUnknown_02024A68 + ldr r0, _08021E60 @ =gNoOfAllBanks ldrb r5, [r0] cmp r4, r5 blt _08021E3C b _08022244 _08021E3C: - ldr r2, _08021E64 @ =gUnknown_02024CA8 + ldr r2, _08021E64 @ =gDisableStructs ldr r5, _08021E68 @ =0xfeffffff adds r3, r0, 0 ldr r1, _08021E6C @ =gUnknown_02024AD0 @@ -12242,25 +12242,25 @@ _08021E50: blt _08021E44 b _08022244 .align 2, 0 -_08021E60: .4byte gUnknown_02024A68 -_08021E64: .4byte gUnknown_02024CA8 +_08021E60: .4byte gNoOfAllBanks +_08021E64: .4byte gDisableStructs _08021E68: .4byte 0xfeffffff _08021E6C: .4byte gUnknown_02024AD0 _08021E70: - ldr r1, _08021F2C @ =gUnknown_02024C6C + ldr r1, _08021F2C @ =gHitMarker ldr r3, [r1] movs r0, 0x80 lsls r0, 5 ands r0, r3 - ldr r2, _08021F30 @ =gPlayerMonIndex + ldr r2, _08021F30 @ =gBankAttacker mov r9, r2 adds r5, r1, 0 cmp r0, 0 beq _08021E9A - ldr r0, _08021F34 @ =gUnknown_02024A60 + ldr r0, _08021F34 @ =gActiveBank ldrb r2, [r2] strb r2, [r0] - ldr r1, _08021F38 @ =gEnemyMonIndex + ldr r1, _08021F38 @ =gBankTarget ldrb r0, [r1] mov r4, r9 strb r0, [r4] @@ -12295,7 +12295,7 @@ _08021EBE: adds r0, r1 strh r3, [r0] _08021ECA: - ldr r0, _08021F50 @ =gUnknown_02024C0C + ldr r0, _08021F50 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _08021F54 @ =gBitTable mov r3, r9 @@ -12333,7 +12333,7 @@ _08021F04: ands r0, r1 cmp r0, 0 beq _08021F68 - ldr r1, _08021F5C @ =gUnknown_02024C34 + ldr r1, _08021F5C @ =gLastUsedMove lsls r0, r4, 1 adds r0, r1 strh r2, [r0] @@ -12342,28 +12342,28 @@ _08021F04: ldrb r1, [r4] lsls r1, 1 adds r1, r0 - ldr r0, _08021F64 @ =gUnknown_02024BE6 + ldr r0, _08021F64 @ =gCurrentMove ldrh r0, [r0] strh r0, [r1] b _08021F82 .align 2, 0 -_08021F2C: .4byte gUnknown_02024C6C -_08021F30: .4byte gPlayerMonIndex -_08021F34: .4byte gUnknown_02024A60 -_08021F38: .4byte gEnemyMonIndex +_08021F2C: .4byte gHitMarker +_08021F30: .4byte gBankAttacker +_08021F34: .4byte gActiveBank +_08021F38: .4byte gBankTarget _08021F3C: .4byte 0xffffefff _08021F40: .4byte gBattleMoves _08021F44: .4byte gUnknown_02024BE8 _08021F48: .4byte gBattleMoveFlags _08021F4C: .4byte gUnknown_02024C2C -_08021F50: .4byte gUnknown_02024C0C +_08021F50: .4byte gAbsentBankFlags _08021F54: .4byte gBitTable _08021F58: .4byte 0x000160a6 -_08021F5C: .4byte gUnknown_02024C34 +_08021F5C: .4byte gLastUsedMove _08021F60: .4byte gUnknown_02024C4C -_08021F64: .4byte gUnknown_02024BE6 +_08021F64: .4byte gCurrentMove _08021F68: - ldr r1, _08021FD0 @ =gUnknown_02024C34 + ldr r1, _08021FD0 @ =gLastUsedMove lsls r0, r4, 1 adds r0, r1 ldr r1, _08021FD4 @ =0x0000ffff @@ -12377,7 +12377,7 @@ _08021F68: negs r1, r1 strh r1, [r0] _08021F82: - ldr r2, _08021FDC @ =gEnemyMonIndex + ldr r2, _08021FDC @ =gBankTarget ldrb r3, [r2] lsls r0, r3, 2 adds r0, r6 @@ -12409,28 +12409,28 @@ _08021FA0: ldr r0, _08021FD4 @ =0x0000ffff cmp r2, r0 bne _08021FEC - ldr r1, _08021FE8 @ =gUnknown_02024C3C - ldr r4, _08021FDC @ =gEnemyMonIndex + ldr r1, _08021FE8 @ =gMoveHitWith + ldr r4, _08021FDC @ =gBankTarget ldrb r0, [r4] lsls r0, 1 adds r0, r1 strh r2, [r0] b _08022244 .align 2, 0 -_08021FD0: .4byte gUnknown_02024C34 +_08021FD0: .4byte gLastUsedMove _08021FD4: .4byte 0x0000ffff _08021FD8: .4byte gUnknown_02024C4C -_08021FDC: .4byte gEnemyMonIndex +_08021FDC: .4byte gBankTarget _08021FE0: .4byte gUnknown_02024C5C _08021FE4: .4byte gBattleMoveFlags -_08021FE8: .4byte gUnknown_02024C3C +_08021FE8: .4byte gMoveHitWith _08021FEC: - ldr r0, _08022014 @ =gUnknown_02024C3C - ldr r5, _08022018 @ =gEnemyMonIndex + ldr r0, _08022014 @ =gMoveHitWith + ldr r5, _08022018 @ =gBankTarget ldrb r1, [r5] lsls r1, 1 adds r1, r0 - ldr r4, _0802201C @ =gUnknown_02024BE6 + ldr r4, _0802201C @ =gCurrentMove ldrh r0, [r4] strh r0, [r1] ldr r0, _08022020 @ =0x0001601c @@ -12446,14 +12446,14 @@ _08021FEC: ands r0, r3 b _08021C22 .align 2, 0 -_08022014: .4byte gUnknown_02024C3C -_08022018: .4byte gEnemyMonIndex -_0802201C: .4byte gUnknown_02024BE6 +_08022014: .4byte gMoveHitWith +_08022018: .4byte gBankTarget +_0802201C: .4byte gCurrentMove _08022020: .4byte 0x0001601c _08022024: .4byte gUnknown_02024C44 _08022028: ldr r0, _08022044 @ =gUnknown_02024C44 - ldr r1, _08022048 @ =gEnemyMonIndex + ldr r1, _08022048 @ =gBankTarget ldrb r2, [r1] lsls r2, 1 adds r2, r0 @@ -12467,24 +12467,24 @@ _08022028: b _08022244 .align 2, 0 _08022044: .4byte gUnknown_02024C44 -_08022048: .4byte gEnemyMonIndex +_08022048: .4byte gBankTarget _0802204C: - ldr r0, _0802205C @ =gUnknown_02024C3C - ldr r2, _08022060 @ =gEnemyMonIndex + ldr r0, _0802205C @ =gMoveHitWith + ldr r2, _08022060 @ =gBankTarget ldrb r1, [r2] lsls r1, 1 adds r1, r0 ldr r0, _08022064 @ =0x0000ffff b _08021C22 .align 2, 0 -_0802205C: .4byte gUnknown_02024C3C -_08022060: .4byte gEnemyMonIndex +_0802205C: .4byte gMoveHitWith +_08022060: .4byte gBankTarget _08022064: .4byte 0x0000ffff _08022068: - ldr r0, _0802212C @ =gUnknown_02024C0C + ldr r0, _0802212C @ =gAbsentBankFlags ldrb r1, [r0] ldr r6, _08022130 @ =gBitTable - ldr r2, _08022134 @ =gPlayerMonIndex + ldr r2, _08022134 @ =gBankAttacker ldrb r5, [r2] lsls r0, r5, 2 adds r0, r6 @@ -12515,14 +12515,14 @@ _08022090: ands r0, r1 cmp r0, 0 beq _0802215C - ldr r0, _08022144 @ =gUnknown_02024C6C + ldr r0, _08022144 @ =gHitMarker ldr r1, [r0] movs r0, 0x80 lsls r0, 18 ands r0, r1 cmp r0, 0 beq _0802215C - ldr r2, _08022148 @ =gEnemyMonIndex + ldr r2, _08022148 @ =gBankTarget ldrb r0, [r2] cmp r5, r0 bne _080220C0 @@ -12547,7 +12547,7 @@ _080220C0: adds r0, r5 add r0, r12 strb r3, [r0] - ldr r0, _08022148 @ =gEnemyMonIndex + ldr r0, _08022148 @ =gBankTarget ldrb r1, [r0] lsls r1, 1 ldr r2, _08022154 @ =0x000160ad @@ -12556,7 +12556,7 @@ _080220C0: ldrh r0, [r4] lsrs r0, 8 strb r0, [r1] - ldr r3, _08022148 @ =gEnemyMonIndex + ldr r3, _08022148 @ =gBankTarget ldrb r2, [r3] lsls r2, 2 mov r5, r9 @@ -12583,14 +12583,14 @@ _080220C0: strb r0, [r2] b _08022244 .align 2, 0 -_0802212C: .4byte gUnknown_02024C0C +_0802212C: .4byte gAbsentBankFlags _08022130: .4byte gBitTable -_08022134: .4byte gPlayerMonIndex +_08022134: .4byte gBankAttacker _08022138: .4byte 0x000160a6 _0802213C: .4byte gBattleMoves _08022140: .4byte gUnknown_02024BE8 -_08022144: .4byte gUnknown_02024C6C -_08022148: .4byte gEnemyMonIndex +_08022144: .4byte gHitMarker +_08022148: .4byte gBankTarget _0802214C: .4byte gBattleMoveFlags _08022150: .4byte 0x000160ac _08022154: .4byte 0x000160ad @@ -12598,11 +12598,11 @@ _08022158: .4byte 0x00016100 _0802215C: mov r1, r9 ldrb r0, [r1] - ldr r2, _080221B4 @ =gEnemyMonIndex + ldr r2, _080221B4 @ =gBankTarget ldrb r2, [r2] cmp r0, r2 beq _08022244 - ldr r3, _080221B4 @ =gEnemyMonIndex + ldr r3, _080221B4 @ =gBankTarget ldrb r0, [r3] lsls r0, 1 ldr r4, _080221B8 @ =0x000160ac @@ -12610,7 +12610,7 @@ _0802215C: add r0, r12 movs r3, 0 strb r3, [r0] - ldr r5, _080221B4 @ =gEnemyMonIndex + ldr r5, _080221B4 @ =gBankTarget ldrb r0, [r5] lsls r0, 1 ldr r1, _080221BC @ =0x000160ad @@ -12640,11 +12640,11 @@ _0802215C: strb r3, [r2] b _08022244 .align 2, 0 -_080221B4: .4byte gEnemyMonIndex +_080221B4: .4byte gBankTarget _080221B8: .4byte 0x000160ac _080221BC: .4byte 0x000160ad _080221C0: - ldr r5, _080222B0 @ =gUnknown_02024C6C + ldr r5, _080222B0 @ =gHitMarker ldr r2, [r5] movs r0, 0x80 lsls r0, 12 @@ -12657,8 +12657,8 @@ _080221C0: ands r0, r1 cmp r0, 0 beq _08022244 - ldr r1, _080222B8 @ =gUnknown_02024D28 - ldr r0, _080222BC @ =gPlayerMonIndex + ldr r1, _080222B8 @ =gProtectStructs + ldr r0, _080222BC @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -12668,7 +12668,7 @@ _080221C0: blt _08022244 ldr r0, _080222C0 @ =gBattleMoves mov r9, r0 - ldr r1, _080222C4 @ =gUnknown_02024BE6 + ldr r1, _080222C4 @ =gCurrentMove mov r8, r1 ldrh r0, [r1] lsls r1, r0, 1 @@ -12684,14 +12684,14 @@ _080221C0: ands r4, r2 cmp r4, 0 bne _08022244 - ldr r7, _080222C8 @ =gEnemyMonIndex + ldr r7, _080222C8 @ =gBankTarget ldrb r0, [r7] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r2, r0, 24 ldr r1, _080222CC @ =gBattleMons @@ -12753,7 +12753,7 @@ _08022286: mov r3, r10 cmp r3, 0 bne _0802229E - ldr r1, _080222D8 @ =gUnknown_02024C10 + ldr r1, _080222D8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 _0802229C: @@ -12768,17 +12768,17 @@ _0802229E: pop {r0} bx r0 .align 2, 0 -_080222B0: .4byte gUnknown_02024C6C +_080222B0: .4byte gHitMarker _080222B4: .4byte gBattleTypeFlags -_080222B8: .4byte gUnknown_02024D28 -_080222BC: .4byte gPlayerMonIndex +_080222B8: .4byte gProtectStructs +_080222BC: .4byte gBankAttacker _080222C0: .4byte gBattleMoves -_080222C4: .4byte gUnknown_02024BE6 -_080222C8: .4byte gEnemyMonIndex +_080222C4: .4byte gCurrentMove +_080222C8: .4byte gBankTarget _080222CC: .4byte gBattleMons _080222D0: .4byte 0x02000000 _080222D4: .4byte 0x0001600c -_080222D8: .4byte gUnknown_02024C10 +_080222D8: .4byte gBattlescriptCurrInstr thumb_func_end sub_80217F8 thumb_func_start atk4A_damageflags @@ -12789,7 +12789,7 @@ atk4A_damageflags: @ 80222DC movs r4, 0 movs r5, 0 ldr r2, _08022340 @ =gBattleMoves - ldr r0, _08022344 @ =gUnknown_02024BE6 + ldr r0, _08022344 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -12798,7 +12798,7 @@ atk4A_damageflags: @ 80222DC ldrb r0, [r0, 0x2] mov r8, r0 ldr r2, _08022348 @ =gBattleMons - ldr r3, _0802234C @ =gEnemyMonIndex + ldr r3, _0802234C @ =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -12812,19 +12812,19 @@ atk4A_damageflags: @ 80222DC mov r1, r8 cmp r1, 0x4 bne _08022370 - ldr r3, _08022350 @ =byte_2024C06 + ldr r3, _08022350 @ =gLastUsedAbility strb r0, [r3] ldr r2, _08022354 @ =gBattleMoveFlags ldrb r0, [r2] movs r1, 0x9 orrs r0, r1 strb r0, [r2] - ldr r1, _08022358 @ =gUnknown_02024C3C + ldr r1, _08022358 @ =gMoveHitWith ldrb r0, [r7] lsls r0, 1 adds r0, r1 strh r4, [r0] - ldr r0, _0802235C @ =gUnknown_02024D1E + ldr r0, _0802235C @ =gBattleCommunication mov r2, r8 strb r2, [r0, 0x6] ldrb r0, [r7] @@ -12833,13 +12833,13 @@ atk4A_damageflags: @ 80222DC b _08022452 .align 2, 0 _08022340: .4byte gBattleMoves -_08022344: .4byte gUnknown_02024BE6 +_08022344: .4byte gCurrentMove _08022348: .4byte gBattleMons -_0802234C: .4byte gEnemyMonIndex -_08022350: .4byte byte_2024C06 +_0802234C: .4byte gBankTarget +_08022350: .4byte gLastUsedAbility _08022354: .4byte gBattleMoveFlags -_08022358: .4byte gUnknown_02024C3C -_0802235C: .4byte gUnknown_02024D1E +_08022358: .4byte gMoveHitWith +_0802235C: .4byte gBattleCommunication _08022360: ldr r0, _0802236C @ =gBattleMoveFlags ldrb r1, [r0] @@ -12971,7 +12971,7 @@ _08022432: beq _0802242C _08022452: ldr r2, _08022500 @ =gBattleMons - ldr r0, _08022504 @ =gEnemyMonIndex + ldr r0, _08022504 @ =gBankTarget mov r8, r0 ldrb r1, [r0] movs r0, 0x58 @@ -12985,9 +12985,9 @@ _08022452: ands r5, r4 cmp r5, 0 bne _080224CE - ldr r0, _08022508 @ =gPlayerMonIndex + ldr r0, _08022508 @ =gBankAttacker ldrb r0, [r0] - ldr r7, _0802250C @ =gUnknown_02024BE6 + ldr r7, _0802250C @ =gCurrentMove ldrh r1, [r7] bl move_weather_interaction lsls r0, 24 @@ -13012,20 +13012,20 @@ _08022494: ldrb r0, [r0, 0x1] cmp r0, 0 beq _080224CE - ldr r3, _08022514 @ =byte_2024C06 + ldr r3, _08022514 @ =gLastUsedAbility strb r6, [r3] ldr r2, _08022518 @ =gBattleMoveFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _0802251C @ =gUnknown_02024C3C + ldr r1, _0802251C @ =gMoveHitWith mov r2, r8 ldrb r0, [r2] lsls r0, 1 adds r0, r1 strh r5, [r0] - ldr r1, _08022520 @ =gUnknown_02024D1E + ldr r1, _08022520 @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x6] ldrb r0, [r2] @@ -13038,8 +13038,8 @@ _080224CE: ands r0, r1 cmp r0, 0 beq _080224EC - ldr r2, _08022524 @ =gUnknown_02024D28 - ldr r0, _08022508 @ =gPlayerMonIndex + ldr r2, _08022524 @ =gProtectStructs + ldr r0, _08022508 @ =gBankAttacker ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -13048,7 +13048,7 @@ _080224CE: orrs r0, r2 strb r0, [r1, 0x1] _080224EC: - ldr r1, _08022528 @ =gUnknown_02024C10 + ldr r1, _08022528 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -13059,26 +13059,26 @@ _080224EC: bx r0 .align 2, 0 _08022500: .4byte gBattleMons -_08022504: .4byte gEnemyMonIndex -_08022508: .4byte gPlayerMonIndex -_0802250C: .4byte gUnknown_02024BE6 +_08022504: .4byte gBankTarget +_08022508: .4byte gBankAttacker +_0802250C: .4byte gCurrentMove _08022510: .4byte gBattleMoves -_08022514: .4byte byte_2024C06 +_08022514: .4byte gLastUsedAbility _08022518: .4byte gBattleMoveFlags -_0802251C: .4byte gUnknown_02024C3C -_08022520: .4byte gUnknown_02024D1E -_08022524: .4byte gUnknown_02024D28 -_08022528: .4byte gUnknown_02024C10 +_0802251C: .4byte gMoveHitWith +_08022520: .4byte gBattleCommunication +_08022524: .4byte gProtectStructs +_08022528: .4byte gBattlescriptCurrInstr thumb_func_end atk4A_damageflags thumb_func_start atk4B_cmd4b atk4B_cmd4b: @ 802252C push {r4,lr} - ldr r4, _08022568 @ =gUnknown_02024A60 - ldr r0, _0802256C @ =gPlayerMonIndex + ldr r4, _08022568 @ =gActiveBank + ldr r0, _0802256C @ =gBankAttacker ldrb r0, [r0] strb r0, [r4] - ldr r2, _08022570 @ =gUnknown_02024C6C + ldr r2, _08022570 @ =gHitMarker ldr r1, _08022574 @ =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -13093,9 +13093,9 @@ atk4B_cmd4b: @ 802252C movs r1, 0 bl dp01_build_cmdbuf_x06_a ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _0802255A: - ldr r1, _08022578 @ =gUnknown_02024C10 + ldr r1, _08022578 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -13103,27 +13103,27 @@ _0802255A: pop {r0} bx r0 .align 2, 0 -_08022568: .4byte gUnknown_02024A60 -_0802256C: .4byte gPlayerMonIndex -_08022570: .4byte gUnknown_02024C6C +_08022568: .4byte gActiveBank +_0802256C: .4byte gBankAttacker +_08022570: .4byte gHitMarker _08022574: .4byte gBitTable -_08022578: .4byte gUnknown_02024C10 +_08022578: .4byte gBattlescriptCurrInstr thumb_func_end atk4B_cmd4b thumb_func_start atk4C_switch1 atk4C_switch1: @ 802257C push {r4-r6,lr} - ldr r0, _080225D4 @ =gUnknown_02024A64 + ldr r0, _080225D4 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _080225CC - ldr r5, _080225D8 @ =gUnknown_02024C10 + ldr r5, _080225D8 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _080225DC @ =gUnknown_02024A60 + ldr r4, _080225DC @ =gActiveBank strb r0, [r4] - ldr r3, _080225E0 @ =gUnknown_02024A6A + ldr r3, _080225E0 @ =gBattlePartyID ldrb r0, [r4] lsls r1, r0, 1 adds r1, r3 @@ -13143,9 +13143,9 @@ atk4C_switch1: @ 802257C ldrb r2, [r0] movs r0, 0 movs r1, 0 - bl dp01_build_cmdbuf_x00_a_b_0 + bl EmitGetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -13154,10 +13154,10 @@ _080225CC: pop {r0} bx r0 .align 2, 0 -_080225D4: .4byte gUnknown_02024A64 -_080225D8: .4byte gUnknown_02024C10 -_080225DC: .4byte gUnknown_02024A60 -_080225E0: .4byte gUnknown_02024A6A +_080225D4: .4byte gBattleExecBuffer +_080225D8: .4byte gBattlescriptCurrInstr +_080225DC: .4byte gActiveBank +_080225E0: .4byte gBattlePartyID _080225E4: .4byte 0x02000000 _080225E8: .4byte 0x00016068 _080225EC: .4byte gBitTable @@ -13167,17 +13167,17 @@ _080225EC: .4byte gBitTable sub_80225F0: @ 80225F0 push {r4-r7,lr} sub sp, 0x58 - ldr r0, _0802274C @ =gUnknown_02024A64 + ldr r0, _0802274C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _080225FE b _08022744 _080225FE: - ldr r0, _08022750 @ =gUnknown_02024C10 + ldr r0, _08022750 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _08022754 @ =gUnknown_02024A60 + ldr r4, _08022754 @ =gActiveBank strb r0, [r4] ldr r6, _08022758 @ =gBattleMons ldrb r0, [r4] @@ -13192,7 +13192,7 @@ _080225FE: muls r0, r5 adds r3, r0, r6 movs r2, 0 - ldr r5, _0802275C @ =gUnknown_02024260 + ldr r5, _0802275C @ =gBattleBufferB adds r7, r4, 0 _0802262C: adds r0, r3, r2 @@ -13247,15 +13247,15 @@ _0802262C: adds r1, 0x20 strb r0, [r1] ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08022764 @ =gUnknown_02024DBC + ldr r0, _08022764 @ =gWishFutureKnock adds r0, 0x29 adds r0, r2, r0 ldrb r1, [r0] ldr r3, _08022768 @ =gBitTable - ldr r2, _0802276C @ =gUnknown_02024A6A + ldr r2, _0802276C @ =gBattlePartyID ldrb r5, [r7] lsls r0, r5, 1 adds r0, r2 @@ -13274,7 +13274,7 @@ _0802262C: strh r1, [r0, 0x2E] _080226CA: ldr r2, _08022770 @ =gBattleMoves - ldr r0, _08022774 @ =gUnknown_02024BE6 + ldr r0, _08022774 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -13312,18 +13312,18 @@ _080226EA: _08022710: bl sub_8010B88 ldr r0, _08022778 @ =0x02000000 - ldr r3, _08022754 @ =gUnknown_02024A60 + ldr r3, _08022754 @ =gActiveBank ldrb r2, [r3] ldr r1, _0802277C @ =0x00016003 adds r0, r1 strb r2, [r0] - ldr r1, _08022780 @ =gUnknown_030041C0 + ldr r1, _08022780 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] strb r2, [r1, 0x2] - ldr r2, _0802276C @ =gUnknown_02024A6A + ldr r2, _0802276C @ =gBattlePartyID ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -13331,7 +13331,7 @@ _08022710: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08022750 @ =gUnknown_02024C10 + ldr r1, _08022750 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -13341,37 +13341,37 @@ _08022744: pop {r0} bx r0 .align 2, 0 -_0802274C: .4byte gUnknown_02024A64 -_08022750: .4byte gUnknown_02024C10 -_08022754: .4byte gUnknown_02024A60 +_0802274C: .4byte gBattleExecBuffer +_08022750: .4byte gBattlescriptCurrInstr +_08022754: .4byte gActiveBank _08022758: .4byte gBattleMons -_0802275C: .4byte gUnknown_02024260 +_0802275C: .4byte gBattleBufferB _08022760: .4byte gBaseStats -_08022764: .4byte gUnknown_02024DBC +_08022764: .4byte gWishFutureKnock _08022768: .4byte gBitTable -_0802276C: .4byte gUnknown_02024A6A +_0802276C: .4byte gBattlePartyID _08022770: .4byte gBattleMoves -_08022774: .4byte gUnknown_02024BE6 +_08022774: .4byte gCurrentMove _08022778: .4byte 0x02000000 _0802277C: .4byte 0x00016003 -_08022780: .4byte gUnknown_030041C0 +_08022780: .4byte gBattleTextBuff1 thumb_func_end sub_80225F0 thumb_func_start sub_8022784 sub_8022784: @ 8022784 push {r4,r5,lr} - ldr r0, _0802280C @ =gUnknown_02024A64 + ldr r0, _0802280C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08022806 - ldr r0, _08022810 @ =gUnknown_02024C10 + ldr r0, _08022810 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _08022814 @ =gUnknown_02024A60 + ldr r4, _08022814 @ =gActiveBank strb r0, [r4] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13394,9 +13394,9 @@ sub_8022784: @ 8022784 movs r1, 0x2 bl GetNationalPokedexFlag _080227D0: - ldr r2, _08022824 @ =gUnknown_02024C0C + ldr r2, _08022824 @ =gAbsentBankFlags ldr r1, _08022828 @ =gBitTable - ldr r5, _08022814 @ =gUnknown_02024A60 + ldr r5, _08022814 @ =gActiveBank ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -13404,18 +13404,18 @@ _080227D0: ldrb r0, [r2] bics r0, r1 strb r0, [r2] - ldr r1, _0802282C @ =gUnknown_02024A6A + ldr r1, _0802282C @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrb r1, [r0] - ldr r4, _08022810 @ =gUnknown_02024C10 + ldr r4, _08022810 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r2, [r0, 0x2] movs r0, 0 bl sub_800C704 ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r4] adds r0, 0x3 str r0, [r4] @@ -13424,15 +13424,15 @@ _08022806: pop {r0} bx r0 .align 2, 0 -_0802280C: .4byte gUnknown_02024A64 -_08022810: .4byte gUnknown_02024C10 -_08022814: .4byte gUnknown_02024A60 +_0802280C: .4byte gBattleExecBuffer +_08022810: .4byte gBattlescriptCurrInstr +_08022814: .4byte gActiveBank _08022818: .4byte gBattleTypeFlags _0802281C: .4byte 0x00000902 _08022820: .4byte gBattleMons -_08022824: .4byte gUnknown_02024C0C +_08022824: .4byte gAbsentBankFlags _08022828: .4byte gBitTable -_0802282C: .4byte gUnknown_02024A6A +_0802282C: .4byte gBattlePartyID thumb_func_end sub_8022784 thumb_func_start sub_8022830 @@ -13440,13 +13440,13 @@ sub_8022830: @ 8022830 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _08022894 @ =gUnknown_02024C10 + ldr r4, _08022894 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] movs r0, 0x7F ands r0, r1 bl sub_8015150 - ldr r3, _08022898 @ =gUnknown_02024A60 + ldr r3, _08022898 @ =gActiveBank strb r0, [r3] ldr r2, [r4] ldrb r1, [r2, 0x1] @@ -13465,7 +13465,7 @@ sub_8022830: @ 8022830 ands r0, r1 cmp r0, 0 bne _0802287C - ldr r1, _080228A4 @ =gUnknown_02024C98 + ldr r1, _080228A4 @ =gStatuses3 lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] @@ -13488,11 +13488,11 @@ _0802287C: str r1, [r4] b _08022A2C .align 2, 0 -_08022894: .4byte gUnknown_02024C10 -_08022898: .4byte gUnknown_02024A60 +_08022894: .4byte gBattlescriptCurrInstr +_08022898: .4byte gActiveBank _0802289C: .4byte gBattleMons _080228A0: .4byte 0x0400e000 -_080228A4: .4byte gUnknown_02024C98 +_080228A4: .4byte gStatuses3 _080228A8: ldr r5, _08022934 @ =gBattleTypeFlags ldrh r1, [r5] @@ -13500,9 +13500,9 @@ _080228A8: ands r0, r1 cmp r0, 0 beq _08022948 - ldr r4, _08022938 @ =gUnknown_02024A60 + ldr r4, _08022938 @ =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 ldr r1, _0802293C @ =gPlayerParty @@ -13527,7 +13527,7 @@ _080228E6: adds r6, r5, 0x3 cmp r5, r6 bge _0802292E - ldr r7, _08022944 @ =gUnknown_02024A6A + ldr r7, _08022944 @ =gBattlePartyID _080228EE: movs r0, 0x64 muls r0, r5 @@ -13548,7 +13548,7 @@ _080228EE: bl GetMonData cmp r0, 0 beq _08022928 - ldr r0, _08022938 @ =gUnknown_02024A60 + ldr r0, _08022938 @ =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r7 @@ -13565,20 +13565,20 @@ _0802292E: b _08022A24 .align 2, 0 _08022934: .4byte gBattleTypeFlags -_08022938: .4byte gUnknown_02024A60 +_08022938: .4byte gActiveBank _0802293C: .4byte gPlayerParty _08022940: .4byte gEnemyParty -_08022944: .4byte gUnknown_02024A6A +_08022944: .4byte gBattlePartyID _08022948: - ldr r0, _08022978 @ =gUnknown_02024A60 + ldr r0, _08022978 @ =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 bne _08022988 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 ldrh r1, [r5] @@ -13587,12 +13587,12 @@ _08022948: cmp r0, 0 beq _0802297C movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 b _0802297E .align 2, 0 -_08022978: .4byte gUnknown_02024A60 +_08022978: .4byte gActiveBank _0802297C: adds r6, r7, 0 _0802297E: @@ -13603,7 +13603,7 @@ _0802297E: _08022984: .4byte gEnemyParty _08022988: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 ldrh r1, [r5] @@ -13612,7 +13612,7 @@ _08022988: cmp r0, 0 beq _080229A8 movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 b _080229AA @@ -13643,7 +13643,7 @@ _080229B0: bl GetMonData cmp r0, 0 bne _080229F2 - ldr r1, _08022A1C @ =gUnknown_02024A6A + ldr r1, _08022A1C @ =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -13662,7 +13662,7 @@ _080229F8: cmp r5, 0x6 bne _08022A24 _080229FC: - ldr r3, _08022A20 @ =gUnknown_02024C10 + ldr r3, _08022A20 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -13678,10 +13678,10 @@ _080229FC: b _08022A2C .align 2, 0 _08022A18: .4byte gPlayerParty -_08022A1C: .4byte gUnknown_02024A6A -_08022A20: .4byte gUnknown_02024C10 +_08022A1C: .4byte gBattlePartyID +_08022A20: .4byte gBattlescriptCurrInstr _08022A24: - ldr r1, _08022A38 @ =gUnknown_02024C10 + ldr r1, _08022A38 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -13692,7 +13692,7 @@ _08022A2C: pop {r0} bx r0 .align 2, 0 -_08022A38: .4byte gUnknown_02024C10 +_08022A38: .4byte gBattlescriptCurrInstr thumb_func_end sub_8022830 thumb_func_start sub_8022A3C @@ -13703,12 +13703,12 @@ sub_8022A3C: @ 8022A3C lsls r2, 24 lsrs r2, 24 ldr r4, _08022A84 @ =0x02000000 - ldr r5, _08022A88 @ =gUnknown_02024A60 + ldr r5, _08022A88 @ =gActiveBank ldrb r0, [r5] ldr r3, _08022A8C @ =0x00016064 adds r1, r0, r3 adds r1, r4 - ldr r3, _08022A90 @ =gUnknown_02024A6A + ldr r3, _08022A90 @ =gBattlePartyID lsls r0, 1 adds r0, r3 ldrh r0, [r0] @@ -13725,16 +13725,16 @@ sub_8022A3C: @ 8022A3C movs r3, 0 bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 _08022A84: .4byte 0x02000000 -_08022A88: .4byte gUnknown_02024A60 +_08022A88: .4byte gActiveBank _08022A8C: .4byte 0x00016064 -_08022A90: .4byte gUnknown_02024A6A +_08022A90: .4byte gBattlePartyID _08022A94: .4byte 0x0001606c thumb_func_end sub_8022A3C @@ -13748,7 +13748,7 @@ atk50_openpartyscreen: @ 8022A98 movs r7, 0 movs r0, 0 mov r9, r0 - ldr r6, _08022B44 @ =gUnknown_02024C10 + ldr r6, _08022B44 @ =gBattlescriptCurrInstr ldr r1, [r6] ldrb r2, [r1, 0x2] ldrb r0, [r1, 0x3] @@ -13774,18 +13774,18 @@ _08022ACE: ands r1, r0 cmp r1, 0x1 beq _08022BBC - ldr r1, _08022B4C @ =gUnknown_02024A60 + ldr r1, _08022B4C @ =gActiveBank strb r7, [r1] - ldr r0, _08022B50 @ =gUnknown_02024A68 + ldr r0, _08022B50 @ =gNoOfAllBanks ldrb r0, [r0] cmp r7, r0 bcc _08022AE8 b _08022F62 _08022AE8: - ldr r7, _08022B54 @ =gUnknown_02024C6C + ldr r7, _08022B54 @ =gHitMarker ldr r6, _08022B58 @ =gBitTable adds r4, r1, 0 - ldr r0, _08022B5C @ =gUnknown_02024C0C + ldr r0, _08022B5C @ =gAbsentBankFlags mov r8, r0 _08022AF2: ldrb r2, [r4] @@ -13822,20 +13822,20 @@ _08022AF2: str r0, [r7] movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 + bl EmitLinkStandbyMsg ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08022BA2 .align 2, 0 -_08022B44: .4byte gUnknown_02024C10 +_08022B44: .4byte gBattlescriptCurrInstr _08022B48: .4byte gBattleTypeFlags -_08022B4C: .4byte gUnknown_02024A60 -_08022B50: .4byte gUnknown_02024A68 -_08022B54: .4byte gUnknown_02024C6C +_08022B4C: .4byte gActiveBank +_08022B50: .4byte gNoOfAllBanks +_08022B54: .4byte gHitMarker _08022B58: .4byte gBitTable -_08022B5C: .4byte gUnknown_02024C0C +_08022B5C: .4byte gAbsentBankFlags _08022B60: - ldr r5, _08022B90 @ =gUnknown_02024D68 + ldr r5, _08022B90 @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -13858,18 +13858,18 @@ _08022B60: strb r1, [r0] b _08022BA2 .align 2, 0 -_08022B90: .4byte gUnknown_02024D68 +_08022B90: .4byte gSpecialStatuses _08022B94: movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 + bl EmitLinkStandbyMsg ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08022BA2: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _08022BB8 @ =gUnknown_02024A68 + ldr r1, _08022BB8 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -13877,14 +13877,14 @@ _08022BA2: bcc _08022AF2 b _08022F62 .align 2, 0 -_08022BB8: .4byte gUnknown_02024A68 +_08022BB8: .4byte gNoOfAllBanks _08022BBC: ands r1, r0 cmp r1, 0 bne _08022BC4 b _08022F62 _08022BC4: - ldr r0, _08022C1C @ =gUnknown_02024C6C + ldr r0, _08022C1C @ =gHitMarker mov r8, r0 ldr r0, [r0] lsrs r5, r0, 28 @@ -13893,7 +13893,7 @@ _08022BC4: ands r0, r5 cmp r0, 0 beq _08022C7E - ldr r4, _08022C24 @ =gUnknown_02024A60 + ldr r4, _08022C24 @ =gActiveBank strb r7, [r4] movs r0, 0 movs r1, 0x6 @@ -13902,7 +13902,7 @@ _08022BC4: lsls r0, 24 cmp r0, 0 beq _08022C2C - ldr r2, _08022C28 @ =gUnknown_02024C0C + ldr r2, _08022C28 @ =gAbsentBankFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13922,15 +13922,15 @@ _08022BC4: movs r0, 0 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08022C7E .align 2, 0 -_08022C1C: .4byte gUnknown_02024C6C +_08022C1C: .4byte gHitMarker _08022C20: .4byte gBitTable -_08022C24: .4byte gUnknown_02024A60 -_08022C28: .4byte gUnknown_02024C0C +_08022C24: .4byte gActiveBank +_08022C28: .4byte gAbsentBankFlags _08022C2C: - ldr r6, _08022C60 @ =gUnknown_02024D68 + ldr r6, _08022C60 @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -13956,15 +13956,15 @@ _08022C2C: strb r1, [r0] b _08022C7E .align 2, 0 -_08022C60: .4byte gUnknown_02024D68 +_08022C60: .4byte gSpecialStatuses _08022C64: .4byte 0x02000000 _08022C68: .4byte 0x0001606a _08022C6C: movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 + bl EmitLinkStandbyMsg ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution movs r2, 0x1 mov r9, r2 _08022C7E: @@ -13977,7 +13977,7 @@ _08022C7E: ands r0, r5 cmp r0, 0 bne _08022D40 - ldr r4, _08022CDC @ =gUnknown_02024A60 + ldr r4, _08022CDC @ =gActiveBank movs r0, 0x2 strb r0, [r4] movs r0, 0x2 @@ -13987,7 +13987,7 @@ _08022C7E: lsls r0, 24 cmp r0, 0 beq _08022CE8 - ldr r2, _08022CE0 @ =gUnknown_02024C0C + ldr r2, _08022CE0 @ =gAbsentBankFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13995,7 +13995,7 @@ _08022C7E: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _08022CE4 @ =gUnknown_02024C6C + ldr r2, _08022CE4 @ =gHitMarker ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -14007,15 +14007,15 @@ _08022C7E: movs r0, 0 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08022D40 .align 2, 0 _08022CD8: .4byte gBitTable -_08022CDC: .4byte gUnknown_02024A60 -_08022CE0: .4byte gUnknown_02024C0C -_08022CE4: .4byte gUnknown_02024C6C +_08022CDC: .4byte gActiveBank +_08022CE0: .4byte gAbsentBankFlags +_08022CE4: .4byte gHitMarker _08022CE8: - ldr r6, _08022D1C @ =gUnknown_02024D68 + ldr r6, _08022D1C @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -14041,7 +14041,7 @@ _08022CE8: strb r1, [r0] b _08022D40 .align 2, 0 -_08022D1C: .4byte gUnknown_02024D68 +_08022D1C: .4byte gSpecialStatuses _08022D20: .4byte 0x02000000 _08022D24: .4byte 0x00016068 _08022D28: @@ -14052,16 +14052,16 @@ _08022D28: bne _08022D40 movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 + bl EmitLinkStandbyMsg ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08022D40: ldr r6, _08022D90 @ =gBitTable ldr r0, [r6, 0x4] ands r0, r5 cmp r0, 0 beq _08022DF6 - ldr r4, _08022D94 @ =gUnknown_02024A60 + ldr r4, _08022D94 @ =gActiveBank movs r0, 0x1 strb r0, [r4] movs r0, 0x1 @@ -14071,7 +14071,7 @@ _08022D40: lsls r0, 24 cmp r0, 0 beq _08022DA0 - ldr r2, _08022D98 @ =gUnknown_02024C0C + ldr r2, _08022D98 @ =gAbsentBankFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -14079,7 +14079,7 @@ _08022D40: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _08022D9C @ =gUnknown_02024C6C + ldr r2, _08022D9C @ =gHitMarker ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -14091,15 +14091,15 @@ _08022D40: movs r0, 0 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08022DF6 .align 2, 0 _08022D90: .4byte gBitTable -_08022D94: .4byte gUnknown_02024A60 -_08022D98: .4byte gUnknown_02024C0C -_08022D9C: .4byte gUnknown_02024C6C +_08022D94: .4byte gActiveBank +_08022D98: .4byte gAbsentBankFlags +_08022D9C: .4byte gHitMarker _08022DA0: - ldr r6, _08022DD4 @ =gUnknown_02024D68 + ldr r6, _08022DD4 @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -14125,15 +14125,15 @@ _08022DA0: strb r1, [r0] b _08022DF6 .align 2, 0 -_08022DD4: .4byte gUnknown_02024D68 +_08022DD4: .4byte gSpecialStatuses _08022DD8: .4byte 0x02000000 _08022DDC: .4byte 0x0001606b _08022DE0: movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 + bl EmitLinkStandbyMsg ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution movs r0, 0x2 mov r2, r9 orrs r2, r0 @@ -14148,7 +14148,7 @@ _08022DF6: ands r0, r5 cmp r0, 0 bne _08022EB8 - ldr r4, _08022E54 @ =gUnknown_02024A60 + ldr r4, _08022E54 @ =gActiveBank movs r0, 0x3 strb r0, [r4] movs r0, 0x3 @@ -14158,7 +14158,7 @@ _08022DF6: lsls r0, 24 cmp r0, 0 beq _08022E60 - ldr r2, _08022E58 @ =gUnknown_02024C0C + ldr r2, _08022E58 @ =gAbsentBankFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -14166,7 +14166,7 @@ _08022DF6: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _08022E5C @ =gUnknown_02024C6C + ldr r2, _08022E5C @ =gHitMarker ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -14178,15 +14178,15 @@ _08022DF6: movs r0, 0 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _08022EB8 .align 2, 0 _08022E50: .4byte gBitTable -_08022E54: .4byte gUnknown_02024A60 -_08022E58: .4byte gUnknown_02024C0C -_08022E5C: .4byte gUnknown_02024C6C +_08022E54: .4byte gActiveBank +_08022E58: .4byte gAbsentBankFlags +_08022E5C: .4byte gHitMarker _08022E60: - ldr r6, _08022E94 @ =gUnknown_02024D68 + ldr r6, _08022E94 @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -14212,7 +14212,7 @@ _08022E60: strb r1, [r0] b _08022EB8 .align 2, 0 -_08022E94: .4byte gUnknown_02024D68 +_08022E94: .4byte gSpecialStatuses _08022E98: .4byte 0x02000000 _08022E9C: .4byte 0x00016069 _08022EA0: @@ -14223,11 +14223,11 @@ _08022EA0: bne _08022EB8 movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 + bl EmitLinkStandbyMsg ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08022EB8: - ldr r1, _08022EE8 @ =gUnknown_02024D68 + ldr r1, _08022EE8 @ =gSpecialStatuses ldrb r0, [r1] lsls r0, 25 cmp r0, 0 @@ -14240,34 +14240,34 @@ _08022EB8: blt _08022F0C cmp r5, 0 beq _08022F0C - ldr r0, _08022EEC @ =gUnknown_02024C0C + ldr r0, _08022EEC @ =gAbsentBankFlags ldrb r1, [r0] ldr r0, _08022EF0 @ =gBitTable ldr r0, [r0] ands r1, r0 cmp r1, 0 beq _08022EF8 - ldr r1, _08022EF4 @ =gUnknown_02024A60 + ldr r1, _08022EF4 @ =gActiveBank movs r0, 0x2 strb r0, [r1] b _08022EFC .align 2, 0 -_08022EE8: .4byte gUnknown_02024D68 -_08022EEC: .4byte gUnknown_02024C0C +_08022EE8: .4byte gSpecialStatuses +_08022EEC: .4byte gAbsentBankFlags _08022EF0: .4byte gBitTable -_08022EF4: .4byte gUnknown_02024A60 +_08022EF4: .4byte gActiveBank _08022EF8: - ldr r0, _08022F3C @ =gUnknown_02024A60 + ldr r0, _08022F3C @ =gActiveBank strb r1, [r0] _08022EFC: movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 - ldr r0, _08022F3C @ =gUnknown_02024A60 + bl EmitLinkStandbyMsg + ldr r0, _08022F3C @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08022F0C: - ldr r1, _08022F40 @ =gUnknown_02024D68 + ldr r1, _08022F40 @ =gSpecialStatuses ldrb r0, [r1, 0x14] lsls r0, 25 cmp r0, 0 @@ -14280,41 +14280,41 @@ _08022F0C: blt _08022F62 cmp r5, 0 beq _08022F62 - ldr r0, _08022F44 @ =gUnknown_02024C0C + ldr r0, _08022F44 @ =gAbsentBankFlags ldrb r0, [r0] ldr r1, _08022F48 @ =gBitTable ldr r1, [r1, 0x4] ands r0, r1 cmp r0, 0 beq _08022F4C - ldr r1, _08022F3C @ =gUnknown_02024A60 + ldr r1, _08022F3C @ =gActiveBank movs r0, 0x3 b _08022F50 .align 2, 0 -_08022F3C: .4byte gUnknown_02024A60 -_08022F40: .4byte gUnknown_02024D68 -_08022F44: .4byte gUnknown_02024C0C +_08022F3C: .4byte gActiveBank +_08022F40: .4byte gSpecialStatuses +_08022F44: .4byte gAbsentBankFlags _08022F48: .4byte gBitTable _08022F4C: - ldr r1, _08022F6C @ =gUnknown_02024A60 + ldr r1, _08022F6C @ =gActiveBank movs r0, 0x1 _08022F50: strb r0, [r1] movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 - ldr r0, _08022F6C @ =gUnknown_02024A60 + bl EmitLinkStandbyMsg + ldr r0, _08022F6C @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08022F62: - ldr r1, _08022F70 @ =gUnknown_02024C10 + ldr r1, _08022F70 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] b _08023302 .align 2, 0 -_08022F6C: .4byte gUnknown_02024A60 -_08022F70: .4byte gUnknown_02024C10 +_08022F6C: .4byte gActiveBank +_08022F70: .4byte gBattlescriptCurrInstr _08022F74: cmp r0, 0x6 beq _08022F7A @@ -14334,7 +14334,7 @@ _08022F88: bne _08022F92 b _0802310C _08022F92: - ldr r7, _08022FF4 @ =gUnknown_02024C6C + ldr r7, _08022FF4 @ =gHitMarker ldr r0, [r7] lsrs r5, r0, 28 ldr r4, _08022FF8 @ =gBitTable @@ -14346,10 +14346,10 @@ _08022F92: ands r0, r5 cmp r0, 0 beq _0802303A - ldr r6, _08022FFC @ =gUnknown_02024A60 + ldr r6, _08022FFC @ =gActiveBank movs r0, 0x2 strb r0, [r6] - ldr r0, _08023000 @ =gUnknown_02024260 + ldr r0, _08023000 @ =gBattleBufferB ldrb r1, [r0, 0x1] movs r0, 0x2 movs r2, 0x6 @@ -14357,7 +14357,7 @@ _08022F92: lsls r0, 24 cmp r0, 0 beq _08023008 - ldr r2, _08023004 @ =gUnknown_02024C0C + ldr r2, _08023004 @ =gAbsentBankFlags ldrb r0, [r6] lsls r0, 2 adds r0, r4 @@ -14376,17 +14376,17 @@ _08022F92: movs r0, 0 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r6] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _0802303A .align 2, 0 _08022FF0: .4byte gBattleTypeFlags -_08022FF4: .4byte gUnknown_02024C6C +_08022FF4: .4byte gHitMarker _08022FF8: .4byte gBitTable -_08022FFC: .4byte gUnknown_02024A60 -_08023000: .4byte gUnknown_02024260 -_08023004: .4byte gUnknown_02024C0C +_08022FFC: .4byte gActiveBank +_08023000: .4byte gBattleBufferB +_08023004: .4byte gAbsentBankFlags _08023008: - ldr r4, _08023098 @ =gUnknown_02024D68 + ldr r4, _08023098 @ =gSpecialStatuses ldrb r0, [r6] lsls r1, r0, 2 adds r1, r0 @@ -14420,10 +14420,10 @@ _0802303A: ands r5, r0 cmp r5, 0 beq _080230EE - ldr r5, _080230A8 @ =gUnknown_02024A60 + ldr r5, _080230A8 @ =gActiveBank movs r0, 0x3 strb r0, [r5] - ldr r0, _080230AC @ =gUnknown_02024260 + ldr r0, _080230AC @ =gBattleBufferB ldr r2, _080230B0 @ =0x00000201 adds r0, r2 ldrb r1, [r0] @@ -14433,7 +14433,7 @@ _0802303A: lsls r0, 24 cmp r0, 0 beq _080230BC - ldr r2, _080230B4 @ =gUnknown_02024C0C + ldr r2, _080230B4 @ =gAbsentBankFlags ldrb r0, [r5] lsls r0, 2 adds r0, r4 @@ -14441,7 +14441,7 @@ _0802303A: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _080230B8 @ =gUnknown_02024C6C + ldr r2, _080230B8 @ =gHitMarker ldrb r0, [r5] lsls r0, 2 adds r0, r4 @@ -14453,20 +14453,20 @@ _0802303A: movs r0, 0 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _080230EE .align 2, 0 -_08023098: .4byte gUnknown_02024D68 +_08023098: .4byte gSpecialStatuses _0802309C: .4byte 0x02000000 _080230A0: .4byte 0x00016068 _080230A4: .4byte gBitTable -_080230A8: .4byte gUnknown_02024A60 -_080230AC: .4byte gUnknown_02024260 +_080230A8: .4byte gActiveBank +_080230AC: .4byte gBattleBufferB _080230B0: .4byte 0x00000201 -_080230B4: .4byte gUnknown_02024C0C -_080230B8: .4byte gUnknown_02024C6C +_080230B4: .4byte gAbsentBankFlags +_080230B8: .4byte gHitMarker _080230BC: - ldr r4, _080230FC @ =gUnknown_02024D68 + ldr r4, _080230FC @ =gSpecialStatuses ldrb r0, [r5] lsls r1, r0, 2 adds r1, r0 @@ -14491,31 +14491,31 @@ _080230BC: orrs r1, r2 strb r1, [r0] _080230EE: - ldr r1, _08023108 @ =gUnknown_02024C10 + ldr r1, _08023108 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] mov r12, r1 b _08023110 .align 2, 0 -_080230FC: .4byte gUnknown_02024D68 +_080230FC: .4byte gSpecialStatuses _08023100: .4byte 0x02000000 _08023104: .4byte 0x00016069 -_08023108: .4byte gUnknown_02024C10 +_08023108: .4byte gBattlescriptCurrInstr _0802310C: adds r0, r1, 0x6 str r0, [r6] _08023110: - ldr r0, _08023160 @ =gUnknown_02024C6C + ldr r0, _08023160 @ =gHitMarker ldr r0, [r0] lsrs r5, r0, 28 - ldr r1, _08023164 @ =gUnknown_02024C09 + ldr r1, _08023164 @ =gBank1 movs r0, 0 strb r0, [r1] ldr r4, _08023168 @ =gBitTable ldr r2, [r4] ands r2, r5 - ldr r6, _0802316C @ =gUnknown_02024A68 + ldr r6, _0802316C @ =gNoOfAllBanks cmp r2, 0 bne _0802314C adds r7, r6, 0 @@ -14549,10 +14549,10 @@ _08023156: str r1, [r2] b _08023302 .align 2, 0 -_08023160: .4byte gUnknown_02024C6C -_08023164: .4byte gUnknown_02024C09 +_08023160: .4byte gHitMarker +_08023164: .4byte gBank1 _08023168: .4byte gBitTable -_0802316C: .4byte gUnknown_02024A68 +_0802316C: .4byte gNoOfAllBanks _08023170: movs r0, 0x80 ands r0, r2 @@ -14566,7 +14566,7 @@ _0802317C: bl sub_8015150 lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080231A4 @ =gUnknown_02024D68 + ldr r1, _080231A4 @ =gSpecialStatuses lsls r0, r7, 2 adds r0, r7 lsls r0, 2 @@ -14580,7 +14580,7 @@ _0802317C: str r0, [r6] b _08023302 .align 2, 0 -_080231A4: .4byte gUnknown_02024D68 +_080231A4: .4byte gSpecialStatuses _080231A8: adds r0, r7, 0 movs r1, 0x6 @@ -14589,9 +14589,9 @@ _080231A8: lsls r0, 24 cmp r0, 0 beq _080231F8 - ldr r2, _080231E8 @ =gUnknown_02024A60 + ldr r2, _080231E8 @ =gActiveBank strb r7, [r2] - ldr r3, _080231EC @ =gUnknown_02024C0C + ldr r3, _080231EC @ =gAbsentBankFlags ldr r4, _080231F0 @ =gBitTable ldrb r0, [r2] lsls r0, 2 @@ -14600,7 +14600,7 @@ _080231A8: ldrb r1, [r3] orrs r0, r1 strb r0, [r3] - ldr r3, _080231F4 @ =gUnknown_02024C6C + ldr r3, _080231F4 @ =gHitMarker ldrb r0, [r2] lsls r0, 2 adds r0, r4 @@ -14613,19 +14613,19 @@ _080231A8: str r0, [r6] b _08023302 .align 2, 0 -_080231E8: .4byte gUnknown_02024A60 -_080231EC: .4byte gUnknown_02024C0C +_080231E8: .4byte gActiveBank +_080231EC: .4byte gAbsentBankFlags _080231F0: .4byte gBitTable -_080231F4: .4byte gUnknown_02024C6C +_080231F4: .4byte gHitMarker _080231F8: - ldr r4, _080232A0 @ =gUnknown_02024A60 + ldr r4, _080232A0 @ =gActiveBank strb r7, [r4] ldr r3, _080232A4 @ =0x02000000 ldrb r0, [r4] ldr r2, _080232A8 @ =0x00016064 adds r1, r0, r2 adds r1, r3 - ldr r2, _080232AC @ =gUnknown_02024A6A + ldr r2, _080232AC @ =gBattlePartyID lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -14649,16 +14649,16 @@ _080231F8: movs r3, 0 bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r6] adds r0, 0x6 str r0, [r6] ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _0802325A - ldr r1, _080232B8 @ =gUnknown_030042E0 + ldr r1, _080232B8 @ =gBattleResults ldrb r0, [r1, 0x2] cmp r0, 0xFE bhi _0802325A @@ -14671,10 +14671,10 @@ _0802325A: ands r0, r1 cmp r0, 0 beq _080232C4 - ldr r1, _080232A0 @ =gUnknown_02024A60 + ldr r1, _080232A0 @ =gActiveBank movs r0, 0 strb r0, [r1] - ldr r0, _080232C0 @ =gUnknown_02024A68 + ldr r0, _080232C0 @ =gNoOfAllBanks ldrb r0, [r0] cmp r0, 0 beq _08023302 @@ -14685,14 +14685,14 @@ _08023276: beq _0802328A movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 + bl EmitLinkStandbyMsg ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _0802328A: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _080232C0 @ =gUnknown_02024A68 + ldr r1, _080232C0 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -14700,26 +14700,26 @@ _0802328A: bcc _08023276 b _08023302 .align 2, 0 -_080232A0: .4byte gUnknown_02024A60 +_080232A0: .4byte gActiveBank _080232A4: .4byte 0x02000000 _080232A8: .4byte 0x00016064 -_080232AC: .4byte gUnknown_02024A6A +_080232AC: .4byte gBattlePartyID _080232B0: .4byte 0x00016068 _080232B4: .4byte 0x0001606c -_080232B8: .4byte gUnknown_030042E0 +_080232B8: .4byte gBattleResults _080232BC: .4byte gBattleTypeFlags -_080232C0: .4byte gUnknown_02024A68 +_080232C0: .4byte gNoOfAllBanks _080232C4: adds r0, r7, 0 - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r4, _08023310 @ =gUnknown_02024A60 + bl GetBankByPlayerAI + ldr r4, _08023310 @ =gActiveBank strb r0, [r4] - ldr r0, _08023314 @ =gUnknown_02024C0C + ldr r0, _08023314 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _08023318 @ =gBitTable ldrb r3, [r4] @@ -14735,9 +14735,9 @@ _080232C4: _080232F4: movs r0, 0 movs r1, 0x2 - bl sub_800D1D8 + bl EmitLinkStandbyMsg ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08023302: add sp, 0x4 pop {r3,r4} @@ -14747,8 +14747,8 @@ _08023302: pop {r0} bx r0 .align 2, 0 -_08023310: .4byte gUnknown_02024A60 -_08023314: .4byte gUnknown_02024C0C +_08023310: .4byte gActiveBank +_08023314: .4byte gAbsentBankFlags _08023318: .4byte gBitTable thumb_func_end atk50_openpartyscreen @@ -14757,17 +14757,17 @@ sub_802331C: @ 802331C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0802334C @ =gUnknown_02024A64 + ldr r0, _0802334C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0802332C b _080234FE _0802332C: - ldr r4, _08023350 @ =gUnknown_02024C10 + ldr r4, _08023350 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r7, _08023354 @ =gUnknown_02024A60 + ldr r7, _08023354 @ =gActiveBank strb r0, [r7] ldr r0, [r4] ldrb r0, [r0, 0x2] @@ -14779,23 +14779,23 @@ _0802332C: beq _0802335E b _080234F6 .align 2, 0 -_0802334C: .4byte gUnknown_02024A64 -_08023350: .4byte gUnknown_02024C10 -_08023354: .4byte gUnknown_02024A60 +_0802334C: .4byte gBattleExecBuffer +_08023350: .4byte gBattlescriptCurrInstr +_08023354: .4byte gActiveBank _08023358: cmp r0, 0x2 beq _080233BC b _080234F6 _0802335E: movs r3, 0 - ldr r2, _08023390 @ =gUnknown_02024A68 + ldr r2, _08023390 @ =gNoOfAllBanks ldrb r0, [r2] cmp r3, r0 blt _0802336A b _080234F6 _0802336A: ldr r0, _08023394 @ =0x02000000 - ldr r1, _08023398 @ =gUnknown_02024260 + ldr r1, _08023398 @ =gBattleBufferB movs r5, 0x80 lsls r5, 2 adds r4, r2, 0 @@ -14816,9 +14816,9 @@ _08023382: blt _08023378 b _080234F6 .align 2, 0 -_08023390: .4byte gUnknown_02024A68 +_08023390: .4byte gNoOfAllBanks _08023394: .4byte 0x02000000 -_08023398: .4byte gUnknown_02024260 +_08023398: .4byte gBattleBufferB _0802339C: .4byte 0x00016068 _080233A0: ldr r0, _080233B8 @ =gBattleTypeFlags @@ -14835,8 +14835,8 @@ _080233AE: .align 2, 0 _080233B8: .4byte gBattleTypeFlags _080233BC: - ldr r1, _08023484 @ =gUnknown_02024D1E - ldr r4, _08023488 @ =gUnknown_02024260 + ldr r1, _08023484 @ =gBattleCommunication + ldr r4, _08023488 @ =gBattleBufferB ldrb r0, [r7] lsls r0, 9 adds r2, r4, 0x1 @@ -14936,8 +14936,8 @@ _080233BC: strb r0, [r1] b _080234AA .align 2, 0 -_08023484: .4byte gUnknown_02024D1E -_08023488: .4byte gUnknown_02024260 +_08023484: .4byte gBattleCommunication +_08023488: .4byte gBattleBufferB _0802348C: .4byte 0x02000000 _08023490: .4byte 0x00016068 _08023494: .4byte gBattleTypeFlags @@ -14948,13 +14948,13 @@ _080234A4: ldrb r0, [r7] bl sub_8012258 _080234AA: - ldr r1, _08023508 @ =gUnknown_030041C0 + ldr r1, _08023508 @ =gBattleTextBuff1 movs r5, 0xFD strb r5, [r1] movs r0, 0x6 strb r0, [r1, 0x1] ldr r4, _0802350C @ =gBattleMons - ldr r3, _08023510 @ =gPlayerMonIndex + ldr r3, _08023510 @ =gBankAttacker ldrb r0, [r3] movs r2, 0x58 muls r0, r2 @@ -14969,14 +14969,14 @@ _080234AA: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r2, _08023514 @ =gUnknown_03004290 + ldr r2, _08023514 @ =gBattleTextBuff2 strb r5, [r2] movs r0, 0x7 strb r0, [r2, 0x1] - ldr r3, _08023518 @ =gUnknown_02024A60 + ldr r3, _08023518 @ =gActiveBank ldrb r0, [r3] strb r0, [r2, 0x2] - ldr r1, _0802351C @ =gUnknown_02024260 + ldr r1, _0802351C @ =gBattleBufferB ldrb r0, [r3] lsls r0, 9 adds r1, 0x1 @@ -14987,7 +14987,7 @@ _080234AA: negs r0, r0 strb r0, [r2, 0x4] _080234F6: - ldr r1, _08023520 @ =gUnknown_02024C10 + ldr r1, _08023520 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 str r0, [r1] @@ -14998,13 +14998,13 @@ _080234FE: pop {r0} bx r0 .align 2, 0 -_08023508: .4byte gUnknown_030041C0 +_08023508: .4byte gBattleTextBuff1 _0802350C: .4byte gBattleMons -_08023510: .4byte gPlayerMonIndex -_08023514: .4byte gUnknown_03004290 -_08023518: .4byte gUnknown_02024A60 -_0802351C: .4byte gUnknown_02024260 -_08023520: .4byte gUnknown_02024C10 +_08023510: .4byte gBankAttacker +_08023514: .4byte gBattleTextBuff2 +_08023518: .4byte gActiveBank +_0802351C: .4byte gBattleBufferB +_08023520: .4byte gBattlescriptCurrInstr thumb_func_end sub_802331C thumb_func_start sub_8023524 @@ -15014,15 +15014,15 @@ sub_8023524: @ 8023524 mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r6, _08023630 @ =gUnknown_02024C10 + ldr r6, _08023630 @ =gBattlescriptCurrInstr ldr r0, [r6] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _08023634 @ =gUnknown_02024A60 + ldr r4, _08023634 @ =gActiveBank strb r0, [r4] ldrb r0, [r4] bl sub_80157C4 - ldr r2, _08023638 @ =gUnknown_02024C6C + ldr r2, _08023638 @ =gHitMarker ldr r1, _0802363C @ =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -15032,7 +15032,7 @@ sub_8023524: @ 8023524 ldr r0, [r2] bics r0, r1 str r0, [r2] - ldr r2, _08023640 @ =gUnknown_02024D68 + ldr r2, _08023640 @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -15044,8 +15044,8 @@ sub_8023524: @ 8023524 ands r0, r2 strb r0, [r1] ldrb r0, [r4] - bl battle_side_get_owner - ldr r5, _08023644 @ =gUnknown_02024C7A + bl GetBankSide + ldr r5, _08023644 @ =gSideAffecting lsls r0, 24 lsrs r0, 23 adds r0, r5 @@ -15057,7 +15057,7 @@ sub_8023524: @ 8023524 cmp r0, 0 bne _0802367C ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 23 adds r0, r5 @@ -15089,7 +15089,7 @@ sub_8023524: @ 8023524 cmp r0, 0x1A beq _0802367C adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 23 adds r0, r5 @@ -15098,8 +15098,8 @@ sub_8023524: @ 8023524 orrs r1, r2 strh r1, [r0] ldrb r0, [r4] - bl battle_side_get_owner - ldr r2, _0802364C @ =gUnknown_02024C80 + bl GetBankSide + ldr r2, _0802364C @ =gSideTimer lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -15137,14 +15137,14 @@ _08023614: str r0, [r6] b _080237B6 .align 2, 0 -_08023630: .4byte gUnknown_02024C10 -_08023634: .4byte gUnknown_02024A60 -_08023638: .4byte gUnknown_02024C6C +_08023630: .4byte gBattlescriptCurrInstr +_08023634: .4byte gActiveBank +_08023638: .4byte gHitMarker _0802363C: .4byte gBitTable -_08023640: .4byte gUnknown_02024D68 -_08023644: .4byte gUnknown_02024C7A +_08023640: .4byte gSpecialStatuses +_08023644: .4byte gSideAffecting _08023648: .4byte gBattleMons -_0802364C: .4byte gUnknown_02024C80 +_0802364C: .4byte gSideTimer _08023650: .4byte gBattleMoveDamage _08023654: .4byte 0x02000000 _08023658: .4byte 0x00016003 @@ -15165,7 +15165,7 @@ _08023670: _08023678: .4byte gUnknown_081D91CD _0802367C: ldr r1, _08023754 @ =gBattleMons - ldr r5, _08023758 @ =gUnknown_02024A60 + ldr r5, _08023758 @ =gActiveBank ldrb r2, [r5] movs r0, 0x58 muls r0, r2 @@ -15174,7 +15174,7 @@ _0802367C: ldrb r0, [r0] cmp r0, 0x36 bne _080236A2 - ldr r1, _0802375C @ =gUnknown_02024CA8 + ldr r1, _0802375C @ =gDisableStructs lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -15189,7 +15189,7 @@ _080236A2: str r0, [sp] movs r2, 0 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080236B8 @@ -15203,8 +15203,8 @@ _080236B8: cmp r0, 0 bne _080237B6 ldrb r0, [r5] - bl battle_side_get_owner - ldr r1, _08023760 @ =gUnknown_02024C7A + bl GetBankSide + ldr r1, _08023760 @ =gSideAffecting lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -15213,11 +15213,11 @@ _080236B8: ands r1, r2 strh r1, [r0] movs r4, 0 - ldr r0, _08023768 @ =gUnknown_02024A68 + ldr r0, _08023768 @ =gNoOfAllBanks ldrb r3, [r0] cmp r4, r3 bge _08023706 - ldr r6, _0802376C @ =gUnknown_02024A7A + ldr r6, _0802376C @ =gTurnOrder ldr r3, _08023770 @ =gUnknown_02024A76 movs r2, 0xC adds r1, r0, 0 @@ -15236,7 +15236,7 @@ _080236FE: blt _080236F0 _08023706: movs r4, 0 - ldr r0, _08023768 @ =gUnknown_02024A68 + ldr r0, _08023768 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bge _08023736 @@ -15244,7 +15244,7 @@ _08023706: _08023712: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 23 ldr r1, _08023774 @ =0x020160bc @@ -15255,21 +15255,21 @@ _08023712: ldrh r1, [r1, 0x28] strh r1, [r0] adds r4, 0x1 - ldr r0, _08023768 @ =gUnknown_02024A68 + ldr r0, _08023768 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08023712 _08023736: - ldr r0, _08023778 @ =gUnknown_02024C10 + ldr r0, _08023778 @ =gBattlescriptCurrInstr ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x5 bne _080237B0 - ldr r0, _0802377C @ =gUnknown_02024C6C + ldr r0, _0802377C @ =gHitMarker ldr r0, [r0] lsrs r4, r0, 28 - ldr r1, _08023780 @ =gUnknown_02024C09 + ldr r1, _08023780 @ =gBank1 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -15277,20 +15277,20 @@ _08023736: b _08023796 .align 2, 0 _08023754: .4byte gBattleMons -_08023758: .4byte gUnknown_02024A60 -_0802375C: .4byte gUnknown_02024CA8 -_08023760: .4byte gUnknown_02024C7A +_08023758: .4byte gActiveBank +_0802375C: .4byte gDisableStructs +_08023760: .4byte gSideAffecting _08023764: .4byte 0x0000fdff -_08023768: .4byte gUnknown_02024A68 -_0802376C: .4byte gUnknown_02024A7A +_08023768: .4byte gNoOfAllBanks +_0802376C: .4byte gTurnOrder _08023770: .4byte gUnknown_02024A76 _08023774: .4byte 0x020160bc -_08023778: .4byte gUnknown_02024C10 -_0802377C: .4byte gUnknown_02024C6C -_08023780: .4byte gUnknown_02024C09 +_08023778: .4byte gBattlescriptCurrInstr +_0802377C: .4byte gHitMarker +_08023780: .4byte gBank1 _08023784: .4byte gBitTable _08023788: - ldr r0, _080237C4 @ =gUnknown_02024A68 + ldr r0, _080237C4 @ =gNoOfAllBanks ldrb r3, [r1] ldrb r0, [r0] cmp r3, r0 @@ -15306,7 +15306,7 @@ _08023796: ands r0, r3 cmp r0, 0 beq _08023788 - ldr r0, _080237C8 @ =gUnknown_02024C0C + ldr r0, _080237C8 @ =gAbsentBankFlags ldrb r0, [r0] ands r0, r3 cmp r0, 0 @@ -15324,14 +15324,14 @@ _080237B6: pop {r0} bx r0 .align 2, 0 -_080237C4: .4byte gUnknown_02024A68 -_080237C8: .4byte gUnknown_02024C0C +_080237C4: .4byte gNoOfAllBanks +_080237C8: .4byte gAbsentBankFlags thumb_func_end sub_8023524 thumb_func_start sub_80237CC sub_80237CC: @ 80237CC push {lr} - ldr r0, _080237DC @ =gUnknown_02024C10 + ldr r0, _080237DC @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -15339,46 +15339,46 @@ sub_80237CC: @ 80237CC movs r0, 0 b _080237E2 .align 2, 0 -_080237DC: .4byte gUnknown_02024C10 +_080237DC: .4byte gBattlescriptCurrInstr _080237E0: movs r0, 0x1 _080237E2: - bl battle_get_side_with_given_state - ldr r1, _08023804 @ =gUnknown_02024A60 + bl GetBankByPlayerAI + ldr r1, _08023804 @ =gActiveBank strb r0, [r1] movs r0, 0 bl dp01_build_cmdbuf_x08_8_8_8 - ldr r0, _08023804 @ =gUnknown_02024A60 + ldr r0, _08023804 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08023808 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _08023808 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08023804: .4byte gUnknown_02024A60 -_08023808: .4byte gUnknown_02024C10 +_08023804: .4byte gActiveBank +_08023808: .4byte gBattlescriptCurrInstr thumb_func_end sub_80237CC thumb_func_start atk54_802511C atk54_802511C: @ 802380C push {r4,r5,lr} - ldr r5, _0802383C @ =gUnknown_02024A60 - ldr r0, _08023840 @ =gPlayerMonIndex + ldr r5, _0802383C @ =gActiveBank + ldr r0, _08023840 @ =gBankAttacker ldrb r0, [r0] strb r0, [r5] - ldr r4, _08023844 @ =gUnknown_02024C10 + ldr r4, _08023844 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] lsls r0, 8 orrs r1, r0 movs r0, 0 - bl dp01_build_cmdbuf_x2B_aa_0 + bl EmitEffectivenessSound ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r4] adds r0, 0x3 str r0, [r4] @@ -15386,19 +15386,19 @@ atk54_802511C: @ 802380C pop {r0} bx r0 .align 2, 0 -_0802383C: .4byte gUnknown_02024A60 -_08023840: .4byte gPlayerMonIndex -_08023844: .4byte gUnknown_02024C10 +_0802383C: .4byte gActiveBank +_08023840: .4byte gBankAttacker +_08023844: .4byte gBattlescriptCurrInstr thumb_func_end atk54_802511C thumb_func_start sub_8023848 sub_8023848: @ 8023848 push {r4,r5,lr} - ldr r5, _08023878 @ =gUnknown_02024A60 - ldr r0, _0802387C @ =gPlayerMonIndex + ldr r5, _08023878 @ =gActiveBank + ldr r0, _0802387C @ =gBankAttacker ldrb r0, [r0] strb r0, [r5] - ldr r4, _08023880 @ =gUnknown_02024C10 + ldr r4, _08023880 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -15407,7 +15407,7 @@ sub_8023848: @ 8023848 movs r0, 0 bl sub_800D074 ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r4] adds r0, 0x3 str r0, [r4] @@ -15415,24 +15415,24 @@ sub_8023848: @ 8023848 pop {r0} bx r0 .align 2, 0 -_08023878: .4byte gUnknown_02024A60 -_0802387C: .4byte gPlayerMonIndex -_08023880: .4byte gUnknown_02024C10 +_08023878: .4byte gActiveBank +_0802387C: .4byte gBankAttacker +_08023880: .4byte gBattlescriptCurrInstr thumb_func_end sub_8023848 thumb_func_start atk56_8025194 atk56_8025194: @ 8023884 push {r4,r5,lr} - ldr r5, _080238AC @ =gUnknown_02024C10 + ldr r5, _080238AC @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _080238B0 @ =gUnknown_02024A60 + ldr r4, _080238B0 @ =gActiveBank strb r0, [r4] movs r0, 0 - bl dp01_build_cmdbuf_x2D_2D_2D_2D + bl EmitFaintingCry ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -15440,24 +15440,24 @@ atk56_8025194: @ 8023884 pop {r0} bx r0 .align 2, 0 -_080238AC: .4byte gUnknown_02024C10 -_080238B0: .4byte gUnknown_02024A60 +_080238AC: .4byte gBattlescriptCurrInstr +_080238B0: .4byte gActiveBank thumb_func_end atk56_8025194 thumb_func_start atk57_80251C4_flee atk57_80251C4_flee: @ 80238B4 push {r4,lr} movs r0, 0 - bl battle_get_side_with_given_state - ldr r4, _080238E0 @ =gUnknown_02024A60 + bl GetBankByPlayerAI + ldr r4, _080238E0 @ =gActiveBank strb r0, [r4] - ldr r0, _080238E4 @ =gUnknown_02024D26 + ldr r0, _080238E4 @ =gBattleOutcome ldrb r1, [r0] movs r0, 0 bl dp01_build_cmdbuf_x37_a ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _080238E8 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _080238E8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -15465,25 +15465,25 @@ atk57_80251C4_flee: @ 80238B4 pop {r0} bx r0 .align 2, 0 -_080238E0: .4byte gUnknown_02024A60 -_080238E4: .4byte gUnknown_02024D26 -_080238E8: .4byte gUnknown_02024C10 +_080238E0: .4byte gActiveBank +_080238E4: .4byte gBattleOutcome +_080238E8: .4byte gBattlescriptCurrInstr thumb_func_end atk57_80251C4_flee thumb_func_start atk58_cmd58 atk58_cmd58: @ 80238EC push {r4,r5,lr} - ldr r5, _08023918 @ =gUnknown_02024C10 + ldr r5, _08023918 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _0802391C @ =gUnknown_02024A60 + ldr r4, _0802391C @ =gActiveBank strb r0, [r4] movs r0, 0 movs r1, 0x1 bl dp01_build_cmdbuf_x06_a ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -15491,8 +15491,8 @@ atk58_cmd58: @ 80238EC pop {r0} bx r0 .align 2, 0 -_08023918: .4byte gUnknown_02024C10 -_0802391C: .4byte gUnknown_02024A60 +_08023918: .4byte gBattlescriptCurrInstr +_0802391C: .4byte gActiveBank thumb_func_end atk58_cmd58 thumb_func_start atk59_8025230 @@ -15501,7 +15501,7 @@ atk59_8025230: @ 8023920 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0802399C @ =gUnknown_02024C10 + ldr r0, _0802399C @ =gBattlescriptCurrInstr ldr r2, [r0] ldrb r6, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -15556,11 +15556,11 @@ _0802397A: _08023992: cmp r5, 0 bne _080239B0 - ldr r0, _0802399C @ =gUnknown_02024C10 + ldr r0, _0802399C @ =gBattlescriptCurrInstr str r4, [r0] b _08023A58 .align 2, 0 -_0802399C: .4byte gUnknown_02024C10 +_0802399C: .4byte gBattlescriptCurrInstr _080239A0: .4byte 0x02000000 _080239A4: .4byte 0x00016018 _080239A8: .4byte gPlayerParty @@ -15569,20 +15569,20 @@ _080239B0: ldr r0, _080239C0 @ =0x0000ffff cmp r5, r0 bne _080239C8 - ldr r1, _080239C4 @ =gUnknown_02024C10 + ldr r1, _080239C4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] b _08023A58 .align 2, 0 _080239C0: .4byte 0x0000ffff -_080239C4: .4byte gUnknown_02024C10 +_080239C4: .4byte gBattlescriptCurrInstr _080239C8: movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, _08023A64 @ =gUnknown_02024A60 + bl GetBankByPlayerAI + ldr r1, _08023A64 @ =gActiveBank strb r0, [r1] - ldr r0, _08023A68 @ =gUnknown_02024A6A + ldr r0, _08023A68 @ =gBattlePartyID ldrb r2, [r1] lsls r1, r2, 1 adds r1, r0 @@ -15616,10 +15616,10 @@ _08023A08: cmp r0, 0 beq _08023A54 movs r0, 0x2 - bl battle_get_side_with_given_state - ldr r1, _08023A64 @ =gUnknown_02024A60 + bl GetBankByPlayerAI + ldr r1, _08023A64 @ =gActiveBank strb r0, [r1] - ldr r0, _08023A68 @ =gUnknown_02024A6A + ldr r0, _08023A68 @ =gBattlePartyID ldrb r2, [r1] lsls r1, r2, 1 adds r1, r0 @@ -15646,7 +15646,7 @@ _08023A08: adds r1, r5, 0 bl GiveMoveToBattleMon _08023A54: - ldr r0, _08023A7C @ =gUnknown_02024C10 + ldr r0, _08023A7C @ =gBattlescriptCurrInstr str r6, [r0] _08023A58: pop {r3,r4} @@ -15656,13 +15656,13 @@ _08023A58: pop {r0} bx r0 .align 2, 0 -_08023A64: .4byte gUnknown_02024A60 -_08023A68: .4byte gUnknown_02024A6A +_08023A64: .4byte gActiveBank +_08023A68: .4byte gBattlePartyID _08023A6C: .4byte 0x02000000 _08023A70: .4byte 0x00016018 _08023A74: .4byte gBattleMons _08023A78: .4byte gBattleTypeFlags -_08023A7C: .4byte gUnknown_02024C10 +_08023A7C: .4byte gBattlescriptCurrInstr thumb_func_end atk59_8025230 thumb_func_start sub_8023A80 @@ -15729,7 +15729,7 @@ sub_8023AF8: @ 8023AF8 mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r1, _08023B24 @ =gUnknown_02024A60 + ldr r1, _08023B24 @ =gActiveBank movs r0, 0 strb r0, [r1] ldr r1, _08023B28 @ =0x02000000 @@ -15747,7 +15747,7 @@ _08023B18: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08023B24: .4byte gUnknown_02024A60 +_08023B24: .4byte gActiveBank _08023B28: .4byte 0x02000000 _08023B2C: .4byte 0x0001601a _08023B30: .4byte _08023B34 @@ -15768,14 +15768,14 @@ _08023B4C: adds r0, 0x1 movs r2, 0 strb r0, [r1] - ldr r0, _08023B70 @ =gUnknown_02024D1E + ldr r0, _08023B70 @ =gBattleCommunication strb r2, [r0, 0x1] bl sub_802BC6C b _08023E5C .align 2, 0 _08023B68: .4byte 0x02000000 _08023B6C: .4byte 0x0001601a -_08023B70: .4byte gUnknown_02024D1E +_08023B70: .4byte gBattleCommunication _08023B74: ldr r0, _08023BFC @ =gMain ldrh r1, [r0, 0x2E] @@ -15783,7 +15783,7 @@ _08023B74: ands r0, r1 cmp r0, 0 beq _08023B9A - ldr r4, _08023C00 @ =gUnknown_02024D1E + ldr r4, _08023C00 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _08023B9A @@ -15800,7 +15800,7 @@ _08023B9A: ands r0, r1 cmp r0, 0 beq _08023BC0 - ldr r4, _08023C00 @ =gUnknown_02024D1E + ldr r4, _08023C00 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _08023BC0 @@ -15819,7 +15819,7 @@ _08023BC0: beq _08023C0C movs r0, 0x5 bl PlaySE - ldr r0, _08023C00 @ =gUnknown_02024D1E + ldr r0, _08023C00 @ =gBattleCommunication ldrb r4, [r0, 0x1] cmp r4, 0 bne _08023C1C @@ -15839,7 +15839,7 @@ _08023BC0: b _08023E5A .align 2, 0 _08023BFC: .4byte gMain -_08023C00: .4byte gUnknown_02024D1E +_08023C00: .4byte gBattleCommunication _08023C04: .4byte 0x02000000 _08023C08: .4byte 0x0001601a _08023C0C: @@ -15952,9 +15952,9 @@ _08023CC8: cmp r0, 0 beq _08023D20 ldr r0, _08023D14 @ =0x0000013f - ldr r1, _08023D18 @ =gUnknown_02024A60 + ldr r1, _08023D18 @ =gActiveBank ldrb r1, [r1] - bl b_std_message + bl PrepareStringBattle ldr r1, _08023D1C @ =0x0001601a add r1, r9 movs r0, 0x5 @@ -15964,10 +15964,10 @@ _08023D08: .4byte 0x02000000 _08023D0C: .4byte 0x00016018 _08023D10: .4byte gPlayerParty _08023D14: .4byte 0x0000013f -_08023D18: .4byte gUnknown_02024A60 +_08023D18: .4byte gActiveBank _08023D1C: .4byte 0x0001601a _08023D20: - ldr r3, _08023E10 @ =gUnknown_02024C10 + ldr r3, _08023E10 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -15980,7 +15980,7 @@ _08023D20: lsls r0, 24 orrs r1, r0 str r1, [r3] - ldr r1, _08023E14 @ =gUnknown_03004290 + ldr r1, _08023E14 @ =gBattleTextBuff2 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -16006,7 +16006,7 @@ _08023D20: ldrh r1, [r7] adds r2, r5, 0 bl SetMonMoveSlot - ldr r0, _08023E1C @ =gUnknown_02024A6A + ldr r0, _08023E1C @ =gBattlePartyID ldrh r0, [r0] ldrb r6, [r6] cmp r0, r6 @@ -16018,7 +16018,7 @@ _08023D20: ands r0, r1 cmp r0, 0 bne _08023DB0 - ldr r0, _08023E24 @ =gUnknown_02024CA8 + ldr r0, _08023E24 @ =gDisableStructs ldrb r1, [r0, 0x18] lsrs r1, 4 ldr r2, _08023E28 @ =gBitTable @@ -16042,7 +16042,7 @@ _08023DB0: ands r0, r1 cmp r0, 0 beq _08023E5C - ldr r0, _08023E1C @ =gUnknown_02024A6A + ldr r0, _08023E1C @ =gBattlePartyID ldr r1, _08023E30 @ =0x02000000 ldr r2, _08023E34 @ =0x00016018 adds r1, r2 @@ -16060,7 +16060,7 @@ _08023DB0: ands r0, r1 cmp r0, 0 bne _08023E5C - ldr r0, _08023E24 @ =gUnknown_02024CA8 + ldr r0, _08023E24 @ =gDisableStructs adds r0, 0x50 ldrb r1, [r0] lsrs r1, 4 @@ -16082,27 +16082,27 @@ _08023DB0: bl SetBattleMonMoveSlot b _08023E5C .align 2, 0 -_08023E10: .4byte gUnknown_02024C10 -_08023E14: .4byte gUnknown_03004290 +_08023E10: .4byte gBattlescriptCurrInstr +_08023E14: .4byte gBattleTextBuff2 _08023E18: .4byte word_2024E82 -_08023E1C: .4byte gUnknown_02024A6A +_08023E1C: .4byte gBattlePartyID _08023E20: .4byte gBattleMons -_08023E24: .4byte gUnknown_02024CA8 +_08023E24: .4byte gDisableStructs _08023E28: .4byte gBitTable _08023E2C: .4byte gBattleTypeFlags _08023E30: .4byte 0x02000000 _08023E34: .4byte 0x00016018 _08023E38: bl sub_8023AD8 - ldr r1, _08023E48 @ =gUnknown_02024C10 + ldr r1, _08023E48 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08023E5C .align 2, 0 -_08023E48: .4byte gUnknown_02024C10 +_08023E48: .4byte gBattlescriptCurrInstr _08023E4C: - ldr r0, _08023E6C @ =gUnknown_02024A64 + ldr r0, _08023E6C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08023E5C @@ -16120,7 +16120,7 @@ _08023E5C: pop {r0} bx r0 .align 2, 0 -_08023E6C: .4byte gUnknown_02024A64 +_08023E6C: .4byte gBattleExecBuffer _08023E70: .4byte 0x0001601a thumb_func_end sub_8023AF8 @@ -16144,12 +16144,12 @@ _08023E90: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r0, _08023EA4 @ =gUnknown_02024D1E + ldr r0, _08023EA4 @ =gBattleCommunication strb r4, [r0, 0x1] bl sub_802BC6C b _08023F78 .align 2, 0 -_08023EA4: .4byte gUnknown_02024D1E +_08023EA4: .4byte gBattleCommunication _08023EA8: ldr r0, _08023F2C @ =gMain ldrh r1, [r0, 0x2E] @@ -16157,7 +16157,7 @@ _08023EA8: ands r0, r1 cmp r0, 0 beq _08023ECE - ldr r4, _08023F30 @ =gUnknown_02024D1E + ldr r4, _08023F30 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _08023ECE @@ -16174,7 +16174,7 @@ _08023ECE: ands r0, r1 cmp r0, 0 beq _08023EF4 - ldr r4, _08023F30 @ =gUnknown_02024D1E + ldr r4, _08023F30 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _08023EF4 @@ -16193,11 +16193,11 @@ _08023EF4: beq _08023F4C movs r0, 0x5 bl PlaySE - ldr r0, _08023F30 @ =gUnknown_02024D1E + ldr r0, _08023F30 @ =gBattleCommunication ldrb r0, [r0, 0x1] cmp r0, 0 beq _08023F38 - ldr r3, _08023F34 @ =gUnknown_02024C10 + ldr r3, _08023F34 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -16213,10 +16213,10 @@ _08023EF4: b _08023F40 .align 2, 0 _08023F2C: .4byte gMain -_08023F30: .4byte gUnknown_02024D1E -_08023F34: .4byte gUnknown_02024C10 +_08023F30: .4byte gBattleCommunication +_08023F34: .4byte gBattlescriptCurrInstr _08023F38: - ldr r1, _08023F48 @ =gUnknown_02024C10 + ldr r1, _08023F48 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -16224,7 +16224,7 @@ _08023F40: bl sub_8023AD8 b _08023F78 .align 2, 0 -_08023F48: .4byte gUnknown_02024C10 +_08023F48: .4byte gBattlescriptCurrInstr _08023F4C: movs r0, 0x2 ands r0, r1 @@ -16232,7 +16232,7 @@ _08023F4C: beq _08023F78 movs r0, 0x5 bl PlaySE - ldr r3, _08023F80 @ =gUnknown_02024C10 + ldr r3, _08023F80 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -16251,17 +16251,17 @@ _08023F78: pop {r0} bx r0 .align 2, 0 -_08023F80: .4byte gUnknown_02024C10 +_08023F80: .4byte gBattlescriptCurrInstr thumb_func_end atk5B_80256E0 thumb_func_start atk5C_cmd5c atk5C_cmd5c: @ 8023F84 push {r4,lr} - ldr r4, _08023FF0 @ =gUnknown_02024C10 + ldr r4, _08023FF0 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r2, _08023FF4 @ =gUnknown_02024A60 + ldr r2, _08023FF4 @ =gActiveBank strb r0, [r2] ldr r0, _08023FF8 @ =gBattleMoveFlags ldrb r1, [r0] @@ -16269,7 +16269,7 @@ atk5C_cmd5c: @ 8023F84 ands r0, r1 cmp r0, 0 bne _08024008 - ldr r0, _08023FFC @ =gUnknown_02024C6C + ldr r0, _08023FFC @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -16288,7 +16288,7 @@ atk5C_cmd5c: @ 8023F84 ands r0, r1 cmp r0, 0 beq _08023FD6 - ldr r0, _08024004 @ =gUnknown_02024CA8 + ldr r0, _08024004 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -16298,22 +16298,22 @@ atk5C_cmd5c: @ 8023F84 bne _08024008 _08023FD6: movs r0, 0 - bl dp01_build_cmdbuf_x29_29_29_29 - ldr r0, _08023FF4 @ =gUnknown_02024A60 + bl EmitHitAnimation + ldr r0, _08023FF4 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08023FF0 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _08023FF0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] b _0802400E .align 2, 0 -_08023FF0: .4byte gUnknown_02024C10 -_08023FF4: .4byte gUnknown_02024A60 +_08023FF0: .4byte gBattlescriptCurrInstr +_08023FF4: .4byte gActiveBank _08023FF8: .4byte gBattleMoveFlags -_08023FFC: .4byte gUnknown_02024C6C +_08023FFC: .4byte gHitMarker _08024000: .4byte gBattleMons -_08024004: .4byte gUnknown_02024CA8 +_08024004: .4byte gDisableStructs _08024008: ldr r0, [r4] adds r0, 0x2 @@ -16481,7 +16481,7 @@ _08024140: mov r0, r8 adds r1, r4, 0 bl sub_80B79B8 - ldr r1, _0802418C @ =gUnknown_030041C0 + ldr r1, _0802418C @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x1 @@ -16505,7 +16505,7 @@ _08024140: strb r0, [r1, 0x7] movs r0, 0xFF strb r0, [r1, 0x8] - ldr r1, _08024190 @ =gUnknown_02024C10 + ldr r1, _08024190 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -16515,8 +16515,8 @@ _08024140: pop {r0} bx r0 .align 2, 0 -_0802418C: .4byte gUnknown_030041C0 -_08024190: .4byte gUnknown_02024C10 +_0802418C: .4byte gBattleTextBuff1 +_08024190: .4byte gBattlescriptCurrInstr thumb_func_end sub_8024014 thumb_func_start atk5E_8025A70 @@ -16524,13 +16524,13 @@ atk5E_8025A70: @ 8024194 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _080241B8 @ =gUnknown_02024C10 + ldr r4, _080241B8 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r6, _080241BC @ =gUnknown_02024A60 + ldr r6, _080241BC @ =gActiveBank strb r0, [r6] - ldr r5, _080241C0 @ =gUnknown_02024D1E + ldr r5, _080241C0 @ =gBattleCommunication ldrb r0, [r5] mov r8, r4 cmp r0, 0 @@ -16539,22 +16539,22 @@ atk5E_8025A70: @ 8024194 beq _080241DC b _08024230 .align 2, 0 -_080241B8: .4byte gUnknown_02024C10 -_080241BC: .4byte gUnknown_02024A60 -_080241C0: .4byte gUnknown_02024D1E +_080241B8: .4byte gBattlescriptCurrInstr +_080241BC: .4byte gActiveBank +_080241C0: .4byte gBattleCommunication _080241C4: movs r0, 0 movs r1, 0 movs r2, 0 - bl dp01_build_cmdbuf_x00_a_b_0 + bl EmitGetAttributes ldrb r0, [r6] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] b _08024230 _080241DC: - ldr r0, _0802423C @ =gUnknown_02024A64 + ldr r0, _0802423C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08024230 @@ -16604,7 +16604,7 @@ _08024230: pop {r0} bx r0 .align 2, 0 -_0802423C: .4byte gUnknown_02024A64 +_0802423C: .4byte gBattleExecBuffer _08024240: .4byte gUnknown_02024264 _08024244: .4byte gUnknown_02024AA4 thumb_func_end atk5E_8025A70 @@ -16612,15 +16612,15 @@ _08024244: .4byte gUnknown_02024AA4 thumb_func_start atk5F_8025B24 atk5F_8025B24: @ 8024248 push {lr} - ldr r0, _08024270 @ =gUnknown_02024A60 - ldr r2, _08024274 @ =gPlayerMonIndex + ldr r0, _08024270 @ =gActiveBank + ldr r2, _08024274 @ =gBankAttacker ldrb r3, [r2] strb r3, [r0] - ldr r1, _08024278 @ =gEnemyMonIndex + ldr r1, _08024278 @ =gBankTarget ldrb r0, [r1] strb r0, [r2] strb r3, [r1] - ldr r2, _0802427C @ =gUnknown_02024C6C + ldr r2, _0802427C @ =gHitMarker ldr r1, [r2] movs r3, 0x80 lsls r3, 5 @@ -16632,48 +16632,48 @@ atk5F_8025B24: @ 8024248 ands r1, r0 b _08024286 .align 2, 0 -_08024270: .4byte gUnknown_02024A60 -_08024274: .4byte gPlayerMonIndex -_08024278: .4byte gEnemyMonIndex -_0802427C: .4byte gUnknown_02024C6C +_08024270: .4byte gActiveBank +_08024274: .4byte gBankAttacker +_08024278: .4byte gBankTarget +_0802427C: .4byte gHitMarker _08024280: .4byte 0xffffefff _08024284: orrs r1, r3 _08024286: str r1, [r2] - ldr r1, _08024294 @ =gUnknown_02024C10 + ldr r1, _08024294 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08024294: .4byte gUnknown_02024C10 +_08024294: .4byte gBattlescriptCurrInstr thumb_func_end atk5F_8025B24 thumb_func_start atk60_cmd60 atk60_cmd60: @ 8024298 push {lr} - ldr r0, _080242C0 @ =gPlayerMonIndex + ldr r0, _080242C0 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080242B2 - ldr r0, _080242C4 @ =gUnknown_02024C10 + ldr r0, _080242C4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl IncrementGameStat _080242B2: - ldr r1, _080242C4 @ =gUnknown_02024C10 + ldr r1, _080242C4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080242C0: .4byte gPlayerMonIndex -_080242C4: .4byte gUnknown_02024C10 +_080242C0: .4byte gBankAttacker +_080242C4: .4byte gBattlescriptCurrInstr thumb_func_end atk60_cmd60 thumb_func_start atk61_8025BA4 @@ -16682,18 +16682,18 @@ atk61_8025BA4: @ 80242C8 mov r7, r8 push {r7} sub sp, 0x30 - ldr r0, _0802432C @ =gUnknown_02024A64 + ldr r0, _0802432C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0802437C - ldr r0, _08024330 @ =gUnknown_02024C10 + ldr r0, _08024330 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r1, _08024334 @ =gUnknown_02024A60 + ldr r1, _08024334 @ =gActiveBank strb r0, [r1] ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, _08024338 @ =gEnemyParty mov r8, r1 @@ -16728,9 +16728,9 @@ _08024324: movs r0, 0 b _08024356 .align 2, 0 -_0802432C: .4byte gUnknown_02024A64 -_08024330: .4byte gUnknown_02024C10 -_08024334: .4byte gUnknown_02024A60 +_0802432C: .4byte gBattleExecBuffer +_08024330: .4byte gBattlescriptCurrInstr +_08024334: .4byte gActiveBank _08024338: .4byte gEnemyParty _0802433C: .4byte gPlayerParty _08024340: .4byte 0x0000ffff @@ -16753,10 +16753,10 @@ _08024356: mov r1, sp movs r2, 0x1 bl dp01_build_cmdbuf_x30_TODO - ldr r0, _08024388 @ =gUnknown_02024A60 + ldr r0, _08024388 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0802438C @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _0802438C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -16768,23 +16768,23 @@ _0802437C: pop {r0} bx r0 .align 2, 0 -_08024388: .4byte gUnknown_02024A60 -_0802438C: .4byte gUnknown_02024C10 +_08024388: .4byte gActiveBank +_0802438C: .4byte gBattlescriptCurrInstr thumb_func_end atk61_8025BA4 thumb_func_start atk62_08025C6C atk62_08025C6C: @ 8024390 push {r4,r5,lr} - ldr r5, _080243B8 @ =gUnknown_02024C10 + ldr r5, _080243B8 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _080243BC @ =gUnknown_02024A60 + ldr r4, _080243BC @ =gActiveBank strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x31_31_31_31 ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -16792,31 +16792,31 @@ atk62_08025C6C: @ 8024390 pop {r0} bx r0 .align 2, 0 -_080243B8: .4byte gUnknown_02024C10 -_080243BC: .4byte gUnknown_02024A60 +_080243B8: .4byte gBattlescriptCurrInstr +_080243BC: .4byte gActiveBank thumb_func_end atk62_08025C6C thumb_func_start atk63_jumptoattack atk63_jumptoattack: @ 80243C0 push {r4,lr} - ldr r0, _080243D8 @ =gUnknown_02024C10 + ldr r0, _080243D8 @ =gBattlescriptCurrInstr ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0 beq _080243E4 - ldr r0, _080243DC @ =gUnknown_02024BE6 + ldr r0, _080243DC @ =gCurrentMove ldr r1, _080243E0 @ =gUnknown_02024BEA ldrh r1, [r1] strh r1, [r0] b _080243F2 .align 2, 0 -_080243D8: .4byte gUnknown_02024C10 -_080243DC: .4byte gUnknown_02024BE6 +_080243D8: .4byte gBattlescriptCurrInstr +_080243DC: .4byte gCurrentMove _080243E0: .4byte gUnknown_02024BEA _080243E4: ldr r2, _08024410 @ =gUnknown_02024BE8 - ldr r1, _08024414 @ =gUnknown_02024BE6 + ldr r1, _08024414 @ =gCurrentMove ldr r0, _08024418 @ =gUnknown_02024BEA ldrh r0, [r0] strh r0, [r1] @@ -16840,7 +16840,7 @@ _080243F2: bx r0 .align 2, 0 _08024410: .4byte gUnknown_02024BE8 -_08024414: .4byte gUnknown_02024BE6 +_08024414: .4byte gCurrentMove _08024418: .4byte gUnknown_02024BEA _0802441C: .4byte gUnknown_081D6BBC _08024420: .4byte gBattleMoves @@ -16849,17 +16849,17 @@ _08024420: .4byte gBattleMoves thumb_func_start atk64_statusanimation atk64_statusanimation: @ 8024424 push {r4,lr} - ldr r0, _08024494 @ =gUnknown_02024A64 + ldr r0, _08024494 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0802448C - ldr r0, _08024498 @ =gUnknown_02024C10 + ldr r0, _08024498 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _0802449C @ =gUnknown_02024A60 + ldr r4, _0802449C @ =gActiveBank strb r0, [r4] - ldr r1, _080244A0 @ =gUnknown_02024C98 + ldr r1, _080244A0 @ =gStatuses3 ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -16868,7 +16868,7 @@ atk64_statusanimation: @ 8024424 ands r0, r1 cmp r0, 0 bne _08024484 - ldr r0, _080244A8 @ =gUnknown_02024CA8 + ldr r0, _080244A8 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -16876,7 +16876,7 @@ atk64_statusanimation: @ 8024424 ldrb r0, [r1, 0xA] cmp r0, 0 bne _08024484 - ldr r0, _080244AC @ =gUnknown_02024C6C + ldr r0, _080244AC @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -16890,11 +16890,11 @@ atk64_statusanimation: @ 8024424 ldr r2, [r0] movs r0, 0 movs r1, 0 - bl dp01_build_cmdbuf_x1B_aaaa_b + bl EmitStatusAnimation ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _08024484: - ldr r1, _08024498 @ =gUnknown_02024C10 + ldr r1, _08024498 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -16903,28 +16903,28 @@ _0802448C: pop {r0} bx r0 .align 2, 0 -_08024494: .4byte gUnknown_02024A64 -_08024498: .4byte gUnknown_02024C10 -_0802449C: .4byte gUnknown_02024A60 -_080244A0: .4byte gUnknown_02024C98 +_08024494: .4byte gBattleExecBuffer +_08024498: .4byte gBattlescriptCurrInstr +_0802449C: .4byte gActiveBank +_080244A0: .4byte gStatuses3 _080244A4: .4byte 0x000400c0 -_080244A8: .4byte gUnknown_02024CA8 -_080244AC: .4byte gUnknown_02024C6C +_080244A8: .4byte gDisableStructs +_080244AC: .4byte gHitMarker _080244B0: .4byte gBattleMons thumb_func_end atk64_statusanimation thumb_func_start atk65_8025D90 atk65_8025D90: @ 80244B4 push {r4,r5,lr} - ldr r0, _0802453C @ =gUnknown_02024A64 + ldr r0, _0802453C @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08024534 - ldr r4, _08024540 @ =gUnknown_02024C10 + ldr r4, _08024540 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r5, _08024544 @ =gUnknown_02024A60 + ldr r5, _08024544 @ =gActiveBank strb r0, [r5] ldr r1, [r4] ldrb r3, [r1, 0x2] @@ -16937,7 +16937,7 @@ atk65_8025D90: @ 80244B4 ldrb r0, [r1, 0x5] lsls r0, 24 orrs r3, r0 - ldr r1, _08024548 @ =gUnknown_02024C98 + ldr r1, _08024548 @ =gStatuses3 ldrb r2, [r5] lsls r0, r2, 2 adds r0, r1 @@ -16946,7 +16946,7 @@ atk65_8025D90: @ 80244B4 ands r0, r1 cmp r0, 0 bne _0802452C - ldr r0, _08024550 @ =gUnknown_02024CA8 + ldr r0, _08024550 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -16954,7 +16954,7 @@ atk65_8025D90: @ 80244B4 ldrb r0, [r1, 0xA] cmp r0, 0 bne _0802452C - ldr r0, _08024554 @ =gUnknown_02024C6C + ldr r0, _08024554 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -16969,11 +16969,11 @@ atk65_8025D90: @ 80244B4 ands r2, r3 movs r0, 0 movs r1, 0x1 - bl dp01_build_cmdbuf_x1B_aaaa_b + bl EmitStatusAnimation ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _0802452C: - ldr r1, _08024540 @ =gUnknown_02024C10 + ldr r1, _08024540 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -16982,28 +16982,28 @@ _08024534: pop {r0} bx r0 .align 2, 0 -_0802453C: .4byte gUnknown_02024A64 -_08024540: .4byte gUnknown_02024C10 -_08024544: .4byte gUnknown_02024A60 -_08024548: .4byte gUnknown_02024C98 +_0802453C: .4byte gBattleExecBuffer +_08024540: .4byte gBattlescriptCurrInstr +_08024544: .4byte gActiveBank +_08024548: .4byte gStatuses3 _0802454C: .4byte 0x000400c0 -_08024550: .4byte gUnknown_02024CA8 -_08024554: .4byte gUnknown_02024C6C +_08024550: .4byte gDisableStructs +_08024554: .4byte gHitMarker _08024558: .4byte gBattleMons thumb_func_end atk65_8025D90 thumb_func_start atk66_8025E38 atk66_8025E38: @ 802455C push {r4,r5,lr} - ldr r0, _080245D4 @ =gUnknown_02024A64 + ldr r0, _080245D4 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _080245CE - ldr r4, _080245D8 @ =gUnknown_02024C10 + ldr r4, _080245D8 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r5, _080245DC @ =gUnknown_02024A60 + ldr r5, _080245DC @ =gActiveBank strb r0, [r5] ldr r4, [r4] ldrb r2, [r4, 0x3] @@ -17016,7 +17016,7 @@ atk66_8025E38: @ 802455C ldrb r0, [r4, 0x6] lsls r0, 24 orrs r2, r0 - ldr r1, _080245E0 @ =gUnknown_02024C98 + ldr r1, _080245E0 @ =gStatuses3 ldrb r3, [r5] lsls r0, r3, 2 adds r0, r1 @@ -17025,7 +17025,7 @@ atk66_8025E38: @ 802455C ands r0, r1 cmp r0, 0 bne _080245C6 - ldr r0, _080245E8 @ =gUnknown_02024CA8 + ldr r0, _080245E8 @ =gDisableStructs lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -17033,7 +17033,7 @@ atk66_8025E38: @ 802455C ldrb r0, [r1, 0xA] cmp r0, 0 bne _080245C6 - ldr r0, _080245EC @ =gUnknown_02024C6C + ldr r0, _080245EC @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -17041,11 +17041,11 @@ atk66_8025E38: @ 802455C bne _080245C6 ldrb r1, [r4, 0x2] movs r0, 0 - bl dp01_build_cmdbuf_x1B_aaaa_b + bl EmitStatusAnimation ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _080245C6: - ldr r1, _080245D8 @ =gUnknown_02024C10 + ldr r1, _080245D8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x7 str r0, [r1] @@ -17054,19 +17054,19 @@ _080245CE: pop {r0} bx r0 .align 2, 0 -_080245D4: .4byte gUnknown_02024A64 -_080245D8: .4byte gUnknown_02024C10 -_080245DC: .4byte gUnknown_02024A60 -_080245E0: .4byte gUnknown_02024C98 +_080245D4: .4byte gBattleExecBuffer +_080245D8: .4byte gBattlescriptCurrInstr +_080245DC: .4byte gActiveBank +_080245E0: .4byte gStatuses3 _080245E4: .4byte 0x000400c0 -_080245E8: .4byte gUnknown_02024CA8 -_080245EC: .4byte gUnknown_02024C6C +_080245E8: .4byte gDisableStructs +_080245EC: .4byte gHitMarker thumb_func_end atk66_8025E38 thumb_func_start atk67_8025ECC atk67_8025ECC: @ 80245F0 push {r4,r5,lr} - ldr r5, _08024600 @ =gUnknown_02024D1E + ldr r5, _08024600 @ =gBattleCommunication ldrb r4, [r5] cmp r4, 0 beq _08024604 @@ -17074,7 +17074,7 @@ atk67_8025ECC: @ 80245F0 beq _08024616 b _08024696 .align 2, 0 -_08024600: .4byte gUnknown_02024D1E +_08024600: .4byte gBattleCommunication _08024604: bl sub_8023A80 ldrb r0, [r5] @@ -17106,7 +17106,7 @@ _0802463A: ands r0, r1 cmp r0, 0 beq _08024660 - ldr r4, _08024678 @ =gUnknown_02024D1E + ldr r4, _08024678 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _08024660 @@ -17123,13 +17123,13 @@ _08024660: ands r0, r1 cmp r0, 0 beq _0802467C - ldr r1, _08024678 @ =gUnknown_02024D1E + ldr r1, _08024678 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x1] b _08024684 .align 2, 0 _08024674: .4byte gMain -_08024678: .4byte gUnknown_02024D1E +_08024678: .4byte gBattleCommunication _0802467C: movs r0, 0x1 ands r0, r1 @@ -17139,7 +17139,7 @@ _08024684: movs r0, 0x5 bl PlaySE bl sub_8023AD8 - ldr r1, _0802469C @ =gUnknown_02024C10 + ldr r1, _0802469C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17148,15 +17148,15 @@ _08024696: pop {r0} bx r0 .align 2, 0 -_0802469C: .4byte gUnknown_02024C10 +_0802469C: .4byte gBattlescriptCurrInstr thumb_func_end atk67_8025ECC thumb_func_start sub_80246A0 sub_80246A0: @ 80246A0 push {r4,r5,lr} movs r1, 0 - ldr r2, _080246CC @ =gUnknown_02024A68 - ldr r5, _080246D0 @ =gUnknown_02024C10 + ldr r2, _080246CC @ =gNoOfAllBanks + ldr r5, _080246D0 @ =gBattlescriptCurrInstr ldrb r0, [r2] cmp r1, r0 bge _080246BE @@ -17177,8 +17177,8 @@ _080246BE: pop {r0} bx r0 .align 2, 0 -_080246CC: .4byte gUnknown_02024A68 -_080246D0: .4byte gUnknown_02024C10 +_080246CC: .4byte gNoOfAllBanks +_080246D0: .4byte gBattlescriptCurrInstr _080246D4: .4byte gUnknown_02024A76 thumb_func_end sub_80246A0 @@ -17186,7 +17186,7 @@ _080246D4: .4byte gUnknown_02024A76 atk69_8025FE0: @ 80246D8 push {r4-r7,lr} ldr r7, _08024700 @ =gBattleMons - ldr r6, _08024704 @ =gEnemyMonIndex + ldr r6, _08024704 @ =gBankTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -17205,7 +17205,7 @@ atk69_8025FE0: @ 80246D8 b _08024726 .align 2, 0 _08024700: .4byte gBattleMons -_08024704: .4byte gEnemyMonIndex +_08024704: .4byte gBankTarget _08024708: .4byte gEnigmaBerries _0802470C: ldrh r0, [r1, 0x2E] @@ -17220,8 +17220,8 @@ _0802470C: lsls r0, 24 lsrs r6, r0, 24 _08024726: - ldr r1, _080247E8 @ =gUnknown_02024C0B - ldr r5, _080247EC @ =gEnemyMonIndex + ldr r1, _080247E8 @ =gStringBank + ldr r5, _080247EC @ =gBankTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -17238,7 +17238,7 @@ _08024726: ldrb r0, [r5] movs r1, 0x27 bl sub_81074F8 - ldr r2, _080247F0 @ =gUnknown_02024D68 + ldr r2, _080247F0 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -17250,7 +17250,7 @@ _08024726: strb r1, [r0] _08024764: ldr r2, _080247F4 @ =gBattleMons - ldr r3, _080247EC @ =gEnemyMonIndex + ldr r3, _080247EC @ =gBankTarget ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -17265,7 +17265,7 @@ _08024764: cmp r1, 0 bne _08024834 ldr r2, _080247F8 @ =gBattleMoves - ldr r0, _080247FC @ =gUnknown_02024BE6 + ldr r0, _080247FC @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -17274,14 +17274,14 @@ _08024764: ldrb r0, [r0] cmp r0, 0x65 beq _080247B6 - ldr r0, _08024800 @ =gUnknown_02024D28 + ldr r0, _08024800 @ =gProtectStructs lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 blt _080247B6 - ldr r0, _080247F0 @ =gUnknown_02024D68 + ldr r0, _080247F0 @ =gSpecialStatuses lsls r1, r4, 2 adds r1, r4 lsls r1, 2 @@ -17302,7 +17302,7 @@ _080247B6: bgt _08024834 subs r0, r1, 0x1 str r0, [r2] - ldr r1, _08024800 @ =gUnknown_02024D28 + ldr r1, _08024800 @ =gProtectStructs ldrb r3, [r3] lsls r0, r3, 4 adds r0, r1 @@ -17317,17 +17317,17 @@ _080247B6: strb r1, [r0] b _08024834 .align 2, 0 -_080247E8: .4byte gUnknown_02024C0B -_080247EC: .4byte gEnemyMonIndex -_080247F0: .4byte gUnknown_02024D68 +_080247E8: .4byte gStringBank +_080247EC: .4byte gBankTarget +_080247F0: .4byte gSpecialStatuses _080247F4: .4byte gBattleMons _080247F8: .4byte gBattleMoves -_080247FC: .4byte gUnknown_02024BE6 -_08024800: .4byte gUnknown_02024D28 +_080247FC: .4byte gCurrentMove +_08024800: .4byte gProtectStructs _08024804: .4byte gBattleMoveDamage _08024808: .4byte gBattleMoveFlags _0802480C: - ldr r0, _08024844 @ =gUnknown_02024D68 + ldr r0, _08024844 @ =gSpecialStatuses lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -17341,14 +17341,14 @@ _0802480C: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _0802484C @ =gUnknown_02024C04 + ldr r1, _0802484C @ =gLastUsedItem adds r0, r3, 0 muls r0, r4 adds r0, r5 ldrh r0, [r0, 0x2E] strh r0, [r1] _08024834: - ldr r1, _08024850 @ =gUnknown_02024C10 + ldr r1, _08024850 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17356,21 +17356,21 @@ _08024834: pop {r0} bx r0 .align 2, 0 -_08024844: .4byte gUnknown_02024D68 +_08024844: .4byte gSpecialStatuses _08024848: .4byte gBattleMoveFlags -_0802484C: .4byte gUnknown_02024C04 -_08024850: .4byte gUnknown_02024C10 +_0802484C: .4byte gLastUsedItem +_08024850: .4byte gBattlescriptCurrInstr thumb_func_end atk69_8025FE0 thumb_func_start atk6A_stash_item_for_side atk6A_stash_item_for_side: @ 8024854 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _080248B0 @ =gUnknown_02024C10 + ldr r6, _080248B0 @ =gBattlescriptCurrInstr ldr r0, [r6] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r5, _080248B4 @ =gUnknown_02024A60 + ldr r5, _080248B4 @ =gActiveBank strb r0, [r5] ldrb r4, [r5] lsls r1, r4, 1 @@ -17397,9 +17397,9 @@ atk6A_stash_item_for_side: @ 8024854 movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r6] adds r0, 0x2 str r0, [r6] @@ -17408,23 +17408,23 @@ atk6A_stash_item_for_side: @ 8024854 pop {r0} bx r0 .align 2, 0 -_080248B0: .4byte gUnknown_02024C10 -_080248B4: .4byte gUnknown_02024A60 +_080248B0: .4byte gBattlescriptCurrInstr +_080248B4: .4byte gActiveBank _080248B8: .4byte 0x020160cc _080248BC: .4byte gBattleMons thumb_func_end atk6A_stash_item_for_side thumb_func_start sub_80248C0 sub_80248C0: @ 80248C0 - ldr r1, _080248EC @ =gUnknown_030041C0 + ldr r1, _080248EC @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] - ldr r2, _080248F0 @ =gPlayerMonIndex + ldr r2, _080248F0 @ =gBankAttacker ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, _080248F4 @ =gUnknown_02024A6A + ldr r3, _080248F4 @ =gBattlePartyID ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -17432,16 +17432,16 @@ sub_80248C0: @ 80248C0 strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _080248F8 @ =gUnknown_02024C10 + ldr r1, _080248F8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_080248EC: .4byte gUnknown_030041C0 -_080248F0: .4byte gPlayerMonIndex -_080248F4: .4byte gUnknown_02024A6A -_080248F8: .4byte gUnknown_02024C10 +_080248EC: .4byte gBattleTextBuff1 +_080248F0: .4byte gBankAttacker +_080248F4: .4byte gBattlePartyID +_080248F8: .4byte gBattlescriptCurrInstr thumb_func_end sub_80248C0 thumb_func_start sub_80248FC @@ -17833,7 +17833,7 @@ _08024C04: .align 2, 0 _08024C2C: .4byte gMain _08024C30: - ldr r1, _08024C48 @ =gUnknown_02024C10 + ldr r1, _08024C48 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17847,55 +17847,55 @@ _08024C38: pop {r0} bx r0 .align 2, 0 -_08024C48: .4byte gUnknown_02024C10 +_08024C48: .4byte gBattlescriptCurrInstr thumb_func_end sub_80248FC thumb_func_start sub_8024C4C sub_8024C4C: @ 8024C4C push {lr} bl sub_80156DC - ldr r1, _08024C60 @ =gUnknown_02024C10 + ldr r1, _08024C60 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08024C60: .4byte gUnknown_02024C10 +_08024C60: .4byte gBattlescriptCurrInstr thumb_func_end sub_8024C4C thumb_func_start atk6E_state0_side_becomes_attacker atk6E_state0_side_becomes_attacker: @ 8024C64 push {lr} movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, _08024C7C @ =gPlayerMonIndex + bl GetBankByPlayerAI + ldr r1, _08024C7C @ =gBankAttacker strb r0, [r1] - ldr r1, _08024C80 @ =gUnknown_02024C10 + ldr r1, _08024C80 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08024C7C: .4byte gPlayerMonIndex -_08024C80: .4byte gUnknown_02024C10 +_08024C7C: .4byte gBankAttacker +_08024C80: .4byte gBattlescriptCurrInstr thumb_func_end atk6E_state0_side_becomes_attacker thumb_func_start atk6F_8026810 atk6F_8026810: @ 8024C84 push {r4,r5,lr} - ldr r5, _08024CB0 @ =gUnknown_02024C10 + ldr r5, _08024CB0 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r4, _08024CB4 @ =gUnknown_02024A60 + ldr r4, _08024CB4 @ =gActiveBank strb r0, [r4] movs r0, 0 movs r1, 0 - bl dp01_build_cmdbuf_x33_a_33_33 + bl EmitSpriteInvisibility ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -17903,21 +17903,21 @@ atk6F_8026810: @ 8024C84 pop {r0} bx r0 .align 2, 0 -_08024CB0: .4byte gUnknown_02024C10 -_08024CB4: .4byte gUnknown_02024A60 +_08024CB0: .4byte gBattlescriptCurrInstr +_08024CB4: .4byte gActiveBank thumb_func_end atk6F_8026810 thumb_func_start atk70_record_ability_usage_of_side atk70_record_ability_usage_of_side: @ 8024CB8 push {r4,lr} - ldr r4, _08024CE0 @ =gUnknown_02024C10 + ldr r4, _08024CE0 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r1, _08024CE4 @ =gUnknown_02024A60 + ldr r1, _08024CE4 @ =gActiveBank strb r0, [r1] ldrb r0, [r1] - ldr r1, _08024CE8 @ =byte_2024C06 + ldr r1, _08024CE8 @ =gLastUsedAbility ldrb r1, [r1] bl sub_81074C4 ldr r0, [r4] @@ -17927,14 +17927,14 @@ atk70_record_ability_usage_of_side: @ 8024CB8 pop {r0} bx r0 .align 2, 0 -_08024CE0: .4byte gUnknown_02024C10 -_08024CE4: .4byte gUnknown_02024A60 -_08024CE8: .4byte byte_2024C06 +_08024CE0: .4byte gBattlescriptCurrInstr +_08024CE4: .4byte gActiveBank +_08024CE8: .4byte gLastUsedAbility thumb_func_end atk70_record_ability_usage_of_side thumb_func_start sub_8024CEC sub_8024CEC: @ 8024CEC - ldr r2, _08024D0C @ =gUnknown_03004290 + ldr r2, _08024D0C @ =gBattleTextBuff2 movs r0, 0xFD strb r0, [r2] movs r0, 0x2 @@ -17951,7 +17951,7 @@ sub_8024CEC: @ 8024CEC strb r0, [r2, 0x4] bx lr .align 2, 0 -_08024D0C: .4byte gUnknown_03004290 +_08024D0C: .4byte gBattleTextBuff2 _08024D10: .4byte word_2024E82 thumb_func_end sub_8024CEC @@ -17959,26 +17959,26 @@ _08024D10: .4byte word_2024E82 atk71_80268A0: @ 8024D14 push {lr} bl sub_8024CEC - ldr r1, _08024D28 @ =gUnknown_02024C10 + ldr r1, _08024D28 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08024D28: .4byte gUnknown_02024C10 +_08024D28: .4byte gBattlescriptCurrInstr thumb_func_end atk71_80268A0 thumb_func_start atk72_flee atk72_flee: @ 8024D2C push {lr} - ldr r0, _08024D58 @ =gUnknown_02024C09 + ldr r0, _08024D58 @ =gBank1 ldrb r0, [r0] bl sub_8014AB8 lsls r0, 24 cmp r0, 0 beq _08024D60 - ldr r3, _08024D5C @ =gUnknown_02024C10 + ldr r3, _08024D5C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -17993,10 +17993,10 @@ atk72_flee: @ 8024D2C str r1, [r3] b _08024D68 .align 2, 0 -_08024D58: .4byte gUnknown_02024C09 -_08024D5C: .4byte gUnknown_02024C10 +_08024D58: .4byte gBank1 +_08024D5C: .4byte gBattlescriptCurrInstr _08024D60: - ldr r1, _08024D6C @ =gUnknown_02024C10 + ldr r1, _08024D6C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -18004,7 +18004,7 @@ _08024D68: pop {r0} bx r0 .align 2, 0 -_08024D6C: .4byte gUnknown_02024C10 +_08024D6C: .4byte gBattlescriptCurrInstr thumb_func_end atk72_flee thumb_func_start atk73_cmd73 @@ -18016,11 +18016,11 @@ atk73_cmd73: @ 8024D70 ands r5, r0 cmp r5, 0 bne _08024E12 - ldr r0, _08024DC4 @ =gUnknown_02024C10 + ldr r0, _08024DC4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r1, _08024DC8 @ =gUnknown_02024A60 + ldr r1, _08024DC8 @ =gActiveBank strb r0, [r1] movs r1, 0x1 eors r0, r1 @@ -18051,8 +18051,8 @@ _08024DB6: b _08024E12 .align 2, 0 _08024DC0: .4byte gBattleTypeFlags -_08024DC4: .4byte gUnknown_02024C10 -_08024DC8: .4byte gUnknown_02024A60 +_08024DC4: .4byte gBattlescriptCurrInstr +_08024DC8: .4byte gActiveBank _08024DCC: .4byte gBattleMons _08024DD0: .4byte 0x02000000 _08024DD4: .4byte 0x000160c1 @@ -18086,7 +18086,7 @@ _08024E08: _08024E10: strb r1, [r0] _08024E12: - ldr r1, _08024E28 @ =gUnknown_02024C10 + ldr r1, _08024E28 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -18096,7 +18096,7 @@ _08024E12: .align 2, 0 _08024E20: .4byte 0x02000000 _08024E24: .4byte 0x000160c1 -_08024E28: .4byte gUnknown_02024C10 +_08024E28: .4byte gBattlescriptCurrInstr thumb_func_end atk73_cmd73 thumb_func_start atk74_hp_tresholds_2 @@ -18108,12 +18108,12 @@ atk74_hp_tresholds_2: @ 8024E2C ands r7, r0 cmp r7, 0 bne _08024ED0 - ldr r0, _08024E90 @ =gUnknown_02024C10 + ldr r0, _08024E90 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8015150 adds r4, r0, 0 - ldr r0, _08024E94 @ =gUnknown_02024A60 + ldr r0, _08024E94 @ =gActiveBank strb r4, [r0] movs r0, 0x1 eors r4, r0 @@ -18121,7 +18121,7 @@ atk74_hp_tresholds_2: @ 8024E2C lsrs r4, 24 ldr r6, _08024E98 @ =0x02000000 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 23 ldr r1, _08024E9C @ =0x000160bc @@ -18147,8 +18147,8 @@ atk74_hp_tresholds_2: @ 8024E2C b _08024ED0 .align 2, 0 _08024E8C: .4byte gBattleTypeFlags -_08024E90: .4byte gUnknown_02024C10 -_08024E94: .4byte gUnknown_02024A60 +_08024E90: .4byte gBattlescriptCurrInstr +_08024E94: .4byte gActiveBank _08024E98: .4byte 0x02000000 _08024E9C: .4byte 0x000160bc _08024EA0: .4byte gBattleMons @@ -18178,7 +18178,7 @@ _08024EC8: _08024ECE: strb r0, [r1] _08024ED0: - ldr r1, _08024EE4 @ =gUnknown_02024C10 + ldr r1, _08024EE4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -18187,18 +18187,18 @@ _08024ED0: bx r0 .align 2, 0 _08024EE0: .4byte 0x000160c1 -_08024EE4: .4byte gUnknown_02024C10 +_08024EE4: .4byte gBattlescriptCurrInstr thumb_func_end atk74_hp_tresholds_2 thumb_func_start atk75_8026A58 atk75_8026A58: @ 8024EE8 push {lr} sub sp, 0x4 - ldr r2, _08024F28 @ =gUnknown_02024E6C - ldr r1, _08024F2C @ =gPlayerMonIndex + ldr r2, _08024F28 @ =gBankInMenu + ldr r1, _08024F2C @ =gBankAttacker ldrb r0, [r1] strb r0, [r2] - ldr r2, _08024F30 @ =gUnknown_02024A6A + ldr r2, _08024F30 @ =gBattlePartyID ldrb r0, [r1] lsls r0, 1 adds r0, r2 @@ -18207,7 +18207,7 @@ atk75_8026A58: @ 8024EE8 muls r0, r2 ldr r1, _08024F34 @ =gEnemyParty adds r0, r1 - ldr r1, _08024F38 @ =gUnknown_02024C04 + ldr r1, _08024F38 @ =gLastUsedItem ldrh r1, [r1] lsls r2, 24 lsrs r2, 24 @@ -18215,7 +18215,7 @@ atk75_8026A58: @ 8024EE8 str r3, [sp] movs r3, 0 bl sub_803E1B0 - ldr r1, _08024F3C @ =gUnknown_02024C10 + ldr r1, _08024F3C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18223,22 +18223,22 @@ atk75_8026A58: @ 8024EE8 pop {r0} bx r0 .align 2, 0 -_08024F28: .4byte gUnknown_02024E6C -_08024F2C: .4byte gPlayerMonIndex -_08024F30: .4byte gUnknown_02024A6A +_08024F28: .4byte gBankInMenu +_08024F2C: .4byte gBankAttacker +_08024F30: .4byte gBattlePartyID _08024F34: .4byte gEnemyParty -_08024F38: .4byte gUnknown_02024C04 -_08024F3C: .4byte gUnknown_02024C10 +_08024F38: .4byte gLastUsedItem +_08024F3C: .4byte gBattlescriptCurrInstr thumb_func_end atk75_8026A58 thumb_func_start sub_8024F40 sub_8024F40: @ 8024F40 push {r4-r6,lr} - ldr r4, _08024F64 @ =gUnknown_02024C10 + ldr r4, _08024F64 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r1, _08024F68 @ =gUnknown_02024A60 + ldr r1, _08024F68 @ =gActiveBank strb r0, [r1] ldr r0, [r4] ldrb r0, [r0, 0x2] @@ -18252,8 +18252,8 @@ _08024F5A: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08024F64: .4byte gUnknown_02024C10 -_08024F68: .4byte gUnknown_02024A60 +_08024F64: .4byte gBattlescriptCurrInstr +_08024F68: .4byte gActiveBank _08024F6C: .4byte _08024F70 .align 2, 0 _08024F70: @@ -18265,24 +18265,24 @@ _08024F70: .4byte _08025060 .4byte _08025098 _08024F8C: - ldr r0, _08024F98 @ =gUnknown_02024A60 + ldr r0, _08024F98 @ =gActiveBank ldrb r0, [r0] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves b _08025112 .align 2, 0 -_08024F98: .4byte gUnknown_02024A60 +_08024F98: .4byte gActiveBank _08024F9C: - ldr r1, _08024FD8 @ =gPlayerMonIndex - ldr r4, _08024FDC @ =gEnemyMonIndex + ldr r1, _08024FD8 @ =gBankAttacker + ldr r4, _08024FDC @ =gBankTarget ldrb r0, [r4] strb r0, [r1] ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r2, _08024FE0 @ =gUnknown_02024C80 + ldr r2, _08024FE0 @ =gSideTimer lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -18301,41 +18301,41 @@ _08024F9C: strb r2, [r4] b _08025112 .align 2, 0 -_08024FD8: .4byte gPlayerMonIndex -_08024FDC: .4byte gEnemyMonIndex -_08024FE0: .4byte gUnknown_02024C80 +_08024FD8: .4byte gBankAttacker +_08024FDC: .4byte gBankTarget +_08024FE0: .4byte gSideTimer _08024FE4: .4byte gBattleMons _08024FE8: - ldr r0, _08024FF4 @ =gEnemyMonIndex - ldr r1, _08024FF8 @ =gUnknown_02024A60 + ldr r0, _08024FF4 @ =gBankTarget + ldr r1, _08024FF8 @ =gActiveBank ldrb r1, [r1] strb r1, [r0] b _08025112 .align 2, 0 -_08024FF4: .4byte gEnemyMonIndex -_08024FF8: .4byte gUnknown_02024A60 +_08024FF4: .4byte gBankTarget +_08024FF8: .4byte gActiveBank _08024FFC: - bl sub_8012028 - ldr r1, _08025008 @ =gUnknown_02024D1E + bl CanRunFromBattle + ldr r1, _08025008 @ =gBattleCommunication strb r0, [r1] b _08025112 .align 2, 0 -_08025008: .4byte gUnknown_02024D1E +_08025008: .4byte gBattleCommunication _0802500C: - ldr r0, _0802501C @ =gUnknown_02024BE6 + ldr r0, _0802501C @ =gCurrentMove ldrh r0, [r0] movs r1, 0 bl sub_801B5C0 - ldr r1, _08025020 @ =gEnemyMonIndex + ldr r1, _08025020 @ =gBankTarget strb r0, [r1] b _08025112 .align 2, 0 -_0802501C: .4byte gUnknown_02024BE6 -_08025020: .4byte gEnemyMonIndex +_0802501C: .4byte gCurrentMove +_08025020: .4byte gBankTarget _08025024: - ldr r2, _08025044 @ =gUnknown_02024C6C + ldr r2, _08025044 @ =gHitMarker ldr r1, _08025048 @ =gBitTable - ldr r0, _0802504C @ =gUnknown_02024A60 + ldr r0, _0802504C @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -18345,24 +18345,24 @@ _08025024: ands r2, r0 cmp r2, 0 beq _08025054 - ldr r1, _08025050 @ =gUnknown_02024D1E + ldr r1, _08025050 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1] b _08025112 .align 2, 0 -_08025044: .4byte gUnknown_02024C6C +_08025044: .4byte gHitMarker _08025048: .4byte gBitTable -_0802504C: .4byte gUnknown_02024A60 -_08025050: .4byte gUnknown_02024D1E +_0802504C: .4byte gActiveBank +_08025050: .4byte gBattleCommunication _08025054: - ldr r0, _0802505C @ =gUnknown_02024D1E + ldr r0, _0802505C @ =gBattleCommunication strb r2, [r0] b _08025112 .align 2, 0 -_0802505C: .4byte gUnknown_02024D1E +_0802505C: .4byte gBattleCommunication _08025060: - ldr r4, _08025090 @ =gUnknown_02024D68 - ldr r3, _08025094 @ =gUnknown_02024A60 + ldr r4, _08025090 @ =gSpecialStatuses + ldr r3, _08025094 @ =gActiveBank ldrb r0, [r3] lsls r1, r0, 2 adds r1, r0 @@ -18385,10 +18385,10 @@ _08025060: strb r0, [r1] b _08025112 .align 2, 0 -_08025090: .4byte gUnknown_02024D68 -_08025094: .4byte gUnknown_02024A60 +_08025090: .4byte gSpecialStatuses +_08025094: .4byte gActiveBank _08025098: - ldr r3, _080250B8 @ =gUnknown_02024A6A + ldr r3, _080250B8 @ =gBattlePartyID ldr r0, _080250BC @ =0x02000000 ldr r1, _080250C0 @ =0x00016018 adds r0, r1 @@ -18402,16 +18402,16 @@ _08025098: cmp r2, r0 bne _080250C8 _080250B2: - ldr r1, _080250C4 @ =gUnknown_02024A60 + ldr r1, _080250C4 @ =gActiveBank movs r0, 0 b _080250CC .align 2, 0 -_080250B8: .4byte gUnknown_02024A6A +_080250B8: .4byte gBattlePartyID _080250BC: .4byte 0x02000000 _080250C0: .4byte 0x00016018 -_080250C4: .4byte gUnknown_02024A60 +_080250C4: .4byte gActiveBank _080250C8: - ldr r1, _08025120 @ =gUnknown_02024A60 + ldr r1, _08025120 @ =gActiveBank movs r0, 0x2 _080250CC: strb r0, [r1] @@ -18452,7 +18452,7 @@ _0802510A: movs r0, 0 strh r0, [r4] _08025112: - ldr r1, _0802512C @ =gUnknown_02024C10 + ldr r1, _0802512C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 str r0, [r1] @@ -18460,10 +18460,10 @@ _08025112: pop {r0} bx r0 .align 2, 0 -_08025120: .4byte gUnknown_02024A60 +_08025120: .4byte gActiveBank _08025124: .4byte 0x020160e8 _08025128: .4byte gBattleMons -_0802512C: .4byte gUnknown_02024C10 +_0802512C: .4byte gBattlescriptCurrInstr thumb_func_end sub_8024F40 thumb_func_start atk77_setprotect @@ -18473,13 +18473,13 @@ atk77_setprotect: @ 8025130 push {r7} movs r6, 0x1 ldr r2, _080251FC @ =gUnknown_02024C4C - ldr r1, _08025200 @ =gPlayerMonIndex + ldr r1, _08025200 @ =gBankAttacker ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 ldrh r0, [r0] mov r8, r1 - ldr r7, _08025204 @ =gUnknown_02024CA8 + ldr r7, _08025204 @ =gDisableStructs cmp r0, 0xB6 beq _08025160 cmp r0, 0xC5 @@ -18493,9 +18493,9 @@ atk77_setprotect: @ 8025130 movs r1, 0 strb r1, [r0, 0x8] _08025160: - ldr r0, _08025208 @ =gUnknown_02024A7E + ldr r0, _08025208 @ =gCurrentMoveTurn ldrb r1, [r0] - ldr r0, _0802520C @ =gUnknown_02024A68 + ldr r0, _0802520C @ =gNoOfAllBanks ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 @@ -18521,7 +18521,7 @@ _08025170: cmp r6, 0 beq _08025224 ldr r4, _08025214 @ =gBattleMoves - ldr r3, _08025218 @ =gUnknown_02024BE6 + ldr r3, _08025218 @ =gCurrentMove ldrh r0, [r3] lsls r1, r0, 1 adds r1, r0 @@ -18530,7 +18530,7 @@ _08025170: ldrb r0, [r1] cmp r0, 0x6F bne _080251C0 - ldr r0, _0802521C @ =gUnknown_02024D28 + ldr r0, _0802521C @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -18538,7 +18538,7 @@ _08025170: movs r2, 0x1 orrs r0, r2 strb r0, [r1] - ldr r1, _08025220 @ =gUnknown_02024D1E + ldr r1, _08025220 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] _080251C0: @@ -18550,7 +18550,7 @@ _080251C0: ldrb r0, [r1] cmp r0, 0x74 bne _080251E6 - ldr r0, _0802521C @ =gUnknown_02024D28 + ldr r0, _0802521C @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -18558,7 +18558,7 @@ _080251C0: movs r2, 0x2 orrs r0, r2 strb r0, [r1] - ldr r1, _08025220 @ =gUnknown_02024D1E + ldr r1, _08025220 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _080251E6: @@ -18574,18 +18574,18 @@ _080251E6: b _08025246 .align 2, 0 _080251FC: .4byte gUnknown_02024C4C -_08025200: .4byte gPlayerMonIndex -_08025204: .4byte gUnknown_02024CA8 -_08025208: .4byte gUnknown_02024A7E -_0802520C: .4byte gUnknown_02024A68 +_08025200: .4byte gBankAttacker +_08025204: .4byte gDisableStructs +_08025208: .4byte gCurrentMoveTurn +_0802520C: .4byte gNoOfAllBanks _08025210: .4byte gProtectSuccessRates _08025214: .4byte gBattleMoves -_08025218: .4byte gUnknown_02024BE6 -_0802521C: .4byte gUnknown_02024D28 -_08025220: .4byte gUnknown_02024D1E +_08025218: .4byte gCurrentMove +_0802521C: .4byte gProtectStructs +_08025220: .4byte gBattleCommunication _08025224: - ldr r2, _08025258 @ =gUnknown_02024CA8 - ldr r0, _0802525C @ =gPlayerMonIndex + ldr r2, _08025258 @ =gDisableStructs + ldr r0, _0802525C @ =gBankAttacker ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -18593,7 +18593,7 @@ _08025224: adds r0, r2 movs r1, 0 strb r1, [r0, 0x8] - ldr r1, _08025260 @ =gUnknown_02024D1E + ldr r1, _08025260 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] ldr r2, _08025264 @ =gBattleMoveFlags @@ -18602,7 +18602,7 @@ _08025224: orrs r0, r1 strb r0, [r2] _08025246: - ldr r1, _08025268 @ =gUnknown_02024C10 + ldr r1, _08025268 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18612,11 +18612,11 @@ _08025246: pop {r0} bx r0 .align 2, 0 -_08025258: .4byte gUnknown_02024CA8 -_0802525C: .4byte gPlayerMonIndex -_08025260: .4byte gUnknown_02024D1E +_08025258: .4byte gDisableStructs +_0802525C: .4byte gBankAttacker +_08025260: .4byte gBattleCommunication _08025264: .4byte gBattleMoveFlags -_08025268: .4byte gUnknown_02024C10 +_08025268: .4byte gBattlescriptCurrInstr thumb_func_end atk77_setprotect thumb_func_start atk78_faintifabilitynotdamp @@ -18624,13 +18624,13 @@ atk78_faintifabilitynotdamp: @ 802526C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08025328 @ =gUnknown_02024A64 + ldr r0, _08025328 @ =gBattleExecBuffer ldr r2, [r0] cmp r2, 0 bne _08025370 - ldr r1, _0802532C @ =gEnemyMonIndex + ldr r1, _0802532C @ =gBankTarget strb r2, [r1] - ldr r0, _08025330 @ =gUnknown_02024A68 + ldr r0, _08025330 @ =gNoOfAllBanks ldrb r3, [r0] adds r5, r1, 0 mov r8, r0 @@ -18666,8 +18666,8 @@ _080252B8: ldrb r1, [r1] cmp r0, r1 bne _08025354 - ldr r4, _08025338 @ =gUnknown_02024A60 - ldr r7, _0802533C @ =gPlayerMonIndex + ldr r4, _08025338 @ =gActiveBank + ldr r7, _0802533C @ =gBankAttacker ldrb r0, [r7] strb r0, [r4] ldr r2, _08025340 @ =gBattleMoveDamage @@ -18679,10 +18679,10 @@ _080252B8: str r0, [r2] ldr r1, _08025344 @ =0x00007fff movs r0, 0 - bl dp01_build_cmdbuf_x18_0_aa_health_bar_update + bl EmitHealthBarUpdate ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08025348 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _08025348 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18696,7 +18696,7 @@ _080252B8: ldrb r5, [r7] ldr r7, _0802534C @ =gBitTable adds r4, r0, 0 - ldr r6, _08025350 @ =gUnknown_02024C0C + ldr r6, _08025350 @ =gAbsentBankFlags _08025304: ldrb r2, [r3] cmp r2, r5 @@ -18718,19 +18718,19 @@ _0802531A: bcc _08025304 b _08025370 .align 2, 0 -_08025328: .4byte gUnknown_02024A64 -_0802532C: .4byte gEnemyMonIndex -_08025330: .4byte gUnknown_02024A68 +_08025328: .4byte gBattleExecBuffer +_0802532C: .4byte gBankTarget +_08025330: .4byte gNoOfAllBanks _08025334: .4byte gBattleMons -_08025338: .4byte gUnknown_02024A60 -_0802533C: .4byte gPlayerMonIndex +_08025338: .4byte gActiveBank +_0802533C: .4byte gBankAttacker _08025340: .4byte gBattleMoveDamage _08025344: .4byte 0x00007fff -_08025348: .4byte gUnknown_02024C10 +_08025348: .4byte gBattlescriptCurrInstr _0802534C: .4byte gBitTable -_08025350: .4byte gUnknown_02024C0C +_08025350: .4byte gAbsentBankFlags _08025354: - ldr r1, _0802537C @ =byte_2024C06 + ldr r1, _0802537C @ =gLastUsedAbility movs r0, 0x6 strb r0, [r1] ldrb r0, [r5] @@ -18740,7 +18740,7 @@ _08025354: adds r1, 0x20 ldrb r1, [r1] bl sub_81074C4 - ldr r1, _08025380 @ =gUnknown_02024C10 + ldr r1, _08025380 @ =gBattlescriptCurrInstr ldr r0, _08025384 @ =gUnknown_081D9834 str r0, [r1] _08025370: @@ -18750,8 +18750,8 @@ _08025370: pop {r0} bx r0 .align 2, 0 -_0802537C: .4byte byte_2024C06 -_08025380: .4byte gUnknown_02024C10 +_0802537C: .4byte gLastUsedAbility +_08025380: .4byte gBattlescriptCurrInstr _08025384: .4byte gUnknown_081D9834 thumb_func_end atk78_faintifabilitynotdamp @@ -18759,12 +18759,12 @@ _08025384: .4byte gUnknown_081D9834 atk79_setuserhptozero: @ 8025388 push {r4,lr} sub sp, 0x4 - ldr r0, _080253D4 @ =gUnknown_02024A64 + ldr r0, _080253D4 @ =gBattleExecBuffer ldr r3, [r0] cmp r3, 0 bne _080253CC - ldr r4, _080253D8 @ =gUnknown_02024A60 - ldr r0, _080253DC @ =gPlayerMonIndex + ldr r4, _080253D8 @ =gActiveBank + ldr r0, _080253DC @ =gBankAttacker ldrb r0, [r0] strb r0, [r4] ldr r1, _080253E0 @ =gBattleMons @@ -18782,10 +18782,10 @@ atk79_setuserhptozero: @ 8025388 movs r1, 0x2A movs r2, 0 movs r3, 0x2 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _080253E4 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _080253E4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18795,17 +18795,17 @@ _080253CC: pop {r0} bx r0 .align 2, 0 -_080253D4: .4byte gUnknown_02024A64 -_080253D8: .4byte gUnknown_02024A60 -_080253DC: .4byte gPlayerMonIndex +_080253D4: .4byte gBattleExecBuffer +_080253D8: .4byte gActiveBank +_080253DC: .4byte gBankAttacker _080253E0: .4byte gBattleMons -_080253E4: .4byte gUnknown_02024C10 +_080253E4: .4byte gBattlescriptCurrInstr thumb_func_end atk79_setuserhptozero thumb_func_start sub_80253E8 sub_80253E8: @ 80253E8 push {r4-r7,lr} - ldr r3, _08025460 @ =gUnknown_02024C10 + ldr r3, _08025460 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r4, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -18824,17 +18824,17 @@ sub_80253E8: @ 80253E8 adds r7, r3, 0 cmp r0, 0 beq _08025480 - ldr r0, _08025468 @ =gEnemyMonIndex + ldr r0, _08025468 @ =gBankTarget ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r2, _0802546C @ =gPlayerMonIndex + ldr r2, _0802546C @ =gBankAttacker lsls r1, 24 lsrs r1, 24 adds r3, r0, 0 - ldr r6, _08025470 @ =gUnknown_02024C0C + ldr r6, _08025470 @ =gAbsentBankFlags ldr r5, _08025474 @ =gBitTable - ldr r0, _08025478 @ =gUnknown_02024A68 + ldr r0, _08025478 @ =gNoOfAllBanks mov r12, r0 ldrb r0, [r2] cmp r1, r0 @@ -18867,13 +18867,13 @@ _0802543E: str r0, [r7] b _08025484 .align 2, 0 -_08025460: .4byte gUnknown_02024C10 +_08025460: .4byte gBattlescriptCurrInstr _08025464: .4byte gBattleTypeFlags -_08025468: .4byte gEnemyMonIndex -_0802546C: .4byte gPlayerMonIndex -_08025470: .4byte gUnknown_02024C0C +_08025468: .4byte gBankTarget +_0802546C: .4byte gBankAttacker +_08025470: .4byte gAbsentBankFlags _08025474: .4byte gBitTable -_08025478: .4byte gUnknown_02024A68 +_08025478: .4byte gNoOfAllBanks _0802547C: str r4, [r7] b _08025484 @@ -18889,7 +18889,7 @@ _08025484: thumb_func_start sub_802548C sub_802548C: @ 802548C push {r4-r6,lr} - ldr r4, _080254E8 @ =gUnknown_02024C10 + ldr r4, _080254E8 @ =gBattlescriptCurrInstr ldr r1, [r4] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -18902,10 +18902,10 @@ sub_802548C: @ 802548C lsls r0, 24 orrs r2, r0 ldrb r0, [r1, 0x5] - ldr r3, _080254EC @ =gEnemyMonIndex + ldr r3, _080254EC @ =gBankTarget cmp r0, 0x1 bne _080254B4 - ldr r0, _080254F0 @ =gPlayerMonIndex + ldr r0, _080254F0 @ =gBankAttacker ldrb r0, [r0] strb r0, [r3] _080254B4: @@ -18936,9 +18936,9 @@ _080254CE: str r2, [r4] b _08025502 .align 2, 0 -_080254E8: .4byte gUnknown_02024C10 -_080254EC: .4byte gEnemyMonIndex -_080254F0: .4byte gPlayerMonIndex +_080254E8: .4byte gBattlescriptCurrInstr +_080254EC: .4byte gBankTarget +_080254F0: .4byte gBankAttacker _080254F4: .4byte gBattleMoveDamage _080254F8: .4byte gBattleMons _080254FC: @@ -18955,7 +18955,7 @@ _08025502: sub_8025508: @ 8025508 push {r4-r7,lr} ldr r3, _0802556C @ =0x02000000 - ldr r4, _08025570 @ =gPlayerMonIndex + ldr r4, _08025570 @ =gBankAttacker ldrb r2, [r4] lsls r1, r2, 1 ldr r5, _08025574 @ =0x000160ac @@ -18994,25 +18994,25 @@ sub_8025508: @ 8025508 ldr r0, _08025584 @ =0x0000ffff cmp r7, r0 beq _08025594 - ldr r2, _08025588 @ =gUnknown_02024C6C + ldr r2, _08025588 @ =gHitMarker ldr r0, [r2] ldr r1, _0802558C @ =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, _08025590 @ =gUnknown_02024BE6 + ldr r4, _08025590 @ =gCurrentMove strh r7, [r4] b _0802565C .align 2, 0 _0802556C: .4byte 0x02000000 -_08025570: .4byte gPlayerMonIndex +_08025570: .4byte gBankAttacker _08025574: .4byte 0x000160ac _08025578: .4byte 0x000160ad _0802557C: .4byte 0x00016100 _08025580: .4byte 0x00016103 _08025584: .4byte 0x0000ffff -_08025588: .4byte gUnknown_02024C6C +_08025588: .4byte gHitMarker _0802558C: .4byte 0xfffffbff -_08025590: .4byte gUnknown_02024BE6 +_08025590: .4byte gCurrentMove _08025594: cmp r6, 0 beq _08025644 @@ -19023,7 +19023,7 @@ _08025594: beq _08025618 cmp r5, r0 beq _08025618 - ldr r2, _080255C8 @ =gUnknown_02024C6C + ldr r2, _080255C8 @ =gHitMarker ldr r0, [r2] ldr r1, _080255CC @ =0xfffffbff ands r0, r1 @@ -19033,25 +19033,25 @@ _08025594: ands r1, r0 cmp r1, 0 beq _080255D4 - ldr r0, _080255D0 @ =gUnknown_02024BE6 + ldr r0, _080255D0 @ =gCurrentMove strh r6, [r0] b _080255D8 .align 2, 0 _080255C4: .4byte 0x0000ffff -_080255C8: .4byte gUnknown_02024C6C +_080255C8: .4byte gHitMarker _080255CC: .4byte 0xfffffbff -_080255D0: .4byte gUnknown_02024BE6 +_080255D0: .4byte gCurrentMove _080255D4: - ldr r0, _08025604 @ =gUnknown_02024BE6 + ldr r0, _08025604 @ =gCurrentMove strh r5, [r0] _080255D8: adds r5, r0, 0 ldrh r0, [r5] movs r1, 0 bl sub_801B5C0 - ldr r1, _08025608 @ =gEnemyMonIndex + ldr r1, _08025608 @ =gBankTarget strb r0, [r1] - ldr r4, _0802560C @ =gUnknown_02024C10 + ldr r4, _0802560C @ =gBattlescriptCurrInstr ldr r3, _08025610 @ =gUnknown_081D6BBC ldr r2, _08025614 @ =gBattleMoves ldrh r1, [r5] @@ -19066,9 +19066,9 @@ _080255D8: str r0, [r4] b _080256C0 .align 2, 0 -_08025604: .4byte gUnknown_02024BE6 -_08025608: .4byte gEnemyMonIndex -_0802560C: .4byte gUnknown_02024C10 +_08025604: .4byte gCurrentMove +_08025608: .4byte gBankTarget +_0802560C: .4byte gBattlescriptCurrInstr _08025610: .4byte gUnknown_081D6BBC _08025614: .4byte gBattleMoves _08025618: @@ -19077,39 +19077,39 @@ _08025618: ldr r0, _08025634 @ =0x0000ffff cmp r6, r0 beq _08025644 - ldr r2, _08025638 @ =gUnknown_02024C6C + ldr r2, _08025638 @ =gHitMarker ldr r0, [r2] ldr r1, _0802563C @ =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, _08025640 @ =gUnknown_02024BE6 + ldr r4, _08025640 @ =gCurrentMove strh r6, [r4] b _0802565C .align 2, 0 _08025634: .4byte 0x0000ffff -_08025638: .4byte gUnknown_02024C6C +_08025638: .4byte gHitMarker _0802563C: .4byte 0xfffffbff -_08025640: .4byte gUnknown_02024BE6 +_08025640: .4byte gCurrentMove _08025644: cmp r5, 0 beq _080256A4 ldr r0, _08025684 @ =0x0000ffff cmp r5, r0 beq _080256A4 - ldr r2, _08025688 @ =gUnknown_02024C6C + ldr r2, _08025688 @ =gHitMarker ldr r0, [r2] ldr r1, _0802568C @ =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, _08025690 @ =gUnknown_02024BE6 + ldr r4, _08025690 @ =gCurrentMove strh r5, [r4] _0802565C: ldrh r0, [r4] movs r1, 0 bl sub_801B5C0 - ldr r1, _08025694 @ =gEnemyMonIndex + ldr r1, _08025694 @ =gBankTarget strb r0, [r1] - ldr r5, _08025698 @ =gUnknown_02024C10 + ldr r5, _08025698 @ =gBattlescriptCurrInstr ldr r3, _0802569C @ =gUnknown_081D6BBC ldr r2, _080256A0 @ =gBattleMoves ldrh r1, [r4] @@ -19125,15 +19125,15 @@ _0802565C: b _080256C0 .align 2, 0 _08025684: .4byte 0x0000ffff -_08025688: .4byte gUnknown_02024C6C +_08025688: .4byte gHitMarker _0802568C: .4byte 0xfffffbff -_08025690: .4byte gUnknown_02024BE6 -_08025694: .4byte gEnemyMonIndex -_08025698: .4byte gUnknown_02024C10 +_08025690: .4byte gCurrentMove +_08025694: .4byte gBankTarget +_08025698: .4byte gBattlescriptCurrInstr _0802569C: .4byte gUnknown_081D6BBC _080256A0: .4byte gBattleMoves _080256A4: - ldr r2, _080256C8 @ =gUnknown_02024D68 + ldr r2, _080256C8 @ =gSpecialStatuses ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -19143,7 +19143,7 @@ _080256A4: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r1, _080256CC @ =gUnknown_02024C10 + ldr r1, _080256CC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19152,8 +19152,8 @@ _080256C0: pop {r0} bx r0 .align 2, 0 -_080256C8: .4byte gUnknown_02024D68 -_080256CC: .4byte gUnknown_02024C10 +_080256C8: .4byte gSpecialStatuses +_080256CC: .4byte gBattlescriptCurrInstr thumb_func_end sub_8025508 thumb_func_start sub_80256D0 @@ -19170,43 +19170,43 @@ sub_80256D0: @ 80256D0 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _080256F8 @ =gUnknown_02024D1E + ldr r1, _080256F8 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _0802570C .align 2, 0 _080256F0: .4byte gBattleWeather _080256F4: .4byte gBattleMoveFlags -_080256F8: .4byte gUnknown_02024D1E +_080256F8: .4byte gBattleCommunication _080256FC: movs r0, 0x1 strh r0, [r2] - ldr r0, _08025718 @ =gUnknown_02024D1E + ldr r0, _08025718 @ =gBattleCommunication strb r1, [r0, 0x5] - ldr r0, _0802571C @ =gUnknown_02024DBC + ldr r0, _0802571C @ =gWishFutureKnock adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _0802570C: - ldr r1, _08025720 @ =gUnknown_02024C10 + ldr r1, _08025720 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08025718: .4byte gUnknown_02024D1E -_0802571C: .4byte gUnknown_02024DBC -_08025720: .4byte gUnknown_02024C10 +_08025718: .4byte gBattleCommunication +_0802571C: .4byte gWishFutureKnock +_08025720: .4byte gBattlescriptCurrInstr thumb_func_end sub_80256D0 thumb_func_start atk7E_setreflect atk7E_setreflect: @ 8025724 push {r4-r6,lr} - ldr r5, _08025754 @ =gPlayerMonIndex + ldr r5, _08025754 @ =gBankAttacker ldrb r0, [r5] - bl battle_get_per_side_status - ldr r6, _08025758 @ =gUnknown_02024C7A + bl GetBankIdentity + ldr r6, _08025758 @ =gSideAffecting movs r4, 0x1 adds r1, r4, 0 ands r1, r0 @@ -19222,17 +19222,17 @@ atk7E_setreflect: @ 8025724 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08025760 @ =gUnknown_02024D1E + ldr r1, _08025760 @ =gBattleCommunication movs r0, 0 b _080257C4 .align 2, 0 -_08025754: .4byte gPlayerMonIndex -_08025758: .4byte gUnknown_02024C7A +_08025754: .4byte gBankAttacker +_08025758: .4byte gSideAffecting _0802575C: .4byte gBattleMoveFlags -_08025760: .4byte gUnknown_02024D1E +_08025760: .4byte gBattleCommunication _08025764: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r4, 0 ands r1, r0 lsls r1, 1 @@ -19242,8 +19242,8 @@ _08025764: orrs r0, r2 strh r0, [r1] ldrb r0, [r5] - bl battle_get_per_side_status - ldr r2, _080257B4 @ =gUnknown_02024C80 + bl GetBankIdentity + ldr r2, _080257B4 @ =gSideTimer adds r1, r4, 0 ands r1, r0 lsls r0, r1, 1 @@ -19259,25 +19259,25 @@ _08025764: cmp r0, 0 beq _080257C0 movs r0, 0x1 - bl sub_803C348 + bl CountAliveMons lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x2 bne _080257C0 - ldr r0, _080257BC @ =gUnknown_02024D1E + ldr r0, _080257BC @ =gBattleCommunication strb r1, [r0, 0x5] b _080257C6 .align 2, 0 -_080257B4: .4byte gUnknown_02024C80 +_080257B4: .4byte gSideTimer _080257B8: .4byte gBattleTypeFlags -_080257BC: .4byte gUnknown_02024D1E +_080257BC: .4byte gBattleCommunication _080257C0: - ldr r1, _080257D4 @ =gUnknown_02024D1E + ldr r1, _080257D4 @ =gBattleCommunication movs r0, 0x1 _080257C4: strb r0, [r1, 0x5] _080257C6: - ldr r1, _080257D8 @ =gUnknown_02024C10 + ldr r1, _080257D8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19285,8 +19285,8 @@ _080257C6: pop {r0} bx r0 .align 2, 0 -_080257D4: .4byte gUnknown_02024D1E -_080257D8: .4byte gUnknown_02024C10 +_080257D4: .4byte gBattleCommunication +_080257D8: .4byte gBattlescriptCurrInstr thumb_func_end atk7E_setreflect thumb_func_start sub_80257DC @@ -19301,9 +19301,9 @@ sub_80257DC: @ 80257DC ands r0, r5 cmp r0, 0 bne _0802580E - ldr r0, _08025820 @ =gUnknown_02024C98 + ldr r0, _08025820 @ =gStatuses3 mov r9, r0 - ldr r1, _08025824 @ =gEnemyMonIndex + ldr r1, _08025824 @ =gBankTarget mov r8, r1 ldrb r4, [r1] lsls r0, r4, 2 @@ -19320,15 +19320,15 @@ _0802580E: movs r0, 0x1 orrs r0, r5 strb r0, [r7] - ldr r1, _08025828 @ =gUnknown_02024D1E + ldr r1, _08025828 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _0802587C .align 2, 0 _0802581C: .4byte gBattleMoveFlags -_08025820: .4byte gUnknown_02024C98 -_08025824: .4byte gEnemyMonIndex -_08025828: .4byte gUnknown_02024D1E +_08025820: .4byte gStatuses3 +_08025824: .4byte gBankTarget +_08025828: .4byte gBattleCommunication _0802582C: ldr r1, _08025858 @ =gBattleMons movs r0, 0x58 @@ -19348,15 +19348,15 @@ _08025848: movs r0, 0x1 orrs r0, r5 strb r0, [r7] - ldr r1, _0802585C @ =gUnknown_02024D1E + ldr r1, _0802585C @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _0802587C .align 2, 0 _08025858: .4byte gBattleMons -_0802585C: .4byte gUnknown_02024D1E +_0802585C: .4byte gBattleCommunication _08025860: - ldr r0, _08025890 @ =gPlayerMonIndex + ldr r0, _08025890 @ =gBankAttacker ldrb r0, [r0] orrs r2, r0 str r2, [r6] @@ -19368,10 +19368,10 @@ _08025860: mov r2, r12 orrs r0, r2 str r0, [r1] - ldr r0, _08025894 @ =gUnknown_02024D1E + ldr r0, _08025894 @ =gBattleCommunication strb r3, [r0, 0x5] _0802587C: - ldr r1, _08025898 @ =gUnknown_02024C10 + ldr r1, _08025898 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19382,15 +19382,15 @@ _0802587C: pop {r0} bx r0 .align 2, 0 -_08025890: .4byte gPlayerMonIndex -_08025894: .4byte gUnknown_02024D1E -_08025898: .4byte gUnknown_02024C10 +_08025890: .4byte gBankAttacker +_08025894: .4byte gBattleCommunication +_08025898: .4byte gBattlescriptCurrInstr thumb_func_end sub_80257DC thumb_func_start atk80_manipulatedamage atk80_manipulatedamage: @ 802589C push {r4,lr} - ldr r1, _080258B4 @ =gUnknown_02024C10 + ldr r1, _080258B4 @ =gBattlescriptCurrInstr ldr r0, [r1] ldrb r2, [r0, 0x1] adds r4, r1, 0 @@ -19402,7 +19402,7 @@ atk80_manipulatedamage: @ 802589C beq _080258BE b _0802590C .align 2, 0 -_080258B4: .4byte gUnknown_02024C10 +_080258B4: .4byte gBattlescriptCurrInstr _080258B8: cmp r2, 0x2 beq _08025904 @@ -19426,7 +19426,7 @@ _080258CC: str r2, [r3] _080258DE: ldr r2, _080258FC @ =gBattleMons - ldr r0, _08025900 @ =gEnemyMonIndex + ldr r0, _08025900 @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -19441,7 +19441,7 @@ _080258DE: .align 2, 0 _080258F8: .4byte gBattleMoveDamage _080258FC: .4byte gBattleMons -_08025900: .4byte gEnemyMonIndex +_08025900: .4byte gBankTarget _08025904: ldr r1, _08025918 @ =gBattleMoveDamage ldr r0, [r1] @@ -19463,7 +19463,7 @@ _08025918: .4byte gBattleMoveDamage atk81_setrest: @ 802591C push {r4-r7,lr} sub sp, 0x4 - ldr r0, _08025974 @ =gUnknown_02024C10 + ldr r0, _08025974 @ =gBattlescriptCurrInstr mov r12, r0 ldr r1, [r0] ldrb r6, [r1, 0x1] @@ -19476,9 +19476,9 @@ atk81_setrest: @ 802591C ldrb r0, [r1, 0x4] lsls r0, 24 orrs r6, r0 - ldr r5, _08025978 @ =gUnknown_02024A60 - ldr r2, _0802597C @ =gEnemyMonIndex - ldr r0, _08025980 @ =gPlayerMonIndex + ldr r5, _08025978 @ =gActiveBank + ldr r2, _0802597C @ =gBankTarget + ldr r0, _08025980 @ =gBankAttacker ldrb r0, [r0] strb r0, [r2] strb r0, [r5] @@ -19506,10 +19506,10 @@ atk81_setrest: @ 802591C str r6, [r0] b _080259DC .align 2, 0 -_08025974: .4byte gUnknown_02024C10 -_08025978: .4byte gUnknown_02024A60 -_0802597C: .4byte gEnemyMonIndex -_08025980: .4byte gPlayerMonIndex +_08025974: .4byte gBattlescriptCurrInstr +_08025978: .4byte gActiveBank +_0802597C: .4byte gBankTarget +_08025980: .4byte gBankAttacker _08025984: .4byte gBattleMoveDamage _08025988: .4byte gBattleMons _0802598C: @@ -19521,14 +19521,14 @@ _0802598C: ands r1, r0 cmp r1, 0 beq _080259A8 - ldr r1, _080259A4 @ =gUnknown_02024D1E + ldr r1, _080259A4 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _080259AC .align 2, 0 -_080259A4: .4byte gUnknown_02024D1E +_080259A4: .4byte gBattleCommunication _080259A8: - ldr r0, _080259E4 @ =gUnknown_02024D1E + ldr r0, _080259E4 @ =gBattleCommunication strb r1, [r0, 0x5] _080259AC: ldrb r0, [r5] @@ -19546,10 +19546,10 @@ _080259AC: movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r7] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _080259E8 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _080259E8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -19559,14 +19559,14 @@ _080259DC: pop {r0} bx r0 .align 2, 0 -_080259E4: .4byte gUnknown_02024D1E -_080259E8: .4byte gUnknown_02024C10 +_080259E4: .4byte gBattleCommunication +_080259E8: .4byte gBattlescriptCurrInstr thumb_func_end atk81_setrest thumb_func_start atk82_jumpifnotfirstturn atk82_jumpifnotfirstturn: @ 80259EC push {r4,r5,lr} - ldr r5, _08025A20 @ =gUnknown_02024C10 + ldr r5, _08025A20 @ =gBattlescriptCurrInstr ldr r4, [r5] ldrb r3, [r4, 0x1] ldrb r0, [r4, 0x2] @@ -19578,8 +19578,8 @@ atk82_jumpifnotfirstturn: @ 80259EC ldrb r0, [r4, 0x4] lsls r0, 24 orrs r3, r0 - ldr r2, _08025A24 @ =gUnknown_02024CA8 - ldr r0, _08025A28 @ =gPlayerMonIndex + ldr r2, _08025A24 @ =gDisableStructs + ldr r0, _08025A28 @ =gBankAttacker ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -19592,9 +19592,9 @@ atk82_jumpifnotfirstturn: @ 80259EC str r0, [r5] b _08025A2E .align 2, 0 -_08025A20: .4byte gUnknown_02024C10 -_08025A24: .4byte gUnknown_02024CA8 -_08025A28: .4byte gPlayerMonIndex +_08025A20: .4byte gBattlescriptCurrInstr +_08025A24: .4byte gDisableStructs +_08025A28: .4byte gBankAttacker _08025A2C: str r3, [r5] _08025A2E: @@ -19605,13 +19605,13 @@ _08025A2E: thumb_func_start sub_8025A34 sub_8025A34: @ 8025A34 - ldr r1, _08025A40 @ =gUnknown_02024C10 + ldr r1, _08025A40 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08025A40: .4byte gUnknown_02024C10 +_08025A40: .4byte gBattlescriptCurrInstr thumb_func_end sub_8025A34 thumb_func_start sub_8025A44 @@ -19622,7 +19622,7 @@ sub_8025A44: @ 8025A44 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r0, _08025A9C @ =gUnknown_02024A68 + ldr r0, _08025A9C @ =gNoOfAllBanks ldrb r1, [r0] mov r8, r0 cmp r2, r1 @@ -19636,7 +19636,7 @@ sub_8025A44: @ 8025A44 adds r5, 0x20 ldr r6, _08025AA4 @ =0x02016003 movs r3, 0 - ldr r7, _08025AA8 @ =gUnknown_02024D1E + ldr r7, _08025AA8 @ =gBattleCommunication adds r4, r1, 0 _08025A70: mov r0, r12 @@ -19652,7 +19652,7 @@ _08025A70: beq _08025AB0 movs r3, 0 strb r2, [r6] - ldr r1, _08025AAC @ =gEnemyMonIndex + ldr r1, _08025AAC @ =gBankTarget ldrb r0, [r1] cmp r0, 0xFF beq _08025AD0 @@ -19662,11 +19662,11 @@ _08025A70: strb r0, [r7, 0x5] b _08025AB8 .align 2, 0 -_08025A9C: .4byte gUnknown_02024A68 +_08025A9C: .4byte gNoOfAllBanks _08025AA0: .4byte gBattleMons _08025AA4: .4byte 0x02016003 -_08025AA8: .4byte gUnknown_02024D1E -_08025AAC: .4byte gEnemyMonIndex +_08025AA8: .4byte gBattleCommunication +_08025AAC: .4byte gBankTarget _08025AB0: adds r3, 0x58 adds r2, 0x1 @@ -19680,11 +19680,11 @@ _08025AB8: movs r0, 0x1 b _08025AD6 _08025AC4: - ldr r0, _08025ACC @ =gUnknown_02024D1E + ldr r0, _08025ACC @ =gBattleCommunication strb r3, [r0, 0x5] b _08025AB8 .align 2, 0 -_08025ACC: .4byte gUnknown_02024D1E +_08025ACC: .4byte gBattleCommunication _08025AD0: strb r2, [r1] b _08025AB8 @@ -19701,7 +19701,7 @@ _08025AD6: thumb_func_start sub_8025AE0 sub_8025AE0: @ 8025AE0 push {r4-r6,lr} - ldr r5, _08025B0C @ =gUnknown_02024C10 + ldr r5, _08025B0C @ =gBattlescriptCurrInstr ldr r1, [r5] ldrb r4, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -19713,7 +19713,7 @@ sub_8025AE0: @ 8025AE0 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r4, r0 - ldr r6, _08025B10 @ =gEnemyMonIndex + ldr r6, _08025B10 @ =gBankTarget ldrb r0, [r6] bl sub_8025A44 lsls r0, 24 @@ -19722,8 +19722,8 @@ sub_8025AE0: @ 8025AE0 str r4, [r5] b _08025B56 .align 2, 0 -_08025B0C: .4byte gUnknown_02024C10 -_08025B10: .4byte gEnemyMonIndex +_08025B0C: .4byte gBattlescriptCurrInstr +_08025B10: .4byte gBankTarget _08025B14: ldr r1, _08025B44 @ =gBattleMons ldrb r3, [r6] @@ -19738,9 +19738,9 @@ _08025B14: cmp r1, 0x48 bne _08025B50 _08025B2C: - ldr r2, _08025B48 @ =byte_2024C06 + ldr r2, _08025B48 @ =gLastUsedAbility strb r0, [r2] - ldr r1, _08025B4C @ =gUnknown_02024D1E + ldr r1, _08025B4C @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] str r4, [r5] @@ -19750,8 +19750,8 @@ _08025B2C: b _08025B56 .align 2, 0 _08025B44: .4byte gBattleMons -_08025B48: .4byte byte_2024C06 -_08025B4C: .4byte gUnknown_02024D1E +_08025B48: .4byte gLastUsedAbility +_08025B4C: .4byte gBattleCommunication _08025B50: ldr r0, [r5] adds r0, 0x5 @@ -19765,8 +19765,8 @@ _08025B56: thumb_func_start sub_8025B5C sub_8025B5C: @ 8025B5C push {r4,r5,lr} - ldr r5, _08025B84 @ =gUnknown_02024CA8 - ldr r4, _08025B88 @ =gPlayerMonIndex + ldr r5, _08025B84 @ =gDisableStructs + ldr r4, _08025B88 @ =gBankAttacker ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -19780,20 +19780,20 @@ sub_8025B5C: @ 8025B5C movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08025B90 @ =gUnknown_02024D1E + ldr r1, _08025B90 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08025BBE .align 2, 0 -_08025B84: .4byte gUnknown_02024CA8 -_08025B88: .4byte gPlayerMonIndex +_08025B84: .4byte gDisableStructs +_08025B88: .4byte gBankAttacker _08025B8C: .4byte gBattleMoveFlags -_08025B90: .4byte gUnknown_02024D1E +_08025B90: .4byte gBattleCommunication _08025B94: adds r0, 0x1 movs r3, 0 strb r0, [r1, 0x9] - ldr r2, _08025BCC @ =gUnknown_030041C0 + ldr r2, _08025BCC @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r2] movs r0, 0x1 @@ -19809,10 +19809,10 @@ _08025B94: strb r0, [r2, 0x4] movs r0, 0xFF strb r0, [r2, 0x5] - ldr r0, _08025BD0 @ =gUnknown_02024D1E + ldr r0, _08025BD0 @ =gBattleCommunication strb r3, [r0, 0x5] _08025BBE: - ldr r1, _08025BD4 @ =gUnknown_02024C10 + ldr r1, _08025BD4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19820,9 +19820,9 @@ _08025BBE: pop {r0} bx r0 .align 2, 0 -_08025BCC: .4byte gUnknown_030041C0 -_08025BD0: .4byte gUnknown_02024D1E -_08025BD4: .4byte gUnknown_02024C10 +_08025BCC: .4byte gBattleTextBuff1 +_08025BD0: .4byte gBattleCommunication +_08025BD4: .4byte gBattlescriptCurrInstr thumb_func_end sub_8025B5C thumb_func_start atk86_stockpiletobasedamage @@ -19831,7 +19831,7 @@ atk86_stockpiletobasedamage: @ 8025BD8 mov r7, r8 push {r7} sub sp, 0x10 - ldr r3, _08025C10 @ =gUnknown_02024C10 + ldr r3, _08025C10 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -19843,8 +19843,8 @@ atk86_stockpiletobasedamage: @ 8025BD8 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r2, r0 - ldr r7, _08025C14 @ =gUnknown_02024CA8 - ldr r6, _08025C18 @ =gPlayerMonIndex + ldr r7, _08025C14 @ =gDisableStructs + ldr r6, _08025C18 @ =gBankAttacker ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -19856,20 +19856,20 @@ atk86_stockpiletobasedamage: @ 8025BD8 str r2, [r3] b _08025CC2 .align 2, 0 -_08025C10: .4byte gUnknown_02024C10 -_08025C14: .4byte gUnknown_02024CA8 -_08025C18: .4byte gPlayerMonIndex +_08025C10: .4byte gBattlescriptCurrInstr +_08025C14: .4byte gDisableStructs +_08025C18: .4byte gBankAttacker _08025C1C: - ldr r0, _08025CD0 @ =gUnknown_02024D1E + ldr r0, _08025CD0 @ =gBattleCommunication ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _08025CA8 ldr r0, _08025CD4 @ =gBattleMoveDamage mov r8, r0 - ldr r4, _08025CD8 @ =gUnknown_02024C7A - ldr r5, _08025CDC @ =gEnemyMonIndex + ldr r4, _08025CD8 @ =gSideAffecting + ldr r5, _08025CDC @ =gBankTarget ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 lsls r1, 1 @@ -19883,7 +19883,7 @@ _08025C1C: ldrb r1, [r5] muls r1, r4 adds r1, r2 - ldr r2, _08025CE4 @ =gUnknown_02024BE6 + ldr r2, _08025CE4 @ =gCurrentMove ldrh r2, [r2] movs r4, 0 str r4, [sp] @@ -19913,7 +19913,7 @@ _08025C1C: ldr r1, _08025CEC @ =0x00016002 adds r2, r1 strb r0, [r2] - ldr r1, _08025CF0 @ =gUnknown_02024D28 + ldr r1, _08025CF0 @ =gProtectStructs ldrb r0, [r6] lsls r0, 4 adds r0, r1 @@ -19928,8 +19928,8 @@ _08025C1C: mov r1, r8 str r0, [r1] _08025CA8: - ldr r2, _08025CF4 @ =gUnknown_02024CA8 - ldr r0, _08025CF8 @ =gPlayerMonIndex + ldr r2, _08025CF4 @ =gDisableStructs + ldr r0, _08025CF8 @ =gBankAttacker ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -19937,7 +19937,7 @@ _08025CA8: adds r0, r2 movs r1, 0 strb r1, [r0, 0x9] - ldr r1, _08025CFC @ =gUnknown_02024C10 + ldr r1, _08025CFC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -19949,18 +19949,18 @@ _08025CC2: pop {r0} bx r0 .align 2, 0 -_08025CD0: .4byte gUnknown_02024D1E +_08025CD0: .4byte gBattleCommunication _08025CD4: .4byte gBattleMoveDamage -_08025CD8: .4byte gUnknown_02024C7A -_08025CDC: .4byte gEnemyMonIndex +_08025CD8: .4byte gSideAffecting +_08025CDC: .4byte gBankTarget _08025CE0: .4byte gBattleMons -_08025CE4: .4byte gUnknown_02024BE6 +_08025CE4: .4byte gCurrentMove _08025CE8: .4byte 0x02000000 _08025CEC: .4byte 0x00016002 -_08025CF0: .4byte gUnknown_02024D28 -_08025CF4: .4byte gUnknown_02024CA8 -_08025CF8: .4byte gPlayerMonIndex -_08025CFC: .4byte gUnknown_02024C10 +_08025CF0: .4byte gProtectStructs +_08025CF4: .4byte gDisableStructs +_08025CF8: .4byte gBankAttacker +_08025CFC: .4byte gBattlescriptCurrInstr thumb_func_end atk86_stockpiletobasedamage thumb_func_start sub_8025D00 @@ -19968,7 +19968,7 @@ sub_8025D00: @ 8025D00 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _08025D40 @ =gUnknown_02024C10 + ldr r7, _08025D40 @ =gBattlescriptCurrInstr ldr r1, [r7] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -19980,9 +19980,9 @@ sub_8025D00: @ 8025D00 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r2, r0 - ldr r0, _08025D44 @ =gUnknown_02024CA8 + ldr r0, _08025D44 @ =gDisableStructs mov r8, r0 - ldr r6, _08025D48 @ =gPlayerMonIndex + ldr r6, _08025D48 @ =gBankAttacker ldrb r3, [r6] lsls r0, r3, 3 subs r0, r3 @@ -19993,14 +19993,14 @@ sub_8025D00: @ 8025D00 cmp r1, 0 bne _08025D50 str r2, [r7] - ldr r0, _08025D4C @ =gUnknown_02024D1E + ldr r0, _08025D4C @ =gBattleCommunication strb r1, [r0, 0x5] b _08025DD0 .align 2, 0 -_08025D40: .4byte gUnknown_02024C10 -_08025D44: .4byte gUnknown_02024CA8 -_08025D48: .4byte gPlayerMonIndex -_08025D4C: .4byte gUnknown_02024D1E +_08025D40: .4byte gBattlescriptCurrInstr +_08025D44: .4byte gDisableStructs +_08025D48: .4byte gBankAttacker +_08025D4C: .4byte gBattleCommunication _08025D50: ldr r1, _08025D74 @ =gBattleMons movs r0, 0x58 @@ -20013,17 +20013,17 @@ _08025D50: movs r0, 0 strb r0, [r4, 0x9] str r2, [r7] - ldr r1, _08025D78 @ =gEnemyMonIndex + ldr r1, _08025D78 @ =gBankTarget ldrb r0, [r6] strb r0, [r1] - ldr r1, _08025D7C @ =gUnknown_02024D1E + ldr r1, _08025D7C @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08025DD0 .align 2, 0 _08025D74: .4byte gBattleMons -_08025D78: .4byte gEnemyMonIndex -_08025D7C: .4byte gUnknown_02024D1E +_08025D78: .4byte gBankTarget +_08025D7C: .4byte gBattleCommunication _08025D80: ldr r5, _08025DDC @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] @@ -20062,7 +20062,7 @@ _08025D9C: ldr r0, [r7] adds r0, 0x5 str r0, [r7] - ldr r1, _08025DE8 @ =gEnemyMonIndex + ldr r1, _08025DE8 @ =gBankTarget ldrb r0, [r6] strb r0, [r1] _08025DD0: @@ -20075,14 +20075,14 @@ _08025DD0: _08025DDC: .4byte gBattleMoveDamage _08025DE0: .4byte 0x02000000 _08025DE4: .4byte 0x00016002 -_08025DE8: .4byte gEnemyMonIndex +_08025DE8: .4byte gBankTarget thumb_func_end sub_8025D00 thumb_func_start atk88_negativedamage atk88_negativedamage: @ 8025DEC push {lr} ldr r2, _08025E14 @ =gBattleMoveDamage - ldr r0, _08025E18 @ =gUnknown_02024BF0 + ldr r0, _08025E18 @ =gHP_dealt ldr r0, [r0] lsrs r1, r0, 31 adds r0, r1 @@ -20095,7 +20095,7 @@ atk88_negativedamage: @ 8025DEC negs r0, r0 str r0, [r2] _08025E08: - ldr r1, _08025E1C @ =gUnknown_02024C10 + ldr r1, _08025E1C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20103,8 +20103,8 @@ _08025E08: bx r0 .align 2, 0 _08025E14: .4byte gBattleMoveDamage -_08025E18: .4byte gUnknown_02024BF0 -_08025E1C: .4byte gUnknown_02024C10 +_08025E18: .4byte gHP_dealt +_08025E1C: .4byte gBattlescriptCurrInstr thumb_func_end atk88_negativedamage thumb_func_start sub_8025E20 @@ -20128,15 +20128,15 @@ sub_8025E20: @ 8025E20 ands r0, r5 cmp r0, 0 beq _08025E54 - ldr r0, _08025E4C @ =gUnknown_02024A60 - ldr r1, _08025E50 @ =gPlayerMonIndex + ldr r0, _08025E4C @ =gActiveBank + ldr r1, _08025E50 @ =gBankAttacker b _08025E58 .align 2, 0 -_08025E4C: .4byte gUnknown_02024A60 -_08025E50: .4byte gPlayerMonIndex +_08025E4C: .4byte gActiveBank +_08025E50: .4byte gBankAttacker _08025E54: - ldr r0, _08025EF8 @ =gUnknown_02024A60 - ldr r1, _08025EFC @ =gEnemyMonIndex + ldr r0, _08025EF8 @ =gActiveBank + ldr r1, _08025EFC @ =gBankTarget _08025E58: ldrb r1, [r1] strb r1, [r0] @@ -20166,7 +20166,7 @@ _08025E72: _08025E88: movs r0, 0xDF ands r5, r0 - ldr r1, _08025F00 @ =gUnknown_030041C0 + ldr r1, _08025F00 @ =gBattleTextBuff1 movs r4, 0 movs r2, 0xFD strb r2, [r1] @@ -20183,10 +20183,10 @@ _08025E88: blt _08025EAC b _080261B0 _08025EAC: - ldr r4, _08025F04 @ =gUnknown_02024C80 - ldr r1, _08025EF8 @ =gUnknown_02024A60 + ldr r4, _08025F04 @ =gSideTimer + ldr r1, _08025EF8 @ =gActiveBank ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 lsls r0, r1, 1 @@ -20199,14 +20199,14 @@ _08025EAC: mov r2, r9 cmp r2, 0 bne _08025F54 - ldr r0, _08025F08 @ =gUnknown_02024BE6 + ldr r0, _08025F08 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xAE beq _08025F84 cmp r5, 0x1 bne _08025F74 - ldr r4, _08025F0C @ =gUnknown_02024D68 - ldr r3, _08025EF8 @ =gUnknown_02024A60 + ldr r4, _08025F0C @ =gSpecialStatuses + ldr r3, _08025EF8 @ =gActiveBank ldrb r0, [r3] lsls r1, r0, 2 adds r1, r0 @@ -20216,28 +20216,28 @@ _08025EAC: lsls r0, 31 cmp r0, 0 beq _08025F14 - ldr r0, _08025F10 @ =gUnknown_02024C10 + ldr r0, _08025F10 @ =gBattlescriptCurrInstr mov r4, r8 str r4, [r0] b _08025F74 .align 2, 0 -_08025EF8: .4byte gUnknown_02024A60 -_08025EFC: .4byte gEnemyMonIndex -_08025F00: .4byte gUnknown_030041C0 -_08025F04: .4byte gUnknown_02024C80 -_08025F08: .4byte gUnknown_02024BE6 -_08025F0C: .4byte gUnknown_02024D68 -_08025F10: .4byte gUnknown_02024C10 +_08025EF8: .4byte gActiveBank +_08025EFC: .4byte gBankTarget +_08025F00: .4byte gBattleTextBuff1 +_08025F04: .4byte gSideTimer +_08025F08: .4byte gCurrentMove +_08025F0C: .4byte gSpecialStatuses +_08025F10: .4byte gBattlescriptCurrInstr _08025F14: mov r0, r8 bl b_movescr_stack_push ldr r0, _08025F40 @ =0x02000000 - ldr r6, _08025F44 @ =gUnknown_02024A60 + ldr r6, _08025F44 @ =gActiveBank ldrb r1, [r6] ldr r2, _08025F48 @ =0x00016003 adds r0, r2 strb r1, [r0] - ldr r1, _08025F4C @ =gUnknown_02024C10 + ldr r1, _08025F4C @ =gBattlescriptCurrInstr ldr r0, _08025F50 @ =gUnknown_081D9128 str r0, [r1] ldrb r1, [r6] @@ -20252,12 +20252,12 @@ _08025F14: b _08025F74 .align 2, 0 _08025F40: .4byte 0x02000000 -_08025F44: .4byte gUnknown_02024A60 +_08025F44: .4byte gActiveBank _08025F48: .4byte 0x00016003 -_08025F4C: .4byte gUnknown_02024C10 +_08025F4C: .4byte gBattlescriptCurrInstr _08025F50: .4byte gUnknown_081D9128 _08025F54: - ldr r0, _08025F78 @ =gUnknown_02024BE6 + ldr r0, _08025F78 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xAE beq _08025F84 @@ -20269,19 +20269,19 @@ _08025F54: lsls r0, 24 cmp r0, 0 beq _08025F84 - ldr r1, _08025F7C @ =gUnknown_02024C10 + ldr r1, _08025F7C @ =gBattlescriptCurrInstr ldr r0, _08025F80 @ =BattleScript_1D83D6 str r0, [r1] _08025F74: movs r0, 0x1 b _080262A4 .align 2, 0 -_08025F78: .4byte gUnknown_02024BE6 -_08025F7C: .4byte gUnknown_02024C10 +_08025F78: .4byte gCurrentMove +_08025F7C: .4byte gBattlescriptCurrInstr _08025F80: .4byte BattleScript_1D83D6 _08025F84: ldr r2, _08025FCC @ =gBattleMons - ldr r1, _08025FD0 @ =gUnknown_02024A60 + ldr r1, _08025FD0 @ =gActiveBank ldrb r3, [r1] movs r4, 0x58 adds r0, r3, 0 @@ -20298,13 +20298,13 @@ _08025FA0: mov r0, r9 cmp r0, 0 bne _08026040 - ldr r0, _08025FD4 @ =gUnknown_02024BE6 + ldr r0, _08025FD4 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xAE beq _08026040 cmp r5, 0x1 bne _08025F74 - ldr r4, _08025FD8 @ =gUnknown_02024D68 + ldr r4, _08025FD8 @ =gSpecialStatuses lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -20313,29 +20313,29 @@ _08025FA0: lsls r0, 31 cmp r0, 0 beq _08025FE0 - ldr r0, _08025FDC @ =gUnknown_02024C10 + ldr r0, _08025FDC @ =gBattlescriptCurrInstr mov r1, r8 str r1, [r0] b _08025F74 .align 2, 0 _08025FCC: .4byte gBattleMons -_08025FD0: .4byte gUnknown_02024A60 -_08025FD4: .4byte gUnknown_02024BE6 -_08025FD8: .4byte gUnknown_02024D68 -_08025FDC: .4byte gUnknown_02024C10 +_08025FD0: .4byte gActiveBank +_08025FD4: .4byte gCurrentMove +_08025FD8: .4byte gSpecialStatuses +_08025FDC: .4byte gBattlescriptCurrInstr _08025FE0: mov r0, r8 bl b_movescr_stack_push ldr r0, _08026028 @ =0x02000000 - ldr r2, _0802602C @ =gUnknown_02024A60 + ldr r2, _0802602C @ =gActiveBank ldrb r1, [r2] ldr r3, _08026030 @ =0x00016003 adds r0, r3 strb r1, [r0] - ldr r1, _08026034 @ =gUnknown_02024C10 + ldr r1, _08026034 @ =gBattlescriptCurrInstr ldr r0, _08026038 @ =gUnknown_081D989B str r0, [r1] - ldr r1, _0802603C @ =byte_2024C06 + ldr r1, _0802603C @ =gLastUsedAbility ldrb r0, [r2] movs r6, 0x58 muls r0, r6 @@ -20346,7 +20346,7 @@ _08025FE0: ldrb r0, [r2] ldrb r1, [r1] bl sub_81074C4 - ldr r0, _0802602C @ =gUnknown_02024A60 + ldr r0, _0802602C @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -20359,13 +20359,13 @@ _08025FE0: b _08025F74 .align 2, 0 _08026028: .4byte 0x02000000 -_0802602C: .4byte gUnknown_02024A60 +_0802602C: .4byte gActiveBank _08026030: .4byte 0x00016003 -_08026034: .4byte gUnknown_02024C10 +_08026034: .4byte gBattlescriptCurrInstr _08026038: .4byte gUnknown_081D989B -_0802603C: .4byte byte_2024C06 +_0802603C: .4byte gLastUsedAbility _08026040: - ldr r1, _08026090 @ =gUnknown_02024A60 + ldr r1, _08026090 @ =gActiveBank ldrb r0, [r1] movs r4, 0x58 muls r0, r4 @@ -20384,15 +20384,15 @@ _08026040: mov r0, r8 bl b_movescr_stack_push ldr r0, _08026094 @ =0x02000000 - ldr r3, _08026090 @ =gUnknown_02024A60 + ldr r3, _08026090 @ =gActiveBank ldrb r1, [r3] ldr r6, _08026098 @ =0x00016003 adds r0, r6 strb r1, [r0] - ldr r1, _0802609C @ =gUnknown_02024C10 + ldr r1, _0802609C @ =gBattlescriptCurrInstr ldr r0, _080260A0 @ =gUnknown_081D9903 str r0, [r1] - ldr r1, _080260A4 @ =byte_2024C06 + ldr r1, _080260A4 @ =gLastUsedAbility ldrb r0, [r3] muls r0, r4 add r0, r10 @@ -20404,14 +20404,14 @@ _08026040: bl sub_81074C4 b _08025F74 .align 2, 0 -_08026090: .4byte gUnknown_02024A60 +_08026090: .4byte gActiveBank _08026094: .4byte 0x02000000 _08026098: .4byte 0x00016003 -_0802609C: .4byte gUnknown_02024C10 +_0802609C: .4byte gBattlescriptCurrInstr _080260A0: .4byte gUnknown_081D9903 -_080260A4: .4byte byte_2024C06 +_080260A4: .4byte gLastUsedAbility _080260A8: - ldr r1, _080260FC @ =gUnknown_02024A60 + ldr r1, _080260FC @ =gActiveBank ldrb r0, [r1] movs r4, 0x58 muls r0, r4 @@ -20432,15 +20432,15 @@ _080260CA: mov r0, r8 bl b_movescr_stack_push ldr r0, _08026100 @ =0x02000000 - ldr r3, _080260FC @ =gUnknown_02024A60 + ldr r3, _080260FC @ =gActiveBank ldrb r1, [r3] ldr r6, _08026104 @ =0x00016003 adds r0, r6 strb r1, [r0] - ldr r1, _08026108 @ =gUnknown_02024C10 + ldr r1, _08026108 @ =gBattlescriptCurrInstr ldr r0, _0802610C @ =gUnknown_081D9903 str r0, [r1] - ldr r1, _08026110 @ =byte_2024C06 + ldr r1, _08026110 @ =gLastUsedAbility ldrb r0, [r3] muls r0, r4 add r0, r10 @@ -20452,14 +20452,14 @@ _080260CA: bl sub_81074C4 b _08025F74 .align 2, 0 -_080260FC: .4byte gUnknown_02024A60 +_080260FC: .4byte gActiveBank _08026100: .4byte 0x02000000 _08026104: .4byte 0x00016003 -_08026108: .4byte gUnknown_02024C10 +_08026108: .4byte gBattlescriptCurrInstr _0802610C: .4byte gUnknown_081D9903 -_08026110: .4byte byte_2024C06 +_08026110: .4byte gLastUsedAbility _08026114: - ldr r0, _080261A0 @ =gUnknown_02024A60 + ldr r0, _080261A0 @ =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -20478,7 +20478,7 @@ _0802612C: ands r0, r1 negs r0, r0 lsls r0, 24 - ldr r3, _080261A4 @ =gUnknown_03004290 + ldr r3, _080261A4 @ =gBattleTextBuff2 movs r4, 0 movs r1, 0xFD strb r1, [r3] @@ -20507,7 +20507,7 @@ _08026156: adds r1, r2, r3 movs r0, 0xFF strb r0, [r1] - ldr r1, _080261A0 @ =gUnknown_02024A60 + ldr r1, _080261A0 @ =gActiveBank ldrb r2, [r1] movs r0, 0x58 muls r0, r2 @@ -20521,9 +20521,9 @@ _08026156: cmp r0, 0 beq _08026206 movs r1, 0 - ldr r0, _080261A8 @ =gEnemyMonIndex + ldr r0, _080261A8 @ =gBankTarget ldrb r0, [r0] - ldr r3, _080261AC @ =gUnknown_02024D1E + ldr r3, _080261AC @ =gBattleCommunication mov r8, r3 cmp r0, r2 bne _0802619A @@ -20533,15 +20533,15 @@ _0802619A: strb r1, [r4, 0x5] b _08026234 .align 2, 0 -_080261A0: .4byte gUnknown_02024A60 -_080261A4: .4byte gUnknown_03004290 -_080261A8: .4byte gEnemyMonIndex -_080261AC: .4byte gUnknown_02024D1E +_080261A0: .4byte gActiveBank +_080261A4: .4byte gBattleTextBuff2 +_080261A8: .4byte gBankTarget +_080261AC: .4byte gBattleCommunication _080261B0: asrs r6, r0, 28 movs r0, 0x7 ands r6, r0 - ldr r3, _08026210 @ =gUnknown_03004290 + ldr r3, _08026210 @ =gBattleTextBuff2 strb r2, [r3] movs r2, 0x1 cmp r6, 0x2 @@ -20568,7 +20568,7 @@ _080261CA: orrs r0, r2 strb r0, [r1] ldr r2, _08026214 @ =gBattleMons - ldr r4, _08026218 @ =gUnknown_02024A60 + ldr r4, _08026218 @ =gActiveBank ldrb r3, [r4] movs r0, 0x58 muls r0, r3 @@ -20583,21 +20583,21 @@ _080261CA: cmp r0, 0xC bne _08026220 _08026206: - ldr r1, _0802621C @ =gUnknown_02024D1E + ldr r1, _0802621C @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] mov r8, r1 b _08026234 .align 2, 0 -_08026210: .4byte gUnknown_03004290 +_08026210: .4byte gBattleTextBuff2 _08026214: .4byte gBattleMons -_08026218: .4byte gUnknown_02024A60 -_0802621C: .4byte gUnknown_02024D1E +_08026218: .4byte gActiveBank +_0802621C: .4byte gBattleCommunication _08026220: movs r1, 0 - ldr r0, _080262B4 @ =gEnemyMonIndex + ldr r0, _080262B4 @ =gBankTarget ldrb r0, [r0] - ldr r2, _080262B8 @ =gUnknown_02024D1E + ldr r2, _080262B8 @ =gBattleCommunication mov r8, r2 cmp r0, r3 bne _08026230 @@ -20606,7 +20606,7 @@ _08026230: mov r3, r8 strb r1, [r3, 0x5] _08026234: - ldr r2, _080262BC @ =gUnknown_02024A60 + ldr r2, _080262BC @ =gActiveBank ldrb r0, [r2] movs r4, 0x58 adds r1, r0, 0 @@ -20631,7 +20631,7 @@ _08026234: movs r0, 0 strb r0, [r1] _08026264: - ldr r1, _080262BC @ =gUnknown_02024A60 + ldr r1, _080262BC @ =gActiveBank ldrb r0, [r1] muls r0, r4 adds r0, r7, r0 @@ -20675,16 +20675,16 @@ _080262A4: pop {r1} bx r1 .align 2, 0 -_080262B4: .4byte gEnemyMonIndex -_080262B8: .4byte gUnknown_02024D1E -_080262BC: .4byte gUnknown_02024A60 +_080262B4: .4byte gBankTarget +_080262B8: .4byte gBattleCommunication +_080262BC: .4byte gActiveBank _080262C0: .4byte gBattleMoveFlags thumb_func_end sub_8025E20 thumb_func_start atk89_statbuffchange atk89_statbuffchange: @ 80262C4 push {r4,r5,lr} - ldr r5, _0802630C @ =gUnknown_02024C10 + ldr r5, _0802630C @ =gBattlescriptCurrInstr ldr r2, [r5] ldrb r3, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -20719,7 +20719,7 @@ _08026304: pop {r0} bx r0 .align 2, 0 -_0802630C: .4byte gUnknown_02024C10 +_0802630C: .4byte gBattlescriptCurrInstr _08026310: .4byte 0x02000000 _08026314: .4byte 0x0001601e thumb_func_end atk89_statbuffchange @@ -20728,9 +20728,9 @@ _08026314: .4byte 0x0001601e atk8A_normalisebuffs: @ 8026318 push {r4-r7,lr} movs r2, 0 - ldr r0, _08026360 @ =gUnknown_02024A68 + ldr r0, _08026360 @ =gNoOfAllBanks ldrb r1, [r0] - ldr r0, _08026364 @ =gUnknown_02024C10 + ldr r0, _08026364 @ =gBattlescriptCurrInstr mov r12, r0 cmp r2, r1 bge _08026350 @@ -20765,8 +20765,8 @@ _08026350: pop {r0} bx r0 .align 2, 0 -_08026360: .4byte gUnknown_02024A68 -_08026364: .4byte gUnknown_02024C10 +_08026360: .4byte gNoOfAllBanks +_08026364: .4byte gBattlescriptCurrInstr _08026368: .4byte gBattleMons thumb_func_end atk8A_normalisebuffs @@ -20774,7 +20774,7 @@ _08026368: .4byte gBattleMons atk8B_setbide: @ 802636C push {r4,r5,lr} ldr r4, _080263C4 @ =gBattleMons - ldr r3, _080263C8 @ =gPlayerMonIndex + ldr r3, _080263C8 @ =gBankAttacker ldrb r0, [r3] movs r5, 0x58 adds r2, r0, 0 @@ -20786,15 +20786,15 @@ atk8B_setbide: @ 802636C lsls r1, 5 orrs r0, r1 str r0, [r2] - ldr r1, _080263CC @ =gUnknown_02024C54 + ldr r1, _080263CC @ =gLockedMove ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _080263D0 @ =gUnknown_02024BE6 + ldr r1, _080263D0 @ =gCurrentMove ldrh r1, [r1] movs r2, 0 strh r1, [r0] - ldr r1, _080263D4 @ =gUnknown_02024BF4 + ldr r1, _080263D4 @ =gTakenDmg ldrb r0, [r3] lsls r0, 2 adds r0, r1 @@ -20808,7 +20808,7 @@ atk8B_setbide: @ 802636C lsls r2, 2 orrs r0, r2 str r0, [r1] - ldr r1, _080263D8 @ =gUnknown_02024C10 + ldr r1, _080263D8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20817,18 +20817,18 @@ atk8B_setbide: @ 802636C bx r0 .align 2, 0 _080263C4: .4byte gBattleMons -_080263C8: .4byte gPlayerMonIndex -_080263CC: .4byte gUnknown_02024C54 -_080263D0: .4byte gUnknown_02024BE6 -_080263D4: .4byte gUnknown_02024BF4 -_080263D8: .4byte gUnknown_02024C10 +_080263C8: .4byte gBankAttacker +_080263CC: .4byte gLockedMove +_080263D0: .4byte gCurrentMove +_080263D4: .4byte gTakenDmg +_080263D8: .4byte gBattlescriptCurrInstr thumb_func_end atk8B_setbide thumb_func_start atk8C_confuseifrepeatingattackends atk8C_confuseifrepeatingattackends: @ 80263DC push {lr} ldr r1, _0802640C @ =gBattleMons - ldr r0, _08026410 @ =gPlayerMonIndex + ldr r0, _08026410 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -20840,11 +20840,11 @@ atk8C_confuseifrepeatingattackends: @ 80263DC ands r0, r1 cmp r0, 0 bne _080263FE - ldr r1, _08026414 @ =gUnknown_02024D1E + ldr r1, _08026414 @ =gBattleCommunication movs r0, 0x75 strb r0, [r1, 0x3] _080263FE: - ldr r1, _08026418 @ =gUnknown_02024C10 + ldr r1, _08026418 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20852,27 +20852,27 @@ _080263FE: bx r0 .align 2, 0 _0802640C: .4byte gBattleMons -_08026410: .4byte gPlayerMonIndex -_08026414: .4byte gUnknown_02024D1E -_08026418: .4byte gUnknown_02024C10 +_08026410: .4byte gBankAttacker +_08026414: .4byte gBattleCommunication +_08026418: .4byte gBattlescriptCurrInstr thumb_func_end atk8C_confuseifrepeatingattackends thumb_func_start atk8D_setloopcounter atk8D_setloopcounter: @ 802641C push {r4,r5,lr} - ldr r0, _08026430 @ =gUnknown_02024C10 + ldr r0, _08026430 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x1] cmp r1, 0 beq _08026438 - ldr r0, _08026434 @ =gUnknown_02024C0E + ldr r0, _08026434 @ =gMultiHitCounter strb r1, [r0] b _08026452 .align 2, 0 -_08026430: .4byte gUnknown_02024C10 -_08026434: .4byte gUnknown_02024C0E +_08026430: .4byte gBattlescriptCurrInstr +_08026434: .4byte gMultiHitCounter _08026438: - ldr r4, _08026460 @ =gUnknown_02024C0E + ldr r4, _08026460 @ =gMultiHitCounter bl Random movs r5, 0x3 ands r0, r5 @@ -20885,7 +20885,7 @@ _0802644E: adds r0, 0x2 strb r0, [r4] _08026452: - ldr r1, _08026464 @ =gUnknown_02024C10 + ldr r1, _08026464 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -20893,8 +20893,8 @@ _08026452: pop {r0} bx r0 .align 2, 0 -_08026460: .4byte gUnknown_02024C0E -_08026464: .4byte gUnknown_02024C10 +_08026460: .4byte gMultiHitCounter +_08026464: .4byte gBattlescriptCurrInstr thumb_func_end atk8D_setloopcounter thumb_func_start sub_8026468 @@ -20923,7 +20923,7 @@ sub_8026468: @ 8026468 adds r1, r4 movs r0, 0xFF strb r0, [r1] - ldr r1, _080264BC @ =gUnknown_02024C10 + ldr r1, _080264BC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20936,21 +20936,21 @@ _080264AC: .4byte 0x000160e0 _080264B0: .4byte 0x000160e1 _080264B4: .4byte 0x000160e2 _080264B8: .4byte 0x000160e4 -_080264BC: .4byte gUnknown_02024C10 +_080264BC: .4byte gBattlescriptCurrInstr thumb_func_end sub_8026468 thumb_func_start sub_80264C0 sub_80264C0: @ 80264C0 push {r4-r7,lr} ldr r6, _080264F4 @ =gBattleMons - ldr r7, _080264F8 @ =gPlayerMonIndex + ldr r7, _080264F8 @ =gBankAttacker ldrb r0, [r7] movs r5, 0x58 adds r1, r0, 0 muls r1, r5 adds r1, r6 adds r1, 0x2A - ldr r4, _080264FC @ =gEnemyMonIndex + ldr r4, _080264FC @ =gBankTarget ldrb r3, [r4] adds r0, r3, 0 muls r0, r5 @@ -20964,16 +20964,16 @@ sub_80264C0: @ 80264C0 ldr r2, _08026504 @ =0x00016064 adds r1, r3, r2 adds r1, r0 - ldr r2, _08026508 @ =gUnknown_02024A6A + ldr r2, _08026508 @ =gBattlePartyID lsls r0, r3, 1 b _08026568 .align 2, 0 _080264F4: .4byte gBattleMons -_080264F8: .4byte gPlayerMonIndex -_080264FC: .4byte gEnemyMonIndex +_080264F8: .4byte gBankAttacker +_080264FC: .4byte gBankTarget _08026500: .4byte 0x02000000 _08026504: .4byte 0x00016064 -_08026508: .4byte gUnknown_02024A6A +_08026508: .4byte gBattlePartyID _0802650C: bl Random movs r3, 0xFF @@ -20997,7 +20997,7 @@ _0802650C: lsrs r1, 2 cmp r0, r1 bhi _0802655C - ldr r3, _08026558 @ =gUnknown_02024C10 + ldr r3, _08026558 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -21013,19 +21013,19 @@ _0802650C: movs r0, 0 b _08026576 .align 2, 0 -_08026558: .4byte gUnknown_02024C10 +_08026558: .4byte gBattlescriptCurrInstr _0802655C: ldr r0, _0802657C @ =0x02000000 ldr r2, _08026580 @ =0x00016064 adds r1, r4, r2 adds r1, r0 - ldr r2, _08026584 @ =gUnknown_02024A6A + ldr r2, _08026584 @ =gBattlePartyID lsls r0, r4, 1 _08026568: adds r0, r2 ldrh r0, [r0] strb r0, [r1] - ldr r1, _08026588 @ =gUnknown_02024C10 + ldr r1, _08026588 @ =gBattlescriptCurrInstr ldr r0, _0802658C @ =gUnknown_081D90FC str r0, [r1] movs r0, 0x1 @@ -21036,8 +21036,8 @@ _08026576: .align 2, 0 _0802657C: .4byte 0x02000000 _08026580: .4byte 0x00016064 -_08026584: .4byte gUnknown_02024A6A -_08026588: .4byte gUnknown_02024C10 +_08026584: .4byte gBattlePartyID +_08026588: .4byte gBattlescriptCurrInstr _0802658C: .4byte gUnknown_081D90FC thumb_func_end sub_80264C0 @@ -21054,9 +21054,9 @@ sub_8026590: @ 8026590 bne _080265A4 b _0802687C _080265A4: - ldr r5, _0802662C @ =gEnemyMonIndex + ldr r5, _0802662C @ =gBankTarget ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, _08026630 @ =gEnemyParty mov r8, r1 @@ -21120,7 +21120,7 @@ _0802661A: b _08026678 .align 2, 0 _08026628: .4byte gBattleTypeFlags -_0802662C: .4byte gEnemyMonIndex +_0802662C: .4byte gBankTarget _08026630: .4byte gEnemyParty _08026634: .4byte gPlayerParty _08026638: @@ -21178,7 +21178,7 @@ _08026688: cmp r0, 0 bne _080266C4 _080266A0: - ldr r3, _080266C0 @ =gUnknown_02024C10 + ldr r3, _080266C0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -21194,7 +21194,7 @@ _080266A0: b _08026880 .align 2, 0 _080266BC: .4byte gBattleTypeFlags -_080266C0: .4byte gUnknown_02024C10 +_080266C0: .4byte gBattlescriptCurrInstr _080266C4: bl sub_80264C0 lsls r0, 24 @@ -21216,7 +21216,7 @@ _080266DC: bl __umodsi3 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08026714 @ =gEnemyMonIndex + ldr r0, _08026714 @ =gBankTarget ldrb r0, [r0] bl sub_803FC34 lsls r0, 24 @@ -21232,12 +21232,12 @@ _080266DC: b _0802671A .align 2, 0 _08026710: .4byte gBattleTypeFlags -_08026714: .4byte gEnemyMonIndex +_08026714: .4byte gBankTarget _08026718: adds r5, r6, 0 _0802671A: - ldr r4, _0802676C @ =gUnknown_02024A6A - ldr r0, _08026770 @ =gEnemyMonIndex + ldr r4, _0802676C @ =gBattlePartyID + ldr r0, _08026770 @ =gBankTarget ldrb r2, [r0] lsls r1, r2, 1 adds r1, r4 @@ -21274,14 +21274,14 @@ _0802671A: beq _080266DC b _08026832 .align 2, 0 -_0802676C: .4byte gUnknown_02024A6A -_08026770: .4byte gEnemyMonIndex +_0802676C: .4byte gBattlePartyID +_08026770: .4byte gBankTarget _08026774: movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080267E4 - ldr r6, _080267DC @ =gUnknown_02024A6A + ldr r6, _080267DC @ =gBattlePartyID _0802677E: bl Random lsls r0, 16 @@ -21290,7 +21290,7 @@ _0802677E: bl __umodsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080267E0 @ =gEnemyMonIndex + ldr r0, _080267E0 @ =gBankTarget ldrb r1, [r0] lsls r0, r1, 1 adds r0, r6 @@ -21326,10 +21326,10 @@ _0802677E: beq _0802677E b _08026832 .align 2, 0 -_080267DC: .4byte gUnknown_02024A6A -_080267E0: .4byte gEnemyMonIndex +_080267DC: .4byte gBattlePartyID +_080267E0: .4byte gBankTarget _080267E4: - ldr r6, _0802686C @ =gUnknown_02024A6A + ldr r6, _0802686C @ =gBattlePartyID _080267E6: bl Random lsls r0, 16 @@ -21338,7 +21338,7 @@ _080267E6: bl __umodsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08026870 @ =gEnemyMonIndex + ldr r0, _08026870 @ =gBankTarget ldrb r0, [r0] lsls r0, 1 adds r0, r6 @@ -21366,7 +21366,7 @@ _080267E6: beq _080267E6 _08026832: ldr r0, _08026874 @ =0x02000000 - ldr r4, _08026870 @ =gEnemyMonIndex + ldr r4, _08026870 @ =gBankTarget ldrb r1, [r4] ldr r2, _08026878 @ =0x00016068 adds r1, r2 @@ -21391,8 +21391,8 @@ _08026850: bl sub_8094B6C b _08026880 .align 2, 0 -_0802686C: .4byte gUnknown_02024A6A -_08026870: .4byte gEnemyMonIndex +_0802686C: .4byte gBattlePartyID +_08026870: .4byte gBankTarget _08026874: .4byte 0x02000000 _08026878: .4byte 0x00016068 _0802687C: @@ -21414,7 +21414,7 @@ sub_802688C: @ 802688C push {r5-r7} movs r6, 0 ldr r2, _08026920 @ =gBattleMons - ldr r3, _08026924 @ =gPlayerMonIndex + ldr r3, _08026924 @ =gBankAttacker ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -21449,7 +21449,7 @@ _080268CE: mov r10, r0 ldr r5, _08026920 @ =gBattleMons mov r12, r5 - ldr r7, _08026924 @ =gPlayerMonIndex + ldr r7, _08026924 @ =gBankAttacker ldrb r0, [r7] movs r4, 0x58 adds r5, r0, 0 @@ -21486,7 +21486,7 @@ _0802691A: b _0802692E .align 2, 0 _08026920: .4byte gBattleMons -_08026924: .4byte gPlayerMonIndex +_08026924: .4byte gBankAttacker _08026928: .4byte gBattleMoves _0802692C: movs r2, 0 @@ -21512,7 +21512,7 @@ _08026946: _08026950: cmp r3, r6 bne _08026974 - ldr r3, _08026970 @ =gUnknown_02024C10 + ldr r3, _08026970 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -21527,7 +21527,7 @@ _08026950: str r1, [r3] b _08026A18 .align 2, 0 -_08026970: .4byte gUnknown_02024C10 +_08026970: .4byte gBattlescriptCurrInstr _08026974: movs r7, 0x3 ldr r5, _080269CC @ =gBattleMoves @@ -21540,7 +21540,7 @@ _0802697A: bcs _0802697A ldr r4, _080269D0 @ =gBattleMons lsls r1, r3, 1 - ldr r3, _080269D4 @ =gPlayerMonIndex + ldr r3, _080269D4 @ =gBankAttacker ldrb r2, [r3] movs r0, 0x58 adds r5, r2, 0 @@ -21577,7 +21577,7 @@ _080269C8: .align 2, 0 _080269CC: .4byte gBattleMoves _080269D0: .4byte gBattleMons -_080269D4: .4byte gPlayerMonIndex +_080269D4: .4byte gBankAttacker _080269D8: movs r2, 0 _080269DA: @@ -21600,7 +21600,7 @@ _080269DA: add r0, r8 adds r0, 0x22 strb r2, [r0] - ldr r1, _08026A28 @ =gUnknown_030041C0 + ldr r1, _08026A28 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -21608,7 +21608,7 @@ _080269DA: strb r2, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _08026A2C @ =gUnknown_02024C10 + ldr r1, _08026A2C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -21621,8 +21621,8 @@ _08026A18: pop {r0} bx r0 .align 2, 0 -_08026A28: .4byte gUnknown_030041C0 -_08026A2C: .4byte gUnknown_02024C10 +_08026A28: .4byte gBattleTextBuff1 +_08026A2C: .4byte gBattlescriptCurrInstr thumb_func_end sub_802688C thumb_func_start atk91_givemoney @@ -21634,7 +21634,7 @@ atk91_givemoney: @ 8026A30 ands r0, r1 cmp r0, 0 bne _08026AAC - ldr r4, _08026A90 @ =gUnknown_02024D1A + ldr r4, _08026A90 @ =gPaydayMoney ldrh r0, [r4] cmp r0, 0 beq _08026AAC @@ -21646,7 +21646,7 @@ atk91_givemoney: @ 8026A30 ldrb r1, [r1] muls r1, r2 bl sub_80B79B8 - ldr r1, _08026AA0 @ =gUnknown_030041C0 + ldr r1, _08026AA0 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x1 @@ -21664,7 +21664,7 @@ atk91_givemoney: @ 8026A30 strb r0, [r1, 0x5] movs r0, 0xFF strb r0, [r1, 0x6] - ldr r4, _08026AA4 @ =gUnknown_02024C10 + ldr r4, _08026AA4 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -21673,15 +21673,15 @@ atk91_givemoney: @ 8026A30 b _08026AB4 .align 2, 0 _08026A8C: .4byte gBattleTypeFlags -_08026A90: .4byte gUnknown_02024D1A +_08026A90: .4byte gPaydayMoney _08026A94: .4byte gSaveBlock1 + 0x490 _08026A98: .4byte 0x02000000 _08026A9C: .4byte 0x00016056 -_08026AA0: .4byte gUnknown_030041C0 -_08026AA4: .4byte gUnknown_02024C10 +_08026AA0: .4byte gBattleTextBuff1 +_08026AA4: .4byte gBattlescriptCurrInstr _08026AA8: .4byte gUnknown_081D95DB _08026AAC: - ldr r1, _08026ABC @ =gUnknown_02024C10 + ldr r1, _08026ABC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -21690,16 +21690,16 @@ _08026AB4: pop {r0} bx r0 .align 2, 0 -_08026ABC: .4byte gUnknown_02024C10 +_08026ABC: .4byte gBattlescriptCurrInstr thumb_func_end atk91_givemoney thumb_func_start atk92_setlightscreen atk92_setlightscreen: @ 8026AC0 push {r4-r6,lr} - ldr r4, _08026AF0 @ =gPlayerMonIndex + ldr r4, _08026AF0 @ =gBankAttacker ldrb r0, [r4] - bl battle_get_per_side_status - ldr r6, _08026AF4 @ =gUnknown_02024C7A + bl GetBankIdentity + ldr r6, _08026AF4 @ =gSideAffecting movs r5, 0x1 adds r1, r5, 0 ands r1, r0 @@ -21715,17 +21715,17 @@ atk92_setlightscreen: @ 8026AC0 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08026AFC @ =gUnknown_02024D1E + ldr r1, _08026AFC @ =gBattleCommunication movs r0, 0 b _08026B60 .align 2, 0 -_08026AF0: .4byte gPlayerMonIndex -_08026AF4: .4byte gUnknown_02024C7A +_08026AF0: .4byte gBankAttacker +_08026AF4: .4byte gSideAffecting _08026AF8: .4byte gBattleMoveFlags -_08026AFC: .4byte gUnknown_02024D1E +_08026AFC: .4byte gBattleCommunication _08026B00: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r5, 0 ands r1, r0 lsls r1, 1 @@ -21735,8 +21735,8 @@ _08026B00: orrs r0, r2 strh r0, [r1] ldrb r0, [r4] - bl battle_get_per_side_status - ldr r2, _08026B50 @ =gUnknown_02024C80 + bl GetBankIdentity + ldr r2, _08026B50 @ =gSideTimer adds r1, r5, 0 ands r1, r0 lsls r0, r1, 1 @@ -21752,24 +21752,24 @@ _08026B00: cmp r0, 0 beq _08026B5C movs r0, 0x1 - bl sub_803C348 + bl CountAliveMons lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 bne _08026B5C - ldr r1, _08026B58 @ =gUnknown_02024D1E + ldr r1, _08026B58 @ =gBattleCommunication movs r0, 0x4 b _08026B60 .align 2, 0 -_08026B50: .4byte gUnknown_02024C80 +_08026B50: .4byte gSideTimer _08026B54: .4byte gBattleTypeFlags -_08026B58: .4byte gUnknown_02024D1E +_08026B58: .4byte gBattleCommunication _08026B5C: - ldr r1, _08026B70 @ =gUnknown_02024D1E + ldr r1, _08026B70 @ =gBattleCommunication movs r0, 0x3 _08026B60: strb r0, [r1, 0x5] - ldr r1, _08026B74 @ =gUnknown_02024C10 + ldr r1, _08026B74 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -21777,8 +21777,8 @@ _08026B60: pop {r0} bx r0 .align 2, 0 -_08026B70: .4byte gUnknown_02024D1E -_08026B74: .4byte gUnknown_02024C10 +_08026B70: .4byte gBattleCommunication +_08026B74: .4byte gBattlescriptCurrInstr thumb_func_end atk92_setlightscreen thumb_func_start sub_8026B78 @@ -21789,7 +21789,7 @@ sub_8026B78: @ 8026B78 mov r5, r8 push {r5-r7} ldr r7, _08026BA8 @ =gBattleMons - ldr r6, _08026BAC @ =gEnemyMonIndex + ldr r6, _08026BAC @ =gBankTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -21808,7 +21808,7 @@ sub_8026B78: @ 8026B78 b _08026BCE .align 2, 0 _08026BA8: .4byte gBattleMons -_08026BAC: .4byte gEnemyMonIndex +_08026BAC: .4byte gBankTarget _08026BB0: .4byte gEnigmaBerries _08026BB4: ldrh r0, [r1, 0x2E] @@ -21823,8 +21823,8 @@ _08026BB4: lsls r0, 24 lsrs r6, r0, 24 _08026BCE: - ldr r1, _08026C4C @ =gUnknown_02024C0B - ldr r5, _08026C50 @ =gEnemyMonIndex + ldr r1, _08026C4C @ =gStringBank + ldr r5, _08026C50 @ =gBankTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -21841,7 +21841,7 @@ _08026BCE: ldrb r0, [r5] movs r1, 0x27 bl sub_81074F8 - ldr r2, _08026C54 @ =gUnknown_02024D68 + ldr r2, _08026C54 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -21854,7 +21854,7 @@ _08026BCE: _08026C0C: ldr r0, _08026C58 @ =gBattleMons mov r8, r0 - ldr r1, _08026C50 @ =gEnemyMonIndex + ldr r1, _08026C50 @ =gBankTarget ldrb r2, [r1] movs r6, 0x58 adds r0, r2, 0 @@ -21872,27 +21872,27 @@ _08026C0C: movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, _08026C60 @ =byte_2024C06 + ldr r0, _08026C60 @ =gLastUsedAbility strb r3, [r0] - ldr r1, _08026C64 @ =gUnknown_02024C10 + ldr r1, _08026C64 @ =gBattlescriptCurrInstr ldr r0, _08026C68 @ =gUnknown_081D9826 str r0, [r1] - ldr r1, _08026C50 @ =gEnemyMonIndex + ldr r1, _08026C50 @ =gBankTarget ldrb r0, [r1] movs r1, 0x5 bl sub_81074C4 b _08026E40 .align 2, 0 -_08026C4C: .4byte gUnknown_02024C0B -_08026C50: .4byte gEnemyMonIndex -_08026C54: .4byte gUnknown_02024D68 +_08026C4C: .4byte gStringBank +_08026C50: .4byte gBankTarget +_08026C54: .4byte gSpecialStatuses _08026C58: .4byte gBattleMons _08026C5C: .4byte gBattleMoveFlags -_08026C60: .4byte byte_2024C06 -_08026C64: .4byte gUnknown_02024C10 +_08026C60: .4byte gLastUsedAbility +_08026C64: .4byte gBattlescriptCurrInstr _08026C68: .4byte gUnknown_081D9826 _08026C6C: - ldr r1, _08026CE0 @ =gUnknown_02024C98 + ldr r1, _08026CE0 @ =gStatuses3 lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] @@ -21901,13 +21901,13 @@ _08026C6C: cmp r0, 0 bne _08026CF4 ldr r1, _08026CE4 @ =gBattleMoves - ldr r0, _08026CE8 @ =gUnknown_02024BE6 + ldr r0, _08026CE8 @ =gCurrentMove ldrh r0, [r0] lsls r2, r0, 1 adds r2, r0 lsls r2, 2 adds r2, r1 - ldr r7, _08026CEC @ =gPlayerMonIndex + ldr r7, _08026CEC @ =gBankAttacker ldrb r0, [r7] muls r0, r6 add r0, r10 @@ -21936,7 +21936,7 @@ _08026C6C: muls r1, r6 add r1, r10 adds r1, 0x2A - ldr r2, _08026CF0 @ =gEnemyMonIndex + ldr r2, _08026CF0 @ =gBankTarget ldrb r0, [r2] muls r0, r6 add r0, r10 @@ -21950,18 +21950,18 @@ _08026CDC: mov r10, r8 b _08026DE0 .align 2, 0 -_08026CE0: .4byte gUnknown_02024C98 +_08026CE0: .4byte gStatuses3 _08026CE4: .4byte gBattleMoves -_08026CE8: .4byte gUnknown_02024BE6 -_08026CEC: .4byte gPlayerMonIndex -_08026CF0: .4byte gEnemyMonIndex +_08026CE8: .4byte gCurrentMove +_08026CEC: .4byte gBankAttacker +_08026CF0: .4byte gBankTarget _08026CF4: - ldr r0, _08026D4C @ =gUnknown_02024CA8 + ldr r0, _08026D4C @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 adds r1, r0 - ldr r2, _08026D50 @ =gPlayerMonIndex + ldr r2, _08026D50 @ =gBankAttacker ldrb r0, [r1, 0x15] movs r4, 0 ldrb r3, [r2] @@ -21981,8 +21981,8 @@ _08026CF4: _08026D20: cmp r4, 0 beq _08026DE0 - ldr r0, _08026D54 @ =gUnknown_02024D28 - ldr r1, _08026D58 @ =gEnemyMonIndex + ldr r0, _08026D54 @ =gProtectStructs + ldr r1, _08026D58 @ =gBankTarget ldrb r2, [r1] lsls r1, r2, 4 adds r1, r0 @@ -22002,14 +22002,14 @@ _08026D20: movs r1, 0x40 b _08026DC6 .align 2, 0 -_08026D4C: .4byte gUnknown_02024CA8 -_08026D50: .4byte gPlayerMonIndex -_08026D54: .4byte gUnknown_02024D28 -_08026D58: .4byte gEnemyMonIndex +_08026D4C: .4byte gDisableStructs +_08026D50: .4byte gBankAttacker +_08026D54: .4byte gProtectStructs +_08026D58: .4byte gBankTarget _08026D5C: .4byte gBattleMoveDamage _08026D60: .4byte gBattleMoveFlags _08026D64: - ldr r0, _08026DA0 @ =gUnknown_02024D68 + ldr r0, _08026DA0 @ =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -22031,8 +22031,8 @@ _08026D64: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _08026DAC @ =gUnknown_02024C04 - ldr r2, _08026DB0 @ =gEnemyMonIndex + ldr r1, _08026DAC @ =gLastUsedItem + ldr r2, _08026DB0 @ =gBankTarget ldrb r0, [r2] muls r0, r3 add r0, r10 @@ -22040,11 +22040,11 @@ _08026D64: strh r0, [r1] b _08026DCA .align 2, 0 -_08026DA0: .4byte gUnknown_02024D68 +_08026DA0: .4byte gSpecialStatuses _08026DA4: .4byte gBattleMoveDamage _08026DA8: .4byte gBattleMoveFlags -_08026DAC: .4byte gUnknown_02024C04 -_08026DB0: .4byte gEnemyMonIndex +_08026DAC: .4byte gLastUsedItem +_08026DB0: .4byte gBankTarget _08026DB4: ldr r1, _08026DD4 @ =gBattleMoveDamage movs r0, 0x58 @@ -22059,7 +22059,7 @@ _08026DC6: orrs r0, r1 strb r0, [r2] _08026DCA: - ldr r1, _08026DDC @ =gUnknown_02024C10 + ldr r1, _08026DDC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -22067,21 +22067,21 @@ _08026DCA: .align 2, 0 _08026DD4: .4byte gBattleMoveDamage _08026DD8: .4byte gBattleMoveFlags -_08026DDC: .4byte gUnknown_02024C10 +_08026DDC: .4byte gBattlescriptCurrInstr _08026DE0: ldr r2, _08026E10 @ =gBattleMoveFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, _08026E14 @ =gPlayerMonIndex + ldr r0, _08026E14 @ =gBankAttacker ldrb r0, [r0] movs r2, 0x58 adds r1, r0, 0 muls r1, r2 add r1, r10 adds r1, 0x2A - ldr r3, _08026E18 @ =gEnemyMonIndex + ldr r3, _08026E18 @ =gBankTarget ldrb r0, [r3] muls r0, r2 add r0, r10 @@ -22090,20 +22090,20 @@ _08026DE0: ldrb r0, [r0] cmp r1, r0 bcc _08026E20 - ldr r1, _08026E1C @ =gUnknown_02024D1E + ldr r1, _08026E1C @ =gBattleCommunication movs r0, 0 b _08026E24 .align 2, 0 _08026E10: .4byte gBattleMoveFlags -_08026E14: .4byte gPlayerMonIndex -_08026E18: .4byte gEnemyMonIndex -_08026E1C: .4byte gUnknown_02024D1E +_08026E14: .4byte gBankAttacker +_08026E18: .4byte gBankTarget +_08026E1C: .4byte gBattleCommunication _08026E20: - ldr r1, _08026E50 @ =gUnknown_02024D1E + ldr r1, _08026E50 @ =gBattleCommunication movs r0, 0x1 _08026E24: strb r0, [r1, 0x5] - ldr r3, _08026E54 @ =gUnknown_02024C10 + ldr r3, _08026E54 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -22125,8 +22125,8 @@ _08026E40: pop {r0} bx r0 .align 2, 0 -_08026E50: .4byte gUnknown_02024D1E -_08026E54: .4byte gUnknown_02024C10 +_08026E50: .4byte gBattleCommunication +_08026E54: .4byte gBattlescriptCurrInstr thumb_func_end sub_8026B78 thumb_func_start atk94_gethalfcurrentenemyhp @@ -22134,7 +22134,7 @@ atk94_gethalfcurrentenemyhp: @ 8026E58 push {lr} ldr r3, _08026E84 @ =gBattleMoveDamage ldr r2, _08026E88 @ =gBattleMons - ldr r0, _08026E8C @ =gEnemyMonIndex + ldr r0, _08026E8C @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -22147,7 +22147,7 @@ atk94_gethalfcurrentenemyhp: @ 8026E58 movs r0, 0x1 str r0, [r3] _08026E76: - ldr r1, _08026E90 @ =gUnknown_02024C10 + ldr r1, _08026E90 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22156,8 +22156,8 @@ _08026E76: .align 2, 0 _08026E84: .4byte gBattleMoveDamage _08026E88: .4byte gBattleMons -_08026E8C: .4byte gEnemyMonIndex -_08026E90: .4byte gUnknown_02024C10 +_08026E8C: .4byte gBankTarget +_08026E90: .4byte gBattlescriptCurrInstr thumb_func_end atk94_gethalfcurrentenemyhp thumb_func_start sub_8026E94 @@ -22174,35 +22174,35 @@ sub_8026E94: @ 8026E94 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08026EBC @ =gUnknown_02024D1E + ldr r1, _08026EBC @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08026ED2 .align 2, 0 _08026EB4: .4byte gBattleWeather _08026EB8: .4byte gBattleMoveFlags -_08026EBC: .4byte gUnknown_02024D1E +_08026EBC: .4byte gBattleCommunication _08026EC0: movs r0, 0x8 strh r0, [r2] - ldr r1, _08026EE0 @ =gUnknown_02024D1E + ldr r1, _08026EE0 @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x5] - ldr r0, _08026EE4 @ =gUnknown_02024DBC + ldr r0, _08026EE4 @ =gWishFutureKnock adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _08026ED2: - ldr r1, _08026EE8 @ =gUnknown_02024C10 + ldr r1, _08026EE8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08026EE0: .4byte gUnknown_02024D1E -_08026EE4: .4byte gUnknown_02024DBC -_08026EE8: .4byte gUnknown_02024C10 +_08026EE0: .4byte gBattleCommunication +_08026EE4: .4byte gWishFutureKnock +_08026EE8: .4byte gBattlescriptCurrInstr thumb_func_end sub_8026E94 thumb_func_start sub_8026EEC @@ -22215,7 +22215,7 @@ sub_8026EEC: @ 8026EEC movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -22227,7 +22227,7 @@ _08026F0A: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08026F20 @@ -22238,7 +22238,7 @@ _08026F20: movs r0, 0x18 ands r0, r1 adds r4, r2, 0 - ldr r5, _08026F98 @ =gPlayerMonIndex + ldr r5, _08026F98 @ =gBankAttacker cmp r0, 0 beq _08026FAE ldr r0, _08026F9C @ =gBattleMons @@ -22269,7 +22269,7 @@ _08026F20: ldrb r0, [r0] cmp r0, 0x8 beq _08026FA8 - ldr r0, _08026FA0 @ =gUnknown_02024C98 + ldr r0, _08026FA0 @ =gStatuses3 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -22292,9 +22292,9 @@ _08026F20: b _08026FAC .align 2, 0 _08026F94: .4byte gBattleWeather -_08026F98: .4byte gPlayerMonIndex +_08026F98: .4byte gBankAttacker _08026F9C: .4byte gBattleMons -_08026FA0: .4byte gUnknown_02024C98 +_08026FA0: .4byte gStatuses3 _08026FA4: .4byte gBattleMoveDamage _08026FA8: ldr r1, _08027004 @ =gBattleMoveDamage @@ -22323,7 +22323,7 @@ _08026FAE: ldrb r0, [r0] cmp r0, 0xF beq _08027010 - ldr r0, _0802700C @ =gUnknown_02024C98 + ldr r0, _0802700C @ =gStatuses3 lsls r1, r3, 2 adds r1, r0 ldr r1, [r1] @@ -22348,7 +22348,7 @@ _08026FAE: .align 2, 0 _08027004: .4byte gBattleMoveDamage _08027008: .4byte gBattleMons -_0802700C: .4byte gUnknown_02024C98 +_0802700C: .4byte gStatuses3 _08027010: ldr r1, _08027018 @ =gBattleMoveDamage movs r0, 0 @@ -22360,9 +22360,9 @@ _0802701C: ldr r1, _08027050 @ =gBattleMoveDamage movs r0, 0 str r0, [r1] - ldr r5, _08027054 @ =gPlayerMonIndex + ldr r5, _08027054 @ =gBankAttacker _08027024: - ldr r0, _08027058 @ =gUnknown_02024C0C + ldr r0, _08027058 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _0802705C @ =gBitTable ldrb r0, [r5] @@ -22376,7 +22376,7 @@ _08027024: movs r0, 0 str r0, [r1] _0802703E: - ldr r1, _08027060 @ =gUnknown_02024C10 + ldr r1, _08027060 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22386,10 +22386,10 @@ _0802703E: bx r0 .align 2, 0 _08027050: .4byte gBattleMoveDamage -_08027054: .4byte gPlayerMonIndex -_08027058: .4byte gUnknown_02024C0C +_08027054: .4byte gBankAttacker +_08027058: .4byte gAbsentBankFlags _0802705C: .4byte gBitTable -_08027060: .4byte gUnknown_02024C10 +_08027060: .4byte gBattlescriptCurrInstr thumb_func_end sub_8026EEC thumb_func_start sub_8027064 @@ -22399,13 +22399,13 @@ sub_8027064: @ 8027064 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _08027090 @ =gPlayerMonIndex + ldr r4, _08027090 @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0802709C - ldr r1, _08027094 @ =gUnknown_02024A6A + ldr r1, _08027094 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -22415,11 +22415,11 @@ sub_8027064: @ 8027064 ldr r0, _08027098 @ =gPlayerParty b _080270AC .align 2, 0 -_08027090: .4byte gPlayerMonIndex -_08027094: .4byte gUnknown_02024A6A +_08027090: .4byte gBankAttacker +_08027094: .4byte gBattlePartyID _08027098: .4byte gPlayerParty _0802709C: - ldr r1, _080270D0 @ =gUnknown_02024A6A + ldr r1, _080270D0 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -22429,13 +22429,13 @@ _0802709C: ldr r0, _080270D4 @ =gEnemyParty _080270AC: adds r5, r1, r0 - ldr r4, _080270D8 @ =gEnemyMonIndex + ldr r4, _080270D8 @ =gBankTarget ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080270E0 - ldr r1, _080270D0 @ =gUnknown_02024A6A + ldr r1, _080270D0 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -22445,12 +22445,12 @@ _080270AC: ldr r0, _080270DC @ =gPlayerParty b _080270F0 .align 2, 0 -_080270D0: .4byte gUnknown_02024A6A +_080270D0: .4byte gBattlePartyID _080270D4: .4byte gEnemyParty -_080270D8: .4byte gEnemyMonIndex +_080270D8: .4byte gBankTarget _080270DC: .4byte gPlayerParty _080270E0: - ldr r1, _0802714C @ =gUnknown_02024A6A + ldr r1, _0802714C @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -22480,7 +22480,7 @@ _080270F0: movs r1, 0 bl GetMonData adds r7, r0, 0 - ldr r5, _08027154 @ =gEnemyMonIndex + ldr r5, _08027154 @ =gBankTarget ldrb r0, [r5] movs r6, 0x58 muls r0, r6 @@ -22490,23 +22490,23 @@ _080270F0: ldrb r2, [r0] cmp r2, 0xC bne _08027168 - ldr r1, _0802715C @ =gUnknown_02024C10 + ldr r1, _0802715C @ =gBattlescriptCurrInstr ldr r0, _08027160 @ =gUnknown_081D98C9 str r0, [r1] - ldr r0, _08027164 @ =byte_2024C06 + ldr r0, _08027164 @ =gLastUsedAbility strb r2, [r0] ldrb r0, [r5] movs r1, 0xC bl sub_81074C4 b _0802721C .align 2, 0 -_0802714C: .4byte gUnknown_02024A6A +_0802714C: .4byte gBattlePartyID _08027150: .4byte gEnemyParty -_08027154: .4byte gEnemyMonIndex +_08027154: .4byte gBankTarget _08027158: .4byte gBattleMons -_0802715C: .4byte gUnknown_02024C10 +_0802715C: .4byte gBattlescriptCurrInstr _08027160: .4byte gUnknown_081D98C9 -_08027164: .4byte byte_2024C06 +_08027164: .4byte gLastUsedAbility _08027168: mov r0, r10 mov r1, r9 @@ -22519,7 +22519,7 @@ _08027168: lsls r0, 24 cmp r4, r0 beq _080271CA - ldr r1, _080271E8 @ =gUnknown_02024C98 + ldr r1, _080271E8 @ =gStatuses3 ldrb r2, [r5] lsls r0, r2, 2 adds r0, r1 @@ -22554,7 +22554,7 @@ _08027168: cmp r0, 0xFF bne _080271F8 _080271CA: - ldr r3, _080271F4 @ =gUnknown_02024C10 + ldr r3, _080271F4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -22569,17 +22569,17 @@ _080271CA: str r1, [r3] b _0802721C .align 2, 0 -_080271E8: .4byte gUnknown_02024C98 +_080271E8: .4byte gStatuses3 _080271EC: .4byte 0x000400c0 _080271F0: .4byte gBattleMons -_080271F4: .4byte gUnknown_02024C10 +_080271F4: .4byte gBattlescriptCurrInstr _080271F8: ldrb r0, [r5] adds r2, r0, 0 muls r2, r6 adds r2, r4 ldr r1, _0802722C @ =gBitTable - ldr r0, _08027230 @ =gPlayerMonIndex + ldr r0, _08027230 @ =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -22588,7 +22588,7 @@ _080271F8: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r1, _08027234 @ =gUnknown_02024C10 + ldr r1, _08027234 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -22602,24 +22602,24 @@ _0802721C: bx r0 .align 2, 0 _0802722C: .4byte gBitTable -_08027230: .4byte gPlayerMonIndex -_08027234: .4byte gUnknown_02024C10 +_08027230: .4byte gBankAttacker +_08027234: .4byte gBattlescriptCurrInstr thumb_func_end sub_8027064 thumb_func_start sub_8027238 sub_8027238: @ 8027238 push {r4-r7,lr} - ldr r0, _08027280 @ =gUnknown_02024A64 + ldr r0, _08027280 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08027324 - ldr r5, _08027284 @ =gUnknown_02024C10 + ldr r5, _08027284 @ =gBattlescriptCurrInstr ldr r1, [r5] ldrb r0, [r1, 0x1] cmp r0, 0x4 beq _08027290 bl sub_8015150 - ldr r4, _08027288 @ =gUnknown_02024A60 + ldr r4, _08027288 @ =gActiveBank strb r0, [r4] ldr r3, _0802728C @ =gBattleMons ldrb r1, [r4] @@ -22634,24 +22634,24 @@ sub_8027238: @ 8027238 adds r2, r3 ldr r2, [r2] movs r0, 0 - bl dp01_build_cmdbuf_x1A_aaaa_bbbb + bl EmitStatusIconUpdate ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, [r5] adds r0, 0x2 str r0, [r5] b _08027324 .align 2, 0 -_08027280: .4byte gUnknown_02024A64 -_08027284: .4byte gUnknown_02024C10 -_08027288: .4byte gUnknown_02024A60 +_08027280: .4byte gBattleExecBuffer +_08027284: .4byte gBattlescriptCurrInstr +_08027288: .4byte gActiveBank _0802728C: .4byte gBattleMons _08027290: - ldr r4, _0802732C @ =gUnknown_02024A60 - ldr r5, _08027330 @ =gPlayerMonIndex + ldr r4, _0802732C @ =gActiveBank + ldr r5, _08027330 @ =gBankAttacker ldrb r0, [r5] strb r0, [r4] - ldr r6, _08027334 @ =gUnknown_02024C0C + ldr r6, _08027334 @ =gAbsentBankFlags ldrb r1, [r6] ldr r7, _08027338 @ =gBitTable ldrb r2, [r4] @@ -22672,9 +22672,9 @@ _08027290: adds r2, r3 ldr r2, [r2] movs r0, 0 - bl dp01_build_cmdbuf_x1A_aaaa_bbbb + bl EmitStatusIconUpdate ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _080272CC: ldr r0, _08027340 @ =gBattleTypeFlags ldrh r1, [r0] @@ -22683,12 +22683,12 @@ _080272CC: cmp r0, 0 beq _0802731C ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r4] ldrb r1, [r6] ldrb r2, [r4] @@ -22709,11 +22709,11 @@ _080272CC: adds r2, r3 ldr r2, [r2] movs r0, 0 - bl dp01_build_cmdbuf_x1A_aaaa_bbbb + bl EmitStatusIconUpdate ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _0802731C: - ldr r1, _08027344 @ =gUnknown_02024C10 + ldr r1, _08027344 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -22722,22 +22722,22 @@ _08027324: pop {r0} bx r0 .align 2, 0 -_0802732C: .4byte gUnknown_02024A60 -_08027330: .4byte gPlayerMonIndex -_08027334: .4byte gUnknown_02024C0C +_0802732C: .4byte gActiveBank +_08027330: .4byte gBankAttacker +_08027334: .4byte gAbsentBankFlags _08027338: .4byte gBitTable _0802733C: .4byte gBattleMons _08027340: .4byte gBattleTypeFlags -_08027344: .4byte gUnknown_02024C10 +_08027344: .4byte gBattlescriptCurrInstr thumb_func_end sub_8027238 thumb_func_start sub_8027348 sub_8027348: @ 8027348 push {r4-r6,lr} - ldr r6, _08027378 @ =gUnknown_02024C80 - ldr r4, _0802737C @ =gPlayerMonIndex + ldr r6, _08027378 @ =gSideTimer + ldr r4, _0802737C @ =gBankAttacker ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity movs r5, 0x1 adds r1, r5, 0 ands r1, r0 @@ -22753,17 +22753,17 @@ sub_8027348: @ 8027348 movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r0, _08027384 @ =gUnknown_02024D1E + ldr r0, _08027384 @ =gBattleCommunication strb r5, [r0, 0x5] b _080273C0 .align 2, 0 -_08027378: .4byte gUnknown_02024C80 -_0802737C: .4byte gPlayerMonIndex +_08027378: .4byte gSideTimer +_0802737C: .4byte gBankAttacker _08027380: .4byte gBattleMoveFlags -_08027384: .4byte gUnknown_02024D1E +_08027384: .4byte gBattleCommunication _08027388: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r5, 0 ands r1, r0 lsls r0, r1, 1 @@ -22773,8 +22773,8 @@ _08027388: movs r1, 0x5 strb r1, [r0, 0x2] ldrb r0, [r4] - bl battle_get_per_side_status - ldr r2, _080273D0 @ =gUnknown_02024C7A + bl GetBankIdentity + ldr r2, _080273D0 @ =gSideAffecting adds r1, r5, 0 ands r1, r0 lsls r1, 1 @@ -22786,10 +22786,10 @@ _08027388: movs r3, 0 orrs r0, r2 strh r0, [r1] - ldr r0, _080273D4 @ =gUnknown_02024D1E + ldr r0, _080273D4 @ =gBattleCommunication strb r3, [r0, 0x5] _080273C0: - ldr r1, _080273D8 @ =gUnknown_02024C10 + ldr r1, _080273D8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22797,16 +22797,16 @@ _080273C0: pop {r0} bx r0 .align 2, 0 -_080273D0: .4byte gUnknown_02024C7A -_080273D4: .4byte gUnknown_02024D1E -_080273D8: .4byte gUnknown_02024C10 +_080273D0: .4byte gSideAffecting +_080273D4: .4byte gBattleCommunication +_080273D8: .4byte gBattlescriptCurrInstr thumb_func_end sub_8027348 thumb_func_start atk9A_setincreasedcriticalchance atk9A_setincreasedcriticalchance: @ 80273DC push {lr} ldr r1, _0802740C @ =gBattleMons - ldr r0, _08027410 @ =gPlayerMonIndex + ldr r0, _08027410 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -22824,30 +22824,30 @@ atk9A_setincreasedcriticalchance: @ 80273DC movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r1, _08027418 @ =gUnknown_02024D1E + ldr r1, _08027418 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08027424 .align 2, 0 _0802740C: .4byte gBattleMons -_08027410: .4byte gPlayerMonIndex +_08027410: .4byte gBankAttacker _08027414: .4byte gBattleMoveFlags -_08027418: .4byte gUnknown_02024D1E +_08027418: .4byte gBattleCommunication _0802741C: orrs r1, r3 str r1, [r0] - ldr r0, _08027430 @ =gUnknown_02024D1E + ldr r0, _08027430 @ =gBattleCommunication strb r2, [r0, 0x5] _08027424: - ldr r1, _08027434 @ =gUnknown_02024C10 + ldr r1, _08027434 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08027430: .4byte gUnknown_02024D1E -_08027434: .4byte gUnknown_02024C10 +_08027430: .4byte gBattleCommunication +_08027434: .4byte gBattlescriptCurrInstr thumb_func_end atk9A_setincreasedcriticalchance thumb_func_start atk9B_transformdataexecution @@ -22859,12 +22859,12 @@ atk9B_transformdataexecution: @ 8027438 ldr r2, _08027494 @ =0x0000ffff adds r0, r2, 0 strh r0, [r1] - ldr r1, _08027498 @ =gUnknown_02024C10 + ldr r1, _08027498 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] ldr r7, _0802749C @ =gBattleMons - ldr r0, _080274A0 @ =gEnemyMonIndex + ldr r0, _080274A0 @ =gBankTarget mov r12, r0 ldrb r1, [r0] movs r6, 0x58 @@ -22879,7 +22879,7 @@ atk9B_transformdataexecution: @ 8027438 ands r0, r4 cmp r0, 0 bne _0802747E - ldr r0, _080274A4 @ =gUnknown_02024C98 + ldr r0, _080274A4 @ =gStatuses3 lsls r1, 2 adds r1, r0 ldr r2, [r1] @@ -22893,21 +22893,21 @@ _0802747E: movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r1, _080274B0 @ =gUnknown_02024D1E + ldr r1, _080274B0 @ =gBattleCommunication movs r0, 0x1 b _080275C8 .align 2, 0 _08027490: .4byte gUnknown_02024BE8 _08027494: .4byte 0x0000ffff -_08027498: .4byte gUnknown_02024C10 +_08027498: .4byte gBattlescriptCurrInstr _0802749C: .4byte gBattleMons -_080274A0: .4byte gEnemyMonIndex -_080274A4: .4byte gUnknown_02024C98 +_080274A0: .4byte gBankTarget +_080274A4: .4byte gStatuses3 _080274A8: .4byte 0x000400c0 _080274AC: .4byte gBattleMoveFlags -_080274B0: .4byte gUnknown_02024D1E +_080274B0: .4byte gBattleCommunication _080274B4: - ldr r3, _08027588 @ =gPlayerMonIndex + ldr r3, _08027588 @ =gBankAttacker ldrb r0, [r3] adds r1, r0, 0 muls r1, r6 @@ -22915,7 +22915,7 @@ _080274B4: ldr r0, [r1] orrs r0, r4 str r0, [r1] - ldr r4, _0802758C @ =gUnknown_02024CA8 + ldr r4, _0802758C @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -22954,7 +22954,7 @@ _080274B4: movs r0, 0xF ands r0, r2 strb r0, [r1, 0x18] - ldr r1, _08027590 @ =gUnknown_030041C0 + ldr r1, _08027590 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x6 @@ -22981,7 +22981,7 @@ _080274B4: adds r2, r0, r7 movs r4, 0 adds r6, r3, 0 - ldr r0, _08027594 @ =gUnknown_02024A60 + ldr r0, _08027594 @ =gActiveBank mov r8, r0 _0802754C: adds r0, r5, r4 @@ -23015,10 +23015,10 @@ _08027564: adds r0, r5 b _080275A6 .align 2, 0 -_08027588: .4byte gPlayerMonIndex -_0802758C: .4byte gUnknown_02024CA8 -_08027590: .4byte gUnknown_030041C0 -_08027594: .4byte gUnknown_02024A60 +_08027588: .4byte gBankAttacker +_0802758C: .4byte gDisableStructs +_08027590: .4byte gBattleTextBuff1 +_08027594: .4byte gActiveBank _08027598: .4byte gBattleMoves _0802759C: .4byte gUnknown_02024A8C _080275A0: @@ -23035,11 +23035,11 @@ _080275A6: strb r0, [r1] movs r0, 0 movs r1, 0x2 - bl dp01_build_cmdbuf_x38_a + bl EmitResetActionMoveSelection mov r2, r8 ldrb r0, [r2] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _080275D4 @ =gUnknown_02024D1E + bl MarkBufferBankForExecution + ldr r1, _080275D4 @ =gBattleCommunication movs r0, 0 _080275C8: strb r0, [r1, 0x5] @@ -23049,14 +23049,14 @@ _080275C8: pop {r0} bx r0 .align 2, 0 -_080275D4: .4byte gUnknown_02024D1E +_080275D4: .4byte gBattleCommunication thumb_func_end atk9B_transformdataexecution thumb_func_start sub_80275D8 sub_80275D8: @ 80275D8 push {r4-r7,lr} ldr r7, _08027608 @ =gBattleMons - ldr r6, _0802760C @ =gPlayerMonIndex + ldr r6, _0802760C @ =gBankAttacker ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -23074,15 +23074,15 @@ _080275F2: ldr r1, _08027610 @ =gBattleMoveDamage movs r0, 0 str r0, [r1] - ldr r1, _08027614 @ =gUnknown_02024D1E + ldr r1, _08027614 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _0802766C .align 2, 0 _08027608: .4byte gBattleMons -_0802760C: .4byte gPlayerMonIndex +_0802760C: .4byte gBankAttacker _08027610: .4byte gBattleMoveDamage -_08027614: .4byte gUnknown_02024D1E +_08027614: .4byte gBattleCommunication _08027618: ldr r4, _0802767C @ =gBattleMoveDamage str r1, [r4] @@ -23110,7 +23110,7 @@ _08027624: ldr r2, _08027680 @ =0xffff1fff ands r0, r2 str r0, [r1] - ldr r2, _08027684 @ =gUnknown_02024CA8 + ldr r2, _08027684 @ =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -23119,16 +23119,16 @@ _08027624: ldr r1, [r4] movs r2, 0 strb r1, [r0, 0xA] - ldr r0, _08027688 @ =gUnknown_02024D1E + ldr r0, _08027688 @ =gBattleCommunication strb r2, [r0, 0x5] - ldr r2, _0802768C @ =gUnknown_02024C6C + ldr r2, _0802768C @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 1 orrs r0, r1 str r0, [r2] _0802766C: - ldr r1, _08027690 @ =gUnknown_02024C10 + ldr r1, _08027690 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -23138,10 +23138,10 @@ _0802766C: .align 2, 0 _0802767C: .4byte gBattleMoveDamage _08027680: .4byte 0xffff1fff -_08027684: .4byte gUnknown_02024CA8 -_08027688: .4byte gUnknown_02024D1E -_0802768C: .4byte gUnknown_02024C6C -_08027690: .4byte gUnknown_02024C10 +_08027684: .4byte gDisableStructs +_08027688: .4byte gBattleCommunication +_0802768C: .4byte gHitMarker +_08027690: .4byte gBattlescriptCurrInstr thumb_func_end sub_80275D8 thumb_func_start sub_8027694 @@ -23195,8 +23195,8 @@ atk9D_copyattack: @ 80276DC ldr r1, _08027758 @ =0x0000ffff adds r7, r1, 0 strh r7, [r0] - ldr r5, _0802775C @ =gUnknown_02024C34 - ldr r6, _08027760 @ =gEnemyMonIndex + ldr r5, _0802775C @ =gLastUsedMove + ldr r6, _08027760 @ =gBankTarget ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -23206,7 +23206,7 @@ atk9D_copyattack: @ 80276DC cmp r0, 0 bne _08027736 ldr r3, _08027764 @ =gBattleMons - ldr r2, _08027768 @ =gPlayerMonIndex + ldr r2, _08027768 @ =gBankAttacker ldrb r1, [r2] movs r0, 0x58 adds r4, r1, 0 @@ -23231,7 +23231,7 @@ atk9D_copyattack: @ 80276DC cmp r1, r7 bne _08027770 _08027736: - ldr r3, _0802776C @ =gUnknown_02024C10 + ldr r3, _0802776C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23248,18 +23248,18 @@ _08027736: .align 2, 0 _08027754: .4byte gUnknown_02024BE8 _08027758: .4byte 0x0000ffff -_0802775C: .4byte gUnknown_02024C34 -_08027760: .4byte gEnemyMonIndex +_0802775C: .4byte gLastUsedMove +_08027760: .4byte gBankTarget _08027764: .4byte gBattleMons -_08027768: .4byte gPlayerMonIndex -_0802776C: .4byte gUnknown_02024C10 +_08027768: .4byte gBankAttacker +_0802776C: .4byte gBattlescriptCurrInstr _08027770: movs r2, 0 mov r3, r12 adds r3, 0xC adds r0, r4, r3 ldrh r0, [r0] - ldr r4, _08027800 @ =gUnknown_02024C10 + ldr r4, _08027800 @ =gBattlescriptCurrInstr mov r10, r4 cmp r0, r1 beq _080277AA @@ -23287,7 +23287,7 @@ _0802778C: _080277AA: cmp r2, 0x4 bne _0802788C - ldr r5, _08027804 @ =gUnknown_02024BE4 + ldr r5, _08027804 @ =gCurrMovePos ldrb r1, [r5] lsls r1, 1 mov r2, r9 @@ -23298,8 +23298,8 @@ _080277AA: mov r0, r12 adds r0, 0xC adds r1, r0 - ldr r2, _08027808 @ =gUnknown_02024C34 - ldr r3, _0802780C @ =gEnemyMonIndex + ldr r2, _08027808 @ =gLastUsedMove + ldr r3, _0802780C @ =gBankTarget ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -23328,10 +23328,10 @@ _080277AA: strb r4, [r0] b _08027828 .align 2, 0 -_08027800: .4byte gUnknown_02024C10 -_08027804: .4byte gUnknown_02024BE4 -_08027808: .4byte gUnknown_02024C34 -_0802780C: .4byte gEnemyMonIndex +_08027800: .4byte gBattlescriptCurrInstr +_08027804: .4byte gCurrMovePos +_08027808: .4byte gLastUsedMove +_0802780C: .4byte gBankTarget _08027810: .4byte gBattleMoves _08027814: mov r4, r9 @@ -23345,7 +23345,7 @@ _08027814: movs r1, 0x5 strb r1, [r0] _08027828: - ldr r1, _08027880 @ =gUnknown_030041C0 + ldr r1, _08027880 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -23363,7 +23363,7 @@ _08027828: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08027884 @ =gUnknown_02024CA8 + ldr r1, _08027884 @ =gDisableStructs mov r2, r9 ldrb r0, [r2] lsls r2, r0, 3 @@ -23389,8 +23389,8 @@ _08027828: str r0, [r4] b _080278A8 .align 2, 0 -_08027880: .4byte gUnknown_030041C0 -_08027884: .4byte gUnknown_02024CA8 +_08027880: .4byte gBattleTextBuff1 +_08027884: .4byte gDisableStructs _08027888: .4byte gBitTable _0802788C: mov r0, r10 @@ -23422,11 +23422,11 @@ sub_80278B8: @ 80278B8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _08027938 @ =gUnknown_02024BE6 + ldr r7, _08027938 @ =gCurrentMove movs r6, 0xB1 lsls r6, 1 ldr r5, _0802793C @ =gUnknown_081FACFE - ldr r0, _08027940 @ =gUnknown_02024C10 + ldr r0, _08027940 @ =gBattlescriptCurrInstr mov r8, r0 _080278CA: bl Random @@ -23442,7 +23442,7 @@ _080278DE: subs r0, 0x1 cmp r0, 0 bge _080278DE - ldr r4, _08027938 @ =gUnknown_02024BE6 + ldr r4, _08027938 @ =gCurrentMove ldrh r2, [r4] ldr r3, _08027948 @ =0x0000ffff subs r0, r5, 0x2 @@ -23457,7 +23457,7 @@ _080278F8: ldr r0, _08027948 @ =0x0000ffff cmp r1, r0 bne _080278CA - ldr r2, _0802794C @ =gUnknown_02024C6C + ldr r2, _0802794C @ =gHitMarker ldr r0, [r2] ldr r1, _08027950 @ =0xfffffbff ands r0, r1 @@ -23478,7 +23478,7 @@ _080278F8: ldrh r0, [r4] movs r1, 0 bl sub_801B5C0 - ldr r1, _0802795C @ =gEnemyMonIndex + ldr r1, _0802795C @ =gBankTarget strb r0, [r1] pop {r3} mov r8, r3 @@ -23486,23 +23486,23 @@ _080278F8: pop {r0} bx r0 .align 2, 0 -_08027938: .4byte gUnknown_02024BE6 +_08027938: .4byte gCurrentMove _0802793C: .4byte gUnknown_081FACFE -_08027940: .4byte gUnknown_02024C10 +_08027940: .4byte gBattlescriptCurrInstr _08027944: .4byte 0x000001ff _08027948: .4byte 0x0000ffff -_0802794C: .4byte gUnknown_02024C6C +_0802794C: .4byte gHitMarker _08027950: .4byte 0xfffffbff _08027954: .4byte gUnknown_081D6BBC _08027958: .4byte gBattleMoves -_0802795C: .4byte gEnemyMonIndex +_0802795C: .4byte gBankTarget thumb_func_end sub_80278B8 thumb_func_start sub_8027960 sub_8027960: @ 8027960 ldr r3, _08027980 @ =gBattleMoveDamage ldr r2, _08027984 @ =gBattleMons - ldr r0, _08027988 @ =gPlayerMonIndex + ldr r0, _08027988 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -23510,7 +23510,7 @@ sub_8027960: @ 8027960 adds r0, 0x2A ldrb r0, [r0] str r0, [r3] - ldr r1, _0802798C @ =gUnknown_02024C10 + ldr r1, _0802798C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -23518,8 +23518,8 @@ sub_8027960: @ 8027960 .align 2, 0 _08027980: .4byte gBattleMoveDamage _08027984: .4byte gBattleMons -_08027988: .4byte gPlayerMonIndex -_0802798C: .4byte gUnknown_02024C10 +_08027988: .4byte gBankAttacker +_0802798C: .4byte gBattlescriptCurrInstr thumb_func_end sub_8027960 thumb_func_start atkA0_psywavedamageeffect @@ -23537,7 +23537,7 @@ _08027994: lsls r3, r0, 1 ldr r4, _080279D4 @ =gBattleMoveDamage ldr r2, _080279D8 @ =gBattleMons - ldr r0, _080279DC @ =gPlayerMonIndex + ldr r0, _080279DC @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -23550,7 +23550,7 @@ _08027994: movs r1, 0x64 bl __divsi3 str r0, [r4] - ldr r1, _080279E0 @ =gUnknown_02024C10 + ldr r1, _080279E0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -23560,24 +23560,24 @@ _08027994: .align 2, 0 _080279D4: .4byte gBattleMoveDamage _080279D8: .4byte gBattleMons -_080279DC: .4byte gPlayerMonIndex -_080279E0: .4byte gUnknown_02024C10 +_080279DC: .4byte gBankAttacker +_080279E0: .4byte gBattlescriptCurrInstr thumb_func_end atkA0_psywavedamageeffect thumb_func_start atkA1_counterdamagecalculator atkA1_counterdamagecalculator: @ 80279E4 push {r4-r6,lr} - ldr r4, _08027A54 @ =gPlayerMonIndex + ldr r4, _08027A54 @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _08027A58 @ =gUnknown_02024D28 + ldr r5, _08027A58 @ =gProtectStructs ldrb r0, [r4] lsls r0, 4 adds r0, r5 ldrb r0, [r0, 0xC] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 ldrb r0, [r4] @@ -23601,7 +23601,7 @@ atkA1_counterdamagecalculator: @ 80279E4 ldr r1, _08027A60 @ =gBattleMoveDamage lsls r0, r3, 1 str r0, [r1] - ldr r1, _08027A64 @ =gUnknown_02024C80 + ldr r1, _08027A64 @ =gSideTimer lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -23616,39 +23616,39 @@ atkA1_counterdamagecalculator: @ 80279E4 ldrh r0, [r0, 0x28] cmp r0, 0 beq _08027A6C - ldr r0, _08027A68 @ =gEnemyMonIndex + ldr r0, _08027A68 @ =gBankTarget strb r1, [r0] b _08027A7C .align 2, 0 -_08027A54: .4byte gPlayerMonIndex -_08027A58: .4byte gUnknown_02024D28 +_08027A54: .4byte gBankAttacker +_08027A58: .4byte gProtectStructs _08027A5C: .4byte gBattleMons _08027A60: .4byte gBattleMoveDamage -_08027A64: .4byte gUnknown_02024C80 -_08027A68: .4byte gEnemyMonIndex +_08027A64: .4byte gSideTimer +_08027A68: .4byte gBankTarget _08027A6C: - ldr r2, _08027A88 @ =gEnemyMonIndex - ldr r1, _08027A8C @ =gUnknown_02024D28 - ldr r0, _08027A90 @ =gPlayerMonIndex + ldr r2, _08027A88 @ =gBankTarget + ldr r1, _08027A8C @ =gProtectStructs + ldr r0, _08027A90 @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r2] _08027A7C: - ldr r1, _08027A94 @ =gUnknown_02024C10 + ldr r1, _08027A94 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08027AC8 .align 2, 0 -_08027A88: .4byte gEnemyMonIndex -_08027A8C: .4byte gUnknown_02024D28 -_08027A90: .4byte gPlayerMonIndex -_08027A94: .4byte gUnknown_02024C10 +_08027A88: .4byte gBankTarget +_08027A8C: .4byte gProtectStructs +_08027A90: .4byte gBankAttacker +_08027A94: .4byte gBattlescriptCurrInstr _08027A98: - ldr r2, _08027AD0 @ =gUnknown_02024D68 - ldr r0, _08027AD4 @ =gPlayerMonIndex + ldr r2, _08027AD0 @ =gSpecialStatuses + ldr r0, _08027AD4 @ =gBankAttacker ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -23658,7 +23658,7 @@ _08027A98: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, _08027AD8 @ =gUnknown_02024C10 + ldr r3, _08027AD8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23676,25 +23676,25 @@ _08027AC8: pop {r0} bx r0 .align 2, 0 -_08027AD0: .4byte gUnknown_02024D68 -_08027AD4: .4byte gPlayerMonIndex -_08027AD8: .4byte gUnknown_02024C10 +_08027AD0: .4byte gSpecialStatuses +_08027AD4: .4byte gBankAttacker +_08027AD8: .4byte gBattlescriptCurrInstr thumb_func_end atkA1_counterdamagecalculator thumb_func_start atkA2_mirrorcoatdamagecalculator atkA2_mirrorcoatdamagecalculator: @ 8027ADC push {r4-r6,lr} - ldr r4, _08027B4C @ =gPlayerMonIndex + ldr r4, _08027B4C @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _08027B50 @ =gUnknown_02024D28 + ldr r5, _08027B50 @ =gProtectStructs ldrb r0, [r4] lsls r0, 4 adds r0, r5 ldrb r0, [r0, 0xD] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 ldrb r0, [r4] @@ -23719,7 +23719,7 @@ atkA2_mirrorcoatdamagecalculator: @ 8027ADC ldr r1, _08027B58 @ =gBattleMoveDamage lsls r0, r3, 1 str r0, [r1] - ldr r1, _08027B5C @ =gUnknown_02024C80 + ldr r1, _08027B5C @ =gSideTimer lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -23734,39 +23734,39 @@ atkA2_mirrorcoatdamagecalculator: @ 8027ADC ldrh r0, [r0, 0x28] cmp r0, 0 beq _08027B64 - ldr r0, _08027B60 @ =gEnemyMonIndex + ldr r0, _08027B60 @ =gBankTarget strb r1, [r0] b _08027B74 .align 2, 0 -_08027B4C: .4byte gPlayerMonIndex -_08027B50: .4byte gUnknown_02024D28 +_08027B4C: .4byte gBankAttacker +_08027B50: .4byte gProtectStructs _08027B54: .4byte gBattleMons _08027B58: .4byte gBattleMoveDamage -_08027B5C: .4byte gUnknown_02024C80 -_08027B60: .4byte gEnemyMonIndex +_08027B5C: .4byte gSideTimer +_08027B60: .4byte gBankTarget _08027B64: - ldr r2, _08027B80 @ =gEnemyMonIndex - ldr r1, _08027B84 @ =gUnknown_02024D28 - ldr r0, _08027B88 @ =gPlayerMonIndex + ldr r2, _08027B80 @ =gBankTarget + ldr r1, _08027B84 @ =gProtectStructs + ldr r0, _08027B88 @ =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0xD] strb r0, [r2] _08027B74: - ldr r1, _08027B8C @ =gUnknown_02024C10 + ldr r1, _08027B8C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08027BC0 .align 2, 0 -_08027B80: .4byte gEnemyMonIndex -_08027B84: .4byte gUnknown_02024D28 -_08027B88: .4byte gPlayerMonIndex -_08027B8C: .4byte gUnknown_02024C10 +_08027B80: .4byte gBankTarget +_08027B84: .4byte gProtectStructs +_08027B88: .4byte gBankAttacker +_08027B8C: .4byte gBattlescriptCurrInstr _08027B90: - ldr r2, _08027BC8 @ =gUnknown_02024D68 - ldr r0, _08027BCC @ =gPlayerMonIndex + ldr r2, _08027BC8 @ =gSpecialStatuses + ldr r0, _08027BCC @ =gBankAttacker ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -23776,7 +23776,7 @@ _08027B90: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, _08027BD0 @ =gUnknown_02024C10 + ldr r3, _08027BD0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23794,9 +23794,9 @@ _08027BC0: pop {r0} bx r0 .align 2, 0 -_08027BC8: .4byte gUnknown_02024D68 -_08027BCC: .4byte gPlayerMonIndex -_08027BD0: .4byte gUnknown_02024C10 +_08027BC8: .4byte gSpecialStatuses +_08027BCC: .4byte gBankAttacker +_08027BD0: .4byte gBattlescriptCurrInstr thumb_func_end atkA2_mirrorcoatdamagecalculator thumb_func_start atkA3_disablelastusedattack @@ -23807,20 +23807,20 @@ atkA3_disablelastusedattack: @ 8027BD4 push {r6,r7} movs r4, 0 ldr r2, _08027CD4 @ =gBattleMons - ldr r3, _08027CD8 @ =gEnemyMonIndex + ldr r3, _08027CD8 @ =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 adds r7, r2, 0 adds r7, 0xC adds r0, r7 - ldr r5, _08027CDC @ =gUnknown_02024C34 + ldr r5, _08027CDC @ =gLastUsedMove lsls r1, 1 adds r1, r5 ldrh r0, [r0] mov r9, r2 adds r6, r3, 0 - ldr r2, _08027CE0 @ =gUnknown_02024CA8 + ldr r2, _08027CE0 @ =gDisableStructs mov r8, r2 ldrh r1, [r1] cmp r0, r1 @@ -23865,7 +23865,7 @@ _08027C28: ldrb r0, [r0] cmp r0, 0 beq _08027CEC - ldr r1, _08027CE4 @ =gUnknown_030041C0 + ldr r1, _08027CE4 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -23925,20 +23925,20 @@ _08027C28: ands r0, r3 orrs r0, r2 strb r0, [r1, 0xB] - ldr r1, _08027CE8 @ =gUnknown_02024C10 + ldr r1, _08027CE8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08027D06 .align 2, 0 _08027CD4: .4byte gBattleMons -_08027CD8: .4byte gEnemyMonIndex -_08027CDC: .4byte gUnknown_02024C34 -_08027CE0: .4byte gUnknown_02024CA8 -_08027CE4: .4byte gUnknown_030041C0 -_08027CE8: .4byte gUnknown_02024C10 +_08027CD8: .4byte gBankTarget +_08027CDC: .4byte gLastUsedMove +_08027CE0: .4byte gDisableStructs +_08027CE4: .4byte gBattleTextBuff1 +_08027CE8: .4byte gBattlescriptCurrInstr _08027CEC: - ldr r3, _08027D14 @ =gUnknown_02024C10 + ldr r3, _08027D14 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23959,7 +23959,7 @@ _08027D06: pop {r0} bx r0 .align 2, 0 -_08027D14: .4byte gUnknown_02024C10 +_08027D14: .4byte gBattlescriptCurrInstr thumb_func_end atkA3_disablelastusedattack thumb_func_start atkA4_setencore @@ -23971,20 +23971,20 @@ atkA4_setencore: @ 8027D18 push {r5-r7} movs r5, 0 ldr r3, _08027E0C @ =gBattleMons - ldr r4, _08027E10 @ =gEnemyMonIndex + ldr r4, _08027E10 @ =gBankTarget ldrb r1, [r4] movs r0, 0x58 muls r0, r1 adds r6, r3, 0 adds r6, 0xC adds r0, r6 - ldr r2, _08027E14 @ =gUnknown_02024C34 + ldr r2, _08027E14 @ =gLastUsedMove lsls r1, 1 adds r1, r2 ldrh r0, [r0] mov r10, r3 mov r8, r2 - ldr r2, _08027E18 @ =gUnknown_02024CA8 + ldr r2, _08027E18 @ =gDisableStructs mov r9, r2 ldrh r1, [r1] cmp r0, r1 @@ -24084,19 +24084,19 @@ _08027D88: ands r0, r3 orrs r0, r2 strb r0, [r1, 0xE] - ldr r1, _08027E1C @ =gUnknown_02024C10 + ldr r1, _08027E1C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08027E3A .align 2, 0 _08027E0C: .4byte gBattleMons -_08027E10: .4byte gEnemyMonIndex -_08027E14: .4byte gUnknown_02024C34 -_08027E18: .4byte gUnknown_02024CA8 -_08027E1C: .4byte gUnknown_02024C10 +_08027E10: .4byte gBankTarget +_08027E14: .4byte gLastUsedMove +_08027E18: .4byte gDisableStructs +_08027E1C: .4byte gBattlescriptCurrInstr _08027E20: - ldr r3, _08027E48 @ =gUnknown_02024C10 + ldr r3, _08027E48 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24118,7 +24118,7 @@ _08027E3A: pop {r0} bx r0 .align 2, 0 -_08027E48: .4byte gUnknown_02024C10 +_08027E48: .4byte gBattlescriptCurrInstr thumb_func_end atkA4_setencore thumb_func_start sub_8027E4C @@ -24128,7 +24128,7 @@ sub_8027E4C: @ 8027E4C mov r6, r8 push {r6,r7} ldr r7, _08027EEC @ =gBattleMons - ldr r0, _08027EF0 @ =gEnemyMonIndex + ldr r0, _08027EF0 @ =gBankTarget mov r8, r0 ldrb r0, [r0] movs r6, 0x58 @@ -24143,7 +24143,7 @@ sub_8027E4C: @ 8027E4C ands r0, r1 cmp r0, 0 bne _08027F18 - ldr r1, _08027EF4 @ =gPlayerMonIndex + ldr r1, _08027EF4 @ =gBankAttacker mov r12, r1 ldrb r0, [r1] muls r0, r6 @@ -24187,7 +24187,7 @@ sub_8027E4C: @ 8027E4C subs r0, r4 mov r5, r9 str r0, [r5] - ldr r2, _08027F0C @ =gUnknown_02024D68 + ldr r2, _08027F0C @ =gSpecialStatuses mov r0, r8 ldrb r1, [r0] lsls r0, r1, 2 @@ -24197,25 +24197,25 @@ sub_8027E4C: @ 8027E4C adds r0, r2 ldr r1, _08027F10 @ =0x0000ffff str r1, [r0] - ldr r1, _08027F14 @ =gUnknown_02024C10 + ldr r1, _08027F14 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08027F32 .align 2, 0 _08027EEC: .4byte gBattleMons -_08027EF0: .4byte gEnemyMonIndex -_08027EF4: .4byte gPlayerMonIndex +_08027EF0: .4byte gBankTarget +_08027EF4: .4byte gBankAttacker _08027EF8: .4byte gBattleMoveDamage _08027EFC: .4byte 0x02000000 _08027F00: .4byte 0x00016014 _08027F04: .4byte 0x00016015 _08027F08: .4byte 0x00016017 -_08027F0C: .4byte gUnknown_02024D68 +_08027F0C: .4byte gSpecialStatuses _08027F10: .4byte 0x0000ffff -_08027F14: .4byte gUnknown_02024C10 +_08027F14: .4byte gBattlescriptCurrInstr _08027F18: - ldr r3, _08027F40 @ =gUnknown_02024C10 + ldr r3, _08027F40 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24236,7 +24236,7 @@ _08027F32: pop {r0} bx r0 .align 2, 0 -_08027F40: .4byte gUnknown_02024C10 +_08027F40: .4byte gBattlescriptCurrInstr thumb_func_end sub_8027E4C thumb_func_start sub_8027F44 @@ -24246,8 +24246,8 @@ sub_8027F44: @ 8027F44 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r1, _08027FA8 @ =gUnknown_02024C3C - ldr r4, _08027FAC @ =gPlayerMonIndex + ldr r1, _08027FA8 @ =gMoveHitWith + ldr r4, _08027FAC @ =gBankAttacker ldrb r0, [r4] lsls r0, 1 adds r2, r0, r1 @@ -24262,7 +24262,7 @@ sub_8027F44: @ 8027F44 lsls r0, 24 cmp r0, 0 beq _08028024 - ldr r2, _08027FB4 @ =gUnknown_02024D28 + ldr r2, _08027FB4 @ =gProtectStructs ldrb r0, [r4] lsls r1, r0, 4 adds r0, r2, 0x4 @@ -24277,7 +24277,7 @@ sub_8027F44: @ 8027F44 cmp r0, 0 bne _08028024 _08027F8C: - ldr r3, _08027FB8 @ =gUnknown_02024C10 + ldr r3, _08027FB8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24292,11 +24292,11 @@ _08027F8C: str r1, [r3] b _08028110 .align 2, 0 -_08027FA8: .4byte gUnknown_02024C3C -_08027FAC: .4byte gPlayerMonIndex +_08027FA8: .4byte gMoveHitWith +_08027FAC: .4byte gBankAttacker _08027FB0: .4byte 0x0000ffff -_08027FB4: .4byte gUnknown_02024D28 -_08027FB8: .4byte gUnknown_02024C10 +_08027FB4: .4byte gProtectStructs +_08027FB8: .4byte gBattlescriptCurrInstr _08027FBC: mov r0, r12 strb r5, [r0] @@ -24306,7 +24306,7 @@ _08027FBC: adds r0, r7 adds r0, 0x22 strb r5, [r0] - ldr r1, _08027FE0 @ =gUnknown_030041C0 + ldr r1, _08027FE0 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -24314,11 +24314,11 @@ _08027FBC: strb r5, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _08027FE4 @ =gUnknown_02024C10 + ldr r1, _08027FE4 @ =gBattlescriptCurrInstr b _08028012 .align 2, 0 -_08027FE0: .4byte gUnknown_030041C0 -_08027FE4: .4byte gUnknown_02024C10 +_08027FE0: .4byte gBattleTextBuff1 +_08027FE4: .4byte gBattlescriptCurrInstr _08027FE8: mov r0, r8 adds r0, 0x1 @@ -24332,7 +24332,7 @@ _08027FE8: adds r0, r7 adds r0, 0x22 strb r2, [r0] - ldr r1, _08028020 @ =gUnknown_030041C0 + ldr r1, _08028020 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -24348,7 +24348,7 @@ _08028012: b _08028110 .align 2, 0 _0802801C: .4byte gBattleMons -_08028020: .4byte gUnknown_030041C0 +_08028020: .4byte gBattleTextBuff1 _08028024: movs r4, 0 mov r8, r4 @@ -24365,7 +24365,7 @@ _0802802C: ldr r6, _08028120 @ =gTypeEffectiveness adds r3, r4, r6 ldr r1, _08028124 @ =gUnknown_02024C44 - ldr r2, _08028128 @ =gPlayerMonIndex + ldr r2, _08028128 @ =gBankAttacker ldrb r5, [r2] lsls r0, r5, 1 adds r0, r1 @@ -24408,7 +24408,7 @@ _08028088: ble _0802802C movs r0, 0 mov r8, r0 - ldr r1, _08028134 @ =gUnknown_02024C10 + ldr r1, _08028134 @ =gBattlescriptCurrInstr mov r12, r1 ldr r3, _08028120 @ =gTypeEffectiveness adds r0, r4, 0x1 @@ -24483,18 +24483,18 @@ _08028110: .align 2, 0 _08028120: .4byte gTypeEffectiveness _08028124: .4byte gUnknown_02024C44 -_08028128: .4byte gPlayerMonIndex +_08028128: .4byte gBankAttacker _0802812C: .4byte gBattleMons _08028130: .4byte 0x000003e7 -_08028134: .4byte gUnknown_02024C10 +_08028134: .4byte gBattlescriptCurrInstr _08028138: .4byte 0x0000014f thumb_func_end sub_8027F44 thumb_func_start atkA7_setalwayshitflag atkA7_setalwayshitflag: @ 802813C push {r4,lr} - ldr r4, _08028180 @ =gUnknown_02024C98 - ldr r3, _08028184 @ =gEnemyMonIndex + ldr r4, _08028180 @ =gStatuses3 + ldr r3, _08028184 @ =gBankTarget ldrb r1, [r3] lsls r1, 2 adds r1, r4 @@ -24510,16 +24510,16 @@ atkA7_setalwayshitflag: @ 802813C movs r2, 0x10 orrs r0, r2 str r0, [r1] - ldr r2, _08028188 @ =gUnknown_02024CA8 + ldr r2, _08028188 @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _0802818C @ =gPlayerMonIndex + ldr r1, _0802818C @ =gBankAttacker ldrb r1, [r1] strb r1, [r0, 0x15] - ldr r1, _08028190 @ =gUnknown_02024C10 + ldr r1, _08028190 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -24527,11 +24527,11 @@ atkA7_setalwayshitflag: @ 802813C pop {r0} bx r0 .align 2, 0 -_08028180: .4byte gUnknown_02024C98 -_08028184: .4byte gEnemyMonIndex -_08028188: .4byte gUnknown_02024CA8 -_0802818C: .4byte gPlayerMonIndex -_08028190: .4byte gUnknown_02024C10 +_08028180: .4byte gStatuses3 +_08028184: .4byte gBankTarget +_08028188: .4byte gDisableStructs +_0802818C: .4byte gBankAttacker +_08028190: .4byte gBattlescriptCurrInstr thumb_func_end atkA7_setalwayshitflag thumb_func_start atkA8_copymovepermanently @@ -24547,7 +24547,7 @@ atkA8_copymovepermanently: @ 8028194 adds r5, r1, 0 strh r5, [r0] ldr r3, _080282FC @ =gBattleMons - ldr r2, _08028300 @ =gPlayerMonIndex + ldr r2, _08028300 @ =gBankAttacker ldrb r1, [r2] movs r0, 0x58 adds r4, r1, 0 @@ -24566,7 +24566,7 @@ atkA8_copymovepermanently: @ 8028194 b _08028320 _080281CC: ldr r0, _08028304 @ =gUnknown_02024C2C - ldr r2, _08028308 @ =gEnemyMonIndex + ldr r2, _08028308 @ =gBankTarget ldrb r1, [r2] lsls r1, 1 adds r1, r0 @@ -24615,7 +24615,7 @@ _0802821A: beq _08028220 b _08028320 _08028220: - ldr r4, _0802830C @ =gUnknown_02024BE4 + ldr r4, _0802830C @ =gCurrMovePos ldrb r1, [r4] lsls r1, 1 mov r2, r10 @@ -24653,7 +24653,7 @@ _08028220: adds r0, r4 ldrb r0, [r0, 0x4] strb r0, [r2] - ldr r1, _08028314 @ =gUnknown_02024A60 + ldr r1, _08028314 @ =gActiveBank mov r2, r10 ldrb r0, [r2] strb r0, [r1] @@ -24691,17 +24691,17 @@ _08028282: movs r1, 0x3 movs r2, 0 movs r3, 0x10 - bl dp01_build_cmdbuf_x02_a_b_varargs - ldr r0, _08028314 @ =gUnknown_02024A60 + bl EmitSetAttributes + ldr r0, _08028314 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08028318 @ =gUnknown_030041C0 + bl MarkBufferBankForExecution + ldr r1, _08028318 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 strb r0, [r1, 0x1] ldr r3, _08028304 @ =gUnknown_02024C2C - ldr r2, _08028308 @ =gEnemyMonIndex + ldr r2, _08028308 @ =gBankTarget ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -24715,7 +24715,7 @@ _08028282: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0802831C @ =gUnknown_02024C10 + ldr r1, _0802831C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -24724,16 +24724,16 @@ _08028282: _080282F4: .4byte gUnknown_02024BE8 _080282F8: .4byte 0x0000ffff _080282FC: .4byte gBattleMons -_08028300: .4byte gPlayerMonIndex +_08028300: .4byte gBankAttacker _08028304: .4byte gUnknown_02024C2C -_08028308: .4byte gEnemyMonIndex -_0802830C: .4byte gUnknown_02024BE4 +_08028308: .4byte gBankTarget +_0802830C: .4byte gCurrMovePos _08028310: .4byte gBattleMoves -_08028314: .4byte gUnknown_02024A60 -_08028318: .4byte gUnknown_030041C0 -_0802831C: .4byte gUnknown_02024C10 +_08028314: .4byte gActiveBank +_08028318: .4byte gBattleTextBuff1 +_0802831C: .4byte gBattlescriptCurrInstr _08028320: - ldr r3, _0802834C @ =gUnknown_02024C10 + ldr r3, _0802834C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24756,7 +24756,7 @@ _0802833A: pop {r0} bx r0 .align 2, 0 -_0802834C: .4byte gUnknown_02024C10 +_0802834C: .4byte gBattlescriptCurrInstr thumb_func_end atkA8_copymovepermanently thumb_func_start sub_8028350 @@ -24860,7 +24860,7 @@ _080283D8: cmp r0, 0x1A bne _08028418 _080283FA: - ldr r0, _08028414 @ =gUnknown_02024C6C + ldr r0, _08028414 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 20 @@ -24872,7 +24872,7 @@ _080283FA: .align 2, 0 _0802840C: .4byte gBattleMoves _08028410: .4byte gBattleWeather -_08028414: .4byte gUnknown_02024C6C +_08028414: .4byte gHitMarker _08028418: movs r0, 0x2 _0802841A: @@ -24889,7 +24889,7 @@ sub_8028420: @ 8028420 push {r5-r7} movs r6, 0 movs r5, 0 - ldr r0, _080284B0 @ =gPlayerMonIndex + ldr r0, _080284B0 @ =gBankAttacker mov r9, r0 movs r1, 0x58 mov r8, r1 @@ -24940,7 +24940,7 @@ _0802848C: adds r5, 0x1 cmp r5, 0x3 ble _0802843E - ldr r0, _080284B0 @ =gPlayerMonIndex + ldr r0, _080284B0 @ =gBankAttacker ldrb r0, [r0] adds r1, r6, 0 movs r2, 0xFD @@ -24949,16 +24949,16 @@ _0802848C: lsrs r6, r0, 24 cmp r6, 0xF bne _080284C0 - ldr r1, _080284BC @ =gUnknown_02024C10 + ldr r1, _080284BC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08028524 .align 2, 0 -_080284B0: .4byte gPlayerMonIndex +_080284B0: .4byte gBankAttacker _080284B4: .4byte gUnknown_02024A8C _080284B8: .4byte gBitTable -_080284BC: .4byte gUnknown_02024C10 +_080284BC: .4byte gBattlescriptCurrInstr _080284C0: movs r7, 0x3 ldr r4, _08028534 @ =gBitTable @@ -24975,7 +24975,7 @@ _080284C4: ldr r4, _08028538 @ =gUnknown_02024BEA ldr r2, _0802853C @ =gBattleMons lsls r1, r5, 1 - ldr r0, _08028540 @ =gPlayerMonIndex + ldr r0, _08028540 @ =gBankAttacker ldrb r3, [r0] movs r0, 0x58 muls r0, r3 @@ -24984,9 +24984,9 @@ _080284C4: adds r1, r2 ldrh r0, [r1] strh r0, [r4] - ldr r0, _08028544 @ =gUnknown_02024BE4 + ldr r0, _08028544 @ =gCurrMovePos strb r5, [r0] - ldr r2, _08028548 @ =gUnknown_02024C6C + ldr r2, _08028548 @ =gHitMarker ldr r0, [r2] ldr r1, _0802854C @ =0xfffffbff ands r0, r1 @@ -24994,9 +24994,9 @@ _080284C4: ldrh r0, [r4] movs r1, 0 bl sub_801B5C0 - ldr r1, _08028550 @ =gEnemyMonIndex + ldr r1, _08028550 @ =gBankTarget strb r0, [r1] - ldr r3, _08028554 @ =gUnknown_02024C10 + ldr r3, _08028554 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25021,18 +25021,18 @@ _08028524: _08028534: .4byte gBitTable _08028538: .4byte gUnknown_02024BEA _0802853C: .4byte gBattleMons -_08028540: .4byte gPlayerMonIndex -_08028544: .4byte gUnknown_02024BE4 -_08028548: .4byte gUnknown_02024C6C +_08028540: .4byte gBankAttacker +_08028544: .4byte gCurrMovePos +_08028548: .4byte gHitMarker _0802854C: .4byte 0xfffffbff -_08028550: .4byte gEnemyMonIndex -_08028554: .4byte gUnknown_02024C10 +_08028550: .4byte gBankTarget +_08028554: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028420 thumb_func_start sub_8028558 sub_8028558: @ 8028558 ldr r1, _0802857C @ =gBattleMons - ldr r0, _08028580 @ =gPlayerMonIndex + ldr r0, _08028580 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -25043,28 +25043,28 @@ sub_8028558: @ 8028558 lsls r1, 18 orrs r0, r1 str r0, [r2] - ldr r1, _08028584 @ =gUnknown_02024C10 + ldr r1, _08028584 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 _0802857C: .4byte gBattleMons -_08028580: .4byte gPlayerMonIndex -_08028584: .4byte gUnknown_02024C10 +_08028580: .4byte gBankAttacker +_08028584: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028558 thumb_func_start b_feature_update_destiny_bond b_feature_update_destiny_bond: @ 8028588 push {r4,r5,lr} - ldr r0, _080285D8 @ =gPlayerMonIndex + ldr r0, _080285D8 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080285DC @ =gEnemyMonIndex + ldr r4, _080285DC @ =gBankTarget ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r3, r0, 24 ldr r1, _080285E0 @ =gBattleMons @@ -25081,7 +25081,7 @@ b_feature_update_destiny_bond: @ 8028588 beq _080285D2 cmp r5, r3 beq _080285D2 - ldr r2, _080285E4 @ =gUnknown_02024C6C + ldr r2, _080285E4 @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 17 @@ -25096,31 +25096,31 @@ _080285D2: pop {r0} bx r0 .align 2, 0 -_080285D8: .4byte gPlayerMonIndex -_080285DC: .4byte gEnemyMonIndex +_080285D8: .4byte gBankAttacker +_080285DC: .4byte gBankTarget _080285E0: .4byte gBattleMons -_080285E4: .4byte gUnknown_02024C6C +_080285E4: .4byte gHitMarker thumb_func_end b_feature_update_destiny_bond thumb_func_start atkAB_802A458 atkAB_802A458: @ 80285E8 push {lr} bl b_feature_update_destiny_bond - ldr r1, _080285FC @ =gUnknown_02024C10 + ldr r1, _080285FC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080285FC: .4byte gUnknown_02024C10 +_080285FC: .4byte gBattlescriptCurrInstr thumb_func_end atkAB_802A458 thumb_func_start atkAC_remaininghptopower atkAC_remaininghptopower: @ 8028600 push {lr} ldr r2, _08028654 @ =gBattleMons - ldr r0, _08028658 @ =gPlayerMonIndex + ldr r0, _08028658 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -25148,13 +25148,13 @@ _0802862C: cmp r1, r0 bgt _0802862C _0802863A: - ldr r2, _08028660 @ =gUnknown_02024DEC + ldr r2, _08028660 @ =gDynamicBasePower ldr r1, _0802865C @ =gUnknown_081FAD26 adds r0, r3, 0x1 adds r0, r1 ldrb r0, [r0] strh r0, [r2] - ldr r1, _08028664 @ =gUnknown_02024C10 + ldr r1, _08028664 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -25162,10 +25162,10 @@ _0802863A: bx r0 .align 2, 0 _08028654: .4byte gBattleMons -_08028658: .4byte gPlayerMonIndex +_08028658: .4byte gBankAttacker _0802865C: .4byte gUnknown_081FAD26 -_08028660: .4byte gUnknown_02024DEC -_08028664: .4byte gUnknown_02024C10 +_08028660: .4byte gDynamicBasePower +_08028664: .4byte gBattlescriptCurrInstr thumb_func_end atkAC_remaininghptopower thumb_func_start sub_8028668 @@ -25176,8 +25176,8 @@ sub_8028668: @ 8028668 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r4, _080287F8 @ =gUnknown_02024C34 - ldr r1, _080287FC @ =gEnemyMonIndex + ldr r4, _080287F8 @ =gLastUsedMove + ldr r1, _080287FC @ =gBankTarget ldrb r2, [r1] lsls r0, r2, 1 adds r0, r4 @@ -25192,7 +25192,7 @@ _08028688: bne _08028690 b _08028828 _08028690: - ldr r1, _08028804 @ =gUnknown_02024C98 + ldr r1, _08028804 @ =gStatuses3 lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] @@ -25268,12 +25268,12 @@ _08028700: bge _0802871E adds r6, r0, 0 _0802871E: - ldr r1, _08028810 @ =gUnknown_030041C0 + ldr r1, _08028810 @ =gBattleTextBuff1 movs r5, 0xFD strb r5, [r1] movs r0, 0x2 strb r0, [r1, 0x1] - ldr r2, _080287F8 @ =gUnknown_02024C34 + ldr r2, _080287F8 @ =gLastUsedMove mov r3, r8 ldrb r0, [r3] lsls r0, 1 @@ -25288,7 +25288,7 @@ _0802871E: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r4, _08028814 @ =gUnknown_03004290 + ldr r4, _08028814 @ =gBattleTextBuff2 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0 @@ -25311,11 +25311,11 @@ _0802871E: ldrb r0, [r1] subs r0, r6 strb r0, [r1] - ldr r4, _08028818 @ =gUnknown_02024A60 + ldr r4, _08028818 @ =gActiveBank mov r3, r8 ldrb r0, [r3] strb r0, [r4] - ldr r1, _0802881C @ =gUnknown_02024CA8 + ldr r1, _0802881C @ =gDisableStructs ldrb r3, [r4] lsls r0, r3, 3 subs r0, r3 @@ -25352,16 +25352,16 @@ _0802871E: movs r0, 0 movs r2, 0 movs r3, 0x1 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _080287D2: - ldr r1, _08028824 @ =gUnknown_02024C10 + ldr r1, _08028824 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] ldr r1, _0802880C @ =gBattleMons - ldr r0, _080287FC @ =gEnemyMonIndex + ldr r0, _080287FC @ =gBankTarget ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -25372,23 +25372,23 @@ _080287D2: cmp r0, 0 bne _08028842 adds r0, r2, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves b _08028842 .align 2, 0 -_080287F8: .4byte gUnknown_02024C34 -_080287FC: .4byte gEnemyMonIndex +_080287F8: .4byte gLastUsedMove +_080287FC: .4byte gBankTarget _08028800: .4byte 0x0000ffff -_08028804: .4byte gUnknown_02024C98 +_08028804: .4byte gStatuses3 _08028808: .4byte 0x000400c0 _0802880C: .4byte gBattleMons -_08028810: .4byte gUnknown_030041C0 -_08028814: .4byte gUnknown_03004290 -_08028818: .4byte gUnknown_02024A60 -_0802881C: .4byte gUnknown_02024CA8 +_08028810: .4byte gBattleTextBuff1 +_08028814: .4byte gBattleTextBuff2 +_08028818: .4byte gActiveBank +_0802881C: .4byte gDisableStructs _08028820: .4byte gBitTable -_08028824: .4byte gUnknown_02024C10 +_08028824: .4byte gBattlescriptCurrInstr _08028828: - ldr r3, _08028854 @ =gUnknown_02024C10 + ldr r3, _08028854 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25411,7 +25411,7 @@ _08028842: pop {r0} bx r0 .align 2, 0 -_08028854: .4byte gUnknown_02024C10 +_08028854: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028668 thumb_func_start sub_8028858 @@ -25424,17 +25424,17 @@ sub_8028858: @ 8028858 movs r4, 0 str r4, [sp, 0x4] movs r7, 0 - ldr r0, _080288AC @ =gUnknown_02024BE6 + ldr r0, _080288AC @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xD7 beq _08028872 b _08028A26 _08028872: - ldr r5, _080288B0 @ =gUnknown_02024D1E + ldr r5, _080288B0 @ =gBattleCommunication strb r7, [r5, 0x5] - ldr r6, _080288B4 @ =gPlayerMonIndex + ldr r6, _080288B4 @ =gBankAttacker ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, _080288B8 @ =gEnemyParty mov r9, r1 @@ -25460,9 +25460,9 @@ _0802888C: str r7, [r0] b _080288D4 .align 2, 0 -_080288AC: .4byte gUnknown_02024BE6 -_080288B0: .4byte gUnknown_02024D1E -_080288B4: .4byte gPlayerMonIndex +_080288AC: .4byte gCurrentMove +_080288B0: .4byte gBattleCommunication +_080288B4: .4byte gBankAttacker _080288B8: .4byte gEnemyParty _080288BC: .4byte gPlayerParty _080288C0: .4byte gBattleMons @@ -25475,15 +25475,15 @@ _080288C4: orrs r0, r1 strb r0, [r5, 0x5] _080288D4: - ldr r4, _08028934 @ =gUnknown_02024A60 - ldr r0, _08028938 @ =gPlayerMonIndex + ldr r4, _08028934 @ =gActiveBank + ldr r0, _08028938 @ =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r6, 0x2 eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, _0802893C @ =0x02000000 ldr r2, _08028940 @ =0x00016003 adds r1, r2 @@ -25495,7 +25495,7 @@ _080288D4: ands r0, r1 cmp r0, 0 beq _08028964 - ldr r0, _08028948 @ =gUnknown_02024C0C + ldr r0, _08028948 @ =gAbsentBankFlags ldrb r2, [r0] ldr r1, _0802894C @ =gBitTable ldrb r3, [r4] @@ -25521,19 +25521,19 @@ _080288D4: str r2, [r0] b _08028964 .align 2, 0 -_08028934: .4byte gUnknown_02024A60 -_08028938: .4byte gPlayerMonIndex +_08028934: .4byte gActiveBank +_08028938: .4byte gBankAttacker _0802893C: .4byte 0x02000000 _08028940: .4byte 0x00016003 _08028944: .4byte gBattleTypeFlags -_08028948: .4byte gUnknown_02024C0C +_08028948: .4byte gAbsentBankFlags _0802894C: .4byte gBitTable _08028950: .4byte gBattleMons _08028954: ldrb r1, [r1] adds r0, r3, 0 bl sub_81074C4 - ldr r1, _080289AC @ =gUnknown_02024D1E + ldr r1, _080289AC @ =gBattleCommunication ldrb r0, [r1, 0x5] orrs r0, r6 strb r0, [r1, 0x5] @@ -25562,8 +25562,8 @@ _0802896A: lsls r0, 1 cmp r5, r0 beq _08028A1E - ldr r2, _080289B4 @ =gUnknown_02024A6A - ldr r0, _080289B8 @ =gPlayerMonIndex + ldr r2, _080289B4 @ =gBattlePartyID + ldr r0, _080289B8 @ =gBankAttacker ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -25574,10 +25574,10 @@ _0802896A: muls r0, r1 b _080289EC .align 2, 0 -_080289AC: .4byte gUnknown_02024D1E +_080289AC: .4byte gBattleCommunication _080289B0: .4byte gBattleMons -_080289B4: .4byte gUnknown_02024A6A -_080289B8: .4byte gPlayerMonIndex +_080289B4: .4byte gBattlePartyID +_080289B8: .4byte gBankAttacker _080289BC: ldr r0, _080289F4 @ =gBattleTypeFlags ldrh r1, [r0] @@ -25585,14 +25585,14 @@ _080289BC: ands r0, r1 cmp r0, 0 beq _08028A04 - ldr r0, _080289F8 @ =gUnknown_02024A60 + ldr r0, _080289F8 @ =gActiveBank ldrb r3, [r0] lsls r0, r3, 1 adds r0, r2 ldrh r0, [r0] cmp r0, r6 bne _08028A04 - ldr r0, _080289FC @ =gUnknown_02024C0C + ldr r0, _080289FC @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _08028A00 @ =gBitTable lsls r0, r3, 2 @@ -25610,8 +25610,8 @@ _080289EC: b _08028A10 .align 2, 0 _080289F4: .4byte gBattleTypeFlags -_080289F8: .4byte gUnknown_02024A60 -_080289FC: .4byte gUnknown_02024C0C +_080289F8: .4byte gActiveBank +_080289FC: .4byte gAbsentBankFlags _08028A00: .4byte gBitTable _08028A04: adds r0, r5, 0 @@ -25633,12 +25633,12 @@ _08028A1E: ble _0802896A b _08028A7E _08028A26: - ldr r1, _08028AB4 @ =gUnknown_02024D1E + ldr r1, _08028AB4 @ =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] movs r7, 0x3F ldr r2, _08028AB8 @ =gBattleMons - ldr r1, _08028ABC @ =gPlayerMonIndex + ldr r1, _08028ABC @ =gBankAttacker ldrb r0, [r1] movs r6, 0x58 muls r0, r6 @@ -25647,13 +25647,13 @@ _08028A26: adds r0, r5 str r4, [r0] ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r3, _08028AC0 @ =gUnknown_02024A60 + bl GetBankByPlayerAI + ldr r3, _08028AC0 @ =gActiveBank strb r0, [r3] ldr r0, _08028AC4 @ =gBattleTypeFlags ldrh r1, [r0] @@ -25661,7 +25661,7 @@ _08028A26: ands r0, r1 cmp r0, 0 beq _08028A7E - ldr r0, _08028AC8 @ =gUnknown_02024C0C + ldr r0, _08028AC8 @ =gAbsentBankFlags ldrb r2, [r0] ldr r1, _08028ACC @ =gBitTable ldrb r3, [r3] @@ -25676,8 +25676,8 @@ _08028A26: adds r0, r5 str r2, [r0] _08028A7E: - ldr r4, _08028AC0 @ =gUnknown_02024A60 - ldr r0, _08028ABC @ =gPlayerMonIndex + ldr r4, _08028AC0 @ =gActiveBank + ldr r0, _08028ABC @ =gBankAttacker ldrb r0, [r0] strb r0, [r4] add r1, sp, 0x4 @@ -25686,10 +25686,10 @@ _08028A7E: movs r1, 0x28 adds r2, r7, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08028AD0 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _08028AD0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -25701,21 +25701,21 @@ _08028A7E: pop {r0} bx r0 .align 2, 0 -_08028AB4: .4byte gUnknown_02024D1E +_08028AB4: .4byte gBattleCommunication _08028AB8: .4byte gBattleMons -_08028ABC: .4byte gPlayerMonIndex -_08028AC0: .4byte gUnknown_02024A60 +_08028ABC: .4byte gBankAttacker +_08028AC0: .4byte gActiveBank _08028AC4: .4byte gBattleTypeFlags -_08028AC8: .4byte gUnknown_02024C0C +_08028AC8: .4byte gAbsentBankFlags _08028ACC: .4byte gBitTable -_08028AD0: .4byte gUnknown_02024C10 +_08028AD0: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028858 thumb_func_start sub_8028AD4 sub_8028AD4: @ 8028AD4 push {r4-r7,lr} ldr r7, _08028B24 @ =gBattleMons - ldr r0, _08028B28 @ =gEnemyMonIndex + ldr r0, _08028B28 @ =gBankTarget ldrb r3, [r0] movs r6, 0x58 adds r1, r3, 0 @@ -25730,7 +25730,7 @@ sub_8028AD4: @ 8028AD4 ands r0, r5 cmp r0, 0 bne _08028B06 - ldr r1, _08028B2C @ =gUnknown_02024C98 + ldr r1, _08028B2C @ =gStatuses3 lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] @@ -25739,7 +25739,7 @@ sub_8028AD4: @ 8028AD4 cmp r0, 0 beq _08028B38 _08028B06: - ldr r3, _08028B34 @ =gUnknown_02024C10 + ldr r3, _08028B34 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25755,15 +25755,15 @@ _08028B06: b _08028B5C .align 2, 0 _08028B24: .4byte gBattleMons -_08028B28: .4byte gEnemyMonIndex -_08028B2C: .4byte gUnknown_02024C98 +_08028B28: .4byte gBankTarget +_08028B2C: .4byte gStatuses3 _08028B30: .4byte 0x000400c0 -_08028B34: .4byte gUnknown_02024C10 +_08028B34: .4byte gBattlescriptCurrInstr _08028B38: orrs r2, r5 str r2, [r4] ldr r1, _08028B64 @ =gBattleMoveDamage - ldr r0, _08028B68 @ =gPlayerMonIndex + ldr r0, _08028B68 @ =gBankAttacker ldrb r0, [r0] muls r0, r6 adds r0, r7 @@ -25775,7 +25775,7 @@ _08028B38: movs r0, 0x1 str r0, [r1] _08028B54: - ldr r1, _08028B6C @ =gUnknown_02024C10 + ldr r1, _08028B6C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -25785,21 +25785,21 @@ _08028B5C: bx r0 .align 2, 0 _08028B64: .4byte gBattleMoveDamage -_08028B68: .4byte gPlayerMonIndex -_08028B6C: .4byte gUnknown_02024C10 +_08028B68: .4byte gBankAttacker +_08028B6C: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028AD4 thumb_func_start sub_8028B70 sub_8028B70: @ 8028B70 push {r4,lr} - ldr r4, _08028BC4 @ =gPlayerMonIndex + ldr r4, _08028BC4 @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r1, _08028BC8 @ =gUnknown_02024C80 + ldr r1, _08028BC8 @ =gSideTimer lsls r2, r0, 1 adds r0, r2, r0 lsls r0, 2 @@ -25807,7 +25807,7 @@ sub_8028B70: @ 8028B70 ldrb r0, [r3, 0x6] cmp r0, 0x3 bne _08028BD4 - ldr r2, _08028BCC @ =gUnknown_02024D68 + ldr r2, _08028BCC @ =gSpecialStatuses ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -25817,7 +25817,7 @@ sub_8028B70: @ 8028B70 movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, _08028BD0 @ =gUnknown_02024C10 + ldr r3, _08028BD0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25832,12 +25832,12 @@ sub_8028B70: @ 8028B70 str r1, [r3] b _08028BEE .align 2, 0 -_08028BC4: .4byte gPlayerMonIndex -_08028BC8: .4byte gUnknown_02024C80 -_08028BCC: .4byte gUnknown_02024D68 -_08028BD0: .4byte gUnknown_02024C10 +_08028BC4: .4byte gBankAttacker +_08028BC8: .4byte gSideTimer +_08028BCC: .4byte gSpecialStatuses +_08028BD0: .4byte gBattlescriptCurrInstr _08028BD4: - ldr r1, _08028BF4 @ =gUnknown_02024C7A + ldr r1, _08028BF4 @ =gSideAffecting adds r1, r2, r1 ldrh r2, [r1] movs r0, 0x10 @@ -25846,7 +25846,7 @@ _08028BD4: ldrb r0, [r3, 0x6] adds r0, 0x1 strb r0, [r3, 0x6] - ldr r1, _08028BF8 @ =gUnknown_02024C10 + ldr r1, _08028BF8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -25855,14 +25855,14 @@ _08028BEE: pop {r0} bx r0 .align 2, 0 -_08028BF4: .4byte gUnknown_02024C7A -_08028BF8: .4byte gUnknown_02024C10 +_08028BF4: .4byte gSideAffecting +_08028BF8: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028B70 thumb_func_start sub_8028BFC sub_8028BFC: @ 8028BFC ldr r1, _08028C20 @ =gBattleMons - ldr r0, _08028C24 @ =gEnemyMonIndex + ldr r0, _08028C24 @ =gBankTarget ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -25873,15 +25873,15 @@ sub_8028BFC: @ 8028BFC lsls r1, 22 orrs r0, r1 str r0, [r2] - ldr r1, _08028C28 @ =gUnknown_02024C10 + ldr r1, _08028C28 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 _08028C20: .4byte gBattleMons -_08028C24: .4byte gEnemyMonIndex -_08028C28: .4byte gUnknown_02024C10 +_08028C24: .4byte gBankTarget +_08028C28: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028BFC thumb_func_start atkB2_setperishsong @@ -25892,9 +25892,9 @@ atkB2_setperishsong: @ 8028C2C push {r6,r7} movs r6, 0 movs r3, 0 - ldr r0, _08028C70 @ =gUnknown_02024A68 + ldr r0, _08028C70 @ =gNoOfAllBanks adds r7, r0, 0 - ldr r0, _08028C74 @ =gPlayerMonIndex + ldr r0, _08028C74 @ =gBankAttacker mov r8, r0 ldrb r1, [r7] cmp r6, r1 @@ -25902,10 +25902,10 @@ atkB2_setperishsong: @ 8028C2C movs r5, 0x20 ldr r0, _08028C78 @ =gBattleMons mov r12, r0 - ldr r0, _08028C7C @ =gUnknown_02024CA8 + ldr r0, _08028C7C @ =gDisableStructs adds r4, r0, 0 adds r4, 0xF - ldr r2, _08028C80 @ =gUnknown_02024C98 + ldr r2, _08028C80 @ =gStatuses3 _08028C54: ldr r1, [r2] adds r0, r1, 0 @@ -25923,11 +25923,11 @@ _08028C6C: adds r6, 0x1 b _08028C8C .align 2, 0 -_08028C70: .4byte gUnknown_02024A68 -_08028C74: .4byte gPlayerMonIndex +_08028C70: .4byte gNoOfAllBanks +_08028C74: .4byte gBankAttacker _08028C78: .4byte gBattleMons -_08028C7C: .4byte gUnknown_02024CA8 -_08028C80: .4byte gUnknown_02024C98 +_08028C7C: .4byte gDisableStructs +_08028C80: .4byte gStatuses3 _08028C84: orrs r1, r5 str r1, [r2] @@ -25944,11 +25944,11 @@ _08028C98: mov r1, r8 ldrb r0, [r1] bl sub_80153D0 - ldr r0, _08028CC4 @ =gUnknown_02024A68 + ldr r0, _08028CC4 @ =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bne _08028CCC - ldr r3, _08028CC8 @ =gUnknown_02024C10 + ldr r3, _08028CC8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25963,10 +25963,10 @@ _08028C98: str r1, [r3] b _08028CD4 .align 2, 0 -_08028CC4: .4byte gUnknown_02024A68 -_08028CC8: .4byte gUnknown_02024C10 +_08028CC4: .4byte gNoOfAllBanks +_08028CC8: .4byte gBattlescriptCurrInstr _08028CCC: - ldr r1, _08028CE0 @ =gUnknown_02024C10 + ldr r1, _08028CE0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -25978,7 +25978,7 @@ _08028CD4: pop {r0} bx r0 .align 2, 0 -_08028CE0: .4byte gUnknown_02024C10 +_08028CE0: .4byte gBattlescriptCurrInstr thumb_func_end atkB2_setperishsong thumb_func_start atkB3_rolloutdamagecalculation @@ -25993,21 +25993,21 @@ atkB3_rolloutdamagecalculation: @ 8028CE4 ands r0, r1 cmp r0, 0 beq _08028D18 - ldr r0, _08028D0C @ =gPlayerMonIndex + ldr r0, _08028D0C @ =gBankAttacker ldrb r0, [r0] - bl b_cancel_multi_turn_move_maybe - ldr r1, _08028D10 @ =gUnknown_02024C10 + bl CancelMultiTurnMoves + ldr r1, _08028D10 @ =gBattlescriptCurrInstr ldr r0, _08028D14 @ =BattleScript_1D6F74 str r0, [r1] b _08028E30 .align 2, 0 _08028D08: .4byte gBattleMoveFlags -_08028D0C: .4byte gPlayerMonIndex -_08028D10: .4byte gUnknown_02024C10 +_08028D0C: .4byte gBankAttacker +_08028D10: .4byte gBattlescriptCurrInstr _08028D14: .4byte BattleScript_1D6F74 _08028D18: ldr r2, _08028E3C @ =gBattleMons - ldr r1, _08028E40 @ =gPlayerMonIndex + ldr r1, _08028E40 @ =gBankAttacker ldrb r3, [r1] movs r5, 0x58 adds r0, r3, 0 @@ -26021,9 +26021,9 @@ _08028D18: ands r0, r7 adds r6, r1, 0 mov r9, r2 - ldr r1, _08028E44 @ =gUnknown_02024CA8 + ldr r1, _08028E44 @ =gDisableStructs mov r12, r1 - ldr r2, _08028E48 @ =gUnknown_02024BE6 + ldr r2, _08028E48 @ =gCurrentMove mov r8, r2 cmp r0, 0 bne _08028D8A @@ -26056,7 +26056,7 @@ _08028D18: ldr r0, [r1] orrs r0, r7 str r0, [r1] - ldr r1, _08028E4C @ =gUnknown_02024C54 + ldr r1, _08028E4C @ =gLockedMove ldrb r0, [r6] lsls r0, 1 adds r0, r1 @@ -26091,7 +26091,7 @@ _08028D8A: ands r0, r2 str r0, [r1] _08028DBE: - ldr r3, _08028E54 @ =gUnknown_02024DEC + ldr r3, _08028E54 @ =gDynamicBasePower ldr r2, _08028E58 @ =gBattleMoves mov r0, r8 ldrh r1, [r0] @@ -26113,7 +26113,7 @@ _08028DBE: lsrs r0, 28 movs r1, 0x5 subs r1, r0 - ldr r7, _08028E5C @ =gUnknown_02024C10 + ldr r7, _08028E5C @ =gBattlescriptCurrInstr adds r5, r3, 0 cmp r2, r1 bge _08028E0C @@ -26160,21 +26160,21 @@ _08028E30: bx r0 .align 2, 0 _08028E3C: .4byte gBattleMons -_08028E40: .4byte gPlayerMonIndex -_08028E44: .4byte gUnknown_02024CA8 -_08028E48: .4byte gUnknown_02024BE6 -_08028E4C: .4byte gUnknown_02024C54 +_08028E40: .4byte gBankAttacker +_08028E44: .4byte gDisableStructs +_08028E48: .4byte gCurrentMove +_08028E4C: .4byte gLockedMove _08028E50: .4byte 0xffffefff -_08028E54: .4byte gUnknown_02024DEC +_08028E54: .4byte gDynamicBasePower _08028E58: .4byte gBattleMoves -_08028E5C: .4byte gUnknown_02024C10 +_08028E5C: .4byte gBattlescriptCurrInstr thumb_func_end atkB3_rolloutdamagecalculation thumb_func_start atkB4_jumpifconfusedandattackmaxed atkB4_jumpifconfusedandattackmaxed: @ 8028E60 push {r4,r5,lr} ldr r5, _08028EB0 @ =gBattleMons - ldr r0, _08028EB4 @ =gEnemyMonIndex + ldr r0, _08028EB4 @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 adds r3, r1, 0 @@ -26185,7 +26185,7 @@ atkB4_jumpifconfusedandattackmaxed: @ 8028E60 ldr r0, [r0] movs r1, 0x7 ands r0, r1 - ldr r4, _08028EB8 @ =gUnknown_02024C10 + ldr r4, _08028EB8 @ =gBattlescriptCurrInstr cmp r0, 0 beq _08028EBC ldr r2, [r4] @@ -26213,8 +26213,8 @@ atkB4_jumpifconfusedandattackmaxed: @ 8028E60 b _08028EC2 .align 2, 0 _08028EB0: .4byte gBattleMons -_08028EB4: .4byte gEnemyMonIndex -_08028EB8: .4byte gUnknown_02024C10 +_08028EB4: .4byte gBankTarget +_08028EB8: .4byte gBattlescriptCurrInstr _08028EBC: ldr r0, [r4] adds r0, 0x6 @@ -26234,8 +26234,8 @@ sub_8028EC8: @ 8028EC8 ands r0, r1 cmp r0, 0 beq _08028F04 - ldr r2, _08028EF4 @ =gUnknown_02024CA8 - ldr r0, _08028EF8 @ =gPlayerMonIndex + ldr r2, _08028EF4 @ =gDisableStructs + ldr r0, _08028EF8 @ =gBankAttacker ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -26243,19 +26243,19 @@ sub_8028EC8: @ 8028EC8 adds r0, r2 movs r1, 0 strb r1, [r0, 0x10] - ldr r1, _08028EFC @ =gUnknown_02024C10 + ldr r1, _08028EFC @ =gBattlescriptCurrInstr ldr r0, _08028F00 @ =BattleScript_1D6F74 str r0, [r1] b _08028F5C .align 2, 0 _08028EF0: .4byte gBattleMoveFlags -_08028EF4: .4byte gUnknown_02024CA8 -_08028EF8: .4byte gPlayerMonIndex -_08028EFC: .4byte gUnknown_02024C10 +_08028EF4: .4byte gDisableStructs +_08028EF8: .4byte gBankAttacker +_08028EFC: .4byte gBattlescriptCurrInstr _08028F00: .4byte BattleScript_1D6F74 _08028F04: - ldr r5, _08028F64 @ =gUnknown_02024CA8 - ldr r4, _08028F68 @ =gPlayerMonIndex + ldr r5, _08028F64 @ =gDisableStructs + ldr r4, _08028F68 @ =gBankAttacker ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -26267,9 +26267,9 @@ _08028F04: adds r0, 0x1 strb r0, [r1, 0x10] _08028F1C: - ldr r3, _08028F6C @ =gUnknown_02024DEC + ldr r3, _08028F6C @ =gDynamicBasePower ldr r2, _08028F70 @ =gBattleMoves - ldr r0, _08028F74 @ =gUnknown_02024BE6 + ldr r0, _08028F74 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -26283,7 +26283,7 @@ _08028F1C: subs r0, r1 lsls r0, 2 adds r0, r5 - ldr r4, _08028F78 @ =gUnknown_02024C10 + ldr r4, _08028F78 @ =gBattlescriptCurrInstr ldrb r1, [r0, 0x10] cmp r2, r1 bge _08028F56 @@ -26306,19 +26306,19 @@ _08028F5C: pop {r0} bx r0 .align 2, 0 -_08028F64: .4byte gUnknown_02024CA8 -_08028F68: .4byte gPlayerMonIndex -_08028F6C: .4byte gUnknown_02024DEC +_08028F64: .4byte gDisableStructs +_08028F68: .4byte gBankAttacker +_08028F6C: .4byte gDynamicBasePower _08028F70: .4byte gBattleMoves -_08028F74: .4byte gUnknown_02024BE6 -_08028F78: .4byte gUnknown_02024C10 +_08028F74: .4byte gCurrentMove +_08028F78: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028EC8 thumb_func_start atkB6_happinesstodamagecalculation atkB6_happinesstodamagecalculation: @ 8028F7C push {r4,lr} ldr r2, _08028FA8 @ =gBattleMoves - ldr r0, _08028FAC @ =gUnknown_02024BE6 + ldr r0, _08028FAC @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -26327,9 +26327,9 @@ atkB6_happinesstodamagecalculation: @ 8028F7C ldrb r0, [r0] cmp r0, 0x79 bne _08028FBC - ldr r4, _08028FB0 @ =gUnknown_02024DEC + ldr r4, _08028FB0 @ =gDynamicBasePower ldr r2, _08028FB4 @ =gBattleMons - ldr r0, _08028FB8 @ =gPlayerMonIndex + ldr r0, _08028FB8 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -26339,14 +26339,14 @@ atkB6_happinesstodamagecalculation: @ 8028F7C b _08028FD2 .align 2, 0 _08028FA8: .4byte gBattleMoves -_08028FAC: .4byte gUnknown_02024BE6 -_08028FB0: .4byte gUnknown_02024DEC +_08028FAC: .4byte gCurrentMove +_08028FB0: .4byte gDynamicBasePower _08028FB4: .4byte gBattleMons -_08028FB8: .4byte gPlayerMonIndex +_08028FB8: .4byte gBankAttacker _08028FBC: - ldr r4, _08028FF0 @ =gUnknown_02024DEC + ldr r4, _08028FF0 @ =gDynamicBasePower ldr r2, _08028FF4 @ =gBattleMons - ldr r0, _08028FF8 @ =gPlayerMonIndex + ldr r0, _08028FF8 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -26362,7 +26362,7 @@ _08028FD2: movs r1, 0x19 bl __divsi3 strh r0, [r4] - ldr r1, _08028FFC @ =gUnknown_02024C10 + ldr r1, _08028FFC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26370,10 +26370,10 @@ _08028FD2: pop {r0} bx r0 .align 2, 0 -_08028FF0: .4byte gUnknown_02024DEC +_08028FF0: .4byte gDynamicBasePower _08028FF4: .4byte gBattleMons -_08028FF8: .4byte gPlayerMonIndex -_08028FFC: .4byte gUnknown_02024C10 +_08028FF8: .4byte gBankAttacker +_08028FFC: .4byte gBattlescriptCurrInstr thumb_func_end atkB6_happinesstodamagecalculation thumb_func_start atkB7_presentdamagecalculation @@ -26384,34 +26384,34 @@ atkB7_presentdamagecalculation: @ 8029000 ands r4, r0 cmp r4, 0x65 bgt _0802901C - ldr r1, _08029018 @ =gUnknown_02024DEC + ldr r1, _08029018 @ =gDynamicBasePower movs r0, 0x28 strh r0, [r1] b _0802905E .align 2, 0 -_08029018: .4byte gUnknown_02024DEC +_08029018: .4byte gDynamicBasePower _0802901C: cmp r4, 0xB1 bgt _0802902C - ldr r1, _08029028 @ =gUnknown_02024DEC + ldr r1, _08029028 @ =gDynamicBasePower movs r0, 0x50 strh r0, [r1] b _0802905E .align 2, 0 -_08029028: .4byte gUnknown_02024DEC +_08029028: .4byte gDynamicBasePower _0802902C: cmp r4, 0xCB bgt _0802903C - ldr r1, _08029038 @ =gUnknown_02024DEC + ldr r1, _08029038 @ =gDynamicBasePower movs r0, 0x78 strh r0, [r1] b _0802905E .align 2, 0 -_08029038: .4byte gUnknown_02024DEC +_08029038: .4byte gDynamicBasePower _0802903C: ldr r3, _08029068 @ =gBattleMoveDamage ldr r2, _0802906C @ =gBattleMons - ldr r0, _08029070 @ =gEnemyMonIndex + ldr r0, _08029070 @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -26430,18 +26430,18 @@ _08029058: _0802905E: cmp r4, 0xCB bgt _0802907C - ldr r1, _08029074 @ =gUnknown_02024C10 + ldr r1, _08029074 @ =gBattlescriptCurrInstr ldr r0, _08029078 @ =BattleScript_1D6F44 b _080290AC .align 2, 0 _08029068: .4byte gBattleMoveDamage _0802906C: .4byte gBattleMons -_08029070: .4byte gEnemyMonIndex -_08029074: .4byte gUnknown_02024C10 +_08029070: .4byte gBankTarget +_08029074: .4byte gBattlescriptCurrInstr _08029078: .4byte BattleScript_1D6F44 _0802907C: ldr r2, _08029098 @ =gBattleMons - ldr r0, _0802909C @ =gEnemyMonIndex + ldr r0, _0802909C @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -26450,16 +26450,16 @@ _0802907C: ldrh r0, [r0, 0x28] cmp r1, r0 bne _080290A8 - ldr r1, _080290A0 @ =gUnknown_02024C10 + ldr r1, _080290A0 @ =gBattlescriptCurrInstr ldr r0, _080290A4 @ =BattleScript_1D83B5 b _080290AC .align 2, 0 _08029098: .4byte gBattleMons -_0802909C: .4byte gEnemyMonIndex -_080290A0: .4byte gUnknown_02024C10 +_0802909C: .4byte gBankTarget +_080290A0: .4byte gBattlescriptCurrInstr _080290A4: .4byte BattleScript_1D83B5 _080290A8: - ldr r1, _080290B4 @ =gUnknown_02024C10 + ldr r1, _080290B4 @ =gBattlescriptCurrInstr ldr r0, _080290B8 @ =BattleScript_1D839B _080290AC: str r0, [r1] @@ -26467,17 +26467,17 @@ _080290AC: pop {r0} bx r0 .align 2, 0 -_080290B4: .4byte gUnknown_02024C10 +_080290B4: .4byte gBattlescriptCurrInstr _080290B8: .4byte BattleScript_1D839B thumb_func_end atkB7_presentdamagecalculation thumb_func_start sub_80290BC sub_80290BC: @ 80290BC push {r4-r6,lr} - ldr r4, _080290F0 @ =gPlayerMonIndex + ldr r4, _080290F0 @ =gBankAttacker ldrb r0, [r4] - bl battle_get_per_side_status - ldr r6, _080290F4 @ =gUnknown_02024C7A + bl GetBankIdentity + ldr r6, _080290F4 @ =gSideAffecting movs r5, 0x1 adds r1, r5, 0 ands r1, r0 @@ -26493,18 +26493,18 @@ sub_80290BC: @ 80290BC movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _080290FC @ =gUnknown_02024D1E + ldr r1, _080290FC @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] b _08029132 .align 2, 0 -_080290F0: .4byte gPlayerMonIndex -_080290F4: .4byte gUnknown_02024C7A +_080290F0: .4byte gBankAttacker +_080290F4: .4byte gSideAffecting _080290F8: .4byte gBattleMoveFlags -_080290FC: .4byte gUnknown_02024D1E +_080290FC: .4byte gBattleCommunication _08029100: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r5, 0 ands r1, r0 lsls r1, 1 @@ -26514,8 +26514,8 @@ _08029100: orrs r0, r2 strh r0, [r1] ldrb r0, [r4] - bl battle_get_per_side_status - ldr r2, _08029140 @ =gUnknown_02024C80 + bl GetBankIdentity + ldr r2, _08029140 @ =gSideTimer adds r1, r5, 0 ands r1, r0 lsls r0, r1, 1 @@ -26524,10 +26524,10 @@ _08029100: adds r0, r2 movs r1, 0x5 strb r1, [r0, 0x7] - ldr r0, _08029144 @ =gUnknown_02024D1E + ldr r0, _08029144 @ =gBattleCommunication strb r1, [r0, 0x5] _08029132: - ldr r1, _08029148 @ =gUnknown_02024C10 + ldr r1, _08029148 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26535,9 +26535,9 @@ _08029132: pop {r0} bx r0 .align 2, 0 -_08029140: .4byte gUnknown_02024C80 -_08029144: .4byte gUnknown_02024D1E -_08029148: .4byte gUnknown_02024C10 +_08029140: .4byte gSideTimer +_08029144: .4byte gBattleCommunication +_08029148: .4byte gBattlescriptCurrInstr thumb_func_end sub_80290BC thumb_func_start atkB9_magnitudedamagecalculation @@ -26554,70 +26554,70 @@ atkB9_magnitudedamagecalculation: @ 802914C lsrs r3, r0, 16 cmp r3, 0x4 bgt _08029178 - ldr r1, _08029174 @ =gUnknown_02024DEC + ldr r1, _08029174 @ =gDynamicBasePower movs r0, 0xA strh r0, [r1] movs r3, 0x4 b _080291E4 .align 2, 0 -_08029174: .4byte gUnknown_02024DEC +_08029174: .4byte gDynamicBasePower _08029178: cmp r3, 0xE bgt _0802918C - ldr r1, _08029188 @ =gUnknown_02024DEC + ldr r1, _08029188 @ =gDynamicBasePower movs r0, 0x1E strh r0, [r1] movs r3, 0x5 b _080291E4 .align 2, 0 -_08029188: .4byte gUnknown_02024DEC +_08029188: .4byte gDynamicBasePower _0802918C: cmp r3, 0x22 bgt _080291A0 - ldr r1, _0802919C @ =gUnknown_02024DEC + ldr r1, _0802919C @ =gDynamicBasePower movs r0, 0x32 strh r0, [r1] movs r3, 0x6 b _080291E4 .align 2, 0 -_0802919C: .4byte gUnknown_02024DEC +_0802919C: .4byte gDynamicBasePower _080291A0: cmp r3, 0x40 bgt _080291B4 - ldr r1, _080291B0 @ =gUnknown_02024DEC + ldr r1, _080291B0 @ =gDynamicBasePower movs r0, 0x46 strh r0, [r1] movs r3, 0x7 b _080291E4 .align 2, 0 -_080291B0: .4byte gUnknown_02024DEC +_080291B0: .4byte gDynamicBasePower _080291B4: cmp r3, 0x54 bgt _080291C8 - ldr r1, _080291C4 @ =gUnknown_02024DEC + ldr r1, _080291C4 @ =gDynamicBasePower movs r0, 0x5A strh r0, [r1] movs r3, 0x8 b _080291E4 .align 2, 0 -_080291C4: .4byte gUnknown_02024DEC +_080291C4: .4byte gDynamicBasePower _080291C8: cmp r3, 0x5E bgt _080291DC - ldr r1, _080291D8 @ =gUnknown_02024DEC + ldr r1, _080291D8 @ =gDynamicBasePower movs r0, 0x6E strh r0, [r1] movs r3, 0x9 b _080291E4 .align 2, 0 -_080291D8: .4byte gUnknown_02024DEC +_080291D8: .4byte gDynamicBasePower _080291DC: - ldr r1, _08029250 @ =gUnknown_02024DEC + ldr r1, _08029250 @ =gDynamicBasePower movs r0, 0x96 strh r0, [r1] movs r3, 0xA _080291E4: - ldr r1, _08029254 @ =gUnknown_030041C0 + ldr r1, _08029254 @ =gBattleTextBuff1 movs r2, 0 movs r0, 0xFD strb r0, [r1] @@ -26629,21 +26629,21 @@ _080291E4: strb r3, [r1, 0x4] movs r0, 0xFF strb r0, [r1, 0x5] - ldr r1, _08029258 @ =gEnemyMonIndex + ldr r1, _08029258 @ =gBankTarget strb r2, [r1] - ldr r0, _0802925C @ =gUnknown_02024A68 + ldr r0, _0802925C @ =gNoOfAllBanks ldrb r3, [r0] adds r6, r1, 0 - ldr r0, _08029260 @ =gUnknown_02024C10 + ldr r0, _08029260 @ =gBattlescriptCurrInstr mov r8, r0 cmp r2, r3 bcs _0802923C adds r4, r6, 0 - ldr r0, _08029264 @ =gPlayerMonIndex + ldr r0, _08029264 @ =gBankAttacker ldrb r5, [r0] ldr r1, _08029268 @ =gBitTable mov r12, r1 - ldr r7, _0802926C @ =gUnknown_02024C0C + ldr r7, _0802926C @ =gAbsentBankFlags _0802921A: ldrb r2, [r4] cmp r2, r5 @@ -26674,14 +26674,14 @@ _0802923C: pop {r0} bx r0 .align 2, 0 -_08029250: .4byte gUnknown_02024DEC -_08029254: .4byte gUnknown_030041C0 -_08029258: .4byte gEnemyMonIndex -_0802925C: .4byte gUnknown_02024A68 -_08029260: .4byte gUnknown_02024C10 -_08029264: .4byte gPlayerMonIndex +_08029250: .4byte gDynamicBasePower +_08029254: .4byte gBattleTextBuff1 +_08029258: .4byte gBankTarget +_0802925C: .4byte gNoOfAllBanks +_08029260: .4byte gBattlescriptCurrInstr +_08029264: .4byte gBankAttacker _08029268: .4byte gBitTable -_0802926C: .4byte gUnknown_02024C0C +_0802926C: .4byte gAbsentBankFlags thumb_func_end atkB9_magnitudedamagecalculation thumb_func_start sub_8029270 @@ -26691,50 +26691,50 @@ sub_8029270: @ 8029270 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08029294 @ =gUnknown_02024C0E + ldr r0, _08029294 @ =gMultiHitCounter ldrb r0, [r0] cmp r0, 0x1 bne _080292A0 - ldr r0, _08029298 @ =gPlayerMonIndex + ldr r0, _08029298 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0802929C movs r0, 0x1 b _080292BA .align 2, 0 -_08029294: .4byte gUnknown_02024C0E -_08029298: .4byte gPlayerMonIndex +_08029294: .4byte gMultiHitCounter +_08029298: .4byte gBankAttacker _0802929C: movs r0, 0 b _080292BA _080292A0: - ldr r0, _080292B4 @ =gPlayerMonIndex + ldr r0, _080292B4 @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080292B8 movs r0, 0x3 b _080292BA .align 2, 0 -_080292B4: .4byte gPlayerMonIndex +_080292B4: .4byte gBankAttacker _080292B8: movs r0, 0x2 _080292BA: - bl battle_get_side_with_given_state - ldr r1, _0802937C @ =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r1, _0802937C @ =gBankTarget strb r0, [r1] - ldr r0, _08029380 @ =gUnknown_02024C18 - ldr r1, _0802937C @ =gEnemyMonIndex + ldr r0, _08029380 @ =gActionForBanks + ldr r1, _0802937C @ =gBankTarget mov r9, r1 ldrb r3, [r1] adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 bne _080293BC - ldr r5, _08029384 @ =gPlayerMonIndex + ldr r5, _08029384 @ =gBankAttacker ldr r0, _08029388 @ =0x02000000 ldr r2, _0802938C @ =0x00016010 adds r1, r3, r2 @@ -26762,7 +26762,7 @@ _080292BA: ldrh r0, [r0, 0x28] cmp r0, 0 beq _080293BC - ldr r0, _08029394 @ =gUnknown_02024CA8 + ldr r0, _08029394 @ =gDisableStructs lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -26771,22 +26771,22 @@ _080292BA: lsls r0, 31 cmp r0, 0 bne _080293BC - ldr r0, _08029398 @ =gUnknown_02024C60 + ldr r0, _08029398 @ =gChosenMovesByBanks lsls r1, r3, 1 adds r1, r0 ldrh r0, [r1] cmp r0, 0xE4 bne _080293BC movs r1, 0 - ldr r0, _0802939C @ =gUnknown_02024A68 - ldr r7, _080293A0 @ =gUnknown_02024BE6 + ldr r0, _0802939C @ =gNoOfAllBanks + ldr r7, _080293A0 @ =gCurrentMove mov r8, r7 - ldr r2, _080293A4 @ =gUnknown_02024C6C + ldr r2, _080293A4 @ =gHitMarker mov r12, r2 ldrb r7, [r0] cmp r1, r7 bge _0802935A - ldr r6, _080293A8 @ =gUnknown_02024A7A + ldr r6, _080293A8 @ =gTurnOrder mov r5, r9 ldr r4, _080293AC @ =gUnknown_02024A76 movs r3, 0xB @@ -26808,7 +26808,7 @@ _0802935A: movs r0, 0xE4 mov r1, r8 strh r0, [r1] - ldr r2, _080293B0 @ =gUnknown_02024C10 + ldr r2, _080293B0 @ =gBattlescriptCurrInstr ldr r0, [r2] adds r0, 0x5 str r0, [r2] @@ -26823,24 +26823,24 @@ _0802935A: str r0, [r7] b _080293D6 .align 2, 0 -_0802937C: .4byte gEnemyMonIndex -_08029380: .4byte gUnknown_02024C18 -_08029384: .4byte gPlayerMonIndex +_0802937C: .4byte gBankTarget +_08029380: .4byte gActionForBanks +_08029384: .4byte gBankAttacker _08029388: .4byte 0x02000000 _0802938C: .4byte 0x00016010 _08029390: .4byte gBattleMons -_08029394: .4byte gUnknown_02024CA8 -_08029398: .4byte gUnknown_02024C60 -_0802939C: .4byte gUnknown_02024A68 -_080293A0: .4byte gUnknown_02024BE6 -_080293A4: .4byte gUnknown_02024C6C -_080293A8: .4byte gUnknown_02024A7A +_08029394: .4byte gDisableStructs +_08029398: .4byte gChosenMovesByBanks +_0802939C: .4byte gNoOfAllBanks +_080293A0: .4byte gCurrentMove +_080293A4: .4byte gHitMarker +_080293A8: .4byte gTurnOrder _080293AC: .4byte gUnknown_02024A76 -_080293B0: .4byte gUnknown_02024C10 +_080293B0: .4byte gBattlescriptCurrInstr _080293B4: .4byte 0x00016002 _080293B8: .4byte 0xfffffbff _080293BC: - ldr r3, _080293E4 @ =gUnknown_02024C10 + ldr r3, _080293E4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -26862,7 +26862,7 @@ _080293D6: pop {r0} bx r0 .align 2, 0 -_080293E4: .4byte gUnknown_02024C10 +_080293E4: .4byte gBattlescriptCurrInstr thumb_func_end sub_8029270 thumb_func_start sub_80293E8 @@ -26879,42 +26879,42 @@ sub_80293E8: @ 80293E8 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08029410 @ =gUnknown_02024D1E + ldr r1, _08029410 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08029426 .align 2, 0 _08029408: .4byte gBattleWeather _0802940C: .4byte gBattleMoveFlags -_08029410: .4byte gUnknown_02024D1E +_08029410: .4byte gBattleCommunication _08029414: movs r0, 0x20 strh r0, [r2] - ldr r1, _08029434 @ =gUnknown_02024D1E + ldr r1, _08029434 @ =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] - ldr r0, _08029438 @ =gUnknown_02024DBC + ldr r0, _08029438 @ =gWishFutureKnock adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _08029426: - ldr r1, _0802943C @ =gUnknown_02024C10 + ldr r1, _0802943C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08029434: .4byte gUnknown_02024D1E -_08029438: .4byte gUnknown_02024DBC -_0802943C: .4byte gUnknown_02024C10 +_08029434: .4byte gBattleCommunication +_08029438: .4byte gWishFutureKnock +_0802943C: .4byte gBattlescriptCurrInstr thumb_func_end sub_80293E8 thumb_func_start atkBC_maxattackhalvehp atkBC_maxattackhalvehp: @ 8029440 push {r4,r5,lr} ldr r5, _0802948C @ =gBattleMons - ldr r4, _08029490 @ =gPlayerMonIndex + ldr r4, _08029490 @ =gBankAttacker ldrb r0, [r4] movs r3, 0x58 muls r0, r3 @@ -26946,18 +26946,18 @@ _08029458: movs r0, 0x1 str r0, [r1] _08029480: - ldr r1, _08029498 @ =gUnknown_02024C10 + ldr r1, _08029498 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080294B6 .align 2, 0 _0802948C: .4byte gBattleMons -_08029490: .4byte gPlayerMonIndex +_08029490: .4byte gBankAttacker _08029494: .4byte gBattleMoveDamage -_08029498: .4byte gUnknown_02024C10 +_08029498: .4byte gBattlescriptCurrInstr _0802949C: - ldr r3, _080294BC @ =gUnknown_02024C10 + ldr r3, _080294BC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -26975,18 +26975,18 @@ _080294B6: pop {r0} bx r0 .align 2, 0 -_080294BC: .4byte gUnknown_02024C10 +_080294BC: .4byte gBattlescriptCurrInstr thumb_func_end atkBC_maxattackhalvehp thumb_func_start atkBD_copyfoestats atkBD_copyfoestats: @ 80294C0 push {r4-r7,lr} movs r2, 0 - ldr r7, _080294F8 @ =gUnknown_02024C10 - ldr r6, _080294FC @ =gPlayerMonIndex + ldr r7, _080294F8 @ =gBattlescriptCurrInstr + ldr r6, _080294FC @ =gBankAttacker movs r4, 0x58 ldr r3, _08029500 @ =gUnknown_02024A98 - ldr r5, _08029504 @ =gEnemyMonIndex + ldr r5, _08029504 @ =gBankTarget _080294CE: ldrb r0, [r6] adds r1, r0, 0 @@ -27009,17 +27009,17 @@ _080294CE: pop {r0} bx r0 .align 2, 0 -_080294F8: .4byte gUnknown_02024C10 -_080294FC: .4byte gPlayerMonIndex +_080294F8: .4byte gBattlescriptCurrInstr +_080294FC: .4byte gBankAttacker _08029500: .4byte gUnknown_02024A98 -_08029504: .4byte gEnemyMonIndex +_08029504: .4byte gBankTarget thumb_func_end atkBD_copyfoestats thumb_func_start atkBE_breakfree atkBE_breakfree: @ 8029508 push {r4,r5,lr} ldr r1, _08029570 @ =gBattleMons - ldr r5, _08029574 @ =gPlayerMonIndex + ldr r5, _08029574 @ =gBankAttacker ldrb r2, [r5] movs r0, 0x58 muls r0, r2 @@ -27034,7 +27034,7 @@ atkBE_breakfree: @ 8029508 ldr r0, _08029578 @ =0xffff1fff ands r1, r0 str r1, [r3] - ldr r1, _0802957C @ =gEnemyMonIndex + ldr r1, _0802957C @ =gBankTarget ldr r2, _08029580 @ =0x02000000 ldrb r0, [r5] ldr r3, _08029584 @ =0x00016020 @@ -27042,7 +27042,7 @@ atkBE_breakfree: @ 8029508 adds r0, r2 ldrb r0, [r0] strb r0, [r1] - ldr r1, _08029588 @ =gUnknown_030041C0 + ldr r1, _08029588 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -27064,21 +27064,21 @@ atkBE_breakfree: @ 8029508 movs r0, 0xFF strb r0, [r1, 0x4] bl b_movescr_stack_push_cursor - ldr r1, _0802958C @ =gUnknown_02024C10 + ldr r1, _0802958C @ =gBattlescriptCurrInstr ldr r0, _08029590 @ =gUnknown_081D92C2 b _0802963E .align 2, 0 _08029570: .4byte gBattleMons -_08029574: .4byte gPlayerMonIndex +_08029574: .4byte gBankAttacker _08029578: .4byte 0xffff1fff -_0802957C: .4byte gEnemyMonIndex +_0802957C: .4byte gBankTarget _08029580: .4byte 0x02000000 _08029584: .4byte 0x00016020 -_08029588: .4byte gUnknown_030041C0 -_0802958C: .4byte gUnknown_02024C10 +_08029588: .4byte gBattleTextBuff1 +_0802958C: .4byte gBattlescriptCurrInstr _08029590: .4byte gUnknown_081D92C2 _08029594: - ldr r4, _080295C8 @ =gUnknown_02024C98 + ldr r4, _080295C8 @ =gStatuses3 lsls r0, r2, 2 adds r3, r0, r4 ldr r1, [r3] @@ -27099,17 +27099,17 @@ _08029594: ands r0, r2 str r0, [r1] bl b_movescr_stack_push_cursor - ldr r1, _080295CC @ =gUnknown_02024C10 + ldr r1, _080295CC @ =gBattlescriptCurrInstr ldr r0, _080295D0 @ =gUnknown_081D92C9 b _0802963E .align 2, 0 -_080295C8: .4byte gUnknown_02024C98 -_080295CC: .4byte gUnknown_02024C10 +_080295C8: .4byte gStatuses3 +_080295CC: .4byte gBattlescriptCurrInstr _080295D0: .4byte gUnknown_081D92C9 _080295D4: adds r0, r2, 0 - bl battle_side_get_owner - ldr r4, _08029624 @ =gUnknown_02024C7A + bl GetBankSide + ldr r4, _08029624 @ =gSideAffecting lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -27119,7 +27119,7 @@ _080295D4: cmp r0, 0 beq _08029638 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -27129,8 +27129,8 @@ _080295D4: movs r4, 0 strh r1, [r0] ldrb r0, [r5] - bl battle_side_get_owner - ldr r2, _0802962C @ =gUnknown_02024C80 + bl GetBankSide + ldr r2, _0802962C @ =gSideTimer lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -27139,17 +27139,17 @@ _080295D4: adds r1, r2 strb r4, [r1, 0x6] bl b_movescr_stack_push_cursor - ldr r1, _08029630 @ =gUnknown_02024C10 + ldr r1, _08029630 @ =gBattlescriptCurrInstr ldr r0, _08029634 @ =gUnknown_081D92D0 b _0802963E .align 2, 0 -_08029624: .4byte gUnknown_02024C7A +_08029624: .4byte gSideAffecting _08029628: .4byte 0x0000ffef -_0802962C: .4byte gUnknown_02024C80 -_08029630: .4byte gUnknown_02024C10 +_0802962C: .4byte gSideTimer +_08029630: .4byte gBattlescriptCurrInstr _08029634: .4byte gUnknown_081D92D0 _08029638: - ldr r1, _08029648 @ =gUnknown_02024C10 + ldr r1, _08029648 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 _0802963E: @@ -27158,13 +27158,13 @@ _0802963E: pop {r0} bx r0 .align 2, 0 -_08029648: .4byte gUnknown_02024C10 +_08029648: .4byte gBattlescriptCurrInstr thumb_func_end atkBE_breakfree thumb_func_start sub_802964C sub_802964C: @ 802964C ldr r1, _08029670 @ =gBattleMons - ldr r0, _08029674 @ =gPlayerMonIndex + ldr r0, _08029674 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -27175,23 +27175,23 @@ sub_802964C: @ 802964C lsls r1, 23 orrs r0, r1 str r0, [r2] - ldr r1, _08029678 @ =gUnknown_02024C10 + ldr r1, _08029678 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 _08029670: .4byte gBattleMons -_08029674: .4byte gPlayerMonIndex -_08029678: .4byte gUnknown_02024C10 +_08029674: .4byte gBankAttacker +_08029678: .4byte gBattlescriptCurrInstr thumb_func_end sub_802964C thumb_func_start atkC0_recoverbasedonsunlight atkC0_recoverbasedonsunlight: @ 802967C push {r4-r7,lr} sub sp, 0x4 - ldr r1, _080296E8 @ =gEnemyMonIndex - ldr r5, _080296EC @ =gPlayerMonIndex + ldr r1, _080296E8 @ =gBankTarget + ldr r5, _080296EC @ =gBankAttacker ldrb r0, [r5] strb r0, [r1] ldr r7, _080296F0 @ =gBattleMons @@ -27213,7 +27213,7 @@ atkC0_recoverbasedonsunlight: @ 802967C movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -27223,14 +27223,14 @@ atkC0_recoverbasedonsunlight: @ 802967C movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080296FC _080296CE: ldr r3, _080296F8 @ =gBattleMoveDamage ldr r2, _080296F0 @ =gBattleMons - ldr r0, _080296EC @ =gPlayerMonIndex + ldr r0, _080296EC @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -27241,8 +27241,8 @@ _080296CE: adds r1, r3, 0 b _08029736 .align 2, 0 -_080296E8: .4byte gEnemyMonIndex -_080296EC: .4byte gPlayerMonIndex +_080296E8: .4byte gBankTarget +_080296EC: .4byte gBankAttacker _080296F0: .4byte gBattleMons _080296F4: .4byte gBattleWeather _080296F8: .4byte gBattleMoveDamage @@ -27286,16 +27286,16 @@ _08029742: ldr r0, [r1] negs r0, r0 str r0, [r1] - ldr r1, _08029758 @ =gUnknown_02024C10 + ldr r1, _08029758 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08029776 .align 2, 0 _08029754: .4byte gBattleMoveDamage -_08029758: .4byte gUnknown_02024C10 +_08029758: .4byte gBattlescriptCurrInstr _0802975C: - ldr r3, _08029780 @ =gUnknown_02024C10 + ldr r3, _08029780 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27314,7 +27314,7 @@ _08029776: pop {r0} bx r0 .align 2, 0 -_08029780: .4byte gUnknown_02024C10 +_08029780: .4byte gBattlescriptCurrInstr thumb_func_end atkC0_recoverbasedonsunlight thumb_func_start sub_8029784 @@ -27325,7 +27325,7 @@ sub_8029784: @ 8029784 mov r5, r8 push {r5-r7} ldr r2, _08029894 @ =gBattleMons - ldr r0, _08029898 @ =gPlayerMonIndex + ldr r0, _08029898 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 adds r4, r1, 0 @@ -27415,7 +27415,7 @@ sub_8029784: @ 8029784 ands r1, r3 lsls r1, 5 orrs r4, r1 - ldr r5, _0802989C @ =gUnknown_02024DEC + ldr r5, _0802989C @ =gDynamicBasePower lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -27443,7 +27443,7 @@ _08029876: movs r1, 0xC0 orrs r0, r1 strb r0, [r5] - ldr r1, _080298A8 @ =gUnknown_02024C10 + ldr r1, _080298A8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -27456,11 +27456,11 @@ _08029876: bx r0 .align 2, 0 _08029894: .4byte gBattleMons -_08029898: .4byte gPlayerMonIndex -_0802989C: .4byte gUnknown_02024DEC +_08029898: .4byte gBankAttacker +_0802989C: .4byte gDynamicBasePower _080298A0: .4byte 0x02000000 _080298A4: .4byte 0x0001601c -_080298A8: .4byte gUnknown_02024C10 +_080298A8: .4byte gBattlescriptCurrInstr thumb_func_end sub_8029784 thumb_func_start atkC2_selectnexttarget @@ -27468,23 +27468,23 @@ atkC2_selectnexttarget: @ 80298AC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08029908 @ =gEnemyMonIndex + ldr r0, _08029908 @ =gBankTarget movs r1, 0 strb r1, [r0] - ldr r1, _0802990C @ =gUnknown_02024A68 + ldr r1, _0802990C @ =gNoOfAllBanks ldrb r1, [r1] adds r6, r0, 0 - ldr r0, _08029910 @ =gUnknown_02024C10 + ldr r0, _08029910 @ =gBattlescriptCurrInstr mov r8, r0 cmp r1, 0 beq _080298F6 adds r3, r6, 0 - ldr r0, _08029914 @ =gPlayerMonIndex + ldr r0, _08029914 @ =gBankAttacker ldrb r5, [r0] ldr r0, _08029918 @ =gBitTable mov r12, r0 adds r4, r1, 0 - ldr r7, _0802991C @ =gUnknown_02024C0C + ldr r7, _0802991C @ =gAbsentBankFlags _080298D4: ldrb r2, [r3] cmp r2, r5 @@ -27515,12 +27515,12 @@ _080298F6: pop {r0} bx r0 .align 2, 0 -_08029908: .4byte gEnemyMonIndex -_0802990C: .4byte gUnknown_02024A68 -_08029910: .4byte gUnknown_02024C10 -_08029914: .4byte gPlayerMonIndex +_08029908: .4byte gBankTarget +_0802990C: .4byte gNoOfAllBanks +_08029910: .4byte gBattlescriptCurrInstr +_08029914: .4byte gBankAttacker _08029918: .4byte gBitTable -_0802991C: .4byte gUnknown_02024C0C +_0802991C: .4byte gAbsentBankFlags thumb_func_end atkC2_selectnexttarget thumb_func_start atkC3_setfutureattack @@ -27531,15 +27531,15 @@ atkC3_setfutureattack: @ 8029920 mov r5, r8 push {r5-r7} sub sp, 0x10 - ldr r0, _08029958 @ =gUnknown_02024DBC + ldr r0, _08029958 @ =gWishFutureKnock mov r8, r0 - ldr r7, _0802995C @ =gEnemyMonIndex + ldr r7, _0802995C @ =gBankTarget ldrb r1, [r7] adds r0, r1, r0 ldrb r6, [r0] cmp r6, 0 beq _08029964 - ldr r3, _08029960 @ =gUnknown_02024C10 + ldr r3, _08029960 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27554,15 +27554,15 @@ atkC3_setfutureattack: @ 8029920 str r1, [r3] b _08029A2E .align 2, 0 -_08029958: .4byte gUnknown_02024DBC -_0802995C: .4byte gEnemyMonIndex -_08029960: .4byte gUnknown_02024C10 +_08029958: .4byte gWishFutureKnock +_0802995C: .4byte gBankTarget +_08029960: .4byte gBattlescriptCurrInstr _08029964: lsls r1, 1 mov r0, r8 adds r0, 0x18 adds r1, r0 - ldr r2, _08029A04 @ =gUnknown_02024BE6 + ldr r2, _08029A04 @ =gCurrentMove mov r9, r2 ldrh r0, [r2] strh r0, [r1] @@ -27570,16 +27570,16 @@ _08029964: adds r0, 0x4 ldrb r4, [r7] adds r0, r4 - ldr r5, _08029A08 @ =gPlayerMonIndex + ldr r5, _08029A08 @ =gBankAttacker ldrb r1, [r5] strb r1, [r0] ldrb r0, [r7] add r0, r8 movs r1, 0x3 strb r1, [r0] - ldr r4, _08029A0C @ =gUnknown_02024C7A + ldr r4, _08029A0C @ =gSideAffecting ldrb r0, [r7] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 mov r10, r1 ands r1, r0 @@ -27609,7 +27609,7 @@ _08029964: adds r2, 0x8 adds r1, r2 str r0, [r1] - ldr r1, _08029A14 @ =gUnknown_02024D28 + ldr r1, _08029A14 @ =gProtectStructs ldrb r0, [r5] lsls r0, 4 adds r0, r1 @@ -27632,24 +27632,24 @@ _080299F2: ldr r0, _08029A18 @ =0x00000161 cmp r1, r0 bne _08029A20 - ldr r0, _08029A1C @ =gUnknown_02024D1E + ldr r0, _08029A1C @ =gBattleCommunication mov r1, r10 strb r1, [r0, 0x5] b _08029A26 .align 2, 0 -_08029A04: .4byte gUnknown_02024BE6 -_08029A08: .4byte gPlayerMonIndex -_08029A0C: .4byte gUnknown_02024C7A +_08029A04: .4byte gCurrentMove +_08029A08: .4byte gBankAttacker +_08029A0C: .4byte gSideAffecting _08029A10: .4byte gBattleMons -_08029A14: .4byte gUnknown_02024D28 +_08029A14: .4byte gProtectStructs _08029A18: .4byte 0x00000161 -_08029A1C: .4byte gUnknown_02024D1E +_08029A1C: .4byte gBattleCommunication _08029A20: - ldr r1, _08029A40 @ =gUnknown_02024D1E + ldr r1, _08029A40 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] _08029A26: - ldr r1, _08029A44 @ =gUnknown_02024C10 + ldr r1, _08029A44 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -27663,8 +27663,8 @@ _08029A2E: pop {r0} bx r0 .align 2, 0 -_08029A40: .4byte gUnknown_02024D1E -_08029A44: .4byte gUnknown_02024C10 +_08029A40: .4byte gBattleCommunication +_08029A44: .4byte gBattlescriptCurrInstr thumb_func_end atkC3_setfutureattack thumb_func_start atkC4_802B910 @@ -27673,9 +27673,9 @@ atkC4_802B910: @ 8029A48 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _08029A8C @ =gPlayerMonIndex + ldr r0, _08029A8C @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r7, _08029A90 @ =gEnemyParty cmp r0, 0 @@ -27683,7 +27683,7 @@ atkC4_802B910: @ 8029A48 ldr r7, _08029A94 @ =gPlayerParty _08029A62: ldr r2, _08029A98 @ =gBattleMons - ldr r0, _08029A9C @ =gEnemyMonIndex + ldr r0, _08029A9C @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -27691,7 +27691,7 @@ _08029A62: ldrh r0, [r0, 0x28] cmp r0, 0 bne _08029AA4 - ldr r3, _08029AA0 @ =gUnknown_02024C10 + ldr r3, _08029AA0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27703,14 +27703,14 @@ _08029A62: ldrb r0, [r2, 0x4] b _08029C40 .align 2, 0 -_08029A8C: .4byte gPlayerMonIndex +_08029A8C: .4byte gBankAttacker _08029A90: .4byte gEnemyParty _08029A94: .4byte gPlayerParty _08029A98: .4byte gBattleMons -_08029A9C: .4byte gEnemyMonIndex -_08029AA0: .4byte gUnknown_02024C10 +_08029A9C: .4byte gBankTarget +_08029AA0: .4byte gBattlescriptCurrInstr _08029AA4: - ldr r6, _08029BE0 @ =gUnknown_02024D1E + ldr r6, _08029BE0 @ =gBattleCommunication ldrb r0, [r6] mov r8, r0 cmp r0, 0x5 @@ -27760,23 +27760,23 @@ _08029AF8: cmp r0, 0x5 bls _08029AB4 _08029B08: - ldr r1, _08029BE0 @ =gUnknown_02024D1E + ldr r1, _08029BE0 @ =gBattleCommunication mov r9, r1 ldrb r2, [r1] cmp r2, 0x5 bhi _08029C0C - ldr r1, _08029BE4 @ =gUnknown_030041C0 + ldr r1, _08029BE4 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r6, _08029BE8 @ =gPlayerMonIndex + ldr r6, _08029BE8 @ =gBankAttacker ldrb r0, [r6] strb r0, [r1, 0x2] strb r2, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08029BEC @ =gUnknown_02024C10 + ldr r1, _08029BEC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x9 str r0, [r1] @@ -27798,7 +27798,7 @@ _08029B08: mov r2, r8 str r3, [r2] ldr r2, _08029BF8 @ =gBattleMoves - ldr r0, _08029BFC @ =gUnknown_02024BE6 + ldr r0, _08029BFC @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -27823,7 +27823,7 @@ _08029B08: muls r0, r1 str r0, [r2] ldr r3, _08029C00 @ =gBattleMons - ldr r1, _08029C04 @ =gEnemyMonIndex + ldr r1, _08029C04 @ =gBankTarget ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -27842,7 +27842,7 @@ _08029B08: adds r2, r0, 0x2 mov r0, r8 str r2, [r0] - ldr r1, _08029C08 @ =gUnknown_02024D28 + ldr r1, _08029C08 @ =gProtectStructs ldrb r0, [r6] lsls r0, 4 adds r0, r1 @@ -27863,22 +27863,22 @@ _08029BD4: strb r0, [r2] b _08029C46 .align 2, 0 -_08029BE0: .4byte gUnknown_02024D1E -_08029BE4: .4byte gUnknown_030041C0 -_08029BE8: .4byte gPlayerMonIndex -_08029BEC: .4byte gUnknown_02024C10 +_08029BE0: .4byte gBattleCommunication +_08029BE4: .4byte gBattleTextBuff1 +_08029BE8: .4byte gBankAttacker +_08029BEC: .4byte gBattlescriptCurrInstr _08029BF0: .4byte gBattleMoveDamage _08029BF4: .4byte gBaseStats _08029BF8: .4byte gBattleMoves -_08029BFC: .4byte gUnknown_02024BE6 +_08029BFC: .4byte gCurrentMove _08029C00: .4byte gBattleMons -_08029C04: .4byte gEnemyMonIndex -_08029C08: .4byte gUnknown_02024D28 +_08029C04: .4byte gBankTarget +_08029C08: .4byte gProtectStructs _08029C0C: mov r0, r8 cmp r0, 0 beq _08029C2C - ldr r3, _08029C28 @ =gUnknown_02024C10 + ldr r3, _08029C28 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27890,9 +27890,9 @@ _08029C0C: ldrb r0, [r2, 0x4] b _08029C40 .align 2, 0 -_08029C28: .4byte gUnknown_02024C10 +_08029C28: .4byte gBattlescriptCurrInstr _08029C2C: - ldr r3, _08029C54 @ =gUnknown_02024C10 + ldr r3, _08029C54 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -27914,13 +27914,13 @@ _08029C46: pop {r0} bx r0 .align 2, 0 -_08029C54: .4byte gUnknown_02024C10 +_08029C54: .4byte gBattlescriptCurrInstr thumb_func_end atkC4_802B910 thumb_func_start atkC5_hidepreattack atkC5_hidepreattack: @ 8029C58 push {lr} - ldr r0, _08029C6C @ =gUnknown_02024BE6 + ldr r0, _08029C6C @ =gCurrentMove ldrh r1, [r0] cmp r1, 0x5B beq _08029C98 @@ -27930,7 +27930,7 @@ atkC5_hidepreattack: @ 8029C58 beq _08029C7C b _08029CC4 .align 2, 0 -_08029C6C: .4byte gUnknown_02024BE6 +_08029C6C: .4byte gCurrentMove _08029C70: ldr r0, _08029C8C @ =0x00000123 cmp r1, r0 @@ -27939,8 +27939,8 @@ _08029C70: cmp r1, r0 bne _08029CC4 _08029C7C: - ldr r2, _08029C90 @ =gUnknown_02024C98 - ldr r0, _08029C94 @ =gPlayerMonIndex + ldr r2, _08029C90 @ =gStatuses3 + ldr r0, _08029C94 @ =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -27949,11 +27949,11 @@ _08029C7C: b _08029CC0 .align 2, 0 _08029C8C: .4byte 0x00000123 -_08029C90: .4byte gUnknown_02024C98 -_08029C94: .4byte gPlayerMonIndex +_08029C90: .4byte gStatuses3 +_08029C94: .4byte gBankAttacker _08029C98: - ldr r2, _08029CA8 @ =gUnknown_02024C98 - ldr r0, _08029CAC @ =gPlayerMonIndex + ldr r2, _08029CA8 @ =gStatuses3 + ldr r0, _08029CAC @ =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -27961,11 +27961,11 @@ _08029C98: movs r2, 0x80 b _08029CC0 .align 2, 0 -_08029CA8: .4byte gUnknown_02024C98 -_08029CAC: .4byte gPlayerMonIndex +_08029CA8: .4byte gStatuses3 +_08029CAC: .4byte gBankAttacker _08029CB0: - ldr r2, _08029CD0 @ =gUnknown_02024C98 - ldr r0, _08029CD4 @ =gPlayerMonIndex + ldr r2, _08029CD0 @ =gStatuses3 + ldr r0, _08029CD4 @ =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -27976,22 +27976,22 @@ _08029CC0: orrs r0, r2 str r0, [r1] _08029CC4: - ldr r1, _08029CD8 @ =gUnknown_02024C10 + ldr r1, _08029CD8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08029CD0: .4byte gUnknown_02024C98 -_08029CD4: .4byte gPlayerMonIndex -_08029CD8: .4byte gUnknown_02024C10 +_08029CD0: .4byte gStatuses3 +_08029CD4: .4byte gBankAttacker +_08029CD8: .4byte gBattlescriptCurrInstr thumb_func_end atkC5_hidepreattack thumb_func_start atkC6_unhidepostattack atkC6_unhidepostattack: @ 8029CDC push {lr} - ldr r0, _08029CF0 @ =gUnknown_02024BE6 + ldr r0, _08029CF0 @ =gCurrentMove ldrh r1, [r0] cmp r1, 0x5B beq _08029D20 @@ -28001,7 +28001,7 @@ atkC6_unhidepostattack: @ 8029CDC beq _08029D00 b _08029D4E .align 2, 0 -_08029CF0: .4byte gUnknown_02024BE6 +_08029CF0: .4byte gCurrentMove _08029CF4: ldr r0, _08029D14 @ =0x00000123 cmp r1, r0 @@ -28010,8 +28010,8 @@ _08029CF4: cmp r1, r0 bne _08029D4E _08029D00: - ldr r2, _08029D18 @ =gUnknown_02024C98 - ldr r0, _08029D1C @ =gPlayerMonIndex + ldr r2, _08029D18 @ =gStatuses3 + ldr r0, _08029D1C @ =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28021,11 +28021,11 @@ _08029D00: b _08029D4A .align 2, 0 _08029D14: .4byte 0x00000123 -_08029D18: .4byte gUnknown_02024C98 -_08029D1C: .4byte gPlayerMonIndex +_08029D18: .4byte gStatuses3 +_08029D1C: .4byte gBankAttacker _08029D20: - ldr r2, _08029D34 @ =gUnknown_02024C98 - ldr r0, _08029D38 @ =gPlayerMonIndex + ldr r2, _08029D34 @ =gStatuses3 + ldr r0, _08029D38 @ =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28034,11 +28034,11 @@ _08029D20: negs r2, r2 b _08029D4A .align 2, 0 -_08029D34: .4byte gUnknown_02024C98 -_08029D38: .4byte gPlayerMonIndex +_08029D34: .4byte gStatuses3 +_08029D38: .4byte gBankAttacker _08029D3C: - ldr r2, _08029D5C @ =gUnknown_02024C98 - ldr r0, _08029D60 @ =gPlayerMonIndex + ldr r2, _08029D5C @ =gStatuses3 + ldr r0, _08029D60 @ =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28048,31 +28048,31 @@ _08029D4A: ands r0, r2 str r0, [r1] _08029D4E: - ldr r1, _08029D68 @ =gUnknown_02024C10 + ldr r1, _08029D68 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08029D5C: .4byte gUnknown_02024C98 -_08029D60: .4byte gPlayerMonIndex +_08029D5C: .4byte gStatuses3 +_08029D60: .4byte gBankAttacker _08029D64: .4byte 0xfffbffff -_08029D68: .4byte gUnknown_02024C10 +_08029D68: .4byte gBattlescriptCurrInstr thumb_func_end atkC6_unhidepostattack thumb_func_start atkC7_setminimize atkC7_setminimize: @ 8029D6C push {lr} - ldr r0, _08029D9C @ =gUnknown_02024C6C + ldr r0, _08029D9C @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 beq _08029D90 - ldr r2, _08029DA0 @ =gUnknown_02024C98 - ldr r0, _08029DA4 @ =gPlayerMonIndex + ldr r2, _08029DA0 @ =gStatuses3 + ldr r0, _08029DA4 @ =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28082,17 +28082,17 @@ atkC7_setminimize: @ 8029D6C orrs r0, r2 str r0, [r1] _08029D90: - ldr r1, _08029DA8 @ =gUnknown_02024C10 + ldr r1, _08029DA8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08029D9C: .4byte gUnknown_02024C6C -_08029DA0: .4byte gUnknown_02024C98 -_08029DA4: .4byte gPlayerMonIndex -_08029DA8: .4byte gUnknown_02024C10 +_08029D9C: .4byte gHitMarker +_08029DA0: .4byte gStatuses3 +_08029DA4: .4byte gBankAttacker +_08029DA8: .4byte gBattlescriptCurrInstr thumb_func_end atkC7_setminimize thumb_func_start sub_8029DAC @@ -28110,40 +28110,40 @@ sub_8029DAC: @ 8029DAC movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08029DD8 @ =gUnknown_02024D1E + ldr r1, _08029DD8 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08029DEA .align 2, 0 _08029DD0: .4byte gBattleWeather _08029DD4: .4byte gBattleMoveFlags -_08029DD8: .4byte gUnknown_02024D1E +_08029DD8: .4byte gBattleCommunication _08029DDC: strh r2, [r3] - ldr r0, _08029DF8 @ =gUnknown_02024D1E + ldr r0, _08029DF8 @ =gBattleCommunication movs r1, 0x5 strb r1, [r0, 0x5] - ldr r0, _08029DFC @ =gUnknown_02024DBC + ldr r0, _08029DFC @ =gWishFutureKnock adds r0, 0x28 strb r1, [r0] _08029DEA: - ldr r1, _08029E00 @ =gUnknown_02024C10 + ldr r1, _08029E00 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08029DF8: .4byte gUnknown_02024D1E -_08029DFC: .4byte gUnknown_02024DBC -_08029E00: .4byte gUnknown_02024C10 +_08029DF8: .4byte gBattleCommunication +_08029DFC: .4byte gWishFutureKnock +_08029E00: .4byte gBattlescriptCurrInstr thumb_func_end sub_8029DAC thumb_func_start atkC9_jumpifattackandspecialattackcannotfall atkC9_jumpifattackandspecialattackcannotfall: @ 8029E04 push {r4,lr} ldr r2, _08029E48 @ =gBattleMons - ldr r0, _08029E4C @ =gEnemyMonIndex + ldr r0, _08029E4C @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -28157,11 +28157,11 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 8029E04 ldrsb r0, [r1, r0] cmp r0, 0 bne _08029E58 - ldr r0, _08029E50 @ =gUnknown_02024D1E + ldr r0, _08029E50 @ =gBattleCommunication ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _08029E58 - ldr r3, _08029E54 @ =gUnknown_02024C10 + ldr r3, _08029E54 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28177,12 +28177,12 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 8029E04 b _08029E84 .align 2, 0 _08029E48: .4byte gBattleMons -_08029E4C: .4byte gEnemyMonIndex -_08029E50: .4byte gUnknown_02024D1E -_08029E54: .4byte gUnknown_02024C10 +_08029E4C: .4byte gBankTarget +_08029E50: .4byte gBattleCommunication +_08029E54: .4byte gBattlescriptCurrInstr _08029E58: - ldr r4, _08029E8C @ =gUnknown_02024A60 - ldr r0, _08029E90 @ =gPlayerMonIndex + ldr r4, _08029E8C @ =gActiveBank + ldr r0, _08029E90 @ =gBankAttacker ldrb r0, [r0] strb r0, [r4] ldr r2, _08029E94 @ =gBattleMoveDamage @@ -28194,10 +28194,10 @@ _08029E58: str r0, [r2] ldr r1, _08029E98 @ =0x00007fff movs r0, 0 - bl dp01_build_cmdbuf_x18_0_aa_health_bar_update + bl EmitHealthBarUpdate ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08029E9C @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _08029E9C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28206,20 +28206,20 @@ _08029E84: pop {r0} bx r0 .align 2, 0 -_08029E8C: .4byte gUnknown_02024A60 -_08029E90: .4byte gPlayerMonIndex +_08029E8C: .4byte gActiveBank +_08029E90: .4byte gBankAttacker _08029E94: .4byte gBattleMoveDamage _08029E98: .4byte 0x00007fff -_08029E9C: .4byte gUnknown_02024C10 +_08029E9C: .4byte gBattlescriptCurrInstr thumb_func_end atkC9_jumpifattackandspecialattackcannotfall thumb_func_start atkCA_setforcedtarget atkCA_setforcedtarget: @ 8029EA0 push {r4,r5,lr} - ldr r4, _08029EE0 @ =gPlayerMonIndex + ldr r4, _08029EE0 @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner - ldr r5, _08029EE4 @ =gUnknown_02024C80 + bl GetBankSide + ldr r5, _08029EE4 @ =gSideTimer lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -28229,7 +28229,7 @@ atkCA_setforcedtarget: @ 8029EA0 movs r0, 0x1 strb r0, [r1, 0x8] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -28238,7 +28238,7 @@ atkCA_setforcedtarget: @ 8029EA0 adds r1, r5 ldrb r0, [r4] strb r0, [r1, 0x9] - ldr r1, _08029EE8 @ =gUnknown_02024C10 + ldr r1, _08029EE8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28246,16 +28246,16 @@ atkCA_setforcedtarget: @ 8029EA0 pop {r0} bx r0 .align 2, 0 -_08029EE0: .4byte gPlayerMonIndex -_08029EE4: .4byte gUnknown_02024C80 -_08029EE8: .4byte gUnknown_02024C10 +_08029EE0: .4byte gBankAttacker +_08029EE4: .4byte gSideTimer +_08029EE8: .4byte gBattlescriptCurrInstr thumb_func_end atkCA_setforcedtarget thumb_func_start atkCB_setcharge atkCB_setcharge: @ 8029EEC push {r4,lr} - ldr r0, _08029F40 @ =gUnknown_02024C98 - ldr r3, _08029F44 @ =gPlayerMonIndex + ldr r0, _08029F40 @ =gStatuses3 + ldr r3, _08029F44 @ =gBankAttacker ldrb r1, [r3] lsls r1, 2 adds r1, r0 @@ -28264,7 +28264,7 @@ atkCB_setcharge: @ 8029EEC lsls r2, 2 orrs r0, r2 str r0, [r1] - ldr r4, _08029F48 @ =gUnknown_02024CA8 + ldr r4, _08029F48 @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -28288,7 +28288,7 @@ atkCB_setcharge: @ 8029EEC movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x12] - ldr r1, _08029F4C @ =gUnknown_02024C10 + ldr r1, _08029F4C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28296,21 +28296,21 @@ atkCB_setcharge: @ 8029EEC pop {r0} bx r0 .align 2, 0 -_08029F40: .4byte gUnknown_02024C98 -_08029F44: .4byte gPlayerMonIndex -_08029F48: .4byte gUnknown_02024CA8 -_08029F4C: .4byte gUnknown_02024C10 +_08029F40: .4byte gStatuses3 +_08029F44: .4byte gBankAttacker +_08029F48: .4byte gDisableStructs +_08029F4C: .4byte gBattlescriptCurrInstr thumb_func_end atkCB_setcharge thumb_func_start atkCC_callterrainattack atkCC_callterrainattack: @ 8029F50 push {r4,lr} - ldr r2, _08029FA0 @ =gUnknown_02024C6C + ldr r2, _08029FA0 @ =gHitMarker ldr r0, [r2] ldr r1, _08029FA4 @ =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, _08029FA8 @ =gUnknown_02024BE6 + ldr r4, _08029FA8 @ =gCurrentMove ldr r1, _08029FAC @ =gNaturePowerMoves ldr r0, _08029FB0 @ =gBattleTerrain ldrb r0, [r0] @@ -28321,7 +28321,7 @@ atkCC_callterrainattack: @ 8029F50 ldrh r0, [r4] movs r1, 0 bl sub_801B5C0 - ldr r1, _08029FB4 @ =gEnemyMonIndex + ldr r1, _08029FB4 @ =gBankTarget strb r0, [r1] ldr r3, _08029FB8 @ =gUnknown_081D6BBC ldr r2, _08029FBC @ =gBattleMoves @@ -28335,7 +28335,7 @@ atkCC_callterrainattack: @ 8029F50 adds r0, r3 ldr r0, [r0] bl b_movescr_stack_push - ldr r1, _08029FC0 @ =gUnknown_02024C10 + ldr r1, _08029FC0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28343,15 +28343,15 @@ atkCC_callterrainattack: @ 8029F50 pop {r0} bx r0 .align 2, 0 -_08029FA0: .4byte gUnknown_02024C6C +_08029FA0: .4byte gHitMarker _08029FA4: .4byte 0xfffffbff -_08029FA8: .4byte gUnknown_02024BE6 +_08029FA8: .4byte gCurrentMove _08029FAC: .4byte gNaturePowerMoves _08029FB0: .4byte gBattleTerrain -_08029FB4: .4byte gEnemyMonIndex +_08029FB4: .4byte gBankTarget _08029FB8: .4byte gUnknown_081D6BBC _08029FBC: .4byte gBattleMoves -_08029FC0: .4byte gUnknown_02024C10 +_08029FC0: .4byte gBattlescriptCurrInstr thumb_func_end atkCC_callterrainattack thumb_func_start atkCD_cureifburnedparalysedorpoisoned @@ -28359,7 +28359,7 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8029FC4 push {r4-r6,lr} sub sp, 0x4 ldr r1, _0802A010 @ =gBattleMons - ldr r3, _0802A014 @ =gPlayerMonIndex + ldr r3, _0802A014 @ =gBankAttacker ldrb r0, [r3] movs r6, 0x58 muls r0, r6 @@ -28373,11 +28373,11 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8029FC4 beq _0802A020 movs r0, 0 str r0, [r2] - ldr r1, _0802A018 @ =gUnknown_02024C10 + ldr r1, _0802A018 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r4, _0802A01C @ =gUnknown_02024A60 + ldr r4, _0802A01C @ =gActiveBank ldrb r0, [r3] strb r0, [r4] ldrb r0, [r4] @@ -28388,17 +28388,17 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8029FC4 movs r1, 0x28 movs r2, 0 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution b _0802A03A .align 2, 0 _0802A010: .4byte gBattleMons -_0802A014: .4byte gPlayerMonIndex -_0802A018: .4byte gUnknown_02024C10 -_0802A01C: .4byte gUnknown_02024A60 +_0802A014: .4byte gBankAttacker +_0802A018: .4byte gBattlescriptCurrInstr +_0802A01C: .4byte gActiveBank _0802A020: - ldr r3, _0802A044 @ =gUnknown_02024C10 + ldr r3, _0802A044 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28417,14 +28417,14 @@ _0802A03A: pop {r0} bx r0 .align 2, 0 -_0802A044: .4byte gUnknown_02024C10 +_0802A044: .4byte gBattlescriptCurrInstr thumb_func_end atkCD_cureifburnedparalysedorpoisoned thumb_func_start atkCE_settorment atkCE_settorment: @ 802A048 push {lr} ldr r1, _0802A080 @ =gBattleMons - ldr r0, _0802A084 @ =gEnemyMonIndex + ldr r0, _0802A084 @ =gBankTarget ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -28435,7 +28435,7 @@ atkCE_settorment: @ 802A048 lsls r2, 24 cmp r1, 0 bge _0802A08C - ldr r3, _0802A088 @ =gUnknown_02024C10 + ldr r3, _0802A088 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28451,12 +28451,12 @@ atkCE_settorment: @ 802A048 b _0802A098 .align 2, 0 _0802A080: .4byte gBattleMons -_0802A084: .4byte gEnemyMonIndex -_0802A088: .4byte gUnknown_02024C10 +_0802A084: .4byte gBankTarget +_0802A088: .4byte gBattlescriptCurrInstr _0802A08C: orrs r1, r2 str r1, [r0] - ldr r1, _0802A09C @ =gUnknown_02024C10 + ldr r1, _0802A09C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28464,14 +28464,14 @@ _0802A098: pop {r0} bx r0 .align 2, 0 -_0802A09C: .4byte gUnknown_02024C10 +_0802A09C: .4byte gBattlescriptCurrInstr thumb_func_end atkCE_settorment thumb_func_start atkCF_jumpifnodamage atkCF_jumpifnodamage: @ 802A0A0 push {lr} - ldr r2, _0802A0CC @ =gUnknown_02024D28 - ldr r0, _0802A0D0 @ =gPlayerMonIndex + ldr r2, _0802A0CC @ =gProtectStructs + ldr r0, _0802A0D0 @ =gBankAttacker ldrb r0, [r0] lsls r1, r0, 4 adds r0, r2, 0x4 @@ -28486,17 +28486,17 @@ atkCF_jumpifnodamage: @ 802A0A0 cmp r0, 0 beq _0802A0D8 _0802A0C0: - ldr r1, _0802A0D4 @ =gUnknown_02024C10 + ldr r1, _0802A0D4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802A0F2 .align 2, 0 -_0802A0CC: .4byte gUnknown_02024D28 -_0802A0D0: .4byte gPlayerMonIndex -_0802A0D4: .4byte gUnknown_02024C10 +_0802A0CC: .4byte gProtectStructs +_0802A0D0: .4byte gBankAttacker +_0802A0D4: .4byte gBattlescriptCurrInstr _0802A0D8: - ldr r3, _0802A0F8 @ =gUnknown_02024C10 + ldr r3, _0802A0F8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28513,14 +28513,14 @@ _0802A0F2: pop {r0} bx r0 .align 2, 0 -_0802A0F8: .4byte gUnknown_02024C10 +_0802A0F8: .4byte gBattlescriptCurrInstr thumb_func_end atkCF_jumpifnodamage thumb_func_start atkD0_settaunt atkD0_settaunt: @ 802A0FC push {r4,lr} - ldr r4, _0802A140 @ =gUnknown_02024CA8 - ldr r3, _0802A144 @ =gEnemyMonIndex + ldr r4, _0802A140 @ =gDisableStructs + ldr r3, _0802A144 @ =gBankTarget ldrb r0, [r3] lsls r1, r0, 3 subs r1, r0 @@ -28547,17 +28547,17 @@ atkD0_settaunt: @ 802A0FC movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x13] - ldr r1, _0802A148 @ =gUnknown_02024C10 + ldr r1, _0802A148 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802A166 .align 2, 0 -_0802A140: .4byte gUnknown_02024CA8 -_0802A144: .4byte gEnemyMonIndex -_0802A148: .4byte gUnknown_02024C10 +_0802A140: .4byte gDisableStructs +_0802A144: .4byte gBankTarget +_0802A148: .4byte gBattlescriptCurrInstr _0802A14C: - ldr r3, _0802A16C @ =gUnknown_02024C10 + ldr r3, _0802A16C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28575,21 +28575,21 @@ _0802A166: pop {r0} bx r0 .align 2, 0 -_0802A16C: .4byte gUnknown_02024C10 +_0802A16C: .4byte gBattlescriptCurrInstr thumb_func_end atkD0_settaunt thumb_func_start sub_802A170 sub_802A170: @ 802A170 push {r4,lr} - ldr r4, _0802A1D8 @ =gPlayerMonIndex + ldr r4, _0802A1D8 @ =gBankAttacker ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r3, _0802A1DC @ =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r3, _0802A1DC @ =gBankTarget strb r0, [r3] ldr r0, _0802A1E0 @ =gBattleTypeFlags ldrh r1, [r0] @@ -28597,7 +28597,7 @@ sub_802A170: @ 802A170 ands r0, r1 cmp r0, 0 beq _0802A1F4 - ldr r0, _0802A1E4 @ =gUnknown_02024C0C + ldr r0, _0802A1E4 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _0802A1E8 @ =gBitTable ldrb r3, [r3] @@ -28607,7 +28607,7 @@ sub_802A170: @ 802A170 ands r1, r0 cmp r1, 0 bne _0802A1F4 - ldr r1, _0802A1EC @ =gUnknown_02024D28 + ldr r1, _0802A1EC @ =gProtectStructs ldrb r0, [r4] lsls r0, 4 adds r0, r1 @@ -28624,21 +28624,21 @@ sub_802A170: @ 802A170 movs r0, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, _0802A1F0 @ =gUnknown_02024C10 + ldr r1, _0802A1F0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802A20E .align 2, 0 -_0802A1D8: .4byte gPlayerMonIndex -_0802A1DC: .4byte gEnemyMonIndex +_0802A1D8: .4byte gBankAttacker +_0802A1DC: .4byte gBankTarget _0802A1E0: .4byte gBattleTypeFlags -_0802A1E4: .4byte gUnknown_02024C0C +_0802A1E4: .4byte gAbsentBankFlags _0802A1E8: .4byte gBitTable -_0802A1EC: .4byte gUnknown_02024D28 -_0802A1F0: .4byte gUnknown_02024C10 +_0802A1EC: .4byte gProtectStructs +_0802A1F0: .4byte gBattlescriptCurrInstr _0802A1F4: - ldr r3, _0802A214 @ =gUnknown_02024C10 + ldr r3, _0802A214 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28656,7 +28656,7 @@ _0802A20E: pop {r0} bx r0 .align 2, 0 -_0802A214: .4byte gUnknown_02024C10 +_0802A214: .4byte gBattlescriptCurrInstr thumb_func_end sub_802A170 thumb_func_start sub_802A218 @@ -28667,9 +28667,9 @@ sub_802A218: @ 802A218 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _0802A30C @ =gPlayerMonIndex + ldr r0, _0802A30C @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -28687,9 +28687,9 @@ sub_802A218: @ 802A218 cmp r1, r0 bne _0802A2EE _0802A24C: - ldr r4, _0802A30C @ =gPlayerMonIndex + ldr r4, _0802A30C @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 ldr r0, _0802A310 @ =gBattleTypeFlags @@ -28704,12 +28704,12 @@ _0802A24C: lsls r0, 3 cmp r1, r0 beq _0802A290 - ldr r0, _0802A31C @ =gUnknown_02024DBC + ldr r0, _0802A31C @ =gWishFutureKnock adds r0, 0x29 adds r0, r2, r0 ldrb r1, [r0] ldr r3, _0802A320 @ =gBitTable - ldr r2, _0802A324 @ =gUnknown_02024A6A + ldr r2, _0802A324 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r2 @@ -28723,7 +28723,7 @@ _0802A24C: _0802A290: ldr r0, _0802A328 @ =gBattleMons mov r9, r0 - ldr r1, _0802A30C @ =gPlayerMonIndex + ldr r1, _0802A30C @ =gBankAttacker ldrb r4, [r1] movs r2, 0x58 mov r8, r2 @@ -28735,7 +28735,7 @@ _0802A290: adds r1, r3, 0 cmp r1, 0 bne _0802A2BE - ldr r0, _0802A32C @ =gEnemyMonIndex + ldr r0, _0802A32C @ =gBankTarget ldrb r0, [r0] mov r2, r8 muls r2, r0 @@ -28747,7 +28747,7 @@ _0802A290: _0802A2BE: cmp r1, 0xAF beq _0802A2EE - ldr r7, _0802A32C @ =gEnemyMonIndex + ldr r7, _0802A32C @ =gBankTarget ldrb r0, [r7] mov r1, r8 muls r1, r0 @@ -28770,7 +28770,7 @@ _0802A2BE: cmp r0, 0xB bhi _0802A334 _0802A2EE: - ldr r3, _0802A330 @ =gUnknown_02024C10 + ldr r3, _0802A330 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28785,26 +28785,26 @@ _0802A2EE: str r1, [r3] b _0802A49A .align 2, 0 -_0802A30C: .4byte gPlayerMonIndex +_0802A30C: .4byte gBankAttacker _0802A310: .4byte gBattleTypeFlags _0802A314: .4byte 0x00000902 _0802A318: .4byte gTrainerBattleOpponent -_0802A31C: .4byte gUnknown_02024DBC +_0802A31C: .4byte gWishFutureKnock _0802A320: .4byte gBitTable -_0802A324: .4byte gUnknown_02024A6A +_0802A324: .4byte gBattlePartyID _0802A328: .4byte gBattleMons -_0802A32C: .4byte gEnemyMonIndex -_0802A330: .4byte gUnknown_02024C10 +_0802A32C: .4byte gBankTarget +_0802A330: .4byte gBattlescriptCurrInstr _0802A334: adds r0, r2, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x3C bne _0802A36C - ldr r1, _0802A360 @ =gUnknown_02024C10 - ldr r0, _0802A364 @ =gUnknown_081D9913 + ldr r1, _0802A360 @ =gBattlescriptCurrInstr + ldr r0, _0802A364 @ =BattleScript_NoItemSteal str r0, [r1] - ldr r1, _0802A368 @ =byte_2024C06 + ldr r1, _0802A368 @ =gLastUsedAbility ldrb r0, [r7] mov r2, r8 muls r2, r0 @@ -28818,9 +28818,9 @@ _0802A334: bl sub_81074C4 b _0802A49A .align 2, 0 -_0802A360: .4byte gUnknown_02024C10 -_0802A364: .4byte gUnknown_081D9913 -_0802A368: .4byte byte_2024C06 +_0802A360: .4byte gBattlescriptCurrInstr +_0802A364: .4byte BattleScript_NoItemSteal +_0802A368: .4byte gLastUsedAbility _0802A36C: lsls r0, r4, 1 ldr r4, _0802A458 @ =0x020160f0 @@ -28828,7 +28828,7 @@ _0802A36C: ldrh r5, [r5, 0x2E] mov r10, r5 strh r1, [r6] - ldr r3, _0802A45C @ =gPlayerMonIndex + ldr r3, _0802A45C @ =gBankAttacker ldrb r0, [r3] mov r1, r8 muls r1, r0 @@ -28843,8 +28843,8 @@ _0802A36C: add r0, r9 mov r3, r10 strh r3, [r0, 0x2E] - ldr r5, _0802A460 @ =gUnknown_02024A60 - ldr r1, _0802A45C @ =gPlayerMonIndex + ldr r5, _0802A460 @ =gActiveBank + ldr r1, _0802A45C @ =gBankAttacker ldrb r0, [r1] strb r0, [r5] str r6, [sp] @@ -28852,10 +28852,10 @@ _0802A36C: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl dp01_build_cmdbuf_x02_a_b_varargs - ldr r2, _0802A45C @ =gPlayerMonIndex + bl EmitSetAttributes + ldr r2, _0802A45C @ =gBankAttacker ldrb r0, [r2] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldrb r0, [r7] strb r0, [r5] ldrb r0, [r7] @@ -28870,9 +28870,9 @@ _0802A36C: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r7] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution ldr r0, _0802A464 @ =0xfffe9f10 adds r4, r0 ldrb r0, [r7] @@ -28889,7 +28889,7 @@ _0802A36C: adds r0, r4 movs r3, 0 strb r3, [r0] - ldr r3, _0802A45C @ =gPlayerMonIndex + ldr r3, _0802A45C @ =gBankAttacker ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -28901,11 +28901,11 @@ _0802A36C: adds r0, r1 adds r0, r4 strb r2, [r0] - ldr r1, _0802A470 @ =gUnknown_02024C10 + ldr r1, _0802A470 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r1, _0802A474 @ =gUnknown_030041C0 + ldr r1, _0802A474 @ =gBattleTextBuff1 movs r3, 0xFD strb r3, [r1] movs r2, 0xA @@ -28917,7 +28917,7 @@ _0802A36C: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0802A478 @ =gUnknown_03004290 + ldr r1, _0802A478 @ =gBattleTextBuff2 strb r3, [r1] strb r2, [r1, 0x1] mov r3, r10 @@ -28933,32 +28933,32 @@ _0802A36C: ldrh r0, [r6] cmp r0, 0 beq _0802A494 - ldr r1, _0802A47C @ =gUnknown_02024D1E + ldr r1, _0802A47C @ =gBattleCommunication movs r0, 0x2 b _0802A498 .align 2, 0 _0802A458: .4byte 0x020160f0 -_0802A45C: .4byte gPlayerMonIndex -_0802A460: .4byte gUnknown_02024A60 +_0802A45C: .4byte gBankAttacker +_0802A460: .4byte gActiveBank _0802A464: .4byte 0xfffe9f10 _0802A468: .4byte 0x000160e8 _0802A46C: .4byte 0x000160e9 -_0802A470: .4byte gUnknown_02024C10 -_0802A474: .4byte gUnknown_030041C0 -_0802A478: .4byte gUnknown_03004290 -_0802A47C: .4byte gUnknown_02024D1E +_0802A470: .4byte gBattlescriptCurrInstr +_0802A474: .4byte gBattleTextBuff1 +_0802A478: .4byte gBattleTextBuff2 +_0802A47C: .4byte gBattleCommunication _0802A480: ldrh r0, [r6] cmp r0, 0 beq _0802A494 - ldr r0, _0802A490 @ =gUnknown_02024D1E + ldr r0, _0802A490 @ =gBattleCommunication movs r3, 0 strb r3, [r0, 0x5] b _0802A49A .align 2, 0 -_0802A490: .4byte gUnknown_02024D1E +_0802A490: .4byte gBattleCommunication _0802A494: - ldr r1, _0802A4AC @ =gUnknown_02024D1E + ldr r1, _0802A4AC @ =gBattleCommunication movs r0, 0x1 _0802A498: strb r0, [r1, 0x5] @@ -28972,14 +28972,14 @@ _0802A49A: pop {r0} bx r0 .align 2, 0 -_0802A4AC: .4byte gUnknown_02024D1E +_0802A4AC: .4byte gBattleCommunication thumb_func_end sub_802A218 thumb_func_start sub_802A4B0 sub_802A4B0: @ 802A4B0 push {r4,lr} ldr r3, _0802A4F0 @ =gBattleMons - ldr r4, _0802A4F4 @ =gEnemyMonIndex + ldr r4, _0802A4F4 @ =gBankTarget ldrb r0, [r4] movs r2, 0x58 muls r0, r2 @@ -28991,32 +28991,32 @@ sub_802A4B0: @ 802A4B0 beq _0802A504 cmp r0, 0x19 beq _0802A504 - ldr r0, _0802A4F8 @ =gPlayerMonIndex + ldr r0, _0802A4F8 @ =gBankAttacker ldrb r0, [r0] muls r0, r2 adds r0, r3 adds r0, 0x20 strb r1, [r0] - ldr r1, _0802A4FC @ =byte_2024C06 + ldr r1, _0802A4FC @ =gLastUsedAbility ldrb r0, [r4] muls r0, r2 adds r0, r3 adds r0, 0x20 ldrb r0, [r0] strb r0, [r1] - ldr r1, _0802A500 @ =gUnknown_02024C10 + ldr r1, _0802A500 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802A51E .align 2, 0 _0802A4F0: .4byte gBattleMons -_0802A4F4: .4byte gEnemyMonIndex -_0802A4F8: .4byte gPlayerMonIndex -_0802A4FC: .4byte byte_2024C06 -_0802A500: .4byte gUnknown_02024C10 +_0802A4F4: .4byte gBankTarget +_0802A4F8: .4byte gBankAttacker +_0802A4FC: .4byte gLastUsedAbility +_0802A500: .4byte gBattlescriptCurrInstr _0802A504: - ldr r3, _0802A524 @ =gUnknown_02024C10 + ldr r3, _0802A524 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29034,13 +29034,13 @@ _0802A51E: pop {r0} bx r0 .align 2, 0 -_0802A524: .4byte gUnknown_02024C10 +_0802A524: .4byte gBattlescriptCurrInstr thumb_func_end sub_802A4B0 thumb_func_start atkD4_802C408 atkD4_802C408: @ 802A528 push {r4-r7,lr} - ldr r7, _0802A53C @ =gUnknown_02024C10 + ldr r7, _0802A53C @ =gBattlescriptCurrInstr ldr r2, [r7] ldrb r3, [r2, 0x1] cmp r3, 0 @@ -29049,10 +29049,10 @@ atkD4_802C408: @ 802A528 beq _0802A578 b _0802A5F4 .align 2, 0 -_0802A53C: .4byte gUnknown_02024C10 +_0802A53C: .4byte gBattlescriptCurrInstr _0802A540: - ldr r1, _0802A56C @ =gUnknown_02024DBC - ldr r4, _0802A570 @ =gPlayerMonIndex + ldr r1, _0802A56C @ =gWishFutureKnock + ldr r4, _0802A570 @ =gBankAttacker adds r0, r1, 0 adds r0, 0x20 ldrb r5, [r4] @@ -29065,7 +29065,7 @@ _0802A540: ldrb r0, [r4] adds r1, 0x24 adds r1, r0, r1 - ldr r2, _0802A574 @ =gUnknown_02024A6A + ldr r2, _0802A574 @ =gBattlePartyID lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -29074,19 +29074,19 @@ _0802A540: adds r0, 0x6 b _0802A5F2 .align 2, 0 -_0802A56C: .4byte gUnknown_02024DBC -_0802A570: .4byte gPlayerMonIndex -_0802A574: .4byte gUnknown_02024A6A +_0802A56C: .4byte gWishFutureKnock +_0802A570: .4byte gBankAttacker +_0802A574: .4byte gBattlePartyID _0802A578: - ldr r1, _0802A5DC @ =gUnknown_030041C0 + ldr r1, _0802A5DC @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r4, _0802A5E0 @ =gEnemyMonIndex + ldr r4, _0802A5E0 @ =gBankTarget ldrb r0, [r4] strb r0, [r1, 0x2] - ldr r0, _0802A5E4 @ =gUnknown_02024DBC + ldr r0, _0802A5E4 @ =gWishFutureKnock adds r0, 0x24 ldrb r5, [r4] adds r0, r5 @@ -29131,9 +29131,9 @@ _0802A5C4: str r1, [r7] b _0802A5F4 .align 2, 0 -_0802A5DC: .4byte gUnknown_030041C0 -_0802A5E0: .4byte gEnemyMonIndex -_0802A5E4: .4byte gUnknown_02024DBC +_0802A5DC: .4byte gBattleTextBuff1 +_0802A5E0: .4byte gBankTarget +_0802A5E4: .4byte gWishFutureKnock _0802A5E8: .4byte gBattleMoveDamage _0802A5EC: .4byte gBattleMons _0802A5F0: @@ -29149,8 +29149,8 @@ _0802A5F4: thumb_func_start sub_802A5FC sub_802A5FC: @ 802A5FC push {lr} - ldr r1, _0802A634 @ =gUnknown_02024C98 - ldr r0, _0802A638 @ =gPlayerMonIndex + ldr r1, _0802A634 @ =gStatuses3 + ldr r0, _0802A638 @ =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -29161,7 +29161,7 @@ sub_802A5FC: @ 802A5FC ands r0, r3 cmp r0, 0 beq _0802A640 - ldr r3, _0802A63C @ =gUnknown_02024C10 + ldr r3, _0802A63C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29176,13 +29176,13 @@ sub_802A5FC: @ 802A5FC str r1, [r3] b _0802A64C .align 2, 0 -_0802A634: .4byte gUnknown_02024C98 -_0802A638: .4byte gPlayerMonIndex -_0802A63C: .4byte gUnknown_02024C10 +_0802A634: .4byte gStatuses3 +_0802A638: .4byte gBankAttacker +_0802A63C: .4byte gBattlescriptCurrInstr _0802A640: orrs r1, r3 str r1, [r2] - ldr r1, _0802A650 @ =gUnknown_02024C10 + ldr r1, _0802A650 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29190,14 +29190,14 @@ _0802A64C: pop {r0} bx r0 .align 2, 0 -_0802A650: .4byte gUnknown_02024C10 +_0802A650: .4byte gBattlescriptCurrInstr thumb_func_end sub_802A5FC thumb_func_start atkD6_doubledamagedealtifdamaged atkD6_doubledamagedealtifdamaged: @ 802A654 push {lr} - ldr r3, _0802A6A4 @ =gUnknown_02024D28 - ldr r0, _0802A6A8 @ =gPlayerMonIndex + ldr r3, _0802A6A4 @ =gProtectStructs + ldr r0, _0802A6A8 @ =gBankAttacker ldrb r0, [r0] lsls r2, r0, 4 adds r0, r3, 0x4 @@ -29206,7 +29206,7 @@ atkD6_doubledamagedealtifdamaged: @ 802A654 cmp r0, 0 beq _0802A674 adds r0, r2, r3 - ldr r1, _0802A6AC @ =gEnemyMonIndex + ldr r1, _0802A6AC @ =gBankTarget ldrb r0, [r0, 0xC] ldrb r1, [r1] cmp r0, r1 @@ -29219,7 +29219,7 @@ _0802A674: cmp r0, 0 beq _0802A696 adds r0, r2, r3 - ldr r1, _0802A6AC @ =gEnemyMonIndex + ldr r1, _0802A6AC @ =gBankTarget ldrb r0, [r0, 0xD] ldrb r1, [r1] cmp r0, r1 @@ -29231,26 +29231,26 @@ _0802A68C: movs r1, 0x2 strb r1, [r0] _0802A696: - ldr r1, _0802A6B8 @ =gUnknown_02024C10 + ldr r1, _0802A6B8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0802A6A4: .4byte gUnknown_02024D28 -_0802A6A8: .4byte gPlayerMonIndex -_0802A6AC: .4byte gEnemyMonIndex +_0802A6A4: .4byte gProtectStructs +_0802A6A8: .4byte gBankAttacker +_0802A6AC: .4byte gBankTarget _0802A6B0: .4byte 0x02000000 _0802A6B4: .4byte 0x0001601f -_0802A6B8: .4byte gUnknown_02024C10 +_0802A6B8: .4byte gBattlescriptCurrInstr thumb_func_end atkD6_doubledamagedealtifdamaged thumb_func_start sub_802A6BC sub_802A6BC: @ 802A6BC push {r4,lr} - ldr r1, _0802A700 @ =gUnknown_02024C98 - ldr r0, _0802A704 @ =gEnemyMonIndex + ldr r1, _0802A700 @ =gStatuses3 + ldr r0, _0802A704 @ =gBankTarget ldrb r3, [r0] lsls r0, r3, 2 adds r4, r0, r1 @@ -29269,7 +29269,7 @@ sub_802A6BC: @ 802A6BC cmp r0, 0 beq _0802A710 _0802A6E4: - ldr r3, _0802A70C @ =gUnknown_02024C10 + ldr r3, _0802A70C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29284,16 +29284,16 @@ _0802A6E4: str r1, [r3] b _0802A720 .align 2, 0 -_0802A700: .4byte gUnknown_02024C98 -_0802A704: .4byte gEnemyMonIndex +_0802A700: .4byte gStatuses3 +_0802A704: .4byte gBankTarget _0802A708: .4byte gBattleMons -_0802A70C: .4byte gUnknown_02024C10 +_0802A70C: .4byte gBattlescriptCurrInstr _0802A710: movs r0, 0x80 lsls r0, 5 orrs r2, r0 str r2, [r4] - ldr r1, _0802A728 @ =gUnknown_02024C10 + ldr r1, _0802A728 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29302,19 +29302,19 @@ _0802A720: pop {r0} bx r0 .align 2, 0 -_0802A728: .4byte gUnknown_02024C10 +_0802A728: .4byte gBattlescriptCurrInstr thumb_func_end sub_802A6BC thumb_func_start atkD8_setdamagetohealthdifference atkD8_setdamagetohealthdifference: @ 802A72C push {lr} ldr r2, _0802A768 @ =gBattleMons - ldr r0, _0802A76C @ =gEnemyMonIndex + ldr r0, _0802A76C @ =gBankTarget ldrb r0, [r0] movs r1, 0x58 muls r0, r1 adds r3, r0, r2 - ldr r0, _0802A770 @ =gPlayerMonIndex + ldr r0, _0802A770 @ =gBankAttacker ldrb r0, [r0] muls r0, r1 adds r1, r0, r2 @@ -29322,7 +29322,7 @@ atkD8_setdamagetohealthdifference: @ 802A72C ldrh r2, [r1, 0x28] cmp r0, r2 bhi _0802A778 - ldr r3, _0802A774 @ =gUnknown_02024C10 + ldr r3, _0802A774 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29338,16 +29338,16 @@ atkD8_setdamagetohealthdifference: @ 802A72C b _0802A78A .align 2, 0 _0802A768: .4byte gBattleMons -_0802A76C: .4byte gEnemyMonIndex -_0802A770: .4byte gPlayerMonIndex -_0802A774: .4byte gUnknown_02024C10 +_0802A76C: .4byte gBankTarget +_0802A770: .4byte gBankAttacker +_0802A774: .4byte gBattlescriptCurrInstr _0802A778: ldr r2, _0802A790 @ =gBattleMoveDamage ldrh r0, [r3, 0x28] ldrh r1, [r1, 0x28] subs r0, r1 str r0, [r2] - ldr r1, _0802A794 @ =gUnknown_02024C10 + ldr r1, _0802A794 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29356,18 +29356,18 @@ _0802A78A: bx r0 .align 2, 0 _0802A790: .4byte gBattleMoveDamage -_0802A794: .4byte gUnknown_02024C10 +_0802A794: .4byte gBattlescriptCurrInstr thumb_func_end atkD8_setdamagetohealthdifference thumb_func_start atkD9_scaledamagebyhealthratio atkD9_scaledamagebyhealthratio: @ 802A798 push {r4,lr} - ldr r4, _0802A7E4 @ =gUnknown_02024DEC + ldr r4, _0802A7E4 @ =gDynamicBasePower ldrh r0, [r4] cmp r0, 0 bne _0802A7D4 ldr r2, _0802A7E8 @ =gBattleMoves - ldr r0, _0802A7EC @ =gUnknown_02024BE6 + ldr r0, _0802A7EC @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -29375,7 +29375,7 @@ atkD9_scaledamagebyhealthratio: @ 802A798 adds r0, r2 ldrb r3, [r0, 0x1] ldr r2, _0802A7F0 @ =gBattleMons - ldr r0, _0802A7F4 @ =gPlayerMonIndex + ldr r0, _0802A7F4 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -29391,7 +29391,7 @@ atkD9_scaledamagebyhealthratio: @ 802A798 movs r0, 0x1 strh r0, [r4] _0802A7D4: - ldr r1, _0802A7F8 @ =gUnknown_02024C10 + ldr r1, _0802A7F8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -29399,19 +29399,19 @@ _0802A7D4: pop {r0} bx r0 .align 2, 0 -_0802A7E4: .4byte gUnknown_02024DEC +_0802A7E4: .4byte gDynamicBasePower _0802A7E8: .4byte gBattleMoves -_0802A7EC: .4byte gUnknown_02024BE6 +_0802A7EC: .4byte gCurrentMove _0802A7F0: .4byte gBattleMons -_0802A7F4: .4byte gPlayerMonIndex -_0802A7F8: .4byte gUnknown_02024C10 +_0802A7F4: .4byte gBankAttacker +_0802A7F8: .4byte gBattlescriptCurrInstr thumb_func_end atkD9_scaledamagebyhealthratio thumb_func_start atkDA_abilityswap atkDA_abilityswap: @ 802A7FC push {r4-r6,lr} ldr r5, _0802A860 @ =gBattleMons - ldr r0, _0802A864 @ =gPlayerMonIndex + ldr r0, _0802A864 @ =gBankAttacker ldrb r0, [r0] movs r4, 0x58 muls r0, r4 @@ -29421,7 +29421,7 @@ atkDA_abilityswap: @ 802A7FC ldrb r1, [r2] cmp r1, 0 bne _0802A824 - ldr r0, _0802A868 @ =gEnemyMonIndex + ldr r0, _0802A868 @ =gBankTarget ldrb r0, [r0] muls r0, r4 adds r0, r5 @@ -29432,7 +29432,7 @@ atkDA_abilityswap: @ 802A7FC _0802A824: cmp r1, 0x19 beq _0802A844 - ldr r6, _0802A868 @ =gEnemyMonIndex + ldr r6, _0802A868 @ =gBankTarget ldrb r0, [r6] muls r0, r4 adds r0, r5 @@ -29447,7 +29447,7 @@ _0802A824: cmp r0, 0 beq _0802A874 _0802A844: - ldr r3, _0802A870 @ =gUnknown_02024C10 + ldr r3, _0802A870 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29463,10 +29463,10 @@ _0802A844: b _0802A88A .align 2, 0 _0802A860: .4byte gBattleMons -_0802A864: .4byte gPlayerMonIndex -_0802A868: .4byte gEnemyMonIndex +_0802A864: .4byte gBankAttacker +_0802A868: .4byte gBankTarget _0802A86C: .4byte gBattleMoveFlags -_0802A870: .4byte gUnknown_02024C10 +_0802A870: .4byte gBattlescriptCurrInstr _0802A874: ldrb r1, [r2] strb r3, [r2] @@ -29475,7 +29475,7 @@ _0802A874: adds r0, r5 adds r0, 0x20 strb r1, [r0] - ldr r1, _0802A890 @ =gUnknown_02024C10 + ldr r1, _0802A890 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29484,7 +29484,7 @@ _0802A88A: pop {r0} bx r0 .align 2, 0 -_0802A890: .4byte gUnknown_02024C10 +_0802A890: .4byte gBattlescriptCurrInstr thumb_func_end atkDA_abilityswap thumb_func_start atkDB_imprisoneffect @@ -29495,8 +29495,8 @@ atkDB_imprisoneffect: @ 802A894 push {r6,r7} movs r0, 0 mov r8, r0 - ldr r1, _0802A8B8 @ =gUnknown_02024C98 - ldr r0, _0802A8BC @ =gPlayerMonIndex + ldr r1, _0802A8B8 @ =gStatuses3 + ldr r0, _0802A8BC @ =gBankAttacker ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -29508,10 +29508,10 @@ atkDB_imprisoneffect: @ 802A894 beq _0802A8E8 b _0802A95E .align 2, 0 -_0802A8B8: .4byte gUnknown_02024C98 -_0802A8BC: .4byte gPlayerMonIndex +_0802A8B8: .4byte gStatuses3 +_0802A8BC: .4byte gBankAttacker _0802A8C0: - ldr r0, _0802A8E0 @ =gUnknown_02024C98 + ldr r0, _0802A8E0 @ =gStatuses3 mov r2, r9 ldrb r1, [r2] lsls r1, 2 @@ -29521,14 +29521,14 @@ _0802A8C0: lsls r2, 6 orrs r0, r2 str r0, [r1] - ldr r1, _0802A8E4 @ =gUnknown_02024C10 + ldr r1, _0802A8E4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802A956 .align 2, 0 -_0802A8E0: .4byte gUnknown_02024C98 -_0802A8E4: .4byte gUnknown_02024C10 +_0802A8E0: .4byte gStatuses3 +_0802A8E4: .4byte gBattlescriptCurrInstr _0802A8E8: adds r0, r2, 0 bl sub_801529C @@ -29536,13 +29536,13 @@ _0802A8E8: b _0802A94E _0802A8F2: adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r8, r0 beq _0802A948 movs r4, 0 - ldr r7, _0802A984 @ =gPlayerMonIndex + ldr r7, _0802A984 @ =gBankAttacker mov r9, r7 ldr r0, _0802A988 @ =gBattleMons mov r12, r0 @@ -29587,17 +29587,17 @@ _0802A948: lsls r0, 24 lsrs r6, r0, 24 _0802A94E: - ldr r0, _0802A98C @ =gUnknown_02024A68 + ldr r0, _0802A98C @ =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bcc _0802A8F2 _0802A956: - ldr r0, _0802A98C @ =gUnknown_02024A68 + ldr r0, _0802A98C @ =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bne _0802A978 _0802A95E: - ldr r3, _0802A990 @ =gUnknown_02024C10 + ldr r3, _0802A990 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29618,17 +29618,17 @@ _0802A978: pop {r0} bx r0 .align 2, 0 -_0802A984: .4byte gPlayerMonIndex +_0802A984: .4byte gBankAttacker _0802A988: .4byte gBattleMons -_0802A98C: .4byte gUnknown_02024A68 -_0802A990: .4byte gUnknown_02024C10 +_0802A98C: .4byte gNoOfAllBanks +_0802A990: .4byte gBattlescriptCurrInstr thumb_func_end atkDB_imprisoneffect thumb_func_start atkDC_setgrudge atkDC_setgrudge: @ 802A994 push {lr} - ldr r1, _0802A9CC @ =gUnknown_02024C98 - ldr r0, _0802A9D0 @ =gPlayerMonIndex + ldr r1, _0802A9CC @ =gStatuses3 + ldr r0, _0802A9D0 @ =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -29639,7 +29639,7 @@ atkDC_setgrudge: @ 802A994 ands r0, r3 cmp r0, 0 beq _0802A9D8 - ldr r3, _0802A9D4 @ =gUnknown_02024C10 + ldr r3, _0802A9D4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29654,13 +29654,13 @@ atkDC_setgrudge: @ 802A994 str r1, [r3] b _0802A9E4 .align 2, 0 -_0802A9CC: .4byte gUnknown_02024C98 -_0802A9D0: .4byte gPlayerMonIndex -_0802A9D4: .4byte gUnknown_02024C10 +_0802A9CC: .4byte gStatuses3 +_0802A9D0: .4byte gBankAttacker +_0802A9D4: .4byte gBattlescriptCurrInstr _0802A9D8: orrs r1, r3 str r1, [r2] - ldr r1, _0802A9E8 @ =gUnknown_02024C10 + ldr r1, _0802A9E8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29668,7 +29668,7 @@ _0802A9E4: pop {r0} bx r0 .align 2, 0 -_0802A9E8: .4byte gUnknown_02024C10 +_0802A9E8: .4byte gBattlescriptCurrInstr thumb_func_end atkDC_setgrudge thumb_func_start atkDD_weightdamagecalculation @@ -29688,7 +29688,7 @@ atkDD_weightdamagecalculation: @ 802A9EC adds r7, r1, 0 adds r4, r6, 0 _0802AA08: - ldr r0, _0802AA5C @ =gEnemyMonIndex + ldr r0, _0802AA5C @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -29716,7 +29716,7 @@ _0802AA36: ldr r0, _0802AA54 @ =0x0000ffff cmp r1, r0 beq _0802AA64 - ldr r0, _0802AA60 @ =gUnknown_02024DEC + ldr r0, _0802AA60 @ =gDynamicBasePower adds r1, r5, 0x1 lsls r1, 1 adds r1, r6 @@ -29727,14 +29727,14 @@ _0802AA36: _0802AA50: .4byte gWeightDamage _0802AA54: .4byte 0x0000ffff _0802AA58: .4byte gBattleMons -_0802AA5C: .4byte gEnemyMonIndex -_0802AA60: .4byte gUnknown_02024DEC +_0802AA5C: .4byte gBankTarget +_0802AA60: .4byte gDynamicBasePower _0802AA64: - ldr r1, _0802AA7C @ =gUnknown_02024DEC + ldr r1, _0802AA7C @ =gDynamicBasePower movs r0, 0x78 strh r0, [r1] _0802AA6A: - ldr r1, _0802AA80 @ =gUnknown_02024C10 + ldr r1, _0802AA80 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -29744,8 +29744,8 @@ _0802AA6A: pop {r0} bx r0 .align 2, 0 -_0802AA7C: .4byte gUnknown_02024DEC -_0802AA80: .4byte gUnknown_02024C10 +_0802AA7C: .4byte gDynamicBasePower +_0802AA80: .4byte gBattlescriptCurrInstr thumb_func_end atkDD_weightdamagecalculation thumb_func_start atkDE_asistattackselect @@ -29758,9 +29758,9 @@ atkDE_asistattackselect: @ 802AA84 sub sp, 0x8 movs r0, 0 mov r10, r0 - ldr r0, _0802AB9C @ =gPlayerMonIndex + ldr r0, _0802AB9C @ =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 ldr r0, _0802ABA0 @ =gPlayerParty @@ -29772,8 +29772,8 @@ atkDE_asistattackselect: @ 802AA84 _0802AAAC: movs r2, 0 _0802AAAE: - ldr r1, _0802ABA8 @ =gUnknown_02024A6A - ldr r0, _0802AB9C @ =gPlayerMonIndex + ldr r1, _0802ABA8 @ =gBattlePartyID + ldr r0, _0802AB9C @ =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -29863,7 +29863,7 @@ _0802AB54: mov r1, r10 cmp r1, 0 beq _0802ABCC - ldr r2, _0802ABB8 @ =gUnknown_02024C6C + ldr r2, _0802ABB8 @ =gHitMarker ldr r0, [r2] ldr r1, _0802ABBC @ =0xfffffbff ands r0, r1 @@ -29883,28 +29883,28 @@ _0802AB54: ldrh r0, [r4] movs r1, 0 bl sub_801B5C0 - ldr r1, _0802ABC4 @ =gEnemyMonIndex + ldr r1, _0802ABC4 @ =gBankTarget strb r0, [r1] - ldr r1, _0802ABC8 @ =gUnknown_02024C10 + ldr r1, _0802ABC8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802ABE6 .align 2, 0 -_0802AB9C: .4byte gPlayerMonIndex +_0802AB9C: .4byte gBankAttacker _0802ABA0: .4byte gPlayerParty _0802ABA4: .4byte gEnemyParty -_0802ABA8: .4byte gUnknown_02024A6A +_0802ABA8: .4byte gBattlePartyID _0802ABAC: .4byte 0x0000ffff _0802ABB0: .4byte 0x02016024 _0802ABB4: .4byte gUnknown_081FACFE -_0802ABB8: .4byte gUnknown_02024C6C +_0802ABB8: .4byte gHitMarker _0802ABBC: .4byte 0xfffffbff _0802ABC0: .4byte gUnknown_02024BEA -_0802ABC4: .4byte gEnemyMonIndex -_0802ABC8: .4byte gUnknown_02024C10 +_0802ABC4: .4byte gBankTarget +_0802ABC8: .4byte gBattlescriptCurrInstr _0802ABCC: - ldr r3, _0802ABF8 @ =gUnknown_02024C10 + ldr r3, _0802ABF8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29927,17 +29927,17 @@ _0802ABE6: pop {r0} bx r0 .align 2, 0 -_0802ABF8: .4byte gUnknown_02024C10 +_0802ABF8: .4byte gBattlescriptCurrInstr thumb_func_end atkDE_asistattackselect thumb_func_start atkDF_setmagiccoat atkDF_setmagiccoat: @ 802ABFC push {lr} - ldr r1, _0802AC44 @ =gEnemyMonIndex - ldr r3, _0802AC48 @ =gPlayerMonIndex + ldr r1, _0802AC44 @ =gBankTarget + ldr r3, _0802AC48 @ =gBankAttacker ldrb r0, [r3] strb r0, [r1] - ldr r2, _0802AC4C @ =gUnknown_02024D68 + ldr r2, _0802AC4C @ =gSpecialStatuses ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -29947,14 +29947,14 @@ atkDF_setmagiccoat: @ 802ABFC movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r0, _0802AC50 @ =gUnknown_02024A7E + ldr r0, _0802AC50 @ =gCurrentMoveTurn ldrb r1, [r0] - ldr r0, _0802AC54 @ =gUnknown_02024A68 + ldr r0, _0802AC54 @ =gNoOfAllBanks ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 bne _0802AC5C - ldr r3, _0802AC58 @ =gUnknown_02024C10 + ldr r3, _0802AC58 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29969,14 +29969,14 @@ atkDF_setmagiccoat: @ 802ABFC str r1, [r3] b _0802AC74 .align 2, 0 -_0802AC44: .4byte gEnemyMonIndex -_0802AC48: .4byte gPlayerMonIndex -_0802AC4C: .4byte gUnknown_02024D68 -_0802AC50: .4byte gUnknown_02024A7E -_0802AC54: .4byte gUnknown_02024A68 -_0802AC58: .4byte gUnknown_02024C10 +_0802AC44: .4byte gBankTarget +_0802AC48: .4byte gBankAttacker +_0802AC4C: .4byte gSpecialStatuses +_0802AC50: .4byte gCurrentMoveTurn +_0802AC54: .4byte gNoOfAllBanks +_0802AC58: .4byte gBattlescriptCurrInstr _0802AC5C: - ldr r0, _0802AC78 @ =gUnknown_02024D28 + ldr r0, _0802AC78 @ =gProtectStructs ldrb r1, [r3] lsls r1, 4 adds r1, r0 @@ -29984,7 +29984,7 @@ _0802AC5C: movs r2, 0x10 orrs r0, r2 strb r0, [r1] - ldr r1, _0802AC7C @ =gUnknown_02024C10 + ldr r1, _0802AC7C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29992,15 +29992,15 @@ _0802AC74: pop {r0} bx r0 .align 2, 0 -_0802AC78: .4byte gUnknown_02024D28 -_0802AC7C: .4byte gUnknown_02024C10 +_0802AC78: .4byte gProtectStructs +_0802AC7C: .4byte gBattlescriptCurrInstr thumb_func_end atkDF_setmagiccoat thumb_func_start atkE0_setstealstatchange atkE0_setstealstatchange: @ 802AC80 push {lr} - ldr r2, _0802ACC4 @ =gUnknown_02024D68 - ldr r3, _0802ACC8 @ =gPlayerMonIndex + ldr r2, _0802ACC4 @ =gSpecialStatuses + ldr r3, _0802ACC8 @ =gBankAttacker ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -30010,14 +30010,14 @@ atkE0_setstealstatchange: @ 802AC80 movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r0, _0802ACCC @ =gUnknown_02024A7E + ldr r0, _0802ACCC @ =gCurrentMoveTurn ldrb r1, [r0] - ldr r0, _0802ACD0 @ =gUnknown_02024A68 + ldr r0, _0802ACD0 @ =gNoOfAllBanks ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 bne _0802ACD8 - ldr r3, _0802ACD4 @ =gUnknown_02024C10 + ldr r3, _0802ACD4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30032,20 +30032,20 @@ atkE0_setstealstatchange: @ 802AC80 str r1, [r3] b _0802ACEE .align 2, 0 -_0802ACC4: .4byte gUnknown_02024D68 -_0802ACC8: .4byte gPlayerMonIndex -_0802ACCC: .4byte gUnknown_02024A7E -_0802ACD0: .4byte gUnknown_02024A68 -_0802ACD4: .4byte gUnknown_02024C10 +_0802ACC4: .4byte gSpecialStatuses +_0802ACC8: .4byte gBankAttacker +_0802ACCC: .4byte gCurrentMoveTurn +_0802ACD0: .4byte gNoOfAllBanks +_0802ACD4: .4byte gBattlescriptCurrInstr _0802ACD8: - ldr r0, _0802ACF4 @ =gUnknown_02024D28 + ldr r0, _0802ACF4 @ =gProtectStructs ldrb r1, [r3] lsls r1, 4 adds r1, r0 ldrb r0, [r1] orrs r0, r2 strb r0, [r1] - ldr r1, _0802ACF8 @ =gUnknown_02024C10 + ldr r1, _0802ACF8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30053,8 +30053,8 @@ _0802ACEE: pop {r0} bx r0 .align 2, 0 -_0802ACF4: .4byte gUnknown_02024D28 -_0802ACF8: .4byte gUnknown_02024C10 +_0802ACF4: .4byte gProtectStructs +_0802ACF8: .4byte gBattlescriptCurrInstr thumb_func_end atkE0_setstealstatchange thumb_func_start atkE1_802CBE4 @@ -30068,10 +30068,10 @@ atkE1_802CBE4: @ 802ACFC adds r4, r1 strb r0, [r4] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _0802ADA8 @ =gUnknown_030041C0 + ldr r2, _0802ADA8 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r2] movs r0, 0x9 @@ -30086,8 +30086,8 @@ atkE1_802CBE4: @ 802ACFC strb r0, [r2, 0x2] movs r0, 0xFF strb r0, [r2, 0x3] - ldr r2, _0802ADB0 @ =gEnemyMonIndex - ldr r1, _0802ADB4 @ =gUnknown_02024A68 + ldr r2, _0802ADB0 @ =gBankTarget + ldr r1, _0802ADB4 @ =gNoOfAllBanks ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 @@ -30096,26 +30096,26 @@ atkE1_802CBE4: @ 802ACFC ldr r6, _0802ADB8 @ =gBitTable _0802AD44: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, r5 beq _0802AD66 - ldr r0, _0802ADBC @ =gUnknown_02024C0C + ldr r0, _0802ADBC @ =gAbsentBankFlags ldrb r1, [r0] ldrb r0, [r4] lsls r0, 2 adds r0, r6 ldr r0, [r0] ands r1, r0 - ldr r2, _0802ADB4 @ =gUnknown_02024A68 + ldr r2, _0802ADB4 @ =gNoOfAllBanks cmp r1, 0 beq _0802AD7A _0802AD66: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0802ADB4 @ =gUnknown_02024A68 + ldr r1, _0802ADB4 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 adds r2, r1, 0 @@ -30123,13 +30123,13 @@ _0802AD66: cmp r0, r1 bcc _0802AD44 _0802AD7A: - ldr r0, _0802ADB0 @ =gEnemyMonIndex + ldr r0, _0802ADB0 @ =gBankTarget ldrb r0, [r0] ldrb r2, [r2] cmp r0, r2 bcc _0802ADC4 _0802AD84: - ldr r3, _0802ADC0 @ =gUnknown_02024C10 + ldr r3, _0802ADC0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30146,15 +30146,15 @@ _0802AD84: .align 2, 0 _0802ADA0: .4byte 0x02000000 _0802ADA4: .4byte 0x000160dd -_0802ADA8: .4byte gUnknown_030041C0 +_0802ADA8: .4byte gBattleTextBuff1 _0802ADAC: .4byte gBattleMons -_0802ADB0: .4byte gEnemyMonIndex -_0802ADB4: .4byte gUnknown_02024A68 +_0802ADB0: .4byte gBankTarget +_0802ADB4: .4byte gNoOfAllBanks _0802ADB8: .4byte gBitTable -_0802ADBC: .4byte gUnknown_02024C0C -_0802ADC0: .4byte gUnknown_02024C10 +_0802ADBC: .4byte gAbsentBankFlags +_0802ADC0: .4byte gBattlescriptCurrInstr _0802ADC4: - ldr r1, _0802ADD4 @ =gUnknown_02024C10 + ldr r1, _0802ADD4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30163,18 +30163,18 @@ _0802ADCC: pop {r0} bx r0 .align 2, 0 -_0802ADD4: .4byte gUnknown_02024C10 +_0802ADD4: .4byte gBattlescriptCurrInstr thumb_func_end atkE1_802CBE4 thumb_func_start sub_802ADD8 sub_802ADD8: @ 802ADD8 push {r4-r7,lr} sub sp, 0x4 - ldr r6, _0802AE44 @ =gUnknown_02024C10 + ldr r6, _0802AE44 @ =gBattlescriptCurrInstr ldr r0, [r6] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r5, _0802AE48 @ =gUnknown_02024A60 + ldr r5, _0802AE48 @ =gActiveBank strb r0, [r5] ldr r4, _0802AE4C @ =gBattleMons ldrb r0, [r5] @@ -30208,9 +30208,9 @@ sub_802ADD8: @ 802ADD8 movs r0, 0 movs r1, 0x28 movs r3, 0x4 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution _0802AE34: ldr r0, [r6] adds r0, 0x2 @@ -30220,8 +30220,8 @@ _0802AE34: pop {r0} bx r0 .align 2, 0 -_0802AE44: .4byte gUnknown_02024C10 -_0802AE48: .4byte gUnknown_02024A60 +_0802AE44: .4byte gBattlescriptCurrInstr +_0802AE48: .4byte gActiveBank _0802AE4C: .4byte gBattleMons _0802AE50: .4byte gBitTable _0802AE54: .4byte 0x02000000 @@ -30231,11 +30231,11 @@ _0802AE58: .4byte 0x00016064 thumb_func_start atkE3_jumpiffainted atkE3_jumpiffainted: @ 802AE5C push {r4,lr} - ldr r4, _0802AE98 @ =gUnknown_02024C10 + ldr r4, _0802AE98 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8015150 - ldr r1, _0802AE9C @ =gUnknown_02024A60 + ldr r1, _0802AE9C @ =gActiveBank strb r0, [r1] ldr r2, _0802AEA0 @ =gBattleMons ldrb r1, [r1] @@ -30259,8 +30259,8 @@ atkE3_jumpiffainted: @ 802AE5C str r1, [r4] b _0802AEAA .align 2, 0 -_0802AE98: .4byte gUnknown_02024C10 -_0802AE9C: .4byte gUnknown_02024A60 +_0802AE98: .4byte gBattlescriptCurrInstr +_0802AE9C: .4byte gActiveBank _0802AEA0: .4byte gBattleMons _0802AEA4: ldr r0, [r4] @@ -30298,67 +30298,67 @@ _0802AECC: .4byte _0802AF34 .4byte _0802AF40 _0802AEEC: - ldr r1, _0802AEF4 @ =gUnknown_02024D1E + ldr r1, _0802AEF4 @ =gBattleCommunication movs r0, 0x2 b _0802AF50 .align 2, 0 -_0802AEF4: .4byte gUnknown_02024D1E +_0802AEF4: .4byte gBattleCommunication _0802AEF8: - ldr r1, _0802AF00 @ =gUnknown_02024D1E + ldr r1, _0802AF00 @ =gBattleCommunication movs r0, 0x1 b _0802AF50 .align 2, 0 -_0802AF00: .4byte gUnknown_02024D1E +_0802AF00: .4byte gBattleCommunication _0802AF04: - ldr r1, _0802AF0C @ =gUnknown_02024D1E + ldr r1, _0802AF0C @ =gBattleCommunication movs r0, 0x1B b _0802AF50 .align 2, 0 -_0802AF0C: .4byte gUnknown_02024D1E +_0802AF0C: .4byte gBattleCommunication _0802AF10: - ldr r1, _0802AF18 @ =gUnknown_02024D1E + ldr r1, _0802AF18 @ =gBattleCommunication movs r0, 0x17 b _0802AF50 .align 2, 0 -_0802AF18: .4byte gUnknown_02024D1E +_0802AF18: .4byte gBattleCommunication _0802AF1C: - ldr r1, _0802AF24 @ =gUnknown_02024D1E + ldr r1, _0802AF24 @ =gBattleCommunication movs r0, 0x16 b _0802AF50 .align 2, 0 -_0802AF24: .4byte gUnknown_02024D1E +_0802AF24: .4byte gBattleCommunication _0802AF28: - ldr r1, _0802AF30 @ =gUnknown_02024D1E + ldr r1, _0802AF30 @ =gBattleCommunication movs r0, 0x18 b _0802AF50 .align 2, 0 -_0802AF30: .4byte gUnknown_02024D1E +_0802AF30: .4byte gBattleCommunication _0802AF34: - ldr r1, _0802AF3C @ =gUnknown_02024D1E + ldr r1, _0802AF3C @ =gBattleCommunication movs r0, 0x7 b _0802AF50 .align 2, 0 -_0802AF3C: .4byte gUnknown_02024D1E +_0802AF3C: .4byte gBattleCommunication _0802AF40: - ldr r1, _0802AF48 @ =gUnknown_02024D1E + ldr r1, _0802AF48 @ =gBattleCommunication movs r0, 0x8 b _0802AF50 .align 2, 0 -_0802AF48: .4byte gUnknown_02024D1E +_0802AF48: .4byte gBattleCommunication _0802AF4C: - ldr r1, _0802AF60 @ =gUnknown_02024D1E + ldr r1, _0802AF60 @ =gBattleCommunication movs r0, 0x5 _0802AF50: strb r0, [r1, 0x3] - ldr r1, _0802AF64 @ =gUnknown_02024C10 + ldr r1, _0802AF64 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0802AF60: .4byte gUnknown_02024D1E -_0802AF64: .4byte gUnknown_02024C10 +_0802AF60: .4byte gBattleCommunication +_0802AF64: .4byte gBattlescriptCurrInstr thumb_func_end sub_802AEB0 thumb_func_start sub_802AF68 @@ -30463,7 +30463,7 @@ _0802B032: adds r7, r4, 0 cmp r7, 0x5 ble _0802AF7A - ldr r1, _0802B050 @ =gUnknown_02024C10 + ldr r1, _0802B050 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -30475,13 +30475,13 @@ _0802B032: bx r0 .align 2, 0 _0802B04C: .4byte gPlayerParty -_0802B050: .4byte gUnknown_02024C10 +_0802B050: .4byte gBattlescriptCurrInstr thumb_func_end sub_802AF68 thumb_func_start atkE6_castform_transform atkE6_castform_transform: @ 802B054 push {r4,lr} - ldr r4, _0802B0A8 @ =gUnknown_02024A60 + ldr r4, _0802B0A8 @ =gActiveBank ldr r3, _0802B0AC @ =0x02000000 ldr r1, _0802B0B0 @ =0x00016003 adds r0, r3, r1 @@ -30511,10 +30511,10 @@ _0802B086: ldrb r2, [r0] movs r0, 0 movs r1, 0 - bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim + bl EmitBattleAnimation ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0802B0BC @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _0802B0BC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -30522,18 +30522,18 @@ _0802B086: pop {r0} bx r0 .align 2, 0 -_0802B0A8: .4byte gUnknown_02024A60 +_0802B0A8: .4byte gActiveBank _0802B0AC: .4byte 0x02000000 _0802B0B0: .4byte 0x00016003 _0802B0B4: .4byte gBattleMons _0802B0B8: .4byte 0x0001609b -_0802B0BC: .4byte gUnknown_02024C10 +_0802B0BC: .4byte gBattlescriptCurrInstr thumb_func_end atkE6_castform_transform thumb_func_start atkE7_castform_switch atkE7_castform_switch: @ 802B0C0 push {r4,r5,lr} - ldr r1, _0802B0F4 @ =gUnknown_02024C10 + ldr r1, _0802B0F4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -30557,7 +30557,7 @@ _0802B0EC: pop {r0} bx r0 .align 2, 0 -_0802B0F4: .4byte gUnknown_02024C10 +_0802B0F4: .4byte gBattlescriptCurrInstr _0802B0F8: .4byte 0x02000000 _0802B0FC: .4byte 0x00016003 _0802B100: .4byte gUnknown_081D977D @@ -30569,7 +30569,7 @@ atkE8_settypebasedhalvers: @ 802B108 push {r4,lr} movs r4, 0 ldr r2, _0802B144 @ =gBattleMoves - ldr r0, _0802B148 @ =gUnknown_02024BE6 + ldr r0, _0802B148 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -30578,8 +30578,8 @@ atkE8_settypebasedhalvers: @ 802B108 ldrb r0, [r0] cmp r0, 0xC9 bne _0802B158 - ldr r1, _0802B14C @ =gUnknown_02024C98 - ldr r0, _0802B150 @ =gPlayerMonIndex + ldr r1, _0802B14C @ =gStatuses3 + ldr r0, _0802B150 @ =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -30592,18 +30592,18 @@ atkE8_settypebasedhalvers: @ 802B108 bne _0802B17C orrs r1, r3 str r1, [r2] - ldr r0, _0802B154 @ =gUnknown_02024D1E + ldr r0, _0802B154 @ =gBattleCommunication strb r4, [r0, 0x5] b _0802B180 .align 2, 0 _0802B144: .4byte gBattleMoves -_0802B148: .4byte gUnknown_02024BE6 -_0802B14C: .4byte gUnknown_02024C98 -_0802B150: .4byte gPlayerMonIndex -_0802B154: .4byte gUnknown_02024D1E +_0802B148: .4byte gCurrentMove +_0802B14C: .4byte gStatuses3 +_0802B150: .4byte gBankAttacker +_0802B154: .4byte gBattleCommunication _0802B158: - ldr r1, _0802B18C @ =gUnknown_02024C98 - ldr r0, _0802B190 @ =gPlayerMonIndex + ldr r1, _0802B18C @ =gStatuses3 + ldr r0, _0802B190 @ =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -30616,7 +30616,7 @@ _0802B158: bne _0802B17C orrs r1, r3 str r1, [r2] - ldr r1, _0802B194 @ =gUnknown_02024D1E + ldr r1, _0802B194 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] movs r4, 0x1 @@ -30624,18 +30624,18 @@ _0802B17C: cmp r4, 0 beq _0802B19C _0802B180: - ldr r1, _0802B198 @ =gUnknown_02024C10 + ldr r1, _0802B198 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802B1B6 .align 2, 0 -_0802B18C: .4byte gUnknown_02024C98 -_0802B190: .4byte gPlayerMonIndex -_0802B194: .4byte gUnknown_02024D1E -_0802B198: .4byte gUnknown_02024C10 +_0802B18C: .4byte gStatuses3 +_0802B190: .4byte gBankAttacker +_0802B194: .4byte gBattleCommunication +_0802B198: .4byte gBattlescriptCurrInstr _0802B19C: - ldr r3, _0802B1BC @ =gUnknown_02024C10 + ldr r3, _0802B1BC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30653,7 +30653,7 @@ _0802B1B6: pop {r0} bx r0 .align 2, 0 -_0802B1BC: .4byte gUnknown_02024C10 +_0802B1BC: .4byte gBattlescriptCurrInstr thumb_func_end atkE8_settypebasedhalvers thumb_func_start sub_802B1C0 @@ -30666,7 +30666,7 @@ sub_802B1C0: @ 802B1C0 movs r1, 0 movs r2, 0xD movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -30676,7 +30676,7 @@ sub_802B1C0: @ 802B1C0 movs r1, 0 movs r2, 0x4D movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0802B276 @@ -30747,7 +30747,7 @@ _0802B270: adds r0, r2, r1 strb r3, [r0] _0802B276: - ldr r1, _0802B288 @ =gUnknown_02024C10 + ldr r1, _0802B288 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -30756,15 +30756,15 @@ _0802B276: bx r0 .align 2, 0 _0802B284: .4byte 0x0001601c -_0802B288: .4byte gUnknown_02024C10 +_0802B288: .4byte gBattlescriptCurrInstr thumb_func_end sub_802B1C0 thumb_func_start atkEA_recycleitem atkEA_recycleitem: @ 802B28C push {r4-r7,lr} sub sp, 0x4 - ldr r7, _0802B2F0 @ =gUnknown_02024A60 - ldr r0, _0802B2F4 @ =gPlayerMonIndex + ldr r7, _0802B2F0 @ =gActiveBank + ldr r0, _0802B2F4 @ =gBankAttacker ldrb r0, [r0] strb r0, [r7] ldrb r2, [r7] @@ -30782,7 +30782,7 @@ atkEA_recycleitem: @ 802B28C ldrh r0, [r0, 0x2E] cmp r0, 0 bne _0802B308 - ldr r1, _0802B300 @ =gUnknown_02024C04 + ldr r1, _0802B300 @ =gLastUsedItem strh r5, [r1] strh r0, [r6] ldrb r0, [r7] @@ -30800,23 +30800,23 @@ atkEA_recycleitem: @ 802B28C movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl dp01_build_cmdbuf_x02_a_b_varargs + bl EmitSetAttributes ldrb r0, [r7] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0802B304 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _0802B304 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802B322 .align 2, 0 -_0802B2F0: .4byte gUnknown_02024A60 -_0802B2F4: .4byte gPlayerMonIndex +_0802B2F0: .4byte gActiveBank +_0802B2F4: .4byte gBankAttacker _0802B2F8: .4byte 0x020160cc _0802B2FC: .4byte gBattleMons -_0802B300: .4byte gUnknown_02024C04 -_0802B304: .4byte gUnknown_02024C10 +_0802B300: .4byte gLastUsedItem +_0802B304: .4byte gBattlescriptCurrInstr _0802B308: - ldr r3, _0802B32C @ =gUnknown_02024C10 + ldr r3, _0802B32C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30835,7 +30835,7 @@ _0802B322: pop {r0} bx r0 .align 2, 0 -_0802B32C: .4byte gUnknown_02024C10 +_0802B32C: .4byte gBattlescriptCurrInstr thumb_func_end atkEA_recycleitem thumb_func_start atkEB_settypetoterrain @@ -30845,7 +30845,7 @@ atkEB_settypetoterrain: @ 802B330 push {r7} ldr r0, _0802B3A0 @ =gBattleMons mov r8, r0 - ldr r7, _0802B3A4 @ =gPlayerMonIndex + ldr r7, _0802B3A4 @ =gBankAttacker ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -30880,7 +30880,7 @@ atkEB_settypetoterrain: @ 802B330 ldrb r0, [r0] adds r1, 0x22 strb r0, [r1] - ldr r1, _0802B3B0 @ =gUnknown_030041C0 + ldr r1, _0802B3B0 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -30891,20 +30891,20 @@ atkEB_settypetoterrain: @ 802B330 strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _0802B3B4 @ =gUnknown_02024C10 + ldr r1, _0802B3B4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802B3D2 .align 2, 0 _0802B3A0: .4byte gBattleMons -_0802B3A4: .4byte gPlayerMonIndex +_0802B3A4: .4byte gBankAttacker _0802B3A8: .4byte gTerrainToType _0802B3AC: .4byte gBattleTerrain -_0802B3B0: .4byte gUnknown_030041C0 -_0802B3B4: .4byte gUnknown_02024C10 +_0802B3B0: .4byte gBattleTextBuff1 +_0802B3B4: .4byte gBattlescriptCurrInstr _0802B3B8: - ldr r3, _0802B3DC @ =gUnknown_02024C10 + ldr r3, _0802B3DC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30924,21 +30924,21 @@ _0802B3D2: pop {r0} bx r0 .align 2, 0 -_0802B3DC: .4byte gUnknown_02024C10 +_0802B3DC: .4byte gBattlescriptCurrInstr thumb_func_end atkEB_settypetoterrain thumb_func_start sub_802B3E0 sub_802B3E0: @ 802B3E0 push {r4,r5,lr} - ldr r5, _0802B45C @ =gPlayerMonIndex + ldr r5, _0802B45C @ =gBankAttacker ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r4, _0802B460 @ =gUnknown_02024A60 + bl GetBankByPlayerAI + ldr r4, _0802B460 @ =gActiveBank strb r0, [r4] ldr r0, _0802B464 @ =gBattleTypeFlags ldrh r1, [r0] @@ -30946,7 +30946,7 @@ sub_802B3E0: @ 802B3E0 ands r0, r1 cmp r0, 0 beq _0802B490 - ldr r0, _0802B468 @ =gUnknown_02024C0C + ldr r0, _0802B468 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _0802B46C @ =gBitTable ldrb r3, [r4] @@ -30956,12 +30956,12 @@ sub_802B3E0: @ 802B3E0 ands r1, r0 cmp r1, 0 bne _0802B490 - ldr r0, _0802B470 @ =gUnknown_02024C18 + ldr r0, _0802B470 @ =gActionForBanks adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 bne _0802B490 - ldr r1, _0802B474 @ =gUnknown_02024C60 + ldr r1, _0802B474 @ =gChosenMovesByBanks lsls r0, r3, 1 adds r0, r1 ldrh r2, [r0] @@ -30971,9 +30971,9 @@ sub_802B3E0: @ 802B3E0 adds r0, r3, r0 movs r1, 0xB strb r1, [r0] - ldr r0, _0802B47C @ =gUnknown_02024BE6 + ldr r0, _0802B47C @ =gCurrentMove strh r2, [r0] - ldr r1, _0802B480 @ =gUnknown_02024C10 + ldr r1, _0802B480 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30990,21 +30990,21 @@ sub_802B3E0: @ 802B3E0 strb r0, [r5] b _0802B4AA .align 2, 0 -_0802B45C: .4byte gPlayerMonIndex -_0802B460: .4byte gUnknown_02024A60 +_0802B45C: .4byte gBankAttacker +_0802B460: .4byte gActiveBank _0802B464: .4byte gBattleTypeFlags -_0802B468: .4byte gUnknown_02024C0C +_0802B468: .4byte gAbsentBankFlags _0802B46C: .4byte gBitTable -_0802B470: .4byte gUnknown_02024C18 -_0802B474: .4byte gUnknown_02024C60 +_0802B470: .4byte gActionForBanks +_0802B474: .4byte gChosenMovesByBanks _0802B478: .4byte gUnknown_02024A76 -_0802B47C: .4byte gUnknown_02024BE6 -_0802B480: .4byte gUnknown_02024C10 +_0802B47C: .4byte gCurrentMove +_0802B480: .4byte gBattlescriptCurrInstr _0802B484: .4byte 0x02000000 _0802B488: .4byte 0x00016002 _0802B48C: .4byte 0x000160a7 _0802B490: - ldr r3, _0802B4B0 @ =gUnknown_02024C10 + ldr r3, _0802B4B0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -31022,17 +31022,17 @@ _0802B4AA: pop {r0} bx r0 .align 2, 0 -_0802B4B0: .4byte gUnknown_02024C10 +_0802B4B0: .4byte gBattlescriptCurrInstr thumb_func_end sub_802B3E0 thumb_func_start sub_802B4B4 sub_802B4B4: @ 802B4B4 push {r4,r5,lr} - ldr r1, _0802B4DC @ =gUnknown_02024C0A - ldr r3, _0802B4E0 @ =gPlayerMonIndex + ldr r1, _0802B4DC @ =gEffectBank + ldr r3, _0802B4E0 @ =gBankAttacker ldrb r0, [r3] strb r0, [r1] - ldr r2, _0802B4E4 @ =gEnemyMonIndex + ldr r2, _0802B4E4 @ =gBankTarget lsls r0, 24 lsrs r0, 24 adds r4, r1, 0 @@ -31047,9 +31047,9 @@ sub_802B4B4: @ 802B4B4 strb r1, [r3] b _0802B4FA .align 2, 0 -_0802B4DC: .4byte gUnknown_02024C0A -_0802B4E0: .4byte gPlayerMonIndex -_0802B4E4: .4byte gEnemyMonIndex +_0802B4DC: .4byte gEffectBank +_0802B4E0: .4byte gBankAttacker +_0802B4E4: .4byte gBankTarget _0802B4E8: .4byte 0x02000000 _0802B4EC: .4byte 0x00016003 _0802B4F0: @@ -31063,7 +31063,7 @@ _0802B4FA: ldr r5, _0802B514 @ =0x00016003 adds r0, r5 strb r1, [r0] - ldr r1, _0802B518 @ =gUnknown_02024C10 + ldr r1, _0802B518 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31073,20 +31073,20 @@ _0802B4FA: .align 2, 0 _0802B510: .4byte 0x02000000 _0802B514: .4byte 0x00016003 -_0802B518: .4byte gUnknown_02024C10 +_0802B518: .4byte gBattlescriptCurrInstr thumb_func_end sub_802B4B4 thumb_func_start sub_802B51C sub_802B51C: @ 802B51C push {r4,lr} - ldr r0, _0802B56C @ =gPlayerMonIndex + ldr r0, _0802B56C @ =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r1, _0802B570 @ =gUnknown_02024C80 + ldr r1, _0802B570 @ =gSideTimer lsls r3, r0, 1 adds r0, r3, r0 lsls r0, 2 @@ -31098,7 +31098,7 @@ sub_802B51C: @ 802B51C cmp r2, 0 beq _0802B58C _0802B544: - ldr r2, _0802B574 @ =gUnknown_02024C7A + ldr r2, _0802B574 @ =gSideAffecting adds r2, r3, r2 ldrh r1, [r2] ldr r0, _0802B578 @ =0x0000fffe @@ -31118,9 +31118,9 @@ _0802B544: adds r0, r3 b _0802B598 .align 2, 0 -_0802B56C: .4byte gPlayerMonIndex -_0802B570: .4byte gUnknown_02024C80 -_0802B574: .4byte gUnknown_02024C7A +_0802B56C: .4byte gBankAttacker +_0802B570: .4byte gSideTimer +_0802B574: .4byte gSideAffecting _0802B578: .4byte 0x0000fffe _0802B57C: .4byte 0x0000fffd _0802B580: .4byte 0x02000000 @@ -31135,7 +31135,7 @@ _0802B58C: adds r0, r1 _0802B598: strb r2, [r0] - ldr r1, _0802B5B4 @ =gUnknown_02024C10 + ldr r1, _0802B5B4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31146,24 +31146,24 @@ _0802B598: _0802B5A8: .4byte 0x02000000 _0802B5AC: .4byte 0x00016002 _0802B5B0: .4byte 0x000160a1 -_0802B5B4: .4byte gUnknown_02024C10 +_0802B5B4: .4byte gBattlescriptCurrInstr thumb_func_end sub_802B51C thumb_func_start sub_802B5B8 sub_802B5B8: @ 802B5B8 push {r4-r7,lr} movs r4, 0 - ldr r0, _0802B5F8 @ =gUnknown_02024A64 + ldr r0, _0802B5F8 @ =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0802B5C6 b _0802B94E _0802B5C6: - ldr r5, _0802B5FC @ =gUnknown_02024A60 - ldr r0, _0802B600 @ =gPlayerMonIndex + ldr r5, _0802B5FC @ =gActiveBank + ldr r0, _0802B600 @ =gBankAttacker ldrb r0, [r0] strb r0, [r5] - ldr r6, _0802B604 @ =gEnemyMonIndex + ldr r6, _0802B604 @ =gBankTarget movs r1, 0x1 eors r0, r1 strb r0, [r6] @@ -31177,17 +31177,17 @@ _0802B5C6: movs r1, 0x5 bl dp01_build_cmdbuf_x0D_a ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0802B60C @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _0802B60C @ =gBattlescriptCurrInstr ldr r0, _0802B610 @ =gUnknown_081D9F35 b _0802B94C .align 2, 0 -_0802B5F8: .4byte gUnknown_02024A64 -_0802B5FC: .4byte gUnknown_02024A60 -_0802B600: .4byte gPlayerMonIndex -_0802B604: .4byte gEnemyMonIndex +_0802B5F8: .4byte gBattleExecBuffer +_0802B5FC: .4byte gActiveBank +_0802B600: .4byte gBankAttacker +_0802B604: .4byte gBankTarget _0802B608: .4byte gBattleTypeFlags -_0802B60C: .4byte gUnknown_02024C10 +_0802B60C: .4byte gBattlescriptCurrInstr _0802B610: .4byte gUnknown_081D9F35 _0802B614: movs r0, 0x80 @@ -31199,15 +31199,15 @@ _0802B614: movs r1, 0x4 bl dp01_build_cmdbuf_x0D_a ldrb r0, [r5] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0802B634 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _0802B634 @ =gBattlescriptCurrInstr ldr r0, _0802B638 @ =gUnknown_081D9F00 b _0802B94C .align 2, 0 -_0802B634: .4byte gUnknown_02024C10 +_0802B634: .4byte gBattlescriptCurrInstr _0802B638: .4byte gUnknown_081D9F00 _0802B63C: - ldr r0, _0802B660 @ =gUnknown_02024C04 + ldr r0, _0802B660 @ =gLastUsedItem ldrh r0, [r0] cmp r0, 0x5 bne _0802B66C @@ -31225,7 +31225,7 @@ _0802B63C: lsrs r5, r0, 24 b _0802B684 .align 2, 0 -_0802B660: .4byte gUnknown_02024C04 +_0802B660: .4byte gLastUsedItem _0802B664: .4byte 0x02000000 _0802B668: .4byte 0x00016089 _0802B66C: @@ -31242,7 +31242,7 @@ _0802B66C: adds r0, r3 ldrb r5, [r0, 0x8] _0802B684: - ldr r2, _0802B6A8 @ =gUnknown_02024C04 + ldr r2, _0802B6A8 @ =gLastUsedItem ldrh r0, [r2] cmp r0, 0x5 bhi _0802B68E @@ -31261,7 +31261,7 @@ _0802B696: .align 2, 0 _0802B6A0: .4byte gBaseStats _0802B6A4: .4byte gBattleMons -_0802B6A8: .4byte gUnknown_02024C04 +_0802B6A8: .4byte gLastUsedItem _0802B6AC: .4byte _0802B6B0 .align 2, 0 _0802B6B0: @@ -31274,7 +31274,7 @@ _0802B6B0: .4byte _0802B72E _0802B6CC: ldr r2, _0802B6F4 @ =gBattleMons - ldr r0, _0802B6F8 @ =gEnemyMonIndex + ldr r0, _0802B6F8 @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -31295,7 +31295,7 @@ _0802B6CC: b _0802B72E .align 2, 0 _0802B6F4: .4byte gBattleMons -_0802B6F8: .4byte gEnemyMonIndex +_0802B6F8: .4byte gBankTarget _0802B6FC: bl sav1_map_get_light_level lsls r0, 24 @@ -31307,7 +31307,7 @@ _0802B6FC: b _0802B78E _0802B70E: ldr r2, _0802B734 @ =gBattleMons - ldr r0, _0802B738 @ =gEnemyMonIndex + ldr r0, _0802B738 @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -31327,10 +31327,10 @@ _0802B72E: b _0802B78E .align 2, 0 _0802B734: .4byte gBattleMons -_0802B738: .4byte gEnemyMonIndex +_0802B738: .4byte gBankTarget _0802B73C: ldr r2, _0802B764 @ =gBattleMons - ldr r0, _0802B768 @ =gEnemyMonIndex + ldr r0, _0802B768 @ =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -31350,9 +31350,9 @@ _0802B760: b _0802B78E .align 2, 0 _0802B764: .4byte gBattleMons -_0802B768: .4byte gEnemyMonIndex +_0802B768: .4byte gBankTarget _0802B76C: - ldr r0, _0802B780 @ =gUnknown_030042E0 + ldr r0, _0802B780 @ =gBattleResults ldrb r0, [r0, 0x13] adds r0, 0xA lsls r0, 24 @@ -31362,7 +31362,7 @@ _0802B76C: movs r4, 0x28 b _0802B78E .align 2, 0 -_0802B780: .4byte gUnknown_030042E0 +_0802B780: .4byte gBattleResults _0802B784: ldr r1, _0802B7F4 @ =gBallCatchBonuses ldrh r0, [r2] @@ -31375,7 +31375,7 @@ _0802B78E: movs r1, 0xA bl __divsi3 ldr r5, _0802B7F8 @ =gBattleMons - ldr r1, _0802B7FC @ =gEnemyMonIndex + ldr r1, _0802B7FC @ =gBankTarget ldrb r1, [r1] movs r7, 0x58 adds r4, r1, 0 @@ -31408,13 +31408,13 @@ _0802B7CA: bl __udivsi3 adds r6, r0, 0 _0802B7DC: - ldr r1, _0802B800 @ =gUnknown_02024C04 + ldr r1, _0802B800 @ =gLastUsedItem ldrh r0, [r1] cmp r0, 0x5 beq _0802B81C cmp r0, 0x1 bne _0802B808 - ldr r0, _0802B804 @ =gUnknown_030042E0 + ldr r0, _0802B804 @ =gBattleResults ldrb r1, [r0, 0x5] movs r2, 0x2 orrs r1, r2 @@ -31423,11 +31423,11 @@ _0802B7DC: .align 2, 0 _0802B7F4: .4byte gBallCatchBonuses _0802B7F8: .4byte gBattleMons -_0802B7FC: .4byte gEnemyMonIndex -_0802B800: .4byte gUnknown_02024C04 -_0802B804: .4byte gUnknown_030042E0 +_0802B7FC: .4byte gBankTarget +_0802B800: .4byte gLastUsedItem +_0802B804: .4byte gBattleResults _0802B808: - ldr r0, _0802B860 @ =gUnknown_030042E0 + ldr r0, _0802B860 @ =gBattleResults ldrh r1, [r1] adds r0, r1 adds r1, r0, 0 @@ -31443,14 +31443,14 @@ _0802B81C: movs r0, 0 movs r1, 0x4 bl dp01_build_cmdbuf_x0D_a - ldr r0, _0802B864 @ =gUnknown_02024A60 + ldr r0, _0802B864 @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0802B868 @ =gUnknown_02024C10 + bl MarkBufferBankForExecution + ldr r1, _0802B868 @ =gBattlescriptCurrInstr ldr r0, _0802B86C @ =gUnknown_081D9EC2 str r0, [r1] - ldr r1, _0802B870 @ =gUnknown_02024A6A - ldr r0, _0802B874 @ =gEnemyMonIndex + ldr r1, _0802B870 @ =gBattlePartyID + ldr r0, _0802B874 @ =gBankTarget ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -31459,7 +31459,7 @@ _0802B81C: muls r0, r1 ldr r1, _0802B878 @ =gEnemyParty adds r0, r1 - ldr r2, _0802B87C @ =gUnknown_02024C04 + ldr r2, _0802B87C @ =gLastUsedItem movs r1, 0x26 bl SetMonData bl CalculatePlayerPartyCount @@ -31469,14 +31469,14 @@ _0802B81C: beq _0802B90E b _0802B938 .align 2, 0 -_0802B860: .4byte gUnknown_030042E0 -_0802B864: .4byte gUnknown_02024A60 -_0802B868: .4byte gUnknown_02024C10 +_0802B860: .4byte gBattleResults +_0802B864: .4byte gActiveBank +_0802B868: .4byte gBattlescriptCurrInstr _0802B86C: .4byte gUnknown_081D9EC2 -_0802B870: .4byte gUnknown_02024A6A -_0802B874: .4byte gEnemyMonIndex +_0802B870: .4byte gBattlePartyID +_0802B874: .4byte gBankTarget _0802B878: .4byte gEnemyParty -_0802B87C: .4byte gUnknown_02024C04 +_0802B87C: .4byte gLastUsedItem _0802B880: movs r0, 0xFF lsls r0, 16 @@ -31509,7 +31509,7 @@ _0802B8B2: cmp r0, r6 bcc _0802B8AC _0802B8C2: - ldr r5, _0802B918 @ =gUnknown_02024C04 + ldr r5, _0802B918 @ =gLastUsedItem ldrh r0, [r5] cmp r0, 0x1 bne _0802B8CC @@ -31518,16 +31518,16 @@ _0802B8CC: movs r0, 0 adds r1, r4, 0 bl dp01_build_cmdbuf_x0D_a - ldr r0, _0802B91C @ =gUnknown_02024A60 + ldr r0, _0802B91C @ =gActiveBank ldrb r0, [r0] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution cmp r4, 0x4 bne _0802B944 - ldr r1, _0802B920 @ =gUnknown_02024C10 + ldr r1, _0802B920 @ =gBattlescriptCurrInstr ldr r0, _0802B924 @ =gUnknown_081D9EC2 str r0, [r1] - ldr r1, _0802B928 @ =gUnknown_02024A6A - ldr r0, _0802B92C @ =gEnemyMonIndex + ldr r1, _0802B928 @ =gBattlePartyID + ldr r0, _0802B92C @ =gBankTarget ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -31545,30 +31545,30 @@ _0802B8CC: cmp r0, 0x6 bne _0802B938 _0802B90E: - ldr r1, _0802B934 @ =gUnknown_02024D1E + ldr r1, _0802B934 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] b _0802B94E .align 2, 0 -_0802B918: .4byte gUnknown_02024C04 -_0802B91C: .4byte gUnknown_02024A60 -_0802B920: .4byte gUnknown_02024C10 +_0802B918: .4byte gLastUsedItem +_0802B91C: .4byte gActiveBank +_0802B920: .4byte gBattlescriptCurrInstr _0802B924: .4byte gUnknown_081D9EC2 -_0802B928: .4byte gUnknown_02024A6A -_0802B92C: .4byte gEnemyMonIndex +_0802B928: .4byte gBattlePartyID +_0802B92C: .4byte gBankTarget _0802B930: .4byte gEnemyParty -_0802B934: .4byte gUnknown_02024D1E +_0802B934: .4byte gBattleCommunication _0802B938: - ldr r1, _0802B940 @ =gUnknown_02024D1E + ldr r1, _0802B940 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _0802B94E .align 2, 0 -_0802B940: .4byte gUnknown_02024D1E +_0802B940: .4byte gBattleCommunication _0802B944: - ldr r0, _0802B954 @ =gUnknown_02024D1E + ldr r0, _0802B954 @ =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, _0802B958 @ =gUnknown_02024C10 + ldr r1, _0802B958 @ =gBattlescriptCurrInstr ldr r0, _0802B95C @ =gUnknown_081D9F0A _0802B94C: str r0, [r1] @@ -31577,8 +31577,8 @@ _0802B94E: pop {r0} bx r0 .align 2, 0 -_0802B954: .4byte gUnknown_02024D1E -_0802B958: .4byte gUnknown_02024C10 +_0802B954: .4byte gBattleCommunication +_0802B958: .4byte gBattlescriptCurrInstr _0802B95C: .4byte gUnknown_081D9F0A thumb_func_end sub_802B5B8 @@ -31588,9 +31588,9 @@ sub_802B960: @ 802B960 mov r6, r9 mov r5, r8 push {r5,r6} - ldr r0, _0802B9C8 @ =gUnknown_02024A6A + ldr r0, _0802B9C8 @ =gBattlePartyID mov r9, r0 - ldr r5, _0802B9CC @ =gPlayerMonIndex + ldr r5, _0802B9CC @ =gBankAttacker ldrb r0, [r5] movs r4, 0x1 eors r0, r4 @@ -31605,7 +31605,7 @@ sub_802B960: @ 802B960 ldr r6, _0802B9D0 @ =gEnemyParty adds r0, r6 bl GiveMonToPlayer - ldr r2, _0802B9D4 @ =gUnknown_030042E0 + ldr r2, _0802B9D4 @ =gBattleResults ldr r1, _0802B9D8 @ =gBattleMons ldrb r0, [r5] eors r4, r0 @@ -31624,7 +31624,7 @@ sub_802B960: @ 802B960 adds r2, 0x2A movs r1, 0x2 bl GetMonData - ldr r1, _0802B9DC @ =gUnknown_02024C10 + ldr r1, _0802B9DC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31635,19 +31635,19 @@ sub_802B960: @ 802B960 pop {r0} bx r0 .align 2, 0 -_0802B9C8: .4byte gUnknown_02024A6A -_0802B9CC: .4byte gPlayerMonIndex +_0802B9C8: .4byte gBattlePartyID +_0802B9CC: .4byte gBankAttacker _0802B9D0: .4byte gEnemyParty -_0802B9D4: .4byte gUnknown_030042E0 +_0802B9D4: .4byte gBattleResults _0802B9D8: .4byte gBattleMons -_0802B9DC: .4byte gUnknown_02024C10 +_0802B9DC: .4byte gBattlescriptCurrInstr thumb_func_end sub_802B960 thumb_func_start sub_802B9E0 sub_802B9E0: @ 802B9E0 push {r4-r6,lr} ldr r4, _0802BA20 @ =gBattleMons - ldr r6, _0802BA24 @ =gEnemyMonIndex + ldr r6, _0802BA24 @ =gBankTarget ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -31661,7 +31661,7 @@ sub_802B9E0: @ 802B9E0 lsls r0, 24 cmp r0, 0 beq _0802BA2C - ldr r3, _0802BA28 @ =gUnknown_02024C10 + ldr r3, _0802BA28 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -31677,8 +31677,8 @@ sub_802B9E0: @ 802B9E0 b _0802BA82 .align 2, 0 _0802BA20: .4byte gBattleMons -_0802BA24: .4byte gEnemyMonIndex -_0802BA28: .4byte gUnknown_02024C10 +_0802BA24: .4byte gBankTarget +_0802BA28: .4byte gBattlescriptCurrInstr _0802BA2C: ldrb r0, [r6] muls r0, r5 @@ -31719,7 +31719,7 @@ _0802BA5C: ldr r1, [r1] str r1, [r0, 0x20] _0802BA7A: - ldr r1, _0802BA8C @ =gUnknown_02024C10 + ldr r1, _0802BA8C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -31729,14 +31729,14 @@ _0802BA82: bx r0 .align 2, 0 _0802BA88: .4byte gSaveBlock2 -_0802BA8C: .4byte gUnknown_02024C10 +_0802BA8C: .4byte gBattlescriptCurrInstr thumb_func_end sub_802B9E0 thumb_func_start sub_802BA90 sub_802BA90: @ 802BA90 push {r4-r7,lr} sub sp, 0x4 - ldr r7, _0802BAA8 @ =gUnknown_02024D1E + ldr r7, _0802BAA8 @ =gBattleCommunication ldrb r1, [r7] cmp r1, 0x1 beq _0802BAC6 @@ -31746,7 +31746,7 @@ sub_802BA90: @ 802BA90 beq _0802BAB8 b _0802BBC4 .align 2, 0 -_0802BAA8: .4byte gUnknown_02024D1E +_0802BAA8: .4byte gBattleCommunication _0802BAAC: cmp r1, 0x2 beq _0802BB10 @@ -31771,7 +31771,7 @@ _0802BAC6: cmp r0, 0 bne _0802BBC4 ldr r4, _0802BB08 @ =gBattleMons - ldr r6, _0802BB0C @ =gEnemyMonIndex + ldr r6, _0802BB0C @ =gBankTarget ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -31796,7 +31796,7 @@ _0802BAC6: .align 2, 0 _0802BB04: .4byte gPaletteFade _0802BB08: .4byte gBattleMons -_0802BB0C: .4byte gEnemyMonIndex +_0802BB0C: .4byte gBankTarget _0802BB10: ldr r0, _0802BB7C @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -31870,7 +31870,7 @@ _0802BBB0: ands r0, r1 cmp r0, 0 bne _0802BBC4 - ldr r1, _0802BBD0 @ =gUnknown_02024C10 + ldr r1, _0802BBD0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31881,7 +31881,7 @@ _0802BBC4: bx r0 .align 2, 0 _0802BBCC: .4byte gPaletteFade -_0802BBD0: .4byte gUnknown_02024C10 +_0802BBD0: .4byte gBattlescriptCurrInstr thumb_func_end sub_802BA90 thumb_func_start sub_802BBD4 @@ -31974,7 +31974,7 @@ _0802BC68: .4byte 0x00001025 thumb_func_start sub_802BC6C sub_802BC6C: @ 802BC6C push {lr} - ldr r0, _0802BC88 @ =gUnknown_02024D1E + ldr r0, _0802BC88 @ =gBattleCommunication ldrb r1, [r0, 0x1] lsls r1, 28 movs r0, 0x90 @@ -31986,7 +31986,7 @@ sub_802BC6C: @ 802BC6C pop {r0} bx r0 .align 2, 0 -_0802BC88: .4byte gUnknown_02024D1E +_0802BC88: .4byte gBattleCommunication thumb_func_end sub_802BC6C thumb_func_start nullsub_6 @@ -32002,7 +32002,7 @@ atkF3_receive_new_pokemon_maybe: @ 802BC90 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _0802BCB4 @ =gUnknown_02024D1E + ldr r0, _0802BCB4 @ =gBattleCommunication ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x4 @@ -32015,7 +32015,7 @@ _0802BCA8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802BCB4: .4byte gUnknown_02024D1E +_0802BCB4: .4byte gBattleCommunication _0802BCB8: .4byte _0802BCBC .align 2, 0 _0802BCBC: @@ -32026,7 +32026,7 @@ _0802BCBC: .4byte _0802BEA4 _0802BCD0: bl sub_8023A80 - ldr r0, _0802BCE8 @ =gUnknown_02024D1E + ldr r0, _0802BCE8 @ =gBattleCommunication ldrb r1, [r0] adds r1, 0x1 movs r2, 0 @@ -32035,7 +32035,7 @@ _0802BCD0: bl sub_802BC6C b _0802BEDA .align 2, 0 -_0802BCE8: .4byte gUnknown_02024D1E +_0802BCE8: .4byte gBattleCommunication _0802BCEC: ldr r0, _0802BD60 @ =gMain ldrh r1, [r0, 0x2E] @@ -32059,7 +32059,7 @@ _0802BD10: ands r0, r1 cmp r0, 0 beq _0802BD36 - ldr r4, _0802BD64 @ =gUnknown_02024D1E + ldr r4, _0802BD64 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _0802BD36 @@ -32078,7 +32078,7 @@ _0802BD36: beq _0802BD68 movs r0, 0x5 bl PlaySE - ldr r1, _0802BD64 @ =gUnknown_02024D1E + ldr r1, _0802BD64 @ =gBattleCommunication ldrb r0, [r1, 0x1] cmp r0, 0 bne _0802BD7A @@ -32090,7 +32090,7 @@ _0802BD36: b _0802BEDA .align 2, 0 _0802BD60: .4byte gMain -_0802BD64: .4byte gUnknown_02024D1E +_0802BD64: .4byte gBattleCommunication _0802BD68: movs r0, 0x2 ands r0, r1 @@ -32100,13 +32100,13 @@ _0802BD68: _0802BD72: movs r0, 0x5 bl PlaySE - ldr r1, _0802BD80 @ =gUnknown_02024D1E + ldr r1, _0802BD80 @ =gBattleCommunication _0802BD7A: movs r0, 0x4 strb r0, [r1] b _0802BEDA .align 2, 0 -_0802BD80: .4byte gUnknown_02024D1E +_0802BD80: .4byte gBattleCommunication _0802BD84: ldr r0, _0802BE34 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -32116,8 +32116,8 @@ _0802BD84: beq _0802BD92 b _0802BEDA _0802BD92: - ldr r7, _0802BE38 @ =gUnknown_02024A6A - ldr r0, _0802BE3C @ =gPlayerMonIndex + ldr r7, _0802BE38 @ =gBattlePartyID + ldr r0, _0802BE3C @ =gBankAttacker mov r10, r0 ldrb r0, [r0] movs r4, 0x1 @@ -32186,19 +32186,19 @@ _0802BD92: adds r2, r6, 0 adds r3, r5, 0 bl DoNamingScreen - ldr r1, _0802BE4C @ =gUnknown_02024D1E + ldr r1, _0802BE4C @ =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _0802BEDA .align 2, 0 _0802BE34: .4byte gPaletteFade -_0802BE38: .4byte gUnknown_02024A6A -_0802BE3C: .4byte gPlayerMonIndex +_0802BE38: .4byte gBattlePartyID +_0802BE3C: .4byte gBankAttacker _0802BE40: .4byte gEnemyParty _0802BE44: .4byte 0x02016079 _0802BE48: .4byte sub_800F808 -_0802BE4C: .4byte gUnknown_02024D1E +_0802BE4C: .4byte gBattleCommunication _0802BE50: ldr r0, _0802BE88 @ =gMain ldr r1, [r0, 0x4] @@ -32211,8 +32211,8 @@ _0802BE50: ands r0, r1 cmp r0, 0 bne _0802BEDA - ldr r2, _0802BE94 @ =gUnknown_02024A6A - ldr r0, _0802BE98 @ =gPlayerMonIndex + ldr r2, _0802BE94 @ =gBattlePartyID + ldr r0, _0802BE98 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x1 eors r0, r1 @@ -32231,8 +32231,8 @@ _0802BE50: _0802BE88: .4byte gMain _0802BE8C: .4byte sub_800F808 _0802BE90: .4byte gPaletteFade -_0802BE94: .4byte gUnknown_02024A6A -_0802BE98: .4byte gPlayerMonIndex +_0802BE94: .4byte gBattlePartyID +_0802BE98: .4byte gBankAttacker _0802BE9C: .4byte gEnemyParty _0802BEA0: .4byte 0x02016079 _0802BEA4: @@ -32241,15 +32241,15 @@ _0802BEA4: lsrs r0, 24 cmp r0, 0x6 bne _0802BEC0 - ldr r1, _0802BEBC @ =gUnknown_02024C10 + ldr r1, _0802BEBC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802BEDA .align 2, 0 -_0802BEBC: .4byte gUnknown_02024C10 +_0802BEBC: .4byte gBattlescriptCurrInstr _0802BEC0: - ldr r3, _0802BEEC @ =gUnknown_02024C10 + ldr r3, _0802BEEC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -32272,13 +32272,13 @@ _0802BEDA: pop {r0} bx r0 .align 2, 0 -_0802BEEC: .4byte gUnknown_02024C10 +_0802BEEC: .4byte gBattlescriptCurrInstr thumb_func_end atkF3_receive_new_pokemon_maybe thumb_func_start sub_802BEF0 sub_802BEF0: @ 802BEF0 ldr r2, _0802BF10 @ =gBattleMons - ldr r0, _0802BF14 @ =gPlayerMonIndex + ldr r0, _0802BF14 @ =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -32288,22 +32288,22 @@ sub_802BEF0: @ 802BEF0 ldrh r0, [r1, 0x28] subs r0, r2 strh r0, [r1, 0x28] - ldr r1, _0802BF1C @ =gUnknown_02024C10 + ldr r1, _0802BF1C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 _0802BF10: .4byte gBattleMons -_0802BF14: .4byte gPlayerMonIndex +_0802BF14: .4byte gBankAttacker _0802BF18: .4byte gBattleMoveDamage -_0802BF1C: .4byte gUnknown_02024C10 +_0802BF1C: .4byte gBattlescriptCurrInstr thumb_func_end sub_802BEF0 thumb_func_start sub_802BF20 sub_802BF20: @ 802BF20 ldr r1, _0802BF3C @ =gBattleMons - ldr r0, _0802BF40 @ =gPlayerMonIndex + ldr r0, _0802BF40 @ =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -32311,41 +32311,41 @@ sub_802BF20: @ 802BF20 adds r0, r1 movs r1, 0 str r1, [r0] - ldr r1, _0802BF44 @ =gUnknown_02024C10 + ldr r1, _0802BF44 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 _0802BF3C: .4byte gBattleMons -_0802BF40: .4byte gPlayerMonIndex -_0802BF44: .4byte gUnknown_02024C10 +_0802BF40: .4byte gBankAttacker +_0802BF44: .4byte gBattlescriptCurrInstr thumb_func_end sub_802BF20 thumb_func_start sub_802BF48 sub_802BF48: @ 802BF48 - ldr r1, _0802BF50 @ =gUnknown_02024A7F + ldr r1, _0802BF50 @ =gFightStateTracker movs r0, 0xC strb r0, [r1] bx lr .align 2, 0 -_0802BF50: .4byte gUnknown_02024A7F +_0802BF50: .4byte gFightStateTracker thumb_func_end sub_802BF48 thumb_func_start sub_802BF54 sub_802BF54: @ 802BF54 - ldr r1, _0802BF64 @ =gUnknown_02024A7F + ldr r1, _0802BF64 @ =gFightStateTracker movs r0, 0xC strb r0, [r1] - ldr r1, _0802BF68 @ =gUnknown_02024A7E - ldr r0, _0802BF6C @ =gUnknown_02024A68 + ldr r1, _0802BF68 @ =gCurrentMoveTurn + ldr r0, _0802BF6C @ =gNoOfAllBanks ldrb r0, [r0] strb r0, [r1] bx lr .align 2, 0 -_0802BF64: .4byte gUnknown_02024A7F -_0802BF68: .4byte gUnknown_02024A7E -_0802BF6C: .4byte gUnknown_02024A68 +_0802BF64: .4byte gFightStateTracker +_0802BF68: .4byte gCurrentMoveTurn +_0802BF6C: .4byte gNoOfAllBanks thumb_func_end sub_802BF54 .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_5.s b/asm/battle_5.s index 7c3f005ff..b72266193 100644 --- a/asm/battle_5.s +++ b/asm/battle_5.s @@ -11,36 +11,36 @@ nullsub_91: @ 802BF70 bx lr thumb_func_end nullsub_91 - thumb_func_start sub_802BF74 -sub_802BF74: @ 802BF74 - ldr r1, _0802BF8C @ =gUnknown_03004330 - ldr r0, _0802BF90 @ =gUnknown_02024A60 + thumb_func_start SetBankFuncToPlayerBufferRunCommand +SetBankFuncToPlayerBufferRunCommand: @ 802BF74 + ldr r1, _0802BF8C @ =gBattleBankFunc + ldr r0, _0802BF90 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0802BF94 @ =sub_802C014 + ldr r1, _0802BF94 @ =PlayerBufferRunCommand str r1, [r0] - ldr r1, _0802BF98 @ =gUnknown_02024E6D + ldr r1, _0802BF98 @ =gDoingBattleAnim movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_0802BF8C: .4byte gUnknown_03004330 -_0802BF90: .4byte gUnknown_02024A60 -_0802BF94: .4byte sub_802C014 -_0802BF98: .4byte gUnknown_02024E6D - thumb_func_end sub_802BF74 +_0802BF8C: .4byte gBattleBankFunc +_0802BF90: .4byte gActiveBank +_0802BF94: .4byte PlayerBufferRunCommand +_0802BF98: .4byte gDoingBattleAnim + thumb_func_end SetBankFuncToPlayerBufferRunCommand - thumb_func_start dp01_tbl1_exec_completed -dp01_tbl1_exec_completed: @ 802BF9C + thumb_func_start PlayerBufferExecCompleted +PlayerBufferExecCompleted: @ 802BF9C push {r4,lr} sub sp, 0x4 - ldr r1, _0802BFDC @ =gUnknown_03004330 - ldr r4, _0802BFE0 @ =gUnknown_02024A60 + ldr r1, _0802BFDC @ =gBattleBankFunc + ldr r4, _0802BFE0 @ =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0802BFE4 @ =sub_802C014 + ldr r1, _0802BFE4 @ =PlayerBufferRunCommand str r1, [r0] ldr r0, _0802BFE8 @ =gBattleTypeFlags ldrh r1, [r0] @@ -55,7 +55,7 @@ dp01_tbl1_exec_completed: @ 802BF9C movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _0802BFEC @ =gUnknown_02023A60 + ldr r1, _0802BFEC @ =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -63,13 +63,13 @@ dp01_tbl1_exec_completed: @ 802BF9C strb r1, [r0] b _0802C002 .align 2, 0 -_0802BFDC: .4byte gUnknown_03004330 -_0802BFE0: .4byte gUnknown_02024A60 -_0802BFE4: .4byte sub_802C014 +_0802BFDC: .4byte gBattleBankFunc +_0802BFE0: .4byte gActiveBank +_0802BFE4: .4byte PlayerBufferRunCommand _0802BFE8: .4byte gBattleTypeFlags -_0802BFEC: .4byte gUnknown_02023A60 +_0802BFEC: .4byte gBattleBufferA _0802BFF0: - ldr r2, _0802C00C @ =gUnknown_02024A64 + ldr r2, _0802C00C @ =gBattleExecBuffer ldr r1, _0802C010 @ =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -84,16 +84,16 @@ _0802C002: pop {r0} bx r0 .align 2, 0 -_0802C00C: .4byte gUnknown_02024A64 +_0802C00C: .4byte gBattleExecBuffer _0802C010: .4byte gBitTable - thumb_func_end dp01_tbl1_exec_completed + thumb_func_end PlayerBufferExecCompleted - thumb_func_start sub_802C014 -sub_802C014: @ 802C014 + thumb_func_start PlayerBufferRunCommand +PlayerBufferRunCommand: @ 802C014 push {lr} - ldr r2, _0802C048 @ =gUnknown_02024A64 + ldr r2, _0802C048 @ =gBattleExecBuffer ldr r1, _0802C04C @ =gBitTable - ldr r0, _0802C050 @ =gUnknown_02024A60 + ldr r0, _0802C050 @ =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -102,13 +102,13 @@ sub_802C014: @ 802C014 ands r1, r0 cmp r1, 0 beq _0802C060 - ldr r0, _0802C054 @ =gUnknown_02023A60 + ldr r0, _0802C054 @ =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _0802C05C - ldr r0, _0802C058 @ =gUnknown_081FAD98 + ldr r0, _0802C058 @ =gPlayerBufferCommands ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -116,24 +116,24 @@ sub_802C014: @ 802C014 bl _call_via_r0 b _0802C060 .align 2, 0 -_0802C048: .4byte gUnknown_02024A64 +_0802C048: .4byte gBattleExecBuffer _0802C04C: .4byte gBitTable -_0802C050: .4byte gUnknown_02024A60 -_0802C054: .4byte gUnknown_02023A60 -_0802C058: .4byte gUnknown_081FAD98 +_0802C050: .4byte gActiveBank +_0802C054: .4byte gBattleBufferA +_0802C058: .4byte gPlayerBufferCommands _0802C05C: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802C060: pop {r0} bx r0 - thumb_func_end sub_802C014 + thumb_func_end PlayerBufferRunCommand thumb_func_start bx_0802E404 bx_0802E404: @ 802C064 push {lr} ldr r2, _0802C08C @ =gSprites - ldr r1, _0802C090 @ =gUnknown_02024BE0 - ldr r0, _0802C094 @ =gUnknown_02024A60 + ldr r1, _0802C090 @ =gObjectBankIDs + ldr r0, _0802C094 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -145,14 +145,14 @@ bx_0802E404: @ 802C064 ldrsh r0, [r0, r1] cmp r0, 0 bne _0802C086 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802C086: pop {r0} bx r0 .align 2, 0 _0802C08C: .4byte gSprites -_0802C090: .4byte gUnknown_02024BE0 -_0802C094: .4byte gUnknown_02024A60 +_0802C090: .4byte gObjectBankIDs +_0802C094: .4byte gActiveBank thumb_func_end bx_0802E404 thumb_func_start sub_802C098 @@ -160,8 +160,8 @@ sub_802C098: @ 802C098 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _0802C0FC @ =gUnknown_02023A60 - ldr r4, _0802C100 @ =gUnknown_02024A60 + ldr r7, _0802C0FC @ =gBattleBufferA + ldr r4, _0802C100 @ =gActiveBank ldrb r0, [r4] lsls r2, r0, 9 adds r1, r7, 0x2 @@ -191,7 +191,7 @@ sub_802C098: @ 802C098 movs r0, 0x5 bl PlaySE bl DestroyMenuCursor - ldr r1, _0802C108 @ =gUnknown_02024E60 + ldr r1, _0802C108 @ =gActionSelectionCursor ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -203,10 +203,10 @@ sub_802C098: @ 802C098 beq _0802C116 b _0802C138 .align 2, 0 -_0802C0FC: .4byte gUnknown_02023A60 -_0802C100: .4byte gUnknown_02024A60 +_0802C0FC: .4byte gBattleBufferA +_0802C100: .4byte gActiveBank _0802C104: .4byte gMain -_0802C108: .4byte gUnknown_02024E60 +_0802C108: .4byte gActionSelectionCursor _0802C10C: cmp r0, 0x2 beq _0802C122 @@ -234,14 +234,14 @@ _0802C12E: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb _0802C138: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0802C2AC _0802C13E: movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _0802C178 - ldr r5, _0802C174 @ =gUnknown_02024E60 + ldr r5, _0802C174 @ =gActionSelectionCursor ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -263,13 +263,13 @@ _0802C158: movs r2, 0x1 b _0802C200 .align 2, 0 -_0802C174: .4byte gUnknown_02024E60 +_0802C174: .4byte gActionSelectionCursor _0802C178: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _0802C1B0 - ldr r5, _0802C1AC @ =gUnknown_02024E60 + ldr r5, _0802C1AC @ =gActionSelectionCursor ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -291,14 +291,14 @@ _0802C192: movs r2, 0x1 b _0802C200 .align 2, 0 -_0802C1AC: .4byte gUnknown_02024E60 +_0802C1AC: .4byte gActionSelectionCursor _0802C1B0: movs r0, 0x40 mov r8, r0 ands r0, r1 cmp r0, 0 beq _0802C1D0 - ldr r5, _0802C1CC @ =gUnknown_02024E60 + ldr r5, _0802C1CC @ =gActionSelectionCursor ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -308,13 +308,13 @@ _0802C1B0: beq _0802C2AC b _0802C1E8 .align 2, 0 -_0802C1CC: .4byte gUnknown_02024E60 +_0802C1CC: .4byte gActionSelectionCursor _0802C1D0: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0802C218 - ldr r5, _0802C214 @ =gUnknown_02024E60 + ldr r5, _0802C214 @ =gActionSelectionCursor ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -343,7 +343,7 @@ _0802C200: bl sub_802E3E4 b _0802C2AC .align 2, 0 -_0802C214: .4byte gUnknown_02024E60 +_0802C214: .4byte gActionSelectionCursor _0802C218: movs r0, 0x2 ands r0, r1 @@ -356,14 +356,14 @@ _0802C218: cmp r0, 0 beq _0802C2AC ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 bne _0802C2AC movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, _0802C298 @ =gUnknown_02024C0C + bl GetBankByPlayerAI + ldr r1, _0802C298 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _0802C29C @ =gBitTable lsls r0, 24 @@ -397,12 +397,12 @@ _0802C278: movs r1, 0xC movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted bl DestroyMenuCursor b _0802C2AC .align 2, 0 _0802C294: .4byte gBattleTypeFlags -_0802C298: .4byte gUnknown_02024C0C +_0802C298: .4byte gAbsentBankFlags _0802C29C: .4byte gBitTable _0802C2A0: movs r0, 0x8 @@ -421,14 +421,14 @@ _0802C2AC: thumb_func_start unref_sub_802C2B8 unref_sub_802C2B8: @ 802C2B8 push {r4,lr} - ldr r4, _0802C2E0 @ =gUnknown_02024A60 + ldr r4, _0802C2E0 @ =gActiveBank ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free ldrb r0, [r4] movs r1, 0 bl dp11b_obj_free - ldr r1, _0802C2E4 @ =gUnknown_03004330 + ldr r1, _0802C2E4 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -438,8 +438,8 @@ unref_sub_802C2B8: @ 802C2B8 pop {r0} bx r0 .align 2, 0 -_0802C2E0: .4byte gUnknown_02024A60 -_0802C2E4: .4byte gUnknown_03004330 +_0802C2E0: .4byte gActiveBank +_0802C2E4: .4byte gBattleBankFunc _0802C2E8: .4byte sub_802C2EC thumb_func_end unref_sub_802C2B8 @@ -458,7 +458,7 @@ sub_802C2EC: @ 802C2EC movs r3, 0x1 bl dp11b_obj_instanciate movs r4, 0 - ldr r0, _0802C38C @ =gUnknown_02024A68 + ldr r0, _0802C38C @ =gNoOfAllBanks ldrb r0, [r0] cmp r0, 0 beq _0802C32E @@ -473,7 +473,7 @@ _0802C312: bl dp11b_obj_free _0802C324: adds r4, 0x1 - ldr r0, _0802C38C @ =gUnknown_02024A68 + ldr r0, _0802C38C @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0802C312 @@ -488,7 +488,7 @@ _0802C32E: movs r0, 0x5 bl PlaySE ldr r2, _0802C394 @ =gSprites - ldr r1, _0802C398 @ =gUnknown_02024BE0 + ldr r1, _0802C398 @ =gObjectBankIDs ldr r4, _0802C388 @ =gUnknown_03004344 ldrb r0, [r4] adds r0, r1 @@ -500,8 +500,8 @@ _0802C32E: adds r0, r2 ldr r1, _0802C39C @ =sub_8010574 str r1, [r0] - ldr r1, _0802C3A0 @ =gUnknown_02024E64 - ldr r0, _0802C3A4 @ =gUnknown_02024A60 + ldr r1, _0802C3A0 @ =gMoveSelectionCursor + ldr r0, _0802C3A4 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -514,18 +514,18 @@ _0802C32E: ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0802C658 .align 2, 0 _0802C384: .4byte gUnknown_081FAE7C _0802C388: .4byte gUnknown_03004344 -_0802C38C: .4byte gUnknown_02024A68 +_0802C38C: .4byte gNoOfAllBanks _0802C390: .4byte gMain _0802C394: .4byte gSprites -_0802C398: .4byte gUnknown_02024BE0 +_0802C398: .4byte gObjectBankIDs _0802C39C: .4byte sub_8010574 -_0802C3A0: .4byte gUnknown_02024E64 -_0802C3A4: .4byte gUnknown_02024A60 +_0802C3A0: .4byte gMoveSelectionCursor +_0802C3A4: .4byte gActiveBank _0802C3A8: movs r0, 0x2 ands r0, r1 @@ -534,7 +534,7 @@ _0802C3A8: movs r0, 0x5 bl PlaySE ldr r2, _0802C400 @ =gSprites - ldr r1, _0802C404 @ =gUnknown_02024BE0 + ldr r1, _0802C404 @ =gObjectBankIDs ldr r5, _0802C408 @ =gUnknown_03004344 ldrb r0, [r5] adds r0, r1 @@ -546,8 +546,8 @@ _0802C3A8: adds r0, r2 ldr r1, _0802C40C @ =sub_8010574 str r1, [r0] - ldr r1, _0802C410 @ =gUnknown_03004330 - ldr r4, _0802C414 @ =gUnknown_02024A60 + ldr r1, _0802C410 @ =gBattleBankFunc + ldr r4, _0802C414 @ =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -569,11 +569,11 @@ _0802C3A8: b _0802C658 .align 2, 0 _0802C400: .4byte gSprites -_0802C404: .4byte gUnknown_02024BE0 +_0802C404: .4byte gObjectBankIDs _0802C408: .4byte gUnknown_03004344 _0802C40C: .4byte sub_8010574 -_0802C410: .4byte gUnknown_03004330 -_0802C414: .4byte gUnknown_02024A60 +_0802C410: .4byte gBattleBankFunc +_0802C414: .4byte gActiveBank _0802C418: .4byte sub_802C68C _0802C41C: movs r0, 0x60 @@ -585,7 +585,7 @@ _0802C426: movs r0, 0x5 bl PlaySE ldr r2, _0802C458 @ =gSprites - ldr r1, _0802C45C @ =gUnknown_02024BE0 + ldr r1, _0802C45C @ =gObjectBankIDs ldr r3, _0802C460 @ =gUnknown_03004344 ldrb r0, [r3] adds r0, r1 @@ -600,7 +600,7 @@ _0802C426: adds r5, r3, 0 _0802C448: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r1, r0, 24 movs r4, 0 @@ -608,7 +608,7 @@ _0802C448: b _0802C472 .align 2, 0 _0802C458: .4byte gSprites -_0802C45C: .4byte gUnknown_02024BE0 +_0802C45C: .4byte gObjectBankIDs _0802C460: .4byte gUnknown_03004344 _0802C464: .4byte sub_8010574 _0802C468: @@ -630,9 +630,9 @@ _0802C480: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] - ldr r1, _0802C4B4 @ =gUnknown_02024A68 + ldr r1, _0802C4B4 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -640,7 +640,7 @@ _0802C480: beq _0802C478 movs r4, 0 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -651,7 +651,7 @@ _0802C480: beq _0802C4C2 b _0802C500 .align 2, 0 -_0802C4B4: .4byte gUnknown_02024A68 +_0802C4B4: .4byte gNoOfAllBanks _0802C4B8: cmp r0, 0x2 beq _0802C4C2 @@ -659,12 +659,12 @@ _0802C4B8: beq _0802C4FE b _0802C500 _0802C4C2: - ldr r2, _0802C520 @ =gUnknown_02024A60 + ldr r2, _0802C520 @ =gActiveBank ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 bne _0802C4FE - ldr r1, _0802C524 @ =gUnknown_02024A6A + ldr r1, _0802C524 @ =gBattlePartyID ldrb r2, [r2] lsls r0, r2, 1 adds r0, r1 @@ -673,7 +673,7 @@ _0802C4C2: muls r0, r1 ldr r1, _0802C528 @ =gPlayerParty adds r0, r1 - ldr r1, _0802C52C @ =gUnknown_02024E64 + ldr r1, _0802C52C @ =gMoveSelectionCursor adds r2, r1 ldrb r1, [r2] adds r1, 0xD @@ -691,7 +691,7 @@ _0802C4C2: _0802C4FE: adds r4, 0x1 _0802C500: - ldr r0, _0802C534 @ =gUnknown_02024C0C + ldr r0, _0802C534 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _0802C538 @ =gBitTable ldrb r0, [r5] @@ -708,12 +708,12 @@ _0802C518: beq _0802C448 b _0802C640 .align 2, 0 -_0802C520: .4byte gUnknown_02024A60 -_0802C524: .4byte gUnknown_02024A6A +_0802C520: .4byte gActiveBank +_0802C524: .4byte gBattlePartyID _0802C528: .4byte gPlayerParty -_0802C52C: .4byte gUnknown_02024E64 +_0802C52C: .4byte gMoveSelectionCursor _0802C530: .4byte gBattleMoves -_0802C534: .4byte gUnknown_02024C0C +_0802C534: .4byte gAbsentBankFlags _0802C538: .4byte gBitTable _0802C53C: .4byte gUnknown_03004344 _0802C540: @@ -726,7 +726,7 @@ _0802C54A: movs r0, 0x5 bl PlaySE ldr r2, _0802C57C @ =gSprites - ldr r1, _0802C580 @ =gUnknown_02024BE0 + ldr r1, _0802C580 @ =gObjectBankIDs ldr r3, _0802C584 @ =gUnknown_03004344 ldrb r0, [r3] adds r0, r1 @@ -741,7 +741,7 @@ _0802C54A: adds r5, r3, 0 _0802C56C: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r1, r0, 24 movs r4, 0 @@ -749,7 +749,7 @@ _0802C56C: b _0802C596 .align 2, 0 _0802C57C: .4byte gSprites -_0802C580: .4byte gUnknown_02024BE0 +_0802C580: .4byte gObjectBankIDs _0802C584: .4byte gUnknown_03004344 _0802C588: .4byte sub_8010574 _0802C58C: @@ -771,9 +771,9 @@ _0802C5A4: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] - ldr r1, _0802C5D8 @ =gUnknown_02024A68 + ldr r1, _0802C5D8 @ =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -781,7 +781,7 @@ _0802C5A4: beq _0802C59C movs r4, 0 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -792,7 +792,7 @@ _0802C5A4: beq _0802C5E6 b _0802C624 .align 2, 0 -_0802C5D8: .4byte gUnknown_02024A68 +_0802C5D8: .4byte gNoOfAllBanks _0802C5DC: cmp r0, 0x2 beq _0802C5E6 @@ -800,12 +800,12 @@ _0802C5DC: beq _0802C622 b _0802C624 _0802C5E6: - ldr r2, _0802C660 @ =gUnknown_02024A60 + ldr r2, _0802C660 @ =gActiveBank ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 bne _0802C622 - ldr r1, _0802C664 @ =gUnknown_02024A6A + ldr r1, _0802C664 @ =gBattlePartyID ldrb r2, [r2] lsls r0, r2, 1 adds r0, r1 @@ -814,7 +814,7 @@ _0802C5E6: muls r0, r1 ldr r1, _0802C668 @ =gPlayerParty adds r0, r1 - ldr r1, _0802C66C @ =gUnknown_02024E64 + ldr r1, _0802C66C @ =gMoveSelectionCursor adds r2, r1 ldrb r1, [r2] adds r1, 0xD @@ -832,7 +832,7 @@ _0802C5E6: _0802C622: adds r4, 0x1 _0802C624: - ldr r0, _0802C674 @ =gUnknown_02024C0C + ldr r0, _0802C674 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _0802C678 @ =gBitTable ldrb r0, [r5] @@ -849,7 +849,7 @@ _0802C63C: beq _0802C56C _0802C640: ldr r2, _0802C680 @ =gSprites - ldr r1, _0802C684 @ =gUnknown_02024BE0 + ldr r1, _0802C684 @ =gObjectBankIDs ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -866,16 +866,16 @@ _0802C658: pop {r0} bx r0 .align 2, 0 -_0802C660: .4byte gUnknown_02024A60 -_0802C664: .4byte gUnknown_02024A6A +_0802C660: .4byte gActiveBank +_0802C664: .4byte gBattlePartyID _0802C668: .4byte gPlayerParty -_0802C66C: .4byte gUnknown_02024E64 +_0802C66C: .4byte gMoveSelectionCursor _0802C670: .4byte gBattleMoves -_0802C674: .4byte gUnknown_02024C0C +_0802C674: .4byte gAbsentBankFlags _0802C678: .4byte gBitTable _0802C67C: .4byte gUnknown_03004344 _0802C680: .4byte gSprites -_0802C684: .4byte gUnknown_02024BE0 +_0802C684: .4byte gObjectBankIDs _0802C688: .4byte sub_8010520 thumb_func_end sub_802C2EC @@ -887,7 +887,7 @@ sub_802C68C: @ 802C68C sub sp, 0x8 movs r0, 0 mov r8, r0 - ldr r7, _0802C6E4 @ =gUnknown_02024A60 + ldr r7, _0802C6E4 @ =gActiveBank ldrb r2, [r7] lsls r0, r2, 9 ldr r1, _0802C6E8 @ =gUnknown_02023A64 @@ -903,7 +903,7 @@ sub_802C68C: @ 802C68C _0802C6B2: movs r0, 0x5 bl PlaySE - ldr r1, _0802C6F0 @ =gUnknown_02024E64 + ldr r1, _0802C6F0 @ =gMoveSelectionCursor ldrb r0, [r7] adds r0, r1 ldrb r0, [r0] @@ -926,10 +926,10 @@ _0802C6B2: ands r4, r0 b _0802C702 .align 2, 0 -_0802C6E4: .4byte gUnknown_02024A60 +_0802C6E4: .4byte gActiveBank _0802C6E8: .4byte gUnknown_02023A64 _0802C6EC: .4byte gMain -_0802C6F0: .4byte gUnknown_02024E64 +_0802C6F0: .4byte gMoveSelectionCursor _0802C6F4: ldr r2, _0802C714 @ =gBattleMoves ldrh r1, [r1] @@ -944,29 +944,29 @@ _0802C702: cmp r0, 0 beq _0802C720 ldr r0, _0802C718 @ =gUnknown_03004344 - ldr r1, _0802C71C @ =gUnknown_02024A60 + ldr r1, _0802C71C @ =gActiveBank ldrb r1, [r1] strb r1, [r0] b _0802C73A .align 2, 0 _0802C714: .4byte gBattleMoves _0802C718: .4byte gUnknown_03004344 -_0802C71C: .4byte gUnknown_02024A60 +_0802C71C: .4byte gActiveBank _0802C720: - ldr r0, _0802C764 @ =gUnknown_02024A60 + ldr r0, _0802C764 @ =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r2, 0x1 movs r0, 0x1 ands r0, r1 eors r0, r2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, _0802C768 @ =gUnknown_03004344 strb r0, [r1] _0802C73A: - ldr r3, _0802C76C @ =gUnknown_02023A60 - ldr r5, _0802C764 @ =gUnknown_02024A60 + ldr r3, _0802C76C @ =gBattleBufferA + ldr r5, _0802C764 @ =gActiveBank ldrb r2, [r5] lsls r1, r2, 9 adds r0, r3, 0x1 @@ -987,9 +987,9 @@ _0802C73A: add r8, r2 b _0802C7B2 .align 2, 0 -_0802C764: .4byte gUnknown_02024A60 +_0802C764: .4byte gActiveBank _0802C768: .4byte gUnknown_03004344 -_0802C76C: .4byte gUnknown_02023A60 +_0802C76C: .4byte gBattleBufferA _0802C770: movs r0, 0x7D ands r0, r4 @@ -998,7 +998,7 @@ _0802C770: movs r0, 0x1 add r8, r0 _0802C77C: - ldr r0, _0802C7D0 @ =gUnknown_02024E64 + ldr r0, _0802C7D0 @ =gMoveSelectionCursor adds r0, r2, r0 adds r1, r6, 0 adds r1, 0x8 @@ -1012,7 +1012,7 @@ _0802C77C: cmp r0, 0 bne _0802C7B2 movs r0, 0 - bl sub_803C348 + bl CountAliveMons lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1029,8 +1029,8 @@ _0802C7B2: bne _0802C7DC _0802C7B8: bl DestroyMenuCursor - ldr r1, _0802C7D0 @ =gUnknown_02024E64 - ldr r0, _0802C7D8 @ =gUnknown_02024A60 + ldr r1, _0802C7D0 @ =gMoveSelectionCursor + ldr r0, _0802C7D8 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -1040,12 +1040,12 @@ _0802C7B8: orrs r2, r0 b _0802C888 .align 2, 0 -_0802C7D0: .4byte gUnknown_02024E64 +_0802C7D0: .4byte gMoveSelectionCursor _0802C7D4: .4byte gUnknown_03004344 -_0802C7D8: .4byte gUnknown_02024A60 +_0802C7D8: .4byte gActiveBank _0802C7DC: - ldr r1, _0802C7F8 @ =gUnknown_03004330 - ldr r2, _0802C7FC @ =gUnknown_02024A60 + ldr r1, _0802C7F8 @ =gBattleBankFunc + ldr r2, _0802C7FC @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -1059,14 +1059,14 @@ _0802C7DC: ldrb r0, [r2] b _0802C838 .align 2, 0 -_0802C7F8: .4byte gUnknown_03004330 -_0802C7FC: .4byte gUnknown_02024A60 +_0802C7F8: .4byte gBattleBankFunc +_0802C7FC: .4byte gActiveBank _0802C800: .4byte sub_802C2EC _0802C804: .4byte gUnknown_03004344 _0802C808: movs r0, 0x1 - bl battle_get_side_with_given_state - ldr r1, _0802C828 @ =gUnknown_02024C0C + bl GetBankByPlayerAI + ldr r1, _0802C828 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _0802C82C @ =gBitTable lsls r0, 24 @@ -1079,17 +1079,17 @@ _0802C808: movs r0, 0x3 b _0802C832 .align 2, 0 -_0802C828: .4byte gUnknown_02024C0C +_0802C828: .4byte gAbsentBankFlags _0802C82C: .4byte gBitTable _0802C830: movs r0, 0x1 _0802C832: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, _0802C854 @ =gUnknown_03004344 _0802C838: strb r0, [r1] ldr r2, _0802C858 @ =gSprites - ldr r1, _0802C85C @ =gUnknown_02024BE0 + ldr r1, _0802C85C @ =gObjectBankIDs ldr r0, _0802C854 @ =gUnknown_03004344 ldrb r0, [r0] adds r0, r1 @@ -1104,7 +1104,7 @@ _0802C838: .align 2, 0 _0802C854: .4byte gUnknown_03004344 _0802C858: .4byte gSprites -_0802C85C: .4byte gUnknown_02024BE0 +_0802C85C: .4byte gObjectBankIDs _0802C860: .4byte sub_8010520 _0802C864: movs r6, 0x2 @@ -1127,7 +1127,7 @@ _0802C888: movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0802CA38 .align 2, 0 _0802C898: .4byte gUnknown_030042A4 @@ -1138,7 +1138,7 @@ _0802C8A4: ands r0, r1 cmp r0, 0 beq _0802C8D4 - ldr r4, _0802C8D0 @ =gUnknown_02024E64 + ldr r4, _0802C8D0 @ =gMoveSelectionCursor adds r2, r4 ldrb r1, [r2] adds r0, r5, 0 @@ -1156,13 +1156,13 @@ _0802C8BC: eors r0, r2 b _0802C976 .align 2, 0 -_0802C8D0: .4byte gUnknown_02024E64 +_0802C8D0: .4byte gMoveSelectionCursor _0802C8D4: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _0802C914 - ldr r4, _0802C90C @ =gUnknown_02024E64 + ldr r4, _0802C90C @ =gMoveSelectionCursor adds r3, r2, r4 ldrb r2, [r3] movs r6, 0x1 @@ -1188,14 +1188,14 @@ _0802C8FC: eors r0, r6 b _0802C976 .align 2, 0 -_0802C90C: .4byte gUnknown_02024E64 +_0802C90C: .4byte gMoveSelectionCursor _0802C910: .4byte gUnknown_03004348 _0802C914: movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0802C944 - ldr r4, _0802C940 @ =gUnknown_02024E64 + ldr r4, _0802C940 @ =gMoveSelectionCursor adds r2, r4 ldrb r1, [r2] adds r0, r6, 0 @@ -1213,13 +1213,13 @@ _0802C92C: eors r0, r2 b _0802C976 .align 2, 0 -_0802C940: .4byte gUnknown_02024E64 +_0802C940: .4byte gMoveSelectionCursor _0802C944: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0802C99C - ldr r4, _0802C994 @ =gUnknown_02024E64 + ldr r4, _0802C994 @ =gMoveSelectionCursor adds r3, r2, r4 ldrb r2, [r3] movs r5, 0x2 @@ -1252,7 +1252,7 @@ _0802C976: bl sub_802E2D4 b _0802CA38 .align 2, 0 -_0802C994: .4byte gUnknown_02024E64 +_0802C994: .4byte gMoveSelectionCursor _0802C998: .4byte gUnknown_03004348 _0802C99C: movs r0, 0x4 @@ -1271,7 +1271,7 @@ _0802C99C: lsrs r5, r0, 16 cmp r5, 0 bne _0802CA38 - ldr r4, _0802C9E0 @ =gUnknown_02024E64 + ldr r4, _0802C9E0 @ =gMoveSelectionCursor adds r0, r2, r4 ldrb r0, [r0] ldr r1, _0802C9E4 @ =gUnknown_081FAE80 @@ -1287,7 +1287,7 @@ _0802C99C: .align 2, 0 _0802C9D8: .4byte gUnknown_03004348 _0802C9DC: .4byte gBattleTypeFlags -_0802C9E0: .4byte gUnknown_02024E64 +_0802C9E0: .4byte gMoveSelectionCursor _0802C9E4: .4byte gUnknown_081FAE80 _0802C9E8: .4byte gUnknown_03004344 _0802C9EC: @@ -1319,8 +1319,8 @@ _0802C9F4: bl InitWindow adds r0, r4, 0 bl sub_8002F44 - ldr r1, _0802CA54 @ =gUnknown_03004330 - ldr r0, _0802CA58 @ =gUnknown_02024A60 + ldr r1, _0802CA54 @ =gBattleBankFunc + ldr r0, _0802CA58 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -1339,8 +1339,8 @@ _0802CA44: .4byte gUnknown_03004344 _0802CA48: .4byte gUnknown_03004210 _0802CA4C: .4byte 0x00001016 _0802CA50: .4byte gUnknown_08400D89 -_0802CA54: .4byte gUnknown_03004330 -_0802CA58: .4byte gUnknown_02024A60 +_0802CA54: .4byte gBattleBankFunc +_0802CA58: .4byte gActiveBank _0802CA5C: .4byte sub_802CA60 thumb_func_end sub_802C68C @@ -1362,9 +1362,9 @@ sub_802CA60: @ 802CA60 _0802CA7A: movs r0, 0x5 bl PlaySE - ldr r0, _0802CDF0 @ =gUnknown_02024E64 + ldr r0, _0802CDF0 @ =gMoveSelectionCursor mov r10, r0 - ldr r1, _0802CDF4 @ =gUnknown_02024A60 + ldr r1, _0802CDF4 @ =gActiveBank mov r8, r1 ldrb r1, [r1] adds r2, r1, r0 @@ -1427,7 +1427,7 @@ _0802CA98: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r2, _0802CE00 @ =gUnknown_02024CA8 + ldr r2, _0802CE00 @ =gDisableStructs adds r6, r0, r2 ldrb r4, [r6, 0x18] lsls r3, r4, 24 @@ -1455,7 +1455,7 @@ _0802CA98: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r3, _0802CE00 @ =gUnknown_02024CA8 + ldr r3, _0802CE00 @ =gDisableStructs adds r1, r3 ldrb r4, [r1, 0x18] lsrs r3, r4, 4 @@ -1500,7 +1500,7 @@ _0802CB76: adds r6, 0x1 cmp r6, 0x3 ble _0802CB76 - ldr r1, _0802CDF0 @ =gUnknown_02024E64 + ldr r1, _0802CDF0 @ =gMoveSelectionCursor ldrb r0, [r7] adds r0, r1 ldrb r0, [r0] @@ -1583,7 +1583,7 @@ _0802CC0C: adds r6, 0x1 cmp r6, 0x3 ble _0802CC0C - ldr r2, _0802CDF4 @ =gUnknown_02024A60 + ldr r2, _0802CDF4 @ =gActiveBank ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -1604,7 +1604,7 @@ _0802CC4E: str r0, [sp, 0x24] add r1, sp, 0x14 mov r10, r1 - ldr r3, _0802CE0C @ =gUnknown_02024A6A + ldr r3, _0802CE0C @ =gBattlePartyID mov r9, r3 mov r8, r2 movs r7, 0x64 @@ -1639,8 +1639,8 @@ _0802CC66: adds r6, 0x1 cmp r6, 0x3 ble _0802CC66 - ldr r1, _0802CE0C @ =gUnknown_02024A6A - ldr r0, _0802CDF4 @ =gUnknown_02024A60 + ldr r1, _0802CE0C @ =gBattlePartyID + ldr r0, _0802CDF4 @ =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1670,8 +1670,8 @@ _0802CCC6: adds r6, 0x1 cmp r6, 0x3 ble _0802CCC6 - ldr r4, _0802CDF0 @ =gUnknown_02024E64 - ldr r3, _0802CDF4 @ =gUnknown_02024A60 + ldr r4, _0802CDF0 @ =gMoveSelectionCursor + ldr r3, _0802CDF4 @ =gActiveBank ldrb r0, [r3] adds r0, r4 ldrb r1, [r0] @@ -1747,9 +1747,9 @@ _0802CD5E: cmp r6, 0x3 ble _0802CD5E movs r6, 0 - ldr r3, _0802CE0C @ =gUnknown_02024A6A + ldr r3, _0802CE0C @ =gBattlePartyID mov r10, r3 - ldr r5, _0802CDF4 @ =gUnknown_02024A60 + ldr r5, _0802CDF4 @ =gActiveBank mov r9, r5 movs r0, 0x64 mov r8, r0 @@ -1789,8 +1789,8 @@ _0802CD8C: adds r6, 0x1 cmp r6, 0x3 ble _0802CD8C - ldr r1, _0802CE0C @ =gUnknown_02024A6A - ldr r0, _0802CDF4 @ =gUnknown_02024A60 + ldr r1, _0802CE0C @ =gBattlePartyID + ldr r0, _0802CDF4 @ =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1805,28 +1805,28 @@ _0802CD8C: b _0802CE1C .align 2, 0 _0802CDEC: .4byte gMain -_0802CDF0: .4byte gUnknown_02024E64 -_0802CDF4: .4byte gUnknown_02024A60 +_0802CDF0: .4byte gMoveSelectionCursor +_0802CDF4: .4byte gActiveBank _0802CDF8: .4byte gUnknown_03004344 _0802CDFC: .4byte gUnknown_02023A64 -_0802CE00: .4byte gUnknown_02024CA8 +_0802CE00: .4byte gDisableStructs _0802CE04: .4byte gBitTable _0802CE08: .4byte gBattleMons -_0802CE0C: .4byte gUnknown_02024A6A +_0802CE0C: .4byte gBattlePartyID _0802CE10: .4byte gPlayerParty _0802CE14: ldrb r0, [r5] ldr r1, _0802CF20 @ =gUnknown_08400D49 bl sub_802E12C _0802CE1C: - ldr r1, _0802CF24 @ =gUnknown_03004330 - ldr r2, _0802CF28 @ =gUnknown_02024A60 + ldr r1, _0802CF24 @ =gBattleBankFunc + ldr r2, _0802CF28 @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 ldr r1, _0802CF2C @ =sub_802C68C str r1, [r0] - ldr r3, _0802CF30 @ =gUnknown_02024E64 + ldr r3, _0802CF30 @ =gMoveSelectionCursor ldrb r0, [r2] adds r0, r3 ldr r1, _0802CF34 @ =gUnknown_03004344 @@ -1871,8 +1871,8 @@ _0802CE78: ldr r0, _0802CF34 @ =gUnknown_03004344 ldrb r0, [r0] bl nullsub_7 - ldr r5, _0802CF30 @ =gUnknown_02024E64 - ldr r4, _0802CF28 @ =gUnknown_02024A60 + ldr r5, _0802CF30 @ =gMoveSelectionCursor + ldr r4, _0802CF28 @ =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1883,7 +1883,7 @@ _0802CE78: ldrb r0, [r0] ldr r1, _0802CF20 @ =gUnknown_08400D49 bl sub_802E12C - ldr r1, _0802CF24 @ =gUnknown_03004330 + ldr r1, _0802CF24 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -1923,8 +1923,8 @@ _0802CEF0: ands r0, r2 cmp r0, 0 beq _0802CF8C - ldr r0, _0802CF30 @ =gUnknown_02024E64 - ldr r1, _0802CF28 @ =gUnknown_02024A60 + ldr r0, _0802CF30 @ =gMoveSelectionCursor + ldr r1, _0802CF28 @ =gActiveBank ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] @@ -1936,10 +1936,10 @@ _0802CEF0: b _0802CF4E .align 2, 0 _0802CF20: .4byte gUnknown_08400D49 -_0802CF24: .4byte gUnknown_03004330 -_0802CF28: .4byte gUnknown_02024A60 +_0802CF24: .4byte gBattleBankFunc +_0802CF28: .4byte gActiveBank _0802CF2C: .4byte sub_802C68C -_0802CF30: .4byte gUnknown_02024E64 +_0802CF30: .4byte gMoveSelectionCursor _0802CF34: .4byte gUnknown_03004344 _0802CF38: .4byte gUnknown_03004210 _0802CF3C: .4byte 0x00001016 @@ -1956,8 +1956,8 @@ _0802CF4E: strb r0, [r4] movs r0, 0x5 bl PlaySE - ldr r1, _0802CF7C @ =gUnknown_02024E64 - ldr r0, _0802CF80 @ =gUnknown_02024A60 + ldr r1, _0802CF7C @ =gMoveSelectionCursor + ldr r0, _0802CF80 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -1970,8 +1970,8 @@ _0802CF4E: b _0802CF8C .align 2, 0 _0802CF78: .4byte gUnknown_03004344 -_0802CF7C: .4byte gUnknown_02024E64 -_0802CF80: .4byte gUnknown_02024A60 +_0802CF7C: .4byte gMoveSelectionCursor +_0802CF80: .4byte gActiveBank _0802CF84: ldrb r0, [r4] movs r1, 0x1B @@ -1995,8 +1995,8 @@ _0802CF8C: ldrb r1, [r1] cmp r0, r1 bcs _0802D020 - ldr r0, _0802CFD4 @ =gUnknown_02024E64 - ldr r1, _0802CFD8 @ =gUnknown_02024A60 + ldr r0, _0802CFD4 @ =gMoveSelectionCursor + ldr r1, _0802CFD8 @ =gActiveBank ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] @@ -2010,8 +2010,8 @@ _0802CF8C: _0802CFC8: .4byte gMain _0802CFCC: .4byte gUnknown_03004344 _0802CFD0: .4byte gUnknown_03004348 -_0802CFD4: .4byte gUnknown_02024E64 -_0802CFD8: .4byte gUnknown_02024A60 +_0802CFD4: .4byte gMoveSelectionCursor +_0802CFD8: .4byte gActiveBank _0802CFDC: ldrb r0, [r3] bl nullsub_7 @@ -2023,8 +2023,8 @@ _0802CFE2: strb r0, [r4] movs r0, 0x5 bl PlaySE - ldr r1, _0802D010 @ =gUnknown_02024E64 - ldr r0, _0802D014 @ =gUnknown_02024A60 + ldr r1, _0802D010 @ =gMoveSelectionCursor + ldr r0, _0802D014 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -2037,8 +2037,8 @@ _0802CFE2: b _0802D020 .align 2, 0 _0802D00C: .4byte gUnknown_03004344 -_0802D010: .4byte gUnknown_02024E64 -_0802D014: .4byte gUnknown_02024A60 +_0802D010: .4byte gMoveSelectionCursor +_0802D014: .4byte gActiveBank _0802D018: ldrb r0, [r4] movs r1, 0x1B @@ -2056,8 +2056,8 @@ _0802D020: ands r0, r2 cmp r0, 0 beq _0802D0A4 - ldr r0, _0802D058 @ =gUnknown_02024E64 - ldr r1, _0802D05C @ =gUnknown_02024A60 + ldr r0, _0802D058 @ =gMoveSelectionCursor + ldr r1, _0802D05C @ =gActiveBank ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] @@ -2070,8 +2070,8 @@ _0802D020: .align 2, 0 _0802D050: .4byte gMain _0802D054: .4byte gUnknown_03004344 -_0802D058: .4byte gUnknown_02024E64 -_0802D05C: .4byte gUnknown_02024A60 +_0802D058: .4byte gMoveSelectionCursor +_0802D05C: .4byte gActiveBank _0802D060: ldrb r0, [r3] bl nullsub_7 @@ -2083,8 +2083,8 @@ _0802D066: strb r0, [r4] movs r0, 0x5 bl PlaySE - ldr r1, _0802D094 @ =gUnknown_02024E64 - ldr r0, _0802D098 @ =gUnknown_02024A60 + ldr r1, _0802D094 @ =gMoveSelectionCursor + ldr r0, _0802D098 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -2097,8 +2097,8 @@ _0802D066: b _0802D0A4 .align 2, 0 _0802D090: .4byte gUnknown_03004344 -_0802D094: .4byte gUnknown_02024E64 -_0802D098: .4byte gUnknown_02024A60 +_0802D094: .4byte gMoveSelectionCursor +_0802D098: .4byte gActiveBank _0802D09C: ldrb r0, [r4] movs r1, 0x1B @@ -2122,8 +2122,8 @@ _0802D0A4: ldrb r1, [r1] cmp r0, r1 bcs _0802D138 - ldr r0, _0802D0EC @ =gUnknown_02024E64 - ldr r1, _0802D0F0 @ =gUnknown_02024A60 + ldr r0, _0802D0EC @ =gMoveSelectionCursor + ldr r1, _0802D0F0 @ =gActiveBank ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] @@ -2137,8 +2137,8 @@ _0802D0A4: _0802D0E0: .4byte gMain _0802D0E4: .4byte gUnknown_03004344 _0802D0E8: .4byte gUnknown_03004348 -_0802D0EC: .4byte gUnknown_02024E64 -_0802D0F0: .4byte gUnknown_02024A60 +_0802D0EC: .4byte gMoveSelectionCursor +_0802D0F0: .4byte gActiveBank _0802D0F4: ldrb r0, [r3] bl nullsub_7 @@ -2150,8 +2150,8 @@ _0802D0FA: strb r0, [r4] movs r0, 0x5 bl PlaySE - ldr r1, _0802D128 @ =gUnknown_02024E64 - ldr r0, _0802D12C @ =gUnknown_02024A60 + ldr r1, _0802D128 @ =gMoveSelectionCursor + ldr r0, _0802D12C @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -2164,8 +2164,8 @@ _0802D0FA: b _0802D138 .align 2, 0 _0802D124: .4byte gUnknown_03004344 -_0802D128: .4byte gUnknown_02024E64 -_0802D12C: .4byte gUnknown_02024A60 +_0802D128: .4byte gMoveSelectionCursor +_0802D12C: .4byte gActiveBank _0802D130: ldrb r0, [r4] movs r1, 0x1B @@ -2198,7 +2198,7 @@ sub_802D148: @ 802D148 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _0802D184 @ =gUnknown_030042D0 + ldr r0, _0802D184 @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r3] ldr r0, _0802D188 @ =c2_8011A1C @@ -2210,7 +2210,7 @@ _0802D174: _0802D178: .4byte gReceivedRemoteLinkPlayers _0802D17C: .4byte gMain _0802D180: .4byte 0x0000043d -_0802D184: .4byte gUnknown_030042D0 +_0802D184: .4byte gPreBattleCallback1 _0802D188: .4byte c2_8011A1C thumb_func_end sub_802D148 @@ -2230,8 +2230,8 @@ sub_802D18C: @ 802D18C cmp r0, 0 beq _0802D1D0 bl sub_800832C - ldr r1, _0802D1C4 @ =gUnknown_03004330 - ldr r0, _0802D1C8 @ =gUnknown_02024A60 + ldr r1, _0802D1C4 @ =gBattleBankFunc + ldr r0, _0802D1C8 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -2241,8 +2241,8 @@ sub_802D18C: @ 802D18C .align 2, 0 _0802D1BC: .4byte gPaletteFade _0802D1C0: .4byte gBattleTypeFlags -_0802D1C4: .4byte gUnknown_03004330 -_0802D1C8: .4byte gUnknown_02024A60 +_0802D1C4: .4byte gBattleBankFunc +_0802D1C8: .4byte gActiveBank _0802D1CC: .4byte sub_802D148 _0802D1D0: movs r0, 0x5A @@ -2255,7 +2255,7 @@ _0802D1D0: negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r0, _0802D200 @ =gUnknown_030042D0 + ldr r0, _0802D200 @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r2] ldr r0, [r2, 0x8] @@ -2266,15 +2266,15 @@ _0802D1F2: .align 2, 0 _0802D1F8: .4byte gMain _0802D1FC: .4byte 0x0000043d -_0802D200: .4byte gUnknown_030042D0 +_0802D200: .4byte gPreBattleCallback1 thumb_func_end sub_802D18C thumb_func_start sub_802D204 sub_802D204: @ 802D204 push {lr} ldr r2, _0802D22C @ =gSprites - ldr r1, _0802D230 @ =gUnknown_02024BE0 - ldr r0, _0802D234 @ =gUnknown_02024A60 + ldr r1, _0802D230 @ =gObjectBankIDs + ldr r0, _0802D234 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2287,14 +2287,14 @@ sub_802D204: @ 802D204 ldr r0, _0802D238 @ =SpriteCallbackDummy cmp r1, r0 bne _0802D228 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802D228: pop {r0} bx r0 .align 2, 0 _0802D22C: .4byte gSprites -_0802D230: .4byte gUnknown_02024BE0 -_0802D234: .4byte gUnknown_02024A60 +_0802D230: .4byte gObjectBankIDs +_0802D234: .4byte gActiveBank _0802D238: .4byte SpriteCallbackDummy thumb_func_end sub_802D204 @@ -2302,8 +2302,8 @@ _0802D238: .4byte SpriteCallbackDummy sub_802D23C: @ 802D23C push {lr} ldr r2, _0802D264 @ =gSprites - ldr r1, _0802D268 @ =gUnknown_02024BE0 - ldr r0, _0802D26C @ =gUnknown_02024A60 + ldr r1, _0802D268 @ =gObjectBankIDs + ldr r0, _0802D26C @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2316,14 +2316,14 @@ sub_802D23C: @ 802D23C ldr r0, _0802D270 @ =SpriteCallbackDummy cmp r1, r0 bne _0802D260 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802D260: pop {r0} bx r0 .align 2, 0 _0802D264: .4byte gSprites -_0802D268: .4byte gUnknown_02024BE0 -_0802D26C: .4byte gUnknown_02024A60 +_0802D268: .4byte gObjectBankIDs +_0802D26C: .4byte gActiveBank _0802D270: .4byte SpriteCallbackDummy thumb_func_end sub_802D23C @@ -2331,8 +2331,8 @@ _0802D270: .4byte SpriteCallbackDummy sub_802D274: @ 802D274 push {r4-r6,lr} ldr r6, _0802D2CC @ =gSprites - ldr r5, _0802D2D0 @ =gUnknown_02024BE0 - ldr r4, _0802D2D4 @ =gUnknown_02024A60 + ldr r5, _0802D2D0 @ =gObjectBankIDs + ldr r4, _0802D2D4 @ =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -2365,15 +2365,15 @@ sub_802D274: @ 802D274 lsls r0, 2 adds r0, r6 bl DestroySprite - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802D2C6: pop {r4-r6} pop {r0} bx r0 .align 2, 0 _0802D2CC: .4byte gSprites -_0802D2D0: .4byte gUnknown_02024BE0 -_0802D2D4: .4byte gUnknown_02024A60 +_0802D2D0: .4byte gObjectBankIDs +_0802D2D4: .4byte gActiveBank _0802D2D8: .4byte SpriteCallbackDummy _0802D2DC: .4byte gSaveBlock2 thumb_func_end sub_802D274 @@ -2381,7 +2381,7 @@ _0802D2DC: .4byte gSaveBlock2 thumb_func_start sub_802D2E0 sub_802D2E0: @ 802D2E0 push {lr} - ldr r3, _0802D314 @ =gUnknown_02024A60 + ldr r3, _0802D314 @ =gActiveBank ldrb r0, [r3] lsls r1, r0, 1 adds r1, r0 @@ -2402,12 +2402,12 @@ sub_802D2E0: @ 802D2E0 adds r1, r2 movs r0, 0 strb r0, [r1, 0x9] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802D310: pop {r0} bx r0 .align 2, 0 -_0802D314: .4byte gUnknown_02024A60 +_0802D314: .4byte gActiveBank _0802D318: .4byte 0x02017810 thumb_func_end sub_802D2E0 @@ -2431,8 +2431,8 @@ sub_802D31C: @ 802D31C beq _0802D374 _0802D340: ldr r2, _0802D364 @ =gSprites - ldr r1, _0802D368 @ =gUnknown_03004340 - ldr r0, _0802D36C @ =gUnknown_02024A60 + ldr r1, _0802D368 @ =gHealthboxIDs + ldr r0, _0802D36C @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2449,13 +2449,13 @@ _0802D340: .align 2, 0 _0802D360: .4byte gBattleTypeFlags _0802D364: .4byte gSprites -_0802D368: .4byte gUnknown_03004340 -_0802D36C: .4byte gUnknown_02024A60 +_0802D368: .4byte gHealthboxIDs +_0802D36C: .4byte gActiveBank _0802D370: .4byte SpriteCallbackDummy _0802D374: ldr r2, _0802D45C @ =gSprites - ldr r5, _0802D460 @ =gUnknown_03004340 - ldr r0, _0802D464 @ =gUnknown_02024A60 + ldr r5, _0802D460 @ =gHealthboxIDs + ldr r0, _0802D464 @ =gActiveBank ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -2492,7 +2492,7 @@ _0802D3B6: bne _0802D3BC b _0802D4DA _0802D3BC: - ldr r7, _0802D464 @ =gUnknown_02024A60 + ldr r7, _0802D464 @ =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r2 @@ -2571,8 +2571,8 @@ _0802D3D8: b _0802D488 .align 2, 0 _0802D45C: .4byte gSprites -_0802D460: .4byte gUnknown_03004340 -_0802D464: .4byte gUnknown_02024A60 +_0802D460: .4byte gHealthboxIDs +_0802D464: .4byte gActiveBank _0802D468: .4byte SpriteCallbackDummy _0802D46C: .4byte 0x02017810 _0802D470: .4byte 0x000027f9 @@ -2585,8 +2585,8 @@ _0802D47C: lsls r2, 1 bl m4aMPlayVolumeControl _0802D488: - ldr r7, _0802D4E8 @ =gUnknown_02024A6A - ldr r4, _0802D4EC @ =gUnknown_02024A60 + ldr r7, _0802D4E8 @ =gBattlePartyID + ldr r4, _0802D4EC @ =gActiveBank ldrb r1, [r4] lsls r0, r1, 1 adds r0, r7 @@ -2618,7 +2618,7 @@ _0802D4BE: adds r0, r1 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _0802D4F8 @ =gUnknown_03004330 + ldr r1, _0802D4F8 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -2631,18 +2631,18 @@ _0802D4DA: .align 2, 0 _0802D4E0: .4byte gMPlay_BGM _0802D4E4: .4byte 0x0000ffff -_0802D4E8: .4byte gUnknown_02024A6A -_0802D4EC: .4byte gUnknown_02024A60 +_0802D4E8: .4byte gBattlePartyID +_0802D4EC: .4byte gActiveBank _0802D4F0: .4byte gPlayerParty _0802D4F4: .4byte 0x02017810 -_0802D4F8: .4byte gUnknown_03004330 +_0802D4F8: .4byte gBattleBankFunc _0802D4FC: .4byte sub_802D2E0 thumb_func_end sub_802D31C thumb_func_start sub_802D500 sub_802D500: @ 802D500 push {r4-r7,lr} - ldr r5, _0802D654 @ =gUnknown_02024A60 + ldr r5, _0802D654 @ =gActiveBank ldrb r2, [r5] lsls r3, r2, 1 adds r0, r3, r2 @@ -2655,7 +2655,7 @@ sub_802D500: @ 802D500 ands r0, r1 cmp r0, 0 bne _0802D530 - ldr r0, _0802D65C @ =gUnknown_02024A6A + ldr r0, _0802D65C @ =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -2678,7 +2678,7 @@ _0802D530: ands r0, r1 cmp r0, 0 bne _0802D55E - ldr r0, _0802D65C @ =gUnknown_02024A6A + ldr r0, _0802D65C @ =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -2731,13 +2731,13 @@ _0802D55E: ldr r1, _0802D66C @ =gSprites adds r0, r1 bl DestroySprite - ldr r4, _0802D670 @ =gUnknown_03004340 + ldr r4, _0802D670 @ =gHealthboxIDs ldrb r0, [r5] adds r1, r6, 0 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0802D65C @ =gUnknown_02024A6A + ldr r2, _0802D65C @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -2757,7 +2757,7 @@ _0802D55E: bl sub_8043DFC _0802D5EE: ldr r1, _0802D668 @ =gUnknown_0300434C - ldr r4, _0802D654 @ =gUnknown_02024A60 + ldr r4, _0802D654 @ =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -2767,11 +2767,11 @@ _0802D5EE: ldr r1, _0802D66C @ =gSprites adds r0, r1 bl DestroySprite - ldr r5, _0802D670 @ =gUnknown_03004340 + ldr r5, _0802D670 @ =gHealthboxIDs ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _0802D65C @ =gUnknown_02024A6A + ldr r2, _0802D65C @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -2793,7 +2793,7 @@ _0802D5EE: negs r0, r0 ands r0, r1 strb r0, [r2, 0x9] - ldr r1, _0802D678 @ =gUnknown_03004330 + ldr r1, _0802D678 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -2804,16 +2804,16 @@ _0802D64C: pop {r0} bx r0 .align 2, 0 -_0802D654: .4byte gUnknown_02024A60 +_0802D654: .4byte gActiveBank _0802D658: .4byte 0x02017810 -_0802D65C: .4byte gUnknown_02024A6A +_0802D65C: .4byte gBattlePartyID _0802D660: .4byte gPlayerParty _0802D664: .4byte gBattleTypeFlags _0802D668: .4byte gUnknown_0300434C _0802D66C: .4byte gSprites -_0802D670: .4byte gUnknown_03004340 +_0802D670: .4byte gHealthboxIDs _0802D674: .4byte 0x02017840 -_0802D678: .4byte gUnknown_03004330 +_0802D678: .4byte gBattleBankFunc _0802D67C: .4byte sub_802D31C thumb_func_end sub_802D500 @@ -2821,8 +2821,8 @@ _0802D67C: .4byte sub_802D31C sub_802D680: @ 802D680 push {r4-r6,lr} ldr r2, _0802D710 @ =gSprites - ldr r0, _0802D714 @ =gUnknown_03004340 - ldr r6, _0802D718 @ =gUnknown_02024A60 + ldr r0, _0802D714 @ =gHealthboxIDs + ldr r6, _0802D718 @ =gActiveBank ldrb r3, [r6] adds r0, r3, r0 ldrb r1, [r0] @@ -2879,7 +2879,7 @@ sub_802D680: @ 802D680 movs r3, 0x6 bl move_anim_start_t4 _0802D6FC: - ldr r0, _0802D728 @ =gUnknown_03004330 + ldr r0, _0802D728 @ =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -2891,19 +2891,19 @@ _0802D708: bx r0 .align 2, 0 _0802D710: .4byte gSprites -_0802D714: .4byte gUnknown_03004340 -_0802D718: .4byte gUnknown_02024A60 +_0802D714: .4byte gHealthboxIDs +_0802D718: .4byte gActiveBank _0802D71C: .4byte SpriteCallbackDummy _0802D720: .4byte 0x02017810 _0802D724: .4byte 0x000027f9 -_0802D728: .4byte gUnknown_03004330 +_0802D728: .4byte gBattleBankFunc _0802D72C: .4byte sub_802D730 thumb_func_end sub_802D680 thumb_func_start sub_802D730 sub_802D730: @ 802D730 push {r4,lr} - ldr r4, _0802D780 @ =gUnknown_02024A60 + ldr r4, _0802D780 @ =gActiveBank ldrb r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -2924,7 +2924,7 @@ sub_802D730: @ 802D730 movs r2, 0x80 lsls r2, 1 bl m4aMPlayVolumeControl - ldr r2, _0802D790 @ =gUnknown_02024A6A + ldr r2, _0802D790 @ =gBattlePartyID ldrb r1, [r4] lsls r0, r1, 1 adds r0, r2 @@ -2934,24 +2934,24 @@ sub_802D730: @ 802D730 ldr r2, _0802D794 @ =gPlayerParty adds r0, r2 bl sub_80324F8 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802D77A: pop {r4} pop {r0} bx r0 .align 2, 0 -_0802D780: .4byte gUnknown_02024A60 +_0802D780: .4byte gActiveBank _0802D784: .4byte 0x02017810 _0802D788: .4byte gMPlay_BGM _0802D78C: .4byte 0x0000ffff -_0802D790: .4byte gUnknown_02024A6A +_0802D790: .4byte gBattlePartyID _0802D794: .4byte gPlayerParty thumb_func_end sub_802D730 thumb_func_start sub_802D798 sub_802D798: @ 802D798 push {r4-r6,lr} - ldr r5, _0802D844 @ =gUnknown_02024A60 + ldr r5, _0802D844 @ =gActiveBank ldrb r2, [r5] lsls r3, r2, 1 adds r0, r3, r2 @@ -2963,7 +2963,7 @@ sub_802D798: @ 802D798 ands r0, r1 cmp r0, 0 bne _0802D7C6 - ldr r0, _0802D84C @ =gUnknown_02024A6A + ldr r0, _0802D84C @ =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -2999,11 +2999,11 @@ _0802D7C6: bne _0802D83C adds r0, r3, r4 bl DestroySprite - ldr r4, _0802D860 @ =gUnknown_03004340 + ldr r4, _0802D860 @ =gHealthboxIDs ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0802D84C @ =gUnknown_02024A6A + ldr r2, _0802D84C @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -3021,7 +3021,7 @@ _0802D7C6: bl sub_8043DFC ldrb r0, [r5] bl sub_8031F88 - ldr r1, _0802D864 @ =gUnknown_03004330 + ldr r1, _0802D864 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3032,15 +3032,15 @@ _0802D83C: pop {r0} bx r0 .align 2, 0 -_0802D844: .4byte gUnknown_02024A60 +_0802D844: .4byte gActiveBank _0802D848: .4byte 0x02017810 -_0802D84C: .4byte gUnknown_02024A6A +_0802D84C: .4byte gBattlePartyID _0802D850: .4byte gPlayerParty _0802D854: .4byte gSprites _0802D858: .4byte gUnknown_0300434C _0802D85C: .4byte SpriteCallbackDummy -_0802D860: .4byte gUnknown_03004340 -_0802D864: .4byte gUnknown_03004330 +_0802D860: .4byte gHealthboxIDs +_0802D864: .4byte gBattleBankFunc _0802D868: .4byte sub_802D680 thumb_func_end sub_802D798 @@ -3072,9 +3072,9 @@ _0802D898: .4byte 0x0000ffff thumb_func_start bx_t1_healthbar_update bx_t1_healthbar_update: @ 802D89C push {r4-r6,lr} - ldr r5, _0802D8DC @ =gUnknown_02024A60 + ldr r5, _0802D8DC @ =gActiveBank ldrb r0, [r5] - ldr r6, _0802D8E0 @ =gUnknown_03004340 + ldr r6, _0802D8E0 @ =gHealthboxIDs adds r1, r0, r6 ldrb r1, [r1] movs r2, 0 @@ -3100,10 +3100,10 @@ bx_t1_healthbar_update: @ 802D89C bl sub_80440EC b _0802D8FE .align 2, 0 -_0802D8DC: .4byte gUnknown_02024A60 -_0802D8E0: .4byte gUnknown_03004340 +_0802D8DC: .4byte gActiveBank +_0802D8E0: .4byte gHealthboxIDs _0802D8E4: - ldr r2, _0802D904 @ =gUnknown_02024A6A + ldr r2, _0802D904 @ =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -3113,13 +3113,13 @@ _0802D8E4: ldr r2, _0802D908 @ =gPlayerParty adds r0, r2 bl sub_80324F8 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802D8FE: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0802D904: .4byte gUnknown_02024A6A +_0802D904: .4byte gBattlePartyID _0802D908: .4byte gPlayerParty thumb_func_end bx_t1_healthbar_update @@ -3130,7 +3130,7 @@ sub_802D90C: @ 802D90C ldrh r0, [r0, 0x16] cmp r0, 0 bne _0802D91A - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802D91A: pop {r0} bx r0 @@ -3167,7 +3167,7 @@ sub_802D924: @ 802D924 lsrs r0, 24 cmp r0, 0x1 beq _0802D96A - ldr r1, _0802DA28 @ =gUnknown_02024A6A + ldr r1, _0802DA28 @ =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -3230,7 +3230,7 @@ _0802D96A: subs r2, r0 ldr r0, [sp, 0xC] subs r2, r0, r2 - ldr r4, _0802DA38 @ =gUnknown_02024A60 + ldr r4, _0802DA38 @ =gActiveBank ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -3244,7 +3244,7 @@ _0802D96A: lsrs r0, 24 cmp r0, 0x1 bne _0802DA40 - ldr r2, _0802DA28 @ =gUnknown_02024A6A + ldr r2, _0802DA28 @ =gBattlePartyID lsls r0, r7, 1 adds r0, r2 mov r1, r10 @@ -3263,11 +3263,11 @@ _0802DA1E: b _0802DA82 .align 2, 0 _0802DA24: .4byte gTasks -_0802DA28: .4byte gUnknown_02024A6A +_0802DA28: .4byte gBattlePartyID _0802DA2C: .4byte gPlayerParty _0802DA30: .4byte gExperienceTables _0802DA34: .4byte gBaseStats -_0802DA38: .4byte gUnknown_02024A60 +_0802DA38: .4byte gActiveBank _0802DA3C: .4byte sub_802DCB0 _0802DA40: ldr r0, _0802DA50 @ =gTasks @@ -3287,7 +3287,7 @@ _0802DA58: adds r0, r6, 0 movs r1, 0x19 bl SetMonData - ldr r1, _0802DA78 @ =gUnknown_03004330 + ldr r1, _0802DA78 @ =gBattleBankFunc ldr r3, [sp, 0x8] lsls r0, r3, 2 adds r0, r1 @@ -3297,7 +3297,7 @@ _0802DA58: bl DestroyTask b _0802DA86 .align 2, 0 -_0802DA78: .4byte gUnknown_03004330 +_0802DA78: .4byte gBattleBankFunc _0802DA7C: .4byte sub_802D90C _0802DA80: ldr r0, _0802DA98 @ =sub_802DA9C @@ -3386,7 +3386,7 @@ sub_802DA9C: @ 802DA9C adds r4, r6 ldr r2, [r4] subs r2, r1 - ldr r0, _0802DB64 @ =gUnknown_03004340 + ldr r0, _0802DB64 @ =gHealthboxIDs add r0, r10 ldrb r1, [r0] mov r0, r9 @@ -3412,7 +3412,7 @@ _0802DB54: .4byte gTasks _0802DB58: .4byte gPlayerParty _0802DB5C: .4byte gExperienceTables _0802DB60: .4byte gBaseStats -_0802DB64: .4byte gUnknown_03004340 +_0802DB64: .4byte gHealthboxIDs _0802DB68: .4byte sub_802DB6C thumb_func_end sub_802DA9C @@ -3448,7 +3448,7 @@ _0802DB9C: ldrh r2, [r6, 0xA] mov r10, r2 ldrb r7, [r6, 0xC] - ldr r5, _0802DC64 @ =gUnknown_03004340 + ldr r5, _0802DC64 @ =gHealthboxIDs adds r5, r7, r5 ldrb r1, [r5] adds r0, r7, 0 @@ -3522,7 +3522,7 @@ _0802DB9C: ldrh r0, [r0] subs r2, r0 subs r2, r4, r2 - ldr r4, _0802DC74 @ =gUnknown_02024A60 + ldr r4, _0802DC74 @ =gActiveBank ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -3535,11 +3535,11 @@ _0802DB9C: str r0, [r6] b _0802DC98 .align 2, 0 -_0802DC64: .4byte gUnknown_03004340 +_0802DC64: .4byte gHealthboxIDs _0802DC68: .4byte gPlayerParty _0802DC6C: .4byte gExperienceTables _0802DC70: .4byte gBaseStats -_0802DC74: .4byte gUnknown_02024A60 +_0802DC74: .4byte gActiveBank _0802DC78: .4byte sub_802DCB0 _0802DC7C: str r0, [sp, 0x4] @@ -3547,7 +3547,7 @@ _0802DC7C: adds r0, r5, 0 movs r1, 0x19 bl SetMonData - ldr r1, _0802DCA8 @ =gUnknown_03004330 + ldr r1, _0802DCA8 @ =gBattleBankFunc lsls r0, r7, 2 adds r0, r1 ldr r1, _0802DCAC @ =sub_802D90C @@ -3564,7 +3564,7 @@ _0802DC98: pop {r0} bx r0 .align 2, 0 -_0802DCA8: .4byte gUnknown_03004330 +_0802DCA8: .4byte gBattleBankFunc _0802DCAC: .4byte sub_802D90C thumb_func_end sub_802DB6C @@ -3585,7 +3585,7 @@ sub_802DCB0: @ 802DCB0 lsrs r0, 24 cmp r0, 0x1 bne _0802DCE4 - ldr r1, _0802DD08 @ =gUnknown_02024A6A + ldr r1, _0802DD08 @ =gBattlePartyID movs r0, 0x2 adds r2, r4, 0 eors r2, r0 @@ -3613,7 +3613,7 @@ _0802DCE4: bx r0 .align 2, 0 _0802DD04: .4byte gTasks -_0802DD08: .4byte gUnknown_02024A6A +_0802DD08: .4byte gBattlePartyID _0802DD0C: .4byte sub_802DD10 thumb_func_end sub_802DCB0 @@ -3652,7 +3652,7 @@ sub_802DD10: @ 802DD10 lsrs r0, 24 cmp r0, 0x1 bne _0802DD8C - ldr r1, _0802DD84 @ =gUnknown_02024A6A + ldr r1, _0802DD84 @ =gBattlePartyID movs r0, 0x2 adds r2, r5, 0 eors r2, r0 @@ -3661,7 +3661,7 @@ sub_802DD10: @ 802DD10 ldrh r0, [r0] cmp r4, r0 bne _0802DD8C - ldr r0, _0802DD88 @ =gUnknown_03004340 + ldr r0, _0802DD88 @ =gHealthboxIDs adds r0, r2, r0 ldrb r0, [r0] adds r1, r7, 0 @@ -3672,10 +3672,10 @@ sub_802DD10: @ 802DD10 _0802DD78: .4byte gTasks _0802DD7C: .4byte 0x02017810 _0802DD80: .4byte gPlayerParty -_0802DD84: .4byte gUnknown_02024A6A -_0802DD88: .4byte gUnknown_03004340 +_0802DD84: .4byte gBattlePartyID +_0802DD88: .4byte gHealthboxIDs _0802DD8C: - ldr r0, _0802DDB4 @ =gUnknown_03004340 + ldr r0, _0802DDB4 @ =gHealthboxIDs adds r0, r5, r0 ldrb r0, [r0] movs r1, 0x64 @@ -3697,7 +3697,7 @@ _0802DDAE: pop {r0} bx r0 .align 2, 0 -_0802DDB4: .4byte gUnknown_03004340 +_0802DDB4: .4byte gHealthboxIDs _0802DDB8: .4byte gPlayerParty _0802DDBC: .4byte gTasks _0802DDC0: .4byte sub_802DDC4 @@ -3722,7 +3722,7 @@ sub_802DDC4: @ 802DDC4 movs r1, 0x38 bl GetMonData ldrb r0, [r4, 0xC] - ldr r1, _0802DE08 @ =gUnknown_03004330 + ldr r1, _0802DE08 @ =gBattleBankFunc lsls r0, 2 adds r0, r1 ldr r1, _0802DE0C @ =sub_802D90C @@ -3735,7 +3735,7 @@ sub_802DDC4: @ 802DDC4 .align 2, 0 _0802DE00: .4byte gTasks _0802DE04: .4byte gPlayerParty -_0802DE08: .4byte gUnknown_03004330 +_0802DE08: .4byte gBattleBankFunc _0802DE0C: .4byte sub_802D90C thumb_func_end sub_802DDC4 @@ -3743,8 +3743,8 @@ _0802DE0C: .4byte sub_802D90C sub_802DE10: @ 802DE10 push {r4-r6,lr} ldr r6, _0802DE94 @ =gSprites - ldr r5, _0802DE98 @ =gUnknown_02024BE0 - ldr r4, _0802DE9C @ =gUnknown_02024A60 + ldr r5, _0802DE98 @ =gObjectBankIDs + ldr r4, _0802DE9C @ =gActiveBank ldrb r2, [r4] adds r0, r2, r5 ldrb r1, [r0] @@ -3759,7 +3759,7 @@ sub_802DE10: @ 802DE10 adds r1, r0 cmp r1, 0xA0 ble _0802DE8C - ldr r1, _0802DEA0 @ =gUnknown_02024A6A + ldr r1, _0802DEA0 @ =gBattlePartyID lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] @@ -3791,29 +3791,29 @@ sub_802DE10: @ 802DE10 lsls r0, 2 adds r0, r6 bl DestroySprite - ldr r1, _0802DEA8 @ =gUnknown_03004340 + ldr r1, _0802DEA8 @ =gHealthboxIDs ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] bl sub_8043DB0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802DE8C: pop {r4-r6} pop {r0} bx r0 .align 2, 0 _0802DE94: .4byte gSprites -_0802DE98: .4byte gUnknown_02024BE0 -_0802DE9C: .4byte gUnknown_02024A60 -_0802DEA0: .4byte gUnknown_02024A6A +_0802DE98: .4byte gObjectBankIDs +_0802DE9C: .4byte gActiveBank +_0802DEA0: .4byte gBattlePartyID _0802DEA4: .4byte gPlayerParty -_0802DEA8: .4byte gUnknown_03004340 +_0802DEA8: .4byte gHealthboxIDs thumb_func_end sub_802DE10 thumb_func_start sub_802DEAC sub_802DEAC: @ 802DEAC push {r4-r6,lr} - ldr r6, _0802DF04 @ =gUnknown_02024A60 + ldr r6, _0802DF04 @ =gActiveBank ldrb r2, [r6] lsls r0, r2, 1 adds r0, r2 @@ -3825,7 +3825,7 @@ sub_802DEAC: @ 802DEAC ands r0, r1 cmp r0, 0 bne _0802DEFC - ldr r5, _0802DF0C @ =gUnknown_02024BE0 + ldr r5, _0802DF0C @ =gObjectBankIDs adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 @@ -3842,22 +3842,22 @@ sub_802DEAC: @ 802DEAC lsls r0, 2 adds r0, r4 bl DestroySprite - ldr r1, _0802DF14 @ =gUnknown_03004340 + ldr r1, _0802DF14 @ =gHealthboxIDs ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] bl sub_8043DB0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802DEFC: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0802DF04: .4byte gUnknown_02024A60 +_0802DF04: .4byte gActiveBank _0802DF08: .4byte 0x02017810 -_0802DF0C: .4byte gUnknown_02024BE0 +_0802DF0C: .4byte gObjectBankIDs _0802DF10: .4byte gSprites -_0802DF14: .4byte gUnknown_03004340 +_0802DF14: .4byte gHealthboxIDs thumb_func_end sub_802DEAC thumb_func_start sub_802DF18 @@ -3867,7 +3867,7 @@ sub_802DF18: @ 802DF18 ldrh r0, [r0, 0x16] cmp r0, 0 bne _0802DF26 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802DF26: pop {r0} bx r0 @@ -3884,8 +3884,8 @@ sub_802DF30: @ 802DF30 ands r0, r1 cmp r0, 0 bne _0802DF6A - ldr r1, _0802DF74 @ =gUnknown_03004330 - ldr r2, _0802DF78 @ =gUnknown_02024A60 + ldr r1, _0802DF74 @ =gBattleBankFunc + ldr r2, _0802DF78 @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -3910,8 +3910,8 @@ _0802DF6A: bx r0 .align 2, 0 _0802DF70: .4byte gPaletteFade -_0802DF74: .4byte gUnknown_03004330 -_0802DF78: .4byte gUnknown_02024A60 +_0802DF74: .4byte gBattleBankFunc +_0802DF78: .4byte gActiveBank _0802DF7C: .4byte sub_802DF88 _0802DF80: .4byte gTasks _0802DF84: .4byte gUnknown_0300434C @@ -3954,8 +3954,8 @@ _0802DFD0: movs r2, 0 bl dp01_build_cmdbuf_x22_a_three_bytes _0802DFDA: - ldr r1, _0802DFFC @ =gUnknown_02023A60 - ldr r0, _0802E000 @ =gUnknown_02024A60 + ldr r1, _0802DFFC @ =gBattleBufferA + ldr r0, _0802E000 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -3967,13 +3967,13 @@ _0802DFDA: bne _0802DFF4 bl b_link_standby_message _0802DFF4: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802DFF8: pop {r0} bx r0 .align 2, 0 -_0802DFFC: .4byte gUnknown_02023A60 -_0802E000: .4byte gUnknown_02024A60 +_0802DFFC: .4byte gBattleBufferA +_0802E000: .4byte gActiveBank thumb_func_end sub_802DF88 thumb_func_start sub_802E004 @@ -3985,8 +3985,8 @@ sub_802E004: @ 802E004 ands r0, r1 cmp r0, 0 bne _0802E028 - ldr r1, _0802E030 @ =gUnknown_03004330 - ldr r0, _0802E034 @ =gUnknown_02024A60 + ldr r1, _0802E030 @ =gBattleBankFunc + ldr r0, _0802E034 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -3999,8 +3999,8 @@ _0802E028: bx r0 .align 2, 0 _0802E02C: .4byte gPaletteFade -_0802E030: .4byte gUnknown_03004330 -_0802E034: .4byte gUnknown_02024A60 +_0802E030: .4byte gBattleBankFunc +_0802E034: .4byte gActiveBank _0802E038: .4byte sub_802E03C thumb_func_end sub_802E004 @@ -4022,7 +4022,7 @@ sub_802E03C: @ 802E03C ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802E062: pop {r0} bx r0 @@ -4036,11 +4036,11 @@ _0802E074: .4byte gScriptItemId thumb_func_start bx_wait_t1 bx_wait_t1: @ 802E078 push {lr} - ldr r0, _0802E0A4 @ =gUnknown_02024E6D + ldr r0, _0802E0A4 @ =gDoingBattleAnim ldrb r0, [r0] cmp r0, 0 beq _0802E09A - ldr r0, _0802E0A8 @ =gUnknown_02024A60 + ldr r0, _0802E0A8 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4053,21 +4053,21 @@ bx_wait_t1: @ 802E078 cmp r0, 0 bne _0802E09E _0802E09A: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802E09E: pop {r0} bx r0 .align 2, 0 -_0802E0A4: .4byte gUnknown_02024E6D -_0802E0A8: .4byte gUnknown_02024A60 +_0802E0A4: .4byte gDoingBattleAnim +_0802E0A8: .4byte gActiveBank _0802E0AC: .4byte 0x02017810 thumb_func_end bx_wait_t1 thumb_func_start bx_blink_t1 bx_blink_t1: @ 802E0B0 push {r4,lr} - ldr r1, _0802E0EC @ =gUnknown_02024BE0 - ldr r0, _0802E0F0 @ =gUnknown_02024A60 + ldr r1, _0802E0EC @ =gObjectBankIDs + ldr r0, _0802E0F0 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -4089,15 +4089,15 @@ bx_blink_t1: @ 802E0B0 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _0802E0F8 @ =gUnknown_02024E6D + ldr r0, _0802E0F8 @ =gDoingBattleAnim strb r3, [r0] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0802E126 .align 2, 0 -_0802E0EC: .4byte gUnknown_02024BE0 -_0802E0F0: .4byte gUnknown_02024A60 +_0802E0EC: .4byte gObjectBankIDs +_0802E0F0: .4byte gActiveBank _0802E0F4: .4byte gSprites -_0802E0F8: .4byte gUnknown_02024E6D +_0802E0F8: .4byte gDoingBattleAnim _0802E0FC: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -4132,12 +4132,12 @@ sub_802E12C: @ 802E12C push {r4-r6,lr} sub sp, 0x4 adds r6, r0, 0 - ldr r0, _0802E180 @ =gUnknown_02024A60 + ldr r0, _0802E180 @ =gActiveBank ldrb r4, [r0] lsls r4, 9 ldr r0, _0802E184 @ =gUnknown_02023A64 adds r4, r0 - ldr r5, _0802E188 @ =gUnknown_020238CC + ldr r5, _0802E188 @ =gDisplayedStringBattle adds r0, r5, 0 bl StringCopy lsls r0, r6, 1 @@ -4170,9 +4170,9 @@ _0802E176: movs r0, 0x37 b _0802E196 .align 2, 0 -_0802E180: .4byte gUnknown_02024A60 +_0802E180: .4byte gActiveBank _0802E184: .4byte gUnknown_02023A64 -_0802E188: .4byte gUnknown_020238CC +_0802E188: .4byte gDisplayedStringBattle _0802E18C: .4byte gMoveNames _0802E190: .4byte gUnknown_03004210 _0802E194: @@ -4195,7 +4195,7 @@ _0802E1AC: .4byte gUnknown_03004210 sub_802E1B0: @ 802E1B0 push {r4-r6,lr} sub sp, 0x8 - ldr r0, _0802E208 @ =gUnknown_02024A60 + ldr r0, _0802E208 @ =gActiveBank ldrb r4, [r0] lsls r4, 9 ldr r0, _0802E20C @ =gUnknown_02023A64 @@ -4236,7 +4236,7 @@ _0802E1F6: pop {r0} bx r0 .align 2, 0 -_0802E208: .4byte gUnknown_02024A60 +_0802E208: .4byte gActiveBank _0802E20C: .4byte gUnknown_02023A64 _0802E210: .4byte gUnknown_03004348 _0802E214: .4byte gUnknown_03004210 @@ -4248,8 +4248,8 @@ _0802E21C: .4byte gUnknown_08400D49 sub_802E220: @ 802E220 push {r4-r6,lr} sub sp, 0x4 - ldr r4, _0802E2B8 @ =gUnknown_02023A60 - ldr r6, _0802E2BC @ =gUnknown_02024A60 + ldr r4, _0802E2B8 @ =gBattleBufferA + ldr r6, _0802E2BC @ =gActiveBank ldrb r0, [r6] lsls r1, r0, 9 adds r0, r4, 0x2 @@ -4259,7 +4259,7 @@ sub_802E220: @ 802E220 beq _0802E2B0 adds r4, 0x4 adds r4, r1, r4 - ldr r2, _0802E2C0 @ =gUnknown_020238CC + ldr r2, _0802E2C0 @ =gDisplayedStringBattle ldr r1, _0802E2C4 @ =gUnknown_08400D49 adds r0, r2, 0 bl StringCopy @@ -4277,7 +4277,7 @@ sub_802E220: @ 802E220 movs r0, 0x6 strb r0, [r2, 0x2] adds r2, 0x3 - ldr r5, _0802E2C8 @ =gUnknown_02024E64 + ldr r5, _0802E2C8 @ =gMoveSelectionCursor ldrb r1, [r6] adds r1, r5 adds r0, r4, 0 @@ -4304,7 +4304,7 @@ sub_802E220: @ 802E220 movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r4, _0802E2CC @ =gUnknown_03004210 - ldr r1, _0802E2C0 @ =gUnknown_020238CC + ldr r1, _0802E2C0 @ =gDisplayedStringBattle ldr r2, _0802E2D0 @ =0x000002a2 movs r0, 0x37 str r0, [sp] @@ -4319,11 +4319,11 @@ _0802E2B0: pop {r0} bx r0 .align 2, 0 -_0802E2B8: .4byte gUnknown_02023A60 -_0802E2BC: .4byte gUnknown_02024A60 -_0802E2C0: .4byte gUnknown_020238CC +_0802E2B8: .4byte gBattleBufferA +_0802E2BC: .4byte gActiveBank +_0802E2C0: .4byte gDisplayedStringBattle _0802E2C4: .4byte gUnknown_08400D49 -_0802E2C8: .4byte gUnknown_02024E64 +_0802E2C8: .4byte gMoveSelectionCursor _0802E2CC: .4byte gUnknown_03004210 _0802E2D0: .4byte 0x000002a2 thumb_func_end sub_802E220 @@ -4332,8 +4332,8 @@ _0802E2D0: .4byte 0x000002a2 sub_802E2D4: @ 802E2D4 push {r4,r5,lr} sub sp, 0x8 - ldr r4, _0802E314 @ =gUnknown_02023A60 - ldr r5, _0802E318 @ =gUnknown_02024A60 + ldr r4, _0802E314 @ =gBattleBufferA + ldr r5, _0802E318 @ =gActiveBank ldrb r0, [r5] lsls r1, r0, 9 adds r0, r4, 0x2 @@ -4361,21 +4361,21 @@ sub_802E2D4: @ 802E2D4 bl InitWindow b _0802E388 .align 2, 0 -_0802E314: .4byte gUnknown_02023A60 -_0802E318: .4byte gUnknown_02024A60 +_0802E314: .4byte gBattleBufferA +_0802E318: .4byte gActiveBank _0802E31C: .4byte gUnknown_03004210 _0802E320: .4byte 0x00001016 _0802E324: .4byte gUnknown_08400D52 _0802E328: adds r4, 0x4 adds r4, r1, r4 - ldr r3, _0802E398 @ =gUnknown_020238CC + ldr r3, _0802E398 @ =gDisplayedStringBattle ldr r1, _0802E39C @ =gUnknown_08400D49 adds r0, r3, 0 bl StringCopy adds r3, r0, 0 ldr r2, _0802E3A0 @ =gBattleMoves - ldr r1, _0802E3A4 @ =gUnknown_02024E64 + ldr r1, _0802E3A4 @ =gMoveSelectionCursor ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -4403,7 +4403,7 @@ _0802E328: movs r2, 0x17 movs r3, 0x39 bl FillWindowRect - ldr r1, _0802E398 @ =gUnknown_020238CC + ldr r1, _0802E398 @ =gDisplayedStringBattle movs r2, 0xB0 lsls r2, 2 movs r0, 0x39 @@ -4419,10 +4419,10 @@ _0802E388: pop {r0} bx r0 .align 2, 0 -_0802E398: .4byte gUnknown_020238CC +_0802E398: .4byte gDisplayedStringBattle _0802E39C: .4byte gUnknown_08400D49 _0802E3A0: .4byte gBattleMoves -_0802E3A4: .4byte gUnknown_02024E64 +_0802E3A4: .4byte gMoveSelectionCursor _0802E3A8: .4byte gTypeNames _0802E3AC: .4byte gUnknown_03004210 _0802E3B0: .4byte 0x00001016 @@ -4509,7 +4509,7 @@ _0802E430: .4byte ReshowBattleScreenAfterMenu thumb_func_start sub_802E434 sub_802E434: @ 802E434 push {lr} - ldr r0, _0802E458 @ =gUnknown_02024A60 + ldr r0, _0802E458 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4521,19 +4521,19 @@ sub_802E434: @ 802E434 ands r0, r1 cmp r0, 0 bne _0802E452 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802E452: pop {r0} bx r0 .align 2, 0 -_0802E458: .4byte gUnknown_02024A60 +_0802E458: .4byte gActiveBank _0802E45C: .4byte 0x02017810 thumb_func_end sub_802E434 thumb_func_start sub_802E460 sub_802E460: @ 802E460 push {lr} - ldr r0, _0802E484 @ =gUnknown_02024A60 + ldr r0, _0802E484 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4545,12 +4545,12 @@ sub_802E460: @ 802E460 ands r0, r1 cmp r0, 0 bne _0802E47E - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802E47E: pop {r0} bx r0 .align 2, 0 -_0802E484: .4byte gUnknown_02024A60 +_0802E484: .4byte gActiveBank _0802E488: .4byte 0x02017810 thumb_func_end sub_802E460 diff --git a/asm/battle_6.s b/asm/battle_6.s index f277fb7f2..90c100c73 100644 --- a/asm/battle_6.s +++ b/asm/battle_6.s @@ -6,13 +6,13 @@ .text - thumb_func_start dp01t_00_1_getattr -dp01t_00_1_getattr: @ 802E4D0 + thumb_func_start PlayerHandleGetAttributes +PlayerHandleGetAttributes: @ 802E4D0 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _0802E4FC @ =gUnknown_02023A60 - ldr r0, _0802E500 @ =gUnknown_02024A60 + ldr r1, _0802E4FC @ =gBattleBufferA + ldr r0, _0802E500 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -20,7 +20,7 @@ dp01t_00_1_getattr: @ 802E4D0 ldrb r0, [r1] cmp r0, 0 bne _0802E508 - ldr r0, _0802E504 @ =gUnknown_02024A6A + ldr r0, _0802E504 @ =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -29,9 +29,9 @@ dp01t_00_1_getattr: @ 802E4D0 adds r6, r0, 0 b _0802E52A .align 2, 0 -_0802E4FC: .4byte gUnknown_02023A60 -_0802E500: .4byte gUnknown_02024A60 -_0802E504: .4byte gUnknown_02024A6A +_0802E4FC: .4byte gBattleBufferA +_0802E500: .4byte gActiveBank +_0802E504: .4byte gBattlePartyID _0802E508: ldrb r4, [r1] movs r5, 0 @@ -57,12 +57,12 @@ _0802E52A: movs r0, 0x1 mov r2, sp bl dp01_build_cmdbuf_x1D_1D_numargs_varargs - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted add sp, 0x100 pop {r4-r6} pop {r0} bx r0 - thumb_func_end dp01t_00_1_getattr + thumb_func_end PlayerHandleGetAttributes thumb_func_start dp01_getattr_by_ch1_for_player_pokemon_ dp01_getattr_by_ch1_for_player_pokemon_: @ 802E544 @@ -76,8 +76,8 @@ dp01_getattr_by_ch1_for_player_pokemon_: @ 802E544 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _0802E578 @ =gUnknown_02023A60 - ldr r3, _0802E57C @ =gUnknown_02024A60 + ldr r2, _0802E578 @ =gBattleBufferA + ldr r3, _0802E57C @ =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -93,8 +93,8 @@ _0802E56E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802E578: .4byte gUnknown_02023A60 -_0802E57C: .4byte gUnknown_02024A60 +_0802E578: .4byte gBattleBufferA +_0802E57C: .4byte gActiveBank _0802E580: .4byte _0802E584 .align 2, 0 _0802E584: @@ -1002,8 +1002,8 @@ _0802ECEC: .4byte gPlayerParty sub_802ECF0: @ 802ECF0 push {r4-r7,lr} sub sp, 0x58 - ldr r2, _0802ED68 @ =gUnknown_02024A6A - ldr r5, _0802ED6C @ =gUnknown_02024A60 + ldr r2, _0802ED68 @ =gBattlePartyID + ldr r5, _0802ED6C @ =gActiveBank ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -1011,7 +1011,7 @@ sub_802ECF0: @ 802ECF0 movs r0, 0x64 adds r4, r2, 0 muls r4, r0 - ldr r3, _0802ED70 @ =gUnknown_02023A60 + ldr r3, _0802ED70 @ =gBattleBufferA lsls r1, 9 adds r0, r3, 0x1 adds r0, r1, r0 @@ -1054,23 +1054,23 @@ _0802ED46: movs r0, 0x1 adds r2, r4, 0 bl dp01_build_cmdbuf_x1D_1D_numargs_varargs - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted add sp, 0x58 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0802ED68: .4byte gUnknown_02024A6A -_0802ED6C: .4byte gUnknown_02024A60 -_0802ED70: .4byte gUnknown_02023A60 +_0802ED68: .4byte gBattlePartyID +_0802ED6C: .4byte gActiveBank +_0802ED70: .4byte gBattleBufferA _0802ED74: .4byte gPlayerParty thumb_func_end sub_802ECF0 - thumb_func_start dp01t_02_1_setattr -dp01t_02_1_setattr: @ 802ED78 + thumb_func_start PlayerHandleSetAttributes +PlayerHandleSetAttributes: @ 802ED78 push {r4,r5,lr} - ldr r1, _0802ED9C @ =gUnknown_02023A60 - ldr r0, _0802EDA0 @ =gUnknown_02024A60 + ldr r1, _0802ED9C @ =gBattleBufferA + ldr r0, _0802EDA0 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -1078,16 +1078,16 @@ dp01t_02_1_setattr: @ 802ED78 ldrb r0, [r1] cmp r0, 0 bne _0802EDA8 - ldr r0, _0802EDA4 @ =gUnknown_02024A6A + ldr r0, _0802EDA4 @ =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl dp01_setattr_by_ch1_for_player_pokemon b _0802EDC6 .align 2, 0 -_0802ED9C: .4byte gUnknown_02023A60 -_0802EDA0: .4byte gUnknown_02024A60 -_0802EDA4: .4byte gUnknown_02024A6A +_0802ED9C: .4byte gBattleBufferA +_0802EDA0: .4byte gActiveBank +_0802EDA4: .4byte gBattlePartyID _0802EDA8: ldrb r4, [r1] movs r5, 0 @@ -1106,11 +1106,11 @@ _0802EDBA: cmp r5, 0x5 bls _0802EDAC _0802EDC6: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4,r5} pop {r0} bx r0 - thumb_func_end dp01t_02_1_setattr + thumb_func_end PlayerHandleSetAttributes thumb_func_start dp01_setattr_by_ch1_for_player_pokemon dp01_setattr_by_ch1_for_player_pokemon: @ 802EDD0 @@ -1122,7 +1122,7 @@ dp01_setattr_by_ch1_for_player_pokemon: @ 802EDD0 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0802EE08 @ =gUnknown_02024A60 + ldr r0, _0802EE08 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r2, _0802EE0C @ =gUnknown_02023A63 @@ -1142,7 +1142,7 @@ _0802EDFC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802EE08: .4byte gUnknown_02024A60 +_0802EE08: .4byte gActiveBank _0802EE0C: .4byte gUnknown_02023A63 _0802EE10: .4byte _0802EE14 .align 2, 0 @@ -1394,7 +1394,7 @@ _0802F09C: muls r0, r5 ldr r1, _0802F0B4 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F0B8 @ =gUnknown_02024A60 + ldr r1, _0802F0B8 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1403,13 +1403,13 @@ _0802F09C: b _0802F796 .align 2, 0 _0802F0B4: .4byte gPlayerParty -_0802F0B8: .4byte gUnknown_02024A60 +_0802F0B8: .4byte gActiveBank _0802F0BC: movs r0, 0x64 muls r0, r5 ldr r1, _0802F0D4 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F0D8 @ =gUnknown_02024A60 + ldr r1, _0802F0D8 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1418,7 +1418,7 @@ _0802F0BC: b _0802F796 .align 2, 0 _0802F0D4: .4byte gPlayerParty -_0802F0D8: .4byte gUnknown_02024A60 +_0802F0D8: .4byte gActiveBank _0802F0DC: movs r0, 0 mov r8, r0 @@ -1466,8 +1466,8 @@ _0802F134: muls r0, r5 ldr r1, _0802F150 @ =gPlayerParty adds r0, r1 - ldr r3, _0802F154 @ =gUnknown_02023A60 - ldr r1, _0802F158 @ =gUnknown_02024A60 + ldr r3, _0802F154 @ =gBattleBufferA + ldr r1, _0802F158 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -1477,15 +1477,15 @@ _0802F134: b _0802F1D8 .align 2, 0 _0802F150: .4byte gPlayerParty -_0802F154: .4byte gUnknown_02023A60 -_0802F158: .4byte gUnknown_02024A60 +_0802F154: .4byte gBattleBufferA +_0802F158: .4byte gActiveBank _0802F15C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r0, _0802F1B8 @ =gPlayerParty adds r4, r0 - ldr r5, _0802F1BC @ =gUnknown_02024A60 + ldr r5, _0802F1BC @ =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -1523,14 +1523,14 @@ _0802F15C: b _0802F796 .align 2, 0 _0802F1B8: .4byte gPlayerParty -_0802F1BC: .4byte gUnknown_02024A60 +_0802F1BC: .4byte gActiveBank _0802F1C0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F1E4 @ =gPlayerParty adds r0, r1 - ldr r3, _0802F1E8 @ =gUnknown_02023A60 - ldr r1, _0802F1EC @ =gUnknown_02024A60 + ldr r3, _0802F1E8 @ =gBattleBufferA + ldr r1, _0802F1EC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -1544,14 +1544,14 @@ _0802F1D8: b _0802F796 .align 2, 0 _0802F1E4: .4byte gPlayerParty -_0802F1E8: .4byte gUnknown_02023A60 -_0802F1EC: .4byte gUnknown_02024A60 +_0802F1E8: .4byte gBattleBufferA +_0802F1EC: .4byte gActiveBank _0802F1F0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F208 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F20C @ =gUnknown_02024A60 + ldr r1, _0802F20C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1560,13 +1560,13 @@ _0802F1F0: b _0802F796 .align 2, 0 _0802F208: .4byte gPlayerParty -_0802F20C: .4byte gUnknown_02024A60 +_0802F20C: .4byte gActiveBank _0802F210: movs r0, 0x64 muls r0, r5 ldr r1, _0802F228 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F22C @ =gUnknown_02024A60 + ldr r1, _0802F22C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1575,13 +1575,13 @@ _0802F210: b _0802F796 .align 2, 0 _0802F228: .4byte gPlayerParty -_0802F22C: .4byte gUnknown_02024A60 +_0802F22C: .4byte gActiveBank _0802F230: movs r0, 0x64 muls r0, r5 ldr r1, _0802F248 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F24C @ =gUnknown_02024A60 + ldr r1, _0802F24C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1590,13 +1590,13 @@ _0802F230: b _0802F796 .align 2, 0 _0802F248: .4byte gPlayerParty -_0802F24C: .4byte gUnknown_02024A60 +_0802F24C: .4byte gActiveBank _0802F250: movs r0, 0x64 muls r0, r5 ldr r1, _0802F268 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F26C @ =gUnknown_02024A60 + ldr r1, _0802F26C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1605,13 +1605,13 @@ _0802F250: b _0802F796 .align 2, 0 _0802F268: .4byte gPlayerParty -_0802F26C: .4byte gUnknown_02024A60 +_0802F26C: .4byte gActiveBank _0802F270: movs r0, 0x64 muls r0, r5 ldr r1, _0802F288 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F28C @ =gUnknown_02024A60 + ldr r1, _0802F28C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1620,13 +1620,13 @@ _0802F270: b _0802F796 .align 2, 0 _0802F288: .4byte gPlayerParty -_0802F28C: .4byte gUnknown_02024A60 +_0802F28C: .4byte gActiveBank _0802F290: movs r0, 0x64 muls r0, r5 ldr r1, _0802F2A8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F2AC @ =gUnknown_02024A60 + ldr r1, _0802F2AC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1635,13 +1635,13 @@ _0802F290: b _0802F796 .align 2, 0 _0802F2A8: .4byte gPlayerParty -_0802F2AC: .4byte gUnknown_02024A60 +_0802F2AC: .4byte gActiveBank _0802F2B0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F2C8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F2CC @ =gUnknown_02024A60 + ldr r1, _0802F2CC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1650,13 +1650,13 @@ _0802F2B0: b _0802F796 .align 2, 0 _0802F2C8: .4byte gPlayerParty -_0802F2CC: .4byte gUnknown_02024A60 +_0802F2CC: .4byte gActiveBank _0802F2D0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F2E8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F2EC @ =gUnknown_02024A60 + ldr r1, _0802F2EC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1665,13 +1665,13 @@ _0802F2D0: b _0802F796 .align 2, 0 _0802F2E8: .4byte gPlayerParty -_0802F2EC: .4byte gUnknown_02024A60 +_0802F2EC: .4byte gActiveBank _0802F2F0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F308 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F30C @ =gUnknown_02024A60 + ldr r1, _0802F30C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1680,13 +1680,13 @@ _0802F2F0: b _0802F796 .align 2, 0 _0802F308: .4byte gPlayerParty -_0802F30C: .4byte gUnknown_02024A60 +_0802F30C: .4byte gActiveBank _0802F310: movs r0, 0x64 muls r0, r5 ldr r1, _0802F328 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F32C @ =gUnknown_02024A60 + ldr r1, _0802F32C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1695,13 +1695,13 @@ _0802F310: b _0802F796 .align 2, 0 _0802F328: .4byte gPlayerParty -_0802F32C: .4byte gUnknown_02024A60 +_0802F32C: .4byte gActiveBank _0802F330: movs r0, 0x64 muls r0, r5 ldr r1, _0802F348 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F34C @ =gUnknown_02024A60 + ldr r1, _0802F34C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1710,13 +1710,13 @@ _0802F330: b _0802F796 .align 2, 0 _0802F348: .4byte gPlayerParty -_0802F34C: .4byte gUnknown_02024A60 +_0802F34C: .4byte gActiveBank _0802F350: movs r0, 0x64 muls r0, r5 ldr r1, _0802F368 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F36C @ =gUnknown_02024A60 + ldr r1, _0802F36C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1725,13 +1725,13 @@ _0802F350: b _0802F796 .align 2, 0 _0802F368: .4byte gPlayerParty -_0802F36C: .4byte gUnknown_02024A60 +_0802F36C: .4byte gActiveBank _0802F370: movs r0, 0x64 muls r0, r5 ldr r1, _0802F388 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F38C @ =gUnknown_02024A60 + ldr r1, _0802F38C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1740,13 +1740,13 @@ _0802F370: b _0802F796 .align 2, 0 _0802F388: .4byte gPlayerParty -_0802F38C: .4byte gUnknown_02024A60 +_0802F38C: .4byte gActiveBank _0802F390: movs r0, 0x64 muls r0, r5 ldr r1, _0802F3A8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F3AC @ =gUnknown_02024A60 + ldr r1, _0802F3AC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1755,14 +1755,14 @@ _0802F390: b _0802F796 .align 2, 0 _0802F3A8: .4byte gPlayerParty -_0802F3AC: .4byte gUnknown_02024A60 +_0802F3AC: .4byte gActiveBank _0802F3B0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r0, _0802F418 @ =gPlayerParty adds r4, r0 - ldr r5, _0802F41C @ =gUnknown_02024A60 + ldr r5, _0802F41C @ =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -1805,13 +1805,13 @@ _0802F3B0: b _0802F4D0 .align 2, 0 _0802F418: .4byte gPlayerParty -_0802F41C: .4byte gUnknown_02024A60 +_0802F41C: .4byte gActiveBank _0802F420: movs r0, 0x64 muls r0, r5 ldr r1, _0802F438 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F43C @ =gUnknown_02024A60 + ldr r1, _0802F43C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1820,13 +1820,13 @@ _0802F420: b _0802F796 .align 2, 0 _0802F438: .4byte gPlayerParty -_0802F43C: .4byte gUnknown_02024A60 +_0802F43C: .4byte gActiveBank _0802F440: movs r0, 0x64 muls r0, r5 ldr r1, _0802F458 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F45C @ =gUnknown_02024A60 + ldr r1, _0802F45C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1835,13 +1835,13 @@ _0802F440: b _0802F796 .align 2, 0 _0802F458: .4byte gPlayerParty -_0802F45C: .4byte gUnknown_02024A60 +_0802F45C: .4byte gActiveBank _0802F460: movs r0, 0x64 muls r0, r5 ldr r1, _0802F478 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F47C @ =gUnknown_02024A60 + ldr r1, _0802F47C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1850,13 +1850,13 @@ _0802F460: b _0802F796 .align 2, 0 _0802F478: .4byte gPlayerParty -_0802F47C: .4byte gUnknown_02024A60 +_0802F47C: .4byte gActiveBank _0802F480: movs r0, 0x64 muls r0, r5 ldr r1, _0802F498 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F49C @ =gUnknown_02024A60 + ldr r1, _0802F49C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1865,13 +1865,13 @@ _0802F480: b _0802F796 .align 2, 0 _0802F498: .4byte gPlayerParty -_0802F49C: .4byte gUnknown_02024A60 +_0802F49C: .4byte gActiveBank _0802F4A0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F4B8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F4BC @ =gUnknown_02024A60 + ldr r1, _0802F4BC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1880,13 +1880,13 @@ _0802F4A0: b _0802F796 .align 2, 0 _0802F4B8: .4byte gPlayerParty -_0802F4BC: .4byte gUnknown_02024A60 +_0802F4BC: .4byte gActiveBank _0802F4C0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F4D8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F4DC @ =gUnknown_02024A60 + ldr r1, _0802F4DC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1896,13 +1896,13 @@ _0802F4D0: b _0802F796 .align 2, 0 _0802F4D8: .4byte gPlayerParty -_0802F4DC: .4byte gUnknown_02024A60 +_0802F4DC: .4byte gActiveBank _0802F4E0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F4F8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F4FC @ =gUnknown_02024A60 + ldr r1, _0802F4FC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1911,13 +1911,13 @@ _0802F4E0: b _0802F796 .align 2, 0 _0802F4F8: .4byte gPlayerParty -_0802F4FC: .4byte gUnknown_02024A60 +_0802F4FC: .4byte gActiveBank _0802F500: movs r0, 0x64 muls r0, r5 ldr r1, _0802F518 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F51C @ =gUnknown_02024A60 + ldr r1, _0802F51C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1926,13 +1926,13 @@ _0802F500: b _0802F796 .align 2, 0 _0802F518: .4byte gPlayerParty -_0802F51C: .4byte gUnknown_02024A60 +_0802F51C: .4byte gActiveBank _0802F520: movs r0, 0x64 muls r0, r5 ldr r1, _0802F538 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F53C @ =gUnknown_02024A60 + ldr r1, _0802F53C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1941,13 +1941,13 @@ _0802F520: b _0802F796 .align 2, 0 _0802F538: .4byte gPlayerParty -_0802F53C: .4byte gUnknown_02024A60 +_0802F53C: .4byte gActiveBank _0802F540: movs r0, 0x64 muls r0, r5 ldr r1, _0802F558 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F55C @ =gUnknown_02024A60 + ldr r1, _0802F55C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1956,13 +1956,13 @@ _0802F540: b _0802F796 .align 2, 0 _0802F558: .4byte gPlayerParty -_0802F55C: .4byte gUnknown_02024A60 +_0802F55C: .4byte gActiveBank _0802F560: movs r0, 0x64 muls r0, r5 ldr r1, _0802F578 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F57C @ =gUnknown_02024A60 + ldr r1, _0802F57C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1971,13 +1971,13 @@ _0802F560: b _0802F796 .align 2, 0 _0802F578: .4byte gPlayerParty -_0802F57C: .4byte gUnknown_02024A60 +_0802F57C: .4byte gActiveBank _0802F580: movs r0, 0x64 muls r0, r5 ldr r1, _0802F598 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F59C @ =gUnknown_02024A60 + ldr r1, _0802F59C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -1986,13 +1986,13 @@ _0802F580: b _0802F796 .align 2, 0 _0802F598: .4byte gPlayerParty -_0802F59C: .4byte gUnknown_02024A60 +_0802F59C: .4byte gActiveBank _0802F5A0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F5B8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F5BC @ =gUnknown_02024A60 + ldr r1, _0802F5BC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2001,13 +2001,13 @@ _0802F5A0: b _0802F796 .align 2, 0 _0802F5B8: .4byte gPlayerParty -_0802F5BC: .4byte gUnknown_02024A60 +_0802F5BC: .4byte gActiveBank _0802F5C0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F5D8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F5DC @ =gUnknown_02024A60 + ldr r1, _0802F5DC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2016,13 +2016,13 @@ _0802F5C0: b _0802F796 .align 2, 0 _0802F5D8: .4byte gPlayerParty -_0802F5DC: .4byte gUnknown_02024A60 +_0802F5DC: .4byte gActiveBank _0802F5E0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F5F8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F5FC @ =gUnknown_02024A60 + ldr r1, _0802F5FC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2031,13 +2031,13 @@ _0802F5E0: b _0802F796 .align 2, 0 _0802F5F8: .4byte gPlayerParty -_0802F5FC: .4byte gUnknown_02024A60 +_0802F5FC: .4byte gActiveBank _0802F600: movs r0, 0x64 muls r0, r5 ldr r1, _0802F618 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F61C @ =gUnknown_02024A60 + ldr r1, _0802F61C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2046,13 +2046,13 @@ _0802F600: b _0802F796 .align 2, 0 _0802F618: .4byte gPlayerParty -_0802F61C: .4byte gUnknown_02024A60 +_0802F61C: .4byte gActiveBank _0802F620: movs r0, 0x64 muls r0, r5 ldr r1, _0802F638 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F63C @ =gUnknown_02024A60 + ldr r1, _0802F63C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2061,13 +2061,13 @@ _0802F620: b _0802F796 .align 2, 0 _0802F638: .4byte gPlayerParty -_0802F63C: .4byte gUnknown_02024A60 +_0802F63C: .4byte gActiveBank _0802F640: movs r0, 0x64 muls r0, r5 ldr r1, _0802F658 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F65C @ =gUnknown_02024A60 + ldr r1, _0802F65C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2076,13 +2076,13 @@ _0802F640: b _0802F796 .align 2, 0 _0802F658: .4byte gPlayerParty -_0802F65C: .4byte gUnknown_02024A60 +_0802F65C: .4byte gActiveBank _0802F660: movs r0, 0x64 muls r0, r5 ldr r1, _0802F678 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F67C @ =gUnknown_02024A60 + ldr r1, _0802F67C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2091,13 +2091,13 @@ _0802F660: b _0802F796 .align 2, 0 _0802F678: .4byte gPlayerParty -_0802F67C: .4byte gUnknown_02024A60 +_0802F67C: .4byte gActiveBank _0802F680: movs r0, 0x64 muls r0, r5 ldr r1, _0802F698 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F69C @ =gUnknown_02024A60 + ldr r1, _0802F69C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2106,13 +2106,13 @@ _0802F680: b _0802F796 .align 2, 0 _0802F698: .4byte gPlayerParty -_0802F69C: .4byte gUnknown_02024A60 +_0802F69C: .4byte gActiveBank _0802F6A0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F6B8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F6BC @ =gUnknown_02024A60 + ldr r1, _0802F6BC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2121,13 +2121,13 @@ _0802F6A0: b _0802F796 .align 2, 0 _0802F6B8: .4byte gPlayerParty -_0802F6BC: .4byte gUnknown_02024A60 +_0802F6BC: .4byte gActiveBank _0802F6C0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F6D8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F6DC @ =gUnknown_02024A60 + ldr r1, _0802F6DC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2136,13 +2136,13 @@ _0802F6C0: b _0802F796 .align 2, 0 _0802F6D8: .4byte gPlayerParty -_0802F6DC: .4byte gUnknown_02024A60 +_0802F6DC: .4byte gActiveBank _0802F6E0: movs r0, 0x64 muls r0, r5 ldr r1, _0802F6F8 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F6FC @ =gUnknown_02024A60 + ldr r1, _0802F6FC @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2151,13 +2151,13 @@ _0802F6E0: b _0802F796 .align 2, 0 _0802F6F8: .4byte gPlayerParty -_0802F6FC: .4byte gUnknown_02024A60 +_0802F6FC: .4byte gActiveBank _0802F700: movs r0, 0x64 muls r0, r5 ldr r1, _0802F718 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F71C @ =gUnknown_02024A60 + ldr r1, _0802F71C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2166,13 +2166,13 @@ _0802F700: b _0802F796 .align 2, 0 _0802F718: .4byte gPlayerParty -_0802F71C: .4byte gUnknown_02024A60 +_0802F71C: .4byte gActiveBank _0802F720: movs r0, 0x64 muls r0, r5 ldr r1, _0802F738 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F73C @ =gUnknown_02024A60 + ldr r1, _0802F73C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2181,13 +2181,13 @@ _0802F720: b _0802F796 .align 2, 0 _0802F738: .4byte gPlayerParty -_0802F73C: .4byte gUnknown_02024A60 +_0802F73C: .4byte gActiveBank _0802F740: movs r0, 0x64 muls r0, r5 ldr r1, _0802F758 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F75C @ =gUnknown_02024A60 + ldr r1, _0802F75C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2196,13 +2196,13 @@ _0802F740: b _0802F796 .align 2, 0 _0802F758: .4byte gPlayerParty -_0802F75C: .4byte gUnknown_02024A60 +_0802F75C: .4byte gActiveBank _0802F760: movs r0, 0x64 muls r0, r5 ldr r1, _0802F778 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F77C @ =gUnknown_02024A60 + ldr r1, _0802F77C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2211,21 +2211,21 @@ _0802F760: b _0802F796 .align 2, 0 _0802F778: .4byte gPlayerParty -_0802F77C: .4byte gUnknown_02024A60 +_0802F77C: .4byte gActiveBank _0802F780: movs r0, 0x64 muls r0, r5 ldr r1, _0802F7C0 @ =gPlayerParty adds r0, r1 - ldr r1, _0802F7C4 @ =gUnknown_02024A60 + ldr r1, _0802F7C4 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl SetMonData _0802F796: - ldr r2, _0802F7C8 @ =gUnknown_02024A6A - ldr r0, _0802F7C4 @ =gUnknown_02024A60 + ldr r2, _0802F7C8 @ =gBattlePartyID + ldr r0, _0802F7C4 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -2245,15 +2245,15 @@ _0802F796: bx r0 .align 2, 0 _0802F7C0: .4byte gPlayerParty -_0802F7C4: .4byte gUnknown_02024A60 -_0802F7C8: .4byte gUnknown_02024A6A +_0802F7C4: .4byte gActiveBank +_0802F7C8: .4byte gBattlePartyID thumb_func_end dp01_setattr_by_ch1_for_player_pokemon thumb_func_start sub_802F7CC sub_802F7CC: @ 802F7CC push {r4-r7,lr} - ldr r1, _0802F830 @ =gUnknown_02024A6A - ldr r7, _0802F834 @ =gUnknown_02024A60 + ldr r1, _0802F830 @ =gBattlePartyID + ldr r7, _0802F834 @ =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -2261,7 +2261,7 @@ sub_802F7CC: @ 802F7CC movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _0802F838 @ =gUnknown_02023A60 + ldr r4, _0802F838 @ =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -2297,22 +2297,22 @@ _0802F802: cmp r3, r0 bcc _0802F802 _0802F824: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0802F830: .4byte gUnknown_02024A6A -_0802F834: .4byte gUnknown_02024A60 -_0802F838: .4byte gUnknown_02023A60 +_0802F830: .4byte gBattlePartyID +_0802F834: .4byte gActiveBank +_0802F838: .4byte gBattleBufferA _0802F83C: .4byte gPlayerParty thumb_func_end sub_802F7CC - thumb_func_start sub_802F840 -sub_802F840: @ 802F840 + thumb_func_start PlayerHandleLoadPokeSprite +PlayerHandleLoadPokeSprite: @ 802F840 push {r4,lr} - ldr r2, _0802F88C @ =gUnknown_02024A6A - ldr r4, _0802F890 @ =gUnknown_02024A60 + ldr r2, _0802F88C @ =gBattlePartyID + ldr r4, _0802F890 @ =gActiveBank ldrb r1, [r4] lsls r0, r1, 1 adds r0, r2 @@ -2323,7 +2323,7 @@ sub_802F840: @ 802F840 adds r0, r2 bl sub_80318FC ldr r2, _0802F898 @ =gSprites - ldr r0, _0802F89C @ =gUnknown_02024BE0 + ldr r0, _0802F89C @ =gObjectBankIDs ldrb r3, [r4] adds r0, r3, r0 ldrb r0, [r0] @@ -2337,7 +2337,7 @@ sub_802F840: @ 802F840 ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] - ldr r1, _0802F8A0 @ =gUnknown_03004330 + ldr r1, _0802F8A0 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -2347,27 +2347,27 @@ sub_802F840: @ 802F840 pop {r0} bx r0 .align 2, 0 -_0802F88C: .4byte gUnknown_02024A6A -_0802F890: .4byte gUnknown_02024A60 +_0802F88C: .4byte gBattlePartyID +_0802F890: .4byte gActiveBank _0802F894: .4byte gPlayerParty _0802F898: .4byte gSprites -_0802F89C: .4byte gUnknown_02024BE0 -_0802F8A0: .4byte gUnknown_03004330 +_0802F89C: .4byte gObjectBankIDs +_0802F8A0: .4byte gBattleBankFunc _0802F8A4: .4byte bx_0802E404 - thumb_func_end sub_802F840 + thumb_func_end PlayerHandleLoadPokeSprite - thumb_func_start sub_802F8A8 -sub_802F8A8: @ 802F8A8 + thumb_func_start PlayerHandleSendOutPoke +PlayerHandleSendOutPoke: @ 802F8A8 push {r4-r6,lr} - ldr r5, _0802F914 @ =gUnknown_02024A60 + ldr r5, _0802F914 @ =gActiveBank ldrb r0, [r5] - ldr r4, _0802F918 @ =gUnknown_02023A60 + ldr r4, _0802F918 @ =gBattleBufferA lsls r1, r0, 9 adds r6, r4, 0x2 adds r1, r6 ldrb r1, [r1] bl sub_8032AA8 - ldr r2, _0802F91C @ =gUnknown_02024A6A + ldr r2, _0802F91C @ =gBattlePartyID ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -2386,11 +2386,11 @@ sub_802F8A8: @ 802F8A8 ldr r2, _0802F920 @ =gPlayerParty adds r0, r2 bl sub_80318FC - ldr r1, _0802F924 @ =gUnknown_02024E60 + ldr r1, _0802F924 @ =gActionSelectionCursor ldrb r0, [r5] adds r0, r1 strb r4, [r0] - ldr r1, _0802F928 @ =gUnknown_02024E64 + ldr r1, _0802F928 @ =gMoveSelectionCursor ldrb r0, [r5] adds r0, r1 strb r4, [r0] @@ -2399,7 +2399,7 @@ sub_802F8A8: @ 802F8A8 adds r1, r6 ldrb r1, [r1] bl sub_802F934 - ldr r1, _0802F92C @ =gUnknown_03004330 + ldr r1, _0802F92C @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -2409,15 +2409,15 @@ sub_802F8A8: @ 802F8A8 pop {r0} bx r0 .align 2, 0 -_0802F914: .4byte gUnknown_02024A60 -_0802F918: .4byte gUnknown_02023A60 -_0802F91C: .4byte gUnknown_02024A6A +_0802F914: .4byte gActiveBank +_0802F918: .4byte gBattleBufferA +_0802F91C: .4byte gBattlePartyID _0802F920: .4byte gPlayerParty -_0802F924: .4byte gUnknown_02024E60 -_0802F928: .4byte gUnknown_02024E64 -_0802F92C: .4byte gUnknown_03004330 +_0802F924: .4byte gActionSelectionCursor +_0802F928: .4byte gMoveSelectionCursor +_0802F92C: .4byte gBattleBankFunc _0802F930: .4byte sub_802D798 - thumb_func_end sub_802F8A8 + thumb_func_end PlayerHandleSendOutPoke thumb_func_start sub_802F934 sub_802F934: @ 802F934 @@ -2433,10 +2433,10 @@ sub_802F934: @ 802F934 lsrs r1, 24 adds r0, r6, 0 bl sub_8032AA8 - ldr r0, _0802FA78 @ =gUnknown_02024A6A + ldr r0, _0802FA78 @ =gBattlePartyID lsls r2, r6, 1 adds r2, r0 - ldr r0, _0802FA7C @ =gUnknown_02023A60 + ldr r0, _0802FA7C @ =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -2461,7 +2461,7 @@ sub_802F934: @ 802F934 mov r1, r9 strb r0, [r1] adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2489,7 +2489,7 @@ sub_802F934: @ 802F934 adds r1, r5, 0 adds r2, r4, 0 bl CreateSprite - ldr r4, _0802FA90 @ =gUnknown_02024BE0 + ldr r4, _0802FA90 @ =gObjectBankIDs adds r4, r6, r4 strb r0, [r4] ldr r5, _0802FA94 @ =gSprites @@ -2573,23 +2573,23 @@ sub_802F934: @ 802F934 pop {r0} bx r0 .align 2, 0 -_0802FA78: .4byte gUnknown_02024A6A -_0802FA7C: .4byte gUnknown_02023A60 +_0802FA78: .4byte gBattlePartyID +_0802FA7C: .4byte gBattleBufferA _0802FA80: .4byte gPlayerParty _0802FA84: .4byte sub_80312F0 _0802FA88: .4byte gUnknown_0300434C _0802FA8C: .4byte gUnknown_02024E8C -_0802FA90: .4byte gUnknown_02024BE0 +_0802FA90: .4byte gObjectBankIDs _0802FA94: .4byte gSprites _0802FA98: .4byte gBattleMonForms _0802FA9C: .4byte SpriteCallbackDummy thumb_func_end sub_802F934 - thumb_func_start sub_802FAA0 -sub_802FAA0: @ 802FAA0 + thumb_func_start PlayerHandleReturnPokeToBall +PlayerHandleReturnPokeToBall: @ 802FAA0 push {r4-r6,lr} - ldr r1, _0802FAD0 @ =gUnknown_02023A60 - ldr r6, _0802FAD4 @ =gUnknown_02024A60 + ldr r1, _0802FAD0 @ =gBattleBufferA + ldr r6, _0802FAD4 @ =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -2603,7 +2603,7 @@ sub_802FAA0: @ 802FAA0 ldr r1, _0802FAD8 @ =0x02017810 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _0802FADC @ =gUnknown_03004330 + ldr r1, _0802FADC @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -2611,13 +2611,13 @@ sub_802FAA0: @ 802FAA0 str r1, [r0] b _0802FB1A .align 2, 0 -_0802FAD0: .4byte gUnknown_02023A60 -_0802FAD4: .4byte gUnknown_02024A60 +_0802FAD0: .4byte gBattleBufferA +_0802FAD4: .4byte gActiveBank _0802FAD8: .4byte 0x02017810 -_0802FADC: .4byte gUnknown_03004330 +_0802FADC: .4byte gBattleBankFunc _0802FAE0: .4byte sub_802FB2C _0802FAE4: - ldr r5, _0802FB20 @ =gUnknown_02024BE0 + ldr r5, _0802FB20 @ =gObjectBankIDs adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 @@ -2634,26 +2634,26 @@ _0802FAE4: lsls r0, 2 adds r0, r4 bl DestroySprite - ldr r1, _0802FB28 @ =gUnknown_03004340 + ldr r1, _0802FB28 @ =gHealthboxIDs ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] bl sub_8043DB0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0802FB1A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0802FB20: .4byte gUnknown_02024BE0 +_0802FB20: .4byte gObjectBankIDs _0802FB24: .4byte gSprites -_0802FB28: .4byte gUnknown_03004340 - thumb_func_end sub_802FAA0 +_0802FB28: .4byte gHealthboxIDs + thumb_func_end PlayerHandleReturnPokeToBall thumb_func_start sub_802FB2C sub_802FB2C: @ 802FB2C push {r4,r5,lr} - ldr r5, _0802FB48 @ =gUnknown_02024A60 + ldr r5, _0802FB48 @ =gActiveBank ldrb r2, [r5] lsls r0, r2, 1 adds r0, r2 @@ -2667,7 +2667,7 @@ sub_802FB2C: @ 802FB2C beq _0802FB7C b _0802FBA4 .align 2, 0 -_0802FB48: .4byte gUnknown_02024A60 +_0802FB48: .4byte gActiveBank _0802FB4C: .4byte 0x02017810 _0802FB50: lsls r0, r2, 2 @@ -2706,7 +2706,7 @@ _0802FB7C: adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r1, _0802FBAC @ =gUnknown_03004330 + ldr r1, _0802FBAC @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -2717,12 +2717,12 @@ _0802FBA4: pop {r0} bx r0 .align 2, 0 -_0802FBAC: .4byte gUnknown_03004330 +_0802FBAC: .4byte gBattleBankFunc _0802FBB0: .4byte sub_802DEAC thumb_func_end sub_802FB2C - thumb_func_start sub_802FBB4 -sub_802FBB4: @ 802FBB4 + thumb_func_start PlayerHandleTrainerThrow +PlayerHandleTrainerThrow: @ 802FBB4 push {r4-r7,lr} mov r7, r8 push {r7} @@ -2732,9 +2732,9 @@ sub_802FBB4: @ 802FBB4 ands r0, r1 cmp r0, 0 beq _0802FBE8 - ldr r0, _0802FBE0 @ =gUnknown_02024A60 + ldr r0, _0802FBE0 @ =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 ands r1, r0 ldr r7, _0802FBE4 @ =0x0000fff0 @@ -2744,19 +2744,19 @@ sub_802FBB4: @ 802FBB4 b _0802FBEA .align 2, 0 _0802FBDC: .4byte gBattleTypeFlags -_0802FBE0: .4byte gUnknown_02024A60 +_0802FBE0: .4byte gActiveBank _0802FBE4: .4byte 0x0000fff0 _0802FBE8: movs r7, 0 _0802FBEA: ldr r4, _0802FCB8 @ =gSaveBlock2 ldrb r0, [r4, 0x8] - ldr r6, _0802FCBC @ =gUnknown_02024A60 + ldr r6, _0802FCBC @ =gActiveBank ldrb r1, [r6] bl sub_8031AF4 ldrb r5, [r4, 0x8] ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2790,7 +2790,7 @@ _0802FBEA: adds r1, r5, 0 adds r2, r4, 0 bl CreateSprite - ldr r5, _0802FCC8 @ =gUnknown_02024BE0 + ldr r5, _0802FCC8 @ =gObjectBankIDs ldrb r1, [r6] adds r1, r5 strb r0, [r1] @@ -2836,7 +2836,7 @@ _0802FBEA: adds r0, r4 ldr r1, _0802FCD4 @ =sub_80313A0 str r1, [r0] - ldr r1, _0802FCD8 @ =gUnknown_03004330 + ldr r1, _0802FCD8 @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -2849,28 +2849,28 @@ _0802FBEA: bx r0 .align 2, 0 _0802FCB8: .4byte gSaveBlock2 -_0802FCBC: .4byte gUnknown_02024A60 +_0802FCBC: .4byte gActiveBank _0802FCC0: .4byte gUnknown_02024E8C _0802FCC4: .4byte gTrainerBackPicCoords -_0802FCC8: .4byte gUnknown_02024BE0 +_0802FCC8: .4byte gObjectBankIDs _0802FCCC: .4byte gSprites _0802FCD0: .4byte 0x0000fffe _0802FCD4: .4byte sub_80313A0 -_0802FCD8: .4byte gUnknown_03004330 +_0802FCD8: .4byte gBattleBankFunc _0802FCDC: .4byte sub_802D204 - thumb_func_end sub_802FBB4 + thumb_func_end PlayerHandleTrainerThrow - thumb_func_start sub_802FCE0 -sub_802FCE0: @ 802FCE0 + thumb_func_start PlayerHandleTrainerSlide +PlayerHandleTrainerSlide: @ 802FCE0 push {r4-r6,lr} ldr r4, _0802FD94 @ =gSaveBlock2 ldrb r0, [r4, 0x8] - ldr r5, _0802FD98 @ =gUnknown_02024A60 + ldr r5, _0802FD98 @ =gActiveBank ldrb r1, [r5] bl sub_8031AF4 ldrb r6, [r4, 0x8] ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2892,7 +2892,7 @@ sub_802FCE0: @ 802FCE0 movs r1, 0x50 movs r3, 0x1E bl CreateSprite - ldr r6, _0802FDA4 @ =gUnknown_02024BE0 + ldr r6, _0802FDA4 @ =gObjectBankIDs ldrb r1, [r5] adds r1, r6 strb r0, [r1] @@ -2938,7 +2938,7 @@ sub_802FCE0: @ 802FCE0 adds r0, r4 ldr r1, _0802FDB0 @ =sub_80313A0 str r1, [r0] - ldr r1, _0802FDB4 @ =gUnknown_03004330 + ldr r1, _0802FDB4 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -2949,22 +2949,22 @@ sub_802FCE0: @ 802FCE0 bx r0 .align 2, 0 _0802FD94: .4byte gSaveBlock2 -_0802FD98: .4byte gUnknown_02024A60 +_0802FD98: .4byte gActiveBank _0802FD9C: .4byte gUnknown_02024E8C _0802FDA0: .4byte gTrainerBackPicCoords -_0802FDA4: .4byte gUnknown_02024BE0 +_0802FDA4: .4byte gObjectBankIDs _0802FDA8: .4byte gSprites _0802FDAC: .4byte 0x0000ffa0 _0802FDB0: .4byte sub_80313A0 -_0802FDB4: .4byte gUnknown_03004330 +_0802FDB4: .4byte gBattleBankFunc _0802FDB8: .4byte sub_802D23C - thumb_func_end sub_802FCE0 + thumb_func_end PlayerHandleTrainerSlide - thumb_func_start sub_802FDBC -sub_802FDBC: @ 802FDBC + thumb_func_start PlayerHandleTrainerSlideBack +PlayerHandleTrainerSlideBack: @ 802FDBC push {r4-r6,lr} - ldr r5, _0802FE5C @ =gUnknown_02024BE0 - ldr r6, _0802FE60 @ =gUnknown_02024A60 + ldr r5, _0802FE5C @ =gObjectBankIDs + ldr r6, _0802FE60 @ =gActiveBank ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -3030,7 +3030,7 @@ sub_802FDBC: @ 802FDBC adds r0, r4 movs r1, 0x1 bl StartSpriteAnim - ldr r1, _0802FE74 @ =gUnknown_03004330 + ldr r1, _0802FE74 @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -3040,20 +3040,20 @@ sub_802FDBC: @ 802FDBC pop {r0} bx r0 .align 2, 0 -_0802FE5C: .4byte gUnknown_02024BE0 -_0802FE60: .4byte gUnknown_02024A60 +_0802FE5C: .4byte gObjectBankIDs +_0802FE60: .4byte gActiveBank _0802FE64: .4byte gSprites _0802FE68: .4byte 0x0000ffd8 _0802FE6C: .4byte sub_8078B34 _0802FE70: .4byte SpriteCallbackDummy -_0802FE74: .4byte gUnknown_03004330 +_0802FE74: .4byte gBattleBankFunc _0802FE78: .4byte sub_802D274 - thumb_func_end sub_802FDBC + thumb_func_end PlayerHandleTrainerSlideBack thumb_func_start sub_802FE7C sub_802FE7C: @ 802FE7C push {r4,r5,lr} - ldr r5, _0802FEC0 @ =gUnknown_02024A60 + ldr r5, _0802FEC0 @ =gActiveBank ldrb r2, [r5] lsls r0, r2, 1 adds r0, r2 @@ -3087,7 +3087,7 @@ _0802FEAE: strb r0, [r1, 0x4] b _0802FF3E .align 2, 0 -_0802FEC0: .4byte gUnknown_02024A60 +_0802FEC0: .4byte gActiveBank _0802FEC4: .4byte 0x02017810 _0802FEC8: ldrb r1, [r3] @@ -3098,7 +3098,7 @@ _0802FEC8: cmp r4, 0 bne _0802FF3E strb r4, [r3, 0x4] - ldr r2, _0802FF44 @ =gUnknown_02024A6A + ldr r2, _0802FF44 @ =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -3113,7 +3113,7 @@ _0802FEC8: movs r0, 0x10 bl PlaySE12WithPanning ldr r2, _0802FF4C @ =gSprites - ldr r3, _0802FF50 @ =gUnknown_02024BE0 + ldr r3, _0802FF50 @ =gObjectBankIDs ldrb r0, [r5] adds r0, r3 ldrb r1, [r0] @@ -3141,7 +3141,7 @@ _0802FEC8: adds r0, r2 ldr r1, _0802FF54 @ =sub_80105EC str r1, [r0] - ldr r1, _0802FF58 @ =gUnknown_03004330 + ldr r1, _0802FF58 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3152,12 +3152,12 @@ _0802FF3E: pop {r0} bx r0 .align 2, 0 -_0802FF44: .4byte gUnknown_02024A6A +_0802FF44: .4byte gBattlePartyID _0802FF48: .4byte gPlayerParty _0802FF4C: .4byte gSprites -_0802FF50: .4byte gUnknown_02024BE0 +_0802FF50: .4byte gObjectBankIDs _0802FF54: .4byte sub_80105EC -_0802FF58: .4byte gUnknown_03004330 +_0802FF58: .4byte gBattleBankFunc _0802FF5C: .4byte sub_802DE10 thumb_func_end sub_802FE7C @@ -3173,7 +3173,7 @@ sub_802FF60: @ 802FF60 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted add sp, 0x4 pop {r0} bx r0 @@ -3185,13 +3185,13 @@ sub_802FF80: @ 802FF80 ldr r1, _0802FFBC @ =0x02017840 movs r0, 0x4 strb r0, [r1, 0x8] - ldr r1, _0802FFC0 @ =gUnknown_02024E6D + ldr r1, _0802FFC0 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] - ldr r5, _0802FFC4 @ =gUnknown_02024A60 + ldr r5, _0802FFC4 @ =gActiveBank ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -3199,7 +3199,7 @@ sub_802FF80: @ 802FF80 adds r1, r4, 0 movs r3, 0x3 bl move_anim_start_t4 - ldr r1, _0802FFC8 @ =gUnknown_03004330 + ldr r1, _0802FFC8 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3210,17 +3210,17 @@ sub_802FF80: @ 802FF80 bx r0 .align 2, 0 _0802FFBC: .4byte 0x02017840 -_0802FFC0: .4byte gUnknown_02024E6D -_0802FFC4: .4byte gUnknown_02024A60 -_0802FFC8: .4byte gUnknown_03004330 +_0802FFC0: .4byte gDoingBattleAnim +_0802FFC4: .4byte gActiveBank +_0802FFC8: .4byte gBattleBankFunc _0802FFCC: .4byte bx_wait_t1 thumb_func_end sub_802FF80 - thumb_func_start sub_802FFD0 -sub_802FFD0: @ 802FFD0 + thumb_func_start PlayerHandleBallThrow +PlayerHandleBallThrow: @ 802FFD0 push {r4,r5,lr} - ldr r1, _08030014 @ =gUnknown_02023A60 - ldr r5, _08030018 @ =gUnknown_02024A60 + ldr r1, _08030014 @ =gBattleBufferA + ldr r5, _08030018 @ =gActiveBank ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -3228,12 +3228,12 @@ sub_802FFD0: @ 802FFD0 ldrb r1, [r0] ldr r0, _0803001C @ =0x02017840 strb r1, [r0, 0x8] - ldr r1, _08030020 @ =gUnknown_02024E6D + ldr r1, _08030020 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -3241,7 +3241,7 @@ sub_802FFD0: @ 802FFD0 adds r1, r4, 0 movs r3, 0x3 bl move_anim_start_t4 - ldr r1, _08030024 @ =gUnknown_03004330 + ldr r1, _08030024 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3251,19 +3251,19 @@ sub_802FFD0: @ 802FFD0 pop {r0} bx r0 .align 2, 0 -_08030014: .4byte gUnknown_02023A60 -_08030018: .4byte gUnknown_02024A60 +_08030014: .4byte gBattleBufferA +_08030018: .4byte gActiveBank _0803001C: .4byte 0x02017840 -_08030020: .4byte gUnknown_02024E6D -_08030024: .4byte gUnknown_03004330 +_08030020: .4byte gDoingBattleAnim +_08030024: .4byte gBattleBankFunc _08030028: .4byte bx_wait_t1 - thumb_func_end sub_802FFD0 + thumb_func_end PlayerHandleBallThrow - thumb_func_start sub_803002C -sub_803002C: @ 803002C + thumb_func_start PlayerHandlePuase +PlayerHandlePuase: @ 803002C push {lr} - ldr r1, _08030054 @ =gUnknown_02023A60 - ldr r0, _08030058 @ =gUnknown_02024A60 + ldr r1, _08030054 @ =gBattleBufferA + ldr r0, _08030058 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -3278,18 +3278,18 @@ _08030040: cmp r0, 0 bne _08030040 _0803004A: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08030054: .4byte gUnknown_02023A60 -_08030058: .4byte gUnknown_02024A60 - thumb_func_end sub_803002C +_08030054: .4byte gBattleBufferA +_08030058: .4byte gActiveBank + thumb_func_end PlayerHandlePuase - thumb_func_start dp01t_0F_1_move_anim -dp01t_0F_1_move_anim: @ 803005C + thumb_func_start PlayerHandleMoveAnimation +PlayerHandleMoveAnimation: @ 803005C push {r4-r6,lr} - ldr r6, _08030140 @ =gUnknown_02024A60 + ldr r6, _08030140 @ =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -3297,7 +3297,7 @@ dp01t_0F_1_move_anim: @ 803005C beq _0803006E b _0803017E _0803006E: - ldr r0, _08030144 @ =gUnknown_02023A60 + ldr r0, _08030144 @ =gBattleBufferA mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -3316,7 +3316,7 @@ _0803006E: adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, _0803014C @ =gUnknown_0202F7BC + ldr r4, _0803014C @ =gMovePowerMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3330,7 +3330,7 @@ _0803006E: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, _08030150 @ =gUnknown_0202F7B8 + ldr r4, _08030150 @ =gMoveDmgMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3356,7 +3356,7 @@ _0803006E: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, _08030154 @ =gUnknown_0202F7BE + ldr r3, _08030154 @ =gHappinessMoveAnim ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -3364,7 +3364,7 @@ _0803006E: adds r1, r2 ldrb r1, [r1] strb r1, [r3] - ldr r4, _08030158 @ =gUnknown_0202F7C0 + ldr r4, _08030158 @ =gWeatherMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3378,14 +3378,14 @@ _0803006E: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, _0803015C @ =gUnknown_0202F7B4 + ldr r3, _0803015C @ =gDisableStructMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 adds r1, 0x10 adds r2, r1 str r2, [r3] - ldr r3, _08030160 @ =gUnknown_02024E70 + ldr r3, _08030160 @ =gPID_perBank ldrb r1, [r6] lsls r1, 2 adds r1, r3 @@ -3397,18 +3397,18 @@ _0803006E: lsrs r2, r0, 24 cmp r2, 0 beq _08030164 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0803017E .align 2, 0 -_08030140: .4byte gUnknown_02024A60 -_08030144: .4byte gUnknown_02023A60 +_08030140: .4byte gActiveBank +_08030144: .4byte gBattleBufferA _08030148: .4byte gUnknown_0202F7C4 -_0803014C: .4byte gUnknown_0202F7BC -_08030150: .4byte gUnknown_0202F7B8 -_08030154: .4byte gUnknown_0202F7BE -_08030158: .4byte gUnknown_0202F7C0 -_0803015C: .4byte gUnknown_0202F7B4 -_08030160: .4byte gUnknown_02024E70 +_0803014C: .4byte gMovePowerMoveAnim +_08030150: .4byte gMoveDmgMoveAnim +_08030154: .4byte gHappinessMoveAnim +_08030158: .4byte gWeatherMoveAnim +_0803015C: .4byte gDisableStructMoveAnim +_08030160: .4byte gPID_perBank _08030164: ldrb r1, [r6] lsls r0, r1, 1 @@ -3417,7 +3417,7 @@ _08030164: ldr r1, _08030184 @ =0x02017810 adds r0, r1 strb r2, [r0, 0x4] - ldr r1, _08030188 @ =gUnknown_03004330 + ldr r1, _08030188 @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -3429,9 +3429,9 @@ _0803017E: bx r0 .align 2, 0 _08030184: .4byte 0x02017810 -_08030188: .4byte gUnknown_03004330 +_08030188: .4byte gBattleBankFunc _0803018C: .4byte sub_8030190 - thumb_func_end dp01t_0F_1_move_anim + thumb_func_end PlayerHandleMoveAnimation thumb_func_start sub_8030190 sub_8030190: @ 8030190 @@ -3439,8 +3439,8 @@ sub_8030190: @ 8030190 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r2, _080301D4 @ =gUnknown_02023A60 - ldr r5, _080301D8 @ =gUnknown_02024A60 + ldr r2, _080301D4 @ =gBattleBufferA + ldr r5, _080301D8 @ =gActiveBank ldrb r3, [r5] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -3470,8 +3470,8 @@ sub_8030190: @ 8030190 beq _080301EA b _080302E8 .align 2, 0 -_080301D4: .4byte gUnknown_02023A60 -_080301D8: .4byte gUnknown_02024A60 +_080301D4: .4byte gBattleBufferA +_080301D8: .4byte gActiveBank _080301DC: .4byte 0x02017810 _080301E0: cmp r2, 0x2 @@ -3559,7 +3559,7 @@ _08030244: ands r1, r2 strb r1, [r0] _0803028C: - ldr r0, _080302A8 @ =gUnknown_02024A60 + ldr r0, _080302A8 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3572,7 +3572,7 @@ _0803028C: .align 2, 0 _080302A0: .4byte gAnimScriptCallback _080302A4: .4byte gAnimScriptActive -_080302A8: .4byte gUnknown_02024A60 +_080302A8: .4byte gActiveBank _080302AC: .4byte 0x02017810 _080302B0: ldrb r1, [r0] @@ -3599,7 +3599,7 @@ _080302B0: lsls r0, 2 adds r0, r6 strb r4, [r0, 0x4] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _080302E8: pop {r3,r4} mov r8, r3 @@ -3609,8 +3609,8 @@ _080302E8: bx r0 thumb_func_end sub_8030190 - thumb_func_start sub_80302F4 -sub_80302F4: @ 80302F4 + thumb_func_start PlayerHandlePrintString +PlayerHandlePrintString: @ 80302F4 push {r4,lr} sub sp, 0x4 ldr r0, _08030338 @ =gUnknown_030042A4 @@ -3618,21 +3618,21 @@ sub_80302F4: @ 80302F4 strh r1, [r0] ldr r0, _0803033C @ =gUnknown_030042A0 strh r1, [r0] - ldr r4, _08030340 @ =gUnknown_02024A60 + ldr r4, _08030340 @ =gActiveBank ldrb r0, [r4] lsls r0, 9 ldr r1, _08030344 @ =gUnknown_02023A62 adds r0, r1 ldrh r0, [r0] - bl sub_8120AA8 + bl BufferStringBattle ldr r0, _08030348 @ =gUnknown_03004210 - ldr r1, _0803034C @ =gUnknown_020238CC + ldr r1, _0803034C @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 movs r3, 0x2 bl sub_8002EB0 - ldr r1, _08030350 @ =gUnknown_03004330 + ldr r1, _08030350 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3645,33 +3645,33 @@ sub_80302F4: @ 80302F4 .align 2, 0 _08030338: .4byte gUnknown_030042A4 _0803033C: .4byte gUnknown_030042A0 -_08030340: .4byte gUnknown_02024A60 +_08030340: .4byte gActiveBank _08030344: .4byte gUnknown_02023A62 _08030348: .4byte gUnknown_03004210 -_0803034C: .4byte gUnknown_020238CC -_08030350: .4byte gUnknown_03004330 +_0803034C: .4byte gDisplayedStringBattle +_08030350: .4byte gBattleBankFunc _08030354: .4byte sub_802DF18 - thumb_func_end sub_80302F4 + thumb_func_end PlayerHandlePrintString - thumb_func_start dp01t_11_1_message_for_player_only -dp01t_11_1_message_for_player_only: @ 8030358 + thumb_func_start PlayerHandlePrintStringPlayerOnly +PlayerHandlePrintStringPlayerOnly: @ 8030358 push {lr} - ldr r0, _08030370 @ =gUnknown_02024A60 + ldr r0, _08030370 @ =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08030374 - bl sub_80302F4 + bl PlayerHandlePrintString b _08030378 .align 2, 0 -_08030370: .4byte gUnknown_02024A60 +_08030370: .4byte gActiveBank _08030374: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08030378: pop {r0} bx r0 - thumb_func_end dp01t_11_1_message_for_player_only + thumb_func_end PlayerHandlePrintStringPlayerOnly .section .text_8030464 @@ -3691,8 +3691,8 @@ sub_8030468: @ 8030468 movs r2, 0xC bl sub_814A5C0 bl sub_80304A8 - ldr r1, _0803049C @ =gUnknown_03004330 - ldr r0, _080304A0 @ =gUnknown_02024A60 + ldr r1, _0803049C @ =gBattleBankFunc + ldr r0, _080304A0 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -3704,8 +3704,8 @@ sub_8030468: @ 8030468 .align 2, 0 _08030494: .4byte 0x0000ffff _08030498: .4byte 0x00002d9f -_0803049C: .4byte gUnknown_03004330 -_080304A0: .4byte gUnknown_02024A60 +_0803049C: .4byte gBattleBankFunc +_080304A0: .4byte gActiveBank _080304A4: .4byte sub_802C68C thumb_func_end sub_8030468 @@ -3725,14 +3725,14 @@ sub_80304A8: @ 80304A8 ldr r1, _08030518 @ =gUnknown_03004344 movs r0, 0xFF strb r0, [r1] - ldr r1, _0803051C @ =gUnknown_02024E64 - ldr r4, _08030520 @ =gUnknown_02024A60 + ldr r1, _0803051C @ =gMoveSelectionCursor + ldr r4, _08030520 @ =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl sub_802E3B4 - ldr r1, _08030524 @ =gUnknown_02023A60 + ldr r1, _08030524 @ =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r1, 0x2 @@ -3762,15 +3762,15 @@ _08030500: _08030510: .4byte gUnknown_030042A4 _08030514: .4byte gUnknown_030042A0 _08030518: .4byte gUnknown_03004344 -_0803051C: .4byte gUnknown_02024E64 -_08030520: .4byte gUnknown_02024A60 -_08030524: .4byte gUnknown_02023A60 +_0803051C: .4byte gMoveSelectionCursor +_08030520: .4byte gActiveBank +_08030524: .4byte gBattleBufferA _08030528: .4byte gUnknown_03004210 _0803052C: .4byte gUnknown_08400D38 thumb_func_end sub_80304A8 - thumb_func_start sub_8030530 -sub_8030530: @ 8030530 + thumb_func_start PlayerHandleOpenBag +PlayerHandleOpenBag: @ 8030530 push {r4,r5,lr} sub sp, 0x4 movs r0, 0x1 @@ -3780,19 +3780,19 @@ sub_8030530: @ 8030530 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0803057C @ =gUnknown_03004330 - ldr r2, _08030580 @ =gUnknown_02024A60 + ldr r1, _0803057C @ =gBattleBankFunc + ldr r2, _08030580 @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 ldr r1, _08030584 @ =sub_802E004 str r1, [r0] - ldr r1, _08030588 @ =gUnknown_02024E6C + ldr r1, _08030588 @ =gBankInMenu ldrb r0, [r2] strb r0, [r1] movs r3, 0 ldr r5, _0803058C @ =gUnknown_02038470 - ldr r4, _08030590 @ =gUnknown_02023A60 + ldr r4, _08030590 @ =gBattleBufferA _0803055E: adds r0, r3, r5 ldrb r1, [r2] @@ -3810,13 +3810,13 @@ _0803055E: pop {r0} bx r0 .align 2, 0 -_0803057C: .4byte gUnknown_03004330 -_08030580: .4byte gUnknown_02024A60 +_0803057C: .4byte gBattleBankFunc +_08030580: .4byte gActiveBank _08030584: .4byte sub_802E004 -_08030588: .4byte gUnknown_02024E6C +_08030588: .4byte gBankInMenu _0803058C: .4byte gUnknown_02038470 -_08030590: .4byte gUnknown_02023A60 - thumb_func_end sub_8030530 +_08030590: .4byte gBattleBufferA + thumb_func_end PlayerHandleOpenBag thumb_func_start sub_8030594 sub_8030594: @ 8030594 @@ -3826,7 +3826,7 @@ sub_8030594: @ 8030594 movs r1, 0xFF bl CreateTask ldr r3, _08030648 @ =gUnknown_0300434C - ldr r5, _0803064C @ =gUnknown_02024A60 + ldr r5, _0803064C @ =gActiveBank ldrb r1, [r5] adds r1, r3 strb r0, [r1] @@ -3838,7 +3838,7 @@ sub_8030594: @ 8030594 adds r1, r0 lsls r1, 3 adds r1, r4 - ldr r4, _08030654 @ =gUnknown_02023A60 + ldr r4, _08030654 @ =gBattleBufferA lsls r2, 9 adds r3, r4, 0x1 adds r2, r3 @@ -3892,14 +3892,14 @@ _08030600: movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _08030668 @ =gUnknown_03004330 - ldr r2, _0803064C @ =gUnknown_02024A60 + ldr r1, _08030668 @ =gBattleBankFunc + ldr r2, _0803064C @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 ldr r1, _0803066C @ =sub_802DF30 str r1, [r0] - ldr r1, _08030670 @ =gUnknown_02024E6C + ldr r1, _08030670 @ =gBankInMenu ldrb r0, [r2] strb r0, [r1] add sp, 0x4 @@ -3909,16 +3909,16 @@ _08030600: .align 2, 0 _08030644: .4byte TaskDummy _08030648: .4byte gUnknown_0300434C -_0803064C: .4byte gUnknown_02024A60 +_0803064C: .4byte gActiveBank _08030650: .4byte gTasks -_08030654: .4byte gUnknown_02023A60 +_08030654: .4byte gBattleBufferA _08030658: .4byte 0x02000000 _0803065C: .4byte 0x00016054 _08030660: .4byte 0x000160c0 _08030664: .4byte gUnknown_02038470 -_08030668: .4byte gUnknown_03004330 +_08030668: .4byte gBattleBankFunc _0803066C: .4byte sub_802DF30 -_08030670: .4byte gUnknown_02024E6C +_08030670: .4byte gBankInMenu thumb_func_end sub_8030594 thumb_func_start sub_8030674 @@ -3934,14 +3934,14 @@ sub_8030674: @ 8030674 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted add sp, 0x4 pop {r0} bx r0 thumb_func_end sub_8030674 - thumb_func_start sub_8030698 -sub_8030698: @ 8030698 + thumb_func_start PlayerHandleHealthBarUpdate +PlayerHandleHealthBarUpdate: @ 8030698 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -3949,8 +3949,8 @@ sub_8030698: @ 8030698 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _08030710 @ =gUnknown_02023A60 - ldr r0, _08030714 @ =gUnknown_02024A60 + ldr r3, _08030710 @ =gBattleBufferA + ldr r0, _08030714 @ =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -3967,7 +3967,7 @@ sub_8030698: @ 8030698 ldr r0, _08030718 @ =0x00007fff cmp r7, r0 beq _08030728 - ldr r6, _0803071C @ =gUnknown_02024A6A + ldr r6, _0803071C @ =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -3990,7 +3990,7 @@ sub_8030698: @ 8030698 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _08030724 @ =gUnknown_03004340 + ldr r1, _08030724 @ =gHealthboxIDs adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -3998,14 +3998,14 @@ sub_8030698: @ 8030698 bl sub_8043D84 b _08030762 .align 2, 0 -_08030710: .4byte gUnknown_02023A60 -_08030714: .4byte gUnknown_02024A60 +_08030710: .4byte gBattleBufferA +_08030714: .4byte gActiveBank _08030718: .4byte 0x00007fff -_0803071C: .4byte gUnknown_02024A6A +_0803071C: .4byte gBattlePartyID _08030720: .4byte gPlayerParty -_08030724: .4byte gUnknown_03004340 +_08030724: .4byte gHealthboxIDs _08030728: - ldr r1, _08030780 @ =gUnknown_02024A6A + ldr r1, _08030780 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -4018,7 +4018,7 @@ _08030728: adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r4, _08030788 @ =gUnknown_03004340 + ldr r4, _08030788 @ =gHealthboxIDs adds r1, r0, r4 ldrb r1, [r1] str r7, [sp] @@ -4032,8 +4032,8 @@ _08030728: movs r2, 0 bl sub_80440EC _08030762: - ldr r1, _0803078C @ =gUnknown_03004330 - ldr r0, _08030790 @ =gUnknown_02024A60 + ldr r1, _0803078C @ =gBattleBankFunc + ldr r0, _08030790 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4047,19 +4047,19 @@ _08030762: pop {r0} bx r0 .align 2, 0 -_08030780: .4byte gUnknown_02024A6A +_08030780: .4byte gBattlePartyID _08030784: .4byte gPlayerParty -_08030788: .4byte gUnknown_03004340 -_0803078C: .4byte gUnknown_03004330 -_08030790: .4byte gUnknown_02024A60 +_08030788: .4byte gHealthboxIDs +_0803078C: .4byte gBattleBankFunc +_08030790: .4byte gActiveBank _08030794: .4byte bx_t1_healthbar_update - thumb_func_end sub_8030698 + thumb_func_end PlayerHandleHealthBarUpdate - thumb_func_start sub_8030798 -sub_8030798: @ 8030798 + thumb_func_start PlayerHandleExpBarUpdate +PlayerHandleExpBarUpdate: @ 8030798 push {r4-r7,lr} - ldr r5, _080307C4 @ =gUnknown_02023A60 - ldr r6, _080307C8 @ =gUnknown_02024A60 + ldr r5, _080307C4 @ =gBattleBufferA + ldr r6, _080307C8 @ =gActiveBank ldrb r0, [r6] lsls r0, 9 adds r1, r5, 0x1 @@ -4075,11 +4075,11 @@ sub_8030798: @ 8030798 bl GetMonData cmp r0, 0x63 bls _080307D0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0803081C .align 2, 0 -_080307C4: .4byte gUnknown_02023A60 -_080307C8: .4byte gUnknown_02024A60 +_080307C4: .4byte gBattleBufferA +_080307C8: .4byte gActiveBank _080307CC: .4byte gPlayerParty _080307D0: movs r0, 0x1 @@ -4111,7 +4111,7 @@ _080307D0: strh r4, [r1, 0xA] ldrb r0, [r6] strh r0, [r1, 0xC] - ldr r1, _0803082C @ =gUnknown_03004330 + ldr r1, _0803082C @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -4124,24 +4124,24 @@ _0803081C: .align 2, 0 _08030824: .4byte sub_802D924 _08030828: .4byte gTasks -_0803082C: .4byte gUnknown_03004330 +_0803082C: .4byte gBattleBankFunc _08030830: .4byte nullsub_91 - thumb_func_end sub_8030798 + thumb_func_end PlayerHandleExpBarUpdate - thumb_func_start sub_8030834 -sub_8030834: @ 8030834 + thumb_func_start PlayerHandleStatusIconUpdate +PlayerHandleStatusIconUpdate: @ 8030834 push {r4,lr} - ldr r4, _0803088C @ =gUnknown_02024A60 + ldr r4, _0803088C @ =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08030884 - ldr r0, _08030890 @ =gUnknown_03004340 + ldr r0, _08030890 @ =gHealthboxIDs ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _08030894 @ =gUnknown_02024A6A + ldr r2, _08030894 @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -4162,7 +4162,7 @@ sub_8030834: @ 8030834 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _080308A0 @ =gUnknown_03004330 + ldr r1, _080308A0 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4173,25 +4173,25 @@ _08030884: pop {r0} bx r0 .align 2, 0 -_0803088C: .4byte gUnknown_02024A60 -_08030890: .4byte gUnknown_03004340 -_08030894: .4byte gUnknown_02024A6A +_0803088C: .4byte gActiveBank +_08030890: .4byte gHealthboxIDs +_08030894: .4byte gBattlePartyID _08030898: .4byte gPlayerParty _0803089C: .4byte 0x02017810 -_080308A0: .4byte gUnknown_03004330 +_080308A0: .4byte gBattleBankFunc _080308A4: .4byte sub_802E434 - thumb_func_end sub_8030834 + thumb_func_end PlayerHandleStatusIconUpdate - thumb_func_start sub_80308A8 -sub_80308A8: @ 80308A8 + thumb_func_start PlayerHandleStatusAnimation +PlayerHandleStatusAnimation: @ 80308A8 push {r4,r5,lr} - ldr r5, _08030900 @ =gUnknown_02024A60 + ldr r5, _08030900 @ =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _080308F8 - ldr r4, _08030904 @ =gUnknown_02023A60 + ldr r4, _08030904 @ =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -4216,7 +4216,7 @@ sub_80308A8: @ 80308A8 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _08030908 @ =gUnknown_03004330 + ldr r1, _08030908 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4227,21 +4227,21 @@ _080308F8: pop {r0} bx r0 .align 2, 0 -_08030900: .4byte gUnknown_02024A60 -_08030904: .4byte gUnknown_02023A60 -_08030908: .4byte gUnknown_03004330 +_08030900: .4byte gActiveBank +_08030904: .4byte gBattleBufferA +_08030908: .4byte gBattleBankFunc _0803090C: .4byte sub_802E434 - thumb_func_end sub_80308A8 + thumb_func_end PlayerHandleStatusAnimation - thumb_func_start sub_8030910 -sub_8030910: @ 8030910 + thumb_func_start PlayerHandleStatusXor +PlayerHandleStatusXor: @ 8030910 push {r4-r6,lr} mov r6, r8 push {r6} sub sp, 0x4 - ldr r0, _0803096C @ =gUnknown_02024A6A + ldr r0, _0803096C @ =gBattlePartyID mov r8, r0 - ldr r4, _08030970 @ =gUnknown_02024A60 + ldr r4, _08030970 @ =gActiveBank ldrb r0, [r4] lsls r0, 1 add r0, r8 @@ -4252,7 +4252,7 @@ sub_8030910: @ 8030910 adds r0, r5 movs r1, 0x37 bl GetMonData - ldr r2, _08030978 @ =gUnknown_02023A60 + ldr r2, _08030978 @ =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r2, 0x1 @@ -4270,7 +4270,7 @@ sub_8030910: @ 8030910 movs r1, 0x37 mov r2, sp bl SetMonData - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted add sp, 0x4 pop {r3} mov r8, r3 @@ -4278,25 +4278,25 @@ sub_8030910: @ 8030910 pop {r0} bx r0 .align 2, 0 -_0803096C: .4byte gUnknown_02024A6A -_08030970: .4byte gUnknown_02024A60 +_0803096C: .4byte gBattlePartyID +_08030970: .4byte gActiveBank _08030974: .4byte gPlayerParty -_08030978: .4byte gUnknown_02023A60 - thumb_func_end sub_8030910 +_08030978: .4byte gBattleBufferA + thumb_func_end PlayerHandleStatusXor thumb_func_start sub_803097C sub_803097C: @ 803097C push {lr} - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_803097C - thumb_func_start sub_8030988 -sub_8030988: @ 8030988 + thumb_func_start PlayerHandleDMATransfer +PlayerHandleDMATransfer: @ 8030988 push {r4,r5,lr} - ldr r3, _080309EC @ =gUnknown_02023A60 - ldr r0, _080309F0 @ =gUnknown_02024A60 + ldr r3, _080309EC @ =gBattleBufferA + ldr r0, _080309F0 @ =gActiveBank ldrb r2, [r0] lsls r2, 9 adds r0, r3, 0x1 @@ -4344,8 +4344,8 @@ sub_8030988: @ 8030988 ldr r0, [r0, 0x8] b _08030A24 .align 2, 0 -_080309EC: .4byte gUnknown_02023A60 -_080309F0: .4byte gUnknown_02024A60 +_080309EC: .4byte gBattleBufferA +_080309F0: .4byte gActiveBank _080309F4: .4byte 0x040000d4 _080309F8: ldr r3, _08030A30 @ =0x040000d4 @@ -4371,7 +4371,7 @@ _080309F8: str r0, [r3, 0x8] ldr r0, [r3, 0x8] _08030A24: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4,r5} pop {r0} bx r0 @@ -4379,13 +4379,13 @@ _08030A24: _08030A30: .4byte 0x040000d4 _08030A34: .4byte 0x80000800 _08030A38: .4byte 0xfffff000 - thumb_func_end sub_8030988 + thumb_func_end PlayerHandleDMATransfer thumb_func_start sub_8030A3C sub_8030A3C: @ 8030A3C push {lr} - ldr r2, _08030A64 @ =gUnknown_02023A60 - ldr r0, _08030A68 @ =gUnknown_02024A60 + ldr r2, _08030A64 @ =gBattleBufferA + ldr r0, _08030A68 @ =gActiveBank ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -4397,18 +4397,18 @@ sub_8030A3C: @ 8030A3C lsls r1, 8 orrs r0, r1 bl PlayBGM - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08030A64: .4byte gUnknown_02023A60 -_08030A68: .4byte gUnknown_02024A60 +_08030A64: .4byte gBattleBufferA +_08030A68: .4byte gActiveBank thumb_func_end sub_8030A3C thumb_func_start sub_8030A6C sub_8030A6C: @ 8030A6C push {lr} - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8030A6C @@ -4420,7 +4420,7 @@ sub_8030A78: @ 8030A78 movs r1, 0 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8030A78 @@ -4432,7 +4432,7 @@ sub_8030A8C: @ 8030A8C movs r1, 0 movs r2, 0 bl dp01_build_cmdbuf_x22_a_three_bytes - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8030A8C @@ -4443,7 +4443,7 @@ sub_8030AA0: @ 8030AA0 movs r0, 0x1 movs r1, 0 bl dp01_build_cmdbuf_x23_aa_0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8030AA0 @@ -4454,7 +4454,7 @@ sub_8030AB4: @ 8030AB4 movs r0, 0x1 movs r1, 0 bl dp01_build_cmdbuf_x24_aa_0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8030AB4 @@ -4468,7 +4468,7 @@ sub_8030AC8: @ 8030AC8 negs r0, r0 ands r0, r1 strb r0, [r2] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -4479,8 +4479,8 @@ _08030AE0: .4byte gUnknown_020238C8 sub_8030AE4: @ 8030AE4 push {lr} ldr r3, _08030B10 @ =gUnknown_020238C8 - ldr r1, _08030B14 @ =gUnknown_02023A60 - ldr r0, _08030B18 @ =gUnknown_02024A60 + ldr r1, _08030B14 @ =gBattleBufferA + ldr r0, _08030B18 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4494,13 +4494,13 @@ sub_8030AE4: @ 8030AE4 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08030B10: .4byte gUnknown_020238C8 -_08030B14: .4byte gUnknown_02023A60 -_08030B18: .4byte gUnknown_02024A60 +_08030B14: .4byte gBattleBufferA +_08030B18: .4byte gActiveBank thumb_func_end sub_8030AE4 thumb_func_start sub_8030B1C @@ -4511,7 +4511,7 @@ sub_8030B1C: @ 8030B1C movs r0, 0x7F ands r0, r1 strb r0, [r2] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -4533,19 +4533,19 @@ sub_8030B34: @ 8030B34 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08030B58: .4byte gUnknown_020238C8 thumb_func_end sub_8030B34 - thumb_func_start dp01t_29_1_blink -dp01t_29_1_blink: @ 8030B5C + thumb_func_start PlayerHandleHitAnimation +PlayerHandleHitAnimation: @ 8030B5C push {r4,lr} ldr r3, _08030B84 @ =gSprites - ldr r2, _08030B88 @ =gUnknown_02024BE0 - ldr r4, _08030B8C @ =gUnknown_02024A60 + ldr r2, _08030B88 @ =gObjectBankIDs + ldr r4, _08030B8C @ =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -4558,14 +4558,14 @@ dp01t_29_1_blink: @ 8030B5C lsls r0, 29 cmp r0, 0 bge _08030B90 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _08030BBA .align 2, 0 _08030B84: .4byte gSprites -_08030B88: .4byte gUnknown_02024BE0 -_08030B8C: .4byte gUnknown_02024A60 +_08030B88: .4byte gObjectBankIDs +_08030B8C: .4byte gActiveBank _08030B90: - ldr r1, _08030BC0 @ =gUnknown_02024E6D + ldr r1, _08030BC0 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -4579,7 +4579,7 @@ _08030B90: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_8047858 - ldr r1, _08030BC4 @ =gUnknown_03004330 + ldr r1, _08030BC4 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4590,32 +4590,32 @@ _08030BBA: pop {r0} bx r0 .align 2, 0 -_08030BC0: .4byte gUnknown_02024E6D -_08030BC4: .4byte gUnknown_03004330 +_08030BC0: .4byte gDoingBattleAnim +_08030BC4: .4byte gBattleBankFunc _08030BC8: .4byte bx_blink_t1 - thumb_func_end dp01t_29_1_blink + thumb_func_end PlayerHandleHitAnimation thumb_func_start sub_8030BCC sub_8030BCC: @ 8030BCC push {lr} - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8030BCC - thumb_func_start sub_8030BD8 -sub_8030BD8: @ 8030BD8 + thumb_func_start PlayerHandleEffectivenessSound +PlayerHandleEffectivenessSound: @ 8030BD8 push {r4,lr} - ldr r4, _08030C14 @ =gUnknown_02024A60 + ldr r4, _08030C14 @ =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _08030BEC movs r3, 0xC0 _08030BEC: - ldr r2, _08030C18 @ =gUnknown_02023A60 + ldr r2, _08030C18 @ =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -4629,20 +4629,20 @@ _08030BEC: lsls r1, r3, 24 asrs r1, 24 bl PlaySE12WithPanning - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 -_08030C14: .4byte gUnknown_02024A60 -_08030C18: .4byte gUnknown_02023A60 - thumb_func_end sub_8030BD8 +_08030C14: .4byte gActiveBank +_08030C18: .4byte gBattleBufferA + thumb_func_end PlayerHandleEffectivenessSound thumb_func_start sub_8030C1C sub_8030C1C: @ 8030C1C push {lr} - ldr r2, _08030C44 @ =gUnknown_02023A60 - ldr r0, _08030C48 @ =gUnknown_02024A60 + ldr r2, _08030C44 @ =gBattleBufferA + ldr r0, _08030C48 @ =gActiveBank ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -4654,19 +4654,19 @@ sub_8030C1C: @ 8030C1C lsls r1, 8 orrs r0, r1 bl PlayFanfare - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08030C44: .4byte gUnknown_02023A60 -_08030C48: .4byte gUnknown_02024A60 +_08030C44: .4byte gBattleBufferA +_08030C48: .4byte gActiveBank thumb_func_end sub_8030C1C - thumb_func_start sub_8030C4C -sub_8030C4C: @ 8030C4C + thumb_func_start PlayerHandleFaintingCry +PlayerHandleFaintingCry: @ 8030C4C push {lr} - ldr r1, _08030C80 @ =gUnknown_02024A6A - ldr r0, _08030C84 @ =gUnknown_02024A60 + ldr r1, _08030C80 @ =gBattlePartyID + ldr r0, _08030C84 @ =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -4683,20 +4683,20 @@ sub_8030C4C: @ 8030C4C negs r1, r1 movs r2, 0x5 bl PlayCry3 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08030C80: .4byte gUnknown_02024A6A -_08030C84: .4byte gUnknown_02024A60 +_08030C80: .4byte gBattlePartyID +_08030C84: .4byte gActiveBank _08030C88: .4byte gPlayerParty - thumb_func_end sub_8030C4C + thumb_func_end PlayerHandleFaintingCry - thumb_func_start dp01t_2E_1_battle_intro -dp01t_2E_1_battle_intro: @ 8030C8C + thumb_func_start PlayerHandleIntroSlide +PlayerHandleIntroSlide: @ 8030C8C push {lr} - ldr r1, _08030CB4 @ =gUnknown_02023A60 - ldr r0, _08030CB8 @ =gUnknown_02024A60 + ldr r1, _08030CB4 @ =gBattleBufferA + ldr r0, _08030CB8 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4708,20 +4708,20 @@ dp01t_2E_1_battle_intro: @ 8030C8C movs r1, 0x1 orrs r0, r1 strh r0, [r2] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08030CB4: .4byte gUnknown_02023A60 -_08030CB8: .4byte gUnknown_02024A60 +_08030CB4: .4byte gBattleBufferA +_08030CB8: .4byte gActiveBank _08030CBC: .4byte gUnknown_02024DE8 - thumb_func_end dp01t_2E_1_battle_intro + thumb_func_end PlayerHandleIntroSlide - thumb_func_start sub_8030CC0 -sub_8030CC0: @ 8030CC0 + thumb_func_start PlayerHandleTrainerBallThrow +PlayerHandleTrainerBallThrow: @ 8030CC0 push {r4-r7,lr} - ldr r6, _08030DF8 @ =gUnknown_02024BE0 - ldr r7, _08030DFC @ =gUnknown_02024A60 + ldr r6, _08030DF8 @ =gObjectBankIDs + ldr r7, _08030DFC @ =gActiveBank ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] @@ -4861,7 +4861,7 @@ _08030DDC: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _08030E30 @ =gUnknown_03004330 + ldr r1, _08030E30 @ =gBattleBankFunc ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -4871,8 +4871,8 @@ _08030DDC: pop {r0} bx r0 .align 2, 0 -_08030DF8: .4byte gUnknown_02024BE0 -_08030DFC: .4byte gUnknown_02024A60 +_08030DF8: .4byte gObjectBankIDs +_08030DFC: .4byte gActiveBank _08030E00: .4byte gSprites _08030E04: .4byte 0x0000ffd8 _08030E08: .4byte sub_8078B34 @@ -4885,9 +4885,9 @@ _08030E20: .4byte gTasks _08030E24: .4byte 0x02017810 _08030E28: .4byte gUnknown_02024E68 _08030E2C: .4byte sub_8044CA0 -_08030E30: .4byte gUnknown_03004330 +_08030E30: .4byte gBattleBankFunc _08030E34: .4byte nullsub_91 - thumb_func_end sub_8030CC0 + thumb_func_end PlayerHandleTrainerBallThrow thumb_func_start sub_8030E38 sub_8030E38: @ 8030E38 @@ -4905,7 +4905,7 @@ sub_8030E38: @ 8030E38 bl FreeSpritePaletteByTag adds r0, r5, 0 bl DestroySprite - ldr r1, _08030E90 @ =gUnknown_02024A6A + ldr r1, _08030E90 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -4915,7 +4915,7 @@ sub_8030E38: @ 8030E38 adds r0, r1 adds r1, r4, 0 bl sub_80318FC - ldr r0, _08030E98 @ =gUnknown_02024BE0 + ldr r0, _08030E98 @ =gObjectBankIDs adds r4, r0 ldrb r1, [r4] lsls r0, r1, 4 @@ -4929,9 +4929,9 @@ sub_8030E38: @ 8030E38 pop {r0} bx r0 .align 2, 0 -_08030E90: .4byte gUnknown_02024A6A +_08030E90: .4byte gBattlePartyID _08030E94: .4byte gPlayerParty -_08030E98: .4byte gUnknown_02024BE0 +_08030E98: .4byte gObjectBankIDs _08030E9C: .4byte gSprites thumb_func_end sub_8030E38 @@ -4960,7 +4960,7 @@ task05_08033660: @ 8030EA0 .align 2, 0 _08030EC8: .4byte gTasks _08030ECC: - ldr r7, _08030F0C @ =gUnknown_02024A60 + ldr r7, _08030F0C @ =gActiveBank ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -4976,12 +4976,12 @@ _08030ECC: cmp r0, 0 beq _08030F1C _08030EEC: - ldr r0, _08030F14 @ =gUnknown_02023A60 + ldr r0, _08030F14 @ =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _08030F18 @ =gUnknown_02024A6A + ldr r0, _08030F18 @ =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -4991,17 +4991,17 @@ _08030EEC: bl sub_802F934 b _08030F70 .align 2, 0 -_08030F0C: .4byte gUnknown_02024A60 +_08030F0C: .4byte gActiveBank _08030F10: .4byte gBattleTypeFlags -_08030F14: .4byte gUnknown_02023A60 -_08030F18: .4byte gUnknown_02024A6A +_08030F14: .4byte gBattleBufferA +_08030F18: .4byte gBattlePartyID _08030F1C: - ldr r4, _08030F94 @ =gUnknown_02023A60 + ldr r4, _08030F94 @ =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, _08030F98 @ =gUnknown_02024A6A + ldr r5, _08030F98 @ =gBattlePartyID lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -5036,8 +5036,8 @@ _08030F1C: eors r0, r6 strb r0, [r7] _08030F70: - ldr r1, _08030FA0 @ =gUnknown_03004330 - ldr r2, _08030FA4 @ =gUnknown_02024A60 + ldr r1, _08030FA0 @ =gBattleBankFunc + ldr r2, _08030FA4 @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -5055,19 +5055,19 @@ _08030F88: pop {r0} bx r0 .align 2, 0 -_08030F94: .4byte gUnknown_02023A60 -_08030F98: .4byte gUnknown_02024A6A +_08030F94: .4byte gBattleBufferA +_08030F98: .4byte gBattlePartyID _08030F9C: .4byte gPlayerParty -_08030FA0: .4byte gUnknown_03004330 -_08030FA4: .4byte gUnknown_02024A60 +_08030FA0: .4byte gBattleBankFunc +_08030FA4: .4byte gActiveBank _08030FA8: .4byte sub_802D500 thumb_func_end task05_08033660 thumb_func_start sub_8030FAC sub_8030FAC: @ 8030FAC push {r4-r6,lr} - ldr r1, _08030FD4 @ =gUnknown_02023A60 - ldr r0, _08030FD8 @ =gUnknown_02024A60 + ldr r1, _08030FD4 @ =gBattleBufferA + ldr r0, _08030FD8 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -5076,17 +5076,17 @@ sub_8030FAC: @ 8030FAC cmp r0, 0 beq _08030FDC adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08030FDC - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _08031044 .align 2, 0 -_08030FD4: .4byte gUnknown_02023A60 -_08030FD8: .4byte gUnknown_02024A60 +_08030FD4: .4byte gBattleBufferA +_08030FD8: .4byte gActiveBank _08030FDC: - ldr r5, _0803104C @ =gUnknown_02024A60 + ldr r5, _0803104C @ =gActiveBank ldrb r1, [r5] lsls r0, r1, 1 adds r0, r1 @@ -5132,7 +5132,7 @@ _08030FDC: movs r1, 0x5D strb r1, [r0, 0x5] _08031038: - ldr r0, _0803105C @ =gUnknown_03004330 + ldr r0, _0803105C @ =gBattleBankFunc ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -5143,18 +5143,18 @@ _08031044: pop {r0} bx r0 .align 2, 0 -_0803104C: .4byte gUnknown_02024A60 +_0803104C: .4byte gActiveBank _08031050: .4byte 0x02017810 _08031054: .4byte gUnknown_02023A64 _08031058: .4byte gUnknown_02024E68 -_0803105C: .4byte gUnknown_03004330 +_0803105C: .4byte gBattleBankFunc _08031060: .4byte sub_8031064 thumb_func_end sub_8030FAC thumb_func_start sub_8031064 sub_8031064: @ 8031064 push {r4,lr} - ldr r4, _0803109C @ =gUnknown_02024A60 + ldr r4, _0803109C @ =gActiveBank ldrb r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -5175,20 +5175,20 @@ sub_8031064: @ 8031064 adds r1, r3 movs r0, 0 strb r0, [r1, 0x5] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08031094: pop {r4} pop {r0} bx r0 .align 2, 0 -_0803109C: .4byte gUnknown_02024A60 +_0803109C: .4byte gActiveBank _080310A0: .4byte 0x02017810 thumb_func_end sub_8031064 thumb_func_start sub_80310A4 sub_80310A4: @ 80310A4 push {lr} - ldr r0, _080310DC @ =gUnknown_02024A60 + ldr r0, _080310DC @ =gActiveBank ldrb r3, [r0] lsls r0, r3, 1 adds r0, r3 @@ -5211,11 +5211,11 @@ sub_80310A4: @ 80310A4 ldr r1, _080310EC @ =sub_8044CA0 str r1, [r0] _080310D2: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_080310DC: .4byte gUnknown_02024A60 +_080310DC: .4byte gActiveBank _080310E0: .4byte 0x02017810 _080310E4: .4byte gTasks _080310E8: .4byte gUnknown_02024E68 @@ -5225,32 +5225,32 @@ _080310EC: .4byte sub_8044CA0 thumb_func_start sub_80310F0 sub_80310F0: @ 80310F0 push {r4,lr} - ldr r4, _08031110 @ =gUnknown_02024A60 + ldr r4, _08031110 @ =gActiveBank ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free ldrb r0, [r4] movs r1, 0 bl dp11b_obj_free - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 -_08031110: .4byte gUnknown_02024A60 +_08031110: .4byte gActiveBank thumb_func_end sub_80310F0 - thumb_func_start dp01t_33_1_enemy_move -dp01t_33_1_enemy_move: @ 8031114 + thumb_func_start PlayerHandleSpriteInvisibility +PlayerHandleSpriteInvisibility: @ 8031114 push {r4,lr} - ldr r4, _08031164 @ =gUnknown_02024A60 + ldr r4, _08031164 @ =gActiveBank ldrb r0, [r4] bl sub_8078874 lsls r0, 24 cmp r0, 0 beq _0803115A ldr r3, _08031168 @ =gSprites - ldr r0, _0803116C @ =gUnknown_02024BE0 + ldr r0, _0803116C @ =gObjectBankIDs ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -5258,7 +5258,7 @@ dp01t_33_1_enemy_move: @ 8031114 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _08031170 @ =gUnknown_02023A60 + ldr r0, _08031170 @ =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -5276,28 +5276,28 @@ dp01t_33_1_enemy_move: @ 8031114 ldrb r0, [r4] bl sub_8031F88 _0803115A: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 -_08031164: .4byte gUnknown_02024A60 +_08031164: .4byte gActiveBank _08031168: .4byte gSprites -_0803116C: .4byte gUnknown_02024BE0 -_08031170: .4byte gUnknown_02023A60 - thumb_func_end dp01t_33_1_enemy_move +_0803116C: .4byte gObjectBankIDs +_08031170: .4byte gBattleBufferA + thumb_func_end PlayerHandleSpriteInvisibility - thumb_func_start bx_exec_buffer_A_ch0_tbl1 -bx_exec_buffer_A_ch0_tbl1: @ 8031174 + thumb_func_start PlayerHandleBattleAnimation +PlayerHandleBattleAnimation: @ 8031174 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _080311B8 @ =gUnknown_02024A60 + ldr r6, _080311B8 @ =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _080311CC - ldr r5, _080311BC @ =gUnknown_02023A60 + ldr r5, _080311BC @ =gBattleBufferA ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -5318,13 +5318,13 @@ bx_exec_buffer_A_ch0_tbl1: @ 8031174 lsls r0, 24 cmp r0, 0 beq _080311C0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _080311CC .align 2, 0 -_080311B8: .4byte gUnknown_02024A60 -_080311BC: .4byte gUnknown_02023A60 +_080311B8: .4byte gActiveBank +_080311BC: .4byte gBattleBufferA _080311C0: - ldr r0, _080311D4 @ =gUnknown_03004330 + ldr r0, _080311D4 @ =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -5336,15 +5336,15 @@ _080311CC: pop {r0} bx r0 .align 2, 0 -_080311D4: .4byte gUnknown_03004330 +_080311D4: .4byte gBattleBankFunc _080311D8: .4byte sub_802E460 - thumb_func_end bx_exec_buffer_A_ch0_tbl1 + thumb_func_end PlayerHandleBattleAnimation - thumb_func_start dp01t_35_1_link_standby_message_and_free_vram -dp01t_35_1_link_standby_message_and_free_vram: @ 80311DC + thumb_func_start PlayerHandleLinkStandbyMsg +PlayerHandleLinkStandbyMsg: @ 80311DC push {r4,lr} - ldr r1, _080311FC @ =gUnknown_02023A60 - ldr r0, _08031200 @ =gUnknown_02024A60 + ldr r1, _080311FC @ =gBattleBufferA + ldr r0, _08031200 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -5358,8 +5358,8 @@ dp01t_35_1_link_standby_message_and_free_vram: @ 80311DC beq _0803120A b _0803122C .align 2, 0 -_080311FC: .4byte gUnknown_02023A60 -_08031200: .4byte gUnknown_02024A60 +_080311FC: .4byte gBattleBufferA +_08031200: .4byte gActiveBank _08031204: cmp r0, 0x2 beq _08031228 @@ -5367,7 +5367,7 @@ _08031204: _0803120A: bl b_link_standby_message _0803120E: - ldr r4, _08031224 @ =gUnknown_02024A60 + ldr r4, _08031224 @ =gActiveBank ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free @@ -5376,21 +5376,21 @@ _0803120E: bl dp11b_obj_free b _0803122C .align 2, 0 -_08031224: .4byte gUnknown_02024A60 +_08031224: .4byte gActiveBank _08031228: bl b_link_standby_message _0803122C: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 - thumb_func_end dp01t_35_1_link_standby_message_and_free_vram + thumb_func_end PlayerHandleLinkStandbyMsg - thumb_func_start sub_8031238 -sub_8031238: @ 8031238 + thumb_func_start PlayerHandleResetActionMoveSelection +PlayerHandleResetActionMoveSelection: @ 8031238 push {r4,lr} - ldr r1, _08031258 @ =gUnknown_02023A60 - ldr r4, _0803125C @ =gUnknown_02024A60 + ldr r1, _08031258 @ =gBattleBufferA + ldr r4, _0803125C @ =gActiveBank ldrb r3, [r4] lsls r0, r3, 9 adds r1, 0x1 @@ -5404,50 +5404,50 @@ sub_8031238: @ 8031238 beq _08031266 b _08031290 .align 2, 0 -_08031258: .4byte gUnknown_02023A60 -_0803125C: .4byte gUnknown_02024A60 +_08031258: .4byte gBattleBufferA +_0803125C: .4byte gActiveBank _08031260: cmp r2, 0x2 beq _08031288 b _08031290 _08031266: - ldr r0, _08031278 @ =gUnknown_02024E60 + ldr r0, _08031278 @ =gActionSelectionCursor adds r0, r3, r0 strb r2, [r0] - ldr r1, _0803127C @ =gUnknown_02024E64 + ldr r1, _0803127C @ =gMoveSelectionCursor ldrb r0, [r4] adds r0, r1 strb r2, [r0] b _08031290 .align 2, 0 -_08031278: .4byte gUnknown_02024E60 -_0803127C: .4byte gUnknown_02024E64 +_08031278: .4byte gActionSelectionCursor +_0803127C: .4byte gMoveSelectionCursor _08031280: - ldr r0, _08031284 @ =gUnknown_02024E60 + ldr r0, _08031284 @ =gActionSelectionCursor b _0803128A .align 2, 0 -_08031284: .4byte gUnknown_02024E60 +_08031284: .4byte gActionSelectionCursor _08031288: - ldr r0, _0803129C @ =gUnknown_02024E64 + ldr r0, _0803129C @ =gMoveSelectionCursor _0803128A: adds r0, r3, r0 movs r1, 0 strb r1, [r0] _08031290: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 -_0803129C: .4byte gUnknown_02024E64 - thumb_func_end sub_8031238 +_0803129C: .4byte gMoveSelectionCursor + thumb_func_end PlayerHandleResetActionMoveSelection thumb_func_start sub_80312A0 sub_80312A0: @ 80312A0 push {r4,lr} - ldr r2, _080312D8 @ =gUnknown_02024D26 - ldr r1, _080312DC @ =gUnknown_02023A60 - ldr r4, _080312E0 @ =gUnknown_02024A60 + ldr r2, _080312D8 @ =gBattleOutcome + ldr r1, _080312DC @ =gBattleBufferA + ldr r4, _080312E0 @ =gActiveBank ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -5458,8 +5458,8 @@ sub_80312A0: @ 80312A0 bl FadeOutMapMusic movs r0, 0x3 bl BeginFastPaletteFade - bl dp01_tbl1_exec_completed - ldr r1, _080312E4 @ =gUnknown_03004330 + bl PlayerBufferExecCompleted + ldr r1, _080312E4 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -5469,10 +5469,10 @@ sub_80312A0: @ 80312A0 pop {r0} bx r0 .align 2, 0 -_080312D8: .4byte gUnknown_02024D26 -_080312DC: .4byte gUnknown_02023A60 -_080312E0: .4byte gUnknown_02024A60 -_080312E4: .4byte gUnknown_03004330 +_080312D8: .4byte gBattleOutcome +_080312DC: .4byte gBattleBufferA +_080312E0: .4byte gActiveBank +_080312E4: .4byte gBattleBankFunc _080312E8: .4byte sub_802D18C thumb_func_end sub_80312A0 diff --git a/asm/battle_8.s b/asm/battle_8.s index 0e4925dfb..366c503f2 100644 --- a/asm/battle_8.s +++ b/asm/battle_8.s @@ -6,13 +6,13 @@ .text - thumb_func_start dp01t_00_7_getattr -dp01t_00_7_getattr: @ 8033524 + thumb_func_start OpponentHandleGetAttributes +OpponentHandleGetAttributes: @ 8033524 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _08033550 @ =gUnknown_02023A60 - ldr r0, _08033554 @ =gUnknown_02024A60 + ldr r1, _08033550 @ =gBattleBufferA + ldr r0, _08033554 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -20,7 +20,7 @@ dp01t_00_7_getattr: @ 8033524 ldrb r0, [r1] cmp r0, 0 bne _0803355C - ldr r0, _08033558 @ =gUnknown_02024A6A + ldr r0, _08033558 @ =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -29,9 +29,9 @@ dp01t_00_7_getattr: @ 8033524 adds r6, r0, 0 b _0803357E .align 2, 0 -_08033550: .4byte gUnknown_02023A60 -_08033554: .4byte gUnknown_02024A60 -_08033558: .4byte gUnknown_02024A6A +_08033550: .4byte gBattleBufferA +_08033554: .4byte gActiveBank +_08033558: .4byte gBattlePartyID _0803355C: ldrb r4, [r1] movs r5, 0 @@ -57,12 +57,12 @@ _0803357E: movs r0, 0x1 mov r2, sp bl dp01_build_cmdbuf_x1D_1D_numargs_varargs - bl sub_80334EC + bl OpponentBufferExecCompleted add sp, 0x100 pop {r4-r6} pop {r0} bx r0 - thumb_func_end dp01t_00_7_getattr + thumb_func_end OpponentHandleGetAttributes thumb_func_start sub_8033598 sub_8033598: @ 8033598 @@ -76,8 +76,8 @@ sub_8033598: @ 8033598 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _080335CC @ =gUnknown_02023A60 - ldr r3, _080335D0 @ =gUnknown_02024A60 + ldr r2, _080335CC @ =gBattleBufferA + ldr r3, _080335D0 @ =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -93,8 +93,8 @@ _080335C2: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080335CC: .4byte gUnknown_02023A60 -_080335D0: .4byte gUnknown_02024A60 +_080335CC: .4byte gBattleBufferA +_080335D0: .4byte gActiveBank _080335D4: .4byte _080335D8 .align 2, 0 _080335D8: @@ -1002,8 +1002,8 @@ _08033D40: .4byte gEnemyParty dp01t_01_2_read_pokmon_data_slice: @ 8033D44 push {r4-r7,lr} sub sp, 0x58 - ldr r2, _08033DBC @ =gUnknown_02024A6A - ldr r5, _08033DC0 @ =gUnknown_02024A60 + ldr r2, _08033DBC @ =gBattlePartyID + ldr r5, _08033DC0 @ =gActiveBank ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -1011,7 +1011,7 @@ dp01t_01_2_read_pokmon_data_slice: @ 8033D44 movs r0, 0x64 adds r4, r2, 0 muls r4, r0 - ldr r3, _08033DC4 @ =gUnknown_02023A60 + ldr r3, _08033DC4 @ =gBattleBufferA lsls r1, 9 adds r0, r3, 0x1 adds r0, r1, r0 @@ -1054,23 +1054,23 @@ _08033D9A: movs r0, 0x1 adds r2, r4, 0 bl dp01_build_cmdbuf_x1D_1D_numargs_varargs - bl sub_80334EC + bl OpponentBufferExecCompleted add sp, 0x58 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08033DBC: .4byte gUnknown_02024A6A -_08033DC0: .4byte gUnknown_02024A60 -_08033DC4: .4byte gUnknown_02023A60 +_08033DBC: .4byte gBattlePartyID +_08033DC0: .4byte gActiveBank +_08033DC4: .4byte gBattleBufferA _08033DC8: .4byte gEnemyParty thumb_func_end dp01t_01_2_read_pokmon_data_slice - thumb_func_start dp01t_02_7_setattr -dp01t_02_7_setattr: @ 8033DCC + thumb_func_start OpponentHandleSetAttributes +OpponentHandleSetAttributes: @ 8033DCC push {r4,r5,lr} - ldr r1, _08033DF0 @ =gUnknown_02023A60 - ldr r0, _08033DF4 @ =gUnknown_02024A60 + ldr r1, _08033DF0 @ =gBattleBufferA + ldr r0, _08033DF4 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -1078,16 +1078,16 @@ dp01t_02_7_setattr: @ 8033DCC ldrb r0, [r1] cmp r0, 0 bne _08033DFC - ldr r0, _08033DF8 @ =gUnknown_02024A6A + ldr r0, _08033DF8 @ =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_8033E24 b _08033E1A .align 2, 0 -_08033DF0: .4byte gUnknown_02023A60 -_08033DF4: .4byte gUnknown_02024A60 -_08033DF8: .4byte gUnknown_02024A6A +_08033DF0: .4byte gBattleBufferA +_08033DF4: .4byte gActiveBank +_08033DF8: .4byte gBattlePartyID _08033DFC: ldrb r4, [r1] movs r5, 0 @@ -1106,11 +1106,11 @@ _08033E0E: cmp r5, 0x5 bls _08033E00 _08033E1A: - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r4,r5} pop {r0} bx r0 - thumb_func_end dp01t_02_7_setattr + thumb_func_end OpponentHandleSetAttributes thumb_func_start sub_8033E24 sub_8033E24: @ 8033E24 @@ -1122,7 +1122,7 @@ sub_8033E24: @ 8033E24 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, _08033E5C @ =gUnknown_02024A60 + ldr r3, _08033E5C @ =gActiveBank ldrb r0, [r3] lsls r0, 9 ldr r2, _08033E60 @ =gUnknown_02023A63 @@ -1143,7 +1143,7 @@ _08033E52: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08033E5C: .4byte gUnknown_02024A60 +_08033E5C: .4byte gActiveBank _08033E60: .4byte gUnknown_02023A63 _08033E64: .4byte _08033E68 .align 2, 0 @@ -1462,7 +1462,7 @@ _0803417C: muls r0, r5 ldr r1, _08034194 @ =gEnemyParty adds r0, r1 - ldr r3, _08034198 @ =gUnknown_02023A60 + ldr r3, _08034198 @ =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -1472,7 +1472,7 @@ _0803417C: b _0803421A .align 2, 0 _08034194: .4byte gEnemyParty -_08034198: .4byte gUnknown_02023A60 +_08034198: .4byte gBattleBufferA _0803419C: movs r0, 0x64 adds r4, r5, 0 @@ -1526,7 +1526,7 @@ _08034204: muls r0, r5 ldr r1, _08034224 @ =gEnemyParty adds r0, r1 - ldr r3, _08034228 @ =gUnknown_02023A60 + ldr r3, _08034228 @ =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -1540,7 +1540,7 @@ _0803421A: b _08034730 .align 2, 0 _08034224: .4byte gEnemyParty -_08034228: .4byte gUnknown_02023A60 +_08034228: .4byte gBattleBufferA _0803422C: movs r0, 0x64 muls r0, r5 @@ -2155,8 +2155,8 @@ _08034740: .4byte gEnemyParty thumb_func_start sub_8034744 sub_8034744: @ 8034744 push {r4-r7,lr} - ldr r1, _080347A8 @ =gUnknown_02024A6A - ldr r7, _080347AC @ =gUnknown_02024A60 + ldr r1, _080347A8 @ =gBattlePartyID + ldr r7, _080347AC @ =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -2164,7 +2164,7 @@ sub_8034744: @ 8034744 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _080347B0 @ =gUnknown_02023A60 + ldr r4, _080347B0 @ =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -2200,28 +2200,28 @@ _0803477A: cmp r3, r0 bcc _0803477A _0803479C: - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080347A8: .4byte gUnknown_02024A6A -_080347AC: .4byte gUnknown_02024A60 -_080347B0: .4byte gUnknown_02023A60 +_080347A8: .4byte gBattlePartyID +_080347AC: .4byte gActiveBank +_080347B0: .4byte gBattleBufferA _080347B4: .4byte gEnemyParty thumb_func_end sub_8034744 - thumb_func_start sub_80347B8 -sub_80347B8: @ 80347B8 + thumb_func_start OpponentHandleLoadPokeSprite +OpponentHandleLoadPokeSprite: @ 80347B8 push {r4-r7,lr} mov r7, r10 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r6, _080348E8 @ =gUnknown_02024A60 + ldr r6, _080348E8 @ =gActiveBank ldrb r0, [r6] lsls r0, 1 - ldr r1, _080348EC @ =gUnknown_02024A6A + ldr r1, _080348EC @ =gBattlePartyID adds r0, r1 ldrh r0, [r0] movs r7, 0x64 @@ -2237,14 +2237,14 @@ sub_80347B8: @ 80347B8 mov r8, r0 ldrb r1, [r6] lsls r0, r1, 1 - ldr r2, _080348EC @ =gUnknown_02024A6A + ldr r2, _080348EC @ =gBattlePartyID adds r0, r2 ldrh r0, [r0] muls r0, r7 add r0, r10 bl sub_8031794 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2272,7 +2272,7 @@ sub_80347B8: @ 80347B8 adds r1, r5, 0 adds r2, r4, 0 bl CreateSprite - ldr r4, _080348F8 @ =gUnknown_02024BE0 + ldr r4, _080348F8 @ =gObjectBankIDs ldrb r1, [r6] adds r1, r4 strb r0, [r1] @@ -2329,7 +2329,7 @@ sub_80347B8: @ 80347B8 bl StartSpriteAnim ldrb r4, [r6] lsls r0, r4, 1 - ldr r2, _080348EC @ =gUnknown_02024A6A + ldr r2, _080348EC @ =gBattlePartyID adds r0, r2 ldrh r0, [r0] muls r0, r7 @@ -2341,7 +2341,7 @@ sub_80347B8: @ 80347B8 lsrs r1, 16 adds r0, r4, 0 bl sub_8032984 - ldr r1, _08034908 @ =gUnknown_03004330 + ldr r1, _08034908 @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -2355,27 +2355,27 @@ sub_80347B8: @ 80347B8 pop {r0} bx r0 .align 2, 0 -_080348E8: .4byte gUnknown_02024A60 -_080348EC: .4byte gUnknown_02024A6A +_080348E8: .4byte gActiveBank +_080348EC: .4byte gBattlePartyID _080348F0: .4byte gEnemyParty _080348F4: .4byte gUnknown_02024E8C -_080348F8: .4byte gUnknown_02024BE0 +_080348F8: .4byte gObjectBankIDs _080348FC: .4byte gSprites _08034900: .4byte 0x0000ff10 _08034904: .4byte gBattleMonForms -_08034908: .4byte gUnknown_03004330 +_08034908: .4byte gBattleBankFunc _0803490C: .4byte sub_8033018 - thumb_func_end sub_80347B8 + thumb_func_end OpponentHandleLoadPokeSprite - thumb_func_start sub_8034910 -sub_8034910: @ 8034910 + thumb_func_start OpponentHandleSendOutPoke +OpponentHandleSendOutPoke: @ 8034910 push {r4,lr} - ldr r1, _08034948 @ =gUnknown_02024A6A - ldr r4, _0803494C @ =gUnknown_02024A60 + ldr r1, _08034948 @ =gBattlePartyID + ldr r4, _0803494C @ =gActiveBank ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 - ldr r3, _08034950 @ =gUnknown_02023A60 + ldr r3, _08034950 @ =gBattleBufferA lsls r0, 9 adds r1, r3, 0x1 adds r0, r1 @@ -2387,7 +2387,7 @@ sub_8034910: @ 8034910 adds r1, r3 ldrb r1, [r1] bl sub_803495C - ldr r1, _08034954 @ =gUnknown_03004330 + ldr r1, _08034954 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -2397,12 +2397,12 @@ sub_8034910: @ 8034910 pop {r0} bx r0 .align 2, 0 -_08034948: .4byte gUnknown_02024A6A -_0803494C: .4byte gUnknown_02024A60 -_08034950: .4byte gUnknown_02023A60 -_08034954: .4byte gUnknown_03004330 +_08034948: .4byte gBattlePartyID +_0803494C: .4byte gActiveBank +_08034950: .4byte gBattleBufferA +_08034954: .4byte gBattleBankFunc _08034958: .4byte sub_80333D4 - thumb_func_end sub_8034910 + thumb_func_end OpponentHandleSendOutPoke thumb_func_start sub_803495C sub_803495C: @ 803495C @@ -2418,10 +2418,10 @@ sub_803495C: @ 803495C lsrs r1, 24 adds r0, r6, 0 bl sub_8032AA8 - ldr r0, _08034AB8 @ =gUnknown_02024A6A + ldr r0, _08034AB8 @ =gBattlePartyID lsls r4, r6, 1 adds r4, r0 - ldr r0, _08034ABC @ =gUnknown_02023A60 + ldr r0, _08034ABC @ =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -2456,7 +2456,7 @@ sub_803495C: @ 803495C adds r1, r6, 0 bl sub_8031794 adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2484,7 +2484,7 @@ sub_803495C: @ 803495C adds r1, r5, 0 adds r2, r4, 0 bl CreateSprite - ldr r4, _08034AD0 @ =gUnknown_02024BE0 + ldr r4, _08034AD0 @ =gObjectBankIDs adds r4, r6, r4 strb r0, [r4] ldr r5, _08034AD4 @ =gSprites @@ -2568,23 +2568,23 @@ sub_803495C: @ 803495C pop {r0} bx r0 .align 2, 0 -_08034AB8: .4byte gUnknown_02024A6A -_08034ABC: .4byte gUnknown_02023A60 +_08034AB8: .4byte gBattlePartyID +_08034ABC: .4byte gBattleBufferA _08034AC0: .4byte gEnemyParty _08034AC4: .4byte sub_80312F0 _08034AC8: .4byte gUnknown_0300434C _08034ACC: .4byte gUnknown_02024E8C -_08034AD0: .4byte gUnknown_02024BE0 +_08034AD0: .4byte gObjectBankIDs _08034AD4: .4byte gSprites _08034AD8: .4byte gBattleMonForms _08034ADC: .4byte SpriteCallbackDummy thumb_func_end sub_803495C - thumb_func_start sub_8034AE0 -sub_8034AE0: @ 8034AE0 + thumb_func_start OpponentHandleReturnPokeToBall +OpponentHandleReturnPokeToBall: @ 8034AE0 push {r4-r6,lr} - ldr r1, _08034B10 @ =gUnknown_02023A60 - ldr r6, _08034B14 @ =gUnknown_02024A60 + ldr r1, _08034B10 @ =gBattleBufferA + ldr r6, _08034B14 @ =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -2598,7 +2598,7 @@ sub_8034AE0: @ 8034AE0 ldr r1, _08034B18 @ =0x02017810 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _08034B1C @ =gUnknown_03004330 + ldr r1, _08034B1C @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -2606,13 +2606,13 @@ sub_8034AE0: @ 8034AE0 str r1, [r0] b _08034B60 .align 2, 0 -_08034B10: .4byte gUnknown_02023A60 -_08034B14: .4byte gUnknown_02024A60 +_08034B10: .4byte gBattleBufferA +_08034B14: .4byte gActiveBank _08034B18: .4byte 0x02017810 -_08034B1C: .4byte gUnknown_03004330 +_08034B1C: .4byte gBattleBankFunc _08034B20: .4byte sub_8034B74 _08034B24: - ldr r5, _08034B68 @ =gUnknown_02024BE0 + ldr r5, _08034B68 @ =gObjectBankIDs adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 @@ -2631,26 +2631,26 @@ _08034B24: bl DestroySprite ldrb r0, [r6] bl sub_8032A08 - ldr r1, _08034B70 @ =gUnknown_03004340 + ldr r1, _08034B70 @ =gHealthboxIDs ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] bl sub_8043DB0 - bl sub_80334EC + bl OpponentBufferExecCompleted _08034B60: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08034B68: .4byte gUnknown_02024BE0 +_08034B68: .4byte gObjectBankIDs _08034B6C: .4byte gSprites -_08034B70: .4byte gUnknown_03004340 - thumb_func_end sub_8034AE0 +_08034B70: .4byte gHealthboxIDs + thumb_func_end OpponentHandleReturnPokeToBall thumb_func_start sub_8034B74 sub_8034B74: @ 8034B74 push {r4,r5,lr} - ldr r5, _08034B90 @ =gUnknown_02024A60 + ldr r5, _08034B90 @ =gActiveBank ldrb r2, [r5] lsls r0, r2, 1 adds r0, r2 @@ -2664,7 +2664,7 @@ sub_8034B74: @ 8034B74 beq _08034BC4 b _08034BEC .align 2, 0 -_08034B90: .4byte gUnknown_02024A60 +_08034B90: .4byte gActiveBank _08034B94: .4byte 0x02017810 _08034B98: lsls r0, r2, 2 @@ -2703,7 +2703,7 @@ _08034BC4: adds r1, r2, 0 movs r3, 0x2 bl move_anim_start_t4 - ldr r1, _08034BF4 @ =gUnknown_03004330 + ldr r1, _08034BF4 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -2714,12 +2714,12 @@ _08034BEC: pop {r0} bx r0 .align 2, 0 -_08034BF4: .4byte gUnknown_03004330 +_08034BF4: .4byte gBattleBankFunc _08034BF8: .4byte sub_8033160 thumb_func_end sub_8034B74 - thumb_func_start sub_8034BFC -sub_8034BFC: @ 8034BFC + thumb_func_start OpponentHandleTrainerThrow +OpponentHandleTrainerThrow: @ 8034BFC push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -2767,14 +2767,14 @@ _08034C48: ldrb r0, [r0, 0x3] _08034C56: mov r9, r0 - ldr r0, _08034D8C @ =gUnknown_02024A60 + ldr r0, _08034D8C @ =gActiveBank mov r8, r0 ldrb r1, [r0] mov r0, r9 bl sub_8031A6C mov r1, r8 ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2803,7 +2803,7 @@ _08034C56: movs r1, 0xB0 adds r2, r4, 0 bl CreateSprite - ldr r5, _08034D98 @ =gUnknown_02024BE0 + ldr r5, _08034D98 @ =gObjectBankIDs mov r2, r8 ldrb r1, [r2] adds r1, r5 @@ -2899,7 +2899,7 @@ _08034C56: adds r0, r4 ldr r1, _08034DB4 @ =sub_80313A0 str r1, [r0] - ldr r1, _08034DB8 @ =gUnknown_03004330 + ldr r1, _08034DB8 @ =gBattleBankFunc mov r2, r8 ldrb r0, [r2] lsls r0, 2 @@ -2914,10 +2914,10 @@ _08034C56: bx r0 .align 2, 0 _08034D88: .4byte gTrainers -_08034D8C: .4byte gUnknown_02024A60 +_08034D8C: .4byte gActiveBank _08034D90: .4byte gUnknown_02024E8C _08034D94: .4byte gTrainerFrontPicCoords -_08034D98: .4byte gUnknown_02024BE0 +_08034D98: .4byte gObjectBankIDs _08034D9C: .4byte gSprites _08034DA0: .4byte 0x0000ff10 _08034DA4: .4byte gTrainerFrontPicPaletteTable @@ -2925,12 +2925,12 @@ _08034DA8: .4byte gTrainerFrontPicTable _08034DAC: .4byte 0x000003ff _08034DB0: .4byte 0xfffffc00 _08034DB4: .4byte sub_80313A0 -_08034DB8: .4byte gUnknown_03004330 +_08034DB8: .4byte gBattleBankFunc _08034DBC: .4byte sub_8032B4C - thumb_func_end sub_8034BFC + thumb_func_end OpponentHandleTrainerThrow - thumb_func_start sub_8034DC0 -sub_8034DC0: @ 8034DC0 + thumb_func_start OpponentHandleTrainerSlide +OpponentHandleTrainerSlide: @ 8034DC0 push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -2978,14 +2978,14 @@ _08034E0C: ldrb r0, [r0, 0x3] _08034E1A: mov r9, r0 - ldr r0, _08034F50 @ =gUnknown_02024A60 + ldr r0, _08034F50 @ =gActiveBank mov r8, r0 ldrb r1, [r0] mov r0, r9 bl sub_8031A6C mov r1, r8 ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3007,7 +3007,7 @@ _08034E1A: movs r1, 0xB0 movs r3, 0x1E bl CreateSprite - ldr r5, _08034F5C @ =gUnknown_02024BE0 + ldr r5, _08034F5C @ =gObjectBankIDs mov r2, r8 ldrb r1, [r2] adds r1, r5 @@ -3112,7 +3112,7 @@ _08034E1A: adds r0, r4 ldr r1, _08034F78 @ =sub_80313A0 str r1, [r0] - ldr r1, _08034F7C @ =gUnknown_03004330 + ldr r1, _08034F7C @ =gBattleBankFunc ldrb r0, [r3] lsls r0, 2 adds r0, r1 @@ -3126,10 +3126,10 @@ _08034E1A: bx r0 .align 2, 0 _08034F4C: .4byte gTrainers -_08034F50: .4byte gUnknown_02024A60 +_08034F50: .4byte gActiveBank _08034F54: .4byte gUnknown_02024E8C _08034F58: .4byte gTrainerFrontPicCoords -_08034F5C: .4byte gUnknown_02024BE0 +_08034F5C: .4byte gObjectBankIDs _08034F60: .4byte gSprites _08034F64: .4byte 0x0000fffe _08034F68: .4byte gTrainerFrontPicPaletteTable @@ -3137,15 +3137,15 @@ _08034F6C: .4byte gTrainerFrontPicTable _08034F70: .4byte 0x000003ff _08034F74: .4byte 0xfffffc00 _08034F78: .4byte sub_80313A0 -_08034F7C: .4byte gUnknown_03004330 +_08034F7C: .4byte gBattleBankFunc _08034F80: .4byte sub_8032B84 - thumb_func_end sub_8034DC0 + thumb_func_end OpponentHandleTrainerSlide - thumb_func_start sub_8034F84 -sub_8034F84: @ 8034F84 + thumb_func_start OpponentHandleTrainerSlideBack +OpponentHandleTrainerSlideBack: @ 8034F84 push {r4-r6,lr} - ldr r6, _08035014 @ =gUnknown_02024BE0 - ldr r4, _08035018 @ =gUnknown_02024A60 + ldr r6, _08035014 @ =gObjectBankIDs + ldr r4, _08035018 @ =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -3203,7 +3203,7 @@ sub_8034F84: @ 8034F84 adds r0, r5 ldr r1, _08035024 @ =SpriteCallbackDummy bl oamt_set_x3A_32 - ldr r1, _08035028 @ =gUnknown_03004330 + ldr r1, _08035028 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3213,19 +3213,19 @@ sub_8034F84: @ 8034F84 pop {r0} bx r0 .align 2, 0 -_08035014: .4byte gUnknown_02024BE0 -_08035018: .4byte gUnknown_02024A60 +_08035014: .4byte gObjectBankIDs +_08035018: .4byte gActiveBank _0803501C: .4byte gSprites _08035020: .4byte sub_8078B34 _08035024: .4byte SpriteCallbackDummy -_08035028: .4byte gUnknown_03004330 +_08035028: .4byte gBattleBankFunc _0803502C: .4byte sub_8032BBC - thumb_func_end sub_8034F84 + thumb_func_end OpponentHandleTrainerSlideBack thumb_func_start sub_8035030 sub_8035030: @ 8035030 push {r4,r5,lr} - ldr r5, _08035074 @ =gUnknown_02024A60 + ldr r5, _08035074 @ =gActiveBank ldrb r2, [r5] lsls r0, r2, 1 adds r0, r2 @@ -3259,7 +3259,7 @@ _08035062: strb r0, [r1, 0x4] b _080350B8 .align 2, 0 -_08035074: .4byte gUnknown_02024A60 +_08035074: .4byte gActiveBank _08035078: .4byte 0x02017810 _0803507C: ldrb r1, [r3] @@ -3274,7 +3274,7 @@ _0803507C: movs r1, 0x3F bl PlaySE12WithPanning ldr r2, _080350C0 @ =gSprites - ldr r1, _080350C4 @ =gUnknown_02024BE0 + ldr r1, _080350C4 @ =gObjectBankIDs ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -3285,7 +3285,7 @@ _0803507C: adds r0, r2 ldr r1, _080350C8 @ =sub_8010384 str r1, [r0] - ldr r1, _080350CC @ =gUnknown_03004330 + ldr r1, _080350CC @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3297,16 +3297,16 @@ _080350B8: bx r0 .align 2, 0 _080350C0: .4byte gSprites -_080350C4: .4byte gUnknown_02024BE0 +_080350C4: .4byte gObjectBankIDs _080350C8: .4byte sub_8010384 -_080350CC: .4byte gUnknown_03004330 +_080350CC: .4byte gBattleBankFunc _080350D0: .4byte sub_803311C thumb_func_end sub_8035030 thumb_func_start sub_80350D4 sub_80350D4: @ 80350D4 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80350D4 @@ -3314,31 +3314,31 @@ sub_80350D4: @ 80350D4 thumb_func_start sub_80350E0 sub_80350E0: @ 80350E0 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80350E0 - thumb_func_start sub_80350EC -sub_80350EC: @ 80350EC + thumb_func_start OpponentHandleBallThrow +OpponentHandleBallThrow: @ 80350EC push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 - thumb_func_end sub_80350EC + thumb_func_end OpponentHandleBallThrow - thumb_func_start sub_80350F8 -sub_80350F8: @ 80350F8 + thumb_func_start OpponentHandlePause +OpponentHandlePause: @ 80350F8 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 - thumb_func_end sub_80350F8 + thumb_func_end OpponentHandlePause - thumb_func_start sub_8035104 -sub_8035104: @ 8035104 + thumb_func_start OpponentHandleMoveAnimation +OpponentHandleMoveAnimation: @ 8035104 push {r4-r6,lr} - ldr r6, _080351E8 @ =gUnknown_02024A60 + ldr r6, _080351E8 @ =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -3346,7 +3346,7 @@ sub_8035104: @ 8035104 beq _08035116 b _08035226 _08035116: - ldr r0, _080351EC @ =gUnknown_02023A60 + ldr r0, _080351EC @ =gBattleBufferA mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -3365,7 +3365,7 @@ _08035116: adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, _080351F4 @ =gUnknown_0202F7BC + ldr r4, _080351F4 @ =gMovePowerMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3379,7 +3379,7 @@ _08035116: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, _080351F8 @ =gUnknown_0202F7B8 + ldr r4, _080351F8 @ =gMoveDmgMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3405,7 +3405,7 @@ _08035116: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, _080351FC @ =gUnknown_0202F7BE + ldr r3, _080351FC @ =gHappinessMoveAnim ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -3413,7 +3413,7 @@ _08035116: adds r1, r2 ldrb r1, [r1] strb r1, [r3] - ldr r4, _08035200 @ =gUnknown_0202F7C0 + ldr r4, _08035200 @ =gWeatherMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3427,14 +3427,14 @@ _08035116: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, _08035204 @ =gUnknown_0202F7B4 + ldr r3, _08035204 @ =gDisableStructMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 adds r1, 0x10 adds r2, r1 str r2, [r3] - ldr r3, _08035208 @ =gUnknown_02024E70 + ldr r3, _08035208 @ =gPID_perBank ldrb r1, [r6] lsls r1, 2 adds r1, r3 @@ -3446,18 +3446,18 @@ _08035116: lsrs r2, r0, 24 cmp r2, 0 beq _0803520C - bl sub_80334EC + bl OpponentBufferExecCompleted b _08035226 .align 2, 0 -_080351E8: .4byte gUnknown_02024A60 -_080351EC: .4byte gUnknown_02023A60 +_080351E8: .4byte gActiveBank +_080351EC: .4byte gBattleBufferA _080351F0: .4byte gUnknown_0202F7C4 -_080351F4: .4byte gUnknown_0202F7BC -_080351F8: .4byte gUnknown_0202F7B8 -_080351FC: .4byte gUnknown_0202F7BE -_08035200: .4byte gUnknown_0202F7C0 -_08035204: .4byte gUnknown_0202F7B4 -_08035208: .4byte gUnknown_02024E70 +_080351F4: .4byte gMovePowerMoveAnim +_080351F8: .4byte gMoveDmgMoveAnim +_080351FC: .4byte gHappinessMoveAnim +_08035200: .4byte gWeatherMoveAnim +_08035204: .4byte gDisableStructMoveAnim +_08035208: .4byte gPID_perBank _0803520C: ldrb r1, [r6] lsls r0, r1, 1 @@ -3466,7 +3466,7 @@ _0803520C: ldr r1, _0803522C @ =0x02017810 adds r0, r1 strb r2, [r0, 0x4] - ldr r1, _08035230 @ =gUnknown_03004330 + ldr r1, _08035230 @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -3478,9 +3478,9 @@ _08035226: bx r0 .align 2, 0 _0803522C: .4byte 0x02017810 -_08035230: .4byte gUnknown_03004330 +_08035230: .4byte gBattleBankFunc _08035234: .4byte sub_8035238 - thumb_func_end sub_8035104 + thumb_func_end OpponentHandleMoveAnimation thumb_func_start sub_8035238 sub_8035238: @ 8035238 @@ -3488,8 +3488,8 @@ sub_8035238: @ 8035238 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r2, _0803527C @ =gUnknown_02023A60 - ldr r5, _08035280 @ =gUnknown_02024A60 + ldr r2, _0803527C @ =gBattleBufferA + ldr r5, _08035280 @ =gActiveBank ldrb r3, [r5] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -3519,8 +3519,8 @@ sub_8035238: @ 8035238 beq _08035292 b _08035390 .align 2, 0 -_0803527C: .4byte gUnknown_02023A60 -_08035280: .4byte gUnknown_02024A60 +_0803527C: .4byte gBattleBufferA +_08035280: .4byte gActiveBank _08035284: .4byte 0x02017810 _08035288: cmp r2, 0x2 @@ -3608,7 +3608,7 @@ _080352EC: ands r1, r2 strb r1, [r0] _08035334: - ldr r0, _08035350 @ =gUnknown_02024A60 + ldr r0, _08035350 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3621,7 +3621,7 @@ _08035334: .align 2, 0 _08035348: .4byte gAnimScriptCallback _0803534C: .4byte gAnimScriptActive -_08035350: .4byte gUnknown_02024A60 +_08035350: .4byte gActiveBank _08035354: .4byte 0x02017810 _08035358: ldrb r1, [r0] @@ -3648,7 +3648,7 @@ _08035358: lsls r0, 2 adds r0, r6 strb r4, [r0, 0x4] - bl sub_80334EC + bl OpponentBufferExecCompleted _08035390: pop {r3,r4} mov r8, r3 @@ -3658,8 +3658,8 @@ _08035390: bx r0 thumb_func_end sub_8035238 - thumb_func_start sub_803539C -sub_803539C: @ 803539C + thumb_func_start OpponentHandlePrintString +OpponentHandlePrintString: @ 803539C push {r4,lr} sub sp, 0x4 ldr r0, _080353E0 @ =gUnknown_030042A4 @@ -3667,21 +3667,21 @@ sub_803539C: @ 803539C strh r1, [r0] ldr r0, _080353E4 @ =gUnknown_030042A0 strh r1, [r0] - ldr r4, _080353E8 @ =gUnknown_02024A60 + ldr r4, _080353E8 @ =gActiveBank ldrb r0, [r4] lsls r0, 9 ldr r1, _080353EC @ =gUnknown_02023A62 adds r0, r1 ldrh r0, [r0] - bl sub_8120AA8 + bl BufferStringBattle ldr r0, _080353F0 @ =gUnknown_03004210 - ldr r1, _080353F4 @ =gUnknown_020238CC + ldr r1, _080353F4 @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 movs r3, 0x2 bl sub_8002EB0 - ldr r1, _080353F8 @ =gUnknown_03004330 + ldr r1, _080353F8 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3694,27 +3694,27 @@ sub_803539C: @ 803539C .align 2, 0 _080353E0: .4byte gUnknown_030042A4 _080353E4: .4byte gUnknown_030042A0 -_080353E8: .4byte gUnknown_02024A60 +_080353E8: .4byte gActiveBank _080353EC: .4byte gUnknown_02023A62 _080353F0: .4byte gUnknown_03004210 -_080353F4: .4byte gUnknown_020238CC -_080353F8: .4byte gUnknown_03004330 +_080353F4: .4byte gDisplayedStringBattle +_080353F8: .4byte gBattleBankFunc _080353FC: .4byte sub_80331D0 - thumb_func_end sub_803539C + thumb_func_end OpponentHandlePrintString - thumb_func_start sub_8035400 -sub_8035400: @ 8035400 + thumb_func_start OpponentHandlePrintStringPlayerOnly +OpponentHandlePrintStringPlayerOnly: @ 8035400 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 - thumb_func_end sub_8035400 + thumb_func_end OpponentHandlePrintStringPlayerOnly thumb_func_start sub_803540C sub_803540C: @ 803540C push {lr} bl sub_8036B0C - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_803540C @@ -3722,7 +3722,7 @@ sub_803540C: @ 803540C thumb_func_start sub_803541C sub_803541C: @ 803541C push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_803541C @@ -3730,7 +3730,7 @@ sub_803541C: @ 803541C thumb_func_start sub_8035428 sub_8035428: @ 8035428 push {r4-r6,lr} - ldr r6, _0803545C @ =gUnknown_02024A60 + ldr r6, _0803545C @ =gActiveBank ldrb r0, [r6] lsls r0, 9 ldr r1, _08035460 @ =gUnknown_02023A64 @@ -3754,7 +3754,7 @@ sub_8035428: @ 8035428 movs r1, 0x4 b _0803546C .align 2, 0 -_0803545C: .4byte gUnknown_02024A60 +_0803545C: .4byte gActiveBank _08035460: .4byte gUnknown_02023A64 _08035464: .4byte gBattleTypeFlags _08035468: @@ -3778,7 +3778,7 @@ _08035474: ands r0, r1 cmp r0, 0 beq _08035494 - ldr r1, _080354EC @ =gEnemyMonIndex + ldr r1, _080354EC @ =gBankTarget ldrb r0, [r6] strb r0, [r1] _08035494: @@ -3793,10 +3793,10 @@ _08035494: cmp r0, 0 beq _080354CE movs r0, 0 - bl battle_get_side_with_given_state - ldr r5, _080354EC @ =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r5, _080354EC @ =gBankTarget strb r0, [r5] - ldr r0, _080354F0 @ =gUnknown_02024C0C + ldr r0, _080354F0 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _080354F4 @ =gBitTable ldrb r0, [r5] @@ -3807,10 +3807,10 @@ _08035494: cmp r1, 0 beq _080354CE movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] _080354CE: - ldr r0, _080354EC @ =gEnemyMonIndex + ldr r0, _080354EC @ =gBankTarget ldrb r0, [r0] lsls r0, 8 orrs r4, r0 @@ -3819,12 +3819,12 @@ _080354CE: adds r2, r4, 0 bl dp01_build_cmdbuf_x21_a_bb _080354E0: - bl sub_80334EC + bl OpponentBufferExecCompleted b _0803558A .align 2, 0 _080354E8: .4byte gBattleMoves -_080354EC: .4byte gEnemyMonIndex -_080354F0: .4byte gUnknown_02024C0C +_080354EC: .4byte gBankTarget +_080354F0: .4byte gAbsentBankFlags _080354F4: .4byte gBitTable _080354F8: movs r6, 0x3 @@ -3847,7 +3847,7 @@ _080354FA: ands r0, r1 cmp r0, 0 beq _0803553C - ldr r0, _08035538 @ =gUnknown_02024A60 + ldr r0, _08035538 @ =gActiveBank ldrb r0, [r0] lsls r0, 8 orrs r4, r0 @@ -3858,7 +3858,7 @@ _080354FA: b _08035586 .align 2, 0 _08035534: .4byte gBattleMoves -_08035538: .4byte gUnknown_02024A60 +_08035538: .4byte gActiveBank _0803553C: ldr r0, _0803556C @ =gBattleTypeFlags ldrh r1, [r0] @@ -3872,7 +3872,7 @@ _0803553C: lsls r1, 24 lsrs r1, 24 adds r0, r1, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 16 @@ -3885,7 +3885,7 @@ _0803553C: _0803556C: .4byte gBattleTypeFlags _08035570: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 16 @@ -3894,7 +3894,7 @@ _08035570: movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb _08035586: - bl sub_80334EC + bl OpponentBufferExecCompleted _0803558A: pop {r4-r6} pop {r0} @@ -3905,7 +3905,7 @@ _0803558A: sub_8035590: @ 8035590 push {lr} ldr r1, _080355B4 @ =0x02000000 - ldr r0, _080355B8 @ =gUnknown_02024A60 + ldr r0, _080355B8 @ =gActiveBank ldrb r0, [r0] lsrs r0, 1 lsls r0, 1 @@ -3915,12 +3915,12 @@ sub_8035590: @ 8035590 ldrb r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _080355B4: .4byte 0x02000000 -_080355B8: .4byte gUnknown_02024A60 +_080355B8: .4byte gActiveBank _080355BC: .4byte 0x000160d4 thumb_func_end sub_8035590 @@ -3928,9 +3928,9 @@ _080355BC: .4byte 0x000160d4 sub_80355C0: @ 80355C0 push {r4-r6,lr} ldr r6, _08035604 @ =0x02000000 - ldr r5, _08035608 @ =gUnknown_02024A60 + ldr r5, _08035608 @ =gActiveBank ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 25 ldr r1, _0803560C @ =0x000160c8 @@ -3951,23 +3951,23 @@ sub_80355C0: @ 80355C0 cmp r0, 0 bne _08035614 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 b _08035628 .align 2, 0 _08035604: .4byte 0x02000000 -_08035608: .4byte gUnknown_02024A60 +_08035608: .4byte gActiveBank _0803560C: .4byte 0x000160c8 _08035610: .4byte gBattleTypeFlags _08035614: movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 _08035628: @@ -3986,7 +3986,7 @@ _0803562E: bl GetMonData cmp r0, 0 beq _0803562C - ldr r1, _08035660 @ =gUnknown_02024A6A + ldr r1, _08035660 @ =gBattlePartyID lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] @@ -4000,10 +4000,10 @@ _0803562E: b _0803568A .align 2, 0 _0803565C: .4byte gEnemyParty -_08035660: .4byte gUnknown_02024A6A +_08035660: .4byte gBattlePartyID _08035664: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 25 ldr r2, _080356B0 @ =0x000160c8 @@ -4011,7 +4011,7 @@ _08035664: adds r0, r6 ldrb r4, [r0] ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 25 ldr r1, _080356B0 @ =0x000160c8 @@ -4021,7 +4021,7 @@ _08035664: strb r1, [r0] _0803568A: ldr r1, _080356B4 @ =0x02000000 - ldr r0, _080356B8 @ =gUnknown_02024A60 + ldr r0, _080356B8 @ =gActiveBank ldrb r0, [r0] ldr r2, _080356BC @ =0x00016068 adds r0, r2 @@ -4032,27 +4032,27 @@ _0803568A: movs r0, 0x1 movs r2, 0 bl dp01_build_cmdbuf_x22_a_three_bytes - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r4-r6} pop {r0} bx r0 .align 2, 0 _080356B0: .4byte 0x000160c8 _080356B4: .4byte 0x02000000 -_080356B8: .4byte gUnknown_02024A60 +_080356B8: .4byte gActiveBank _080356BC: .4byte 0x00016068 thumb_func_end sub_80355C0 thumb_func_start sub_80356C0 sub_80356C0: @ 80356C0 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80356C0 - thumb_func_start sub_80356CC -sub_80356CC: @ 80356CC + thumb_func_start OpponentHandleHealthBarUpdate +OpponentHandleHealthBarUpdate: @ 80356CC push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -4060,8 +4060,8 @@ sub_80356CC: @ 80356CC sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _08035744 @ =gUnknown_02023A60 - ldr r0, _08035748 @ =gUnknown_02024A60 + ldr r3, _08035744 @ =gBattleBufferA + ldr r0, _08035748 @ =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -4078,7 +4078,7 @@ sub_80356CC: @ 80356CC ldr r0, _0803574C @ =0x00007fff cmp r7, r0 beq _0803575C - ldr r6, _08035750 @ =gUnknown_02024A6A + ldr r6, _08035750 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -4101,7 +4101,7 @@ sub_80356CC: @ 80356CC adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _08035758 @ =gUnknown_03004340 + ldr r1, _08035758 @ =gHealthboxIDs adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -4109,14 +4109,14 @@ sub_80356CC: @ 80356CC bl sub_8043D84 b _08035786 .align 2, 0 -_08035744: .4byte gUnknown_02023A60 -_08035748: .4byte gUnknown_02024A60 +_08035744: .4byte gBattleBufferA +_08035748: .4byte gActiveBank _0803574C: .4byte 0x00007fff -_08035750: .4byte gUnknown_02024A6A +_08035750: .4byte gBattlePartyID _08035754: .4byte gEnemyParty -_08035758: .4byte gUnknown_03004340 +_08035758: .4byte gHealthboxIDs _0803575C: - ldr r1, _080357A4 @ =gUnknown_02024A6A + ldr r1, _080357A4 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -4129,15 +4129,15 @@ _0803575C: adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _080357AC @ =gUnknown_03004340 + ldr r1, _080357AC @ =gHealthboxIDs adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] movs r3, 0 bl sub_8043D84 _08035786: - ldr r1, _080357B0 @ =gUnknown_03004330 - ldr r0, _080357B4 @ =gUnknown_02024A60 + ldr r1, _080357B0 @ =gBattleBankFunc + ldr r0, _080357B4 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4151,36 +4151,36 @@ _08035786: pop {r0} bx r0 .align 2, 0 -_080357A4: .4byte gUnknown_02024A6A +_080357A4: .4byte gBattlePartyID _080357A8: .4byte gEnemyParty -_080357AC: .4byte gUnknown_03004340 -_080357B0: .4byte gUnknown_03004330 -_080357B4: .4byte gUnknown_02024A60 +_080357AC: .4byte gHealthboxIDs +_080357B0: .4byte gBattleBankFunc +_080357B4: .4byte gActiveBank _080357B8: .4byte sub_80330C8 - thumb_func_end sub_80356CC + thumb_func_end OpponentHandleHealthBarUpdate - thumb_func_start sub_80357BC -sub_80357BC: @ 80357BC + thumb_func_start OpponentHandleExpBarUpdate +OpponentHandleExpBarUpdate: @ 80357BC push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 - thumb_func_end sub_80357BC + thumb_func_end OpponentHandleExpBarUpdate - thumb_func_start sub_80357C8 -sub_80357C8: @ 80357C8 + thumb_func_start OpponentHandleStatusIconUpdate +OpponentHandleStatusIconUpdate: @ 80357C8 push {r4,lr} - ldr r4, _08035820 @ =gUnknown_02024A60 + ldr r4, _08035820 @ =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08035818 - ldr r0, _08035824 @ =gUnknown_03004340 + ldr r0, _08035824 @ =gHealthboxIDs ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _08035828 @ =gUnknown_02024A6A + ldr r2, _08035828 @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -4201,7 +4201,7 @@ sub_80357C8: @ 80357C8 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _08035834 @ =gUnknown_03004330 + ldr r1, _08035834 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4212,25 +4212,25 @@ _08035818: pop {r0} bx r0 .align 2, 0 -_08035820: .4byte gUnknown_02024A60 -_08035824: .4byte gUnknown_03004340 -_08035828: .4byte gUnknown_02024A6A +_08035820: .4byte gActiveBank +_08035824: .4byte gHealthboxIDs +_08035828: .4byte gBattlePartyID _0803582C: .4byte gEnemyParty _08035830: .4byte 0x02017810 -_08035834: .4byte gUnknown_03004330 +_08035834: .4byte gBattleBankFunc _08035838: .4byte sub_8033494 - thumb_func_end sub_80357C8 + thumb_func_end OpponentHandleStatusIconUpdate - thumb_func_start sub_803583C -sub_803583C: @ 803583C + thumb_func_start OpponentHandleStatusAnimation +OpponentHandleStatusAnimation: @ 803583C push {r4,r5,lr} - ldr r5, _08035894 @ =gUnknown_02024A60 + ldr r5, _08035894 @ =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0803588C - ldr r4, _08035898 @ =gUnknown_02023A60 + ldr r4, _08035898 @ =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -4255,7 +4255,7 @@ sub_803583C: @ 803583C lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _0803589C @ =gUnknown_03004330 + ldr r1, _0803589C @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4266,40 +4266,40 @@ _0803588C: pop {r0} bx r0 .align 2, 0 -_08035894: .4byte gUnknown_02024A60 -_08035898: .4byte gUnknown_02023A60 -_0803589C: .4byte gUnknown_03004330 +_08035894: .4byte gActiveBank +_08035898: .4byte gBattleBufferA +_0803589C: .4byte gBattleBankFunc _080358A0: .4byte sub_8033494 - thumb_func_end sub_803583C + thumb_func_end OpponentHandleStatusAnimation - thumb_func_start sub_80358A4 -sub_80358A4: @ 80358A4 + thumb_func_start OpponentHandleStatusXor +OpponentHandleStatusXor: @ 80358A4 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 - thumb_func_end sub_80358A4 + thumb_func_end OpponentHandleStatusXor thumb_func_start sub_80358B0 sub_80358B0: @ 80358B0 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80358B0 - thumb_func_start sub_80358BC -sub_80358BC: @ 80358BC + thumb_func_start OpponentHandleDMATransfer +OpponentHandleDMATransfer: @ 80358BC push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 - thumb_func_end sub_80358BC + thumb_func_end OpponentHandleDMATransfer thumb_func_start sub_80358C8 sub_80358C8: @ 80358C8 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80358C8 @@ -4307,7 +4307,7 @@ sub_80358C8: @ 80358C8 thumb_func_start sub_80358D4 sub_80358D4: @ 80358D4 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80358D4 @@ -4315,7 +4315,7 @@ sub_80358D4: @ 80358D4 thumb_func_start sub_80358E0 sub_80358E0: @ 80358E0 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80358E0 @@ -4323,7 +4323,7 @@ sub_80358E0: @ 80358E0 thumb_func_start sub_80358EC sub_80358EC: @ 80358EC push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80358EC @@ -4331,7 +4331,7 @@ sub_80358EC: @ 80358EC thumb_func_start sub_80358F8 sub_80358F8: @ 80358F8 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_80358F8 @@ -4339,7 +4339,7 @@ sub_80358F8: @ 80358F8 thumb_func_start sub_8035904 sub_8035904: @ 8035904 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8035904 @@ -4353,7 +4353,7 @@ sub_8035910: @ 8035910 negs r0, r0 ands r0, r1 strb r0, [r2] - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -4364,8 +4364,8 @@ _08035928: .4byte gUnknown_020238C8 sub_803592C: @ 803592C push {lr} ldr r3, _08035958 @ =gUnknown_020238C8 - ldr r1, _0803595C @ =gUnknown_02023A60 - ldr r0, _08035960 @ =gUnknown_02024A60 + ldr r1, _0803595C @ =gBattleBufferA + ldr r0, _08035960 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4379,13 +4379,13 @@ sub_803592C: @ 803592C ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08035958: .4byte gUnknown_020238C8 -_0803595C: .4byte gUnknown_02023A60 -_08035960: .4byte gUnknown_02024A60 +_0803595C: .4byte gBattleBufferA +_08035960: .4byte gActiveBank thumb_func_end sub_803592C thumb_func_start sub_8035964 @@ -4396,7 +4396,7 @@ sub_8035964: @ 8035964 movs r0, 0x7F ands r0, r1 strb r0, [r2] - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 @@ -4418,19 +4418,19 @@ sub_803597C: @ 803597C ands r0, r2 orrs r0, r1 strb r0, [r3] - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _080359A0: .4byte gUnknown_020238C8 thumb_func_end sub_803597C - thumb_func_start dp01t_29_7_blink -dp01t_29_7_blink: @ 80359A4 + thumb_func_start OpponentHandleHitAnimation +OpponentHandleHitAnimation: @ 80359A4 push {r4,lr} ldr r3, _080359CC @ =gSprites - ldr r2, _080359D0 @ =gUnknown_02024BE0 - ldr r4, _080359D4 @ =gUnknown_02024A60 + ldr r2, _080359D0 @ =gObjectBankIDs + ldr r4, _080359D4 @ =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -4443,14 +4443,14 @@ dp01t_29_7_blink: @ 80359A4 lsls r0, 29 cmp r0, 0 bge _080359D8 - bl sub_80334EC + bl OpponentBufferExecCompleted b _08035A02 .align 2, 0 _080359CC: .4byte gSprites -_080359D0: .4byte gUnknown_02024BE0 -_080359D4: .4byte gUnknown_02024A60 +_080359D0: .4byte gObjectBankIDs +_080359D4: .4byte gActiveBank _080359D8: - ldr r1, _08035A08 @ =gUnknown_02024E6D + ldr r1, _08035A08 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -4464,7 +4464,7 @@ _080359D8: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_8047858 - ldr r1, _08035A0C @ =gUnknown_03004330 + ldr r1, _08035A0C @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4475,32 +4475,32 @@ _08035A02: pop {r0} bx r0 .align 2, 0 -_08035A08: .4byte gUnknown_02024E6D -_08035A0C: .4byte gUnknown_03004330 +_08035A08: .4byte gDoingBattleAnim +_08035A0C: .4byte gBattleBankFunc _08035A10: .4byte bx_blink_t7 - thumb_func_end dp01t_29_7_blink + thumb_func_end OpponentHandleHitAnimation thumb_func_start sub_8035A14 sub_8035A14: @ 8035A14 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8035A14 - thumb_func_start sub_8035A20 -sub_8035A20: @ 8035A20 + thumb_func_start OpponentHandleEffectivenessSound +OpponentHandleEffectivenessSound: @ 8035A20 push {r4,lr} - ldr r4, _08035A5C @ =gUnknown_02024A60 + ldr r4, _08035A5C @ =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _08035A34 movs r3, 0xC0 _08035A34: - ldr r2, _08035A60 @ =gUnknown_02023A60 + ldr r2, _08035A60 @ =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -4514,20 +4514,20 @@ _08035A34: lsls r1, r3, 24 asrs r1, 24 bl PlaySE12WithPanning - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 -_08035A5C: .4byte gUnknown_02024A60 -_08035A60: .4byte gUnknown_02023A60 - thumb_func_end sub_8035A20 +_08035A5C: .4byte gActiveBank +_08035A60: .4byte gBattleBufferA + thumb_func_end OpponentHandleEffectivenessSound thumb_func_start sub_8035A64 sub_8035A64: @ 8035A64 push {lr} - ldr r2, _08035A8C @ =gUnknown_02023A60 - ldr r0, _08035A90 @ =gUnknown_02024A60 + ldr r2, _08035A8C @ =gBattleBufferA + ldr r0, _08035A90 @ =gActiveBank ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -4539,19 +4539,19 @@ sub_8035A64: @ 8035A64 lsls r1, 8 orrs r0, r1 bl PlayFanfare - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08035A8C: .4byte gUnknown_02023A60 -_08035A90: .4byte gUnknown_02024A60 +_08035A8C: .4byte gBattleBufferA +_08035A90: .4byte gActiveBank thumb_func_end sub_8035A64 - thumb_func_start sub_8035A94 -sub_8035A94: @ 8035A94 + thumb_func_start OpponentHandleFaintingCry +OpponentHandleFaintingCry: @ 8035A94 push {lr} - ldr r1, _08035AC4 @ =gUnknown_02024A6A - ldr r0, _08035AC8 @ =gUnknown_02024A60 + ldr r1, _08035AC4 @ =gBattlePartyID + ldr r0, _08035AC8 @ =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -4567,20 +4567,20 @@ sub_8035A94: @ 8035A94 movs r1, 0x19 movs r2, 0x5 bl PlayCry3 - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08035AC4: .4byte gUnknown_02024A6A -_08035AC8: .4byte gUnknown_02024A60 +_08035AC4: .4byte gBattlePartyID +_08035AC8: .4byte gActiveBank _08035ACC: .4byte gEnemyParty - thumb_func_end sub_8035A94 + thumb_func_end OpponentHandleFaintingCry thumb_func_start dp01t_2E_7_battle_intro dp01t_2E_7_battle_intro: @ 8035AD0 push {lr} - ldr r1, _08035AF8 @ =gUnknown_02023A60 - ldr r0, _08035AFC @ =gUnknown_02024A60 + ldr r1, _08035AF8 @ =gBattleBufferA + ldr r0, _08035AFC @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4592,20 +4592,20 @@ dp01t_2E_7_battle_intro: @ 8035AD0 movs r1, 0x1 orrs r0, r1 strh r0, [r2] - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08035AF8: .4byte gUnknown_02023A60 -_08035AFC: .4byte gUnknown_02024A60 +_08035AF8: .4byte gBattleBufferA +_08035AFC: .4byte gActiveBank _08035B00: .4byte gUnknown_02024DE8 thumb_func_end dp01t_2E_7_battle_intro thumb_func_start sub_8035B04 sub_8035B04: @ 8035B04 push {r4-r6,lr} - ldr r5, _08035BE0 @ =gUnknown_02024BE0 - ldr r6, _08035BE4 @ =gUnknown_02024A60 + ldr r5, _08035BE0 @ =gObjectBankIDs + ldr r6, _08035BE4 @ =gActiveBank ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -4701,7 +4701,7 @@ _08035BC2: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _08035C08 @ =gUnknown_03004330 + ldr r1, _08035C08 @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -4711,8 +4711,8 @@ _08035BC2: pop {r0} bx r0 .align 2, 0 -_08035BE0: .4byte gUnknown_02024BE0 -_08035BE4: .4byte gUnknown_02024A60 +_08035BE0: .4byte gObjectBankIDs +_08035BE4: .4byte gActiveBank _08035BE8: .4byte gSprites _08035BEC: .4byte sub_8078B34 _08035BF0: .4byte sub_8035C10 @@ -4721,7 +4721,7 @@ _08035BF8: .4byte gTasks _08035BFC: .4byte 0x02017810 _08035C00: .4byte gUnknown_02024E68 _08035C04: .4byte sub_8044CA0 -_08035C08: .4byte gUnknown_03004330 +_08035C08: .4byte gBattleBankFunc _08035C0C: .4byte nullsub_45 thumb_func_end sub_8035B04 @@ -4760,7 +4760,7 @@ sub_8035C44: @ 8035C44 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, _08035C9C @ =gUnknown_02024A60 + ldr r7, _08035C9C @ =gActiveBank ldrb r0, [r7] mov r9, r0 ldr r1, _08035CA0 @ =gTasks @@ -4782,12 +4782,12 @@ sub_8035C44: @ 8035C44 cmp r0, 0 beq _08035CB0 _08035C7E: - ldr r0, _08035CA8 @ =gUnknown_02023A60 + ldr r0, _08035CA8 @ =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _08035CAC @ =gUnknown_02024A6A + ldr r0, _08035CAC @ =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -4797,18 +4797,18 @@ _08035C7E: bl sub_803495C b _08035CF0 .align 2, 0 -_08035C9C: .4byte gUnknown_02024A60 +_08035C9C: .4byte gActiveBank _08035CA0: .4byte gTasks _08035CA4: .4byte gBattleTypeFlags -_08035CA8: .4byte gUnknown_02023A60 -_08035CAC: .4byte gUnknown_02024A6A +_08035CA8: .4byte gBattleBufferA +_08035CAC: .4byte gBattlePartyID _08035CB0: - ldr r4, _08035D14 @ =gUnknown_02023A60 + ldr r4, _08035D14 @ =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, _08035D18 @ =gUnknown_02024A6A + ldr r6, _08035D18 @ =gBattlePartyID lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -4834,8 +4834,8 @@ _08035CB0: eors r0, r5 strb r0, [r7] _08035CF0: - ldr r1, _08035D1C @ =gUnknown_03004330 - ldr r2, _08035D20 @ =gUnknown_02024A60 + ldr r1, _08035D1C @ =gBattleBankFunc + ldr r2, _08035D20 @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -4852,18 +4852,18 @@ _08035CF0: pop {r0} bx r0 .align 2, 0 -_08035D14: .4byte gUnknown_02023A60 -_08035D18: .4byte gUnknown_02024A6A -_08035D1C: .4byte gUnknown_03004330 -_08035D20: .4byte gUnknown_02024A60 +_08035D14: .4byte gBattleBufferA +_08035D18: .4byte gBattlePartyID +_08035D1C: .4byte gBattleBankFunc +_08035D20: .4byte gActiveBank _08035D24: .4byte sub_8032E2C thumb_func_end sub_8035C44 thumb_func_start dp01t_30_7_0803D67C dp01t_30_7_0803D67C: @ 8035D28 push {r4-r6,lr} - ldr r1, _08035D50 @ =gUnknown_02023A60 - ldr r0, _08035D54 @ =gUnknown_02024A60 + ldr r1, _08035D50 @ =gBattleBufferA + ldr r0, _08035D54 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -4872,17 +4872,17 @@ dp01t_30_7_0803D67C: @ 8035D28 cmp r0, 0 beq _08035D58 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08035D58 - bl sub_80334EC + bl OpponentBufferExecCompleted b _08035E12 .align 2, 0 -_08035D50: .4byte gUnknown_02023A60 -_08035D54: .4byte gUnknown_02024A60 +_08035D50: .4byte gBattleBufferA +_08035D54: .4byte gActiveBank _08035D58: - ldr r3, _08035DA8 @ =gUnknown_02024A60 + ldr r3, _08035DA8 @ =gActiveBank ldrb r1, [r3] lsls r0, r1, 1 adds r0, r1 @@ -4893,7 +4893,7 @@ _08035D58: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - ldr r1, _08035DB0 @ =gUnknown_02023A60 + ldr r1, _08035DB0 @ =gBattleBufferA ldrb r2, [r3] lsls r0, r2, 9 adds r1, 0x2 @@ -4922,9 +4922,9 @@ _08035D58: strb r1, [r3, 0x1] b _08035E12 .align 2, 0 -_08035DA8: .4byte gUnknown_02024A60 +_08035DA8: .4byte gActiveBank _08035DAC: .4byte 0x02017810 -_08035DB0: .4byte gUnknown_02023A60 +_08035DB0: .4byte gBattleBufferA _08035DB4: movs r0, 0x3F negs r0, r0 @@ -4968,7 +4968,7 @@ _08035DBC: movs r1, 0x5D strb r1, [r0, 0x5] _08035E06: - ldr r0, _08035E24 @ =gUnknown_03004330 + ldr r0, _08035E24 @ =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -4982,14 +4982,14 @@ _08035E12: _08035E18: .4byte gUnknown_02023A64 _08035E1C: .4byte gUnknown_02024E68 _08035E20: .4byte 0x02017810 -_08035E24: .4byte gUnknown_03004330 +_08035E24: .4byte gBattleBankFunc _08035E28: .4byte sub_8035E2C thumb_func_end dp01t_30_7_0803D67C thumb_func_start sub_8035E2C sub_8035E2C: @ 8035E2C push {r4,lr} - ldr r4, _08035E64 @ =gUnknown_02024A60 + ldr r4, _08035E64 @ =gActiveBank ldrb r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -5010,20 +5010,20 @@ sub_8035E2C: @ 8035E2C adds r1, r3 movs r0, 0 strb r0, [r1, 0x5] - bl sub_80334EC + bl OpponentBufferExecCompleted _08035E5C: pop {r4} pop {r0} bx r0 .align 2, 0 -_08035E64: .4byte gUnknown_02024A60 +_08035E64: .4byte gActiveBank _08035E68: .4byte 0x02017810 thumb_func_end sub_8035E2C thumb_func_start sub_8035E6C sub_8035E6C: @ 8035E6C push {lr} - ldr r0, _08035EA4 @ =gUnknown_02024A60 + ldr r0, _08035EA4 @ =gActiveBank ldrb r3, [r0] lsls r0, r3, 1 adds r0, r3 @@ -5046,11 +5046,11 @@ sub_8035E6C: @ 8035E6C ldr r1, _08035EB4 @ =sub_8044CA0 str r1, [r0] _08035E9A: - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08035EA4: .4byte gUnknown_02024A60 +_08035EA4: .4byte gActiveBank _08035EA8: .4byte 0x02017810 _08035EAC: .4byte gTasks _08035EB0: .4byte gUnknown_02024E68 @@ -5060,22 +5060,22 @@ _08035EB4: .4byte sub_8044CA0 thumb_func_start sub_8035EB8 sub_8035EB8: @ 8035EB8 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8035EB8 - thumb_func_start sub_8035EC4 -sub_8035EC4: @ 8035EC4 + thumb_func_start OpponentHandleSpriteInvisibility +OpponentHandleSpriteInvisibility: @ 8035EC4 push {r4,lr} - ldr r4, _08035F14 @ =gUnknown_02024A60 + ldr r4, _08035F14 @ =gActiveBank ldrb r0, [r4] bl sub_8078874 lsls r0, 24 cmp r0, 0 beq _08035F0A ldr r3, _08035F18 @ =gSprites - ldr r0, _08035F1C @ =gUnknown_02024BE0 + ldr r0, _08035F1C @ =gObjectBankIDs ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -5083,7 +5083,7 @@ sub_8035EC4: @ 8035EC4 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _08035F20 @ =gUnknown_02023A60 + ldr r0, _08035F20 @ =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -5101,28 +5101,28 @@ sub_8035EC4: @ 8035EC4 ldrb r0, [r4] bl sub_8031F88 _08035F0A: - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 -_08035F14: .4byte gUnknown_02024A60 +_08035F14: .4byte gActiveBank _08035F18: .4byte gSprites -_08035F1C: .4byte gUnknown_02024BE0 -_08035F20: .4byte gUnknown_02023A60 - thumb_func_end sub_8035EC4 +_08035F1C: .4byte gObjectBankIDs +_08035F20: .4byte gBattleBufferA + thumb_func_end OpponentHandleSpriteInvisibility - thumb_func_start dp01t_34_7_move_anim_start_t3 -dp01t_34_7_move_anim_start_t3: @ 8035F24 + thumb_func_start OpponentHandleBattleAnimation +OpponentHandleBattleAnimation: @ 8035F24 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _08035F68 @ =gUnknown_02024A60 + ldr r6, _08035F68 @ =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08035F7C - ldr r5, _08035F6C @ =gUnknown_02023A60 + ldr r5, _08035F6C @ =gBattleBufferA ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -5143,13 +5143,13 @@ dp01t_34_7_move_anim_start_t3: @ 8035F24 lsls r0, 24 cmp r0, 0 beq _08035F70 - bl sub_80334EC + bl OpponentBufferExecCompleted b _08035F7C .align 2, 0 -_08035F68: .4byte gUnknown_02024A60 -_08035F6C: .4byte gUnknown_02023A60 +_08035F68: .4byte gActiveBank +_08035F6C: .4byte gBattleBufferA _08035F70: - ldr r0, _08035F84 @ =gUnknown_03004330 + ldr r0, _08035F84 @ =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -5161,25 +5161,25 @@ _08035F7C: pop {r0} bx r0 .align 2, 0 -_08035F84: .4byte gUnknown_03004330 +_08035F84: .4byte gBattleBankFunc _08035F88: .4byte sub_80334C0 - thumb_func_end dp01t_34_7_move_anim_start_t3 + thumb_func_end OpponentHandleBattleAnimation - thumb_func_start sub_8035F8C -sub_8035F8C: @ 8035F8C + thumb_func_start OpponentHandleLinkStandbyMsg +OpponentHandleLinkStandbyMsg: @ 8035F8C push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 - thumb_func_end sub_8035F8C + thumb_func_end OpponentHandleLinkStandbyMsg - thumb_func_start sub_8035F98 -sub_8035F98: @ 8035F98 + thumb_func_start OpponentHandleResetActionMoveSelection +OpponentHandleResetActionMoveSelection: @ 8035F98 push {lr} - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 - thumb_func_end sub_8035F98 + thumb_func_end OpponentHandleResetActionMoveSelection thumb_func_start sub_8035FA4 sub_8035FA4: @ 8035FA4 @@ -5198,20 +5198,20 @@ sub_8035FA4: @ 8035FA4 negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r0, _08035FE4 @ =gUnknown_030042D0 + ldr r0, _08035FE4 @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r2] ldr r0, [r2, 0x8] bl SetMainCallback2 _08035FCE: - bl sub_80334EC + bl OpponentBufferExecCompleted pop {r0} bx r0 .align 2, 0 _08035FD8: .4byte gBattleTypeFlags _08035FDC: .4byte gMain _08035FE0: .4byte 0x0000043d -_08035FE4: .4byte gUnknown_030042D0 +_08035FE4: .4byte gPreBattleCallback1 thumb_func_end sub_8035FA4 thumb_func_start nullsub_46 diff --git a/asm/battle_9.s b/asm/battle_9.s index 350e13f30..887fbd702 100644 --- a/asm/battle_9.s +++ b/asm/battle_9.s @@ -9,8 +9,8 @@ thumb_func_start ai_switch_perish_song ai_switch_perish_song: @ 8035FEC push {lr} - ldr r1, _08036038 @ =gUnknown_02024C98 - ldr r0, _0803603C @ =gUnknown_02024A60 + ldr r1, _08036038 @ =gStatuses3 + ldr r0, _0803603C @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -19,7 +19,7 @@ ai_switch_perish_song: @ 8035FEC ands r0, r1 cmp r0, 0 beq _0803604C - ldr r0, _08036040 @ =gUnknown_02024CA8 + ldr r0, _08036040 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -29,7 +29,7 @@ ai_switch_perish_song: @ 8035FEC cmp r0, 0 bne _0803604C adds r0, r2, 0 - bl battle_get_per_side_status + bl GetBankIdentity ldr r1, _08036044 @ =0x02000000 lsls r0, 24 lsrs r0, 25 @@ -45,9 +45,9 @@ ai_switch_perish_song: @ 8035FEC movs r0, 0x1 b _0803604E .align 2, 0 -_08036038: .4byte gUnknown_02024C98 -_0803603C: .4byte gUnknown_02024A60 -_08036040: .4byte gUnknown_02024CA8 +_08036038: .4byte gStatuses3 +_0803603C: .4byte gActiveBank +_08036040: .4byte gDisableStructs _08036044: .4byte 0x02000000 _08036048: .4byte 0x000160c8 _0803604C: @@ -73,9 +73,9 @@ sub_8036054: @ 8036054 .align 2, 0 _0803606C: .4byte gBattleTypeFlags _08036070: - ldr r0, _08036094 @ =gUnknown_02024A60 + ldr r0, _08036094 @ =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity ldr r1, _08036098 @ =0x02000000 lsls r0, 24 lsrs r0, 25 @@ -90,13 +90,13 @@ _08036070: movs r0, 0x1 b _080361CA .align 2, 0 -_08036094: .4byte gUnknown_02024A60 +_08036094: .4byte gActiveBank _08036098: .4byte 0x02000000 _0803609C: .4byte 0x000160c8 _080360A0: ldr r4, _080361D8 @ =gBattleMons movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 movs r1, 0x58 @@ -109,7 +109,7 @@ _080360A0: b _080361C8 _080360BC: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r2, r0, 24 movs r6, 0 @@ -123,7 +123,7 @@ _080360BC: mov r8, r3 _080360D8: lsls r1, r6, 1 - ldr r0, _080361DC @ =gUnknown_02024A60 + ldr r0, _080361DC @ =gActiveBank ldrb r0, [r0] muls r0, r5 adds r1, r0 @@ -173,8 +173,8 @@ _08036110: lsls r1, 1 cmp r0, r1 beq _080361C2 - ldr r1, _080361E4 @ =gUnknown_02024A6A - ldr r0, _080361DC @ =gUnknown_02024A60 + ldr r1, _080361E4 @ =gBattlePartyID + ldr r0, _080361DC @ =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -188,7 +188,7 @@ _08036110: movs r1, 0x2E bl GetMonData movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r2, r0, 24 movs r4, 0 @@ -247,9 +247,9 @@ _080361CA: bx r1 .align 2, 0 _080361D8: .4byte gBattleMons -_080361DC: .4byte gUnknown_02024A60 +_080361DC: .4byte gActiveBank _080361E0: .4byte gEnemyParty -_080361E4: .4byte gUnknown_02024A6A +_080361E4: .4byte gBattlePartyID thumb_func_end sub_8036054 thumb_func_start sub_80361E8 @@ -274,8 +274,8 @@ sub_80361E8: @ 80361E8 beq _08036214 b _08036400 _08036214: - ldr r1, _0803627C @ =gUnknown_02024C3C - ldr r5, _08036280 @ =gUnknown_02024A60 + ldr r1, _0803627C @ =gMoveHitWith + ldr r5, _08036280 @ =gActiveBank ldrb r3, [r5] lsls r0, r3, 1 adds r4, r0, r1 @@ -308,13 +308,13 @@ _08036242: beq _080362AE mov r8, r3 mov r0, r8 - bl battle_get_per_side_status + bl GetBankIdentity movs r4, 0x2 eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r1, _08036290 @ =gUnknown_02024C0C + bl GetBankByPlayerAI + ldr r1, _08036290 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _08036294 @ =gBitTable lsls r0, 24 @@ -327,20 +327,20 @@ _08036242: ldrb r7, [r5] b _080362B2 .align 2, 0 -_0803627C: .4byte gUnknown_02024C3C -_08036280: .4byte gUnknown_02024A60 +_0803627C: .4byte gMoveHitWith +_08036280: .4byte gActiveBank _08036284: .4byte 0x0000ffff _08036288: .4byte gBattleMoves _0803628C: .4byte gBattleTypeFlags -_08036290: .4byte gUnknown_02024C0C +_08036290: .4byte gAbsentBankFlags _08036294: .4byte gBitTable _08036298: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 b _080362B2 @@ -349,8 +349,8 @@ _080362AE: mov r8, r7 _080362B2: ldr r3, _080362D4 @ =gBattleMoves - ldr r1, _080362D8 @ =gUnknown_02024C3C - ldr r2, _080362DC @ =gUnknown_02024A60 + ldr r1, _080362D8 @ =gMoveHitWith + ldr r2, _080362DC @ =gActiveBank ldrb r0, [r2] lsls r0, 1 adds r0, r1 @@ -367,8 +367,8 @@ _080362B2: b _080362F2 .align 2, 0 _080362D4: .4byte gBattleMoves -_080362D8: .4byte gUnknown_02024C3C -_080362DC: .4byte gUnknown_02024A60 +_080362D8: .4byte gMoveHitWith +_080362DC: .4byte gActiveBank _080362E0: cmp r0, 0xB bne _080362EA @@ -397,9 +397,9 @@ _080362F4: .align 2, 0 _08036308: .4byte gBattleMons _0803630C: - ldr r0, _08036330 @ =gUnknown_02024A60 + ldr r0, _08036330 @ =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity ldr r1, _08036334 @ =0x02000000 lsls r0, 24 lsrs r0, 25 @@ -414,7 +414,7 @@ _0803630C: movs r0, 0x1 b _08036402 .align 2, 0 -_08036330: .4byte gUnknown_02024A60 +_08036330: .4byte gActiveBank _08036334: .4byte 0x02000000 _08036338: .4byte 0x000160c8 _0803633C: @@ -444,7 +444,7 @@ _08036342: lsls r1, 1 cmp r0, r1 beq _080363FA - ldr r1, _080363D4 @ =gUnknown_02024A6A + ldr r1, _080363D4 @ =gBattlePartyID mov r2, r8 lsls r0, r2, 1 adds r0, r1 @@ -488,7 +488,7 @@ _08036342: .align 2, 0 _080363CC: .4byte gBaseStats _080363D0: .4byte gEnemyParty -_080363D4: .4byte gUnknown_02024A6A +_080363D4: .4byte gBattlePartyID _080363D8: .4byte 0x02000000 _080363DC: .4byte 0x00016068 _080363E0: @@ -525,7 +525,7 @@ _08036402: ai_switchout_natural_cure: @ 8036410 push {r4,r5,lr} ldr r3, _08036468 @ =gBattleMons - ldr r5, _0803646C @ =gUnknown_02024A60 + ldr r5, _0803646C @ =gActiveBank ldrb r4, [r5] movs r0, 0x58 adds r2, r4, 0 @@ -549,7 +549,7 @@ ai_switchout_natural_cure: @ 8036410 lsrs r0, 1 cmp r1, r0 bcc _080364D8 - ldr r1, _08036470 @ =gUnknown_02024C3C + ldr r1, _08036470 @ =gMoveHitWith lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -568,13 +568,13 @@ _08036456: b _080364E0 .align 2, 0 _08036468: .4byte gBattleMons -_0803646C: .4byte gUnknown_02024A60 -_08036470: .4byte gUnknown_02024C3C +_0803646C: .4byte gActiveBank +_08036470: .4byte gMoveHitWith _08036474: .4byte 0x0000ffff _08036478: ldr r2, _080364A4 @ =gBattleMoves - ldr r1, _080364A8 @ =gUnknown_02024C3C - ldr r4, _080364AC @ =gUnknown_02024A60 + ldr r1, _080364A8 @ =gMoveHitWith + ldr r4, _080364AC @ =gActiveBank ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -595,8 +595,8 @@ _08036478: b _080364E0 .align 2, 0 _080364A4: .4byte gBattleMoves -_080364A8: .4byte gUnknown_02024C3C -_080364AC: .4byte gUnknown_02024A60 +_080364A8: .4byte gMoveHitWith +_080364AC: .4byte gActiveBank _080364B0: movs r0, 0x8 movs r1, 0x1 @@ -619,10 +619,10 @@ _080364D8: movs r0, 0 b _08036500 _080364DC: - ldr r0, _08036508 @ =gUnknown_02024A60 + ldr r0, _08036508 @ =gActiveBank ldrb r0, [r0] _080364E0: - bl battle_get_per_side_status + bl GetBankIdentity ldr r1, _0803650C @ =0x02000000 lsls r0, 24 lsrs r0, 25 @@ -642,7 +642,7 @@ _08036500: pop {r1} bx r1 .align 2, 0 -_08036508: .4byte gUnknown_02024A60 +_08036508: .4byte gActiveBank _0803650C: .4byte 0x02000000 _08036510: .4byte 0x000160c8 thumb_func_end ai_switchout_natural_cure @@ -657,10 +657,10 @@ ai_has_super_effective_move_on_field: @ 8036514 lsrs r0, 24 mov r8, r0 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _080365AC @ =gUnknown_02024C0C + ldr r0, _080365AC @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _080365B0 @ =gBitTable lsls r0, r3, 2 @@ -680,7 +680,7 @@ ai_has_super_effective_move_on_field: @ 8036514 mov r9, r0 _08036550: lsls r1, r4, 1 - ldr r0, _080365B8 @ =gUnknown_02024A60 + ldr r0, _080365B8 @ =gActiveBank ldrb r0, [r0] muls r0, r7 adds r1, r0 @@ -724,20 +724,20 @@ _0803659C: bne _080365C4 b _0803663E .align 2, 0 -_080365AC: .4byte gUnknown_02024C0C +_080365AC: .4byte gAbsentBankFlags _080365B0: .4byte gBitTable _080365B4: .4byte gBattleMons -_080365B8: .4byte gUnknown_02024A60 +_080365B8: .4byte gActiveBank _080365BC: .4byte gBattleTypeFlags _080365C0: movs r0, 0x1 b _08036640 _080365C4: movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0803664C @ =gUnknown_02024C0C + ldr r0, _0803664C @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _08036650 @ =gBitTable lsls r0, r3, 2 @@ -757,7 +757,7 @@ _080365C4: mov r9, r3 _080365F2: lsls r1, r4, 1 - ldr r0, _08036658 @ =gUnknown_02024A60 + ldr r0, _08036658 @ =gActiveBank ldrb r0, [r0] muls r0, r7 adds r1, r0 @@ -802,10 +802,10 @@ _08036640: pop {r1} bx r1 .align 2, 0 -_0803664C: .4byte gUnknown_02024C0C +_0803664C: .4byte gAbsentBankFlags _08036650: .4byte gBitTable _08036654: .4byte gBattleMons -_08036658: .4byte gUnknown_02024A60 +_08036658: .4byte gActiveBank thumb_func_end ai_has_super_effective_move_on_field thumb_func_start ai_is_too_invested_in_stat_buffs @@ -813,7 +813,7 @@ ai_is_too_invested_in_stat_buffs: @ 803665C push {r4,lr} movs r4, 0 ldr r1, _0803669C @ =gBattleMons - ldr r0, _080366A0 @ =gUnknown_02024A60 + ldr r0, _080366A0 @ =gActiveBank ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -847,7 +847,7 @@ _08036696: bx r1 .align 2, 0 _0803669C: .4byte gBattleMons -_080366A0: .4byte gUnknown_02024A60 +_080366A0: .4byte gActiveBank thumb_func_end ai_is_too_invested_in_stat_buffs thumb_func_start sub_80366A4 @@ -864,8 +864,8 @@ sub_80366A4: @ 80366A4 lsls r1, 24 lsrs r1, 24 str r1, [sp, 0x4] - ldr r1, _08036730 @ =gUnknown_02024C3C - ldr r5, _08036734 @ =gUnknown_02024A60 + ldr r1, _08036730 @ =gMoveHitWith + ldr r5, _08036734 @ =gActiveBank ldrb r3, [r5] lsls r0, r3, 1 adds r4, r0, r1 @@ -905,13 +905,13 @@ _080366F6: beq _08036798 mov r9, r3 mov r0, r9 - bl battle_get_per_side_status + bl GetBankIdentity movs r4, 0x2 eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r1, _08036748 @ =gUnknown_02024C0C + bl GetBankByPlayerAI + ldr r1, _08036748 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _0803674C @ =gBitTable lsls r0, 24 @@ -925,29 +925,29 @@ _080366F6: mov r10, r5 b _0803679C .align 2, 0 -_08036730: .4byte gUnknown_02024C3C -_08036734: .4byte gUnknown_02024A60 +_08036730: .4byte gMoveHitWith +_08036734: .4byte gActiveBank _08036738: .4byte 0x0000ffff _0803673C: .4byte gUnknown_02024C5C _08036740: .4byte gBattleMoves _08036744: .4byte gBattleTypeFlags -_08036748: .4byte gUnknown_02024C0C +_08036748: .4byte gAbsentBankFlags _0803674C: .4byte gBitTable _08036750: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 mov r10, r0 b _0803679C _08036768: - ldr r0, _0803678C @ =gUnknown_02024A60 + ldr r0, _0803678C @ =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity ldr r1, _08036790 @ =0x02000000 lsls r0, 24 lsrs r0, 25 @@ -962,7 +962,7 @@ _08036768: movs r0, 0x1 b _080368DA .align 2, 0 -_0803678C: .4byte gUnknown_02024A60 +_0803678C: .4byte gActiveBank _08036790: .4byte 0x02000000 _08036794: .4byte 0x000160c8 _08036798: @@ -997,7 +997,7 @@ _080367C4: lsls r1, 1 cmp r0, r1 beq _080368D0 - ldr r1, _08036834 @ =gUnknown_02024A6A + ldr r1, _08036834 @ =gBattlePartyID mov r2, r9 lsls r0, r2, 1 adds r0, r1 @@ -1042,7 +1042,7 @@ _080367C4: b _08036850 .align 2, 0 _08036830: .4byte gEnemyParty -_08036834: .4byte gUnknown_02024A6A +_08036834: .4byte gBattlePartyID _08036838: .4byte 0x02000000 _0803683C: .4byte 0x00016068 _08036840: .4byte gBaseStats @@ -1054,8 +1054,8 @@ _08036844: adds r0, r2 ldrb r2, [r0, 0x16] _08036850: - ldr r1, _080368F0 @ =gUnknown_02024C3C - ldr r5, _080368F4 @ =gUnknown_02024A60 + ldr r1, _080368F0 @ =gMoveHitWith + ldr r5, _080368F4 @ =gActiveBank ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -1133,8 +1133,8 @@ _080368DA: bx r1 .align 2, 0 _080368EC: .4byte gBaseStats -_080368F0: .4byte gUnknown_02024C3C -_080368F4: .4byte gUnknown_02024A60 +_080368F0: .4byte gMoveHitWith +_080368F4: .4byte gActiveBank _080368F8: .4byte gUnknown_02024C5C _080368FC: .4byte gBattleMons _08036900: .4byte gEnemyParty @@ -1147,7 +1147,7 @@ sub_8036904: @ 8036904 push {r7} sub sp, 0x4 ldr r6, _080369E0 @ =gBattleMons - ldr r4, _080369E4 @ =gUnknown_02024A60 + ldr r4, _080369E4 @ =gActiveBank ldrb r2, [r4] movs r5, 0x58 adds r0, r2, 0 @@ -1162,7 +1162,7 @@ sub_8036904: @ 8036904 beq _0803692A b _08036AFC _0803692A: - ldr r0, _080369EC @ =gUnknown_02024C98 + ldr r0, _080369EC @ =gStatuses3 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -1178,7 +1178,7 @@ _0803693E: adds r1, r2, 0 movs r2, 0x17 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -1190,7 +1190,7 @@ _08036956: movs r0, 0xC movs r2, 0x47 movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -1202,7 +1202,7 @@ _0803696E: movs r1, 0 movs r2, 0x2A movs r3, 0 - bl sub_8018324 + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080369A0 @@ -1231,16 +1231,16 @@ _080369A0: ands r0, r1 cmp r0, 0 beq _08036A12 - ldr r4, _080369E4 @ =gUnknown_02024A60 + ldr r4, _080369E4 @ =gActiveBank ldrb r7, [r4] adds r0, r7, 0 - bl battle_get_per_side_status + bl GetBankIdentity movs r5, 0x2 eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r1, _080369F4 @ =gUnknown_02024C0C + bl GetBankByPlayerAI + ldr r1, _080369F4 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _080369F8 @ =gBitTable lsls r0, 24 @@ -1254,24 +1254,24 @@ _080369A0: b _08036A18 .align 2, 0 _080369E0: .4byte gBattleMons -_080369E4: .4byte gUnknown_02024A60 +_080369E4: .4byte gActiveBank _080369E8: .4byte 0x0400e000 -_080369EC: .4byte gUnknown_02024C98 +_080369EC: .4byte gStatuses3 _080369F0: .4byte gBattleTypeFlags -_080369F4: .4byte gUnknown_02024C0C +_080369F4: .4byte gAbsentBankFlags _080369F8: .4byte gBitTable _080369FC: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 b _08036A18 _08036A12: - ldr r0, _08036AE8 @ =gUnknown_02024A60 + ldr r0, _08036AE8 @ =gActiveBank ldrb r6, [r0] adds r7, r6, 0 _08036A18: @@ -1299,7 +1299,7 @@ _08036A1A: lsls r1, 1 cmp r0, r1 beq _08036A7E - ldr r1, _08036AF0 @ =gUnknown_02024A6A + ldr r1, _08036AF0 @ =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -1372,9 +1372,9 @@ _08036AE4: movs r0, 0x1 b _08036AFE .align 2, 0 -_08036AE8: .4byte gUnknown_02024A60 +_08036AE8: .4byte gActiveBank _08036AEC: .4byte gEnemyParty -_08036AF0: .4byte gUnknown_02024A6A +_08036AF0: .4byte gBattlePartyID _08036AF4: .4byte 0x02000000 _08036AF8: .4byte 0x00016068 _08036AFC: @@ -1406,9 +1406,9 @@ _08036B1C: b _08036C24 _08036B28: ldr r4, _08036B6C @ =0x02000000 - ldr r0, _08036B70 @ =gUnknown_02024A60 + ldr r0, _08036B70 @ =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 25 ldr r1, _08036B74 @ =0x000160c8 @@ -1428,7 +1428,7 @@ _08036B28: cmp r0, 0 bne _08036B78 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 @@ -1436,15 +1436,15 @@ _08036B28: .align 2, 0 _08036B68: .4byte gBattleTypeFlags _08036B6C: .4byte 0x02000000 -_08036B70: .4byte gUnknown_02024A60 +_08036B70: .4byte gActiveBank _08036B74: .4byte 0x000160c8 _08036B78: movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 _08036B8C: @@ -1458,7 +1458,7 @@ _08036B8E: bl GetMonData cmp r0, 0 beq _08036BCE - ldr r1, _08036C10 @ =gUnknown_02024A6A + ldr r1, _08036C10 @ =gBattlePartyID lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] @@ -1486,9 +1486,9 @@ _08036BCE: cmp r4, 0x5 ble _08036B8E _08036BD4: - ldr r0, _08036C1C @ =gUnknown_02024A60 + ldr r0, _08036C1C @ =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity ldr r1, _08036C14 @ =0x02000000 lsls r0, 24 lsrs r0, 25 @@ -1497,9 +1497,9 @@ _08036BD4: adds r0, r1 strb r4, [r0] _08036BEA: - ldr r4, _08036C1C @ =gUnknown_02024A60 + ldr r4, _08036C1C @ =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity ldr r2, _08036C14 @ =0x02000000 ldrb r1, [r4] ldr r3, _08036C18 @ =0x00016068 @@ -1515,10 +1515,10 @@ _08036BEA: b _08036C40 .align 2, 0 _08036C0C: .4byte gEnemyParty -_08036C10: .4byte gUnknown_02024A6A +_08036C10: .4byte gBattlePartyID _08036C14: .4byte 0x02000000 _08036C18: .4byte 0x00016068 -_08036C1C: .4byte gUnknown_02024A60 +_08036C1C: .4byte gActiveBank _08036C20: .4byte 0x000160c8 _08036C24: bl sub_803708C @@ -1526,7 +1526,7 @@ _08036C24: cmp r0, 0 bne _08036C40 _08036C2E: - ldr r0, _08036C48 @ =gUnknown_02024A60 + ldr r0, _08036C48 @ =gActiveBank ldrb r0, [r0] movs r2, 0x1 eors r2, r0 @@ -1539,7 +1539,7 @@ _08036C40: pop {r0} bx r0 .align 2, 0 -_08036C48: .4byte gUnknown_02024A60 +_08036C48: .4byte gActiveBank thumb_func_end sub_8036B0C thumb_func_start sub_8036C4C @@ -1629,16 +1629,16 @@ sub_8036CD4: @ 8036CD4 ands r0, r1 cmp r0, 0 beq _08036D78 - ldr r4, _08036D20 @ =gUnknown_02024A60 + ldr r4, _08036D20 @ =gActiveBank ldrb r0, [r4] str r0, [sp, 0xC] - bl battle_get_per_side_status + bl GetBankIdentity movs r5, 0x2 eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r1, _08036D24 @ =gUnknown_02024C0C + bl GetBankByPlayerAI + ldr r1, _08036D24 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _08036D28 @ =gBitTable lsls r0, 24 @@ -1653,16 +1653,16 @@ sub_8036CD4: @ 8036CD4 b _08036D42 .align 2, 0 _08036D1C: .4byte gBattleTypeFlags -_08036D20: .4byte gUnknown_02024A60 -_08036D24: .4byte gUnknown_02024C0C +_08036D20: .4byte gActiveBank +_08036D24: .4byte gAbsentBankFlags _08036D28: .4byte gBitTable _08036D2C: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x10] @@ -1673,7 +1673,7 @@ _08036D42: lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _08036D70 @ =gUnknown_02024C0C + ldr r0, _08036D70 @ =gAbsentBankFlags ldrb r1, [r0] ldr r2, _08036D74 @ =gBitTable mov r4, r10 @@ -1689,15 +1689,15 @@ _08036D42: mov r10, r0 b _08036D8C .align 2, 0 -_08036D70: .4byte gUnknown_02024C0C +_08036D70: .4byte gAbsentBankFlags _08036D74: .4byte gBitTable _08036D78: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _08036E5C @ =gUnknown_02024A60 + ldr r0, _08036E5C @ =gActiveBank ldrb r0, [r0] str r0, [sp, 0x10] str r0, [sp, 0xC] @@ -1738,7 +1738,7 @@ _08036DA2: ands r0, r2 cmp r0, 0 bne _08036E7C - ldr r1, _08036E68 @ =gUnknown_02024A6A + ldr r1, _08036E68 @ =gBattlePartyID ldr r3, [sp, 0xC] lsls r0, r3, 1 adds r0, r1 @@ -1804,10 +1804,10 @@ _08036DA2: str r0, [sp, 0x8] b _08036E8A .align 2, 0 -_08036E5C: .4byte gUnknown_02024A60 +_08036E5C: .4byte gActiveBank _08036E60: .4byte gBitTable _08036E64: .4byte gEnemyParty -_08036E68: .4byte gUnknown_02024A6A +_08036E68: .4byte gBattlePartyID _08036E6C: .4byte 0x02000000 _08036E70: .4byte 0x00016068 _08036E74: .4byte gBaseStats @@ -1843,7 +1843,7 @@ _08036EA4: lsrs r4, r0, 16 cmp r4, 0 beq _08036ECA - ldr r0, _08036EF0 @ =gUnknown_02024A60 + ldr r0, _08036EF0 @ =gActiveBank ldrb r1, [r0] adds r0, r4, 0 mov r2, r10 @@ -1873,7 +1873,7 @@ _08036ED6: b _08036EFA .align 2, 0 _08036EEC: .4byte gEnemyParty -_08036EF0: .4byte gUnknown_02024A60 +_08036EF0: .4byte gActiveBank _08036EF4: .4byte gBitTable _08036EF8: movs r0, 0x3F @@ -1884,7 +1884,7 @@ _08036EFA: beq _08036F04 b _08036D94 _08036F04: - ldr r0, _08037000 @ =gUnknown_02024DEC + ldr r0, _08037000 @ =gDynamicBasePower movs r2, 0 strh r2, [r0] ldr r0, _08037004 @ =0x02000000 @@ -1923,7 +1923,7 @@ _08036F2C: bl GetMonData cmp r0, 0 beq _08036FE8 - ldr r1, _0803701C @ =gUnknown_02024A6A + ldr r1, _0803701C @ =gBattlePartyID ldr r4, [sp, 0xC] lsls r0, r4, 1 adds r0, r1 @@ -1952,7 +1952,7 @@ _08036F2C: mov r9, r6 ldr r4, _08037024 @ =gBattleMoveDamage mov r8, r4 - ldr r6, _08037028 @ =gUnknown_02024A60 + ldr r6, _08037028 @ =gActiveBank _08036F90: adds r1, r5, 0 adds r1, 0xD @@ -2012,17 +2012,17 @@ _08036FEE: pop {r1} bx r1 .align 2, 0 -_08037000: .4byte gUnknown_02024DEC +_08037000: .4byte gDynamicBasePower _08037004: .4byte 0x02000000 _08037008: .4byte 0x0001601c _0803700C: .4byte 0x0001601f _08037010: .4byte gBattleMoveFlags _08037014: .4byte gCritMultiplier _08037018: .4byte gEnemyParty -_0803701C: .4byte gUnknown_02024A6A +_0803701C: .4byte gBattlePartyID _08037020: .4byte 0x00016068 _08037024: .4byte gBattleMoveDamage -_08037028: .4byte gUnknown_02024A60 +_08037028: .4byte gActiveBank _0803702C: .4byte gBattleMoves thumb_func_end sub_8036CD4 @@ -2181,7 +2181,7 @@ _08037136: bl ai_identify_item_effect ldr r2, _08037180 @ =0xfffe9600 adds r4, r2 - ldr r3, _08037184 @ =gUnknown_02024A60 + ldr r3, _08037184 @ =gActiveBank ldrb r1, [r3] lsrs r1, 1 ldr r2, _08037188 @ =0x000160d8 @@ -2209,7 +2209,7 @@ _08037174: .4byte 0x02016a00 _08037178: .4byte gItemEffectTable _0803717C: .4byte gSaveBlock1 + 0x3676 _08037180: .4byte 0xfffe9600 -_08037184: .4byte gUnknown_02024A60 +_08037184: .4byte gActiveBank _08037188: .4byte 0x000160d8 _0803718C: .4byte _08037190 .align 2, 0 @@ -2222,7 +2222,7 @@ _08037190: .4byte _080374F8 _080371A8: ldr r2, _080371C8 @ =gBattleMons - ldr r0, _080371CC @ =gUnknown_02024A60 + ldr r0, _080371CC @ =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -2241,7 +2241,7 @@ _080371C6: b _08037450 .align 2, 0 _080371C8: .4byte gBattleMons -_080371CC: .4byte gUnknown_02024A60 +_080371CC: .4byte gActiveBank _080371D0: mov r0, r10 movs r1, 0x4 @@ -2254,7 +2254,7 @@ _080371D0: b _080374A8 _080371E4: ldr r2, _08037214 @ =gBattleMons - ldr r0, _08037218 @ =gUnknown_02024A60 + ldr r0, _08037218 @ =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -2281,10 +2281,10 @@ _08037210: b _08037496 .align 2, 0 _08037214: .4byte gBattleMons -_08037218: .4byte gUnknown_02024A60 +_08037218: .4byte gActiveBank _0803721C: ldr r2, _08037378 @ =0x02000000 - ldr r3, _0803737C @ =gUnknown_02024A60 + ldr r3, _0803737C @ =gActiveBank ldrb r0, [r3] lsrs r0, 1 ldr r6, _08037380 @ =0x000160da @@ -2466,12 +2466,12 @@ _08037362: b _080374AE .align 2, 0 _08037378: .4byte 0x02000000 -_0803737C: .4byte gUnknown_02024A60 +_0803737C: .4byte gActiveBank _08037380: .4byte 0x000160da _08037384: .4byte gBattleMons _08037388: ldr r6, _08037458 @ =0x02000000 - ldr r4, _0803745C @ =gUnknown_02024A60 + ldr r4, _0803745C @ =gActiveBank ldrb r0, [r4] lsrs r0, 1 ldr r3, _08037460 @ =0x000160da @@ -2481,7 +2481,7 @@ _08037388: mov r12, r1 movs r1, 0 strb r1, [r0] - ldr r1, _08037464 @ =gUnknown_02024CA8 + ldr r1, _08037464 @ =gDisableStructs ldrb r2, [r4] lsls r0, r2, 3 subs r0, r2 @@ -2581,16 +2581,16 @@ _08037450: b _080374AE .align 2, 0 _08037458: .4byte 0x02000000 -_0803745C: .4byte gUnknown_02024A60 +_0803745C: .4byte gActiveBank _08037460: .4byte 0x000160da -_08037464: .4byte gUnknown_02024CA8 +_08037464: .4byte gDisableStructs _08037468: - ldr r4, _0803749C @ =gUnknown_02024A60 + ldr r4, _0803749C @ =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080374A0 @ =gUnknown_02024CA8 + ldr r2, _080374A0 @ =gDisableStructs ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -2599,7 +2599,7 @@ _08037468: ldrb r0, [r0, 0x16] cmp r0, 0 beq _080374A8 - ldr r0, _080374A4 @ =gUnknown_02024C80 + ldr r0, _080374A4 @ =gSideTimer lsls r1, r3, 1 adds r1, r3 lsls r1, 2 @@ -2612,9 +2612,9 @@ _08037496: mov r8, r0 b _080374AE .align 2, 0 -_0803749C: .4byte gUnknown_02024A60 -_080374A0: .4byte gUnknown_02024CA8 -_080374A4: .4byte gUnknown_02024C80 +_0803749C: .4byte gActiveBank +_080374A0: .4byte gDisableStructs +_080374A4: .4byte gSideTimer _080374A8: mov r1, r8 cmp r1, 0 @@ -2625,7 +2625,7 @@ _080374AE: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb ldr r1, _080374DC @ =0x02000000 - ldr r0, _080374E0 @ =gUnknown_02024A60 + ldr r0, _080374E0 @ =gActiveBank ldrb r0, [r0] lsrs r0, 1 lsls r0, 1 @@ -2644,7 +2644,7 @@ _080374AE: b _080374FA .align 2, 0 _080374DC: .4byte 0x02000000 -_080374E0: .4byte gUnknown_02024A60 +_080374E0: .4byte gActiveBank _080374E4: .4byte 0x000160d4 _080374E8: .4byte 0x00016a24 _080374EC: @@ -2672,10 +2672,10 @@ nullsub_47: @ 803750C bx lr thumb_func_end nullsub_47 - thumb_func_start sub_8037510 -sub_8037510: @ 8037510 - ldr r1, _08037520 @ =gUnknown_03004330 - ldr r0, _08037524 @ =gUnknown_02024A60 + thumb_func_start SetBankFuncToLinkOpponentBufferRunCommand +SetBankFuncToLinkOpponentBufferRunCommand: @ 8037510 + ldr r1, _08037520 @ =gBattleBankFunc + ldr r0, _08037524 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -2683,17 +2683,17 @@ sub_8037510: @ 8037510 str r1, [r0] bx lr .align 2, 0 -_08037520: .4byte gUnknown_03004330 -_08037524: .4byte gUnknown_02024A60 +_08037520: .4byte gBattleBankFunc +_08037524: .4byte gActiveBank _08037528: .4byte sub_803752C - thumb_func_end sub_8037510 + thumb_func_end SetBankFuncToLinkOpponentBufferRunCommand thumb_func_start sub_803752C sub_803752C: @ 803752C push {lr} - ldr r2, _08037560 @ =gUnknown_02024A64 + ldr r2, _08037560 @ =gBattleExecBuffer ldr r1, _08037564 @ =gBitTable - ldr r0, _08037568 @ =gUnknown_02024A60 + ldr r0, _08037568 @ =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -2702,13 +2702,13 @@ sub_803752C: @ 803752C ands r1, r0 cmp r1, 0 beq _08037578 - ldr r0, _0803756C @ =gUnknown_02023A60 + ldr r0, _0803756C @ =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _08037574 - ldr r0, _08037570 @ =gUnknown_081FB048 + ldr r0, _08037570 @ =gLinkOpponentBufferCommands ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -2716,11 +2716,11 @@ sub_803752C: @ 803752C bl _call_via_r0 b _08037578 .align 2, 0 -_08037560: .4byte gUnknown_02024A64 +_08037560: .4byte gBattleExecBuffer _08037564: .4byte gBitTable -_08037568: .4byte gUnknown_02024A60 -_0803756C: .4byte gUnknown_02023A60 -_08037570: .4byte gUnknown_081FB048 +_08037568: .4byte gActiveBank +_0803756C: .4byte gBattleBufferA +_08037570: .4byte gLinkOpponentBufferCommands _08037574: bl dp01_tbl4_exec_completed _08037578: @@ -2732,8 +2732,8 @@ _08037578: sub_803757C: @ 803757C push {lr} ldr r2, _080375A4 @ =gSprites - ldr r1, _080375A8 @ =gUnknown_02024BE0 - ldr r0, _080375AC @ =gUnknown_02024A60 + ldr r1, _080375A8 @ =gObjectBankIDs + ldr r0, _080375AC @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2752,8 +2752,8 @@ _080375A0: bx r0 .align 2, 0 _080375A4: .4byte gSprites -_080375A8: .4byte gUnknown_02024BE0 -_080375AC: .4byte gUnknown_02024A60 +_080375A8: .4byte gObjectBankIDs +_080375AC: .4byte gActiveBank _080375B0: .4byte SpriteCallbackDummy thumb_func_end sub_803757C @@ -2761,8 +2761,8 @@ _080375B0: .4byte SpriteCallbackDummy sub_80375B4: @ 80375B4 push {r4-r6,lr} ldr r4, _0803762C @ =gSprites - ldr r6, _08037630 @ =gUnknown_02024BE0 - ldr r5, _08037634 @ =gUnknown_02024A60 + ldr r6, _08037630 @ =gObjectBankIDs + ldr r5, _08037634 @ =gActiveBank ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -2817,8 +2817,8 @@ _08037624: bx r0 .align 2, 0 _0803762C: .4byte gSprites -_08037630: .4byte gUnknown_02024BE0 -_08037634: .4byte gUnknown_02024A60 +_08037630: .4byte gObjectBankIDs +_08037634: .4byte gActiveBank _08037638: .4byte SpriteCallbackDummy _0803763C: .4byte 0x000003ff _08037640: .4byte 0xfffffc00 @@ -2827,7 +2827,7 @@ _08037640: .4byte 0xfffffc00 thumb_func_start sub_8037644 sub_8037644: @ 8037644 push {lr} - ldr r3, _08037678 @ =gUnknown_02024A60 + ldr r3, _08037678 @ =gActiveBank ldrb r0, [r3] lsls r1, r0, 1 adds r1, r0 @@ -2853,7 +2853,7 @@ _08037674: pop {r0} bx r0 .align 2, 0 -_08037678: .4byte gUnknown_02024A60 +_08037678: .4byte gActiveBank _0803767C: .4byte 0x02017810 thumb_func_end sub_8037644 @@ -2877,8 +2877,8 @@ sub_8037680: @ 8037680 beq _080376D8 _080376A4: ldr r2, _080376C8 @ =gSprites - ldr r1, _080376CC @ =gUnknown_03004340 - ldr r0, _080376D0 @ =gUnknown_02024A60 + ldr r1, _080376CC @ =gHealthboxIDs + ldr r0, _080376D0 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2895,13 +2895,13 @@ _080376A4: .align 2, 0 _080376C4: .4byte gBattleTypeFlags _080376C8: .4byte gSprites -_080376CC: .4byte gUnknown_03004340 -_080376D0: .4byte gUnknown_02024A60 +_080376CC: .4byte gHealthboxIDs +_080376D0: .4byte gActiveBank _080376D4: .4byte SpriteCallbackDummy _080376D8: ldr r2, _080377D8 @ =gSprites - ldr r5, _080377DC @ =gUnknown_03004340 - ldr r0, _080377E0 @ =gUnknown_02024A60 + ldr r5, _080377DC @ =gHealthboxIDs + ldr r0, _080377E0 @ =gActiveBank ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -2938,9 +2938,9 @@ _0803771A: bne _08037720 b _08037822 _08037720: - ldr r7, _080377E0 @ =gUnknown_02024A60 + ldr r7, _080377E0 @ =gActiveBank ldrb r0, [r7] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 @@ -3017,7 +3017,7 @@ _080377B4: cmp r0, 0 beq _080377F8 ldrb r0, [r7] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3027,8 +3027,8 @@ _080377B4: b _08037804 .align 2, 0 _080377D8: .4byte gSprites -_080377DC: .4byte gUnknown_03004340 -_080377E0: .4byte gUnknown_02024A60 +_080377DC: .4byte gHealthboxIDs +_080377E0: .4byte gActiveBank _080377E4: .4byte SpriteCallbackDummy _080377E8: .4byte 0x02017810 _080377EC: .4byte 0x000027f9 @@ -3041,7 +3041,7 @@ _080377F8: lsls r2, 1 bl m4aMPlayVolumeControl _08037804: - ldr r2, _08037830 @ =gUnknown_02024A60 + ldr r2, _08037830 @ =gActiveBank ldrb r1, [r2] lsls r0, r1, 1 adds r0, r1 @@ -3050,7 +3050,7 @@ _08037804: adds r0, r1 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _08037838 @ =gUnknown_03004330 + ldr r1, _08037838 @ =gBattleBankFunc ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -3063,9 +3063,9 @@ _08037822: .align 2, 0 _08037828: .4byte gMPlay_BGM _0803782C: .4byte 0x0000ffff -_08037830: .4byte gUnknown_02024A60 +_08037830: .4byte gActiveBank _08037834: .4byte 0x02017810 -_08037838: .4byte gUnknown_03004330 +_08037838: .4byte gBattleBankFunc _0803783C: .4byte sub_8037644 thumb_func_end sub_8037680 @@ -3076,7 +3076,7 @@ sub_8037840: @ 8037840 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r6, _08037A48 @ =gUnknown_02024A60 + ldr r6, _08037A48 @ =gActiveBank ldrb r2, [r6] lsls r3, r2, 1 adds r0, r3, r2 @@ -3089,7 +3089,7 @@ sub_8037840: @ 8037840 ands r0, r1 cmp r0, 0 bne _08037878 - ldr r0, _08037A50 @ =gUnknown_02024A6A + ldr r0, _08037A50 @ =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -3112,7 +3112,7 @@ _08037878: ands r0, r1 cmp r0, 0 bne _080378A6 - ldr r0, _08037A50 @ =gUnknown_02024A6A + ldr r0, _08037A50 @ =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -3157,7 +3157,7 @@ _080378DA: cmp r0, 0 beq _0803791A adds r0, r2, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -3194,7 +3194,7 @@ _0803791A: cmp r0, 0 bne _080379B2 ldr r1, _08037A5C @ =gUnknown_0300434C - ldr r5, _08037A48 @ =gUnknown_02024A60 + ldr r5, _08037A48 @ =gActiveBank ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -3206,7 +3206,7 @@ _0803791A: ldr r1, _08037A60 @ =gSprites adds r0, r1 bl DestroySprite - ldr r0, _08037A64 @ =gUnknown_03004340 + ldr r0, _08037A64 @ =gHealthboxIDs mov r8, r0 ldrb r0, [r5] adds r1, r4, 0 @@ -3214,7 +3214,7 @@ _0803791A: mov r2, r8 adds r0, r1, r2 ldrb r0, [r0] - ldr r2, _08037A50 @ =gUnknown_02024A6A + ldr r2, _08037A50 @ =gBattlePartyID mov r10, r2 lsls r1, 1 add r1, r10 @@ -3254,7 +3254,7 @@ _0803791A: bl sub_8032984 _080379B2: ldr r1, _08037A5C @ =gUnknown_0300434C - ldr r4, _08037A48 @ =gUnknown_02024A60 + ldr r4, _08037A48 @ =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -3264,11 +3264,11 @@ _080379B2: ldr r1, _08037A60 @ =gSprites adds r0, r1 bl DestroySprite - ldr r5, _08037A64 @ =gUnknown_03004340 + ldr r5, _08037A64 @ =gHealthboxIDs ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _08037A50 @ =gUnknown_02024A6A + ldr r2, _08037A50 @ =gBattlePartyID mov r9, r2 lsls r1, 1 add r1, r9 @@ -3309,7 +3309,7 @@ _080379B2: negs r0, r0 ands r0, r1 strb r0, [r2, 0x9] - ldr r1, _08037A6C @ =gUnknown_03004330 + ldr r1, _08037A6C @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3324,16 +3324,16 @@ _08037A3A: pop {r0} bx r0 .align 2, 0 -_08037A48: .4byte gUnknown_02024A60 +_08037A48: .4byte gActiveBank _08037A4C: .4byte 0x02017810 -_08037A50: .4byte gUnknown_02024A6A +_08037A50: .4byte gBattlePartyID _08037A54: .4byte gEnemyParty _08037A58: .4byte gBattleTypeFlags _08037A5C: .4byte gUnknown_0300434C _08037A60: .4byte gSprites -_08037A64: .4byte gUnknown_03004340 +_08037A64: .4byte gHealthboxIDs _08037A68: .4byte 0x02017840 -_08037A6C: .4byte gUnknown_03004330 +_08037A6C: .4byte gBattleBankFunc _08037A70: .4byte sub_8037680 thumb_func_end sub_8037840 @@ -3341,8 +3341,8 @@ _08037A70: .4byte sub_8037680 sub_8037A74: @ 8037A74 push {r4-r7,lr} ldr r2, _08037ACC @ =gSprites - ldr r0, _08037AD0 @ =gUnknown_02024BE0 - ldr r7, _08037AD4 @ =gUnknown_02024A60 + ldr r0, _08037AD0 @ =gObjectBankIDs + ldr r7, _08037AD4 @ =gActiveBank ldrb r3, [r7] adds r0, r3, r0 ldrb r1, [r0] @@ -3371,7 +3371,7 @@ sub_8037A74: @ 8037A74 ands r0, r5 cmp r0, 0 bne _08037AE4 - ldr r0, _08037ADC @ =gUnknown_02024A6A + ldr r0, _08037ADC @ =gBattlePartyID adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 @@ -3383,10 +3383,10 @@ sub_8037A74: @ 8037A74 b _08037B18 .align 2, 0 _08037ACC: .4byte gSprites -_08037AD0: .4byte gUnknown_02024BE0 -_08037AD4: .4byte gUnknown_02024A60 +_08037AD0: .4byte gObjectBankIDs +_08037AD4: .4byte gActiveBank _08037AD8: .4byte 0x02017810 -_08037ADC: .4byte gUnknown_02024A6A +_08037ADC: .4byte gBattlePartyID _08037AE0: .4byte gEnemyParty _08037AE4: ldrb r0, [r1, 0x1] @@ -3423,9 +3423,9 @@ _08037B20: .4byte 0x000027f9 thumb_func_start sub_8037B24 sub_8037B24: @ 8037B24 push {r4-r6,lr} - ldr r6, _08037B64 @ =gUnknown_02024A60 + ldr r6, _08037B64 @ =gActiveBank ldrb r0, [r6] - ldr r5, _08037B68 @ =gUnknown_03004340 + ldr r5, _08037B68 @ =gHealthboxIDs adds r1, r0, r5 ldrb r1, [r1] movs r2, 0 @@ -3451,8 +3451,8 @@ sub_8037B24: @ 8037B24 bl sub_80440EC b _08037B70 .align 2, 0 -_08037B64: .4byte gUnknown_02024A60 -_08037B68: .4byte gUnknown_03004340 +_08037B64: .4byte gActiveBank +_08037B68: .4byte gHealthboxIDs _08037B6C: bl dp01_tbl4_exec_completed _08037B70: @@ -3465,8 +3465,8 @@ _08037B70: sub_8037B78: @ 8037B78 push {lr} ldr r2, _08037BAC @ =gSprites - ldr r0, _08037BB0 @ =gUnknown_02024BE0 - ldr r1, _08037BB4 @ =gUnknown_02024A60 + ldr r0, _08037BB0 @ =gObjectBankIDs + ldr r1, _08037BB4 @ =gActiveBank ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -3479,7 +3479,7 @@ sub_8037B78: @ 8037B78 lsls r0, 31 cmp r0, 0 bne _08037BA6 - ldr r0, _08037BB8 @ =gUnknown_03004340 + ldr r0, _08037BB8 @ =gHealthboxIDs adds r0, r3, r0 ldrb r0, [r0] bl sub_8043DB0 @@ -3489,15 +3489,15 @@ _08037BA6: bx r0 .align 2, 0 _08037BAC: .4byte gSprites -_08037BB0: .4byte gUnknown_02024BE0 -_08037BB4: .4byte gUnknown_02024A60 -_08037BB8: .4byte gUnknown_03004340 +_08037BB0: .4byte gObjectBankIDs +_08037BB4: .4byte gActiveBank +_08037BB8: .4byte gHealthboxIDs thumb_func_end sub_8037B78 thumb_func_start sub_8037BBC sub_8037BBC: @ 8037BBC push {r4-r6,lr} - ldr r6, _08037C18 @ =gUnknown_02024A60 + ldr r6, _08037C18 @ =gActiveBank ldrb r2, [r6] lsls r0, r2, 1 adds r0, r2 @@ -3509,7 +3509,7 @@ sub_8037BBC: @ 8037BBC ands r0, r1 cmp r0, 0 bne _08037C12 - ldr r5, _08037C20 @ =gUnknown_02024BE0 + ldr r5, _08037C20 @ =gObjectBankIDs adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 @@ -3528,7 +3528,7 @@ sub_8037BBC: @ 8037BBC bl DestroySprite ldrb r0, [r6] bl sub_8032A08 - ldr r1, _08037C28 @ =gUnknown_03004340 + ldr r1, _08037C28 @ =gHealthboxIDs ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -3539,11 +3539,11 @@ _08037C12: pop {r0} bx r0 .align 2, 0 -_08037C18: .4byte gUnknown_02024A60 +_08037C18: .4byte gActiveBank _08037C1C: .4byte 0x02017810 -_08037C20: .4byte gUnknown_02024BE0 +_08037C20: .4byte gObjectBankIDs _08037C24: .4byte gSprites -_08037C28: .4byte gUnknown_03004340 +_08037C28: .4byte gHealthboxIDs thumb_func_end sub_8037BBC thumb_func_start sub_8037C2C @@ -3564,8 +3564,8 @@ _08037C40: .4byte gUnknown_03004210 thumb_func_start dp01t_0F_4_move_anim dp01t_0F_4_move_anim: @ 8037C44 push {r4,lr} - ldr r1, _08037C80 @ =gUnknown_02024BE0 - ldr r0, _08037C84 @ =gUnknown_02024A60 + ldr r1, _08037C80 @ =gObjectBankIDs + ldr r0, _08037C84 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -3587,15 +3587,15 @@ dp01t_0F_4_move_anim: @ 8037C44 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _08037C8C @ =gUnknown_02024E6D + ldr r0, _08037C8C @ =gDoingBattleAnim strb r3, [r0] bl dp01_tbl4_exec_completed b _08037CBA .align 2, 0 -_08037C80: .4byte gUnknown_02024BE0 -_08037C84: .4byte gUnknown_02024A60 +_08037C80: .4byte gObjectBankIDs +_08037C84: .4byte gActiveBank _08037C88: .4byte gSprites -_08037C8C: .4byte gUnknown_02024E6D +_08037C8C: .4byte gDoingBattleAnim _08037C90: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -3629,8 +3629,8 @@ _08037CBA: sub_8037CC0: @ 8037CC0 push {r4,lr} ldr r2, _08037D10 @ =gSprites - ldr r0, _08037D14 @ =gUnknown_03004340 - ldr r4, _08037D18 @ =gUnknown_02024A60 + ldr r0, _08037D14 @ =gHealthboxIDs + ldr r4, _08037D18 @ =gActiveBank ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -3657,7 +3657,7 @@ sub_8037CC0: @ 8037CC0 movs r3, 0x6 bl move_anim_start_t4 _08037CFC: - ldr r0, _08037D24 @ =gUnknown_03004330 + ldr r0, _08037D24 @ =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -3669,18 +3669,18 @@ _08037D08: bx r0 .align 2, 0 _08037D10: .4byte gSprites -_08037D14: .4byte gUnknown_03004340 -_08037D18: .4byte gUnknown_02024A60 +_08037D14: .4byte gHealthboxIDs +_08037D18: .4byte gActiveBank _08037D1C: .4byte SpriteCallbackDummy _08037D20: .4byte 0x02017800 -_08037D24: .4byte gUnknown_03004330 +_08037D24: .4byte gBattleBankFunc _08037D28: .4byte sub_8037D2C thumb_func_end sub_8037CC0 thumb_func_start sub_8037D2C sub_8037D2C: @ 8037D2C push {lr} - ldr r0, _08037D58 @ =gUnknown_02024A60 + ldr r0, _08037D58 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3700,7 +3700,7 @@ _08037D52: pop {r0} bx r0 .align 2, 0 -_08037D58: .4byte gUnknown_02024A60 +_08037D58: .4byte gActiveBank _08037D5C: .4byte 0x02017810 _08037D60: .4byte c3_0802FDF4 thumb_func_end sub_8037D2C @@ -3708,7 +3708,7 @@ _08037D60: .4byte c3_0802FDF4 thumb_func_start sub_8037D64 sub_8037D64: @ 8037D64 push {r4,r5,lr} - ldr r5, _08037E08 @ =gUnknown_02024A60 + ldr r5, _08037E08 @ =gActiveBank ldrb r1, [r5] lsls r0, r1, 1 adds r0, r1 @@ -3739,7 +3739,7 @@ sub_8037D64: @ 8037D64 bl FreeSpriteTilesByTag adds r0, r4, 0 bl FreeSpritePaletteByTag - ldr r1, _08037E14 @ =gUnknown_02024BE0 + ldr r1, _08037E14 @ =gObjectBankIDs ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -3750,11 +3750,11 @@ sub_8037D64: @ 8037D64 adds r0, r1 movs r1, 0 bl StartSpriteAnim - ldr r4, _08037E1C @ =gUnknown_03004340 + ldr r4, _08037E1C @ =gHealthboxIDs ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08037E20 @ =gUnknown_02024A6A + ldr r2, _08037E20 @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -3772,7 +3772,7 @@ sub_8037D64: @ 8037D64 bl sub_8043DFC ldrb r0, [r5] bl sub_8031F88 - ldr r1, _08037E28 @ =gUnknown_03004330 + ldr r1, _08037E28 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3783,22 +3783,22 @@ _08037E00: pop {r0} bx r0 .align 2, 0 -_08037E08: .4byte gUnknown_02024A60 +_08037E08: .4byte gActiveBank _08037E0C: .4byte 0x02017810 _08037E10: .4byte 0x000027f9 -_08037E14: .4byte gUnknown_02024BE0 +_08037E14: .4byte gObjectBankIDs _08037E18: .4byte gSprites -_08037E1C: .4byte gUnknown_03004340 -_08037E20: .4byte gUnknown_02024A6A +_08037E1C: .4byte gHealthboxIDs +_08037E20: .4byte gBattlePartyID _08037E24: .4byte gEnemyParty -_08037E28: .4byte gUnknown_03004330 +_08037E28: .4byte gBattleBankFunc _08037E2C: .4byte sub_8037CC0 thumb_func_end sub_8037D64 thumb_func_start sub_8037E30 sub_8037E30: @ 8037E30 push {r4-r6,lr} - ldr r5, _08037ECC @ =gUnknown_02024A60 + ldr r5, _08037ECC @ =gActiveBank ldrb r2, [r5] lsls r3, r2, 1 adds r0, r3, r2 @@ -3810,7 +3810,7 @@ sub_8037E30: @ 8037E30 ands r0, r1 cmp r0, 0 bne _08037E5E - ldr r0, _08037ED4 @ =gUnknown_02024A6A + ldr r0, _08037ED4 @ =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -3847,7 +3847,7 @@ _08037E5E: adds r0, r3, r4 bl DestroySprite ldrb r4, [r5] - ldr r1, _08037ED4 @ =gUnknown_02024A6A + ldr r1, _08037ED4 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -3862,7 +3862,7 @@ _08037E5E: lsrs r1, 16 adds r0, r4, 0 bl sub_8032984 - ldr r1, _08037EE8 @ =gUnknown_03004330 + ldr r1, _08037EE8 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3873,14 +3873,14 @@ _08037EC4: pop {r0} bx r0 .align 2, 0 -_08037ECC: .4byte gUnknown_02024A60 +_08037ECC: .4byte gActiveBank _08037ED0: .4byte 0x02017810 -_08037ED4: .4byte gUnknown_02024A6A +_08037ED4: .4byte gBattlePartyID _08037ED8: .4byte gEnemyParty _08037EDC: .4byte gSprites _08037EE0: .4byte gUnknown_0300434C _08037EE4: .4byte SpriteCallbackDummy -_08037EE8: .4byte gUnknown_03004330 +_08037EE8: .4byte gBattleBankFunc _08037EEC: .4byte sub_8037D64 thumb_func_end sub_8037E30 @@ -3901,7 +3901,7 @@ sub_8037EF0: @ 8037EF0 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _08037F2C @ =gUnknown_030042D0 + ldr r0, _08037F2C @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r3] ldr r0, _08037F30 @ =c2_8011A1C @@ -3913,7 +3913,7 @@ _08037F1C: _08037F20: .4byte gReceivedRemoteLinkPlayers _08037F24: .4byte gMain _08037F28: .4byte 0x0000043d -_08037F2C: .4byte gUnknown_030042D0 +_08037F2C: .4byte gPreBattleCallback1 _08037F30: .4byte c2_8011A1C thumb_func_end sub_8037EF0 @@ -3933,8 +3933,8 @@ sub_8037F34: @ 8037F34 cmp r0, 0 beq _08037F78 bl sub_800832C - ldr r1, _08037F6C @ =gUnknown_03004330 - ldr r0, _08037F70 @ =gUnknown_02024A60 + ldr r1, _08037F6C @ =gBattleBankFunc + ldr r0, _08037F70 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -3944,8 +3944,8 @@ sub_8037F34: @ 8037F34 .align 2, 0 _08037F64: .4byte gPaletteFade _08037F68: .4byte gBattleTypeFlags -_08037F6C: .4byte gUnknown_03004330 -_08037F70: .4byte gUnknown_02024A60 +_08037F6C: .4byte gBattleBankFunc +_08037F70: .4byte gActiveBank _08037F74: .4byte sub_8037EF0 _08037F78: movs r0, 0x5A @@ -3958,7 +3958,7 @@ _08037F78: negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r0, _08037FA8 @ =gUnknown_030042D0 + ldr r0, _08037FA8 @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r2] ldr r0, [r2, 0x8] @@ -3969,13 +3969,13 @@ _08037F9A: .align 2, 0 _08037FA0: .4byte gMain _08037FA4: .4byte 0x0000043d -_08037FA8: .4byte gUnknown_030042D0 +_08037FA8: .4byte gPreBattleCallback1 thumb_func_end sub_8037F34 thumb_func_start sub_8037FAC sub_8037FAC: @ 8037FAC push {lr} - ldr r0, _08037FD0 @ =gUnknown_02024A60 + ldr r0, _08037FD0 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3992,14 +3992,14 @@ _08037FCA: pop {r0} bx r0 .align 2, 0 -_08037FD0: .4byte gUnknown_02024A60 +_08037FD0: .4byte gActiveBank _08037FD4: .4byte 0x02017810 thumb_func_end sub_8037FAC thumb_func_start sub_8037FD8 sub_8037FD8: @ 8037FD8 push {lr} - ldr r0, _08037FFC @ =gUnknown_02024A60 + ldr r0, _08037FFC @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4016,7 +4016,7 @@ _08037FF6: pop {r0} bx r0 .align 2, 0 -_08037FFC: .4byte gUnknown_02024A60 +_08037FFC: .4byte gActiveBank _08038000: .4byte 0x02017810 thumb_func_end sub_8037FD8 @@ -4024,8 +4024,8 @@ _08038000: .4byte 0x02017810 dp01_tbl4_exec_completed: @ 8038004 push {r4,lr} sub sp, 0x4 - ldr r1, _08038044 @ =gUnknown_03004330 - ldr r4, _08038048 @ =gUnknown_02024A60 + ldr r1, _08038044 @ =gBattleBankFunc + ldr r4, _08038048 @ =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4044,7 +4044,7 @@ dp01_tbl4_exec_completed: @ 8038004 movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _08038054 @ =gUnknown_02023A60 + ldr r1, _08038054 @ =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -4052,13 +4052,13 @@ dp01_tbl4_exec_completed: @ 8038004 strb r1, [r0] b _0803806A .align 2, 0 -_08038044: .4byte gUnknown_03004330 -_08038048: .4byte gUnknown_02024A60 +_08038044: .4byte gBattleBankFunc +_08038048: .4byte gActiveBank _0803804C: .4byte sub_803752C _08038050: .4byte gBattleTypeFlags -_08038054: .4byte gUnknown_02023A60 +_08038054: .4byte gBattleBufferA _08038058: - ldr r2, _08038074 @ =gUnknown_02024A64 + ldr r2, _08038074 @ =gBattleExecBuffer ldr r1, _08038078 @ =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -4073,7 +4073,7 @@ _0803806A: pop {r0} bx r0 .align 2, 0 -_08038074: .4byte gUnknown_02024A64 +_08038074: .4byte gBattleExecBuffer _08038078: .4byte gBitTable thumb_func_end dp01_tbl4_exec_completed diff --git a/asm/battle_anim_807B69C.s b/asm/battle_anim_807B69C.s index 8d0b355e5..e34f47f1c 100644 --- a/asm/battle_anim_807B69C.s +++ b/asm/battle_anim_807B69C.s @@ -17,7 +17,7 @@ unref_sub_807B69C: @ 807B69C lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _0807B740 @ =gUnknown_02024BE0 + ldr r0, _0807B740 @ =gObjectBankIDs adds r0, r4, r0 ldrb r6, [r0] ldr r0, _0807B744 @ =sub_807B7E0 @@ -89,7 +89,7 @@ _0807B734: bls _0807B6F0 b _0807B7BC .align 2, 0 -_0807B740: .4byte gUnknown_02024BE0 +_0807B740: .4byte gObjectBankIDs _0807B744: .4byte sub_807B7E0 _0807B748: .4byte gBattleAnimPicTable + (136 * 8) _0807B74C: .4byte gBattleAnimPaletteTable + (136 * 8) diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s index be80cc44f..fd5b9fb88 100644 --- a/asm/battle_anim_80CA710.s +++ b/asm/battle_anim_80CA710.s @@ -25,7 +25,7 @@ sub_80CA710: @ 80CA710 strh r0, [r4, 0x30] ldr r0, _080CA748 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CA74C @@ -413,7 +413,7 @@ sub_80CAA14: @ 80CAA14 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CAA60 @@ -524,7 +524,7 @@ sub_80CAB18: @ 80CAB18 bl sub_80787B0 ldr r0, _080CAB78 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CAB38 @@ -772,7 +772,7 @@ _080CAD06: _080CAD0E: ldr r0, _080CAD2C @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1089,7 +1089,7 @@ sub_80CAF6C: @ 80CAF6C adds r4, r0, 0 ldr r0, _080CAF8C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CAF90 @@ -1144,7 +1144,7 @@ sub_80CAFD0: @ 80CAFD0 bl sub_80787B0 ldr r0, _080CB024 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CAFF0 @@ -1206,11 +1206,11 @@ _080CB050: bl sub_80786EC ldr r0, _080CB084 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r0, _080CB07C @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -1673,7 +1673,7 @@ sub_80CB3A8: @ 80CB3A8 strh r1, [r5, 0x24] ldr r0, _080CB430 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CB3F2 @@ -1802,7 +1802,7 @@ sub_80CB4CC: @ 80CB4CC _080CB4DE: ldr r6, _080CB530 @ =gBattleAnimEnemyMonIndex ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CB4F6 @@ -2494,7 +2494,7 @@ sub_80CBA28: @ 80CBA28 lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -3030,7 +3030,7 @@ sub_80CBDF4: @ 80CBDF4 bl sub_807A100 strh r0, [r5, 0x1E] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 movs r2, 0x1 @@ -3842,7 +3842,7 @@ _080CC490: _080CC492: ldrb r6, [r0] adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CC4BC @@ -4319,7 +4319,7 @@ sub_80CC82C: @ 80CC82C adds r4, r0, 0 ldr r0, _080CC84C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CC854 @@ -4364,7 +4364,7 @@ sub_80CC884: @ 80CC884 adds r5, r0, 0 ldr r0, _080CC8BC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CC89E @@ -4448,7 +4448,7 @@ sub_80CC914: @ 80CC914 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CC948 @@ -4609,7 +4609,7 @@ _080CCA72: strh r4, [r6, 0x22] ldr r0, _080CCAA4 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CCA8A @@ -4863,7 +4863,7 @@ sub_80CCC50: @ 80CCC50 strh r0, [r5, 0x2E] ldr r0, _080CCC74 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CCC78 @@ -4996,7 +4996,7 @@ _080CCD3A: adds r0, r4 strh r0, [r5, 0x22] ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CCD78 @@ -5659,7 +5659,7 @@ sub_80CD274: @ 80CD274 bl sub_8078650 ldr r0, _080CD2A0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CD2A8 @@ -5751,7 +5751,7 @@ sub_80CD328: @ 80CD328 bl sub_8078650 ldr r0, _080CD358 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CD360 @@ -6378,7 +6378,7 @@ sub_80CD7CC: @ 80CD7CC strh r0, [r4, 0x2E] ldr r5, _080CD80C @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x2 negs r2, r2 @@ -6390,7 +6390,7 @@ _080CD7EA: strh r1, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] - ldr r1, _080CD810 @ =gUnknown_02024BE0 + ldr r1, _080CD810 @ =gObjectBankIDs ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -6405,7 +6405,7 @@ _080CD7EA: bx r0 .align 2, 0 _080CD80C: .4byte gBattleAnimPlayerMonIndex -_080CD810: .4byte gUnknown_02024BE0 +_080CD810: .4byte gObjectBankIDs _080CD814: .4byte sub_80CD81C _080CD818: .4byte sub_8078458 thumb_func_end sub_80CD7CC @@ -6418,7 +6418,7 @@ sub_80CD81C: @ 80CD81C ldrsh r6, [r5, r0] cmp r6, 0 bne _080CD858 - ldr r1, _080CD898 @ =gUnknown_02024BE0 + ldr r1, _080CD898 @ =gObjectBankIDs ldr r4, _080CD89C @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] adds r0, r1 @@ -6427,7 +6427,7 @@ sub_80CD81C: @ 80CD81C movs r1, 0 bl sub_8078E70 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x3A] @@ -6474,7 +6474,7 @@ _080CD892: pop {r0} bx r0 .align 2, 0 -_080CD898: .4byte gUnknown_02024BE0 +_080CD898: .4byte gObjectBankIDs _080CD89C: .4byte gBattleAnimPlayerMonIndex _080CD8A0: .4byte 0xfffffd00 _080CD8A4: .4byte sub_80CD9B8 @@ -6488,7 +6488,7 @@ sub_80CD8A8: @ 80CD8A8 strh r0, [r4, 0x2E] ldr r5, _080CD8E8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0x3 cmp r0, 0 @@ -6500,7 +6500,7 @@ _080CD8C6: strh r1, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] - ldr r1, _080CD8EC @ =gUnknown_02024BE0 + ldr r1, _080CD8EC @ =gObjectBankIDs ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -6515,7 +6515,7 @@ _080CD8C6: bx r0 .align 2, 0 _080CD8E8: .4byte gBattleAnimPlayerMonIndex -_080CD8EC: .4byte gUnknown_02024BE0 +_080CD8EC: .4byte gObjectBankIDs _080CD8F0: .4byte sub_80CD9B8 _080CD8F4: .4byte sub_8078458 thumb_func_end sub_80CD8A8 @@ -6550,19 +6550,19 @@ sub_80CD91C: @ 80CD91C ldrsh r0, [r5, r1] cmp r0, 0 bne _080CD96C - ldr r1, _080CD958 @ =gUnknown_02024BE0 + ldr r1, _080CD958 @ =gObjectBankIDs ldr r4, _080CD95C @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] strh r0, [r5, 0x34] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x3A] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CD960 @@ -6573,7 +6573,7 @@ sub_80CD91C: @ 80CD91C lsls r0, 4 b _080CD96A .align 2, 0 -_080CD958: .4byte gUnknown_02024BE0 +_080CD958: .4byte gObjectBankIDs _080CD95C: .4byte gBattleAnimPlayerMonIndex _080CD960: movs r0, 0x80 @@ -6659,14 +6659,14 @@ _080CD9EA: b _080CDAC2 _080CD9F0: strh r5, [r4, 0x30] - ldr r1, _080CDA74 @ =gUnknown_02024BE0 + ldr r1, _080CDA74 @ =gObjectBankIDs ldr r2, _080CDA78 @ =gBattleAnimPlayerMonIndex ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] strh r0, [r4, 0x32] ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x34] @@ -6723,7 +6723,7 @@ _080CDA2E: strh r0, [r4, 0x2E] b _080CDAC2 .align 2, 0 -_080CDA74: .4byte gUnknown_02024BE0 +_080CDA74: .4byte gObjectBankIDs _080CDA78: .4byte gBattleAnimPlayerMonIndex _080CDA7C: .4byte 0xfffffe00 _080CDA80: @@ -6772,7 +6772,7 @@ sub_80CDAC8: @ 80CDAC8 adds r0, r6 lsls r0, 3 adds r5, r0, r1 - ldr r1, _080CDB10 @ =gUnknown_02024BE0 + ldr r1, _080CDB10 @ =gObjectBankIDs ldr r2, _080CDB14 @ =gBattleAnimPlayerMonIndex ldrb r0, [r2] adds r0, r1 @@ -6780,7 +6780,7 @@ sub_80CDAC8: @ 80CDAC8 movs r4, 0 strh r0, [r5, 0x8] ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 strh r2, [r5, 0xA] @@ -6797,7 +6797,7 @@ sub_80CDAC8: @ 80CDAC8 b _080CDB56 .align 2, 0 _080CDB0C: .4byte gTasks -_080CDB10: .4byte gUnknown_02024BE0 +_080CDB10: .4byte gObjectBankIDs _080CDB14: .4byte gBattleAnimPlayerMonIndex _080CDB18: .4byte gBattleAnimArgs _080CDB1C: @@ -7785,19 +7785,19 @@ unref_sub_80CE260: @ 80CE260 lsls r0, 24 lsrs r7, r0, 24 movs r4, 0 - ldr r0, _080CE2C8 @ =gUnknown_02024A68 + ldr r0, _080CE2C8 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bcs _080CE2BC ldr r6, _080CE2CC @ =gBattleAnimArgs - ldr r5, _080CE2D0 @ =gUnknown_03004340 + ldr r5, _080CE2D0 @ =gHealthboxIDs _080CE274: movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0x1 bne _080CE290 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CE290 @@ -7810,7 +7810,7 @@ _080CE290: cmp r0, 0x1 bne _080CE2AE adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -7822,7 +7822,7 @@ _080CE2AE: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080CE2C8 @ =gUnknown_02024A68 + ldr r0, _080CE2C8 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bcc _080CE274 @@ -7833,9 +7833,9 @@ _080CE2BC: pop {r0} bx r0 .align 2, 0 -_080CE2C8: .4byte gUnknown_02024A68 +_080CE2C8: .4byte gNoOfAllBanks _080CE2CC: .4byte gBattleAnimArgs -_080CE2D0: .4byte gUnknown_03004340 +_080CE2D0: .4byte gHealthboxIDs thumb_func_end unref_sub_80CE260 thumb_func_start unref_sub_80CE2D4 @@ -7846,7 +7846,7 @@ unref_sub_80CE2D4: @ 80CE2D4 movs r4, 0 b _080CE2EE _080CE2DE: - ldr r0, _080CE304 @ =gUnknown_03004340 + ldr r0, _080CE304 @ =gHealthboxIDs adds r0, r4, r0 ldrb r0, [r0] bl sub_8043DFC @@ -7854,7 +7854,7 @@ _080CE2DE: lsls r0, 24 lsrs r4, r0, 24 _080CE2EE: - ldr r0, _080CE308 @ =gUnknown_02024A68 + ldr r0, _080CE308 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bcc _080CE2DE @@ -7864,8 +7864,8 @@ _080CE2EE: pop {r0} bx r0 .align 2, 0 -_080CE304: .4byte gUnknown_03004340 -_080CE308: .4byte gUnknown_02024A68 +_080CE304: .4byte gHealthboxIDs +_080CE308: .4byte gNoOfAllBanks thumb_func_end unref_sub_80CE2D4 thumb_func_start sub_80CE30C @@ -8389,7 +8389,7 @@ _080CE6FC: .4byte 0xffffec00 _080CE700: ldr r0, _080CE740 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CE748 @@ -8617,7 +8617,7 @@ _080CE8C6: str r0, [r6] ldr r0, _080CE8EC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8666,7 +8666,7 @@ sub_80CE910: @ 80CE910 bne _080CE968 ldr r0, _080CE948 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -9167,7 +9167,7 @@ sub_80CECE8: @ 80CECE8 adds r6, r0, 0 ldr r7, _080CED6C @ =gBattleAnimPlayerMonIndex ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -9471,7 +9471,7 @@ sub_80CEF44: @ 80CEF44 lsls r0, 24 lsrs r5, r0, 24 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CEF64 @@ -9532,7 +9532,7 @@ _080CEFBA: adds r1, r5, 0 bl sub_80CEF44 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 negs r1, r0 @@ -9821,7 +9821,7 @@ _080CF1E6: adds r1, r5, 0 bl sub_80CEF44 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CF20C @@ -10088,13 +10088,13 @@ sub_80CF3C4: @ 80CF3C4 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r1, _080CF410 @ =gUnknown_02024BE0 + ldr r1, _080CF410 @ =gObjectBankIDs ldr r0, _080CF414 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] adds r0, r1 ldrb r6, [r0] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CF41C @@ -10107,7 +10107,7 @@ sub_80CF3C4: @ 80CF3C4 b _080CF426 .align 2, 0 _080CF40C: .4byte gBattleAnimPlayerMonIndex -_080CF410: .4byte gUnknown_02024BE0 +_080CF410: .4byte gObjectBankIDs _080CF414: .4byte gBattleAnimEnemyMonIndex _080CF418: .4byte gBattleAnimArgs _080CF41C: @@ -10216,7 +10216,7 @@ sub_80CF4D8: @ 80CF4D8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _080CF504 @ =gUnknown_02024BE0 + ldr r1, _080CF504 @ =gObjectBankIDs ldr r0, _080CF508 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -10234,7 +10234,7 @@ sub_80CF4D8: @ 80CF4D8 pop {r0} bx r0 .align 2, 0 -_080CF504: .4byte gUnknown_02024BE0 +_080CF504: .4byte gObjectBankIDs _080CF508: .4byte gBattleAnimPlayerMonIndex _080CF50C: .4byte gTasks _080CF510: .4byte sub_80CF514 @@ -10245,12 +10245,12 @@ sub_80CF514: @ 80CF514 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080CF544 @ =gUnknown_02024BE0 + ldr r1, _080CF544 @ =gObjectBankIDs ldr r0, _080CF548 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r1, r0, r1 ldrb r4, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CF550 @@ -10266,7 +10266,7 @@ sub_80CF514: @ 80CF514 adds r6, r2, 0 b _080CF55E .align 2, 0 -_080CF544: .4byte gUnknown_02024BE0 +_080CF544: .4byte gObjectBankIDs _080CF548: .4byte gBattleAnimPlayerMonIndex _080CF54C: .4byte gTasks _080CF550: @@ -10384,7 +10384,7 @@ sub_80CF610: @ 80CF610 strh r0, [r4, 0x22] ldr r0, _080CF65C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CF660 @@ -10491,7 +10491,7 @@ _080CF6FC: .4byte gBattleAnimArgs _080CF700: ldr r0, _080CF7C8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CF722 @@ -11067,7 +11067,7 @@ _080CFB68: strh r0, [r3, 0x4] b _080CFBCA _080CFB70: - ldr r1, _080CFBB4 @ =gUnknown_02024A72 + ldr r1, _080CFBB4 @ =gBanksBySide ldr r0, _080CFBB8 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] adds r0, r1 @@ -11101,7 +11101,7 @@ _080CFB70: ands r0, r1 b _080CFBC8 .align 2, 0 -_080CFBB4: .4byte gUnknown_02024A72 +_080CFBB4: .4byte gBanksBySide _080CFBB8: .4byte gBattleAnimEnemyMonIndex _080CFBBC: .4byte gTasks _080CFBC0: .4byte gBattleAnimArgs @@ -11484,7 +11484,7 @@ sub_80CFE9C: @ 80CFE9C lsrs r7, r0, 16 ldr r0, _080CFF44 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080CFEE0 @@ -11570,7 +11570,7 @@ sub_80CFF68: @ 80CFF68 strh r0, [r4, 0x24] ldr r0, _080CFFD4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080CFF8C @@ -11783,7 +11783,7 @@ sub_80D0118: @ 80D0118 bl sub_80787B0 ldr r0, _080D0168 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D0136 @@ -12823,7 +12823,7 @@ sub_80D0930: @ 80D0930 adds r4, r0, 0 ldr r5, _080D0960 @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D0964 @@ -12902,7 +12902,7 @@ _080D09DC: _080D09DE: ldrb r5, [r0] adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13052,7 +13052,7 @@ sub_80D0AB8: @ 80D0AB8 strh r0, [r4, 0x1A] ldr r0, _080D0B34 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13278,7 +13278,7 @@ sub_80D0C88: @ 80D0C88 bl sub_807A100 strh r0, [r5, 0x26] ldrb r0, [r4] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13753,7 +13753,7 @@ _080D1048: lsls r0, 24 lsrs r4, r0, 24 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D1074 @@ -13862,7 +13862,7 @@ _080D111C: str r3, [sp, 0x4] _080D1124: adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D1180 @@ -13886,21 +13886,21 @@ _080D1124: cmp r0, 0 beq _080D1170 ldr r2, _080D1168 @ =gSprites - ldr r0, _080D116C @ =gUnknown_02024BE0 + ldr r0, _080D116C @ =gObjectBankIDs adds r0, r4, r0 b _080D120A .align 2, 0 _080D1164: .4byte gBattleAnimArgs _080D1168: .4byte gSprites -_080D116C: .4byte gUnknown_02024BE0 +_080D116C: .4byte gObjectBankIDs _080D1170: ldr r2, _080D1178 @ =gSprites - ldr r0, _080D117C @ =gUnknown_02024BE0 + ldr r0, _080D117C @ =gObjectBankIDs add r0, r8 b _080D120A .align 2, 0 _080D1178: .4byte gSprites -_080D117C: .4byte gUnknown_02024BE0 +_080D117C: .4byte gObjectBankIDs _080D1180: adds r0, r7, 0 mov r1, r10 @@ -13930,7 +13930,7 @@ _080D1180: cmp r0, 0 beq _080D1204 ldr r3, _080D11F8 @ =gSprites - ldr r2, _080D11FC @ =gUnknown_02024BE0 + ldr r2, _080D11FC @ =gObjectBankIDs adds r0, r7, r2 ldrb r1, [r0] lsls r0, r1, 4 @@ -13959,13 +13959,13 @@ _080D11EC: .4byte gBattleAnimArgs _080D11F0: .4byte gMain _080D11F4: .4byte 0x0000043d _080D11F8: .4byte gSprites -_080D11FC: .4byte gUnknown_02024BE0 +_080D11FC: .4byte gObjectBankIDs _080D1200: adds r0, r6, 0 b _080D1214 _080D1204: ldr r2, _080D1268 @ =gSprites - ldr r0, _080D126C @ =gUnknown_02024BE0 + ldr r0, _080D126C @ =gObjectBankIDs adds r0, r7, r0 _080D120A: ldrb r1, [r0] @@ -14015,7 +14015,7 @@ _080D121A: b _080D129C .align 2, 0 _080D1268: .4byte gSprites -_080D126C: .4byte gUnknown_02024BE0 +_080D126C: .4byte gObjectBankIDs _080D1270: .4byte gBattleAnimArgs _080D1274: .4byte gMain _080D1278: .4byte 0x0000043d @@ -14036,7 +14036,7 @@ _080D127C: strh r0, [r3, 0x2] _080D129C: mov r0, r8 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D12C0 @@ -14141,7 +14141,7 @@ sub_80D1368: @ 80D1368 bl sub_80787B0 ldr r0, _080D139C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0xA0 cmp r0, 0 @@ -14186,7 +14186,7 @@ sub_80D13AC: @ 80D13AC strh r2, [r4, 0x2E] ldr r0, _080D1418 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0xA0 cmp r0, 0 @@ -14533,7 +14533,7 @@ sub_80D1638: @ 80D1638 strh r0, [r4, 0x20] ldr r0, _080D1670 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D1678 @@ -15295,7 +15295,7 @@ sub_80D1C08: @ 80D1C08 bl sub_80787B0 ldr r6, _080D1C70 @ =gBattleAnimPlayerMonIndex ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D1C28 @@ -16332,7 +16332,7 @@ _080D2458: .4byte gBattleAnimBackgroundTilemap_ScaryFaceContest _080D245C: ldr r0, _080D2478 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -17534,7 +17534,7 @@ _080D2D84: _080D2D86: ldrb r6, [r0] adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -17950,7 +17950,7 @@ sub_80D30AC: @ 80D30AC lsls r0, 24 lsrs r0, 24 ldr r3, _080D30C8 @ =gBattleAnimArgs - ldr r1, _080D30CC @ =gUnknown_0202F7B4 + ldr r1, _080D30CC @ =gDisableStructMoveAnim ldr r1, [r1] ldrb r2, [r1, 0x10] movs r1, 0x1 @@ -17961,7 +17961,7 @@ sub_80D30AC: @ 80D30AC bx r0 .align 2, 0 _080D30C8: .4byte gBattleAnimArgs -_080D30CC: .4byte gUnknown_0202F7B4 +_080D30CC: .4byte gDisableStructMoveAnim thumb_func_end sub_80D30AC thumb_func_start update_fury_cutter_counter_copy @@ -17970,7 +17970,7 @@ update_fury_cutter_counter_copy: @ 80D30D0 lsls r0, 24 lsrs r0, 24 ldr r2, _080D30E8 @ =gBattleAnimArgs - ldr r1, _080D30EC @ =gUnknown_0202F7B4 + ldr r1, _080D30EC @ =gDisableStructMoveAnim ldr r1, [r1] ldrb r1, [r1, 0x10] strh r1, [r2, 0xE] @@ -17979,7 +17979,7 @@ update_fury_cutter_counter_copy: @ 80D30D0 bx r0 .align 2, 0 _080D30E8: .4byte gBattleAnimArgs -_080D30EC: .4byte gUnknown_0202F7B4 +_080D30EC: .4byte gDisableStructMoveAnim thumb_func_end update_fury_cutter_counter_copy thumb_func_start sub_80D30F0 @@ -18101,7 +18101,7 @@ sub_80D31C8: @ 80D31C8 adds r6, r0, 0 ldr r5, _080D31F0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D31F8 @@ -18144,7 +18144,7 @@ _080D320A: strb r0, [r2] ldr r0, _080D32D4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D3240 @@ -18341,7 +18341,7 @@ sub_80D33B4: @ 80D33B4 bl sub_80787B0 ldr r0, _080D33DC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D33E4 @@ -18735,7 +18735,7 @@ sub_80D3698: @ 80D3698 cmp r0, 0 bne _080D36F2 ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D36EC @@ -18789,11 +18789,11 @@ sub_80D3728: @ 80D3728 adds r6, r0, 0 ldr r5, _080D37E8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r0, _080D37EC @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -18804,12 +18804,12 @@ sub_80D3728: @ 80D3728 negs r0, r0 strh r0, [r4] ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 beq _080D376A ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -18841,7 +18841,7 @@ _080D3790: bl sub_80787B0 ldr r0, _080D37E8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D37AA @@ -19082,7 +19082,7 @@ _080D3920: strb r0, [r2] ldr r0, _080D39A0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -19205,7 +19205,7 @@ _080D3A90: .4byte gUnknown_030041B4 _080D3A94: ldr r0, _080D3AC4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 @@ -20376,11 +20376,11 @@ sub_80D4394: @ 80D4394 push {r4,r5,lr} ldr r4, _080D43B8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D43C8 - ldr r1, _080D43BC @ =gUnknown_02024A6A + ldr r1, _080D43BC @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -20391,13 +20391,13 @@ sub_80D4394: @ 80D4394 b _080D43D8 .align 2, 0 _080D43B8: .4byte gBattleAnimPlayerMonIndex -_080D43BC: .4byte gUnknown_02024A6A +_080D43BC: .4byte gBattlePartyID _080D43C0: .4byte gPlayerParty _080D43C4: adds r0, r2, 0 b _080D440A _080D43C8: - ldr r1, _080D4410 @ =gUnknown_02024A6A + ldr r1, _080D4410 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -20435,7 +20435,7 @@ _080D440A: pop {r1} bx r1 .align 2, 0 -_080D4410: .4byte gUnknown_02024A6A +_080D4410: .4byte gBattlePartyID _080D4414: .4byte gEnemyParty thumb_func_end sub_80D4394 @@ -20683,7 +20683,7 @@ sub_80D45D8: @ 80D45D8 strh r0, [r4, 0xA] ldr r0, _080D460C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D4610 @@ -21094,7 +21094,7 @@ sub_80D48F4: @ 80D48F4 lsrs r0, 24 strh r0, [r5, 0x10] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -21901,7 +21901,7 @@ sub_80D4F5C: @ 80D4F5C bl sub_8078650 ldr r0, _080D4F90 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D4F98 @@ -21957,7 +21957,7 @@ sub_80D4FCC: @ 80D4FCC adds r4, r0, 0 ldr r0, _080D4FF8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D5000 @@ -22049,7 +22049,7 @@ sub_80D5074: @ 80D5074 bl sub_8078650 ldr r0, _080D5098 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D50A0 @@ -22208,24 +22208,24 @@ sub_80D51A8: @ 80D51A8 adds r6, r0, 0 ldr r5, _080D5200 @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r0, _080D5204 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _080D51EE movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldrb r1, [r5] lsls r0, 24 lsrs r0, 24 cmp r1, r0 beq _080D51E6 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldrb r1, [r5] lsls r0, 24 lsrs r0, 24 @@ -22597,7 +22597,7 @@ sub_80D5470: @ 80D5470 strh r0, [r4, 0x10] ldr r0, _080D54D8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x12] @@ -23023,7 +23023,7 @@ sub_80D57C4: @ 80D57C4 ldrh r4, [r0, 0x20] ldr r0, _080D5818 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D581C @@ -23205,7 +23205,7 @@ sub_80D5940: @ 80D5940 lsrs r4, r0, 16 ldr r0, _080D597C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D5980 @@ -23468,7 +23468,7 @@ _080D5B28: strh r0, [r5, 0x3C] ldr r0, _080D5B54 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D5B58 @@ -23503,7 +23503,7 @@ _080D5B80: strh r0, [r5, 0x30] ldr r0, _080D5BA0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D5BA4 @@ -23815,7 +23815,7 @@ sub_80D5DDC: @ 80D5DDC adds r4, r1, r0 ldr r0, _080D5E40 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -24221,7 +24221,7 @@ _080D60EA: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - ldr r1, _080D6114 @ =gUnknown_02024BE0 + ldr r1, _080D6114 @ =gObjectBankIDs ldr r0, _080D6118 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] adds r0, r1 @@ -24237,7 +24237,7 @@ _080D60EA: .align 2, 0 _080D610C: .4byte gTasks _080D6110: .4byte gBattleAnimArgs -_080D6114: .4byte gUnknown_02024BE0 +_080D6114: .4byte gObjectBankIDs _080D6118: .4byte gBattleAnimEnemyMonIndex _080D611C: .4byte gUnknown_083D9794 _080D6120: @@ -24333,7 +24333,7 @@ sub_80D61C8: @ 80D61C8 adds r4, r0, 0 ldr r0, _080D61E8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D61F0 @@ -24391,7 +24391,7 @@ sub_80D6234: @ 80D6234 adds r4, r0, 0 ldr r0, _080D6254 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D625C @@ -24457,7 +24457,7 @@ sub_80D6294: @ 80D6294 strh r0, [r5, 0x22] ldr r0, _080D62DC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D62E4 @@ -24868,7 +24868,7 @@ sub_80D65DC: @ 80D65DC beq _080D65FE ldr r0, _080D664C @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D6606 @@ -24946,7 +24946,7 @@ _080D667E: cmp r0, 0 beq _080D669C adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D66A4 @@ -25900,7 +25900,7 @@ sub_80D6DD8: @ 80D6DD8 movs r0, 0x10 strh r0, [r5, 0x3C] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -26019,7 +26019,7 @@ _080D6ED0: lsrs r0, 24 strh r0, [r5, 0x24] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D6F0C @@ -26195,7 +26195,7 @@ _080D703A: _080D703C: ldr r4, _080D707C @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -27394,7 +27394,7 @@ sub_80D792C: @ 80D792C strh r0, [r4, 0x32] ldr r0, _080D7964 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D796C @@ -27468,7 +27468,7 @@ _080D79D0: bl sub_807A3FC ldr r0, _080D7A1C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D79F6 @@ -27582,7 +27582,7 @@ _080D7AB4: _080D7AC6: ldr r0, _080D7AE4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D7AEC @@ -27708,7 +27708,7 @@ sub_80D7BA0: @ 80D7BA0 strh r0, [r4, 0x2E] ldr r0, _080D7BFC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, _080D7C00 @ =0x0000ffec cmp r0, 0 @@ -27746,7 +27746,7 @@ sub_80D7C08: @ 80D7C08 adds r4, r0, 0 ldr r0, _080D7C5C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, _080D7C60 @ =0x0000ffec cmp r0, 0 @@ -27895,7 +27895,7 @@ _080D7D20: _080D7D32: ldr r0, _080D7D54 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D7D5C @@ -28098,7 +28098,7 @@ _080D7EAC: bl sub_807A3FC ldr r0, _080D7EF0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D7ED2 @@ -28167,7 +28167,7 @@ _080D7F34: movs r1, 0 bl sub_807A3FC ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D7F60 @@ -28213,7 +28213,7 @@ _080D7F92: movs r1, 0 bl sub_807A3FC ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D7FBC @@ -28260,7 +28260,7 @@ _080D7FF6: strh r0, [r5, 0x3A] ldr r0, _080D803C @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D800C @@ -29147,7 +29147,7 @@ sub_80D8700: @ 80D8700 lsls r0, 8 strh r0, [r5, 0x3C] _080D8734: - ldr r3, _080D87F4 @ =gUnknown_02024A72 + ldr r3, _080D87F4 @ =gBanksBySide ldrb r0, [r7] adds r0, r3 ldrb r1, [r0] @@ -29238,7 +29238,7 @@ _080D8794: _080D87E8: .4byte gBattleAnimArgs _080D87EC: .4byte gBattleAnimPlayerMonIndex _080D87F0: .4byte gBattleAnimEnemyMonIndex -_080D87F4: .4byte gUnknown_02024A72 +_080D87F4: .4byte gBanksBySide _080D87F8: .4byte gSprites _080D87FC: ldrh r0, [r6, 0x2] @@ -29384,7 +29384,7 @@ _080D88D6: ands r0, r1 cmp r0, 0 beq _080D8938 - ldr r1, _080D8934 @ =gUnknown_02024A72 + ldr r1, _080D8934 @ =gBanksBySide ldrb r0, [r6] adds r0, r1 ldrb r1, [r0] @@ -29399,7 +29399,7 @@ _080D88D6: _080D8928: .4byte gBattleAnimEnemyMonIndex _080D892C: .4byte gMain _080D8930: .4byte 0x0000043d -_080D8934: .4byte gUnknown_02024A72 +_080D8934: .4byte gBanksBySide _080D8938: strh r5, [r4, 0x38] _080D893A: @@ -29544,7 +29544,7 @@ _080D8A12: ands r0, r1 cmp r0, 0 beq _080D8A78 - ldr r1, _080D8A70 @ =gUnknown_02024A72 + ldr r1, _080D8A70 @ =gBanksBySide ldr r0, _080D8A74 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] adds r0, r1 @@ -29559,7 +29559,7 @@ _080D8A12: .align 2, 0 _080D8A68: .4byte gMain _080D8A6C: .4byte 0x0000043d -_080D8A70: .4byte gUnknown_02024A72 +_080D8A70: .4byte gBanksBySide _080D8A74: .4byte gBattleAnimEnemyMonIndex _080D8A78: ldr r0, _080D8A90 @ =0x0000fff0 @@ -29760,7 +29760,7 @@ sub_80D8BA8: @ 80D8BA8 ldrh r0, [r4, 0x2] lsls r0, 20 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 adds r0, r5, 0 @@ -30067,7 +30067,7 @@ _080D8E48: .4byte gTasks unc_080B06FC: @ 80D8E4C push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _080D8ECC @ =gUnknown_0202F7B4 + ldr r0, _080D8ECC @ =gDisableStructMoveAnim ldr r0, [r0] ldrb r1, [r0, 0x11] lsrs r0, r1, 4 @@ -30091,7 +30091,7 @@ _080D8E6A: strh r0, [r5, 0x2E] ldr r0, _080D8ED4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D8E92 @@ -30126,7 +30126,7 @@ _080D8E92: pop {r0} bx r0 .align 2, 0 -_080D8ECC: .4byte gUnknown_0202F7B4 +_080D8ECC: .4byte gDisableStructMoveAnim _080D8ED0: .4byte gBattleAnimArgs _080D8ED4: .4byte gBattleAnimPlayerMonIndex _080D8ED8: .4byte gBattleAnimEnemyMonIndex @@ -30260,7 +30260,7 @@ sub_80D8FC0: @ 80D8FC0 ldrb r3, [r1] lsls r3, 1 adds r3, r1 - ldr r1, _080D8FEC @ =gUnknown_0202F7B4 + ldr r1, _080D8FEC @ =gDisableStructMoveAnim ldr r1, [r1] ldrb r1, [r1, 0x11] lsrs r2, r1, 4 @@ -30274,7 +30274,7 @@ sub_80D8FC0: @ 80D8FC0 bx r0 .align 2, 0 _080D8FE8: .4byte gBattleAnimArgs -_080D8FEC: .4byte gUnknown_0202F7B4 +_080D8FEC: .4byte gDisableStructMoveAnim thumb_func_end sub_80D8FC0 thumb_func_start unc_080B08A0 @@ -30317,7 +30317,7 @@ sub_80D902C: @ 80D902C bne _080D9054 ldr r0, _080D9074 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D9054 @@ -30514,7 +30514,7 @@ _080D91C4: negs r0, r0 lsrs r4, r0, 16 _080D91D6: - ldr r0, _080D9264 @ =gUnknown_02024A72 + ldr r0, _080D9264 @ =gBanksBySide add r0, r8 ldrb r1, [r0] adds r0, r7, 0 @@ -30585,7 +30585,7 @@ _080D9250: bx r0 .align 2, 0 _080D9260: .4byte gBattleAnimEnemyMonIndex -_080D9264: .4byte gUnknown_02024A72 +_080D9264: .4byte gBanksBySide _080D9268: .4byte 0xfff00000 _080D926C: .4byte gBattleAnimSpriteTemplate_83DB4A8 _080D9270: .4byte gSprites @@ -30739,7 +30739,7 @@ sub_80D9378: @ 80D9378 cmp r0, r1 bne _080D93A4 ldrb r0, [r2] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -30755,7 +30755,7 @@ _080D93A4: bl sub_8078764 ldr r0, _080D93F4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D93C2 @@ -31309,7 +31309,7 @@ sub_80D97CC: @ 80D97CC ldrsh r0, [r0, r1] cmp r0, 0 bne _080D9828 - ldr r4, _080D981C @ =gPlayerMonIndex + ldr r4, _080D981C @ =gBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_8077ABC @@ -31338,7 +31338,7 @@ sub_80D97CC: @ 80D97CC b _080D9844 .align 2, 0 _080D9818: .4byte gBattleAnimArgs -_080D981C: .4byte gPlayerMonIndex +_080D981C: .4byte gBankAttacker _080D9820: .4byte gBattleAnimPlayerMonIndex _080D9824: .4byte gBattleAnimEnemyMonIndex _080D9828: @@ -31614,7 +31614,7 @@ sub_80D9A38: @ 80D9A38 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D9A7C - ldr r4, _080D9A70 @ =gPlayerMonIndex + ldr r4, _080D9A70 @ =gBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_8077ABC @@ -31633,7 +31633,7 @@ sub_80D9A38: @ 80D9A38 b _080D9A82 .align 2, 0 _080D9A6C: .4byte gBattleAnimArgs -_080D9A70: .4byte gPlayerMonIndex +_080D9A70: .4byte gBankAttacker _080D9A74: .4byte gBattleAnimEnemyMonIndex _080D9A78: .4byte gBattleAnimPlayerMonIndex _080D9A7C: @@ -31669,7 +31669,7 @@ _080D9AB4: .4byte gBattleAnimPlayerMonIndex _080D9AB8: .4byte gBattleAnimEnemyMonIndex _080D9ABC: adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D9ADC @@ -31768,7 +31768,7 @@ sub_80D9B48: @ 80D9B48 ldr r0, _080D9BCC @ =gUnknown_0202F7C4 ldrb r6, [r0] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D9B92 @@ -31839,7 +31839,7 @@ _080D9BF8: _080D9C0C: ldr r0, _080D9C34 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D9C22 @@ -31954,7 +31954,7 @@ _080D9CDE: strh r0, [r4, 0x1C] ldr r0, _080D9D0C @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D9D14 @@ -32106,7 +32106,7 @@ _080D9E08: bl sub_807A3FC ldr r0, _080D9E6C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D9E36 @@ -32239,7 +32239,7 @@ sub_80D9F14: @ 80D9F14 bl sub_807A3FC ldr r0, _080D9F78 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D9F40 @@ -32306,7 +32306,7 @@ _080D9FA4: bl sub_807A3FC ldr r0, _080D9FE8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D9FCA @@ -32540,7 +32540,7 @@ sub_80DA16C: @ 80DA16C bl sub_80787B0 ldr r0, _080DA1D8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DA18C @@ -32613,7 +32613,7 @@ sub_80DA208: @ 80DA208 adds r5, r0, 0 ldr r4, _080DA2A4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DA234 @@ -32804,7 +32804,7 @@ sub_80DA38C: @ 80DA38C adds r5, r0, 0 ldr r0, _080DA3B4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DA3BC @@ -32990,7 +32990,7 @@ _080DA500: _080DA502: ldrb r6, [r0] adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DA518 @@ -34136,7 +34136,7 @@ sub_80DAD84: @ 80DAD84 ands r0, r1 cmp r0, 0 beq _080DAE44 - ldr r0, _080DADD8 @ =gUnknown_02024A72 + ldr r0, _080DADD8 @ =gBanksBySide ldr r1, _080DADDC @ =gBattleAnimEnemyMonIndex ldrb r2, [r1] adds r0, r2, r0 @@ -34157,7 +34157,7 @@ sub_80DAD84: @ 80DAD84 _080DADCC: .4byte gBattleAnimArgs _080DADD0: .4byte gMain _080DADD4: .4byte 0x0000043d -_080DADD8: .4byte gUnknown_02024A72 +_080DADD8: .4byte gBanksBySide _080DADDC: .4byte gBattleAnimEnemyMonIndex _080DADE0: adds r0, r2, 0 @@ -34465,7 +34465,7 @@ _080DB024: bne _080DB03C ldr r0, _080DB090 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DB052 @@ -34476,7 +34476,7 @@ _080DB03C: bne _080DB058 ldr r0, _080DB094 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DB058 @@ -35423,7 +35423,7 @@ sub_80DB74C: @ 80DB74C adds r6, r0, 0 ldr r0, _080DB804 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DB768 @@ -35449,12 +35449,12 @@ _080DB77E: cmp r0, 0 bne _080DB7DA movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 adds r7, r4, 0 adds r0, r4, 0 - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -35495,7 +35495,7 @@ _080DB7DA: beq _080DB810 ldr r0, _080DB804 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DB808 @@ -35513,7 +35513,7 @@ _080DB808: _080DB810: ldr r5, _080DB880 @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DB826 @@ -35684,7 +35684,7 @@ sub_80DB92C: @ 80DB92C cmp r0, 0 bne _080DB9BC movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 @@ -35694,7 +35694,7 @@ sub_80DB92C: @ 80DB92C cmp r0, 0 beq _080DB98E ldr r2, _080DB9D8 @ =gSprites - ldr r0, _080DB9DC @ =gUnknown_02024BE0 + ldr r0, _080DB9DC @ =gObjectBankIDs adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -35717,7 +35717,7 @@ _080DB98E: cmp r0, 0 beq _080DB9BC ldr r2, _080DB9D8 @ =gSprites - ldr r0, _080DB9DC @ =gUnknown_02024BE0 + ldr r0, _080DB9DC @ =gObjectBankIDs adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -35746,7 +35746,7 @@ _080DB9CC: .align 2, 0 _080DB9D4: .4byte REG_BLDALPHA _080DB9D8: .4byte gSprites -_080DB9DC: .4byte gUnknown_02024BE0 +_080DB9DC: .4byte gObjectBankIDs _080DB9E0: .4byte sub_80DB9E4 thumb_func_end sub_80DB92C @@ -35759,11 +35759,11 @@ sub_80DB9E4: @ 80DB9E4 cmp r0, 0 bne _080DBA3C movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -35826,7 +35826,7 @@ _080DBA66: beq _080DBAAE ldr r0, _080DBA9C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DBAA0 @@ -35904,7 +35904,7 @@ sub_80DBAF4: @ 80DBAF4 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DBB44 @@ -35971,7 +35971,7 @@ sub_80DBB70: @ 80DBB70 lsls r1, 16 lsrs r7, r1, 16 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -36168,7 +36168,7 @@ sub_80DBCFC: @ 80DBCFC strh r1, [r4, 0xC] ldr r0, _080DBD4C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0x8 cmp r0, 0 @@ -36969,7 +36969,7 @@ _080DC346: _080DC352: ldr r0, _080DC36C @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -37614,7 +37614,7 @@ _080DC84C: .4byte gBattleAnimArgs _080DC850: ldr r0, _080DC8E4 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DC880 @@ -37707,7 +37707,7 @@ _080DC914: .4byte gBattleAnimArgs _080DC918: ldr r0, _080DC990 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DC934 @@ -37884,7 +37884,7 @@ sub_80DCA70: @ 80DCA70 bl sub_807A3FC ldr r0, _080DCAA4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DCAAC @@ -37912,7 +37912,7 @@ _080DCAB8: strh r0, [r4, 0x22] ldr r0, _080DCAE4 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DCAD4 @@ -38077,7 +38077,7 @@ _080DCBE8: .4byte gBattleAnimArgs _080DCBEC: ldr r0, _080DCCE8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DCC0E @@ -38098,22 +38098,22 @@ _080DCC0E: bne _080DCC5E ldr r0, _080DCCE8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r5, _080DCCF0 @ =gBattleAnimEnemyMonIndex ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _080DCC5E ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 beq _080DCC4C ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -38207,7 +38207,7 @@ sub_80DCCFC: @ 80DCCFC bl sub_80787B0 ldr r0, _080DCD68 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DCD1C @@ -38508,7 +38508,7 @@ sub_80DCF60: @ 80DCF60 bl AnimateSprite ldr r0, _080DCF8C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DCF90 @@ -38728,7 +38728,7 @@ _080DD120: beq _080DD13A ldr r0, _080DD184 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DD13A @@ -39046,7 +39046,7 @@ sub_80DD3AC: @ 80DD3AC beq _080DD3F8 ldr r0, _080DD3F4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DD3F8 @@ -39681,7 +39681,7 @@ _080DD8B8: .4byte gTasks thumb_func_start sub_80DD8BC sub_80DD8BC: @ 80DD8BC push {lr} - ldr r0, _080DD8E4 @ =gUnknown_0202F7B4 + ldr r0, _080DD8E4 @ =gDisableStructMoveAnim ldr r0, [r0] ldrb r1, [r0, 0x11] lsrs r0, r1, 4 @@ -39702,7 +39702,7 @@ _080DD8DE: pop {r1} bx r1 .align 2, 0 -_080DD8E4: .4byte gUnknown_0202F7B4 +_080DD8E4: .4byte gDisableStructMoveAnim thumb_func_end sub_80DD8BC thumb_func_start sub_80DD8E8 @@ -39789,7 +39789,7 @@ sub_80DD978: @ 80DD978 adds r4, r0, 0 ldr r0, _080DD9A0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -39896,7 +39896,7 @@ sub_80DDA4C: @ 80DDA4C push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080DDA84 @ =gUnknown_0202F7B8 + ldr r2, _080DDA84 @ =gMoveDmgMoveAnim ldr r0, [r2] cmp r0, 0x20 bgt _080DDA60 @@ -39924,7 +39924,7 @@ _080DDA7A: pop {r0} bx r0 .align 2, 0 -_080DDA84: .4byte gUnknown_0202F7B8 +_080DDA84: .4byte gMoveDmgMoveAnim _080DDA88: .4byte gBattleAnimArgs thumb_func_end sub_80DDA4C @@ -40919,7 +40919,7 @@ _080DE1E0: strh r1, [r0, 0x2E] ldr r0, _080DE250 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DE258 @@ -41158,7 +41158,7 @@ sub_80DE3D4: @ 80DE3D4 adds r5, r0, r1 ldr r0, _080DE410 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r6, r0, 24 movs r1, 0x26 @@ -41518,7 +41518,7 @@ sub_80DE6B0: @ 80DE6B0 adds r4, r0, r1 ldr r0, _080DE6E4 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r6, r0, 24 movs r1, 0x26 @@ -42292,7 +42292,7 @@ sub_80DECB0: @ 80DECB0 strh r0, [r1] ldr r0, _080DED08 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DECF4 @@ -42573,7 +42573,7 @@ sub_80DEF3C: @ 80DEF3C bl sub_80787B0 ldr r0, _080DEF68 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080DEF70 @@ -42777,7 +42777,7 @@ sub_80DF0B8: @ 80DF0B8 strh r0, [r4, 0x24] ldr r0, _080DF120 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DF0DC @@ -43024,7 +43024,7 @@ _080DF292: strh r7, [r5, 0x2E] ldr r0, _080DF2FC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide movs r1, 0 lsls r0, 24 cmp r0, 0 @@ -43288,7 +43288,7 @@ sub_80DF49C: @ 80DF49C movs r2, 0x4 orrs r1, r2 strb r1, [r3] - ldr r2, _080DF4E0 @ =gUnknown_02024BE0 + ldr r2, _080DF4E0 @ =gObjectBankIDs ldr r1, _080DF4E4 @ =gBattleAnimPlayerMonIndex ldrb r1, [r1] adds r1, r2 @@ -43317,7 +43317,7 @@ sub_80DF49C: @ 80DF49C strh r1, [r0, 0x22] bx lr .align 2, 0 -_080DF4E0: .4byte gUnknown_02024BE0 +_080DF4E0: .4byte gObjectBankIDs _080DF4E4: .4byte gBattleAnimPlayerMonIndex _080DF4E8: .4byte gBattleAnimArgs _080DF4EC: .4byte sub_80DF4F4 @@ -43429,7 +43429,7 @@ sub_80DF5A0: @ 80DF5A0 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DF5F0 @@ -43508,7 +43508,7 @@ sub_80DF63C: @ 80DF63C strh r0, [r5, 0x36] ldr r0, _080DF698 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DF6A0 @@ -43631,7 +43631,7 @@ sub_80DF760: @ 80DF760 adds r4, r0, 0 ldr r0, _080DF788 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080DF77A @@ -43672,7 +43672,7 @@ sub_80DF78C: @ 80DF78C ldr r0, _080DF7E4 @ =gBattleAnimArgs ldrh r0, [r0] strh r0, [r6, 0x3A] - ldr r4, _080DF7E8 @ =gPlayerMonIndex + ldr r4, _080DF7E8 @ =gBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_807A100 @@ -43690,7 +43690,7 @@ sub_80DF78C: @ 80DF78C .align 2, 0 _080DF7E0: .4byte gBattleAnimPlayerMonIndex _080DF7E4: .4byte gBattleAnimArgs -_080DF7E8: .4byte gPlayerMonIndex +_080DF7E8: .4byte gBankAttacker _080DF7EC: lsrs r0, r1, 17 _080DF7EE: @@ -43866,7 +43866,7 @@ sub_80DF924: @ 80DF924 adds r4, r1, r0 ldr r0, _080DF954 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -44257,7 +44257,7 @@ sub_80DFC24: @ 80DFC24 strh r2, [r1, 0xA] ldr r1, _080DFC64 @ =REG_BLDALPHA strh r2, [r1] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -44330,7 +44330,7 @@ sub_80DFC9C: @ 80DFC9C cmp r2, 0x10 bne _080DFD1E ldr r2, _080DFD0C @ =gSprites - ldr r1, _080DFD10 @ =gUnknown_02024BE0 + ldr r1, _080DFD10 @ =gObjectBankIDs ldr r0, _080DFD14 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -44351,7 +44351,7 @@ sub_80DFC9C: @ 80DFC9C _080DFD04: .4byte gTasks _080DFD08: .4byte REG_BLDALPHA _080DFD0C: .4byte gSprites -_080DFD10: .4byte gUnknown_02024BE0 +_080DFD10: .4byte gObjectBankIDs _080DFD14: .4byte gBattleAnimPlayerMonIndex _080DFD18: ldrh r0, [r4, 0xC] @@ -44456,7 +44456,7 @@ sub_80DFDC0: @ 80DFDC0 strh r0, [r1] ldr r0, _080DFDEC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -44898,7 +44898,7 @@ sub_80E00EC: @ 80E00EC adds r0, 0x20 strh r0, [r5, 0x26] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080E015C @@ -44914,7 +44914,7 @@ _080E015E: strh r0, [r5, 0x18] ldr r0, _080E01AC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xE] @@ -45262,7 +45262,7 @@ _080E0438: .4byte 0x00003f3f _080E043C: ldr r0, _080E045C @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xE] @@ -45356,7 +45356,7 @@ _080E04D0: adds r0, 0x4 strh r0, [r5, 0x26] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080E0524 @@ -45903,7 +45903,7 @@ sub_80E0918: @ 80E0918 mov r10, r0 ldr r6, _080E09B8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r6] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -45916,7 +45916,7 @@ sub_80E0918: @ 80E0918 bl sub_8076034 ldr r0, _080E09BC @ =gSprites mov r9, r0 - ldr r0, _080E09C0 @ =gUnknown_02024BE0 + ldr r0, _080E09C0 @ =gObjectBankIDs mov r8, r0 ldrb r0, [r6] add r0, r8 @@ -45971,7 +45971,7 @@ _080E09A2: .align 2, 0 _080E09B8: .4byte gBattleAnimPlayerMonIndex _080E09BC: .4byte gSprites -_080E09C0: .4byte gUnknown_02024BE0 +_080E09C0: .4byte gObjectBankIDs thumb_func_end sub_80E0918 thumb_func_start sub_80E09C4 @@ -45981,7 +45981,7 @@ sub_80E09C4: @ 80E09C4 lsrs r6, r0, 24 ldr r4, _080E0A0C @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -46114,13 +46114,13 @@ _080E0AC4: bne _080E0B40 ldr r4, _080E0B74 @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _080E0AF4 ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _080E0B40 @@ -46134,7 +46134,7 @@ _080E0AF4: cmp r0, 0x1 bne _080E0B40 ldr r3, _080E0B78 @ =gSprites - ldr r1, _080E0B7C @ =gUnknown_02024BE0 + ldr r1, _080E0B7C @ =gObjectBankIDs ldrb r0, [r4] eors r0, r6 adds r0, r1 @@ -46182,16 +46182,16 @@ _080E0B6C: .4byte 0x00000c08 _080E0B70: .4byte REG_BG1CNT _080E0B74: .4byte gBattleAnimPlayerMonIndex _080E0B78: .4byte gSprites -_080E0B7C: .4byte gUnknown_02024BE0 +_080E0B7C: .4byte gObjectBankIDs _080E0B80: .4byte 0x02019348 _080E0B84: ldr r4, _080E0BA4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080E0BB0 - ldr r1, _080E0BA8 @ =gUnknown_02024A6A + ldr r1, _080E0BA8 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -46202,10 +46202,10 @@ _080E0B84: b _080E0BC0 .align 2, 0 _080E0BA4: .4byte gBattleAnimPlayerMonIndex -_080E0BA8: .4byte gUnknown_02024A6A +_080E0BA8: .4byte gBattlePartyID _080E0BAC: .4byte gEnemyParty _080E0BB0: - ldr r1, _080E0C58 @ =gUnknown_02024A6A + ldr r1, _080E0C58 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -46284,7 +46284,7 @@ _080E0BCC: bl sub_8079108 b _080E0C94 .align 2, 0 -_080E0C58: .4byte gUnknown_02024A6A +_080E0C58: .4byte gBattlePartyID _080E0C5C: .4byte gPlayerParty _080E0C60: .4byte gBattleAnimPlayerMonIndex _080E0C64: .4byte 0x040000d4 @@ -46445,7 +46445,7 @@ _080E0D84: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _080E0DE2 - ldr r2, _080E0E1C @ =gUnknown_02024BE0 + ldr r2, _080E0E1C @ =gObjectBankIDs ldr r0, _080E0E20 @ =gBattleAnimPlayerMonIndex ldrb r1, [r0] movs r0, 0x2 @@ -46488,7 +46488,7 @@ _080E0E0C: .4byte REG_BLDCNT _080E0E10: .4byte gSprites _080E0E14: .4byte 0x040000d4 _080E0E18: .4byte 0x85000200 -_080E0E1C: .4byte gUnknown_02024BE0 +_080E0E1C: .4byte gObjectBankIDs _080E0E20: .4byte gBattleAnimPlayerMonIndex thumb_func_end sub_80E0CD0 @@ -46548,7 +46548,7 @@ _080E0E8A: beq _080E0EB6 _080E0E90: adds r0, r4, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -46556,12 +46556,12 @@ _080E0E90: lsls r0, 24 cmp r0, 0 beq _080E0EB4 - ldr r0, _080E0EB0 @ =gUnknown_02024BE0 + ldr r0, _080E0EB0 @ =gObjectBankIDs adds r0, r4, r0 ldrb r2, [r0] b _080E0EB6 .align 2, 0 -_080E0EB0: .4byte gUnknown_02024BE0 +_080E0EB0: .4byte gObjectBankIDs _080E0EB4: movs r2, 0xFF _080E0EB6: @@ -46739,7 +46739,7 @@ sub_80E1004: @ 80E1004 bl sub_8078764 ldr r0, _080E1064 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080E1024 @@ -47092,7 +47092,7 @@ _080E12C4: strh r0, [r4, 0x1C] ldr r0, _080E12EC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1E] @@ -47300,7 +47300,7 @@ sub_80E143C: @ 80E143C strh r4, [r1, 0x26] ldr r0, _080E1480 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -47465,7 +47465,7 @@ _080E15A0: strh r0, [r4, 0x1C] ldr r0, _080E15C4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1E] @@ -47837,7 +47837,7 @@ sub_80E1864: @ 80E1864 _080E1888: .4byte gTasks _080E188C: .4byte gBattleAnimArgs _080E1890: - ldr r0, _080E18BC @ =gUnknown_0202F7BC + ldr r0, _080E18BC @ =gMovePowerMoveAnim ldrh r0, [r0] movs r1, 0xA bl __udivsi3 @@ -47860,7 +47860,7 @@ _080E189C: ldr r0, _080E18C4 @ =sub_80E1934 b _080E1926 .align 2, 0 -_080E18BC: .4byte gUnknown_0202F7BC +_080E18BC: .4byte gMovePowerMoveAnim _080E18C0: .4byte gUnknown_030041B0 _080E18C4: .4byte sub_80E1934 _080E18C8: @@ -47881,7 +47881,7 @@ _080E18CE: adds r1, r4, 0 adds r1, 0x8 adds r1, r0 - ldr r0, _080E1904 @ =gUnknown_02024BE0 + ldr r0, _080E1904 @ =gObjectBankIDs adds r0, r5, r0 ldrb r0, [r0] strh r0, [r1] @@ -47896,7 +47896,7 @@ _080E18F8: bls _080E18CE b _080E1924 .align 2, 0 -_080E1904: .4byte gUnknown_02024BE0 +_080E1904: .4byte gObjectBankIDs _080E1908: ldrb r0, [r6] bl obj_id_for_side_relative_to_move @@ -48254,7 +48254,7 @@ sub_80E1B88: @ 80E1B88 lsrs r1, r0, 24 ldr r3, _080E1BA8 @ =gBattleAnimArgs movs r2, 0 - ldr r0, _080E1BAC @ =gUnknown_0202F7BC + ldr r0, _080E1BAC @ =gMovePowerMoveAnim ldrh r0, [r0] cmp r0, 0x63 bls _080E1B9C @@ -48267,7 +48267,7 @@ _080E1B9C: bx r0 .align 2, 0 _080E1BA8: .4byte gBattleAnimArgs -_080E1BAC: .4byte gUnknown_0202F7BC +_080E1BAC: .4byte gMovePowerMoveAnim thumb_func_end sub_80E1B88 thumb_func_start sub_80E1BB0 @@ -48414,7 +48414,7 @@ sub_80E1CB4: @ 80E1CB4 strh r0, [r4, 0x2E] ldr r0, _080E1CF0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -49382,7 +49382,7 @@ _080E240C: cmp r0, 0 beq _080E243C ldr r2, _080E24B0 @ =gSprites - ldr r0, _080E24B4 @ =gUnknown_03004340 + ldr r0, _080E24B4 @ =gHealthboxIDs add r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -49455,7 +49455,7 @@ _080E24A4: .4byte gBattleAnimPlayerMonIndex _080E24A8: .4byte gBattleAnimEnemyMonIndex _080E24AC: .4byte 0x0000ffff _080E24B0: .4byte gSprites -_080E24B4: .4byte gUnknown_03004340 +_080E24B4: .4byte gHealthboxIDs thumb_func_end unref_sub_80E23A8 thumb_func_start sub_80E24B8 @@ -49598,13 +49598,13 @@ _080E25A0: cmp r0, 0x1 bhi _080E25F4 movs r4, 0 - ldr r5, _080E2600 @ =gUnknown_02024A68 + ldr r5, _080E2600 @ =gNoOfAllBanks ldrb r0, [r5] cmp r4, r0 bcs _080E25F4 ldr r2, _080E2604 @ =gSprites mov r12, r2 - ldr r6, _080E2608 @ =gUnknown_02024BE0 + ldr r6, _080E2608 @ =gObjectBankIDs movs r7, 0x3 negs r7, r7 _080E25D2: @@ -49633,16 +49633,16 @@ _080E25FA: pop {r0} bx r0 .align 2, 0 -_080E2600: .4byte gUnknown_02024A68 +_080E2600: .4byte gNoOfAllBanks _080E2604: .4byte gSprites -_080E2608: .4byte gUnknown_02024BE0 +_080E2608: .4byte gObjectBankIDs thumb_func_end sub_80E255C thumb_func_start sub_80E260C sub_80E260C: @ 80E260C push {r4-r6,lr} ldr r6, _080E2680 @ =gSprites - ldr r4, _080E2684 @ =gUnknown_02024BE0 + ldr r4, _080E2684 @ =gObjectBankIDs ldr r5, _080E2688 @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] adds r0, r4 @@ -49699,7 +49699,7 @@ sub_80E260C: @ 80E260C b _080E26B0 .align 2, 0 _080E2680: .4byte gSprites -_080E2684: .4byte gUnknown_02024BE0 +_080E2684: .4byte gObjectBankIDs _080E2688: .4byte gBattleAnimPlayerMonIndex _080E268C: .4byte gBattleAnimEnemyMonIndex _080E2690: .4byte gBattleAnimArgs @@ -49928,7 +49928,7 @@ sub_80E2838: @ 80E2838 adds r4, r0, 0 ldr r0, _080E2868 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080E285C @@ -50902,13 +50902,13 @@ _080E2FAC: bne _080E3028 ldr r5, _080E305C @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _080E2FDC ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _080E3028 @@ -50922,7 +50922,7 @@ _080E2FDC: cmp r0, 0x1 bne _080E3028 ldr r3, _080E3060 @ =gSprites - ldr r1, _080E3064 @ =gUnknown_02024BE0 + ldr r1, _080E3064 @ =gObjectBankIDs ldrb r0, [r5] eors r0, r6 adds r0, r1 @@ -50970,16 +50970,16 @@ _080E3054: .4byte 0x00000c08 _080E3058: .4byte REG_BG1CNT _080E305C: .4byte gBattleAnimPlayerMonIndex _080E3060: .4byte gSprites -_080E3064: .4byte gUnknown_02024BE0 +_080E3064: .4byte gObjectBankIDs _080E3068: .4byte 0x02019348 _080E306C: ldr r4, _080E308C @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080E3098 - ldr r1, _080E3090 @ =gUnknown_02024A6A + ldr r1, _080E3090 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -50990,10 +50990,10 @@ _080E306C: b _080E30A8 .align 2, 0 _080E308C: .4byte gBattleAnimPlayerMonIndex -_080E3090: .4byte gUnknown_02024A6A +_080E3090: .4byte gBattlePartyID _080E3094: .4byte gEnemyParty _080E3098: - ldr r1, _080E3160 @ =gUnknown_02024A6A + ldr r1, _080E3160 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -51087,7 +51087,7 @@ _080E3106: pop {r0} bx r0 .align 2, 0 -_080E3160: .4byte gUnknown_02024A6A +_080E3160: .4byte gBattlePartyID _080E3164: .4byte gPlayerParty _080E3168: .4byte gBattleAnimPlayerMonIndex _080E316C: .4byte 0x040000d4 @@ -51199,7 +51199,7 @@ _080E3208: ldrsh r0, [r4, r3] cmp r0, 0x1 bne _080E3288 - ldr r2, _080E32D8 @ =gUnknown_02024BE0 + ldr r2, _080E32D8 @ =gObjectBankIDs ldr r0, _080E32DC @ =gBattleAnimPlayerMonIndex ldrb r1, [r0] movs r0, 0x2 @@ -51252,7 +51252,7 @@ _080E32C8: .4byte REG_BLDCNT _080E32CC: .4byte gSprites _080E32D0: .4byte 0x040000d4 _080E32D4: .4byte 0x85000200 -_080E32D8: .4byte gUnknown_02024BE0 +_080E32D8: .4byte gObjectBankIDs _080E32DC: .4byte gBattleAnimPlayerMonIndex thumb_func_end sub_80E3194 @@ -51441,13 +51441,13 @@ _080E3432: cmp r0, 0 bne _080E34A4 adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _080E345E adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _080E34A4 @@ -51459,7 +51459,7 @@ _080E345E: cmp r0, 0x1 bne _080E34A4 ldr r1, _080E34D8 @ =gSprites - ldr r0, _080E34DC @ =gUnknown_02024BE0 + ldr r0, _080E34DC @ =gObjectBankIDs add r0, r8 ldrb r0, [r0] lsls r2, r0, 4 @@ -51505,15 +51505,15 @@ _080E34CC: .4byte REG_BLDCNT _080E34D0: .4byte 0x00003f42 _080E34D4: .4byte REG_BG1CNT _080E34D8: .4byte gSprites -_080E34DC: .4byte gUnknown_02024BE0 +_080E34DC: .4byte gObjectBankIDs _080E34E0: .4byte 0x02019348 _080E34E4: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080E3508 - ldr r1, _080E3500 @ =gUnknown_02024A6A + ldr r1, _080E3500 @ =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -51522,10 +51522,10 @@ _080E34E4: ldr r1, _080E3504 @ =gEnemyParty b _080E3516 .align 2, 0 -_080E3500: .4byte gUnknown_02024A6A +_080E3500: .4byte gBattlePartyID _080E3504: .4byte gEnemyParty _080E3508: - ldr r1, _080E3568 @ =gUnknown_02024A6A + ldr r1, _080E3568 @ =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -51539,7 +51539,7 @@ _080E3516: lsls r0, 16 lsrs r4, r0, 16 _080E3522: - ldr r6, _080E3570 @ =gUnknown_02024BE0 + ldr r6, _080E3570 @ =gObjectBankIDs adds r0, r5, r6 ldrb r1, [r0] adds r0, r5, 0 @@ -51572,9 +51572,9 @@ _080E3550: bl LZDecompressVram b _080E3580 .align 2, 0 -_080E3568: .4byte gUnknown_02024A6A +_080E3568: .4byte gBattlePartyID _080E356C: .4byte gPlayerParty -_080E3570: .4byte gUnknown_02024BE0 +_080E3570: .4byte gObjectBankIDs _080E3574: .4byte gBattleStatMask1_Tilemap _080E3578: ldr r0, _080E35B0 @ =gBattleStatMask2_Tilemap @@ -51734,7 +51734,7 @@ _080E3692: mov r3, sp ldrh r3, [r3, 0x20] strh r3, [r1, 0x14] - ldr r0, _080E36D8 @ =gUnknown_02024BE0 + ldr r0, _080E36D8 @ =gObjectBankIDs add r0, r8 ldrb r0, [r0] strh r0, [r1, 0x16] @@ -51754,7 +51754,7 @@ _080E3692: bl PlaySE12WithPanning b _080E36F4 .align 2, 0 -_080E36D8: .4byte gUnknown_02024BE0 +_080E36D8: .4byte gObjectBankIDs _080E36DC: .4byte sub_80E3704 _080E36E0: movs r0, 0x40 @@ -52237,7 +52237,7 @@ sub_80E3A58: @ 80E3A58 beq _080E3A94 ldr r0, _080E3AC8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080E3A94 @@ -52345,7 +52345,7 @@ sub_80E3B4C: @ 80E3B4C lsrs r4, 24 ldr r0, _080E3B70 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide ldr r1, _080E3B74 @ =gBattleAnimArgs lsls r0, 24 lsrs r0, 24 @@ -52368,7 +52368,7 @@ sub_80E3B78: @ 80E3B78 lsrs r4, 24 ldr r0, _080E3B9C @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide ldr r1, _080E3BA0 @ =gBattleAnimArgs lsls r0, 24 lsrs r0, 24 @@ -52430,7 +52430,7 @@ _080E3BE6: lsls r0, 24 cmp r0, 0 beq _080E3C24 - ldr r0, _080E3C44 @ =gUnknown_02024BE0 + ldr r0, _080E3C44 @ =gObjectBankIDs adds r0, r4, r0 ldrb r0, [r0] lsls r2, r0, 4 @@ -52464,7 +52464,7 @@ _080E3C24: .align 2, 0 _080E3C3C: .4byte gSprites _080E3C40: .4byte gBattleAnimPlayerMonIndex -_080E3C44: .4byte gUnknown_02024BE0 +_080E3C44: .4byte gObjectBankIDs _080E3C48: .4byte gBattleAnimArgs thumb_func_end sub_80E3BDC @@ -52596,11 +52596,11 @@ _080E3D50: .4byte REG_BG1CNT _080E3D54: .4byte 0x02019348 _080E3D58: adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080E3D7C - ldr r1, _080E3D74 @ =gUnknown_02024A6A + ldr r1, _080E3D74 @ =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -52609,10 +52609,10 @@ _080E3D58: ldr r1, _080E3D78 @ =gEnemyParty b _080E3D8A .align 2, 0 -_080E3D74: .4byte gUnknown_02024A6A +_080E3D74: .4byte gBattlePartyID _080E3D78: .4byte gEnemyParty _080E3D7C: - ldr r1, _080E3E48 @ =gUnknown_02024A6A + ldr r1, _080E3E48 @ =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -52626,7 +52626,7 @@ _080E3D8A: lsls r0, 16 lsrs r4, r0, 16 _080E3D96: - ldr r5, _080E3E50 @ =gUnknown_02024BE0 + ldr r5, _080E3E50 @ =gObjectBankIDs adds r0, r7, r5 ldrb r1, [r0] adds r0, r7, 0 @@ -52710,9 +52710,9 @@ _080E3DE6: pop {r0} bx r0 .align 2, 0 -_080E3E48: .4byte gUnknown_02024A6A +_080E3E48: .4byte gBattlePartyID _080E3E4C: .4byte gPlayerParty -_080E3E50: .4byte gUnknown_02024BE0 +_080E3E50: .4byte gObjectBankIDs _080E3E54: .4byte gUnknown_030042C0 _080E3E58: .4byte gUnknown_030041B4 _080E3E5C: .4byte gTasks @@ -53227,11 +53227,11 @@ sub_80E4234: @ 80E4234 lsls r0, 24 lsrs r0, 24 ldr r2, _080E4254 @ =gBattleAnimPlayerMonIndex - ldr r1, _080E4258 @ =gEnemyMonIndex + ldr r1, _080E4258 @ =gBankTarget ldrb r1, [r1] strb r1, [r2] ldr r2, _080E425C @ =gBattleAnimEnemyMonIndex - ldr r1, _080E4260 @ =gUnknown_02024C0A + ldr r1, _080E4260 @ =gEffectBank ldrb r1, [r1] strb r1, [r2] bl DestroyAnimVisualTask @@ -53239,9 +53239,9 @@ sub_80E4234: @ 80E4234 bx r0 .align 2, 0 _080E4254: .4byte gBattleAnimPlayerMonIndex -_080E4258: .4byte gEnemyMonIndex +_080E4258: .4byte gBankTarget _080E425C: .4byte gBattleAnimEnemyMonIndex -_080E4260: .4byte gUnknown_02024C0A +_080E4260: .4byte gEffectBank thumb_func_end sub_80E4234 thumb_func_start sub_80E4264 @@ -53251,11 +53251,11 @@ sub_80E4264: @ 80E4264 lsrs r5, r0, 24 ldr r0, _080E428C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r0, _080E4290 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -53287,7 +53287,7 @@ sub_80E42B0: @ 80E42B0 lsls r0, 24 lsrs r0, 24 ldr r2, _080E42C8 @ =gBattleAnimEnemyMonIndex - ldr r1, _080E42CC @ =gEnemyMonIndex + ldr r1, _080E42CC @ =gBankTarget ldrb r1, [r1] strb r1, [r2] bl DestroyAnimVisualTask @@ -53295,7 +53295,7 @@ sub_80E42B0: @ 80E42B0 bx r0 .align 2, 0 _080E42C8: .4byte gBattleAnimEnemyMonIndex -_080E42CC: .4byte gEnemyMonIndex +_080E42CC: .4byte gBankTarget thumb_func_end sub_80E42B0 thumb_func_start sub_80E42D0 @@ -53304,11 +53304,11 @@ sub_80E42D0: @ 80E42D0 lsls r0, 24 lsrs r0, 24 ldr r2, _080E42F0 @ =gBattleAnimPlayerMonIndex - ldr r1, _080E42F4 @ =gPlayerMonIndex + ldr r1, _080E42F4 @ =gBankAttacker ldrb r1, [r1] strb r1, [r2] ldr r2, _080E42F8 @ =gBattleAnimEnemyMonIndex - ldr r1, _080E42FC @ =gUnknown_02024C0A + ldr r1, _080E42FC @ =gEffectBank ldrb r1, [r1] strb r1, [r2] bl DestroyAnimVisualTask @@ -53316,9 +53316,9 @@ sub_80E42D0: @ 80E42D0 bx r0 .align 2, 0 _080E42F0: .4byte gBattleAnimPlayerMonIndex -_080E42F4: .4byte gPlayerMonIndex +_080E42F4: .4byte gBankAttacker _080E42F8: .4byte gBattleAnimEnemyMonIndex -_080E42FC: .4byte gUnknown_02024C0A +_080E42FC: .4byte gEffectBank thumb_func_end sub_80E42D0 thumb_func_start sub_80E4300 @@ -54884,7 +54884,7 @@ sub_80E4EF8: @ 80E4EF8 lsls r5, 24 lsrs r5, 24 adds r0, r4, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 ldr r2, _080E4FCC @ =0x040000d4 diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s index be9b806d9..f2f127690 100644 --- a/asm/battle_anim_81258BC.s +++ b/asm/battle_anim_81258BC.s @@ -451,11 +451,11 @@ _0812B21A: _0812B230: .4byte gBattleAnimEnemyMonIndex _0812B234: adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812B258 - ldr r1, _0812B250 @ =gUnknown_02024A6A + ldr r1, _0812B250 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -464,10 +464,10 @@ _0812B234: ldr r1, _0812B254 @ =gEnemyParty b _0812B266 .align 2, 0 -_0812B250: .4byte gUnknown_02024A6A +_0812B250: .4byte gBattlePartyID _0812B254: .4byte gEnemyParty _0812B258: - ldr r1, _0812B290 @ =gUnknown_02024A6A + ldr r1, _0812B290 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -495,7 +495,7 @@ _0812B272: bl PlayCry1 b _0812B2AA .align 2, 0 -_0812B290: .4byte gUnknown_02024A6A +_0812B290: .4byte gBattlePartyID _0812B294: .4byte gPlayerParty _0812B298: .4byte gBattleAnimArgs _0812B29C: @@ -734,28 +734,28 @@ unref_sub_812B464: @ 812B464 bx lr thumb_func_end unref_sub_812B464 - thumb_func_start sub_812B468 -sub_812B468: @ 812B468 - ldr r1, _0812B478 @ =gUnknown_03004330 - ldr r0, _0812B47C @ =gUnknown_02024A60 + thumb_func_start SetBankFuncToSafariBufferRunCommand +SetBankFuncToSafariBufferRunCommand: @ 812B468 + ldr r1, _0812B478 @ =gBattleBankFunc + ldr r0, _0812B47C @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0812B480 @ =sub_812B484 + ldr r1, _0812B480 @ =SafariBufferRunCommand str r1, [r0] bx lr .align 2, 0 -_0812B478: .4byte gUnknown_03004330 -_0812B47C: .4byte gUnknown_02024A60 -_0812B480: .4byte sub_812B484 - thumb_func_end sub_812B468 +_0812B478: .4byte gBattleBankFunc +_0812B47C: .4byte gActiveBank +_0812B480: .4byte SafariBufferRunCommand + thumb_func_end SetBankFuncToSafariBufferRunCommand - thumb_func_start sub_812B484 -sub_812B484: @ 812B484 + thumb_func_start SafariBufferRunCommand +SafariBufferRunCommand: @ 812B484 push {lr} - ldr r2, _0812B4B8 @ =gUnknown_02024A64 + ldr r2, _0812B4B8 @ =gBattleExecBuffer ldr r1, _0812B4BC @ =gBitTable - ldr r0, _0812B4C0 @ =gUnknown_02024A60 + ldr r0, _0812B4C0 @ =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -764,13 +764,13 @@ sub_812B484: @ 812B484 ands r1, r0 cmp r1, 0 beq _0812B4D0 - ldr r0, _0812B4C4 @ =gUnknown_02023A60 + ldr r0, _0812B4C4 @ =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _0812B4CC - ldr r0, _0812B4C8 @ =gUnknown_08402080 + ldr r0, _0812B4C8 @ =gSafariBufferCommands ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -778,17 +778,17 @@ sub_812B484: @ 812B484 bl _call_via_r0 b _0812B4D0 .align 2, 0 -_0812B4B8: .4byte gUnknown_02024A64 +_0812B4B8: .4byte gBattleExecBuffer _0812B4BC: .4byte gBitTable -_0812B4C0: .4byte gUnknown_02024A60 -_0812B4C4: .4byte gUnknown_02023A60 -_0812B4C8: .4byte gUnknown_08402080 +_0812B4C0: .4byte gActiveBank +_0812B4C4: .4byte gBattleBufferA +_0812B4C8: .4byte gSafariBufferCommands _0812B4CC: - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted _0812B4D0: pop {r0} bx r0 - thumb_func_end sub_812B484 + thumb_func_end SafariBufferRunCommand thumb_func_start bx_battle_menu_t6_2 bx_battle_menu_t6_2: @ 812B4D4 @@ -803,8 +803,8 @@ bx_battle_menu_t6_2: @ 812B4D4 movs r0, 0x5 bl PlaySE bl DestroyMenuCursor - ldr r1, _0812B50C @ =gUnknown_02024E60 - ldr r0, _0812B510 @ =gUnknown_02024A60 + ldr r1, _0812B50C @ =gActionSelectionCursor + ldr r0, _0812B510 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -817,8 +817,8 @@ bx_battle_menu_t6_2: @ 812B4D4 b _0812B540 .align 2, 0 _0812B508: .4byte gMain -_0812B50C: .4byte gUnknown_02024E60 -_0812B510: .4byte gUnknown_02024A60 +_0812B50C: .4byte gActionSelectionCursor +_0812B510: .4byte gActiveBank _0812B514: cmp r0, 0x2 beq _0812B52A @@ -846,15 +846,15 @@ _0812B536: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb _0812B540: - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted b _0812B64E _0812B546: movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _0812B584 - ldr r5, _0812B57C @ =gUnknown_02024E60 - ldr r4, _0812B580 @ =gUnknown_02024A60 + ldr r5, _0812B57C @ =gActionSelectionCursor + ldr r4, _0812B580 @ =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -874,15 +874,15 @@ _0812B546: movs r2, 0x1 b _0812B5F2 .align 2, 0 -_0812B57C: .4byte gUnknown_02024E60 -_0812B580: .4byte gUnknown_02024A60 +_0812B57C: .4byte gActionSelectionCursor +_0812B580: .4byte gActiveBank _0812B584: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _0812B5C0 - ldr r5, _0812B5B8 @ =gUnknown_02024E60 - ldr r4, _0812B5BC @ =gUnknown_02024A60 + ldr r5, _0812B5B8 @ =gActionSelectionCursor + ldr r4, _0812B5BC @ =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -902,15 +902,15 @@ _0812B584: movs r2, 0x1 b _0812B5F2 .align 2, 0 -_0812B5B8: .4byte gUnknown_02024E60 -_0812B5BC: .4byte gUnknown_02024A60 +_0812B5B8: .4byte gActionSelectionCursor +_0812B5BC: .4byte gActiveBank _0812B5C0: movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0812B60C - ldr r5, _0812B604 @ =gUnknown_02024E60 - ldr r4, _0812B608 @ =gUnknown_02024A60 + ldr r5, _0812B604 @ =gActionSelectionCursor + ldr r4, _0812B608 @ =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -938,15 +938,15 @@ _0812B5F2: bl sub_802E3E4 b _0812B64E .align 2, 0 -_0812B604: .4byte gUnknown_02024E60 -_0812B608: .4byte gUnknown_02024A60 +_0812B604: .4byte gActionSelectionCursor +_0812B608: .4byte gActiveBank _0812B60C: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0812B64E - ldr r5, _0812B654 @ =gUnknown_02024E60 - ldr r4, _0812B658 @ =gUnknown_02024A60 + ldr r5, _0812B654 @ =gActionSelectionCursor + ldr r4, _0812B658 @ =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -976,16 +976,16 @@ _0812B64E: pop {r0} bx r0 .align 2, 0 -_0812B654: .4byte gUnknown_02024E60 -_0812B658: .4byte gUnknown_02024A60 +_0812B654: .4byte gActionSelectionCursor +_0812B658: .4byte gActiveBank thumb_func_end bx_battle_menu_t6_2 thumb_func_start sub_812B65C sub_812B65C: @ 812B65C push {lr} ldr r2, _0812B684 @ =gSprites - ldr r1, _0812B688 @ =gUnknown_02024BE0 - ldr r0, _0812B68C @ =gUnknown_02024A60 + ldr r1, _0812B688 @ =gObjectBankIDs + ldr r0, _0812B68C @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -998,14 +998,14 @@ sub_812B65C: @ 812B65C ldr r0, _0812B690 @ =SpriteCallbackDummy cmp r1, r0 bne _0812B680 - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted _0812B680: pop {r0} bx r0 .align 2, 0 _0812B684: .4byte gSprites -_0812B688: .4byte gUnknown_02024BE0 -_0812B68C: .4byte gUnknown_02024A60 +_0812B688: .4byte gObjectBankIDs +_0812B68C: .4byte gActiveBank _0812B690: .4byte SpriteCallbackDummy thumb_func_end sub_812B65C @@ -1016,7 +1016,7 @@ sub_812B694: @ 812B694 ldrh r0, [r0, 0x16] cmp r0, 0 bne _0812B6A2 - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted _0812B6A2: pop {r0} bx r0 @@ -1041,7 +1041,7 @@ sub_812B6AC: @ 812B6AC negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r0, _0812B6E8 @ =gUnknown_030042D0 + ldr r0, _0812B6E8 @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r2] ldr r0, [r2, 0x8] @@ -1053,17 +1053,17 @@ _0812B6D6: _0812B6DC: .4byte gPaletteFade _0812B6E0: .4byte gMain _0812B6E4: .4byte 0x0000043d -_0812B6E8: .4byte gUnknown_030042D0 +_0812B6E8: .4byte gPreBattleCallback1 thumb_func_end sub_812B6AC thumb_func_start bx_wait_t6 bx_wait_t6: @ 812B6EC push {lr} - ldr r0, _0812B718 @ =gUnknown_02024E6D + ldr r0, _0812B718 @ =gDoingBattleAnim ldrb r0, [r0] cmp r0, 0 beq _0812B70E - ldr r0, _0812B71C @ =gUnknown_02024A60 + ldr r0, _0812B71C @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1076,13 +1076,13 @@ bx_wait_t6: @ 812B6EC cmp r0, 0 bne _0812B712 _0812B70E: - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted _0812B712: pop {r0} bx r0 .align 2, 0 -_0812B718: .4byte gUnknown_02024E6D -_0812B71C: .4byte gUnknown_02024A60 +_0812B718: .4byte gDoingBattleAnim +_0812B71C: .4byte gActiveBank _0812B720: .4byte 0x02017810 thumb_func_end bx_wait_t6 @@ -1095,8 +1095,8 @@ sub_812B724: @ 812B724 ands r0, r1 cmp r0, 0 bne _0812B744 - ldr r1, _0812B74C @ =gUnknown_03004330 - ldr r0, _0812B750 @ =gUnknown_02024A60 + ldr r1, _0812B74C @ =gBattleBankFunc + ldr r0, _0812B750 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -1108,8 +1108,8 @@ _0812B744: bx r0 .align 2, 0 _0812B748: .4byte gPaletteFade -_0812B74C: .4byte gUnknown_03004330 -_0812B750: .4byte gUnknown_02024A60 +_0812B74C: .4byte gBattleBankFunc +_0812B750: .4byte gActiveBank _0812B754: .4byte sub_812B758 thumb_func_end sub_812B724 @@ -1131,7 +1131,7 @@ sub_812B758: @ 812B758 ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted _0812B77E: pop {r0} bx r0 @@ -1145,7 +1145,7 @@ _0812B790: .4byte gScriptItemId thumb_func_start sub_812B794 sub_812B794: @ 812B794 push {lr} - ldr r0, _0812B7B8 @ =gUnknown_02024A60 + ldr r0, _0812B7B8 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1157,25 +1157,25 @@ sub_812B794: @ 812B794 ands r0, r1 cmp r0, 0 bne _0812B7B2 - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted _0812B7B2: pop {r0} bx r0 .align 2, 0 -_0812B7B8: .4byte gUnknown_02024A60 +_0812B7B8: .4byte gActiveBank _0812B7BC: .4byte 0x02017810 thumb_func_end sub_812B794 - thumb_func_start dp01_tbl6_exec_completed -dp01_tbl6_exec_completed: @ 812B7C0 + thumb_func_start SafariBufferExecCompleted +SafariBufferExecCompleted: @ 812B7C0 push {r4,lr} sub sp, 0x4 - ldr r1, _0812B800 @ =gUnknown_03004330 - ldr r4, _0812B804 @ =gUnknown_02024A60 + ldr r1, _0812B800 @ =gBattleBankFunc + ldr r4, _0812B804 @ =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0812B808 @ =sub_812B484 + ldr r1, _0812B808 @ =SafariBufferRunCommand str r1, [r0] ldr r0, _0812B80C @ =gBattleTypeFlags ldrh r1, [r0] @@ -1190,7 +1190,7 @@ dp01_tbl6_exec_completed: @ 812B7C0 movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _0812B810 @ =gUnknown_02023A60 + ldr r1, _0812B810 @ =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -1198,13 +1198,13 @@ dp01_tbl6_exec_completed: @ 812B7C0 strb r1, [r0] b _0812B826 .align 2, 0 -_0812B800: .4byte gUnknown_03004330 -_0812B804: .4byte gUnknown_02024A60 -_0812B808: .4byte sub_812B484 +_0812B800: .4byte gBattleBankFunc +_0812B804: .4byte gActiveBank +_0812B808: .4byte SafariBufferRunCommand _0812B80C: .4byte gBattleTypeFlags -_0812B810: .4byte gUnknown_02023A60 +_0812B810: .4byte gBattleBufferA _0812B814: - ldr r2, _0812B830 @ =gUnknown_02024A64 + ldr r2, _0812B830 @ =gBattleExecBuffer ldr r1, _0812B834 @ =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -1219,14 +1219,14 @@ _0812B826: pop {r0} bx r0 .align 2, 0 -_0812B830: .4byte gUnknown_02024A64 +_0812B830: .4byte gBattleExecBuffer _0812B834: .4byte gBitTable - thumb_func_end dp01_tbl6_exec_completed + thumb_func_end SafariBufferExecCompleted thumb_func_start unref_sub_812B838 unref_sub_812B838: @ 812B838 push {lr} - ldr r0, _0812B85C @ =gUnknown_02024A60 + ldr r0, _0812B85C @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1238,27 +1238,27 @@ unref_sub_812B838: @ 812B838 ands r0, r1 cmp r0, 0 bne _0812B856 - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted _0812B856: pop {r0} bx r0 .align 2, 0 -_0812B85C: .4byte gUnknown_02024A60 +_0812B85C: .4byte gActiveBank _0812B860: .4byte 0x02017810 thumb_func_end unref_sub_812B838 - thumb_func_start sub_812B864 -sub_812B864: @ 812B864 + thumb_func_start SafariHandleGetAttributes +SafariHandleGetAttributes: @ 812B864 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 - thumb_func_end sub_812B864 + thumb_func_end SafariHandleGetAttributes thumb_func_start sub_812B870 sub_812B870: @ 812B870 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B870 @@ -1266,7 +1266,7 @@ sub_812B870: @ 812B870 thumb_func_start sub_812B87C sub_812B87C: @ 812B87C push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B87C @@ -1274,7 +1274,7 @@ sub_812B87C: @ 812B87C thumb_func_start sub_812B888 sub_812B888: @ 812B888 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B888 @@ -1282,7 +1282,7 @@ sub_812B888: @ 812B888 thumb_func_start sub_812B894 sub_812B894: @ 812B894 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B894 @@ -1290,7 +1290,7 @@ sub_812B894: @ 812B894 thumb_func_start sub_812B8A0 sub_812B8A0: @ 812B8A0 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B8A0 @@ -1298,7 +1298,7 @@ sub_812B8A0: @ 812B8A0 thumb_func_start sub_812B8AC sub_812B8AC: @ 812B8AC push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B8AC @@ -1308,12 +1308,12 @@ sub_812B8B8: @ 812B8B8 push {r4-r6,lr} ldr r4, _0812B96C @ =gSaveBlock2 ldrb r0, [r4, 0x8] - ldr r5, _0812B970 @ =gUnknown_02024A60 + ldr r5, _0812B970 @ =gActiveBank ldrb r1, [r5] bl sub_8031AF4 ldrb r6, [r4, 0x8] ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1335,7 +1335,7 @@ sub_812B8B8: @ 812B8B8 movs r1, 0x50 movs r3, 0x1E bl CreateSprite - ldr r6, _0812B97C @ =gUnknown_02024BE0 + ldr r6, _0812B97C @ =gObjectBankIDs ldrb r1, [r5] adds r1, r6 strb r0, [r1] @@ -1381,7 +1381,7 @@ sub_812B8B8: @ 812B8B8 adds r0, r4 ldr r1, _0812B988 @ =sub_80313A0 str r1, [r0] - ldr r1, _0812B98C @ =gUnknown_03004330 + ldr r1, _0812B98C @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -1392,21 +1392,21 @@ sub_812B8B8: @ 812B8B8 bx r0 .align 2, 0 _0812B96C: .4byte gSaveBlock2 -_0812B970: .4byte gUnknown_02024A60 +_0812B970: .4byte gActiveBank _0812B974: .4byte gUnknown_02024E8C _0812B978: .4byte gTrainerBackPicCoords -_0812B97C: .4byte gUnknown_02024BE0 +_0812B97C: .4byte gObjectBankIDs _0812B980: .4byte gSprites _0812B984: .4byte 0x0000fffe _0812B988: .4byte sub_80313A0 -_0812B98C: .4byte gUnknown_03004330 +_0812B98C: .4byte gBattleBankFunc _0812B990: .4byte sub_812B65C thumb_func_end sub_812B8B8 thumb_func_start sub_812B994 sub_812B994: @ 812B994 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B994 @@ -1414,7 +1414,7 @@ sub_812B994: @ 812B994 thumb_func_start sub_812B9A0 sub_812B9A0: @ 812B9A0 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B9A0 @@ -1422,7 +1422,7 @@ sub_812B9A0: @ 812B9A0 thumb_func_start sub_812B9AC sub_812B9AC: @ 812B9AC push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B9AC @@ -1430,7 +1430,7 @@ sub_812B9AC: @ 812B9AC thumb_func_start sub_812B9B8 sub_812B9B8: @ 812B9B8 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812B9B8 @@ -1441,13 +1441,13 @@ sub_812B9C4: @ 812B9C4 ldr r1, _0812BA00 @ =0x02017840 movs r0, 0x4 strb r0, [r1, 0x8] - ldr r1, _0812BA04 @ =gUnknown_02024E6D + ldr r1, _0812BA04 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] - ldr r5, _0812BA08 @ =gUnknown_02024A60 + ldr r5, _0812BA08 @ =gActiveBank ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -1455,7 +1455,7 @@ sub_812B9C4: @ 812B9C4 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, _0812BA0C @ =gUnknown_03004330 + ldr r1, _0812BA0C @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -1466,17 +1466,17 @@ sub_812B9C4: @ 812B9C4 bx r0 .align 2, 0 _0812BA00: .4byte 0x02017840 -_0812BA04: .4byte gUnknown_02024E6D -_0812BA08: .4byte gUnknown_02024A60 -_0812BA0C: .4byte gUnknown_03004330 +_0812BA04: .4byte gDoingBattleAnim +_0812BA08: .4byte gActiveBank +_0812BA0C: .4byte gBattleBankFunc _0812BA10: .4byte bx_wait_t6 thumb_func_end sub_812B9C4 thumb_func_start sub_812BA14 sub_812BA14: @ 812BA14 push {r4,r5,lr} - ldr r1, _0812BA58 @ =gUnknown_02023A60 - ldr r5, _0812BA5C @ =gUnknown_02024A60 + ldr r1, _0812BA58 @ =gBattleBufferA + ldr r5, _0812BA5C @ =gActiveBank ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -1484,12 +1484,12 @@ sub_812BA14: @ 812BA14 ldrb r1, [r0] ldr r0, _0812BA60 @ =0x02017840 strb r1, [r0, 0x8] - ldr r1, _0812BA64 @ =gUnknown_02024E6D + ldr r1, _0812BA64 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -1497,7 +1497,7 @@ sub_812BA14: @ 812BA14 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, _0812BA68 @ =gUnknown_03004330 + ldr r1, _0812BA68 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -1507,18 +1507,18 @@ sub_812BA14: @ 812BA14 pop {r0} bx r0 .align 2, 0 -_0812BA58: .4byte gUnknown_02023A60 -_0812BA5C: .4byte gUnknown_02024A60 +_0812BA58: .4byte gBattleBufferA +_0812BA5C: .4byte gActiveBank _0812BA60: .4byte 0x02017840 -_0812BA64: .4byte gUnknown_02024E6D -_0812BA68: .4byte gUnknown_03004330 +_0812BA64: .4byte gDoingBattleAnim +_0812BA68: .4byte gBattleBankFunc _0812BA6C: .4byte bx_wait_t6 thumb_func_end sub_812BA14 thumb_func_start sub_812BA70 sub_812BA70: @ 812BA70 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BA70 @@ -1526,13 +1526,13 @@ sub_812BA70: @ 812BA70 thumb_func_start sub_812BA7C sub_812BA7C: @ 812BA7C push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BA7C - thumb_func_start dp01t_10_6_message -dp01t_10_6_message: @ 812BA88 + thumb_func_start SafariHandlePrintString +SafariHandlePrintString: @ 812BA88 push {r4,lr} sub sp, 0x4 ldr r0, _0812BACC @ =gUnknown_030042A4 @@ -1540,21 +1540,21 @@ dp01t_10_6_message: @ 812BA88 strh r1, [r0] ldr r0, _0812BAD0 @ =gUnknown_030042A0 strh r1, [r0] - ldr r4, _0812BAD4 @ =gUnknown_02024A60 + ldr r4, _0812BAD4 @ =gActiveBank ldrb r0, [r4] lsls r0, 9 ldr r1, _0812BAD8 @ =gUnknown_02023A62 adds r0, r1 ldrh r0, [r0] - bl sub_8120AA8 + bl BufferStringBattle ldr r0, _0812BADC @ =gUnknown_03004210 - ldr r1, _0812BAE0 @ =gUnknown_020238CC + ldr r1, _0812BAE0 @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 movs r3, 0x2 bl sub_8002EB0 - ldr r1, _0812BAE4 @ =gUnknown_03004330 + ldr r1, _0812BAE4 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -1567,40 +1567,40 @@ dp01t_10_6_message: @ 812BA88 .align 2, 0 _0812BACC: .4byte gUnknown_030042A4 _0812BAD0: .4byte gUnknown_030042A0 -_0812BAD4: .4byte gUnknown_02024A60 +_0812BAD4: .4byte gActiveBank _0812BAD8: .4byte gUnknown_02023A62 _0812BADC: .4byte gUnknown_03004210 -_0812BAE0: .4byte gUnknown_020238CC -_0812BAE4: .4byte gUnknown_03004330 +_0812BAE0: .4byte gDisplayedStringBattle +_0812BAE4: .4byte gBattleBankFunc _0812BAE8: .4byte sub_812B694 - thumb_func_end dp01t_10_6_message + thumb_func_end SafariHandlePrintString - thumb_func_start dp01t_11_6_message_for_player_only -dp01t_11_6_message_for_player_only: @ 812BAEC + thumb_func_start SafariHandlePrintStringPlayerOnly +SafariHandlePrintStringPlayerOnly: @ 812BAEC push {lr} - ldr r0, _0812BB04 @ =gUnknown_02024A60 + ldr r0, _0812BB04 @ =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0812BB08 - bl dp01t_10_6_message + bl SafariHandlePrintString b _0812BB0C .align 2, 0 -_0812BB04: .4byte gUnknown_02024A60 +_0812BB04: .4byte gActiveBank _0812BB08: - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted _0812BB0C: pop {r0} bx r0 - thumb_func_end dp01t_11_6_message_for_player_only + thumb_func_end SafariHandlePrintStringPlayerOnly .section .text_812BBFC thumb_func_start sub_812BBFC sub_812BBFC: @ 812BBFC push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BBFC @@ -1608,7 +1608,7 @@ sub_812BBFC: @ 812BBFC thumb_func_start sub_812BC08 sub_812BC08: @ 812BC08 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BC08 @@ -1624,30 +1624,30 @@ sub_812BC14: @ 812BC14 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0812BC44 @ =gUnknown_03004330 - ldr r2, _0812BC48 @ =gUnknown_02024A60 + ldr r1, _0812BC44 @ =gBattleBankFunc + ldr r2, _0812BC48 @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 ldr r1, _0812BC4C @ =sub_812B724 str r1, [r0] - ldr r1, _0812BC50 @ =gUnknown_02024E6C + ldr r1, _0812BC50 @ =gBankInMenu ldrb r0, [r2] strb r0, [r1] add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0812BC44: .4byte gUnknown_03004330 -_0812BC48: .4byte gUnknown_02024A60 +_0812BC44: .4byte gBattleBankFunc +_0812BC48: .4byte gActiveBank _0812BC4C: .4byte sub_812B724 -_0812BC50: .4byte gUnknown_02024E6C +_0812BC50: .4byte gBankInMenu thumb_func_end sub_812BC14 thumb_func_start sub_812BC54 sub_812BC54: @ 812BC54 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BC54 @@ -1655,7 +1655,7 @@ sub_812BC54: @ 812BC54 thumb_func_start sub_812BC60 sub_812BC60: @ 812BC60 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BC60 @@ -1663,7 +1663,7 @@ sub_812BC60: @ 812BC60 thumb_func_start sub_812BC6C sub_812BC6C: @ 812BC6C push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BC6C @@ -1671,7 +1671,7 @@ sub_812BC6C: @ 812BC6C thumb_func_start sub_812BC78 sub_812BC78: @ 812BC78 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BC78 @@ -1679,12 +1679,12 @@ sub_812BC78: @ 812BC78 thumb_func_start sub_812BC84 sub_812BC84: @ 812BC84 push {lr} - ldr r0, _0812BCB0 @ =gUnknown_03004340 - ldr r1, _0812BCB4 @ =gUnknown_02024A60 + ldr r0, _0812BCB0 @ =gHealthboxIDs + ldr r1, _0812BCB4 @ =gActiveBank ldrb r1, [r1] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _0812BCB8 @ =gUnknown_02024A6A + ldr r2, _0812BCB8 @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -1694,20 +1694,20 @@ sub_812BC84: @ 812BC84 adds r1, r2 movs r2, 0xB bl sub_8045A5C - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_0812BCB0: .4byte gUnknown_03004340 -_0812BCB4: .4byte gUnknown_02024A60 -_0812BCB8: .4byte gUnknown_02024A6A +_0812BCB0: .4byte gHealthboxIDs +_0812BCB4: .4byte gActiveBank +_0812BCB8: .4byte gBattlePartyID _0812BCBC: .4byte gPlayerParty thumb_func_end sub_812BC84 thumb_func_start sub_812BCC0 sub_812BCC0: @ 812BCC0 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BCC0 @@ -1715,7 +1715,7 @@ sub_812BCC0: @ 812BCC0 thumb_func_start sub_812BCCC sub_812BCCC: @ 812BCCC push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BCCC @@ -1723,7 +1723,7 @@ sub_812BCCC: @ 812BCCC thumb_func_start sub_812BCD8 sub_812BCD8: @ 812BCD8 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BCD8 @@ -1731,7 +1731,7 @@ sub_812BCD8: @ 812BCD8 thumb_func_start sub_812BCE4 sub_812BCE4: @ 812BCE4 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BCE4 @@ -1739,7 +1739,7 @@ sub_812BCE4: @ 812BCE4 thumb_func_start sub_812BCF0 sub_812BCF0: @ 812BCF0 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BCF0 @@ -1747,7 +1747,7 @@ sub_812BCF0: @ 812BCF0 thumb_func_start sub_812BCFC sub_812BCFC: @ 812BCFC push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BCFC @@ -1755,7 +1755,7 @@ sub_812BCFC: @ 812BCFC thumb_func_start sub_812BD08 sub_812BD08: @ 812BD08 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD08 @@ -1763,7 +1763,7 @@ sub_812BD08: @ 812BD08 thumb_func_start sub_812BD14 sub_812BD14: @ 812BD14 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD14 @@ -1771,7 +1771,7 @@ sub_812BD14: @ 812BD14 thumb_func_start sub_812BD20 sub_812BD20: @ 812BD20 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD20 @@ -1779,7 +1779,7 @@ sub_812BD20: @ 812BD20 thumb_func_start sub_812BD2C sub_812BD2C: @ 812BD2C push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD2C @@ -1787,7 +1787,7 @@ sub_812BD2C: @ 812BD2C thumb_func_start sub_812BD38 sub_812BD38: @ 812BD38 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD38 @@ -1795,7 +1795,7 @@ sub_812BD38: @ 812BD38 thumb_func_start sub_812BD44 sub_812BD44: @ 812BD44 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD44 @@ -1803,7 +1803,7 @@ sub_812BD44: @ 812BD44 thumb_func_start sub_812BD50 sub_812BD50: @ 812BD50 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD50 @@ -1811,7 +1811,7 @@ sub_812BD50: @ 812BD50 thumb_func_start sub_812BD5C sub_812BD5C: @ 812BD5C push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD5C @@ -1819,7 +1819,7 @@ sub_812BD5C: @ 812BD5C thumb_func_start sub_812BD68 sub_812BD68: @ 812BD68 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD68 @@ -1827,7 +1827,7 @@ sub_812BD68: @ 812BD68 thumb_func_start sub_812BD74 sub_812BD74: @ 812BD74 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BD74 @@ -1835,16 +1835,16 @@ sub_812BD74: @ 812BD74 thumb_func_start sub_812BD80 sub_812BD80: @ 812BD80 push {r4,lr} - ldr r4, _0812BDBC @ =gUnknown_02024A60 + ldr r4, _0812BDBC @ =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _0812BD94 movs r3, 0xC0 _0812BD94: - ldr r2, _0812BDC0 @ =gUnknown_02023A60 + ldr r2, _0812BDC0 @ =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -1858,20 +1858,20 @@ _0812BD94: lsls r1, r3, 24 asrs r1, 24 bl PlaySE12WithPanning - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r4} pop {r0} bx r0 .align 2, 0 -_0812BDBC: .4byte gUnknown_02024A60 -_0812BDC0: .4byte gUnknown_02023A60 +_0812BDBC: .4byte gActiveBank +_0812BDC0: .4byte gBattleBufferA thumb_func_end sub_812BD80 thumb_func_start sub_812BDC4 sub_812BDC4: @ 812BDC4 push {lr} - ldr r2, _0812BDEC @ =gUnknown_02023A60 - ldr r0, _0812BDF0 @ =gUnknown_02024A60 + ldr r2, _0812BDEC @ =gBattleBufferA + ldr r0, _0812BDF0 @ =gActiveBank ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -1883,19 +1883,19 @@ sub_812BDC4: @ 812BDC4 lsls r1, 8 orrs r0, r1 bl PlayFanfare - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_0812BDEC: .4byte gUnknown_02023A60 -_0812BDF0: .4byte gUnknown_02024A60 +_0812BDEC: .4byte gBattleBufferA +_0812BDF0: .4byte gActiveBank thumb_func_end sub_812BDC4 thumb_func_start sub_812BDF4 sub_812BDF4: @ 812BDF4 push {lr} - ldr r1, _0812BE24 @ =gUnknown_02024A6A - ldr r0, _0812BE28 @ =gUnknown_02024A60 + ldr r1, _0812BE24 @ =gBattlePartyID + ldr r0, _0812BE28 @ =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1910,20 +1910,20 @@ sub_812BDF4: @ 812BDF4 lsrs r0, 16 movs r1, 0x19 bl PlayCry1 - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_0812BE24: .4byte gUnknown_02024A6A -_0812BE28: .4byte gUnknown_02024A60 +_0812BE24: .4byte gBattlePartyID +_0812BE28: .4byte gActiveBank _0812BE2C: .4byte gPlayerParty thumb_func_end sub_812BDF4 thumb_func_start dp01t_2E_6_battle_intro dp01t_2E_6_battle_intro: @ 812BE30 push {lr} - ldr r1, _0812BE58 @ =gUnknown_02023A60 - ldr r0, _0812BE5C @ =gUnknown_02024A60 + ldr r1, _0812BE58 @ =gBattleBufferA + ldr r0, _0812BE5C @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -1935,24 +1935,24 @@ dp01t_2E_6_battle_intro: @ 812BE30 movs r1, 0x1 orrs r0, r1 strh r0, [r2] - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_0812BE58: .4byte gUnknown_02023A60 -_0812BE5C: .4byte gUnknown_02024A60 +_0812BE58: .4byte gBattleBufferA +_0812BE5C: .4byte gActiveBank _0812BE60: .4byte gUnknown_02024DE8 thumb_func_end dp01t_2E_6_battle_intro thumb_func_start sub_812BE64 sub_812BE64: @ 812BE64 push {r4,r5,lr} - ldr r5, _0812BEA0 @ =gUnknown_03004340 - ldr r4, _0812BEA4 @ =gUnknown_02024A60 + ldr r5, _0812BEA0 @ =gHealthboxIDs + ldr r4, _0812BEA4 @ =gActiveBank ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _0812BEA8 @ =gUnknown_02024A6A + ldr r2, _0812BEA8 @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -1968,21 +1968,21 @@ sub_812BE64: @ 812BE64 adds r0, r5 ldrb r0, [r0] bl sub_8043DFC - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0812BEA0: .4byte gUnknown_03004340 -_0812BEA4: .4byte gUnknown_02024A60 -_0812BEA8: .4byte gUnknown_02024A6A +_0812BEA0: .4byte gHealthboxIDs +_0812BEA4: .4byte gActiveBank +_0812BEA8: .4byte gBattlePartyID _0812BEAC: .4byte gPlayerParty thumb_func_end sub_812BE64 thumb_func_start sub_812BEB0 sub_812BEB0: @ 812BEB0 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BEB0 @@ -1990,7 +1990,7 @@ sub_812BEB0: @ 812BEB0 thumb_func_start sub_812BEBC sub_812BEBC: @ 812BEBC push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BEBC @@ -1998,7 +1998,7 @@ sub_812BEBC: @ 812BEBC thumb_func_start sub_812BEC8 sub_812BEC8: @ 812BEC8 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BEC8 @@ -2006,7 +2006,7 @@ sub_812BEC8: @ 812BEC8 thumb_func_start sub_812BED4 sub_812BED4: @ 812BED4 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BED4 @@ -2015,8 +2015,8 @@ sub_812BED4: @ 812BED4 sub_812BEE0: @ 812BEE0 push {r4-r6,lr} sub sp, 0x4 - ldr r5, _0812BF18 @ =gUnknown_02023A60 - ldr r6, _0812BF1C @ =gUnknown_02024A60 + ldr r5, _0812BF18 @ =gBattleBufferA + ldr r6, _0812BF1C @ =gActiveBank ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -2037,13 +2037,13 @@ sub_812BEE0: @ 812BEE0 lsls r0, 24 cmp r0, 0 beq _0812BF20 - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted b _0812BF2C .align 2, 0 -_0812BF18: .4byte gUnknown_02023A60 -_0812BF1C: .4byte gUnknown_02024A60 +_0812BF18: .4byte gBattleBufferA +_0812BF1C: .4byte gActiveBank _0812BF20: - ldr r0, _0812BF34 @ =gUnknown_03004330 + ldr r0, _0812BF34 @ =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -2055,14 +2055,14 @@ _0812BF2C: pop {r0} bx r0 .align 2, 0 -_0812BF34: .4byte gUnknown_03004330 +_0812BF34: .4byte gBattleBankFunc _0812BF38: .4byte sub_812B794 thumb_func_end sub_812BEE0 thumb_func_start sub_812BF3C sub_812BF3C: @ 812BF3C push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BF3C @@ -2070,7 +2070,7 @@ sub_812BF3C: @ 812BF3C thumb_func_start sub_812BF48 sub_812BF48: @ 812BF48 push {lr} - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_812BF48 @@ -2078,9 +2078,9 @@ sub_812BF48: @ 812BF48 thumb_func_start sub_812BF54 sub_812BF54: @ 812BF54 push {r4,lr} - ldr r2, _0812BF98 @ =gUnknown_02024D26 - ldr r1, _0812BF9C @ =gUnknown_02023A60 - ldr r4, _0812BFA0 @ =gUnknown_02024A60 + ldr r2, _0812BF98 @ =gBattleOutcome + ldr r1, _0812BF9C @ =gBattleBufferA + ldr r4, _0812BFA0 @ =gActiveBank ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -2091,14 +2091,14 @@ sub_812BF54: @ 812BF54 bl FadeOutMapMusic movs r0, 0x3 bl BeginFastPaletteFade - bl dp01_tbl6_exec_completed + bl SafariBufferExecCompleted ldr r0, _0812BFA4 @ =gBattleTypeFlags ldrh r1, [r0] movs r0, 0x6 ands r0, r1 cmp r0, 0x2 bne _0812BF90 - ldr r0, _0812BFA8 @ =gUnknown_03004330 + ldr r0, _0812BFA8 @ =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -2109,11 +2109,11 @@ _0812BF90: pop {r0} bx r0 .align 2, 0 -_0812BF98: .4byte gUnknown_02024D26 -_0812BF9C: .4byte gUnknown_02023A60 -_0812BFA0: .4byte gUnknown_02024A60 +_0812BF98: .4byte gBattleOutcome +_0812BF9C: .4byte gBattleBufferA +_0812BFA0: .4byte gActiveBank _0812BFA4: .4byte gBattleTypeFlags -_0812BFA8: .4byte gUnknown_03004330 +_0812BFA8: .4byte gBattleBankFunc _0812BFAC: .4byte sub_812B6AC thumb_func_end sub_812BF54 diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 28f6f9ada..bae3d9bc2 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -807,7 +807,7 @@ sub_812C720: @ 812C720 bl sub_807A3FC ldr r0, _0812C788 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812C754 @@ -960,7 +960,7 @@ sub_812C848: @ 812C848 bne _0812C89C ldr r0, _0812C888 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0812C88C @@ -1060,7 +1060,7 @@ sub_812C924: @ 812C924 lsrs r4, r0, 24 ldr r0, _0812C940 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1090,7 +1090,7 @@ sub_812C960: @ 812C960 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0812C974 @ =gUnknown_0202F7B8 + ldr r0, _0812C974 @ =gMoveDmgMoveAnim ldr r0, [r0] cmp r0, 0 ble _0812C97C @@ -1098,7 +1098,7 @@ sub_812C960: @ 812C960 movs r0, 0 b _0812C980 .align 2, 0 -_0812C974: .4byte gUnknown_0202F7B8 +_0812C974: .4byte gMoveDmgMoveAnim _0812C978: .4byte gBattleAnimArgs _0812C97C: ldr r1, _0812C98C @ =gBattleAnimArgs @@ -1689,7 +1689,7 @@ _0812CDF6: lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r7, r0, 24 adds r0, r6, 0 @@ -2577,7 +2577,7 @@ sub_812D4B4: @ 812D4B4 adds r4, r0, 0 ldr r0, _0812D4CC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812D4D4 @@ -2611,7 +2611,7 @@ sub_812D4EC: @ 812D4EC strh r0, [r4, 0x2E] ldr r0, _0812D50C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812D510 @@ -3046,7 +3046,7 @@ _0812D834: strh r0, [r1] ldr r0, _0812D854 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3137,7 +3137,7 @@ _0812D8F4: .4byte gBattleAnimPlayerMonIndex _0812D8F8: .4byte gBattleAnimEnemyMonIndex _0812D8FC: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r1, r0, 24 _0812D906: @@ -3228,7 +3228,7 @@ _0812D9A2: cmp r0, 0 beq _0812D9F0 ldr r3, _0812D9E4 @ =gSprites - ldr r4, _0812D9E8 @ =gUnknown_02024BE0 + ldr r4, _0812D9E8 @ =gObjectBankIDs ldr r2, _0812D9D4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r2] adds r0, r4 @@ -3249,11 +3249,11 @@ _0812D9D8: .4byte 0x040000d4 _0812D9DC: .4byte 0x84000200 _0812D9E0: .4byte 0x02019348 _0812D9E4: .4byte gSprites -_0812D9E8: .4byte gUnknown_02024BE0 +_0812D9E8: .4byte gObjectBankIDs _0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18 _0812D9F0: ldr r3, _0812DA34 @ =gSprites - ldr r4, _0812DA38 @ =gUnknown_02024BE0 + ldr r4, _0812DA38 @ =gObjectBankIDs ldr r2, _0812DA3C @ =gBattleAnimPlayerMonIndex ldrb r0, [r2] adds r0, r4 @@ -3289,7 +3289,7 @@ _0812DA2A: b _0812DAFA .align 2, 0 _0812DA34: .4byte gSprites -_0812DA38: .4byte gUnknown_02024BE0 +_0812DA38: .4byte gObjectBankIDs _0812DA3C: .4byte gBattleAnimPlayerMonIndex _0812DA40: .4byte gSpriteAffineAnimTable_81E7BEC _0812DA44: .4byte gTasks @@ -3331,7 +3331,7 @@ _0812DA84: strh r0, [r1] ldr r0, _0812DAA4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3356,7 +3356,7 @@ _0812DAAE: bne _0812DAF4 ldr r4, _0812DB0C @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3402,7 +3402,7 @@ c3_80DFBE4: @ 812DB18 lsrs r0, 24 ldr r4, _0812DB48 @ =gBattleAnimArgs ldr r3, _0812DB4C @ =gSprites - ldr r2, _0812DB50 @ =gUnknown_02024BE0 + ldr r2, _0812DB50 @ =gObjectBankIDs ldr r1, _0812DB54 @ =gBattleAnimPlayerMonIndex ldrb r1, [r1] adds r1, r2 @@ -3423,7 +3423,7 @@ c3_80DFBE4: @ 812DB18 .align 2, 0 _0812DB48: .4byte gBattleAnimArgs _0812DB4C: .4byte gSprites -_0812DB50: .4byte gUnknown_02024BE0 +_0812DB50: .4byte gObjectBankIDs _0812DB54: .4byte gBattleAnimPlayerMonIndex thumb_func_end c3_80DFBE4 @@ -3574,7 +3574,7 @@ _0812DC98: .4byte gUnknown_030041B4 _0812DC9C: ldr r0, _0812DCB4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812DCC0 @@ -4294,7 +4294,7 @@ _0812E25C: .4byte gUnknown_030041B4 _0812E260: ldr r0, _0812E2A0 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r4, r0, 24 bl IsDoubleBattle @@ -4379,7 +4379,7 @@ _0812E300: strh r0, [r5, 0xE] ldr r0, _0812E338 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4645,7 +4645,7 @@ _0812E50E: strh r0, [r4, 0x32] ldr r0, _0812E53C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812E540 @@ -4756,7 +4756,7 @@ _0812E5F8: ldr r0, _0812E630 @ =gBattleAnimEnemyMonIndex _0812E5FA: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4973,7 +4973,7 @@ sub_812E7A0: @ 812E7A0 adds r4, r0, 0 ldr r0, _0812E7BC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5017,7 +5017,7 @@ sub_812E7F0: @ 812E7F0 strh r0, [r4, 0x2E] ldr r0, _0812E830 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0812E834 @@ -5518,7 +5518,7 @@ _0812EBC2: cmp r0, 0 bne _0812EBE8 ldrb r0, [r6, 0x1E] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsls r2, r5, 4 cmp r0, 0 @@ -6066,13 +6066,13 @@ _0812F000: .4byte 0x02019348 _0812F004: ldr r0, _0812F070 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812F0AC movs r0, 0 str r0, [sp, 0x14] - ldr r6, _0812F074 @ =gUnknown_02024A6A + ldr r6, _0812F074 @ =gBattlePartyID ldr r4, _0812F078 @ =gBattleAnimEnemyMonIndex ldrb r0, [r4] lsls r0, 1 @@ -6102,7 +6102,7 @@ _0812F004: cmp r0, 0 bne _0812F0A4 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0812F084 @@ -6115,7 +6115,7 @@ _0812F004: b _0812F092 .align 2, 0 _0812F070: .4byte gBattleAnimPlayerMonIndex -_0812F074: .4byte gUnknown_02024A6A +_0812F074: .4byte gBattlePartyID _0812F078: .4byte gBattleAnimEnemyMonIndex _0812F07C: .4byte gPlayerParty _0812F080: .4byte 0x02017800 @@ -6144,7 +6144,7 @@ _0812F0A6: _0812F0AC: movs r2, 0x1 str r2, [sp, 0x14] - ldr r6, _0812F10C @ =gUnknown_02024A6A + ldr r6, _0812F10C @ =gBattlePartyID ldr r4, _0812F110 @ =gBattleAnimEnemyMonIndex ldrb r0, [r4] lsls r0, 1 @@ -6174,7 +6174,7 @@ _0812F0AC: cmp r0, 0 bne _0812F138 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0812F120 @@ -6187,7 +6187,7 @@ _0812F0AC: adds r0, r1 b _0812F12C .align 2, 0 -_0812F10C: .4byte gUnknown_02024A6A +_0812F10C: .4byte gBattlePartyID _0812F110: .4byte gBattleAnimEnemyMonIndex _0812F114: .4byte gEnemyParty _0812F118: .4byte 0x02017800 @@ -6479,7 +6479,7 @@ _0812F342: movs r0, 0x18 strh r0, [r4, 0x18] adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6509,7 +6509,7 @@ _0812F388: lsrs r0, 24 strh r0, [r4, 0x26] adds r0, r5, 0 - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6621,7 +6621,7 @@ sub_812F474: @ 812F474 ldr r1, _0812F4A8 @ =gTasks adds r6, r0, r1 ldrb r0, [r6, 0x12] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -7252,7 +7252,7 @@ sub_812F948: @ 812F948 bl StartSpriteAffineAnim ldr r0, _0812F9A4 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812F96E @@ -7673,7 +7673,7 @@ sub_812FC68: @ 812FC68 lsls r0, 3 mov r1, r8 adds r4, r0, r1 - ldr r1, _0812FCCC @ =gUnknown_02024BE0 + ldr r1, _0812FCCC @ =gObjectBankIDs ldr r2, _0812FCD0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r2] adds r0, r1 @@ -7697,7 +7697,7 @@ sub_812FC68: @ 812FC68 strh r0, [r4, 0x14] _0812FCAC: ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812FCDC @@ -7710,7 +7710,7 @@ _0812FCAC: b _0812FD4C .align 2, 0 _0812FCC8: .4byte gTasks -_0812FCCC: .4byte gUnknown_02024BE0 +_0812FCCC: .4byte gObjectBankIDs _0812FCD0: .4byte gBattleAnimPlayerMonIndex _0812FCD4: .4byte gBattleAnimArgs _0812FCD8: .4byte 0xffff8000 @@ -8251,7 +8251,7 @@ sub_81300F4: @ 81300F4 adds r5, r0, 0 ldr r6, _0813014C @ =gBattleAnimPlayerMonIndex ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8316,7 +8316,7 @@ _08130172: _08130180: ldr r0, _081301AC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _081301A0 @@ -8405,7 +8405,7 @@ _0813021C: _08130226: ldr r5, _0813025C @ =gBattleAnimPlayerMonIndex ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08130260 @@ -8943,7 +8943,7 @@ _081305C6: bl sub_80786EC mov r1, r10 ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -9901,7 +9901,7 @@ _08130D88: .4byte 0x0000ffff _08130D8C: ldr r0, _08130DA0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08130DA8 @@ -10166,7 +10166,7 @@ _08130F82: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -10553,7 +10553,7 @@ sub_8131264: @ 8131264 movs r1, 0x3 bl sub_8077ABC ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08131290 @@ -10695,7 +10695,7 @@ _08131384: cmp r0, 0 beq _081313C6 ldr r3, _081313F8 @ =gSprites - ldr r2, _081313FC @ =gUnknown_02024BE0 + ldr r2, _081313FC @ =gObjectBankIDs ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -10745,7 +10745,7 @@ _081313E8: .align 2, 0 _081313F4: .4byte gBattleAnimPlayerMonIndex _081313F8: .4byte gSprites -_081313FC: .4byte gUnknown_02024BE0 +_081313FC: .4byte gObjectBankIDs _08131400: .4byte gSpriteAffineAnimTable_81E7C18 _08131404: .4byte sub_8131408 thumb_func_end sub_81312E4 @@ -10934,7 +10934,7 @@ sub_8131564: @ 8131564 adds r5, r0, 0 ldr r4, _08131588 @ =gBattleAnimEnemyMonIndex ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08131590 @@ -11396,7 +11396,7 @@ sub_81318F0: @ 81318F0 ldr r3, _0813193C @ =gBattleAnimArgs movs r2, 0 strh r2, [r3, 0xE] - ldr r1, _08131940 @ =gUnknown_0202F7BE + ldr r1, _08131940 @ =gHappinessMoveAnim ldrb r0, [r1] ldrb r1, [r1] adds r0, r1, 0 @@ -11432,7 +11432,7 @@ _08131930: bx r0 .align 2, 0 _0813193C: .4byte gBattleAnimArgs -_08131940: .4byte gUnknown_0202F7BE +_08131940: .4byte gHappinessMoveAnim thumb_func_end sub_81318F0 thumb_func_start sub_8131944 @@ -11491,7 +11491,7 @@ _08131990: strh r0, [r6, 0xA] ldr r0, _081319E0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -11583,11 +11583,11 @@ _08131A70: .4byte gBattleAnimPlayerMonIndex _08131A74: ldr r4, _08131AD4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08131B10 - ldr r7, _08131AD8 @ =gUnknown_02024A6A + ldr r7, _08131AD8 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r7 @@ -11627,7 +11627,7 @@ _08131A74: b _08131AE6 .align 2, 0 _08131AD4: .4byte gBattleAnimPlayerMonIndex -_08131AD8: .4byte gUnknown_02024A6A +_08131AD8: .4byte gBattlePartyID _08131ADC: .4byte gPlayerParty _08131AE0: .4byte 0x02017800 _08131AE4: @@ -11654,7 +11654,7 @@ _08131AE6: .align 2, 0 _08131B0C: .4byte gSprites _08131B10: - ldr r7, _08131B64 @ =gUnknown_02024A6A + ldr r7, _08131B64 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r7 @@ -11693,7 +11693,7 @@ _08131B10: lsrs r5, r0, 16 b _08131B72 .align 2, 0 -_08131B64: .4byte gUnknown_02024A6A +_08131B64: .4byte gBattlePartyID _08131B68: .4byte gEnemyParty _08131B6C: .4byte 0x02017800 _08131B70: @@ -11796,7 +11796,7 @@ _08131C20: strh r0, [r6, 0xA] ldr r0, _08131C70 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -11853,7 +11853,7 @@ _08131C8E: bne _08131D0E ldr r0, _08131CE4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08131CEC @@ -11937,7 +11937,7 @@ _08131D40: bl sub_807A0F4 ldr r0, _08131D94 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -12000,7 +12000,7 @@ _08131DC4: mov r10, r0 ldrb r0, [r0] str r2, [sp, 0x10] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 mov r9, r4 ldr r2, [sp, 0x10] @@ -12146,7 +12146,7 @@ _08131ECA: strb r0, [r2] ldr r0, _08131F5C @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12220,7 +12220,7 @@ _08131FA6: strh r0, [r4, 0x32] ldr r0, _08131FD0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08131FD4 @@ -12327,7 +12327,7 @@ _08132084: .4byte gBattleAnimPlayerMonIndex _08132088: .4byte gBattleAnimEnemyMonIndex _0813208C: .4byte gTasks _08132090: - ldr r1, _081320CC @ =gUnknown_02024BE0 + ldr r1, _081320CC @ =gObjectBankIDs ldr r0, _081320D0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -12358,7 +12358,7 @@ _08132090: ldrsh r1, [r2, r3] b _0813215E .align 2, 0 -_081320CC: .4byte gUnknown_02024BE0 +_081320CC: .4byte gObjectBankIDs _081320D0: .4byte gBattleAnimPlayerMonIndex _081320D4: .4byte gSprites _081320D8: @@ -12386,7 +12386,7 @@ _081320EC: strh r1, [r0, 0x26] b _08132188 _08132104: - ldr r1, _08132144 @ =gUnknown_02024BE0 + ldr r1, _08132144 @ =gObjectBankIDs ldr r0, _08132148 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -12419,7 +12419,7 @@ _08132104: bgt _08132188 b _08132162 .align 2, 0 -_08132144: .4byte gUnknown_02024BE0 +_08132144: .4byte gObjectBankIDs _08132148: .4byte gBattleAnimPlayerMonIndex _0813214C: .4byte gSprites _08132150: @@ -12439,7 +12439,7 @@ _08132162: strh r0, [r2, 0x26] b _08132188 _0813216A: - ldr r1, _08132190 @ =gUnknown_02024BE0 + ldr r1, _08132190 @ =gObjectBankIDs ldr r0, _08132194 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -12458,7 +12458,7 @@ _08132188: pop {r0} bx r0 .align 2, 0 -_08132190: .4byte gUnknown_02024BE0 +_08132190: .4byte gObjectBankIDs _08132194: .4byte gBattleAnimPlayerMonIndex _08132198: .4byte gSprites thumb_func_end sub_8131FFC @@ -12481,7 +12481,7 @@ sub_813219C: @ 813219C strh r0, [r4, 0xE] ldr r0, _08132208 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -12664,7 +12664,7 @@ sub_8132318: @ 8132318 adds r4, r0, 0 ldr r0, _0813236C @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldrh r0, [r4, 0x2E] ldrh r1, [r4, 0x30] @@ -12708,7 +12708,7 @@ sub_8132370: @ 8132370 adds r4, r0, 0 ldr r0, _081323A8 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _081323B4 @@ -12943,7 +12943,7 @@ sub_8132528: @ 8132528 ldr r2, _08132544 @ =gBattleAnimArgs movs r0, 0 strh r0, [r2, 0xE] - ldr r0, _08132548 @ =gUnknown_0202F7C0 + ldr r0, _08132548 @ =gWeatherMoveAnim ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -12953,7 +12953,7 @@ sub_8132528: @ 8132528 b _0813256E .align 2, 0 _08132544: .4byte gBattleAnimArgs -_08132548: .4byte gUnknown_0202F7C0 +_08132548: .4byte gWeatherMoveAnim _0813254C: movs r0, 0x7 ands r0, r1 diff --git a/asm/battle_anim_8137220.s b/asm/battle_anim_8137220.s index 13773361a..f88a938e7 100644 --- a/asm/battle_anim_8137220.s +++ b/asm/battle_anim_8137220.s @@ -11,14 +11,14 @@ unref_sub_8137220: @ 8137220 bx lr thumb_func_end unref_sub_8137220 - thumb_func_start sub_8137224 -sub_8137224: @ 8137224 - ldr r1, _08137250 @ =gUnknown_03004330 - ldr r0, _08137254 @ =gUnknown_02024A60 + thumb_func_start SetBankFuncToWallyBufferRunCommand +SetBankFuncToWallyBufferRunCommand: @ 8137224 + ldr r1, _08137250 @ =gBattleBankFunc + ldr r0, _08137254 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08137258 @ =sub_813726C + ldr r1, _08137258 @ =WallyBufferRunCommand str r1, [r0] ldr r1, _0813725C @ =0x02000000 ldr r2, _08137260 @ =0x000160a8 @@ -36,21 +36,21 @@ sub_8137224: @ 8137224 strb r2, [r1] bx lr .align 2, 0 -_08137250: .4byte gUnknown_03004330 -_08137254: .4byte gUnknown_02024A60 -_08137258: .4byte sub_813726C +_08137250: .4byte gBattleBankFunc +_08137254: .4byte gActiveBank +_08137258: .4byte WallyBufferRunCommand _0813725C: .4byte 0x02000000 _08137260: .4byte 0x000160a8 _08137264: .4byte 0x000160a9 _08137268: .4byte 0x000160ab - thumb_func_end sub_8137224 + thumb_func_end SetBankFuncToWallyBufferRunCommand - thumb_func_start sub_813726C -sub_813726C: @ 813726C + thumb_func_start WallyBufferRunCommand +WallyBufferRunCommand: @ 813726C push {lr} - ldr r2, _081372A0 @ =gUnknown_02024A64 + ldr r2, _081372A0 @ =gBattleExecBuffer ldr r1, _081372A4 @ =gBitTable - ldr r0, _081372A8 @ =gUnknown_02024A60 + ldr r0, _081372A8 @ =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -59,13 +59,13 @@ sub_813726C: @ 813726C ands r1, r0 cmp r1, 0 beq _081372B8 - ldr r0, _081372AC @ =gUnknown_02023A60 + ldr r0, _081372AC @ =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _081372B4 - ldr r0, _081372B0 @ =gUnknown_084061A4 + ldr r0, _081372B0 @ =gWallyBufferCommands ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -73,17 +73,17 @@ sub_813726C: @ 813726C bl _call_via_r0 b _081372B8 .align 2, 0 -_081372A0: .4byte gUnknown_02024A64 +_081372A0: .4byte gBattleExecBuffer _081372A4: .4byte gBitTable -_081372A8: .4byte gUnknown_02024A60 -_081372AC: .4byte gUnknown_02023A60 -_081372B0: .4byte gUnknown_084061A4 +_081372A8: .4byte gActiveBank +_081372AC: .4byte gBattleBufferA +_081372B0: .4byte gWallyBufferCommands _081372B4: - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _081372B8: pop {r0} bx r0 - thumb_func_end sub_813726C + thumb_func_end WallyBufferRunCommand thumb_func_start sub_81372BC sub_81372BC: @ 81372BC @@ -140,7 +140,7 @@ _0813730E: movs r1, 0 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted ldr r2, _08137340 @ =0x000160a8 adds r1, r5, r2 b _0813738C @@ -179,7 +179,7 @@ _08137368: _0813737E: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted ldr r0, _081373A4 @ =0x000160a8 adds r1, r5, r0 _0813738C: @@ -239,7 +239,7 @@ _081373E8: movs r1, 0x1 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08137410: pop {r4-r6} pop {r0} @@ -252,8 +252,8 @@ _08137418: .4byte 0x000160aa sub_813741C: @ 813741C push {lr} ldr r2, _08137444 @ =gSprites - ldr r1, _08137448 @ =gUnknown_02024BE0 - ldr r0, _0813744C @ =gUnknown_02024A60 + ldr r1, _08137448 @ =gObjectBankIDs + ldr r0, _0813744C @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -266,14 +266,14 @@ sub_813741C: @ 813741C ldr r0, _08137450 @ =SpriteCallbackDummy cmp r1, r0 bne _08137440 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08137440: pop {r0} bx r0 .align 2, 0 _08137444: .4byte gSprites -_08137448: .4byte gUnknown_02024BE0 -_0813744C: .4byte gUnknown_02024A60 +_08137448: .4byte gObjectBankIDs +_0813744C: .4byte gActiveBank _08137450: .4byte SpriteCallbackDummy thumb_func_end sub_813741C @@ -284,7 +284,7 @@ sub_8137454: @ 8137454 ldrh r0, [r0, 0x16] cmp r0, 0 bne _08137462 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08137462: pop {r0} bx r0 @@ -309,7 +309,7 @@ sub_813746C: @ 813746C negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r0, _081374A8 @ =gUnknown_030042D0 + ldr r0, _081374A8 @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r2] ldr r0, [r2, 0x8] @@ -321,22 +321,22 @@ _08137496: _0813749C: .4byte gPaletteFade _081374A0: .4byte gMain _081374A4: .4byte 0x0000043d -_081374A8: .4byte gUnknown_030042D0 +_081374A8: .4byte gPreBattleCallback1 thumb_func_end sub_813746C thumb_func_start bx_wait_t5 bx_wait_t5: @ 81374AC push {lr} - ldr r0, _081374C0 @ =gUnknown_02024E6D + ldr r0, _081374C0 @ =gDoingBattleAnim ldrb r0, [r0] cmp r0, 0 bne _081374BA - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _081374BA: pop {r0} bx r0 .align 2, 0 -_081374C0: .4byte gUnknown_02024E6D +_081374C0: .4byte gDoingBattleAnim thumb_func_end bx_wait_t5 thumb_func_start sub_81374C4 @@ -348,8 +348,8 @@ sub_81374C4: @ 81374C4 ands r0, r1 cmp r0, 0 bne _081374E8 - ldr r1, _081374F0 @ =gUnknown_03004330 - ldr r0, _081374F4 @ =gUnknown_02024A60 + ldr r1, _081374F0 @ =gBattleBankFunc + ldr r0, _081374F4 @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -362,8 +362,8 @@ _081374E8: bx r0 .align 2, 0 _081374EC: .4byte gPaletteFade -_081374F0: .4byte gUnknown_03004330 -_081374F4: .4byte gUnknown_02024A60 +_081374F0: .4byte gBattleBankFunc +_081374F4: .4byte gActiveBank _081374F8: .4byte sub_81374FC thumb_func_end sub_81374C4 @@ -385,7 +385,7 @@ sub_81374FC: @ 81374FC ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08137522: pop {r0} bx r0 @@ -399,7 +399,7 @@ _08137534: .4byte gScriptItemId thumb_func_start sub_8137538 sub_8137538: @ 8137538 push {r4-r7,lr} - ldr r5, _0813768C @ =gUnknown_02024A60 + ldr r5, _0813768C @ =gActiveBank ldrb r2, [r5] lsls r3, r2, 1 adds r0, r3, r2 @@ -412,7 +412,7 @@ sub_8137538: @ 8137538 ands r0, r1 cmp r0, 0 bne _08137568 - ldr r0, _08137694 @ =gUnknown_02024A6A + ldr r0, _08137694 @ =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -435,7 +435,7 @@ _08137568: ands r0, r1 cmp r0, 0 bne _08137596 - ldr r0, _08137694 @ =gUnknown_02024A6A + ldr r0, _08137694 @ =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -488,13 +488,13 @@ _08137596: ldr r1, _081376A4 @ =gSprites adds r0, r1 bl DestroySprite - ldr r4, _081376A8 @ =gUnknown_03004340 + ldr r4, _081376A8 @ =gHealthboxIDs ldrb r0, [r5] adds r1, r6, 0 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08137694 @ =gUnknown_02024A6A + ldr r2, _08137694 @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -514,7 +514,7 @@ _08137596: bl sub_8043DFC _08137626: ldr r1, _081376A0 @ =gUnknown_0300434C - ldr r4, _0813768C @ =gUnknown_02024A60 + ldr r4, _0813768C @ =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -524,11 +524,11 @@ _08137626: ldr r1, _081376A4 @ =gSprites adds r0, r1 bl DestroySprite - ldr r5, _081376A8 @ =gUnknown_03004340 + ldr r5, _081376A8 @ =gHealthboxIDs ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _08137694 @ =gUnknown_02024A6A + ldr r2, _08137694 @ =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -550,7 +550,7 @@ _08137626: negs r0, r0 ands r0, r1 strb r0, [r2, 0x9] - ldr r1, _081376B0 @ =gUnknown_03004330 + ldr r1, _081376B0 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -561,16 +561,16 @@ _08137684: pop {r0} bx r0 .align 2, 0 -_0813768C: .4byte gUnknown_02024A60 +_0813768C: .4byte gActiveBank _08137690: .4byte 0x02017810 -_08137694: .4byte gUnknown_02024A6A +_08137694: .4byte gBattlePartyID _08137698: .4byte gPlayerParty _0813769C: .4byte gBattleTypeFlags _081376A0: .4byte gUnknown_0300434C _081376A4: .4byte gSprites -_081376A8: .4byte gUnknown_03004340 +_081376A8: .4byte gHealthboxIDs _081376AC: .4byte 0x02017840 -_081376B0: .4byte gUnknown_03004330 +_081376B0: .4byte gBattleBankFunc _081376B4: .4byte sub_81376B8 thumb_func_end sub_8137538 @@ -579,8 +579,8 @@ sub_81376B8: @ 81376B8 push {r4-r7,lr} movs r4, 0 ldr r2, _0813778C @ =gSprites - ldr r0, _08137790 @ =gUnknown_03004340 - ldr r7, _08137794 @ =gUnknown_02024A60 + ldr r0, _08137790 @ =gHealthboxIDs + ldr r7, _08137794 @ =gActiveBank ldrb r3, [r7] adds r0, r3, r0 ldrb r1, [r0] @@ -663,7 +663,7 @@ _081376DC: ldr r0, _081377A4 @ =c3_0802FDF4 movs r1, 0xA bl CreateTask - ldr r2, _081377A8 @ =gUnknown_02024A6A + ldr r2, _081377A8 @ =gBattlePartyID ldrb r1, [r7] lsls r0, r1, 1 adds r0, r2 @@ -673,29 +673,29 @@ _081376DC: ldr r2, _081377AC @ =gPlayerParty adds r0, r2 bl sub_80324F8 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08137784: pop {r4-r7} pop {r0} bx r0 .align 2, 0 _0813778C: .4byte gSprites -_08137790: .4byte gUnknown_03004340 -_08137794: .4byte gUnknown_02024A60 +_08137790: .4byte gHealthboxIDs +_08137794: .4byte gActiveBank _08137798: .4byte SpriteCallbackDummy _0813779C: .4byte 0x02017810 _081377A0: .4byte 0x000027f9 _081377A4: .4byte c3_0802FDF4 -_081377A8: .4byte gUnknown_02024A6A +_081377A8: .4byte gBattlePartyID _081377AC: .4byte gPlayerParty thumb_func_end sub_81376B8 thumb_func_start sub_81377B0 sub_81377B0: @ 81377B0 push {r4-r6,lr} - ldr r5, _081377F0 @ =gUnknown_02024A60 + ldr r5, _081377F0 @ =gActiveBank ldrb r0, [r5] - ldr r6, _081377F4 @ =gUnknown_03004340 + ldr r6, _081377F4 @ =gHealthboxIDs adds r1, r0, r6 ldrb r1, [r1] movs r2, 0 @@ -721,10 +721,10 @@ sub_81377B0: @ 81377B0 bl sub_80440EC b _08137812 .align 2, 0 -_081377F0: .4byte gUnknown_02024A60 -_081377F4: .4byte gUnknown_03004340 +_081377F0: .4byte gActiveBank +_081377F4: .4byte gHealthboxIDs _081377F8: - ldr r2, _08137818 @ =gUnknown_02024A6A + ldr r2, _08137818 @ =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -734,21 +734,21 @@ _081377F8: ldr r2, _0813781C @ =gPlayerParty adds r0, r2 bl sub_80324F8 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08137812: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08137818: .4byte gUnknown_02024A6A +_08137818: .4byte gBattlePartyID _0813781C: .4byte gPlayerParty thumb_func_end sub_81377B0 thumb_func_start bx_blink_t5 bx_blink_t5: @ 8137820 push {r4,lr} - ldr r1, _0813785C @ =gUnknown_02024BE0 - ldr r0, _08137860 @ =gUnknown_02024A60 + ldr r1, _0813785C @ =gObjectBankIDs + ldr r0, _08137860 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -770,15 +770,15 @@ bx_blink_t5: @ 8137820 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _08137868 @ =gUnknown_02024E6D + ldr r0, _08137868 @ =gDoingBattleAnim strb r3, [r0] - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted b _08137896 .align 2, 0 -_0813785C: .4byte gUnknown_02024BE0 -_08137860: .4byte gUnknown_02024A60 +_0813785C: .4byte gObjectBankIDs +_08137860: .4byte gActiveBank _08137864: .4byte gSprites -_08137868: .4byte gUnknown_02024E6D +_08137868: .4byte gDoingBattleAnim _0813786C: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -811,7 +811,7 @@ _08137896: thumb_func_start sub_813789C sub_813789C: @ 813789C push {r4-r6,lr} - ldr r6, _081378F4 @ =gUnknown_02024A60 + ldr r6, _081378F4 @ =gActiveBank ldrb r2, [r6] lsls r0, r2, 1 adds r0, r2 @@ -823,7 +823,7 @@ sub_813789C: @ 813789C ands r0, r1 cmp r0, 0 bne _081378EC - ldr r5, _081378FC @ =gUnknown_02024BE0 + ldr r5, _081378FC @ =gObjectBankIDs adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 @@ -840,30 +840,30 @@ sub_813789C: @ 813789C lsls r0, 2 adds r0, r4 bl DestroySprite - ldr r1, _08137904 @ =gUnknown_03004340 + ldr r1, _08137904 @ =gHealthboxIDs ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] bl sub_8043DB0 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _081378EC: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081378F4: .4byte gUnknown_02024A60 +_081378F4: .4byte gActiveBank _081378F8: .4byte 0x02017810 -_081378FC: .4byte gUnknown_02024BE0 +_081378FC: .4byte gObjectBankIDs _08137900: .4byte gSprites -_08137904: .4byte gUnknown_03004340 +_08137904: .4byte gHealthboxIDs thumb_func_end sub_813789C thumb_func_start sub_8137908 sub_8137908: @ 8137908 push {lr} ldr r2, _08137930 @ =gSprites - ldr r1, _08137934 @ =gUnknown_02024BE0 - ldr r0, _08137938 @ =gUnknown_02024A60 + ldr r1, _08137934 @ =gObjectBankIDs + ldr r0, _08137938 @ =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -876,21 +876,21 @@ sub_8137908: @ 8137908 ldr r0, _0813793C @ =SpriteCallbackDummy cmp r1, r0 bne _0813792C - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _0813792C: pop {r0} bx r0 .align 2, 0 _08137930: .4byte gSprites -_08137934: .4byte gUnknown_02024BE0 -_08137938: .4byte gUnknown_02024A60 +_08137934: .4byte gObjectBankIDs +_08137938: .4byte gActiveBank _0813793C: .4byte SpriteCallbackDummy thumb_func_end sub_8137908 thumb_func_start sub_8137940 sub_8137940: @ 8137940 push {lr} - ldr r0, _08137964 @ =gUnknown_02024A60 + ldr r0, _08137964 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -902,25 +902,25 @@ sub_8137940: @ 8137940 ands r0, r1 cmp r0, 0 bne _0813795E - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _0813795E: pop {r0} bx r0 .align 2, 0 -_08137964: .4byte gUnknown_02024A60 +_08137964: .4byte gActiveBank _08137968: .4byte 0x02017810 thumb_func_end sub_8137940 - thumb_func_start dp01_tbl5_exec_completed -dp01_tbl5_exec_completed: @ 813796C + thumb_func_start WallyBufferExecCompleted +WallyBufferExecCompleted: @ 813796C push {r4,lr} sub sp, 0x4 - ldr r1, _081379AC @ =gUnknown_03004330 - ldr r4, _081379B0 @ =gUnknown_02024A60 + ldr r1, _081379AC @ =gBattleBankFunc + ldr r4, _081379B0 @ =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081379B4 @ =sub_813726C + ldr r1, _081379B4 @ =WallyBufferRunCommand str r1, [r0] ldr r0, _081379B8 @ =gBattleTypeFlags ldrh r1, [r0] @@ -935,7 +935,7 @@ dp01_tbl5_exec_completed: @ 813796C movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _081379BC @ =gUnknown_02023A60 + ldr r1, _081379BC @ =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -943,13 +943,13 @@ dp01_tbl5_exec_completed: @ 813796C strb r1, [r0] b _081379D2 .align 2, 0 -_081379AC: .4byte gUnknown_03004330 -_081379B0: .4byte gUnknown_02024A60 -_081379B4: .4byte sub_813726C +_081379AC: .4byte gBattleBankFunc +_081379B0: .4byte gActiveBank +_081379B4: .4byte WallyBufferRunCommand _081379B8: .4byte gBattleTypeFlags -_081379BC: .4byte gUnknown_02023A60 +_081379BC: .4byte gBattleBufferA _081379C0: - ldr r2, _081379DC @ =gUnknown_02024A64 + ldr r2, _081379DC @ =gBattleExecBuffer ldr r1, _081379E0 @ =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -964,14 +964,14 @@ _081379D2: pop {r0} bx r0 .align 2, 0 -_081379DC: .4byte gUnknown_02024A64 +_081379DC: .4byte gBattleExecBuffer _081379E0: .4byte gBitTable - thumb_func_end dp01_tbl5_exec_completed + thumb_func_end WallyBufferExecCompleted thumb_func_start unref_sub_81379E4 unref_sub_81379E4: @ 81379E4 push {lr} - ldr r0, _08137A08 @ =gUnknown_02024A60 + ldr r0, _08137A08 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -983,12 +983,12 @@ unref_sub_81379E4: @ 81379E4 ands r0, r1 cmp r0, 0 bne _08137A02 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08137A02: pop {r0} bx r0 .align 2, 0 -_08137A08: .4byte gUnknown_02024A60 +_08137A08: .4byte gActiveBank _08137A0C: .4byte 0x02017810 thumb_func_end unref_sub_81379E4 @@ -997,8 +997,8 @@ dp01t_00_5_getattr: @ 8137A10 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _08137A3C @ =gUnknown_02023A60 - ldr r0, _08137A40 @ =gUnknown_02024A60 + ldr r1, _08137A3C @ =gBattleBufferA + ldr r0, _08137A40 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -1006,7 +1006,7 @@ dp01t_00_5_getattr: @ 8137A10 ldrb r0, [r1] cmp r0, 0 bne _08137A48 - ldr r0, _08137A44 @ =gUnknown_02024A6A + ldr r0, _08137A44 @ =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -1015,9 +1015,9 @@ dp01t_00_5_getattr: @ 8137A10 adds r6, r0, 0 b _08137A6A .align 2, 0 -_08137A3C: .4byte gUnknown_02023A60 -_08137A40: .4byte gUnknown_02024A60 -_08137A44: .4byte gUnknown_02024A6A +_08137A3C: .4byte gBattleBufferA +_08137A40: .4byte gActiveBank +_08137A44: .4byte gBattlePartyID _08137A48: ldrb r4, [r1] movs r5, 0 @@ -1043,7 +1043,7 @@ _08137A6A: movs r0, 0x1 mov r2, sp bl dp01_build_cmdbuf_x1D_1D_numargs_varargs - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted add sp, 0x100 pop {r4-r6} pop {r0} @@ -1062,8 +1062,8 @@ sub_8137A84: @ 8137A84 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _08137AB8 @ =gUnknown_02023A60 - ldr r3, _08137ABC @ =gUnknown_02024A60 + ldr r2, _08137AB8 @ =gBattleBufferA + ldr r3, _08137ABC @ =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -1079,8 +1079,8 @@ _08137AAE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08137AB8: .4byte gUnknown_02023A60 -_08137ABC: .4byte gUnknown_02024A60 +_08137AB8: .4byte gBattleBufferA +_08137ABC: .4byte gActiveBank _08137AC0: .4byte _08137AC4 .align 2, 0 _08137AC4: @@ -1995,8 +1995,8 @@ sub_8138230: @ 8138230 thumb_func_start sub_813823C sub_813823C: @ 813823C push {r4,r5,lr} - ldr r1, _08138260 @ =gUnknown_02023A60 - ldr r0, _08138264 @ =gUnknown_02024A60 + ldr r1, _08138260 @ =gBattleBufferA + ldr r0, _08138264 @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -2004,16 +2004,16 @@ sub_813823C: @ 813823C ldrb r0, [r1] cmp r0, 0 bne _0813826C - ldr r0, _08138268 @ =gUnknown_02024A6A + ldr r0, _08138268 @ =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_8138294 b _0813828A .align 2, 0 -_08138260: .4byte gUnknown_02023A60 -_08138264: .4byte gUnknown_02024A60 -_08138268: .4byte gUnknown_02024A6A +_08138260: .4byte gBattleBufferA +_08138264: .4byte gActiveBank +_08138268: .4byte gBattlePartyID _0813826C: ldrb r4, [r1] movs r5, 0 @@ -2032,7 +2032,7 @@ _0813827E: cmp r5, 0x5 bls _08138270 _0813828A: - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r4,r5} pop {r0} bx r0 @@ -2048,7 +2048,7 @@ sub_8138294: @ 8138294 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081382CC @ =gUnknown_02024A60 + ldr r0, _081382CC @ =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r2, _081382D0 @ =gUnknown_02023A63 @@ -2068,7 +2068,7 @@ _081382C0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_081382CC: .4byte gUnknown_02024A60 +_081382CC: .4byte gActiveBank _081382D0: .4byte gUnknown_02023A63 _081382D4: .4byte _081382D8 .align 2, 0 @@ -2320,7 +2320,7 @@ _08138560: muls r0, r5 ldr r1, _08138578 @ =gPlayerParty adds r0, r1 - ldr r1, _0813857C @ =gUnknown_02024A60 + ldr r1, _0813857C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2329,13 +2329,13 @@ _08138560: b _08138C5A .align 2, 0 _08138578: .4byte gPlayerParty -_0813857C: .4byte gUnknown_02024A60 +_0813857C: .4byte gActiveBank _08138580: movs r0, 0x64 muls r0, r5 ldr r1, _08138598 @ =gPlayerParty adds r0, r1 - ldr r1, _0813859C @ =gUnknown_02024A60 + ldr r1, _0813859C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2344,7 +2344,7 @@ _08138580: b _08138C5A .align 2, 0 _08138598: .4byte gPlayerParty -_0813859C: .4byte gUnknown_02024A60 +_0813859C: .4byte gActiveBank _081385A0: movs r0, 0 mov r8, r0 @@ -2392,8 +2392,8 @@ _081385F8: muls r0, r5 ldr r1, _08138614 @ =gPlayerParty adds r0, r1 - ldr r3, _08138618 @ =gUnknown_02023A60 - ldr r1, _0813861C @ =gUnknown_02024A60 + ldr r3, _08138618 @ =gBattleBufferA + ldr r1, _0813861C @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -2403,15 +2403,15 @@ _081385F8: b _0813869C .align 2, 0 _08138614: .4byte gPlayerParty -_08138618: .4byte gUnknown_02023A60 -_0813861C: .4byte gUnknown_02024A60 +_08138618: .4byte gBattleBufferA +_0813861C: .4byte gActiveBank _08138620: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r0, _0813867C @ =gPlayerParty adds r4, r0 - ldr r5, _08138680 @ =gUnknown_02024A60 + ldr r5, _08138680 @ =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -2449,14 +2449,14 @@ _08138620: b _08138C5A .align 2, 0 _0813867C: .4byte gPlayerParty -_08138680: .4byte gUnknown_02024A60 +_08138680: .4byte gActiveBank _08138684: movs r0, 0x64 muls r0, r5 ldr r1, _081386A8 @ =gPlayerParty adds r0, r1 - ldr r3, _081386AC @ =gUnknown_02023A60 - ldr r1, _081386B0 @ =gUnknown_02024A60 + ldr r3, _081386AC @ =gBattleBufferA + ldr r1, _081386B0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -2470,14 +2470,14 @@ _0813869C: b _08138C5A .align 2, 0 _081386A8: .4byte gPlayerParty -_081386AC: .4byte gUnknown_02023A60 -_081386B0: .4byte gUnknown_02024A60 +_081386AC: .4byte gBattleBufferA +_081386B0: .4byte gActiveBank _081386B4: movs r0, 0x64 muls r0, r5 ldr r1, _081386CC @ =gPlayerParty adds r0, r1 - ldr r1, _081386D0 @ =gUnknown_02024A60 + ldr r1, _081386D0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2486,13 +2486,13 @@ _081386B4: b _08138C5A .align 2, 0 _081386CC: .4byte gPlayerParty -_081386D0: .4byte gUnknown_02024A60 +_081386D0: .4byte gActiveBank _081386D4: movs r0, 0x64 muls r0, r5 ldr r1, _081386EC @ =gPlayerParty adds r0, r1 - ldr r1, _081386F0 @ =gUnknown_02024A60 + ldr r1, _081386F0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2501,13 +2501,13 @@ _081386D4: b _08138C5A .align 2, 0 _081386EC: .4byte gPlayerParty -_081386F0: .4byte gUnknown_02024A60 +_081386F0: .4byte gActiveBank _081386F4: movs r0, 0x64 muls r0, r5 ldr r1, _0813870C @ =gPlayerParty adds r0, r1 - ldr r1, _08138710 @ =gUnknown_02024A60 + ldr r1, _08138710 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2516,13 +2516,13 @@ _081386F4: b _08138C5A .align 2, 0 _0813870C: .4byte gPlayerParty -_08138710: .4byte gUnknown_02024A60 +_08138710: .4byte gActiveBank _08138714: movs r0, 0x64 muls r0, r5 ldr r1, _0813872C @ =gPlayerParty adds r0, r1 - ldr r1, _08138730 @ =gUnknown_02024A60 + ldr r1, _08138730 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2531,13 +2531,13 @@ _08138714: b _08138C5A .align 2, 0 _0813872C: .4byte gPlayerParty -_08138730: .4byte gUnknown_02024A60 +_08138730: .4byte gActiveBank _08138734: movs r0, 0x64 muls r0, r5 ldr r1, _0813874C @ =gPlayerParty adds r0, r1 - ldr r1, _08138750 @ =gUnknown_02024A60 + ldr r1, _08138750 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2546,13 +2546,13 @@ _08138734: b _08138C5A .align 2, 0 _0813874C: .4byte gPlayerParty -_08138750: .4byte gUnknown_02024A60 +_08138750: .4byte gActiveBank _08138754: movs r0, 0x64 muls r0, r5 ldr r1, _0813876C @ =gPlayerParty adds r0, r1 - ldr r1, _08138770 @ =gUnknown_02024A60 + ldr r1, _08138770 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2561,13 +2561,13 @@ _08138754: b _08138C5A .align 2, 0 _0813876C: .4byte gPlayerParty -_08138770: .4byte gUnknown_02024A60 +_08138770: .4byte gActiveBank _08138774: movs r0, 0x64 muls r0, r5 ldr r1, _0813878C @ =gPlayerParty adds r0, r1 - ldr r1, _08138790 @ =gUnknown_02024A60 + ldr r1, _08138790 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2576,13 +2576,13 @@ _08138774: b _08138C5A .align 2, 0 _0813878C: .4byte gPlayerParty -_08138790: .4byte gUnknown_02024A60 +_08138790: .4byte gActiveBank _08138794: movs r0, 0x64 muls r0, r5 ldr r1, _081387AC @ =gPlayerParty adds r0, r1 - ldr r1, _081387B0 @ =gUnknown_02024A60 + ldr r1, _081387B0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2591,13 +2591,13 @@ _08138794: b _08138C5A .align 2, 0 _081387AC: .4byte gPlayerParty -_081387B0: .4byte gUnknown_02024A60 +_081387B0: .4byte gActiveBank _081387B4: movs r0, 0x64 muls r0, r5 ldr r1, _081387CC @ =gPlayerParty adds r0, r1 - ldr r1, _081387D0 @ =gUnknown_02024A60 + ldr r1, _081387D0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2606,13 +2606,13 @@ _081387B4: b _08138C5A .align 2, 0 _081387CC: .4byte gPlayerParty -_081387D0: .4byte gUnknown_02024A60 +_081387D0: .4byte gActiveBank _081387D4: movs r0, 0x64 muls r0, r5 ldr r1, _081387EC @ =gPlayerParty adds r0, r1 - ldr r1, _081387F0 @ =gUnknown_02024A60 + ldr r1, _081387F0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2621,13 +2621,13 @@ _081387D4: b _08138C5A .align 2, 0 _081387EC: .4byte gPlayerParty -_081387F0: .4byte gUnknown_02024A60 +_081387F0: .4byte gActiveBank _081387F4: movs r0, 0x64 muls r0, r5 ldr r1, _0813880C @ =gPlayerParty adds r0, r1 - ldr r1, _08138810 @ =gUnknown_02024A60 + ldr r1, _08138810 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2636,13 +2636,13 @@ _081387F4: b _08138C5A .align 2, 0 _0813880C: .4byte gPlayerParty -_08138810: .4byte gUnknown_02024A60 +_08138810: .4byte gActiveBank _08138814: movs r0, 0x64 muls r0, r5 ldr r1, _0813882C @ =gPlayerParty adds r0, r1 - ldr r1, _08138830 @ =gUnknown_02024A60 + ldr r1, _08138830 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2651,13 +2651,13 @@ _08138814: b _08138C5A .align 2, 0 _0813882C: .4byte gPlayerParty -_08138830: .4byte gUnknown_02024A60 +_08138830: .4byte gActiveBank _08138834: movs r0, 0x64 muls r0, r5 ldr r1, _0813884C @ =gPlayerParty adds r0, r1 - ldr r1, _08138850 @ =gUnknown_02024A60 + ldr r1, _08138850 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2666,13 +2666,13 @@ _08138834: b _08138C5A .align 2, 0 _0813884C: .4byte gPlayerParty -_08138850: .4byte gUnknown_02024A60 +_08138850: .4byte gActiveBank _08138854: movs r0, 0x64 muls r0, r5 ldr r1, _0813886C @ =gPlayerParty adds r0, r1 - ldr r1, _08138870 @ =gUnknown_02024A60 + ldr r1, _08138870 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2681,14 +2681,14 @@ _08138854: b _08138C5A .align 2, 0 _0813886C: .4byte gPlayerParty -_08138870: .4byte gUnknown_02024A60 +_08138870: .4byte gActiveBank _08138874: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 ldr r0, _081388DC @ =gPlayerParty adds r4, r0 - ldr r5, _081388E0 @ =gUnknown_02024A60 + ldr r5, _081388E0 @ =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -2731,13 +2731,13 @@ _08138874: b _08138994 .align 2, 0 _081388DC: .4byte gPlayerParty -_081388E0: .4byte gUnknown_02024A60 +_081388E0: .4byte gActiveBank _081388E4: movs r0, 0x64 muls r0, r5 ldr r1, _081388FC @ =gPlayerParty adds r0, r1 - ldr r1, _08138900 @ =gUnknown_02024A60 + ldr r1, _08138900 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2746,13 +2746,13 @@ _081388E4: b _08138C5A .align 2, 0 _081388FC: .4byte gPlayerParty -_08138900: .4byte gUnknown_02024A60 +_08138900: .4byte gActiveBank _08138904: movs r0, 0x64 muls r0, r5 ldr r1, _0813891C @ =gPlayerParty adds r0, r1 - ldr r1, _08138920 @ =gUnknown_02024A60 + ldr r1, _08138920 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2761,13 +2761,13 @@ _08138904: b _08138C5A .align 2, 0 _0813891C: .4byte gPlayerParty -_08138920: .4byte gUnknown_02024A60 +_08138920: .4byte gActiveBank _08138924: movs r0, 0x64 muls r0, r5 ldr r1, _0813893C @ =gPlayerParty adds r0, r1 - ldr r1, _08138940 @ =gUnknown_02024A60 + ldr r1, _08138940 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2776,13 +2776,13 @@ _08138924: b _08138C5A .align 2, 0 _0813893C: .4byte gPlayerParty -_08138940: .4byte gUnknown_02024A60 +_08138940: .4byte gActiveBank _08138944: movs r0, 0x64 muls r0, r5 ldr r1, _0813895C @ =gPlayerParty adds r0, r1 - ldr r1, _08138960 @ =gUnknown_02024A60 + ldr r1, _08138960 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2791,13 +2791,13 @@ _08138944: b _08138C5A .align 2, 0 _0813895C: .4byte gPlayerParty -_08138960: .4byte gUnknown_02024A60 +_08138960: .4byte gActiveBank _08138964: movs r0, 0x64 muls r0, r5 ldr r1, _0813897C @ =gPlayerParty adds r0, r1 - ldr r1, _08138980 @ =gUnknown_02024A60 + ldr r1, _08138980 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2806,13 +2806,13 @@ _08138964: b _08138C5A .align 2, 0 _0813897C: .4byte gPlayerParty -_08138980: .4byte gUnknown_02024A60 +_08138980: .4byte gActiveBank _08138984: movs r0, 0x64 muls r0, r5 ldr r1, _0813899C @ =gPlayerParty adds r0, r1 - ldr r1, _081389A0 @ =gUnknown_02024A60 + ldr r1, _081389A0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2822,13 +2822,13 @@ _08138994: b _08138C5A .align 2, 0 _0813899C: .4byte gPlayerParty -_081389A0: .4byte gUnknown_02024A60 +_081389A0: .4byte gActiveBank _081389A4: movs r0, 0x64 muls r0, r5 ldr r1, _081389BC @ =gPlayerParty adds r0, r1 - ldr r1, _081389C0 @ =gUnknown_02024A60 + ldr r1, _081389C0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2837,13 +2837,13 @@ _081389A4: b _08138C5A .align 2, 0 _081389BC: .4byte gPlayerParty -_081389C0: .4byte gUnknown_02024A60 +_081389C0: .4byte gActiveBank _081389C4: movs r0, 0x64 muls r0, r5 ldr r1, _081389DC @ =gPlayerParty adds r0, r1 - ldr r1, _081389E0 @ =gUnknown_02024A60 + ldr r1, _081389E0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2852,13 +2852,13 @@ _081389C4: b _08138C5A .align 2, 0 _081389DC: .4byte gPlayerParty -_081389E0: .4byte gUnknown_02024A60 +_081389E0: .4byte gActiveBank _081389E4: movs r0, 0x64 muls r0, r5 ldr r1, _081389FC @ =gPlayerParty adds r0, r1 - ldr r1, _08138A00 @ =gUnknown_02024A60 + ldr r1, _08138A00 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2867,13 +2867,13 @@ _081389E4: b _08138C5A .align 2, 0 _081389FC: .4byte gPlayerParty -_08138A00: .4byte gUnknown_02024A60 +_08138A00: .4byte gActiveBank _08138A04: movs r0, 0x64 muls r0, r5 ldr r1, _08138A1C @ =gPlayerParty adds r0, r1 - ldr r1, _08138A20 @ =gUnknown_02024A60 + ldr r1, _08138A20 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2882,13 +2882,13 @@ _08138A04: b _08138C5A .align 2, 0 _08138A1C: .4byte gPlayerParty -_08138A20: .4byte gUnknown_02024A60 +_08138A20: .4byte gActiveBank _08138A24: movs r0, 0x64 muls r0, r5 ldr r1, _08138A3C @ =gPlayerParty adds r0, r1 - ldr r1, _08138A40 @ =gUnknown_02024A60 + ldr r1, _08138A40 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2897,13 +2897,13 @@ _08138A24: b _08138C5A .align 2, 0 _08138A3C: .4byte gPlayerParty -_08138A40: .4byte gUnknown_02024A60 +_08138A40: .4byte gActiveBank _08138A44: movs r0, 0x64 muls r0, r5 ldr r1, _08138A5C @ =gPlayerParty adds r0, r1 - ldr r1, _08138A60 @ =gUnknown_02024A60 + ldr r1, _08138A60 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2912,13 +2912,13 @@ _08138A44: b _08138C5A .align 2, 0 _08138A5C: .4byte gPlayerParty -_08138A60: .4byte gUnknown_02024A60 +_08138A60: .4byte gActiveBank _08138A64: movs r0, 0x64 muls r0, r5 ldr r1, _08138A7C @ =gPlayerParty adds r0, r1 - ldr r1, _08138A80 @ =gUnknown_02024A60 + ldr r1, _08138A80 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2927,13 +2927,13 @@ _08138A64: b _08138C5A .align 2, 0 _08138A7C: .4byte gPlayerParty -_08138A80: .4byte gUnknown_02024A60 +_08138A80: .4byte gActiveBank _08138A84: movs r0, 0x64 muls r0, r5 ldr r1, _08138A9C @ =gPlayerParty adds r0, r1 - ldr r1, _08138AA0 @ =gUnknown_02024A60 + ldr r1, _08138AA0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2942,13 +2942,13 @@ _08138A84: b _08138C5A .align 2, 0 _08138A9C: .4byte gPlayerParty -_08138AA0: .4byte gUnknown_02024A60 +_08138AA0: .4byte gActiveBank _08138AA4: movs r0, 0x64 muls r0, r5 ldr r1, _08138ABC @ =gPlayerParty adds r0, r1 - ldr r1, _08138AC0 @ =gUnknown_02024A60 + ldr r1, _08138AC0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2957,13 +2957,13 @@ _08138AA4: b _08138C5A .align 2, 0 _08138ABC: .4byte gPlayerParty -_08138AC0: .4byte gUnknown_02024A60 +_08138AC0: .4byte gActiveBank _08138AC4: movs r0, 0x64 muls r0, r5 ldr r1, _08138ADC @ =gPlayerParty adds r0, r1 - ldr r1, _08138AE0 @ =gUnknown_02024A60 + ldr r1, _08138AE0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2972,13 +2972,13 @@ _08138AC4: b _08138C5A .align 2, 0 _08138ADC: .4byte gPlayerParty -_08138AE0: .4byte gUnknown_02024A60 +_08138AE0: .4byte gActiveBank _08138AE4: movs r0, 0x64 muls r0, r5 ldr r1, _08138AFC @ =gPlayerParty adds r0, r1 - ldr r1, _08138B00 @ =gUnknown_02024A60 + ldr r1, _08138B00 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2987,13 +2987,13 @@ _08138AE4: b _08138C5A .align 2, 0 _08138AFC: .4byte gPlayerParty -_08138B00: .4byte gUnknown_02024A60 +_08138B00: .4byte gActiveBank _08138B04: movs r0, 0x64 muls r0, r5 ldr r1, _08138B1C @ =gPlayerParty adds r0, r1 - ldr r1, _08138B20 @ =gUnknown_02024A60 + ldr r1, _08138B20 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3002,13 +3002,13 @@ _08138B04: b _08138C5A .align 2, 0 _08138B1C: .4byte gPlayerParty -_08138B20: .4byte gUnknown_02024A60 +_08138B20: .4byte gActiveBank _08138B24: movs r0, 0x64 muls r0, r5 ldr r1, _08138B3C @ =gPlayerParty adds r0, r1 - ldr r1, _08138B40 @ =gUnknown_02024A60 + ldr r1, _08138B40 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3017,13 +3017,13 @@ _08138B24: b _08138C5A .align 2, 0 _08138B3C: .4byte gPlayerParty -_08138B40: .4byte gUnknown_02024A60 +_08138B40: .4byte gActiveBank _08138B44: movs r0, 0x64 muls r0, r5 ldr r1, _08138B5C @ =gPlayerParty adds r0, r1 - ldr r1, _08138B60 @ =gUnknown_02024A60 + ldr r1, _08138B60 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3032,13 +3032,13 @@ _08138B44: b _08138C5A .align 2, 0 _08138B5C: .4byte gPlayerParty -_08138B60: .4byte gUnknown_02024A60 +_08138B60: .4byte gActiveBank _08138B64: movs r0, 0x64 muls r0, r5 ldr r1, _08138B7C @ =gPlayerParty adds r0, r1 - ldr r1, _08138B80 @ =gUnknown_02024A60 + ldr r1, _08138B80 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3047,13 +3047,13 @@ _08138B64: b _08138C5A .align 2, 0 _08138B7C: .4byte gPlayerParty -_08138B80: .4byte gUnknown_02024A60 +_08138B80: .4byte gActiveBank _08138B84: movs r0, 0x64 muls r0, r5 ldr r1, _08138B9C @ =gPlayerParty adds r0, r1 - ldr r1, _08138BA0 @ =gUnknown_02024A60 + ldr r1, _08138BA0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3062,13 +3062,13 @@ _08138B84: b _08138C5A .align 2, 0 _08138B9C: .4byte gPlayerParty -_08138BA0: .4byte gUnknown_02024A60 +_08138BA0: .4byte gActiveBank _08138BA4: movs r0, 0x64 muls r0, r5 ldr r1, _08138BBC @ =gPlayerParty adds r0, r1 - ldr r1, _08138BC0 @ =gUnknown_02024A60 + ldr r1, _08138BC0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3077,13 +3077,13 @@ _08138BA4: b _08138C5A .align 2, 0 _08138BBC: .4byte gPlayerParty -_08138BC0: .4byte gUnknown_02024A60 +_08138BC0: .4byte gActiveBank _08138BC4: movs r0, 0x64 muls r0, r5 ldr r1, _08138BDC @ =gPlayerParty adds r0, r1 - ldr r1, _08138BE0 @ =gUnknown_02024A60 + ldr r1, _08138BE0 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3092,13 +3092,13 @@ _08138BC4: b _08138C5A .align 2, 0 _08138BDC: .4byte gPlayerParty -_08138BE0: .4byte gUnknown_02024A60 +_08138BE0: .4byte gActiveBank _08138BE4: movs r0, 0x64 muls r0, r5 ldr r1, _08138BFC @ =gPlayerParty adds r0, r1 - ldr r1, _08138C00 @ =gUnknown_02024A60 + ldr r1, _08138C00 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3107,13 +3107,13 @@ _08138BE4: b _08138C5A .align 2, 0 _08138BFC: .4byte gPlayerParty -_08138C00: .4byte gUnknown_02024A60 +_08138C00: .4byte gActiveBank _08138C04: movs r0, 0x64 muls r0, r5 ldr r1, _08138C1C @ =gPlayerParty adds r0, r1 - ldr r1, _08138C20 @ =gUnknown_02024A60 + ldr r1, _08138C20 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3122,13 +3122,13 @@ _08138C04: b _08138C5A .align 2, 0 _08138C1C: .4byte gPlayerParty -_08138C20: .4byte gUnknown_02024A60 +_08138C20: .4byte gActiveBank _08138C24: movs r0, 0x64 muls r0, r5 ldr r1, _08138C3C @ =gPlayerParty adds r0, r1 - ldr r1, _08138C40 @ =gUnknown_02024A60 + ldr r1, _08138C40 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3137,21 +3137,21 @@ _08138C24: b _08138C5A .align 2, 0 _08138C3C: .4byte gPlayerParty -_08138C40: .4byte gUnknown_02024A60 +_08138C40: .4byte gActiveBank _08138C44: movs r0, 0x64 muls r0, r5 ldr r1, _08138C84 @ =gPlayerParty adds r0, r1 - ldr r1, _08138C88 @ =gUnknown_02024A60 + ldr r1, _08138C88 @ =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl SetMonData _08138C5A: - ldr r2, _08138C8C @ =gUnknown_02024A6A - ldr r0, _08138C88 @ =gUnknown_02024A60 + ldr r2, _08138C8C @ =gBattlePartyID + ldr r0, _08138C88 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -3171,14 +3171,14 @@ _08138C5A: bx r0 .align 2, 0 _08138C84: .4byte gPlayerParty -_08138C88: .4byte gUnknown_02024A60 -_08138C8C: .4byte gUnknown_02024A6A +_08138C88: .4byte gActiveBank +_08138C8C: .4byte gBattlePartyID thumb_func_end sub_8138294 thumb_func_start sub_8138C90 sub_8138C90: @ 8138C90 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8138C90 @@ -3186,7 +3186,7 @@ sub_8138C90: @ 8138C90 thumb_func_start sub_8138C9C sub_8138C9C: @ 8138C9C push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8138C9C @@ -3194,7 +3194,7 @@ sub_8138C9C: @ 8138C9C thumb_func_start sub_8138CA8 sub_8138CA8: @ 8138CA8 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8138CA8 @@ -3202,8 +3202,8 @@ sub_8138CA8: @ 8138CA8 thumb_func_start sub_8138CB4 sub_8138CB4: @ 8138CB4 push {r4-r6,lr} - ldr r0, _08138CE0 @ =gUnknown_02023A60 - ldr r6, _08138CE4 @ =gUnknown_02024A60 + ldr r0, _08138CE0 @ =gBattleBufferA + ldr r6, _08138CE4 @ =gActiveBank ldrb r2, [r6] lsls r1, r2, 9 adds r0, 0x1 @@ -3215,7 +3215,7 @@ sub_8138CB4: @ 8138CB4 adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r0, _08138CE8 @ =gUnknown_03004330 + ldr r0, _08138CE8 @ =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -3223,12 +3223,12 @@ sub_8138CB4: @ 8138CB4 str r0, [r1] b _08138D26 .align 2, 0 -_08138CE0: .4byte gUnknown_02023A60 -_08138CE4: .4byte gUnknown_02024A60 -_08138CE8: .4byte gUnknown_03004330 +_08138CE0: .4byte gBattleBufferA +_08138CE4: .4byte gActiveBank +_08138CE8: .4byte gBattleBankFunc _08138CEC: .4byte sub_813789C _08138CF0: - ldr r5, _08138D2C @ =gUnknown_02024BE0 + ldr r5, _08138D2C @ =gObjectBankIDs adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 @@ -3245,31 +3245,31 @@ _08138CF0: lsls r0, 2 adds r0, r4 bl DestroySprite - ldr r1, _08138D34 @ =gUnknown_03004340 + ldr r1, _08138D34 @ =gHealthboxIDs ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] bl sub_8043DB0 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08138D26: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08138D2C: .4byte gUnknown_02024BE0 +_08138D2C: .4byte gObjectBankIDs _08138D30: .4byte gSprites -_08138D34: .4byte gUnknown_03004340 +_08138D34: .4byte gHealthboxIDs thumb_func_end sub_8138CB4 thumb_func_start sub_8138D38 sub_8138D38: @ 8138D38 push {r4-r6,lr} - ldr r4, _08138DE0 @ =gUnknown_02024A60 + ldr r4, _08138DE0 @ =gActiveBank ldrb r1, [r4] movs r0, 0x2 bl sub_8031AF4 ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3288,7 +3288,7 @@ sub_8138D38: @ 8138D38 movs r1, 0x50 movs r3, 0x1E bl CreateSprite - ldr r6, _08138DEC @ =gUnknown_02024BE0 + ldr r6, _08138DEC @ =gObjectBankIDs ldrb r1, [r4] adds r1, r6 strb r0, [r1] @@ -3334,7 +3334,7 @@ sub_8138D38: @ 8138D38 adds r0, r5 ldr r1, _08138DF8 @ =sub_80313A0 str r1, [r0] - ldr r1, _08138DFC @ =gUnknown_03004330 + ldr r1, _08138DFC @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3344,26 +3344,26 @@ sub_8138D38: @ 8138D38 pop {r0} bx r0 .align 2, 0 -_08138DE0: .4byte gUnknown_02024A60 +_08138DE0: .4byte gActiveBank _08138DE4: .4byte gUnknown_02024E8C _08138DE8: .4byte gTrainerBackPicCoords -_08138DEC: .4byte gUnknown_02024BE0 +_08138DEC: .4byte gObjectBankIDs _08138DF0: .4byte gSprites _08138DF4: .4byte 0x0000fffe _08138DF8: .4byte sub_80313A0 -_08138DFC: .4byte gUnknown_03004330 +_08138DFC: .4byte gBattleBankFunc _08138E00: .4byte sub_813741C thumb_func_end sub_8138D38 thumb_func_start sub_8138E04 sub_8138E04: @ 8138E04 push {r4-r6,lr} - ldr r4, _08138EAC @ =gUnknown_02024A60 + ldr r4, _08138EAC @ =gActiveBank ldrb r1, [r4] movs r0, 0x2 bl sub_8031AF4 ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3382,7 +3382,7 @@ sub_8138E04: @ 8138E04 movs r1, 0x50 movs r3, 0x1E bl CreateSprite - ldr r6, _08138EB8 @ =gUnknown_02024BE0 + ldr r6, _08138EB8 @ =gObjectBankIDs ldrb r1, [r4] adds r1, r6 strb r0, [r1] @@ -3428,7 +3428,7 @@ sub_8138E04: @ 8138E04 adds r0, r5 ldr r1, _08138EC4 @ =sub_80313A0 str r1, [r0] - ldr r1, _08138EC8 @ =gUnknown_03004330 + ldr r1, _08138EC8 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3438,21 +3438,21 @@ sub_8138E04: @ 8138E04 pop {r0} bx r0 .align 2, 0 -_08138EAC: .4byte gUnknown_02024A60 +_08138EAC: .4byte gActiveBank _08138EB0: .4byte gUnknown_02024E8C _08138EB4: .4byte gTrainerBackPicCoords -_08138EB8: .4byte gUnknown_02024BE0 +_08138EB8: .4byte gObjectBankIDs _08138EBC: .4byte gSprites _08138EC0: .4byte 0x0000ffa0 _08138EC4: .4byte sub_80313A0 -_08138EC8: .4byte gUnknown_03004330 +_08138EC8: .4byte gBattleBankFunc _08138ECC: .4byte sub_8137908 thumb_func_end sub_8138E04 thumb_func_start sub_8138ED0 sub_8138ED0: @ 8138ED0 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8138ED0 @@ -3460,7 +3460,7 @@ sub_8138ED0: @ 8138ED0 thumb_func_start sub_8138EDC sub_8138EDC: @ 8138EDC push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8138EDC @@ -3468,7 +3468,7 @@ sub_8138EDC: @ 8138EDC thumb_func_start sub_8138EE8 sub_8138EE8: @ 8138EE8 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8138EE8 @@ -3479,13 +3479,13 @@ sub_8138EF4: @ 8138EF4 ldr r1, _08138F30 @ =0x02017840 movs r0, 0x4 strb r0, [r1, 0x8] - ldr r1, _08138F34 @ =gUnknown_02024E6D + ldr r1, _08138F34 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] - ldr r5, _08138F38 @ =gUnknown_02024A60 + ldr r5, _08138F38 @ =gActiveBank ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -3493,7 +3493,7 @@ sub_8138EF4: @ 8138EF4 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, _08138F3C @ =gUnknown_03004330 + ldr r1, _08138F3C @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3504,17 +3504,17 @@ sub_8138EF4: @ 8138EF4 bx r0 .align 2, 0 _08138F30: .4byte 0x02017840 -_08138F34: .4byte gUnknown_02024E6D -_08138F38: .4byte gUnknown_02024A60 -_08138F3C: .4byte gUnknown_03004330 +_08138F34: .4byte gDoingBattleAnim +_08138F38: .4byte gActiveBank +_08138F3C: .4byte gBattleBankFunc _08138F40: .4byte bx_wait_t5 thumb_func_end sub_8138EF4 thumb_func_start sub_8138F44 sub_8138F44: @ 8138F44 push {r4,r5,lr} - ldr r1, _08138F88 @ =gUnknown_02023A60 - ldr r5, _08138F8C @ =gUnknown_02024A60 + ldr r1, _08138F88 @ =gBattleBufferA + ldr r5, _08138F8C @ =gActiveBank ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -3522,12 +3522,12 @@ sub_8138F44: @ 8138F44 ldrb r1, [r0] ldr r0, _08138F90 @ =0x02017840 strb r1, [r0, 0x8] - ldr r1, _08138F94 @ =gUnknown_02024E6D + ldr r1, _08138F94 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -3535,7 +3535,7 @@ sub_8138F44: @ 8138F44 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, _08138F98 @ =gUnknown_03004330 + ldr r1, _08138F98 @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3545,18 +3545,18 @@ sub_8138F44: @ 8138F44 pop {r0} bx r0 .align 2, 0 -_08138F88: .4byte gUnknown_02023A60 -_08138F8C: .4byte gUnknown_02024A60 +_08138F88: .4byte gBattleBufferA +_08138F8C: .4byte gActiveBank _08138F90: .4byte 0x02017840 -_08138F94: .4byte gUnknown_02024E6D -_08138F98: .4byte gUnknown_03004330 +_08138F94: .4byte gDoingBattleAnim +_08138F98: .4byte gBattleBankFunc _08138F9C: .4byte bx_wait_t5 thumb_func_end sub_8138F44 thumb_func_start sub_8138FA0 sub_8138FA0: @ 8138FA0 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8138FA0 @@ -3564,9 +3564,9 @@ sub_8138FA0: @ 8138FA0 thumb_func_start sub_8138FAC sub_8138FAC: @ 8138FAC push {r4-r6,lr} - ldr r0, _08139080 @ =gUnknown_02023A60 + ldr r0, _08139080 @ =gBattleBufferA mov r12, r0 - ldr r6, _08139084 @ =gUnknown_02024A60 + ldr r6, _08139084 @ =gActiveBank ldrb r2, [r6] lsls r2, 9 adds r0, 0x1 @@ -3584,7 +3584,7 @@ sub_8138FAC: @ 8138FAC adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, _0813908C @ =gUnknown_0202F7BC + ldr r4, _0813908C @ =gMovePowerMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3598,7 +3598,7 @@ sub_8138FAC: @ 8138FAC lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, _08139090 @ =gUnknown_0202F7B8 + ldr r4, _08139090 @ =gMoveDmgMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3624,7 +3624,7 @@ sub_8138FAC: @ 8138FAC lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, _08139094 @ =gUnknown_0202F7BE + ldr r3, _08139094 @ =gHappinessMoveAnim ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -3632,7 +3632,7 @@ sub_8138FAC: @ 8138FAC adds r1, r2 ldrb r1, [r1] strb r1, [r3] - ldr r4, _08139098 @ =gUnknown_0202F7C0 + ldr r4, _08139098 @ =gWeatherMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -3646,14 +3646,14 @@ sub_8138FAC: @ 8138FAC lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, _0813909C @ =gUnknown_0202F7B4 + ldr r3, _0813909C @ =gDisableStructMoveAnim ldrb r2, [r6] lsls r2, 9 mov r1, r12 adds r1, 0x10 adds r2, r1 str r2, [r3] - ldr r3, _081390A0 @ =gUnknown_02024E70 + ldr r3, _081390A0 @ =gPID_perBank ldrb r1, [r6] lsls r1, 2 adds r1, r3 @@ -3665,18 +3665,18 @@ sub_8138FAC: @ 8138FAC lsrs r2, r0, 24 cmp r2, 0 beq _081390A4 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted b _081390BE .align 2, 0 -_08139080: .4byte gUnknown_02023A60 -_08139084: .4byte gUnknown_02024A60 +_08139080: .4byte gBattleBufferA +_08139084: .4byte gActiveBank _08139088: .4byte gUnknown_0202F7C4 -_0813908C: .4byte gUnknown_0202F7BC -_08139090: .4byte gUnknown_0202F7B8 -_08139094: .4byte gUnknown_0202F7BE -_08139098: .4byte gUnknown_0202F7C0 -_0813909C: .4byte gUnknown_0202F7B4 -_081390A0: .4byte gUnknown_02024E70 +_0813908C: .4byte gMovePowerMoveAnim +_08139090: .4byte gMoveDmgMoveAnim +_08139094: .4byte gHappinessMoveAnim +_08139098: .4byte gWeatherMoveAnim +_0813909C: .4byte gDisableStructMoveAnim +_081390A0: .4byte gPID_perBank _081390A4: ldrb r1, [r6] lsls r0, r1, 1 @@ -3685,7 +3685,7 @@ _081390A4: ldr r1, _081390C4 @ =0x02017810 adds r0, r1 strb r2, [r0, 0x4] - ldr r1, _081390C8 @ =gUnknown_03004330 + ldr r1, _081390C8 @ =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -3697,7 +3697,7 @@ _081390BE: bx r0 .align 2, 0 _081390C4: .4byte 0x02017810 -_081390C8: .4byte gUnknown_03004330 +_081390C8: .4byte gBattleBankFunc _081390CC: .4byte sub_81390D0 thumb_func_end sub_8138FAC @@ -3706,8 +3706,8 @@ sub_81390D0: @ 81390D0 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r2, _0813910C @ =gUnknown_02023A60 - ldr r5, _08139110 @ =gUnknown_02024A60 + ldr r2, _0813910C @ =gBattleBufferA + ldr r5, _08139110 @ =gActiveBank ldrb r3, [r5] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -3733,8 +3733,8 @@ sub_81390D0: @ 81390D0 beq _08139122 b _081391FC .align 2, 0 -_0813910C: .4byte gUnknown_02023A60 -_08139110: .4byte gUnknown_02024A60 +_0813910C: .4byte gBattleBufferA +_08139110: .4byte gActiveBank _08139114: .4byte 0x02017810 _08139118: cmp r2, 0x2 @@ -3845,7 +3845,7 @@ _081391C4: lsls r0, 2 adds r0, r6 strb r4, [r0, 0x4] - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _081391FC: pop {r3} mov r8, r3 @@ -3863,7 +3863,7 @@ sub_8139208: @ 8139208 strh r1, [r0] ldr r0, _08139258 @ =gUnknown_030042A0 strh r1, [r0] - ldr r5, _0813925C @ =gUnknown_02024A60 + ldr r5, _0813925C @ =gActiveBank ldrb r0, [r5] lsls r0, 9 ldr r1, _08139260 @ =gUnknown_02023A62 @@ -3874,15 +3874,15 @@ sub_8139208: @ 8139208 bl DestroyMenuCursor _0813922A: ldrh r0, [r4] - bl sub_8120AA8 + bl BufferStringBattle ldr r0, _08139264 @ =gUnknown_03004210 - ldr r1, _08139268 @ =gUnknown_020238CC + ldr r1, _08139268 @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 movs r3, 0x2 bl sub_8002EB0 - ldr r1, _0813926C @ =gUnknown_03004330 + ldr r1, _0813926C @ =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3895,29 +3895,29 @@ _0813922A: .align 2, 0 _08139254: .4byte gUnknown_030042A4 _08139258: .4byte gUnknown_030042A0 -_0813925C: .4byte gUnknown_02024A60 +_0813925C: .4byte gActiveBank _08139260: .4byte gUnknown_02023A62 _08139264: .4byte gUnknown_03004210 -_08139268: .4byte gUnknown_020238CC -_0813926C: .4byte gUnknown_03004330 +_08139268: .4byte gDisplayedStringBattle +_0813926C: .4byte gBattleBankFunc _08139270: .4byte sub_8137454 thumb_func_end sub_8139208 thumb_func_start dp01t_11_5_message_for_player_only dp01t_11_5_message_for_player_only: @ 8139274 push {lr} - ldr r0, _0813928C @ =gUnknown_02024A60 + ldr r0, _0813928C @ =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08139290 bl sub_8139208 b _08139294 .align 2, 0 -_0813928C: .4byte gUnknown_02024A60 +_0813928C: .4byte gActiveBank _08139290: - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08139294: pop {r0} bx r0 @@ -3954,8 +3954,8 @@ sub_8139298: @ 8139298 movs r2, 0x2 movs r3, 0x23 bl FillWindowRect_DefaultPalette - ldr r1, _08139358 @ =gUnknown_03004330 - ldr r0, _0813935C @ =gUnknown_02024A60 + ldr r1, _08139358 @ =gBattleBankFunc + ldr r0, _0813935C @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -3989,9 +3989,9 @@ _0813930C: movs r1, 0 bl sub_802E3E4 ldr r0, _08139370 @ =gUnknown_08400CCC - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r4, _08139354 @ =gUnknown_03004210 - ldr r1, _08139374 @ =gUnknown_020238CC + ldr r1, _08139374 @ =gDisplayedStringBattle movs r2, 0xDC lsls r2, 1 movs r0, 0x23 @@ -4009,20 +4009,20 @@ _0813930C: _0813934C: .4byte gUnknown_030042A4 _08139350: .4byte gUnknown_030042A0 _08139354: .4byte gUnknown_03004210 -_08139358: .4byte gUnknown_03004330 -_0813935C: .4byte gUnknown_02024A60 +_08139358: .4byte gBattleBankFunc +_0813935C: .4byte gActiveBank _08139360: .4byte sub_81372BC _08139364: .4byte gUnknown_08400CF3 _08139368: .4byte 0x0000ffff _0813936C: .4byte 0x00002d9f _08139370: .4byte gUnknown_08400CCC -_08139374: .4byte gUnknown_020238CC +_08139374: .4byte gDisplayedStringBattle thumb_func_end sub_8139298 thumb_func_start sub_8139378 sub_8139378: @ 8139378 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139378 @@ -4069,7 +4069,7 @@ _081393B2: movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _081393DE: pop {r4,r5} pop {r0} @@ -4090,30 +4090,30 @@ sub_81393EC: @ 81393EC movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0813941C @ =gUnknown_03004330 - ldr r2, _08139420 @ =gUnknown_02024A60 + ldr r1, _0813941C @ =gBattleBankFunc + ldr r2, _08139420 @ =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 ldr r1, _08139424 @ =sub_81374C4 str r1, [r0] - ldr r1, _08139428 @ =gUnknown_02024E6C + ldr r1, _08139428 @ =gBankInMenu ldrb r0, [r2] strb r0, [r1] add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0813941C: .4byte gUnknown_03004330 -_08139420: .4byte gUnknown_02024A60 +_0813941C: .4byte gBattleBankFunc +_08139420: .4byte gActiveBank _08139424: .4byte sub_81374C4 -_08139428: .4byte gUnknown_02024E6C +_08139428: .4byte gBankInMenu thumb_func_end sub_81393EC thumb_func_start sub_813942C sub_813942C: @ 813942C push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_813942C @@ -4121,7 +4121,7 @@ sub_813942C: @ 813942C thumb_func_start sub_8139438 sub_8139438: @ 8139438 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139438 @@ -4135,8 +4135,8 @@ sub_8139444: @ 8139444 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _081394BC @ =gUnknown_02023A60 - ldr r0, _081394C0 @ =gUnknown_02024A60 + ldr r3, _081394BC @ =gBattleBufferA + ldr r0, _081394C0 @ =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -4153,7 +4153,7 @@ sub_8139444: @ 8139444 ldr r0, _081394C4 @ =0x00007fff cmp r7, r0 beq _081394D4 - ldr r6, _081394C8 @ =gUnknown_02024A6A + ldr r6, _081394C8 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -4176,7 +4176,7 @@ sub_8139444: @ 8139444 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _081394D0 @ =gUnknown_03004340 + ldr r1, _081394D0 @ =gHealthboxIDs adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -4184,14 +4184,14 @@ sub_8139444: @ 8139444 bl sub_8043D84 b _0813950E .align 2, 0 -_081394BC: .4byte gUnknown_02023A60 -_081394C0: .4byte gUnknown_02024A60 +_081394BC: .4byte gBattleBufferA +_081394C0: .4byte gActiveBank _081394C4: .4byte 0x00007fff -_081394C8: .4byte gUnknown_02024A6A +_081394C8: .4byte gBattlePartyID _081394CC: .4byte gPlayerParty -_081394D0: .4byte gUnknown_03004340 +_081394D0: .4byte gHealthboxIDs _081394D4: - ldr r1, _0813952C @ =gUnknown_02024A6A + ldr r1, _0813952C @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -4204,7 +4204,7 @@ _081394D4: adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r4, _08139534 @ =gUnknown_03004340 + ldr r4, _08139534 @ =gHealthboxIDs adds r1, r0, r4 ldrb r1, [r1] str r7, [sp] @@ -4218,8 +4218,8 @@ _081394D4: movs r2, 0 bl sub_80440EC _0813950E: - ldr r1, _08139538 @ =gUnknown_03004330 - ldr r0, _0813953C @ =gUnknown_02024A60 + ldr r1, _08139538 @ =gBattleBankFunc + ldr r0, _0813953C @ =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4233,18 +4233,18 @@ _0813950E: pop {r0} bx r0 .align 2, 0 -_0813952C: .4byte gUnknown_02024A6A +_0813952C: .4byte gBattlePartyID _08139530: .4byte gPlayerParty -_08139534: .4byte gUnknown_03004340 -_08139538: .4byte gUnknown_03004330 -_0813953C: .4byte gUnknown_02024A60 +_08139534: .4byte gHealthboxIDs +_08139538: .4byte gBattleBankFunc +_0813953C: .4byte gActiveBank _08139540: .4byte sub_81377B0 thumb_func_end sub_8139444 thumb_func_start sub_8139544 sub_8139544: @ 8139544 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139544 @@ -4252,7 +4252,7 @@ sub_8139544: @ 8139544 thumb_func_start sub_8139550 sub_8139550: @ 8139550 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139550 @@ -4260,7 +4260,7 @@ sub_8139550: @ 8139550 thumb_func_start sub_813955C sub_813955C: @ 813955C push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_813955C @@ -4268,7 +4268,7 @@ sub_813955C: @ 813955C thumb_func_start sub_8139568 sub_8139568: @ 8139568 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139568 @@ -4276,7 +4276,7 @@ sub_8139568: @ 8139568 thumb_func_start sub_8139574 sub_8139574: @ 8139574 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139574 @@ -4284,7 +4284,7 @@ sub_8139574: @ 8139574 thumb_func_start sub_8139580 sub_8139580: @ 8139580 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139580 @@ -4292,7 +4292,7 @@ sub_8139580: @ 8139580 thumb_func_start sub_813958C sub_813958C: @ 813958C push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_813958C @@ -4300,7 +4300,7 @@ sub_813958C: @ 813958C thumb_func_start sub_8139598 sub_8139598: @ 8139598 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139598 @@ -4308,7 +4308,7 @@ sub_8139598: @ 8139598 thumb_func_start sub_81395A4 sub_81395A4: @ 81395A4 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81395A4 @@ -4316,7 +4316,7 @@ sub_81395A4: @ 81395A4 thumb_func_start sub_81395B0 sub_81395B0: @ 81395B0 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81395B0 @@ -4324,7 +4324,7 @@ sub_81395B0: @ 81395B0 thumb_func_start sub_81395BC sub_81395BC: @ 81395BC push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81395BC @@ -4332,7 +4332,7 @@ sub_81395BC: @ 81395BC thumb_func_start sub_81395C8 sub_81395C8: @ 81395C8 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81395C8 @@ -4340,7 +4340,7 @@ sub_81395C8: @ 81395C8 thumb_func_start sub_81395D4 sub_81395D4: @ 81395D4 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81395D4 @@ -4348,7 +4348,7 @@ sub_81395D4: @ 81395D4 thumb_func_start sub_81395E0 sub_81395E0: @ 81395E0 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81395E0 @@ -4356,7 +4356,7 @@ sub_81395E0: @ 81395E0 thumb_func_start sub_81395EC sub_81395EC: @ 81395EC push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81395EC @@ -4364,7 +4364,7 @@ sub_81395EC: @ 81395EC thumb_func_start sub_81395F8 sub_81395F8: @ 81395F8 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_81395F8 @@ -4373,8 +4373,8 @@ sub_81395F8: @ 81395F8 sub_8139604: @ 8139604 push {r4,lr} ldr r3, _0813962C @ =gSprites - ldr r2, _08139630 @ =gUnknown_02024BE0 - ldr r4, _08139634 @ =gUnknown_02024A60 + ldr r2, _08139630 @ =gObjectBankIDs + ldr r4, _08139634 @ =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -4387,14 +4387,14 @@ sub_8139604: @ 8139604 lsls r0, 29 cmp r0, 0 bge _08139638 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted b _08139662 .align 2, 0 _0813962C: .4byte gSprites -_08139630: .4byte gUnknown_02024BE0 -_08139634: .4byte gUnknown_02024A60 +_08139630: .4byte gObjectBankIDs +_08139634: .4byte gActiveBank _08139638: - ldr r1, _08139668 @ =gUnknown_02024E6D + ldr r1, _08139668 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -4408,7 +4408,7 @@ _08139638: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_8047858 - ldr r1, _0813966C @ =gUnknown_03004330 + ldr r1, _0813966C @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4419,15 +4419,15 @@ _08139662: pop {r0} bx r0 .align 2, 0 -_08139668: .4byte gUnknown_02024E6D -_0813966C: .4byte gUnknown_03004330 +_08139668: .4byte gDoingBattleAnim +_0813966C: .4byte gBattleBankFunc _08139670: .4byte bx_blink_t5 thumb_func_end sub_8139604 thumb_func_start sub_8139674 sub_8139674: @ 8139674 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139674 @@ -4435,8 +4435,8 @@ sub_8139674: @ 8139674 thumb_func_start sub_8139680 sub_8139680: @ 8139680 push {lr} - ldr r2, _081396A8 @ =gUnknown_02023A60 - ldr r0, _081396AC @ =gUnknown_02024A60 + ldr r2, _081396A8 @ =gBattleBufferA + ldr r0, _081396AC @ =gActiveBank ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -4448,19 +4448,19 @@ sub_8139680: @ 8139680 lsls r1, 8 orrs r0, r1 bl PlaySE - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_081396A8: .4byte gUnknown_02023A60 -_081396AC: .4byte gUnknown_02024A60 +_081396A8: .4byte gBattleBufferA +_081396AC: .4byte gActiveBank thumb_func_end sub_8139680 thumb_func_start sub_81396B0 sub_81396B0: @ 81396B0 push {lr} - ldr r2, _081396D8 @ =gUnknown_02023A60 - ldr r0, _081396DC @ =gUnknown_02024A60 + ldr r2, _081396D8 @ =gBattleBufferA + ldr r0, _081396DC @ =gActiveBank ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -4472,19 +4472,19 @@ sub_81396B0: @ 81396B0 lsls r1, 8 orrs r0, r1 bl PlayFanfare - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_081396D8: .4byte gUnknown_02023A60 -_081396DC: .4byte gUnknown_02024A60 +_081396D8: .4byte gBattleBufferA +_081396DC: .4byte gActiveBank thumb_func_end sub_81396B0 thumb_func_start sub_81396E0 sub_81396E0: @ 81396E0 push {lr} - ldr r1, _08139710 @ =gUnknown_02024A6A - ldr r0, _08139714 @ =gUnknown_02024A60 + ldr r1, _08139710 @ =gBattlePartyID + ldr r0, _08139714 @ =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -4499,20 +4499,20 @@ sub_81396E0: @ 81396E0 lsrs r0, 16 movs r1, 0x19 bl PlayCry1 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08139710: .4byte gUnknown_02024A6A -_08139714: .4byte gUnknown_02024A60 +_08139710: .4byte gBattlePartyID +_08139714: .4byte gActiveBank _08139718: .4byte gPlayerParty thumb_func_end sub_81396E0 thumb_func_start dp01t_2E_5_battle_intro dp01t_2E_5_battle_intro: @ 813971C push {lr} - ldr r1, _08139744 @ =gUnknown_02023A60 - ldr r0, _08139748 @ =gUnknown_02024A60 + ldr r1, _08139744 @ =gBattleBufferA + ldr r0, _08139748 @ =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4524,20 +4524,20 @@ dp01t_2E_5_battle_intro: @ 813971C movs r1, 0x1 orrs r0, r1 strh r0, [r2] - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 .align 2, 0 -_08139744: .4byte gUnknown_02023A60 -_08139748: .4byte gUnknown_02024A60 +_08139744: .4byte gBattleBufferA +_08139748: .4byte gActiveBank _0813974C: .4byte gUnknown_02024DE8 thumb_func_end dp01t_2E_5_battle_intro thumb_func_start sub_8139750 sub_8139750: @ 8139750 push {r4-r7,lr} - ldr r6, _08139880 @ =gUnknown_02024BE0 - ldr r7, _08139884 @ =gUnknown_02024A60 + ldr r6, _08139880 @ =gObjectBankIDs + ldr r7, _08139884 @ =gActiveBank ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] @@ -4673,7 +4673,7 @@ _08139864: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _081398B4 @ =gUnknown_03004330 + ldr r1, _081398B4 @ =gBattleBankFunc ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -4683,8 +4683,8 @@ _08139864: pop {r0} bx r0 .align 2, 0 -_08139880: .4byte gUnknown_02024BE0 -_08139884: .4byte gUnknown_02024A60 +_08139880: .4byte gObjectBankIDs +_08139884: .4byte gActiveBank _08139888: .4byte gSprites _0813988C: .4byte 0x0000ffd8 _08139890: .4byte sub_8078B34 @@ -4696,7 +4696,7 @@ _081398A4: .4byte gTasks _081398A8: .4byte 0x02017810 _081398AC: .4byte gUnknown_02024E68 _081398B0: .4byte sub_8044CA0 -_081398B4: .4byte gUnknown_03004330 +_081398B4: .4byte gBattleBankFunc _081398B8: .4byte nullsub_91 thumb_func_end sub_8139750 @@ -4715,10 +4715,10 @@ sub_81398BC: @ 81398BC adds r0, r1 movs r1, 0 strh r1, [r0, 0x2] - ldr r0, _08139A04 @ =gUnknown_02024A6A + ldr r0, _08139A04 @ =gBattlePartyID lsls r2, r6, 1 adds r2, r0 - ldr r0, _08139A08 @ =gUnknown_02023A60 + ldr r0, _08139A08 @ =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -4743,7 +4743,7 @@ sub_81398BC: @ 81398BC mov r1, r9 strb r0, [r1] adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -4771,7 +4771,7 @@ sub_81398BC: @ 81398BC adds r1, r5, 0 adds r2, r4, 0 bl CreateSprite - ldr r4, _08139A1C @ =gUnknown_02024BE0 + ldr r4, _08139A1C @ =gObjectBankIDs adds r4, r6, r4 strb r0, [r4] ldr r5, _08139A20 @ =gSprites @@ -4856,13 +4856,13 @@ sub_81398BC: @ 81398BC bx r0 .align 2, 0 _08139A00: .4byte 0x02017800 -_08139A04: .4byte gUnknown_02024A6A -_08139A08: .4byte gUnknown_02023A60 +_08139A04: .4byte gBattlePartyID +_08139A08: .4byte gBattleBufferA _08139A0C: .4byte gPlayerParty _08139A10: .4byte sub_80312F0 _08139A14: .4byte gUnknown_0300434C _08139A18: .4byte gUnknown_02024E8C -_08139A1C: .4byte gUnknown_02024BE0 +_08139A1C: .4byte gObjectBankIDs _08139A20: .4byte gSprites _08139A24: .4byte gBattleMonForms _08139A28: .4byte SpriteCallbackDummy @@ -4889,23 +4889,23 @@ sub_8139A2C: @ 8139A2C .align 2, 0 _08139A4C: .4byte gTasks _08139A50: - ldr r4, _08139A8C @ =gUnknown_02024A60 + ldr r4, _08139A8C @ =gActiveBank ldrb r5, [r4] ldrh r0, [r1, 0x8] strb r0, [r4] - ldr r0, _08139A90 @ =gUnknown_02023A60 + ldr r0, _08139A90 @ =gBattleBufferA ldrb r1, [r4] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _08139A94 @ =gUnknown_02024A6A + ldr r0, _08139A94 @ =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] strb r0, [r2] ldrb r0, [r4] bl sub_81398BC - ldr r1, _08139A98 @ =gUnknown_03004330 + ldr r1, _08139A98 @ =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4919,18 +4919,18 @@ _08139A86: pop {r0} bx r0 .align 2, 0 -_08139A8C: .4byte gUnknown_02024A60 -_08139A90: .4byte gUnknown_02023A60 -_08139A94: .4byte gUnknown_02024A6A -_08139A98: .4byte gUnknown_03004330 +_08139A8C: .4byte gActiveBank +_08139A90: .4byte gBattleBufferA +_08139A94: .4byte gBattlePartyID +_08139A98: .4byte gBattleBankFunc _08139A9C: .4byte sub_8137538 thumb_func_end sub_8139A2C thumb_func_start sub_8139AA0 sub_8139AA0: @ 8139AA0 push {r4,r5,lr} - ldr r1, _08139AC8 @ =gUnknown_02023A60 - ldr r0, _08139ACC @ =gUnknown_02024A60 + ldr r1, _08139AC8 @ =gBattleBufferA + ldr r0, _08139ACC @ =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -4939,17 +4939,17 @@ sub_8139AA0: @ 8139AA0 cmp r0, 0 beq _08139AD0 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08139AD0 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted b _08139B0A .align 2, 0 -_08139AC8: .4byte gUnknown_02023A60 -_08139ACC: .4byte gUnknown_02024A60 +_08139AC8: .4byte gBattleBufferA +_08139ACC: .4byte gActiveBank _08139AD0: - ldr r5, _08139B10 @ =gUnknown_02024A60 + ldr r5, _08139B10 @ =gActiveBank ldrb r1, [r5] lsls r0, r1, 1 adds r0, r1 @@ -4975,13 +4975,13 @@ _08139AD0: ldrb r1, [r5] adds r1, r2 strb r0, [r1] - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted _08139B0A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08139B10: .4byte gUnknown_02024A60 +_08139B10: .4byte gActiveBank _08139B14: .4byte 0x02017810 _08139B18: .4byte gUnknown_02023A64 _08139B1C: .4byte gUnknown_02024E68 @@ -4990,7 +4990,7 @@ _08139B1C: .4byte gUnknown_02024E68 thumb_func_start sub_8139B20 sub_8139B20: @ 8139B20 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139B20 @@ -4998,7 +4998,7 @@ sub_8139B20: @ 8139B20 thumb_func_start sub_8139B2C sub_8139B2C: @ 8139B2C push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139B2C @@ -5006,7 +5006,7 @@ sub_8139B2C: @ 8139B2C thumb_func_start sub_8139B38 sub_8139B38: @ 8139B38 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139B38 @@ -5015,8 +5015,8 @@ sub_8139B38: @ 8139B38 sub_8139B44: @ 8139B44 push {r4-r6,lr} sub sp, 0x4 - ldr r5, _08139B7C @ =gUnknown_02023A60 - ldr r6, _08139B80 @ =gUnknown_02024A60 + ldr r5, _08139B7C @ =gBattleBufferA + ldr r6, _08139B80 @ =gActiveBank ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -5037,13 +5037,13 @@ sub_8139B44: @ 8139B44 lsls r0, 24 cmp r0, 0 beq _08139B84 - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted b _08139B90 .align 2, 0 -_08139B7C: .4byte gUnknown_02023A60 -_08139B80: .4byte gUnknown_02024A60 +_08139B7C: .4byte gBattleBufferA +_08139B80: .4byte gActiveBank _08139B84: - ldr r0, _08139B98 @ =gUnknown_03004330 + ldr r0, _08139B98 @ =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -5055,14 +5055,14 @@ _08139B90: pop {r0} bx r0 .align 2, 0 -_08139B98: .4byte gUnknown_03004330 +_08139B98: .4byte gBattleBankFunc _08139B9C: .4byte sub_8137940 thumb_func_end sub_8139B44 thumb_func_start sub_8139BA0 sub_8139BA0: @ 8139BA0 push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139BA0 @@ -5070,7 +5070,7 @@ sub_8139BA0: @ 8139BA0 thumb_func_start sub_8139BAC sub_8139BAC: @ 8139BAC push {lr} - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_8139BAC @@ -5078,9 +5078,9 @@ sub_8139BAC: @ 8139BAC thumb_func_start sub_8139BB8 sub_8139BB8: @ 8139BB8 push {r4,lr} - ldr r2, _08139BFC @ =gUnknown_02024D26 - ldr r1, _08139C00 @ =gUnknown_02023A60 - ldr r4, _08139C04 @ =gUnknown_02024A60 + ldr r2, _08139BFC @ =gBattleOutcome + ldr r1, _08139C00 @ =gBattleBufferA + ldr r4, _08139C04 @ =gActiveBank ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -5091,14 +5091,14 @@ sub_8139BB8: @ 8139BB8 bl FadeOutMapMusic movs r0, 0x3 bl BeginFastPaletteFade - bl dp01_tbl5_exec_completed + bl WallyBufferExecCompleted ldr r0, _08139C08 @ =gBattleTypeFlags ldrh r1, [r0] movs r0, 0x6 ands r0, r1 cmp r0, 0x2 bne _08139BF4 - ldr r0, _08139C0C @ =gUnknown_03004330 + ldr r0, _08139C0C @ =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -5109,11 +5109,11 @@ _08139BF4: pop {r0} bx r0 .align 2, 0 -_08139BFC: .4byte gUnknown_02024D26 -_08139C00: .4byte gUnknown_02023A60 -_08139C04: .4byte gUnknown_02024A60 +_08139BFC: .4byte gBattleOutcome +_08139C00: .4byte gBattleBufferA +_08139C04: .4byte gActiveBank _08139C08: .4byte gBattleTypeFlags -_08139C0C: .4byte gUnknown_03004330 +_08139C0C: .4byte gBattleBankFunc _08139C10: .4byte sub_813746C thumb_func_end sub_8139BB8 diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index 25ac4470e..296db945e 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -73,7 +73,7 @@ unref_sub_813F0F4: @ 813F0F4 mov r4, r8 orrs r0, r4 strb r0, [r2] - ldr r0, _0813F2D0 @ =gUnknown_03004340 + ldr r0, _0813F2D0 @ =gHealthboxIDs adds r3, r0 ldrb r0, [r3] ldr r1, _0813F2D4 @ =gSprites @@ -229,7 +229,7 @@ _0813F2C0: .4byte 0x00003f3d _0813F2C4: .4byte REG_BLDCNT _0813F2C8: .4byte 0x00003f42 _0813F2CC: .4byte REG_BG1CNT -_0813F2D0: .4byte gUnknown_03004340 +_0813F2D0: .4byte gHealthboxIDs _0813F2D4: .4byte gSprites _0813F2D8: .4byte SpriteCallbackDummy _0813F2DC: .4byte 0x040000d4 @@ -423,7 +423,7 @@ _0813F406: negs r0, r0 ands r0, r1 strb r0, [r2, 0x1] - ldr r0, _0813F4E8 @ =gUnknown_03004340 + ldr r0, _0813F4E8 @ =gHealthboxIDs add r0, r9 ldrb r0, [r0] lsls r1, r0, 4 @@ -480,7 +480,7 @@ _0813F4D8: .4byte REG_BLDCNT _0813F4DC: .4byte gSprites _0813F4E0: .4byte 0x040000d4 _0813F4E4: .4byte 0x85000200 -_0813F4E8: .4byte gUnknown_03004340 +_0813F4E8: .4byte gHealthboxIDs thumb_func_end sub_813F300 thumb_func_start sub_813F4EC @@ -494,7 +494,7 @@ sub_813F4EC: @ 813F4EC lsls r0, 24 lsrs r0, 24 str r0, [sp] - ldr r1, _0813F5D0 @ =gUnknown_03004340 + ldr r1, _0813F5D0 @ =gHealthboxIDs ldr r0, _0813F5D4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -594,7 +594,7 @@ sub_813F4EC: @ 813F4EC pop {r0} bx r0 .align 2, 0 -_0813F5D0: .4byte gUnknown_03004340 +_0813F5D0: .4byte gHealthboxIDs _0813F5D4: .4byte gBattleAnimPlayerMonIndex _0813F5D8: .4byte gSprites _0813F5DC: .4byte 0x0000d709 @@ -613,7 +613,7 @@ sub_813F5E8: @ 813F5E8 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _0813F684 @ =gUnknown_03004340 + ldr r1, _0813F684 @ =gHealthboxIDs ldr r0, _0813F688 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -677,7 +677,7 @@ sub_813F5E8: @ 813F5E8 pop {r0} bx r0 .align 2, 0 -_0813F684: .4byte gUnknown_03004340 +_0813F684: .4byte gHealthboxIDs _0813F688: .4byte gBattleAnimPlayerMonIndex _0813F68C: .4byte gSprites _0813F690: .4byte 0x0000d709 @@ -819,7 +819,7 @@ sub_813F798: @ 813F798 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0813F7C4 @ =gUnknown_02024BE0 + ldr r1, _0813F7C4 @ =gObjectBankIDs ldr r0, _0813F7C8 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -839,7 +839,7 @@ sub_813F798: @ 813F798 beq _0813F7D6 b _0813F838 .align 2, 0 -_0813F7C4: .4byte gUnknown_02024BE0 +_0813F7C4: .4byte gObjectBankIDs _0813F7C8: .4byte gBattleAnimPlayerMonIndex _0813F7CC: .4byte gTasks _0813F7D0: @@ -910,17 +910,17 @@ sub_813F844: @ 813F844 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0813F87C @ =gUnknown_02024BE0 + ldr r1, _0813F87C @ =gObjectBankIDs ldr r4, _0813F880 @ =gBattleAnimPlayerMonIndex ldrb r0, [r4] adds r1, r0, r1 ldrb r1, [r1] mov r9, r1 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0813F88C - ldr r1, _0813F884 @ =gUnknown_02024A6A + ldr r1, _0813F884 @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -930,12 +930,12 @@ sub_813F844: @ 813F844 ldr r1, _0813F888 @ =gPlayerParty b _0813F89C .align 2, 0 -_0813F87C: .4byte gUnknown_02024BE0 +_0813F87C: .4byte gObjectBankIDs _0813F880: .4byte gBattleAnimPlayerMonIndex -_0813F884: .4byte gUnknown_02024A6A +_0813F884: .4byte gBattlePartyID _0813F888: .4byte gPlayerParty _0813F88C: - ldr r1, _0813F8CC @ =gUnknown_02024A6A + ldr r1, _0813F8CC @ =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -966,7 +966,7 @@ _0813F89C: beq _0813F958 b _0813F982 .align 2, 0 -_0813F8CC: .4byte gUnknown_02024A6A +_0813F8CC: .4byte gBattlePartyID _0813F8D0: .4byte gEnemyParty _0813F8D4: .4byte gTasks _0813F8D8: @@ -1064,7 +1064,7 @@ sub_813F990: @ 813F990 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0813F9B4 @ =gUnknown_02024C04 + ldr r0, _0813F9B4 @ =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -1076,7 +1076,7 @@ sub_813F990: @ 813F990 pop {r0} bx r0 .align 2, 0 -_0813F9B4: .4byte gUnknown_02024C04 +_0813F9B4: .4byte gLastUsedItem thumb_func_end sub_813F990 thumb_func_start sub_813F9B8 @@ -1085,7 +1085,7 @@ sub_813F9B8: @ 813F9B8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0813F9DC @ =gUnknown_02024C04 + ldr r0, _0813F9DC @ =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -1097,7 +1097,7 @@ sub_813F9B8: @ 813F9B8 pop {r0} bx r0 .align 2, 0 -_0813F9DC: .4byte gUnknown_02024C04 +_0813F9DC: .4byte gLastUsedItem thumb_func_end sub_813F9B8 thumb_func_start sub_813F9E0 @@ -1209,7 +1209,7 @@ sub_813FA94: @ 813FA94 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _0813FB58 @ =gUnknown_02024C04 + ldr r0, _0813FB58 @ =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index adds r1, r0, 0 @@ -1257,7 +1257,7 @@ sub_813FA94: @ 813FA94 ldr r0, _0813FB68 @ =sub_813FD90 str r0, [r4] ldr r3, _0813FB6C @ =0x02017840 - ldr r1, _0813FB70 @ =gUnknown_02024BE0 + ldr r1, _0813FB70 @ =gObjectBankIDs mov r2, r8 ldrb r0, [r2] adds r0, r1 @@ -1294,13 +1294,13 @@ sub_813FA94: @ 813FA94 pop {r0} bx r0 .align 2, 0 -_0813FB58: .4byte gUnknown_02024C04 +_0813FB58: .4byte gLastUsedItem _0813FB5C: .4byte gSpriteTemplate_820AAB4 _0813FB60: .4byte gSprites _0813FB64: .4byte gBattleAnimEnemyMonIndex _0813FB68: .4byte sub_813FD90 _0813FB6C: .4byte 0x02017840 -_0813FB70: .4byte gUnknown_02024BE0 +_0813FB70: .4byte gObjectBankIDs _0813FB74: .4byte gTasks _0813FB78: .4byte sub_813FB7C thumb_func_end sub_813FA94 @@ -1360,14 +1360,14 @@ _0813FBDC: movs r6, 0x17 movs r5, 0x5 _0813FBE0: - ldr r0, _0813FC9C @ =gUnknown_02024C04 + ldr r0, _0813FC9C @ =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 bl sub_8079E90 @@ -1419,8 +1419,8 @@ _0813FBE0: ldr r0, _0813FCAC @ =SpriteCallbackDummy str r0, [r4] movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, _0813FCB0 @ =gUnknown_02024BE0 + bl GetBankByPlayerAI + ldr r1, _0813FCB0 @ =gObjectBankIDs lsls r0, 24 lsrs r0, 24 adds r0, r1 @@ -1446,12 +1446,12 @@ _0813FBE0: pop {r0} bx r0 .align 2, 0 -_0813FC9C: .4byte gUnknown_02024C04 +_0813FC9C: .4byte gLastUsedItem _0813FCA0: .4byte gSpriteTemplate_820AAB4 _0813FCA4: .4byte gSprites _0813FCA8: .4byte gBattleAnimEnemyMonIndex _0813FCAC: .4byte SpriteCallbackDummy -_0813FCB0: .4byte gUnknown_02024BE0 +_0813FCB0: .4byte gObjectBankIDs _0813FCB4: .4byte gTasks _0813FCB8: .4byte sub_813FCBC thumb_func_end sub_813FBB8 @@ -1463,8 +1463,8 @@ sub_813FCBC: @ 813FCBC lsrs r5, r0, 24 ldr r6, _0813FD1C @ =gSprites movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, _0813FD20 @ =gUnknown_02024BE0 + bl GetBankByPlayerAI + ldr r1, _0813FD20 @ =gObjectBankIDs lsls r0, 24 lsrs r0, 24 adds r0, r1 @@ -1506,7 +1506,7 @@ _0813FD16: bx r0 .align 2, 0 _0813FD1C: .4byte gSprites -_0813FD20: .4byte gUnknown_02024BE0 +_0813FD20: .4byte gObjectBankIDs _0813FD24: .4byte gTasks _0813FD28: .4byte sub_813FD90 _0813FD2C: .4byte sub_813FD34 @@ -1520,8 +1520,8 @@ sub_813FD34: @ 813FD34 lsrs r5, r0, 24 ldr r6, _0813FD88 @ =gSprites movs r0, 0 - bl battle_get_side_with_given_state - ldr r4, _0813FD8C @ =gUnknown_02024BE0 + bl GetBankByPlayerAI + ldr r4, _0813FD8C @ =gObjectBankIDs lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -1536,7 +1536,7 @@ sub_813FD34: @ 813FD34 cmp r0, 0 bge _0813FD80 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -1555,7 +1555,7 @@ _0813FD80: bx r0 .align 2, 0 _0813FD88: .4byte gSprites -_0813FD8C: .4byte gUnknown_02024BE0 +_0813FD8C: .4byte gObjectBankIDs thumb_func_end sub_813FD34 thumb_func_start sub_813FD90 @@ -1632,7 +1632,7 @@ _0813FE10: strh r0, [r4, 0x38] ldr r0, _0813FE64 @ =sub_813FE70 str r0, [r4, 0x1C] - ldr r0, _0813FE68 @ =gUnknown_02024C04 + ldr r0, _0813FE68 @ =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -1665,7 +1665,7 @@ _0813FE5A: bx r0 .align 2, 0 _0813FE64: .4byte sub_813FE70 -_0813FE68: .4byte gUnknown_02024C04 +_0813FE68: .4byte gLastUsedItem _0813FE6C: .4byte gBattleAnimEnemyMonIndex thumb_func_end sub_813FDC0 @@ -1689,7 +1689,7 @@ sub_813FE70: @ 813FE70 ldr r0, _0813FEB8 @ =sub_813FEC8 str r0, [r4, 0x1C] ldr r2, _0813FEBC @ =gSprites - ldr r1, _0813FEC0 @ =gUnknown_02024BE0 + ldr r1, _0813FEC0 @ =gObjectBankIDs ldr r0, _0813FEC4 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] adds r0, r1 @@ -1708,7 +1708,7 @@ _0813FEAC: _0813FEB4: .4byte TaskDummy _0813FEB8: .4byte sub_813FEC8 _0813FEBC: .4byte gSprites -_0813FEC0: .4byte gUnknown_02024BE0 +_0813FEC0: .4byte gObjectBankIDs _0813FEC4: .4byte gBattleAnimEnemyMonIndex thumb_func_end sub_813FE70 @@ -1716,7 +1716,7 @@ _0813FEC4: .4byte gBattleAnimEnemyMonIndex sub_813FEC8: @ 813FEC8 push {r4-r7,lr} adds r7, r0, 0 - ldr r1, _0813FF0C @ =gUnknown_02024BE0 + ldr r1, _0813FF0C @ =gObjectBankIDs ldr r0, _0813FF10 @ =gBattleAnimEnemyMonIndex ldrb r0, [r0] adds r0, r1 @@ -1749,7 +1749,7 @@ _0813FEFA: beq _0813FF1E b _0813FFDC .align 2, 0 -_0813FF0C: .4byte gUnknown_02024BE0 +_0813FF0C: .4byte gObjectBankIDs _0813FF10: .4byte gBattleAnimEnemyMonIndex _0813FF14: .4byte gTasks _0813FF18: @@ -2461,7 +2461,7 @@ sub_8140454: @ 8140454 beq _081404CC cmp r1, 0x5F bne _08140490 - ldr r0, _08140488 @ =gUnknown_02024E6D + ldr r0, _08140488 @ =gDoingBattleAnim movs r1, 0 strb r1, [r0] movs r0, 0x1 @@ -2472,14 +2472,14 @@ sub_8140454: @ 8140454 b _081404CC .align 2, 0 _08140484: .4byte gBattleAnimEnemyMonIndex -_08140488: .4byte gUnknown_02024E6D +_08140488: .4byte gDoingBattleAnim _0814048C: .4byte 0x00000173 _08140490: ldr r0, _081404D4 @ =0x0000013b cmp r1, r0 bne _081404CC ldr r5, _081404D8 @ =gSprites - ldr r4, _081404DC @ =gUnknown_02024BE0 + ldr r4, _081404DC @ =gObjectBankIDs ldrb r0, [r7] adds r0, r4 ldrb r1, [r0] @@ -2510,7 +2510,7 @@ _081404CC: .align 2, 0 _081404D4: .4byte 0x0000013b _081404D8: .4byte gSprites -_081404DC: .4byte gUnknown_02024BE0 +_081404DC: .4byte gObjectBankIDs _081404E0: .4byte sub_81404E4 thumb_func_end sub_8140454 @@ -2670,7 +2670,7 @@ sub_81405F4: @ 81405F4 bl StartSpriteAffineAnim ldr r0, _081406A8 @ =sub_81406BC str r0, [r4, 0x1C] - ldr r0, _081406AC @ =gUnknown_02024C04 + ldr r0, _081406AC @ =gLastUsedItem ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -2698,7 +2698,7 @@ sub_81405F4: @ 81405F4 bl sub_8141314 _08140646: ldr r6, _081406B4 @ =gSprites - ldr r5, _081406B8 @ =gUnknown_02024BE0 + ldr r5, _081406B8 @ =gObjectBankIDs ldr r4, _081406B0 @ =gBattleAnimEnemyMonIndex ldrb r0, [r4] adds r0, r5 @@ -2746,10 +2746,10 @@ _08140646: bx r0 .align 2, 0 _081406A8: .4byte sub_81406BC -_081406AC: .4byte gUnknown_02024C04 +_081406AC: .4byte gLastUsedItem _081406B0: .4byte gBattleAnimEnemyMonIndex _081406B4: .4byte gSprites -_081406B8: .4byte gUnknown_02024BE0 +_081406B8: .4byte gObjectBankIDs thumb_func_end sub_81405F4 thumb_func_start sub_81406BC @@ -2771,7 +2771,7 @@ sub_81406BC: @ 81406BC strb r0, [r2] _081406DA: ldr r4, _08140708 @ =gSprites - ldr r3, _0814070C @ =gUnknown_02024BE0 + ldr r3, _0814070C @ =gObjectBankIDs ldr r2, _08140710 @ =gBattleAnimEnemyMonIndex ldrb r0, [r2] adds r0, r3 @@ -2793,7 +2793,7 @@ _081406DA: b _08140734 .align 2, 0 _08140708: .4byte gSprites -_0814070C: .4byte gUnknown_02024BE0 +_0814070C: .4byte gObjectBankIDs _08140710: .4byte gBattleAnimEnemyMonIndex _08140714: ldr r6, _0814079C @ =0xfffffee0 @@ -2823,7 +2823,7 @@ _08140734: cmp r5, 0 beq _08140796 ldr r4, _081407A0 @ =gSprites - ldr r3, _081407A4 @ =gUnknown_02024BE0 + ldr r3, _081407A4 @ =gObjectBankIDs ldr r2, _081407A8 @ =gBattleAnimEnemyMonIndex ldrb r0, [r2] adds r0, r3 @@ -2857,7 +2857,7 @@ _08140734: strh r5, [r7, 0x2E] ldr r0, _081407B0 @ =sub_81405C8 str r0, [r7, 0x1C] - ldr r0, _081407B4 @ =gUnknown_02024E6D + ldr r0, _081407B4 @ =gDoingBattleAnim strb r6, [r0] movs r0, 0x1 bl sub_8043EB4 @@ -2868,11 +2868,11 @@ _08140796: .align 2, 0 _0814079C: .4byte 0xfffffee0 _081407A0: .4byte gSprites -_081407A4: .4byte gUnknown_02024BE0 +_081407A4: .4byte gObjectBankIDs _081407A8: .4byte gBattleAnimEnemyMonIndex _081407AC: .4byte 0x02017840 _081407B0: .4byte sub_81405C8 -_081407B4: .4byte gUnknown_02024E6D +_081407B4: .4byte gDoingBattleAnim thumb_func_end sub_81406BC thumb_func_start sub_81407B8 @@ -2959,7 +2959,7 @@ _0814084A: strh r0, [r4, 0x2E] ldr r0, _08140864 @ =sub_81405C8 str r0, [r4, 0x1C] - ldr r1, _08140868 @ =gUnknown_02024E6D + ldr r1, _08140868 @ =gDoingBattleAnim movs r0, 0 strb r0, [r1] movs r0, 0x1 @@ -2970,7 +2970,7 @@ _0814085E: bx r0 .align 2, 0 _08140864: .4byte sub_81405C8 -_08140868: .4byte gUnknown_02024E6D +_08140868: .4byte gDoingBattleAnim thumb_func_end sub_81407F4 thumb_func_start sub_814086C @@ -4582,7 +4582,7 @@ sub_814151C: @ 814151C lsrs r7, r0, 24 movs r0, 0 mov r8, r0 - ldr r0, _08141550 @ =gUnknown_02024BE0 + ldr r0, _08141550 @ =gObjectBankIDs ldr r3, _08141554 @ =gBattleAnimPlayerMonIndex ldrb r2, [r3] adds r0, r2, r0 @@ -4602,7 +4602,7 @@ sub_814151C: @ 814151C beq _08141562 b _081416B6 .align 2, 0 -_08141550: .4byte gUnknown_02024BE0 +_08141550: .4byte gObjectBankIDs _08141554: .4byte gBattleAnimPlayerMonIndex _08141558: .4byte gTasks _0814155C: @@ -4620,7 +4620,7 @@ _08141562: adds r0, r4 strh r0, [r5, 0x8] ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _081415A4 @@ -4698,7 +4698,7 @@ _08141606: adds r0, r2 strh r0, [r5, 0x8] ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0814163C @@ -4740,7 +4740,7 @@ _08141654: strh r1, [r0, 0x8] ldr r0, _08141690 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 @@ -4818,7 +4818,7 @@ _081416EC: _081416F2: ldr r0, _08141708 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4883,7 +4883,7 @@ _08141744: .align 2, 0 _08141778: .4byte REG_BLDALPHA _0814177C: - ldr r1, _081417C0 @ =gUnknown_02024BE0 + ldr r1, _081417C0 @ =gObjectBankIDs ldr r3, _081417C4 @ =gBattleAnimPlayerMonIndex ldrb r0, [r3] adds r0, r1 @@ -4917,7 +4917,7 @@ _081417B8: pop {r0} bx r0 .align 2, 0 -_081417C0: .4byte gUnknown_02024BE0 +_081417C0: .4byte gObjectBankIDs _081417C4: .4byte gBattleAnimPlayerMonIndex _081417C8: .4byte gSprites _081417CC: .4byte 0x06010000 @@ -4955,7 +4955,7 @@ sub_8141808: @ 8141808 lsls r0, 24 lsrs r0, 24 ldr r2, _08141820 @ =gBattleAnimEnemyMonIndex - ldr r1, _08141824 @ =gUnknown_02024C0A + ldr r1, _08141824 @ =gEffectBank ldrb r1, [r1] strb r1, [r2] bl DestroyAnimVisualTask @@ -4963,7 +4963,7 @@ sub_8141808: @ 8141808 bx r0 .align 2, 0 _08141820: .4byte gBattleAnimEnemyMonIndex -_08141824: .4byte gUnknown_02024C0A +_08141824: .4byte gEffectBank thumb_func_end sub_8141808 thumb_func_start sub_8141828 @@ -5248,7 +5248,7 @@ _08141A44: cmp r0, 0 bne _08141A8C mov r0, r8 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0x3F cmp r0, 0 @@ -5484,7 +5484,7 @@ sub_8141C30: @ 8141C30 movs r0, 0x1E strh r0, [r4, 0x2E] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -5496,7 +5496,7 @@ sub_8141C30: @ 8141C30 adds r0, r1 strh r0, [r4, 0x32] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -5510,7 +5510,7 @@ sub_8141C30: @ 8141C30 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80786EC - ldr r1, _08141CAC @ =gUnknown_02024BE0 + ldr r1, _08141CAC @ =gObjectBankIDs ldr r0, _08141CB0 @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -5530,7 +5530,7 @@ sub_8141C30: @ 8141C30 .align 2, 0 _08141CA4: .4byte gBattleAnimArgs _08141CA8: .4byte 0x0000ffe0 -_08141CAC: .4byte gUnknown_02024BE0 +_08141CAC: .4byte gObjectBankIDs _08141CB0: .4byte gBattleAnimPlayerMonIndex _08141CB4: .4byte gSprites _08141CB8: .4byte sub_8141CBC @@ -5541,7 +5541,7 @@ sub_8141CBC: @ 8141CBC push {lr} adds r3, r0, 0 ldr r2, _08141CE4 @ =gSprites - ldr r1, _08141CE8 @ =gUnknown_02024BE0 + ldr r1, _08141CE8 @ =gObjectBankIDs ldr r0, _08141CEC @ =gBattleAnimPlayerMonIndex ldrb r0, [r0] adds r0, r1 @@ -5561,7 +5561,7 @@ _08141CE0: bx r0 .align 2, 0 _08141CE4: .4byte gSprites -_08141CE8: .4byte gUnknown_02024BE0 +_08141CE8: .4byte gObjectBankIDs _08141CEC: .4byte gBattleAnimPlayerMonIndex _08141CF0: .4byte sub_8141CF4 thumb_func_end sub_8141CBC @@ -5597,7 +5597,7 @@ sub_8141D20: @ 8141D20 push {r4,r5,lr} adds r4, r0, 0 ldr r5, _08141D70 @ =gSprites - ldr r3, _08141D74 @ =gUnknown_02024BE0 + ldr r3, _08141D74 @ =gObjectBankIDs ldr r2, _08141D78 @ =gBattleAnimPlayerMonIndex ldrb r0, [r2] adds r0, r3 @@ -5634,7 +5634,7 @@ _08141D68: bx r0 .align 2, 0 _08141D70: .4byte gSprites -_08141D74: .4byte gUnknown_02024BE0 +_08141D74: .4byte gObjectBankIDs _08141D78: .4byte gBattleAnimPlayerMonIndex thumb_func_end sub_8141D20 @@ -5645,11 +5645,11 @@ sub_8141D7C: @ 8141D7C lsls r4, 24 lsrs r4, 24 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, _08141DA4 @ =gBattleAnimPlayerMonIndex strb r0, [r1] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, _08141DA8 @ =gBattleAnimEnemyMonIndex strb r0, [r1] adds r0, r4, 0 diff --git a/asm/battle_message.s b/asm/battle_message.s index 0e3588d14..414213737 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_8120AA8 -sub_8120AA8: @ 8120AA8 + thumb_func_start BufferStringBattle +BufferStringBattle: @ 8120AA8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -16,17 +16,17 @@ sub_8120AA8: @ 8120AA8 lsls r0, 16 lsrs r7, r0, 16 movs r6, 0 - ldr r5, _08120B70 @ =gSelectedOrderFromParty - ldr r4, _08120B74 @ =gUnknown_02024A60 + ldr r5, _08120B70 @ =gBufferedMoves + ldr r4, _08120B74 @ =gActiveBank ldrb r1, [r4] lsls r1, 9 ldr r0, _08120B78 @ =gUnknown_02023A64 adds r1, r0 str r1, [r5] - ldr r2, _08120B7C @ =gUnknown_02024C04 + ldr r2, _08120B7C @ =gLastUsedItem ldrh r0, [r1, 0x4] strh r0, [r2] - ldr r2, _08120B80 @ =byte_2024C06 + ldr r2, _08120B80 @ =gLastUsedAbility ldrb r0, [r1, 0x6] strb r0, [r2] ldr r3, _08120B84 @ =0x02000000 @@ -48,7 +48,7 @@ sub_8120AA8: @ 8120AA8 adds r0, r3, r2 mov r2, r8 strb r2, [r0] - ldr r2, _08120B94 @ =gUnknown_02024C0B + ldr r2, _08120B94 @ =gStringBank ldrb r0, [r1, 0xA] strb r0, [r2] ldrb r1, [r1, 0xB] @@ -57,9 +57,9 @@ sub_8120AA8: @ 8120AA8 strb r1, [r0] movs r2, 0 mov r9, r3 - ldr r3, _08120B9C @ =gUnknown_030041C0 + ldr r3, _08120B9C @ =gBattleTextBuff1 mov r10, r3 - ldr r3, _08120BA0 @ =gUnknown_0203926C + ldr r3, _08120BA0 @ =gAbilitiesPerBank _08120B10: adds r0, r2, r3 ldr r1, [r5] @@ -71,12 +71,12 @@ _08120B10: cmp r2, 0x3 ble _08120B10 movs r2, 0 - ldr r0, _08120B9C @ =gUnknown_030041C0 + ldr r0, _08120B9C @ =gBattleTextBuff1 mov r8, r0 - ldr r3, _08120B70 @ =gSelectedOrderFromParty - ldr r1, _08120BA4 @ =gUnknown_03004290 + ldr r3, _08120B70 @ =gBufferedMoves + ldr r1, _08120BA4 @ =gBattleTextBuff2 mov r12, r1 - ldr r5, _08120BA8 @ =gUnknown_030042B0 + ldr r5, _08120BA8 @ =gBattleTextBuff3 _08120B30: mov r0, r8 adds r1, r2, r0 @@ -111,21 +111,21 @@ _08120B64: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08120B70: .4byte gSelectedOrderFromParty -_08120B74: .4byte gUnknown_02024A60 +_08120B70: .4byte gBufferedMoves +_08120B74: .4byte gActiveBank _08120B78: .4byte gUnknown_02023A64 -_08120B7C: .4byte gUnknown_02024C04 -_08120B80: .4byte byte_2024C06 +_08120B7C: .4byte gLastUsedItem +_08120B80: .4byte gLastUsedAbility _08120B84: .4byte 0x02000000 _08120B88: .4byte 0x00016003 _08120B8C: .4byte 0x0001605e _08120B90: .4byte 0x000160c1 -_08120B94: .4byte gUnknown_02024C0B +_08120B94: .4byte gStringBank _08120B98: .4byte 0x000160a0 -_08120B9C: .4byte gUnknown_030041C0 -_08120BA0: .4byte gUnknown_0203926C -_08120BA4: .4byte gUnknown_03004290 -_08120BA8: .4byte gUnknown_030042B0 +_08120B9C: .4byte gBattleTextBuff1 +_08120BA0: .4byte gAbilitiesPerBank +_08120BA4: .4byte gBattleTextBuff2 +_08120BA8: .4byte gBattleTextBuff3 _08120BAC: .4byte _08120BB0 .align 2, 0 _08120BB0: @@ -199,7 +199,7 @@ _08120C38: .4byte gUnknown_08400555 _08120C3C: .4byte gUnknown_0840057B _08120C40: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08120C7C @@ -271,7 +271,7 @@ _08120CC4: .4byte gUnknown_084005F5 _08120CC8: .4byte gUnknown_08400635 _08120CCC: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08120D24 @@ -345,7 +345,7 @@ _08120D5C: ldr r0, _08120D88 @ =0x00016003 add r0, r9 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08120DB8 @@ -414,14 +414,14 @@ _08120DE4: .4byte gUnknown_08400622 _08120DE8: mov r0, r10 bl sub_8121D1C - ldr r0, _08120E14 @ =gSelectedOrderFromParty + ldr r0, _08120E14 @ =gBufferedMoves ldr r2, [r0] ldrh r1, [r2] movs r0, 0xB1 lsls r0, 1 cmp r1, r0 bls _08120E28 - ldr r0, _08120E18 @ =gUnknown_03004290 + ldr r0, _08120E18 @ =gBattleTextBuff2 ldr r2, _08120E1C @ =gUnknown_08401674 ldr r1, _08120E20 @ =0x02000000 ldr r3, _08120E24 @ =0x000160a0 @@ -433,13 +433,13 @@ _08120DE8: bl StringCopy b _08120E38 .align 2, 0 -_08120E14: .4byte gSelectedOrderFromParty -_08120E18: .4byte gUnknown_03004290 +_08120E14: .4byte gBufferedMoves +_08120E18: .4byte gBattleTextBuff2 _08120E1C: .4byte gUnknown_08401674 _08120E20: .4byte 0x02000000 _08120E24: .4byte 0x000160a0 _08120E28: - ldr r0, _08120E44 @ =gUnknown_03004290 + ldr r0, _08120E44 @ =gBattleTextBuff2 ldrh r2, [r2] movs r1, 0xD muls r1, r2 @@ -447,16 +447,16 @@ _08120E28: adds r1, r2 bl StringCopy _08120E38: - ldr r0, _08120E44 @ =gUnknown_03004290 + ldr r0, _08120E44 @ =gBattleTextBuff2 bl sub_8121D74 ldr r6, _08120E4C @ =gUnknown_084007BD b _08120F70 .align 2, 0 -_08120E44: .4byte gUnknown_03004290 +_08120E44: .4byte gBattleTextBuff2 _08120E48: .4byte gMoveNames _08120E4C: .4byte gUnknown_084007BD _08120E50: - ldr r5, _08120E90 @ =gUnknown_030041C0 + ldr r5, _08120E90 @ =gBattleTextBuff1 ldrb r1, [r5] movs r0, 0x80 ands r0, r1 @@ -466,7 +466,7 @@ _08120E50: ands r0, r1 strb r0, [r5] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -478,7 +478,7 @@ _08120E50: eors r0, r1 strb r0, [r5] _08120E7C: - ldr r0, _08120E90 @ =gUnknown_030041C0 + ldr r0, _08120E90 @ =gBattleTextBuff1 ldrb r0, [r0] subs r0, 0x2 lsls r0, 24 @@ -488,7 +488,7 @@ _08120E7C: ldr r6, _08120E94 @ =gUnknown_083FFEFC b _08120F70 .align 2, 0 -_08120E90: .4byte gUnknown_030041C0 +_08120E90: .4byte gBattleTextBuff1 _08120E94: .4byte gUnknown_083FFEFC _08120E98: ldr r0, _08120EAC @ =gBattleTypeFlags @@ -506,7 +506,7 @@ _08120EB0: .4byte gUnknown_083FFFEA _08120EB4: .4byte gUnknown_083FFFF7 _08120EB8: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -524,7 +524,7 @@ _08120ED2: ands r0, r1 cmp r0, 0 beq _08120F18 - ldr r0, _08120EF4 @ =gUnknown_030041C0 + ldr r0, _08120EF4 @ =gBattleTextBuff1 ldrb r0, [r0] cmp r0, 0x2 beq _08120F08 @@ -535,7 +535,7 @@ _08120ED2: b _08120F70 .align 2, 0 _08120EF0: .4byte gBattleTypeFlags -_08120EF4: .4byte gUnknown_030041C0 +_08120EF4: .4byte gBattleTextBuff1 _08120EF8: cmp r0, 0x3 beq _08120F10 @@ -556,7 +556,7 @@ _08120F10: .align 2, 0 _08120F14: .4byte gUnknown_083FFFCB _08120F18: - ldr r0, _08120F2C @ =gUnknown_030041C0 + ldr r0, _08120F2C @ =gBattleTextBuff1 ldrb r0, [r0] cmp r0, 0x2 beq _08120F40 @@ -566,7 +566,7 @@ _08120F18: beq _08120F36 b _08120F70 .align 2, 0 -_08120F2C: .4byte gUnknown_030041C0 +_08120F2C: .4byte gBattleTextBuff1 _08120F30: cmp r0, 0x3 beq _08120F48 @@ -591,14 +591,14 @@ _08120F50: lsls r0, 1 cmp r7, r0 bls _08120F64 - ldr r1, _08120F60 @ =gUnknown_020238CC + ldr r1, _08120F60 @ =gDisplayedStringBattle movs r0, 0xFF strb r0, [r1] b _08120F76 .align 2, 0 -_08120F60: .4byte gUnknown_020238CC +_08120F60: .4byte gDisplayedStringBattle _08120F64: - ldr r1, _08120F84 @ =gUnknown_08400F8C + ldr r1, _08120F84 @ =gBattleStringsTable adds r0, r7, 0 subs r0, 0xC lsls r0, 2 @@ -606,7 +606,7 @@ _08120F64: ldr r6, [r0] _08120F70: adds r0, r6, 0 - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle _08120F76: pop {r3-r5} mov r8, r3 @@ -616,19 +616,19 @@ _08120F76: pop {r0} bx r0 .align 2, 0 -_08120F84: .4byte gUnknown_08400F8C - thumb_func_end sub_8120AA8 +_08120F84: .4byte gBattleStringsTable + thumb_func_end BufferStringBattle - thumb_func_start get_battle_strings_ -get_battle_strings_: @ 8120F88 + thumb_func_start StrCpyDecodeToDisplayedStringBattle +StrCpyDecodeToDisplayedStringBattle: @ 8120F88 push {lr} - ldr r1, _08120F94 @ =gUnknown_020238CC - bl sub_8120FFC + ldr r1, _08120F94 @ =gDisplayedStringBattle + bl StrCpyDecodeBattle pop {r1} bx r1 .align 2, 0 -_08120F94: .4byte gUnknown_020238CC - thumb_func_end get_battle_strings_ +_08120F94: .4byte gDisplayedStringBattle + thumb_func_end StrCpyDecodeToDisplayedStringBattle thumb_func_start sub_8120F98 sub_8120F98: @ 8120F98 @@ -686,8 +686,8 @@ _08120FF2: bx r1 thumb_func_end sub_8120F98 - thumb_func_start sub_8120FFC -sub_8120FFC: @ 8120FFC + thumb_func_start StrCpyDecodeBattle +StrCpyDecodeBattle: @ 8120FFC push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -769,7 +769,7 @@ _08121044: .4byte _081219D4 .4byte _08121134 _081210F0: - ldr r5, _08121100 @ =gUnknown_030041C0 + ldr r5, _08121100 @ =gBattleTextBuff1 ldrb r0, [r5] cmp r0, 0xFD bne _08121108 @@ -777,7 +777,7 @@ _081210F0: adds r0, r5, 0 b _08121140 .align 2, 0 -_08121100: .4byte gUnknown_030041C0 +_08121100: .4byte gBattleTextBuff1 _08121104: .4byte gStringVar1 _08121108: adds r0, r5, 0 @@ -790,17 +790,17 @@ _08121118: adds r4, r5, 0 bl _081219E6 _0812111E: - ldr r1, _0812112C @ =gUnknown_03004290 + ldr r1, _0812112C @ =gBattleTextBuff2 ldrb r0, [r1] cmp r0, 0xFD bne _08121154 ldr r4, _08121130 @ =gStringVar2 b _0812113E .align 2, 0 -_0812112C: .4byte gUnknown_03004290 +_0812112C: .4byte gBattleTextBuff2 _08121130: .4byte gStringVar2 _08121134: - ldr r1, _0812114C @ =gUnknown_030042B0 + ldr r1, _0812114C @ =gBattleTextBuff3 ldrb r0, [r1] cmp r0, 0xFD bne _08121154 @@ -812,15 +812,15 @@ _08121140: bl sub_8121A68 bl _081219E6 .align 2, 0 -_0812114C: .4byte gUnknown_030042B0 +_0812114C: .4byte gBattleTextBuff3 _08121150: .4byte gStringVar3 _08121154: adds r4, r1, 0 bl _081219E6 _0812115A: movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, _08121178 @ =gUnknown_02024A6A + bl GetBankByPlayerAI + ldr r1, _08121178 @ =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -831,12 +831,12 @@ _0812115A: adds r0, r1 bl _0812190E .align 2, 0 -_08121178: .4byte gUnknown_02024A6A +_08121178: .4byte gBattlePartyID _0812117C: .4byte gPlayerParty _08121180: movs r0, 0x1 - bl battle_get_side_with_given_state - ldr r1, _0812119C @ =gUnknown_02024A6A + bl GetBankByPlayerAI + ldr r1, _0812119C @ =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -847,12 +847,12 @@ _08121180: adds r0, r1 b _0812190E .align 2, 0 -_0812119C: .4byte gUnknown_02024A6A +_0812119C: .4byte gBattlePartyID _081211A0: .4byte gEnemyParty _081211A4: movs r0, 0x2 - bl battle_get_side_with_given_state - ldr r1, _081211C0 @ =gUnknown_02024A6A + bl GetBankByPlayerAI + ldr r1, _081211C0 @ =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -863,12 +863,12 @@ _081211A4: adds r0, r1 b _0812190E .align 2, 0 -_081211C0: .4byte gUnknown_02024A6A +_081211C0: .4byte gBattlePartyID _081211C4: .4byte gPlayerParty _081211C8: movs r0, 0x3 - bl battle_get_side_with_given_state - ldr r1, _081211E4 @ =gUnknown_02024A6A + bl GetBankByPlayerAI + ldr r1, _081211E4 @ =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -879,10 +879,10 @@ _081211C8: adds r0, r1 b _0812190E .align 2, 0 -_081211E4: .4byte gUnknown_02024A6A +_081211E4: .4byte gBattlePartyID _081211E8: .4byte gEnemyParty _081211EC: - ldr r2, _0812120C @ =gUnknown_02024A6A + ldr r2, _0812120C @ =gBattlePartyID ldr r1, _08121210 @ =gLinkPlayers lsls r0, r7, 3 subs r0, r7 @@ -898,11 +898,11 @@ _081211EC: adds r0, r1 b _0812190E .align 2, 0 -_0812120C: .4byte gUnknown_02024A6A +_0812120C: .4byte gBattlePartyID _08121210: .4byte gLinkPlayers _08121214: .4byte gPlayerParty _08121218: - ldr r2, _0812123C @ =gUnknown_02024A6A + ldr r2, _0812123C @ =gBattlePartyID ldr r1, _08121240 @ =gLinkPlayers lsls r0, r7, 3 subs r0, r7 @@ -920,11 +920,11 @@ _08121218: adds r0, r1 b _0812190E .align 2, 0 -_0812123C: .4byte gUnknown_02024A6A +_0812123C: .4byte gBattlePartyID _08121240: .4byte gLinkPlayers _08121244: .4byte gEnemyParty _08121248: - ldr r2, _0812126C @ =gUnknown_02024A6A + ldr r2, _0812126C @ =gBattlePartyID ldr r1, _08121270 @ =gLinkPlayers lsls r0, r7, 3 subs r0, r7 @@ -942,11 +942,11 @@ _08121248: adds r0, r1 b _0812190E .align 2, 0 -_0812126C: .4byte gUnknown_02024A6A +_0812126C: .4byte gBattlePartyID _08121270: .4byte gLinkPlayers _08121274: .4byte gPlayerParty _08121278: - ldr r2, _0812129C @ =gUnknown_02024A6A + ldr r2, _0812129C @ =gBattlePartyID ldr r1, _081212A0 @ =gLinkPlayers lsls r0, r7, 3 subs r0, r7 @@ -964,13 +964,13 @@ _08121278: adds r0, r1 b _0812190E .align 2, 0 -_0812129C: .4byte gUnknown_02024A6A +_0812129C: .4byte gBattlePartyID _081212A0: .4byte gLinkPlayers _081212A4: .4byte gEnemyParty _081212A8: - ldr r4, _081212CC @ =gPlayerMonIndex + ldr r4, _081212CC @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 adds r2, r4, 0 cmp r0, 0 @@ -985,7 +985,7 @@ _081212A8: ldr r4, _081212D8 @ =gUnknown_08400797 b _081212E6 .align 2, 0 -_081212CC: .4byte gPlayerMonIndex +_081212CC: .4byte gBankAttacker _081212D0: .4byte gBattleTypeFlags _081212D4: .4byte gUnknown_08400791 _081212D8: .4byte gUnknown_08400797 @@ -1001,12 +1001,12 @@ _081212E6: cmp r0, 0xFF bne _081212DC ldrb r0, [r2] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r0, 0x1 ands r0, r1 - bl battle_get_side_with_given_state - ldr r1, _08121314 @ =gUnknown_02024A6A + bl GetBankByPlayerAI + ldr r1, _08121314 @ =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -1017,37 +1017,37 @@ _081212E6: adds r0, r1 b _0812190E .align 2, 0 -_08121314: .4byte gUnknown_02024A6A +_08121314: .4byte gBattlePartyID _08121318: .4byte gEnemyParty _0812131C: ldrb r0, [r2] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r0, 0x1 ands r0, r1 - bl battle_get_side_with_given_state - ldr r1, _08121338 @ =gUnknown_02024A6A + bl GetBankByPlayerAI + ldr r1, _08121338 @ =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] b _0812193A .align 2, 0 -_08121338: .4byte gUnknown_02024A6A +_08121338: .4byte gBattlePartyID _0812133C: - ldr r4, _08121370 @ =gPlayerMonIndex + ldr r4, _08121370 @ =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0812137C ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r0, 0x1 ands r0, r1 - bl battle_get_side_with_given_state - ldr r1, _08121374 @ =gUnknown_02024A6A + bl GetBankByPlayerAI + ldr r1, _08121374 @ =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, 0x4 @@ -1059,17 +1059,17 @@ _0812133C: adds r0, r1 b _0812190E .align 2, 0 -_08121370: .4byte gPlayerMonIndex -_08121374: .4byte gUnknown_02024A6A +_08121370: .4byte gBankAttacker +_08121374: .4byte gBattlePartyID _08121378: .4byte gPlayerParty _0812137C: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r0, 0x1 ands r0, r1 - bl battle_get_side_with_given_state - ldr r1, _081213A0 @ =gUnknown_02024A6A + bl GetBankByPlayerAI + ldr r1, _081213A0 @ =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, 0x4 @@ -1080,12 +1080,12 @@ _0812137C: ldr r1, _081213A4 @ =gEnemyParty b _08121940 .align 2, 0 -_081213A0: .4byte gUnknown_02024A6A +_081213A0: .4byte gBattlePartyID _081213A4: .4byte gEnemyParty _081213A8: - ldr r5, _081213F4 @ =gPlayerMonIndex + ldr r5, _081213F4 @ =gBankAttacker ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0812140C @@ -1100,7 +1100,7 @@ _081213A8: _081213C6: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _08121404 @ =gUnknown_02024A6A + ldr r3, _08121404 @ =gBattlePartyID ldr r2, _08121408 @ =gEnemyParty mov r12, r2 adds r2, r5, 0 @@ -1123,25 +1123,25 @@ _081213E8: ldrh r1, [r0] b _08121908 .align 2, 0 -_081213F4: .4byte gPlayerMonIndex +_081213F4: .4byte gBankAttacker _081213F8: .4byte gBattleTypeFlags _081213FC: .4byte gUnknown_08400791 _08121400: .4byte gUnknown_08400797 -_08121404: .4byte gUnknown_02024A6A +_08121404: .4byte gBattlePartyID _08121408: .4byte gEnemyParty _0812140C: - ldr r1, _08121418 @ =gUnknown_02024A6A + ldr r1, _08121418 @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _0812193A .align 2, 0 -_08121418: .4byte gUnknown_02024A6A +_08121418: .4byte gBattlePartyID _0812141C: - ldr r5, _08121468 @ =gEnemyMonIndex + ldr r5, _08121468 @ =gBankTarget ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08121480 @@ -1156,7 +1156,7 @@ _0812141C: _0812143A: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _08121478 @ =gUnknown_02024A6A + ldr r3, _08121478 @ =gBattlePartyID ldr r2, _0812147C @ =gEnemyParty mov r12, r2 adds r2, r5, 0 @@ -1179,25 +1179,25 @@ _0812145C: ldrh r1, [r0] b _08121908 .align 2, 0 -_08121468: .4byte gEnemyMonIndex +_08121468: .4byte gBankTarget _0812146C: .4byte gBattleTypeFlags _08121470: .4byte gUnknown_08400791 _08121474: .4byte gUnknown_08400797 -_08121478: .4byte gUnknown_02024A6A +_08121478: .4byte gBattlePartyID _0812147C: .4byte gEnemyParty _08121480: - ldr r1, _0812148C @ =gUnknown_02024A6A + ldr r1, _0812148C @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _0812193A .align 2, 0 -_0812148C: .4byte gUnknown_02024A6A +_0812148C: .4byte gBattlePartyID _08121490: - ldr r5, _081214DC @ =gUnknown_02024C0A + ldr r5, _081214DC @ =gEffectBank ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _081214F4 @@ -1212,7 +1212,7 @@ _08121490: _081214AE: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _081214EC @ =gUnknown_02024A6A + ldr r3, _081214EC @ =gBattlePartyID ldr r2, _081214F0 @ =gEnemyParty mov r12, r2 adds r2, r5, 0 @@ -1235,25 +1235,25 @@ _081214D0: ldrh r1, [r0] b _08121908 .align 2, 0 -_081214DC: .4byte gUnknown_02024C0A +_081214DC: .4byte gEffectBank _081214E0: .4byte gBattleTypeFlags _081214E4: .4byte gUnknown_08400791 _081214E8: .4byte gUnknown_08400797 -_081214EC: .4byte gUnknown_02024A6A +_081214EC: .4byte gBattlePartyID _081214F0: .4byte gEnemyParty _081214F4: - ldr r1, _08121500 @ =gUnknown_02024A6A + ldr r1, _08121500 @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _0812193A .align 2, 0 -_08121500: .4byte gUnknown_02024A6A +_08121500: .4byte gBattlePartyID _08121504: - ldr r5, _08121550 @ =gUnknown_02024A60 + ldr r5, _08121550 @ =gActiveBank ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08121568 @@ -1268,7 +1268,7 @@ _08121504: _08121522: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _08121560 @ =gUnknown_02024A6A + ldr r3, _08121560 @ =gBattlePartyID ldr r2, _08121564 @ =gEnemyParty mov r12, r2 adds r2, r5, 0 @@ -1291,27 +1291,27 @@ _08121544: ldrh r1, [r0] b _08121908 .align 2, 0 -_08121550: .4byte gUnknown_02024A60 +_08121550: .4byte gActiveBank _08121554: .4byte gBattleTypeFlags _08121558: .4byte gUnknown_08400791 _0812155C: .4byte gUnknown_08400797 -_08121560: .4byte gUnknown_02024A6A +_08121560: .4byte gBattlePartyID _08121564: .4byte gEnemyParty _08121568: - ldr r1, _08121574 @ =gUnknown_02024A6A + ldr r1, _08121574 @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _0812193A .align 2, 0 -_08121574: .4byte gUnknown_02024A6A +_08121574: .4byte gBattlePartyID _08121578: ldr r4, _081215CC @ =0x02000000 ldr r0, _081215D0 @ =0x00016003 adds r5, r4, r0 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 adds r2, r4, 0 cmp r0, 0 @@ -1327,7 +1327,7 @@ _08121578: _0812159C: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _081215E0 @ =gUnknown_02024A6A + ldr r3, _081215E0 @ =gBattlePartyID ldr r5, _081215E4 @ =gEnemyParty mov r12, r5 cmp r0, 0xFF @@ -1356,19 +1356,19 @@ _081215D0: .4byte 0x00016003 _081215D4: .4byte gBattleTypeFlags _081215D8: .4byte gUnknown_08400791 _081215DC: .4byte gUnknown_08400797 -_081215E0: .4byte gUnknown_02024A6A +_081215E0: .4byte gBattlePartyID _081215E4: .4byte gEnemyParty _081215E8: - ldr r1, _081215F4 @ =gUnknown_02024A6A + ldr r1, _081215F4 @ =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _0812193A .align 2, 0 -_081215F4: .4byte gUnknown_02024A6A +_081215F4: .4byte gBattlePartyID _081215F8: - ldr r0, _08121610 @ =gSelectedOrderFromParty + ldr r0, _08121610 @ =gBufferedMoves ldr r2, [r0] ldrh r1, [r2] movs r0, 0xB1 @@ -1380,14 +1380,14 @@ _081215F8: adds r0, r2 b _08121634 .align 2, 0 -_08121610: .4byte gSelectedOrderFromParty +_08121610: .4byte gBufferedMoves _08121614: .4byte 0x02000000 _08121618: .4byte 0x000160a0 _0812161C: ldrh r1, [r2] b _08121652 _08121620: - ldr r0, _08121640 @ =gSelectedOrderFromParty + ldr r0, _08121640 @ =gBufferedMoves ldr r2, [r0] ldrh r1, [r2, 0x2] movs r0, 0xB1 @@ -1404,7 +1404,7 @@ _08121634: adds r4, r0, r1 b _081219E6 .align 2, 0 -_08121640: .4byte gSelectedOrderFromParty +_08121640: .4byte gBufferedMoves _08121644: .4byte 0x02000000 _08121648: .4byte 0x000160a0 _0812164C: .4byte gUnknown_08401674 @@ -1425,7 +1425,7 @@ _08121660: ands r0, r1 cmp r0, 0 beq _081216D8 - ldr r1, _081216B0 @ =gUnknown_02024C04 + ldr r1, _081216B0 @ =gLastUsedItem ldrh r0, [r1] cmp r0, 0xAF bne _081216D4 @@ -1438,7 +1438,7 @@ _08121660: subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081216C0 @ =gUnknown_02024C0B + ldr r1, _081216C0 @ =gStringBank ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 @@ -1457,11 +1457,11 @@ _08121660: b _081219E6 .align 2, 0 _081216AC: .4byte gBattleTypeFlags -_081216B0: .4byte gUnknown_02024C04 +_081216B0: .4byte gLastUsedItem _081216B4: .4byte gLinkPlayers _081216B8: .4byte 0x02000000 _081216BC: .4byte 0x000160cb -_081216C0: .4byte gUnknown_02024C0B +_081216C0: .4byte gStringBank _081216C4: .4byte gEnigmaBerries _081216C8: .4byte gUnknown_08400A85 _081216CC: @@ -1473,7 +1473,7 @@ _081216D4: ldrh r0, [r1] b _081216DC _081216D8: - ldr r0, _081216E8 @ =gUnknown_02024C04 + ldr r0, _081216E8 @ =gLastUsedItem ldrh r0, [r0] _081216DC: mov r1, sp @@ -1481,39 +1481,39 @@ _081216DC: mov r4, sp b _081219E6 .align 2, 0 -_081216E8: .4byte gUnknown_02024C04 +_081216E8: .4byte gLastUsedItem _081216EC: - ldr r0, _081216F0 @ =byte_2024C06 + ldr r0, _081216F0 @ =gLastUsedAbility b _08121734 .align 2, 0 -_081216F0: .4byte byte_2024C06 +_081216F0: .4byte gLastUsedAbility _081216F4: - ldr r1, _081216FC @ =gUnknown_0203926C - ldr r0, _08121700 @ =gPlayerMonIndex + ldr r1, _081216FC @ =gAbilitiesPerBank + ldr r0, _08121700 @ =gBankAttacker b _08121730 .align 2, 0 -_081216FC: .4byte gUnknown_0203926C -_08121700: .4byte gPlayerMonIndex +_081216FC: .4byte gAbilitiesPerBank +_08121700: .4byte gBankAttacker _08121704: - ldr r1, _0812170C @ =gUnknown_0203926C - ldr r0, _08121710 @ =gEnemyMonIndex + ldr r1, _0812170C @ =gAbilitiesPerBank + ldr r0, _08121710 @ =gBankTarget b _08121730 .align 2, 0 -_0812170C: .4byte gUnknown_0203926C -_08121710: .4byte gEnemyMonIndex +_0812170C: .4byte gAbilitiesPerBank +_08121710: .4byte gBankTarget _08121714: - ldr r1, _08121720 @ =gUnknown_0203926C + ldr r1, _08121720 @ =gAbilitiesPerBank ldr r0, _08121724 @ =0x02000000 ldr r2, _08121728 @ =0x00016003 adds r0, r2 b _08121730 .align 2, 0 -_08121720: .4byte gUnknown_0203926C +_08121720: .4byte gAbilitiesPerBank _08121724: .4byte 0x02000000 _08121728: .4byte 0x00016003 _0812172C: - ldr r1, _08121740 @ =gUnknown_0203926C - ldr r0, _08121744 @ =gUnknown_02024C0A + ldr r1, _08121740 @ =gAbilitiesPerBank + ldr r0, _08121744 @ =gEffectBank _08121730: ldrb r0, [r0] adds r0, r1 @@ -1525,8 +1525,8 @@ _08121734: adds r4, r1, r0 b _081219E6 .align 2, 0 -_08121740: .4byte gUnknown_0203926C -_08121744: .4byte gUnknown_02024C0A +_08121740: .4byte gAbilitiesPerBank +_08121744: .4byte gEffectBank _08121748: .4byte gAbilityNames _0812174C: ldr r3, _08121764 @ =gTrainerBattleOpponent @@ -1719,7 +1719,7 @@ _081218C0: ldr r1, _0812191C @ =0x00016003 adds r0, r5, r1 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08121934 @@ -1805,15 +1805,15 @@ _08121970: .4byte 0x0000084b _08121974: .4byte gUnknown_084009ED _08121978: .4byte gUnknown_084009F7 _0812197C: - ldr r0, _08121980 @ =gPlayerMonIndex + ldr r0, _08121980 @ =gBankAttacker b _08121986 .align 2, 0 -_08121980: .4byte gPlayerMonIndex +_08121980: .4byte gBankAttacker _08121984: - ldr r0, _08121998 @ =gEnemyMonIndex + ldr r0, _08121998 @ =gBankTarget _08121986: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r4, _0812199C @ =gUnknown_084007A7 cmp r0, 0 @@ -1821,19 +1821,19 @@ _08121986: ldr r4, _081219A0 @ =gUnknown_084007AC b _081219E6 .align 2, 0 -_08121998: .4byte gEnemyMonIndex +_08121998: .4byte gBankTarget _0812199C: .4byte gUnknown_084007A7 _081219A0: .4byte gUnknown_084007AC _081219A4: - ldr r0, _081219A8 @ =gPlayerMonIndex + ldr r0, _081219A8 @ =gBankAttacker b _081219AE .align 2, 0 -_081219A8: .4byte gPlayerMonIndex +_081219A8: .4byte gBankAttacker _081219AC: - ldr r0, _081219C0 @ =gEnemyMonIndex + ldr r0, _081219C0 @ =gBankTarget _081219AE: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r4, _081219C4 @ =gUnknown_0840079C cmp r0, 0 @@ -1841,19 +1841,19 @@ _081219AE: ldr r4, _081219C8 @ =gUnknown_084007A1 b _081219E6 .align 2, 0 -_081219C0: .4byte gEnemyMonIndex +_081219C0: .4byte gBankTarget _081219C4: .4byte gUnknown_0840079C _081219C8: .4byte gUnknown_084007A1 _081219CC: - ldr r0, _081219D0 @ =gPlayerMonIndex + ldr r0, _081219D0 @ =gBankAttacker b _081219D6 .align 2, 0 -_081219D0: .4byte gPlayerMonIndex +_081219D0: .4byte gBankAttacker _081219D4: - ldr r0, _08121A24 @ =gEnemyMonIndex + ldr r0, _08121A24 @ =gBankTarget _081219D6: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r4, _08121A28 @ =gUnknown_084007B2 cmp r0, 0 @@ -1894,7 +1894,7 @@ _08121A06: adds r6, 0x1 b _08121A3C .align 2, 0 -_08121A24: .4byte gEnemyMonIndex +_08121A24: .4byte gBankTarget _08121A28: .4byte gUnknown_084007B2 _08121A2C: .4byte gUnknown_084007B7 _08121A30: @@ -1927,7 +1927,7 @@ _08121A4A: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8120FFC + thumb_func_end StrCpyDecodeBattle thumb_func_start sub_8121A68 sub_8121A68: @ 8121A68 @@ -1980,14 +1980,14 @@ _08121ACC: ldrb r0, [r0, 0x2] lsls r0, 8 orrs r1, r0 - ldr r0, _08121AE4 @ =gUnknown_08400F8C + ldr r0, _08121AE4 @ =gBattleStringsTable subs r1, 0xC lsls r1, 2 adds r1, r0 ldr r1, [r1] b _08121CE2 .align 2, 0 -_08121AE4: .4byte gUnknown_08400F8C +_08121AE4: .4byte gBattleStringsTable _08121AE8: ldrb r0, [r4, 0x1] cmp r0, 0x2 @@ -2060,7 +2060,7 @@ _08121B54: _08121B60: .4byte gTypeNames _08121B64: ldrb r0, [r4, 0x1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08121B88 @@ -2135,7 +2135,7 @@ _08121BF0: _08121C02: adds r4, r5, r7 ldrb r0, [r4, 0x1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08121C28 @@ -2213,7 +2213,7 @@ _08121C78: subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _08121CD4 @ =gUnknown_02024C0B + ldr r1, _08121CD4 @ =gStringBank ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 @@ -2232,7 +2232,7 @@ _08121CC4: .4byte gBattleTypeFlags _08121CC8: .4byte gLinkPlayers _08121CCC: .4byte 0x02000000 _08121CD0: .4byte 0x000160cb -_08121CD4: .4byte gUnknown_02024C0B +_08121CD4: .4byte gStringBank _08121CD8: .4byte gEnigmaBerries _08121CDC: .4byte gUnknown_08400A85 _08121CE0: @@ -2274,7 +2274,7 @@ sub_8121D1C: @ 8121D1C push {r4,r5,lr} adds r4, r0, 0 movs r2, 0 - ldr r5, _08121D50 @ =gSelectedOrderFromParty + ldr r5, _08121D50 @ =gBufferedMoves ldr r3, _08121D54 @ =gUnknown_084016BC _08121D26: cmp r2, 0x4 @@ -2299,7 +2299,7 @@ _08121D3C: bl StringCopy b _08121D68 .align 2, 0 -_08121D50: .4byte gSelectedOrderFromParty +_08121D50: .4byte gBufferedMoves _08121D54: .4byte gUnknown_084016BC _08121D58: .4byte gUnknown_08400E5E _08121D5C: @@ -2329,7 +2329,7 @@ _08121D7E: cmp r0, 0xFF bne _08121D7C ldr r1, _08121DB4 @ =gUnknown_084016BC - ldr r5, _08121DB8 @ =gSelectedOrderFromParty + ldr r5, _08121DB8 @ =gBufferedMoves movs r0, 0 lsls r0, 1 adds r2, r0, r1 @@ -2356,7 +2356,7 @@ _08121DA8: mov pc, r0 .align 2, 0 _08121DB4: .4byte gUnknown_084016BC -_08121DB8: .4byte gSelectedOrderFromParty +_08121DB8: .4byte gBufferedMoves _08121DBC: .4byte _08121DC0 .align 2, 0 _08121DC0: diff --git a/asm/battle_records.s b/asm/battle_records.s index e10f2f4e5..cfe822acc 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -415,7 +415,7 @@ _08110250: .4byte 0x0000270f sub_8110254: @ 8110254 push {r4,lr} adds r4, r0, 0 - ldr r0, _08110268 @ =gUnknown_02024D26 + ldr r0, _08110268 @ =gBattleOutcome ldrb r0, [r0] cmp r0, 0x1 beq _0811026C @@ -423,7 +423,7 @@ sub_8110254: @ 8110254 beq _0811027A b _08110288 .align 2, 0 -_08110268: .4byte gUnknown_02024D26 +_08110268: .4byte gBattleOutcome _0811026C: eors r0, r4 bl sub_81101FC @@ -457,7 +457,7 @@ sub_8110290: @ 8110290 subs r3, 0x30 adds r2, r3 ldrh r2, [r2, 0xE] - ldr r3, _081102DC @ =gUnknown_02024D26 + ldr r3, _081102DC @ =gBattleOutcome ldrb r3, [r3] ldr r6, _081102E0 @ =gLinkPlayers ldr r5, _081102E4 @ =gLinkPlayerMapObjects @@ -478,7 +478,7 @@ sub_8110290: @ 8110290 .align 2, 0 _081102D4: .4byte gSaveBlock1 + 0x30B8 _081102D8: .4byte gTrainerCards + 0x30 -_081102DC: .4byte gUnknown_02024D26 +_081102DC: .4byte gBattleOutcome _081102E0: .4byte gLinkPlayers _081102E4: .4byte gLinkPlayerMapObjects thumb_func_end sub_8110290 diff --git a/asm/battle_tower.s b/asm/battle_tower.s index c50903de5..ee8e18198 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2324,7 +2324,7 @@ _08135750: .4byte 0x00000564 _08135754: movs r2, 0 ldr r4, _0813576C @ =gSaveBlock2 + 0x565 - ldr r3, _08135770 @ =gSelectedOrderFromParty + ldr r3, _08135770 @ =gBufferedMoves _0813575A: adds r0, r2, r4 adds r1, r2, r3 @@ -2336,7 +2336,7 @@ _0813575A: b _0813589A .align 2, 0 _0813576C: .4byte gSaveBlock2 + 0x565 -_08135770: .4byte gSelectedOrderFromParty +_08135770: .4byte gBufferedMoves _08135774: ldr r3, _081357C0 @ =0x00000564 adds r0, r5, r3 @@ -2665,7 +2665,7 @@ _08135A10: .4byte 0x00000554 sub_8135A14: @ 8135A14 push {r4,lr} movs r2, 0 - ldr r4, _08135A34 @ =gSelectedOrderFromParty + ldr r4, _08135A34 @ =gBufferedMoves ldr r3, _08135A38 @ =gSaveBlock2 + 0x565 _08135A1C: adds r0, r2, r4 @@ -2680,7 +2680,7 @@ _08135A1C: pop {r0} bx r0 .align 2, 0 -_08135A34: .4byte gSelectedOrderFromParty +_08135A34: .4byte gBufferedMoves _08135A38: .4byte gSaveBlock2 + 0x565 thumb_func_end sub_8135A14 @@ -2891,7 +2891,7 @@ _08135BD4: _08135BD8: bl sub_8135CFC ldr r4, _08135C1C @ =gSaveBlock2 - ldr r0, _08135C2C @ =gUnknown_02024D26 + ldr r0, _08135C2C @ =gBattleOutcome ldrb r1, [r0] ldr r2, _08135C30 @ =0x00000555 adds r0, r4, r2 @@ -2925,7 +2925,7 @@ _08135C1C: .4byte gSaveBlock2 _08135C20: .4byte 0x00000554 _08135C24: .4byte gSpecialVar_0x8004 _08135C28: .4byte 0x0000055c -_08135C2C: .4byte gUnknown_02024D26 +_08135C2C: .4byte gBattleOutcome _08135C30: .4byte 0x00000555 _08135C34: .4byte 0x00000556 thumb_func_end sub_8135BA0 @@ -3553,7 +3553,7 @@ _081360CC: .4byte gSaveBlock2 + 0x4A8 thumb_func_start sub_81360D0 sub_81360D0: @ 81360D0 push {lr} - ldr r0, _081360E4 @ =gUnknown_02024D26 + ldr r0, _081360E4 @ =gBattleOutcome ldrb r0, [r0] cmp r0, 0x3 bne _081360EC @@ -3562,7 +3562,7 @@ sub_81360D0: @ 81360D0 strb r0, [r1] b _08136102 .align 2, 0 -_081360E4: .4byte gUnknown_02024D26 +_081360E4: .4byte gBattleOutcome _081360E8: .4byte gStringVar4 _081360EC: cmp r0, 0x1 diff --git a/asm/choose_party.s b/asm/choose_party.s index f1a03cda3..efa50dcf5 100644 --- a/asm/choose_party.s +++ b/asm/choose_party.s @@ -47,7 +47,7 @@ _08121E54: .4byte 0x00000263 sub_8121E58: @ 8121E58 push {lr} movs r1, 0 - ldr r3, _08121E74 @ =gSelectedOrderFromParty + ldr r3, _08121E74 @ =gBufferedMoves movs r2, 0 _08121E60: adds r0, r1, r3 @@ -60,7 +60,7 @@ _08121E60: pop {r0} bx r0 .align 2, 0 -_08121E74: .4byte gSelectedOrderFromParty +_08121E74: .4byte gBufferedMoves thumb_func_end sub_8121E58 thumb_func_start sub_8121E78 @@ -192,7 +192,7 @@ _08121F78: _08121F7E: cmp r4, 0x2 bhi _08121FA0 - ldr r0, _08121FC4 @ =gSelectedOrderFromParty + ldr r0, _08121FC4 @ =gBufferedMoves adds r0, r4, r0 ldrb r0, [r0] cmp r0, r6 @@ -223,7 +223,7 @@ _08121FA0: bl sub_806BC3C b _08121FD4 .align 2, 0 -_08121FC4: .4byte gSelectedOrderFromParty +_08121FC4: .4byte gBufferedMoves _08121FC8: .4byte gPlayerParty _08121FCC: adds r0, r5, 0 @@ -372,7 +372,7 @@ sub_81220C8: @ 81220C8 ldrb r0, [r0] cmp r0, 0 beq _081221A2 - ldr r0, _081220F4 @ =gSelectedOrderFromParty + ldr r0, _081220F4 @ =gBufferedMoves ldrb r0, [r0, 0x2] cmp r0, 0 bne _08122100 @@ -381,7 +381,7 @@ sub_81220C8: @ 81220C8 .align 2, 0 _081220EC: .4byte 0x0201b000 _081220F0: .4byte 0x00000263 -_081220F4: .4byte gSelectedOrderFromParty +_081220F4: .4byte gBufferedMoves _081220F8: movs r0, 0x12 b _081221A4 @@ -391,7 +391,7 @@ _081220FC: _08122100: movs r5, 0 _08122102: - ldr r4, _081221B4 @ =gSelectedOrderFromParty + ldr r4, _081221B4 @ =gBufferedMoves adds r4, r5, r4 ldrb r0, [r4] movs r1, 0x64 @@ -430,7 +430,7 @@ _0812214A: add r0, r9 movs r1, 0 ldrsh r4, [r0, r1] - ldr r0, _081221B4 @ =gSelectedOrderFromParty + ldr r0, _081221B4 @ =gBufferedMoves adds r6, r5, r0 ldrb r0, [r6] mov r2, r8 @@ -481,7 +481,7 @@ _081221A4: pop {r1} bx r1 .align 2, 0 -_081221B4: .4byte gSelectedOrderFromParty +_081221B4: .4byte gBufferedMoves _081221B8: .4byte gUnknown_030042FC _081221BC: .4byte 0x0201b000 _081221C0: .4byte 0x00000282 @@ -495,7 +495,7 @@ sub_81221CC: @ 81221CC lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _081221E4 @ =gSelectedOrderFromParty + ldr r3, _081221E4 @ =gBufferedMoves _081221D6: adds r0, r1, r3 ldrb r0, [r0] @@ -504,7 +504,7 @@ _081221D6: movs r0, 0x1 b _081221F4 .align 2, 0 -_081221E4: .4byte gSelectedOrderFromParty +_081221E4: .4byte gBufferedMoves _081221E8: adds r0, r1, 0x1 lsls r0, 24 @@ -868,7 +868,7 @@ sub_81224A8: @ 81224A8 .align 2, 0 _081224CC: .4byte gTasks _081224D0: - ldr r0, _081224F8 @ =gSelectedOrderFromParty + ldr r0, _081224F8 @ =gBufferedMoves ldrb r0, [r0] cmp r0, 0 beq _08122504 @@ -888,7 +888,7 @@ _081224D0: str r1, [r0] b _08122520 .align 2, 0 -_081224F8: .4byte gSelectedOrderFromParty +_081224F8: .4byte gBufferedMoves _081224FC: .4byte gTasks _08122500: .4byte sub_8122450 _08122504: @@ -1088,7 +1088,7 @@ sub_8122694: @ 8122694 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r3, _081226D4 @ =gSelectedOrderFromParty + ldr r3, _081226D4 @ =gBufferedMoves ldr r2, _081226D8 @ =gLastFieldPokeMenuOpened _081226A0: adds r1, r4, r3 @@ -1116,7 +1116,7 @@ _081226CC: bl sub_8122838 b _08122716 .align 2, 0 -_081226D4: .4byte gSelectedOrderFromParty +_081226D4: .4byte gBufferedMoves _081226D8: .4byte gLastFieldPokeMenuOpened _081226DC: adds r0, r4, 0x1 @@ -1197,7 +1197,7 @@ sub_8122770: @ 8122770 lsrs r6, r0, 24 movs r4, 0 ldr r5, _08122798 @ =gLastFieldPokeMenuOpened - ldr r3, _0812279C @ =gSelectedOrderFromParty + ldr r3, _0812279C @ =gBufferedMoves _0812277C: adds r2, r4, r3 ldrb r1, [r2] @@ -1214,7 +1214,7 @@ _0812277C: b _081227BE .align 2, 0 _08122798: .4byte gLastFieldPokeMenuOpened -_0812279C: .4byte gSelectedOrderFromParty +_0812279C: .4byte gBufferedMoves _081227A0: ldrb r0, [r3, 0x1] strb r0, [r3] @@ -1237,7 +1237,7 @@ _081227BE: ldrb r0, [r5] movs r1, 0x70 bl sub_806BC3C - ldr r4, _081227F8 @ =gSelectedOrderFromParty + ldr r4, _081227F8 @ =gBufferedMoves ldrb r0, [r4] cmp r0, 0 beq _081227DA @@ -1262,7 +1262,7 @@ _081227EC: pop {r0} bx r0 .align 2, 0 -_081227F8: .4byte gSelectedOrderFromParty +_081227F8: .4byte gBufferedMoves thumb_func_end sub_8122770 thumb_func_start sub_81227FC diff --git a/asm/contest.s b/asm/contest.s index 00c4013a3..4a85f3d16 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -868,7 +868,7 @@ _080AB8CC: bl sub_80B00C8 bl sub_80B0324 bl sub_80B0518 - ldr r1, _080AB928 @ =gUnknown_02024A72 + ldr r1, _080AB928 @ =gBanksBySide strb r4, [r1] movs r0, 0x1 strb r0, [r1, 0x1] @@ -878,12 +878,12 @@ _080AB8CC: strb r2, [r1, 0x3] ldr r0, _080AB92C @ =gBattleTypeFlags strh r4, [r0] - ldr r4, _080AB930 @ =gPlayerMonIndex + ldr r4, _080AB930 @ =gBankAttacker strb r2, [r4] - ldr r0, _080AB934 @ =gEnemyMonIndex + ldr r0, _080AB934 @ =gBankTarget strb r3, [r0] bl sub_80AE858 - ldr r2, _080AB938 @ =gUnknown_02024BE0 + ldr r2, _080AB938 @ =gObjectBankIDs ldrb r1, [r4] adds r1, r2 strb r0, [r1] @@ -891,11 +891,11 @@ _080AB8CC: b _080AB946 .align 2, 0 _080AB924: .4byte 0x02019204 -_080AB928: .4byte gUnknown_02024A72 +_080AB928: .4byte gBanksBySide _080AB92C: .4byte gBattleTypeFlags -_080AB930: .4byte gPlayerMonIndex -_080AB934: .4byte gEnemyMonIndex -_080AB938: .4byte gUnknown_02024BE0 +_080AB930: .4byte gBankAttacker +_080AB934: .4byte gBankTarget +_080AB938: .4byte gObjectBankIDs _080AB93C: movs r0, 0 mov r1, r10 @@ -1197,7 +1197,7 @@ sub_80ABB70: @ 80ABB70 lsls r0, 24 cmp r0, 0 bne _080ABBD4 - ldr r0, _080ABBCC @ =gUnknown_020238CC + ldr r0, _080ABBCC @ =gDisplayedStringBattle ldr r1, _080ABBD0 @ =gUnknown_083CAF84 bl StringCopy b _080ABBDC @@ -1209,14 +1209,14 @@ _080ABBBC: .4byte 0x02018204 _080ABBC0: .4byte 0x040000d4 _080ABBC4: .4byte 0x84000100 _080ABBC8: .4byte gContestPlayerMonIndex -_080ABBCC: .4byte gUnknown_020238CC +_080ABBCC: .4byte gDisplayedStringBattle _080ABBD0: .4byte gUnknown_083CAF84 _080ABBD4: - ldr r0, _080ABC20 @ =gUnknown_020238CC + ldr r0, _080ABC20 @ =gDisplayedStringBattle ldr r1, _080ABC24 @ =gUnknown_083CAFAE bl StringCopy _080ABBDC: - ldr r5, _080ABC20 @ =gUnknown_020238CC + ldr r5, _080ABC20 @ =gDisplayedStringBattle ldr r0, _080ABC28 @ =0x02019204 ldrb r1, [r0, 0x1] adds r1, 0x1 @@ -1247,7 +1247,7 @@ _080ABBDC: pop {r0} bx r0 .align 2, 0 -_080ABC20: .4byte gUnknown_020238CC +_080ABC20: .4byte gDisplayedStringBattle _080ABC24: .4byte gUnknown_083CAFAE _080ABC28: .4byte 0x02019204 _080ABC2C: .4byte gStringVar4 @@ -1635,7 +1635,7 @@ _080ABF26: lsls r0, 24 cmp r0, 0 bne _080ABF78 - ldr r0, _080ABF70 @ =gUnknown_020238CC + ldr r0, _080ABF70 @ =gDisplayedStringBattle ldr r1, _080ABF74 @ =gUnknown_083CAF84 bl StringCopy b _080ABF80 @@ -1643,14 +1643,14 @@ _080ABF26: _080ABF64: .4byte gUnknown_03004210 _080ABF68: .4byte gUnknown_083CA340 _080ABF6C: .4byte gContestPlayerMonIndex -_080ABF70: .4byte gUnknown_020238CC +_080ABF70: .4byte gDisplayedStringBattle _080ABF74: .4byte gUnknown_083CAF84 _080ABF78: - ldr r0, _080ABFC8 @ =gUnknown_020238CC + ldr r0, _080ABFC8 @ =gDisplayedStringBattle ldr r1, _080ABFCC @ =gUnknown_083CAFAE bl StringCopy _080ABF80: - ldr r5, _080ABFC8 @ =gUnknown_020238CC + ldr r5, _080ABFC8 @ =gDisplayedStringBattle ldr r0, _080ABFD0 @ =0x02019204 ldrb r1, [r0, 0x1] adds r1, 0x1 @@ -1683,7 +1683,7 @@ _080ABF80: str r1, [r0] b _080AC098 .align 2, 0 -_080ABFC8: .4byte gUnknown_020238CC +_080ABFC8: .4byte gDisplayedStringBattle _080ABFCC: .4byte gUnknown_083CAFAE _080ABFD0: .4byte 0x02019204 _080ABFD4: .4byte gStringVar4 @@ -2343,8 +2343,8 @@ _080AC542: lsls r4, 3 adds r4, r0 strh r5, [r4, 0xC] - ldr r1, _080AC5E0 @ =gUnknown_02024BE0 - ldr r0, _080AC5E4 @ =gPlayerMonIndex + ldr r1, _080AC5E0 @ =gObjectBankIDs + ldr r0, _080AC5E4 @ =gBankAttacker ldrb r0, [r0] adds r0, r1 strb r5, [r0] @@ -2364,8 +2364,8 @@ _080AC5D0: .4byte gContestMons _080AC5D4: .4byte gSprites _080AC5D8: .4byte sub_80AD8FC _080AC5DC: .4byte gTasks -_080AC5E0: .4byte gUnknown_02024BE0 -_080AC5E4: .4byte gPlayerMonIndex +_080AC5E0: .4byte gObjectBankIDs +_080AC5E4: .4byte gBankAttacker _080AC5E8: mov r1, r8 lsls r0, r1, 2 @@ -6359,7 +6359,7 @@ sub_80AE5D4: @ 80AE5D4 lsrs r4, r0, 24 lsls r2, 24 lsrs r2, 24 - ldr r3, _080AE660 @ =gUnknown_020238CC + ldr r3, _080AE660 @ =gDisplayedStringBattle ldr r1, _080AE664 @ =gEmptyString_81E72B0 adds r0, r3, 0 bl sub_80AE598 @@ -6393,7 +6393,7 @@ sub_80AE5D4: @ 80AE5D4 adds r0, r3, 0 bl StringCopy ldr r0, _080AE670 @ =gUnknown_03004210 - ldr r1, _080AE660 @ =gUnknown_020238CC + ldr r1, _080AE660 @ =gDisplayedStringBattle ldr r2, _080AE674 @ =gUnknown_02038696 adds r2, r4, r2 ldrb r4, [r2] @@ -6420,7 +6420,7 @@ sub_80AE5D4: @ 80AE5D4 bl sub_8004D04 b _080AE6B0 .align 2, 0 -_080AE660: .4byte gUnknown_020238CC +_080AE660: .4byte gDisplayedStringBattle _080AE664: .4byte gEmptyString_81E72B0 _080AE668: .4byte gIsLinkContest _080AE66C: .4byte gLinkPlayers @@ -6434,7 +6434,7 @@ _080AE67C: adds r0, r3, 0 bl StringCopy ldr r0, _080AE6BC @ =gUnknown_03004210 - ldr r1, _080AE6C0 @ =gUnknown_020238CC + ldr r1, _080AE6C0 @ =gDisplayedStringBattle ldr r2, _080AE6C4 @ =gUnknown_02038696 adds r2, r4, r2 ldrb r4, [r2] @@ -6460,7 +6460,7 @@ _080AE6B0: .align 2, 0 _080AE6B8: .4byte gUnknown_0203857D _080AE6BC: .4byte gUnknown_03004210 -_080AE6C0: .4byte gUnknown_020238CC +_080AE6C0: .4byte gDisplayedStringBattle _080AE6C4: .4byte gUnknown_02038696 _080AE6C8: .4byte gUnknown_083CA310 thumb_func_end sub_80AE5D4 @@ -6490,7 +6490,7 @@ sub_80AE6E4: @ 80AE6E4 lsrs r4, 24 lsls r2, 24 lsrs r2, 24 - ldr r3, _080AE75C @ =gUnknown_020238CC + ldr r3, _080AE75C @ =gDisplayedStringBattle movs r0, 0xFC strb r0, [r3] movs r0, 0x6 @@ -6507,7 +6507,7 @@ sub_80AE6E4: @ 80AE6E4 movs r0, 0xFF strb r0, [r3] ldr r0, _080AE764 @ =gUnknown_03004210 - ldr r1, _080AE75C @ =gUnknown_020238CC + ldr r1, _080AE75C @ =gDisplayedStringBattle ldr r2, _080AE768 @ =gUnknown_02038696 adds r4, r2 ldrb r4, [r4] @@ -6540,7 +6540,7 @@ sub_80AE6E4: @ 80AE6E4 pop {r0} bx r0 .align 2, 0 -_080AE75C: .4byte gUnknown_020238CC +_080AE75C: .4byte gDisplayedStringBattle _080AE760: .4byte gContestMons + 0x2 _080AE764: .4byte gUnknown_03004210 _080AE768: .4byte gUnknown_02038696 @@ -7941,17 +7941,17 @@ _080AF1FE: ldrh r0, [r1, 0x6] cmp r0, 0 bne _080AF228 - ldr r0, _080AF220 @ =gUnknown_020238CC + ldr r0, _080AF220 @ =gDisplayedStringBattle ldr r1, _080AF224 @ =gUnknownText_MissedTurn adds r2, r3, 0 bl sub_80AE598 b _080AF23A .align 2, 0 _080AF21C: .4byte 0x02019260 -_080AF220: .4byte gUnknown_020238CC +_080AF220: .4byte gDisplayedStringBattle _080AF224: .4byte gUnknownText_MissedTurn _080AF228: - ldr r0, _080AF270 @ =gUnknown_020238CC + ldr r0, _080AF270 @ =gDisplayedStringBattle ldrh r2, [r1, 0x6] movs r1, 0xD muls r1, r2 @@ -7963,7 +7963,7 @@ _080AF23A: adds r0, r5, 0 bl sub_80AF2A0 ldr r0, _080AF278 @ =gUnknown_03004210 - ldr r1, _080AF270 @ =gUnknown_020238CC + ldr r1, _080AF270 @ =gDisplayedStringBattle lsls r2, r5, 2 adds r2, r5 lsls r2, 18 @@ -7985,7 +7985,7 @@ _080AF23A: pop {r0} bx r0 .align 2, 0 -_080AF270: .4byte gUnknown_020238CC +_080AF270: .4byte gDisplayedStringBattle _080AF274: .4byte gMoveNames _080AF278: .4byte gUnknown_03004210 _080AF27C: .4byte gUnknown_083CA318 @@ -15126,17 +15126,17 @@ _080B2848: _080B2878: .4byte 0x02019260 _080B287C: .4byte gContestMons _080B2880: - ldr r1, _080B2888 @ =gUnknown_0202F7BE + ldr r1, _080B2888 @ =gHappinessMoveAnim movs r0, 0xFF b _080B28BC .align 2, 0 -_080B2888: .4byte gUnknown_0202F7BE +_080B2888: .4byte gHappinessMoveAnim _080B288C: - ldr r1, _080B2894 @ =gUnknown_0202F7BE + ldr r1, _080B2894 @ =gHappinessMoveAnim movs r0, 0 b _080B28BC .align 2, 0 -_080B2894: .4byte gUnknown_0202F7BE +_080B2894: .4byte gHappinessMoveAnim _080B2898: ldr r0, _080B28B0 @ =0x02019204 adds r2, r0, 0 @@ -15224,9 +15224,9 @@ sub_80B292C: @ 80B292C push {lr} ldr r0, _080B2958 @ =SpriteCallbackDummy bl CreateInvisibleSpriteWithCallback - ldr r1, _080B295C @ =gUnknown_02024BE0 + ldr r1, _080B295C @ =gObjectBankIDs strb r0, [r1, 0x3] - ldr r0, _080B2960 @ =gEnemyMonIndex + ldr r0, _080B2960 @ =gBankTarget ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -15241,15 +15241,15 @@ sub_80B292C: @ 80B292C bx r0 .align 2, 0 _080B2958: .4byte SpriteCallbackDummy -_080B295C: .4byte gUnknown_02024BE0 -_080B2960: .4byte gEnemyMonIndex +_080B295C: .4byte gObjectBankIDs +_080B2960: .4byte gBankTarget _080B2964: .4byte gSprites thumb_func_end sub_80B292C thumb_func_start sub_80B2968 sub_80B2968: @ 80B2968 push {r4,lr} - ldr r0, _080B29AC @ =gUnknown_02024BE0 + ldr r0, _080B29AC @ =gObjectBankIDs ldrb r0, [r0, 0x3] lsls r4, r0, 4 adds r4, r0 @@ -15280,7 +15280,7 @@ sub_80B2968: @ 80B2968 pop {r0} bx r0 .align 2, 0 -_080B29AC: .4byte gUnknown_02024BE0 +_080B29AC: .4byte gObjectBankIDs _080B29B0: .4byte gSprites thumb_func_end sub_80B2968 @@ -15341,20 +15341,20 @@ _080B29DC: .4byte _080B2A6C .4byte _080B2A6C _080B2A60: - ldr r1, _080B2A68 @ =gEnemyMonIndex + ldr r1, _080B2A68 @ =gBankTarget movs r0, 0x2 b _080B2A70 .align 2, 0 -_080B2A68: .4byte gEnemyMonIndex +_080B2A68: .4byte gBankTarget _080B2A6C: - ldr r1, _080B2A78 @ =gEnemyMonIndex + ldr r1, _080B2A78 @ =gBankTarget movs r0, 0x3 _080B2A70: strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_080B2A78: .4byte gEnemyMonIndex +_080B2A78: .4byte gBankTarget thumb_func_end sub_80B29B4 thumb_func_start sub_80B2A7C diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 7bd7de240..93dd26eee 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -281,17 +281,17 @@ sub_80C226C: @ 80C226C ldrb r0, [r0] cmp r5, r0 bne _080C2294 - ldr r0, _080C228C @ =gUnknown_020238CC + ldr r0, _080C228C @ =gDisplayedStringBattle ldr r1, _080C2290 @ =gUnknown_083D17DC bl StringCopy adds r2, r0, 0 b _080C2296 .align 2, 0 _080C2288: .4byte gContestPlayerMonIndex -_080C228C: .4byte gUnknown_020238CC +_080C228C: .4byte gDisplayedStringBattle _080C2290: .4byte gUnknown_083D17DC _080C2294: - ldr r2, _080C22E8 @ =gUnknown_020238CC + ldr r2, _080C22E8 @ =gDisplayedStringBattle _080C2296: movs r4, 0xFC strb r4, [r2] @@ -331,7 +331,7 @@ _080C2296: bl StringCopy b _080C230A .align 2, 0 -_080C22E8: .4byte gUnknown_020238CC +_080C22E8: .4byte gDisplayedStringBattle _080C22EC: .4byte gContestMons + 0x2 _080C22F0: .4byte gUnknown_083D17E0 _080C22F4: .4byte gIsLinkContest @@ -345,7 +345,7 @@ _080C22FC: lsls r4, r5, 3 _080C230A: ldr r0, _080C2334 @ =gMenuWindow - ldr r1, _080C2338 @ =gUnknown_020238CC + ldr r1, _080C2338 @ =gDisplayedStringBattle adds r2, r4, r5 lsls r2, 18 ldr r3, _080C233C @ =0x03020000 @@ -365,7 +365,7 @@ _080C230A: bx r0 .align 2, 0 _080C2334: .4byte gMenuWindow -_080C2338: .4byte gUnknown_020238CC +_080C2338: .4byte gDisplayedStringBattle _080C233C: .4byte 0x03020000 thumb_func_end sub_80C226C @@ -2198,7 +2198,7 @@ _080C31CE: bl GetStringWidthGivenWindowConfig lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080C32D4 @ =gUnknown_020238CC + ldr r2, _080C32D4 @ =gDisplayedStringBattle ldr r1, _080C32D8 @ =gUnknown_083D17E2 adds r0, r2, 0 bl StringCopy @@ -2237,7 +2237,7 @@ _080C3218: strb r0, [r2, 0x3] ldr r0, _080C32DC @ =0x02018068 mov r10, r0 - ldr r1, _080C32D4 @ =gUnknown_020238CC + ldr r1, _080C32D4 @ =gDisplayedStringBattle bl sub_80034D4 mov r0, sp ldrh r4, [r0] @@ -2301,7 +2301,7 @@ _080C32C4: .4byte gWindowConfig_81E7278 _080C32C8: .4byte 0x06010000 _080C32CC: .4byte 0x040000d4 _080C32D0: .4byte 0x85000100 -_080C32D4: .4byte gUnknown_020238CC +_080C32D4: .4byte gDisplayedStringBattle _080C32D8: .4byte gUnknown_083D17E2 _080C32DC: .4byte 0x02018068 _080C32E0: .4byte gUnknown_083D1624 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 159d96298..c6d3c0978 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -1321,7 +1321,7 @@ Task_EvolutionScene: @ 811240C beq _0811246E movs r0, 0x10 strh r0, [r3, 0x8] - ldr r0, _08112498 @ =gUnknown_02024D1E + ldr r0, _08112498 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1351,7 +1351,7 @@ _08112484: .align 2, 0 _08112490: .4byte gTasks _08112494: .4byte gMain -_08112498: .4byte gUnknown_02024D1E +_08112498: .4byte gBattleCommunication _0811249C: .4byte _081124A0 .align 2, 0 _081124A0: @@ -1503,7 +1503,7 @@ _081125FC: _0811260C: movs r0, 0x11 bl sub_8149970 - ldr r1, _08112628 @ =gUnknown_02024D1E + ldr r1, _08112628 @ =gBattleCommunication strb r0, [r1, 0x2] ldr r0, _0811262C @ =gTasks mov r2, r8 @@ -1513,10 +1513,10 @@ _0811260C: b _08112A2E .align 2, 0 _08112624: .4byte gPaletteFade -_08112628: .4byte gUnknown_02024D1E +_08112628: .4byte gBattleCommunication _0811262C: .4byte gTasks _08112630: - ldr r4, _08112664 @ =gUnknown_02024D1E + ldr r4, _08112664 @ =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1541,10 +1541,10 @@ _08112646: strb r0, [r4, 0x2] bl _08112FD0 .align 2, 0 -_08112664: .4byte gUnknown_02024D1E +_08112664: .4byte gBattleCommunication _08112668: .4byte 0x02014800 _0811266C: - ldr r4, _08112698 @ =gUnknown_02024D1E + ldr r4, _08112698 @ =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1566,7 +1566,7 @@ _08112682: adds r1, r6 b _08112A2E .align 2, 0 -_08112698: .4byte gUnknown_02024D1E +_08112698: .4byte gBattleCommunication _0811269C: .4byte 0x02014800 _081126A0: ldr r1, _081126D8 @ =0x02014800 @@ -1580,7 +1580,7 @@ _081126A0: _081126B2: movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, _081126DC @ =gUnknown_02024D1E + ldr r0, _081126DC @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1598,10 +1598,10 @@ _081126CC: b _08112A2E .align 2, 0 _081126D8: .4byte 0x02014800 -_081126DC: .4byte gUnknown_02024D1E +_081126DC: .4byte gBattleCommunication _081126E0: bl sub_8149B44 - ldr r1, _081126F4 @ =gUnknown_02024D1E + ldr r1, _081126F4 @ =gBattleCommunication strb r0, [r1, 0x2] ldr r0, _081126F8 @ =gTasks mov r3, r8 @@ -1610,10 +1610,10 @@ _081126E0: adds r1, r0 b _08112A2E .align 2, 0 -_081126F4: .4byte gUnknown_02024D1E +_081126F4: .4byte gBattleCommunication _081126F8: .4byte gTasks _081126FC: - ldr r5, _08112724 @ =gUnknown_02024D1E + ldr r5, _08112724 @ =gBattleCommunication ldrb r0, [r5, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1633,9 +1633,9 @@ _08112712: strb r0, [r5, 0x2] b _08112992 .align 2, 0 -_08112724: .4byte gUnknown_02024D1E +_08112724: .4byte gBattleCommunication _08112728: - ldr r0, _08112750 @ =gUnknown_02024D1E + ldr r0, _08112750 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1654,7 +1654,7 @@ _0811273E: adds r1, r6 b _08112A2E .align 2, 0 -_08112750: .4byte gUnknown_02024D1E +_08112750: .4byte gBattleCommunication _08112754: bl IsSEPlaying lsls r0, 24 @@ -1789,7 +1789,7 @@ _08112856: movs r1, 0x2 add r2, sp, 0x4 bl GetMonData - ldr r0, _081128A8 @ =gUnknown_030041C0 + ldr r0, _081128A8 @ =gBattleTextBuff1 add r1, sp, 0x4 bl StringCopy10 ldr r0, _081128AC @ =0x0000ffff @@ -1800,7 +1800,7 @@ _08112856: b _08112FD0 .align 2, 0 _081128A4: .4byte gUnknown_03004210 -_081128A8: .4byte gUnknown_030041C0 +_081128A8: .4byte gBattleTextBuff1 _081128AC: .4byte 0x0000ffff _081128B0: ldr r0, _081128C0 @ =0x0000fffe @@ -1868,7 +1868,7 @@ _0811291A: _0811292C: .4byte gPaletteFade _08112930: .4byte gUnknown_03005E94 _08112934: - ldr r0, _08112968 @ =gUnknown_02024D1E + ldr r0, _08112968 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1893,7 +1893,7 @@ _08112948: adds r1, r6 b _08112A2E .align 2, 0 -_08112968: .4byte gUnknown_02024D1E +_08112968: .4byte gBattleCommunication _0811296C: .4byte 0x0006001c _08112970: .4byte 0x00007fff _08112974: @@ -1967,10 +1967,10 @@ _081129FE: bl sub_8024CEC ldr r0, _08112A3C @ =0x0000016f bl PlayFanfare - ldr r0, _08112A40 @ =gUnknown_08400F8C + ldr r0, _08112A40 @ =gBattleStringsTable ldr r0, [r0, 0xC] - bl get_battle_strings_ - ldr r1, _08112A44 @ =gUnknown_020238CC + bl StrCpyDecodeToDisplayedStringBattle + ldr r1, _08112A44 @ =gDisplayedStringBattle movs r0, 0xF str r0, [sp] adds r0, r4, 0 @@ -1992,8 +1992,8 @@ _08112A2E: .align 2, 0 _08112A38: .4byte gUnknown_03004210 _08112A3C: .4byte 0x0000016f -_08112A40: .4byte gUnknown_08400F8C -_08112A44: .4byte gUnknown_020238CC +_08112A40: .4byte gBattleStringsTable +_08112A44: .4byte gDisplayedStringBattle _08112A48: .4byte gTasks _08112A4C: ldr r0, _08112A80 @ =gUnknown_03004210 @@ -2073,10 +2073,10 @@ _08112AE2: b _08112FD0 _08112AEE: bl sub_8024CEC - ldr r0, _08112B20 @ =gUnknown_08400F8C + ldr r0, _08112B20 @ =gBattleStringsTable ldr r0, [r0, 0x10] - bl get_battle_strings_ - ldr r1, _08112B24 @ =gUnknown_020238CC + bl StrCpyDecodeToDisplayedStringBattle + ldr r1, _08112B24 @ =gDisplayedStringBattle movs r0, 0xF str r0, [sp] adds r0, r4, 0 @@ -2093,8 +2093,8 @@ _08112AEE: b _08112FCE .align 2, 0 _08112B1C: .4byte gUnknown_03004210 -_08112B20: .4byte gUnknown_08400F8C -_08112B24: .4byte gUnknown_020238CC +_08112B20: .4byte gBattleStringsTable +_08112B24: .4byte gDisplayedStringBattle _08112B28: .4byte gTasks _08112B2C: ldr r4, _08112B6C @ =gUnknown_03004210 @@ -2109,10 +2109,10 @@ _08112B36: beq _08112B42 b _08112FD0 _08112B42: - ldr r0, _08112B70 @ =gUnknown_08400F8C + ldr r0, _08112B70 @ =gBattleStringsTable ldr r0, [r0, 0x14] - bl get_battle_strings_ - ldr r1, _08112B74 @ =gUnknown_020238CC + bl StrCpyDecodeToDisplayedStringBattle + ldr r1, _08112B74 @ =gDisplayedStringBattle movs r0, 0xF str r0, [sp] adds r0, r4, 0 @@ -2129,8 +2129,8 @@ _08112B42: b _08112FCE .align 2, 0 _08112B6C: .4byte gUnknown_03004210 -_08112B70: .4byte gUnknown_08400F8C -_08112B74: .4byte gUnknown_020238CC +_08112B70: .4byte gBattleStringsTable +_08112B74: .4byte gDisplayedStringBattle _08112B78: .4byte gTasks _08112B7C: ldr r4, _08112BF8 @ =gUnknown_03004210 @@ -2143,10 +2143,10 @@ _08112B86: lsls r0, 24 cmp r0, 0 bne _08112BC0 - ldr r0, _08112BFC @ =gUnknown_08400F8C + ldr r0, _08112BFC @ =gBattleStringsTable ldr r0, [r0, 0x18] - bl get_battle_strings_ - ldr r1, _08112C00 @ =gUnknown_020238CC + bl StrCpyDecodeToDisplayedStringBattle + ldr r1, _08112C00 @ =gDisplayedStringBattle movs r0, 0xF str r0, [sp] adds r0, r4, 0 @@ -2188,16 +2188,16 @@ _08112BD6: adds r0, 0x1 movs r2, 0 strh r0, [r1, 0x18] - ldr r0, _08112C08 @ =gUnknown_02024D1E + ldr r0, _08112C08 @ =gBattleCommunication strb r2, [r0, 0x1] bl sub_802BC6C b _08112FD0 .align 2, 0 _08112BF8: .4byte gUnknown_03004210 -_08112BFC: .4byte gUnknown_08400F8C -_08112C00: .4byte gUnknown_020238CC +_08112BFC: .4byte gBattleStringsTable +_08112C00: .4byte gDisplayedStringBattle _08112C04: .4byte gTasks -_08112C08: .4byte gUnknown_02024D1E +_08112C08: .4byte gBattleCommunication _08112C0C: ldr r0, _08112CA4 @ =gMain ldrh r1, [r0, 0x2E] @@ -2205,7 +2205,7 @@ _08112C0C: ands r0, r1 cmp r0, 0 beq _08112C32 - ldr r4, _08112CA8 @ =gUnknown_02024D1E + ldr r4, _08112CA8 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _08112C32 @@ -2222,7 +2222,7 @@ _08112C32: ands r0, r1 cmp r0, 0 beq _08112C58 - ldr r4, _08112CA8 @ =gUnknown_02024D1E + ldr r4, _08112CA8 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _08112C58 @@ -2240,14 +2240,14 @@ _08112C58: cmp r0, 0 beq _08112CE2 bl sub_8023AD8 - ldr r0, _08112CAC @ =gUnknown_08400F8C + ldr r0, _08112CAC @ =gBattleStringsTable movs r1, 0x92 lsls r1, 3 adds r0, r1 ldr r0, [r0] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _08112CB0 @ =gUnknown_03004210 - ldr r1, _08112CB4 @ =gUnknown_020238CC + ldr r1, _08112CB4 @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 @@ -2255,7 +2255,7 @@ _08112C58: bl sub_8002EB0 movs r0, 0x5 bl PlaySE - ldr r0, _08112CA8 @ =gUnknown_02024D1E + ldr r0, _08112CA8 @ =gBattleCommunication ldrb r2, [r0, 0x1] cmp r2, 0 beq _08112CBC @@ -2269,10 +2269,10 @@ _08112C58: b _08112CE2 .align 2, 0 _08112CA4: .4byte gMain -_08112CA8: .4byte gUnknown_02024D1E -_08112CAC: .4byte gUnknown_08400F8C +_08112CA8: .4byte gBattleCommunication +_08112CAC: .4byte gBattleStringsTable _08112CB0: .4byte gUnknown_03004210 -_08112CB4: .4byte gUnknown_020238CC +_08112CB4: .4byte gDisplayedStringBattle _08112CB8: .4byte gTasks _08112CBC: ldr r0, _08112D28 @ =gTasks @@ -2303,14 +2303,14 @@ _08112CE2: b _08112FD0 _08112CF0: bl sub_8023AD8 - ldr r0, _08112D30 @ =gUnknown_08400F8C + ldr r0, _08112D30 @ =gBattleStringsTable movs r1, 0x92 lsls r1, 3 adds r0, r1 ldr r0, [r0] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _08112D34 @ =gUnknown_03004210 - ldr r1, _08112D38 @ =gUnknown_020238CC + ldr r1, _08112D38 @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 @@ -2329,9 +2329,9 @@ _08112CF0: .align 2, 0 _08112D28: .4byte gTasks _08112D2C: .4byte gMain -_08112D30: .4byte gUnknown_08400F8C +_08112D30: .4byte gBattleStringsTable _08112D34: .4byte gUnknown_03004210 -_08112D38: .4byte gUnknown_020238CC +_08112D38: .4byte gDisplayedStringBattle _08112D3C: ldr r0, _08112D78 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -2411,13 +2411,13 @@ _08112DCC: bl IsHMMove2 cmp r0, 0 beq _08112E24 - ldr r0, _08112E10 @ =gUnknown_08400F8C + ldr r0, _08112E10 @ =gBattleStringsTable ldr r3, _08112E14 @ =0x000004cc adds r0, r3 ldr r0, [r0] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _08112E18 @ =gUnknown_03004210 - ldr r1, _08112E1C @ =gUnknown_020238CC + ldr r1, _08112E1C @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 @@ -2432,13 +2432,13 @@ _08112DCC: strh r1, [r0, 0x18] b _08112FD0 .align 2, 0 -_08112E10: .4byte gUnknown_08400F8C +_08112E10: .4byte gBattleStringsTable _08112E14: .4byte 0x000004cc _08112E18: .4byte gUnknown_03004210 -_08112E1C: .4byte gUnknown_020238CC +_08112E1C: .4byte gDisplayedStringBattle _08112E20: .4byte gTasks _08112E24: - ldr r1, _08112E80 @ =gUnknown_03004290 + ldr r1, _08112E80 @ =gBattleTextBuff2 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -2458,14 +2458,14 @@ _08112E24: mov r0, r9 adds r2, r4, 0 bl SetMonMoveSlot - ldr r0, _08112E88 @ =gUnknown_08400F8C + ldr r0, _08112E88 @ =gBattleStringsTable movs r3, 0xCF lsls r3, 2 adds r0, r3 ldr r0, [r0] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _08112E8C @ =gUnknown_03004210 - ldr r1, _08112E90 @ =gUnknown_020238CC + ldr r1, _08112E90 @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 @@ -2480,11 +2480,11 @@ _08112E24: adds r0, 0x1 b _08112FCE .align 2, 0 -_08112E80: .4byte gUnknown_03004290 +_08112E80: .4byte gBattleTextBuff2 _08112E84: .4byte word_2024E82 -_08112E88: .4byte gUnknown_08400F8C +_08112E88: .4byte gBattleStringsTable _08112E8C: .4byte gUnknown_03004210 -_08112E90: .4byte gUnknown_020238CC +_08112E90: .4byte gDisplayedStringBattle _08112E94: .4byte gTasks _08112E98: ldr r4, _08112ED8 @ =gUnknown_03004210 @@ -2499,10 +2499,10 @@ _08112EA2: beq _08112EAE b _08112FD0 _08112EAE: - ldr r0, _08112EDC @ =gUnknown_08400F8C + ldr r0, _08112EDC @ =gBattleStringsTable ldr r0, [r0, 0x1C] - bl get_battle_strings_ - ldr r1, _08112EE0 @ =gUnknown_020238CC + bl StrCpyDecodeToDisplayedStringBattle + ldr r1, _08112EE0 @ =gDisplayedStringBattle movs r0, 0xF str r0, [sp] adds r0, r4, 0 @@ -2519,8 +2519,8 @@ _08112EAE: b _08112FCE .align 2, 0 _08112ED8: .4byte gUnknown_03004210 -_08112EDC: .4byte gUnknown_08400F8C -_08112EE0: .4byte gUnknown_020238CC +_08112EDC: .4byte gBattleStringsTable +_08112EE0: .4byte gDisplayedStringBattle _08112EE4: .4byte gTasks _08112EE8: ldr r4, _08112F28 @ =gUnknown_03004210 @@ -2531,13 +2531,13 @@ _08112EE8: lsls r0, 24 cmp r0, 0 bne _08112FD0 - ldr r0, _08112F2C @ =gUnknown_08400F8C + ldr r0, _08112F2C @ =gBattleStringsTable movs r1, 0xD0 lsls r1, 2 adds r0, r1 ldr r0, [r0] - bl get_battle_strings_ - ldr r1, _08112F30 @ =gUnknown_020238CC + bl StrCpyDecodeToDisplayedStringBattle + ldr r1, _08112F30 @ =gDisplayedStringBattle movs r0, 0xF str r0, [sp] adds r0, r4, 0 @@ -2554,15 +2554,15 @@ _08112EE8: b _08112FD0 .align 2, 0 _08112F28: .4byte gUnknown_03004210 -_08112F2C: .4byte gUnknown_08400F8C -_08112F30: .4byte gUnknown_020238CC +_08112F2C: .4byte gBattleStringsTable +_08112F30: .4byte gDisplayedStringBattle _08112F34: .4byte gTasks _08112F38: - ldr r0, _08112F68 @ =gUnknown_08400F8C + ldr r0, _08112F68 @ =gBattleStringsTable ldr r0, [r0, 0x20] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _08112F6C @ =gUnknown_03004210 - ldr r1, _08112F70 @ =gUnknown_020238CC + ldr r1, _08112F70 @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 @@ -2581,16 +2581,16 @@ _08112F38: strh r1, [r0, 0x18] b _08112FD0 .align 2, 0 -_08112F68: .4byte gUnknown_08400F8C +_08112F68: .4byte gBattleStringsTable _08112F6C: .4byte gUnknown_03004210 -_08112F70: .4byte gUnknown_020238CC +_08112F70: .4byte gDisplayedStringBattle _08112F74: .4byte gTasks _08112F78: - ldr r0, _08112FA0 @ =gUnknown_08400F8C + ldr r0, _08112FA0 @ =gBattleStringsTable ldr r0, [r0, 0x24] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _08112FA4 @ =gUnknown_03004210 - ldr r1, _08112FA8 @ =gUnknown_020238CC + ldr r1, _08112FA8 @ =gDisplayedStringBattle movs r2, 0xF str r2, [sp] movs r2, 0x90 @@ -2606,9 +2606,9 @@ _08112F9A: strh r1, [r0, 0x8] b _08112FD0 .align 2, 0 -_08112FA0: .4byte gUnknown_08400F8C +_08112FA0: .4byte gBattleStringsTable _08112FA4: .4byte gUnknown_03004210 -_08112FA8: .4byte gUnknown_020238CC +_08112FA8: .4byte gDisplayedStringBattle _08112FAC: .4byte gTasks _08112FB0: ldr r0, _08112FE0 @ =gUnknown_03004210 @@ -2808,7 +2808,7 @@ _0811315C: strh r0, [r1] movs r0, 0x11 bl sub_8149970 - ldr r1, _08113184 @ =gUnknown_02024D1E + ldr r1, _08113184 @ =gBattleCommunication strb r0, [r1, 0x2] ldr r1, _08113188 @ =gTasks lsls r0, r7, 2 @@ -2818,10 +2818,10 @@ _0811315C: b _08113298 .align 2, 0 _08113180: .4byte gPaletteFade -_08113184: .4byte gUnknown_02024D1E +_08113184: .4byte gBattleCommunication _08113188: .4byte gTasks _0811318C: - ldr r4, _081131C0 @ =gUnknown_02024D1E + ldr r4, _081131C0 @ =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -2846,10 +2846,10 @@ _081131A2: strb r0, [r4, 0x2] bl _08113B3A .align 2, 0 -_081131C0: .4byte gUnknown_02024D1E +_081131C0: .4byte gBattleCommunication _081131C4: .4byte 0x02014800 _081131C8: - ldr r4, _081131EC @ =gUnknown_02024D1E + ldr r4, _081131EC @ =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -2867,7 +2867,7 @@ _081131DE: strb r0, [r4, 0x2] b _08113290 .align 2, 0 -_081131EC: .4byte gUnknown_02024D1E +_081131EC: .4byte gBattleCommunication _081131F0: .4byte 0x02014800 _081131F4: ldr r1, _08113224 @ =0x02014800 @@ -2881,7 +2881,7 @@ _081131F4: _08113206: movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, _08113228 @ =gUnknown_02024D1E + ldr r0, _08113228 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -2895,10 +2895,10 @@ _08113220: b _08113290 .align 2, 0 _08113224: .4byte 0x02014800 -_08113228: .4byte gUnknown_02024D1E +_08113228: .4byte gBattleCommunication _0811322C: bl sub_8149B44 - ldr r1, _08113240 @ =gUnknown_02024D1E + ldr r1, _08113240 @ =gBattleCommunication strb r0, [r1, 0x2] ldr r1, _08113244 @ =gTasks lsls r0, r7, 2 @@ -2907,10 +2907,10 @@ _0811322C: adds r0, r1 b _08113298 .align 2, 0 -_08113240: .4byte gUnknown_02024D1E +_08113240: .4byte gBattleCommunication _08113244: .4byte gTasks _08113248: - ldr r5, _08113270 @ =gUnknown_02024D1E + ldr r5, _08113270 @ =gBattleCommunication ldrb r0, [r5, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -2930,9 +2930,9 @@ _0811325E: strb r0, [r5, 0x2] b _081132E2 .align 2, 0 -_08113270: .4byte gUnknown_02024D1E +_08113270: .4byte gBattleCommunication _08113274: - ldr r0, _081132A4 @ =gUnknown_02024D1E + ldr r0, _081132A4 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -2956,7 +2956,7 @@ _08113298: strh r1, [r0, 0x8] bl _08113B3A .align 2, 0 -_081132A4: .4byte gUnknown_02024D1E +_081132A4: .4byte gBattleCommunication _081132A8: bl IsSEPlaying lsls r0, 24 @@ -3106,7 +3106,7 @@ _081133C2: movs r1, 0x2 add r2, sp, 0x4 bl GetMonData - ldr r0, _08113418 @ =gUnknown_030041C0 + ldr r0, _08113418 @ =gBattleTextBuff1 add r1, sp, 0x4 bl StringCopy10 ldr r0, _0811341C @ =0x0000ffff @@ -3118,7 +3118,7 @@ _081133C2: .align 2, 0 _08113410: .4byte gUnknown_03004828 _08113414: .4byte gTasks -_08113418: .4byte gUnknown_030041C0 +_08113418: .4byte gBattleTextBuff1 _0811341C: .4byte 0x0000ffff _08113420: ldr r0, _08113430 @ =0x0000fffe @@ -3189,12 +3189,12 @@ _081134A8: bl sub_8024CEC ldr r0, _081134E8 @ =0x0000016f bl PlayFanfare - ldr r0, _081134EC @ =gUnknown_08400F8C + ldr r0, _081134EC @ =gBattleStringsTable ldr r0, [r0, 0xC] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r2, [r4] adds r0, r2, 0x4 - ldr r1, _081134F0 @ =gUnknown_020238CC + ldr r1, _081134F0 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3216,8 +3216,8 @@ _081134DC: .align 2, 0 _081134E4: .4byte gUnknown_03004828 _081134E8: .4byte 0x0000016f -_081134EC: .4byte gUnknown_08400F8C -_081134F0: .4byte gUnknown_020238CC +_081134EC: .4byte gBattleStringsTable +_081134F0: .4byte gDisplayedStringBattle _081134F4: .4byte gTasks _081134F8: ldr r0, _08113530 @ =gUnknown_03004828 @@ -3301,12 +3301,12 @@ _08113598: b _08113B3A _081135A4: bl sub_8024CEC - ldr r0, _081135D8 @ =gUnknown_08400F8C + ldr r0, _081135D8 @ =gBattleStringsTable ldr r0, [r0, 0x10] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r2, [r4] adds r0, r2, 0x4 - ldr r1, _081135DC @ =gUnknown_020238CC + ldr r1, _081135DC @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3323,8 +3323,8 @@ _081135A4: b _08113B38 .align 2, 0 _081135D4: .4byte gUnknown_03004828 -_081135D8: .4byte gUnknown_08400F8C -_081135DC: .4byte gUnknown_020238CC +_081135D8: .4byte gBattleStringsTable +_081135DC: .4byte gDisplayedStringBattle _081135E0: .4byte gTasks _081135E4: ldr r4, _08113628 @ =gUnknown_03004828 @@ -3340,12 +3340,12 @@ _081135F0: beq _081135FC b _08113B3A _081135FC: - ldr r0, _0811362C @ =gUnknown_08400F8C + ldr r0, _0811362C @ =gBattleStringsTable ldr r0, [r0, 0x14] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r2, [r4] adds r0, r2, 0x4 - ldr r1, _08113630 @ =gUnknown_020238CC + ldr r1, _08113630 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3362,8 +3362,8 @@ _081135FC: b _08113B38 .align 2, 0 _08113628: .4byte gUnknown_03004828 -_0811362C: .4byte gUnknown_08400F8C -_08113630: .4byte gUnknown_020238CC +_0811362C: .4byte gBattleStringsTable +_08113630: .4byte gDisplayedStringBattle _08113634: .4byte gTasks _08113638: ldr r4, _081136FC @ =gUnknown_03004828 @@ -3377,12 +3377,12 @@ _08113644: lsls r0, 24 cmp r0, 0 bne _08113682 - ldr r0, _08113700 @ =gUnknown_08400F8C + ldr r0, _08113700 @ =gBattleStringsTable ldr r0, [r0, 0x18] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r2, [r4] adds r0, r2, 0x4 - ldr r1, _08113704 @ =gUnknown_020238CC + ldr r1, _08113704 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3424,7 +3424,7 @@ _0811369C: movs r2, 0x8 movs r3, 0x1D bl DrawTextWindow - ldr r4, _0811370C @ =gUnknown_02024D1E + ldr r4, _0811370C @ =gBattleCommunication strb r6, [r4, 0x1] ldr r2, [r5] adds r0, r2, 0x4 @@ -3460,10 +3460,10 @@ _0811369C: b _08113B3A .align 2, 0 _081136FC: .4byte gUnknown_03004828 -_08113700: .4byte gUnknown_08400F8C -_08113704: .4byte gUnknown_020238CC +_08113700: .4byte gBattleStringsTable +_08113704: .4byte gDisplayedStringBattle _08113708: .4byte gTasks -_0811370C: .4byte gUnknown_02024D1E +_0811370C: .4byte gBattleCommunication _08113710: .4byte gOtherText_YesNoAndPlayer _08113714: .4byte 0x0000ffff _08113718: .4byte 0x00002d9f @@ -3474,7 +3474,7 @@ _0811371C: ands r0, r1 cmp r0, 0 beq _08113742 - ldr r4, _081137D0 @ =gUnknown_02024D1E + ldr r4, _081137D0 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _08113742 @@ -3491,7 +3491,7 @@ _08113742: ands r0, r1 cmp r0, 0 beq _08113768 - ldr r4, _081137D0 @ =gUnknown_02024D1E + ldr r4, _081137D0 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _08113768 @@ -3518,15 +3518,15 @@ _08113768: movs r3, 0x1D bl ZeroFillWindowRect bl DestroyMenuCursor - ldr r0, _081137D8 @ =gUnknown_08400F8C + ldr r0, _081137D8 @ =gBattleStringsTable movs r1, 0x92 lsls r1, 3 adds r0, r1 ldr r0, [r0] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r2, [r4] adds r0, r2, 0x4 - ldr r1, _081137DC @ =gUnknown_020238CC + ldr r1, _081137DC @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3535,7 +3535,7 @@ _08113768: bl sub_8002EB0 movs r0, 0x5 bl PlaySE - ldr r0, _081137D0 @ =gUnknown_02024D1E + ldr r0, _081137D0 @ =gBattleCommunication ldrb r2, [r0, 0x1] cmp r2, 0 beq _081137E4 @@ -3549,10 +3549,10 @@ _08113768: b _0811380A .align 2, 0 _081137CC: .4byte gMain -_081137D0: .4byte gUnknown_02024D1E +_081137D0: .4byte gBattleCommunication _081137D4: .4byte gUnknown_03004828 -_081137D8: .4byte gUnknown_08400F8C -_081137DC: .4byte gUnknown_020238CC +_081137D8: .4byte gBattleStringsTable +_081137DC: .4byte gDisplayedStringBattle _081137E0: .4byte gTasks _081137E4: ldr r0, _08113868 @ =gTasks @@ -3592,15 +3592,15 @@ _08113818: movs r3, 0x1D bl ZeroFillWindowRect bl DestroyMenuCursor - ldr r0, _08113874 @ =gUnknown_08400F8C + ldr r0, _08113874 @ =gBattleStringsTable movs r1, 0x92 lsls r1, 3 adds r0, r1 ldr r0, [r0] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r2, [r4] adds r0, r2, 0x4 - ldr r1, _08113878 @ =gUnknown_020238CC + ldr r1, _08113878 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3621,8 +3621,8 @@ _08113818: _08113868: .4byte gTasks _0811386C: .4byte gMain _08113870: .4byte gUnknown_03004828 -_08113874: .4byte gUnknown_08400F8C -_08113878: .4byte gUnknown_020238CC +_08113874: .4byte gBattleStringsTable +_08113878: .4byte gDisplayedStringBattle _0811387C: ldr r0, _081138B8 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -3704,15 +3704,15 @@ _08113910: bl IsHMMove2 cmp r0, 0 beq _08113970 - ldr r0, _0811395C @ =gUnknown_08400F8C + ldr r0, _0811395C @ =gBattleStringsTable ldr r3, _08113960 @ =0x000004cc adds r0, r3 ldr r0, [r0] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _08113964 @ =gUnknown_03004828 ldr r2, [r0] adds r0, r2, 0x4 - ldr r1, _08113968 @ =gUnknown_020238CC + ldr r1, _08113968 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3728,13 +3728,13 @@ _08113910: strh r1, [r0, 0x18] b _08113B3A .align 2, 0 -_0811395C: .4byte gUnknown_08400F8C +_0811395C: .4byte gBattleStringsTable _08113960: .4byte 0x000004cc _08113964: .4byte gUnknown_03004828 -_08113968: .4byte gUnknown_020238CC +_08113968: .4byte gDisplayedStringBattle _0811396C: .4byte gTasks _08113970: - ldr r1, _081139D0 @ =gUnknown_03004290 + ldr r1, _081139D0 @ =gBattleTextBuff2 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -3754,16 +3754,16 @@ _08113970: mov r0, r8 adds r2, r4, 0 bl SetMonMoveSlot - ldr r0, _081139D8 @ =gUnknown_08400F8C + ldr r0, _081139D8 @ =gBattleStringsTable movs r3, 0xCF lsls r3, 2 adds r0, r3 ldr r0, [r0] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _081139DC @ =gUnknown_03004828 ldr r2, [r0] adds r0, r2, 0x4 - ldr r1, _081139E0 @ =gUnknown_020238CC + ldr r1, _081139E0 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3779,11 +3779,11 @@ _08113970: adds r0, 0x1 b _08113B38 .align 2, 0 -_081139D0: .4byte gUnknown_03004290 +_081139D0: .4byte gBattleTextBuff2 _081139D4: .4byte word_2024E82 -_081139D8: .4byte gUnknown_08400F8C +_081139D8: .4byte gBattleStringsTable _081139DC: .4byte gUnknown_03004828 -_081139E0: .4byte gUnknown_020238CC +_081139E0: .4byte gDisplayedStringBattle _081139E4: .4byte gTasks _081139E8: ldr r4, _08113A2C @ =gUnknown_03004828 @@ -3799,12 +3799,12 @@ _081139F4: beq _08113A00 b _08113B3A _08113A00: - ldr r0, _08113A30 @ =gUnknown_08400F8C + ldr r0, _08113A30 @ =gBattleStringsTable ldr r0, [r0, 0x1C] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r2, [r4] adds r0, r2, 0x4 - ldr r1, _08113A34 @ =gUnknown_020238CC + ldr r1, _08113A34 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3821,8 +3821,8 @@ _08113A00: b _08113B38 .align 2, 0 _08113A2C: .4byte gUnknown_03004828 -_08113A30: .4byte gUnknown_08400F8C -_08113A34: .4byte gUnknown_020238CC +_08113A30: .4byte gBattleStringsTable +_08113A34: .4byte gDisplayedStringBattle _08113A38: .4byte gTasks _08113A3C: ldr r4, _08113A80 @ =gUnknown_03004828 @@ -3834,15 +3834,15 @@ _08113A3C: lsls r0, 24 cmp r0, 0 bne _08113B3A - ldr r0, _08113A84 @ =gUnknown_08400F8C + ldr r0, _08113A84 @ =gBattleStringsTable movs r1, 0xD0 lsls r1, 2 adds r0, r1 ldr r0, [r0] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r2, [r4] adds r0, r2, 0x4 - ldr r1, _08113A88 @ =gUnknown_020238CC + ldr r1, _08113A88 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r4, 0xF @@ -3858,17 +3858,17 @@ _08113A3C: b _08113B3A .align 2, 0 _08113A80: .4byte gUnknown_03004828 -_08113A84: .4byte gUnknown_08400F8C -_08113A88: .4byte gUnknown_020238CC +_08113A84: .4byte gBattleStringsTable +_08113A88: .4byte gDisplayedStringBattle _08113A8C: .4byte gTasks _08113A90: - ldr r0, _08113AC8 @ =gUnknown_08400F8C + ldr r0, _08113AC8 @ =gBattleStringsTable ldr r0, [r0, 0x20] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _08113ACC @ =gUnknown_03004828 ldr r2, [r0] adds r0, r2, 0x4 - ldr r1, _08113AD0 @ =gUnknown_020238CC + ldr r1, _08113AD0 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3888,18 +3888,18 @@ _08113A90: strh r1, [r0, 0x18] b _08113B3A .align 2, 0 -_08113AC8: .4byte gUnknown_08400F8C +_08113AC8: .4byte gBattleStringsTable _08113ACC: .4byte gUnknown_03004828 -_08113AD0: .4byte gUnknown_020238CC +_08113AD0: .4byte gDisplayedStringBattle _08113AD4: .4byte gTasks _08113AD8: - ldr r0, _08113B08 @ =gUnknown_08400F8C + ldr r0, _08113B08 @ =gBattleStringsTable ldr r0, [r0, 0x24] - bl get_battle_strings_ + bl StrCpyDecodeToDisplayedStringBattle ldr r0, _08113B0C @ =gUnknown_03004828 ldr r2, [r0] adds r0, r2, 0x4 - ldr r1, _08113B10 @ =gUnknown_020238CC + ldr r1, _08113B10 @ =gDisplayedStringBattle adds r2, 0x34 ldrb r2, [r2] movs r3, 0xF @@ -3915,9 +3915,9 @@ _08113AD8: strh r1, [r0, 0x8] b _08113B3A .align 2, 0 -_08113B08: .4byte gUnknown_08400F8C +_08113B08: .4byte gBattleStringsTable _08113B0C: .4byte gUnknown_03004828 -_08113B10: .4byte gUnknown_020238CC +_08113B10: .4byte gDisplayedStringBattle _08113B14: .4byte gTasks _08113B18: ldr r0, _08113B48 @ =gUnknown_03004828 @@ -6694,7 +6694,7 @@ _081150D4: .4byte gUnknown_030041B8 thumb_func_start sub_81150D8 sub_81150D8: @ 81150D8 push {lr} - ldr r0, _081150F4 @ =gUnknown_02024D1E + ldr r0, _081150F4 @ =gBattleCommunication ldrb r1, [r0, 0x1] lsls r1, 28 movs r0, 0x90 @@ -6706,7 +6706,7 @@ sub_81150D8: @ 81150D8 pop {r0} bx r0 .align 2, 0 -_081150F4: .4byte gUnknown_02024D1E +_081150F4: .4byte gBattleCommunication thumb_func_end sub_81150D8 thumb_func_start HBlankCB_TradeEvolutionScene diff --git a/asm/field_specials.s b/asm/field_specials.s index 136489b80..8523e540b 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -1196,11 +1196,11 @@ _0810E2FC: .4byte gOtherText_Son thumb_func_start sub_810E300 sub_810E300: @ 810E300 - ldr r0, _0810E308 @ =gUnknown_02024D26 + ldr r0, _0810E308 @ =gBattleOutcome ldrb r0, [r0] bx lr .align 2, 0 -_0810E308: .4byte gUnknown_02024D26 +_0810E308: .4byte gBattleOutcome thumb_func_end sub_810E300 thumb_func_start CableCarWarp @@ -4871,7 +4871,7 @@ sub_810FEFC: @ 810FEFC cmp r0, 0x2 bne _0810FF2C bl sub_810FA74 - ldr r0, _0810FF24 @ =gUnknown_02024D26 + ldr r0, _0810FF24 @ =gBattleOutcome ldrb r0, [r0] cmp r0, 0x1 bne _0810FF28 @@ -4879,7 +4879,7 @@ sub_810FEFC: @ 810FEFC b _0810FF2C .align 2, 0 _0810FF20: .4byte 0x00004095 -_0810FF24: .4byte gUnknown_02024D26 +_0810FF24: .4byte gBattleOutcome _0810FF28: bl sub_810FC18 _0810FF2C: diff --git a/asm/pokeball.s b/asm/pokeball.s index 9abeed00d..eea360775 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -15,10 +15,10 @@ sub_8046400: @ 8046400 lsrs r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r1, _08046450 @ =gUnknown_02024E6D + ldr r1, _08046450 @ =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] - ldr r6, _08046454 @ =gUnknown_02024A60 + ldr r6, _08046454 @ =gActiveBank ldrb r1, [r6] lsls r0, r1, 1 adds r0, r1 @@ -48,8 +48,8 @@ sub_8046400: @ 8046400 pop {r1} bx r1 .align 2, 0 -_08046450: .4byte gUnknown_02024E6D -_08046454: .4byte gUnknown_02024A60 +_08046450: .4byte gDoingBattleAnim +_08046454: .4byte gActiveBank _08046458: .4byte 0x02017810 _0804645C: .4byte sub_8046464 _08046460: .4byte gTasks @@ -89,11 +89,11 @@ _0804649C: mov r8, r0 ldrb r5, [r1, 0xE] adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080464C8 - ldr r1, _080464C0 @ =gUnknown_02024A6A + ldr r1, _080464C0 @ =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -102,10 +102,10 @@ _0804649C: ldr r1, _080464C4 @ =gEnemyParty b _080464D6 .align 2, 0 -_080464C0: .4byte gUnknown_02024A6A +_080464C0: .4byte gBattlePartyID _080464C4: .4byte gEnemyParty _080464C8: - ldr r1, _08046544 @ =gUnknown_02024A6A + ldr r1, _08046544 @ =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -152,7 +152,7 @@ _080464D6: beq _0804655C cmp r2, 0xFF bne _08046598 - ldr r0, _08046554 @ =gEnemyMonIndex + ldr r0, _08046554 @ =gBankTarget strb r5, [r0] movs r0, 0x18 strh r0, [r4, 0x20] @@ -165,11 +165,11 @@ _080464D6: str r1, [r0] b _080465A6 .align 2, 0 -_08046544: .4byte gUnknown_02024A6A +_08046544: .4byte gBattlePartyID _08046548: .4byte gPlayerParty _0804654C: .4byte gSpriteTemplate_820AAB4 _08046550: .4byte gSprites -_08046554: .4byte gEnemyMonIndex +_08046554: .4byte gBankTarget _08046558: .4byte sub_8047074 _0804655C: adds r0, r5, 0 @@ -185,7 +185,7 @@ _0804655C: lsrs r0, 24 adds r0, 0x18 strh r0, [r4, 0x22] - ldr r0, _08046590 @ =gEnemyMonIndex + ldr r0, _08046590 @ =gBankTarget strb r5, [r0] movs r3, 0 strh r3, [r4, 0x2E] @@ -196,12 +196,12 @@ _0804655C: str r1, [r0] b _080465A6 .align 2, 0 -_08046590: .4byte gEnemyMonIndex +_08046590: .4byte gBankTarget _08046594: .4byte sub_8047254 _08046598: movs r0, 0x1 - bl battle_get_side_with_given_state - ldr r1, _080465C4 @ =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r1, _080465C4 @ =gBankTarget strb r0, [r1] movs r0, 0x1 str r0, [sp] @@ -211,7 +211,7 @@ _080465A6: adds r1, r7 lsls r1, 2 adds r4, r1, r0 - ldr r5, _080465C4 @ =gEnemyMonIndex + ldr r5, _080465C4 @ =gBankTarget ldrb r0, [r5] strh r0, [r4, 0x3A] ldr r2, [sp] @@ -221,7 +221,7 @@ _080465A6: bl DestroyTask b _08046616 .align 2, 0 -_080465C4: .4byte gEnemyMonIndex +_080465C4: .4byte gBankTarget _080465C8: .4byte gSprites _080465CC: movs r0, 0x22 @@ -383,7 +383,7 @@ sub_80466F4: @ 80466F4 strh r7, [r6, 0x38] ldr r0, _08046754 @ =sub_8046760 str r0, [r6, 0x1C] - ldr r5, _08046758 @ =gUnknown_02024BE0 + ldr r5, _08046758 @ =gObjectBankIDs movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r5 @@ -419,7 +419,7 @@ _0804674E: bx r0 .align 2, 0 _08046754: .4byte sub_8046760 -_08046758: .4byte gUnknown_02024BE0 +_08046758: .4byte gObjectBankIDs _0804675C: .4byte gSprites thumb_func_end sub_80466F4 @@ -438,7 +438,7 @@ sub_8046760: @ 8046760 bl PlaySE _08046778: ldr r6, _080467C4 @ =gSprites - ldr r5, _080467C8 @ =gUnknown_02024BE0 + ldr r5, _080467C8 @ =gObjectBankIDs movs r1, 0x3A ldrsh r0, [r4, r1] adds r0, r5 @@ -476,7 +476,7 @@ _08046778: b _080467F0 .align 2, 0 _080467C4: .4byte gSprites -_080467C8: .4byte gUnknown_02024BE0 +_080467C8: .4byte gObjectBankIDs _080467CC: .4byte sub_80467F8 _080467D0: ldrh r0, [r1, 0x30] @@ -1124,11 +1124,11 @@ sub_8046C78: @ 8046C78 b _08046E1C _08046CE8: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08046D20 - ldr r1, _08046D18 @ =gUnknown_02024A6A + ldr r1, _08046D18 @ =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -1143,10 +1143,10 @@ _08046CE8: _08046D0C: .4byte sub_8046E9C _08046D10: .4byte gMain _08046D14: .4byte 0x0000043d -_08046D18: .4byte gUnknown_02024A6A +_08046D18: .4byte gBattlePartyID _08046D1C: .4byte gEnemyParty _08046D20: - ldr r1, _08046D90 @ =gUnknown_02024A6A + ldr r1, _08046D90 @ =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -1162,13 +1162,13 @@ _08046D34: lsls r0, 16 lsrs r7, r0, 16 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r5, r0 beq _08046D5A movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r5, r0 @@ -1198,7 +1198,7 @@ _08046D5A: bl m4aMPlayStop b _08046DAE .align 2, 0 -_08046D90: .4byte gUnknown_02024A6A +_08046D90: .4byte gBattlePartyID _08046D94: .4byte gPlayerParty _08046D98: .4byte 0x02017840 _08046D9C: .4byte gBattleTypeFlags @@ -1228,13 +1228,13 @@ _08046DCC: .4byte 0x0000ffff _08046DD0: .4byte 0x02017840 _08046DD4: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r5, r0 beq _08046DF0 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r5, r0 @@ -1264,7 +1264,7 @@ _08046DF6: strh r4, [r1, 0xC] strh r2, [r1, 0x26] _08046E1C: - ldr r5, _08046E74 @ =gUnknown_02024BE0 + ldr r5, _08046E74 @ =gObjectBankIDs movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r5 @@ -1305,7 +1305,7 @@ _08046E1C: .align 2, 0 _08046E6C: .4byte sub_8046AD0 _08046E70: .4byte gTasks -_08046E74: .4byte gUnknown_02024BE0 +_08046E74: .4byte gObjectBankIDs _08046E78: .4byte gSprites thumb_func_end sub_8046C78 @@ -1337,7 +1337,7 @@ sub_8046E9C: @ 8046E9C lsls r0, 24 lsrs r4, r0, 24 ldr r6, _08046F00 @ =gSprites - ldr r0, _08046F04 @ =gUnknown_02024BE0 + ldr r0, _08046F04 @ =gObjectBankIDs adds r3, r4, r0 ldrb r1, [r3] lsls r0, r1, 4 @@ -1382,7 +1382,7 @@ _08046EDE: b _08046F24 .align 2, 0 _08046F00: .4byte gSprites -_08046F04: .4byte gUnknown_02024BE0 +_08046F04: .4byte gObjectBankIDs _08046F08: ldr r2, _08046FA8 @ =0xfffffee0 adds r0, r2, 0 @@ -1409,7 +1409,7 @@ _08046F24: cmp r7, 0 beq _08046FA0 ldr r2, _08046FAC @ =gSprites - ldr r0, _08046FB0 @ =gUnknown_02024BE0 + ldr r0, _08046FB0 @ =gObjectBankIDs adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -1419,7 +1419,7 @@ _08046F24: movs r2, 0 movs r1, 0 strh r1, [r0, 0x26] - ldr r0, _08046FB4 @ =gUnknown_02024E6D + ldr r0, _08046FB4 @ =gDoingBattleAnim strb r2, [r0] lsls r1, r4, 1 adds r1, r4 @@ -1468,8 +1468,8 @@ _08046FA0: .align 2, 0 _08046FA8: .4byte 0xfffffee0 _08046FAC: .4byte gSprites -_08046FB0: .4byte gUnknown_02024BE0 -_08046FB4: .4byte gUnknown_02024E6D +_08046FB0: .4byte gObjectBankIDs +_08046FB4: .4byte gDoingBattleAnim _08046FB8: .4byte 0x02017810 thumb_func_end sub_8046E9C @@ -1489,7 +1489,7 @@ sub_8046FBC: @ 8046FBC beq _08047056 cmp r1, 0x5F bne _08046FF4 - ldr r0, _08046FEC @ =gUnknown_02024E6D + ldr r0, _08046FEC @ =gDoingBattleAnim movs r1, 0 strb r1, [r0] bl m4aMPlayAllStop @@ -1497,14 +1497,14 @@ sub_8046FBC: @ 8046FBC bl PlaySE b _08047056 .align 2, 0 -_08046FEC: .4byte gUnknown_02024E6D +_08046FEC: .4byte gDoingBattleAnim _08046FF0: .4byte 0x00000173 _08046FF4: ldr r0, _0804705C @ =0x0000013b cmp r1, r0 bne _08047056 ldr r5, _08047060 @ =gSprites - ldr r4, _08047064 @ =gUnknown_02024BE0 + ldr r4, _08047064 @ =gObjectBankIDs movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r4 @@ -1553,7 +1553,7 @@ _08047056: .align 2, 0 _0804705C: .4byte 0x0000013b _08047060: .4byte gSprites -_08047064: .4byte gUnknown_02024BE0 +_08047064: .4byte gObjectBankIDs _08047068: .4byte gMain _0804706C: .4byte 0x0000043d _08047070: .4byte 0x02017810 @@ -1751,7 +1751,7 @@ _080471B8: movs r0, 0x3A ldrsh r4, [r5, r0] movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -1826,7 +1826,7 @@ sub_8047254: @ 8047254 movs r0, 0x3A ldrsh r4, [r5, r0] movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -2485,7 +2485,7 @@ sub_804777C: @ 804777C lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r0, _080477FC @ =gUnknown_03004340 + ldr r0, _080477FC @ =gHealthboxIDs adds r0, r5, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -2503,7 +2503,7 @@ sub_804777C: @ 804777C ldr r0, _08047804 @ =sub_8047830 str r0, [r4, 0x1C] adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080477CA @@ -2532,7 +2532,7 @@ _080477CA: ldr r1, [r1] bl _call_via_r1 adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -2544,7 +2544,7 @@ _080477F4: pop {r0} bx r0 .align 2, 0 -_080477FC: .4byte gUnknown_03004340 +_080477FC: .4byte gHealthboxIDs _08047800: .4byte gSprites _08047804: .4byte sub_8047830 _08047808: .4byte sub_804780C @@ -2614,7 +2614,7 @@ sub_8047858: @ 8047858 adds r3, r1, r2 movs r0, 0x1 strh r0, [r3, 0x2E] - ldr r0, _08047898 @ =gUnknown_03004340 + ldr r0, _08047898 @ =gHealthboxIDs adds r4, r0 ldrb r0, [r4] strh r0, [r3, 0x30] @@ -2627,7 +2627,7 @@ sub_8047858: @ 8047858 .align 2, 0 _08047890: .4byte oamc_804BEB4 _08047894: .4byte gSprites -_08047898: .4byte gUnknown_03004340 +_08047898: .4byte gHealthboxIDs thumb_func_end sub_8047858 thumb_func_start oamc_804BEB4 @@ -2747,11 +2747,11 @@ sub_8047978: @ 8047978 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080479A4 - ldr r1, _0804799C @ =gUnknown_02024A6A + ldr r1, _0804799C @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -2760,10 +2760,10 @@ sub_8047978: @ 8047978 ldr r1, _080479A0 @ =gEnemyParty b _080479B2 .align 2, 0 -_0804799C: .4byte gUnknown_02024A6A +_0804799C: .4byte gBattlePartyID _080479A0: .4byte gEnemyParty _080479A4: - ldr r1, _080479C4 @ =gUnknown_02024A6A + ldr r1, _080479C4 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -2780,7 +2780,7 @@ _080479B2: pop {r1} bx r1 .align 2, 0 -_080479C4: .4byte gUnknown_02024A6A +_080479C4: .4byte gBattlePartyID _080479C8: .4byte gPlayerParty thumb_func_end sub_8047978 diff --git a/asm/pokeblock.s b/asm/pokeblock.s index 74da210b0..5b6522144 100644 --- a/asm/pokeblock.s +++ b/asm/pokeblock.s @@ -2121,7 +2121,7 @@ sub_810C788: @ 810C788 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0810C840 @ =gUnknown_030041C0 + ldr r0, _0810C840 @ =gBattleTextBuff1 ldr r2, _0810C844 @ =gPokeblockNames ldr r1, _0810C848 @ =0xfffff808 adds r5, r1 @@ -2189,7 +2189,7 @@ _0810C808: _0810C834: .4byte gEnemyParty _0810C838: .4byte gScriptItemId _0810C83C: .4byte gSaveBlock1 + 0x7F8 -_0810C840: .4byte gUnknown_030041C0 +_0810C840: .4byte gBattleTextBuff1 _0810C844: .4byte gPokeblockNames _0810C848: .4byte 0xfffff808 _0810C84C: .4byte gTasks diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s index 3a97f8a04..dc74831d5 100644 --- a/asm/pokemon_item_effect.s +++ b/asm/pokemon_item_effect.s @@ -73,7 +73,7 @@ sub_803E1B0: @ 803E1B0 cmp r0, 0 beq _0803E22C ldr r2, _0803E224 @ =gEnigmaBerries - ldr r0, _0803E228 @ =gUnknown_02024E6C + ldr r0, _0803E228 @ =gBankInMenu ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -85,7 +85,7 @@ sub_803E1B0: @ 803E1B0 _0803E21C: .4byte gMain _0803E220: .4byte 0x0000043d _0803E224: .4byte gEnigmaBerries -_0803E228: .4byte gUnknown_02024E6C +_0803E228: .4byte gBankInMenu _0803E22C: ldr r0, _0803E238 @ =gSaveBlock1 ldr r5, _0803E23C @ =0x00003688 @@ -101,8 +101,8 @@ _0803E240: lsrs r0, 24 _0803E248: str r0, [sp, 0x30] - ldr r1, _0803E2A4 @ =gUnknown_02024C0B - ldr r0, _0803E2A8 @ =gUnknown_02024E6C + ldr r1, _0803E2A4 @ =gStringBank + ldr r0, _0803E2A8 @ =gBankInMenu ldrb r2, [r0] strb r2, [r1] ldr r0, _0803E2AC @ =gMain @@ -115,23 +115,23 @@ _0803E248: lsrs r1, r0, 24 cmp r1, 0 beq _0803E2E8 - ldr r0, _0803E2B4 @ =gUnknown_02024A60 + ldr r0, _0803E2B4 @ =gActiveBank strb r2, [r0] ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 negs r1, r0 orrs r1, r0 lsrs r1, 31 str r1, [sp, 0x18] - ldr r0, _0803E2B8 @ =gUnknown_02024A68 + ldr r0, _0803E2B8 @ =gNoOfAllBanks ldr r4, [sp, 0x8] subs r4, 0xD ldrb r0, [r0] cmp r1, r0 bge _0803E2F4 - ldr r2, _0803E2BC @ =gUnknown_02024A6A + ldr r2, _0803E2BC @ =gBattlePartyID lsls r0, r1, 1 adds r0, r2 ldrh r3, [r0] @@ -145,18 +145,18 @@ _0803E248: str r0, [sp, 0x34] b _0803E2F4 .align 2, 0 -_0803E2A4: .4byte gUnknown_02024C0B -_0803E2A8: .4byte gUnknown_02024E6C +_0803E2A4: .4byte gStringBank +_0803E2A8: .4byte gBankInMenu _0803E2AC: .4byte gMain _0803E2B0: .4byte 0x0000043d -_0803E2B4: .4byte gUnknown_02024A60 -_0803E2B8: .4byte gUnknown_02024A68 -_0803E2BC: .4byte gUnknown_02024A6A +_0803E2B4: .4byte gActiveBank +_0803E2B8: .4byte gNoOfAllBanks +_0803E2BC: .4byte gBattlePartyID _0803E2C0: ldr r1, [sp, 0x18] adds r1, 0x2 str r1, [sp, 0x18] - ldr r0, _0803E2E4 @ =gUnknown_02024A68 + ldr r0, _0803E2E4 @ =gNoOfAllBanks ldrb r0, [r0] cmp r1, r0 bge _0803E2F4 @@ -172,9 +172,9 @@ _0803E2C0: str r0, [sp, 0x34] b _0803E2F4 .align 2, 0 -_0803E2E4: .4byte gUnknown_02024A68 +_0803E2E4: .4byte gNoOfAllBanks _0803E2E8: - ldr r0, _0803E310 @ =gUnknown_02024A60 + ldr r0, _0803E310 @ =gActiveBank strb r1, [r0] movs r3, 0x4 str r3, [sp, 0x34] @@ -196,7 +196,7 @@ _0803E2F4: beq _0803E31E b _0803E36C .align 2, 0 -_0803E310: .4byte gUnknown_02024A60 +_0803E310: .4byte gActiveBank _0803E314: .4byte gItemEffectTable _0803E318: ldr r5, [sp, 0x8] @@ -211,7 +211,7 @@ _0803E31E: ands r0, r1 cmp r0, 0 beq _0803E350 - ldr r0, _0803E348 @ =gUnknown_02024A60 + ldr r0, _0803E348 @ =gActiveBank ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -222,7 +222,7 @@ _0803E31E: .align 2, 0 _0803E340: .4byte gMain _0803E344: .4byte 0x0000043d -_0803E348: .4byte gUnknown_02024A60 +_0803E348: .4byte gActiveBank _0803E34C: .4byte gUnknown_02024DF8 _0803E350: ldr r2, _0803E358 @ =gSaveBlock1 + 0x3676 @@ -310,7 +310,7 @@ _0803E3F0: cmp r0, 0 beq _0803E41E ldr r1, _0803E468 @ =gBattleMons - ldr r0, _0803E470 @ =gUnknown_02024A60 + ldr r0, _0803E470 @ =gActiveBank ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -336,7 +336,7 @@ _0803E41E: bl _0803F14C _0803E42C: ldr r6, _0803E468 @ =gBattleMons - ldr r5, _0803E470 @ =gUnknown_02024A60 + ldr r5, _0803E470 @ =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -367,7 +367,7 @@ _0803E460: .4byte gMain _0803E464: .4byte 0x0000043d _0803E468: .4byte gBattleMons _0803E46C: .4byte 0xfff0ffff -_0803E470: .4byte gUnknown_02024A60 +_0803E470: .4byte gActiveBank _0803E474: ldr r0, [sp, 0x20] ldr r1, [sp, 0x18] @@ -380,7 +380,7 @@ _0803E474: cmp r3, 0 beq _0803E4BA ldr r7, _0803E500 @ =gBattleMons - ldr r5, _0803E504 @ =gUnknown_02024A60 + ldr r5, _0803E504 @ =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -414,7 +414,7 @@ _0803E4BA: bl _0803F14C _0803E4C8: ldr r6, _0803E500 @ =gBattleMons - ldr r5, _0803E504 @ =gUnknown_02024A60 + ldr r5, _0803E504 @ =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -443,7 +443,7 @@ _0803E4F8: bl _0803F14C .align 2, 0 _0803E500: .4byte gBattleMons -_0803E504: .4byte gUnknown_02024A60 +_0803E504: .4byte gActiveBank _0803E508: ldr r4, [sp, 0x20] ldr r5, [sp, 0x18] @@ -456,7 +456,7 @@ _0803E508: cmp r3, 0 beq _0803E54E ldr r7, _0803E594 @ =gBattleMons - ldr r5, _0803E598 @ =gUnknown_02024A60 + ldr r5, _0803E598 @ =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -490,7 +490,7 @@ _0803E54E: bl _0803F14C _0803E55C: ldr r6, _0803E594 @ =gBattleMons - ldr r5, _0803E598 @ =gUnknown_02024A60 + ldr r5, _0803E598 @ =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -519,7 +519,7 @@ _0803E58C: bl _0803F14C .align 2, 0 _0803E594: .4byte gBattleMons -_0803E598: .4byte gUnknown_02024A60 +_0803E598: .4byte gActiveBank _0803E59C: ldr r3, [sp, 0x20] ldr r4, [sp, 0x18] @@ -530,10 +530,10 @@ _0803E59C: adds r6, r2, 0 cmp r0, 0 beq _0803E5E4 - ldr r5, _0803E758 @ =gUnknown_02024C80 - ldr r4, _0803E75C @ =gUnknown_02024A60 + ldr r5, _0803E758 @ =gSideTimer + ldr r4, _0803E75C @ =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -544,7 +544,7 @@ _0803E59C: cmp r0, 0 bne _0803E5E4 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -739,8 +739,8 @@ _0803E74E: str r5, [sp, 0x1C] bl _0803F14C .align 2, 0 -_0803E758: .4byte gUnknown_02024C80 -_0803E75C: .4byte gUnknown_02024A60 +_0803E758: .4byte gSideTimer +_0803E75C: .4byte gActiveBank _0803E760: .4byte gExperienceTables _0803E764: .4byte gBaseStats _0803E768: .4byte gBattleMons @@ -984,7 +984,7 @@ _0803E954: ldr r2, [sp, 0x34] cmp r2, 0x4 beq _0803E9B4 - ldr r2, _0803E9A4 @ =gUnknown_02024C0C + ldr r2, _0803E9A4 @ =gAbsentBankFlags ldr r1, _0803E9A8 @ =gBitTable ldr r3, [sp, 0x34] lsls r0, r3, 2 @@ -993,7 +993,7 @@ _0803E954: ldrb r0, [r2] bics r0, r1 strb r0, [r2] - ldr r1, _0803E9AC @ =gUnknown_02024A6A + ldr r1, _0803E9AC @ =gBattlePartyID lsls r0, r3, 1 adds r0, r1 ldrb r0, [r0] @@ -1003,20 +1003,20 @@ _0803E954: lsrs r1, 24 ldr r0, [sp, 0x34] bl CopyPlayerPartyMonToBattleData - ldr r0, _0803E9B0 @ =gUnknown_02024A60 + ldr r0, _0803E9B0 @ =gActiveBank ldrb r0, [r0] b _0803E9CC .align 2, 0 _0803E99C: .4byte gMain _0803E9A0: .4byte 0x0000043d -_0803E9A4: .4byte gUnknown_02024C0C +_0803E9A4: .4byte gAbsentBankFlags _0803E9A8: .4byte gBitTable -_0803E9AC: .4byte gUnknown_02024A6A -_0803E9B0: .4byte gUnknown_02024A60 +_0803E9AC: .4byte gBattlePartyID +_0803E9B0: .4byte gActiveBank _0803E9B4: - ldr r3, _0803E9E4 @ =gUnknown_02024C0C + ldr r3, _0803E9E4 @ =gAbsentBankFlags ldr r1, _0803E9E8 @ =gBitTable - ldr r2, _0803E9EC @ =gUnknown_02024A60 + ldr r2, _0803E9EC @ =gActiveBank ldrb r0, [r2] eors r0, r4 lsls r0, 2 @@ -1027,11 +1027,11 @@ _0803E9B4: strb r0, [r3] ldrb r0, [r2] _0803E9CC: - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803EA0A - ldr r1, _0803E9F0 @ =gUnknown_030042E0 + ldr r1, _0803E9F0 @ =gBattleResults ldrb r0, [r1, 0x4] cmp r0, 0xFE bhi _0803EA0A @@ -1039,10 +1039,10 @@ _0803E9CC: strb r0, [r1, 0x4] b _0803EA0A .align 2, 0 -_0803E9E4: .4byte gUnknown_02024C0C +_0803E9E4: .4byte gAbsentBankFlags _0803E9E8: .4byte gBitTable -_0803E9EC: .4byte gUnknown_02024A60 -_0803E9F0: .4byte gUnknown_030042E0 +_0803E9EC: .4byte gActiveBank +_0803E9F0: .4byte gBattleResults _0803E9F4: mov r0, r8 movs r1, 0x39 @@ -1166,13 +1166,13 @@ _0803EAB8: ands r0, r3 cmp r0, 0 bne _0803EB48 - ldr r4, _0803EB38 @ =gUnknown_02024A60 + ldr r4, _0803EB38 @ =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803EB48 - ldr r1, _0803EB3C @ =gUnknown_030042E0 + ldr r1, _0803EB3C @ =gBattleResults ldrb r0, [r1, 0x3] cmp r0, 0xFE bhi _0803EB08 @@ -1186,9 +1186,9 @@ _0803EB08: movs r0, 0 movs r1, 0 movs r2, 0 - bl dp01_build_cmdbuf_x00_a_b_0 + bl EmitGetAttributes ldrb r0, [r4] - bl dp01_battle_side_mark_buffer_for_execution + bl MarkBufferBankForExecution strb r5, [r4] b _0803EB48 .align 2, 0 @@ -1197,8 +1197,8 @@ _0803EB28: .4byte 0x000160fa _0803EB2C: .4byte gMain _0803EB30: .4byte 0x0000043d _0803EB34: .4byte gBattleMons -_0803EB38: .4byte gUnknown_02024A60 -_0803EB3C: .4byte gUnknown_030042E0 +_0803EB38: .4byte gActiveBank +_0803EB3C: .4byte gBattleResults _0803EB40: ldr r1, _0803EB58 @ =gBattleMoveDamage ldr r0, [sp] @@ -1340,7 +1340,7 @@ _0803EC28: ands r1, r0 cmp r1, 0 bne _0803EC8E - ldr r1, _0803ECB0 @ =gUnknown_02024CA8 + ldr r1, _0803ECB0 @ =gDisableStructs ldr r2, [sp, 0x34] lsls r0, r2, 3 subs r0, r2 @@ -1380,7 +1380,7 @@ _0803EC9E: _0803ECA4: .4byte gMain _0803ECA8: .4byte 0x0000043d _0803ECAC: .4byte gBattleMons -_0803ECB0: .4byte gUnknown_02024CA8 +_0803ECB0: .4byte gDisableStructs _0803ECB4: .4byte gBitTable _0803ECB8: ldr r6, [sp, 0x10] @@ -1497,7 +1497,7 @@ _0803ED74: ands r0, r1 cmp r0, 0 bne _0803EDD8 - ldr r1, _0803EDEC @ =gUnknown_02024CA8 + ldr r1, _0803EDEC @ =gDisableStructs lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -1526,7 +1526,7 @@ _0803EDD8: _0803EDE0: .4byte gMain _0803EDE4: .4byte 0x0000043d _0803EDE8: .4byte gBattleMons -_0803EDEC: .4byte gUnknown_02024CA8 +_0803EDEC: .4byte gDisableStructs _0803EDF0: .4byte gBitTable _0803EDF4: mov r0, r8 diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s index 88fa5dbde..59b08dd01 100644 --- a/asm/reshow_battle_screen.s +++ b/asm/reshow_battle_screen.s @@ -260,11 +260,11 @@ _0807AF80: _0807AF88: bl sub_80327CC movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r7, _0807B000 @ =gUnknown_02024A6A + ldr r7, _0807B000 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r7 ldrh r0, [r0] @@ -284,7 +284,7 @@ _0807AF88: cmp r0, 0 beq _0807AFEC movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -301,8 +301,8 @@ _0807AF88: adds r0, r4, 0 bl sub_8032984 _0807AFEC: - ldr r1, _0807B008 @ =gUnknown_02024E60 - ldr r0, _0807B00C @ =gUnknown_02024E6C + ldr r1, _0807B008 @ =gActionSelectionCursor + ldr r0, _0807B00C @ =gBankInMenu ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -310,10 +310,10 @@ _0807AFEC: bl sub_802E3E4 b _0807B040 .align 2, 0 -_0807B000: .4byte gUnknown_02024A6A +_0807B000: .4byte gBattlePartyID _0807B004: .4byte gEnemyParty -_0807B008: .4byte gUnknown_02024E60 -_0807B00C: .4byte gUnknown_02024E6C +_0807B008: .4byte gActionSelectionCursor +_0807B00C: .4byte gBankInMenu _0807B010: ldr r0, _0807B054 @ =sub_800FCD4 bl SetHBlankCallback @@ -381,12 +381,12 @@ sub_807B094: @ 807B094 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0807B0D8 @ =gUnknown_02024A68 + ldr r0, _0807B0D8 @ =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bcs _0807B172 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0807B0F2 @@ -398,7 +398,7 @@ sub_807B094: @ 807B094 ands r0, r1 cmp r0, 0 bne _0807B0E8 - ldr r1, _0807B0E0 @ =gUnknown_02024A6A + ldr r1, _0807B0E0 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -410,9 +410,9 @@ sub_807B094: @ 807B094 bl sub_8031794 b _0807B168 .align 2, 0 -_0807B0D8: .4byte gUnknown_02024A68 +_0807B0D8: .4byte gNoOfAllBanks _0807B0DC: .4byte 0x02017800 -_0807B0E0: .4byte gUnknown_02024A6A +_0807B0E0: .4byte gBattlePartyID _0807B0E4: .4byte gEnemyParty _0807B0E8: adds r0, r4, 0 @@ -457,7 +457,7 @@ _0807B12A: ands r0, r1 cmp r0, 0 bne _0807B160 - ldr r1, _0807B158 @ =gUnknown_02024A6A + ldr r1, _0807B158 @ =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -470,7 +470,7 @@ _0807B12A: b _0807B168 .align 2, 0 _0807B154: .4byte 0x02017800 -_0807B158: .4byte gUnknown_02024A6A +_0807B158: .4byte gBattlePartyID _0807B15C: .4byte gPlayerParty _0807B160: adds r0, r4, 0 @@ -502,7 +502,7 @@ sub_807B184: @ 807B184 sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0807B1B8 @ =gUnknown_02024A68 + ldr r0, _0807B1B8 @ =gNoOfAllBanks ldrb r0, [r0] cmp r7, r0 bcc _0807B19E @@ -521,7 +521,7 @@ _0807B19E: bl sub_8077F7C b _0807B1C6 .align 2, 0 -_0807B1B8: .4byte gUnknown_02024A68 +_0807B1B8: .4byte gNoOfAllBanks _0807B1BC: .4byte 0x02017800 _0807B1C0: adds r0, r7, 0 @@ -531,13 +531,13 @@ _0807B1C6: lsrs r0, 24 mov r8, r0 adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0807B1DA b _0807B2D8 _0807B1DA: - ldr r1, _0807B2BC @ =gUnknown_02024A6A + ldr r1, _0807B2BC @ =gBattlePartyID lsls r0, r7, 1 adds r6, r0, r1 ldrh r0, [r6] @@ -566,7 +566,7 @@ _0807B1FE: lsls r4, 16 lsrs r4, 16 adds r0, r7, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -588,7 +588,7 @@ _0807B1FE: adds r1, r4, 0 mov r2, r8 bl CreateSprite - ldr r4, _0807B2C8 @ =gUnknown_02024BE0 + ldr r4, _0807B2C8 @ =gObjectBankIDs adds r4, r7, r4 strb r0, [r4] ldr r5, _0807B2CC @ =gSprites @@ -642,10 +642,10 @@ _0807B1FE: bl StartSpriteAnim b _0807B4AC .align 2, 0 -_0807B2BC: .4byte gUnknown_02024A6A +_0807B2BC: .4byte gBattlePartyID _0807B2C0: .4byte gEnemyParty _0807B2C4: .4byte gUnknown_02024E8C -_0807B2C8: .4byte gUnknown_02024BE0 +_0807B2C8: .4byte gObjectBankIDs _0807B2CC: .4byte gSprites _0807B2D0: .4byte SpriteCallbackDummy _0807B2D4: .4byte gBattleMonForms @@ -661,7 +661,7 @@ _0807B2D8: ldr r5, _0807B32C @ =gSaveBlock2 ldrb r4, [r5, 0x8] movs r0, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -702,7 +702,7 @@ _0807B338: cmp r7, 0 bne _0807B3D0 movs r0, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -728,7 +728,7 @@ _0807B37C: movs r1, 0x50 adds r2, r4, 0 bl CreateSprite - ldr r3, _0807B3C4 @ =gUnknown_02024BE0 + ldr r3, _0807B3C4 @ =gObjectBankIDs strb r0, [r3] ldr r4, _0807B3C8 @ =gSprites ldrb r0, [r3] @@ -759,11 +759,11 @@ _0807B37C: .align 2, 0 _0807B3BC: .4byte gUnknown_02024E8C _0807B3C0: .4byte gTrainerBackPicCoords -_0807B3C4: .4byte gUnknown_02024BE0 +_0807B3C4: .4byte gObjectBankIDs _0807B3C8: .4byte gSprites _0807B3CC: .4byte SpriteCallbackDummy _0807B3D0: - ldr r1, _0807B4E8 @ =gUnknown_02024A6A + ldr r1, _0807B4E8 @ =gBattlePartyID lsls r0, r7, 1 adds r6, r0, r1 ldrh r0, [r6] @@ -790,7 +790,7 @@ _0807B3D0: lsls r4, 16 lsrs r4, 16 adds r0, r7, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -812,7 +812,7 @@ _0807B3D0: adds r1, r4, 0 mov r2, r8 bl CreateSprite - ldr r4, _0807B4F4 @ =gUnknown_02024BE0 + ldr r4, _0807B4F4 @ =gObjectBankIDs adds r4, r7, r4 strb r0, [r4] ldr r5, _0807B4F8 @ =gSprites @@ -866,7 +866,7 @@ _0807B3D0: bl StartSpriteAnim _0807B4AC: ldr r1, _0807B4F8 @ =gSprites - ldr r0, _0807B4F4 @ =gUnknown_02024BE0 + ldr r0, _0807B4F4 @ =gObjectBankIDs adds r0, r7, r0 ldrb r0, [r0] lsls r2, r0, 4 @@ -897,10 +897,10 @@ _0807B4D8: pop {r0} bx r0 .align 2, 0 -_0807B4E8: .4byte gUnknown_02024A6A +_0807B4E8: .4byte gBattlePartyID _0807B4EC: .4byte gPlayerParty _0807B4F0: .4byte gUnknown_02024E8C -_0807B4F4: .4byte gUnknown_02024BE0 +_0807B4F4: .4byte gObjectBankIDs _0807B4F8: .4byte gSprites _0807B4FC: .4byte SpriteCallbackDummy _0807B500: .4byte gBattleMonForms @@ -912,7 +912,7 @@ sub_807B508: @ 807B508 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0807B530 @ =gUnknown_02024A68 + ldr r0, _0807B530 @ =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 bcc _0807B518 @@ -929,7 +929,7 @@ _0807B518: bl battle_make_oam_safari_battle b _0807B550 .align 2, 0 -_0807B530: .4byte gUnknown_02024A68 +_0807B530: .4byte gNoOfAllBanks _0807B534: .4byte gBattleTypeFlags _0807B538: ldrh r1, [r2] @@ -947,7 +947,7 @@ _0807B54A: _0807B550: lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0807B58C @ =gUnknown_03004340 + ldr r0, _0807B58C @ =gHealthboxIDs adds r4, r5, r0 strb r6, [r4] adds r0, r5, 0 @@ -955,12 +955,12 @@ _0807B550: adds r0, r6, 0 bl sub_8043DFC adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0807B598 ldrb r0, [r4] - ldr r1, _0807B590 @ =gUnknown_02024A6A + ldr r1, _0807B590 @ =gBattlePartyID lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] @@ -972,8 +972,8 @@ _0807B550: bl sub_8045A5C b _0807B5E4 .align 2, 0 -_0807B58C: .4byte gUnknown_03004340 -_0807B590: .4byte gUnknown_02024A6A +_0807B58C: .4byte gHealthboxIDs +_0807B590: .4byte gBattlePartyID _0807B594: .4byte gEnemyParty _0807B598: ldr r0, _0807B5C0 @ =gBattleTypeFlags @@ -983,7 +983,7 @@ _0807B598: cmp r0, 0 beq _0807B5CC ldrb r0, [r4] - ldr r1, _0807B5C4 @ =gUnknown_02024A6A + ldr r1, _0807B5C4 @ =gBattlePartyID lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] @@ -996,11 +996,11 @@ _0807B598: b _0807B5E4 .align 2, 0 _0807B5C0: .4byte gBattleTypeFlags -_0807B5C4: .4byte gUnknown_02024A6A +_0807B5C4: .4byte gBattlePartyID _0807B5C8: .4byte gPlayerParty _0807B5CC: ldrb r0, [r4] - ldr r1, _0807B610 @ =gUnknown_02024A6A + ldr r1, _0807B610 @ =gBattlePartyID lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] @@ -1012,41 +1012,41 @@ _0807B5CC: bl sub_8045A5C _0807B5E4: adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _0807B600 adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 bne _0807B61C _0807B600: - ldr r0, _0807B618 @ =gUnknown_03004340 + ldr r0, _0807B618 @ =gHealthboxIDs adds r0, r5, r0 ldrb r0, [r0] movs r1, 0x1 bl nullsub_11 b _0807B628 .align 2, 0 -_0807B610: .4byte gUnknown_02024A6A +_0807B610: .4byte gBattlePartyID _0807B614: .4byte gPlayerParty -_0807B618: .4byte gUnknown_03004340 +_0807B618: .4byte gHealthboxIDs _0807B61C: - ldr r0, _0807B654 @ =gUnknown_03004340 + ldr r0, _0807B654 @ =gHealthboxIDs adds r0, r5, r0 ldrb r0, [r0] movs r1, 0 bl nullsub_11 _0807B628: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0807B660 - ldr r0, _0807B658 @ =gUnknown_02024A6A + ldr r0, _0807B658 @ =gBattlePartyID adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 @@ -1061,8 +1061,8 @@ _0807B628: bl sub_8043DB0 b _0807B68A .align 2, 0 -_0807B654: .4byte gUnknown_03004340 -_0807B658: .4byte gUnknown_02024A6A +_0807B654: .4byte gHealthboxIDs +_0807B658: .4byte gBattlePartyID _0807B65C: .4byte gEnemyParty _0807B660: ldr r0, _0807B690 @ =gBattleTypeFlags @@ -1071,7 +1071,7 @@ _0807B660: ands r0, r1 cmp r0, 0 bne _0807B68A - ldr r0, _0807B694 @ =gUnknown_02024A6A + ldr r0, _0807B694 @ =gBattlePartyID adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 @@ -1090,7 +1090,7 @@ _0807B68A: bx r0 .align 2, 0 _0807B690: .4byte gBattleTypeFlags -_0807B694: .4byte gUnknown_02024A6A +_0807B694: .4byte gBattlePartyID _0807B698: .4byte gPlayerParty thumb_func_end sub_807B508 diff --git a/data/battle_811DA74.s b/data/battle_811DA74.s index a17937823..873c76eb9 100644 --- a/data/battle_811DA74.s +++ b/data/battle_811DA74.s @@ -4,10 +4,10 @@ .section .rodata .align 2 -gUnknown_083FE4F4:: @ 83FE4F4 - .4byte dp01t_00_3_getattr +gLinkPartnerBufferCommands:: @ 83FE4F4 + .4byte LinkPartnerHandleGetAttributes .4byte sub_811EC04 - .4byte sub_811EC10 + .4byte LinkPartnerHandleSetAttributes .4byte sub_811F664 .4byte sub_811F6D8 .4byte sub_811F7F4 @@ -29,10 +29,10 @@ gUnknown_083FE4F4:: @ 83FE4F4 .4byte sub_8120128 .4byte sub_8120134 .4byte sub_8120140 - .4byte sub_812014C - .4byte sub_812023C - .4byte sub_8120248 - .4byte sub_81202BC + .4byte LinkPartnerHandleHealthBarUpdate + .4byte LinkPartnerHandleExpBarUpdate + .4byte LinkPartnerHandleStatusIconUpdate + .4byte LinkPartnerHandleStatusAnimation .4byte sub_8120324 .4byte sub_8120330 .4byte sub_812033C @@ -46,11 +46,11 @@ gUnknown_083FE4F4:: @ 83FE4F4 .4byte sub_81203AC .4byte sub_81203E4 .4byte sub_81203FC - .4byte dp01t_29_3_blink + .4byte LinkPartnerHandleHitAnimation .4byte sub_8120494 - .4byte sub_81204A0 + .4byte LinkPartnerHandleEffectivenessSound .4byte sub_81204E4 - .4byte sub_8120514 + .4byte LinkPartnerHandleFaintingCry .4byte dp01t_2E_3_battle_intro .4byte sub_8120588 .4byte dp01t_30_3_80EB11C diff --git a/data/battle_anim_81258BC.s b/data/battle_anim_81258BC.s index b4f88fc67..993adbc2e 100644 --- a/data/battle_anim_81258BC.s +++ b/data/battle_anim_81258BC.s @@ -4,8 +4,8 @@ .section .rodata .align 2 -gUnknown_08402080:: @ 8402080 - .4byte sub_812B864 +gSafariBufferCommands:: @ 8402080 + .4byte SafariHandleGetAttributes .4byte sub_812B870 .4byte sub_812B87C .4byte sub_812B888 @@ -21,8 +21,8 @@ gUnknown_08402080:: @ 8402080 .4byte sub_812BA14 .4byte sub_812BA70 .4byte sub_812BA7C - .4byte dp01t_10_6_message - .4byte dp01t_11_6_message_for_player_only + .4byte SafariHandlePrintString + .4byte SafariHandlePrintStringPlayerOnly .4byte sub_812BB10 .4byte sub_812BBFC .4byte sub_812BC08 diff --git a/data/battle_anim_8137220.s b/data/battle_anim_8137220.s index a2f7c1d74..c1673af9a 100644 --- a/data/battle_anim_8137220.s +++ b/data/battle_anim_8137220.s @@ -4,7 +4,7 @@ .section .rodata .align 2 -gUnknown_084061A4:: @ 84061A4 +gWallyBufferCommands:: @ 84061A4 .4byte dp01t_00_5_getattr .4byte sub_8138230 .4byte sub_813823C diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 32d8e6da5..fbb0826fc 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -280,7 +280,7 @@ BattleScript_1D6F48: @ 81D6F48 seteffectwithchancetarget faintpokemon TARGET, 0, 0x0 -BattleScript_1D6F62:: @ 81D6F62 +BattleScript_EndTurn:: @ 81D6F62 setbyte 0x201600c, 0 atk49 0, 0 end @@ -299,7 +299,7 @@ BattleScript_1D6F77: @ 81D6F77 missmessage resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Sleep: @ 81D6F81 attackcanceler @@ -315,25 +315,25 @@ MoveEffect_Sleep: @ 81D6F81 waitanimation setbyte 0x2024d21, 1 seteffecttarget - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D6FC4: @ 81D6FC4 pause 32 printstring BATTLE_TEXT_DefendingAsleep waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D6FD2: @ 81D6FD2 pause 32 printstring BATTLE_TEXT_WasntAffected waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D6FE0: @ 81D6FE0 pause 32 printfromtable BattleTextList_40156A waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PoisonHit: @ 81D6FF0 MoveEffect_PoisonTail: @ 81D6FF0 @@ -380,7 +380,7 @@ BattleScript_1D703F: @ 81D703F BattleScript_1D7056: @ 81D7056 faintpokemon USER, 0, 0x0 faintpokemon TARGET, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_BlazeKick: @ 81D7069 MoveEffect_BurnHit: @ 81D7069 @@ -490,7 +490,7 @@ BattleScript_1D7129: @ 81D7129 BattleScript_1D7167: @ 81D7167 faintpokemon TARGET, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_MirrorMove: @ 81D7173 attackcanceler @@ -501,7 +501,7 @@ MoveEffect_MirrorMove: @ 81D7173 orbyte 0x2024c68, 32 printstring BATTLE_TEXT_MirrorFail waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_AttackUp: @ 81D718B setbyte 0x201601e, 17 @@ -542,9 +542,9 @@ BattleScript_1D71D8: @ 81D71D8 waitmessage 64 BattleScript_1D71E0: @ 81D71E0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn -gUnknown_081D71E5:: @ 81D71E5 +BattleScript_StatUp:: @ 81D71E5 playanimation 2, 1, 0x20160a4 printfromtable BattleTextList_401570 waitmessage 64 @@ -592,9 +592,9 @@ BattleScript_1D7269: @ 81D7269 waitmessage 64 BattleScript_1D7271: @ 81D7271 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn -gUnknown_081D7276:: @ 81D7276 +BattleScript_StatDown:: @ 81D7276 playanimation 2, 1, 0x20160a4 printfromtable BattleTextList_40157C waitmessage 64 @@ -609,7 +609,7 @@ MoveEffect_Haze: @ 81D7286 normalisebuffs printstring BATTLE_TEXT_StatElim waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Bide: @ 81D7297 attackcanceler @@ -619,7 +619,7 @@ MoveEffect_Bide: @ 81D7297 waitanimation orword 0x2024c6c, 0x8000000 setbide - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Rampage: @ 81D72AB attackcanceler @@ -690,7 +690,7 @@ BattleScript_1D7377: @ 81D7377 resultmessage waitmessage 64 jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7396 - copyarray gUnknown_030041C0, 0x20160e0, 6 + copyarray gBattleTextBuff1, 0x20160e0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 @@ -712,7 +712,7 @@ MoveEffect_Conversion: @ 81D73B1 waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_FlinchHit: @ 81D73C6 setbyte 0x2024d21, 8 @@ -730,7 +730,7 @@ MoveEffect_RestoreHp: @ 81D73D1 datahpupdate USER printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Toxic: @ 81D73F4 attackcanceler @@ -751,19 +751,19 @@ MoveEffect_Toxic: @ 81D73F4 seteffecttarget resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7455: @ 81D7455 pause 64 printstring BATTLE_TEXT_AlreadyPoisoned waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7463: @ 81D7463 copyarray 0x2024c0a, 0x2024c08, 1 setbyte 0x2024d23, 0 - callatk BattleScript_1D98BD - jump BattleScript_1D6F62 + callatk BattleScript_PSNPrevention + jump BattleScript_EndTurn MoveEffect_PayDay: @ 81D747D setbyte 0x2024d21, 11 @@ -798,13 +798,13 @@ BattleScript_1D74C6: @ 81D74C6 pause 64 printfromtable BattleTextList_40156A waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D74D6: @ 81D74D6 pause 32 printstring BATTLE_TEXT_AttackingAsleep waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Ohko: @ 81D74E4 attackcanceler @@ -821,14 +821,14 @@ BattleScript_1D7505: @ 81D7505 pause 64 printfromtable BattleTextList_4015C8 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_RazorWind: @ 81D7515 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D setbyte 0x2016055, 0 callatk BattleScript_1D756C - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D753D: @ 81D753D attackcanceler @@ -909,7 +909,7 @@ BattleScript_1D7632: @ 81D7632 pause 64 resultmessage waitmessage 64 - jumpifbyte 4, 0x2024c68, 8, BattleScript_1D6F62 + jumpifbyte 4, 0x2024c68, 8, BattleScript_EndTurn printstring BATTLE_TEXT_KeptGoingCrash waitmessage 64 atk5 @@ -922,7 +922,7 @@ BattleScript_1D7632: @ 81D7632 datahpupdate USER faintpokemon USER, 0, 0x0 orbyte 0x2024c68, 1 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Mist: @ 81D7676 attackcanceler @@ -933,7 +933,7 @@ MoveEffect_Mist: @ 81D7676 waitanimation printfromtable BattleTextList_4015A0 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_FocusEnergy: @ 81D7689 attackcanceler @@ -945,7 +945,7 @@ MoveEffect_FocusEnergy: @ 81D7689 waitanimation printfromtable BattleTextList_4015A4 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Recoil: @ 81D76A6 setbyte 0x2024d21, 206 @@ -968,13 +968,13 @@ MoveEffect_Confuse: @ 81D76BF seteffecttarget resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D76FE: @ 81D76FE pause 32 printstring BATTLE_TEXT_AlreadyConfused waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_AttackUp2: @ 81D770C setbyte 0x201601e, 33 @@ -1005,7 +1005,7 @@ MoveEffect_Transform: @ 81D7743 waitanimation printfromtable BattleTextList_4015A8 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_AttackDown2: @ 81D7756 setbyte 0x201601e, 161 @@ -1034,7 +1034,7 @@ BattleScript_1D7786: @ 81D7786 waitanimation printfromtable BattleTextList_401540 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Poison: @ 81D7795 attackcanceler @@ -1055,7 +1055,7 @@ MoveEffect_Poison: @ 81D7795 seteffecttarget resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Paralyze: @ 81D77F6 attackcanceler @@ -1075,19 +1075,19 @@ MoveEffect_Paralyze: @ 81D77F6 seteffecttarget resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D784B: @ 81D784B pause 32 printstring BATTLE_TEXT_AlreadyParalyzed waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7859: @ 81D7859 copyarray 0x2024c0a, 0x2024c08, 1 setbyte 0x2024d23, 0 - callatk BattleScript_1D98B1 - jump BattleScript_1D6F62 + callatk BattleScript_PRLZPrevention + jump BattleScript_EndTurn MoveEffect_AttackDownHit: @ 81D7873 setbyte 0x2024d21, 22 @@ -1118,7 +1118,7 @@ MoveEffect_SkyAttack: @ 81D78B5 jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D setbyte 0x2016055, 3 callatk BattleScript_1D756C - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_ConfuseHit: @ 81D78DD setbyte 0x2024d21, 7 @@ -1154,13 +1154,13 @@ BattleScript_1D7922: @ 81D7922 BattleScript_1D7928: @ 81D7928 printfromtable BattleTextList_4015AC waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7935: @ 81D7935 pause 32 printstring BATTLE_TEXT_SubAlready waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Recharge: @ 81D7943 attackcanceler @@ -1171,7 +1171,7 @@ MoveEffect_Recharge: @ 81D7943 gUnknown_081D7956:: @ 81D7956 printstring BATTLE_TEXT_MustRecharge waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Rage: @ 81D7961 attackcanceler @@ -1197,7 +1197,7 @@ MoveEffect_Mimic: @ 81D7988 waitanimation printstring BATTLE_TEXT_LearnedMove2 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Metronome: @ 81D79AE attackcanceler @@ -1223,7 +1223,7 @@ BattleScript_1D79D9: @ 81D79D9 waitanimation printfromtable BattleTextList_40154C waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Splash: @ 81D79E9 attackcanceler @@ -1234,7 +1234,7 @@ MoveEffect_Splash: @ 81D79E9 atk60 26 printstring BATTLE_TEXT_Nothing waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Disable: @ 81D79FB attackcanceler @@ -1246,7 +1246,7 @@ MoveEffect_Disable: @ 81D79FB waitanimation printstring BATTLE_TEXT_MoveWasDisabled waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_LevelDamage: @ 81D7A17 attackcanceler @@ -1290,7 +1290,7 @@ MoveEffect_Encore: @ 81D7A5D waitanimation printstring BATTLE_TEXT_EncoreGot waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PainSplit: @ 81D7A79 attackcanceler @@ -1308,7 +1308,7 @@ MoveEffect_PainSplit: @ 81D7A79 datahpupdate TARGET printstring BATTLE_TEXT_PainSplit waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Snore: @ 81D7AB0 attackcanceler @@ -1339,7 +1339,7 @@ MoveEffect_Conversion2: @ 81D7AEA waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_LockOn: @ 81D7AFF attackcanceler @@ -1352,7 +1352,7 @@ MoveEffect_LockOn: @ 81D7AFF waitanimation printstring BATTLE_TEXT_TookAim waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Sketch: @ 81D7B21 attackcanceler @@ -1364,7 +1364,7 @@ MoveEffect_Sketch: @ 81D7B21 waitanimation printstring BATTLE_TEXT_SketchedMove waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_SleepTalk: @ 81D7B40 attackcanceler @@ -1400,7 +1400,7 @@ MoveEffect_DestinyBond: @ 81D7B82 waitanimation printstring BATTLE_TEXT_DestinyBondTake waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Flail: @ 81D7B93 remaininghptopower @@ -1416,7 +1416,7 @@ MoveEffect_Spite: @ 81D7B99 waitanimation printstring BATTLE_TEXT_ReducedBy waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_HealBell: @ 81D7BB5 attackcanceler @@ -1441,7 +1441,7 @@ BattleScript_1D7BE1: @ 81D7BE1 BattleScript_1D7BF2: @ 81D7BF2 atk98 4 waitstateatk - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_TripleKick: @ 81D7BFA attackcanceler @@ -1493,7 +1493,7 @@ BattleScript_1D7C90: @ 81D7C90 resultmessage waitmessage 64 jumpifbyte 0, 0x20160e4, 0, BattleScript_1D7CAF - copyarray gUnknown_030041C0, 0x20160e0, 6 + copyarray gBattleTextBuff1, 0x20160e0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 @@ -1520,7 +1520,7 @@ MoveEffect_MeanLook: @ 81D7CCC seteffecttarget printstring BATTLE_TEXT_CantEscapeNow waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Nightmare: @ 81D7CF4 attackcanceler @@ -1538,7 +1538,7 @@ BattleScript_1D7D1A: @ 81D7D1A seteffecttarget printstring BATTLE_TEXT_NightmareStart waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Minimize: @ 81D7D2E attackcanceler @@ -1578,7 +1578,7 @@ BattleScript_1D7D9A: @ 81D7D9A waitmessage 64 BattleScript_1D7DAE: @ 81D7DAE - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7DB3: @ 81D7DB3 jumpifarraynotequal 0x2024c07, 0x2024c08, 1, BattleScript_1D7DC4 @@ -1599,7 +1599,7 @@ BattleScript_1D7DC4: @ 81D7DC4 printstring BATTLE_TEXT_CurseLay waitmessage 64 faintpokemon USER, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Endure: @ 81D7DFD MoveEffect_Protect: @ 81D7DFD @@ -1611,7 +1611,7 @@ MoveEffect_Protect: @ 81D7DFD waitanimation printfromtable BattleTextList_40153A waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Spikes: @ 81D7E10 attackcanceler @@ -1622,7 +1622,7 @@ MoveEffect_Spikes: @ 81D7E10 waitanimation printstring BATTLE_TEXT_SpikesScattered waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Foresight: @ 81D7E25 attackcanceler @@ -1634,7 +1634,7 @@ MoveEffect_Foresight: @ 81D7E25 waitanimation printstring BATTLE_TEXT_IdentifiedPoke waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PerishSong: @ 81D7E3D attackcanceler @@ -1653,7 +1653,7 @@ BattleScript_1D7E53: @ 81D7E53 BattleScript_1D7E5A: @ 81D7E5A addbyte 0x2016003, 1 jumpifarraynotequal 0x2016003, 0x2024a68, 1, BattleScript_1D7E53 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D7E73: @ 81D7E73 printstring BATTLE_TEXT_BlocksOther2 @@ -1703,7 +1703,7 @@ BattleScript_1D7EE5: @ 81D7EE5 jumpifhalverset TARGET, 32, BattleScript_1D9037 setbyte 0x2024d21, 7 seteffecttarget - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_FuryCutter: @ 81D7F00 attackcanceler @@ -1730,7 +1730,7 @@ MoveEffect_Attract: @ 81D7F1F waitanimation printstring BATTLE_TEXT_FellLove waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Frustration: @ 81D7F3B MoveEffect_Return: @ 81D7F3B @@ -1788,7 +1788,7 @@ MoveEffect_BatonPass: @ 81D7F7C switch3 USER, 1 waitstateatk atk52 USER - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_RapidSpin: @ 81D7FA9 setbyte 0x2024d21, 163 @@ -1833,7 +1833,7 @@ BattleScript_1D7FFA: @ 81D7FFA printfromtable BattleTextList_40151C waitmessage 64 callatk BattleScript_1D9761 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_SunnyDay: @ 81D800E attackcanceler @@ -1866,7 +1866,7 @@ MoveEffect_BellyDrum: @ 81D8038 datahpupdate USER printstring BATTLE_TEXT_CutHPMaxATK waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PsychUp: @ 81D805A attackcanceler @@ -1877,7 +1877,7 @@ MoveEffect_PsychUp: @ 81D805A waitanimation printstring BATTLE_TEXT_CopyStatChanges waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_MirrorCoat: @ 81D806F attackcanceler @@ -1903,7 +1903,7 @@ MoveEffect_SkullBash: @ 81D8085 waitmessage 64 BattleScript_1D80CF: @ 81D80CF - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Twister: @ 81D80D4 jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D80EE @@ -1976,7 +1976,7 @@ MoveEffect_FutureSight: @ 81D817D waitanimation printfromtable BattleTextList_4015E2 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Gust: @ 81D8194 jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D6F14 @@ -1999,7 +1999,7 @@ BattleScript_1D81E1: @ 81D81E1 jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D setbyte 0x2016055, 1 callatk BattleScript_1D756C - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D8209: @ 81D8209 orword 0x2024c6c, 0x8000000 @@ -2026,7 +2026,7 @@ MoveEffect_Teleport: @ 81D8233 printstring BATTLE_TEXT_FledBattle waitmessage 64 setbyte 0x2024d26, 5 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_BeatUp: @ 81D826E attackcanceler @@ -2088,7 +2088,7 @@ BattleScript_1D8322: @ 81D8322 BattleScript_1D8328: @ 81D8328 callatk BattleScript_1D756C hidepreattack - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D8333: @ 81D8333 attackcanceler @@ -2136,13 +2136,13 @@ BattleScript_1D839B:: @ 81D839B datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D83B5:: @ 81D83B5 pause 32 printstring BATTLE_TEXT_HPFull waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_FakeOut: @ 81D83C3 attackcanceler @@ -2161,14 +2161,14 @@ BattleScript_1D83D6:: @ 81D83D6 orbyte 0x2024c68, 32 resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D83E8: @ 81D83E8 pause 32 orbyte 0x2024c68, 8 resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Uproar: @ 81D83FA attackcanceler @@ -2191,7 +2191,7 @@ MoveEffect_Stockpile: @ 81D841A waitanimation printfromtable BattleTextList_40155E waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_SpitUp: @ 81D842D attackcanceler @@ -2208,7 +2208,7 @@ BattleScript_1D844E: @ 81D844E pause 32 printstring BATTLE_TEXT_SpitUpFail waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D845C: @ 81D845C attackstring @@ -2217,7 +2217,7 @@ BattleScript_1D845C: @ 81D845C stockpiletobasedamage BattleScript_1D844E resultmessage waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Swallow: @ 81D846F attackcanceler @@ -2230,7 +2230,7 @@ BattleScript_1D847C: @ 81D847C pause 32 printfromtable BattleTextList_401566 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Hail: @ 81D848C attackcanceler @@ -2249,7 +2249,7 @@ MoveEffect_Torment: @ 81D8495 waitanimation printstring BATTLE_TEXT_TormentSubject waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Flatter: @ 81D84B1 attackcanceler @@ -2273,7 +2273,7 @@ BattleScript_1D84F4: @ 81D84F4 jumpifhalverset TARGET, 32, BattleScript_1D9037 setbyte 0x2024d21, 7 seteffecttarget - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_WillOWisp: @ 81D850F attackcanceler @@ -2290,19 +2290,19 @@ MoveEffect_WillOWisp: @ 81D850F waitanimation setbyte 0x2024d21, 3 seteffecttarget - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D855B: @ 81D855B copyarray 0x2024c0a, 0x2024c08, 1 setbyte 0x2024d23, 0 - callatk BattleScript_1D98A5 - jump BattleScript_1D6F62 + callatk BattleScript_BRNPrevention + jump BattleScript_EndTurn BattleScript_1D8575: @ 81D8575 pause 32 printstring BATTLE_TEXT_AlreadyBurned waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Memento: @ 81D8583 attackcanceler @@ -2333,7 +2333,7 @@ BattleScript_1D85D0: @ 81D85D0 BattleScript_1D85F3: @ 81D85F3 faintpokemon USER, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D85FF: @ 81D85FF printstring BATTLE_TEXT_NoEffect @@ -2352,7 +2352,7 @@ BattleScript_1D8611: @ 81D8611 resultmessage waitmessage 64 faintpokemon USER, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Facade: @ 81D8626 jumpifstatus USER, PSN | BRN | PAR | TOX, BattleScript_1D8635 @@ -2368,7 +2368,7 @@ MoveEffect_FocusPunch: @ 81D8640 ppreduce printstring BATTLE_TEXT_LostFocus waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Smellingsalt: @ 81D8652 jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F14 @@ -2389,7 +2389,7 @@ MoveEffect_FollowMe: @ 81D867C waitanimation printstring BATTLE_TEXT_CenterAttention waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_NaturePower: @ 81D868D attackcanceler @@ -2409,7 +2409,7 @@ MoveEffect_Charge: @ 81D869A waitanimation printstring BATTLE_TEXT_ChargingPower waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Taunt: @ 81D86AB attackcanceler @@ -2421,7 +2421,7 @@ MoveEffect_Taunt: @ 81D86AB waitanimation printstring BATTLE_TEXT_TauntFell waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_HelpingHand: @ 81D86C7 attackcanceler @@ -2432,7 +2432,7 @@ MoveEffect_HelpingHand: @ 81D86C7 waitanimation printstring BATTLE_TEXT_ReadyToHelp waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Trick: @ 81D86DC attackcanceler @@ -2447,7 +2447,7 @@ MoveEffect_Trick: @ 81D86DC waitmessage 64 printfromtable BattleTextList_401642 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_RolePlay: @ 81D870A attackcanceler @@ -2459,7 +2459,7 @@ MoveEffect_RolePlay: @ 81D870A waitanimation printstring BATTLE_TEXT_CopiedObject waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Wish: @ 81D8726 attackcanceler @@ -2468,7 +2468,7 @@ MoveEffect_Wish: @ 81D8726 atkd4 0, BattleScript_1D83D6 attackanimation waitanimation - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Assist: @ 81D8736 attackcanceler @@ -2489,7 +2489,7 @@ MoveEffect_Ingrain: @ 81D874D waitanimation printstring BATTLE_TEXT_PlantedRoots waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Superpower: @ 81D8762 setbyte 0x2024d21, 229 @@ -2504,7 +2504,7 @@ MoveEffect_MagicCoat: @ 81D876D waitanimation printstring BATTLE_TEXT_ShroudedItself waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Recycle: @ 81D8782 attackcanceler @@ -2515,7 +2515,7 @@ MoveEffect_Recycle: @ 81D8782 waitanimation printstring BATTLE_TEXT_FoundOne waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Revenge: @ 81D8797 doubledamagedealtifdamaged @@ -2554,7 +2554,7 @@ BattleScript_1D87D0: @ 81D87D0 waitmessage 64 seteffectwithchancetarget faintpokemon TARGET, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Yawn: @ 81D87EE attackcanceler @@ -2571,7 +2571,7 @@ MoveEffect_Yawn: @ 81D87EE waitanimation printstring BATTLE_TEXT_DrowsyMade waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D882F: @ 81D882F copyarray 0x2016003, 0x20160f8, 1 @@ -2580,7 +2580,7 @@ BattleScript_1D8839: @ 81D8839 pause 32 printstring BATTLE_TEXT_MadeIneffective2 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_KnockOff: @ 81D8847 setbyte 0x2024d21, 54 @@ -2614,7 +2614,7 @@ MoveEffect_SkillSwap: @ 81D8893 waitanimation printstring BATTLE_TEXT_AbilitySwap waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Imprison: @ 81D88AF attackcanceler @@ -2625,7 +2625,7 @@ MoveEffect_Imprison: @ 81D88AF waitanimation printstring BATTLE_TEXT_SealedMove waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Refresh: @ 81D88C4 attackcanceler @@ -2637,7 +2637,7 @@ MoveEffect_Refresh: @ 81D88C4 printstring BATTLE_TEXT_StatusNormal waitmessage 64 atk98 1 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Grudge: @ 81D88DB attackcanceler @@ -2648,7 +2648,7 @@ MoveEffect_Grudge: @ 81D88DB waitanimation printstring BATTLE_TEXT_GrudgeBear waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Snatch: @ 81D88F0 attackcanceler @@ -2660,7 +2660,7 @@ MoveEffect_Snatch: @ 81D88F0 pause 32 printstring BATTLE_TEXT_AwaitMove waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_LowKick: @ 81D8908 attackcanceler @@ -2745,7 +2745,7 @@ MoveEffect_WaterSport: @ 81D89D7 waitanimation printfromtable BattleTextList_4015D4 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_PoisonFang: @ 81D89EE setbyte 0x2024d21, 6 @@ -2788,14 +2788,14 @@ BattleScript_1D8A55: @ 81D8A55 waitmessage 64 BattleScript_1D8A78: @ 81D8A78 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D8A7D: @ 81D8A7D pause 32 orbyte 0x2024c68, 32 printstring BATTLE_TEXT_StatNoLower waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_CosmicPower: @ 81D8A91 attackcanceler @@ -2823,7 +2823,7 @@ BattleScript_1D8AD1: @ 81D8AD1 waitmessage 64 BattleScript_1D8AF0: @ 81D8AF0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_SkyUppercut: @ 81D8AF5 orword 0x2024c6c, 0x10000 @@ -2855,7 +2855,7 @@ BattleScript_1D8B43: @ 81D8B43 waitmessage 64 BattleScript_1D8B62: @ 81D8B62 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_CalmMind: @ 81D8B67 attackcanceler @@ -2883,14 +2883,14 @@ BattleScript_1D8BA7: @ 81D8BA7 waitmessage 64 BattleScript_1D8BC6: @ 81D8BC6 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D8BCB: @ 81D8BCB pause 32 orbyte 0x2024c68, 32 printstring BATTLE_TEXT_StatNoHigher waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_DragonDance: @ 81D8BDF attackcanceler @@ -2918,7 +2918,7 @@ BattleScript_1D8C1F: @ 81D8C1F waitmessage 64 BattleScript_1D8C3E: @ 81D8C3E - jump BattleScript_1D6F62 + jump BattleScript_EndTurn MoveEffect_Camouflage: @ 81D8C43 attackcanceler @@ -2929,7 +2929,7 @@ MoveEffect_Camouflage: @ 81D8C43 waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D8C58:: @ 81D8C58 atk56 1 @@ -3188,11 +3188,11 @@ BattleScript_1D8EAD: @ 81D8EAD BattleScript_1D8EEE: @ 81D8EEE return -gUnknown_081D8EEF:: @ 81D8EEF +BattleScript_Pausex20:: @ 81D8EEF pause 32 return -gUnknown_081D8EF3:: @ 81D8EF3 +BattleScript_LevelUp:: @ 81D8EF3 atk55 0xe10016f attackcanceler setbyte 0x201609c, 0 @@ -3338,7 +3338,7 @@ BattleScript_1D9083: @ 81D9083 gUnknown_081D90A7:: @ 81D90A7 printstring BATTLE_TEXT_StoringEnergy waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D90B2:: @ 81D90B2 printstring BATTLE_TEXT_UnleashedEnergy @@ -3359,7 +3359,7 @@ gUnknown_081D90B2:: @ 81D90B2 resultmessage waitmessage 64 faintpokemon TARGET, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D90F1:: @ 81D90F1 printstring BATTLE_TEXT_UnleashedEnergy @@ -3383,7 +3383,7 @@ BattleScript_1D9116: @ 81D9116 waitstateatk printstring BATTLE_TEXT_DraggedOut atk52 TARGET - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9128:: @ 81D9128 pause 32 @@ -3399,7 +3399,7 @@ gUnknown_081D9132:: @ 81D9132 gUnknown_081D9139:: @ 81D9139 printstring BATTLE_TEXT_MoveIsDisabled waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9144:: @ 81D9144 printstring2 BATTLE_TEXT_MoveIsDisabled @@ -3527,7 +3527,7 @@ BattleScript_1D92AB: @ 81D92AB BattleScript_1D92BF: @ 81D92BF return -gUnknown_081D92C0:: @ 81D92C0 +BattleScript_RapidSpinAway:: @ 81D92C0 breakfree return @@ -3601,19 +3601,19 @@ gUnknown_081D9369:: @ 81D9369 printstring2 BATTLE_TEXT_NoPP1 atk44 -gUnknown_081D936D:: @ 81D936D +BattleScript_NoPPForMove:: @ 81D936D attackstring pause 32 printstring BATTLE_TEXT_NoPP2 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D937C:: @ 81D937C printstring2 BATTLE_TEXT_TormentNoUse atk44 printstring BATTLE_TEXT_TormentNoUse waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D938B:: @ 81D938B printstring2 BATTLE_TEXT_TauntNoUse @@ -3622,7 +3622,7 @@ gUnknown_081D938B:: @ 81D938B gUnknown_081D938F:: @ 81D938F printstring BATTLE_TEXT_TauntNoUse waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D939A:: @ 81D939A atkd4 1, BattleScript_1D93C1 @@ -3657,7 +3657,7 @@ BattleScript_1D93EC: @ 81D93EC pause 32 printstring BATTLE_TEXT_AnchoredItself waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D93FA:: @ 81D93FA setbyte 0x20160dc, 0 @@ -3680,7 +3680,7 @@ BattleScript_1D9427: @ 81D9427 BattleScript_1D944A: @ 81D944A return -gUnknown_081D944B:: @ 81D944B +BattleScript_KnockedOff:: @ 81D944B playanimation TARGET, 5, 0x0 printstring BATTLE_TEXT_KnockedOffItem waitmessage 64 @@ -3689,7 +3689,7 @@ gUnknown_081D944B:: @ 81D944B gUnknown_081D9459:: @ 81D9459 printstring BATTLE_TEXT_SealedNoUse waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9464:: @ 81D9464 printstring2 BATTLE_TEXT_SealedNoUse @@ -3700,7 +3700,7 @@ gUnknown_081D9468:: @ 81D9468 waitmessage 64 return -gUnknown_081D946F:: @ 81D946F +BattleScript_MagicCoatBounce:: @ 81D946F attackstring ppreduce pause 32 @@ -3710,7 +3710,7 @@ gUnknown_081D946F:: @ 81D946F atk76 USER, 1 return -gUnknown_081D9487:: @ 81D9487 +BattleScript_SnatchedMove:: @ 81D9487 attackstring ppreduce snatchmove @@ -3721,12 +3721,12 @@ gUnknown_081D9487:: @ 81D9487 atk5f return -gUnknown_081D94A2:: @ 81D94A2 +BattleScript_EnduredMsg:: @ 81D94A2 printstring BATTLE_TEXT_EnduredHit waitmessage 64 return -gUnknown_081D94A9:: @ 81D94A9 +BattleScript_OneHitKOMsg:: @ 81D94A9 printstring BATTLE_TEXT_GrandSlam waitmessage 64 return @@ -3755,7 +3755,7 @@ gUnknown_081D94EE:: @ 81D94EE printstring BATTLE_TEXT_FastAsleep waitmessage 64 statusanimation USER - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D94FB:: @ 81D94FB bicword 0x2024c6c, 0x10 @@ -3796,7 +3796,7 @@ gUnknown_081D9545:: @ 81D9545 printstring BATTLE_TEXT_FrozenSolid waitmessage 64 statusanimation USER - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9552:: @ 81D9552 printfromtable BattleTextList_4015C4 @@ -3814,12 +3814,12 @@ gUnknown_081D9566:: @ 81D9566 printstring BATTLE_TEXT_Paralyzed3 waitmessage 64 statusanimation USER - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9573:: @ 81D9573 printstring BATTLE_TEXT_Flinched waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D957E:: @ 81D957E printfromtable BattleTextList_40155A @@ -3850,7 +3850,7 @@ BattleScript_1D95AC: @ 81D95AC graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D95D3: @ 81D95D3 return @@ -3885,7 +3885,7 @@ gUnknown_081D95FB:: @ 81D95FB gUnknown_081D9608:: @ 81D9608 printstring BATTLE_TEXT_ImmobilizedBy waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9613:: @ 81D9613 printstring BATTLE_TEXT_NightmareLock @@ -3899,7 +3899,7 @@ gUnknown_081D9624:: @ 81D9624 atk65 1, 0x10000000 jump BattleScript_1D9520 -gUnknown_081D9635:: @ 81D9635 +BattleScript_TargetPRLZHeal:: @ 81D9635 printstring BATTLE_TEXT_ParalysisHealed waitmessage 64 atk98 0 @@ -3990,7 +3990,7 @@ BattleScript_1D96DB: @ 81D96DB BattleScript_1D96F5: @ 81D96F5 return -gUnknown_081D96F6:: @ 81D96F6 +BattleScript_ItemSteal:: @ 81D96F6 playanimation TARGET, 16, 0x0 printstring BATTLE_TEXT_StoleSomething waitmessage 64 @@ -4103,7 +4103,7 @@ gUnknown_081D97FE:: @ 81D97FE callatk BattleScript_1D9761 end3 -gUnknown_081D9812:: @ 81D9812 +BattleScript_TookAttack:: @ 81D9812 attackstring pause 32 printstring BATTLE_TEXT_TookAttack2 @@ -4115,13 +4115,13 @@ gUnknown_081D9826:: @ 81D9826 pause 32 printstring BATTLE_TEXT_ProtectedBy pause 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9834:: @ 81D9834 pause 32 printstring BATTLE_TEXT_PreventedBy pause 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9842:: @ 81D9842 ppreduce @@ -4135,7 +4135,7 @@ gUnknown_081D9843:: @ 81D9843 printstring BATTLE_TEXT_HPRestoredUsing waitmessage 64 orbyte 0x2024c68, 8 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9865:: @ 81D9865 ppreduce @@ -4146,7 +4146,7 @@ gUnknown_081D9866:: @ 81D9866 printstring BATTLE_TEXT_MadeUseless waitmessage 64 orbyte 0x2024c68, 8 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D987B:: @ 81D987B ppreduce @@ -4156,13 +4156,13 @@ gUnknown_081D987C:: @ 81D987C pause 32 printfromtable BattleTextList_401648 waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D988D: @ 81D988D pause 32 printstring BATTLE_TEXT_AnchorsItself waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D989B:: @ 81D989B pause 32 @@ -4170,19 +4170,19 @@ gUnknown_081D989B:: @ 81D989B waitmessage 64 return -BattleScript_1D98A5:: @ 81D98A5 +BattleScript_BRNPrevention:: @ 81D98A5 pause 32 printfromtable BattleTextList_401630 waitmessage 64 return -BattleScript_1D98B1:: @ 81D98B1 +BattleScript_PRLZPrevention:: @ 81D98B1 pause 32 printfromtable BattleTextList_401636 waitmessage 64 return -BattleScript_1D98BD:: @ 81D98BD +BattleScript_PSNPrevention:: @ 81D98BD pause 32 printfromtable BattleTextList_40163C waitmessage 64 @@ -4192,19 +4192,19 @@ gUnknown_081D98C9:: @ 81D98C9 pause 32 printstring BATTLE_TEXT_PreventedRomance waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn -gUnknown_081D98D7:: @ 81D98D7 +BattleScript_FlinchPrevention:: @ 81D98D7 pause 32 printstring BATTLE_TEXT_PreventedFlinching waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn BattleScript_1D98E5: @ 81D98E5 pause 32 printstring BATTLE_TEXT_PreventedConfusion waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D98F3:: @ 81D98F3 attackstring @@ -4212,7 +4212,7 @@ gUnknown_081D98F3:: @ 81D98F3 pause 32 printstring BATTLE_TEXT_BlocksOther waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9903:: @ 81D9903 pause 32 @@ -4221,11 +4221,11 @@ gUnknown_081D9903:: @ 81D9903 setbyte 0x2024d23, 3 return -gUnknown_081D9913:: @ 81D9913 +BattleScript_NoItemSteal:: @ 81D9913 pause 32 printstring BATTLE_TEXT_MadeIneffective waitmessage 64 - jump BattleScript_1D6F62 + jump BattleScript_EndTurn gUnknown_081D9921:: @ 81D9921 printstring BATTLE_TEXT_MadeType @@ -4296,7 +4296,7 @@ gUnknown_081D99A0:: @ 81D99A0 waitmessage 64 jump BattleScript_1D95AC -gUnknown_081D99AB:: @ 81D99AB +BattleScript_SubstituteFade:: @ 81D99AB playanimation TARGET, 2, 0x0 printstring BATTLE_TEXT_SubFaded return @@ -4429,7 +4429,7 @@ gUnknown_081D9AC2:: @ 81D9AC2 printstring2 BATTLE_TEXT_ChoiceBand atk44 -gUnknown_081D9AC6:: @ 81D9AC6 +BattleScript_HangedOnMsg:: @ 81D9AC6 playanimation TARGET, 9, 0x0 printstring BATTLE_TEXT_FocusSash waitmessage 64 @@ -4455,7 +4455,7 @@ gUnknown_081D9AFE:: @ 81D9AFE BattleScript_1D9B0B: @ 81D9B0B setbyte 0x2024d23, 4 - callatk gUnknown_081D71E5 + callatk BattleScript_StatUp removeitem USER end2 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 0ed54d11e..3f0dc8af1 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -52,7 +52,7 @@ BattleScript_1D9EBC: @ 81D9EBC pokemoncatchfunction gUnknown_081D9EC2:: @ 81D9EC2 - jumpifhalfword 0, gUnknown_02024C04, 5, BattleScript_1D9ED0 + jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0 atk60 11 BattleScript_1D9ED0: @ 81D9ED0 @@ -60,25 +60,25 @@ BattleScript_1D9ED0: @ 81D9ED0 capturesomethingf1 BattleScript_1D9EE3 printstring BATTLE_TEXT_AddedToDex waitstateatk - setbyte gUnknown_02024D1E, 0 + setbyte gBattleCommunication, 0 capturesomethingf2 BattleScript_1D9EE3: @ 81D9EE3 printstring BATTLE_TEXT_GiveNickname waitstateatk - setbyte gUnknown_02024D1E, 0 + setbyte gBattleCommunication, 0 capturesomethingf3 BattleScript_1D9EF8 printstring BATTLE_TEXT_SentToPC waitmessage 64 BattleScript_1D9EF8: @ 81D9EF8 catchpoke - setbyte gUnknown_02024D26, 7 + setbyte gBattleOutcome, 7 activesidesomething gUnknown_081D9F00:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 - setbyte gUnknown_02024D26, 7 + setbyte gBattleOutcome, 7 activesidesomething gUnknown_081D9F0A:: @ 81D9F0A @@ -88,7 +88,7 @@ gUnknown_081D9F0A:: @ 81D9F0A jumpifbyte 1, gNumSafariBalls, 0, BattleScript_1D9F34 printstring BATTLE_TEXT_SafariOver waitmessage 64 - setbyte gUnknown_02024D26, 8 + setbyte gBattleOutcome, 8 BattleScript_1D9F34: @ 81D9F34 atkf6 @@ -112,7 +112,7 @@ BattleScript_1D9F4F: @ 81D9F4F printstring BATTLE_TEXT_Used2 waitmessage 64 atk75 - orword gUnknown_02024C6C, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_RestoredHealth @@ -161,7 +161,7 @@ BattleScript_1D9FBB: @ 81D9FBB BattleScript_1D9FDA: @ 81D9FDA atk54 17 - setbyte gUnknown_02024D26, 4 + setbyte gBattleOutcome, 4 activesidesomething BattleScript_1D9FE4: @ 81D9FE4 diff --git a/data/data2.s b/data/data2.s index b8b6dc7db..00ef5c26e 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1029,79 +1029,79 @@ gUnknown_081FA724:: @ 81FA724 .2byte 0xFFFF .align 2 -gUnknown_081FA73C:: @ 81FA73C +gBattleScriptingCommandsTable:: @ 81FA73C .4byte atk00_attackcanceler .4byte atk01_accuracycheck .4byte atk02_attackstring .4byte atk03_ppreduce .4byte atk04_critcalc .4byte atk05_damagecalc1 - .4byte atk06_damagecalc2 - .4byte atk07_damagecalc3 - .4byte atk08_cmd8 - .4byte sub_801D8EC - .4byte sub_801DA60 - .4byte sub_801DA80 + .4byte atk06_typecalc + .4byte atk07_dmg_adjustment + .4byte atk08_dmg_adjustment2 + .4byte atk09_attackanimation + .4byte atk0A_waitanimation + .4byte atk0B_healthbarupdate .4byte atk0C_datahpupdate .4byte atk0D_critmessage - .4byte atk0E_missmessage + .4byte atk0E_effectiveness_sound .4byte atk0F_resultmessage .4byte atk10_printstring - .4byte atk11_printstring2 + .4byte atk11_printstring_playeronly .4byte atk12_waitmessage .4byte atk13_printfromtable - .4byte atk14_printfromtable2 + .4byte atk14_printfromtable_playeronly .4byte atk15_seteffectwithchancetarget - .4byte sub_801F708 - .4byte sub_801F718 - .4byte sub_801F728 - .4byte sub_801F7AC - .4byte sub_801FB34 - .4byte atkE2_cmde2 + .4byte atk16_seteffectprimary + .4byte atk17_seteffectsecondary + .4byte atk18_status_effect_clear + .4byte atk19_faint_pokemon + .4byte atk1A_faint_animation + .4byte atk1B_faint_effects_clear .4byte atk1C_jumpifstatus - .4byte atk1D_jumpifsecondarystatus + .4byte atk1D_jumpifstatus2 .4byte atk1E_jumpifability - .4byte sub_801FDB4 - .4byte sub_801FE2C - .4byte atk21_jumpifspecialstatusflag - .4byte sub_801FFA8 - .4byte sub_8020004 - .4byte sub_80209B4 - .4byte atk25_resetflags - .4byte sub_8020BB4 - .4byte atk27_cmd27 - .4byte sub_8020C14 + .4byte atk1F_jumpifsideaffecting + .4byte atk20_jumpifstat + .4byte atk21_jumpifstatus3 + .4byte atk22_jumpiftype + .4byte atk23_getexp + .4byte atk24 + .4byte atk25_move_values_cleanup + .4byte atk26_set_multihit + .4byte atk27_decrement_multihit + .4byte atk28_goto .4byte atk29_jumpifbyte - .4byte sub_8020CD4 - .4byte sub_8020D7C - .4byte sub_8020E30 - .4byte sub_8020EB8 - .4byte sub_8020F3C - .4byte sub_8020F64 - .4byte sub_8020F90 + .4byte atk2A_jumpifhalfword + .4byte atk2B_jumpifword + .4byte atk2C_jumpifarrayequal + .4byte atk2D_jumpifarraynotequal + .4byte atk2E_setbyte + .4byte atk2F_addbyte + .4byte atk30_subbyte .4byte atk31_copyarray - .4byte atk32_memcpy_with_offset - .4byte sub_802107C + .4byte atk32_copyarray_withindex + .4byte atk33_orbyte .4byte atk34_orhalfword .4byte atk35_orword - .4byte sub_8021124 + .4byte atk36_bicbyte .4byte atk37_bichalfword .4byte atk38_bicword .4byte atk39_pause - .4byte sub_802120C - .4byte atk3B_8022C68 + .4byte atk3A_waitstate + .4byte atk3B_healthbar_update .4byte atk3C_return - .4byte sub_8021290 - .4byte sub_80212B0 + .4byte atk3D_end + .4byte atk3E_end2 .4byte atk3F_end3 - .4byte atk40_801DBA0 + .4byte atk40_jump_if_move_affected_by_protect .4byte atk41_call .4byte atk42_jumpiftype2 - .4byte sub_8021384 - .4byte sub_80213D0 - .4byte atk46_cmd46 - .4byte sub_80214B4 - .4byte atk47 + .4byte atk43_jumpifabilitypresent + .4byte atk44 + .4byte atk45_playanimation + .4byte atk46_playanimation2 + .4byte atk47_setgraphicalstatchangevalues_setgraphicalstatchangevalues_setgraphicalstatchangevalues .4byte atk48_playstatchangeanimation .4byte sub_80217F8 .4byte atk4A_damageflags @@ -1305,7 +1305,7 @@ gCriticalHitChance:: @ 81FAB50 .2byte 2 @ +4 .align 2 -gUnknown_081FAB5C:: @ 81FAB5C +gStatusFlagsForMoveEffects:: @ 81FAB5C .4byte 0x00000000 .4byte 0x00000007 .4byte 0x00000008 @@ -1368,7 +1368,7 @@ gUnknown_081FAB5C:: @ 81FAB5C .4byte 0x00000000 .align 2 -gUnknown_081FAC4C:: @ 81FAC4C +gMoveEffectBS_Ptrs:: @ 81FAC4C .4byte BattleScript_1D963E .4byte BattleScript_1D963E .4byte BattleScript_1D965A @@ -1514,38 +1514,38 @@ gBallCatchBonuses:: @ 81FAD90 .string "ターン$" @ "turn" .align 2 -gUnknown_081FAD98:: @ 81FAD98 - .4byte dp01t_00_1_getattr +gPlayerBufferCommands:: @ 81FAD98 + .4byte PlayerHandleGetAttributes .4byte sub_802ECF0 - .4byte dp01t_02_1_setattr + .4byte PlayerHandleSetAttributes .4byte sub_802F7CC - .4byte sub_802F840 - .4byte sub_802F8A8 - .4byte sub_802FAA0 - .4byte sub_802FBB4 - .4byte sub_802FCE0 - .4byte sub_802FDBC + .4byte PlayerHandleLoadPokeSprite + .4byte PlayerHandleSendOutPoke + .4byte PlayerHandleReturnPokeToBall + .4byte PlayerHandleTrainerThrow + .4byte PlayerHandleTrainerSlide + .4byte PlayerHandleTrainerSlideBack .4byte sub_802FE7C .4byte sub_802FF60 .4byte sub_802FF80 - .4byte sub_802FFD0 - .4byte sub_803002C - .4byte dp01t_0F_1_move_anim - .4byte sub_80302F4 - .4byte dp01t_11_1_message_for_player_only + .4byte PlayerHandleBallThrow + .4byte PlayerHandlePuase + .4byte PlayerHandleMoveAnimation + .4byte PlayerHandlePrintString + .4byte PlayerHandlePrintStringPlayerOnly .4byte sub_803037C .4byte nullsub_42 .4byte sub_8030468 - .4byte sub_8030530 + .4byte PlayerHandleOpenBag .4byte sub_8030594 .4byte sub_8030674 - .4byte sub_8030698 - .4byte sub_8030798 - .4byte sub_8030834 - .4byte sub_80308A8 - .4byte sub_8030910 + .4byte PlayerHandleHealthBarUpdate + .4byte PlayerHandleExpBarUpdate + .4byte PlayerHandleStatusIconUpdate + .4byte PlayerHandleStatusAnimation + .4byte PlayerHandleStatusXor .4byte sub_803097C - .4byte sub_8030988 + .4byte PlayerHandleDMATransfer .4byte sub_8030A3C .4byte sub_8030A6C .4byte sub_8030A78 @@ -1556,20 +1556,20 @@ gUnknown_081FAD98:: @ 81FAD98 .4byte sub_8030AE4 .4byte sub_8030B1C .4byte sub_8030B34 - .4byte dp01t_29_1_blink + .4byte PlayerHandleHitAnimation .4byte sub_8030BCC - .4byte sub_8030BD8 + .4byte PlayerHandleEffectivenessSound .4byte sub_8030C1C - .4byte sub_8030C4C - .4byte dp01t_2E_1_battle_intro - .4byte sub_8030CC0 + .4byte PlayerHandleFaintingCry + .4byte PlayerHandleIntroSlide + .4byte PlayerHandleTrainerBallThrow .4byte sub_8030FAC .4byte sub_80310A4 .4byte sub_80310F0 - .4byte dp01t_33_1_enemy_move - .4byte bx_exec_buffer_A_ch0_tbl1 - .4byte dp01t_35_1_link_standby_message_and_free_vram - .4byte sub_8031238 + .4byte PlayerHandleSpriteInvisibility + .4byte PlayerHandleBattleAnimation + .4byte PlayerHandleLinkStandbyMsg + .4byte PlayerHandleResetActionMoveSelection .4byte sub_80312A0 .4byte nullsub_43 @@ -1670,38 +1670,38 @@ gUnknown_081FAF4C:: @ 81FAF4C .4byte 0x0200e000 .align 2 -gUnknown_081FAF5C:: @ 81FAF5C - .4byte dp01t_00_7_getattr +gOpponentBufferCommands:: @ 81FAF5C + .4byte OpponentHandleGetAttributes .4byte dp01t_01_2_read_pokmon_data_slice - .4byte dp01t_02_7_setattr + .4byte OpponentHandleSetAttributes .4byte sub_8034744 - .4byte sub_80347B8 - .4byte sub_8034910 - .4byte sub_8034AE0 - .4byte sub_8034BFC - .4byte sub_8034DC0 - .4byte sub_8034F84 + .4byte OpponentHandleLoadPokeSprite + .4byte OpponentHandleSendOutPoke + .4byte OpponentHandleReturnPokeToBall + .4byte OpponentHandleTrainerThrow + .4byte OpponentHandleTrainerSlide + .4byte OpponentHandleTrainerSlideBack .4byte sub_8035030 .4byte sub_80350D4 .4byte sub_80350E0 - .4byte sub_80350EC - .4byte sub_80350F8 - .4byte sub_8035104 - .4byte sub_803539C - .4byte sub_8035400 + .4byte OpponentHandleBallThrow + .4byte OpponentHandlePause + .4byte OpponentHandleMoveAnimation + .4byte OpponentHandlePrintString + .4byte OpponentHandlePrintStringPlayerOnly .4byte sub_803540C .4byte sub_803541C .4byte sub_8035428 .4byte sub_8035590 .4byte sub_80355C0 .4byte sub_80356C0 - .4byte sub_80356CC - .4byte sub_80357BC - .4byte sub_80357C8 - .4byte sub_803583C - .4byte sub_80358A4 + .4byte OpponentHandleHealthBarUpdate + .4byte OpponentHandleExpBarUpdate + .4byte OpponentHandleStatusIconUpdate + .4byte OpponentHandleStatusAnimation + .4byte OpponentHandleStatusXor .4byte sub_80358B0 - .4byte sub_80358BC + .4byte OpponentHandleDMATransfer .4byte sub_80358C8 .4byte sub_80358D4 .4byte sub_80358E0 @@ -1712,20 +1712,20 @@ gUnknown_081FAF5C:: @ 81FAF5C .4byte sub_803592C .4byte sub_8035964 .4byte sub_803597C - .4byte dp01t_29_7_blink + .4byte OpponentHandleHitAnimation .4byte sub_8035A14 - .4byte sub_8035A20 + .4byte OpponentHandleEffectivenessSound .4byte sub_8035A64 - .4byte sub_8035A94 + .4byte OpponentHandleFaintingCry .4byte dp01t_2E_7_battle_intro .4byte sub_8035B04 .4byte dp01t_30_7_0803D67C .4byte sub_8035E6C .4byte sub_8035EB8 - .4byte sub_8035EC4 - .4byte dp01t_34_7_move_anim_start_t3 - .4byte sub_8035F8C - .4byte sub_8035F98 + .4byte OpponentHandleSpriteInvisibility + .4byte OpponentHandleBattleAnimation + .4byte OpponentHandleLinkStandbyMsg + .4byte OpponentHandleResetActionMoveSelection .4byte sub_8035FA4 .4byte nullsub_46 @@ -1733,8 +1733,8 @@ gUnknown_081FAF5C:: @ 81FAF5C .byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20 .align 2 -gUnknown_081FB048:: @ 81FB048 - .4byte dp01t_00_4_getattr +gLinkOpponentBufferCommands:: @ 81FB048 + .4byte LinkOpponentHandleGetAttributes .4byte sub_803889C .4byte sub_80388A8 .4byte sub_8039220 diff --git a/data/text/battle_strings.inc b/data/text/battle_strings.inc index d0c8f74d5..7a47caa0e 100644 --- a/data/text/battle_strings.inc +++ b/data/text/battle_strings.inc @@ -1177,7 +1177,7 @@ gUnknown_08400F78:: @ 8400F78 .4byte ContestStatText_TooSour .align 2 -gUnknown_08400F8C:: @ 8400F8C +gBattleStringsTable:: @ 8400F8C .4byte BattleText_UnknownString .4byte BattleText_GainExpPoints .4byte BattleText_GrewLevel @@ -1531,8 +1531,8 @@ gUnknown_08400F8C:: @ 8400F8C .4byte BattleText_NoEffectOn .align 1 -gUnknown_08401508:: @ 8401508 -@ Each entry refers to a text pointer in gUnknown_08400F8C, but the values are offset +gMissStrings:: @ 8401508 +@ Each entry refers to a text pointer in gBattleStringsTable, but the values are offset @ by 0xc. For example, 0x0017 refers to BattleText_AttackMissed because it is the @ 11th entry in the pointer table. .2byte BATTLE_TEXT_AttackMissed @@ -1790,13 +1790,13 @@ BattleTextList_401648:: @ 8401648 .2byte BATTLE_TEXT_RaisedFirePower .2byte BATTLE_TEXT_MadeIneffective -gUnknown_0840164C:: @ 840164C - .2byte BATTLE_TEXT_StopLearning - .2byte BATTLE_TEXT_FellAsleep - .2byte BATTLE_TEXT_SpeltHealthy - .2byte BATTLE_TEXT_SubTookDamage - .2byte BATTLE_TEXT_CoinScatter - .2byte BATTLE_TEXT_SandTombTrapped +gTrappingMoves:: @ 840164C + .2byte MOVE_BIND + .2byte MOVE_WRAP + .2byte MOVE_FIRE_SPIN + .2byte MOVE_CLAMP + .2byte MOVE_WHIRLPOOL + .2byte MOVE_SAND_TOMB .2byte 0xFFFF .align 2 diff --git a/include/battle.h b/include/battle.h index 255813ca3..395cf042a 100644 --- a/include/battle.h +++ b/include/battle.h @@ -203,7 +203,7 @@ struct Struct2017840 }; extern struct UnkBattleStruct1 unk_2016A00; -extern struct UnkBattleStruct4 gUnknown_02024CA8[]; +extern struct UnkBattleStruct4 gDisableStructs[]; extern struct AI_ThinkingStruct gAIThinkingSpace; // TODO: move ewram to global.h @@ -263,30 +263,30 @@ void sub_8011834(void); void bc_801362C(void); void sub_8011970(void); void sub_80119B4(void); -void sub_8011B00(void); -void sub_8011E8C(void); +void BattleBeginFirstTurn(void); +void BattleTurnPassed(void); // asm/battle_2.o void sub_8012324(void); void sub_8012FBC(u8, u8); u8 b_first_side(u8, u8, u8); -void sub_801365C(u8); -void sub_801377C(void); +void TurnValuesCleanUp(u8); +void SpecialStatusesClear(void); void sub_80138F0(void); -void dp01_battle_side_mark_buffer_for_execution(); +void MarkBufferBankForExecution(); void sub_80155A4(); -void b_cancel_multi_turn_move_maybe(u8); -void b_std_message(); +void CancelMultiTurnMoves(u8); +void PrepareStringBattle(); void sub_80156DC(); void sub_80157C4(u8 index); // asm/battle_3.o u8 sub_8015A98(u8, u8, u8); -u8 sub_8015DFC(); -u8 sub_8016558(); +u8 UpdateTurnCounters(); +u8 TurnBasedEffects(); u8 sub_80170DC(); u8 sub_80173A4(); -u8 sub_8018324(u8, u8, u8, u8, u16); +u8 AbilityBattleEffects(u8, u8, u8, u8, u16); u8 sub_801A02C(); // asm/battle_4.o @@ -295,7 +295,7 @@ void move_effectiveness_something(u16, u8, u8); // asm/battle_5.o void nullsub_91(void); -void sub_802BF74(void); +void SetBankFuncToPlayerBufferRunCommand(void); void sub_802C098(); void c3_0802FDF4(u8); void sub_802E3E4(u8, int); @@ -312,9 +312,9 @@ void sub_8031F88(u8); void sub_80324F8(struct Pokemon *, u8); void sub_8032638(); void sub_8032AA8(u8, u8); -void sub_8032AE0(void); +void SetBankFuncToOpponentBufferRunCommand(void); // asm/battle_9.o -void sub_8037510(void); +void SetBankFuncToLinkOpponentBufferRunCommand(void); #endif // GUARD_BATTLE_H diff --git a/include/battle_811DA74.h b/include/battle_811DA74.h index 8b7e2f090..750c3fe2b 100644 --- a/include/battle_811DA74.h +++ b/include/battle_811DA74.h @@ -1,10 +1,10 @@ #ifndef GUARD_BATTLE_811DA74_H #define GUARD_BATTLE_811DA74_H -void sub_811DA78(void); -void sub_811DA94(void); +void SetBankFuncToLinkPartnerBufferRunCommand(void); +void LinkPartnerBufferRunCommand(void); void sub_811E0A0(void); -void dp01_tbl3_exec_completed(void); +void LinkPartnerBufferExecCompleted(void); u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *b); void sub_811EC68(u8); diff --git a/include/battle_anim_81258BC.h b/include/battle_anim_81258BC.h index 6bbf5dde2..45ef4b8cc 100644 --- a/include/battle_anim_81258BC.h +++ b/include/battle_anim_81258BC.h @@ -1,7 +1,7 @@ #ifndef GUARD_BATTLE_ANIM_81258BC_H #define GUARD_BATTLE_ANIM_81258BC_H -void sub_812B468(void); +void SetBankFuncToSafariBufferRunCommand(void); void bx_battle_menu_t6_2(void); #endif // GUARD_BATTLE_ANIM_81258BC_H diff --git a/include/battle_anim_8137220.h b/include/battle_anim_8137220.h index c9708ac62..73bf0d883 100644 --- a/include/battle_anim_8137220.h +++ b/include/battle_anim_8137220.h @@ -1,6 +1,6 @@ #ifndef GUARD_BATTLE_ANIM_8137220_H #define GUARD_BATTLE_ANIM_8137220_H -void sub_8137224(void); +void SetBankFuncToWallyBufferRunCommand(void); #endif // GUARD_BATTLE_ANIM_8137220_H diff --git a/include/battle_message.h b/include/battle_message.h index 04a7770a3..1ac20ce30 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -1,7 +1,7 @@ #ifndef GUARD_BATTLE_MESSAGE_H #define GUARD_BATTLE_MESSAGE_H -void get_battle_strings_(u8 *); -void sub_8120FFC(const u8 *, u8 *); +void StrCpyDecodeToDisplayedStringBattle(u8 *); +void StrCpyDecodeBattle(const u8 *, u8 *); #endif // GUARD_BATTLE_MESSAGE_H diff --git a/include/pokemon.h b/include/pokemon.h index 273e7d26e..d67cd647a 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -440,7 +440,7 @@ u16 sub_803B7C8(struct Pokemon *mon, u8 a2); void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move); void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move); -u8 sub_803C348(u8 a1); +u8 CountAliveMons(u8 a1); u8 sub_803C434(u8 a1); u8 GetMonGender(struct Pokemon *mon); u8 GetBoxMonGender(struct BoxPokemon *boxMon); diff --git a/include/rom3.h b/include/rom3.h index a66162443..8e99f8de4 100644 --- a/include/rom3.h +++ b/include/rom3.h @@ -12,13 +12,13 @@ void dp01_prepare_buffer_wireless_probably(u8 a, u16, u8 *c); void sub_800C1A8(u8); void sub_800C35C(void); void sub_800C47C(u8); -void dp01_build_cmdbuf_x00_a_b_0(u8 a, u8 b, u8 c); +void EmitGetAttributes(u8 a, u8 b, u8 c); void dp01_build_cmdbuf_x04_4_4_4(u8 a); void sub_800C704(u8, u8, u8); void dp01_build_cmdbuf_x07_7_7_7(u8 a); void dp01_build_cmdbuf_x12_a_bb(u8 a, u8 b, u16 c); void dp01_build_cmdbuf_x1D_1D_numargs_varargs(u8, u16, u8 *); -void dp01_build_cmdbuf_x2E_a(u8 a, u8 b); +void EmitBattleIntroSlide(u8 a, u8 b); void dp01_build_cmdbuf_x2F_2F_2F_2F(u8 a); void dp01_build_cmdbuf_x30_TODO(u8 a, u8 *b, u8 c); diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 26c89d4cc..11e94e1f5 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -12,16 +12,16 @@ void sub_8078314(struct Sprite *sprite); void sub_8078364(struct Sprite *sprite); void sub_8078458(struct Sprite *sprite); void sub_80784A8(struct Sprite *sprite); -u8 battle_side_get_owner(u8); -u8 battle_side_get_owner(u8); -u8 battle_side_get_owner(u8 side); -u8 battle_side_get_owner(u8 slot); -u8 battle_side_get_owner(u8); -u8 battle_get_per_side_status(u8); -u8 battle_get_per_side_status(u8 slot); -u8 battle_get_side_with_given_state(u8); -u8 battle_get_side_with_given_state(u8); -u8 battle_get_side_with_given_state(u8 state); +u8 GetBankSide(u8); +u8 GetBankSide(u8); +u8 GetBankSide(u8 side); +u8 GetBankSide(u8 slot); +u8 GetBankSide(u8); +u8 GetBankIdentity(u8); +u8 GetBankIdentity(u8 slot); +u8 GetBankByPlayerAI(u8); +u8 GetBankByPlayerAI(u8); +u8 GetBankByPlayerAI(u8 state); u8 sub_8078874(u8); bool8 sub_8078874(u8); bool8 IsDoubleBattle(); @@ -50,7 +50,7 @@ void sub_8079BF4(s16 *bottom, s16 *top, void *ptr); void *sub_8079BFC(s16 bottom, s16 top); void sub_8079E24(); u8 sub_8079E90(u8 slot); -u8 battle_get_per_side_status_permutated(u8 slot); +u8 GetBankIdentity_permutated(u8 slot); void sub_807A784(u8 taskId); void sub_807A850(struct Task *task, u8 taskId); void sub_807A8D4(struct Sprite *sprite); diff --git a/src/battle_2.c b/src/battle_2.c index 451c4f108..2b13fc45d 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -140,46 +140,46 @@ extern u8 ewram[]; #define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000)) extern struct UnknownPokemonStruct2 gUnknown_02023A00[]; -extern u8 gUnknown_02024260[][0x200]; -extern u8 gUnknown_02024A60; -extern u32 gUnknown_02024A64; -extern u8 gUnknown_02024A68; -extern u16 gUnknown_02024A6A[]; -extern u8 gUnknown_02024A7F; -extern u8 gUnknown_02024A7A[]; +extern u8 gBattleBufferB[][0x200]; +extern u8 gActiveBank; +extern u32 gBattleExecBuffer; +extern u8 gNoOfAllBanks; +extern u16 gBattlePartyID[]; +extern u8 gFightStateTracker; +extern u8 gTurnOrder[]; extern struct UnknownStruct12 gUnknown_02024AD0[]; -extern u8 gUnknown_02024BE0[]; -extern u16 gUnknown_02024BE6; -extern u8 byte_2024C06; -extern u8 gUnknown_02024C0B; -extern u8 gUnknown_02024C0C; -extern u8 gUnknown_02024C0E; -extern u8 gUnknown_02024C18[]; +extern u8 gObjectBankIDs[]; +extern u16 gCurrentMove; +extern u8 gLastUsedAbility; +extern u8 gStringBank; +extern u8 gAbsentBankFlags; +extern u8 gMultiHitCounter; +extern u8 gActionForBanks[]; extern u16 gUnknown_02024C2C[]; -extern u16 gUnknown_02024C34[]; -extern u16 gUnknown_02024C3C[]; +extern u16 gLastUsedMove[]; +extern u16 gMoveHitWith[]; extern u16 gUnknown_02024C44[]; extern u16 gUnknown_02024C4C[]; -extern u16 gUnknown_02024C54[]; +extern u16 gLockedMove[]; extern u8 gUnknown_02024C5C[]; -extern u16 gUnknown_02024C60[]; -extern u32 gUnknown_02024C6C; +extern u16 gChosenMovesByBanks[]; +extern u32 gHitMarker; extern u8 gUnknown_02024C70[]; -extern u16 gUnknown_02024C7A[]; -extern u8 gUnknown_02024C80[][12]; -extern u32 gUnknown_02024C98[]; -//extern u8 gUnknown_02024CA8[][0x1C]; -extern u16 gUnknown_02024D18; -extern u16 gUnknown_02024D1A; -extern u16 gUnknown_02024D1C; -extern u8 gUnknown_02024D1E[]; +extern u16 gSideAffecting[]; +extern u8 gSideTimer[][12]; +extern u32 gStatuses3[]; +//extern u8 gDisableStructs[][0x1C]; +extern u16 gPauseCounterBattle; +extern u16 gPaydayMoney; +extern u16 gRandomTurnNumber; +extern u8 gBattleCommunication[]; extern u8 gUnknown_02024D1F[]; // I don't actually know what type this is. -extern u8 gUnknown_02024D26; -extern struct UnknownStruct13 gUnknown_02024D28[]; -extern u8 gUnknown_02024DBC[]; +extern u8 gBattleOutcome; +extern struct UnknownStruct13 gProtectStructs[]; +extern u8 gWishFutureKnock[]; extern u16 gUnknown_02024DE8; -extern u8 gUnknown_02024E60[]; -extern u8 gUnknown_02024E64[]; +extern u8 gActionSelectionCursor[]; +extern u8 gMoveSelectionCursor[]; extern u8 gUnknown_02038470[]; extern u16 gUnknown_030041B0; extern u16 gUnknown_030041B4; @@ -197,12 +197,12 @@ extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; extern u16 gUnknown_030042C0; extern u16 gUnknown_030042C4; -extern MainCallback gUnknown_030042D0; -extern void (*gUnknown_030042D4)(void); -extern struct Struct30042E0 gUnknown_030042E0; -extern u8 gUnknown_03004324; -extern void (*gUnknown_03004330[])(void); -extern u8 gUnknown_03004340[]; +extern MainCallback gPreBattleCallback1; +extern void (*gBattleMainFunc)(void); +extern struct Struct30042E0 gBattleResults; +extern u8 gLeveledUpInBattle; +extern void (*gBattleBankFunc[])(void); +extern u8 gHealthboxIDs[]; extern struct UnknownStruct6 gUnknown_03004DE0; //extern u16 gUnknown_03004DE0[][0xA0]; // possibly? extern u16 gBattleTypeFlags; @@ -212,8 +212,8 @@ extern u16 gTrainerBattleOpponent; extern struct BattleEnigmaBerry gEnigmaBerries[]; extern u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2]; extern u8 gBattleMonForms[]; -extern u8 gPlayerMonIndex; -extern u8 gEnemyMonIndex; +extern u8 gBankAttacker; +extern u8 gBankTarget; extern u16 gBattleWeather; extern u32 gBattleMoveDamage; extern struct BattlePokemon gBattleMons[]; @@ -226,7 +226,7 @@ void sub_800E7C4(void) { sub_800B858(); SetMainCallback2(sub_800F104); - gUnknown_02024D1E[0] = 0; + gBattleCommunication[0] = 0; } else { @@ -299,7 +299,7 @@ void InitBattle(void) gMain.inBattle = TRUE; for (i = 0; i < 6; i++) AdjustFriendship(&gPlayerParty[i], 3); - gUnknown_02024D1E[0] = 0; + gBattleCommunication[0] = 0; } void sub_800E9EC(void) @@ -421,7 +421,7 @@ void sub_800EC9C(void) ewram160CB = playerId; enemyId = playerId ^ 1; - switch (gUnknown_02024D1E[0]) + switch (gBattleCommunication[0]) { case 0: if (gBattleTypeFlags & BATTLE_TYPE_LINK) @@ -433,13 +433,13 @@ void sub_800EC9C(void) sub_800E9EC(); sub_800EAAC(); SendBlock(bitmask_all_link_players_but_self(), &ewram0, 32); - gUnknown_02024D1E[0] = 1; + gBattleCommunication[0] = 1; } } else { gBattleTypeFlags |= BATTLE_TYPE_WILD; - gUnknown_02024D1E[0] = 8; + gBattleCommunication[0] = 8; sub_800EB08(); } break; @@ -490,14 +490,14 @@ void sub_800EC9C(void) gTasks[taskId].data[5] = 0; gTasks[taskId].data[3] = ewram0.unk2 | (ewram0.unk3 << 8); gTasks[taskId].data[4] = gBlockRecvBuffer[enemyId][1]; - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 2: if (sub_8007ECC()) { SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(*gPlayerParty) * 2); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 3: @@ -505,14 +505,14 @@ void sub_800EC9C(void) { ResetBlockReceivedFlags(); memcpy(gEnemyParty, gBlockRecvBuffer[enemyId], sizeof(*gEnemyParty) * 2); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 4: if (sub_8007ECC()) { SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(*gPlayerParty) * 2); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 5: @@ -520,14 +520,14 @@ void sub_800EC9C(void) { ResetBlockReceivedFlags(); memcpy(gEnemyParty + 2, gBlockRecvBuffer[enemyId], sizeof(*gEnemyParty) * 2); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 6: if (sub_8007ECC()) { SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 4, sizeof(*gPlayerParty) * 2); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 7: @@ -541,19 +541,19 @@ void sub_800EC9C(void) shedinja_something(&gEnemyParty[3]); shedinja_something(&gEnemyParty[4]); shedinja_something(&gEnemyParty[5]); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 8: sub_800B950(); - gUnknown_02024D1E[0]++; - gUnknown_02024D1E[1] = 0; - gUnknown_02024D1E[2] = 0; + gBattleCommunication[0]++; + gBattleCommunication[1] = 0; + gBattleCommunication[2] = 0; break; case 9: if (battle_load_something(gUnknown_02024D1F, gUnknown_02024D1F + 1) != 0) { - gUnknown_030042D0 = gMain.callback1; + gPreBattleCallback1 = gMain.callback1; gMain.callback1 = sub_8010824; SetMainCallback2(sub_800F808); if (gBattleTypeFlags & BATTLE_TYPE_LINK) @@ -606,14 +606,14 @@ void sub_800F104(void) AnimateSprites(); BuildOamBuffer(); - switch (gUnknown_02024D1E[0]) + switch (gBattleCommunication[0]) { case 0: if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC()) { sub_800F02C(); SendBlock(bitmask_all_link_players_but_self(), ewram, 0x60); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 1: @@ -631,7 +631,7 @@ void sub_800F104(void) memcpy(gUnknown_02023A00, gBlockRecvBuffer[i], 0x60); } } - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; *pSavedCallback = gMain.savedCallback; *pSavedBattleTypeFlags = gBattleTypeFlags; gMain.savedCallback = sub_800F104; @@ -641,7 +641,7 @@ void sub_800F104(void) case 2: if (!gPaletteFade.active) { - gUnknown_02024D1E[0] = 3; + gBattleCommunication[0] = 3; sub_800832C(); } break; @@ -666,7 +666,7 @@ void sub_800F298(void) RunTasks(); AnimateSprites(); BuildOamBuffer(); - switch (gUnknown_02024D1E[0]) + switch (gBattleCommunication[0]) { case 0: if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC()) @@ -676,7 +676,7 @@ void sub_800F298(void) sub_800E9EC(); sub_800EAAC(); SendBlock(bitmask_all_link_players_but_self(), ewram, 0x20); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 1: @@ -756,7 +756,7 @@ void sub_800F298(void) } ZeroPlayerPartyMons(); ZeroEnemyPartyMons(); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; goto step_2; } break; @@ -765,7 +765,7 @@ void sub_800F298(void) if (sub_8007ECC()) { SendBlock(bitmask_all_link_players_but_self(), ewram1D000, sizeof(struct Pokemon) * 2); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 3: @@ -821,14 +821,14 @@ void sub_800F298(void) } } } - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 4: if (sub_8007ECC()) { SendBlock(bitmask_all_link_players_but_self(), ewram1D000 + 2, sizeof(struct Pokemon)); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 5: @@ -899,19 +899,19 @@ void sub_800F298(void) shedinja_something(&gEnemyParty[4]); shedinja_something(&gEnemyParty[5]); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 6: sub_800B950(); - gUnknown_02024D1E[0]++; - gUnknown_02024D1E[1] = 0; - gUnknown_02024D1E[2] = 0; + gBattleCommunication[0]++; + gBattleCommunication[1] = 0; + gBattleCommunication[2] = 0; break; case 7: if (battle_load_something(gUnknown_02024D1F, gUnknown_02024D1F + 1) != 0) { - gUnknown_030042D0 = gMain.callback1; + gPreBattleCallback1 = gMain.callback1; gMain.callback1 = sub_8010824; SetMainCallback2(sub_800F808); if (gBattleTypeFlags & BATTLE_TYPE_LINK) @@ -1270,7 +1270,7 @@ void c2_8011A1C(void) gTasks[taskId].data[5] = 1; sub_800FE40(taskId); SetMainCallback2(sub_80101B8); - gUnknown_02024D1E[0] = 0; + gBattleCommunication[0] = 0; } void sub_80101B8(void) @@ -1284,18 +1284,18 @@ void sub_80101B8(void) void c2_081284E0(void) { - switch (gUnknown_02024D1E[0]) + switch (gBattleCommunication[0]) { case 0: - gUnknown_02024D1E[1] = 0xFF; - gUnknown_02024D1E[0]++; + gBattleCommunication[1] = 0xFF; + gBattleCommunication[0]++; break; case 1: - gUnknown_02024D1E[1]--; - if (gUnknown_02024D1E[1] == 0) + gBattleCommunication[1]--; + if (gBattleCommunication[1] == 0) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); - gUnknown_02024D1E[0]++; + gBattleCommunication[0]++; } break; case 2: @@ -1330,7 +1330,7 @@ void sub_80102AC(struct Sprite *sprite) if (sprite->animEnded) { sub_804777C(sprite->data0); - sub_8043DFC(gUnknown_03004340[sprite->data0]); + sub_8043DFC(gHealthboxIDs[sprite->data0]); sprite->callback = nullsub_37; StartSpriteAnimIfDifferent(sprite, 0); BeginNormalPaletteFade(0x00020000, 0, 10, 0, 0x3DEF); @@ -1376,11 +1376,11 @@ void sub_8010384(struct Sprite *sprite) else species = sprite->data2; - GetMonData(&gEnemyParty[gUnknown_02024A6A[r6]], MON_DATA_PERSONALITY); // Unused return value + GetMonData(&gEnemyParty[gBattlePartyID[r6]], MON_DATA_PERSONALITY); // Unused return value if (species == SPECIES_UNOWN) { - u32 personalityValue = GetMonData(&gEnemyParty[gUnknown_02024A6A[r6]], MON_DATA_PERSONALITY); + u32 personalityValue = GetMonData(&gEnemyParty[gBattlePartyID[r6]], MON_DATA_PERSONALITY); u16 unownForm = ((((personalityValue & 0x3000000) >> 18) | ((personalityValue & 0x30000) >> 12) | ((personalityValue & 0x300) >> 6) | (personalityValue & 3)) % 0x1C); u16 unownSpecies; @@ -1426,7 +1426,7 @@ void sub_8010494(struct Sprite *sprite) } else { - u8 *dst = (u8 *)gUnknown_081FAF4C[battle_get_per_side_status(sprite->data0)] + (gBattleMonForms[sprite->data0] << 11) + (sprite->data3 << 8); + u8 *dst = (u8 *)gUnknown_081FAF4C[GetBankIdentity(sprite->data0)] + (gBattleMonForms[sprite->data0] << 11) + (sprite->data3 << 8); for (i = 0; i < 0x100; i++) *(dst++) = 0; @@ -1514,14 +1514,14 @@ void dp11b_obj_instanciate(u8 a, u8 b, s8 c, s8 d) spriteId = CreateInvisibleSpriteWithCallback(objc_dp11b_pingpong); if (b == TRUE) { - r7 = gUnknown_03004340[a]; + r7 = gHealthboxIDs[a]; ewram17810[a].unk2 = spriteId; ewram17810[a].unk0_1 = 1; gSprites[spriteId].data0 = 0x80; } else { - r7 = gUnknown_02024BE0[a]; + r7 = gObjectBankIDs[a]; ewram17810[a].unk3 = spriteId; ewram17810[a].unk0_2 = 1; gSprites[spriteId].data0 = 0xC0; @@ -1579,17 +1579,17 @@ void nullsub_41(void) void sub_8010800(void) { sub_8010874(); - gUnknown_02024D1E[1] = 0; - gUnknown_030042D4 = bc_8012FAC; + gBattleCommunication[1] = 0; + gBattleMainFunc = bc_8012FAC; } void sub_8010824(void) { - gUnknown_030042D4(); - gUnknown_02024A60 = 0; + gBattleMainFunc(); + gActiveBank = 0; - for (gUnknown_02024A60 = 0; gUnknown_02024A60 < gUnknown_02024A68; gUnknown_02024A60++) - gUnknown_03004330[gUnknown_02024A60](); + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + gBattleBankFunc[gActiveBank](); } void sub_8010874(void) @@ -1598,65 +1598,65 @@ void sub_8010874(void) s32 j; u8 *r4; - sub_801365C(0); - sub_801377C(); + TurnValuesCleanUp(0); + SpecialStatusesClear(); for (i = 0; i < 4; i++) { - gUnknown_02024C98[i] = 0; + gStatuses3[i] = 0; - r4 = (u8 *)&gUnknown_02024CA8[i]; + r4 = (u8 *)&gDisableStructs[i]; for (j = 0; j < (u32)0x1C; j++) r4[j] = 0; - gUnknown_02024CA8[i].unk16 = 2; + gDisableStructs[i].unk16 = 2; gUnknown_02024C70[i] = 0; - gUnknown_02024C34[i] = 0; - gUnknown_02024C3C[i] = 0; + gLastUsedMove[i] = 0; + gMoveHitWith[i] = 0; gUnknown_02024C44[i] = 0; gUnknown_02024C4C[i] = 0; gUnknown_02024C5C[i] = 0xFF; - gUnknown_02024C54[i] = 0; + gLockedMove[i] = 0; gUnknown_02024C2C[i] = 0; ewram17100[i] = 0; } for (i = 0; i < 2; i++) { - gUnknown_02024C7A[i] = 0; + gSideAffecting[i] = 0; - r4 = (u8 *)&gUnknown_02024C80[i]; + r4 = (u8 *)&gSideTimer[i]; for (j = 0; j < (u32)12; j++) r4[j] = 0; } - gPlayerMonIndex = 0; - gEnemyMonIndex = 0; + gBankAttacker = 0; + gBankTarget = 0; gBattleWeather = 0; - r4 = (u8 *)&gUnknown_02024DBC; + r4 = (u8 *)&gWishFutureKnock; for (i = 0; i < (u32)0x2C; i++) r4[i] = 0; - gUnknown_02024C6C = 0; + gHitMarker = 0; if ((gBattleTypeFlags & 2) == 0 && gSaveBlock2.optionsBattleSceneOff == TRUE) - gUnknown_02024C6C = 0x80; + gHitMarker = 0x80; ewram16084 = gSaveBlock2.optionsBattleStyle; - gUnknown_02024C0E = 0; - gUnknown_02024D26 = 0; - gUnknown_02024A64 = 0; - gUnknown_02024D1A = 0; + gMultiHitCounter = 0; + gBattleOutcome = 0; + gBattleExecBuffer = 0; + gPaydayMoney = 0; ewram17130 = 0; ewram17160 = 0; for (i = 0; i < 8; i++) - gUnknown_02024D1E[i] = 0; - gUnknown_02024D18 = 0; + gBattleCommunication[i] = 0; + gPauseCounterBattle = 0; gBattleMoveDamage = 0; gUnknown_02024DE8 = 0; ewram16002 = 0; ewram160A1 = 0; - gUnknown_03004324 = 0; - gUnknown_02024C0C = 0; + gLeveledUpInBattle = 0; + gAbsentBankFlags = 0; ewram16078 = 0; ewram16086 = 0; ewram16087 = 0; @@ -1679,208 +1679,208 @@ void sub_8010874(void) ewram160C9 = 6; ewram16113 = 0; for (i = 0; i < 11; i++) - gUnknown_030042E0.unk36[i] = 0; - gUnknown_030042E0.unk13 = 0; - gUnknown_030042E0.unk0 = 0; - gUnknown_030042E0.unk1 = 0; - gUnknown_030042E0.unk2 = 0; - gUnknown_030042E0.unk3 = 0; - gUnknown_030042E0.unk4 = 0; - gUnknown_030042E0.unk5_0 = 0; - gUnknown_030042E0.unk5_1 = 0; - gUnknown_030042E0.unk20 = 0; - gUnknown_030042E0.unk22 = 0; - gUnknown_030042E0.unk24 = 0; - gUnknown_030042E0.unk6 = 0; - gUnknown_030042E0.unk26 = 0; - gUnknown_030042E0.unk28 = 0; + gBattleResults.unk36[i] = 0; + gBattleResults.unk13 = 0; + gBattleResults.unk0 = 0; + gBattleResults.unk1 = 0; + gBattleResults.unk2 = 0; + gBattleResults.unk3 = 0; + gBattleResults.unk4 = 0; + gBattleResults.unk5_0 = 0; + gBattleResults.unk5_1 = 0; + gBattleResults.unk20 = 0; + gBattleResults.unk22 = 0; + gBattleResults.unk24 = 0; + gBattleResults.unk6 = 0; + gBattleResults.unk26 = 0; + gBattleResults.unk28 = 0; for (i = 0; i < 10; i++) { - gUnknown_030042E0.unk8[i] = 0; - gUnknown_030042E0.unk14[i] = 0; - gUnknown_030042E0.unk2A[i] = 0; + gBattleResults.unk8[i] = 0; + gBattleResults.unk14[i] = 0; + gBattleResults.unk2A[i] = 0; } } void sub_8010B88(void) { - struct UnkBattleStruct4 sp0 = gUnknown_02024CA8[gUnknown_02024A60]; + struct UnkBattleStruct4 sp0 = gDisableStructs[gActiveBank]; s32 i; u8 *ptr; u32 *ptr2; - if (gBattleMoves[gUnknown_02024BE6].effect != 0x7F) + if (gBattleMoves[gCurrentMove].effect != 0x7F) { for (i = 0; i < 8; i++) - gBattleMons[gUnknown_02024A60].statStages[i] = 6; - for (i = 0; i < gUnknown_02024A68; i++) + gBattleMons[gActiveBank].statStages[i] = 6; + for (i = 0; i < gNoOfAllBanks; i++) { struct UnknownStruct12 *sp20 = &gUnknown_02024AD0[i]; - if ((sp20->unk0 & 0x04000000) && gUnknown_02024CA8[i].unk14 == gUnknown_02024A60) + if ((sp20->unk0 & 0x04000000) && gDisableStructs[i].unk14 == gActiveBank) sp20->unk0 &= ~0x04000000; - if ((gUnknown_02024C98[i] & 0x18) && gUnknown_02024CA8[i].unk15 == gUnknown_02024A60) + if ((gStatuses3[i] & 0x18) && gDisableStructs[i].unk15 == gActiveBank) { - gUnknown_02024C98[i] &= ~0x18; - gUnknown_02024CA8[i].unk15 = 0; + gStatuses3[i] &= ~0x18; + gDisableStructs[i].unk15 = 0; } } } - if (gBattleMoves[gUnknown_02024BE6].effect == 0x7F) + if (gBattleMoves[gCurrentMove].effect == 0x7F) { - gBattleMons[gUnknown_02024A60].status2 &= 0x15100007; - gUnknown_02024C98[gUnknown_02024A60] &= 0x3043F; + gBattleMons[gActiveBank].status2 &= 0x15100007; + gStatuses3[gActiveBank] &= 0x3043F; - for (i = 0; i < gUnknown_02024A68; i++) + for (i = 0; i < gNoOfAllBanks; i++) { - if (battle_side_get_owner(gUnknown_02024A60) != battle_side_get_owner(i) - && (gUnknown_02024C98[i] & 0x18) != 0 - && (gUnknown_02024CA8[i].unk15 == gUnknown_02024A60)) + if (GetBankSide(gActiveBank) != GetBankSide(i) + && (gStatuses3[i] & 0x18) != 0 + && (gDisableStructs[i].unk15 == gActiveBank)) { - gUnknown_02024C98[i] &= ~0x18; - gUnknown_02024C98[i] |= 0x10; + gStatuses3[i] &= ~0x18; + gStatuses3[i] |= 0x10; } } } else { - gBattleMons[gUnknown_02024A60].status2 = 0; - gUnknown_02024C98[gUnknown_02024A60] = 0; + gBattleMons[gActiveBank].status2 = 0; + gStatuses3[gActiveBank] = 0; } - for (i = 0; i < gUnknown_02024A68; i++) + for (i = 0; i < gNoOfAllBanks; i++) { - if (gUnknown_02024AD0[i].unk0 & (gBitTable[gUnknown_02024A60] << 16)) - gUnknown_02024AD0[i].unk0 &= ~(gBitTable[gUnknown_02024A60] << 16); - if ((gUnknown_02024AD0[i].unk0 & 0xE000) && ewram[0x16020 + i] == gUnknown_02024A60) + if (gUnknown_02024AD0[i].unk0 & (gBitTable[gActiveBank] << 16)) + gUnknown_02024AD0[i].unk0 &= ~(gBitTable[gActiveBank] << 16); + if ((gUnknown_02024AD0[i].unk0 & 0xE000) && ewram[0x16020 + i] == gActiveBank) gUnknown_02024AD0[i].unk0 &= ~0xE000; } - gUnknown_02024E60[gUnknown_02024A60] = 0; - gUnknown_02024E64[gUnknown_02024A60] = 0; + gActionSelectionCursor[gActiveBank] = 0; + gMoveSelectionCursor[gActiveBank] = 0; - ptr = (u8 *)&gUnknown_02024CA8[gUnknown_02024A60]; + ptr = (u8 *)&gDisableStructs[gActiveBank]; for (i = 0; i < (u32)0x1C; i++) ptr[i] = 0; - if (gBattleMoves[gUnknown_02024BE6].effect == 0x7F) + if (gBattleMoves[gCurrentMove].effect == 0x7F) { - gUnknown_02024CA8[gUnknown_02024A60].unkA = sp0.unkA; - gUnknown_02024CA8[gUnknown_02024A60].unk15 = sp0.unk15; - gUnknown_02024CA8[gUnknown_02024A60].unkF_0 = sp0.unkF_0; - gUnknown_02024CA8[gUnknown_02024A60].unkF_4 = sp0.unkF_4; + gDisableStructs[gActiveBank].unkA = sp0.unkA; + gDisableStructs[gActiveBank].unk15 = sp0.unk15; + gDisableStructs[gActiveBank].unkF_0 = sp0.unkF_0; + gDisableStructs[gActiveBank].unkF_4 = sp0.unkF_4; } - gUnknown_02024CA8[gUnknown_02024A60].unk16 = 2; - gUnknown_02024C34[gUnknown_02024A60] = 0; - gUnknown_02024C3C[gUnknown_02024A60] = 0; - gUnknown_02024C44[gUnknown_02024A60] = 0; - gUnknown_02024C4C[gUnknown_02024A60] = 0; - gUnknown_02024C2C[gUnknown_02024A60] = 0; - gUnknown_02024C5C[gUnknown_02024A60] = 0xFF; + gDisableStructs[gActiveBank].unk16 = 2; + gLastUsedMove[gActiveBank] = 0; + gMoveHitWith[gActiveBank] = 0; + gUnknown_02024C44[gActiveBank] = 0; + gUnknown_02024C4C[gActiveBank] = 0; + gUnknown_02024C2C[gActiveBank] = 0; + gUnknown_02024C5C[gActiveBank] = 0xFF; - ewram[0x160AC + gUnknown_02024A60 * 2 + 0] = 0; - ewram[0x160AC + gUnknown_02024A60 * 2 + 1] = 0; - ewram[0x16100 + gUnknown_02024A60 * 4 + 0] = 0; - ewram[0x16100 + gUnknown_02024A60 * 4 + 1] = 0; - ewram[0x16100 + gUnknown_02024A60 * 4 + 2] = 0; - ewram[0x16100 + gUnknown_02024A60 * 4 + 3] = 0; - ewram[0x160E8 + gUnknown_02024A60 * 2 + 0] = 0; - ewram[0x160E8 + gUnknown_02024A60 * 2 + 1] = 0; + ewram[0x160AC + gActiveBank * 2 + 0] = 0; + ewram[0x160AC + gActiveBank * 2 + 1] = 0; + ewram[0x16100 + gActiveBank * 4 + 0] = 0; + ewram[0x16100 + gActiveBank * 4 + 1] = 0; + ewram[0x16100 + gActiveBank * 4 + 2] = 0; + ewram[0x16100 + gActiveBank * 4 + 3] = 0; + ewram[0x160E8 + gActiveBank * 2 + 0] = 0; + ewram[0x160E8 + gActiveBank * 2 + 1] = 0; ptr2 = (u32 *)(ewram + 0x17100); - ptr2[gUnknown_02024A60] = 0; + ptr2[gActiveBank] = 0; - gUnknown_02024BE6 = 0; + gCurrentMove = 0; } -void sub_8010F48(void) +void UndoEffectsAfterFainting(void) { s32 i; u8 *ptr; u32 *ptr2; for (i = 0; i < 8; i++) - gBattleMons[gUnknown_02024A60].statStages[i] = 6; - gBattleMons[gUnknown_02024A60].status2 = 0; - gUnknown_02024C98[gUnknown_02024A60] = 0; - for (i = 0; i < gUnknown_02024A68; i++) + gBattleMons[gActiveBank].statStages[i] = 6; + gBattleMons[gActiveBank].status2 = 0; + gStatuses3[gActiveBank] = 0; + for (i = 0; i < gNoOfAllBanks; i++) { - if ((gBattleMons[i].status2 & 0x4000000) && gUnknown_02024CA8[i].unk14 == gUnknown_02024A60) + if ((gBattleMons[i].status2 & 0x4000000) && gDisableStructs[i].unk14 == gActiveBank) gBattleMons[i].status2 &= ~0x4000000; - if (gBattleMons[i].status2 & (gBitTable[gUnknown_02024A60] << 16)) - gBattleMons[i].status2 &= ~(gBitTable[gUnknown_02024A60] << 16); - if ((gBattleMons[i].status2 & 0xE000) && ewram[0x16020 + i] == gUnknown_02024A60) + if (gBattleMons[i].status2 & (gBitTable[gActiveBank] << 16)) + gBattleMons[i].status2 &= ~(gBitTable[gActiveBank] << 16); + if ((gBattleMons[i].status2 & 0xE000) && ewram[0x16020 + i] == gActiveBank) gBattleMons[i].status2 &= ~0xE000; } - gUnknown_02024E60[gUnknown_02024A60] = 0; - gUnknown_02024E64[gUnknown_02024A60] = 0; + gActionSelectionCursor[gActiveBank] = 0; + gMoveSelectionCursor[gActiveBank] = 0; - ptr = (u8 *)&gUnknown_02024CA8[gUnknown_02024A60]; + ptr = (u8 *)&gDisableStructs[gActiveBank]; for (i = 0; i < (u32)0x1C; i++) ptr[i] = 0; - gUnknown_02024D28[gUnknown_02024A60].unk0_0 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk0_1 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk0_2 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk0_3 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk0_4 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk0_5 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk0_6 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk0_7 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk1_0 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk1_1 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk1_2 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk1_3 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk1_5 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk1_6 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk1_7 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk2_0 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk2_1 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk2_2 = 0; - gUnknown_02024D28[gUnknown_02024A60].unk2_3 = 0; - - gUnknown_02024CA8[gUnknown_02024A60].unk16 = 2; - gUnknown_02024C34[gUnknown_02024A60] = 0; - gUnknown_02024C3C[gUnknown_02024A60] = 0; - gUnknown_02024C44[gUnknown_02024A60] = 0; - gUnknown_02024C4C[gUnknown_02024A60] = 0; - gUnknown_02024C2C[gUnknown_02024A60] = 0; - gUnknown_02024C5C[gUnknown_02024A60] = 0xFF; - - ewram[0x160E8 + gUnknown_02024A60 * 2 + 0] = 0; - ewram[0x160E8 + gUnknown_02024A60 * 2 + 1] = 0; - ewram[0x160AC + gUnknown_02024A60 * 2 + 0] = 0; - ewram[0x160AC + gUnknown_02024A60 * 2 + 1] = 0; - ewram[0x16100 + gUnknown_02024A60 * 4 + 0] = 0; - ewram[0x16100 + gUnknown_02024A60 * 4 + 1] = 0; - ewram[0x16100 + gUnknown_02024A60 * 4 + 2] = 0; - ewram[0x16100 + gUnknown_02024A60 * 4 + 3] = 0; + gProtectStructs[gActiveBank].unk0_0 = 0; + gProtectStructs[gActiveBank].unk0_1 = 0; + gProtectStructs[gActiveBank].unk0_2 = 0; + gProtectStructs[gActiveBank].unk0_3 = 0; + gProtectStructs[gActiveBank].unk0_4 = 0; + gProtectStructs[gActiveBank].unk0_5 = 0; + gProtectStructs[gActiveBank].unk0_6 = 0; + gProtectStructs[gActiveBank].unk0_7 = 0; + gProtectStructs[gActiveBank].unk1_0 = 0; + gProtectStructs[gActiveBank].unk1_1 = 0; + gProtectStructs[gActiveBank].unk1_2 = 0; + gProtectStructs[gActiveBank].unk1_3 = 0; + gProtectStructs[gActiveBank].unk1_5 = 0; + gProtectStructs[gActiveBank].unk1_6 = 0; + gProtectStructs[gActiveBank].unk1_7 = 0; + gProtectStructs[gActiveBank].unk2_0 = 0; + gProtectStructs[gActiveBank].unk2_1 = 0; + gProtectStructs[gActiveBank].unk2_2 = 0; + gProtectStructs[gActiveBank].unk2_3 = 0; + + gDisableStructs[gActiveBank].unk16 = 2; + gLastUsedMove[gActiveBank] = 0; + gMoveHitWith[gActiveBank] = 0; + gUnknown_02024C44[gActiveBank] = 0; + gUnknown_02024C4C[gActiveBank] = 0; + gUnknown_02024C2C[gActiveBank] = 0; + gUnknown_02024C5C[gActiveBank] = 0xFF; + + ewram[0x160E8 + gActiveBank * 2 + 0] = 0; + ewram[0x160E8 + gActiveBank * 2 + 1] = 0; + ewram[0x160AC + gActiveBank * 2 + 0] = 0; + ewram[0x160AC + gActiveBank * 2 + 1] = 0; + ewram[0x16100 + gActiveBank * 4 + 0] = 0; + ewram[0x16100 + gActiveBank * 4 + 1] = 0; + ewram[0x16100 + gActiveBank * 4 + 2] = 0; + ewram[0x16100 + gActiveBank * 4 + 3] = 0; ptr2 = (u32 *)(ewram + 0x17100); - ptr2[gUnknown_02024A60] = 0; + ptr2[gActiveBank] = 0; - gBattleMons[gUnknown_02024A60].type1 = gBaseStats[gBattleMons[gUnknown_02024A60].species].type1; - gBattleMons[gUnknown_02024A60].type2 = gBaseStats[gBattleMons[gUnknown_02024A60].species].type2; + gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1; + gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2; } void bc_8012FAC(void) { - switch (gUnknown_02024D1E[0]) + switch (gBattleCommunication[0]) { case 0: - gUnknown_02024A60 = gUnknown_02024D1E[1]; - dp01_build_cmdbuf_x00_a_b_0(0, 0, 0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); - gUnknown_02024D1E[0]++; + gActiveBank = gBattleCommunication[1]; + EmitGetAttributes(0, 0, 0); + MarkBufferBankForExecution(gActiveBank); + gBattleCommunication[0]++; break; case 1: - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - gUnknown_02024D1E[1]++; - if (gUnknown_02024D1E[1] == gUnknown_02024A68) - gUnknown_030042D4 = bc_load_battlefield; + gBattleCommunication[1]++; + if (gBattleCommunication[1] == gNoOfAllBanks) + gBattleMainFunc = bc_load_battlefield; else - gUnknown_02024D1E[0] = 0; + gBattleCommunication[0] = 0; } break; } @@ -1888,14 +1888,14 @@ void bc_8012FAC(void) void bc_load_battlefield(void) { - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - gUnknown_02024A60 = battle_get_side_with_given_state(0); - dp01_build_cmdbuf_x2E_a(0, gBattleTerrain); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); - gUnknown_030042D4 = sub_8011384; - gUnknown_02024D1E[0] = 0; - gUnknown_02024D1E[1] = 0; + gActiveBank = GetBankByPlayerAI(0); + EmitBattleIntroSlide(0, gBattleTerrain); + MarkBufferBankForExecution(gActiveBank); + gBattleMainFunc = sub_8011384; + gBattleCommunication[0] = 0; + gBattleCommunication[1] = 0; } } @@ -1904,14 +1904,14 @@ void sub_8011384(void) u8 *ptr; s32 i; - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - for (gUnknown_02024A60 = 0; gUnknown_02024A60 < gUnknown_02024A68; gUnknown_02024A60++) + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) { if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) - && battle_side_get_owner(gUnknown_02024A60) == 0) + && GetBankSide(gActiveBank) == 0) { - ptr = (u8 *)&gBattleMons[gUnknown_02024A60]; + ptr = (u8 *)&gBattleMons[gActiveBank]; for (i = 0; i < (u32)0x58; i++) ptr[i] = 0; } @@ -1919,59 +1919,59 @@ void sub_8011384(void) { u8 r0; - ptr = (u8 *)&gBattleMons[gUnknown_02024A60]; + ptr = (u8 *)&gBattleMons[gActiveBank]; for (i = 0; i < (u32)0x58; i++) - ptr[i] = gUnknown_02024260[gUnknown_02024A60][4 + i]; + ptr[i] = gBattleBufferB[gActiveBank][4 + i]; - gBattleMons[gUnknown_02024A60].type1 = gBaseStats[gBattleMons[gUnknown_02024A60].species].type1; - gBattleMons[gUnknown_02024A60].type2 = gBaseStats[gBattleMons[gUnknown_02024A60].species].type2; - gBattleMons[gUnknown_02024A60].ability = GetAbilityBySpecies(gBattleMons[gUnknown_02024A60].species, gBattleMons[gUnknown_02024A60].altAbility); - r0 = battle_side_get_owner(gUnknown_02024A60); - ewram160BC[r0] = gBattleMons[gUnknown_02024A60].hp; + gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1; + gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2; + gBattleMons[gActiveBank].ability = GetAbilityBySpecies(gBattleMons[gActiveBank].species, gBattleMons[gActiveBank].altAbility); + r0 = GetBankSide(gActiveBank); + ewram160BC[r0] = gBattleMons[gActiveBank].hp; for (i = 0; i < 8; i++) - gBattleMons[gUnknown_02024A60].statStages[i] = 6; - gBattleMons[gUnknown_02024A60].status2 = 0; + gBattleMons[gActiveBank].statStages[i] = 6; + gBattleMons[gActiveBank].status2 = 0; } - if (battle_get_per_side_status(gUnknown_02024A60) == 0) + if (GetBankIdentity(gActiveBank) == 0) { dp01_build_cmdbuf_x07_7_7_7(0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); } if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { - if (battle_get_per_side_status(gUnknown_02024A60) == 1) + if (GetBankIdentity(gActiveBank) == 1) { dp01_build_cmdbuf_x07_7_7_7(0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); } - if (battle_side_get_owner(gUnknown_02024A60) == 1 + if (GetBankSide(gActiveBank) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK))) - GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gUnknown_02024A60].species), 2); + GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), 2); } else { - if (battle_side_get_owner(gUnknown_02024A60) == 1 + if (GetBankSide(gActiveBank) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK))) { - GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gUnknown_02024A60].species), 2); + GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), 2); dp01_build_cmdbuf_x04_4_4_4(0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); } } if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - if (battle_get_per_side_status(gUnknown_02024A60) == 2 - || battle_get_per_side_status(gUnknown_02024A60) == 3) + if (GetBankIdentity(gActiveBank) == 2 + || GetBankIdentity(gActiveBank) == 3) { dp01_build_cmdbuf_x07_7_7_7(0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); } } } - gUnknown_030042D4 = bc_801333C; + gBattleMainFunc = bc_801333C; } } @@ -1979,7 +1979,7 @@ void bc_801333C(void) { s32 i; - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { struct { @@ -2003,9 +2003,9 @@ void bc_801333C(void) sp0[i].status = GetMonData(&gEnemyParty[i], MON_DATA_STATUS); } } - gUnknown_02024A60 = battle_get_side_with_given_state(1); + gActiveBank = GetBankByPlayerAI(1); dp01_build_cmdbuf_x30_TODO(0, (u8 *)sp0, 0x80); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); for (i = 0; i < 6; i++) { @@ -2021,11 +2021,11 @@ void bc_801333C(void) sp0[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS); } } - gUnknown_02024A60 = battle_get_side_with_given_state(0); + gActiveBank = GetBankByPlayerAI(0); dp01_build_cmdbuf_x30_TODO(0, (u8 *)sp0, 0x80); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); - gUnknown_030042D4 = bc_battle_begin_message; + gBattleMainFunc = bc_battle_begin_message; } else { @@ -2047,198 +2047,198 @@ void bc_801333C(void) } } - gUnknown_030042D4 = bc_8013568; + gBattleMainFunc = bc_8013568; } } } void bc_battle_begin_message(void) { - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - gUnknown_02024A60 = battle_get_side_with_given_state(1); - b_std_message(0, gUnknown_02024A60); - gUnknown_030042D4 = sub_8011800; + gActiveBank = GetBankByPlayerAI(1); + PrepareStringBattle(0, gActiveBank); + gBattleMainFunc = sub_8011800; } } void bc_8013568(void) { - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - gUnknown_030042D4 = sub_8011970; - b_std_message(0, 0); + gBattleMainFunc = sub_8011970; + PrepareStringBattle(0, 0); } } void sub_8011800(void) { - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - b_std_message(1, battle_get_side_with_given_state(1)); - gUnknown_030042D4 = sub_8011834; + PrepareStringBattle(1, GetBankByPlayerAI(1)); + gBattleMainFunc = sub_8011834; } } void sub_8011834(void) { - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - for (gUnknown_02024A60 = 0; gUnknown_02024A60 < gUnknown_02024A68; gUnknown_02024A60++) + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) { - if (battle_get_per_side_status(gUnknown_02024A60) == 1) + if (GetBankIdentity(gActiveBank) == 1) { dp01_build_cmdbuf_x2F_2F_2F_2F(0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); } if ((gBattleTypeFlags & BATTLE_TYPE_MULTI) - && battle_get_per_side_status(gUnknown_02024A60) == 3) + && GetBankIdentity(gActiveBank) == 3) { dp01_build_cmdbuf_x2F_2F_2F_2F(0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); } } - gUnknown_030042D4 = bc_801362C; + gBattleMainFunc = bc_801362C; } } void bc_801362C(void) { - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - for (gUnknown_02024A60 = 0; gUnknown_02024A60 < gUnknown_02024A68; gUnknown_02024A60++) + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) { - if (battle_side_get_owner(gUnknown_02024A60) == 1 + if (GetBankSide(gActiveBank) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK))) - GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gUnknown_02024A60].species), 2); + GetNationalPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBank].species), 2); } - gUnknown_030042D4 = sub_8011970; + gBattleMainFunc = sub_8011970; } } void unref_sub_8011950(void) { - if (gUnknown_02024A64 == 0) - gUnknown_030042D4 = sub_8011970; + if (gBattleExecBuffer == 0) + gBattleMainFunc = sub_8011970; } void sub_8011970(void) { - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) - b_std_message(1, battle_get_side_with_given_state(0)); - gUnknown_030042D4 = sub_80119B4; + PrepareStringBattle(1, GetBankByPlayerAI(0)); + gBattleMainFunc = sub_80119B4; } } void sub_80119B4(void) { - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - for (gUnknown_02024A60 = 0; gUnknown_02024A60 < gUnknown_02024A68; gUnknown_02024A60++) + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) { - if (battle_get_per_side_status(gUnknown_02024A60) == 0) + if (GetBankIdentity(gActiveBank) == 0) { dp01_build_cmdbuf_x2F_2F_2F_2F(0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); } if ((gBattleTypeFlags & BATTLE_TYPE_MULTI) - && battle_get_per_side_status(gUnknown_02024A60) == 2) + && GetBankIdentity(gActiveBank) == 2) { dp01_build_cmdbuf_x2F_2F_2F_2F(0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + MarkBufferBankForExecution(gActiveBank); } } ewram16058 = 0; ewram160F9 = 0; ewram160E6 = 0; - gUnknown_030042D4 = sub_8011B00; + gBattleMainFunc = BattleBeginFirstTurn; } } void unref_sub_8011A68(void) { - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - for (gUnknown_02024A60 = 0; gUnknown_02024A60 < gUnknown_02024A68; gUnknown_02024A60++) + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) { - if (battle_side_get_owner(gUnknown_02024A60) == 0) + if (GetBankSide(gActiveBank) == 0) { - sub_800C704(0, gUnknown_02024A6A[gUnknown_02024A60], 0); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); + sub_800C704(0, gBattlePartyID[gActiveBank], 0); + MarkBufferBankForExecution(gActiveBank); } } ewram16058 = 0; ewram160F9 = 0; ewram160E6 = 0; - gUnknown_030042D4 = sub_8011B00; + gBattleMainFunc = BattleBeginFirstTurn; } } -void sub_8011B00(void) +void BattleBeginFirstTurn(void) { s32 i; s32 j; u8 r9 = 0; - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { if (ewram16058 == 0) { - for (i = 0; i < gUnknown_02024A68; i++) - gUnknown_02024A7A[i] = i; - for (i = 0; i < gUnknown_02024A68 - 1; i++) + for (i = 0; i < gNoOfAllBanks; i++) + gTurnOrder[i] = i; + for (i = 0; i < gNoOfAllBanks - 1; i++) { - for (j = i + 1; j < gUnknown_02024A68; j++) + for (j = i + 1; j < gNoOfAllBanks; j++) { - if (b_first_side(gUnknown_02024A7A[i], gUnknown_02024A7A[j], 1) != 0) + if (b_first_side(gTurnOrder[i], gTurnOrder[j], 1) != 0) sub_8012FBC(i, j); } } } - if (ewram160E6 == 0 && sub_8018324(0, 0, 0, 0xFF, 0) != 0) + if (ewram160E6 == 0 && AbilityBattleEffects(0, 0, 0, 0xFF, 0) != 0) { ewram160E6 = 1; return; } - while (ewram16058 < gUnknown_02024A68) + while (ewram16058 < gNoOfAllBanks) { - if (sub_8018324(0, gUnknown_02024A7A[ewram16058], 0, 0, 0) != 0) + if (AbilityBattleEffects(0, gTurnOrder[ewram16058], 0, 0, 0) != 0) r9++; ewram16058++; if (r9 != 0) return; } - if (sub_8018324(9, 0, 0, 0, 0) != 0) + if (AbilityBattleEffects(9, 0, 0, 0, 0) != 0) return; - if (sub_8018324(11, 0, 0, 0, 0) != 0) + if (AbilityBattleEffects(11, 0, 0, 0, 0) != 0) return; - while (ewram160F9 < gUnknown_02024A68) + while (ewram160F9 < gNoOfAllBanks) { - if (sub_801A02C(0, gUnknown_02024A7A[ewram160F9], 0) != 0) + if (sub_801A02C(0, gTurnOrder[ewram160F9], 0) != 0) r9++; ewram160F9++; if (r9 != 0) return; } // Absolutely pointless for-loop that somehow doesn't get optimized out - for (i = 0; i < gUnknown_02024A68; i++) + for (i = 0; i < gNoOfAllBanks; i++) ; for (i = 0; i < 4; i++) { ewram[0x16068 + i] = 6; - gUnknown_02024C18[i] = 0xFF; - gUnknown_02024C60[i] = 0; + gActionForBanks[i] = 0xFF; + gChosenMovesByBanks[i] = 0; } - sub_801365C(0); - sub_801377C(); - ewram160A6 = gUnknown_02024C0C; - gUnknown_030042D4 = sub_8012324; + TurnValuesCleanUp(0); + SpecialStatusesClear(); + ewram160A6 = gAbsentBankFlags; + gBattleMainFunc = sub_8012324; sub_80156DC(); for (i = 0; i < 8; i++) - gUnknown_02024D1E[i] = 0; - for (i = 0; i < gUnknown_02024A68; i++) + gBattleCommunication[i] = 0; + for (i = 0; i < gNoOfAllBanks; i++) gBattleMons[i].status2 &= ~8; ewram16000 = 0; ewram16001 = 0; @@ -2248,7 +2248,7 @@ void sub_8011B00(void) ewram16059 = 0; ewram1600E = 0; gBattleMoveFlags = 0; - gUnknown_02024D1C = Random(); + gRandomTurnNumber = Random(); } } @@ -2256,16 +2256,16 @@ void bc_8013B1C(void) { s32 i; - if (gUnknown_02024A64 == 0) + if (gBattleExecBuffer == 0) { - gUnknown_030042D4 = sub_8011E8C; + gBattleMainFunc = BattleTurnPassed; for (i = 0; i < 8; i++) - gUnknown_02024D1E[i] = 0; - for (i = 0; i < gUnknown_02024A68; i++) + gBattleCommunication[i] = 0; + for (i = 0; i < gNoOfAllBanks; i++) { gBattleMons[i].status2 &= ~8; if ((gBattleMons[i].status1 & 7) && (gBattleMons[i].status2 & 0x1000)) - b_cancel_multi_turn_move_maybe(i); + CancelMultiTurnMoves(i); } ewram16000 = 0; ewram16001 = 0; @@ -2276,16 +2276,16 @@ void bc_8013B1C(void) } } -void sub_8011E8C(void) +void BattleTurnPassed(void) { s32 i; - sub_801365C(1); - if (gUnknown_02024D26 == 0) + TurnValuesCleanUp(1); + if (gBattleOutcome == 0) { - if (sub_8015DFC() != 0) + if (UpdateTurnCounters() != 0) return; - if (sub_8016558() != 0) + if (TurnBasedEffects() != 0) return; } if (sub_80173A4() != 0) @@ -2293,94 +2293,94 @@ void sub_8011E8C(void) ewram16059 = 0; if (sub_80170DC() != 0) return; - sub_801365C(0); - gUnknown_02024C6C &= ~0x200; - gUnknown_02024C6C &= ~0x80000; - gUnknown_02024C6C &= ~0x400000; - gUnknown_02024C6C &= ~0x100000; + TurnValuesCleanUp(0); + gHitMarker &= ~0x200; + gHitMarker &= ~0x80000; + gHitMarker &= ~0x400000; + gHitMarker &= ~0x100000; ewram16002 = 0; ewram160A1 = 0; ewram1600C = 0; gBattleMoveDamage = 0; gBattleMoveFlags = 0; for (i = 0; i < 5; i++) - gUnknown_02024D1E[i] = 0; - if (gUnknown_02024D26 != 0) + gBattleCommunication[i] = 0; + if (gBattleOutcome != 0) { - gUnknown_02024A7F = 12; - gUnknown_030042D4 = sub_80138F0; + gFightStateTracker = 12; + gBattleMainFunc = sub_80138F0; return; } - if (gUnknown_030042E0.unk13 < 0xFF) - gUnknown_030042E0.unk13++; - for (i = 0; i < gUnknown_02024A68; i++) + if (gBattleResults.unk13 < 0xFF) + gBattleResults.unk13++; + for (i = 0; i < gNoOfAllBanks; i++) { - gUnknown_02024C18[i] = 0xFF; - gUnknown_02024C60[i] = 0; + gActionForBanks[i] = 0xFF; + gChosenMovesByBanks[i] = 0; } for (i = 0; i < 4; i++) ewram[0x16068 + i] = 6; - ewram160A6 = gUnknown_02024C0C; - gUnknown_030042D4 = sub_8012324; - gUnknown_02024D1C = Random(); + ewram160A6 = gAbsentBankFlags; + gBattleMainFunc = sub_8012324; + gRandomTurnNumber = Random(); } -u8 sub_8012028(void) +u8 CanRunFromBattle(void) { u8 r2; u8 r6; s32 i; - if (gBattleMons[gUnknown_02024A60].item == 0xAF) - r2 = gEnigmaBerries[gUnknown_02024A60].holdEffect; + if (gBattleMons[gActiveBank].item == 0xAF) + r2 = gEnigmaBerries[gActiveBank].holdEffect; else - r2 = ItemId_GetHoldEffect(gBattleMons[gUnknown_02024A60].item); - gUnknown_02024C0B = gUnknown_02024A60; + r2 = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item); + gStringBank = gActiveBank; if (r2 == 0x25) return 0; if (gBattleTypeFlags & BATTLE_TYPE_LINK) return 0; - if (gBattleMons[gUnknown_02024A60].ability == ABILITY_RUN_AWAY) + if (gBattleMons[gActiveBank].ability == ABILITY_RUN_AWAY) return 0; - r6 = battle_side_get_owner(gUnknown_02024A60); - for (i = 0; i < gUnknown_02024A68; i++) + r6 = GetBankSide(gActiveBank); + for (i = 0; i < gNoOfAllBanks; i++) { - if (r6 != battle_side_get_owner(i) + if (r6 != GetBankSide(i) && gBattleMons[i].ability == 0x17) { ewram16003 = i; - byte_2024C06 = gBattleMons[i].ability; - gUnknown_02024D1E[5] = 2; + gLastUsedAbility = gBattleMons[i].ability; + gBattleCommunication[5] = 2; return 2; } - if (r6 != battle_side_get_owner(i) - && gBattleMons[gUnknown_02024A60].ability != ABILITY_LEVITATE - && gBattleMons[gUnknown_02024A60].type1 != 2 - && gBattleMons[gUnknown_02024A60].type2 != 2 + if (r6 != GetBankSide(i) + && gBattleMons[gActiveBank].ability != ABILITY_LEVITATE + && gBattleMons[gActiveBank].type1 != 2 + && gBattleMons[gActiveBank].type2 != 2 && gBattleMons[i].ability == 0x47) { ewram16003 = i; - byte_2024C06 = gBattleMons[i].ability; - gUnknown_02024D1E[5] = 2; + gLastUsedAbility = gBattleMons[i].ability; + gBattleCommunication[5] = 2; return 2; } } - i = sub_8018324(15, gUnknown_02024A60, 0x2A, 0, 0); - if (i != 0 && (gBattleMons[gUnknown_02024A60].type1 == 8 || gBattleMons[gUnknown_02024A60].type2 == 8)) + i = AbilityBattleEffects(15, gActiveBank, 0x2A, 0, 0); + if (i != 0 && (gBattleMons[gActiveBank].type1 == 8 || gBattleMons[gActiveBank].type2 == 8)) { ewram16003 = i - 1; - byte_2024C06 = gBattleMons[i - 1].ability; - gUnknown_02024D1E[5] = 2; + gLastUsedAbility = gBattleMons[i - 1].ability; + gBattleCommunication[5] = 2; return 2; } - if ((gBattleMons[gUnknown_02024A60].status2 & 0x0400E000) || (gUnknown_02024C98[gUnknown_02024A60] & 0x400)) + if ((gBattleMons[gActiveBank].status2 & 0x0400E000) || (gStatuses3[gActiveBank] & 0x400)) { - gUnknown_02024D1E[5] = 0; + gBattleCommunication[5] = 0; return 1; } if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) { - gUnknown_02024D1E[5] = 1; + gBattleCommunication[5] = 1; return 1; } return 0; @@ -2394,7 +2394,7 @@ void sub_8012258(u8 a) for (i = 0; i < 3; i++) gUnknown_02038470[i] = ewram[0x1606C + i + a * 3]; - r4 = pokemon_order_func(gUnknown_02024A6A[a]); + r4 = pokemon_order_func(gBattlePartyID[a]); r1 = pokemon_order_func(ewram[0x16068 + a]); sub_8094C98(r4, r1); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) @@ -2419,44 +2419,44 @@ void sub_8012324(void) { u8 r5; - gUnknown_02024D1E[4] = 0; + gBattleCommunication[4] = 0; // inverted loop //_0801234C - for (gUnknown_02024A60 = 0; gUnknown_02024A60 < gUnknown_02024A68; gUnknown_02024A60++) + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) { - r5 = battle_get_per_side_status(gUnknown_02024A60); - switch (gUnknown_02024D1E[gUnknown_02024A60]) + r5 = GetBankIdentity(gActiveBank); + switch (gBattleCommunication[gActiveBank]) { case 0: - ewram[0x016068 + gUnknown_02024A60] = 6; + ewram[0x016068 + gActiveBank] = 6; if (!(gBattleTypeFlags & 0x40) && (r5 & 2) - && !(ewram160A6 & gBitTable[battle_get_side_with_given_state(r5 ^ 2)]) - && gUnknown_02024D1E[battle_get_side_with_given_state(r5)] != 4) + && !(ewram160A6 & gBitTable[GetBankByPlayerAI(r5 ^ 2)]) + && gBattleCommunication[GetBankByPlayerAI(r5)] != 4) break; //_080123F8 - if (ewram160A6 & gBitTable[gUnknown_02024A60]) + if (ewram160A6 & gBitTable[gActiveBank]) { - gUnknown_02024C18[gUnknown_02024A60] = 13; + gActionForBanks[gActiveBank] = 13; if (!(gBattleTypeFlags & 0x40)) - gUnknown_02024D1E[gUnknown_02024A60] = 4; + gBattleCommunication[gActiveBank] = 4; //_08012454 else - gUnknown_02024D1E[gUnknown_02024A60] = 3; + gBattleCommunication[gActiveBank] = 3; break; } //_08012468 - if ((gBattleMons[gUnknown_02024A60].status2 & 0x1000) - || (gBattleMons[gUnknown_02024A60].status2 & 0x10000000)) + if ((gBattleMons[gActiveBank].status2 & 0x1000) + || (gBattleMons[gActiveBank].status2 & 0x10000000)) { - gUnknown_02024C18[gUnknown_02024A60] = 0; - gUnknown_02024D1E[gUnknown_02024A60] = 3; + gActionForBanks[gActiveBank] = 0; + gBattleCommunication[gActiveBank] = 3; } else { - dp01_build_cmdbuf_x12_a_bb(0, gUnknown_02024C18[0], gUnknown_02024260[0][1] | (gUnknown_02024260[0][2] << 8)); - dp01_battle_side_mark_buffer_for_execution(gUnknown_02024A60); - gUnknown_02024D1E[gUnknown_02024A60]++; + dp01_build_cmdbuf_x12_a_bb(0, gActionForBanks[0], gBattleBufferB[0][1] | (gBattleBufferB[0][2] << 8)); + MarkBufferBankForExecution(gActiveBank); + gBattleCommunication[gActiveBank]++; } break; case 1: diff --git a/src/battle_6.c b/src/battle_6.c index 866a66ae3..df2419f70 100644 --- a/src/battle_6.c +++ b/src/battle_6.c @@ -9,11 +9,11 @@ extern u16 gUnknown_030042A0; extern struct Window gUnknown_03004210; -extern void (*gUnknown_03004330[])(void); +extern void (*gBattleBankFunc[])(void); -extern u8 gUnknown_02024A60; -extern u8 gUnknown_02024E60[]; -extern u8 gUnknown_020238CC[]; +extern u8 gActiveBank; +extern u8 gActionSelectionCursor[]; +extern u8 gDisplayedStringBattle[]; extern u16 gUnknown_030042C0; extern u16 gUnknown_030041B4; @@ -39,7 +39,7 @@ void sub_803037C(void) { FillWindowRect(&gUnknown_03004210, 10, 2, 15, 27, 18); FillWindowRect(&gUnknown_03004210, 10, 2, 35, 16, 38); - gUnknown_03004330[gUnknown_02024A60] = sub_802C098; + gBattleBankFunc[gActiveBank] = sub_802C098; InitWindow(&gUnknown_03004210, gUnknown_08400CF3, 400, 18, 35); sub_8002F44(&gUnknown_03004210); @@ -50,9 +50,9 @@ void sub_803037C(void) { nullsub_8(r4); } - sub_802E3E4(gUnknown_02024E60[gUnknown_02024A60], 0); + sub_802E3E4(gActionSelectionCursor[gActiveBank], 0); - get_battle_strings_((u8 *) gUnknown_08400CA8); - InitWindow(&gUnknown_03004210, gUnknown_020238CC, SUB_803037C_TILE_DATA_OFFSET, 2, 35); + StrCpyDecodeToDisplayedStringBattle((u8 *) gUnknown_08400CA8); + InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_803037C_TILE_DATA_OFFSET, 2, 35); sub_8002F44(&gUnknown_03004210); } diff --git a/src/battle_7.c b/src/battle_7.c index 9c8b86fb4..a2990018e 100644 --- a/src/battle_7.c +++ b/src/battle_7.c @@ -29,19 +29,19 @@ struct Struct2019348 u32 unk10; }; -extern u8 gUnknown_02023A60[][0x200]; -extern u8 gUnknown_02024A60; -extern u32 gUnknown_02024A64; -extern u8 gUnknown_02024A68; -extern u16 gUnknown_02024A6A[]; -extern u8 gUnknown_02024A72[]; -extern u8 gUnknown_02024BE0[]; +extern u8 gBattleBufferA[][0x200]; +extern u8 gActiveBank; +extern u32 gBattleExecBuffer; +extern u8 gNoOfAllBanks; +extern u16 gBattlePartyID[]; +extern u8 gBanksBySide[]; +extern u8 gObjectBankIDs[]; extern u16 gUnknown_02024DE8; -extern u8 gUnknown_02024E6D; -extern u32 gUnknown_02024E70[]; +extern u8 gDoingBattleAnim; +extern u32 gPID_perBank[]; extern struct Window gUnknown_03004210; -extern void (*gUnknown_03004330[])(void); -extern u8 gUnknown_03004340[]; +extern void (*gBattleBankFunc[])(void); +extern u8 gHealthboxIDs[]; extern u8 gUnknown_0300434C[]; extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlay_SE2; @@ -63,7 +63,7 @@ extern const u8 gSubstituteDollGfx[]; extern const u8 gSubstituteDollPal[]; extern const struct SpriteSheet gUnknown_081FAF24; extern const struct SpriteTemplate gSpriteTemplate_81FAF34; -extern void (*const gUnknown_081FAF5C[])(void); +extern void (*const gOpponentBufferCommands[])(void); extern const struct SpriteSheet gUnknown_0820A47C; extern const struct SpriteSheet gUnknown_0820A484; extern const struct SpriteSheet gUnknown_0820A48C[]; @@ -98,9 +98,9 @@ void sub_80324E0(u8 a); void sub_80327CC(void); void sub_8032978(struct Sprite *); void sub_80328A4(struct Sprite *); -void sub_8032AFC(void); +void OpponentBufferRunCommand(void); void sub_80332D0(void); -void sub_80334EC(void); +void OpponentBufferExecCompleted(void); void sub_80312F0(struct Sprite *sprite) { @@ -142,36 +142,36 @@ void sub_80313A0(struct Sprite *sprite) void move_anim_start_t2_for_situation(u8 a, u32 b) { - ewram17810[gUnknown_02024A60].unk0_4 = 1; + ewram17810[gActiveBank].unk0_4 = 1; if (a == 0) { if (b == 0x20) - move_anim_start_t2(gUnknown_02024A60, 6); + move_anim_start_t2(gActiveBank, 6); else if (b == 8 || (b & 0x80)) - move_anim_start_t2(gUnknown_02024A60, 0); + move_anim_start_t2(gActiveBank, 0); else if (b == 0x10) - move_anim_start_t2(gUnknown_02024A60, 2); + move_anim_start_t2(gActiveBank, 2); else if (b & 7) - move_anim_start_t2(gUnknown_02024A60, 4); + move_anim_start_t2(gActiveBank, 4); else if (b == 0x40) - move_anim_start_t2(gUnknown_02024A60, 5); + move_anim_start_t2(gActiveBank, 5); else - ewram17810[gUnknown_02024A60].unk0_4 = 0; + ewram17810[gActiveBank].unk0_4 = 0; } else { if (b & 0x000F0000) - move_anim_start_t2(gUnknown_02024A60, 3); + move_anim_start_t2(gActiveBank, 3); else if (b & 7) - move_anim_start_t2(gUnknown_02024A60, 1); + move_anim_start_t2(gActiveBank, 1); else if (b & 0x10000000) - move_anim_start_t2(gUnknown_02024A60, 7); + move_anim_start_t2(gActiveBank, 7); else if (b & 0x08000000) - move_anim_start_t2(gUnknown_02024A60, 8); + move_anim_start_t2(gActiveBank, 8); else if (b & 0x0000E000) - move_anim_start_t2(gUnknown_02024A60, 9); + move_anim_start_t2(gActiveBank, 9); else - ewram17810[gUnknown_02024A60].unk0_4 = 0; + ewram17810[gActiveBank].unk0_4 = 0; } } @@ -186,9 +186,9 @@ bool8 move_anim_start_t3(u8 a, u8 b, u8 c, u8 d, u16 e) } if (ewram17800[a].unk0_2 && sub_803163C(d) == 0) return TRUE; - if (ewram17800[a].unk0_2 && d == 2 && gSprites[gUnknown_02024BE0[a]].invisible) + if (ewram17800[a].unk0_2 && d == 2 && gSprites[gObjectBankIDs[a]].invisible) { - refresh_graphics_maybe(a, 1, gUnknown_02024BE0[a]); + refresh_graphics_maybe(a, 1, gObjectBankIDs[a]); sub_80324E0(a); return TRUE; } @@ -262,7 +262,7 @@ bool8 mplay_80342A4(u8 a) if (IsSEPlaying()) { ewram17810[a].unk8++; - if (ewram17810[gUnknown_02024A60].unk8 < 30) + if (ewram17810[gActiveBank].unk8 < 30) return TRUE; m4aMPlayStop(&gMPlay_SE1); m4aMPlayStop(&gMPlay_SE2); @@ -294,10 +294,10 @@ void sub_8031794(struct Pokemon *pkmn, u8 b) else { species = ewram17800[b].unk2; - r7 = gUnknown_02024E70[b]; + r7 = gPID_perBank[b]; } otId = GetMonData(pkmn, MON_DATA_OT_ID); - var = battle_get_per_side_status(b); + var = GetBankIdentity(b); HandleLoadSpecialPokePic( &gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, @@ -346,10 +346,10 @@ void sub_80318FC(struct Pokemon *pkmn, u8 b) else { species = ewram17800[b].unk2; - r7 = gUnknown_02024E70[b]; + r7 = gPID_perBank[b]; } otId = GetMonData(pkmn, MON_DATA_OT_ID); - var = battle_get_per_side_status(b); + var = GetBankIdentity(b); HandleLoadSpecialPokePic( &gMonBackPicTable[species], gMonBackPicCoords[species].coords, @@ -392,7 +392,7 @@ void sub_8031A6C(u16 a, u8 b) u8 status; struct SpriteSheet spriteSheet; - status = battle_get_per_side_status(b); + status = GetBankIdentity(b); DecompressPicFromTable_2( &gTrainerFrontPicTable[a], gTrainerFrontPicCoords[a].coords, @@ -411,7 +411,7 @@ void sub_8031AF4(u16 a, u8 b) { u8 status; - status = battle_get_per_side_status(b); + status = GetBankIdentity(b); DecompressPicFromTable_2( &gTrainerBackPicTable[a], gTrainerBackPicCoords[a].coords, @@ -454,7 +454,7 @@ void unref_sub_8031BA0(void) count = 4; } for (i = 0; i < count; i++) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gUnknown_02024A72[i]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[i]]); } bool8 sub_8031C30(u8 a) @@ -480,9 +480,9 @@ bool8 sub_8031C30(u8 a) else if (a == 3) LoadCompressedObjectPic(&gUnknown_0820A484); else if (a == 4) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gUnknown_02024A72[0]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[0]]); else if (a == 5) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gUnknown_02024A72[1]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[1]]); else retVal = TRUE; } @@ -497,13 +497,13 @@ bool8 sub_8031C30(u8 a) else if (a == 5) LoadCompressedObjectPic(&gUnknown_0820A49C[1]); else if (a == 6) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gUnknown_02024A72[0]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[0]]); else if (a == 7) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gUnknown_02024A72[1]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[1]]); else if (a == 8) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gUnknown_02024A72[2]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[2]]); else if (a == 9) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gUnknown_02024A72[3]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[3]]); else retVal = TRUE; } @@ -542,11 +542,11 @@ u8 battle_load_something(u8 *pState, u8 *b) break; case 3: if ((gBattleTypeFlags & 0x80) && *b == 0) - gUnknown_03004340[*b] = battle_make_oam_safari_battle(); + gHealthboxIDs[*b] = battle_make_oam_safari_battle(); else - gUnknown_03004340[*b] = battle_make_oam_normal_battle(*b); + gHealthboxIDs[*b] = battle_make_oam_normal_battle(*b); (*b)++; - if (*b == gUnknown_02024A68) + if (*b == gNoOfAllBanks) { *b = 0; (*pState)++; @@ -554,30 +554,30 @@ u8 battle_load_something(u8 *pState, u8 *b) break; case 4: sub_8043F44(*b); - if (gUnknown_02024A72[*b] <= 1) - nullsub_11(gUnknown_03004340[*b], 0); + if (gBanksBySide[*b] <= 1) + nullsub_11(gHealthboxIDs[*b], 0); else - nullsub_11(gUnknown_03004340[*b], 1); + nullsub_11(gHealthboxIDs[*b], 1); (*b)++; - if (*b == gUnknown_02024A68) + if (*b == gNoOfAllBanks) { *b = 0; (*pState)++; } break; case 5: - if (battle_side_get_owner(*b) == 0) + if (GetBankSide(*b) == 0) { if (!(gBattleTypeFlags & 0x80)) - sub_8045A5C(gUnknown_03004340[*b], &gPlayerParty[gUnknown_02024A6A[*b]], 0); + sub_8045A5C(gHealthboxIDs[*b], &gPlayerParty[gBattlePartyID[*b]], 0); } else { - sub_8045A5C(gUnknown_03004340[*b], &gEnemyParty[gUnknown_02024A6A[*b]], 0); + sub_8045A5C(gHealthboxIDs[*b], &gEnemyParty[gBattlePartyID[*b]], 0); } - sub_8043DB0(gUnknown_03004340[*b]); + sub_8043DB0(gHealthboxIDs[*b]); (*b)++; - if (*b == gUnknown_02024A68) + if (*b == gNoOfAllBanks) { *b = 0; (*pState)++; @@ -608,13 +608,13 @@ void sub_8031F24(void) { s32 i; - for (i = 0; i < gUnknown_02024A68; i++) - ewram17800[i].unk0_0 = gSprites[gUnknown_02024BE0[i]].invisible; + for (i = 0; i < gNoOfAllBanks; i++) + ewram17800[i].unk0_0 = gSprites[gObjectBankIDs[i]].invisible; } void sub_8031F88(u8 a) { - ewram17800[a].unk0_0 = gSprites[gUnknown_02024BE0[a]].invisible; + ewram17800[a].unk0_0 = gSprites[gObjectBankIDs[a]].invisible; } void sub_8031FC4(u8 a, u8 b, bool8 c) @@ -628,7 +628,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) if (c) { - StartSpriteAnim(&gSprites[gUnknown_02024BE0[a]], ewram17840.unk0); + StartSpriteAnim(&gSprites[gObjectBankIDs[a]], ewram17840.unk0); paletteOffset = 0x100 + a * 16; LoadPalette(ewram + 0x16400 + ewram17840.unk0 * 32, paletteOffset, 32); gBattleMonForms[a] = ewram17840.unk0; @@ -637,7 +637,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) BlendPalette(paletteOffset, 16, 6, 0x7FFF); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } - gSprites[gUnknown_02024BE0[a]].pos1.y = sub_8077F68(a); + gSprites[gObjectBankIDs[a]].pos1.y = sub_8077F68(a); } else { @@ -661,15 +661,15 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) } else { - r10 = battle_get_per_side_status(a); - if (battle_side_get_owner(b) == 1) - species = GetMonData(&gEnemyParty[gUnknown_02024A6A[b]], MON_DATA_SPECIES); + r10 = GetBankIdentity(a); + if (GetBankSide(b) == 1) + species = GetMonData(&gEnemyParty[gBattlePartyID[b]], MON_DATA_SPECIES); else - species = GetMonData(&gPlayerParty[gUnknown_02024A6A[b]], MON_DATA_SPECIES); - if (battle_side_get_owner(a) == 0) + species = GetMonData(&gPlayerParty[gBattlePartyID[b]], MON_DATA_SPECIES); + if (GetBankSide(a) == 0) { - personalityValue = GetMonData(&gPlayerParty[gUnknown_02024A6A[a]], MON_DATA_PERSONALITY); - otId = GetMonData(&gPlayerParty[gUnknown_02024A6A[a]], MON_DATA_OT_ID); + personalityValue = GetMonData(&gPlayerParty[gBattlePartyID[a]], MON_DATA_PERSONALITY); + otId = GetMonData(&gPlayerParty[gBattlePartyID[a]], MON_DATA_OT_ID); HandleLoadSpecialPokePic( &gMonBackPicTable[species], gMonBackPicCoords[species].coords, @@ -677,12 +677,12 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) 0x02000000, gUnknown_081FAF4C[r10], species, - gUnknown_02024E70[a]); + gPID_perBank[a]); } else { - personalityValue = GetMonData(&gEnemyParty[gUnknown_02024A6A[a]], MON_DATA_PERSONALITY); - otId = GetMonData(&gEnemyParty[gUnknown_02024A6A[a]], MON_DATA_OT_ID); + personalityValue = GetMonData(&gEnemyParty[gBattlePartyID[a]], MON_DATA_PERSONALITY); + otId = GetMonData(&gEnemyParty[gBattlePartyID[a]], MON_DATA_OT_ID); HandleLoadSpecialPokePic( &gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, @@ -690,11 +690,11 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) 0x02000000, gUnknown_081FAF4C[r10], species, - gUnknown_02024E70[a]); + gPID_perBank[a]); } } src = gUnknown_081FAF4C[r10]; - dst = (void *)(VRAM + 0x10000 + gSprites[gUnknown_02024BE0[a]].oam.tileNum * 32); + dst = (void *)(VRAM + 0x10000 + gSprites[gObjectBankIDs[a]].oam.tileNum * 32); DmaCopy32(3, src, dst, 0x800); paletteOffset = 0x100 + a * 16; palette = species_and_otid_get_pal(species, otId, personalityValue); @@ -714,8 +714,8 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) ewram17800[a].unk2 = species; gBattleMonForms[a] = gBattleMonForms[b]; } - gSprites[gUnknown_02024BE0[a]].pos1.y = sub_8077F68(a); - StartSpriteAnim(&gSprites[gUnknown_02024BE0[a]], gBattleMonForms[a]); + gSprites[gObjectBankIDs[a]].pos1.y = sub_8077F68(a); + StartSpriteAnim(&gSprites[gObjectBankIDs[a]], gBattleMonForms[a]); } } @@ -732,10 +732,10 @@ void sub_8032350(u8 a, u8 b) if (IsContest()) r4 = 0; else - r4 = battle_get_per_side_status(a); + r4 = GetBankIdentity(a); if (IsContest()) LZDecompressVram(gSubstituteDollTilemap, gUnknown_081FAF4C[r4]); - else if (battle_side_get_owner(a) != 0) + else if (GetBankSide(a) != 0) LZDecompressVram(gSubstituteDollGfx, gUnknown_081FAF4C[r4]); else LZDecompressVram(gSubstituteDollTilemap, gUnknown_081FAF4C[r4]); @@ -751,10 +751,10 @@ void sub_8032350(u8 a, u8 b) { if (!IsContest()) { - if (battle_side_get_owner(a) != 0) - sub_8031794(&gEnemyParty[gUnknown_02024A6A[a]], a); + if (GetBankSide(a) != 0) + sub_8031794(&gEnemyParty[gBattlePartyID[a]], a); else - sub_80318FC(&gPlayerParty[gUnknown_02024A6A[a]], a); + sub_80318FC(&gPlayerParty[gBattlePartyID[a]], a); } } } @@ -812,7 +812,7 @@ void sub_80324F8(struct Pokemon *pkmn, u8 b) void sub_80325B8(void) { - u8 r4 = battle_get_side_with_given_state(0); + u8 r4 = GetBankByPlayerAI(0); ewram17800[r4].unk0_1 = 0; if (IsDoubleBattle()) @@ -832,10 +832,10 @@ void sub_8032638(void) { if (gMain.inBattle) { - u8 r8 = battle_get_side_with_given_state(0); - u8 r9 = battle_get_side_with_given_state(2); - u8 r4 = pokemon_order_func(gUnknown_02024A6A[r8]); - u8 r5 = pokemon_order_func(gUnknown_02024A6A[r9]); + u8 r8 = GetBankByPlayerAI(0); + u8 r9 = GetBankByPlayerAI(2); + u8 r4 = pokemon_order_func(gBattlePartyID[r8]); + u8 r5 = pokemon_order_func(gBattlePartyID[r9]); if (GetMonData(&gPlayerParty[r4], MON_DATA_HP) != 0) sub_80324F8(&gPlayerParty[r4], r8); @@ -851,19 +851,19 @@ void sub_80326EC(u8 a) { s32 i; - for (i = 0; i < gUnknown_02024A68; i++) + for (i = 0; i < gNoOfAllBanks; i++) { if (sub_8078874(i) != 0) { - gSprites[gUnknown_02024BE0[i]].oam.affineMode = a; + gSprites[gObjectBankIDs[i]].oam.affineMode = a; if (a == 0) { - ewram17810[i].unk6 = gSprites[gUnknown_02024BE0[i]].oam.matrixNum; - gSprites[gUnknown_02024BE0[i]].oam.matrixNum = 0; + ewram17810[i].unk6 = gSprites[gObjectBankIDs[i]].oam.matrixNum; + gSprites[gObjectBankIDs[i]].oam.matrixNum = 0; } else { - gSprites[gUnknown_02024BE0[i]].oam.matrixNum = ewram17810[i].unk6; + gSprites[gObjectBankIDs[i]].oam.matrixNum = ewram17810[i].unk6; } } } @@ -874,12 +874,12 @@ void sub_80327CC(void) u8 r5; LoadCompressedObjectPic(&gUnknown_081FAF24); - r5 = battle_get_side_with_given_state(1); + r5 = GetBankByPlayerAI(1); ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); gSprites[ewram17810[r5].unk7].data0 = r5; if (IsDoubleBattle()) { - r5 = battle_get_side_with_given_state(3); + r5 = GetBankByPlayerAI(3); ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); gSprites[ewram17810[r5].unk7].data0 = r5; } @@ -889,7 +889,7 @@ void sub_80328A4(struct Sprite *sprite) { bool8 invisible = FALSE; u8 r4 = sprite->data0; - struct Sprite *r7 = &gSprites[gUnknown_02024BE0[r4]]; + struct Sprite *r7 = &gSprites[gObjectBankIDs[r4]]; if (!r7->inUse || sub_8078874(r4) == 0) { @@ -914,7 +914,7 @@ void sub_8032978(struct Sprite *sprite) void sub_8032984(u8 a, u16 b) { - if (battle_side_get_owner(a) != 0) + if (GetBankSide(a) != 0) { if (ewram17800[a].unk2 != 0) b = ewram17800[a].unk2; @@ -965,53 +965,53 @@ void nullsub_45(void) { } -void sub_8032AE0(void) +void SetBankFuncToOpponentBufferRunCommand(void) { - gUnknown_03004330[gUnknown_02024A60] = sub_8032AFC; + gBattleBankFunc[gActiveBank] = OpponentBufferRunCommand; } -void sub_8032AFC(void) +void OpponentBufferRunCommand(void) { - if (gUnknown_02024A64 & gBitTable[gUnknown_02024A60]) + if (gBattleExecBuffer & gBitTable[gActiveBank]) { - if (gUnknown_02023A60[gUnknown_02024A60][0] <= 0x38) - gUnknown_081FAF5C[gUnknown_02023A60[gUnknown_02024A60][0]](); + if (gBattleBufferA[gActiveBank][0] <= 0x38) + gOpponentBufferCommands[gBattleBufferA[gActiveBank][0]](); else - sub_80334EC(); + OpponentBufferExecCompleted(); } } void sub_8032B4C(void) { - if (gSprites[gUnknown_02024BE0[gUnknown_02024A60]].callback == SpriteCallbackDummy) - sub_80334EC(); + if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy) + OpponentBufferExecCompleted(); } // Duplicate of sub_8032B4C void sub_8032B84(void) { - if (gSprites[gUnknown_02024BE0[gUnknown_02024A60]].callback == SpriteCallbackDummy) - sub_80334EC(); + if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy) + OpponentBufferExecCompleted(); } void sub_8032BBC(void) { - if (gSprites[gUnknown_02024BE0[gUnknown_02024A60]].callback == SpriteCallbackDummy) + if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy) { - sub_8031B74(gSprites[gUnknown_02024BE0[gUnknown_02024A60]].oam.affineParam); - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].oam.tileNum = gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data5; - FreeSpriteOamMatrix(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - DestroySprite(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - sub_80334EC(); + sub_8031B74(gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam); + gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = gSprites[gObjectBankIDs[gActiveBank]].data5; + FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]); + DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]); + OpponentBufferExecCompleted(); } } void sub_8032C4C(void) { - if ((--ewram17810[gUnknown_02024A60].unk9) == 0xFF) + if ((--ewram17810[gActiveBank].unk9) == 0xFF) { - ewram17810[gUnknown_02024A60].unk9 = 0; - sub_80334EC(); + ewram17810[gActiveBank].unk9 = 0; + OpponentBufferExecCompleted(); } } @@ -1021,89 +1021,89 @@ void sub_8032C88(void) if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & BATTLE_TYPE_MULTI))) { - if (gSprites[gUnknown_03004340[gUnknown_02024A60]].callback == SpriteCallbackDummy) + if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy) r6 = TRUE; } else { - if (gSprites[gUnknown_03004340[gUnknown_02024A60]].callback == SpriteCallbackDummy - && gSprites[gUnknown_03004340[gUnknown_02024A60 ^ 2]].callback == SpriteCallbackDummy) + if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy + && gSprites[gHealthboxIDs[gActiveBank ^ 2]].callback == SpriteCallbackDummy) r6 = TRUE; } if (IsCryPlayingOrClearCrySongs()) r6 = FALSE; - if (r6 && ewram17810[gUnknown_02024A60].unk1_0 && ewram17810[gUnknown_02024A60 ^ 2].unk1_0) + if (r6 && ewram17810[gActiveBank].unk1_0 && ewram17810[gActiveBank ^ 2].unk1_0) { - ewram17810[gUnknown_02024A60].unk0_7 = 0; - ewram17810[gUnknown_02024A60].unk1_0 = 0; - ewram17810[gUnknown_02024A60 ^ 2].unk0_7 = 0; - ewram17810[gUnknown_02024A60 ^ 2].unk1_0 = 0; + ewram17810[gActiveBank].unk0_7 = 0; + ewram17810[gActiveBank].unk1_0 = 0; + ewram17810[gActiveBank ^ 2].unk0_7 = 0; + ewram17810[gActiveBank ^ 2].unk1_0 = 0; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); if (gBattleTypeFlags & BATTLE_TYPE_MULTI) m4aMPlayContinue(&gMPlay_BGM); else m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); - ewram17810[gUnknown_02024A60].unk9 = 3; - gUnknown_03004330[gUnknown_02024A60] = sub_8032C4C; + ewram17810[gActiveBank].unk9 = 3; + gBattleBankFunc[gActiveBank] = sub_8032C4C; } } void sub_8032E2C(void) { - if (!ewram17810[gUnknown_02024A60].unk0_3 && !ewram17810[gUnknown_02024A60].unk0_7) - sub_8141828(gUnknown_02024A60, &gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60]]); - if (!ewram17810[gUnknown_02024A60 ^ 2].unk0_3 && !ewram17810[gUnknown_02024A60 ^ 2].unk0_7) - sub_8141828(gUnknown_02024A60 ^ 2, &gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60 ^ 2]]); - if (!ewram17810[gUnknown_02024A60].unk0_3 && !ewram17810[gUnknown_02024A60 ^ 2].unk0_3) + if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7) + sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]); + if (!ewram17810[gActiveBank ^ 2].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_7) + sub_8141828(gActiveBank ^ 2, &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]]); + if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank ^ 2].unk0_3) { if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) { - DestroySprite(&gSprites[gUnknown_0300434C[gUnknown_02024A60 ^ 2]]); + DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank ^ 2]]); sub_8045A5C( - gUnknown_03004340[gUnknown_02024A60 ^ 2], - &gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60 ^ 2]], + gHealthboxIDs[gActiveBank ^ 2], + &gEnemyParty[gBattlePartyID[gActiveBank ^ 2]], 0); - sub_804777C(gUnknown_02024A60 ^ 2); - sub_8043DFC(gUnknown_03004340[gUnknown_02024A60 ^ 2]); + sub_804777C(gActiveBank ^ 2); + sub_8043DFC(gHealthboxIDs[gActiveBank ^ 2]); sub_8032984( - gUnknown_02024A60 ^ 2, - GetMonData(&gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60 ^ 2]], MON_DATA_SPECIES)); + gActiveBank ^ 2, + GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank ^ 2]], MON_DATA_SPECIES)); } - DestroySprite(&gSprites[gUnknown_0300434C[gUnknown_02024A60]]); + DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]); sub_8045A5C( - gUnknown_03004340[gUnknown_02024A60], - &gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60]], + gHealthboxIDs[gActiveBank], + &gEnemyParty[gBattlePartyID[gActiveBank]], 0); - sub_804777C(gUnknown_02024A60); - sub_8043DFC(gUnknown_03004340[gUnknown_02024A60]); + sub_804777C(gActiveBank); + sub_8043DFC(gHealthboxIDs[gActiveBank]); sub_8032984( - gUnknown_02024A60, - GetMonData(&gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60]], MON_DATA_SPECIES)); + gActiveBank, + GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES)); ewram17840.unk9_0 = 0; - gUnknown_03004330[gUnknown_02024A60] = sub_8032C88; + gBattleBankFunc[gActiveBank] = sub_8032C88; } } void sub_8033018(void) { - if (gSprites[gUnknown_02024BE0[gUnknown_02024A60]].animEnded == TRUE - && gSprites[gUnknown_02024BE0[gUnknown_02024A60]].pos2.x == 0) + if (gSprites[gObjectBankIDs[gActiveBank]].animEnded == TRUE + && gSprites[gObjectBankIDs[gActiveBank]].pos2.x == 0) { - if (!ewram17810[gUnknown_02024A60].unk0_7) + if (!ewram17810[gActiveBank].unk0_7) { - sub_8141828(gUnknown_02024A60, &gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60]]); + sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]); return; } - if (ewram17810[gUnknown_02024A60].unk1_0) + if (ewram17810[gActiveBank].unk1_0) { - ewram17810[gUnknown_02024A60].unk0_7 = 0; - ewram17810[gUnknown_02024A60].unk1_0 = 0; + ewram17810[gActiveBank].unk0_7 = 0; + ewram17810[gActiveBank].unk1_0 = 0; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); - sub_80334EC(); + OpponentBufferExecCompleted(); return; } } @@ -1111,52 +1111,52 @@ void sub_8033018(void) void sub_80330C8(void) { - s16 r4 = sub_8045C78(gUnknown_02024A60, gUnknown_03004340[gUnknown_02024A60], 0, 0); + s16 r4 = sub_8045C78(gActiveBank, gHealthboxIDs[gActiveBank], 0, 0); - sub_8043DFC(gUnknown_03004340[gUnknown_02024A60]); + sub_8043DFC(gHealthboxIDs[gActiveBank]); if (r4 != -1) - sub_80440EC(gUnknown_03004340[gUnknown_02024A60], r4, 0); + sub_80440EC(gHealthboxIDs[gActiveBank], r4, 0); else - sub_80334EC(); + OpponentBufferExecCompleted(); } void sub_803311C(void) { - if (!gSprites[gUnknown_02024BE0[gUnknown_02024A60]].inUse) + if (!gSprites[gObjectBankIDs[gActiveBank]].inUse) { - sub_8043DB0(gUnknown_03004340[gUnknown_02024A60]); - sub_80334EC(); + sub_8043DB0(gHealthboxIDs[gActiveBank]); + OpponentBufferExecCompleted(); } } void sub_8033160(void) { - if (!ewram17810[gUnknown_02024A60].unk0_6) + if (!ewram17810[gActiveBank].unk0_6) { - FreeSpriteOamMatrix(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - DestroySprite(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - sub_8032A08(gUnknown_02024A60); - sub_8043DB0(gUnknown_03004340[gUnknown_02024A60]); - sub_80334EC(); + FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]); + DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]); + sub_8032A08(gActiveBank); + sub_8043DB0(gHealthboxIDs[gActiveBank]); + OpponentBufferExecCompleted(); } } void sub_80331D0(void) { if (gUnknown_03004210.state == 0) - sub_80334EC(); + OpponentBufferExecCompleted(); } void bx_blink_t7(void) { - u8 spriteId = gUnknown_02024BE0[gUnknown_02024A60]; + u8 spriteId = gObjectBankIDs[gActiveBank]; if (gSprites[spriteId].data1 == 32) { gSprites[spriteId].data1 = 0; gSprites[spriteId].invisible = FALSE; - gUnknown_02024E6D = 0; - sub_80334EC(); + gDoingBattleAnim = 0; + OpponentBufferExecCompleted(); } else { @@ -1168,70 +1168,70 @@ void bx_blink_t7(void) void sub_8033264(void) { - if (gSprites[gUnknown_03004340[gUnknown_02024A60]].callback == SpriteCallbackDummy) + if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy) { - if (ewram17800[gUnknown_02024A60].unk0_2) - move_anim_start_t4(gUnknown_02024A60, gUnknown_02024A60, gUnknown_02024A60, 6); - gUnknown_03004330[gUnknown_02024A60] = sub_80332D0; + if (ewram17800[gActiveBank].unk0_2) + move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6); + gBattleBankFunc[gActiveBank] = sub_80332D0; } } void sub_80332D0(void) { - if (!ewram17810[gUnknown_02024A60].unk0_6) + if (!ewram17810[gActiveBank].unk0_6) { CreateTask(c3_0802FDF4, 10); - sub_80334EC(); + OpponentBufferExecCompleted(); } } void sub_8033308(void) { - if (ewram17810[gUnknown_02024A60].unk1_0) + if (ewram17810[gActiveBank].unk1_0) { - ewram17810[gUnknown_02024A60].unk0_7 = 0; - ewram17810[gUnknown_02024A60].unk1_0 = 0; + ewram17810[gActiveBank].unk0_7 = 0; + ewram17810[gActiveBank].unk1_0 = 0; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); - StartSpriteAnim(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]], 0); + StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 0); sub_8045A5C( - gUnknown_03004340[gUnknown_02024A60], - &gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60]], + gHealthboxIDs[gActiveBank], + &gEnemyParty[gBattlePartyID[gActiveBank]], 0); - sub_804777C(gUnknown_02024A60); - sub_8043DFC(gUnknown_03004340[gUnknown_02024A60]); - sub_8031F88(gUnknown_02024A60); - gUnknown_03004330[gUnknown_02024A60] = sub_8033264; + sub_804777C(gActiveBank); + sub_8043DFC(gHealthboxIDs[gActiveBank]); + sub_8031F88(gActiveBank); + gBattleBankFunc[gActiveBank] = sub_8033264; } } void sub_80333D4(void) { - if (!ewram17810[gUnknown_02024A60].unk0_3 && !ewram17810[gUnknown_02024A60].unk0_7) - sub_8141828(gUnknown_02024A60, &gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60]]); - if (gSprites[gUnknown_0300434C[gUnknown_02024A60]].callback == SpriteCallbackDummy - && !ewram17810[gUnknown_02024A60].unk0_3) + if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7) + sub_8141828(gActiveBank, &gEnemyParty[gBattlePartyID[gActiveBank]]); + if (gSprites[gUnknown_0300434C[gActiveBank]].callback == SpriteCallbackDummy + && !ewram17810[gActiveBank].unk0_3) { - DestroySprite(&gSprites[gUnknown_0300434C[gUnknown_02024A60]]); - sub_8032984(gUnknown_02024A60, GetMonData(&gEnemyParty[gUnknown_02024A6A[gUnknown_02024A60]], MON_DATA_SPECIES)); - gUnknown_03004330[gUnknown_02024A60] = sub_8033308; + DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]); + sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES)); + gBattleBankFunc[gActiveBank] = sub_8033308; } } void sub_8033494(void) { - if (!ewram17810[gUnknown_02024A60].unk0_4) - sub_80334EC(); + if (!ewram17810[gActiveBank].unk0_4) + OpponentBufferExecCompleted(); } void sub_80334C0(void) { - if (!ewram17810[gUnknown_02024A60].unk0_5) - sub_80334EC(); + if (!ewram17810[gActiveBank].unk0_5) + OpponentBufferExecCompleted(); } -void sub_80334EC(void) +void OpponentBufferExecCompleted(void) { - gUnknown_03004330[gUnknown_02024A60] = sub_8032AFC; - gUnknown_02024A64 &= ~gBitTable[gUnknown_02024A60]; + gBattleBankFunc[gActiveBank] = OpponentBufferRunCommand; + gBattleExecBuffer &= ~gBitTable[gActiveBank]; } diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index b855f1535..743dd2554 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -44,35 +44,35 @@ struct UnknownStruct5 extern u16 gBattleTypeFlags; extern struct UnknownStruct5 gUnknown_020238C8; -extern u8 gUnknown_020238CC[]; -extern u8 gUnknown_02023A60[][0x200]; -extern u8 gUnknown_02024A60; -extern u32 gUnknown_02024A64; -extern u16 gUnknown_02024A6A[]; -extern u8 gUnknown_02024BE0[]; -extern u8 gUnknown_02024D26; +extern u8 gDisplayedStringBattle[]; +extern u8 gBattleBufferA[][0x200]; +extern u8 gActiveBank; +extern u32 gBattleExecBuffer; +extern u16 gBattlePartyID[]; +extern u8 gObjectBankIDs[]; +extern u8 gBattleOutcome; extern u16 gUnknown_02024DE8; extern u8 gUnknown_02024E68[]; -extern u8 gUnknown_02024E6D; -extern u32 gUnknown_02024E70[]; +extern u8 gDoingBattleAnim; +extern u32 gPID_perBank[]; extern struct SpriteTemplate gUnknown_02024E8C; -extern u32 *gUnknown_0202F7B4; -extern u32 gUnknown_0202F7B8; -extern u16 gUnknown_0202F7BC; -extern u8 gUnknown_0202F7BE; -extern u16 gUnknown_0202F7C0; +extern u32 *gDisableStructMoveAnim; +extern u32 gMoveDmgMoveAnim; +extern u16 gMovePowerMoveAnim; +extern u8 gHappinessMoveAnim; +extern u16 gWeatherMoveAnim; extern u8 gUnknown_0202F7C4; extern struct Window gUnknown_03004210; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; -extern MainCallback gUnknown_030042D0; -extern void (*gUnknown_03004330[])(void); -extern u8 gUnknown_03004340[]; +extern MainCallback gPreBattleCallback1; +extern void (*gBattleBankFunc[])(void); +extern u8 gHealthboxIDs[]; extern u8 gUnknown_0300434C[]; extern u8 gBattleMonForms[]; extern u8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); -extern void (*const gUnknown_083FE4F4[])(void); +extern void (*const gLinkPartnerBufferCommands[])(void); extern u8 move_anim_start_t3(); extern u8 sub_8078874(); @@ -83,7 +83,7 @@ extern void sub_8047858(); extern void move_anim_start_t2_for_situation(); extern void load_gfxc_health_bar(); extern void sub_8043D84(); -extern void sub_8120AA8(); +extern void BufferStringBattle(); extern void sub_8031F24(void); extern void sub_80326EC(); extern void ExecuteMoveAnim(); @@ -119,9 +119,9 @@ extern void sub_8031F88(); extern void sub_8141828(); extern void c2_8011A1C(void); -void sub_811DA94(void); +void LinkPartnerBufferRunCommand(void); void sub_811E0A0(void); -void dp01_tbl3_exec_completed(void); +void LinkPartnerBufferExecCompleted(void); u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *b); void sub_811EC68(u8); void sub_811F864(u8, u8); @@ -135,45 +135,45 @@ void nullsub_74(void) { } -void sub_811DA78(void) +void SetBankFuncToLinkPartnerBufferRunCommand(void) { - gUnknown_03004330[gUnknown_02024A60] = sub_811DA94; + gBattleBankFunc[gActiveBank] = LinkPartnerBufferRunCommand; } -void sub_811DA94(void) +void LinkPartnerBufferRunCommand(void) { - if (gUnknown_02024A64 & gBitTable[gUnknown_02024A60]) + if (gBattleExecBuffer & gBitTable[gActiveBank]) { - if (gUnknown_02023A60[gUnknown_02024A60][0] <= 0x38) - gUnknown_083FE4F4[gUnknown_02023A60[gUnknown_02024A60][0]](); + if (gBattleBufferA[gActiveBank][0] <= 0x38) + gLinkPartnerBufferCommands[gBattleBufferA[gActiveBank][0]](); else - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } } void sub_811DAE4(void) { - if (gSprites[gUnknown_02024BE0[gUnknown_02024A60]].callback == SpriteCallbackDummy) - dp01_tbl3_exec_completed(); + if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy) + LinkPartnerBufferExecCompleted(); } void sub_811DB1C(void) { - if (gSprites[gUnknown_02024BE0[gUnknown_02024A60]].callback == SpriteCallbackDummy) + if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy) { nullsub_10(0); - FreeSpriteOamMatrix(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - DestroySprite(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - dp01_tbl3_exec_completed(); + FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]); + DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]); + LinkPartnerBufferExecCompleted(); } } void sub_811DB84(void) { - if ((--ewram17810[gUnknown_02024A60].unk9) == 0xFF) + if ((--ewram17810[gActiveBank].unk9) == 0xFF) { - ewram17810[gUnknown_02024A60].unk9 = 0; - dp01_tbl3_exec_completed(); + ewram17810[gActiveBank].unk9 = 0; + LinkPartnerBufferExecCompleted(); } } @@ -183,21 +183,21 @@ void sub_811DBC0(void) if (!IsDoubleBattle() || (IsDoubleBattle() && (gBattleTypeFlags & 0x40))) { - if (gSprites[gUnknown_03004340[gUnknown_02024A60]].callback == SpriteCallbackDummy) + if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy) r6 = TRUE; } else { - if (gSprites[gUnknown_03004340[gUnknown_02024A60]].callback == SpriteCallbackDummy - && gSprites[gUnknown_03004340[gUnknown_02024A60 ^ 2]].callback == SpriteCallbackDummy) + if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy + && gSprites[gHealthboxIDs[gActiveBank ^ 2]].callback == SpriteCallbackDummy) r6 = TRUE; } if (IsCryPlayingOrClearCrySongs()) r6 = FALSE; if (r6) { - ewram17810[gUnknown_02024A60].unk9 = 3; - gUnknown_03004330[gUnknown_02024A60] = sub_811DB84; + ewram17810[gActiveBank].unk9 = 3; + gBattleBankFunc[gActiveBank] = sub_811DB84; } } @@ -205,92 +205,92 @@ void sub_811DCA0(void) { u8 r2; - if (!ewram17810[gUnknown_02024A60].unk0_3) + if (!ewram17810[gActiveBank].unk0_3) { // I couldn't get it to work as a bitfield here - r2 = *((u8 *)&ewram17810[gUnknown_02024A60 ^ 2]) & 8; - if (!r2 && (++ewram17810[gUnknown_02024A60].unk9) != 1) + r2 = *((u8 *)&ewram17810[gActiveBank ^ 2]) & 8; + if (!r2 && (++ewram17810[gActiveBank].unk9) != 1) { - ewram17810[gUnknown_02024A60].unk9 = r2; + ewram17810[gActiveBank].unk9 = r2; if (IsDoubleBattle() && !(gBattleTypeFlags & 0x40)) { - DestroySprite(&gSprites[gUnknown_0300434C[gUnknown_02024A60 ^ 2]]); - sub_8045A5C(gUnknown_03004340[gUnknown_02024A60 ^ 2], &gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60 ^ 2]], 0); - sub_804777C(gUnknown_02024A60 ^ 2); - sub_8043DFC(gUnknown_03004340[gUnknown_02024A60 ^ 2]); + DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank ^ 2]]); + sub_8045A5C(gHealthboxIDs[gActiveBank ^ 2], &gPlayerParty[gBattlePartyID[gActiveBank ^ 2]], 0); + sub_804777C(gActiveBank ^ 2); + sub_8043DFC(gHealthboxIDs[gActiveBank ^ 2]); } - DestroySprite(&gSprites[gUnknown_0300434C[gUnknown_02024A60]]); - sub_8045A5C(gUnknown_03004340[gUnknown_02024A60], &gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], 0); - sub_804777C(gUnknown_02024A60); - sub_8043DFC(gUnknown_03004340[gUnknown_02024A60]); + DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]); + sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 0); + sub_804777C(gActiveBank); + sub_8043DFC(gHealthboxIDs[gActiveBank]); (s8)ewram17810[4].unk9 &= ~1; - gUnknown_03004330[gUnknown_02024A60] = sub_811DBC0; + gBattleBankFunc[gActiveBank] = sub_811DBC0; } } } void sub_811DDE8(void) { - if (gSprites[gUnknown_02024BE0[gUnknown_02024A60]].animEnded - && gSprites[gUnknown_02024BE0[gUnknown_02024A60]].pos2.x == 0) - dp01_tbl3_exec_completed(); + if (gSprites[gObjectBankIDs[gActiveBank]].animEnded + && gSprites[gObjectBankIDs[gActiveBank]].pos2.x == 0) + LinkPartnerBufferExecCompleted(); } void bx_t3_healthbar_update(void) { s16 r4; - r4 = sub_8045C78(gUnknown_02024A60, gUnknown_03004340[gUnknown_02024A60], 0, 0); - sub_8043DFC(gUnknown_03004340[gUnknown_02024A60]); + r4 = sub_8045C78(gActiveBank, gHealthboxIDs[gActiveBank], 0, 0); + sub_8043DFC(gHealthboxIDs[gActiveBank]); if (r4 != -1) { - sub_80440EC(gUnknown_03004340[gUnknown_02024A60], r4, 0); + sub_80440EC(gHealthboxIDs[gActiveBank], r4, 0); } else { - sub_80324F8(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], gUnknown_02024A60); - dp01_tbl3_exec_completed(); + sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + LinkPartnerBufferExecCompleted(); } } void sub_811DE98(void) { - if (gSprites[gUnknown_02024BE0[gUnknown_02024A60]].pos1.y + gSprites[gUnknown_02024BE0[gUnknown_02024A60]].pos2.y > 160) + if (gSprites[gObjectBankIDs[gActiveBank]].pos1.y + gSprites[gObjectBankIDs[gActiveBank]].pos2.y > 160) { - nullsub_9(GetMonData(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], MON_DATA_SPECIES)); - FreeOamMatrix(gSprites[gUnknown_02024BE0[gUnknown_02024A60]].oam.matrixNum); - DestroySprite(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - sub_8043DB0(gUnknown_03004340[gUnknown_02024A60]); - dp01_tbl3_exec_completed(); + nullsub_9(GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES)); + FreeOamMatrix(gSprites[gObjectBankIDs[gActiveBank]].oam.matrixNum); + DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]); + sub_8043DB0(gHealthboxIDs[gActiveBank]); + LinkPartnerBufferExecCompleted(); } } void sub_811DF34(void) { - if (!ewram17810[gUnknown_02024A60].unk0_6) + if (!ewram17810[gActiveBank].unk0_6) { - FreeSpriteOamMatrix(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - DestroySprite(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - sub_8043DB0(gUnknown_03004340[gUnknown_02024A60]); - dp01_tbl3_exec_completed(); + FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]); + DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]); + sub_8043DB0(gHealthboxIDs[gActiveBank]); + LinkPartnerBufferExecCompleted(); } } void sub_811DFA0(void) { if (gUnknown_03004210.state == 0) - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void bx_blink_t3(void) { - u8 spriteId = gUnknown_02024BE0[gUnknown_02024A60]; + u8 spriteId = gObjectBankIDs[gActiveBank]; if (gSprites[spriteId].data1 == 32) { gSprites[spriteId].data1 = 0; gSprites[spriteId].invisible = FALSE; - gUnknown_02024E6D = 0; - dp01_tbl3_exec_completed(); + gDoingBattleAnim = 0; + LinkPartnerBufferExecCompleted(); } else { @@ -304,48 +304,48 @@ void bx_blink_t3(void) void sub_811E034(void) { - if (gSprites[gUnknown_03004340[gUnknown_02024A60]].callback == SpriteCallbackDummy) + if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy) { - if (ewram17800[gUnknown_02024A60].unk0_2) - move_anim_start_t4(gUnknown_02024A60, gUnknown_02024A60, gUnknown_02024A60, 6); - gUnknown_03004330[gUnknown_02024A60] = sub_811E0A0; + if (ewram17800[gActiveBank].unk0_2) + move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6); + gBattleBankFunc[gActiveBank] = sub_811E0A0; } } void sub_811E0A0(void) { - if (!ewram17810[gUnknown_02024A60].unk0_6) - dp01_tbl3_exec_completed(); + if (!ewram17810[gActiveBank].unk0_6) + LinkPartnerBufferExecCompleted(); } void sub_811E0CC(void) { - if (ewram17810[gUnknown_02024A60].unk1_0) + if (ewram17810[gActiveBank].unk1_0) { - ewram17810[gUnknown_02024A60].unk0_7 = 0; - ewram17810[gUnknown_02024A60].unk1_0 = 0; + ewram17810[gActiveBank].unk0_7 = 0; + ewram17810[gActiveBank].unk1_0 = 0; FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); CreateTask(c3_0802FDF4, 10); - sub_80324F8(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], gUnknown_02024A60); - StartSpriteAnim(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]], 0); - sub_8045A5C(gUnknown_03004340[gUnknown_02024A60], &gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], 0); - sub_804777C(gUnknown_02024A60); - sub_8043DFC(gUnknown_03004340[gUnknown_02024A60]); - sub_8031F88(gUnknown_02024A60); - gUnknown_03004330[gUnknown_02024A60] = sub_811E034; + sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 0); + sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 0); + sub_804777C(gActiveBank); + sub_8043DFC(gHealthboxIDs[gActiveBank]); + sub_8031F88(gActiveBank); + gBattleBankFunc[gActiveBank] = sub_811E034; } } void sub_811E1BC(void) { - if (!ewram17810[gUnknown_02024A60].unk0_3 && !ewram17810[gUnknown_02024A60].unk0_7) - sub_8141828(gUnknown_02024A60, &gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]]); - if (gSprites[gUnknown_0300434C[gUnknown_02024A60]].callback == SpriteCallbackDummy - && !ewram17810[gUnknown_02024A60].unk0_3) + if (!ewram17810[gActiveBank].unk0_3 && !ewram17810[gActiveBank].unk0_7) + sub_8141828(gActiveBank, &gPlayerParty[gBattlePartyID[gActiveBank]]); + if (gSprites[gUnknown_0300434C[gActiveBank]].callback == SpriteCallbackDummy + && !ewram17810[gActiveBank].unk0_3) { - DestroySprite(&gSprites[gUnknown_0300434C[gUnknown_02024A60]]); - gUnknown_03004330[gUnknown_02024A60] = sub_811E0CC; + DestroySprite(&gSprites[gUnknown_0300434C[gActiveBank]]); + gBattleBankFunc[gActiveBank] = sub_811E0CC; } } @@ -355,7 +355,7 @@ void sub_811E258(void) { m4aSongNumStop(0x5A); gMain.inBattle = FALSE; - gMain.callback1 = gUnknown_030042D0; + gMain.callback1 = gPreBattleCallback1; SetMainCallback2(c2_8011A1C); } } @@ -367,60 +367,60 @@ void sub_811E29C(void) if (gBattleTypeFlags & 2) { sub_800832C(); - gUnknown_03004330[gUnknown_02024A60] = sub_811E258; + gBattleBankFunc[gActiveBank] = sub_811E258; } else { m4aSongNumStop(0x5A); gMain.inBattle = FALSE; - gMain.callback1 = gUnknown_030042D0; + gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); } } } -void dp01_tbl3_exec_completed(void) +void LinkPartnerBufferExecCompleted(void) { u8 multiplayerId; - gUnknown_03004330[gUnknown_02024A60] = sub_811DA94; + gBattleBankFunc[gActiveBank] = LinkPartnerBufferRunCommand; if (gBattleTypeFlags & 2) { multiplayerId = GetMultiplayerId(); dp01_prepare_buffer_wireless_probably(2, 4, &multiplayerId); - gUnknown_02023A60[gUnknown_02024A60][0] = 0x38; + gBattleBufferA[gActiveBank][0] = 0x38; } else { - gUnknown_02024A64 &= ~gBitTable[gUnknown_02024A60]; + gBattleExecBuffer &= ~gBitTable[gActiveBank]; } } void sub_811E38C(void) { - if (!ewram17810[gUnknown_02024A60].unk0_4) - dp01_tbl3_exec_completed(); + if (!ewram17810[gActiveBank].unk0_4) + LinkPartnerBufferExecCompleted(); } void sub_811E3B8(void) { - if (!ewram17810[gUnknown_02024A60].unk0_5) - dp01_tbl3_exec_completed(); + if (!ewram17810[gActiveBank].unk0_5) + LinkPartnerBufferExecCompleted(); } -void dp01t_00_3_getattr(void) +void LinkPartnerHandleGetAttributes(void) { u8 unk[256]; int r6 = 0; s32 i; - if (gUnknown_02023A60[gUnknown_02024A60][2] == 0) + if (gBattleBufferA[gActiveBank][2] == 0) { - r6 = dp01_getattr_by_ch1_for_player_pokemon(gUnknown_02024A6A[gUnknown_02024A60], unk); + r6 = dp01_getattr_by_ch1_for_player_pokemon(gBattlePartyID[gActiveBank], unk); } else { - u8 r4 = gUnknown_02023A60[gUnknown_02024A60][2]; + u8 r4 = gBattleBufferA[gActiveBank][2]; for (i = 0; i < 6; i++) { @@ -430,7 +430,7 @@ void dp01t_00_3_getattr(void) } } dp01_build_cmdbuf_x1D_1D_numargs_varargs(1, r6, unk); - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) @@ -443,7 +443,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) u32 data32; s32 size = 0; - switch (gUnknown_02023A60[gUnknown_02024A60][1]) + switch (gBattleBufferA[gActiveBank][1]) { case 0: battlePokemon.species = GetMonData(&gPlayerParty[a], MON_DATA_SPECIES); @@ -509,7 +509,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) case 5: case 6: case 7: - data16 = GetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gUnknown_02023A60[gUnknown_02024A60][1] - 4); + data16 = GetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4); buffer[0] = data16; buffer[1] = data16 >> 8; size = 2; @@ -524,7 +524,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) case 10: case 11: case 12: - buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + gUnknown_02023A60[gUnknown_02024A60][1] - 9); + buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9); size = 1; break; case 17: @@ -740,21 +740,21 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) void sub_811EC04(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } -void sub_811EC10(void) +void LinkPartnerHandleSetAttributes(void) { u8 i; u8 r4; - if (gUnknown_02023A60[gUnknown_02024A60][2] == 0) + if (gBattleBufferA[gActiveBank][2] == 0) { - sub_811EC68(gUnknown_02024A6A[gUnknown_02024A60]); + sub_811EC68(gBattlePartyID[gActiveBank]); } else { - r4 = gUnknown_02023A60[gUnknown_02024A60][2]; + r4 = gBattleBufferA[gActiveBank][2]; for (i = 0; i < 6; i++) { if (r4 & 1) @@ -762,16 +762,16 @@ void sub_811EC10(void) r4 >>= 1; } } - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_811EC68(u8 a) { - struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gUnknown_02023A60[gUnknown_02024A60][3]; - struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gUnknown_02023A60[gUnknown_02024A60][3]; + struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3]; + struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3]; s32 i; - switch (gUnknown_02023A60[gUnknown_02024A60][1]) + switch (gBattleBufferA[gActiveBank][1]) { case 0: { @@ -812,10 +812,10 @@ void sub_811EC68(u8 a) } break; case 1: - SetMonData(&gPlayerParty[a], MON_DATA_SPECIES, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPECIES, &gBattleBufferA[gActiveBank][3]); break; case 2: - SetMonData(&gPlayerParty[a], MON_DATA_HELD_ITEM, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_HELD_ITEM, &gBattleBufferA[gActiveBank][3]); break; case 3: for (i = 0; i < 4; i++) @@ -829,157 +829,157 @@ void sub_811EC68(u8 a) case 5: case 6: case 7: - SetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gUnknown_02023A60[gUnknown_02024A60][1] - 4, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_MOVE1 + gBattleBufferA[gActiveBank][1] - 4, &gBattleBufferA[gActiveBank][3]); break; case 8: - SetMonData(&gPlayerParty[a], MON_DATA_PP1, &gUnknown_02023A60[gUnknown_02024A60][3]); - SetMonData(&gPlayerParty[a], MON_DATA_PP2, &gUnknown_02023A60[gUnknown_02024A60][4]); - SetMonData(&gPlayerParty[a], MON_DATA_PP3, &gUnknown_02023A60[gUnknown_02024A60][5]); - SetMonData(&gPlayerParty[a], MON_DATA_PP4, &gUnknown_02023A60[gUnknown_02024A60][6]); - SetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES, &gUnknown_02023A60[gUnknown_02024A60][7]); + SetMonData(&gPlayerParty[a], MON_DATA_PP1, &gBattleBufferA[gActiveBank][3]); + SetMonData(&gPlayerParty[a], MON_DATA_PP2, &gBattleBufferA[gActiveBank][4]); + SetMonData(&gPlayerParty[a], MON_DATA_PP3, &gBattleBufferA[gActiveBank][5]); + SetMonData(&gPlayerParty[a], MON_DATA_PP4, &gBattleBufferA[gActiveBank][6]); + SetMonData(&gPlayerParty[a], MON_DATA_PP_BONUSES, &gBattleBufferA[gActiveBank][7]); break; case 9: case 10: case 11: case 12: - SetMonData(&gPlayerParty[a], MON_DATA_PP1 + gUnknown_02023A60[gUnknown_02024A60][1] - 9, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_PP1 + gBattleBufferA[gActiveBank][1] - 9, &gBattleBufferA[gActiveBank][3]); break; case 17: - SetMonData(&gPlayerParty[a], MON_DATA_OT_ID, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_OT_ID, &gBattleBufferA[gActiveBank][3]); break; case 18: - SetMonData(&gPlayerParty[a], MON_DATA_EXP, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_EXP, &gBattleBufferA[gActiveBank][3]); break; case 19: - SetMonData(&gPlayerParty[a], MON_DATA_HP_EV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_HP_EV, &gBattleBufferA[gActiveBank][3]); break; case 20: - SetMonData(&gPlayerParty[a], MON_DATA_ATK_EV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_ATK_EV, &gBattleBufferA[gActiveBank][3]); break; case 21: - SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]); break; case 22: - SetMonData(&gPlayerParty[a], MON_DATA_SPD_EV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]); break; case 23: - SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]); break; case 24: - SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_EV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_EV, &gBattleBufferA[gActiveBank][3]); break; case 25: - SetMonData(&gPlayerParty[a], MON_DATA_FRIENDSHIP, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_FRIENDSHIP, &gBattleBufferA[gActiveBank][3]); break; case 26: - SetMonData(&gPlayerParty[a], MON_DATA_POKERUS, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_POKERUS, &gBattleBufferA[gActiveBank][3]); break; case 27: - SetMonData(&gPlayerParty[a], MON_DATA_MET_LOCATION, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_MET_LOCATION, &gBattleBufferA[gActiveBank][3]); break; case 28: - SetMonData(&gPlayerParty[a], MON_DATA_MET_LEVEL, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_MET_LEVEL, &gBattleBufferA[gActiveBank][3]); break; case 29: - SetMonData(&gPlayerParty[a], MON_DATA_MET_GAME, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_MET_GAME, &gBattleBufferA[gActiveBank][3]); break; case 30: - SetMonData(&gPlayerParty[a], MON_DATA_POKEBALL, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_POKEBALL, &gBattleBufferA[gActiveBank][3]); break; case 31: - SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gUnknown_02023A60[gUnknown_02024A60][3]); - SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gUnknown_02023A60[gUnknown_02024A60][4]); - SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gUnknown_02023A60[gUnknown_02024A60][5]); - SetMonData(&gPlayerParty[a], MON_DATA_SPD_IV, &gUnknown_02023A60[gUnknown_02024A60][6]); - SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gUnknown_02023A60[gUnknown_02024A60][7]); - SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gUnknown_02023A60[gUnknown_02024A60][8]); + SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]); + SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]); + SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]); + SetMonData(&gPlayerParty[a], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][6]); + SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]); + SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]); break; case 32: - SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]); break; case 33: - SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][3]); break; case 34: - SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]); break; case 35: - SetMonData(&gPlayerParty[a], MON_DATA_SPD_IV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][3]); break; case 36: - SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]); break; case 37: - SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][3]); break; case 38: - SetMonData(&gPlayerParty[a], MON_DATA_PERSONALITY, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_PERSONALITY, &gBattleBufferA[gActiveBank][3]); break; case 39: - SetMonData(&gPlayerParty[a], MON_DATA_CHECKSUM, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_CHECKSUM, &gBattleBufferA[gActiveBank][3]); break; case 40: - SetMonData(&gPlayerParty[a], MON_DATA_STATUS, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_STATUS, &gBattleBufferA[gActiveBank][3]); break; case 41: - SetMonData(&gPlayerParty[a], MON_DATA_LEVEL, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_LEVEL, &gBattleBufferA[gActiveBank][3]); break; case 42: - SetMonData(&gPlayerParty[a], MON_DATA_HP, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_HP, &gBattleBufferA[gActiveBank][3]); break; case 43: - SetMonData(&gPlayerParty[a], MON_DATA_MAX_HP, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_MAX_HP, &gBattleBufferA[gActiveBank][3]); break; case 44: - SetMonData(&gPlayerParty[a], MON_DATA_ATK, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_ATK, &gBattleBufferA[gActiveBank][3]); break; case 45: - SetMonData(&gPlayerParty[a], MON_DATA_DEF, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]); break; case 46: - SetMonData(&gPlayerParty[a], MON_DATA_SPD, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPD, &gBattleBufferA[gActiveBank][3]); break; case 47: - SetMonData(&gPlayerParty[a], MON_DATA_SPATK, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]); break; case 48: - SetMonData(&gPlayerParty[a], MON_DATA_SPDEF, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SPDEF, &gBattleBufferA[gActiveBank][3]); break; case 49: - SetMonData(&gPlayerParty[a], MON_DATA_COOL, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_COOL, &gBattleBufferA[gActiveBank][3]); break; case 50: - SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY, &gBattleBufferA[gActiveBank][3]); break; case 51: - SetMonData(&gPlayerParty[a], MON_DATA_CUTE, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_CUTE, &gBattleBufferA[gActiveBank][3]); break; case 52: - SetMonData(&gPlayerParty[a], MON_DATA_SMART, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SMART, &gBattleBufferA[gActiveBank][3]); break; case 53: - SetMonData(&gPlayerParty[a], MON_DATA_TOUGH, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_TOUGH, &gBattleBufferA[gActiveBank][3]); break; case 54: - SetMonData(&gPlayerParty[a], MON_DATA_SHEEN, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SHEEN, &gBattleBufferA[gActiveBank][3]); break; case 55: - SetMonData(&gPlayerParty[a], MON_DATA_COOL_RIBBON, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_COOL_RIBBON, &gBattleBufferA[gActiveBank][3]); break; case 56: - SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY_RIBBON, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_BEAUTY_RIBBON, &gBattleBufferA[gActiveBank][3]); break; case 57: - SetMonData(&gPlayerParty[a], MON_DATA_CUTE_RIBBON, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_CUTE_RIBBON, &gBattleBufferA[gActiveBank][3]); break; case 58: - SetMonData(&gPlayerParty[a], MON_DATA_SMART_RIBBON, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_SMART_RIBBON, &gBattleBufferA[gActiveBank][3]); break; case 59: - SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gUnknown_02023A60[gUnknown_02024A60][3]); + SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]); break; } - sub_80324F8(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], gUnknown_02024A60); + sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); } void sub_811F664(void) @@ -987,37 +987,37 @@ void sub_811F664(void) u8 *dst; u8 i; - dst = (u8 *)&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]] + gUnknown_02023A60[gUnknown_02024A60][1]; - for (i = 0; i < gUnknown_02023A60[gUnknown_02024A60][2]; i++) - dst[i] = gUnknown_02023A60[gUnknown_02024A60][3 + i]; - dp01_tbl3_exec_completed(); + dst = (u8 *)&gPlayerParty[gBattlePartyID[gActiveBank]] + gBattleBufferA[gActiveBank][1]; + for (i = 0; i < gBattleBufferA[gActiveBank][2]; i++) + dst[i] = gBattleBufferA[gActiveBank][3 + i]; + LinkPartnerBufferExecCompleted(); } void sub_811F6D8(void) { - sub_80318FC(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], gUnknown_02024A60); + sub_80318FC(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); GetMonSpriteTemplate_803C56C( - GetMonData(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], MON_DATA_SPECIES), - battle_get_per_side_status(gUnknown_02024A60)); - gUnknown_02024BE0[gUnknown_02024A60] = CreateSprite( + GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES), + GetBankIdentity(gActiveBank)); + gObjectBankIDs[gActiveBank] = CreateSprite( &gUnknown_02024E8C, - sub_8077ABC(gUnknown_02024A60, 2), - sub_8077F68(gUnknown_02024A60), - sub_8079E90(gUnknown_02024A60)); - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].pos2.x = -240; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data0 = gUnknown_02024A60; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].oam.paletteNum = gUnknown_02024A60; - StartSpriteAnim(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]], gBattleMonForms[gUnknown_02024A60]); - gUnknown_03004330[gUnknown_02024A60] = sub_811DDE8; + sub_8077ABC(gActiveBank, 2), + sub_8077F68(gActiveBank), + sub_8079E90(gActiveBank)); + gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; + gSprites[gObjectBankIDs[gActiveBank]].data0 = gActiveBank; + gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; + StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], gBattleMonForms[gActiveBank]); + gBattleBankFunc[gActiveBank] = sub_811DDE8; } void sub_811F7F4(void) { - sub_8032AA8(gUnknown_02024A60, gUnknown_02023A60[gUnknown_02024A60][2]); - gUnknown_02024A6A[gUnknown_02024A60] = gUnknown_02023A60[gUnknown_02024A60][1]; - sub_80318FC(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], gUnknown_02024A60); - sub_811F864(gUnknown_02024A60, gUnknown_02023A60[gUnknown_02024A60][2]); - gUnknown_03004330[gUnknown_02024A60] = sub_811E1BC; + sub_8032AA8(gActiveBank, gBattleBufferA[gActiveBank][2]); + gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1]; + sub_80318FC(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + sub_811F864(gActiveBank, gBattleBufferA[gActiveBank][2]); + gBattleBankFunc[gActiveBank] = sub_811E1BC; } void sub_811F864(u8 a, u8 b) @@ -1025,56 +1025,56 @@ void sub_811F864(u8 a, u8 b) u16 species; sub_8032AA8(a, b); - gUnknown_02024A6A[a] = gUnknown_02023A60[a][1]; - species = GetMonData(&gPlayerParty[gUnknown_02024A6A[a]], MON_DATA_SPECIES); + gBattlePartyID[a] = gBattleBufferA[a][1]; + species = GetMonData(&gPlayerParty[gBattlePartyID[a]], MON_DATA_SPECIES); gUnknown_0300434C[a] = CreateInvisibleSpriteWithCallback(sub_80312F0); - GetMonSpriteTemplate_803C56C(species, battle_get_per_side_status(a)); - gUnknown_02024BE0[a] = CreateSprite( + GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a)); + gObjectBankIDs[a] = CreateSprite( &gUnknown_02024E8C, sub_8077ABC(a, 2), sub_8077F68(a), sub_8079E90(a)); - gSprites[gUnknown_0300434C[a]].data1 = gUnknown_02024BE0[a]; - gSprites[gUnknown_02024BE0[a]].data0 = a; - gSprites[gUnknown_02024BE0[a]].data2 = species; - gSprites[gUnknown_02024BE0[a]].oam.paletteNum = a; - StartSpriteAnim(&gSprites[gUnknown_02024BE0[a]], gBattleMonForms[a]); - gSprites[gUnknown_02024BE0[a]].invisible = TRUE; - gSprites[gUnknown_02024BE0[a]].callback = SpriteCallbackDummy; + gSprites[gUnknown_0300434C[a]].data1 = gObjectBankIDs[a]; + gSprites[gObjectBankIDs[a]].data0 = a; + gSprites[gObjectBankIDs[a]].data2 = species; + gSprites[gObjectBankIDs[a]].oam.paletteNum = a; + StartSpriteAnim(&gSprites[gObjectBankIDs[a]], gBattleMonForms[a]); + gSprites[gObjectBankIDs[a]].invisible = TRUE; + gSprites[gObjectBankIDs[a]].callback = SpriteCallbackDummy; gSprites[gUnknown_0300434C[a]].data0 = sub_8046400(0, 0xFF); } void sub_811F9D0(void) { - if (gUnknown_02023A60[gUnknown_02024A60][1] == 0) + if (gBattleBufferA[gActiveBank][1] == 0) { - ewram17810[gUnknown_02024A60].unk4 = 0; - gUnknown_03004330[gUnknown_02024A60] = sub_811FA5C; + ewram17810[gActiveBank].unk4 = 0; + gBattleBankFunc[gActiveBank] = sub_811FA5C; } else { - FreeSpriteOamMatrix(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - DestroySprite(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - sub_8043DB0(gUnknown_03004340[gUnknown_02024A60]); - dp01_tbl3_exec_completed(); + FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]); + DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]); + sub_8043DB0(gHealthboxIDs[gActiveBank]); + LinkPartnerBufferExecCompleted(); } } void sub_811FA5C(void) { - switch (ewram17810[gUnknown_02024A60].unk4) + switch (ewram17810[gActiveBank].unk4) { case 0: - if (ewram17800[gUnknown_02024A60].unk0_2) - move_anim_start_t4(gUnknown_02024A60, gUnknown_02024A60, gUnknown_02024A60, 5); - ewram17810[gUnknown_02024A60].unk4 = 1; + if (ewram17800[gActiveBank].unk0_2) + move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5); + ewram17810[gActiveBank].unk4 = 1; break; case 1: - if (!ewram17810[gUnknown_02024A60].unk0_6) + if (!ewram17810[gActiveBank].unk0_6) { - ewram17810[gUnknown_02024A60].unk4 = 0; - move_anim_start_t4(gUnknown_02024A60, gUnknown_02024A60, gUnknown_02024A60, 1); - gUnknown_03004330[gUnknown_02024A60] = sub_811DF34; + ewram17810[gActiveBank].unk4 = 0; + move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 1); + gBattleBankFunc[gActiveBank] = sub_811DF34; } break; } @@ -1087,138 +1087,138 @@ void sub_811FAE4(void) if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - if (battle_get_per_side_status(gUnknown_02024A60) & 2) + if (GetBankIdentity(gActiveBank) & 2) xOffset = 16; else xOffset = -16; - gender = gLinkPlayers[sub_803FC34(gUnknown_02024A60)].gender; + gender = gLinkPlayers[sub_803FC34(gActiveBank)].gender; } else { xOffset = 0; gender = gLinkPlayers[GetMultiplayerId() ^ 1].gender; } - sub_8031AF4(gender, gUnknown_02024A60); - GetMonSpriteTemplate_803C5A0(gender, battle_get_per_side_status(gUnknown_02024A60)); - gUnknown_02024BE0[gUnknown_02024A60] = CreateSprite( + sub_8031AF4(gender, gActiveBank); + GetMonSpriteTemplate_803C5A0(gender, GetBankIdentity(gActiveBank)); + gObjectBankIDs[gActiveBank] = CreateSprite( &gUnknown_02024E8C, 80 + xOffset, 80 + 4 * (8 - gTrainerBackPicCoords[gender].coords), - sub_8079E90(gUnknown_02024A60)); - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].oam.paletteNum = gUnknown_02024A60; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].pos2.x = 240; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data0 = -2; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].callback = sub_80313A0; - gUnknown_03004330[gUnknown_02024A60] = sub_811DAE4; + sub_8079E90(gActiveBank)); + gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; + gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240; + gSprites[gObjectBankIDs[gActiveBank]].data0 = -2; + gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; + gBattleBankFunc[gActiveBank] = sub_811DAE4; } void sub_811FC30(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_811FC3C(void) { - oamt_add_pos2_onto_pos1(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data0 = 35; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data2 = -40; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data4 = gSprites[gUnknown_02024BE0[gUnknown_02024A60]].pos1.y; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].callback = sub_8078B34; - oamt_set_x3A_32(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]], SpriteCallbackDummy); - gUnknown_03004330[gUnknown_02024A60] = sub_811DB1C; + oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); + gSprites[gObjectBankIDs[gActiveBank]].data0 = 35; + gSprites[gObjectBankIDs[gActiveBank]].data2 = -40; + gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; + oamt_set_x3A_32(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy); + gBattleBankFunc[gActiveBank] = sub_811DB1C; } void sub_811FCE8(void) { - if (ewram17810[gUnknown_02024A60].unk4 == 0) + if (ewram17810[gActiveBank].unk4 == 0) { - if (ewram17800[gUnknown_02024A60].unk0_2) - move_anim_start_t4(gUnknown_02024A60, gUnknown_02024A60, gUnknown_02024A60, 5); - ewram17810[gUnknown_02024A60].unk4++; + if (ewram17800[gActiveBank].unk0_2) + move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5); + ewram17810[gActiveBank].unk4++; } - else if (!ewram17810[gUnknown_02024A60].unk0_6) + else if (!ewram17810[gActiveBank].unk0_6) { - ewram17810[gUnknown_02024A60].unk4 = 0; - sub_80324F8(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], gUnknown_02024A60); + ewram17810[gActiveBank].unk4 = 0; + sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); PlaySE12WithPanning(SE_POKE_DEAD, -64); - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data1 = 0; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data2 = 5; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].callback = sub_80105EC; - gUnknown_03004330[gUnknown_02024A60] = sub_811DE98; + gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; + gSprites[gObjectBankIDs[gActiveBank]].data2 = 5; + gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80105EC; + gBattleBankFunc[gActiveBank] = sub_811DE98; } } void sub_811FDCC(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_811FDD8(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_811FDE4(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_811FDF0(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_811FDFC(void) { - if (mplay_80342A4(gUnknown_02024A60) == 0) + if (mplay_80342A4(gActiveBank) == 0) { - u32 r0 = gUnknown_02023A60[gUnknown_02024A60][1] - | (gUnknown_02023A60[gUnknown_02024A60][2] << 8); - - gUnknown_0202F7C4 = gUnknown_02023A60[gUnknown_02024A60][3]; - gUnknown_0202F7BC = gUnknown_02023A60[gUnknown_02024A60][4] - | (gUnknown_02023A60[gUnknown_02024A60][5] << 8); - gUnknown_0202F7B8 = gUnknown_02023A60[gUnknown_02024A60][6] - | (gUnknown_02023A60[gUnknown_02024A60][7] << 8) - | (gUnknown_02023A60[gUnknown_02024A60][8] << 16) - | (gUnknown_02023A60[gUnknown_02024A60][9] << 24); - gUnknown_0202F7BE = gUnknown_02023A60[gUnknown_02024A60][10]; - gUnknown_0202F7C0 = gUnknown_02023A60[gUnknown_02024A60][12] - | (gUnknown_02023A60[gUnknown_02024A60][13] << 8); - gUnknown_0202F7B4 = (u32 *)&gUnknown_02023A60[gUnknown_02024A60][16]; - gUnknown_02024E70[gUnknown_02024A60] = *gUnknown_0202F7B4; + u32 r0 = gBattleBufferA[gActiveBank][1] + | (gBattleBufferA[gActiveBank][2] << 8); + + gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3]; + gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4] + | (gBattleBufferA[gActiveBank][5] << 8); + gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6] + | (gBattleBufferA[gActiveBank][7] << 8) + | (gBattleBufferA[gActiveBank][8] << 16) + | (gBattleBufferA[gActiveBank][9] << 24); + gHappinessMoveAnim = gBattleBufferA[gActiveBank][10]; + gWeatherMoveAnim = gBattleBufferA[gActiveBank][12] + | (gBattleBufferA[gActiveBank][13] << 8); + gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16]; + gPID_perBank[gActiveBank] = *gDisableStructMoveAnim; if (sub_8031720(r0, gUnknown_0202F7C4) != 0) - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); else { - ewram17810[gUnknown_02024A60].unk4 = 0; - gUnknown_03004330[gUnknown_02024A60] = sub_811FF30; + ewram17810[gActiveBank].unk4 = 0; + gBattleBankFunc[gActiveBank] = sub_811FF30; } } } void sub_811FF30(void) { - u16 r4 = gUnknown_02023A60[gUnknown_02024A60][1] - | (gUnknown_02023A60[gUnknown_02024A60][2] << 8); - u8 r7 = gUnknown_02023A60[gUnknown_02024A60][11]; + u16 r4 = gBattleBufferA[gActiveBank][1] + | (gBattleBufferA[gActiveBank][2] << 8); + u8 r7 = gBattleBufferA[gActiveBank][11]; - switch (ewram17810[gUnknown_02024A60].unk4) + switch (ewram17810[gActiveBank].unk4) { case 0: - if (ewram17800[gUnknown_02024A60].unk0_2 && !ewram17800[gUnknown_02024A60].unk0_3) + if (ewram17800[gActiveBank].unk0_2 && !ewram17800[gActiveBank].unk0_3) { - ewram17800[gUnknown_02024A60].unk0_3 = 1; - move_anim_start_t4(gUnknown_02024A60, gUnknown_02024A60, gUnknown_02024A60, 5); + ewram17800[gActiveBank].unk0_3 = 1; + move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5); } - ewram17810[gUnknown_02024A60].unk4 = 1; + ewram17810[gActiveBank].unk4 = 1; break; case 1: - if (!ewram17810[gUnknown_02024A60].unk0_6) + if (!ewram17810[gActiveBank].unk0_6) { sub_80326EC(0); ExecuteMoveAnim(r4); - ewram17810[gUnknown_02024A60].unk4 = 2; + ewram17810[gActiveBank].unk4 = 2; } break; case 2: @@ -1226,23 +1226,23 @@ void sub_811FF30(void) if (!gAnimScriptActive) { sub_80326EC(1); - if ((ewram17800[gUnknown_02024A60].unk0_2) && r7 <= 1) + if ((ewram17800[gActiveBank].unk0_2) && r7 <= 1) { - move_anim_start_t4(gUnknown_02024A60, gUnknown_02024A60, gUnknown_02024A60, 6); - ewram17800[gUnknown_02024A60].unk0_3 = 0; + move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6); + ewram17800[gActiveBank].unk0_3 = 0; } - ewram17810[gUnknown_02024A60].unk4 = 3; + ewram17810[gActiveBank].unk4 = 3; } break; case 3: - if (!ewram17810[gUnknown_02024A60].unk0_6) + if (!ewram17810[gActiveBank].unk0_6) { sub_8031F24(); sub_80324BC( - gUnknown_02024A60, - gUnknown_02023A60[gUnknown_02024A60][1] | (gUnknown_02023A60[gUnknown_02024A60][2] << 8)); - ewram17810[gUnknown_02024A60].unk4 = 0; - dp01_tbl3_exec_completed(); + gActiveBank, + gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8)); + ewram17810[gActiveBank].unk4 = 0; + LinkPartnerBufferExecCompleted(); } break; } @@ -1252,215 +1252,215 @@ void sub_8120094(void) { gUnknown_030042A4 = 0; gUnknown_030042A0 = 0; - sub_8120AA8(*(u16 *)&gUnknown_02023A60[gUnknown_02024A60][2]); - sub_8002EB0(&gUnknown_03004210, gUnknown_020238CC, 144, 2, 15); - gUnknown_03004330[gUnknown_02024A60] = sub_811DFA0; + BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); + sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + gBattleBankFunc[gActiveBank] = sub_811DFA0; } void sub_81200F8(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120104(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120110(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_812011C(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120128(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120134(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120140(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } -void sub_812014C(void) +void LinkPartnerHandleHealthBarUpdate(void) { s16 r7; load_gfxc_health_bar(0); - r7 = gUnknown_02023A60[gUnknown_02024A60][2] | (gUnknown_02023A60[gUnknown_02024A60][3] << 8); + r7 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8); if (r7 != 0x7FFF) { - u32 maxHP = GetMonData(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], MON_DATA_MAX_HP); - u32 hp = GetMonData(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], MON_DATA_HP); + u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP); + u32 hp = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_HP); - sub_8043D84(gUnknown_02024A60, gUnknown_03004340[gUnknown_02024A60], maxHP, hp, r7); + sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, hp, r7); } else { - u32 maxHP = GetMonData(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], MON_DATA_MAX_HP); + u32 maxHP = GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MAX_HP); - sub_8043D84(gUnknown_02024A60, gUnknown_03004340[gUnknown_02024A60], maxHP, 0, r7); + sub_8043D84(gActiveBank, gHealthboxIDs[gActiveBank], maxHP, 0, r7); } - gUnknown_03004330[gUnknown_02024A60] = bx_t3_healthbar_update; + gBattleBankFunc[gActiveBank] = bx_t3_healthbar_update; } -void sub_812023C(void) +void LinkPartnerHandleExpBarUpdate(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } -void sub_8120248(void) +void LinkPartnerHandleStatusIconUpdate(void) { - if (mplay_80342A4(gUnknown_02024A60) == 0) + if (mplay_80342A4(gActiveBank) == 0) { - sub_8045A5C(gUnknown_03004340[gUnknown_02024A60], &gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], 9); - ewram17810[gUnknown_02024A60].unk0_4 = 0; - gUnknown_03004330[gUnknown_02024A60] = sub_811E38C; + sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 9); + ewram17810[gActiveBank].unk0_4 = 0; + gBattleBankFunc[gActiveBank] = sub_811E38C; } } -void sub_81202BC(void) +void LinkPartnerHandleStatusAnimation(void) { - if (mplay_80342A4(gUnknown_02024A60) == 0) + if (mplay_80342A4(gActiveBank) == 0) { move_anim_start_t2_for_situation( - gUnknown_02023A60[gUnknown_02024A60][1], - gUnknown_02023A60[gUnknown_02024A60][2] - | (gUnknown_02023A60[gUnknown_02024A60][3] << 8) - | (gUnknown_02023A60[gUnknown_02024A60][4] << 16) - | (gUnknown_02023A60[gUnknown_02024A60][5] << 24)); - gUnknown_03004330[gUnknown_02024A60] = sub_811E38C; + gBattleBufferA[gActiveBank][1], + gBattleBufferA[gActiveBank][2] + | (gBattleBufferA[gActiveBank][3] << 8) + | (gBattleBufferA[gActiveBank][4] << 16) + | (gBattleBufferA[gActiveBank][5] << 24)); + gBattleBankFunc[gActiveBank] = sub_811E38C; } } void sub_8120324(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120330(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_812033C(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120348(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120354(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120360(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_812036C(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120378(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120384(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120390(void) { gUnknown_020238C8.unk0_0 = 0; - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_81203AC(void) { - gUnknown_020238C8.unk0_0 = gUnknown_02023A60[gUnknown_02024A60][1]; - dp01_tbl3_exec_completed(); + gUnknown_020238C8.unk0_0 = gBattleBufferA[gActiveBank][1]; + LinkPartnerBufferExecCompleted(); } void sub_81203E4(void) { gUnknown_020238C8.unk0_7 = 0; - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_81203FC(void) { gUnknown_020238C8.unk0_7 ^= 1; - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } -void dp01t_29_3_blink(void) +void LinkPartnerHandleHitAnimation(void) { - if (gSprites[gUnknown_02024BE0[gUnknown_02024A60]].invisible == TRUE) - dp01_tbl3_exec_completed(); + if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE) + LinkPartnerBufferExecCompleted(); else { - gUnknown_02024E6D = 1; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data1 = 0; - sub_8047858(gUnknown_02024A60); - gUnknown_03004330[gUnknown_02024A60] = bx_blink_t3; + gDoingBattleAnim = 1; + gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; + sub_8047858(gActiveBank); + gBattleBankFunc[gActiveBank] = bx_blink_t3; } } void sub_8120494(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } -void sub_81204A0(void) +void LinkPartnerHandleEffectivenessSound(void) { s8 pan; - if (battle_side_get_owner(gUnknown_02024A60) == 0) + if (GetBankSide(gActiveBank) == 0) pan = -64; else pan = 63; - PlaySE12WithPanning(gUnknown_02023A60[gUnknown_02024A60][1] | (gUnknown_02023A60[gUnknown_02024A60][2] << 8), pan); - dp01_tbl3_exec_completed(); + PlaySE12WithPanning(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8), pan); + LinkPartnerBufferExecCompleted(); } void sub_81204E4(void) { - PlayFanfare(gUnknown_02023A60[gUnknown_02024A60][1] | (gUnknown_02023A60[gUnknown_02024A60][2] << 8)); - dp01_tbl3_exec_completed(); + PlayFanfare(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8)); + LinkPartnerBufferExecCompleted(); } -void sub_8120514(void) +void LinkPartnerHandleFaintingCry(void) { PlayCry3( - GetMonData(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], MON_DATA_SPECIES), + GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES), -25, 5); - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void dp01t_2E_3_battle_intro(void) { - sub_80E43C0(gUnknown_02023A60[gUnknown_02024A60][1]); + sub_80E43C0(gBattleBufferA[gActiveBank][1]); gUnknown_02024DE8 |= 1; - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120588(void) @@ -1468,25 +1468,25 @@ void sub_8120588(void) u8 r4; u8 taskId; - oamt_add_pos2_onto_pos1(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]]); - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data0 = 50; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data2 = -40; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data4 = gSprites[gUnknown_02024BE0[gUnknown_02024A60]].pos1.y; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].callback = sub_8078B34; - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].data5 = gUnknown_02024A60; - oamt_set_x3A_32(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]], sub_8030E38); - StartSpriteAnim(&gSprites[gUnknown_02024BE0[gUnknown_02024A60]], 1); + oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); + gSprites[gObjectBankIDs[gActiveBank]].data0 = 50; + gSprites[gObjectBankIDs[gActiveBank]].data2 = -40; + gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; + gSprites[gObjectBankIDs[gActiveBank]].data5 = gActiveBank; + oamt_set_x3A_32(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38); + StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1); r4 = AllocSpritePalette(0xD6F9); LoadCompressedPalette( - gTrainerBackPicPaletteTable[gLinkPlayers[sub_803FC34(gUnknown_02024A60)].gender].data, + gTrainerBackPicPaletteTable[gLinkPlayers[sub_803FC34(gActiveBank)].gender].data, 0x100 + r4 * 16, 0x20); - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].oam.paletteNum = r4; + gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = r4; taskId = CreateTask(sub_812071C, 5); - gTasks[taskId].data[0] = gUnknown_02024A60; - if (ewram17810[gUnknown_02024A60].unk0_0) - gTasks[gUnknown_02024E68[gUnknown_02024A60]].func = sub_8044CA0; + gTasks[taskId].data[0] = gActiveBank; + if (ewram17810[gActiveBank].unk0_0) + gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0; ewram17840.unk9_0 = 1; - gUnknown_03004330[gUnknown_02024A60] = nullsub_74; + gBattleBankFunc[gActiveBank] = nullsub_74; } void sub_812071C(u8 taskId) @@ -1499,111 +1499,111 @@ void sub_812071C(u8 taskId) return; } - r9 = gUnknown_02024A60; - gUnknown_02024A60 = gTasks[taskId].data[0]; + r9 = gActiveBank; + gActiveBank = gTasks[taskId].data[0]; if (!IsDoubleBattle() || (gBattleTypeFlags & BATTLE_TYPE_MULTI)) { - gUnknown_02023A60[gUnknown_02024A60][1] = gUnknown_02024A6A[gUnknown_02024A60]; - sub_811F864(gUnknown_02024A60, 0); + gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank]; + sub_811F864(gActiveBank, 0); } else { - gUnknown_02023A60[gUnknown_02024A60][1] = gUnknown_02024A6A[gUnknown_02024A60]; - sub_811F864(gUnknown_02024A60, 0); - gUnknown_02024A60 ^= 2; - gUnknown_02023A60[gUnknown_02024A60][1] = gUnknown_02024A6A[gUnknown_02024A60]; - sub_80318FC(&gPlayerParty[gUnknown_02024A6A[gUnknown_02024A60]], gUnknown_02024A60); - sub_811F864(gUnknown_02024A60, 0); - gUnknown_02024A60 ^= 2; + gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank]; + sub_811F864(gActiveBank, 0); + gActiveBank ^= 2; + gBattleBufferA[gActiveBank][1] = gBattlePartyID[gActiveBank]; + sub_80318FC(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + sub_811F864(gActiveBank, 0); + gActiveBank ^= 2; } - gUnknown_03004330[gUnknown_02024A60] = sub_811DCA0; - gUnknown_02024A60 = r9; + gBattleBankFunc[gActiveBank] = sub_811DCA0; + gActiveBank = r9; DestroyTask(taskId); } void dp01t_30_3_80EB11C(void) { - if (gUnknown_02023A60[gUnknown_02024A60][1] != 0 && battle_side_get_owner(gUnknown_02024A60) == 0) + if (gBattleBufferA[gActiveBank][1] != 0 && GetBankSide(gActiveBank) == 0) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); return; } - ewram17810[gUnknown_02024A60].unk0_0 = 1; - gUnknown_02024E68[gUnknown_02024A60] = sub_8044804( - gUnknown_02024A60, - (struct BattleInterfaceStruct2 *)&gUnknown_02023A60[gUnknown_02024A60][4], - gUnknown_02023A60[gUnknown_02024A60][1], - gUnknown_02023A60[gUnknown_02024A60][2]); - ewram17810[gUnknown_02024A60].unk5 = 0; - if (gUnknown_02023A60[gUnknown_02024A60][2] != 0) - ewram17810[gUnknown_02024A60].unk5 = 0x5D; - gUnknown_03004330[gUnknown_02024A60] = sub_81208E0; + ewram17810[gActiveBank].unk0_0 = 1; + gUnknown_02024E68[gActiveBank] = sub_8044804( + gActiveBank, + (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBank][4], + gBattleBufferA[gActiveBank][1], + gBattleBufferA[gActiveBank][2]); + ewram17810[gActiveBank].unk5 = 0; + if (gBattleBufferA[gActiveBank][2] != 0) + ewram17810[gActiveBank].unk5 = 0x5D; + gBattleBankFunc[gActiveBank] = sub_81208E0; } void sub_81208E0(void) { - if (ewram17810[gUnknown_02024A60].unk5++ >= 93) + if (ewram17810[gActiveBank].unk5++ >= 93) { - ewram17810[gUnknown_02024A60].unk5 = 0; - dp01_tbl3_exec_completed(); + ewram17810[gActiveBank].unk5 = 0; + LinkPartnerBufferExecCompleted(); } } void sub_8120920(void) { - if (ewram17810[gUnknown_02024A60].unk0_0) - gTasks[gUnknown_02024E68[gUnknown_02024A60]].func = sub_8044CA0; - dp01_tbl3_exec_completed(); + if (ewram17810[gActiveBank].unk0_0) + gTasks[gUnknown_02024E68[gActiveBank]].func = sub_8044CA0; + LinkPartnerBufferExecCompleted(); } void sub_812096C(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120978(void) { - if (sub_8078874(gUnknown_02024A60) != 0) + if (sub_8078874(gActiveBank) != 0) { - gSprites[gUnknown_02024BE0[gUnknown_02024A60]].invisible = gUnknown_02023A60[gUnknown_02024A60][1]; - sub_8031F88(gUnknown_02024A60); + gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1]; + sub_8031F88(gActiveBank); } - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_81209D8(void) { - if (mplay_80342A4(gUnknown_02024A60) == 0) + if (mplay_80342A4(gActiveBank) == 0) { - u8 r3 = gUnknown_02023A60[gUnknown_02024A60][1]; - u16 r4 = gUnknown_02023A60[gUnknown_02024A60][2] | (gUnknown_02023A60[gUnknown_02024A60][3] << 8); - u8 var = gUnknown_02024A60; + u8 r3 = gBattleBufferA[gActiveBank][1]; + u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8); + u8 var = gActiveBank; if (move_anim_start_t3(var, var, var, r3, r4) != 0) - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); else - gUnknown_03004330[gUnknown_02024A60] = sub_811E3B8; + gBattleBankFunc[gActiveBank] = sub_811E3B8; } } void sub_8120A40(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120A4C(void) { - dp01_tbl3_exec_completed(); + LinkPartnerBufferExecCompleted(); } void sub_8120A58(void) { - gUnknown_02024D26 = gUnknown_02023A60[gUnknown_02024A60][1]; + gBattleOutcome = gBattleBufferA[gActiveBank][1]; FadeOutMapMusic(5); BeginFastPaletteFade(3); - dp01_tbl3_exec_completed(); - gUnknown_03004330[gUnknown_02024A60] = sub_811E29C; + LinkPartnerBufferExecCompleted(); + gBattleBankFunc[gActiveBank] = sub_811E29C; } void nullsub_75(void) diff --git a/src/battle_ai.c b/src/battle_ai.c index cb8023251..fabe0b61d 100644 --- a/src/battle_ai.c +++ b/src/battle_ai.c @@ -14,22 +14,22 @@ extern u16 gBattleTypeFlags; extern u16 gBattleWeather; -extern u8 gUnknown_02024A60; -extern u8 gUnknown_02024A6A[][2]; -extern u16 gUnknown_02024BE6; +extern u8 gActiveBank; +extern u8 gBattlePartyID[][2]; +extern u16 gCurrentMove; extern int gBattleMoveDamage; -extern u8 gPlayerMonIndex; -extern u8 gEnemyMonIndex; -extern u8 gUnknown_02024C0C; +extern u8 gBankAttacker; +extern u8 gBankTarget; +extern u8 gAbsentBankFlags; extern u8 gBattleMoveFlags; -extern u16 gUnknown_02024DEC; -extern u16 gUnknown_02024C34[]; +extern u16 gDynamicBasePower; +extern u16 gLastUsedMove[]; extern u32 gUnknown_02024ACC[]; -extern u32 gUnknown_02024C98[]; -extern u16 gUnknown_02024C7A[]; +extern u32 gStatuses3[]; +extern u16 gSideAffecting[]; extern struct BattlePokemon gBattleMons[]; extern struct BattlePokemon gUnknown_02024A8C[]; -extern u8 gUnknown_030042E0[]; +extern u8 gBattleResults[]; extern u8 gCritMultiplier; extern u16 gTrainerBattleOpponent; extern u8 *BattleAIs[]; @@ -296,7 +296,7 @@ void BattleAI_SetupAIData(void) for (i = 0; i < MAX_MON_MOVES; i++) AI_THINKING_STRUCT->score[i] = 100; - r7 = sub_8015A98(gUnknown_02024A60, 0, 0xFF); + r7 = sub_8015A98(gActiveBank, 0, 0xFF); // probably sets up the moves to consider and ignores non-valid moves such as NO_MOVE or glitch moves. for (i = 0; i < MAX_MON_MOVES; i++) @@ -309,17 +309,17 @@ void BattleAI_SetupAIData(void) // clear AI stack. AI_STACK->size = 0; - gPlayerMonIndex = gUnknown_02024A60; + gBankAttacker = gActiveBank; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - gEnemyMonIndex = Random() & 2; // just pick somebody to target. + gBankTarget = Random() & 2; // just pick somebody to target. - if (gUnknown_02024C0C & gBitTable[gEnemyMonIndex]) - gEnemyMonIndex ^= 2; + if (gAbsentBankFlags & gBitTable[gBankTarget]) + gBankTarget ^= 2; } else - gEnemyMonIndex = gUnknown_02024A60 ^ 1; + gBankTarget = gActiveBank ^ 1; // special AI flag cases. if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) @@ -394,13 +394,13 @@ void BattleAI_DoAIProcessing(void) break; case AIState_SettingUp: gAIScriptPtr = BattleAIs[AI_THINKING_STRUCT->aiLogicId]; // set the AI ptr. - if (gBattleMons[gPlayerMonIndex].pp[AI_THINKING_STRUCT->movesetIndex] == 0) + if (gBattleMons[gBankAttacker].pp[AI_THINKING_STRUCT->movesetIndex] == 0) { AI_THINKING_STRUCT->moveConsidered = MOVE_NONE; // don't consider a move you have 0 PP for, idiot. } else { - AI_THINKING_STRUCT->moveConsidered = gBattleMons[gPlayerMonIndex].moves[AI_THINKING_STRUCT->movesetIndex]; + AI_THINKING_STRUCT->moveConsidered = gBattleMons[gBankAttacker].moves[AI_THINKING_STRUCT->movesetIndex]; } AI_THINKING_STRUCT->aiState++; break; @@ -433,9 +433,9 @@ void sub_810745C(void) for (i = 0; i < 8; i++) { - if (UNK_2016A00_STRUCT->movesUsed[gEnemyMonIndex >> 1][i] == 0) + if (UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] == 0) { - UNK_2016A00_STRUCT->movesUsed[gEnemyMonIndex >> 1][i] = gUnknown_02024C34[gEnemyMonIndex]; + UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] = gLastUsedMove[gBankTarget]; return; } } @@ -451,14 +451,14 @@ void unref_sub_81074A0(u8 a) void sub_81074C4(u8 a, u8 b) { - if (battle_side_get_owner(a) == 0) - UNK_2016A00_STRUCT->unk20[battle_get_per_side_status(a) & 1] = b; + if (GetBankSide(a) == 0) + UNK_2016A00_STRUCT->unk20[GetBankIdentity(a) & 1] = b; } void sub_81074F8(u8 a, u8 b) { - if (battle_side_get_owner(a) == 0) - UNK_2016A00_STRUCT->unk22[battle_get_per_side_status(a) & 1] = b; + if (GetBankSide(a) == 0) + UNK_2016A00_STRUCT->unk22[GetBankIdentity(a) & 1] = b; } static void BattleAICmd_if_random_less_than(void) @@ -508,9 +508,9 @@ static void BattleAICmd_if_hp_less_than(void) u16 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) < gAIScriptPtr[2]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); @@ -523,9 +523,9 @@ static void BattleAICmd_if_hp_more_than(void) u16 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) > gAIScriptPtr[2]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); @@ -538,9 +538,9 @@ static void BattleAICmd_if_hp_equal(void) u16 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) == gAIScriptPtr[2]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); @@ -553,9 +553,9 @@ static void BattleAICmd_if_hp_not_equal(void) u16 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) != gAIScriptPtr[2]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); @@ -569,9 +569,9 @@ static void BattleAICmd_if_status(void) u32 arg; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); @@ -587,9 +587,9 @@ static void BattleAICmd_if_not_status(void) u32 arg; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); @@ -605,9 +605,9 @@ static void BattleAICmd_if_status2(void) u32 arg; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); @@ -623,9 +623,9 @@ static void BattleAICmd_if_not_status2(void) u32 arg; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); @@ -641,13 +641,13 @@ static void BattleAICmd_if_status3(void) u32 arg; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); - if ((gUnknown_02024C98[index] & arg) != 0) + if ((gStatuses3[index] & arg) != 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -659,13 +659,13 @@ static void BattleAICmd_if_not_status3(void) u32 arg; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); - if ((gUnknown_02024C98[index] & arg) == 0) + if ((gStatuses3[index] & arg) == 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -677,14 +677,14 @@ static void BattleAICmd_if_status4(void) u32 arg1, arg2; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; - arg1 = battle_get_per_side_status(index) & 1; + arg1 = GetBankIdentity(index) & 1; arg2 = AIScriptRead32(gAIScriptPtr + 2); - if ((gUnknown_02024C7A[arg1] & arg2) != 0) + if ((gSideAffecting[arg1] & arg2) != 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -696,14 +696,14 @@ static void BattleAICmd_if_not_status4(void) u32 arg1, arg2; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; - arg1 = battle_get_per_side_status(index) & 1; + arg1 = GetBankIdentity(index) & 1; arg2 = AIScriptRead32(gAIScriptPtr + 2); - if ((gUnknown_02024C7A[arg1] & arg2) == 0) + if ((gSideAffecting[arg1] & arg2) == 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -871,8 +871,8 @@ static void BattleAICmd_if_user_can_damage(void) for (i = 0; i < MAX_MON_MOVES; i++) { - if (gBattleMons[gPlayerMonIndex].moves[i] != 0 - && gBattleMoves[gBattleMons[gPlayerMonIndex].moves[i]].power != 0) + if (gBattleMons[gBankAttacker].moves[i] != 0 + && gBattleMoves[gBattleMons[gBankAttacker].moves[i]].power != 0) break; } if (i == MAX_MON_MOVES) @@ -887,8 +887,8 @@ static void BattleAICmd_if_user_cant_damage(void) for (i = 0; i < MAX_MON_MOVES; i++) { - if (gBattleMons[gPlayerMonIndex].moves[i] != 0 - && gBattleMoves[gBattleMons[gPlayerMonIndex].moves[i]].power != 0) + if (gBattleMons[gBankAttacker].moves[i] != 0 + && gBattleMoves[gBattleMons[gBankAttacker].moves[i]].power != 0) break; } if (i != MAX_MON_MOVES) @@ -899,7 +899,7 @@ static void BattleAICmd_if_user_cant_damage(void) static void BattleAICmd_get_turn_count(void) { - AI_THINKING_STRUCT->funcResult = gUnknown_030042E0[19]; + AI_THINKING_STRUCT->funcResult = gBattleResults[19]; gAIScriptPtr += 1; } @@ -908,16 +908,16 @@ static void BattleAICmd_get_type(void) switch (gAIScriptPtr[1]) { case 1: // player primary type - AI_THINKING_STRUCT->funcResult = gBattleMons[gPlayerMonIndex].type1; + AI_THINKING_STRUCT->funcResult = gBattleMons[gBankAttacker].type1; break; case 0: // enemy primary type - AI_THINKING_STRUCT->funcResult = gBattleMons[gEnemyMonIndex].type1; + AI_THINKING_STRUCT->funcResult = gBattleMons[gBankTarget].type1; break; case 3: // player secondary type - AI_THINKING_STRUCT->funcResult = gBattleMons[gPlayerMonIndex].type2; + AI_THINKING_STRUCT->funcResult = gBattleMons[gBankAttacker].type2; break; case 2: // enemy secondary type - AI_THINKING_STRUCT->funcResult = gBattleMons[gEnemyMonIndex].type2; + AI_THINKING_STRUCT->funcResult = gBattleMons[gBankTarget].type2; break; case 4: // type of move being pointed to AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].type; @@ -945,7 +945,7 @@ static void BattleAICmd_is_most_powerful_move(void) if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power > 1 && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF) { - gUnknown_02024DEC = 0; + gDynamicBasePower = 0; unk_2000000[0x1601C] = 0; // why is this a manual array? unk_2000000[0x1601F] = 1; gBattleMoveFlags = 0; @@ -955,18 +955,18 @@ static void BattleAICmd_is_most_powerful_move(void) { for (j = 0; sDiscouragedPowerfulMoveEffects[j] != 0xFFFF; j++) { // _08108276 - if (gBattleMoves[gBattleMons[gPlayerMonIndex].moves[i]].effect == sDiscouragedPowerfulMoveEffects[j]) + if (gBattleMoves[gBattleMons[gBankAttacker].moves[i]].effect == sDiscouragedPowerfulMoveEffects[j]) break; } // _081082BA - if (gBattleMons[gPlayerMonIndex].moves[i] + if (gBattleMons[gBankAttacker].moves[i] && sDiscouragedPowerfulMoveEffects[j] == 0xFFFF - && gBattleMoves[gBattleMons[gPlayerMonIndex].moves[i]].power > 1) + && gBattleMoves[gBattleMons[gBankAttacker].moves[i]].power > 1) { - gUnknown_02024BE6 = gBattleMons[gPlayerMonIndex].moves[i]; - sub_801CAF8(gPlayerMonIndex, gEnemyMonIndex); - move_effectiveness_something(gUnknown_02024BE6, gPlayerMonIndex, gEnemyMonIndex); + gCurrentMove = gBattleMons[gBankAttacker].moves[i]; + sub_801CAF8(gBankAttacker, gBankTarget); + move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget); damages[i] = (gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[i]) / 100; if (damages[i] == 0) // moves always do at least 1 damage. @@ -1049,7 +1049,7 @@ _08108240:\n\ beq _08108250\n\ b _081083B2\n\ _08108250:\n\ - ldr r0, _08108338 @ =gUnknown_02024DEC\n\ + ldr r0, _08108338 @ =gDynamicBasePower\n\ movs r1, 0\n\ strh r1, [r0]\n\ ldr r2, _0810833C @ =0xfffff81c\n\ @@ -1072,7 +1072,7 @@ _08108276:\n\ movs r3, 0\n\ ldr r5, _08108348 @ =gBattleMons\n\ lsls r4, r6, 1\n\ - ldr r7, _0810834C @ =gPlayerMonIndex\n\ + ldr r7, _0810834C @ =gBankAttacker\n\ lsls r1, r6, 2\n\ mov r8, r1\n\ adds r2, r6, 0x1\n\ @@ -1130,10 +1130,10 @@ _081082BA:\n\ ldrb r0, [r1, 0x1]\n\ cmp r0, 0x1\n\ bls _0810835C\n\ - ldr r5, _08108350 @ =gUnknown_02024BE6\n\ + ldr r5, _08108350 @ =gCurrentMove\n\ strh r2, [r5]\n\ ldrb r0, [r7]\n\ - ldr r4, _08108354 @ =gEnemyMonIndex\n\ + ldr r4, _08108354 @ =gBankTarget\n\ ldrb r1, [r4]\n\ bl sub_801CAF8\n\ ldrh r0, [r5]\n\ @@ -1162,14 +1162,14 @@ _08108328: .4byte sDiscouragedPowerfulMoveEffects\n\ _0810832C: .4byte 0x0000ffff\n\ _08108330: .4byte gBattleMoves\n\ _08108334: .4byte 0x02016800\n\ -_08108338: .4byte gUnknown_02024DEC\n\ +_08108338: .4byte gDynamicBasePower\n\ _0810833C: .4byte 0xfffff81c\n\ _08108340: .4byte gBattleMoveFlags\n\ _08108344: .4byte gCritMultiplier\n\ _08108348: .4byte gBattleMons\n\ -_0810834C: .4byte gPlayerMonIndex\n\ -_08108350: .4byte gUnknown_02024BE6\n\ -_08108354: .4byte gEnemyMonIndex\n\ +_0810834C: .4byte gBankAttacker\n\ +_08108350: .4byte gCurrentMove\n\ +_08108354: .4byte gBankTarget\n\ _08108358: .4byte gBattleMoveDamage\n\ _0810835C:\n\ mov r1, sp\n\ @@ -1243,9 +1243,9 @@ _081083D0: .4byte gAIScriptPtr\n\ static void BattleAICmd_get_move(void) { if (gAIScriptPtr[1] == USER) - AI_THINKING_STRUCT->funcResult = gUnknown_02024C34[gPlayerMonIndex]; + AI_THINKING_STRUCT->funcResult = gLastUsedMove[gBankAttacker]; else - AI_THINKING_STRUCT->funcResult = gUnknown_02024C34[gEnemyMonIndex]; + AI_THINKING_STRUCT->funcResult = gLastUsedMove[gBankTarget]; gAIScriptPtr += 2; } @@ -1268,7 +1268,7 @@ static void BattleAICmd_if_arg_not_equal(void) static void BattleAICmd_if_would_go_first(void) { - if (b_first_side(gPlayerMonIndex, gEnemyMonIndex, 1) == gAIScriptPtr[1]) + if (b_first_side(gBankAttacker, gBankTarget, 1) == gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1276,7 +1276,7 @@ static void BattleAICmd_if_would_go_first(void) static void BattleAICmd_if_would_not_go_first(void) { - if (b_first_side(gPlayerMonIndex, gEnemyMonIndex, 1) != gAIScriptPtr[1]) + if (b_first_side(gBankAttacker, gBankTarget, 1) != gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1300,11 +1300,11 @@ static void BattleAICmd_count_alive_pokemon(void) AI_THINKING_STRUCT->funcResult = 0; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; - if (battle_side_get_owner(index) == 0) + if (GetBankSide(index) == 0) party = gPlayerParty; else party = gEnemyParty; @@ -1312,14 +1312,14 @@ static void BattleAICmd_count_alive_pokemon(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { u32 status; - var = gUnknown_02024A6A[index][0]; - status = battle_get_per_side_status(index) ^ 2; - var2 = gUnknown_02024A6A[battle_get_side_with_given_state(status)][0]; + var = gBattlePartyID[index][0]; + status = GetBankIdentity(index) ^ 2; + var2 = gBattlePartyID[GetBankByPlayerAI(status)][0]; } else { - var = gUnknown_02024A6A[index][0]; - var2 = gUnknown_02024A6A[index][0]; + var = gBattlePartyID[index][0]; + var2 = gBattlePartyID[index][0]; } for (i = 0; i < 6; i++) @@ -1353,13 +1353,13 @@ static void BattleAICmd_get_ability(void) u8 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; - if (battle_side_get_owner(index) == TARGET) + if (GetBankSide(index) == TARGET) { - u16 unk = battle_get_per_side_status(index) & 1; + u16 unk = GetBankIdentity(index) & 1; if (UNK_2016A00_STRUCT->unk20[unk] != 0) { @@ -1414,7 +1414,7 @@ static void BattleAICmd_get_highest_possible_damage(void) { s32 i; - gUnknown_02024DEC = 0; + gDynamicBasePower = 0; BATTLE_STRUCT->unk.unk1 = 0; BATTLE_STRUCT->unk.unk4 = 1; gBattleMoveFlags = 0; @@ -1424,11 +1424,11 @@ static void BattleAICmd_get_highest_possible_damage(void) for (i = 0; i < MAX_MON_MOVES; i++) { gBattleMoveDamage = 40; - gUnknown_02024BE6 = gBattleMons[gPlayerMonIndex].moves[i]; + gCurrentMove = gBattleMons[gBankAttacker].moves[i]; - if (gUnknown_02024BE6) + if (gCurrentMove) { - move_effectiveness_something(gUnknown_02024BE6, gPlayerMonIndex, gEnemyMonIndex); + move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget); // reduce by 1/3. if (gBattleMoveDamage == 120) @@ -1454,16 +1454,16 @@ static void BattleAICmd_if_damage_bonus(void) { u8 damageVar; - gUnknown_02024DEC = 0; + gDynamicBasePower = 0; BATTLE_STRUCT->unk.unk1 = 0; BATTLE_STRUCT->unk.unk4 = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; gBattleMoveDamage = 40; - gUnknown_02024BE6 = AI_THINKING_STRUCT->moveConsidered; + gCurrentMove = AI_THINKING_STRUCT->moveConsidered; - move_effectiveness_something(gUnknown_02024BE6, gPlayerMonIndex, gEnemyMonIndex); + move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget); if (gBattleMoveDamage == 120) gBattleMoveDamage = 80; @@ -1598,9 +1598,9 @@ static void BattleAICmd_if_stat_level_less_than(void) u32 party; if (gAIScriptPtr[1] == USER) - party = gPlayerMonIndex; + party = gBankAttacker; else - party = gEnemyMonIndex; + party = gBankTarget; if (gBattleMons[party].statStages[gAIScriptPtr[2]] < gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); @@ -1613,9 +1613,9 @@ static void BattleAICmd_if_stat_level_more_than(void) u32 party; if (gAIScriptPtr[1] == USER) - party = gPlayerMonIndex; + party = gBankAttacker; else - party = gEnemyMonIndex; + party = gBankTarget; if (gBattleMons[party].statStages[gAIScriptPtr[2]] > gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); @@ -1628,9 +1628,9 @@ static void BattleAICmd_if_stat_level_equal(void) u32 party; if (gAIScriptPtr[1] == USER) - party = gPlayerMonIndex; + party = gBankAttacker; else - party = gEnemyMonIndex; + party = gBankTarget; if (gBattleMons[party].statStages[gAIScriptPtr[2]] == gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); @@ -1643,9 +1643,9 @@ static void BattleAICmd_if_stat_level_not_equal(void) u32 party; if (gAIScriptPtr[1] == USER) - party = gPlayerMonIndex; + party = gBankAttacker; else - party = gEnemyMonIndex; + party = gBankTarget; if (gBattleMons[party].statStages[gAIScriptPtr[2]] != gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); @@ -1661,14 +1661,14 @@ static void BattleAICmd_if_can_faint(void) return; } - gUnknown_02024DEC = 0; + gDynamicBasePower = 0; BATTLE_STRUCT->unk.unk1 = 0; BATTLE_STRUCT->unk.unk4 = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; - gUnknown_02024BE6 = AI_THINKING_STRUCT->moveConsidered; - sub_801CAF8(gPlayerMonIndex, gEnemyMonIndex); - move_effectiveness_something(gUnknown_02024BE6, gPlayerMonIndex, gEnemyMonIndex); + gCurrentMove = AI_THINKING_STRUCT->moveConsidered; + sub_801CAF8(gBankAttacker, gBankTarget); + move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget); gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100; @@ -1676,7 +1676,7 @@ static void BattleAICmd_if_can_faint(void) if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - if (gBattleMons[gEnemyMonIndex].hp <= gBattleMoveDamage) + if (gBattleMons[gBankTarget].hp <= gBattleMoveDamage) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1690,20 +1690,20 @@ static void BattleAICmd_if_cant_faint(void) return; } - gUnknown_02024DEC = 0; + gDynamicBasePower = 0; BATTLE_STRUCT->unk.unk1 = 0; BATTLE_STRUCT->unk.unk4 = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; - gUnknown_02024BE6 = AI_THINKING_STRUCT->moveConsidered; - sub_801CAF8(gPlayerMonIndex, gEnemyMonIndex); - move_effectiveness_something(gUnknown_02024BE6, gPlayerMonIndex, gEnemyMonIndex); + gCurrentMove = AI_THINKING_STRUCT->moveConsidered; + sub_801CAF8(gBankAttacker, gBankTarget); + move_effectiveness_something(gCurrentMove, gBankAttacker, gBankTarget); gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100; // this macro is missing the damage 0 = 1 assumption. - if (gBattleMons[gEnemyMonIndex].hp > gBattleMoveDamage) + if (gBattleMons[gBankTarget].hp > gBattleMoveDamage) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1720,7 +1720,7 @@ static void BattleAICmd_if_has_move(void) case 3: for (i = 0; i < MAX_MON_MOVES; i++) { - if (gBattleMons[gPlayerMonIndex].moves[i] == *temp_ptr) + if (gBattleMons[gBankAttacker].moves[i] == *temp_ptr) break; } if (i == MAX_MON_MOVES) @@ -1732,7 +1732,7 @@ static void BattleAICmd_if_has_move(void) case 2: for (i = 0; i < 8; i++) { - if (UNK_2016A00_STRUCT->movesUsed[gEnemyMonIndex >> 1][i] == *temp_ptr) + if (UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] == *temp_ptr) break; } if (i == 8) @@ -1754,7 +1754,7 @@ static void BattleAICmd_if_dont_have_move(void) case 3: for (i = 0; i < MAX_MON_MOVES; i++) { - if (gBattleMons[gPlayerMonIndex].moves[i] == *temp_ptr) + if (gBattleMons[gBankAttacker].moves[i] == *temp_ptr) break; } if (i != MAX_MON_MOVES) @@ -1766,7 +1766,7 @@ static void BattleAICmd_if_dont_have_move(void) case 2: for (i = 0; i < 8; i++) { - if (UNK_2016A00_STRUCT->movesUsed[gEnemyMonIndex >> 1][i] == *temp_ptr) + if (UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] == *temp_ptr) break; } if (i != 8) @@ -1787,7 +1787,7 @@ static void BattleAICmd_if_move_effect(void) case 3: for (i = 0; i < MAX_MON_MOVES; i++) { - if (gBattleMons[gPlayerMonIndex].moves[i] != 0 && gBattleMoves[gBattleMons[gPlayerMonIndex].moves[i]].effect == gAIScriptPtr[2]) + if (gBattleMons[gBankAttacker].moves[i] != 0 && gBattleMoves[gBattleMons[gBankAttacker].moves[i]].effect == gAIScriptPtr[2]) break; } if (i != MAX_MON_MOVES) @@ -1799,7 +1799,7 @@ static void BattleAICmd_if_move_effect(void) case 2: for (i = 0; i < 8; i++) { - if (gBattleMons[gPlayerMonIndex].moves[i] != 0 && gBattleMoves[UNK_2016A00_STRUCT->movesUsed[gEnemyMonIndex >> 1][i]].effect == gAIScriptPtr[2]) + if (gBattleMons[gBankAttacker].moves[i] != 0 && gBattleMoves[UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i]].effect == gAIScriptPtr[2]) break; } gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); @@ -1816,7 +1816,7 @@ static void BattleAICmd_if_not_move_effect(void) case 3: for (i = 0; i < MAX_MON_MOVES; i++) { - if (gBattleMons[gPlayerMonIndex].moves[i] != 0 && gBattleMoves[gBattleMons[gPlayerMonIndex].moves[i]].effect == gAIScriptPtr[2]) + if (gBattleMons[gBankAttacker].moves[i] != 0 && gBattleMoves[gBattleMons[gBankAttacker].moves[i]].effect == gAIScriptPtr[2]) break; } if (i != MAX_MON_MOVES) @@ -1828,7 +1828,7 @@ static void BattleAICmd_if_not_move_effect(void) case 2: for (i = 0; i < 8; i++) { - if (UNK_2016A00_STRUCT->movesUsed[gEnemyMonIndex >> 1][i] != 0 && gBattleMoves[UNK_2016A00_STRUCT->movesUsed[gEnemyMonIndex >> 1][i]].effect == gAIScriptPtr[2]) + if (UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] != 0 && gBattleMoves[UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i]].effect == gAIScriptPtr[2]) break; } gAIScriptPtr += 7; @@ -1840,13 +1840,13 @@ static void BattleAICmd_if_last_move_did_damage(void) u8 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; if (gAIScriptPtr[2] == 0) { - if (gUnknown_02024CA8[index].unk4 == 0) + if (gDisableStructs[index].unk4 == 0) { gAIScriptPtr += 7; return; @@ -1859,7 +1859,7 @@ static void BattleAICmd_if_last_move_did_damage(void) gAIScriptPtr += 7; return; } - else if (gUnknown_02024CA8[index].unk6 != 0) + else if (gDisableStructs[index].unk6 != 0) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); return; @@ -1872,7 +1872,7 @@ static void BattleAICmd_if_encored(void) switch (gAIScriptPtr[1]) { case 0: // _08109348 - if (gUnknown_02024CA8[gUnknown_02024A60].unk4 == AI_THINKING_STRUCT->moveConsidered) + if (gDisableStructs[gActiveBank].unk4 == AI_THINKING_STRUCT->moveConsidered) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -1880,7 +1880,7 @@ static void BattleAICmd_if_encored(void) gAIScriptPtr += 6; return; case 1: // _08109370 - if (gUnknown_02024CA8[gUnknown_02024A60].unk6 == AI_THINKING_STRUCT->moveConsidered) + if (gDisableStructs[gActiveBank].unk6 == AI_THINKING_STRUCT->moveConsidered) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -1919,13 +1919,13 @@ static void BattleAICmd_get_hold_effect(void) u16 status; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; - if (battle_side_get_owner(index) == 0) + if (GetBankSide(index) == 0) { - status = (battle_get_per_side_status(index) & 1); + status = (GetBankIdentity(index) & 1); AI_THINKING_STRUCT->funcResult = UNK_2016A00_STRUCT->unk22[status]; } else @@ -1939,9 +1939,9 @@ static void BattleAICmd_get_gender(void) u8 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; AI_THINKING_STRUCT->funcResult = GetGenderFromSpeciesAndPersonality(gBattleMons[index].species, gBattleMons[index].personality); @@ -1953,11 +1953,11 @@ static void BattleAICmd_is_first_turn(void) u8 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; - AI_THINKING_STRUCT->funcResult = gUnknown_02024CA8[index].unk16; + AI_THINKING_STRUCT->funcResult = gDisableStructs[index].unk16; gAIScriptPtr += 2; } @@ -1967,11 +1967,11 @@ static void BattleAICmd_get_stockpile_count(void) u8 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; - AI_THINKING_STRUCT->funcResult = gUnknown_02024CA8[index].unk9; + AI_THINKING_STRUCT->funcResult = gDisableStructs[index].unk9; gAIScriptPtr += 2; } @@ -1988,9 +1988,9 @@ static void BattleAICmd_get_item(void) u8 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; // this hack and a half matches. whatever. i dont care. someone else fix this mess later. PS: still cant fix this. AI_THINKING_STRUCT->funcResult = ewram[0x160CC + (index * 2)]; @@ -2024,11 +2024,11 @@ static void BattleAICmd_get_protect_count(void) u8 index; if (gAIScriptPtr[1] == USER) - index = gPlayerMonIndex; + index = gBankAttacker; else - index = gEnemyMonIndex; + index = gBankTarget; - AI_THINKING_STRUCT->funcResult = gUnknown_02024CA8[index].unk8; + AI_THINKING_STRUCT->funcResult = gDisableStructs[index].unk8; gAIScriptPtr += 2; } @@ -2079,7 +2079,7 @@ static void BattleAICmd_if_level_compare(void) switch (gAIScriptPtr[1]) { case 0: // greater than - if (gBattleMons[gPlayerMonIndex].level > gBattleMons[gEnemyMonIndex].level) + if (gBattleMons[gBankAttacker].level > gBattleMons[gBankTarget].level) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -2087,7 +2087,7 @@ static void BattleAICmd_if_level_compare(void) gAIScriptPtr += 6; return; case 1: // less than - if (gBattleMons[gPlayerMonIndex].level < gBattleMons[gEnemyMonIndex].level) + if (gBattleMons[gBankAttacker].level < gBattleMons[gBankTarget].level) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -2095,7 +2095,7 @@ static void BattleAICmd_if_level_compare(void) gAIScriptPtr += 6; return; case 2: // equal - if (gBattleMons[gPlayerMonIndex].level == gBattleMons[gEnemyMonIndex].level) + if (gBattleMons[gBankAttacker].level == gBattleMons[gBankTarget].level) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -2107,7 +2107,7 @@ static void BattleAICmd_if_level_compare(void) static void BattleAICmd_if_taunted(void) { - if (gUnknown_02024CA8[gEnemyMonIndex].taunt != 0) + if (gDisableStructs[gBankTarget].taunt != 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -2115,7 +2115,7 @@ static void BattleAICmd_if_taunted(void) static void BattleAICmd_if_not_taunted(void) { - if (gUnknown_02024CA8[gEnemyMonIndex].taunt == 0) + if (gDisableStructs[gBankTarget].taunt == 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; diff --git a/src/battle_anim.c b/src/battle_anim.c index 90e5c97c3..cc856d5cd 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -17,10 +17,10 @@ #define GET_TRUE_SPRITE_INDEX(i) (i - 10000) extern u8 unk_2000000[]; -extern u16 gUnknown_02024A6A[4]; -extern u8 gUnknown_02024BE0[]; -extern u8 gPlayerMonIndex; -extern u8 gEnemyMonIndex; +extern u16 gBattlePartyID[4]; +extern u8 gObjectBankIDs[]; +extern u8 gBankAttacker; +extern u8 gBankTarget; EWRAM_DATA const u8 *gBattleAnimScriptPtr = NULL; EWRAM_DATA const u8 *gBattleAnimScriptRetAddr = NULL; EWRAM_DATA void (*gAnimScriptCallback)(void) = NULL; @@ -28,11 +28,11 @@ EWRAM_DATA s8 gAnimFramesToWait = 0; EWRAM_DATA u8 gAnimScriptActive = FALSE; EWRAM_DATA u8 gAnimVisualTaskCount = 0; EWRAM_DATA u8 gAnimSoundTaskCount = 0; -EWRAM_DATA u32 gUnknown_0202F7B4 = 0; -EWRAM_DATA u32 gUnknown_0202F7B8 = 0; -EWRAM_DATA u16 gUnknown_0202F7BC = 0; -EWRAM_DATA u8 gUnknown_0202F7BE = 0; -EWRAM_DATA u16 gUnknown_0202F7C0 = 0; +EWRAM_DATA u32 gDisableStructMoveAnim = 0; +EWRAM_DATA u32 gMoveDmgMoveAnim = 0; +EWRAM_DATA u16 gMovePowerMoveAnim = 0; +EWRAM_DATA u8 gHappinessMoveAnim = 0; +EWRAM_DATA u16 gWeatherMoveAnim = 0; EWRAM_DATA u8 gMonAnimTaskIdArray[2] = {0}; EWRAM_DATA u8 gUnknown_0202F7C4 = 0; EWRAM_DATA u8 gUnknown_0202F7C5 = 0; @@ -181,10 +181,10 @@ void battle_anim_clear_some_data(void) gAnimScriptActive = FALSE; gAnimVisualTaskCount = 0; gAnimSoundTaskCount = 0; - gUnknown_0202F7B4 = 0; - gUnknown_0202F7B8 = 0; - gUnknown_0202F7BC = 0; - gUnknown_0202F7BE = 0; + gDisableStructMoveAnim = 0; + gMoveDmgMoveAnim = 0; + gMovePowerMoveAnim = 0; + gHappinessMoveAnim = 0; // clear index array. for (i = 0; i < 8; i++) @@ -206,8 +206,8 @@ void battle_anim_clear_some_data(void) void ExecuteMoveAnim(u16 move) { - gBattleAnimPlayerMonIndex = gPlayerMonIndex; - gBattleAnimEnemyMonIndex = gEnemyMonIndex; + gBattleAnimPlayerMonIndex = gBankAttacker; + gBattleAnimEnemyMonIndex = gBankTarget; DoMoveAnim(gBattleAnims_Moves, move, 1); } @@ -221,10 +221,10 @@ void DoMoveAnim(const u8 *const moveAnims[], u16 move, u8 c) sub_8043EB4(0); for (i = 0; i < 4; i++) { - if (battle_side_get_owner(i) != 0) - gUnknown_0202F7CA[i] = GetMonData(&gEnemyParty[gUnknown_02024A6A[i]], MON_DATA_SPECIES); + if (GetBankSide(i) != 0) + gUnknown_0202F7CA[i] = GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_SPECIES); else - gUnknown_0202F7CA[i] = GetMonData(&gPlayerParty[gUnknown_02024A6A[i]], MON_DATA_SPECIES); + gUnknown_0202F7CA[i] = GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_SPECIES); } } else @@ -689,14 +689,14 @@ static void ScriptCmd_monbg(void) r5 = gBattleAnimEnemyMonIndex; if (b_side_obj__get_some_boolean(r5)) { - r0 = battle_get_per_side_status(r5); + r0 = GetBankIdentity(r5); r0 += 0xFF; if (r0 <= 1 || IsContest() != 0) r7 = 0; else r7 = 1; sub_8076034(r5, r7); - r4 = gUnknown_02024BE0[r5]; + r4 = gObjectBankIDs[r5]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[0] = r4; gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x; @@ -719,14 +719,14 @@ static void ScriptCmd_monbg(void) r5 ^= 2; if (r6 > 1 && b_side_obj__get_some_boolean(r5)) { - r0 = battle_get_per_side_status(r5); + r0 = GetBankIdentity(r5); r0 += 0xFF; if (r0 <= 1 || IsContest() != 0) r7 = 0; else r7 = 1; sub_8076034(r5, r7); - r4 = gUnknown_02024BE0[r5]; + r4 = gObjectBankIDs[r5]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[0] = r4; gTasks[taskId].data[1] = gSprites[r4].pos1.x + gSprites[r4].pos2.x; @@ -764,7 +764,7 @@ bool8 b_side_obj__get_some_boolean(u8 a) return TRUE; // this line wont ever be reached. if ((EWRAM_17800[a].unk0 & 1) == 0) return TRUE; - if (gSprites[gUnknown_02024BE0[a]].invisible) + if (gSprites[gObjectBankIDs[a]].invisible) return FALSE; return TRUE; } @@ -807,7 +807,7 @@ _08075FDC:\n\ cmp r0, 0\n\ beq _0807601C\n\ ldr r2, _08076024 @ =gSprites\n\ - ldr r0, _08076028 @ =gUnknown_02024BE0\n\ + ldr r0, _08076028 @ =gObjectBankIDs\n\ adds r0, r5, r0\n\ ldrb r1, [r0]\n\ lsls r0, r1, 4\n\ @@ -825,7 +825,7 @@ _0807601C:\n\ .align 2, 0\n\ _08076020: .4byte 0x02017800\n\ _08076024: .4byte gSprites\n\ -_08076028: .4byte gUnknown_02024BE0\n\ +_08076028: .4byte gObjectBankIDs\n\ _0807602C:\n\ movs r0, 0\n\ _0807602E:\n\ @@ -873,12 +873,12 @@ void sub_8076034(u8 a, u8 b) REG_BG1CNT_BITFIELD.screenSize = 1; REG_BG1CNT_BITFIELD.areaOverflowMode = 0; - spriteId = gUnknown_02024BE0[a]; + spriteId = gObjectBankIDs[a]; gUnknown_030042C0 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; if (IsContest() != 0 && sub_80AEB1C(EWRAM_19348) != 0) gUnknown_030042C0--; gUnknown_030041B4 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; - gSprites[gUnknown_02024BE0[a]].invisible = TRUE; + gSprites[gObjectBankIDs[a]].invisible = TRUE; REG_BG1HOFS = gUnknown_030042C0; REG_BG1VOFS = gUnknown_030041B4; @@ -890,7 +890,7 @@ void sub_8076034(u8 a, u8 b) if (IsContest() != 0) r2 = 0; else - r2 = battle_get_per_side_status(a); + r2 = GetBankIdentity(a); sub_80E4EF8(0, 0, r2, s.unk8, (u32)s.unk0, (((s32)s.unk4 - VRAM) / 2048), REG_BG1CNT_BITFIELD.charBaseBlock); if (IsContest() != 0) sub_8076380(); @@ -923,10 +923,10 @@ void sub_8076034(u8 a, u8 b) REG_BG2CNT_BITFIELD.screenSize = 1; REG_BG2CNT_BITFIELD.areaOverflowMode = 0; - spriteId = gUnknown_02024BE0[a]; + spriteId = gObjectBankIDs[a]; gUnknown_03004288 = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; gUnknown_03004280 = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; - gSprites[gUnknown_02024BE0[a]].invisible = TRUE; + gSprites[gObjectBankIDs[a]].invisible = TRUE; REG_BG2HOFS = gUnknown_03004288; REG_BG2VOFS = gUnknown_03004280; @@ -935,7 +935,7 @@ void sub_8076034(u8 a, u8 b) addr3 = (void *)(PLTT + 0x120); DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32); - sub_80E4EF8(0, 0, battle_get_per_side_status(a), 9, 0x6000, 0x1E, REG_BG2CNT_BITFIELD.charBaseBlock); + sub_80E4EF8(0, 0, GetBankIdentity(a), 9, 0x6000, 0x1E, REG_BG2CNT_BITFIELD.charBaseBlock); } } @@ -1098,9 +1098,9 @@ static void ScriptCmd_clearmonbg(void) else r5 = gBattleAnimEnemyMonIndex; if (gMonAnimTaskIdArray[0] != 0xFF) - gSprites[gUnknown_02024BE0[r5]].invisible = FALSE; + gSprites[gObjectBankIDs[r5]].invisible = FALSE; if (r4 > 1 && gMonAnimTaskIdArray[1] != 0xFF) - gSprites[gUnknown_02024BE0[r5 ^ 2]].invisible = FALSE; + gSprites[gObjectBankIDs[r5 ^ 2]].invisible = FALSE; else r4 = 0; taskId = CreateTask(sub_807672C, 5); @@ -1117,7 +1117,7 @@ static void sub_807672C(u8 taskId) gTasks[taskId].data[1]++; if (gTasks[taskId].data[1] != 1) { - var = battle_get_per_side_status(gTasks[taskId].data[2]); + var = GetBankIdentity(gTasks[taskId].data[2]); var += 0xFF; if (var <= 1 || IsContest() != 0) r4 = 0; @@ -1158,26 +1158,26 @@ static void ScriptCmd_monbg_22(void) r4 = gBattleAnimEnemyMonIndex; if (b_side_obj__get_some_boolean(r4)) { - r0 = battle_get_per_side_status(r4); + r0 = GetBankIdentity(r4); r0 += 0xFF; if (r0 <= 1 || IsContest() != 0) r1 = 0; else r1 = 1; sub_8076034(r4, r1); - gSprites[gUnknown_02024BE0[r4]].invisible = FALSE; + gSprites[gObjectBankIDs[r4]].invisible = FALSE; } r4 ^= 2; if (r5 > 1 && b_side_obj__get_some_boolean(r4)) { - r0 = battle_get_per_side_status(r4); + r0 = GetBankIdentity(r4); r0 += 0xFF; if (r0 <= 1 || IsContest() != 0) r1 = 0; else r1 = 1; sub_8076034(r4, r1); - gSprites[gUnknown_02024BE0[r4]].invisible = FALSE; + gSprites[gObjectBankIDs[r4]].invisible = FALSE; } gBattleAnimScriptPtr++; } @@ -1199,9 +1199,9 @@ static void ScriptCmd_clearmonbg_23(void) else r6 = gBattleAnimEnemyMonIndex; if (b_side_obj__get_some_boolean(r6)) - gSprites[gUnknown_02024BE0[r6]].invisible = FALSE; + gSprites[gObjectBankIDs[r6]].invisible = FALSE; if (r5 > 1 && b_side_obj__get_some_boolean(r6 ^ 2)) - gSprites[gUnknown_02024BE0[r6 ^ 2]].invisible = FALSE; + gSprites[gObjectBankIDs[r6 ^ 2]].invisible = FALSE; else r5 = 0; taskId = CreateTask(sub_80769A4, 5); @@ -1220,7 +1220,7 @@ static void sub_80769A4(u8 taskId) if (gTasks[taskId].data[1] != 1) { r4 = gTasks[taskId].data[2]; - r0 = battle_get_per_side_status(r4); + r0 = GetBankIdentity(r4); r0 += 0xFF; if (r0 <= 1 || IsContest() != 0) r5 = 0; @@ -1369,7 +1369,7 @@ static void ScriptCmd_fadetobg_25(void) taskId = CreateTask(task_p5_load_battle_screen_elements, 5); if (IsContest() != 0) gTasks[taskId].data[0] = r6; - else if (battle_side_get_owner(gBattleAnimEnemyMonIndex) == 0) + else if (GetBankSide(gBattleAnimEnemyMonIndex) == 0) gTasks[taskId].data[0] = r7; else gTasks[taskId].data[0] = r8; @@ -1493,7 +1493,7 @@ s8 sub_8076F98(s8 a) { if (!IsContest() && (EWRAM_17810[gBattleAnimPlayerMonIndex].unk0 & 0x10)) { - a = battle_side_get_owner(gBattleAnimPlayerMonIndex) ? 0xC0 : 0x3F; + a = GetBankSide(gBattleAnimPlayerMonIndex) ? 0xC0 : 0x3F; } //_08076FDC else @@ -1512,9 +1512,9 @@ s8 sub_8076F98(s8 a) //_08077004 else { - if (battle_side_get_owner(gBattleAnimPlayerMonIndex) == 0) + if (GetBankSide(gBattleAnimPlayerMonIndex) == 0) { - if (battle_side_get_owner(gBattleAnimEnemyMonIndex) == 0) + if (GetBankSide(gBattleAnimEnemyMonIndex) == 0) } //_08077042 else @@ -1551,7 +1551,7 @@ s8 sub_8076F98(s8 a) cmp r0, 0\n\ beq _08076FDC\n\ adds r0, r2, 0\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ movs r4, 0xC0\n\ cmp r0, 0\n\ @@ -1583,13 +1583,13 @@ _08077000: .4byte gBattleAnimEnemyMonIndex\n\ _08077004:\n\ ldr r0, _0807702C @ =gBattleAnimPlayerMonIndex\n\ ldrb r0, [r0]\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _08077042\n\ ldr r0, _08077030 @ =gBattleAnimEnemyMonIndex\n\ ldrb r0, [r0]\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _0807706E\n\ @@ -1613,7 +1613,7 @@ _08077034:\n\ _08077042:\n\ ldr r0, _08077064 @ =gBattleAnimEnemyMonIndex\n\ ldrb r0, [r0]\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ lsrs r0, 24\n\ cmp r0, 0x1\n\ @@ -1661,14 +1661,14 @@ s8 sub_8077094(s8 a) { if (!IsContest() && (EWRAM_17810[gBattleAnimPlayerMonIndex].unk0 & 0x10)) { - if (battle_side_get_owner(gBattleAnimPlayerMonIndex) != 0) + if (GetBankSide(gBattleAnimPlayerMonIndex) != 0) a = 0x3F; else a = 0xC0; } else { - if (battle_side_get_owner(gBattleAnimPlayerMonIndex) != 0 || IsContest() != 0) + if (GetBankSide(gBattleAnimPlayerMonIndex) != 0 || IsContest() != 0) a = -a; } return a; @@ -2129,7 +2129,7 @@ static void ScriptCmd_monbgprio_28(void) r0 = gBattleAnimEnemyMonIndex; else r0 = gBattleAnimPlayerMonIndex; - r4 = battle_get_per_side_status(r0); + r4 = GetBankIdentity(r0); if (!IsContest() && (r4 == 0 || r4 == 3)) { REG_BG1CNT_BITFIELD.priority = 1; @@ -2155,13 +2155,13 @@ static void ScriptCmd_monbgprio_2A(void) r6 = SCRIPT_READ_8(gBattleAnimScriptPtr + 1); gBattleAnimScriptPtr += 2; - if (battle_side_get_owner(gBattleAnimPlayerMonIndex) != battle_side_get_owner(gBattleAnimEnemyMonIndex)) + if (GetBankSide(gBattleAnimPlayerMonIndex) != GetBankSide(gBattleAnimEnemyMonIndex)) { if (r6 != 0) r0 = gBattleAnimEnemyMonIndex; else r0 = gBattleAnimPlayerMonIndex; - r4 = battle_get_per_side_status(r0); + r4 = GetBankIdentity(r0); if (!IsContest() && (r4 == 0 || r4 == 3)) { REG_BG1CNT_BITFIELD.priority = 1; @@ -2207,16 +2207,16 @@ static void ScriptCmd_doublebattle_2D(void) r7 = SCRIPT_READ_8(gBattleAnimScriptPtr + 1); gBattleAnimScriptPtr += 2; if (!IsContest() && IsDoubleBattle() - && battle_side_get_owner(gBattleAnimPlayerMonIndex) == battle_side_get_owner(gBattleAnimEnemyMonIndex)) + && GetBankSide(gBattleAnimPlayerMonIndex) == GetBankSide(gBattleAnimEnemyMonIndex)) { if (r7 == 0) { - r4 = battle_get_per_side_status_permutated(gBattleAnimPlayerMonIndex); + r4 = GetBankIdentity_permutated(gBattleAnimPlayerMonIndex); spriteId = obj_id_for_side_relative_to_move(0); } else { - r4 = battle_get_per_side_status_permutated(gBattleAnimEnemyMonIndex); + r4 = GetBankIdentity_permutated(gBattleAnimEnemyMonIndex); spriteId = obj_id_for_side_relative_to_move(1); } if (spriteId != 0xFF) @@ -2241,16 +2241,16 @@ static void ScriptCmd_doublebattle_2E(void) r7 = SCRIPT_READ_8(gBattleAnimScriptPtr + 1); gBattleAnimScriptPtr += 2; if (!IsContest() && IsDoubleBattle() - && battle_side_get_owner(gBattleAnimPlayerMonIndex) == battle_side_get_owner(gBattleAnimEnemyMonIndex)) + && GetBankSide(gBattleAnimPlayerMonIndex) == GetBankSide(gBattleAnimEnemyMonIndex)) { if (r7 == 0) { - r4 = battle_get_per_side_status_permutated(gBattleAnimPlayerMonIndex); + r4 = GetBankIdentity_permutated(gBattleAnimPlayerMonIndex); spriteId = obj_id_for_side_relative_to_move(0); } else { - r4 = battle_get_per_side_status_permutated(gBattleAnimEnemyMonIndex); + r4 = GetBankIdentity_permutated(gBattleAnimEnemyMonIndex); spriteId = obj_id_for_side_relative_to_move(1); } if (spriteId != 0xFF && r4 == 2) diff --git a/src/battle_anim_80A7E7C.c b/src/battle_anim_80A7E7C.c index 12b53d7d9..34c11a352 100644 --- a/src/battle_anim_80A7E7C.c +++ b/src/battle_anim_80A7E7C.c @@ -10,9 +10,9 @@ extern s16 gBattleAnimArgs[8]; -extern u8 gUnknown_02024BE0[]; -extern s32 gUnknown_0202F7B8; -extern u16 gUnknown_0202F7BC; +extern u8 gObjectBankIDs[]; +extern s32 gMoveDmgMoveAnim; +extern u16 gMovePowerMoveAnim; extern u8 gBattleAnimPlayerMonIndex; extern u8 gBattleAnimEnemyMonIndex; @@ -109,28 +109,28 @@ void sub_80A7FA0(u8 task) switch (gBattleAnimArgs[0]) { case 4: - side = battle_get_side_with_given_state(0); + side = GetBankByPlayerAI(0); break; case 5: - side = battle_get_side_with_given_state(2); + side = GetBankByPlayerAI(2); break; case 6: - side = battle_get_side_with_given_state(1); + side = GetBankByPlayerAI(1); break; case 7: default: - side = battle_get_side_with_given_state(3); + side = GetBankByPlayerAI(3); break; } if (b_side_obj__get_some_boolean(side) == FALSE) { r6 = 1; } - sprite = gUnknown_02024BE0[side]; + sprite = gObjectBankIDs[side]; } else { - sprite = gUnknown_02024BE0[gBattleAnimPlayerMonIndex]; + sprite = gObjectBankIDs[gBattleAnimPlayerMonIndex]; } if (r6) { @@ -329,7 +329,7 @@ static void sub_80A8488(u8 task) void sub_80A8500(u8 task) { - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) + if (GetBankSide(gBattleAnimPlayerMonIndex)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -339,7 +339,7 @@ void sub_80A8500(u8 task) void sub_80A8530(struct Sprite *sprite) { sprite->invisible = TRUE; - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) + if (GetBankSide(gBattleAnimPlayerMonIndex)) { sprite->data1 = -gBattleAnimArgs[1]; } @@ -349,7 +349,7 @@ void sub_80A8530(struct Sprite *sprite) } sprite->data0 = gBattleAnimArgs[0]; sprite->data2 = 0; - sprite->data3 = gUnknown_02024BE0[gBattleAnimPlayerMonIndex]; + sprite->data3 = gObjectBankIDs[gBattleAnimPlayerMonIndex]; sprite->data4 = gBattleAnimArgs[0]; oamt_set_x3A_32(sprite, sub_80A85A4); sprite->callback = sub_8078458; @@ -391,11 +391,11 @@ void sub_80A8638(struct Sprite *sprite) int spriteId; if (!gBattleAnimArgs[0]) { - spriteId = gUnknown_02024BE0[gBattleAnimPlayerMonIndex]; + spriteId = gObjectBankIDs[gBattleAnimPlayerMonIndex]; } else { - spriteId = gUnknown_02024BE0[gBattleAnimEnemyMonIndex]; + spriteId = gObjectBankIDs[gBattleAnimEnemyMonIndex]; } sprite->data0 = gBattleAnimArgs[2]; sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; @@ -464,8 +464,8 @@ void sub_80A8764(struct Sprite *sprite) { v1 = gBattleAnimEnemyMonIndex; } - spriteId = gUnknown_02024BE0[v1]; - if (battle_side_get_owner(v1)) + spriteId = gObjectBankIDs[v1]; + if (GetBankSide(v1)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; if (gBattleAnimArgs[3] == 1) @@ -500,8 +500,8 @@ void sub_80A8818(struct Sprite *sprite) { v1 = gBattleAnimEnemyMonIndex; } - spriteId = gUnknown_02024BE0[v1]; - if (battle_side_get_owner(v1)) + spriteId = gObjectBankIDs[v1]; + if (GetBankSide(v1)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; if (gBattleAnimArgs[3] == 1) @@ -542,7 +542,7 @@ void sub_80A8920(u8 task) { s16 r7; r7 = 0x8000 / gBattleAnimArgs[3]; - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) + if (GetBankSide(gBattleAnimPlayerMonIndex)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[5] = -gBattleAnimArgs[5]; @@ -609,7 +609,7 @@ void sub_80A8A80(u8 task) DestroyAnimVisualTask(task); return; } - spriteId = gUnknown_02024BE0[gBattleAnimPlayerMonIndex ^ 2]; + spriteId = gObjectBankIDs[gBattleAnimPlayerMonIndex ^ 2]; break; case 3: if (!b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) @@ -617,14 +617,14 @@ void sub_80A8A80(u8 task) DestroyAnimVisualTask(task); return; } - spriteId = gUnknown_02024BE0[gBattleAnimEnemyMonIndex ^ 2]; + spriteId = gObjectBankIDs[gBattleAnimEnemyMonIndex ^ 2]; break; default: DestroyAnimVisualTask(task); return; } TASK.data[0] = spriteId; - if (battle_side_get_owner(gBattleAnimEnemyMonIndex)) + if (GetBankSide(gBattleAnimEnemyMonIndex)) { TASK.data[1] = gBattleAnimArgs[1]; } @@ -649,7 +649,7 @@ static void sub_80A8B3C(u8 task) void sub_80A8B88(u8 task) { u8 spriteId; - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) + if (GetBankSide(gBattleAnimPlayerMonIndex)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -688,7 +688,7 @@ static void sub_80A8C0C(u8 task) } else { - if (battle_side_get_owner(TASK.data[5]) == 0) + if (GetBankSide(TASK.data[5]) == 0) { gSprites[spriteId].pos2.y = (y >= 0) ? y : -y; } @@ -778,11 +778,11 @@ void sub_80A8E04(u8 task) { if (gBattleAnimArgs[2] == 0) { - TASK.data[7] = !battle_side_get_owner(gBattleAnimPlayerMonIndex); + TASK.data[7] = !GetBankSide(gBattleAnimPlayerMonIndex); } else { - TASK.data[7] = !battle_side_get_owner(gBattleAnimEnemyMonIndex); + TASK.data[7] = !GetBankSide(gBattleAnimEnemyMonIndex); } } if (TASK.data[7]) @@ -805,14 +805,14 @@ void sub_80A8EFC(u8 task) TASK.data[2] = gBattleAnimArgs[0]; if (gBattleAnimArgs[2] == 0) { - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) + if (GetBankSide(gBattleAnimPlayerMonIndex)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } } else { - if (battle_side_get_owner(gBattleAnimEnemyMonIndex)) + if (GetBankSide(gBattleAnimEnemyMonIndex)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -865,7 +865,7 @@ void sub_80A9058(u8 task) { if (!gBattleAnimArgs[0]) { - TASK.data[15] = gUnknown_0202F7BC / 12; + TASK.data[15] = gMovePowerMoveAnim / 12; if (TASK.data[15] < 1) { TASK.data[15] = 1; @@ -877,7 +877,7 @@ void sub_80A9058(u8 task) } else { - TASK.data[15] = gUnknown_0202F7B8 / 12; + TASK.data[15] = gMoveDmgMoveAnim / 12; if (TASK.data[15] < 1) { TASK.data[15] = 1; diff --git a/src/battle_anim_81258BC.c b/src/battle_anim_81258BC.c index fe4e9bd38..5bdbb4946 100644 --- a/src/battle_anim_81258BC.c +++ b/src/battle_anim_81258BC.c @@ -6,14 +6,14 @@ #include "text.h" extern struct Window gUnknown_03004210; -extern u8 gUnknown_020238CC[]; -extern u8 gUnknown_02024E60[]; +extern u8 gDisplayedStringBattle[]; +extern u8 gActionSelectionCursor[]; extern const u8 gUnknown_08400CBB[]; -extern u8 gUnknown_02024A60; +extern u8 gActiveBank; extern const u8 gUnknown_08400D15[]; -extern void *gUnknown_03004330[]; +extern void *gBattleBankFunc[]; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; @@ -31,7 +31,7 @@ void sub_812BB10(void) { gUnknown_03004210.paletteNum = 0; FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18); FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); - gUnknown_03004330[gUnknown_02024A60] = bx_battle_menu_t6_2; + gBattleBankFunc[gActiveBank] = bx_battle_menu_t6_2; InitWindow(&gUnknown_03004210, gUnknown_08400D15, 400, 18, 35); sub_8002F44(&gUnknown_03004210); @@ -42,9 +42,9 @@ void sub_812BB10(void) { nullsub_8(i); } - sub_802E3E4(gUnknown_02024E60[gUnknown_02024A60], 0); - get_battle_strings_((u8 *) gUnknown_08400CBB); + sub_802E3E4(gActionSelectionCursor[gActiveBank], 0); + StrCpyDecodeToDisplayedStringBattle((u8 *) gUnknown_08400CBB); - InitWindow(&gUnknown_03004210, gUnknown_020238CC, SUB_812BB10_TILE_DATA_OFFSET, 2, 35); + InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35); sub_8002F44(&gUnknown_03004210); }
\ No newline at end of file diff --git a/src/battle_interface.c b/src/battle_interface.c index 042861c22..246bda62b 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -34,11 +34,11 @@ extern u8 ewram[]; #define ewram16089 (*(u8 *) (ewram + 0x16089)) #define ewram17850 ((struct UnknownStruct5 *)(ewram + 0x17850)) -extern u8 gUnknown_020238CC[]; -extern u8 gUnknown_02024A68; -extern u16 gUnknown_02024A6A[]; -extern u8 gUnknown_02024A72[]; -extern u8 gUnknown_03004340[]; +extern u8 gDisplayedStringBattle[]; +extern u8 gNoOfAllBanks; +extern u16 gBattlePartyID[]; +extern u8 gBanksBySide[]; +extern u8 gHealthboxIDs[]; extern u16 gBattleTypeFlags; @@ -424,7 +424,7 @@ u8 battle_make_oam_normal_battle(u8 a) if (!IsDoubleBattle()) { - if (battle_side_get_owner(a) == 0) + if (GetBankSide(a) == 0) { spriteId1 = CreateSprite(&gSpriteTemplate_820A4EC[0], 240, 160, 1); spriteId2 = CreateSpriteAtEnd(&gSpriteTemplate_820A4EC[0], 240, 160, 1); @@ -450,10 +450,10 @@ u8 battle_make_oam_normal_battle(u8 a) //_08043A28 else { - if (battle_side_get_owner(a) == 0) + if (GetBankSide(a) == 0) { - spriteId1 = CreateSprite(&gSpriteTemplate_820A4EC[battle_get_per_side_status(a) / 2], 240, 160, 1); - spriteId2 = CreateSpriteAtEnd(&gSpriteTemplate_820A4EC[battle_get_per_side_status(a) / 2], 240, 160, 1); + spriteId1 = CreateSprite(&gSpriteTemplate_820A4EC[GetBankIdentity(a) / 2], 240, 160, 1); + spriteId2 = CreateSpriteAtEnd(&gSpriteTemplate_820A4EC[GetBankIdentity(a) / 2], 240, 160, 1); gSprites[spriteId1].oam.affineParam = spriteId2; gSprites[spriteId2].data5 = spriteId1; @@ -464,8 +464,8 @@ u8 battle_make_oam_normal_battle(u8 a) //_08043ACC else { - spriteId1 = CreateSprite(&gSpriteTemplate_820A51C[battle_get_per_side_status(a) / 2], 240, 160, 1); - spriteId2 = CreateSpriteAtEnd(&gSpriteTemplate_820A51C[battle_get_per_side_status(a) / 2], 240, 160, 1); + spriteId1 = CreateSprite(&gSpriteTemplate_820A51C[GetBankIdentity(a) / 2], 240, 160, 1); + spriteId2 = CreateSpriteAtEnd(&gSpriteTemplate_820A51C[GetBankIdentity(a) / 2], 240, 160, 1); gSprites[spriteId1].oam.affineParam = spriteId2; gSprites[spriteId2].data5 = spriteId1; @@ -477,9 +477,9 @@ u8 battle_make_oam_normal_battle(u8 a) } //_08043B50 - spriteId3 = CreateSpriteAtEnd(&gSpriteTemplate_820A56C[gUnknown_02024A72[a]], 140, 60, 0); + spriteId3 = CreateSpriteAtEnd(&gSpriteTemplate_820A56C[gBanksBySide[a]], 140, 60, 0); sprite = &gSprites[spriteId3]; - SetSubspriteTables(sprite, &gSubspriteTables_820A684[battle_side_get_owner(a)]); + SetSubspriteTables(sprite, &gSubspriteTables_820A684[GetBankSide(a)]); sprite->subspriteMode = 2; sprite->oam.priority = 1; CpuCopy32(sub_8043CDC(1), (void *)(OBJ_VRAM0 + sprite->oam.tileNum * 32), 64); @@ -592,13 +592,13 @@ void sub_8043EB4(u8 priority) { s32 i; - for (i = 0; i < gUnknown_02024A68; i++) + for (i = 0; i < gNoOfAllBanks; i++) { u8 spriteId1; u8 spriteId2; u8 spriteId3; - spriteId1 = gUnknown_03004340[i]; + spriteId1 = gHealthboxIDs[i]; spriteId2 = gSprites[spriteId1].oam.affineParam; spriteId3 = gSprites[spriteId1].data5; gSprites[spriteId1].oam.priority = priority; @@ -614,7 +614,7 @@ void sub_8043F44(u8 a) if (!IsDoubleBattle()) { - if (battle_side_get_owner(a) != 0) + if (GetBankSide(a) != 0) { x = 44; y = 30; @@ -627,7 +627,7 @@ void sub_8043F44(u8 a) } else { - switch (battle_get_per_side_status(a)) + switch (GetBankIdentity(a)) { case 0: x = 159; @@ -647,7 +647,7 @@ void sub_8043F44(u8 a) break; } } - sub_8043E50(gUnknown_03004340[a], x, y); + sub_8043E50(gHealthboxIDs[a], x, y); } #if ENGLISH @@ -668,14 +668,14 @@ static void sub_8043FC0(u8 a, u8 b) memcpy(str, gUnknown_0820A81C, sizeof(str)); if (!IsDoubleBattle()) { - if (battle_side_get_owner(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data6) == 0) r7 = gUnknown_0820A804; else r7 = gUnknown_0820A80C; } else { - if (battle_side_get_owner(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data6) == 0) r7 = gUnknown_0820A814; else r7 = gUnknown_0820A80C; @@ -725,7 +725,7 @@ void sub_80440EC(u8 a, s16 b, u8 c) memcpy(str, gUnknown_0820A864, sizeof(str)); foo = gSprites[a].data6; - if (IsDoubleBattle() == TRUE || battle_side_get_owner(foo) == 1) + if (IsDoubleBattle() == TRUE || GetBankSide(foo) == 1) { //_08044136 sub_8044210(a, b, c); @@ -735,7 +735,7 @@ void sub_80440EC(u8 a, s16 b, u8 c) ptr = str + 6; if (c == 0) { - if (battle_side_get_owner(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data6) == 0) r4 = gUnknown_0820A83C; else r4 = gUnknown_0820A848; @@ -747,7 +747,7 @@ void sub_80440EC(u8 a, s16 b, u8 c) } else { - if (battle_side_get_owner(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data6) == 0) r4 = gUnknown_0820A854; else r4 = gUnknown_0820A85C; @@ -797,7 +797,7 @@ void sub_80440EC(u8 a, s16 b, u8 c) beq _08044136\n\ lsls r0, r5, 24\n\ lsrs r0, 24\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ lsrs r0, 24\n\ cmp r0, 0x1\n\ @@ -821,7 +821,7 @@ _0804414C:\n\ ldrh r0, [r4, 0x3A]\n\ lsls r0, 24\n\ lsrs r0, 24\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ ldr r4, _08044188 @ =gUnknown_0820A848\n\ cmp r0, 0\n\ @@ -849,7 +849,7 @@ _08044190:\n\ ldrh r0, [r4, 0x3A]\n\ lsls r0, 24\n\ lsrs r0, 24\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ ldr r4, _080441FC @ =gUnknown_0820A85C\n\ cmp r0, 0\n\ @@ -938,7 +938,7 @@ static void sub_8044210(u8 a, s16 b, u8 c) r7 = gUnknown_0820A894; r10 = 2; sub_8003504(ptr, b, 0xF, 1); - if (battle_side_get_owner(r4) == 0) + if (GetBankSide(r4) == 0) { CpuCopy32(sub_8043CDC(0x74), (void *)(OBJ_VRAM0 + (gSprites[a].oam.tileNum + 0x34) * 32), 32); } @@ -964,7 +964,7 @@ void sub_8044338(u8 a, struct Pokemon *pkmn) // TODO: make this a local variable memcpy(str, gUnknown_0820A864, sizeof(str)); - r6 = ewram520[battle_get_per_side_status(gSprites[a].data6)].filler0; + r6 = ewram520[GetBankIdentity(gSprites[a].data6)].filler0; r8 = 5; nature = GetNature(pkmn); StringCopy(str + 6, gNatureNames[nature]); @@ -1048,7 +1048,7 @@ void sub_8044338(u8 a, struct Pokemon *pkmn) ldrh r0, [r0, 0x3A]\n\ lsls r0, 24\n\ lsrs r0, 24\n\ - bl battle_get_per_side_status\n\ + bl GetBankIdentity\n\ lsls r0, 24\n\ lsrs r0, 24\n\ lsls r1, r0, 1\n\ @@ -1287,17 +1287,17 @@ void sub_804454C(void) s32 i; u8 spriteId; - for (i = 0; i < gUnknown_02024A68; i++) + for (i = 0; i < gNoOfAllBanks; i++) { - if (gSprites[gUnknown_03004340[i]].callback == SpriteCallbackDummy - && battle_side_get_owner(i) != 1 - && (IsDoubleBattle() || battle_side_get_owner(i) != 0)) + if (gSprites[gHealthboxIDs[i]].callback == SpriteCallbackDummy + && GetBankSide(i) != 1 + && (IsDoubleBattle() || GetBankSide(i) != 0)) { u8 r6; ewram17800[i].unk0_4 ^= 1; r6 = ewram17800[i].unk0_4; - if (battle_side_get_owner(i) == 0) + if (GetBankSide(i) == 0) { if (!IsDoubleBattle()) @@ -1307,17 +1307,17 @@ void sub_804454C(void) if (r6 == 1) { - spriteId = gSprites[gUnknown_03004340[i]].data5; + spriteId = gSprites[gHealthboxIDs[i]].data5; CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100); - sub_8044210(gUnknown_03004340[i], GetMonData(&gPlayerParty[gUnknown_02024A6A[i]], MON_DATA_HP), 0); - sub_8044210(gUnknown_03004340[i], GetMonData(&gPlayerParty[gUnknown_02024A6A[i]], MON_DATA_MAX_HP), 1); + sub_8044210(gHealthboxIDs[i], GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_HP), 0); + sub_8044210(gHealthboxIDs[i], GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_MAX_HP), 1); } else { - draw_status_ailment_maybe(gUnknown_03004340[i]); - sub_8045A5C(gUnknown_03004340[i], &gPlayerParty[gUnknown_02024A6A[i]], 5); - CpuCopy32(sub_8043CDC(0x75), (void *)(OBJ_VRAM0 + 0x680 + gSprites[gUnknown_03004340[i]].oam.tileNum * 32), 32); + draw_status_ailment_maybe(gHealthboxIDs[i]); + sub_8045A5C(gHealthboxIDs[i], &gPlayerParty[gBattlePartyID[i]], 5); + CpuCopy32(sub_8043CDC(0x75), (void *)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxIDs[i]].oam.tileNum * 32), 32); } } else @@ -1326,26 +1326,26 @@ void sub_804454C(void) { if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) { - sub_8044338(gUnknown_03004340[i], &gEnemyParty[gUnknown_02024A6A[i]]); + sub_8044338(gHealthboxIDs[i], &gEnemyParty[gBattlePartyID[i]]); } else { - spriteId = gSprites[gUnknown_03004340[i]].data5; + spriteId = gSprites[gHealthboxIDs[i]].data5; CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32), 0x100); - sub_8044210(gUnknown_03004340[i], GetMonData(&gEnemyParty[gUnknown_02024A6A[i]], MON_DATA_HP), 0); - sub_8044210(gUnknown_03004340[i], GetMonData(&gEnemyParty[gUnknown_02024A6A[i]], MON_DATA_MAX_HP), 1); + sub_8044210(gHealthboxIDs[i], GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_HP), 0); + sub_8044210(gHealthboxIDs[i], GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_MAX_HP), 1); } } else { - draw_status_ailment_maybe(gUnknown_03004340[i]); - sub_8045A5C(gUnknown_03004340[i], &gEnemyParty[gUnknown_02024A6A[i]], 5); + draw_status_ailment_maybe(gHealthboxIDs[i]); + sub_8045A5C(gHealthboxIDs[i], &gEnemyParty[gBattlePartyID[i]], 5); if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) - sub_8045A5C(gUnknown_03004340[i], &gEnemyParty[gUnknown_02024A6A[i]], 4); + sub_8045A5C(gHealthboxIDs[i], &gEnemyParty[gBattlePartyID[i]], 4); } } - gSprites[gUnknown_03004340[i]].data7 ^= 1; + gSprites[gHealthboxIDs[i]].data7 ^= 1; } } } @@ -1366,9 +1366,9 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) u8 sp18; u8 taskId; - if (c == 0 || battle_get_per_side_status(a) != 3) + if (c == 0 || GetBankIdentity(a) != 3) { - if (battle_side_get_owner(a) == 0) + if (GetBankSide(a) == 0) { r7 = 0; x = 136; @@ -1461,7 +1461,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) gSprites[sp[i]].data2 = r7; } //_08044A76 - if (battle_side_get_owner(a) == 0) + if (GetBankSide(a) == 0) { for (i = 0; i < 6; i++) //_08044A9A { @@ -1582,14 +1582,14 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) str r3, [sp, 0x10]\n\ cmp r4, 0\n\ beq _08044834\n\ - bl battle_get_per_side_status\n\ + bl GetBankIdentity\n\ lsls r0, 24\n\ lsrs r0, 24\n\ cmp r0, 0x3\n\ beq _08044878\n\ _08044834:\n\ ldr r0, [sp, 0x8]\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _08044854\n\ @@ -1871,7 +1871,7 @@ _08044A56:\n\ b _08044970\n\ _08044A76:\n\ ldr r0, [sp, 0x8]\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _08044B5E\n\ @@ -2177,7 +2177,7 @@ void sub_8044CA0(u8 taskId) { for (i = 0; i < 6; i++) { - if (battle_side_get_owner(sp8) != 0) + if (GetBankSide(sp8) != 0) { gSprites[sp[5 - i]].data1 = 7 * i; gSprites[sp[5 - i]].data3 = 0; @@ -2375,10 +2375,10 @@ static void sub_80451A0(u8 a, struct Pokemon *pkmn) s32 _7; u8 *const *r1; - StringCopy(gUnknown_020238CC, gUnknown_0820A8B0); + StringCopy(gDisplayedStringBattle, gUnknown_0820A8B0); GetMonData(pkmn, MON_DATA_NICKNAME, nickname); StringGetEnd10(nickname); - ptr = StringCopy(gUnknown_020238CC + 3, nickname); + ptr = StringCopy(gDisplayedStringBattle + 3, nickname); ptr[0] = EXT_CTRL_CODE_BEGIN; ptr[1] = 3; ptr[2] = 2; @@ -2414,15 +2414,15 @@ static void sub_80451A0(u8 a, struct Pokemon *pkmn) ptr[1] = 0x13; ptr[2] = 0x37; ptr[3] = EOS; - ptr = (u8 *)0x02000520 + battle_get_per_side_status(gSprites[a].data6) * 0x180; - sub_80034D4(ptr, gUnknown_020238CC); + ptr = (u8 *)0x02000520 + GetBankIdentity(gSprites[a].data6) * 0x180; + sub_80034D4(ptr, gDisplayedStringBattle); i = 0; _7 = 7; if (GetMonData(pkmn, MON_DATA_LANGUAGE) == 1 && GetMonData(pkmn, MON_DATA_IS_EGG) == 0) { - u8 *p = gUnknown_020238CC; + u8 *p = gDisplayedStringBattle; while (*p != EOS) { @@ -2451,7 +2451,7 @@ static void sub_80451A0(u8 a, struct Pokemon *pkmn) for (; i < _7; i++) CpuCopy32(sub_8043CDC(0x2B), ptr + 64 * i, 32); - if (battle_side_get_owner(gSprites[a].data6) == 0 && !IsDoubleBattle()) + if (GetBankSide(gSprites[a].data6) == 0 && !IsDoubleBattle()) { r1 = (u8 *const *)gUnknown_0820A8B4; for (i = 0; i < _7; i++) @@ -2469,7 +2469,7 @@ static void sub_80451A0(u8 a, struct Pokemon *pkmn) } else { - if (battle_side_get_owner(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data6) == 0) r1 = (u8 *const *)gUnknown_0820A904; else r1 = (u8 *const *)gUnknown_0820A8DC; @@ -2498,9 +2498,9 @@ static void sub_8045458(u8 a, u8 b) return; r4 = gSprites[a].data6; - if (battle_side_get_owner(r4) != 0) + if (GetBankSide(r4) != 0) { - u16 species = GetMonData(&gEnemyParty[gUnknown_02024A6A[r4]], MON_DATA_SPECIES); + u16 species = GetMonData(&gEnemyParty[gBattlePartyID[r4]], MON_DATA_SPECIES); if (GetNationalPokedexFlag(SpeciesToNationalPokedexNum(species), 1) != 0) { r4 = gSprites[a].data5; @@ -2525,9 +2525,9 @@ static void draw_status_ailment_maybe(u8 a) r7 = gSprites[a].data6; r10 = gSprites[a].data5; - if (battle_side_get_owner(r7) == 0) + if (GetBankSide(r7) == 0) { - r4 = GetMonData(&gPlayerParty[gUnknown_02024A6A[r7]], MON_DATA_STATUS); + r4 = GetMonData(&gPlayerParty[gBattlePartyID[r7]], MON_DATA_STATUS); if (!IsDoubleBattle()) r8 = 0x1A; else @@ -2535,7 +2535,7 @@ static void draw_status_ailment_maybe(u8 a) } else { - r4 = GetMonData(&gEnemyParty[gUnknown_02024A6A[r7]], MON_DATA_STATUS); + r4 = GetMonData(&gEnemyParty[gBattlePartyID[r7]], MON_DATA_STATUS); r8 = 0x11; } if (r4 & 7) @@ -2583,7 +2583,7 @@ static void draw_status_ailment_maybe(u8 a) FillPalette(r0[gBattleInterfaceStatusIcons_DynPal], r4_2 + 0x100, 2); CpuCopy16(gPlttBufferUnfaded + 0x100 + r4_2, (void *)(OBJ_PLTT + r4_2 * 2), 2); CpuCopy32(r6, (void *)(OBJ_VRAM0 + (gSprites[a].oam.tileNum + r8) * 32), 96); - if (IsDoubleBattle() == TRUE || battle_side_get_owner(r7) == TRUE) + if (IsDoubleBattle() == TRUE || GetBankSide(r7) == TRUE) { if (!ewram17800[r7].unk0_4) { @@ -2662,7 +2662,7 @@ static void sub_80458B0(u8 a) s32 r7; u8 *addr; - r6 = (u8 *)0x02000520 + battle_get_per_side_status(gSprites[a].data6) * 0x180; + r6 = (u8 *)0x02000520 + GetBankIdentity(gSprites[a].data6) * 0x180; r8 = 7; sub_80034D4(r6, BattleText_SafariBalls); for (i = 0; i < r8; i++) @@ -2687,13 +2687,13 @@ static void sub_8045998(u8 a) s32 r6; s32 i; - r7 = StringCopy(gUnknown_020238CC, BattleText_SafariBallsLeft); + r7 = StringCopy(gDisplayedStringBattle, BattleText_SafariBallsLeft); r7 = sub_8003504(r7, gNumSafariBalls, 10, 1); StringAppend(r7, BattleText_HighlightRed); - status = battle_get_per_side_status(gSprites[a].data6); + status = GetBankIdentity(gSprites[a].data6); r7 = (u8 *)0x02000520 + status * 0x180; r6 = 5; - sub_80034D4(r7, gUnknown_020238CC); + sub_80034D4(r7, gDisplayedStringBattle); r7 = (u8 *)0x02000520 + status * 0x180 + 32; for (i = 6; i < 6 + r6; i++) { @@ -2709,7 +2709,7 @@ void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) u32 currhp; r10 = gSprites[a].data6; - if (battle_side_get_owner(r10) == 0) + if (GetBankSide(r10) == 0) { if (c == 3 || c == 0) sub_8043FC0(a, GetMonData(pkmn, MON_DATA_LEVEL)); @@ -2828,7 +2828,7 @@ static void sub_8045D58(u8 a, u8 b) break; case 1: sub_804602C(ewram17850[a].unk4, ewram17850[a].unk8, ewram17850[a].unkC, &ewram17850[a].unk10, sp8, 8); - r0 = GetMonData(&gPlayerParty[gUnknown_02024A6A[a]], MON_DATA_LEVEL); + r0 = GetMonData(&gPlayerParty[gBattlePartyID[a]], MON_DATA_LEVEL); if (r0 == 100) { for (i = 0; i < 8; i++) diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index c02290e80..96b68adba 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -44,9 +44,9 @@ struct Unk201B000 extern u16 gScriptItemId; extern u8 gPlayerPartyCount; -extern u8 gUnknown_02024A68; -extern u16 gUnknown_02024A6A[]; -extern u8 gUnknown_02024E6C; +extern u8 gNoOfAllBanks; +extern u16 gBattlePartyID[]; +extern u8 gBankInMenu; extern u8 gUnknown_0202E8F4; extern u8 gUnknown_0202E8F5; extern u8 gUnknown_0202E8F6; @@ -135,7 +135,7 @@ static void sub_8094998(u8 arg[3], u8 player_number) if (!IsDoubleBattle()) { pos = 1; - *temp = gUnknown_02024A6A[battle_get_side_with_given_state(0)]; + *temp = gBattlePartyID[GetBankByPlayerAI(0)]; for (i = 0; i <= 5; i++) if (i != *temp) temp[pos++] = i; @@ -143,8 +143,8 @@ static void sub_8094998(u8 arg[3], u8 player_number) else { pos = 2; - *temp = gUnknown_02024A6A[battle_get_side_with_given_state(0)]; - temp[1] = gUnknown_02024A6A[battle_get_side_with_given_state(2)]; + *temp = gBattlePartyID[GetBankByPlayerAI(0)]; + temp[1] = gBattlePartyID[GetBankByPlayerAI(2)]; for (i = 0; i <= 5; i++) if ((i != *temp) && (i != temp[1])) temp[pos++] = i; @@ -158,15 +158,15 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3) { int i, j; u8 temp[6]; - if (!battle_side_get_owner(arg3)) + if (!GetBankSide(arg3)) { - i = battle_get_side_with_given_state(0); - j = battle_get_side_with_given_state(2); + i = GetBankByPlayerAI(0); + j = GetBankByPlayerAI(2); } else { - i = battle_get_side_with_given_state(1); - j = battle_get_side_with_given_state(3); + i = GetBankByPlayerAI(1); + j = GetBankByPlayerAI(3); } if (IsLinkDoubleBattle() == TRUE) { @@ -188,7 +188,7 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3) if (!IsDoubleBattle()) { int pos = 1; - *temp = gUnknown_02024A6A[i]; + *temp = gBattlePartyID[i]; for (i = 0; i <= 5; i++) if (i != *temp) temp[pos++] = i; @@ -196,8 +196,8 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3) else { int pos = 2; - *temp = gUnknown_02024A6A[i]; - temp[1] = gUnknown_02024A6A[j]; + *temp = gBattlePartyID[i]; + temp[1] = gBattlePartyID[j]; for (i = 0; i <= 5; i++) if ((i != *temp) && (i != temp[1])) temp[pos++] = i; @@ -674,10 +674,10 @@ static void Task_BattlePartyMenuShift(u8 taskId) gTasks[taskId].func = Task_80954C0; return; } - for (i = 0; i < gUnknown_02024A68; i++) + for (i = 0; i < gNoOfAllBanks; i++) { - if (battle_side_get_owner(i) == 0 - && sub_8094C20(partySelection) == gUnknown_02024A6A[i]) + if (GetBankSide(i) == 0 + && sub_8094C20(partySelection) == gBattlePartyID[i]) { sub_806D5A4(); GetMonNickname(&gPlayerParty[partySelection], gStringVar1); @@ -715,10 +715,10 @@ static void Task_BattlePartyMenuShift(u8 taskId) if (gUnknown_02038473 == 2) { u8 r0; - u8 r4 = gUnknown_02024E6C; + u8 r4 = gBankInMenu; sub_806D5A4(); - r0 = pokemon_order_func(gUnknown_02024A6A[r4]); + r0 = pokemon_order_func(gBattlePartyID[r4]); GetMonNickname(&gPlayerParty[r0], gStringVar1); StringExpandPlaceholders(gStringVar4, gOtherText_CantBeSwitched); sub_806E834(gStringVar4, 0); @@ -727,7 +727,7 @@ static void Task_BattlePartyMenuShift(u8 taskId) } gUnknown_0202E8F5 = sub_8094C20(partySelection); gUnknown_0202E8F4 = 1; - r4 = pokemon_order_func(gUnknown_02024A6A[gUnknown_02024E6C]); + r4 = pokemon_order_func(gBattlePartyID[gBankInMenu]); sub_8094C98(r4, partySelection); sub_806E6F0(&gPlayerParty[r4], &gPlayerParty[partySelection]); gTasks[taskId].func = Task_809527C; diff --git a/src/battle_setup.c b/src/battle_setup.c index e4e83dfa1..adcbe8eaa 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -49,7 +49,7 @@ EWRAM_DATA u8 *gTrainerBattleEndScript = NULL; extern u16 gBattleTypeFlags; extern u16 gScriptLastTalked; -extern u8 gUnknown_02024D26; +extern u8 gBattleOutcome; extern struct MapObject gMapObjects[]; @@ -574,7 +574,7 @@ void HandleWildBattleEnd(void) CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE); ResetOamRange(0, 128); - if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE) + if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE) { SetMainCallback2(CB2_WhiteOut); } @@ -590,7 +590,7 @@ void HandleScriptedWildBattleEnd(void) CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE); ResetOamRange(0, 128); - if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE) + if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE) SetMainCallback2(CB2_WhiteOut); else SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); @@ -1051,7 +1051,7 @@ void sub_808260C(void) { SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle? } - else if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE) + else if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE) { SetMainCallback2(CB2_WhiteOut); } @@ -1068,7 +1068,7 @@ void do_choose_name_or_words_screen(void) { SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); // link battle? } - else if (battle_exit_is_player_defeat(gUnknown_02024D26) == TRUE) + else if (battle_exit_is_player_defeat(gBattleOutcome) == TRUE) { SetMainCallback2(CB2_WhiteOut); } diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index f3799ab66..ae60e30fe 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -23,8 +23,8 @@ extern struct SecretBaseRecord gSecretBaseRecord; extern u32 dword_2017100[]; extern u16 gBattleTypeFlags; extern struct BattlePokemon gBattleMons[4]; -extern u16 gUnknown_02024BE6; -extern u8 byte_2024C06; +extern u16 gCurrentMove; +extern u8 gLastUsedAbility; extern u8 gCritMultiplier; extern u16 gBattleWeather; extern struct BattleEnigmaBerry gEnigmaBerries[]; @@ -103,7 +103,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 && FlagGet(BADGE01_GET) - && !battle_side_get_owner(a7)) + && !GetBankSide(a7)) attack = (110 * attack) / 100; if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) @@ -111,7 +111,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 && FlagGet(BADGE05_GET) - && !battle_side_get_owner(a8)) + && !GetBankSide(a8)) defense = (110 * defense) / 100; if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) @@ -119,7 +119,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 && FlagGet(BADGE07_GET) - && !battle_side_get_owner(a7)) + && !GetBankSide(a7)) spAttack = (110 * spAttack) / 100; if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) @@ -127,7 +127,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 && FlagGet(BADGE07_GET) - && !battle_side_get_owner(a8)) + && !GetBankSide(a8)) spDefense = (110 * spDefense) / 100; } } @@ -167,17 +167,17 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de spAttack /= 2; if (attacker->ability == ABILITY_HUSTLE) attack = (150 * attack) / 100; - if (attacker->ability == ABILITY_PLUS && sub_8018324(0xE, 0, ABILITY_MINUS, 0, 0)) + if (attacker->ability == ABILITY_PLUS && AbilityBattleEffects(0xE, 0, ABILITY_MINUS, 0, 0)) spAttack = (150 * spAttack) / 100; - if (attacker->ability == ABILITY_MINUS && sub_8018324(0xE, 0, ABILITY_PLUS, 0, 0)) + if (attacker->ability == ABILITY_MINUS && AbilityBattleEffects(0xE, 0, ABILITY_PLUS, 0, 0)) spAttack = (150 * spAttack) / 100; if (attacker->ability == ABILITY_GUTS && attacker->status1) attack = (150 * attack) / 100; if (defender->ability == ABILITY_MARVEL_SCALE && defender->status1) defense = (150 * defense) / 100; - if (type == TYPE_ELECTRIC && sub_8018324(0xE, 0, 0, 0xFD, 0)) + if (type == TYPE_ELECTRIC && AbilityBattleEffects(0xE, 0, 0, 0xFD, 0)) gBattleMovePower /= 2; - if (type == TYPE_FIRE && sub_8018324(0xE, 0, 0, 0xFE, 0)) + if (type == TYPE_FIRE && AbilityBattleEffects(0xE, 0, 0, 0xFE, 0)) gBattleMovePower /= 2; if (type == TYPE_GRASS && attacker->ability == ABILITY_OVERGROW && attacker->hp <= (attacker->maxHP / 3)) gBattleMovePower = (150 * gBattleMovePower) / 100; @@ -187,7 +187,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de gBattleMovePower = (150 * gBattleMovePower) / 100; if (type == TYPE_BUG && attacker->ability == ABILITY_SWARM && attacker->hp <= (attacker->maxHP / 3)) gBattleMovePower = (150 * gBattleMovePower) / 100; - if (gBattleMoves[gUnknown_02024BE6].effect == 7) + if (gBattleMoves[gCurrentMove].effect == 7) defense /= 2; if (type < TYPE_MYSTERY) // is physical? @@ -221,13 +221,13 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((a4 & 1) && gCritMultiplier == 1) { - if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && sub_803C348(2) == 2) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && CountAliveMons(2) == 2) damage = 2 * (damage / 3); else damage /= 2; } - if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gBattleMoves[move].target == 8 && sub_803C348(2) == 2) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gBattleMoves[move].target == 8 && CountAliveMons(2) == 2) damage /= 2; // moves always do at least 1 damage. @@ -266,17 +266,17 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if ((a4 & 2) && gCritMultiplier == 1) { - if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && sub_803C348(2) == 2) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && CountAliveMons(2) == 2) damage = 2 * (damage / 3); else damage /= 2; } - if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gBattleMoves[move].target == 8 && sub_803C348(2) == 2) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gBattleMoves[move].target == 8 && CountAliveMons(2) == 2) damage /= 2; // are effects of weather negated with cloud nine or air lock? - if (!sub_8018324(0xE, 0, ABILITY_CLOUD_NINE, 0, 0) && !sub_8018324(0xE, 0, ABILITY_AIR_LOCK, 0, 0)) + if (!AbilityBattleEffects(0xE, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(0xE, 0, ABILITY_AIR_LOCK, 0, 0)) { // rain? if (gBattleWeather & 1) @@ -288,7 +288,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de } // does lack of sun half solar beam damage? - if ((gBattleWeather & 0x9F) && gUnknown_02024BE6 == 76) + if ((gBattleWeather & 0x9F) && gCurrentMove == 76) damage /= 2; // sunny? @@ -485,7 +485,7 @@ _0803BB5E:\n\ cmp r0, 0\n\ beq _0803BB98\n\ ldr r0, [sp, 0x10]\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _0803BB98\n\ @@ -518,7 +518,7 @@ _0803BB98:\n\ cmp r0, 0\n\ beq _0803BBE2\n\ adds r0, r4, 0\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _0803BBE2\n\ @@ -553,7 +553,7 @@ _0803BBE2:\n\ cmp r0, 0\n\ beq _0803BC2E\n\ ldr r0, [sp, 0x10]\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _0803BC2E\n\ @@ -589,7 +589,7 @@ _0803BC2E:\n\ cmp r0, 0\n\ beq _0803BC78\n\ adds r0, r4, 0\n\ - bl battle_side_get_owner\n\ + bl GetBankSide\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _0803BC78\n\ @@ -807,7 +807,7 @@ _0803BDFC:\n\ movs r1, 0\n\ movs r2, 0x3A\n\ movs r3, 0\n\ - bl sub_8018324\n\ + bl AbilityBattleEffects\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _0803BE2A\n\ @@ -831,7 +831,7 @@ _0803BE2A:\n\ movs r1, 0\n\ movs r2, 0x39\n\ movs r3, 0\n\ - bl sub_8018324\n\ + bl AbilityBattleEffects\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _0803BE5C\n\ @@ -885,7 +885,7 @@ _0803BE9A:\n\ movs r1, 0\n\ movs r2, 0\n\ movs r3, 0xFD\n\ - bl sub_8018324\n\ + bl AbilityBattleEffects\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _0803BEBE\n\ @@ -903,7 +903,7 @@ _0803BEBE:\n\ movs r1, 0\n\ movs r2, 0\n\ movs r3, 0xFE\n\ - bl sub_8018324\n\ + bl AbilityBattleEffects\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _0803BEE2\n\ @@ -1005,7 +1005,7 @@ _0803BF72:\n\ strh r0, [r4]\n\ _0803BFA2:\n\ ldr r2, _0803BFEC @ =gBattleMoves\n\ - ldr r0, _0803BFF0 @ =gUnknown_02024BE6\n\ + ldr r0, _0803BFF0 @ =gCurrentMove\n\ ldrh r1, [r0]\n\ lsls r0, r1, 1\n\ adds r0, r1\n\ @@ -1040,7 +1040,7 @@ _0803BFE0: .4byte 0xfffffe69\n\ _0803BFE4: .4byte 0x00000175\n\ _0803BFE8: .4byte gBattleMovePower\n\ _0803BFEC: .4byte gBattleMoves\n\ -_0803BFF0: .4byte gUnknown_02024BE6\n\ +_0803BFF0: .4byte gCurrentMove\n\ _0803BFF4: .4byte gCritMultiplier\n\ _0803BFF8: .4byte gStatStageRatios\n\ _0803BFFC:\n\ @@ -1146,7 +1146,7 @@ _0803C0A8:\n\ cmp r1, 0\n\ beq _0803C0E4\n\ movs r0, 0x2\n\ - bl sub_803C348\n\ + bl CountAliveMons\n\ lsls r0, 24\n\ lsrs r0, 24\n\ cmp r0, 0x2\n\ @@ -1180,7 +1180,7 @@ _0803C0EA:\n\ cmp r0, 0x8\n\ bne _0803C11C\n\ movs r0, 0x2\n\ - bl sub_803C348\n\ + bl CountAliveMons\n\ lsls r0, 24\n\ lsrs r0, 24\n\ cmp r0, 0x2\n\ @@ -1306,7 +1306,7 @@ _0803C1D6:\n\ cmp r1, 0\n\ beq _0803C224\n\ movs r0, 0x2\n\ - bl sub_803C348\n\ + bl CountAliveMons\n\ lsls r0, 24\n\ lsrs r0, 24\n\ cmp r0, 0x2\n\ @@ -1340,7 +1340,7 @@ _0803C22A:\n\ cmp r0, 0x8\n\ bne _0803C25C\n\ movs r0, 0x2\n\ - bl sub_803C348\n\ + bl CountAliveMons\n\ lsls r0, 24\n\ lsrs r0, 24\n\ cmp r0, 0x2\n\ @@ -1355,7 +1355,7 @@ _0803C25C:\n\ movs r1, 0\n\ movs r2, 0xD\n\ movs r3, 0\n\ - bl sub_8018324\n\ + bl AbilityBattleEffects\n\ lsls r0, 24\n\ lsrs r0, 24\n\ cmp r0, 0\n\ @@ -1365,7 +1365,7 @@ _0803C25C:\n\ movs r1, 0\n\ movs r2, 0x4D\n\ movs r3, 0\n\ - bl sub_8018324\n\ + bl AbilityBattleEffects\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _0803C30C\n\ @@ -1403,7 +1403,7 @@ _0803C2C4:\n\ ands r0, r1\n\ cmp r0, 0\n\ beq _0803C2DC\n\ - ldr r0, _0803C2F4 @ =gUnknown_02024BE6\n\ + ldr r0, _0803C2F4 @ =gCurrentMove\n\ ldrh r0, [r0]\n\ cmp r0, 0x4C\n\ bne _0803C2DC\n\ @@ -1423,7 +1423,7 @@ _0803C2DC:\n\ beq _0803C306\n\ b _0803C30C\n\ .align 2, 0\n\ -_0803C2F4: .4byte gUnknown_02024BE6\n\ +_0803C2F4: .4byte gCurrentMove\n\ _0803C2F8:\n\ lsls r0, r5, 4\n\ subs r0, r5\n\ diff --git a/src/item_use.c b/src/item_use.c index 269c847a5..a92161e9a 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -43,12 +43,12 @@ extern void (* gUnknown_03004AE4)(u8, u16, TaskFunc); extern u8 gUnknown_02038561; extern u8 gLastFieldPokeMenuOpened; -extern u8 gUnknown_02024E6C; +extern u8 gBankInMenu; extern u8 gUnknown_081A1654[]; extern u8 gUnknown_081A168F[]; -extern u16 gUnknown_02024A6A[]; +extern u16 gBattlePartyID[]; extern u16 gScriptItemId; extern u16 gBattleTypeFlags; @@ -1043,7 +1043,7 @@ void sub_80CA2BC(u8 taskId) void ItemUseInBattle_StatIncrease(u8 taskId) { - u16 partyId = gUnknown_02024A6A[gUnknown_02024E6C]; + u16 partyId = gBattlePartyID[gBankInMenu]; MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14); diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 91cd77f86..5acdae4d3 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -20,13 +20,13 @@ extern u16 unk_20160BC[]; extern struct SecretBaseRecord gSecretBaseRecord; extern u32 dword_2017100[]; extern u16 gBattleTypeFlags; -extern u8 gUnknown_02024A60; +extern u8 gActiveBank; extern struct BattlePokemon gBattleMons[4]; -extern u16 gUnknown_02024BE6; -extern u8 byte_2024C06; -extern u8 gPlayerMonIndex; -extern u8 gEnemyMonIndex; -extern u8 gUnknown_02024C0C; +extern u16 gCurrentMove; +extern u8 gLastUsedAbility; +extern u8 gBankAttacker; +extern u8 gBankTarget; +extern u8 gAbsentBankFlags; extern u8 gXXX_CritRelated; extern u16 gBattleWeather; extern struct BattleEnigmaBerry gEnigmaBerries[]; @@ -41,7 +41,7 @@ extern const struct SpriteTemplate gSpriteTemplate_8208288[]; extern u8 gSecretBaseTrainerClasses[]; extern u8 gHoldEffectToType[][2]; -u8 sub_803C348(u8 a1) +u8 CountAliveMons(u8 a1) { s32 i; u8 retVal = 0; @@ -51,21 +51,21 @@ u8 sub_803C348(u8 a1) case 0: for (i = 0; i < 4; i++) { - if (i != gUnknown_02024A60 && !(gUnknown_02024C0C & gBitTable[i])) + if (i != gActiveBank && !(gAbsentBankFlags & gBitTable[i])) retVal++; } break; case 1: for (i = 0; i < 4; i++) { - if (battle_side_get_owner(i) == battle_side_get_owner(gPlayerMonIndex) && !(gUnknown_02024C0C & gBitTable[i])) + if (GetBankSide(i) == GetBankSide(gBankAttacker) && !(gAbsentBankFlags & gBitTable[i])) retVal++; } break; case 2: for (i = 0; i < 4; i++) { - if (battle_side_get_owner(i) == battle_side_get_owner(gEnemyMonIndex) && !(gUnknown_02024C0C & gBitTable[i])) + if (GetBankSide(i) == GetBankSide(gBankTarget) && !(gAbsentBankFlags & gBitTable[i])) retVal++; } break; @@ -77,7 +77,7 @@ u8 sub_803C348(u8 a1) #ifdef NONMATCHING u8 sub_803C434(u8 a1) { - u32 status0 = battle_get_per_side_status(a1); + u32 status0 = GetBankIdentity(a1); register u8 status_ asm("r4"); u8 status; register u32 mask1 asm("r1") = 1; @@ -93,11 +93,11 @@ u8 sub_803C434(u8 a1) val &= val_; if (!val) { - return battle_get_side_with_given_state(status); + return GetBankByPlayerAI(status); } } - if (sub_803C348(0) > 1) + if (CountAliveMons(0) > 1) { u16 r = Random(); register u32 val asm("r1") = mask2; @@ -106,19 +106,19 @@ u8 sub_803C434(u8 a1) { u32 status2 = 2; status2 ^= status; - return battle_get_side_with_given_state(status2); + return GetBankByPlayerAI(status2); } else { - return battle_get_side_with_given_state(status); + return GetBankByPlayerAI(status); } } else { - if (gUnknown_02024C0C & gBitTable[status]) - return battle_get_side_with_given_state(status ^ 2); + if (gAbsentBankFlags & gBitTable[status]) + return GetBankByPlayerAI(status ^ 2); else - return battle_get_side_with_given_state(status); + return GetBankByPlayerAI(status); } } #else @@ -129,7 +129,7 @@ u8 sub_803C434(u8 a1) push {r4-r6,lr}\n\ lsls r0, 24\n\ lsrs r0, 24\n\ - bl battle_get_per_side_status\n\ + bl GetBankIdentity\n\ movs r1, 0x1\n\ movs r6, 0x1\n\ adds r4, r6, 0\n\ @@ -148,7 +148,7 @@ u8 sub_803C434(u8 a1) _0803C45C: .4byte gBattleTypeFlags\n\ _0803C460:\n\ movs r0, 0\n\ - bl sub_803C348\n\ + bl CountAliveMons\n\ lsls r0, 24\n\ lsrs r0, 24\n\ cmp r0, 0x1\n\ @@ -177,14 +177,14 @@ _0803C484:\n\ adds r0, r4, 0\n\ b _0803C4AA\n\ .align 2, 0\n\ -_0803C49C: .4byte gUnknown_02024C0C\n\ +_0803C49C: .4byte gAbsentBankFlags\n\ _0803C4A0: .4byte gBitTable\n\ _0803C4A4:\n\ movs r0, 0x2\n\ eors r5, r0\n\ adds r0, r5, 0\n\ _0803C4AA:\n\ - bl battle_get_side_with_given_state\n\ + bl GetBankByPlayerAI\n\ lsls r0, 24\n\ lsrs r0, 24\n\ pop {r4-r6}\n\ @@ -1131,11 +1131,11 @@ u8 sub_803DAA0(void) u8 GetAbilityBySpecies(u16 species, bool8 altAbility) { if (altAbility) - byte_2024C06 = gBaseStats[species].ability2; + gLastUsedAbility = gBaseStats[species].ability2; else - byte_2024C06 = gBaseStats[species].ability1; + gLastUsedAbility = gBaseStats[species].ability1; - return byte_2024C06; + return gLastUsedAbility; } u8 GetMonAbility(struct Pokemon *mon) @@ -1295,7 +1295,7 @@ void CopyPlayerPartyMonToBattleData(u8 battleIndex, u8 partyIndex) GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname); StringCopy10(gBattleMons[battleIndex].nickname, nickname); GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[battleIndex].otName); - *(unk_20160BC + battle_side_get_owner(battleIndex)) = gBattleMons[battleIndex].hp; + *(unk_20160BC + GetBankSide(battleIndex)) = gBattleMons[battleIndex].hp; for (i = 0; i < 8; i++) gBattleMons[battleIndex].statStages[i] = 6; diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 9e69a3850..ef9a1698d 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -48,19 +48,19 @@ struct SpindaSpot extern u8 gPlayerPartyCount; extern u8 gEnemyPartyCount; extern struct BattlePokemon gBattleMons[4]; -extern u8 gUnknown_02024A60; +extern u8 gActiveBank; extern struct BattleEnigmaBerry gEnigmaBerries[]; extern u16 gSpeciesToHoennPokedexNum[]; extern u16 gSpeciesToNationalPokedexNum[]; extern u16 gHoennToNationalOrder[]; extern u16 gSpeciesIdToCryId[]; -extern u8 gUnknown_030041C0[]; -extern u8 gUnknown_03004290[]; -extern u8 gUnknown_020238CC[]; -extern u8 gPlayerMonIndex; -extern u8 gEnemyMonIndex; -extern u8 gUnknown_02024C0B; -extern u8 gUnknown_02024E6C; +extern u8 gBattleTextBuff1[]; +extern u8 gBattleTextBuff2[]; +extern u8 gDisplayedStringBattle[]; +extern u8 gBankAttacker; +extern u8 gBankTarget; +extern u8 gStringBank; +extern u8 gBankInMenu; extern struct SpindaSpot gSpindaSpotGraphics[]; extern s8 gNatureStatTable[][5]; extern s8 gUnknown_082082FE[][3]; @@ -71,9 +71,9 @@ extern u8 gBattleMonForms[]; extern const u8 BattleText_Wally[]; extern const u16 gHMMoves[]; extern s8 gUnknown_083F7E28[]; -extern u8 byte_2024C06; +extern u8 gLastUsedAbility; extern const u8 BattleText_PreventedSwitch[]; -extern u16 gUnknown_02024A6A[]; +extern u16 gBattlePartyID[]; extern u8 gJapaneseNidoranNames[][11]; extern u8 gUnknown_082082F8[]; @@ -119,7 +119,7 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit) if (itemId == ITEM_ENIGMA_BERRY) { - temp = gEnigmaBerries[gUnknown_02024A60].itemEffect; + temp = gEnigmaBerries[gActiveBank].itemEffect; } itemEffect = temp; @@ -216,10 +216,10 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit) void sub_803F324(int stat) { - gEnemyMonIndex = gUnknown_02024E6C; - StringCopy(gUnknown_030041C0, gUnknown_08400F58[gUnknown_082082F8[stat]]); - StringCopy(gUnknown_03004290, gUnknown_083FFDB3); - get_battle_strings_(gUnknown_083FFDD3); + gBankTarget = gBankInMenu; + StringCopy(gBattleTextBuff1, gUnknown_08400F58[gUnknown_082082F8[stat]]); + StringCopy(gBattleTextBuff2, gUnknown_083FFDB3); + StrCpyDecodeToDisplayedStringBattle(gUnknown_083FFDD3); } u8 *sub_803F378(u16 itemId) @@ -231,7 +231,7 @@ u8 *sub_803F378(u16 itemId) { if (gMain.inBattle) { - itemEffect = gEnigmaBerries[gUnknown_02024E6C].itemEffect; + itemEffect = gEnigmaBerries[gBankInMenu].itemEffect; } else { @@ -243,7 +243,7 @@ u8 *sub_803F378(u16 itemId) itemEffect = (u8 *) gItemEffectTable[itemId - 13]; } - gUnknown_02024C0B = gUnknown_02024E6C; + gStringBank = gBankInMenu; for (i = 0; i < 3; i++) { @@ -257,19 +257,19 @@ u8 *sub_803F378(u16 itemId) } else { - gPlayerMonIndex = gUnknown_02024E6C; - get_battle_strings_(gUnknown_083FEE92); + gBankAttacker = gBankInMenu; + StrCpyDecodeToDisplayedStringBattle(gUnknown_083FEE92); } } } if (itemEffect[3] & 0x80) { - gPlayerMonIndex = gUnknown_02024E6C; - get_battle_strings_(gUnknown_083FEE5D); + gBankAttacker = gBankInMenu; + StrCpyDecodeToDisplayedStringBattle(gUnknown_083FEE5D); } - return gUnknown_020238CC; + return gDisplayedStringBattle; } u8 GetNature(struct Pokemon *mon) @@ -1296,21 +1296,21 @@ void BoxMonRestorePP(struct BoxPokemon *boxMon) void sub_8040B8C(void) { - byte_2024C06 = BATTLE_STRUCT->filler1_2[0x37]; - gUnknown_030041C0[0] = 0xFD; - gUnknown_030041C0[1] = 4; - gUnknown_030041C0[2] = BATTLE_STRUCT->filler1[0x34]; - gUnknown_030041C0[4] = EOS; - if (!battle_side_get_owner(BATTLE_STRUCT->filler1[0x34])) - gUnknown_030041C0[3] = pokemon_order_func(gUnknown_02024A6A[BATTLE_STRUCT->filler1[0x34]]); + gLastUsedAbility = BATTLE_STRUCT->filler1_2[0x37]; + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 4; + gBattleTextBuff1[2] = BATTLE_STRUCT->filler1[0x34]; + gBattleTextBuff1[4] = EOS; + if (!GetBankSide(BATTLE_STRUCT->filler1[0x34])) + gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[BATTLE_STRUCT->filler1[0x34]]); else - gUnknown_030041C0[3] = gUnknown_02024A6A[BATTLE_STRUCT->filler1[0x34]]; - gUnknown_03004290[0] = 0xFD; - gUnknown_03004290[1] = 4; - gUnknown_03004290[2] = gUnknown_02024E6C; - gUnknown_03004290[3] = pokemon_order_func(gUnknown_02024A6A[gUnknown_02024E6C]); - gUnknown_03004290[4] = EOS; - sub_8120FFC(BattleText_PreventedSwitch, gStringVar4); + gBattleTextBuff1[3] = gBattlePartyID[BATTLE_STRUCT->filler1[0x34]]; + gBattleTextBuff2[0] = 0xFD; + gBattleTextBuff2[1] = 4; + gBattleTextBuff2[2] = gBankInMenu; + gBattleTextBuff2[3] = pokemon_order_func(gBattlePartyID[gBankInMenu]); + gBattleTextBuff2[4] = EOS; + StrCpyDecodeBattle(BattleText_PreventedSwitch, gStringVar4); } void SetWildMonHeldItem(void) diff --git a/src/rom3.c b/src/rom3.c index 93f0f0356..9d8d39f91 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -28,33 +28,33 @@ extern u8 gUnknown_020238C4; extern u8 gUnknown_020238C5; extern u8 gUnknown_020238C6; extern u32 gUnknown_020239FC; -extern u8 gUnknown_02023A60[][0x200]; -extern u8 gUnknown_02024260[][0x200]; -extern u8 gUnknown_02024A60; -extern u32 gUnknown_02024A64; -extern u8 gUnknown_02024A68; -extern u16 gUnknown_02024A6A[]; -extern u8 gUnknown_02024A72[]; -extern u16 gUnknown_02024BE6; +extern u8 gBattleBufferA[][0x200]; +extern u8 gBattleBufferB[][0x200]; +extern u8 gActiveBank; +extern u32 gBattleExecBuffer; +extern u8 gNoOfAllBanks; +extern u16 gBattlePartyID[]; +extern u8 gBanksBySide[]; +extern u16 gCurrentMove; extern u16 gUnknown_02024BE8; -extern u16 gUnknown_02024C04; -extern u8 byte_2024C06; -extern u8 gPlayerMonIndex; -extern u8 gEnemyMonIndex; -extern u8 gUnknown_02024C0A; -extern u8 gUnknown_02024C0B; -extern u8 gUnknown_02024C0C; -extern u8 gUnknown_02024C0E; +extern u16 gLastUsedItem; +extern u8 gLastUsedAbility; +extern u8 gBankAttacker; +extern u8 gBankTarget; +extern u8 gEffectBank; +extern u8 gStringBank; +extern u8 gAbsentBankFlags; +extern u8 gMultiHitCounter; extern u8 gUnknown_02024C78; -extern u8 gUnknown_02024D26; -extern u8 gUnknown_02024E60[]; -extern u8 gUnknown_02024E64[]; -extern u8 gUnknown_03004040[]; -extern u8 gUnknown_030041C0[]; -extern u8 gUnknown_03004290[]; -extern u8 gUnknown_030042B0[]; -extern void (*gUnknown_030042D4)(void); -extern void (*gUnknown_03004330[])(void); +extern u8 gBattleOutcome; +extern u8 gActionSelectionCursor[]; +extern u8 gMoveSelectionCursor[]; +extern u8 gBattleBuffersTransferData[]; +extern u8 gBattleTextBuff1[]; +extern u8 gBattleTextBuff2[]; +extern u8 gBattleTextBuff3[]; +extern void (*gBattleMainFunc)(void); +extern void (*gBattleBankFunc[])(void); void sub_800B858(void) { @@ -70,16 +70,16 @@ void setup_poochyena_battle(void) { s32 i; - gUnknown_030042D4 = nullsub_41; + gBattleMainFunc = nullsub_41; for (i = 0; i < 4; i++) { - gUnknown_03004330[i] = nullsub_91; - gUnknown_02024A72[i] = 0xFF; - gUnknown_02024E60[i] = 0; - gUnknown_02024E64[i] = 0; + gBattleBankFunc[i] = nullsub_91; + gBanksBySide[i] = 0xFF; + gActionSelectionCursor[i] = 0; + gMoveSelectionCursor[i] = 0; } sub_800B858(); - gUnknown_02024A64 = 0; + gBattleExecBuffer = 0; battle_anim_clear_some_data(); ClearBattleMonForms(); BattleAI_HandleItemUseBeforeAISetup(); @@ -105,7 +105,7 @@ void sub_800B950(void) sub_800BD54(); if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) { - for (i = 0; i < gUnknown_02024A68; i++) + for (i = 0; i < gNoOfAllBanks; i++) sub_8094978(i, 0); } } @@ -114,30 +114,30 @@ void sub_800B9A8(void) { if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - gUnknown_030042D4 = sub_8010800; + gBattleMainFunc = sub_8010800; if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) - gUnknown_03004330[0] = sub_812B468; + gBattleBankFunc[0] = SetBankFuncToSafariBufferRunCommand; else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL) - gUnknown_03004330[0] = sub_8137224; + gBattleBankFunc[0] = SetBankFuncToWallyBufferRunCommand; else - gUnknown_03004330[0] = sub_802BF74; - gUnknown_02024A72[0] = 0; - gUnknown_03004330[1] = sub_8032AE0; - gUnknown_02024A72[1] = 1; - gUnknown_02024A68 = 2; + gBattleBankFunc[0] = SetBankFuncToPlayerBufferRunCommand; + gBanksBySide[0] = 0; + gBattleBankFunc[1] = SetBankFuncToOpponentBufferRunCommand; + gBanksBySide[1] = 1; + gNoOfAllBanks = 2; } else { - gUnknown_030042D4 = sub_8010800; - gUnknown_03004330[0] = sub_802BF74; - gUnknown_02024A72[0] = 0; - gUnknown_03004330[1] = sub_8032AE0; - gUnknown_02024A72[1] = 1; - gUnknown_03004330[2] = sub_802BF74; - gUnknown_02024A72[2] = 2; - gUnknown_03004330[3] = sub_8032AE0; - gUnknown_02024A72[3] = 3; - gUnknown_02024A68 = 4; + gBattleMainFunc = sub_8010800; + gBattleBankFunc[0] = SetBankFuncToPlayerBufferRunCommand; + gBanksBySide[0] = 0; + gBattleBankFunc[1] = SetBankFuncToOpponentBufferRunCommand; + gBanksBySide[1] = 1; + gBattleBankFunc[2] = SetBankFuncToPlayerBufferRunCommand; + gBanksBySide[2] = 2; + gBattleBankFunc[3] = SetBankFuncToOpponentBufferRunCommand; + gBanksBySide[3] = 3; + gNoOfAllBanks = 4; } } @@ -150,20 +150,20 @@ void sub_800BA78(void) { if (gBattleTypeFlags & BATTLE_TYPE_WILD) { - gUnknown_030042D4 = sub_8010800; - gUnknown_03004330[0] = sub_802BF74; - gUnknown_02024A72[0] = 0; - gUnknown_03004330[1] = sub_8037510; - gUnknown_02024A72[1] = 1; - gUnknown_02024A68 = 2; + gBattleMainFunc = sub_8010800; + gBattleBankFunc[0] = SetBankFuncToPlayerBufferRunCommand; + gBanksBySide[0] = 0; + gBattleBankFunc[1] = SetBankFuncToLinkOpponentBufferRunCommand; + gBanksBySide[1] = 1; + gNoOfAllBanks = 2; } else { - gUnknown_03004330[1] = sub_802BF74; - gUnknown_02024A72[1] = 0; - gUnknown_03004330[0] = sub_8037510; - gUnknown_02024A72[0] = 1; - gUnknown_02024A68 = 2; + gBattleBankFunc[1] = SetBankFuncToPlayerBufferRunCommand; + gBanksBySide[1] = 0; + gBattleBankFunc[0] = SetBankFuncToLinkOpponentBufferRunCommand; + gBanksBySide[0] = 1; + gNoOfAllBanks = 2; } return; } @@ -171,35 +171,35 @@ void sub_800BA78(void) { if (gBattleTypeFlags & BATTLE_TYPE_WILD) { - gUnknown_030042D4 = sub_8010800; - gUnknown_03004330[0] = sub_802BF74; - gUnknown_02024A72[0] = 0; - gUnknown_03004330[1] = sub_8037510; - gUnknown_02024A72[1] = 1; - gUnknown_03004330[2] = sub_802BF74; - gUnknown_02024A72[2] = 2; - gUnknown_03004330[3] = sub_8037510; - gUnknown_02024A72[3] = 3; - gUnknown_02024A68 = 4; + gBattleMainFunc = sub_8010800; + gBattleBankFunc[0] = SetBankFuncToPlayerBufferRunCommand; + gBanksBySide[0] = 0; + gBattleBankFunc[1] = SetBankFuncToLinkOpponentBufferRunCommand; + gBanksBySide[1] = 1; + gBattleBankFunc[2] = SetBankFuncToPlayerBufferRunCommand; + gBanksBySide[2] = 2; + gBattleBankFunc[3] = SetBankFuncToLinkOpponentBufferRunCommand; + gBanksBySide[3] = 3; + gNoOfAllBanks = 4; } else { - gUnknown_03004330[1] = sub_802BF74; - gUnknown_02024A72[1] = 0; - gUnknown_03004330[0] = sub_8037510; - gUnknown_02024A72[0] = 1; - gUnknown_03004330[3] = sub_802BF74; - gUnknown_02024A72[3] = 2; - gUnknown_03004330[2] = sub_8037510; - gUnknown_02024A72[2] = 3; - gUnknown_02024A68 = 4; + gBattleBankFunc[1] = SetBankFuncToPlayerBufferRunCommand; + gBanksBySide[1] = 0; + gBattleBankFunc[0] = SetBankFuncToLinkOpponentBufferRunCommand; + gBanksBySide[0] = 1; + gBattleBankFunc[3] = SetBankFuncToPlayerBufferRunCommand; + gBanksBySide[3] = 2; + gBattleBankFunc[2] = SetBankFuncToLinkOpponentBufferRunCommand; + gBanksBySide[2] = 3; + gNoOfAllBanks = 4; } return; } multiplayerId = GetMultiplayerId(); if (gBattleTypeFlags & BATTLE_TYPE_WILD) - gUnknown_030042D4 = sub_8010800; + gBattleMainFunc = sub_8010800; for (i = 0; i < 4; i++) { switch (gLinkPlayers[i].lp_field_18) @@ -216,18 +216,18 @@ void sub_800BA78(void) if (i == multiplayerId) { - gUnknown_03004330[gLinkPlayers[i].lp_field_18] = sub_802BF74; + gBattleBankFunc[gLinkPlayers[i].lp_field_18] = SetBankFuncToPlayerBufferRunCommand; switch (gLinkPlayers[i].lp_field_18) { case 0: case 3: - gUnknown_02024A72[gLinkPlayers[i].lp_field_18] = 0; - gUnknown_02024A6A[gLinkPlayers[i].lp_field_18] = 0; + gBanksBySide[gLinkPlayers[i].lp_field_18] = 0; + gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0; break; case 1: case 2: - gUnknown_02024A72[gLinkPlayers[i].lp_field_18] = 2; - gUnknown_02024A6A[gLinkPlayers[i].lp_field_18] = 3; + gBanksBySide[gLinkPlayers[i].lp_field_18] = 2; + gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3; break; } } @@ -236,41 +236,41 @@ void sub_800BA78(void) if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[multiplayerId].lp_field_18 & 1)) || ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[multiplayerId].lp_field_18 & 1))) { - gUnknown_03004330[gLinkPlayers[i].lp_field_18] = sub_811DA78; + gBattleBankFunc[gLinkPlayers[i].lp_field_18] = SetBankFuncToLinkPartnerBufferRunCommand; switch (gLinkPlayers[i].lp_field_18) { case 0: case 3: - gUnknown_02024A72[gLinkPlayers[i].lp_field_18] = 0; - gUnknown_02024A6A[gLinkPlayers[i].lp_field_18] = 0; + gBanksBySide[gLinkPlayers[i].lp_field_18] = 0; + gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0; break; case 1: case 2: - gUnknown_02024A72[gLinkPlayers[i].lp_field_18] = 2; - gUnknown_02024A6A[gLinkPlayers[i].lp_field_18] = 3; + gBanksBySide[gLinkPlayers[i].lp_field_18] = 2; + gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3; break; } } else { - gUnknown_03004330[gLinkPlayers[i].lp_field_18] = sub_8037510; + gBattleBankFunc[gLinkPlayers[i].lp_field_18] = SetBankFuncToLinkOpponentBufferRunCommand; switch (gLinkPlayers[i].lp_field_18) { case 0: case 3: - gUnknown_02024A72[gLinkPlayers[i].lp_field_18] = 1; - gUnknown_02024A6A[gLinkPlayers[i].lp_field_18] = 0; + gBanksBySide[gLinkPlayers[i].lp_field_18] = 1; + gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0; break; case 1: case 2: - gUnknown_02024A72[gLinkPlayers[i].lp_field_18] = 3; - gUnknown_02024A6A[gLinkPlayers[i].lp_field_18] = 3; + gBanksBySide[gLinkPlayers[i].lp_field_18] = 3; + gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3; break; } } } } - gUnknown_02024A68 = 4; + gNoOfAllBanks = 4; } void sub_800BD54(void) @@ -280,20 +280,20 @@ void sub_800BD54(void) if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) { - for (i = 0; i < gUnknown_02024A68; i++) + for (i = 0; i < gNoOfAllBanks; i++) { for (j = 0; j < 6; j++) { if (i < 2) { - if (!(gUnknown_02024A72[i] & 1)) + if (!(gBanksBySide[i] & 1)) { if (GetMonData(&gPlayerParty[j], MON_DATA_HP) != 0 && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != 0 && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != SPECIES_EGG && GetMonData(&gPlayerParty[j], MON_DATA_IS_EGG) == 0) { - gUnknown_02024A6A[i] = j; + gBattlePartyID[i] = j; break; } } @@ -304,22 +304,22 @@ void sub_800BD54(void) && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != SPECIES_EGG && GetMonData(&gEnemyParty[j], MON_DATA_IS_EGG) == 0) { - gUnknown_02024A6A[i] = j; + gBattlePartyID[i] = j; break; } } } else { - if (!(gUnknown_02024A72[i] & 1)) + if (!(gBanksBySide[i] & 1)) { if (GetMonData(&gPlayerParty[j], MON_DATA_HP) != 0 && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES) != 0 //Probably a typo by Game Freak. The rest use SPECIES2 && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != SPECIES_EGG && GetMonData(&gPlayerParty[j], MON_DATA_IS_EGG) == 0 - && gUnknown_02024A6A[i - 2] != j) + && gBattlePartyID[i - 2] != j) { - gUnknown_02024A6A[i] = j; + gBattlePartyID[i] = j; break; } } @@ -329,9 +329,9 @@ void sub_800BD54(void) && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != 0 && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != SPECIES_EGG && GetMonData(&gEnemyParty[j], MON_DATA_IS_EGG) == 0 - && gUnknown_02024A6A[i - 2] != j) + && gBattlePartyID[i - 2] != j) { - gUnknown_02024A6A[i] = j; + gBattlePartyID[i] = j; break; } } @@ -356,14 +356,14 @@ void dp01_prepare_buffer(u8 a, u8 *b, u16 c) case 0: for (i = 0; i < c; i++) { - gUnknown_02023A60[gUnknown_02024A60][i] = *b; + gBattleBufferA[gActiveBank][i] = *b; b++; } break; case 1: for (i = 0; i < c; i++) { - gUnknown_02024260[gUnknown_02024A60][i] = *b; + gBattleBufferB[gActiveBank][i] = *b; b++; } break; @@ -400,13 +400,13 @@ void dp01_prepare_buffer_wireless_probably(u8 a, u16 b, u8 *c) gTasks[gUnknown_020238C4].data[14] = 0; } unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14000] = a; - unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14001] = gUnknown_02024A60; - unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14002] = gPlayerMonIndex; - unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14003] = gEnemyMonIndex; + unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14001] = gActiveBank; + unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14002] = gBankAttacker; + unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14003] = gBankTarget; unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14004] = r9; unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14005] = (r9 & 0x0000FF00) >> 8; - unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14006] = gUnknown_02024C0C; - unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14007] = gUnknown_02024C0A; + unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14006] = gAbsentBankFlags; + unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14007] = gEffectBank; for (i = 0; i < b; i++) unk_2000000[gTasks[gUnknown_020238C4].data[14] + 0x14008 + i] = c[i]; gTasks[gUnknown_020238C4].data[14] = gTasks[gUnknown_020238C4].data[14] + r9 + 8; @@ -538,235 +538,235 @@ void sub_800C47C(u8 taskId) switch (unk_2000000[0x15000 + gTasks[taskId].data[15] + 0]) { case 0: - if (gUnknown_02024A64 & gBitTable[r4]) + if (gBattleExecBuffer & gBitTable[r4]) return; - memcpy(gUnknown_02023A60[r4], &unk_2000000[0x15000 + gTasks[taskId].data[15] + 8], r7); + memcpy(gBattleBufferA[r4], &unk_2000000[0x15000 + gTasks[taskId].data[15] + 8], r7); sub_80155A4(r4); if (!(gBattleTypeFlags & BATTLE_TYPE_WILD)) { - gPlayerMonIndex = unk_2000000[0x15000 + gTasks[taskId].data[15] + 2]; - gEnemyMonIndex = unk_2000000[0x15000 + gTasks[taskId].data[15] + 3]; - gUnknown_02024C0C = unk_2000000[0x15000 + gTasks[taskId].data[15] + 6]; - gUnknown_02024C0A = unk_2000000[0x15000 + gTasks[taskId].data[15] + 7]; + gBankAttacker = unk_2000000[0x15000 + gTasks[taskId].data[15] + 2]; + gBankTarget = unk_2000000[0x15000 + gTasks[taskId].data[15] + 3]; + gAbsentBankFlags = unk_2000000[0x15000 + gTasks[taskId].data[15] + 6]; + gEffectBank = unk_2000000[0x15000 + gTasks[taskId].data[15] + 7]; } break; case 1: - memcpy(gUnknown_02024260[r4], &unk_2000000[0x15000 + gTasks[taskId].data[15] + 8], r7); + memcpy(gBattleBufferB[r4], &unk_2000000[0x15000 + gTasks[taskId].data[15] + 8], r7); break; case 2: r2 = unk_2000000[0x15000 + gTasks[taskId].data[15] + 8]; - gUnknown_02024A64 &= ~(gBitTable[r4] << (r2 * 4)); + gBattleExecBuffer &= ~(gBitTable[r4] << (r2 * 4)); break; } gTasks[taskId].data[15] = gTasks[taskId].data[15] + r7 + 8; } } -void dp01_build_cmdbuf_x00_a_b_0(u8 a, u8 b, u8 c) +void EmitGetAttributes(u8 a, u8 b, u8 c) { - gUnknown_03004040[0] = 0; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = 0; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 0; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = 0; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x01_a_b_0(u8 a, u8 b, u8 c) { - gUnknown_03004040[0] = 1; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = 0; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 1; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = 0; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x02_a_b_varargs(u8 a, u8 b, u8 c, u8 d, u8 *e) +void EmitSetAttributes(u8 a, u8 b, u8 c, u8 d, u8 *e) { int i; - gUnknown_03004040[0] = 2; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; + gBattleBuffersTransferData[0] = 2; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; for (i = 0; i < d; i++) - gUnknown_03004040[3 + i] = *(e++); - dp01_prepare_buffer(a, gUnknown_03004040, d + 3); + gBattleBuffersTransferData[3 + i] = *(e++); + dp01_prepare_buffer(a, gBattleBuffersTransferData, d + 3); } void unref_sub_800C6A4(u8 a, u8 b, u8 c, u8 *d) { int i; - gUnknown_03004040[0] = 3; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; + gBattleBuffersTransferData[0] = 3; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; for (i = 0; i < c; i++) - gUnknown_03004040[3 + i] = *(d++); - dp01_prepare_buffer(a, gUnknown_03004040, c + 3); + gBattleBuffersTransferData[3 + i] = *(d++); + dp01_prepare_buffer(a, gBattleBuffersTransferData, c + 3); } void dp01_build_cmdbuf_x04_4_4_4(u8 a) { - gUnknown_03004040[0] = 4; - gUnknown_03004040[1] = 4; - gUnknown_03004040[2] = 4; - gUnknown_03004040[3] = 4; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 4; + gBattleBuffersTransferData[1] = 4; + gBattleBuffersTransferData[2] = 4; + gBattleBuffersTransferData[3] = 4; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void sub_800C704(u8 a, u8 b, u8 c) { - gUnknown_03004040[0] = 5; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = 5; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 5; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = 5; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x06_a(u8 a, u8 b) { - gUnknown_03004040[0] = 6; - gUnknown_03004040[1] = b; - dp01_prepare_buffer(a, gUnknown_03004040, 2); + gBattleBuffersTransferData[0] = 6; + gBattleBuffersTransferData[1] = b; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 2); } void dp01_build_cmdbuf_x07_7_7_7(u8 a) { - gUnknown_03004040[0] = 7; - gUnknown_03004040[1] = 7; - gUnknown_03004040[2] = 7; - gUnknown_03004040[3] = 7; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 7; + gBattleBuffersTransferData[1] = 7; + gBattleBuffersTransferData[2] = 7; + gBattleBuffersTransferData[3] = 7; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x08_8_8_8(u8 a) { - gUnknown_03004040[0] = 8; - gUnknown_03004040[1] = 8; - gUnknown_03004040[2] = 8; - gUnknown_03004040[3] = 8; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 8; + gBattleBuffersTransferData[1] = 8; + gBattleBuffersTransferData[2] = 8; + gBattleBuffersTransferData[3] = 8; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x09_9_9_9(u8 a) { - gUnknown_03004040[0] = 9; - gUnknown_03004040[1] = 9; - gUnknown_03004040[2] = 9; - gUnknown_03004040[3] = 9; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 9; + gBattleBuffersTransferData[1] = 9; + gBattleBuffersTransferData[2] = 9; + gBattleBuffersTransferData[3] = 9; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x0A_A_A_A(u8 a) +void EmitFaintAnimation(u8 a) { - gUnknown_03004040[0] = 10; - gUnknown_03004040[1] = 10; - gUnknown_03004040[2] = 10; - gUnknown_03004040[3] = 10; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 10; + gBattleBuffersTransferData[1] = 10; + gBattleBuffersTransferData[2] = 10; + gBattleBuffersTransferData[3] = 10; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x0B_B_B_B(u8 a) { - gUnknown_03004040[0] = 11; - gUnknown_03004040[1] = 11; - gUnknown_03004040[2] = 11; - gUnknown_03004040[3] = 11; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 11; + gBattleBuffersTransferData[1] = 11; + gBattleBuffersTransferData[2] = 11; + gBattleBuffersTransferData[3] = 11; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x0C_C_C_C(u8 a) { - gUnknown_03004040[0] = 12; - gUnknown_03004040[1] = 12; - gUnknown_03004040[2] = 12; - gUnknown_03004040[3] = 12; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 12; + gBattleBuffersTransferData[1] = 12; + gBattleBuffersTransferData[2] = 12; + gBattleBuffersTransferData[3] = 12; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x0D_a(u8 a, u8 b) { - gUnknown_03004040[0] = 13; - gUnknown_03004040[1] = b; - dp01_prepare_buffer(a, gUnknown_03004040, 2); + gBattleBuffersTransferData[0] = 13; + gBattleBuffersTransferData[1] = b; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 2); } void unref_sub_800C828(u8 a, u8 b, u8 *c) { int i; - gUnknown_03004040[0] = 14; - gUnknown_03004040[1] = b; + gBattleBuffersTransferData[0] = 14; + gBattleBuffersTransferData[1] = b; for (i = 0; i < b * 3; i++) - gUnknown_03004040[2 + i] = *(c++); - dp01_prepare_buffer(a, gUnknown_03004040, b * 3 + 2); -} - -void dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes(u8 a, u16 b, u8 c, u16 d, s32 e, u8 f, u8 *g) -{ - gUnknown_03004040[0] = 15; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = (b & 0xFF00) >> 8; - gUnknown_03004040[3] = c; - gUnknown_03004040[4] = d; - gUnknown_03004040[5] = (d & 0xFF00) >> 8; - gUnknown_03004040[6] = e; - gUnknown_03004040[7] = (e & 0x0000FF00) >> 8; - gUnknown_03004040[8] = (e & 0x00FF0000) >> 16; - gUnknown_03004040[9] = (e & 0xFF000000) >> 24; - gUnknown_03004040[10] = f; - gUnknown_03004040[11] = gUnknown_02024C0E; - if (sub_8018324(14, 0, 13, 0, 0) == 0 && sub_8018324(14, 0, 0x4D, 0, 0) == 0) + gBattleBuffersTransferData[2 + i] = *(c++); + dp01_prepare_buffer(a, gBattleBuffersTransferData, b * 3 + 2); +} + +void EmitMoveAnimation(u8 a, u16 b, u8 c, u16 d, s32 e, u8 f, u8 *g) +{ + gBattleBuffersTransferData[0] = 15; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = (b & 0xFF00) >> 8; + gBattleBuffersTransferData[3] = c; + gBattleBuffersTransferData[4] = d; + gBattleBuffersTransferData[5] = (d & 0xFF00) >> 8; + gBattleBuffersTransferData[6] = e; + gBattleBuffersTransferData[7] = (e & 0x0000FF00) >> 8; + gBattleBuffersTransferData[8] = (e & 0x00FF0000) >> 16; + gBattleBuffersTransferData[9] = (e & 0xFF000000) >> 24; + gBattleBuffersTransferData[10] = f; + gBattleBuffersTransferData[11] = gMultiHitCounter; + if (AbilityBattleEffects(14, 0, 13, 0, 0) == 0 && AbilityBattleEffects(14, 0, 0x4D, 0, 0) == 0) { - gUnknown_03004040[12] = gBattleWeather; - gUnknown_03004040[13] = (gBattleWeather & 0xFF00) >> 8; + gBattleBuffersTransferData[12] = gBattleWeather; + gBattleBuffersTransferData[13] = (gBattleWeather & 0xFF00) >> 8; } else { - gUnknown_03004040[12] = 0; - gUnknown_03004040[13] = 0; + gBattleBuffersTransferData[12] = 0; + gBattleBuffersTransferData[13] = 0; } - gUnknown_03004040[14] = 0; - gUnknown_03004040[15] = 0; - memcpy(&gUnknown_03004040[16], g, 0x1C); - dp01_prepare_buffer(a, gUnknown_03004040, 0x2C); + gBattleBuffersTransferData[14] = 0; + gBattleBuffersTransferData[15] = 0; + memcpy(&gBattleBuffersTransferData[16], g, 0x1C); + dp01_prepare_buffer(a, gBattleBuffersTransferData, 0x2C); } #ifdef NONMATCHING -void dp01_build_cmdbuf_x10_TODO(u8 a, u16 b) +void EmitPrintString(u8 a, u16 b) { int i; //u16 *r12; - gUnknown_03004040[0] = 16; - gUnknown_03004040[1] = gUnknown_02024D26; - gUnknown_03004040[2] = b; - gUnknown_03004040[3] = (b & 0xFF00) >> 8; - - *((u16 *)&gUnknown_03004040[4]) = gUnknown_02024BE6; - *((u16 *)&gUnknown_03004040[6]) = gUnknown_02024BE8; - *((u16 *)&gUnknown_03004040[8]) = gUnknown_02024C04; - - gUnknown_03004040[10] = byte_2024C06; - gUnknown_03004040[11] = unk_2000000[0x16000 + 3]; - gUnknown_03004040[12] = unk_2000000[0x16000 + 0x5E]; - gUnknown_03004040[13] = unk_2000000[0x16000 + 0xC1]; - gUnknown_03004040[14] = gUnknown_02024C0B; - gUnknown_03004040[15] = gBattleMoves[gUnknown_02024BE6].type; + gBattleBuffersTransferData[0] = 16; + gBattleBuffersTransferData[1] = gBattleOutcome; + gBattleBuffersTransferData[2] = b; + gBattleBuffersTransferData[3] = (b & 0xFF00) >> 8; + + *((u16 *)&gBattleBuffersTransferData[4]) = gCurrentMove; + *((u16 *)&gBattleBuffersTransferData[6]) = gUnknown_02024BE8; + *((u16 *)&gBattleBuffersTransferData[8]) = gLastUsedItem; + + gBattleBuffersTransferData[10] = gLastUsedAbility; + gBattleBuffersTransferData[11] = unk_2000000[0x16000 + 3]; + gBattleBuffersTransferData[12] = unk_2000000[0x16000 + 0x5E]; + gBattleBuffersTransferData[13] = unk_2000000[0x16000 + 0xC1]; + gBattleBuffersTransferData[14] = gStringBank; + gBattleBuffersTransferData[15] = gBattleMoves[gCurrentMove].type; for (i = 0; i < 4; i++) { - gUnknown_03004040[16 + i] = gBattleMons[i].ability; + gBattleBuffersTransferData[16 + i] = gBattleMons[i].ability; } for (i = 0; i < 16; i++) { - gUnknown_03004040[20 + i] = gUnknown_030041C0[i]; - gUnknown_03004040[36 + i] = gUnknown_03004290[i]; - gUnknown_03004040[52 + i] = gUnknown_030042B0[i]; + gBattleBuffersTransferData[20 + i] = gBattleTextBuff1[i]; + gBattleBuffersTransferData[36 + i] = gBattleTextBuff2[i]; + gBattleBuffersTransferData[52 + i] = gBattleTextBuff3[i]; } - dp01_prepare_buffer(a, gUnknown_03004040, 0x44); + dp01_prepare_buffer(a, gBattleBuffersTransferData, 0x44); } #else __attribute__((naked)) -void dp01_build_cmdbuf_x10_TODO(u8 a, u16 b) +void EmitPrintString(u8 a, u16 b) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -779,10 +779,10 @@ void dp01_build_cmdbuf_x10_TODO(u8 a, u16 b) mov r10, r0\n\ lsls r1, 16\n\ lsrs r1, 16\n\ - ldr r2, _0800CA2C @ =gUnknown_03004040\n\ + ldr r2, _0800CA2C @ =gBattleBuffersTransferData\n\ movs r0, 0x10\n\ strb r0, [r2]\n\ - ldr r0, _0800CA30 @ =gUnknown_02024D26\n\ + ldr r0, _0800CA30 @ =gBattleOutcome\n\ ldrb r0, [r0]\n\ strb r0, [r2, 0x1]\n\ strb r1, [r2, 0x2]\n\ @@ -790,17 +790,17 @@ void dp01_build_cmdbuf_x10_TODO(u8 a, u16 b) strb r1, [r2, 0x3]\n\ adds r0, r2, 0x4\n\ mov r12, r0\n\ - ldr r4, _0800CA34 @ =gUnknown_02024BE6\n\ + ldr r4, _0800CA34 @ =gCurrentMove\n\ ldrh r0, [r4]\n\ strh r0, [r2, 0x4]\n\ ldr r0, _0800CA38 @ =gUnknown_02024BE8\n\ ldrh r0, [r0]\n\ mov r1, r12\n\ strh r0, [r1, 0x2]\n\ - ldr r0, _0800CA3C @ =gUnknown_02024C04\n\ + ldr r0, _0800CA3C @ =gLastUsedItem\n\ ldrh r0, [r0]\n\ strh r0, [r1, 0x4]\n\ - ldr r0, _0800CA40 @ =byte_2024C06\n\ + ldr r0, _0800CA40 @ =gLastUsedAbility\n\ ldrb r0, [r0]\n\ strb r0, [r1, 0x6]\n\ ldr r1, _0800CA44 @ =0x02000000\n\ @@ -818,7 +818,7 @@ void dp01_build_cmdbuf_x10_TODO(u8 a, u16 b) ldrb r0, [r1]\n\ mov r1, r12\n\ strb r0, [r1, 0x9]\n\ - ldr r0, _0800CA50 @ =gUnknown_02024C0B\n\ + ldr r0, _0800CA50 @ =gStringBank\n\ ldrb r0, [r0]\n\ strb r0, [r1, 0xA]\n\ ldr r3, _0800CA54 @ =gBattleMoves\n\ @@ -832,7 +832,7 @@ void dp01_build_cmdbuf_x10_TODO(u8 a, u16 b) strb r0, [r3, 0xB]\n\ movs r3, 0\n\ mov r9, r2\n\ - ldr r7, _0800CA58 @ =gUnknown_030042B0\n\ + ldr r7, _0800CA58 @ =gBattleTextBuff3\n\ mov r8, r7\n\ adds r2, 0x10\n\ ldr r0, _0800CA5C @ =gBattleMons\n\ @@ -851,12 +851,12 @@ _0800C9D2:\n\ adds r5, 0x10\n\ mov r4, r12\n\ adds r4, 0x20\n\ - ldr r6, _0800CA60 @ =gUnknown_03004290\n\ + ldr r6, _0800CA60 @ =gBattleTextBuff2\n\ mov r2, r12\n\ adds r2, 0x30\n\ _0800C9F0:\n\ adds r1, r5, r3\n\ - ldr r7, _0800CA64 @ =gUnknown_030041C0\n\ + ldr r7, _0800CA64 @ =gBattleTextBuff1\n\ adds r0, r3, r7\n\ ldrb r0, [r0]\n\ strb r0, [r1]\n\ @@ -884,27 +884,27 @@ _0800C9F0:\n\ pop {r0}\n\ bx r0\n\ .align 2, 0\n\ -_0800CA2C: .4byte gUnknown_03004040\n\ -_0800CA30: .4byte gUnknown_02024D26\n\ -_0800CA34: .4byte gUnknown_02024BE6\n\ +_0800CA2C: .4byte gBattleBuffersTransferData\n\ +_0800CA30: .4byte gBattleOutcome\n\ +_0800CA34: .4byte gCurrentMove\n\ _0800CA38: .4byte gUnknown_02024BE8\n\ -_0800CA3C: .4byte gUnknown_02024C04\n\ -_0800CA40: .4byte byte_2024C06\n\ +_0800CA3C: .4byte gLastUsedItem\n\ +_0800CA40: .4byte gLastUsedAbility\n\ _0800CA44: .4byte 0x02000000\n\ _0800CA48: .4byte 0x00016003\n\ _0800CA4C: .4byte 0x000160c1\n\ -_0800CA50: .4byte gUnknown_02024C0B\n\ +_0800CA50: .4byte gStringBank\n\ _0800CA54: .4byte gBattleMoves\n\ -_0800CA58: .4byte gUnknown_030042B0\n\ +_0800CA58: .4byte gBattleTextBuff3\n\ _0800CA5C: .4byte gBattleMons\n\ -_0800CA60: .4byte gUnknown_03004290\n\ -_0800CA64: .4byte gUnknown_030041C0\n\ +_0800CA60: .4byte gBattleTextBuff2\n\ +_0800CA64: .4byte gBattleTextBuff1\n\ .syntax divided\n"); } #endif __attribute__((naked)) -void dp01_build_cmdbuf_x11_TODO() +void EmitPrintStringPlayerOnly() { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -917,7 +917,7 @@ void dp01_build_cmdbuf_x11_TODO() mov r10, r0\n\ lsls r1, 16\n\ lsrs r1, 16\n\ - ldr r2, _0800CB28 @ =gUnknown_03004040\n\ + ldr r2, _0800CB28 @ =gBattleBuffersTransferData\n\ movs r0, 0x11\n\ strb r0, [r2]\n\ strb r0, [r2, 0x1]\n\ @@ -926,17 +926,17 @@ void dp01_build_cmdbuf_x11_TODO() strb r1, [r2, 0x3]\n\ adds r0, r2, 0x4\n\ mov r12, r0\n\ - ldr r0, _0800CB2C @ =gUnknown_02024BE6\n\ + ldr r0, _0800CB2C @ =gCurrentMove\n\ ldrh r0, [r0]\n\ strh r0, [r2, 0x4]\n\ ldr r0, _0800CB30 @ =gUnknown_02024BE8\n\ ldrh r0, [r0]\n\ mov r1, r12\n\ strh r0, [r1, 0x2]\n\ - ldr r0, _0800CB34 @ =gUnknown_02024C04\n\ + ldr r0, _0800CB34 @ =gLastUsedItem\n\ ldrh r0, [r0]\n\ strh r0, [r1, 0x4]\n\ - ldr r0, _0800CB38 @ =byte_2024C06\n\ + ldr r0, _0800CB38 @ =gLastUsedAbility\n\ ldrb r0, [r0]\n\ strb r0, [r1, 0x6]\n\ ldr r0, _0800CB3C @ =0x02000000\n\ @@ -951,7 +951,7 @@ void dp01_build_cmdbuf_x11_TODO() strb r0, [r7, 0x8]\n\ movs r3, 0\n\ mov r9, r2\n\ - ldr r7, _0800CB48 @ =gUnknown_030042B0\n\ + ldr r7, _0800CB48 @ =gBattleTextBuff3\n\ mov r8, r7\n\ mov r4, r9\n\ adds r4, 0x10\n\ @@ -971,12 +971,12 @@ _0800CACE:\n\ adds r5, 0x10\n\ mov r4, r12\n\ adds r4, 0x20\n\ - ldr r6, _0800CB50 @ =gUnknown_03004290\n\ + ldr r6, _0800CB50 @ =gBattleTextBuff2\n\ mov r2, r12\n\ adds r2, 0x30\n\ _0800CAEC:\n\ adds r1, r5, r3\n\ - ldr r7, _0800CB54 @ =gUnknown_030041C0\n\ + ldr r7, _0800CB54 @ =gBattleTextBuff1\n\ adds r0, r3, r7\n\ ldrb r0, [r0]\n\ strb r0, [r1]\n\ @@ -1004,384 +1004,384 @@ _0800CAEC:\n\ pop {r0}\n\ bx r0\n\ .align 2, 0\n\ -_0800CB28: .4byte gUnknown_03004040\n\ -_0800CB2C: .4byte gUnknown_02024BE6\n\ +_0800CB28: .4byte gBattleBuffersTransferData\n\ +_0800CB2C: .4byte gCurrentMove\n\ _0800CB30: .4byte gUnknown_02024BE8\n\ -_0800CB34: .4byte gUnknown_02024C04\n\ -_0800CB38: .4byte byte_2024C06\n\ +_0800CB34: .4byte gLastUsedItem\n\ +_0800CB38: .4byte gLastUsedAbility\n\ _0800CB3C: .4byte 0x02000000\n\ _0800CB40: .4byte 0x00016003\n\ _0800CB44: .4byte 0x0001605e\n\ -_0800CB48: .4byte gUnknown_030042B0\n\ +_0800CB48: .4byte gBattleTextBuff3\n\ _0800CB4C: .4byte gBattleMons\n\ -_0800CB50: .4byte gUnknown_03004290\n\ -_0800CB54: .4byte gUnknown_030041C0\n\ +_0800CB50: .4byte gBattleTextBuff2\n\ +_0800CB54: .4byte gBattleTextBuff1\n\ .syntax divided\n"); } void dp01_build_cmdbuf_x12_a_bb(u8 a, u8 b, u16 c) { - gUnknown_03004040[0] = 18; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = (c & 0xFF00) >> 8; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 18; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = (c & 0xFF00) >> 8; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void unref_sub_800CB84(u8 a, u8 b) { - gUnknown_03004040[0] = 19; - gUnknown_03004040[1] = b; - dp01_prepare_buffer(a, gUnknown_03004040, 2); + gBattleBuffersTransferData[0] = 19; + gBattleBuffersTransferData[1] = b; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 2); } void sub_800CBA4(u8 a, u8 b, u8 c, u8 *d) { u32 i; - gUnknown_03004040[0] = 20; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = 0; + gBattleBuffersTransferData[0] = 20; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = 0; for (i = 0; i < 20; i++) - gUnknown_03004040[4 + i] = d[i]; - dp01_prepare_buffer(a, gUnknown_03004040, 24); + gBattleBuffersTransferData[4 + i] = d[i]; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 24); } void sub_800CBE0(u8 a, u8 *b) { int i; - gUnknown_03004040[0] = 21; + gBattleBuffersTransferData[0] = 21; for (i = 0; i < 3; i++) - gUnknown_03004040[1 + i] = b[i]; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[1 + i] = b[i]; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f(u8 a, u8 b, u8 c, u8 d, u8 *e) { int i; - gUnknown_03004040[0] = 22; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = d; + gBattleBuffersTransferData[0] = 22; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = d; for (i = 0; i < 3; i++) - gUnknown_03004040[4 + i] = e[i]; - dp01_prepare_buffer(a, gUnknown_03004040, 8); //but only 7 bytes were written + gBattleBuffersTransferData[4 + i] = e[i]; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 8); //but only 7 bytes were written } void dp01_build_cmdbuf_x17_17_17_17(u8 a) { - gUnknown_03004040[0] = 23; - gUnknown_03004040[1] = 23; - gUnknown_03004040[2] = 23; - gUnknown_03004040[3] = 23; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 23; + gBattleBuffersTransferData[1] = 23; + gBattleBuffersTransferData[2] = 23; + gBattleBuffersTransferData[3] = 23; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x18_0_aa_health_bar_update(u8 a, s16 b) +void EmitHealthBarUpdate(u8 a, s16 b) { - gUnknown_03004040[0] = 24; - gUnknown_03004040[1] = 0; - gUnknown_03004040[2] = b; - gUnknown_03004040[3] = (b & 0xFF00) >> 8; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 24; + gBattleBuffersTransferData[1] = 0; + gBattleBuffersTransferData[2] = b; + gBattleBuffersTransferData[3] = (b & 0xFF00) >> 8; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x19_a_bb(u8 a, u8 b, s16 c) +void EmitExpBarUpdate(u8 a, u8 b, s16 c) { - gUnknown_03004040[0] = 25; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = (c & 0xFF00) >> 8; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 25; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = (c & 0xFF00) >> 8; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x1A_aaaa_bbbb(u8 a, u32 b, u32 c) +void EmitStatusIconUpdate(u8 a, u32 b, u32 c) { - gUnknown_03004040[0] = 26; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = (b & 0x0000FF00) >> 8; - gUnknown_03004040[3] = (b & 0x00FF0000) >> 16; - gUnknown_03004040[4] = (b & 0xFF000000) >> 24; - gUnknown_03004040[5] = c; - gUnknown_03004040[6] = (c & 0x0000FF00) >> 8; - gUnknown_03004040[7] = (c & 0x00FF0000) >> 16; - gUnknown_03004040[8] = (c & 0xFF000000) >> 24; - dp01_prepare_buffer(a, gUnknown_03004040, 9); + gBattleBuffersTransferData[0] = 26; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = (b & 0x0000FF00) >> 8; + gBattleBuffersTransferData[3] = (b & 0x00FF0000) >> 16; + gBattleBuffersTransferData[4] = (b & 0xFF000000) >> 24; + gBattleBuffersTransferData[5] = c; + gBattleBuffersTransferData[6] = (c & 0x0000FF00) >> 8; + gBattleBuffersTransferData[7] = (c & 0x00FF0000) >> 16; + gBattleBuffersTransferData[8] = (c & 0xFF000000) >> 24; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 9); } -void dp01_build_cmdbuf_x1B_aaaa_b(u8 a, u8 b, u32 c) +void EmitStatusAnimation(u8 a, u8 b, u32 c) { - gUnknown_03004040[0] = 27; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = (c & 0x0000FF00) >> 8; - gUnknown_03004040[4] = (c & 0x00FF0000) >> 16; - gUnknown_03004040[5] = (c & 0xFF000000) >> 24; - dp01_prepare_buffer(a, gUnknown_03004040, 6); + gBattleBuffersTransferData[0] = 27; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = (c & 0x0000FF00) >> 8; + gBattleBuffersTransferData[4] = (c & 0x00FF0000) >> 16; + gBattleBuffersTransferData[5] = (c & 0xFF000000) >> 24; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 6); } -void dp01_build_cmdbuf_x1C_a(u8 a, u8 b) +void EmitStatusXor(u8 a, u8 b) { - gUnknown_03004040[0] = 28; - gUnknown_03004040[1] = b; - dp01_prepare_buffer(a, gUnknown_03004040, 2); + gBattleBuffersTransferData[0] = 28; + gBattleBuffersTransferData[1] = b; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 2); } void dp01_build_cmdbuf_x1D_1D_numargs_varargs(u8 a, u16 b, u8 *c) { int i; - gUnknown_03004040[0] = 29; - gUnknown_03004040[1] = 29; - gUnknown_03004040[2] = b; - gUnknown_03004040[3] = (b & 0xFF00) >> 8; + gBattleBuffersTransferData[0] = 29; + gBattleBuffersTransferData[1] = 29; + gBattleBuffersTransferData[2] = b; + gBattleBuffersTransferData[3] = (b & 0xFF00) >> 8; for (i = 0; i < b; i++) - gUnknown_03004040[4 + i] = *(c++); - dp01_prepare_buffer(a, gUnknown_03004040, b + 4); + gBattleBuffersTransferData[4 + i] = *(c++); + dp01_prepare_buffer(a, gBattleBuffersTransferData, b + 4); } void unref_sub_800CDD4(u8 a, u32 b, u16 c, u8 *d) { int i; - gUnknown_03004040[0] = 30; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = (b & 0x0000FF00) >> 8; - gUnknown_03004040[3] = (b & 0x00FF0000) >> 16; - gUnknown_03004040[4] = (b & 0xFF000000) >> 24; - gUnknown_03004040[5] = c; - gUnknown_03004040[6] = (c & 0xFF00) >> 8; + gBattleBuffersTransferData[0] = 30; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = (b & 0x0000FF00) >> 8; + gBattleBuffersTransferData[3] = (b & 0x00FF0000) >> 16; + gBattleBuffersTransferData[4] = (b & 0xFF000000) >> 24; + gBattleBuffersTransferData[5] = c; + gBattleBuffersTransferData[6] = (c & 0xFF00) >> 8; for (i = 0; i < c; i++) - gUnknown_03004040[7 + i] = *(d++); - dp01_prepare_buffer(a, gUnknown_03004040, c + 7); + gBattleBuffersTransferData[7 + i] = *(d++); + dp01_prepare_buffer(a, gBattleBuffersTransferData, c + 7); } void unref_sub_800CE3C(u8 a, u16 b, u8 *c) { int i; - gUnknown_03004040[0] = 31; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = (b & 0xFF00) >> 8; + gBattleBuffersTransferData[0] = 31; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = (b & 0xFF00) >> 8; for (i = 0; i < b; i++) - gUnknown_03004040[3 + i] = *(c++); - dp01_prepare_buffer(a, gUnknown_03004040, b + 3); + gBattleBuffersTransferData[3 + i] = *(c++); + dp01_prepare_buffer(a, gBattleBuffersTransferData, b + 3); } void unref_sub_800CE84(u8 a, u16 b, u8 *c) { int i; - gUnknown_03004040[0] = 32; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = (b & 0xFF00) >> 8; + gBattleBuffersTransferData[0] = 32; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = (b & 0xFF00) >> 8; for (i = 0; i < b; i++) - gUnknown_03004040[3 + i] = *(c++); - dp01_prepare_buffer(a, gUnknown_03004040, b + 3); + gBattleBuffersTransferData[3 + i] = *(c++); + dp01_prepare_buffer(a, gBattleBuffersTransferData, b + 3); } void dp01_build_cmdbuf_x21_a_bb(u8 a, u8 b, u16 c) { - gUnknown_03004040[0] = 33; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = (c & 0xFF00) >> 8; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 33; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = (c & 0xFF00) >> 8; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x22_a_three_bytes(u8 a, u8 b, u8 *c) { int i; - gUnknown_03004040[0] = 34; - gUnknown_03004040[1] = b; + gBattleBuffersTransferData[0] = 34; + gBattleBuffersTransferData[1] = b; for (i = 0; i < 3; i++) - gUnknown_03004040[2 + i] = c[i]; - dp01_prepare_buffer(a, gUnknown_03004040, 5); + gBattleBuffersTransferData[2 + i] = c[i]; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 5); } void dp01_build_cmdbuf_x23_aa_0(u8 a, u16 b) { - gUnknown_03004040[0] = 35; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = (b & 0xFF00) >> 8; - gUnknown_03004040[3] = 0; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 35; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = (b & 0xFF00) >> 8; + gBattleBuffersTransferData[3] = 0; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x24_aa_0(u8 a, u16 b) { - gUnknown_03004040[0] = 36; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = (b & 0xFF00) >> 8; - gUnknown_03004040[3] = 0; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 36; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = (b & 0xFF00) >> 8; + gBattleBuffersTransferData[3] = 0; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x25_25_25_25(u8 a) { - gUnknown_03004040[0] = 37; - gUnknown_03004040[1] = 37; - gUnknown_03004040[2] = 37; - gUnknown_03004040[3] = 37; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 37; + gBattleBuffersTransferData[1] = 37; + gBattleBuffersTransferData[2] = 37; + gBattleBuffersTransferData[3] = 37; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x26_a(u8 a, u8 b) { - gUnknown_03004040[0] = 38; - gUnknown_03004040[1] = b; - dp01_prepare_buffer(a, gUnknown_03004040, 2); + gBattleBuffersTransferData[0] = 38; + gBattleBuffersTransferData[1] = b; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 2); } void dp01_build_cmdbuf_x27_27_27_27(u8 a) { - gUnknown_03004040[0] = 39; - gUnknown_03004040[1] = 39; - gUnknown_03004040[2] = 39; - gUnknown_03004040[3] = 39; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 39; + gBattleBuffersTransferData[1] = 39; + gBattleBuffersTransferData[2] = 39; + gBattleBuffersTransferData[3] = 39; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x28_28_28_28(u8 a) { - gUnknown_03004040[0] = 40; - gUnknown_03004040[1] = 40; - gUnknown_03004040[2] = 40; - gUnknown_03004040[3] = 40; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 40; + gBattleBuffersTransferData[1] = 40; + gBattleBuffersTransferData[2] = 40; + gBattleBuffersTransferData[3] = 40; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x29_29_29_29(u8 a) +void EmitHitAnimation(u8 a) { - gUnknown_03004040[0] = 41; - gUnknown_03004040[1] = 41; - gUnknown_03004040[2] = 41; - gUnknown_03004040[3] = 41; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 41; + gBattleBuffersTransferData[1] = 41; + gBattleBuffersTransferData[2] = 41; + gBattleBuffersTransferData[3] = 41; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x2A_2A_2A_2A(u8 a) { - gUnknown_03004040[0] = 42; - gUnknown_03004040[1] = 42; - gUnknown_03004040[2] = 42; - gUnknown_03004040[3] = 42; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 42; + gBattleBuffersTransferData[1] = 42; + gBattleBuffersTransferData[2] = 42; + gBattleBuffersTransferData[3] = 42; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x2B_aa_0(u8 a, u16 b) +void EmitEffectivenessSound(u8 a, u16 b) { - gUnknown_03004040[0] = 43; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = (b & 0xFF00) >> 8; - gUnknown_03004040[3] = 0; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 43; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = (b & 0xFF00) >> 8; + gBattleBuffersTransferData[3] = 0; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void sub_800D074(u8 a, u16 b) { - gUnknown_03004040[0] = 44; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = (b & 0xFF00) >> 8; - gUnknown_03004040[3] = 0; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 44; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = (b & 0xFF00) >> 8; + gBattleBuffersTransferData[3] = 0; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x2D_2D_2D_2D(u8 a) +void EmitFaintingCry(u8 a) { - gUnknown_03004040[0] = 45; - gUnknown_03004040[1] = 45; - gUnknown_03004040[2] = 45; - gUnknown_03004040[3] = 45; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 45; + gBattleBuffersTransferData[1] = 45; + gBattleBuffersTransferData[2] = 45; + gBattleBuffersTransferData[3] = 45; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x2E_a(u8 a, u8 b) +void EmitBattleIntroSlide(u8 a, u8 b) { - gUnknown_03004040[0] = 46; - gUnknown_03004040[1] = b; - dp01_prepare_buffer(a, gUnknown_03004040, 2); + gBattleBuffersTransferData[0] = 46; + gBattleBuffersTransferData[1] = b; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 2); } void dp01_build_cmdbuf_x2F_2F_2F_2F(u8 a) { - gUnknown_03004040[0] = 47; - gUnknown_03004040[1] = 47; - gUnknown_03004040[2] = 47; - gUnknown_03004040[3] = 47; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 47; + gBattleBuffersTransferData[1] = 47; + gBattleBuffersTransferData[2] = 47; + gBattleBuffersTransferData[3] = 47; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x30_TODO(u8 a, u8 *b, u8 c) { int i; - gUnknown_03004040[0] = 48; - gUnknown_03004040[1] = c & 0x7F; - gUnknown_03004040[2] = (c & 0x80) >> 7; - gUnknown_03004040[3] = 48; + gBattleBuffersTransferData[0] = 48; + gBattleBuffersTransferData[1] = c & 0x7F; + gBattleBuffersTransferData[2] = (c & 0x80) >> 7; + gBattleBuffersTransferData[3] = 48; for (i = 0; i < 48; i++) - gUnknown_03004040[4 + i] = b[i]; - dp01_prepare_buffer(a, gUnknown_03004040, 52); + gBattleBuffersTransferData[4 + i] = b[i]; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 52); } void dp01_build_cmdbuf_x31_31_31_31(u8 a) { - gUnknown_03004040[0] = 49; - gUnknown_03004040[1] = 49; - gUnknown_03004040[2] = 49; - gUnknown_03004040[3] = 49; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 49; + gBattleBuffersTransferData[1] = 49; + gBattleBuffersTransferData[2] = 49; + gBattleBuffersTransferData[3] = 49; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } void dp01_build_cmdbuf_x32_32_32_32(u8 a) { - gUnknown_03004040[0] = 50; - gUnknown_03004040[1] = 50; - gUnknown_03004040[2] = 50; - gUnknown_03004040[3] = 50; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 50; + gBattleBuffersTransferData[1] = 50; + gBattleBuffersTransferData[2] = 50; + gBattleBuffersTransferData[3] = 50; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x33_a_33_33(u8 a, u8 b) +void EmitSpriteInvisibility(u8 a, u8 b) { - gUnknown_03004040[0] = 51; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = 51; - gUnknown_03004040[3] = 51; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 51; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = 51; + gBattleBuffersTransferData[3] = 51; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void dp01_build_cmdbuf_x34_a_bb_aka_battle_anim(u8 a, u8 b, u16 c) +void EmitBattleAnimation(u8 a, u8 b, u16 c) { - gUnknown_03004040[0] = 52; - gUnknown_03004040[1] = b; - gUnknown_03004040[2] = c; - gUnknown_03004040[3] = (c & 0xFF00) >> 8; - dp01_prepare_buffer(a, gUnknown_03004040, 4); + gBattleBuffersTransferData[0] = 52; + gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[3] = (c & 0xFF00) >> 8; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 4); } -void sub_800D1D8(u8 a, u8 b) +void EmitLinkStandbyMsg(u8 a, u8 b) { - gUnknown_03004040[0] = 53; - gUnknown_03004040[1] = b; - dp01_prepare_buffer(a, gUnknown_03004040, 2); + gBattleBuffersTransferData[0] = 53; + gBattleBuffersTransferData[1] = b; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 2); } -void dp01_build_cmdbuf_x38_a(u8 a, u8 b) +void EmitResetActionMoveSelection(u8 a, u8 b) { - gUnknown_03004040[0] = 54; - gUnknown_03004040[1] = b; - dp01_prepare_buffer(a, gUnknown_03004040, 2); + gBattleBuffersTransferData[0] = 54; + gBattleBuffersTransferData[1] = b; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 2); } void dp01_build_cmdbuf_x37_a(u8 a, u8 b) { - gUnknown_03004040[0] = 55; - gUnknown_03004040[1] = b; - dp01_prepare_buffer(a, gUnknown_03004040, 2); + gBattleBuffersTransferData[0] = 55; + gBattleBuffersTransferData[1] = b; + dp01_prepare_buffer(a, gBattleBuffersTransferData, 2); } diff --git a/src/rom_800D42C.c b/src/rom_800D42C.c index 6f153c340..f51779e65 100644 --- a/src/rom_800D42C.c +++ b/src/rom_800D42C.c @@ -4,7 +4,7 @@ #include "text.h" extern u16 gBattleTypeFlags; -extern u8 gUnknown_02024D26; +extern u8 gBattleOutcome; extern struct Window gUnknown_03004210; @@ -37,7 +37,7 @@ extern u8 BattleText_Tie[]; void PrintLinkBattleWinLossTie(void) { - if (gUnknown_02024D26 == 3) + if (gBattleOutcome == 3) { PRINT_MESSAGE(BattleText_Tie, TILE_OFFSET_WIN, CENTER_MESSAGE_X); return; @@ -47,7 +47,7 @@ void PrintLinkBattleWinLossTie(void) { // Double battle? - if (gUnknown_02024D26 == 1) + if (gBattleOutcome == 1) { // lp_field_18 = player position? @@ -89,7 +89,7 @@ void PrintLinkBattleWinLossTie(void) } - if (gUnknown_02024D26 == 1) + if (gBattleOutcome == 1) { if (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18 != 0) { diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index a31a764fb..249146b37 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -24,11 +24,11 @@ #define NUM_BATTLE_SLOTS 4 -#define gBattleMonPartyPositions gUnknown_02024A6A +#define gBattleMonPartyPositions gBattlePartyID #define gCastformElevations gUnknownCastformData_0837F5A8 #define gCastformBackSpriteYCoords gUnknown_0837F5AC -#define gTransformPersonalities gUnknown_02024E70 -#define gBattleMonSprites gUnknown_02024BE0 +#define gTransformPersonalities gPID_perBank +#define gBattleMonSprites gObjectBankIDs struct Struct_unk_2019348 { @@ -105,11 +105,11 @@ extern u8 gBattleMonSprites[NUM_BATTLE_SLOTS]; extern u8 gBattleAnimPlayerMonIndex; extern u8 gBattleAnimEnemyMonIndex; extern s16 gBattleAnimArgs[8]; -extern u8 gUnknown_02024A72[NUM_BATTLE_SLOTS]; -extern u8 gUnknown_02024A68; // gNumBattleMons? +extern u8 gBanksBySide[NUM_BATTLE_SLOTS]; +extern u8 gNoOfAllBanks; // gNumBattleMons? extern struct OamMatrix gOamMatrices[]; extern struct Struct_2017810 unk_2017810[]; -extern u8 gUnknown_0202F7BE; +extern u8 gHappinessMoveAnim; EWRAM_DATA union AffineAnimCmd *gUnknown_0202F7D4 = NULL; EWRAM_DATA u32 filler_0202F7D8[3] = {0}; @@ -193,10 +193,10 @@ u8 sub_8077ABC(u8 slot, u8 a2) { switch (a2) { case 0: case 2: - var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][battle_get_per_side_status(slot)].field_0; + var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][GetBankIdentity(slot)].field_0; break; case 1: - var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][battle_get_per_side_status(slot)].field_1; + var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][GetBankIdentity(slot)].field_1; break; case 3: case 4: @@ -208,7 +208,7 @@ u8 sub_8077ABC(u8 slot, u8 a2) { species = unk_2019348.field_0; } } else { - if (battle_side_get_owner(slot)) { + if (GetBankSide(slot)) { transform = &gTransformStatuses[slot]; if (!transform->species) { species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); @@ -241,7 +241,7 @@ u8 sub_8077BFC(u8 slot, u16 species) { u8 ret; u16 var; - if (!battle_side_get_owner(slot) || IsContest()) { + if (!GetBankSide(slot) || IsContest()) { if (species == SPECIES_UNOWN) { if (IsContest()) { if (unk_2019348.field_4 & 1) { @@ -299,7 +299,7 @@ u8 sub_8077BFC(u8 slot, u16 species) { u8 sub_8077DD8(u8 slot, u16 species) { u8 ret = 0; - if (battle_side_get_owner(slot) == 1) { + if (GetBankSide(slot) == 1) { if (!IsContest()) { if (species == SPECIES_CASTFORM) { ret = gCastformElevations[gBattleMonForms[slot]]; @@ -316,15 +316,15 @@ u8 sub_8077DD8(u8 slot, u16 species) { u8 sub_8077E44(u8 slot, u16 species, u8 a3) { u16 offset; u8 y; - if (battle_side_get_owner(slot) == 0 || IsContest()) { + if (GetBankSide(slot) == 0 || IsContest()) { offset = sub_8077BFC(slot, species); } else { offset = sub_8077BFC(slot, species); offset -= sub_8077DD8(slot, species); } - y = offset + gUnknown_0837F578[IS_DOUBLE_BATTLE()][battle_get_per_side_status(slot)].field_1; + y = offset + gUnknown_0837F578[IS_DOUBLE_BATTLE()][GetBankIdentity(slot)].field_1; if (a3) { - if (battle_side_get_owner(slot) == 0) { + if (GetBankSide(slot) == 0) { y += 8; } if (y > 104) y = 104; @@ -366,7 +366,7 @@ u8 sub_8077F68(u8 slot) { u8 sub_8077F7C(u8 slot) { u16 var; - if (battle_side_get_owner(slot)) { + if (GetBankSide(slot)) { var = sub_8077ABC(slot, 1) + 16; } else { var = sub_8077ABC(slot, 1) + 17; @@ -380,7 +380,7 @@ u8 sub_8077FC0(u8 slot) { struct TransformStatus *transform; r6 = sub_8077ABC(slot, 1); if (!IsContest()) { - if (battle_side_get_owner(slot)) { + if (GetBankSide(slot)) { transform = &gTransformStatuses[slot]; if (!transform->species) { var = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); @@ -395,7 +395,7 @@ u8 sub_8077FC0(u8 slot) { var = transform->species; } } - if (battle_side_get_owner(slot)) { + if (GetBankSide(slot)) { r6 -= sub_8077DD8(slot, var); } } @@ -678,7 +678,7 @@ void sub_807867C(struct Sprite *sprite, s16 a2) { } else if (v1 < v2) { sprite->pos1.x += a2; } else { - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + if (GetBankSide(gBattleAnimPlayerMonIndex)) { sprite->pos1.x -= a2; } else { sprite->pos1.x += a2; @@ -731,18 +731,18 @@ void sub_80787B0(struct Sprite *sprite, u8 a2) { sprite->pos1.y += gBattleAnimArgs[1]; } -u8 battle_side_get_owner(u8 slot) { - return gUnknown_02024A72[slot] & 1; +u8 GetBankSide(u8 slot) { + return gBanksBySide[slot] & 1; } -u8 battle_get_per_side_status(u8 slot) { - return gUnknown_02024A72[slot]; +u8 GetBankIdentity(u8 slot) { + return gBanksBySide[slot]; } -u8 battle_get_side_with_given_state(u8 slot) { +u8 GetBankByPlayerAI(u8 slot) { u8 i; - for (i = 0; i < gUnknown_02024A68; i++) { - if (gUnknown_02024A72[i] == slot) { + for (i = 0; i < gNoOfAllBanks; i++) { + if (gBanksBySide[i] == slot) { break; } } @@ -759,10 +759,10 @@ bool8 sub_8078874(u8 slot) { } return FALSE; } else { - if (gUnknown_02024A72[slot] == 0xff) { + if (gBanksBySide[slot] == 0xff) { return FALSE; } - if (battle_side_get_owner(slot)) { + if (GetBankSide(slot)) { if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) { return TRUE; } @@ -796,7 +796,7 @@ void sub_8078954(struct Struct_sub_8078914 *unk) { unk->field_0 = (u8 *)0x6008000; unk->field_4 = (u8 *)0x600f000; unk->field_8 = 0xe; - } else if (battle_get_per_side_status_permutated(gBattleAnimPlayerMonIndex) == 1) { + } else if (GetBankIdentity_permutated(gBattleAnimPlayerMonIndex) == 1) { unk->field_0 = (u8 *)0x6004000; unk->field_4 = (u8 *)0x600e000; unk->field_8 = 0x8; @@ -1184,25 +1184,25 @@ u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) { } } else { if (a1) { - if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(0))) { - var |= 1 << (battle_get_side_with_given_state(0) + 16); + if (b_side_obj__get_some_boolean(GetBankByPlayerAI(0))) { + var |= 1 << (GetBankByPlayerAI(0) + 16); } } if (a2) { - if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(2))) { - shift = battle_get_side_with_given_state(2) + 16; + if (b_side_obj__get_some_boolean(GetBankByPlayerAI(2))) { + shift = GetBankByPlayerAI(2) + 16; var |= 1 << shift; } } if (a3) { - if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(1))) { - shift = battle_get_side_with_given_state(1) + 16; + if (b_side_obj__get_some_boolean(GetBankByPlayerAI(1))) { + shift = GetBankByPlayerAI(1) + 16; var |= 1 << shift; } } if (a4) { - if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(3))) { - shift = battle_get_side_with_given_state(3) + 16; + if (b_side_obj__get_some_boolean(GetBankByPlayerAI(3))) { + shift = GetBankByPlayerAI(3) + 16; var |= 1 << shift; } } @@ -1215,7 +1215,7 @@ u8 sub_80793A8(u8 a1) { } u8 unref_sub_80793B0(u8 a1) { - return battle_get_side_with_given_state(a1); + return GetBankByPlayerAI(a1); } void sub_80793C4(struct Sprite *sprite) { @@ -1252,7 +1252,7 @@ void sub_807941C(struct Sprite *sprite) { v2 = 1; } sub_80787B0(sprite, v1); - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + if (GetBankSide(gBattleAnimPlayerMonIndex)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data0 = gBattleAnimArgs[4]; @@ -1264,7 +1264,7 @@ void sub_807941C(struct Sprite *sprite) { void sub_80794A8(struct Sprite *sprite) { sub_80787B0(sprite, 1); - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + if (GetBankSide(gBattleAnimPlayerMonIndex)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data0 = gBattleAnimArgs[4]; @@ -1297,7 +1297,7 @@ void sub_8079534(struct Sprite *sprite) { sub_8078764(sprite, r4); slot = gBattleAnimEnemyMonIndex; } - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + if (GetBankSide(gBattleAnimPlayerMonIndex)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sub_8078764(sprite, r4); @@ -1542,7 +1542,7 @@ u16 sub_8079B10(u8 sprite) { species = unk_2019348.field_0; return gMonBackPicCoords[species].y_offset; } else { - if (!battle_side_get_owner(i)) { + if (!GetBankSide(i)) { transform = &gTransformStatuses[slot]; if (!transform->species) { species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES); @@ -1610,11 +1610,11 @@ u8 sub_8079C74(struct Task *task) { void sub_8079CEC(u8 task) { u16 v1; - if (gUnknown_0202F7BE <= 30) { + if (gHappinessMoveAnim <= 30) { v1 = 0; - } else if (gUnknown_0202F7BE <= 100) { + } else if (gHappinessMoveAnim <= 100) { v1 = 1; - } else if (gUnknown_0202F7BE <= 200) { + } else if (gHappinessMoveAnim <= 200) { v1 = 2; } else { v1 = 3; @@ -1640,7 +1640,7 @@ void unref_sub_8079D20(u8 priority) { void sub_8079E24() { int i; - for (i = 0; i < gUnknown_02024A68; i++) { + for (i = 0; i < gNoOfAllBanks; i++) { if (b_side_obj__get_some_boolean(i)) { gSprites[gBattleMonSprites[i]].subpriority = sub_8079E90(i); gSprites[gBattleMonSprites[i]].oam.priority = 2; @@ -1658,7 +1658,7 @@ u8 sub_8079E90(u8 slot) { return 40; } } else { - status = battle_get_per_side_status(slot); + status = GetBankIdentity(slot); if (status == 0) { ret = 30; } else if (status == 2) { @@ -1673,7 +1673,7 @@ u8 sub_8079E90(u8 slot) { } u8 sub_8079ED4(u8 slot) { - u8 status = battle_get_per_side_status(slot); + u8 status = GetBankIdentity(slot); if (IsContest()) { return 2; } @@ -1684,10 +1684,10 @@ u8 sub_8079ED4(u8 slot) { } } -u8 battle_get_per_side_status_permutated(u8 slot) { +u8 GetBankIdentity_permutated(u8 slot) { u8 status; if (!IsContest()) { - status = battle_get_per_side_status(slot); + status = GetBankIdentity(slot); if (status == 0 || status == 3) { return 2; } else { @@ -1785,7 +1785,7 @@ int sub_807A100(u8 slot, u8 a2) { coords = &gMonBackPicCoords[0]; } } else { - if (!battle_side_get_owner(slot)) { + if (!GetBankSide(slot)) { transform = &gTransformStatuses[slot]; if (!transform->species) { species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); @@ -1892,7 +1892,7 @@ u8 sub_807A4A0(int a1, u8 sprite, int a3) { void sub_807A544(struct Sprite *sprite) { sub_8078650(sprite); - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + if (GetBankSide(gBattleAnimPlayerMonIndex)) { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; sprite->hFlip = TRUE; @@ -1909,7 +1909,7 @@ void sub_807A544(struct Sprite *sprite) { } void sub_807A5C4(struct Sprite *sprite) { - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + if (GetBankSide(gBattleAnimPlayerMonIndex)) { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] *= -1; } else { @@ -1927,7 +1927,7 @@ void sub_807A5C4(struct Sprite *sprite) { void sub_807A63C(struct Sprite *sprite) { sub_8078650(sprite); - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + if (GetBankSide(gBattleAnimPlayerMonIndex)) { sprite->pos1.x -= gBattleAnimArgs[0]; } else { sprite->pos1.x += gBattleAnimArgs[0]; @@ -1942,7 +1942,7 @@ void sub_807A69C(u8 taskId) { u16 dest; struct Task *task = &gTasks[taskId]; task->data[0] = obj_id_for_side_relative_to_move(0); - task->data[1] = (battle_side_get_owner(gBattleAnimPlayerMonIndex)) ? -8 : 8; + task->data[1] = (GetBankSide(gBattleAnimPlayerMonIndex)) ? -8 : 8; task->data[2] = 0; task->data[3] = 0; gSprites[task->data[0]].pos2.x -= task->data[0]; @@ -2014,7 +2014,7 @@ void sub_807A8D4(struct Sprite *sprite) { void sub_807A908(struct Sprite *sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); - if (!battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + if (!GetBankSide(gBattleAnimPlayerMonIndex)) { sprite->data0 = 5; } else { sprite->data0 = -10; @@ -2041,7 +2041,7 @@ void sub_807A9BC(struct Sprite *sprite) { sprite->data0 = gBattleAnimArgs[2]; sprite->data2 = sprite->pos1.x + gBattleAnimArgs[4]; sprite->data4 = sprite->pos1.y + gBattleAnimArgs[5]; - if (!battle_side_get_owner(gBattleAnimEnemyMonIndex)) { + if (!GetBankSide(gBattleAnimEnemyMonIndex)) { x = (u16)gBattleAnimArgs[4] + 30; sprite->pos1.x += x; sprite->pos1.y = gBattleAnimArgs[5] - 20; diff --git a/src/safari_zone.c b/src/safari_zone.c index fa6c11f52..a47c8e951 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -23,7 +23,7 @@ struct PokeblockFeeder static void ClearAllPokeblockFeeders(void); static void DecrementFeederStepCounters(void); -extern u8 gUnknown_02024D26; +extern u8 gBattleOutcome; EWRAM_DATA u8 gNumSafariBalls = 0; EWRAM_DATA static u16 gSafariZoneStepCounter = 0; @@ -99,14 +99,14 @@ void sub_80C824C(void) { SetMainCallback2(c2_exit_to_overworld_2_switch); } - else if (gUnknown_02024D26 == 8) + else if (gBattleOutcome == 8) { ScriptContext2_RunNewScript(&gUnknown_081C340A); warp_in(); gFieldCallback = sub_8080E44; SetMainCallback2(CB2_LoadMap); } - else if (gUnknown_02024D26 == 7) + else if (gBattleOutcome == 7) { ScriptContext1_SetupScript(&gUnknown_081C3459); ScriptContext1_Stop(); diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index c8171db52..fb72be527 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -31,7 +31,7 @@ extern struct SpriteTemplate gUnknown_02024E8C; extern u8 gContestPlayerMonIndex; extern u8 gIsLinkContest; extern u8 gPlayerPartyCount; -extern u8 gSelectedOrderFromParty[]; +extern u8 gBufferedMoves[]; extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; @@ -648,7 +648,7 @@ void sub_80C5568(void) void sub_80C5580(void) { - u8 var = gSelectedOrderFromParty[0]; + u8 var = gBufferedMoves[0]; switch(var) { @@ -671,7 +671,7 @@ void ChooseBattleTowerPlayerParty(void) void SetBattleTowerPlayerParty(void) { - u8 var = gSelectedOrderFromParty[0]; + u8 var = gBufferedMoves[0]; switch(var) { @@ -697,8 +697,8 @@ void ReducePlayerPartyToThree(void) // copy the selected pokemon according to the order. for(i = 0; i < 3; i++) - if(gSelectedOrderFromParty[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop - party[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1]; // index is 0 based, not literal + if(gBufferedMoves[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop + party[i] = gPlayerParty[gBufferedMoves[i] - 1]; // index is 0 based, not literal // delete the last 3 pokemon CpuFill32(0, gPlayerParty, sizeof gPlayerParty); @@ -44,7 +44,7 @@ struct UnkTvStruct s8 var0; }; -extern struct Struct30042E0 gUnknown_030042E0; +extern struct Struct30042E0 gBattleResults; extern u8 gUnknown_0300430A[11]; struct OutbreakPokemon @@ -101,9 +101,9 @@ extern u16 gScriptLastTalked; extern u8 gScriptContestCategory; extern u8 gScriptContestRank; extern u8 gUnknown_03004316[11]; -extern u8 gUnknown_02024D26; +extern u8 gBattleOutcome; -extern u16 gUnknown_02024C04; +extern u16 gLastUsedItem; extern u8 ewram[]; #define gUnknown_02007000 (*(ewramStruct_02007000 *)(ewram + 0x7000)) @@ -132,7 +132,7 @@ extern u16 sub_8135D3C(u8); extern u8 gScriptContestCategory; extern u8 gScriptContestRank; extern u8 gUnknown_03004316[11]; -extern u8 gUnknown_02024D26; +extern u8 gBattleOutcome; void sub_80BF334(void); void sub_80BF3A4(void); @@ -156,7 +156,7 @@ void sub_80BEA88(void); void sub_80BE138(TVShow *show); void sub_80BE160(TVShow *show); -extern u16 gUnknown_02024C04; +extern u16 gLastUsedItem; void sub_80BE5FC(void); void sub_80BE65C(void); @@ -430,33 +430,33 @@ void TakeTVShowInSearchOfTrainersOffTheAir(void); void GabbyAndTyBeforeInterview(void) { u8 i; - gSaveBlock1.gabbyAndTyData.mon1 = gUnknown_030042E0.unk6; - gSaveBlock1.gabbyAndTyData.mon2 = gUnknown_030042E0.unk26; - gSaveBlock1.gabbyAndTyData.lastMove = gUnknown_030042E0.unk22; + gSaveBlock1.gabbyAndTyData.mon1 = gBattleResults.unk6; + gSaveBlock1.gabbyAndTyData.mon2 = gBattleResults.unk26; + gSaveBlock1.gabbyAndTyData.lastMove = gBattleResults.unk22; if (gSaveBlock1.gabbyAndTyData.battleNum != 0xff) { gSaveBlock1.gabbyAndTyData.battleNum ++; } - gSaveBlock1.gabbyAndTyData.valA_0 = gUnknown_030042E0.unk5_0; - if (gUnknown_030042E0.unk0) + gSaveBlock1.gabbyAndTyData.valA_0 = gBattleResults.unk5_0; + if (gBattleResults.unk0) { gSaveBlock1.gabbyAndTyData.valA_1 = 1; } else { gSaveBlock1.gabbyAndTyData.valA_1 = 0; } - if (gUnknown_030042E0.unk3) + if (gBattleResults.unk3) { gSaveBlock1.gabbyAndTyData.valA_2 = 1; } else { gSaveBlock1.gabbyAndTyData.valA_2 = 0; } - if (!gUnknown_030042E0.unk5_1) + if (!gBattleResults.unk5_1) { for (i=0; i<11; i++) { - if (gUnknown_030042E0.unk36[i] != 0) + if (gBattleResults.unk36[i] != 0) { gSaveBlock1.gabbyAndTyData.valA_3 = 1; break; @@ -612,38 +612,38 @@ void sub_80BDEC8(void) { total = 0; sub_80BEB20(); sub_80BE778(); - if (gUnknown_030042E0.unk28 == 0) { + if (gBattleResults.unk28 == 0) { sub_80BE074(); } else { sub_80BE028(); - if (sub_80BF77C(0xffff) == 0 && StringCompareWithoutExtCtrlCodes(gSpeciesNames[gUnknown_030042E0.unk28], gUnknown_030042E0.unk2A) != 0) { + if (sub_80BF77C(0xffff) == 0 && StringCompareWithoutExtCtrlCodes(gSpeciesNames[gBattleResults.unk28], gBattleResults.unk2A) != 0) { gUnknown_03005D38.var0 = sub_80BF74C(gSaveBlock1.tvShows); if (gUnknown_03005D38.var0 != -1 && sub_80BF1B4(TVSHOW_POKEMON_TODAY_CAUGHT) != 1) { for (i=0; i<11; i++) { - total += gUnknown_030042E0.unk36[i]; + total += gBattleResults.unk36[i]; } - if (total != 0 || gUnknown_030042E0.unk5_1 != 0) { + if (total != 0 || gBattleResults.unk5_1 != 0) { total = FALSE; show = &gSaveBlock1.tvShows[gUnknown_03005D38.var0]; show->pokemonToday.var00 = TVSHOW_POKEMON_TODAY_CAUGHT; show->pokemonToday.var01 = total; - if (gUnknown_030042E0.unk5_1 != 0) { + if (gBattleResults.unk5_1 != 0) { total = 1; item = ITEM_MASTER_BALL; } else { for (i=0; i<11; i++) { - total += gUnknown_030042E0.unk36[i]; + total += gBattleResults.unk36[i]; } if (total > 0xff) { total = 0xff; } - item = gUnknown_02024C04; + item = gLastUsedItem; } show->pokemonToday.var12 = total; show->pokemonToday.ball = item; StringCopy(show->pokemonToday.playerName, gSaveBlock2.playerName); - StringCopy(show->pokemonToday.nickname, gUnknown_030042E0.unk2A); - show->pokemonToday.species = gUnknown_030042E0.unk28; + StringCopy(show->pokemonToday.nickname, gBattleResults.unk2A); + show->pokemonToday.species = gBattleResults.unk28; sub_80BE138(show); show->pokemonToday.language = GAME_LANGUAGE; show->pokemonToday.language2 = sub_80BDEAC(show->pokemonToday.nickname); @@ -663,8 +663,8 @@ void sub_80BE028(void) { buffer->worldOfMasters.var00 = TVSHOW_WORLD_OF_MASTERS; } buffer->worldOfMasters.var02++; - buffer->worldOfMasters.var04 = gUnknown_030042E0.unk28; - buffer->worldOfMasters.var08 = gUnknown_030042E0.unk6; + buffer->worldOfMasters.var04 = gBattleResults.unk28; + buffer->worldOfMasters.var08 = gBattleResults.unk6; buffer->worldOfMasters.var0a = gMapHeader.name; } @@ -681,7 +681,7 @@ void sub_80BE074(void) { if (total > 0xff) { total = 0xff; } - if (total > 2 && gUnknown_02024D26 == 1) { + if (total > 2 && gBattleOutcome == 1) { gUnknown_03005D38.var0 = sub_80BF74C(gSaveBlock1.tvShows); if (gUnknown_03005D38.var0 != -1 && sub_80BF1B4(TVSHOW_POKEMON_TODAY_FAILED) != 1) { flag = FALSE; @@ -689,10 +689,10 @@ void sub_80BE074(void) { asm_comment("Here the wrong registers are used to hold the show ID and flag."); show->pokemonTodayFailed.var00 = TVSHOW_POKEMON_TODAY_FAILED; show->pokemonTodayFailed.var01 = flag; - show->pokemonTodayFailed.species = gUnknown_030042E0.unk6; - show->pokemonTodayFailed.species2 = gUnknown_030042E0.unk20; + show->pokemonTodayFailed.species = gBattleResults.unk6; + show->pokemonTodayFailed.species2 = gBattleResults.unk20; show->pokemonTodayFailed.var10 = total; - show->pokemonTodayFailed.var11 = gUnknown_02024D26; + show->pokemonTodayFailed.var11 = gBattleOutcome; show->pokemonTodayFailed.var12 = gMapHeader.name; StringCopy(show->pokemonTodayFailed.playerName, gSaveBlock2.playerName); sub_80BE138(show); @@ -731,7 +731,7 @@ _080BE088:\n\ _080BE0A2:\n\ cmp r5, 0x2\n\ bls _080BE112\n\ - ldr r7, _080BE120 @ =gUnknown_02024D26\n\ + ldr r7, _080BE120 @ =gBattleOutcome\n\ ldrb r0, [r7]\n\ cmp r0, 0x1\n\ bne _080BE112\n\ @@ -763,7 +763,7 @@ _080BE0A2:\n\ movs r0, 0x17\n\ strb r0, [r4]\n\ strb r1, [r4, 0x1]\n\ - ldr r1, _080BE12C @ =gUnknown_030042E0\n\ + ldr r1, _080BE12C @ =gBattleResults\n\ ldrh r0, [r1, 0x6]\n\ strh r0, [r4, 0xC]\n\ ldrh r0, [r1, 0x20]\n\ @@ -789,10 +789,10 @@ _080BE112:\n\ .align 2, 0\n\ _080BE118: .4byte 0x0000ffff\n\ _080BE11C: .4byte gUnknown_03004316\n\ -_080BE120: .4byte gUnknown_02024D26\n\ +_080BE120: .4byte gBattleOutcome\n\ _080BE124: .4byte gSaveBlock1 + 0x2738\n\ _080BE128: .4byte gUnknown_03005D38\n\ -_080BE12C: .4byte gUnknown_030042E0\n\ +_080BE12C: .4byte gBattleResults\n\ _080BE130: .4byte gMapHeader\n\ _080BE134: .4byte gSaveBlock2\n\ .syntax divided\n"); diff --git a/src/unknown_debug_menu.c b/src/unknown_debug_menu.c index 2cdcbaabd..6a8bad0d4 100644 --- a/src/unknown_debug_menu.c +++ b/src/unknown_debug_menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "menu.h" -extern u8 gUnknown_02024D1E[]; +extern u8 gBattleCommunication[]; extern u8 (*gCallback_03004AE8)(void); @@ -33,7 +33,7 @@ static u8 sub_814A464(void) } else { - gUnknown_02024D1E[0] = result; + gBattleCommunication[0] = result; gCallback_03004AE8 = gUnknown_0842C29C[result].func; return 0; } @@ -43,8 +43,8 @@ u8 sub_814A4B8(void) { gSaveBlock2.filler_A8.var_4AE = 3; gSaveBlock2.filler_A8.var_4AF = 3; - gSaveBlock2.filler_A8.var_4B4 = gUnknown_02024D1E[0] + 1; - gSaveBlock2.filler_A8.var_4B6 = gUnknown_02024D1E[0] + 1; + gSaveBlock2.filler_A8.var_4B4 = gBattleCommunication[0] + 1; + gSaveBlock2.filler_A8.var_4B6 = gBattleCommunication[0] + 1; gSaveBlock2.filler_A8.var_4B0 = 1; gSaveBlock2.filler_A8.var_4B2 = 1; CloseMenu(); diff --git a/sym_common.txt b/sym_common.txt index 407dca9d1..dfd114c8c 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -5,7 +5,7 @@ .include "rtc.o" .align 4 -gUnknown_03004040: @ 3004040 +gBattleBuffersTransferData: @ 3004040 .space 0x170 gUnknown_030041B0: @ 30041B0 @@ -17,7 +17,7 @@ gUnknown_030041B4: @ 30041B4 gUnknown_030041B8: @ 30041B8 .space 0x8 -gUnknown_030041C0: @ 30041C0 +gBattleTextBuff1: @ 30041C0 .space 0x10 gUnknown_030041D0: @ 30041D0 @@ -50,7 +50,7 @@ gUnknown_03004288: @ 3004288 gBattleTerrain: @ 300428C .space 0x4 -gUnknown_03004290: @ 3004290 +gBattleTextBuff2: @ 3004290 .space 0x10 gUnknown_030042A0: @ 30042A0 @@ -59,7 +59,7 @@ gUnknown_030042A0: @ 30042A0 gUnknown_030042A4: @ 30042A4 .space 0xC -gUnknown_030042B0: @ 30042B0 +gBattleTextBuff3: @ 30042B0 .space 0x10 gUnknown_030042C0: @ 30042C0 @@ -68,13 +68,13 @@ gUnknown_030042C0: @ 30042C0 gUnknown_030042C4: @ 30042C4 .space 0xC -gUnknown_030042D0: @ 30042D0 +gPreBattleCallback1: @ 30042D0 .space 0x4 -gUnknown_030042D4: @ 30042D4 +gBattleMainFunc: @ 30042D4 .space 0xC -gUnknown_030042E0: @ 30042E0 +gBattleResults: @ 30042E0 .space 0x1C gUnknown_030042FC: @ 30042FC @@ -86,13 +86,13 @@ gUnknown_0300430A: @ 300430A gUnknown_03004316: @ 3004316 .space 0xE -gUnknown_03004324: @ 3004324 +gLeveledUpInBattle: @ 3004324 .space 0xC -gUnknown_03004330: @ 3004330 +gBattleBankFunc: @ 3004330 .space 0x10 -gUnknown_03004340: @ 3004340 +gHealthboxIDs: @ 3004340 .space 0x4 gUnknown_03004344: @ 3004344 diff --git a/sym_ewram.txt b/sym_ewram.txt index dadf5e615..9f810eba7 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -20,7 +20,7 @@ gUnknown_020238C6: @ 20238C6 gUnknown_020238C8: @ 20238C8 .space 0x4 -gUnknown_020238CC: @ 20238CC +gDisplayedStringBattle: @ 20238CC .space 0x12C gBattleTypeFlags: @ 20239F8 @@ -38,7 +38,7 @@ gUnknown_02023A04: @ 2023A04 gUnknown_02023A14: @ 2023A14 .space 0x4C -gUnknown_02023A60: @ 2023A60 +gBattleBufferA: @ 2023A60 .space 0x2 gUnknown_02023A62: @ 2023A62 @@ -50,37 +50,37 @@ gUnknown_02023A63: @ 2023A63 gUnknown_02023A64: @ 2023A64 .space 0x7FC -gUnknown_02024260: @ 2024260 +gBattleBufferB: @ 2024260 .space 0x4 gUnknown_02024264: @ 2024264 .space 0x7FC -gUnknown_02024A60: @ 2024A60 +gActiveBank: @ 2024A60 .space 0x4 -gUnknown_02024A64: @ 2024A64 +gBattleExecBuffer: @ 2024A64 .space 0x4 -gUnknown_02024A68: @ 2024A68 +gNoOfAllBanks: @ 2024A68 .space 0x2 -gUnknown_02024A6A: @ 2024A6A +gBattlePartyID: @ 2024A6A .space 0x8 -gUnknown_02024A72: @ 2024A72 +gBanksBySide: @ 2024A72 .space 0x4 gUnknown_02024A76: @ 2024A76 .space 0x4 -gUnknown_02024A7A: @ 2024A7A +gTurnOrder: @ 2024A7A .space 0x4 -gUnknown_02024A7E: @ 2024A7E +gCurrentMoveTurn: @ 2024A7E .space 0x1 -gUnknown_02024A7F: @ 2024A7F +gFightStateTracker: @ 2024A7F .space 0x1 gBattleMons: @ 2024A80 @@ -104,16 +104,16 @@ gUnknown_02024ACC: @ 2024ACC gUnknown_02024AD0: @ 2024AD0 .space 0x110 -gUnknown_02024BE0: @ 2024BE0 +gObjectBankIDs: @ 2024BE0 .space 0x4 -gUnknown_02024BE4: @ 2024BE4 +gCurrMovePos: @ 2024BE4 .space 0x1 gUnknown_02024BE5: @ 2024BE5 .space 0x1 -gUnknown_02024BE6: @ 2024BE6 +gCurrentMove: @ 2024BE6 .space 0x2 gUnknown_02024BE8: @ 2024BE8 @@ -125,46 +125,46 @@ gUnknown_02024BEA: @ 2024BEA gBattleMoveDamage: @ 2024BEC .space 0x4 -gUnknown_02024BF0: @ 2024BF0 +gHP_dealt: @ 2024BF0 .space 0x4 -gUnknown_02024BF4: @ 2024BF4 +gTakenDmg: @ 2024BF4 .space 0x10 -gUnknown_02024C04: @ 2024C04 +gLastUsedItem: @ 2024C04 .space 0x2 -byte_2024C06: @ 2024C06 +gLastUsedAbility: @ 2024C06 .space 0x1 -gPlayerMonIndex: @ 2024C07 +gBankAttacker: @ 2024C07 .space 0x1 -gEnemyMonIndex: @ 2024C08 +gBankTarget: @ 2024C08 .space 0x1 -gUnknown_02024C09: @ 2024C09 +gBank1: @ 2024C09 .space 0x1 -gUnknown_02024C0A: @ 2024C0A +gEffectBank: @ 2024C0A .space 0x1 -gUnknown_02024C0B: @ 2024C0B +gStringBank: @ 2024C0B .space 0x1 -gUnknown_02024C0C: @ 2024C0C +gAbsentBankFlags: @ 2024C0C .space 0x1 gCritMultiplier: @ 2024C0D .space 0x1 -gUnknown_02024C0E: @ 2024C0E +gMultiHitCounter: @ 2024C0E .space 0x2 -gUnknown_02024C10: @ 2024C10 +gBattlescriptCurrInstr: @ 2024C10 .space 0x8 -gUnknown_02024C18: @ 2024C18 +gActionForBanks: @ 2024C18 .space 0x4 gUnknown_02024C1C: @ 2024C1C @@ -173,10 +173,10 @@ gUnknown_02024C1C: @ 2024C1C gUnknown_02024C2C: @ 2024C2C .space 0x8 -gUnknown_02024C34: @ 2024C34 +gLastUsedMove: @ 2024C34 .space 0x8 -gUnknown_02024C3C: @ 2024C3C +gMoveHitWith: @ 2024C3C .space 0x8 gUnknown_02024C44: @ 2024C44 @@ -185,70 +185,70 @@ gUnknown_02024C44: @ 2024C44 gUnknown_02024C4C: @ 2024C4C .space 0x8 -gUnknown_02024C54: @ 2024C54 +gLockedMove: @ 2024C54 .space 0x8 gUnknown_02024C5C: @ 2024C5C .space 0x4 -gUnknown_02024C60: @ 2024C60 +gChosenMovesByBanks: @ 2024C60 .space 0x8 gBattleMoveFlags: @ 2024C68 .space 0x4 -gUnknown_02024C6C: @ 2024C6C +gHitMarker: @ 2024C6C .space 0x4 gUnknown_02024C70: @ 2024C70 .space 0x4 -gUnknown_02024C74: @ 2024C74 +gTakenDmgBanks: @ 2024C74 .space 0x4 gUnknown_02024C78: @ 2024C78 .space 0x2 -gUnknown_02024C7A: @ 2024C7A +gSideAffecting: @ 2024C7A .space 0x6 -gUnknown_02024C80: @ 2024C80 +gSideTimer: @ 2024C80 .space 0x18 -gUnknown_02024C98: @ 2024C98 +gStatuses3: @ 2024C98 .space 0x10 -gUnknown_02024CA8: @ 2024CA8 +gDisableStructs: @ 2024CA8 .space 0x70 -gUnknown_02024D18: @ 2024D18 +gPauseCounterBattle: @ 2024D18 .space 0x2 -gUnknown_02024D1A: @ 2024D1A +gPaydayMoney: @ 2024D1A .space 0x2 -gUnknown_02024D1C: @ 2024D1C +gRandomTurnNumber: @ 2024D1C .space 0x2 -gUnknown_02024D1E: @ 2024D1E +gBattleCommunication: @ 2024D1E .space 0x1 gUnknown_02024D1F: @ 2024D1F .space 0x7 -gUnknown_02024D26: @ 2024D26 +gBattleOutcome: @ 2024D26 .space 0x2 -gUnknown_02024D28: @ 2024D28 +gProtectStructs: @ 2024D28 .space 0x40 -gUnknown_02024D68: @ 2024D68 +gSpecialStatuses: @ 2024D68 .space 0x50 gBattleWeather: @ 2024DB8 .space 0x4 -gUnknown_02024DBC: @ 2024DBC +gWishFutureKnock: @ 2024DBC .space 0x20 gUnknown_02024DDC: @ 2024DDC @@ -257,13 +257,13 @@ gUnknown_02024DDC: @ 2024DDC gUnknown_02024DE8: @ 2024DE8 .space 0x2 -gUnknown_02024DEA: @ 2024DEA +gSentPokesToOpponent: @ 2024DEA .space 0x2 -gUnknown_02024DEC: @ 2024DEC +gDynamicBasePower: @ 2024DEC .space 0x2 -gUnknown_02024DEE: @ 2024DEE +gExpShareExp: @ 2024DEE .space 0x2 gEnigmaBerries: @ 2024DF0 @@ -272,22 +272,22 @@ gEnigmaBerries: @ 2024DF0 gUnknown_02024DF8: @ 2024DF8 .space 0x68 -gUnknown_02024E60: @ 2024E60 +gActionSelectionCursor: @ 2024E60 .space 0x4 -gUnknown_02024E64: @ 2024E64 +gMoveSelectionCursor: @ 2024E64 .space 0x4 gUnknown_02024E68: @ 2024E68 .space 0x4 -gUnknown_02024E6C: @ 2024E6C +gBankInMenu: @ 2024E6C .space 0x1 -gUnknown_02024E6D: @ 2024E6D +gDoingBattleAnim: @ 2024E6D .space 0x3 -gUnknown_02024E70: @ 2024E70 +gPID_perBank: @ 2024E70 .space 0x10 gBattleMovePower: @ 2024E80 @@ -925,10 +925,10 @@ gUnknown_02039268: @ 2039268 gUnknown_0203926A: @ 203926A .space 0x2 -gUnknown_0203926C: @ 203926C +gAbilitiesPerBank: @ 203926C .space 0x4 -gSelectedOrderFromParty: @ 2039270 +gBufferedMoves: @ 2039270 .space 0x4 gUnknown_02039274: @ 2039274 |