diff options
Diffstat (limited to 'asm/battle_2.s')
| -rw-r--r-- | asm/battle_2.s | 1586 |
1 files changed, 793 insertions, 793 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index 3fdaeca33..d4fb29c16 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -9,7 +9,7 @@ sub_800FD9C: @ 800FD9C push {r4,lr} bl MoveSaveBlocks_ResetHeap - bl sub_802E03C + bl AllocateBattleResources bl AllocateBattleSpritesData bl AllocateMonSpritesGfx ldr r4, _0800FDCC @ =gBattleTypeFlags @@ -18,17 +18,17 @@ sub_800FD9C: @ 800FD9C ands r0, r1 cmp r0, 0 beq _0800FDD8 - bl sub_800D230 + bl HandleLinkBattleSetup ldr r0, _0800FDD0 @ =sub_80109C8 bl SetMainCallback2 - ldr r1, _0800FDD4 @ =gUnknown_2023E82 + ldr r1, _0800FDD4 @ =gBattleCommunication movs r0, 0 strb r0, [r1] b _0800FE1C .align 2, 0 _0800FDCC: .4byte gBattleTypeFlags _0800FDD0: .4byte sub_80109C8 -_0800FDD4: .4byte gUnknown_2023E82 +_0800FDD4: .4byte gBattleCommunication _0800FDD8: bl sub_800FE24 ldr r1, [r4] @@ -169,9 +169,9 @@ _0800FEA6: ldr r1, _0800FF68 @ =gReservedSpritePaletteCount movs r0, 0x4 strb r0, [r1] - ldr r0, _0800FF6C @ =sub_80116F4 + ldr r0, _0800FF6C @ =VBlankCB_Battle bl SetVBlankCallback - bl sub_800D278 + bl SetUpBattleVars ldr r0, _0800FF70 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 @@ -199,7 +199,7 @@ _0800FF5C: .4byte gBattle_BG3_X _0800FF60: .4byte gBattle_BG3_Y _0800FF64: .4byte gUnknown_2022B50 _0800FF68: .4byte gReservedSpritePaletteCount -_0800FF6C: .4byte sub_80116F4 +_0800FF6C: .4byte VBlankCB_Battle _0800FF70: .4byte gBattleTypeFlags _0800FF74: .4byte sub_8010BA0 _0800FF78: @@ -237,7 +237,7 @@ _0800FFAE: cmp r4, r5 ble _0800FFAE movs r1, 0 - ldr r0, _0800FFE8 @ =gUnknown_2023E82 + ldr r0, _0800FFE8 @ =gBattleCommunication strb r1, [r0] add sp, 0x4 pop {r4,r5} @@ -251,7 +251,7 @@ _0800FFD8: .4byte gTrainerBattleOpponent_A _0800FFDC: .4byte gMain _0800FFE0: .4byte 0x00000439 _0800FFE4: .4byte gPlayerParty -_0800FFE8: .4byte gUnknown_2023E82 +_0800FFE8: .4byte gBattleCommunication thumb_func_end sub_800FE24 thumb_func_start sub_800FFEC @@ -952,7 +952,7 @@ sub_8010508: @ 8010508 movs r0, 0x1 adds r5, r4, 0 eors r5, r0 - ldr r0, _08010544 @ =gUnknown_2023E82 + ldr r0, _08010544 @ =gBattleCommunication ldrb r0, [r0] cmp r0, 0x10 bls _08010536 @@ -965,7 +965,7 @@ _08010536: mov pc, r0 .align 2, 0 _08010540: .4byte gBattleStruct -_08010544: .4byte gUnknown_2023E82 +_08010544: .4byte gBattleCommunication _08010548: .4byte _0801054C .align 2, 0 _0801054C: @@ -1000,7 +1000,7 @@ _08010590: movs r0, 0x3 bl ShowBg bl sub_80357C8 - ldr r1, _080105CC @ =gUnknown_2023E82 + ldr r1, _080105CC @ =gBattleCommunication movs r0, 0x1 strb r0, [r1] _080105BC: @@ -1010,10 +1010,10 @@ _080105BC: bne _080105C6 b _080108B8 _080105C6: - bl sub_80FCEA8 + bl LoadWirelessStatusIndicatorSpriteGfx b _080108B8 .align 2, 0 -_080105CC: .4byte gUnknown_2023E82 +_080105CC: .4byte gBattleCommunication _080105D0: .4byte gWirelessCommType _080105D4: ldr r2, _08010640 @ =gBattleTypeFlags @@ -1029,7 +1029,7 @@ _080105D4: bne _080105EC b _080108B8 _080105EC: - bl sub_800A4BC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 beq _0801062A @@ -1053,7 +1053,7 @@ _080105EC: adds r1, r5 movs r2, 0x20 bl SendBlock - ldr r0, _08010650 @ =gUnknown_2023E82 + ldr r0, _08010650 @ =gBattleCommunication strb r6, [r0] _0801062A: ldr r0, _08010654 @ =gWirelessCommType @@ -1064,26 +1064,26 @@ _0801062A: _08010634: movs r0, 0 movs r1, 0 - bl sub_80FCD74 + bl CreateWirelessStatusIndicatorSprite b _080108B8 .align 2, 0 _08010640: .4byte gBattleTypeFlags _08010644: .4byte gReceivedRemoteLinkPlayers _08010648: .4byte gBattleStruct _0801064C: .4byte 0x00000185 -_08010650: .4byte gUnknown_2023E82 +_08010650: .4byte gBattleCommunication _08010654: .4byte gWirelessCommType _08010658: movs r0, 0x4 orrs r1, r0 str r1, [r2] - ldr r1, _0801066C @ =gUnknown_2023E82 + ldr r1, _0801066C @ =gBattleCommunication movs r0, 0xF strb r0, [r1] bl sub_801017C b _080108B8 .align 2, 0 -_0801066C: .4byte gUnknown_2023E82 +_0801066C: .4byte gBattleCommunication _08010670: bl GetBlockReceivedStatus movs r1, 0x3 @@ -1133,16 +1133,16 @@ _0801067E: ldrh r0, [r1] strh r0, [r2, 0x10] bl SetDeoxysStats - ldr r1, _080106F0 @ =gUnknown_2023E82 + ldr r1, _080106F0 @ =gBattleCommunication b _080108B2 .align 2, 0 _080106E0: .4byte sub_800F6FC _080106E4: .4byte gTasks _080106E8: .4byte gBattleStruct _080106EC: .4byte gBlockRecvBuffer -_080106F0: .4byte gUnknown_2023E82 +_080106F0: .4byte gBattleCommunication _080106F4: - bl sub_800A4BC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 bne _08010700 @@ -1154,11 +1154,11 @@ _08010700: ldr r1, _08010714 @ =gPlayerParty movs r2, 0xC8 bl SendBlock - ldr r1, _08010718 @ =gUnknown_2023E82 + ldr r1, _08010718 @ =gBattleCommunication b _080108B2 .align 2, 0 _08010714: .4byte gPlayerParty -_08010718: .4byte gUnknown_2023E82 +_08010718: .4byte gBattleCommunication _0801071C: bl GetBlockReceivedStatus movs r1, 0x3 @@ -1174,14 +1174,14 @@ _0801072A: adds r1, r2 movs r2, 0xC8 bl memcpy - ldr r1, _08010748 @ =gUnknown_2023E82 + ldr r1, _08010748 @ =gBattleCommunication b _080108B2 .align 2, 0 _08010740: .4byte gEnemyParty _08010744: .4byte gBlockRecvBuffer -_08010748: .4byte gUnknown_2023E82 +_08010748: .4byte gBattleCommunication _0801074C: - bl sub_800A4BC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 bne _08010758 @@ -1193,11 +1193,11 @@ _08010758: ldr r1, _0801076C @ =gUnknown_202434C movs r2, 0xC8 bl SendBlock - ldr r1, _08010770 @ =gUnknown_2023E82 + ldr r1, _08010770 @ =gBattleCommunication b _080108B2 .align 2, 0 _0801076C: .4byte gUnknown_202434C -_08010770: .4byte gUnknown_2023E82 +_08010770: .4byte gBattleCommunication _08010774: bl GetBlockReceivedStatus movs r1, 0x3 @@ -1213,14 +1213,14 @@ _08010782: adds r1, r2 movs r2, 0xC8 bl memcpy - ldr r1, _080107A0 @ =gUnknown_2023E82 + ldr r1, _080107A0 @ =gBattleCommunication b _080108B2 .align 2, 0 _08010798: .4byte gUnknown_20240F4 _0801079C: .4byte gBlockRecvBuffer -_080107A0: .4byte gUnknown_2023E82 +_080107A0: .4byte gBattleCommunication _080107A4: - bl sub_800A4BC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 bne _080107B0 @@ -1232,11 +1232,11 @@ _080107B0: ldr r1, _080107C4 @ =gUnknown_2024414 movs r2, 0xC8 bl SendBlock - ldr r1, _080107C8 @ =gUnknown_2023E82 + ldr r1, _080107C8 @ =gBattleCommunication b _080108B2 .align 2, 0 _080107C4: .4byte gUnknown_2024414 -_080107C8: .4byte gUnknown_2023E82 +_080107C8: .4byte gBattleCommunication _080107CC: bl GetBlockReceivedStatus movs r1, 0x3 @@ -1268,17 +1268,17 @@ _080107CC: adds r0, r4, 0 adds r0, 0x64 bl sub_8011D0C - ldr r1, _08010830 @ =gUnknown_2023E82 + ldr r1, _08010830 @ =gBattleCommunication b _080108B2 .align 2, 0 _08010820: .4byte gUnknown_20241BC _08010824: .4byte gBlockRecvBuffer _08010828: .4byte 0xfffffe70 _0801082C: .4byte 0xfffffed4 -_08010830: .4byte gUnknown_2023E82 +_08010830: .4byte gBattleCommunication _08010834: bl sub_800D30C - ldr r0, _08010848 @ =gUnknown_2023E82 + ldr r0, _08010848 @ =gBattleCommunication ldrb r1, [r0] adds r1, 0x1 movs r2, 0 @@ -1287,7 +1287,7 @@ _08010834: strb r2, [r0, 0x2] b _080108B8 .align 2, 0 -_08010848: .4byte gUnknown_2023E82 +_08010848: .4byte gBattleCommunication _0801084C: ldr r0, _08010880 @ =gUnknown_2023E83 adds r1, r0, 0x1 @@ -1295,13 +1295,13 @@ _0801084C: lsls r0, 24 cmp r0, 0 beq _080108B8 - ldr r2, _08010884 @ =gUnknown_3004F80 + ldr r2, _08010884 @ =gPreBattleCallback1 ldr r1, _08010888 @ =gMain ldr r0, [r1] str r0, [r2] ldr r0, _0801088C @ =sub_80123E4 str r0, [r1] - ldr r0, _08010890 @ =sub_8011100 + ldr r0, _08010890 @ =BattleMainCB2 bl SetMainCallback2 ldr r2, _08010894 @ =gBattleTypeFlags ldr r1, [r2] @@ -1315,20 +1315,20 @@ _0801084C: b _080108B8 .align 2, 0 _08010880: .4byte gUnknown_2023E83 -_08010884: .4byte gUnknown_3004F80 +_08010884: .4byte gPreBattleCallback1 _08010888: .4byte gMain _0801088C: .4byte sub_80123E4 -_08010890: .4byte sub_8011100 +_08010890: .4byte BattleMainCB2 _08010894: .4byte gBattleTypeFlags _08010898: - ldr r0, _080108C0 @ =gUnknown_2023E82 + ldr r0, _080108C0 @ =gBattleCommunication ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] movs r1, 0x1 strb r1, [r0, 0x1] _080108A4: - ldr r1, _080108C0 @ =gUnknown_2023E82 + ldr r1, _080108C0 @ =gBattleCommunication ldrb r0, [r1, 0x1] subs r0, 0x1 strb r0, [r1, 0x1] @@ -1344,7 +1344,7 @@ _080108B8: pop {r0} bx r0 .align 2, 0 -_080108C0: .4byte gUnknown_2023E82 +_080108C0: .4byte gBattleCommunication thumb_func_end sub_8010508 thumb_func_start sub_80108C4 @@ -1494,7 +1494,7 @@ sub_80109C8: @ 80109C8 bl RunTasks bl AnimateSprites bl BuildOamBuffer - ldr r5, _08010A10 @ =gUnknown_2023E82 + ldr r5, _08010A10 @ =gBattleCommunication ldrb r0, [r5] cmp r0, 0x1 beq _08010A5C @@ -1505,7 +1505,7 @@ sub_80109C8: @ 80109C8 b _08010B82 .align 2, 0 _08010A0C: .4byte gBattleStruct -_08010A10: .4byte gUnknown_2023E82 +_08010A10: .4byte gBattleCommunication _08010A14: cmp r0, 0x2 beq _08010AFC @@ -1521,7 +1521,7 @@ _08010A20: bne _08010A2A b _08010B82 _08010A2A: - bl sub_800A4BC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 bne _08010A36 @@ -1596,7 +1596,7 @@ _08010ABA: adds r4, 0x1 cmp r4, 0x3 ble _08010A78 - ldr r1, _08010AEC @ =gUnknown_2023E82 + ldr r1, _08010AEC @ =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -1615,7 +1615,7 @@ _08010ABA: .align 2, 0 _08010AE4: .4byte gBlockRecvBuffer _08010AE8: .4byte gUnknown_2022B58 -_08010AEC: .4byte gUnknown_2023E82 +_08010AEC: .4byte gBattleCommunication _08010AF0: .4byte gMain _08010AF4: .4byte gBattleTypeFlags _08010AF8: .4byte sub_80109C8 @@ -1709,7 +1709,7 @@ sub_8010BA0: @ 8010BA0 bl RunTasks bl AnimateSprites bl BuildOamBuffer - ldr r0, _08010BDC @ =gUnknown_2023E82 + ldr r0, _08010BDC @ =gBattleCommunication ldrb r0, [r0] cmp r0, 0xC bls _08010BCC @@ -1722,7 +1722,7 @@ _08010BCC: mov pc, r0 .align 2, 0 _08010BD8: .4byte gBattleStruct -_08010BDC: .4byte gUnknown_2023E82 +_08010BDC: .4byte gBattleCommunication _08010BE0: .4byte _08010BE4 .align 2, 0 _08010BE4: @@ -1753,7 +1753,7 @@ _08010C18: movs r0, 0x3 bl ShowBg bl sub_80357C8 - ldr r1, _08010C54 @ =gUnknown_2023E82 + ldr r1, _08010C54 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1] _08010C44: @@ -1763,10 +1763,10 @@ _08010C44: bne _08010C4E b _080110F0 _08010C4E: - bl sub_80FCEA8 + bl LoadWirelessStatusIndicatorSpriteGfx b _080110F0 .align 2, 0 -_08010C54: .4byte gUnknown_2023E82 +_08010C54: .4byte gBattleCommunication _08010C58: .4byte gWirelessCommType _08010C5C: ldr r0, _08010CC0 @ =gReceivedRemoteLinkPlayers @@ -1775,7 +1775,7 @@ _08010C5C: bne _08010C66 b _080110F0 _08010C66: - bl sub_800A4BC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 beq _08010CAA @@ -1800,7 +1800,7 @@ _08010C66: adds r1, r5 movs r2, 0x20 bl SendBlock - ldr r1, _08010CCC @ =gUnknown_2023E82 + ldr r1, _08010CCC @ =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -1813,13 +1813,13 @@ _08010CAA: _08010CB4: movs r0, 0 movs r1, 0 - bl sub_80FCD74 + bl CreateWirelessStatusIndicatorSprite b _080110F0 .align 2, 0 _08010CC0: .4byte gReceivedRemoteLinkPlayers _08010CC4: .4byte gBattleStruct _08010CC8: .4byte 0x00000185 -_08010CCC: .4byte gUnknown_2023E82 +_08010CCC: .4byte gBattleCommunication _08010CD0: .4byte gWirelessCommType _08010CD4: bl GetBlockReceivedStatus @@ -1926,12 +1926,12 @@ _08010D9C: bge _08010D3A bl ZeroPlayerPartyMons bl ZeroEnemyPartyMons - ldr r1, _08010DD8 @ =gUnknown_2023E82 + ldr r1, _08010DD8 @ =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] _08010DB6: - bl sub_800A4BC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 bne _08010DC2 @@ -1943,10 +1943,10 @@ _08010DC2: ldr r1, _08010DDC @ =gDecompressionBuffer movs r2, 0xC8 bl SendBlock - ldr r1, _08010DD8 @ =gUnknown_2023E82 + ldr r1, _08010DD8 @ =gBattleCommunication b _080110EA .align 2, 0 -_08010DD8: .4byte gUnknown_2023E82 +_08010DD8: .4byte gBattleCommunication _08010DDC: .4byte gDecompressionBuffer _08010DE0: bl GetBlockReceivedStatus @@ -2078,13 +2078,13 @@ _08010EBE: adds r6, 0x1 cmp r6, 0x3 ble _08010E00 - ldr r1, _08010ED4 @ =gUnknown_2023E82 + ldr r1, _08010ED4 @ =gBattleCommunication b _080110EA .align 2, 0 _08010ED0: .4byte gUnknown_2024158 -_08010ED4: .4byte gUnknown_2023E82 +_08010ED4: .4byte gBattleCommunication _08010ED8: - bl sub_800A4BC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 bne _08010EE4 @@ -2096,11 +2096,11 @@ _08010EE4: ldr r1, _08010EF8 @ =gDecompressionBuffer + 0x0C8 movs r2, 0x64 bl SendBlock - ldr r1, _08010EFC @ =gUnknown_2023E82 + ldr r1, _08010EFC @ =gBattleCommunication b _080110EA .align 2, 0 _08010EF8: .4byte gDecompressionBuffer + 0x0C8 -_08010EFC: .4byte gUnknown_2023E82 +_08010EFC: .4byte gBattleCommunication _08010F00: bl GetBlockReceivedStatus movs r1, 0xF @@ -2273,16 +2273,16 @@ _08010FDE: lsls r2, 1 adds r0, r4, r2 bl sub_8011D0C - ldr r1, _08011068 @ =gUnknown_2023E82 + ldr r1, _08011068 @ =gBattleCommunication b _080110EA .align 2, 0 _0801105C: .4byte gUnknown_2024220 _08011060: .4byte gPlayerParty _08011064: .4byte gEnemyParty -_08011068: .4byte gUnknown_2023E82 +_08011068: .4byte gBattleCommunication _0801106C: bl sub_800D30C - ldr r0, _08011080 @ =gUnknown_2023E82 + ldr r0, _08011080 @ =gBattleCommunication ldrb r1, [r0] adds r1, 0x1 movs r2, 0 @@ -2291,7 +2291,7 @@ _0801106C: strb r2, [r0, 0x2] b _080110F0 .align 2, 0 -_08011080: .4byte gUnknown_2023E82 +_08011080: .4byte gBattleCommunication _08011084: ldr r0, _080110B8 @ =gUnknown_2023E83 adds r1, r0, 0x1 @@ -2299,13 +2299,13 @@ _08011084: lsls r0, 24 cmp r0, 0 beq _080110F0 - ldr r2, _080110BC @ =gUnknown_3004F80 + ldr r2, _080110BC @ =gPreBattleCallback1 ldr r1, _080110C0 @ =gMain ldr r0, [r1] str r0, [r2] ldr r0, _080110C4 @ =sub_80123E4 str r0, [r1] - ldr r0, _080110C8 @ =sub_8011100 + ldr r0, _080110C8 @ =BattleMainCB2 bl SetMainCallback2 ldr r2, _080110CC @ =gBattleTypeFlags ldr r1, [r2] @@ -2319,20 +2319,20 @@ _08011084: b _080110F0 .align 2, 0 _080110B8: .4byte gUnknown_2023E83 -_080110BC: .4byte gUnknown_3004F80 +_080110BC: .4byte gPreBattleCallback1 _080110C0: .4byte gMain _080110C4: .4byte sub_80123E4 -_080110C8: .4byte sub_8011100 +_080110C8: .4byte BattleMainCB2 _080110CC: .4byte gBattleTypeFlags _080110D0: - ldr r0, _080110FC @ =gUnknown_2023E82 + ldr r0, _080110FC @ =gBattleCommunication ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] movs r1, 0x1 strb r1, [r0, 0x1] _080110DC: - ldr r1, _080110FC @ =gUnknown_2023E82 + ldr r1, _080110FC @ =gBattleCommunication ldrb r0, [r1, 0x1] subs r0, 0x1 strb r0, [r1, 0x1] @@ -2350,11 +2350,11 @@ _080110F0: pop {r0} bx r0 .align 2, 0 -_080110FC: .4byte gUnknown_2023E82 +_080110FC: .4byte gBattleCommunication thumb_func_end sub_8010BA0 - thumb_func_start sub_8011100 -sub_8011100: @ 8011100 + thumb_func_start BattleMainCB2 +BattleMainCB2: @ 8011100 push {lr} sub sp, 0x4 bl AnimateSprites @@ -2401,13 +2401,13 @@ _08011164: .4byte gBattleTypeFlags _08011168: .4byte gSpecialVar_Result _0801116C: .4byte gBattleOutcome _08011170: .4byte CB2_QuitRecordedBattle - thumb_func_end sub_8011100 + thumb_func_end BattleMainCB2 thumb_func_start FreeRestoreBattleData FreeRestoreBattleData: @ 8011174 push {lr} ldr r1, _080111AC @ =gMain - ldr r0, _080111B0 @ =gUnknown_3004F80 + ldr r0, _080111B0 @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r1] ldr r2, _080111B4 @ =gScanlineEffect @@ -2425,12 +2425,12 @@ FreeRestoreBattleData: @ 8011174 bl m4aSongNumStop bl FreeMonSpritesGfx bl FreeBattleSpritesData - bl sub_802E138 + bl FreeBattleResources pop {r0} bx r0 .align 2, 0 _080111AC: .4byte gMain -_080111B0: .4byte gUnknown_3004F80 +_080111B0: .4byte gPreBattleCallback1 _080111B4: .4byte gScanlineEffect _080111B8: .4byte 0x00000439 thumb_func_end FreeRestoreBattleData @@ -3121,8 +3121,8 @@ _080116EC: .4byte 0x04000006 _080116F0: .4byte 0x04000008 thumb_func_end sub_80116CC - thumb_func_start sub_80116F4 -sub_80116F4: @ 80116F4 + thumb_func_start VBlankCB_Battle +VBlankCB_Battle: @ 80116F4 push {lr} bl Random ldr r0, _08011788 @ =gBattle_BG0_X @@ -3192,7 +3192,7 @@ _080117A8: .4byte gUnknown_2022984 _080117AC: .4byte gUnknown_2022986 _080117B0: .4byte gUnknown_2022988 _080117B4: .4byte gUnknown_202298A - thumb_func_end sub_80116F4 + thumb_func_end VBlankCB_Battle thumb_func_start nullsub_9 nullsub_9: @ 80117B8 @@ -3612,7 +3612,7 @@ _08011A9C: ldr r1, _08011B7C @ =gReservedSpritePaletteCount movs r0, 0x4 strb r0, [r1] - ldr r0, _08011B80 @ =sub_80116F4 + ldr r0, _08011B80 @ =VBlankCB_Battle bl SetVBlankCallback ldr r0, _08011B84 @ =sub_800F6FC movs r1, 0 @@ -3634,7 +3634,7 @@ _08011A9C: bl sub_801184C ldr r0, _08011B8C @ =sub_8011B94 bl SetMainCallback2 - ldr r0, _08011B90 @ =gUnknown_2023E82 + ldr r0, _08011B90 @ =gBattleCommunication strb r4, [r0] add sp, 0x4 pop {r4} @@ -3657,11 +3657,11 @@ _08011B70: .4byte gBattle_BG3_X _08011B74: .4byte gBattle_BG3_Y _08011B78: .4byte gBattleTextboxPalette _08011B7C: .4byte gReservedSpritePaletteCount -_08011B80: .4byte sub_80116F4 +_08011B80: .4byte VBlankCB_Battle _08011B84: .4byte sub_800F6FC _08011B88: .4byte gTasks _08011B8C: .4byte sub_8011B94 -_08011B90: .4byte gUnknown_2023E82 +_08011B90: .4byte gBattleCommunication thumb_func_end sub_8011A1C thumb_func_start sub_8011B94 @@ -3680,7 +3680,7 @@ sub_8011B94: @ 8011B94 sub_8011BB0: @ 8011BB0 push {r4,lr} sub sp, 0x4 - ldr r4, _08011BC8 @ =gUnknown_2023E82 + ldr r4, _08011BC8 @ =gBattleCommunication ldrb r0, [r4] cmp r0, 0x1 beq _08011BEA @@ -3690,7 +3690,7 @@ sub_8011BB0: @ 8011BB0 beq _08011BD2 b _08011C34 .align 2, 0 -_08011BC8: .4byte gUnknown_2023E82 +_08011BC8: .4byte gBattleCommunication _08011BCC: cmp r0, 0x2 beq _08011C10 @@ -3738,7 +3738,7 @@ _08011C10: bl sub_812C224 bl FreeMonSpritesGfx bl FreeBattleSpritesData - bl sub_802E138 + bl FreeBattleResources _08011C34: add sp, 0x4 pop {r4} @@ -3920,7 +3920,7 @@ _08011D90: .4byte 0x00002108 sub_8011D94: @ 8011D94 push {lr} adds r2, r0, 0 - ldr r0, _08011DC0 @ =gUnknown_2023F4C + ldr r0, _08011DC0 @ =gIntroSlideFlags ldrh r1, [r0] movs r0, 0x1 ands r0, r1 @@ -3941,7 +3941,7 @@ _08011DBC: pop {r0} bx r0 .align 2, 0 -_08011DC0: .4byte gUnknown_2023F4C +_08011DC0: .4byte gIntroSlideFlags _08011DC4: .4byte sub_8011DC8 thumb_func_end sub_8011D94 @@ -3960,7 +3960,7 @@ sub_8011DC8: @ 8011DC8 lsls r0, 24 lsrs r0, 24 bl sub_804BD94 - ldr r1, _08011E18 @ =gUnknown_3004FF0 + ldr r1, _08011E18 @ =gHealthboxSpriteIds movs r2, 0x2E ldrsh r0, [r4, r2] adds r0, r1 @@ -3985,7 +3985,7 @@ _08011E10: pop {r0} bx r0 .align 2, 0 -_08011E18: .4byte gUnknown_3004FF0 +_08011E18: .4byte gHealthboxSpriteIds _08011E1C: .4byte nullsub_10 _08011E20: .4byte 0x00002108 thumb_func_end sub_8011DC8 @@ -4061,8 +4061,8 @@ _08011E98: .4byte nullsub_10 _08011E9C: .4byte gUnknown_2022AE8 thumb_func_end sub_8011E3C - thumb_func_start sub_8011EA0 -sub_8011EA0: @ 8011EA0 + thumb_func_start SpriteCB_FaintOpponentMon +SpriteCB_FaintOpponentMon: @ 8011EA0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -4071,7 +4071,7 @@ sub_8011EA0: @ 8011EA0 ldrh r0, [r0, 0x2E] lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08011EC4 @ =gUnknown_2024018 + ldr r0, _08011EC4 @ =gBattleSpritesDataPtr ldr r0, [r0] ldr r1, [r0] lsls r0, r6, 2 @@ -4082,7 +4082,7 @@ sub_8011EA0: @ 8011EA0 adds r4, r0, 0 b _08011ECC .align 2, 0 -_08011EC4: .4byte gUnknown_2024018 +_08011EC4: .4byte gBattleSpritesDataPtr _08011EC8: mov r0, r9 ldrh r4, [r0, 0x32] @@ -4201,7 +4201,7 @@ _08011F8C: .align 2, 0 _08011FAC: .4byte gUnknown_82349CC _08011FB0: .4byte sub_8011FB4 - thumb_func_end sub_8011EA0 + thumb_func_end SpriteCB_FaintOpponentMon thumb_func_start sub_8011FB4 sub_8011FB4: @ 8011FB4 @@ -4364,7 +4364,7 @@ _080120CC: .4byte oac_poke_ally_ oac_poke_ally_: @ 80120D0 push {lr} adds r2, r0, 0 - ldr r0, _080120F8 @ =gUnknown_2023F4C + ldr r0, _080120F8 @ =gIntroSlideFlags ldrh r1, [r0] movs r0, 0x1 ands r0, r1 @@ -4384,7 +4384,7 @@ _080120F4: pop {r0} bx r0 .align 2, 0 -_080120F8: .4byte gUnknown_2023F4C +_080120F8: .4byte gIntroSlideFlags _080120FC: .4byte nullsub_11 thumb_func_end oac_poke_ally_ @@ -4406,7 +4406,7 @@ nullsub_11: @ 801210C sub_8012110: @ 8012110 push {lr} adds r2, r0, 0 - ldr r0, _08012134 @ =gUnknown_2023F4C + ldr r0, _08012134 @ =gIntroSlideFlags ldrh r1, [r0] movs r0, 0x1 ands r0, r1 @@ -4424,7 +4424,7 @@ _08012130: pop {r0} bx r0 .align 2, 0 -_08012134: .4byte gUnknown_2023F4C +_08012134: .4byte gIntroSlideFlags thumb_func_end sub_8012110 thumb_func_start dp11b_obj_instanciate @@ -4447,7 +4447,7 @@ dp11b_obj_instanciate: @ 8012138 mov r10, r3 cmp r1, 0 beq _08012174 - ldr r0, _08012170 @ =gUnknown_2024018 + ldr r0, _08012170 @ =gBattleSpritesDataPtr ldr r0, [r0] ldr r1, [r0, 0x4] lsls r2, r4, 1 @@ -4458,9 +4458,9 @@ dp11b_obj_instanciate: @ 8012138 movs r0, 0x2 b _08012186 .align 2, 0 -_08012170: .4byte gUnknown_2024018 +_08012170: .4byte gBattleSpritesDataPtr _08012174: - ldr r0, _080121D0 @ =gUnknown_2024018 + ldr r0, _080121D0 @ =gBattleSpritesDataPtr ldr r0, [r0] ldr r1, [r0, 0x4] lsls r2, r4, 1 @@ -4481,10 +4481,10 @@ _08012186: mov r0, r8 cmp r0, 0x1 bne _080121E0 - ldr r0, _080121D8 @ =gUnknown_3004FF0 + ldr r0, _080121D8 @ =gHealthboxSpriteIds adds r0, r4, r0 ldrb r7, [r0] - ldr r2, _080121D0 @ =gUnknown_2024018 + ldr r2, _080121D0 @ =gBattleSpritesDataPtr ldr r0, [r2] ldr r0, [r0, 0x4] adds r1, r6, r4 @@ -4506,15 +4506,15 @@ _08012186: movs r1, 0x80 b _0801220E .align 2, 0 -_080121D0: .4byte gUnknown_2024018 +_080121D0: .4byte gBattleSpritesDataPtr _080121D4: .4byte SpriteCB_HealthBoxBounce -_080121D8: .4byte gUnknown_3004FF0 +_080121D8: .4byte gHealthboxSpriteIds _080121DC: .4byte gSprites _080121E0: ldr r0, _0801224C @ =gBattlerSpriteIds adds r0, r4, r0 ldrb r7, [r0] - ldr r2, _08012250 @ =gUnknown_2024018 + ldr r2, _08012250 @ =gBattleSpritesDataPtr ldr r0, [r2] ldr r0, [r0, 0x4] adds r1, r6, r4 @@ -4568,7 +4568,7 @@ _0801223C: bx r0 .align 2, 0 _0801224C: .4byte gBattlerSpriteIds -_08012250: .4byte gUnknown_2024018 +_08012250: .4byte gBattleSpritesDataPtr _08012254: .4byte gSprites thumb_func_end dp11b_obj_instanciate @@ -4581,7 +4581,7 @@ dp11b_obj_free: @ 8012258 lsrs r1, 24 cmp r1, 0x1 bne _080122AC - ldr r6, _080122A4 @ =gUnknown_2024018 + ldr r6, _080122A4 @ =gBattleSpritesDataPtr ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -4611,10 +4611,10 @@ dp11b_obj_free: @ 8012258 negs r0, r0 b _080122E6 .align 2, 0 -_080122A4: .4byte gUnknown_2024018 +_080122A4: .4byte gBattleSpritesDataPtr _080122A8: .4byte gSprites _080122AC: - ldr r6, _08012300 @ =gUnknown_2024018 + ldr r6, _08012300 @ =gBattleSpritesDataPtr ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -4658,7 +4658,7 @@ _080122FA: pop {r0} bx r0 .align 2, 0 -_08012300: .4byte gUnknown_2024018 +_08012300: .4byte gBattleSpritesDataPtr _08012304: .4byte gSprites thumb_func_end dp11b_obj_free @@ -4772,28 +4772,28 @@ nullsub_12: @ 80123BC bx lr thumb_func_end nullsub_12 - thumb_func_start sub_80123C0 -sub_80123C0: @ 80123C0 + thumb_func_start BeginBattleIntro +BeginBattleIntro: @ 80123C0 push {lr} bl sub_8012434 - ldr r1, _080123D8 @ =gUnknown_2023E82 + ldr r1, _080123D8 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x1] - ldr r1, _080123DC @ =gUnknown_3004F84 + ldr r1, _080123DC @ =gBattleMainFunc ldr r0, _080123E0 @ =BattleIntroGetMonsData str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080123D8: .4byte gUnknown_2023E82 -_080123DC: .4byte gUnknown_3004F84 +_080123D8: .4byte gBattleCommunication +_080123DC: .4byte gBattleMainFunc _080123E0: .4byte BattleIntroGetMonsData - thumb_func_end sub_80123C0 + thumb_func_end BeginBattleIntro thumb_func_start sub_80123E4 sub_80123E4: @ 80123E4 push {r4,r5,lr} - ldr r0, _08012424 @ =gUnknown_3004F84 + ldr r0, _08012424 @ =gBattleMainFunc ldr r0, [r0] bl _call_via_r0 ldr r1, _08012428 @ =gActiveBattler @@ -4803,7 +4803,7 @@ sub_80123E4: @ 80123E4 ldrb r0, [r0] cmp r0, 0 beq _0801241E - ldr r5, _08012430 @ =gUnknown_3004FE0 + ldr r5, _08012430 @ =gBattlerControllerFuncs adds r4, r1, 0 _08012400: ldrb r0, [r4] @@ -4825,10 +4825,10 @@ _0801241E: pop {r0} bx r0 .align 2, 0 -_08012424: .4byte gUnknown_3004F84 +_08012424: .4byte gBattleMainFunc _08012428: .4byte gActiveBattler _0801242C: .4byte gBattlersCount -_08012430: .4byte gUnknown_3004FE0 +_08012430: .4byte gBattlerControllerFuncs thumb_func_end sub_80123E4 thumb_func_start sub_8012434 @@ -4849,7 +4849,7 @@ sub_8012434: @ 8012434 mov r12, r1 ldr r0, _080126D4 @ =gUnknown_2023DA0 mov r9, r0 - ldr r1, _080126D8 @ =gLastUsedMove + ldr r1, _080126D8 @ =gLastMoves mov r8, r1 ldr r4, _080126DC @ =gDisableStructs movs r5, 0 @@ -4904,7 +4904,7 @@ _0801246C: ble _08012464 movs r5, 0 ldr r3, _080126F8 @ =gSideTimers - ldr r4, _080126FC @ =gSideAffecting + ldr r4, _080126FC @ =gSideStatuses movs r2, 0x1 _080124C6: strh r5, [r4] @@ -4921,13 +4921,13 @@ _080124CA: cmp r2, 0 bge _080124C6 movs r1, 0 - ldr r2, _08012700 @ =sBattler_AI + ldr r2, _08012700 @ =gBattlerAttacker strb r1, [r2] ldr r0, _08012704 @ =gBattlerTarget strb r1, [r0] ldr r2, _08012708 @ =gBattleWeather strh r1, [r2] - ldr r1, _0801270C @ =gUnknown_2023F20 + ldr r1, _0801270C @ =gWishFutureKnock movs r2, 0 movs r3, 0 _080124F2: @@ -4937,7 +4937,7 @@ _080124F2: cmp r2, 0x2B bls _080124F2 movs r0, 0 - ldr r1, _08012710 @ =gUnknown_2023DD0 + ldr r1, _08012710 @ =gHitMarker str r0, [r1] ldr r2, _08012714 @ =gBattleTypeFlags ldr r0, [r2] @@ -4953,7 +4953,7 @@ _080124F2: cmp r0, 0 beq _08012522 movs r0, 0x80 - ldr r2, _08012710 @ =gUnknown_2023DD0 + ldr r2, _08012710 @ =gHitMarker str r0, [r2] _08012522: ldr r1, _0801271C @ =gSaveBlock2Ptr @@ -4968,7 +4968,7 @@ _08012522: strb r1, [r0] ldr r2, _08012728 @ =gBattleOutcome strb r1, [r2] - ldr r0, _0801272C @ =gUnknown_2023BC8 + ldr r0, _0801272C @ =gBattleControllerExecFlags str r1, [r0] movs r2, 0 ldr r0, _08012730 @ =gUnknown_2023E7E @@ -4982,7 +4982,7 @@ _08012522: ldr r0, [r0, 0xC] adds r0, 0x20 strb r2, [r0] - ldr r1, _08012734 @ =gUnknown_2023E82 + ldr r1, _08012734 @ =gBattleCommunication movs r2, 0 adds r0, r1, 0x7 _0801255C: @@ -4997,7 +4997,7 @@ _0801255C: movs r0, 0 ldr r1, _0801273C @ =gBattleMoveDamage str r0, [r1] - ldr r2, _08012740 @ =gUnknown_2023F4C + ldr r2, _08012740 @ =gIntroSlideFlags strh r0, [r2] mov r1, r9 ldr r0, _08012720 @ =gBattleScripting @@ -5174,7 +5174,7 @@ _080126AE: _080126CC: .4byte gUnknown_2023DB0 _080126D0: .4byte gUnknown_2023DA8 _080126D4: .4byte gUnknown_2023DA0 -_080126D8: .4byte gLastUsedMove +_080126D8: .4byte gLastMoves _080126DC: .4byte gDisableStructs _080126E0: .4byte gUnknown_2023D90 _080126E4: .4byte gUnknown_2023DB8 @@ -5183,24 +5183,24 @@ _080126EC: .4byte gUnknown_2023DD4 _080126F0: .4byte gUnknown_2023DC0 _080126F4: .4byte gBattleResources _080126F8: .4byte gSideTimers -_080126FC: .4byte gSideAffecting -_08012700: .4byte sBattler_AI +_080126FC: .4byte gSideStatuses +_08012700: .4byte gBattlerAttacker _08012704: .4byte gBattlerTarget _08012708: .4byte gBattleWeather -_0801270C: .4byte gUnknown_2023F20 -_08012710: .4byte gUnknown_2023DD0 +_0801270C: .4byte gWishFutureKnock +_08012710: .4byte gHitMarker _08012714: .4byte gBattleTypeFlags _08012718: .4byte 0x00010002 _0801271C: .4byte gSaveBlock2Ptr _08012720: .4byte gBattleScripting _08012724: .4byte gUnknown_2023D72 _08012728: .4byte gBattleOutcome -_0801272C: .4byte gUnknown_2023BC8 +_0801272C: .4byte gBattleControllerExecFlags _08012730: .4byte gUnknown_2023E7E -_08012734: .4byte gUnknown_2023E82 +_08012734: .4byte gBattleCommunication _08012738: .4byte gUnknown_2023E7C _0801273C: .4byte gBattleMoveDamage -_08012740: .4byte gUnknown_2023F4C +_08012740: .4byte gIntroSlideFlags _08012744: .4byte gUnknown_3004FD4 _08012748: .4byte gAbsentBattlerFlags _0801274C: .4byte gBattleStruct @@ -5425,7 +5425,7 @@ _080128F0: _0801290C: movs r5, 0 ldr r7, _08012B80 @ =gBattleStruct - ldr r3, _08012B84 @ =gUnknown_2023FF8 + ldr r3, _08012B84 @ =gActionSelectionCursor mov r10, r3 ldr r6, _08012B88 @ =gBattlersCount ldrb r6, [r6] @@ -5481,7 +5481,7 @@ _0801296C: movs r1, 0 strb r1, [r0] ldrb r0, [r6] - ldr r2, _08012B9C @ =gUnknown_2023FFC + ldr r2, _08012B9C @ =gMoveSelectionCursor adds r0, r2 strb r1, [r0] ldrb r1, [r6] @@ -5579,7 +5579,7 @@ _08012A1A: mov r1, r12 ldrb r0, [r1] lsls r0, 1 - ldr r3, _08012BAC @ =gLastUsedMove + ldr r3, _08012BAC @ =gLastMoves adds r0, r3 movs r3, 0 strh r2, [r0] @@ -5747,17 +5747,17 @@ _08012B3C: .align 2, 0 _08012B7C: .4byte gBattleMons _08012B80: .4byte gBattleStruct -_08012B84: .4byte gUnknown_2023FF8 +_08012B84: .4byte gActionSelectionCursor _08012B88: .4byte gBattlersCount _08012B8C: .4byte gUnknown_2023C34 _08012B90: .4byte gBitTable _08012B94: .4byte gActiveBattler _08012B98: .4byte 0xffff1fff -_08012B9C: .4byte gUnknown_2023FFC +_08012B9C: .4byte gMoveSelectionCursor _08012BA0: .4byte gCurrentMove _08012BA4: .4byte gBattleMoves _08012BA8: .4byte gMoveResultFlags -_08012BAC: .4byte gLastUsedMove +_08012BAC: .4byte gLastMoves _08012BB0: .4byte gUnknown_2023DA0 _08012BB4: .4byte gUnknown_2023DA8 _08012BB8: .4byte gUnknown_2023DB0 @@ -5776,11 +5776,11 @@ sub_8012BC8: @ 8012BC8 movs r3, 0 ldr r7, _08012F5C @ =gActiveBattler ldr r6, _08012F60 @ =gStatuses3 - ldr r0, _08012F64 @ =gUnknown_2023FF8 + ldr r0, _08012F64 @ =gActionSelectionCursor mov r8, r0 - ldr r1, _08012F68 @ =gUnknown_2023FFC + ldr r1, _08012F68 @ =gMoveSelectionCursor mov r9, r1 - ldr r2, _08012F6C @ =gUnknown_2023E8C + ldr r2, _08012F6C @ =gProtectStructs mov r12, r2 adds r5, r7, 0 movs r4, 0x58 @@ -6047,7 +6047,7 @@ _08012CA8: strb r1, [r0, 0x16] ldrb r0, [r7] lsls r0, 1 - ldr r1, _08012F8C @ =gLastUsedMove + ldr r1, _08012F8C @ =gLastMoves adds r0, r1 movs r3, 0 strh r2, [r0] @@ -6239,9 +6239,9 @@ _08012F04: .align 2, 0 _08012F5C: .4byte gActiveBattler _08012F60: .4byte gStatuses3 -_08012F64: .4byte gUnknown_2023FF8 -_08012F68: .4byte gUnknown_2023FFC -_08012F6C: .4byte gUnknown_2023E8C +_08012F64: .4byte gActionSelectionCursor +_08012F68: .4byte gMoveSelectionCursor +_08012F6C: .4byte gProtectStructs _08012F70: .4byte gBattleMons _08012F74: .4byte gBattlersCount _08012F78: .4byte gBitTable @@ -6249,7 +6249,7 @@ _08012F7C: .4byte gDisableStructs _08012F80: .4byte 0xfbffffff _08012F84: .4byte gBattleStruct _08012F88: .4byte 0xffff1fff -_08012F8C: .4byte gLastUsedMove +_08012F8C: .4byte gLastMoves _08012F90: .4byte gUnknown_2023DA0 _08012F94: .4byte gUnknown_2023DA8 _08012F98: .4byte gUnknown_2023DB0 @@ -6262,7 +6262,7 @@ _08012FA8: .4byte gBaseStats thumb_func_start BattleIntroGetMonsData BattleIntroGetMonsData: @ 8012FAC push {r4,r5,lr} - ldr r5, _08012FBC @ =gUnknown_2023E82 + ldr r5, _08012FBC @ =gBattleCommunication ldrb r0, [r5] cmp r0, 0 beq _08012FC0 @@ -6270,7 +6270,7 @@ BattleIntroGetMonsData: @ 8012FAC beq _08012FE4 b _0801301A .align 2, 0 -_08012FBC: .4byte gUnknown_2023E82 +_08012FBC: .4byte gBattleCommunication _08012FC0: ldr r4, _08012FE0 @ =gActiveBattler ldrb r0, [r5, 0x1] @@ -6280,7 +6280,7 @@ _08012FC0: movs r2, 0 bl BtlController_EmitGetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -6288,7 +6288,7 @@ _08012FC0: .align 2, 0 _08012FE0: .4byte gActiveBattler _08012FE4: - ldr r0, _08013008 @ =gUnknown_2023BC8 + ldr r0, _08013008 @ =gBattleControllerExecFlags ldr r2, [r0] cmp r2, 0 bne _0801301A @@ -6301,14 +6301,14 @@ _08012FE4: ldrb r1, [r1] cmp r0, r1 bne _08013018 - ldr r1, _08013010 @ =gUnknown_3004F84 + ldr r1, _08013010 @ =gBattleMainFunc ldr r0, _08013014 @ =BattleIntroPrepareBackgroundSlide str r0, [r1] b _0801301A .align 2, 0 -_08013008: .4byte gUnknown_2023BC8 +_08013008: .4byte gBattleControllerExecFlags _0801300C: .4byte gBattlersCount -_08013010: .4byte gUnknown_3004F84 +_08013010: .4byte gBattleMainFunc _08013014: .4byte BattleIntroPrepareBackgroundSlide _08013018: strb r2, [r5] @@ -6321,7 +6321,7 @@ _0801301A: thumb_func_start BattleIntroPrepareBackgroundSlide BattleIntroPrepareBackgroundSlide: @ 8013020 push {r4,r5,lr} - ldr r0, _08013058 @ =gUnknown_2023BC8 + ldr r0, _08013058 @ =gBattleControllerExecFlags ldr r5, [r0] cmp r5, 0 bne _08013050 @@ -6332,13 +6332,13 @@ BattleIntroPrepareBackgroundSlide: @ 8013020 ldr r0, _08013060 @ =gUnknown_2022B50 ldrb r1, [r0] movs r0, 0 - bl EmitIntroSlide + bl BtlController_EmitIntroSlide ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r1, _08013064 @ =gUnknown_3004F84 + bl MarkBattlerForControllerExec + ldr r1, _08013064 @ =gBattleMainFunc ldr r0, _08013068 @ =sub_8013070 str r0, [r1] - ldr r0, _0801306C @ =gUnknown_2023E82 + ldr r0, _0801306C @ =gBattleCommunication strb r5, [r0] strb r5, [r0, 0x1] _08013050: @@ -6346,12 +6346,12 @@ _08013050: pop {r0} bx r0 .align 2, 0 -_08013058: .4byte gUnknown_2023BC8 +_08013058: .4byte gBattleControllerExecFlags _0801305C: .4byte gActiveBattler _08013060: .4byte gUnknown_2022B50 -_08013064: .4byte gUnknown_3004F84 +_08013064: .4byte gBattleMainFunc _08013068: .4byte sub_8013070 -_0801306C: .4byte gUnknown_2023E82 +_0801306C: .4byte gBattleCommunication thumb_func_end BattleIntroPrepareBackgroundSlide thumb_func_start sub_8013070 @@ -6361,7 +6361,7 @@ sub_8013070: @ 8013070 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _080130D4 @ =gUnknown_2023BC8 + ldr r0, _080130D4 @ =gBattleControllerExecFlags ldr r1, [r0] cmp r1, 0 beq _08013084 @@ -6409,7 +6409,7 @@ _080130C6: bls _080130C6 b _080131B6 .align 2, 0 -_080130D4: .4byte gUnknown_2023BC8 +_080130D4: .4byte gBattleControllerExecFlags _080130D8: .4byte gActiveBattler _080130DC: .4byte gBattlersCount _080130E0: .4byte gBattleMons @@ -6422,7 +6422,7 @@ _080130E8: adds r3, r0, r2 movs r2, 0 ldr r6, _08013230 @ =gBaseStats - ldr r5, _08013234 @ =gUnknown_20233C4 + ldr r5, _08013234 @ =gBattleBufferB ldr r4, _08013238 @ =gActiveBattler _080130FA: adds r0, r3, r2 @@ -6526,9 +6526,9 @@ _080131B6: cmp r0, 0 bne _080131D0 movs r0, 0 - bl EmitDrawTrainerPic + bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080131D0: ldr r5, _08013244 @ =gBattleTypeFlags ldr r0, [r5] @@ -6543,9 +6543,9 @@ _080131D0: cmp r0, 0x1 bne _080131F6 movs r0, 0 - bl EmitDrawTrainerPic + bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080131F6: ldrb r0, [r4] bl GetBattlerSide @@ -6574,7 +6574,7 @@ _080131F6: b _080132C2 .align 2, 0 _08013230: .4byte gBaseStats -_08013234: .4byte gUnknown_20233C4 +_08013234: .4byte gBattleBufferB _08013238: .4byte gActiveBattler _0801323C: .4byte gBattleStruct _08013240: .4byte gUnknown_2023BFC @@ -6631,10 +6631,10 @@ _0801328E: bl HandleSetPokedexFlag _080132B4: movs r0, 0 - bl EmitLoadMonSprite + bl BtlController_EmitLoadMonSprite mov r1, r9 ldrb r0, [r1] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080132C2: ldr r0, _08013328 @ =gBattleTypeFlags ldr r0, [r0] @@ -6657,9 +6657,9 @@ _080132C2: bne _080132F8 _080132EC: movs r0, 0 - bl EmitDrawTrainerPic + bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080132F8: mov r2, r9 ldrb r0, [r2] @@ -6673,7 +6673,7 @@ _080132F8: bcs _0801330E b _080130A0 _0801330E: - ldr r1, _08013334 @ =gUnknown_3004F84 + ldr r1, _08013334 @ =gBattleMainFunc ldr r0, _08013338 @ =BattleIntroDrawPartySummaryScreens str r0, [r1] _08013314: @@ -6689,7 +6689,7 @@ _08013324: .4byte 0x0001aa02 _08013328: .4byte gBattleTypeFlags _0801332C: .4byte gActiveBattler _08013330: .4byte gBattlersCount -_08013334: .4byte gUnknown_3004F84 +_08013334: .4byte gBattleMainFunc _08013338: .4byte BattleIntroDrawPartySummaryScreens thumb_func_end sub_8013070 @@ -6699,7 +6699,7 @@ BattleIntroDrawPartySummaryScreens: @ 801333C mov r7, r8 push {r7} sub sp, 0x30 - ldr r0, _08013394 @ =gUnknown_2023BC8 + ldr r0, _08013394 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 beq _0801334E @@ -6742,7 +6742,7 @@ _0801338C: movs r0, 0 b _080133B6 .align 2, 0 -_08013394: .4byte gUnknown_2023BC8 +_08013394: .4byte gBattleControllerExecFlags _08013398: .4byte gBattleTypeFlags _0801339C: .4byte gEnemyParty _080133A0: .4byte 0x0000ffff @@ -6768,9 +6768,9 @@ _080133B6: movs r0, 0 mov r1, sp movs r2, 0x80 - bl EmitDrawPartyStatusSummary + bl BtlController_EmitDrawPartyStatusSummary ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec movs r7, 0 mov r6, r8 mov r5, sp @@ -6823,15 +6823,15 @@ _0801342E: movs r0, 0 mov r1, sp movs r2, 0x80 - bl EmitDrawPartyStatusSummary + bl BtlController_EmitDrawPartyStatusSummary ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r1, _08013460 @ =gUnknown_3004F84 + bl MarkBattlerForControllerExec + ldr r1, _08013460 @ =gBattleMainFunc ldr r0, _08013464 @ =BattleIntroPrintTrainerWantsToBattle b _080134C6 .align 2, 0 _0801345C: .4byte gActiveBattler -_08013460: .4byte gUnknown_3004F84 +_08013460: .4byte gBattleMainFunc _08013464: .4byte BattleIntroPrintTrainerWantsToBattle _08013468: movs r7, 0 @@ -6878,7 +6878,7 @@ _080134B6: adds r7, 0x1 cmp r7, 0x5 ble _0801346E - ldr r1, _080134D4 @ =gUnknown_3004F84 + ldr r1, _080134D4 @ =gBattleMainFunc ldr r0, _080134D8 @ =sub_8013514 _080134C6: str r0, [r1] @@ -6890,14 +6890,14 @@ _080134C8: pop {r0} bx r0 .align 2, 0 -_080134D4: .4byte gUnknown_3004F84 +_080134D4: .4byte gBattleMainFunc _080134D8: .4byte sub_8013514 thumb_func_end BattleIntroDrawPartySummaryScreens thumb_func_start BattleIntroPrintTrainerWantsToBattle BattleIntroPrintTrainerWantsToBattle: @ 80134DC push {lr} - ldr r0, _08013504 @ =gUnknown_2023BC8 + ldr r0, _08013504 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _080134FE @@ -6908,27 +6908,27 @@ BattleIntroPrintTrainerWantsToBattle: @ 80134DC ldrb r1, [r1] movs r0, 0 bl PrepareStringBattle - ldr r1, _0801350C @ =gUnknown_3004F84 + ldr r1, _0801350C @ =gBattleMainFunc ldr r0, _08013510 @ =sub_8013568 str r0, [r1] _080134FE: pop {r0} bx r0 .align 2, 0 -_08013504: .4byte gUnknown_2023BC8 +_08013504: .4byte gBattleControllerExecFlags _08013508: .4byte gActiveBattler -_0801350C: .4byte gUnknown_3004F84 +_0801350C: .4byte gBattleMainFunc _08013510: .4byte sub_8013568 thumb_func_end BattleIntroPrintTrainerWantsToBattle thumb_func_start sub_8013514 sub_8013514: @ 8013514 push {lr} - ldr r0, _08013550 @ =gUnknown_2023BC8 + ldr r0, _08013550 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _0801354A - ldr r1, _08013554 @ =gUnknown_3004F84 + ldr r1, _08013554 @ =gBattleMainFunc ldr r0, _08013558 @ =sub_80136E4 str r0, [r1] movs r0, 0 @@ -6951,8 +6951,8 @@ _0801354A: pop {r0} bx r0 .align 2, 0 -_08013550: .4byte gUnknown_2023BC8 -_08013554: .4byte gUnknown_3004F84 +_08013550: .4byte gBattleControllerExecFlags +_08013554: .4byte gBattleMainFunc _08013558: .4byte sub_80136E4 _0801355C: .4byte gBattleTypeFlags _08013560: .4byte gBattleScripting @@ -6962,7 +6962,7 @@ _08013564: .4byte gUnknown_81D91A1 thumb_func_start sub_8013568 sub_8013568: @ 8013568 push {lr} - ldr r0, _08013590 @ =gUnknown_2023BC8 + ldr r0, _08013590 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _0801358A @@ -6973,22 +6973,22 @@ sub_8013568: @ 8013568 lsrs r1, 24 movs r0, 0x1 bl PrepareStringBattle - ldr r1, _08013594 @ =gUnknown_3004F84 + ldr r1, _08013594 @ =gBattleMainFunc ldr r0, _08013598 @ =sub_801359C str r0, [r1] _0801358A: pop {r0} bx r0 .align 2, 0 -_08013590: .4byte gUnknown_2023BC8 -_08013594: .4byte gUnknown_3004F84 +_08013590: .4byte gBattleControllerExecFlags +_08013594: .4byte gBattleMainFunc _08013598: .4byte sub_801359C thumb_func_end sub_8013568 thumb_func_start sub_801359C sub_801359C: @ 801359C push {r4,lr} - ldr r0, _08013614 @ =gUnknown_2023BC8 + ldr r0, _08013614 @ =gBattleControllerExecFlags ldr r1, [r0] cmp r1, 0 bne _0801360C @@ -7007,9 +7007,9 @@ _080135B4: cmp r0, 0x1 bne _080135CE movs r0, 0 - bl EmitIntroTrainerBallThrow + bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080135CE: ldr r0, _08013620 @ =gBattleTypeFlags ldr r0, [r0] @@ -7024,9 +7024,9 @@ _080135CE: cmp r0, 0x3 bne _080135F4 movs r0, 0 - bl EmitIntroTrainerBallThrow + bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080135F4: ldrb r0, [r4] adds r0, 0x1 @@ -7038,7 +7038,7 @@ _080135F4: cmp r0, r1 bcc _080135B4 _08013606: - ldr r1, _08013624 @ =gUnknown_3004F84 + ldr r1, _08013624 @ =gBattleMainFunc ldr r0, _08013628 @ =sub_801362C str r0, [r1] _0801360C: @@ -7046,18 +7046,18 @@ _0801360C: pop {r0} bx r0 .align 2, 0 -_08013614: .4byte gUnknown_2023BC8 +_08013614: .4byte gBattleControllerExecFlags _08013618: .4byte gActiveBattler _0801361C: .4byte gBattlersCount _08013620: .4byte gBattleTypeFlags -_08013624: .4byte gUnknown_3004F84 +_08013624: .4byte gBattleMainFunc _08013628: .4byte sub_801362C thumb_func_end sub_801359C thumb_func_start sub_801362C sub_801362C: @ 801362C push {r4-r7,lr} - ldr r0, _080136A4 @ =gUnknown_2023BC8 + ldr r0, _080136A4 @ =gBattleControllerExecFlags ldr r1, [r0] cmp r1, 0 bne _0801369C @@ -7109,7 +7109,7 @@ _08013684: cmp r0, r1 bcc _0801364C _08013696: - ldr r1, _080136BC @ =gUnknown_3004F84 + ldr r1, _080136BC @ =gBattleMainFunc ldr r0, _080136C0 @ =sub_80136E4 str r0, [r1] _0801369C: @@ -7117,39 +7117,39 @@ _0801369C: pop {r0} bx r0 .align 2, 0 -_080136A4: .4byte gUnknown_2023BC8 +_080136A4: .4byte gBattleControllerExecFlags _080136A8: .4byte gActiveBattler _080136AC: .4byte gBattlersCount _080136B0: .4byte gBattleMons _080136B4: .4byte gBattleTypeFlags _080136B8: .4byte 0x0001aa02 -_080136BC: .4byte gUnknown_3004F84 +_080136BC: .4byte gBattleMainFunc _080136C0: .4byte sub_80136E4 thumb_func_end sub_801362C thumb_func_start sub_80136C4 sub_80136C4: @ 80136C4 push {lr} - ldr r0, _080136D8 @ =gUnknown_2023BC8 + ldr r0, _080136D8 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _080136D4 - ldr r1, _080136DC @ =gUnknown_3004F84 + ldr r1, _080136DC @ =gBattleMainFunc ldr r0, _080136E0 @ =sub_80136E4 str r0, [r1] _080136D4: pop {r0} bx r0 .align 2, 0 -_080136D8: .4byte gUnknown_2023BC8 -_080136DC: .4byte gUnknown_3004F84 +_080136D8: .4byte gBattleControllerExecFlags +_080136DC: .4byte gBattleMainFunc _080136E0: .4byte sub_80136E4 thumb_func_end sub_80136C4 thumb_func_start sub_80136E4 sub_80136E4: @ 80136E4 push {lr} - ldr r0, _08013718 @ =gUnknown_2023BC8 + ldr r0, _08013718 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _08013712 @@ -7167,23 +7167,23 @@ sub_80136E4: @ 80136E4 movs r0, 0x1 bl PrepareStringBattle _0801370C: - ldr r1, _08013720 @ =gUnknown_3004F84 + ldr r1, _08013720 @ =gBattleMainFunc ldr r0, _08013724 @ =sub_8013728 str r0, [r1] _08013712: pop {r0} bx r0 .align 2, 0 -_08013718: .4byte gUnknown_2023BC8 +_08013718: .4byte gBattleControllerExecFlags _0801371C: .4byte gBattleTypeFlags -_08013720: .4byte gUnknown_3004F84 +_08013720: .4byte gBattleMainFunc _08013724: .4byte sub_8013728 thumb_func_end sub_80136E4 thumb_func_start sub_8013728 sub_8013728: @ 8013728 push {r4,lr} - ldr r0, _080137B4 @ =gUnknown_2023BC8 + ldr r0, _080137B4 @ =gBattleControllerExecFlags ldr r1, [r0] cmp r1, 0 bne _080137AC @@ -7201,9 +7201,9 @@ _08013740: cmp r0, 0 bne _08013758 movs r0, 0 - bl EmitIntroTrainerBallThrow + bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08013758: ldr r0, _080137C0 @ =gBattleTypeFlags ldr r0, [r0] @@ -7218,9 +7218,9 @@ _08013758: cmp r0, 0x2 bne _0801377E movs r0, 0 - bl EmitIntroTrainerBallThrow + bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0801377E: ldrb r0, [r4] adds r0, 0x1 @@ -7243,7 +7243,7 @@ _08013790: ldr r0, [r2] adds r0, 0xB6 strb r1, [r0] - ldr r1, _080137C8 @ =gUnknown_3004F84 + ldr r1, _080137C8 @ =gBattleMainFunc ldr r0, _080137CC @ =sub_801385C str r0, [r1] _080137AC: @@ -7251,19 +7251,19 @@ _080137AC: pop {r0} bx r0 .align 2, 0 -_080137B4: .4byte gUnknown_2023BC8 +_080137B4: .4byte gBattleControllerExecFlags _080137B8: .4byte gActiveBattler _080137BC: .4byte gBattlersCount _080137C0: .4byte gBattleTypeFlags _080137C4: .4byte gBattleStruct -_080137C8: .4byte gUnknown_3004F84 +_080137C8: .4byte gBattleMainFunc _080137CC: .4byte sub_801385C thumb_func_end sub_8013728 thumb_func_start sub_80137D0 sub_80137D0: @ 80137D0 push {r4,r5,lr} - ldr r0, _08013840 @ =gUnknown_2023BC8 + ldr r0, _08013840 @ =gBattleControllerExecFlags ldr r1, [r0] cmp r1, 0 bne _0801383A @@ -7287,9 +7287,9 @@ _080137EA: ldrb r1, [r0] movs r0, 0 movs r2, 0 - bl EmitSwitchInAnim + bl BtlController_EmitSwitchInAnim ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0801380C: ldrb r0, [r4] adds r0, 0x1 @@ -7312,7 +7312,7 @@ _0801381E: ldr r0, [r2] adds r0, 0xB6 strb r1, [r0] - ldr r1, _08013854 @ =gUnknown_3004F84 + ldr r1, _08013854 @ =gBattleMainFunc ldr r0, _08013858 @ =sub_801385C str r0, [r1] _0801383A: @@ -7320,12 +7320,12 @@ _0801383A: pop {r0} bx r0 .align 2, 0 -_08013840: .4byte gUnknown_2023BC8 +_08013840: .4byte gBattleControllerExecFlags _08013844: .4byte gActiveBattler _08013848: .4byte gBattlersCount _0801384C: .4byte gBattlerPartyIndexes _08013850: .4byte gBattleStruct -_08013854: .4byte gUnknown_3004F84 +_08013854: .4byte gBattleMainFunc _08013858: .4byte sub_801385C thumb_func_end sub_80137D0 @@ -7338,7 +7338,7 @@ sub_801385C: @ 801385C sub sp, 0x8 movs r0, 0 mov r9, r0 - ldr r0, _080138A0 @ =gUnknown_2023BC8 + ldr r0, _080138A0 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 beq _08013874 @@ -7356,7 +7356,7 @@ _08013874: ldrb r0, [r1] cmp r5, r0 bge _0801389A - ldr r2, _080138AC @ =gUnknown_2023BDE + ldr r2, _080138AC @ =gBattlerByTurnOrder _0801388E: adds r0, r5, r2 strb r5, [r0] @@ -7368,17 +7368,17 @@ _0801389A: movs r5, 0 b _080138F0 .align 2, 0 -_080138A0: .4byte gUnknown_2023BC8 +_080138A0: .4byte gBattleControllerExecFlags _080138A4: .4byte gBattleStruct _080138A8: .4byte gBattlersCount -_080138AC: .4byte gUnknown_2023BDE +_080138AC: .4byte gBattlerByTurnOrder _080138B0: adds r4, r5, 0x1 mov r8, r4 ldrb r1, [r1] cmp r8, r1 bge _080138EE - ldr r6, _08013924 @ =gUnknown_2023BDE + ldr r6, _08013924 @ =gBattlerByTurnOrder ldr r3, _08013928 @ =gBattlersCount lsls r7, r5, 24 _080138C0: @@ -7434,7 +7434,7 @@ _080138FA: strb r1, [r0] b _08013ADA .align 2, 0 -_08013924: .4byte gUnknown_2023BDE +_08013924: .4byte gBattlerByTurnOrder _08013928: .4byte gBattlersCount _0801392C: .4byte gBattleStruct _08013930: @@ -7446,7 +7446,7 @@ _08013930: ldrb r1, [r1] cmp r0, r1 bcs _0801398A - ldr r5, _08013AF0 @ =gUnknown_2023BDE + ldr r5, _08013AF0 @ =gBattlerByTurnOrder adds r4, r2, 0 _08013944: ldr r0, [r4] @@ -7519,7 +7519,7 @@ _080139BA: ldrb r1, [r3] cmp r0, r1 bcs _08013A14 - ldr r5, _08013AF0 @ =gUnknown_2023BDE + ldr r5, _08013AF0 @ =gBattlerByTurnOrder adds r4, r2, 0 _080139D0: ldr r0, [r4] @@ -7530,7 +7530,7 @@ _080139D0: movs r0, 0 movs r2, 0 str r3, [sp, 0x4] - bl sub_801BC68 + bl ItemBattleEffects lsls r0, 24 ldr r3, [sp, 0x4] cmp r0, 0 @@ -7571,7 +7571,7 @@ _08013A22: mov r8, r1 movs r7, 0x6 ldr r6, _08013AF4 @ =gUnknown_2023D7C - ldr r2, _08013AF8 @ =gUnknown_2023DC4 + ldr r2, _08013AF8 @ =gChosenMoveByBattler movs r4, 0xFF movs r3, 0 _08013A32: @@ -7598,11 +7598,11 @@ _08013A32: ldr r1, _08013AFC @ =gAbsentBattlerFlags ldrb r1, [r1] strb r1, [r0] - ldr r1, _08013B00 @ =gUnknown_3004F84 + ldr r1, _08013B00 @ =gBattleMainFunc ldr r0, _08013B04 @ =sub_8014040 str r0, [r1] bl ResetSentPokesToOpponentValue - ldr r1, _08013B08 @ =gUnknown_2023E82 + ldr r1, _08013B08 @ =gBattleCommunication movs r2, 0 adds r0, r1, 0x7 _08013A74: @@ -7669,13 +7669,13 @@ _08013ADA: .align 2, 0 _08013AE8: .4byte gBattleStruct _08013AEC: .4byte gBattlersCount -_08013AF0: .4byte gUnknown_2023BDE +_08013AF0: .4byte gBattlerByTurnOrder _08013AF4: .4byte gUnknown_2023D7C -_08013AF8: .4byte gUnknown_2023DC4 +_08013AF8: .4byte gChosenMoveByBattler _08013AFC: .4byte gAbsentBattlerFlags -_08013B00: .4byte gUnknown_3004F84 +_08013B00: .4byte gBattleMainFunc _08013B04: .4byte sub_8014040 -_08013B08: .4byte gUnknown_2023E82 +_08013B08: .4byte gBattleCommunication _08013B0C: .4byte gBattleScripting _08013B10: .4byte gMoveResultFlags _08013B14: .4byte gBattleMons @@ -7685,15 +7685,15 @@ _08013B18: .4byte gUnknown_2023E80 thumb_func_start sub_8013B1C sub_8013B1C: @ 8013B1C push {r4-r6,lr} - ldr r0, _08013BB4 @ =gUnknown_2023BC8 + ldr r0, _08013BB4 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _08013BAC - ldr r1, _08013BB8 @ =gUnknown_3004F84 - ldr r0, _08013BBC @ =sub_8013BD4 + ldr r1, _08013BB8 @ =gBattleMainFunc + ldr r0, _08013BBC @ =BattleTurnPassed str r0, [r1] ldr r3, _08013BC0 @ =gBattlersCount - ldr r1, _08013BC4 @ =gUnknown_2023E82 + ldr r1, _08013BC4 @ =gBattleCommunication movs r2, 0 adds r0, r1, 0x7 _08013B34: @@ -7764,18 +7764,18 @@ _08013BAC: pop {r0} bx r0 .align 2, 0 -_08013BB4: .4byte gUnknown_2023BC8 -_08013BB8: .4byte gUnknown_3004F84 -_08013BBC: .4byte sub_8013BD4 +_08013BB4: .4byte gBattleControllerExecFlags +_08013BB8: .4byte gBattleMainFunc +_08013BBC: .4byte BattleTurnPassed _08013BC0: .4byte gBattlersCount -_08013BC4: .4byte gUnknown_2023E82 +_08013BC4: .4byte gBattleCommunication _08013BC8: .4byte gBattleMons _08013BCC: .4byte gBattleStruct _08013BD0: .4byte gMoveResultFlags thumb_func_end sub_8013B1C - thumb_func_start sub_8013BD4 -sub_8013BD4: @ 8013BD4 + thumb_func_start BattleTurnPassed +BattleTurnPassed: @ 8013BD4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -7787,13 +7787,13 @@ sub_8013BD4: @ 8013BD4 ldrb r0, [r0] cmp r0, 0 bne _08013C04 - bl UpdateTurnCounters + bl DoFieldEndTurnEffects lsls r0, 24 cmp r0, 0 beq _08013BF8 b _08013D20 _08013BF8: - bl TurnBasedEffects + bl DoBattlerEndTurnEffects lsls r0, 24 cmp r0, 0 beq _08013C04 @@ -7810,14 +7810,14 @@ _08013C12: ldr r0, [r0] adds r0, 0x4D strb r1, [r0] - bl sub_8018C98 + bl HandleWishPerishSongOnTurnEnd lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 bne _08013D20 movs r0, 0 bl TurnValuesCleanUp - ldr r2, _08013C80 @ =gUnknown_2023DD0 + ldr r2, _08013C80 @ =gHitMarker ldr r0, [r2] ldr r1, _08013C84 @ =0xfffffdff ands r0, r1 @@ -7836,7 +7836,7 @@ _08013C12: str r4, [r0] ldr r0, _08013C9C @ =gMoveResultFlags strb r4, [r0] - ldr r1, _08013CA0 @ =gUnknown_2023E82 + ldr r1, _08013CA0 @ =gBattleCommunication movs r2, 0 adds r0, r1, 0x4 _08013C58: @@ -7848,17 +7848,17 @@ _08013C58: ldrb r0, [r0] cmp r0, 0 beq _08013CB0 - ldr r1, _08013CA4 @ =gUnknown_2023BE3 + ldr r1, _08013CA4 @ =gCurrentActionFuncId movs r0, 0xC strb r0, [r1] - ldr r1, _08013CA8 @ =gUnknown_3004F84 + ldr r1, _08013CA8 @ =gBattleMainFunc ldr r0, _08013CAC @ =RunTurnActionsFunctions str r0, [r1] b _08013D20 .align 2, 0 _08013C78: .4byte gBattleOutcome _08013C7C: .4byte gBattleStruct -_08013C80: .4byte gUnknown_2023DD0 +_08013C80: .4byte gHitMarker _08013C84: .4byte 0xfffffdff _08013C88: .4byte 0xfff7ffff _08013C8C: .4byte 0xffbfffff @@ -7866,9 +7866,9 @@ _08013C90: .4byte 0xffefffff _08013C94: .4byte gBattleScripting _08013C98: .4byte gBattleMoveDamage _08013C9C: .4byte gMoveResultFlags -_08013CA0: .4byte gUnknown_2023E82 -_08013CA4: .4byte gUnknown_2023BE3 -_08013CA8: .4byte gUnknown_3004F84 +_08013CA0: .4byte gBattleCommunication +_08013CA4: .4byte gCurrentActionFuncId +_08013CA8: .4byte gBattleMainFunc _08013CAC: .4byte RunTurnActionsFunctions _08013CB0: ldr r1, _08013D30 @ =gBattleResults @@ -7882,7 +7882,7 @@ _08013CBC: ldr r4, _08013D34 @ =gBattlersCount ldr r0, _08013D38 @ =gBattleStruct mov r8, r0 - ldr r1, _08013D3C @ =gUnknown_3004F84 + ldr r1, _08013D3C @ =gBattleMainFunc mov r10, r1 ldr r0, _08013D40 @ =gAbsentBattlerFlags mov r12, r0 @@ -7894,7 +7894,7 @@ _08013CBC: ldr r7, _08013D48 @ =gUnknown_2023D7C movs r6, 0xFF movs r5, 0 - ldr r3, _08013D4C @ =gUnknown_2023DC4 + ldr r3, _08013D4C @ =gChosenMoveByBattler _08013CDE: adds r1, r2, r7 ldrb r0, [r1] @@ -7942,13 +7942,13 @@ _08013D20: _08013D30: .4byte gBattleResults _08013D34: .4byte gBattlersCount _08013D38: .4byte gBattleStruct -_08013D3C: .4byte gUnknown_3004F84 +_08013D3C: .4byte gBattleMainFunc _08013D40: .4byte gAbsentBattlerFlags _08013D44: .4byte sub_8014040 _08013D48: .4byte gUnknown_2023D7C -_08013D4C: .4byte gUnknown_2023DC4 +_08013D4C: .4byte gChosenMoveByBattler _08013D50: .4byte gUnknown_2023E80 - thumb_func_end sub_8013BD4 + thumb_func_end BattleTurnPassed thumb_func_start IsRunningFromBattleImpossible IsRunningFromBattleImpossible: @ 8013D54 @@ -8120,7 +8120,7 @@ _08013E8A: adds r0, 0x20 ldrb r0, [r0] strb r0, [r2] - ldr r1, _08013EC0 @ =gUnknown_2023E82 + ldr r1, _08013EC0 @ =gBattleCommunication movs r0, 0x2 b _08013F5C .align 2, 0 @@ -8131,7 +8131,7 @@ _08013EB0: .4byte gBattleMons _08013EB4: .4byte gBattlersCount _08013EB8: .4byte gBattleScripting _08013EBC: .4byte gLastUsedAbility -_08013EC0: .4byte gUnknown_2023E82 +_08013EC0: .4byte gBattleCommunication _08013EC4: ldr r1, _08013EF8 @ =gBattleMons ldr r0, _08013EFC @ =gActiveBattler @@ -8155,7 +8155,7 @@ _08013EC4: cmp r0, 0 beq _08013F0C _08013EEE: - ldr r1, _08013F08 @ =gUnknown_2023E82 + ldr r1, _08013F08 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] movs r0, 0x1 @@ -8165,7 +8165,7 @@ _08013EF8: .4byte gBattleMons _08013EFC: .4byte gActiveBattler _08013F00: .4byte 0x0400e000 _08013F04: .4byte gStatuses3 -_08013F08: .4byte gUnknown_2023E82 +_08013F08: .4byte gBattleCommunication _08013F0C: ldr r0, _08013F1C @ =gBattleTypeFlags ldr r0, [r0] @@ -8184,28 +8184,28 @@ _08013F20: ldr r1, _08013F34 @ =gLastUsedAbility ldrb r0, [r2] strb r0, [r1] - ldr r1, _08013F38 @ =gUnknown_2023E82 + ldr r1, _08013F38 @ =gBattleCommunication movs r0, 0x2 b _08013F5C .align 2, 0 _08013F30: .4byte gBattleScripting _08013F34: .4byte gLastUsedAbility -_08013F38: .4byte gUnknown_2023E82 +_08013F38: .4byte gBattleCommunication _08013F3C: ldr r0, _08013F4C @ =gBattleScripting strb r5, [r0, 0x17] ldr r1, _08013F50 @ =gLastUsedAbility ldrb r0, [r2] strb r0, [r1] - ldr r1, _08013F54 @ =gUnknown_2023E82 + ldr r1, _08013F54 @ =gBattleCommunication movs r0, 0x2 b _08013F5C .align 2, 0 _08013F4C: .4byte gBattleScripting _08013F50: .4byte gLastUsedAbility -_08013F54: .4byte gUnknown_2023E82 +_08013F54: .4byte gBattleCommunication _08013F58: - ldr r1, _08013F68 @ =gUnknown_2023E82 + ldr r1, _08013F68 @ =gBattleCommunication movs r0, 0x1 _08013F5C: strb r0, [r1, 0x5] @@ -8215,7 +8215,7 @@ _08013F5E: pop {r1} bx r1 .align 2, 0 -_08013F68: .4byte gUnknown_2023E82 +_08013F68: .4byte gBattleCommunication thumb_func_end IsRunningFromBattleImpossible thumb_func_start sub_8013F6C @@ -8335,7 +8335,7 @@ sub_8014040: @ 8014040 mov r5, r8 push {r5-r7} sub sp, 0x1C - ldr r0, _0801408C @ =gUnknown_2023E82 + ldr r0, _0801408C @ =gBattleCommunication movs r1, 0 strb r1, [r0, 0x4] ldr r0, _08014090 @ =gActiveBattler @@ -8352,7 +8352,7 @@ _08014064: bl GetBattlerPosition lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0801408C @ =gUnknown_2023E82 + ldr r1, _0801408C @ =gBattleCommunication ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -8366,7 +8366,7 @@ _08014080: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801408C: .4byte gUnknown_2023E82 +_0801408C: .4byte gBattleCommunication _08014090: .4byte gActiveBattler _08014094: .4byte gBattlersCount _08014098: .4byte _0801409C @@ -8413,7 +8413,7 @@ _080140B8: ands r1, r0 cmp r1, 0 bne _08014114 - ldr r4, _08014160 @ =gUnknown_2023E82 + ldr r4, _08014160 @ =gBattleCommunication adds r0, r5, 0 bl GetBattlerAtPosition lsls r0, 24 @@ -8447,7 +8447,7 @@ _08014114: ands r0, r1 cmp r0, 0 bne _08014168 - ldr r0, _08014160 @ =gUnknown_2023E82 + ldr r0, _08014160 @ =gBattleCommunication ldrb r1, [r4] adds r1, r0 movs r0, 0x4 @@ -8458,17 +8458,17 @@ _08014150: .4byte gActiveBattler _08014154: .4byte gBattleStruct _08014158: .4byte gBattleTypeFlags _0801415C: .4byte gBitTable -_08014160: .4byte gUnknown_2023E82 +_08014160: .4byte gBattleCommunication _08014164: .4byte gUnknown_2023D7C _08014168: - ldr r0, _08014178 @ =gUnknown_2023E82 + ldr r0, _08014178 @ =gBattleCommunication ldrb r1, [r4] adds r1, r0 movs r0, 0x3 strb r0, [r1] bl _08014C4E .align 2, 0 -_08014178: .4byte gUnknown_2023E82 +_08014178: .4byte gBattleCommunication _0801417C: ldr r1, _080141B0 @ =gBattleMons movs r0, 0x58 @@ -8490,7 +8490,7 @@ _0801419C: ldr r0, _080141B4 @ =gUnknown_2023D7C adds r0, r2, r0 strb r3, [r0] - ldr r1, _080141B8 @ =gUnknown_2023E82 + ldr r1, _080141B8 @ =gBattleCommunication ldrb r0, [r4] adds r0, r1 movs r1, 0x3 @@ -8499,23 +8499,23 @@ _0801419C: .align 2, 0 _080141B0: .4byte gBattleMons _080141B4: .4byte gUnknown_2023D7C -_080141B8: .4byte gUnknown_2023E82 +_080141B8: .4byte gBattleCommunication _080141BC: ldr r0, _080141D4 @ =gUnknown_2023D7C ldrb r1, [r0] - ldr r0, _080141D8 @ =gUnknown_20233C4 + ldr r0, _080141D8 @ =gBattleBufferB ldrb r2, [r0, 0x1] ldrb r0, [r0, 0x2] lsls r0, 8 orrs r2, r0 movs r0, 0 - bl EmitChooseAction + bl BtlController_EmitChooseAction bl _08014B26 .align 2, 0 _080141D4: .4byte gUnknown_2023D7C -_080141D8: .4byte gUnknown_20233C4 +_080141D8: .4byte gBattleBufferB _080141DC: - ldr r4, _08014234 @ =gUnknown_2023BC8 + ldr r4, _08014234 @ =gBattleControllerExecFlags ldr r1, _08014238 @ =gBitTable ldr r3, _0801423C @ =gActiveBattler ldrb r5, [r3] @@ -8540,7 +8540,7 @@ _080141DC: _0801420A: ldr r2, _08014240 @ =gUnknown_2023D7C adds r2, r5, r2 - ldr r1, _08014244 @ =gUnknown_20233C4 + ldr r1, _08014244 @ =gBattleBufferB lsls r0, r5, 9 adds r1, 0x1 adds r0, r1 @@ -8560,11 +8560,11 @@ _08014228: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08014234: .4byte gUnknown_2023BC8 +_08014234: .4byte gBattleControllerExecFlags _08014238: .4byte gBitTable _0801423C: .4byte gActiveBattler _08014240: .4byte gUnknown_2023D7C -_08014244: .4byte gUnknown_20233C4 +_08014244: .4byte gBattleBufferB _08014248: .4byte _0801424C .align 2, 0 _0801424C: @@ -8582,11 +8582,11 @@ _0801424C: .4byte _080146AC .4byte _08014670 _08014280: - bl sub_8017998 + bl AreAllMovesUnusable lsls r0, 24 cmp r0, 0 beq _080142D8 - ldr r0, _080142C8 @ =gUnknown_2023E82 + ldr r0, _080142C8 @ =gBattleCommunication ldr r3, _080142CC @ =gActiveBattler ldrb r1, [r3] adds r1, r0 @@ -8608,7 +8608,7 @@ _08014280: ldrb r1, [r3] ldr r2, [r2] adds r2, r1, r2 - ldr r0, _080142D4 @ =gUnknown_20233C4 + ldr r0, _080142D4 @ =gBattleBufferB lsls r1, 9 adds r0, 0x3 adds r1, r0 @@ -8616,10 +8616,10 @@ _08014280: strb r0, [r2, 0xC] bl _08014C78 .align 2, 0 -_080142C8: .4byte gUnknown_2023E82 +_080142C8: .4byte gBattleCommunication _080142CC: .4byte gActiveBattler _080142D0: .4byte gBattleStruct -_080142D4: .4byte gUnknown_20233C4 +_080142D4: .4byte gBattleBufferB _080142D8: ldr r3, _08014318 @ =gDisableStructs ldr r5, _0801431C @ =gActiveBattler @@ -8631,7 +8631,7 @@ _080142D8: ldrh r2, [r0, 0x6] cmp r2, 0 beq _0801432C - ldr r1, _08014320 @ =gUnknown_2023DC4 + ldr r1, _08014320 @ =gChosenMoveByBattler lsls r0, r4, 1 adds r0, r1 strh r2, [r0] @@ -8646,7 +8646,7 @@ _080142D8: adds r0, r3 ldrb r0, [r0, 0xC] strb r0, [r1] - ldr r1, _08014328 @ =gUnknown_2023E82 + ldr r1, _08014328 @ =gBattleCommunication ldrb r0, [r5] adds r0, r1 movs r1, 0x3 @@ -8655,9 +8655,9 @@ _080142D8: .align 2, 0 _08014318: .4byte gDisableStructs _0801431C: .4byte gActiveBattler -_08014320: .4byte gUnknown_2023DC4 +_08014320: .4byte gChosenMoveByBattler _08014324: .4byte gBattleStruct -_08014328: .4byte gUnknown_2023E82 +_08014328: .4byte gBattleCommunication _0801432C: add r2, sp, 0x4 ldr r3, _080143CC @ =gBattleMons @@ -8736,7 +8736,7 @@ _0801436E: movs r0, 0 movs r2, 0 add r3, sp, 0x4 - bl EmitChooseMove + bl BtlController_EmitChooseMove b _0801460E .align 2, 0 _080143CC: .4byte gBattleMons @@ -8748,14 +8748,14 @@ _080143D4: ands r0, r1 cmp r0, 0 beq _08014428 - ldr r1, _08014418 @ =gUnknown_2023D80 + ldr r1, _08014418 @ =gSelectionBattleScripts mov r3, r8 ldrb r0, [r3] lsls r0, 2 adds r0, r1 ldr r1, _0801441C @ =gUnknown_81D96A4 str r1, [r0] - ldr r0, _08014420 @ =gUnknown_2023E82 + ldr r0, _08014420 @ =gBattleCommunication ldrb r1, [r3] adds r1, r0 movs r3, 0 @@ -8774,9 +8774,9 @@ _080143D4: .align 2, 0 _08014410: .4byte gBattleTypeFlags _08014414: .4byte 0x00000902 -_08014418: .4byte gUnknown_2023D80 +_08014418: .4byte gSelectionBattleScripts _0801441C: .4byte gUnknown_81D96A4 -_08014420: .4byte gUnknown_2023E82 +_08014420: .4byte gBattleCommunication _08014424: .4byte gBattleStruct _08014428: ldr r2, _08014448 @ =gBattleStruct @@ -8788,9 +8788,9 @@ _08014428: ldr r1, [r2] adds r1, r0 movs r0, 0 - bl EmitChooseItem + bl BtlController_EmitChooseItem ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _080146AC .align 2, 0 _08014448: .4byte gBattleStruct @@ -8934,7 +8934,7 @@ _08014548: str r0, [sp] movs r0, 0 movs r2, 0x6 - bl EmitChoosePokemon + bl BtlController_EmitChoosePokemon b _0801460E .align 2, 0 _08014574: .4byte gActiveBattler @@ -8988,7 +8988,7 @@ _080145D0: movs r1, 0 _080145DE: movs r3, 0 - bl EmitChoosePokemon + bl BtlController_EmitChoosePokemon b _0801460E .align 2, 0 _080145E8: .4byte gUnknown_2023D7C @@ -9007,11 +9007,11 @@ _080145F0: movs r1, 0 movs r2, 0x6 movs r3, 0 - bl EmitChoosePokemon + bl BtlController_EmitChoosePokemon _0801460E: ldr r0, _0801461C @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _080146AC .align 2, 0 _08014618: .4byte gBattleStruct @@ -9021,14 +9021,14 @@ _08014620: lsls r0, 24 cmp r0, 0 beq _080146AC - ldr r1, _0801465C @ =gUnknown_2023D80 + ldr r1, _0801465C @ =gSelectionBattleScripts ldr r3, _08014660 @ =gActiveBattler ldrb r0, [r3] lsls r0, 2 adds r0, r1 ldr r1, _08014664 @ =gUnknown_81D8949 str r1, [r0] - ldr r0, _08014668 @ =gUnknown_2023E82 + ldr r0, _08014668 @ =gBattleCommunication ldrb r1, [r3] adds r1, r0 movs r4, 0 @@ -9047,13 +9047,13 @@ _08014620: strb r4, [r0] b _08014C78 .align 2, 0 -_0801465C: .4byte gUnknown_2023D80 +_0801465C: .4byte gSelectionBattleScripts _08014660: .4byte gActiveBattler _08014664: .4byte gUnknown_81D8949 -_08014668: .4byte gUnknown_2023E82 +_08014668: .4byte gBattleCommunication _0801466C: .4byte gBattleStruct _08014670: - ldr r4, _080146A8 @ =gUnknown_2023E82 + ldr r4, _080146A8 @ =gBattleCommunication mov r2, r8 ldrb r1, [r2] adds r1, r4 @@ -9072,13 +9072,13 @@ _08014670: adds r0, r4 strb r5, [r0] movs r0, 0 - bl EmitCmd50 + bl BtlController_EmitEndBounceEffect mov r3, r8 ldrb r0, [r3] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _08014C78 .align 2, 0 -_080146A8: .4byte gUnknown_2023E82 +_080146A8: .4byte gBattleCommunication _080146AC: ldr r0, _080146D8 @ =gBattleTypeFlags ldr r0, [r0] @@ -9086,7 +9086,7 @@ _080146AC: ands r0, r1 cmp r0, 0x8 bne _080146EC - ldr r0, _080146DC @ =gUnknown_20233C4 + ldr r0, _080146DC @ =gBattleBufferB ldr r4, _080146E0 @ =gActiveBattler ldrb r1, [r4] lsls r1, 9 @@ -9097,22 +9097,22 @@ _080146AC: bne _080146EC ldr r0, _080146E4 @ =gUnknown_81D8924 bl BattleScriptExecute - ldr r1, _080146E8 @ =gUnknown_2023E82 + ldr r1, _080146E8 @ =gBattleCommunication ldrb r0, [r4] adds r0, r1 b _08014926 .align 2, 0 _080146D8: .4byte gBattleTypeFlags -_080146DC: .4byte gUnknown_20233C4 +_080146DC: .4byte gBattleBufferB _080146E0: .4byte gActiveBattler _080146E4: .4byte gUnknown_81D8924 -_080146E8: .4byte gUnknown_2023E82 +_080146E8: .4byte gBattleCommunication _080146EC: bl IsRunningFromBattleImpossible lsls r0, 24 cmp r0, 0 beq _08014750 - ldr r0, _08014738 @ =gUnknown_20233C4 + ldr r0, _08014738 @ =gBattleBufferB ldr r4, _0801473C @ =gActiveBattler ldrb r2, [r4] lsls r1, r2, 9 @@ -9121,12 +9121,12 @@ _080146EC: ldrb r0, [r1] cmp r0, 0x3 bne _08014750 - ldr r1, _08014740 @ =gUnknown_2023D80 + ldr r1, _08014740 @ =gSelectionBattleScripts lsls r0, r2, 2 adds r0, r1 ldr r1, _08014744 @ =gUnknown_81D8943 str r1, [r0] - ldr r0, _08014748 @ =gUnknown_2023E82 + ldr r0, _08014748 @ =gBattleCommunication ldrb r1, [r4] adds r1, r0 movs r3, 0 @@ -9146,23 +9146,23 @@ _0801472C: strb r3, [r0] b _08014C78 .align 2, 0 -_08014738: .4byte gUnknown_20233C4 +_08014738: .4byte gBattleBufferB _0801473C: .4byte gActiveBattler -_08014740: .4byte gUnknown_2023D80 +_08014740: .4byte gSelectionBattleScripts _08014744: .4byte gUnknown_81D8943 -_08014748: .4byte gUnknown_2023E82 +_08014748: .4byte gBattleCommunication _0801474C: .4byte gBattleStruct _08014750: - ldr r2, _0801475C @ =gUnknown_2023E82 + ldr r2, _0801475C @ =gBattleCommunication ldr r0, _08014760 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 -_0801475C: .4byte gUnknown_2023E82 +_0801475C: .4byte gBattleCommunication _08014760: .4byte gActiveBattler _08014764: - ldr r4, _080147A8 @ =gUnknown_2023BC8 + ldr r4, _080147A8 @ =gBattleControllerExecFlags ldr r1, _080147AC @ =gBitTable ldr r3, _080147B0 @ =gActiveBattler ldrb r5, [r3] @@ -9199,7 +9199,7 @@ _0801479E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080147A8: .4byte gUnknown_2023BC8 +_080147A8: .4byte gBattleControllerExecFlags _080147AC: .4byte gBitTable _080147B0: .4byte gActiveBattler _080147B4: .4byte gUnknown_2023D7C @@ -9217,7 +9217,7 @@ _080147BC: .4byte _08014A68 .4byte _08014A8C _080147E4: - ldr r0, _08014804 @ =gUnknown_20233C4 + ldr r0, _08014804 @ =gBattleBufferB mov r1, r8 ldrb r4, [r1] lsls r1, r4, 9 @@ -9233,7 +9233,7 @@ _080147E4: strb r1, [r0] b _08014C78 .align 2, 0 -_08014804: .4byte gUnknown_20233C4 +_08014804: .4byte gBattleBufferB _08014808: adds r3, r7, 0 mov r5, r8 @@ -9251,18 +9251,18 @@ _08014808: ldr r0, _08014830 @ =0x0000ffff cmp r2, r0 bne _08014838 - ldr r0, _08014834 @ =gUnknown_2023E82 + ldr r0, _08014834 @ =gBattleCommunication adds r0, r4, r0 b _08014926 .align 2, 0 _08014830: .4byte 0x0000ffff -_08014834: .4byte gUnknown_2023E82 +_08014834: .4byte gBattleCommunication _08014838: - bl sub_8017594 + bl TrySetCantSelectMoveBattleScript lsls r0, 24 cmp r0, 0 beq _0801487C - ldr r0, _08014874 @ =gUnknown_2023E82 + ldr r0, _08014874 @ =gBattleCommunication ldrb r1, [r5] adds r1, r0 movs r3, 0 @@ -9287,7 +9287,7 @@ _08014838: strb r0, [r1] b _08014C78 .align 2, 0 -_08014874: .4byte gUnknown_2023E82 +_08014874: .4byte gBattleCommunication _08014878: .4byte gBattleStruct _0801487C: mov r2, r8 @@ -9300,7 +9300,7 @@ _0801487C: adds r0, r6 ldrb r0, [r0] strb r0, [r1] - ldr r0, _080148CC @ =gUnknown_2023DC4 + ldr r0, _080148CC @ =gChosenMoveByBattler ldrb r2, [r2] lsls r5, r2, 1 adds r5, r0 @@ -9324,16 +9324,16 @@ _0801487C: add r0, r9 ldrb r0, [r0] strb r0, [r4, 0xC] - ldr r0, _080148D4 @ =gUnknown_2023E82 + ldr r0, _080148D4 @ =gBattleCommunication ldrb r1, [r3] b _08014B30 .align 2, 0 _080148C8: .4byte gBattleStruct -_080148CC: .4byte gUnknown_2023DC4 +_080148CC: .4byte gChosenMoveByBattler _080148D0: .4byte gBattleMons -_080148D4: .4byte gUnknown_2023E82 +_080148D4: .4byte gBattleCommunication _080148D8: - ldr r2, _08014900 @ =gUnknown_20233C4 + ldr r2, _08014900 @ =gBattleBufferB ldr r5, _08014904 @ =gActiveBattler ldrb r4, [r5] lsls r1, r4, 9 @@ -9349,18 +9349,18 @@ _080148D8: bne _080148F6 b _08014C48 _080148F6: - ldr r0, _08014908 @ =gUnknown_2023D68 + ldr r0, _08014908 @ =gLastUsedItem strh r3, [r0] - ldr r0, _0801490C @ =gUnknown_2023E82 + ldr r0, _0801490C @ =gBattleCommunication ldrb r1, [r5] b _08014B30 .align 2, 0 -_08014900: .4byte gUnknown_20233C4 +_08014900: .4byte gBattleBufferB _08014904: .4byte gActiveBattler -_08014908: .4byte gUnknown_2023D68 -_0801490C: .4byte gUnknown_2023E82 +_08014908: .4byte gLastUsedItem +_0801490C: .4byte gBattleCommunication _08014910: - ldr r6, _0801492C @ =gUnknown_20233C4 + ldr r6, _0801492C @ =gBattleBufferB ldr r7, _08014930 @ =gActiveBattler ldrb r2, [r7] lsls r0, r2, 9 @@ -9369,16 +9369,16 @@ _08014910: ldrb r1, [r0] cmp r1, 0x6 bne _08014938 - ldr r0, _08014934 @ =gUnknown_2023E82 + ldr r0, _08014934 @ =gBattleCommunication adds r0, r2, r0 _08014926: movs r1, 0 strb r1, [r0] b _08014C4E .align 2, 0 -_0801492C: .4byte gUnknown_20233C4 +_0801492C: .4byte gBattleBufferB _08014930: .4byte gActiveBattler -_08014934: .4byte gUnknown_2023E82 +_08014934: .4byte gBattleCommunication _08014938: ldr r0, _080149FC @ =gBattleStruct mov r12, r0 @@ -9476,83 +9476,83 @@ _08014938: ldrb r0, [r0] strb r0, [r1] _080149F6: - ldr r0, _08014A04 @ =gUnknown_2023E82 + ldr r0, _08014A04 @ =gBattleCommunication ldrb r1, [r7] b _08014B30 .align 2, 0 _080149FC: .4byte gBattleStruct _08014A00: .4byte gBattleTypeFlags -_08014A04: .4byte gUnknown_2023E82 +_08014A04: .4byte gBattleCommunication _08014A08: - ldr r2, _08014A20 @ =gUnknown_2023DD0 + ldr r2, _08014A20 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 8 orrs r0, r1 str r0, [r2] - ldr r2, _08014A24 @ =gUnknown_2023E82 + ldr r2, _08014A24 @ =gBattleCommunication ldr r0, _08014A28 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 -_08014A20: .4byte gUnknown_2023DD0 -_08014A24: .4byte gUnknown_2023E82 +_08014A20: .4byte gHitMarker +_08014A24: .4byte gBattleCommunication _08014A28: .4byte gActiveBattler _08014A2C: - ldr r2, _08014A38 @ =gUnknown_2023E82 + ldr r2, _08014A38 @ =gBattleCommunication ldr r0, _08014A3C @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 -_08014A38: .4byte gUnknown_2023E82 +_08014A38: .4byte gBattleCommunication _08014A3C: .4byte gActiveBattler _08014A40: - ldr r2, _08014A4C @ =gUnknown_2023E82 + ldr r2, _08014A4C @ =gBattleCommunication ldr r0, _08014A50 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 -_08014A4C: .4byte gUnknown_2023E82 +_08014A4C: .4byte gBattleCommunication _08014A50: .4byte gActiveBattler _08014A54: - ldr r2, _08014A60 @ =gUnknown_2023E82 + ldr r2, _08014A60 @ =gBattleCommunication ldr r0, _08014A64 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 -_08014A60: .4byte gUnknown_2023E82 +_08014A60: .4byte gBattleCommunication _08014A64: .4byte gActiveBattler _08014A68: - ldr r2, _08014A80 @ =gUnknown_2023DD0 + ldr r2, _08014A80 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 8 orrs r0, r1 str r0, [r2] - ldr r2, _08014A84 @ =gUnknown_2023E82 + ldr r2, _08014A84 @ =gBattleCommunication ldr r0, _08014A88 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 -_08014A80: .4byte gUnknown_2023DD0 -_08014A84: .4byte gUnknown_2023E82 +_08014A80: .4byte gHitMarker +_08014A84: .4byte gBattleCommunication _08014A88: .4byte gActiveBattler _08014A8C: - ldr r2, _08014A98 @ =gUnknown_2023E82 + ldr r2, _08014A98 @ =gBattleCommunication ldr r0, _08014A9C @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 -_08014A98: .4byte gUnknown_2023E82 +_08014A98: .4byte gBattleCommunication _08014A9C: .4byte gActiveBattler _08014AA0: - ldr r3, _08014B08 @ =gUnknown_2023BC8 + ldr r3, _08014B08 @ =gBattleControllerExecFlags ldr r4, _08014B0C @ =gBitTable ldr r0, _08014B10 @ =gActiveBattler ldrb r0, [r0] @@ -9602,10 +9602,10 @@ _08014ACA: _08014AFE: movs r0, 0 movs r1, 0 - bl EmitLinkStandbyMsg + bl BtlController_EmitLinkStandbyMsg b _08014B24 .align 2, 0 -_08014B08: .4byte gUnknown_2023BC8 +_08014B08: .4byte gBattleControllerExecFlags _08014B0C: .4byte gBitTable _08014B10: .4byte gActiveBattler _08014B14: .4byte gBattleTypeFlags @@ -9613,13 +9613,13 @@ _08014B18: .4byte gBattleStruct _08014B1C: movs r0, 0 movs r1, 0x1 - bl EmitLinkStandbyMsg + bl BtlController_EmitLinkStandbyMsg _08014B24: ldr r4, _08014B3C @ =gActiveBattler _08014B26: ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r0, _08014B40 @ =gUnknown_2023E82 + bl MarkBattlerForControllerExec + ldr r0, _08014B40 @ =gBattleCommunication ldrb r1, [r4] _08014B30: adds r1, r0 @@ -9630,9 +9630,9 @@ _08014B32: b _08014C4E .align 2, 0 _08014B3C: .4byte gActiveBattler -_08014B40: .4byte gUnknown_2023E82 +_08014B40: .4byte gBattleCommunication _08014B44: - ldr r3, _08014B78 @ =gUnknown_2023BC8 + ldr r3, _08014B78 @ =gBattleControllerExecFlags ldr r1, _08014B7C @ =gBitTable ldr r0, _08014B80 @ =gActiveBattler ldrb r0, [r0] @@ -9652,16 +9652,16 @@ _08014B44: ands r0, r1 cmp r0, 0 bne _08014C4E - ldr r1, _08014B84 @ =gUnknown_2023E82 + ldr r1, _08014B84 @ =gBattleCommunication ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] b _08014C4E .align 2, 0 -_08014B78: .4byte gUnknown_2023BC8 +_08014B78: .4byte gBattleControllerExecFlags _08014B7C: .4byte gBitTable _08014B80: .4byte gActiveBattler -_08014B84: .4byte gUnknown_2023E82 +_08014B84: .4byte gBattleCommunication _08014B88: ldr r5, _08014BA8 @ =gActiveBattler ldrb r2, [r5] @@ -9673,7 +9673,7 @@ _08014B88: ldrb r0, [r0] cmp r0, 0 beq _08014BB4 - ldr r0, _08014BB0 @ =gUnknown_2023E82 + ldr r0, _08014BB0 @ =gBattleCommunication adds r0, r2, r0 adds r1, 0x84 ldrb r1, [r1] @@ -9682,18 +9682,18 @@ _08014B88: .align 2, 0 _08014BA8: .4byte gActiveBattler _08014BAC: .4byte gBattleStruct -_08014BB0: .4byte gUnknown_2023E82 +_08014BB0: .4byte gBattleCommunication _08014BB4: - ldr r0, _08014C08 @ =sBattler_AI + ldr r0, _08014C08 @ =gBattlerAttacker strb r2, [r0] - ldr r7, _08014C0C @ =gUnknown_2023D74 - ldr r6, _08014C10 @ =gUnknown_2023D80 + ldr r7, _08014C0C @ =gBattlescriptCurrInstr + ldr r6, _08014C10 @ =gSelectionBattleScripts ldrb r0, [r5] lsls r0, 2 adds r0, r6 ldr r4, [r0] str r4, [r7] - ldr r3, _08014C14 @ =gUnknown_2023BC8 + ldr r3, _08014C14 @ =gBattleControllerExecFlags ldr r1, _08014C18 @ =gBitTable ldrb r0, [r5] lsls r0, 2 @@ -9712,7 +9712,7 @@ _08014BB4: ands r0, r1 cmp r0, 0 bne _08014BFA - ldr r0, _08014C1C @ =gUnknown_825011C + ldr r0, _08014C1C @ =gBattleScriptingCommandsTable ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -9726,14 +9726,14 @@ _08014BFA: str r1, [r0] b _08014C4E .align 2, 0 -_08014C08: .4byte sBattler_AI -_08014C0C: .4byte gUnknown_2023D74 -_08014C10: .4byte gUnknown_2023D80 -_08014C14: .4byte gUnknown_2023BC8 +_08014C08: .4byte gBattlerAttacker +_08014C0C: .4byte gBattlescriptCurrInstr +_08014C10: .4byte gSelectionBattleScripts +_08014C14: .4byte gBattleControllerExecFlags _08014C18: .4byte gBitTable -_08014C1C: .4byte gUnknown_825011C +_08014C1C: .4byte gBattleScriptingCommandsTable _08014C20: - ldr r3, _08014C88 @ =gUnknown_2023BC8 + ldr r3, _08014C88 @ =gBattleControllerExecFlags ldr r1, _08014C8C @ =gBitTable ldr r0, _08014C90 @ =gActiveBattler ldrb r4, [r0] @@ -9754,7 +9754,7 @@ _08014C20: cmp r3, 0 bne _08014C4E _08014C48: - ldr r0, _08014C94 @ =gUnknown_2023E82 + ldr r0, _08014C94 @ =gBattleCommunication adds r0, r4, r0 strb r3, [r0] _08014C4E: @@ -9771,12 +9771,12 @@ _08014C4E: bcs _08014C68 bl _08014064 _08014C68: - ldr r0, _08014C94 @ =gUnknown_2023E82 + ldr r0, _08014C94 @ =gBattleCommunication ldrb r0, [r0, 0x4] ldrb r2, [r2] cmp r0, r2 bne _08014C78 - ldr r1, _08014C9C @ =gUnknown_3004F84 + ldr r1, _08014C9C @ =gBattleMainFunc ldr r0, _08014CA0 @ =sub_80150A8 str r0, [r1] _08014C78: @@ -9789,12 +9789,12 @@ _08014C78: pop {r0} bx r0 .align 2, 0 -_08014C88: .4byte gUnknown_2023BC8 +_08014C88: .4byte gBattleControllerExecFlags _08014C8C: .4byte gBitTable _08014C90: .4byte gActiveBattler -_08014C94: .4byte gUnknown_2023E82 +_08014C94: .4byte gBattleCommunication _08014C98: .4byte gBattlersCount -_08014C9C: .4byte gUnknown_3004F84 +_08014C9C: .4byte gBattleMainFunc _08014CA0: .4byte sub_80150A8 thumb_func_end sub_8014040 @@ -9812,7 +9812,7 @@ SwapTurnOrder: @ 8014CA4 ldrb r3, [r2] strb r3, [r4] strb r5, [r2] - ldr r2, _08014CD4 @ =gUnknown_2023BDE + ldr r2, _08014CD4 @ =gBattlerByTurnOrder adds r0, r2 ldrb r5, [r0] adds r1, r2 @@ -9824,7 +9824,7 @@ SwapTurnOrder: @ 8014CA4 bx r0 .align 2, 0 _08014CD0: .4byte gUnknown_2023BDA -_08014CD4: .4byte gUnknown_2023BDE +_08014CD4: .4byte gBattlerByTurnOrder thumb_func_end SwapTurnOrder thumb_func_start GetWhoStrikesFirst @@ -10163,7 +10163,7 @@ _08014F78: adds r2, r0, 0 cmp r1, 0 bne _08014FC8 - ldr r0, _08014F9C @ =gUnknown_2023E8C + ldr r0, _08014F9C @ =gProtectStructs lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] @@ -10174,7 +10174,7 @@ _08014F78: b _08014FCA .align 2, 0 _08014F98: .4byte gUnknown_2023D7C -_08014F9C: .4byte gUnknown_2023E8C +_08014F9C: .4byte gProtectStructs _08014FA0: ldr r0, _08014FC0 @ =gBattleStruct ldr r0, [r0] @@ -10203,7 +10203,7 @@ _08014FCA: ldrb r0, [r0] cmp r0, 0 bne _08015014 - ldr r0, _08014FE8 @ =gUnknown_2023E8C + ldr r0, _08014FE8 @ =gProtectStructs lsls r1, 4 adds r1, r0 ldrb r0, [r1] @@ -10213,7 +10213,7 @@ _08014FCA: movs r2, 0xA5 b _08015016 .align 2, 0 -_08014FE8: .4byte gUnknown_2023E8C +_08014FE8: .4byte gProtectStructs _08014FEC: ldr r0, _0801500C @ =gBattleStruct ldr r0, [r0] @@ -10342,7 +10342,7 @@ _080150D0: ldr r7, _08015108 @ =gUnknown_2023BDA ldr r6, _0801510C @ =gUnknown_2023D7C mov r2, r8 - ldr r5, _08015110 @ =gUnknown_2023BDE + ldr r5, _08015110 @ =gBattlerByTurnOrder _080150D8: adds r1, r3, r7 ldrb r0, [r2] @@ -10368,7 +10368,7 @@ _08015100: .4byte gActiveBattler _08015104: .4byte gBattlersCount _08015108: .4byte gUnknown_2023BDA _0801510C: .4byte gUnknown_2023D7C -_08015110: .4byte gUnknown_2023BDE +_08015110: .4byte gBattlerByTurnOrder _08015114: movs r0, 0x2 ands r1, r0 @@ -10428,13 +10428,13 @@ _08015174: adds r0, r1 ldrb r0, [r0] strb r0, [r6] - ldr r2, _080151E4 @ =gUnknown_2023BDE + ldr r2, _080151E4 @ =gBattlerByTurnOrder ldrb r0, [r3] strb r0, [r2] movs r3, 0x1 movs r5, 0 adds r4, r1, 0 - ldr r7, _080151E8 @ =gUnknown_3004F84 + ldr r7, _080151E8 @ =gBattleMainFunc mov r10, r7 ldr r0, _080151EC @ =CheckFocusPunch_ClearVarsBeforeTurnStarts mov r12, r0 @@ -10476,8 +10476,8 @@ _080151CC: _080151D8: .4byte gUnknown_2023D7C _080151DC: .4byte gActiveBattler _080151E0: .4byte gUnknown_2023BDA -_080151E4: .4byte gUnknown_2023BDE -_080151E8: .4byte gUnknown_3004F84 +_080151E4: .4byte gBattlerByTurnOrder +_080151E8: .4byte gBattleMainFunc _080151EC: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts _080151F0: .4byte gBattleStruct _080151F4: .4byte gBattlersCount @@ -10492,7 +10492,7 @@ _080151F8: ldr r6, _0801528C @ =gUnknown_2023D7C mov r2, r8 ldr r5, _08015290 @ =gUnknown_2023BDA - ldr r4, _08015294 @ =gUnknown_2023BDE + ldr r4, _08015294 @ =gBattlerByTurnOrder _0801520E: ldrb r0, [r2] adds r0, r6 @@ -10529,7 +10529,7 @@ _0801523E: beq _08015282 ldr r6, _0801528C @ =gUnknown_2023D7C ldr r5, _08015290 @ =gUnknown_2023BDA - ldr r4, _08015294 @ =gUnknown_2023BDE + ldr r4, _08015294 @ =gBattlerByTurnOrder _08015252: ldrb r0, [r2] adds r0, r6 @@ -10563,7 +10563,7 @@ _08015282: _08015288: .4byte gBattlersCount _0801528C: .4byte gUnknown_2023D7C _08015290: .4byte gUnknown_2023BDA -_08015294: .4byte gUnknown_2023BDE +_08015294: .4byte gBattlerByTurnOrder _08015298: adds r4, r5, 0x1 adds r7, r4, 0 @@ -10574,7 +10574,7 @@ _08015298: lsls r2, r5, 24 mov r8, r2 _080152A8: - ldr r0, _0801531C @ =gUnknown_2023BDE + ldr r0, _0801531C @ =gBattlerByTurnOrder adds r1, r5, r0 ldrb r3, [r1] adds r0, r4, r0 @@ -10617,7 +10617,7 @@ _080152F0: cmp r5, r0 blt _08015298 _080152FA: - ldr r1, _08015324 @ =gUnknown_3004F84 + ldr r1, _08015324 @ =gBattleMainFunc ldr r0, _08015328 @ =CheckFocusPunch_ClearVarsBeforeTurnStarts str r0, [r1] ldr r0, _0801532C @ =gBattleStruct @@ -10635,9 +10635,9 @@ _08015304: bx r0 .align 2, 0 _08015318: .4byte gUnknown_2023BDA -_0801531C: .4byte gUnknown_2023BDE +_0801531C: .4byte gBattlerByTurnOrder _08015320: .4byte gBattlersCount -_08015324: .4byte gUnknown_3004F84 +_08015324: .4byte gBattleMainFunc _08015328: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts _0801532C: .4byte gBattleStruct thumb_func_end sub_80150A8 @@ -10660,7 +10660,7 @@ TurnValuesCleanUp: @ 8015330 adds r5, r1, 0 cmp r2, 0 beq _08015428 - ldr r7, _08015390 @ =gUnknown_2023E8C + ldr r7, _08015390 @ =gProtectStructs adds r6, r5, 0 ldr r0, _08015394 @ =gUnknown_2023C34 mov r12, r0 @@ -10691,7 +10691,7 @@ _0801535E: .align 2, 0 _08015388: .4byte gActiveBattler _0801538C: .4byte gBattlersCount -_08015390: .4byte gUnknown_2023E8C +_08015390: .4byte gProtectStructs _08015394: .4byte gUnknown_2023C34 _08015398: .4byte gDisableStructs _0801539C: @@ -10801,7 +10801,7 @@ SpecialStatusesClear: @ 8015450 beq _0801548E adds r3, r2, 0 movs r4, 0 - ldr r5, _0801549C @ =gUnknown_2023ECC + ldr r5, _0801549C @ =gSpecialStatuses _08015468: ldrb r1, [r3] lsls r0, r1, 2 @@ -10830,13 +10830,13 @@ _0801548E: .align 2, 0 _08015494: .4byte gActiveBattler _08015498: .4byte gBattlersCount -_0801549C: .4byte gUnknown_2023ECC +_0801549C: .4byte gSpecialStatuses thumb_func_end SpecialStatusesClear thumb_func_start CheckFocusPunch_ClearVarsBeforeTurnStarts CheckFocusPunch_ClearVarsBeforeTurnStarts: @ 80154A0 push {r4-r7,lr} - ldr r0, _08015528 @ =gUnknown_2023DD0 + ldr r0, _08015528 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 8 @@ -10854,7 +10854,7 @@ CheckFocusPunch_ClearVarsBeforeTurnStarts: @ 80154A0 cmp r0, r1 bcs _0801555E ldr r5, _08015534 @ =gActiveBattler - ldr r4, _08015538 @ =sBattler_AI + ldr r4, _08015538 @ =gBattlerAttacker movs r7, 0x84 lsls r7, 1 _080154CC: @@ -10866,7 +10866,7 @@ _080154CC: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, _0801553C @ =gUnknown_2023DC4 + ldr r1, _0801553C @ =gChosenMoveByBattler ldrb r3, [r5] lsls r0, r3, 1 adds r0, r1 @@ -10893,7 +10893,7 @@ _080154CC: lsls r0, 31 cmp r0, 0 bne _08015550 - ldr r0, _08015548 @ =gUnknown_2023E8C + ldr r0, _08015548 @ =gProtectStructs lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] @@ -10904,15 +10904,15 @@ _080154CC: bl BattleScriptExecute b _08015598 .align 2, 0 -_08015528: .4byte gUnknown_2023DD0 +_08015528: .4byte gHitMarker _0801552C: .4byte gBattleStruct _08015530: .4byte gBattlersCount _08015534: .4byte gActiveBattler -_08015538: .4byte sBattler_AI -_0801553C: .4byte gUnknown_2023DC4 +_08015538: .4byte gBattlerAttacker +_0801553C: .4byte gChosenMoveByBattler _08015540: .4byte gBattleMons _08015544: .4byte gDisableStructs -_08015548: .4byte gUnknown_2023E8C +_08015548: .4byte gProtectStructs _0801554C: .4byte gUnknown_81D9015 _08015550: mov r2, r12 @@ -10927,7 +10927,7 @@ _0801555E: ldr r1, _080155A0 @ =gUnknown_2023BE2 movs r0, 0 strb r0, [r1] - ldr r1, _080155A4 @ =gUnknown_2023BE3 + ldr r1, _080155A4 @ =gCurrentActionFuncId ldr r0, _080155A8 @ =gUnknown_2023BDA movs r3, 0 ldrb r0, [r0] @@ -10938,10 +10938,10 @@ _0801555E: ldr r0, _080155B0 @ =gBattleStruct ldr r0, [r0] strb r2, [r0, 0x13] - ldr r1, _080155B4 @ =gUnknown_3004F84 + ldr r1, _080155B4 @ =gBattleMainFunc ldr r0, _080155B8 @ =RunTurnActionsFunctions str r0, [r1] - ldr r0, _080155BC @ =gUnknown_2023E82 + ldr r0, _080155BC @ =gBattleCommunication strb r2, [r0, 0x3] strb r2, [r0, 0x4] ldr r0, _080155C0 @ =gBattleScripting @@ -10957,13 +10957,13 @@ _08015598: bx r0 .align 2, 0 _080155A0: .4byte gUnknown_2023BE2 -_080155A4: .4byte gUnknown_2023BE3 +_080155A4: .4byte gCurrentActionFuncId _080155A8: .4byte gUnknown_2023BDA _080155AC: .4byte gDynamicBasePower _080155B0: .4byte gBattleStruct -_080155B4: .4byte gUnknown_3004F84 +_080155B4: .4byte gBattleMainFunc _080155B8: .4byte RunTurnActionsFunctions -_080155BC: .4byte gUnknown_2023E82 +_080155BC: .4byte gBattleCommunication _080155C0: .4byte gBattleScripting _080155C4: .4byte gBattleResources thumb_func_end CheckFocusPunch_ClearVarsBeforeTurnStarts @@ -10973,7 +10973,7 @@ RunTurnActionsFunctions: @ 80155C8 push {r4-r6,lr} ldr r6, _0801561C @ =gBattleOutcome ldrb r0, [r6] - ldr r2, _08015620 @ =gUnknown_2023BE3 + ldr r2, _08015620 @ =gCurrentActionFuncId cmp r0, 0 beq _080155D8 movs r0, 0xC @@ -10996,12 +10996,12 @@ _080155D8: ldrb r0, [r0] cmp r1, r0 bcc _08015644 - ldr r2, _08015634 @ =gUnknown_2023DD0 + ldr r2, _08015634 @ =gHitMarker ldr r0, [r2] ldr r1, _08015638 @ =0xffefffff ands r0, r1 str r0, [r2] - ldr r3, _0801563C @ =gUnknown_3004F84 + ldr r3, _0801563C @ =gBattleMainFunc ldr r2, _08015640 @ =gUnknown_8250070 ldrb r1, [r6] movs r0, 0x7F @@ -11013,14 +11013,14 @@ _080155D8: b _0801565C .align 2, 0 _0801561C: .4byte gBattleOutcome -_08015620: .4byte gUnknown_2023BE3 +_08015620: .4byte gCurrentActionFuncId _08015624: .4byte gBattleStruct _08015628: .4byte gUnknown_2023BE2 _0801562C: .4byte gUnknown_8250038 _08015630: .4byte gBattlersCount -_08015634: .4byte gUnknown_2023DD0 +_08015634: .4byte gHitMarker _08015638: .4byte 0xffefffff -_0801563C: .4byte gUnknown_3004F84 +_0801563C: .4byte gBattleMainFunc _08015640: .4byte gUnknown_8250070 _08015644: ldr r0, [r5] @@ -11028,7 +11028,7 @@ _08015644: ldrb r0, [r0] cmp r0, r1 beq _0801565C - ldr r2, _08015664 @ =gUnknown_2023DD0 + ldr r2, _08015664 @ =gHitMarker ldr r0, [r2] ldr r1, _08015668 @ =0xfffffdff ands r0, r1 @@ -11040,7 +11040,7 @@ _0801565C: pop {r0} bx r0 .align 2, 0 -_08015664: .4byte gUnknown_2023DD0 +_08015664: .4byte gHitMarker _08015668: .4byte 0xfffffdff _0801566C: .4byte 0xfff7ffff thumb_func_end RunTurnActionsFunctions @@ -11048,7 +11048,7 @@ _0801566C: .4byte 0xfff7ffff thumb_func_start sub_8015670 sub_8015670: @ 8015670 push {r4,lr} - ldr r1, _080156A8 @ =gUnknown_2023BE3 + ldr r1, _080156A8 @ =gCurrentActionFuncId movs r0, 0 strb r0, [r1] ldr r0, _080156AC @ =gBattleTypeFlags @@ -11063,9 +11063,9 @@ sub_8015670: @ 8015670 strb r0, [r1] movs r0, 0 bl GetBattlerAtPosition - ldr r1, _080156B8 @ =sBattler_AI + ldr r1, _080156B8 @ =gBattlerAttacker strb r0, [r1] - ldr r1, _080156BC @ =gUnknown_2023D74 + ldr r1, _080156BC @ =gBattlescriptCurrInstr ldr r0, _080156C0 @ =gUnknown_81D88CC str r0, [r1] ldrb r1, [r4] @@ -11074,12 +11074,12 @@ sub_8015670: @ 8015670 strb r0, [r4] b _0801576E .align 2, 0 -_080156A8: .4byte gUnknown_2023BE3 +_080156A8: .4byte gCurrentActionFuncId _080156AC: .4byte gBattleTypeFlags _080156B0: .4byte gBattleTextBuff1 _080156B4: .4byte gBattleOutcome -_080156B8: .4byte sBattler_AI -_080156BC: .4byte gUnknown_2023D74 +_080156B8: .4byte gBattlerAttacker +_080156BC: .4byte gBattlescriptCurrInstr _080156C0: .4byte gUnknown_81D88CC _080156C4: ldr r0, _080156E0 @ =0x00080900 @@ -11090,12 +11090,12 @@ _080156C4: movs r0, 0x9B lsls r0, 1 bl PlayBGM - ldr r1, _080156E4 @ =gUnknown_2023D74 + ldr r1, _080156E4 @ =gBattlescriptCurrInstr ldr r0, _080156E8 @ =gUnknown_81D88D7 b _0801576C .align 2, 0 _080156E0: .4byte 0x00080900 -_080156E4: .4byte gUnknown_2023D74 +_080156E4: .4byte gBattlescriptCurrInstr _080156E8: .4byte gUnknown_81D88D7 _080156EC: movs r0, 0xA @@ -11103,7 +11103,7 @@ _080156EC: cmp r1, 0x8 bne _08015768 bl BattleStopLowHpSound - ldr r1, _08015720 @ =gUnknown_2023D74 + ldr r1, _08015720 @ =gBattlescriptCurrInstr ldr r0, _08015724 @ =gUnknown_81D87EF str r0, [r1] ldr r2, _08015728 @ =gTrainers @@ -11123,7 +11123,7 @@ _080156EC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08015720: .4byte gUnknown_2023D74 +_08015720: .4byte gBattlescriptCurrInstr _08015724: .4byte gUnknown_81D87EF _08015728: .4byte gTrainers _0801572C: .4byte gTrainerBattleOpponent_A @@ -11149,28 +11149,28 @@ _0801575E: bl PlayBGM b _0801576E _08015768: - ldr r1, _0801577C @ =gUnknown_2023D74 + ldr r1, _0801577C @ =gBattlescriptCurrInstr ldr r0, _08015780 @ =gUnknown_81D8803 _0801576C: str r0, [r1] _0801576E: - ldr r1, _08015784 @ =gUnknown_3004F84 + ldr r1, _08015784 @ =gBattleMainFunc ldr r0, _08015788 @ =sub_8015910 str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0801577C: .4byte gUnknown_2023D74 +_0801577C: .4byte gBattlescriptCurrInstr _08015780: .4byte gUnknown_81D8803 -_08015784: .4byte gUnknown_3004F84 +_08015784: .4byte gBattleMainFunc _08015788: .4byte sub_8015910 thumb_func_end sub_8015670 thumb_func_start sub_801578C sub_801578C: @ 801578C push {r4,lr} - ldr r1, _080157C4 @ =gUnknown_2023BE3 + ldr r1, _080157C4 @ =gCurrentActionFuncId movs r0, 0 strb r0, [r1] ldr r0, _080157C8 @ =gBattleTypeFlags @@ -11186,9 +11186,9 @@ sub_801578C: @ 801578C strb r0, [r1] movs r0, 0 bl GetBattlerAtPosition - ldr r1, _080157D4 @ =sBattler_AI + ldr r1, _080157D4 @ =gBattlerAttacker strb r0, [r1] - ldr r1, _080157D8 @ =gUnknown_2023D74 + ldr r1, _080157D8 @ =gBattlescriptCurrInstr ldr r0, _080157DC @ =gUnknown_81D88CC str r0, [r1] ldrb r1, [r4] @@ -11197,12 +11197,12 @@ sub_801578C: @ 801578C strb r0, [r4] b _08015830 .align 2, 0 -_080157C4: .4byte gUnknown_2023BE3 +_080157C4: .4byte gCurrentActionFuncId _080157C8: .4byte gBattleTypeFlags _080157CC: .4byte gBattleTextBuff1 _080157D0: .4byte gBattleOutcome -_080157D4: .4byte sBattler_AI -_080157D8: .4byte gUnknown_2023D74 +_080157D4: .4byte gBattlerAttacker +_080157D8: .4byte gBattlescriptCurrInstr _080157DC: .4byte gUnknown_81D88CC _080157E0: movs r0, 0x8 @@ -11219,55 +11219,55 @@ _080157E0: ands r1, r0 cmp r1, 0 beq _0801580C - ldr r1, _08015808 @ =gUnknown_2023E82 + ldr r1, _08015808 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08015810 .align 2, 0 -_08015808: .4byte gUnknown_2023E82 +_08015808: .4byte gBattleCommunication _0801580C: - ldr r0, _0801581C @ =gUnknown_2023E82 + ldr r0, _0801581C @ =gBattleCommunication strb r4, [r0, 0x5] _08015810: movs r0, 0x1 bl GetBattlerAtPosition - ldr r1, _08015820 @ =sBattler_AI + ldr r1, _08015820 @ =gBattlerAttacker strb r0, [r1] b _0801582A .align 2, 0 -_0801581C: .4byte gUnknown_2023E82 -_08015820: .4byte sBattler_AI +_0801581C: .4byte gBattleCommunication +_08015820: .4byte gBattlerAttacker _08015824: - ldr r1, _0801583C @ =gUnknown_2023E82 + ldr r1, _0801583C @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] _0801582A: - ldr r1, _08015840 @ =gUnknown_2023D74 + ldr r1, _08015840 @ =gBattlescriptCurrInstr ldr r0, _08015844 @ =gUnknown_81D8806 str r0, [r1] _08015830: - ldr r1, _08015848 @ =gUnknown_3004F84 + ldr r1, _08015848 @ =gBattleMainFunc ldr r0, _0801584C @ =sub_8015910 str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0801583C: .4byte gUnknown_2023E82 -_08015840: .4byte gUnknown_2023D74 +_0801583C: .4byte gBattleCommunication +_08015840: .4byte gBattlescriptCurrInstr _08015844: .4byte gUnknown_81D8806 -_08015848: .4byte gUnknown_3004F84 +_08015848: .4byte gBattleMainFunc _0801584C: .4byte sub_8015910 thumb_func_end sub_801578C thumb_func_start sub_8015850 sub_8015850: @ 8015850 push {lr} - ldr r1, _08015878 @ =gUnknown_2023BE3 + ldr r1, _08015878 @ =gCurrentActionFuncId movs r0, 0 strb r0, [r1] - ldr r1, _0801587C @ =gUnknown_2023E8C - ldr r0, _08015880 @ =sBattler_AI + ldr r1, _0801587C @ =gProtectStructs + ldr r0, _08015880 @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -11278,42 +11278,42 @@ sub_8015850: @ 8015850 beq _0801588C cmp r0, 0x2 beq _0801589C - ldr r1, _08015884 @ =gUnknown_2023D74 + ldr r1, _08015884 @ =gBattlescriptCurrInstr ldr r0, _08015888 @ =gUnknown_81D8916 b _080158A0 .align 2, 0 -_08015878: .4byte gUnknown_2023BE3 -_0801587C: .4byte gUnknown_2023E8C -_08015880: .4byte sBattler_AI -_08015884: .4byte gUnknown_2023D74 +_08015878: .4byte gCurrentActionFuncId +_0801587C: .4byte gProtectStructs +_08015880: .4byte gBattlerAttacker +_08015884: .4byte gBattlescriptCurrInstr _08015888: .4byte gUnknown_81D8916 _0801588C: - ldr r1, _08015894 @ =gUnknown_2023D74 + ldr r1, _08015894 @ =gBattlescriptCurrInstr ldr r0, _08015898 @ =gUnknown_81D8901 b _080158A0 .align 2, 0 -_08015894: .4byte gUnknown_2023D74 +_08015894: .4byte gBattlescriptCurrInstr _08015898: .4byte gUnknown_81D8901 _0801589C: - ldr r1, _080158AC @ =gUnknown_2023D74 + ldr r1, _080158AC @ =gBattlescriptCurrInstr ldr r0, _080158B0 @ =gUnknown_81D890F _080158A0: str r0, [r1] - ldr r1, _080158B4 @ =gUnknown_3004F84 + ldr r1, _080158B4 @ =gBattleMainFunc ldr r0, _080158B8 @ =sub_8015910 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080158AC: .4byte gUnknown_2023D74 +_080158AC: .4byte gBattlescriptCurrInstr _080158B0: .4byte gUnknown_81D890F -_080158B4: .4byte gUnknown_3004F84 +_080158B4: .4byte gBattleMainFunc _080158B8: .4byte sub_8015910 thumb_func_end sub_8015850 thumb_func_start sub_80158BC sub_80158BC: @ 80158BC - ldr r1, _080158F0 @ =gUnknown_2023BE3 + ldr r1, _080158F0 @ =gCurrentActionFuncId movs r0, 0 strb r0, [r1] ldr r1, _080158F4 @ =gBattleTextBuff1 @@ -11321,7 +11321,7 @@ sub_80158BC: @ 80158BC strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] - ldr r2, _080158F8 @ =sBattler_AI + ldr r2, _080158F8 @ =gBattlerAttacker ldrb r0, [r2] strb r0, [r1, 0x2] ldr r3, _080158FC @ =gBattlerPartyIndexes @@ -11332,28 +11332,28 @@ sub_80158BC: @ 80158BC strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08015900 @ =gUnknown_2023D74 + ldr r1, _08015900 @ =gBattlescriptCurrInstr ldr r0, _08015904 @ =gUnknown_81D891D str r0, [r1] - ldr r1, _08015908 @ =gUnknown_3004F84 + ldr r1, _08015908 @ =gBattleMainFunc ldr r0, _0801590C @ =sub_8015910 str r0, [r1] bx lr .align 2, 0 -_080158F0: .4byte gUnknown_2023BE3 +_080158F0: .4byte gCurrentActionFuncId _080158F4: .4byte gBattleTextBuff1 -_080158F8: .4byte sBattler_AI +_080158F8: .4byte gBattlerAttacker _080158FC: .4byte gBattlerPartyIndexes -_08015900: .4byte gUnknown_2023D74 +_08015900: .4byte gBattlescriptCurrInstr _08015904: .4byte gUnknown_81D891D -_08015908: .4byte gUnknown_3004F84 +_08015908: .4byte gBattleMainFunc _0801590C: .4byte sub_8015910 thumb_func_end sub_80158BC thumb_func_start sub_8015910 sub_8015910: @ 8015910 push {r4-r7,lr} - ldr r0, _08015974 @ =gUnknown_2023BE3 + ldr r0, _08015974 @ =gCurrentActionFuncId ldrb r0, [r0] subs r0, 0xB lsls r0, 24 @@ -11401,7 +11401,7 @@ _08015942: bl StringCopy b _080159AA .align 2, 0 -_08015974: .4byte gUnknown_2023BE3 +_08015974: .4byte gCurrentActionFuncId _08015978: .4byte gBattleTypeFlags _0801597C: .4byte 0x00080b92 _08015980: .4byte gActiveBattler @@ -11445,27 +11445,27 @@ _080159D0: bl BeginFastPaletteFade movs r0, 0x5 bl FadeOutMapMusic - ldr r1, _080159F4 @ =gUnknown_3004F84 + ldr r1, _080159F4 @ =gBattleMainFunc ldr r0, _080159F8 @ =sub_8015A30 str r0, [r1] ldr r1, _080159FC @ =gUnknown_300537C - ldr r0, _08015A00 @ =sub_8011100 + ldr r0, _08015A00 @ =BattleMainCB2 str r0, [r1] b _08015A1E .align 2, 0 _080159EC: .4byte gBattlersCount _080159F0: .4byte gBattleTypeFlags -_080159F4: .4byte gUnknown_3004F84 +_080159F4: .4byte gBattleMainFunc _080159F8: .4byte sub_8015A30 _080159FC: .4byte gUnknown_300537C -_08015A00: .4byte sub_8011100 +_08015A00: .4byte BattleMainCB2 _08015A04: - ldr r0, _08015A24 @ =gUnknown_2023BC8 + ldr r0, _08015A24 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _08015A1E - ldr r1, _08015A28 @ =gUnknown_825011C - ldr r0, _08015A2C @ =gUnknown_2023D74 + ldr r1, _08015A28 @ =gBattleScriptingCommandsTable + ldr r0, _08015A2C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -11477,9 +11477,9 @@ _08015A1E: pop {r0} bx r0 .align 2, 0 -_08015A24: .4byte gUnknown_2023BC8 -_08015A28: .4byte gUnknown_825011C -_08015A2C: .4byte gUnknown_2023D74 +_08015A24: .4byte gBattleControllerExecFlags +_08015A28: .4byte gBattleScriptingCommandsTable +_08015A2C: .4byte gBattlescriptCurrInstr thumb_func_end sub_8015910 thumb_func_start sub_8015A30 @@ -11501,17 +11501,17 @@ sub_8015A30: @ 8015A30 cmp r0, 0x1 beq _08015A6C _08015A52: - ldr r1, _08015A64 @ =gUnknown_3004F84 + ldr r1, _08015A64 @ =gBattleMainFunc ldr r0, _08015A68 @ =ReturnFromBattleToOverworld b _08015A70 .align 2, 0 _08015A58: .4byte gPaletteFade _08015A5C: .4byte gUnknown_3004FD4 _08015A60: .4byte gBattleOutcome -_08015A64: .4byte gUnknown_3004F84 +_08015A64: .4byte gBattleMainFunc _08015A68: .4byte ReturnFromBattleToOverworld _08015A6C: - ldr r1, _08015A94 @ =gUnknown_3004F84 + ldr r1, _08015A94 @ =gBattleMainFunc ldr r0, _08015A98 @ =sub_8015AA0 _08015A70: str r0, [r1] @@ -11524,12 +11524,12 @@ _08015A70: bne _08015A8E bl FreeMonSpritesGfx bl FreeBattleSpritesData - bl sub_802E138 + bl FreeBattleResources _08015A8E: pop {r0} bx r0 .align 2, 0 -_08015A94: .4byte gUnknown_3004F84 +_08015A94: .4byte gBattleMainFunc _08015A98: .4byte sub_8015AA0 _08015A9C: .4byte gBattleTypeFlags thumb_func_end sub_8015A30 @@ -11568,7 +11568,7 @@ _08015AAE: lsrs r2, r0, 16 cmp r2, 0 beq _08015B08 - ldr r0, _08015B00 @ =gUnknown_3004F84 + ldr r0, _08015B00 @ =gBattleMainFunc ldr r1, _08015B04 @ =sub_8015B30 str r1, [r0] lsls r3, r5, 24 @@ -11582,7 +11582,7 @@ _08015AAE: _08015AF4: .4byte gUnknown_3004FD4 _08015AF8: .4byte gBitTable _08015AFC: .4byte gPlayerParty -_08015B00: .4byte gUnknown_3004F84 +_08015B00: .4byte gBattleMainFunc _08015B04: .4byte sub_8015B30 _08015B08: adds r5, 0x1 @@ -11593,7 +11593,7 @@ _08015B08: cmp r0, 0 bne _08015AAC _08015B16: - ldr r1, _08015B28 @ =gUnknown_3004F84 + ldr r1, _08015B28 @ =gBattleMainFunc ldr r0, _08015B2C @ =ReturnFromBattleToOverworld str r0, [r1] _08015B1C: @@ -11602,7 +11602,7 @@ _08015B1C: bx r0 .align 2, 0 _08015B24: .4byte gUnknown_3004FD4 -_08015B28: .4byte gUnknown_3004F84 +_08015B28: .4byte gBattleMainFunc _08015B2C: .4byte ReturnFromBattleToOverworld thumb_func_end sub_8015AA0 @@ -11611,10 +11611,10 @@ sub_8015B30: @ 8015B30 push {lr} ldr r0, _08015B48 @ =gMain ldr r1, [r0, 0x4] - ldr r0, _08015B4C @ =sub_8011100 + ldr r0, _08015B4C @ =BattleMainCB2 cmp r1, r0 bne _08015B42 - ldr r1, _08015B50 @ =gUnknown_3004F84 + ldr r1, _08015B50 @ =gBattleMainFunc ldr r0, _08015B54 @ =sub_8015AA0 str r0, [r1] _08015B42: @@ -11622,8 +11622,8 @@ _08015B42: bx r0 .align 2, 0 _08015B48: .4byte gMain -_08015B4C: .4byte sub_8011100 -_08015B50: .4byte gUnknown_3004F84 +_08015B4C: .4byte BattleMainCB2 +_08015B50: .4byte gBattleMainFunc _08015B54: .4byte sub_8015AA0 thumb_func_end sub_8015B30 @@ -11664,7 +11664,7 @@ _08015B86: negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _08015BF8 @ =gUnknown_3004F80 + ldr r0, _08015BF8 @ =gPreBattleCallback1 ldr r0, [r0] str r0, [r3] movs r0, 0x80 @@ -11701,14 +11701,14 @@ _08015BE8: .4byte gSpecialVar_Result _08015BEC: .4byte gBattleOutcome _08015BF0: .4byte gMain _08015BF4: .4byte 0x00000439 -_08015BF8: .4byte gUnknown_3004F80 +_08015BF8: .4byte gPreBattleCallback1 _08015BFC: .4byte gEnemyParty thumb_func_end ReturnFromBattleToOverworld thumb_func_start RunBattleScriptCommands_PopCallbacksStack RunBattleScriptCommands_PopCallbacksStack: @ 8015C00 push {lr} - ldr r0, _08015C3C @ =gUnknown_2023BE3 + ldr r0, _08015C3C @ =gCurrentActionFuncId ldrb r0, [r0] subs r0, 0xB lsls r0, 24 @@ -11726,7 +11726,7 @@ RunBattleScriptCommands_PopCallbacksStack: @ 8015C00 subs r0, 0x1 strb r0, [r1] _08015C24: - ldr r2, _08015C44 @ =gUnknown_3004F84 + ldr r2, _08015C44 @ =gBattleMainFunc ldr r0, [r3] ldr r1, [r0, 0xC] adds r0, r1, 0 @@ -11738,16 +11738,16 @@ _08015C24: str r0, [r2] b _08015C62 .align 2, 0 -_08015C3C: .4byte gUnknown_2023BE3 +_08015C3C: .4byte gCurrentActionFuncId _08015C40: .4byte gBattleResources -_08015C44: .4byte gUnknown_3004F84 +_08015C44: .4byte gBattleMainFunc _08015C48: - ldr r0, _08015C68 @ =gUnknown_2023BC8 + ldr r0, _08015C68 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _08015C62 - ldr r1, _08015C6C @ =gUnknown_825011C - ldr r0, _08015C70 @ =gUnknown_2023D74 + ldr r1, _08015C6C @ =gBattleScriptingCommandsTable + ldr r0, _08015C70 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -11758,20 +11758,20 @@ _08015C62: pop {r0} bx r0 .align 2, 0 -_08015C68: .4byte gUnknown_2023BC8 -_08015C6C: .4byte gUnknown_825011C -_08015C70: .4byte gUnknown_2023D74 +_08015C68: .4byte gBattleControllerExecFlags +_08015C6C: .4byte gBattleScriptingCommandsTable +_08015C70: .4byte gBattlescriptCurrInstr thumb_func_end RunBattleScriptCommands_PopCallbacksStack - thumb_func_start sub_8015C74 -sub_8015C74: @ 8015C74 + thumb_func_start RunBattleScriptCommands +RunBattleScriptCommands: @ 8015C74 push {lr} - ldr r0, _08015C94 @ =gUnknown_2023BC8 + ldr r0, _08015C94 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _08015C90 - ldr r1, _08015C98 @ =gUnknown_825011C - ldr r0, _08015C9C @ =gUnknown_2023D74 + ldr r1, _08015C98 @ =gBattleScriptingCommandsTable + ldr r0, _08015C9C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -11782,10 +11782,10 @@ _08015C90: pop {r0} bx r0 .align 2, 0 -_08015C94: .4byte gUnknown_2023BC8 -_08015C98: .4byte gUnknown_825011C -_08015C9C: .4byte gUnknown_2023D74 - thumb_func_end sub_8015C74 +_08015C94: .4byte gBattleControllerExecFlags +_08015C98: .4byte gBattleScriptingCommandsTable +_08015C9C: .4byte gBattlescriptCurrInstr + thumb_func_end RunBattleScriptCommands thumb_func_start sub_8015CA0 sub_8015CA0: @ 8015CA0 @@ -11797,8 +11797,8 @@ sub_8015CA0: @ 8015CA0 sub sp, 0x8 movs r0, 0x4 str r0, [sp] - ldr r6, _08015CE0 @ =sBattler_AI - ldr r1, _08015CE4 @ =gUnknown_2023BDE + ldr r6, _08015CE0 @ =gBattlerAttacker + ldr r1, _08015CE4 @ =gBattlerByTurnOrder ldr r0, _08015CE8 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -11817,16 +11817,16 @@ sub_8015CA0: @ 8015CA0 ands r2, r0 cmp r2, 0 beq _08015CF8 - ldr r1, _08015CF4 @ =gUnknown_2023BE3 + ldr r1, _08015CF4 @ =gCurrentActionFuncId movs r0, 0xC b _0801634C .align 2, 0 -_08015CE0: .4byte sBattler_AI -_08015CE4: .4byte gUnknown_2023BDE +_08015CE0: .4byte gBattlerAttacker +_08015CE4: .4byte gBattlerByTurnOrder _08015CE8: .4byte gUnknown_2023BE2 _08015CEC: .4byte gBattleStruct _08015CF0: .4byte gBitTable -_08015CF4: .4byte gUnknown_2023BE3 +_08015CF4: .4byte gCurrentActionFuncId _08015CF8: ldr r1, _08015D6C @ =gCritMultiplier movs r0, 0x1 @@ -11841,10 +11841,10 @@ _08015CF8: strb r2, [r0] ldr r0, _08015D78 @ =gUnknown_2023D72 strb r2, [r0] - ldr r0, _08015D7C @ =gUnknown_2023E82 + ldr r0, _08015D7C @ =gBattleCommunication strb r2, [r0, 0x6] - ldr r2, _08015D80 @ =gUnknown_2023D48 - ldr r3, _08015D84 @ =gUnknown_2023D49 + ldr r2, _08015D80 @ =gCurrMovePos + ldr r3, _08015D84 @ =gChosenMovePos mov r9, r3 ldrb r0, [r6] ldr r4, _08015D88 @ =gBattleStruct @@ -11854,7 +11854,7 @@ _08015CF8: ldrb r0, [r0] strb r0, [r3] strb r0, [r2] - ldr r1, _08015D8C @ =gUnknown_2023E8C + ldr r1, _08015D8C @ =gProtectStructs ldrb r4, [r6] lsls r0, r4, 4 adds r3, r0, r1 @@ -11868,11 +11868,11 @@ _08015CF8: ands r0, r1 strb r0, [r3] ldr r2, _08015D90 @ =gCurrentMove - ldr r1, _08015D94 @ =gUnknown_2023D4C + ldr r1, _08015D94 @ =gChosenMove movs r0, 0xA5 strh r0, [r1] strh r0, [r2] - ldr r2, _08015D98 @ =gUnknown_2023DD0 + ldr r2, _08015D98 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 4 @@ -11890,14 +11890,14 @@ _08015D6C: .4byte gCritMultiplier _08015D70: .4byte gBattleScripting _08015D74: .4byte gMoveResultFlags _08015D78: .4byte gUnknown_2023D72 -_08015D7C: .4byte gUnknown_2023E82 -_08015D80: .4byte gUnknown_2023D48 -_08015D84: .4byte gUnknown_2023D49 +_08015D7C: .4byte gBattleCommunication +_08015D80: .4byte gCurrMovePos +_08015D84: .4byte gChosenMovePos _08015D88: .4byte gBattleStruct -_08015D8C: .4byte gUnknown_2023E8C +_08015D8C: .4byte gProtectStructs _08015D90: .4byte gCurrentMove -_08015D94: .4byte gUnknown_2023D4C -_08015D98: .4byte gUnknown_2023DD0 +_08015D94: .4byte gChosenMove +_08015D98: .4byte gHitMarker _08015D9C: ldr r0, _08015DD4 @ =gBattleMons movs r1, 0x58 @@ -11920,7 +11920,7 @@ _08015D9C: beq _08015DE4 _08015DC2: ldr r3, _08015DD8 @ =gCurrentMove - ldr r2, _08015DDC @ =gUnknown_2023D4C + ldr r2, _08015DDC @ =gChosenMove ldr r1, _08015DE0 @ =gUnknown_2023DB8 lsls r0, r4, 1 adds r0, r1 @@ -11931,7 +11931,7 @@ _08015DC2: .align 2, 0 _08015DD4: .4byte gBattleMons _08015DD8: .4byte gCurrentMove -_08015DDC: .4byte gUnknown_2023D4C +_08015DDC: .4byte gChosenMove _08015DE0: .4byte gUnknown_2023DB8 _08015DE4: ldr r3, _08015E38 @ =gDisableStructs @@ -11954,7 +11954,7 @@ _08015DE4: cmp r2, r1 bne _08015E48 ldr r2, _08015E3C @ =gCurrentMove - ldr r0, _08015E40 @ =gUnknown_2023D4C + ldr r0, _08015E40 @ =gChosenMove strh r4, [r0] strh r4, [r2] ldrb r1, [r6] @@ -11977,7 +11977,7 @@ _08015DE4: .align 2, 0 _08015E38: .4byte gDisableStructs _08015E3C: .4byte gCurrentMove -_08015E40: .4byte gUnknown_2023D4C +_08015E40: .4byte gChosenMove _08015E44: .4byte gBattleStruct _08015E48: cmp r2, 0 @@ -11989,7 +11989,7 @@ _08015E48: mov r0, r8 strb r3, [r0] ldr r3, _08015EB0 @ =gCurrentMove - ldr r2, _08015EB4 @ =gUnknown_2023D4C + ldr r2, _08015EB4 @ =gChosenMove ldrb r0, [r0] lsls r0, 1 ldrb r1, [r6] @@ -12032,13 +12032,13 @@ _08015E48: b _08015EF6 .align 2, 0 _08015EB0: .4byte gCurrentMove -_08015EB4: .4byte gUnknown_2023D4C +_08015EB4: .4byte gChosenMove _08015EB8: .4byte gBattleStruct _08015EBC: mov r4, r8 ldrb r0, [r4] lsls r0, 1 - ldr r4, _08015EFC @ =sBattler_AI + ldr r4, _08015EFC @ =gBattlerAttacker ldrb r2, [r4] movs r1, 0x58 muls r1, r2 @@ -12046,7 +12046,7 @@ _08015EBC: mov r1, r10 adds r1, 0xC adds r0, r1 - ldr r1, _08015F00 @ =gUnknown_2023DC4 + ldr r1, _08015F00 @ =gChosenMoveByBattler lsls r2, 1 adds r2, r1 ldrh r3, [r0] @@ -12054,7 +12054,7 @@ _08015EBC: cmp r3, r2 beq _08015F10 ldr r1, _08015F04 @ =gCurrentMove - ldr r0, _08015F08 @ =gUnknown_2023D4C + ldr r0, _08015F08 @ =gChosenMove strh r3, [r0] strh r3, [r1] ldrh r0, [r1] @@ -12068,18 +12068,18 @@ _08015EF6: strb r0, [r1, 0xC] b _08015F18 .align 2, 0 -_08015EFC: .4byte sBattler_AI -_08015F00: .4byte gUnknown_2023DC4 +_08015EFC: .4byte gBattlerAttacker +_08015F00: .4byte gChosenMoveByBattler _08015F04: .4byte gCurrentMove -_08015F08: .4byte gUnknown_2023D4C +_08015F08: .4byte gChosenMove _08015F0C: .4byte gBattleStruct _08015F10: ldr r1, _08015F30 @ =gCurrentMove - ldr r0, _08015F34 @ =gUnknown_2023D4C + ldr r0, _08015F34 @ =gChosenMove strh r3, [r0] strh r3, [r1] _08015F18: - ldr r0, _08015F38 @ =sBattler_AI + ldr r0, _08015F38 @ =gBattlerAttacker ldrb r0, [r0] bl GetBattlerSide lsls r0, 24 @@ -12092,8 +12092,8 @@ _08015F18: b _08015F48 .align 2, 0 _08015F30: .4byte gCurrentMove -_08015F34: .4byte gUnknown_2023D4C -_08015F38: .4byte sBattler_AI +_08015F34: .4byte gChosenMove +_08015F38: .4byte gBattlerAttacker _08015F3C: .4byte gBattleResults _08015F40: ldr r0, _08015FAC @ =gBattleResults @@ -12101,7 +12101,7 @@ _08015F40: ldrh r1, [r1] strh r1, [r0, 0x24] _08015F48: - ldr r4, _08015FB4 @ =sBattler_AI + ldr r4, _08015FB4 @ =gBattlerAttacker ldrb r0, [r4] bl GetBattlerSide movs r1, 0x1 @@ -12150,7 +12150,7 @@ _08015F48: .align 2, 0 _08015FAC: .4byte gBattleResults _08015FB0: .4byte gCurrentMove -_08015FB4: .4byte sBattler_AI +_08015FB4: .4byte gBattlerAttacker _08015FB8: .4byte gSideTimers _08015FBC: .4byte gBattleMoves _08015FC0: .4byte gBattleMons @@ -12160,7 +12160,7 @@ _08015FC8: ldr r1, [r2] movs r0, 0x1 ands r1, r0 - ldr r3, _080160E8 @ =sBattler_AI + ldr r3, _080160E8 @ =gBattlerAttacker adds r7, r2, 0 cmp r1, 0 bne _08015FDA @@ -12192,7 +12192,7 @@ _08015FEC: b _080161F8 _08016008: ldr r3, _080160F8 @ =gBattleMons - ldr r2, _080160E8 @ =sBattler_AI + ldr r2, _080160E8 @ =gBattlerAttacker ldrb r6, [r2] ldr r0, _080160FC @ =gBattleStruct ldr r0, [r0] @@ -12231,7 +12231,7 @@ _08016048: lsrs r0, 24 cmp r6, r0 beq _08016096 - ldr r0, _080160E8 @ =sBattler_AI + ldr r0, _080160E8 @ =gBattlerAttacker ldrb r1, [r0] ldr r0, _080160FC @ =gBattleStruct ldr r0, [r0] @@ -12278,7 +12278,7 @@ _080160A8: b _080161AA _080160B0: ldr r2, _080160F0 @ =gBattleMoves - ldr r0, _08016108 @ =gUnknown_2023D4C + ldr r0, _08016108 @ =gChosenMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -12288,7 +12288,7 @@ _080160B0: ands r4, r0 cmp r4, 0 beq _08016130 - ldr r0, _080160E8 @ =sBattler_AI + ldr r0, _080160E8 @ =gBattlerAttacker ldrb r0, [r0] bl GetBattlerSide lsls r0, 24 @@ -12303,7 +12303,7 @@ _080160B0: b _08016122 .align 2, 0 _080160E4: .4byte gBattleTypeFlags -_080160E8: .4byte sBattler_AI +_080160E8: .4byte gBattlerAttacker _080160EC: .4byte gSideTimers _080160F0: .4byte gBattleMoves _080160F4: .4byte gCurrentMove @@ -12311,7 +12311,7 @@ _080160F8: .4byte gBattleMons _080160FC: .4byte gBattleStruct _08016100: .4byte gActiveBattler _08016104: .4byte gBattlersCount -_08016108: .4byte gUnknown_2023D4C +_08016108: .4byte gChosenMove _0801610C: movs r0, 0x3 b _08016122 @@ -12334,7 +12334,7 @@ _08016122: _0801612C: .4byte gBattlerTarget _08016130: ldr r2, _08016178 @ =gBattlerTarget - ldr r0, _0801617C @ =sBattler_AI + ldr r0, _0801617C @ =gBattlerAttacker ldrb r0, [r0] ldr r1, _08016180 @ =gBattleStruct ldr r1, [r1] @@ -12356,7 +12356,7 @@ _08016140: bne _0801615A b _0801632C _0801615A: - ldr r6, _0801617C @ =sBattler_AI + ldr r6, _0801617C @ =gBattlerAttacker ldrb r0, [r6] bl GetBattlerSide adds r4, r0, 0 @@ -12370,7 +12370,7 @@ _0801615A: b _0801631A .align 2, 0 _08016178: .4byte gBattlerTarget -_0801617C: .4byte sBattler_AI +_0801617C: .4byte gBattlerAttacker _08016180: .4byte gBattleStruct _08016184: .4byte gAbsentBattlerFlags _08016188: .4byte gBitTable @@ -12390,7 +12390,7 @@ _0801618C: b _08016310 _080161AA: ldr r4, _080161E4 @ =gActiveBattler - ldr r0, _080161E8 @ =gUnknown_2023BDE + ldr r0, _080161E8 @ =gBattlerByTurnOrder ldr r3, [sp] adds r0, r3, r0 ldrb r0, [r0] @@ -12402,8 +12402,8 @@ _080161AA: adds r1, r2 adds r1, 0x20 ldrb r1, [r1] - bl sub_80C71D0 - ldr r2, _080161F0 @ =gUnknown_2023ECC + bl RecordAbilityBattle + ldr r2, _080161F0 @ =gSpecialStatuses ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -12419,9 +12419,9 @@ _080161AA: b _0801632C .align 2, 0 _080161E4: .4byte gActiveBattler -_080161E8: .4byte gUnknown_2023BDE +_080161E8: .4byte gBattlerByTurnOrder _080161EC: .4byte gBattleMons -_080161F0: .4byte gUnknown_2023ECC +_080161F0: .4byte gSpecialStatuses _080161F4: .4byte gBattlerTarget _080161F8: ldr r0, [r7] @@ -12430,7 +12430,7 @@ _080161F8: cmp r0, 0 beq _080162A0 ldr r2, _08016238 @ =gBattleMoves - ldr r0, _0801623C @ =gUnknown_2023D4C + ldr r0, _0801623C @ =gChosenMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -12455,7 +12455,7 @@ _080161F8: b _08016256 .align 2, 0 _08016238: .4byte gBattleMoves -_0801623C: .4byte gUnknown_2023D4C +_0801623C: .4byte gChosenMove _08016240: movs r0, 0x3 b _08016256 @@ -12484,7 +12484,7 @@ _08016256: ands r1, r0 cmp r1, 0 beq _0801632C - ldr r0, _0801629C @ =sBattler_AI + ldr r0, _0801629C @ =gBattlerAttacker ldrb r0, [r0] bl GetBattlerSide adds r4, r0, 0 @@ -12500,7 +12500,7 @@ _08016256: _08016290: .4byte gBattlerTarget _08016294: .4byte gAbsentBattlerFlags _08016298: .4byte gBitTable -_0801629C: .4byte sBattler_AI +_0801629C: .4byte gBattlerAttacker _080162A0: ldr r5, _080162E4 @ =gBattlerTarget adds r2, r3, 0 @@ -12566,7 +12566,7 @@ _0801631A: bl GetBattlerAtPosition strb r0, [r5] _0801632C: - ldr r4, _08016360 @ =gUnknown_2023D74 + ldr r4, _08016360 @ =gBattlescriptCurrInstr ldr r3, _08016364 @ =gUnknown_81D65A8 ldr r2, _08016368 @ =gBattleMoves ldr r0, _0801636C @ =gCurrentMove @@ -12580,7 +12580,7 @@ _0801632C: adds r0, r3 ldr r0, [r0] str r0, [r4] - ldr r1, _08016370 @ =gUnknown_2023BE3 + ldr r1, _08016370 @ =gCurrentActionFuncId movs r0, 0xA _0801634C: strb r0, [r1] @@ -12593,18 +12593,18 @@ _0801634C: pop {r0} bx r0 .align 2, 0 -_08016360: .4byte gUnknown_2023D74 +_08016360: .4byte gBattlescriptCurrInstr _08016364: .4byte gUnknown_81D65A8 _08016368: .4byte gBattleMoves _0801636C: .4byte gCurrentMove -_08016370: .4byte gUnknown_2023BE3 +_08016370: .4byte gCurrentActionFuncId thumb_func_end sub_8015CA0 thumb_func_start sub_8016374 sub_8016374: @ 8016374 push {r4,lr} - ldr r3, _080163E0 @ =sBattler_AI - ldr r1, _080163E4 @ =gUnknown_2023BDE + ldr r3, _080163E0 @ =gBattlerAttacker + ldr r1, _080163E4 @ =gBattlerByTurnOrder ldr r0, _080163E8 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -12615,11 +12615,11 @@ sub_8016374: @ 8016374 strh r2, [r0] ldr r0, _080163F0 @ =gBattle_BG0_Y strh r2, [r0] - ldr r1, _080163F4 @ =gUnknown_2023FF8 + ldr r1, _080163F4 @ =gActionSelectionCursor ldrb r0, [r3] adds r0, r1 strb r2, [r0] - ldr r1, _080163F8 @ =gUnknown_2023FFC + ldr r1, _080163F8 @ =gMoveSelectionCursor ldrb r0, [r3] adds r0, r1 strb r2, [r0] @@ -12641,10 +12641,10 @@ sub_8016374: @ 8016374 strb r0, [r2, 0x4] ldr r0, _08016404 @ =gBattleScripting strb r4, [r0, 0x17] - ldr r1, _08016408 @ =gUnknown_2023D74 + ldr r1, _08016408 @ =gBattlescriptCurrInstr ldr r0, _0801640C @ =gUnknown_81D894D str r0, [r1] - ldr r1, _08016410 @ =gUnknown_2023BE3 + ldr r1, _08016410 @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] ldr r1, _08016414 @ =gBattleResults @@ -12658,19 +12658,19 @@ _080163DA: pop {r0} bx r0 .align 2, 0 -_080163E0: .4byte sBattler_AI -_080163E4: .4byte gUnknown_2023BDE +_080163E0: .4byte gBattlerAttacker +_080163E4: .4byte gBattlerByTurnOrder _080163E8: .4byte gUnknown_2023BE2 _080163EC: .4byte gBattle_BG0_X _080163F0: .4byte gBattle_BG0_Y -_080163F4: .4byte gUnknown_2023FF8 -_080163F8: .4byte gUnknown_2023FFC +_080163F4: .4byte gActionSelectionCursor +_080163F8: .4byte gMoveSelectionCursor _080163FC: .4byte gBattleTextBuff1 _08016400: .4byte gBattleStruct _08016404: .4byte gBattleScripting -_08016408: .4byte gUnknown_2023D74 +_08016408: .4byte gBattlescriptCurrInstr _0801640C: .4byte gUnknown_81D894D -_08016410: .4byte gUnknown_2023BE3 +_08016410: .4byte gCurrentActionFuncId _08016414: .4byte gBattleResults thumb_func_end sub_8016374 @@ -12681,9 +12681,9 @@ sub_8016418: @ 8016418 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _08016474 @ =sBattler_AI + ldr r4, _08016474 @ =gBattlerAttacker ldr r2, _08016478 @ =gBattlerTarget - ldr r1, _0801647C @ =gUnknown_2023BDE + ldr r1, _0801647C @ =gBattlerByTurnOrder ldr r0, _08016480 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -12697,8 +12697,8 @@ sub_8016418: @ 8016418 strh r1, [r0] ldrb r0, [r4] bl ClearFuryCutterDestinyBondGrudge - ldr r5, _0801648C @ =gUnknown_2023D68 - ldr r2, _08016490 @ =gUnknown_20233C4 + ldr r5, _0801648C @ =gLastUsedItem + ldr r2, _08016490 @ =gBattleBufferB ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -12713,7 +12713,7 @@ sub_8016418: @ 8016418 adds r1, r3, 0 cmp r1, 0xC bhi _0801649C - ldr r2, _08016494 @ =gUnknown_2023D74 + ldr r2, _08016494 @ =gBattlescriptCurrInstr ldr r1, _08016498 @ =gUnknown_81D99B0 ldrh r0, [r5] lsls r0, 2 @@ -12722,15 +12722,15 @@ sub_8016418: @ 8016418 str r0, [r2] b _080164FC .align 2, 0 -_08016474: .4byte sBattler_AI +_08016474: .4byte gBattlerAttacker _08016478: .4byte gBattlerTarget -_0801647C: .4byte gUnknown_2023BDE +_0801647C: .4byte gBattlerByTurnOrder _08016480: .4byte gUnknown_2023BE2 _08016484: .4byte gBattle_BG0_X _08016488: .4byte gBattle_BG0_Y -_0801648C: .4byte gUnknown_2023D68 -_08016490: .4byte gUnknown_20233C4 -_08016494: .4byte gUnknown_2023D74 +_0801648C: .4byte gLastUsedItem +_08016490: .4byte gBattleBufferB +_08016494: .4byte gBattlescriptCurrInstr _08016498: .4byte gUnknown_81D99B0 _0801649C: adds r0, r3, 0 @@ -12739,51 +12739,51 @@ _0801649C: lsrs r0, 16 cmp r0, 0x1 bhi _080164C4 - ldr r0, _080164B8 @ =gUnknown_2023D74 + ldr r0, _080164B8 @ =gBattlescriptCurrInstr ldr r1, _080164BC @ =gUnknown_81D99FC ldr r1, [r1] str r1, [r0] - ldr r1, _080164C0 @ =gUnknown_2023BE3 + ldr r1, _080164C0 @ =gCurrentActionFuncId mov r10, r1 b _0801671E .align 2, 0 -_080164B8: .4byte gUnknown_2023D74 +_080164B8: .4byte gBattlescriptCurrInstr _080164BC: .4byte gUnknown_81D99FC -_080164C0: .4byte gUnknown_2023BE3 +_080164C0: .4byte gCurrentActionFuncId _080164C4: movs r0, 0xAF lsls r0, 1 cmp r1, r0 bne _080164E8 - ldr r0, _080164DC @ =gUnknown_2023D74 + ldr r0, _080164DC @ =gBattlescriptCurrInstr ldr r1, _080164E0 @ =gUnknown_81D99FC ldr r1, [r1, 0x4] str r1, [r0] - ldr r2, _080164E4 @ =gUnknown_2023BE3 + ldr r2, _080164E4 @ =gCurrentActionFuncId mov r10, r2 b _0801671E .align 2, 0 -_080164DC: .4byte gUnknown_2023D74 +_080164DC: .4byte gBattlescriptCurrInstr _080164E0: .4byte gUnknown_81D99FC -_080164E4: .4byte gUnknown_2023BE3 +_080164E4: .4byte gCurrentActionFuncId _080164E8: ldrb r0, [r4] bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _08016510 - ldr r0, _08016504 @ =gUnknown_2023D74 + ldr r0, _08016504 @ =gBattlescriptCurrInstr ldr r1, _08016508 @ =gUnknown_81D99E4 ldr r1, [r1] str r1, [r0] _080164FC: - ldr r0, _0801650C @ =gUnknown_2023BE3 + ldr r0, _0801650C @ =gCurrentActionFuncId mov r10, r0 b _0801671E .align 2, 0 -_08016504: .4byte gUnknown_2023D74 +_08016504: .4byte gBattlescriptCurrInstr _08016508: .4byte gUnknown_81D99E4 -_0801650C: .4byte gUnknown_2023BE3 +_0801650C: .4byte gCurrentActionFuncId _08016510: ldr r3, _08016548 @ =gBattleScripting ldrb r0, [r4] @@ -12797,12 +12797,12 @@ _08016510: ldrb r0, [r0] subs r0, 0x1 mov r8, r4 - ldr r1, _08016550 @ =gUnknown_2023D74 + ldr r1, _08016550 @ =gBattlescriptCurrInstr mov r9, r1 ldr r6, _08016554 @ =gUnknown_81D99E4 mov r12, r3 adds r7, r2, 0 - ldr r2, _08016558 @ =gUnknown_2023BE3 + ldr r2, _08016558 @ =gCurrentActionFuncId mov r10, r2 cmp r0, 0x4 bls _0801653C @@ -12816,9 +12816,9 @@ _0801653C: .align 2, 0 _08016548: .4byte gBattleScripting _0801654C: .4byte gBattleStruct -_08016550: .4byte gUnknown_2023D74 +_08016550: .4byte gBattlescriptCurrInstr _08016554: .4byte gUnknown_81D99E4 -_08016558: .4byte gUnknown_2023BE3 +_08016558: .4byte gCurrentActionFuncId _0801655C: .4byte _08016560 .align 2, 0 _08016560: @@ -12828,10 +12828,10 @@ _08016560: .4byte _08016608 .4byte _080166D8 _08016574: - ldr r5, _080165AC @ =gUnknown_2023E82 + ldr r5, _080165AC @ =gBattleCommunication movs r0, 0 strb r0, [r5, 0x5] - ldr r2, _080165B0 @ =sBattler_AI + ldr r2, _080165B0 @ =gBattlerAttacker ldrb r0, [r2] lsrs r0, 1 ldr r1, [r7] @@ -12845,10 +12845,10 @@ _08016574: beq _080165C0 movs r0, 0x3E ands r0, r1 - ldr r1, _080165B4 @ =gUnknown_2023D74 + ldr r1, _080165B4 @ =gBattlescriptCurrInstr mov r9, r1 ldr r6, _080165B8 @ =gUnknown_81D99E4 - ldr r2, _080165BC @ =gUnknown_2023BE3 + ldr r2, _080165BC @ =gCurrentActionFuncId mov r10, r2 cmp r0, 0 bne _080165A6 @@ -12858,16 +12858,16 @@ _080165A6: strb r0, [r5, 0x5] b _08016706 .align 2, 0 -_080165AC: .4byte gUnknown_2023E82 -_080165B0: .4byte sBattler_AI -_080165B4: .4byte gUnknown_2023D74 +_080165AC: .4byte gBattleCommunication +_080165B0: .4byte gBattlerAttacker +_080165B4: .4byte gBattlescriptCurrInstr _080165B8: .4byte gUnknown_81D99E4 -_080165BC: .4byte gUnknown_2023BE3 +_080165BC: .4byte gCurrentActionFuncId _080165C0: - ldr r0, _080165FC @ =gUnknown_2023D74 + ldr r0, _080165FC @ =gBattlescriptCurrInstr mov r9, r0 ldr r6, _08016600 @ =gUnknown_81D99E4 - ldr r1, _08016604 @ =gUnknown_2023BE3 + ldr r1, _08016604 @ =gCurrentActionFuncId mov r10, r1 mov r4, r8 adds r3, r7, 0 @@ -12896,14 +12896,14 @@ _080165D0: beq _080165D0 b _08016706 .align 2, 0 -_080165FC: .4byte gUnknown_2023D74 +_080165FC: .4byte gBattlescriptCurrInstr _08016600: .4byte gUnknown_81D99E4 -_08016604: .4byte gUnknown_2023BE3 +_08016604: .4byte gCurrentActionFuncId _08016608: - ldr r3, _0801663C @ =gUnknown_2023E82 + ldr r3, _0801663C @ =gBattleCommunication movs r0, 0x4 strb r0, [r3, 0x5] - ldr r2, _08016640 @ =sBattler_AI + ldr r2, _08016640 @ =gBattlerAttacker ldrb r0, [r2] lsrs r0, 1 ldr r1, [r7] @@ -12920,18 +12920,18 @@ _08016608: beq _08016650 movs r0, 0x5 strb r0, [r3, 0x5] - ldr r2, _08016644 @ =gUnknown_2023D74 + ldr r2, _08016644 @ =gBattlescriptCurrInstr mov r9, r2 ldr r6, _08016648 @ =gUnknown_81D99E4 - ldr r0, _0801664C @ =gUnknown_2023BE3 + ldr r0, _0801664C @ =gCurrentActionFuncId mov r10, r0 b _08016706 .align 2, 0 -_0801663C: .4byte gUnknown_2023E82 -_08016640: .4byte sBattler_AI -_08016644: .4byte gUnknown_2023D74 +_0801663C: .4byte gBattleCommunication +_08016640: .4byte gBattlerAttacker +_08016644: .4byte gBattlescriptCurrInstr _08016648: .4byte gUnknown_81D99E4 -_0801664C: .4byte gUnknown_2023BE3 +_0801664C: .4byte gCurrentActionFuncId _08016650: ldr r3, _080166C4 @ =gBattleTextBuff1 movs r4, 0xFD @@ -12952,10 +12952,10 @@ _08016650: strb r0, [r1, 0x4] ldrb r0, [r6] ands r2, r0 - ldr r1, _080166CC @ =gUnknown_2023D74 + ldr r1, _080166CC @ =gBattlescriptCurrInstr mov r9, r1 ldr r6, _080166D0 @ =gUnknown_81D99E4 - ldr r0, _080166D4 @ =gUnknown_2023BE3 + ldr r0, _080166D4 @ =gCurrentActionFuncId mov r10, r0 cmp r2, 0 bne _080166B4 @@ -12995,9 +12995,9 @@ _080166B4: .align 2, 0 _080166C4: .4byte gBattleTextBuff1 _080166C8: .4byte gBattleTextBuff2 -_080166CC: .4byte gUnknown_2023D74 +_080166CC: .4byte gBattlescriptCurrInstr _080166D0: .4byte gUnknown_81D99E4 -_080166D4: .4byte gUnknown_2023BE3 +_080166D4: .4byte gCurrentActionFuncId _080166D8: ldr r0, _080166EC @ =gBattleTypeFlags ldr r1, [r0] @@ -13005,23 +13005,23 @@ _080166D8: ands r1, r0 cmp r1, 0 beq _080166F4 - ldr r1, _080166F0 @ =gUnknown_2023E82 + ldr r1, _080166F0 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _080166F8 .align 2, 0 _080166EC: .4byte gBattleTypeFlags -_080166F0: .4byte gUnknown_2023E82 +_080166F0: .4byte gBattleCommunication _080166F4: - ldr r0, _08016734 @ =gUnknown_2023E82 + ldr r0, _08016734 @ =gBattleCommunication strb r1, [r0, 0x5] _080166F8: - ldr r0, _08016738 @ =sBattler_AI + ldr r0, _08016738 @ =gBattlerAttacker mov r8, r0 - ldr r1, _0801673C @ =gUnknown_2023D74 + ldr r1, _0801673C @ =gBattlescriptCurrInstr mov r9, r1 ldr r6, _08016740 @ =gUnknown_81D99E4 - ldr r2, _08016744 @ =gUnknown_2023BE3 + ldr r2, _08016744 @ =gCurrentActionFuncId mov r10, r2 _08016706: mov r1, r8 @@ -13048,11 +13048,11 @@ _0801671E: pop {r0} bx r0 .align 2, 0 -_08016734: .4byte gUnknown_2023E82 -_08016738: .4byte sBattler_AI -_0801673C: .4byte gUnknown_2023D74 +_08016734: .4byte gBattleCommunication +_08016738: .4byte gBattlerAttacker +_0801673C: .4byte gBattlescriptCurrInstr _08016740: .4byte gUnknown_81D99E4 -_08016744: .4byte gUnknown_2023BE3 +_08016744: .4byte gCurrentActionFuncId thumb_func_end sub_8016418 thumb_func_start sub_8016748 @@ -13088,14 +13088,14 @@ _0801677E: strb r4, [r0] cmp r1, 0x25 bne _080167BC - ldr r2, _080167B0 @ =gUnknown_2023D68 + ldr r2, _080167B0 @ =gLastUsedItem ldr r1, _080167B4 @ =gBattleMons movs r0, 0x58 muls r0, r4 adds r0, r1 ldrh r0, [r0, 0x2E] strh r0, [r2] - ldr r0, _080167B8 @ =gUnknown_2023E8C + ldr r0, _080167B8 @ =gProtectStructs lsls r2, r4, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -13108,9 +13108,9 @@ _0801677E: b _08016816 .align 2, 0 _080167AC: .4byte gPotentialItemEffectBattler -_080167B0: .4byte gUnknown_2023D68 +_080167B0: .4byte gLastUsedItem _080167B4: .4byte gBattleMons -_080167B8: .4byte gUnknown_2023E8C +_080167B8: .4byte gProtectStructs _080167BC: ldr r7, _080167EC @ =gBattleMons movs r2, 0x58 @@ -13124,7 +13124,7 @@ _080167BC: bne _080167F8 ldr r0, _080167F0 @ =gLastUsedAbility strb r1, [r0] - ldr r0, _080167F4 @ =gUnknown_2023E8C + ldr r0, _080167F4 @ =gProtectStructs lsls r2, r4, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -13138,7 +13138,7 @@ _080167BC: .align 2, 0 _080167EC: .4byte gBattleMons _080167F0: .4byte gLastUsedAbility -_080167F4: .4byte gUnknown_2023E8C +_080167F4: .4byte gProtectStructs _080167F8: ldr r0, _08016820 @ =gBattleTypeFlags ldr r3, [r0] @@ -13230,8 +13230,8 @@ _080168A0: .4byte gBattleOutcome thumb_func_start sub_80168A4 sub_80168A4: @ 80168A4 push {r4-r6,lr} - ldr r4, _080168F4 @ =sBattler_AI - ldr r1, _080168F8 @ =gUnknown_2023BDE + ldr r4, _080168F4 @ =gBattlerAttacker + ldr r1, _080168F8 @ =gBattlerByTurnOrder ldr r5, _080168FC @ =gUnknown_2023BE2 ldrb r0, [r5] adds r0, r1 @@ -13270,8 +13270,8 @@ _080168D8: movs r1, 0x2 b _08016922 .align 2, 0 -_080168F4: .4byte sBattler_AI -_080168F8: .4byte gUnknown_2023BDE +_080168F4: .4byte gBattlerAttacker +_080168F8: .4byte gBattlerByTurnOrder _080168FC: .4byte gUnknown_2023BE2 _08016900: .4byte gBattleTypeFlags _08016904: .4byte gBattlersCount @@ -13322,20 +13322,20 @@ _0801694C: bne _080169D8 ldrb r0, [r4] bl ClearFuryCutterDestinyBondGrudge - ldr r1, _0801697C @ =gUnknown_2023E82 + ldr r1, _0801697C @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x5] - ldr r1, _08016980 @ =gUnknown_2023D74 + ldr r1, _08016980 @ =gBattlescriptCurrInstr ldr r0, _08016984 @ =gUnknown_81D893A str r0, [r1] - ldr r1, _08016988 @ =gUnknown_2023BE3 + ldr r1, _08016988 @ =gCurrentActionFuncId movs r0, 0xA b _080169D6 .align 2, 0 -_0801697C: .4byte gUnknown_2023E82 -_08016980: .4byte gUnknown_2023D74 +_0801697C: .4byte gBattleCommunication +_08016980: .4byte gBattlescriptCurrInstr _08016984: .4byte gUnknown_81D893A -_08016988: .4byte gUnknown_2023BE3 +_08016988: .4byte gCurrentActionFuncId _0801698C: ldr r1, _080169B4 @ =gBattleMons ldrb r2, [r4] @@ -13348,22 +13348,22 @@ _0801698C: ands r0, r1 cmp r0, 0 beq _080169CC - ldr r1, _080169BC @ =gUnknown_2023E82 + ldr r1, _080169BC @ =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] - ldr r1, _080169C0 @ =gUnknown_2023D74 + ldr r1, _080169C0 @ =gBattlescriptCurrInstr ldr r0, _080169C4 @ =gUnknown_81D893A str r0, [r1] - ldr r1, _080169C8 @ =gUnknown_2023BE3 + ldr r1, _080169C8 @ =gCurrentActionFuncId movs r0, 0xA b _080169D6 .align 2, 0 _080169B4: .4byte gBattleMons _080169B8: .4byte 0x0400e000 -_080169BC: .4byte gUnknown_2023E82 -_080169C0: .4byte gUnknown_2023D74 +_080169BC: .4byte gBattleCommunication +_080169C0: .4byte gBattlescriptCurrInstr _080169C4: .4byte gUnknown_81D893A -_080169C8: .4byte gUnknown_2023BE3 +_080169C8: .4byte gCurrentActionFuncId _080169CC: ldr r0, _080169E0 @ =gBattlersCount ldrb r0, [r0] @@ -13384,8 +13384,8 @@ _080169E4: .4byte gBattleOutcome thumb_func_start sub_80169E8 sub_80169E8: @ 80169E8 push {r4,r5,lr} - ldr r2, _08016A44 @ =sBattler_AI - ldr r1, _08016A48 @ =gUnknown_2023BDE + ldr r2, _08016A44 @ =gBattlerAttacker + ldr r1, _08016A48 @ =gBattlerByTurnOrder ldr r0, _08016A4C @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13428,8 +13428,8 @@ sub_80169E8: @ 80169E8 strb r0, [r4] b _08016A98 .align 2, 0 -_08016A44: .4byte sBattler_AI -_08016A48: .4byte gUnknown_2023BDE +_08016A44: .4byte gBattlerAttacker +_08016A48: .4byte gBattlerByTurnOrder _08016A4C: .4byte gUnknown_2023BE2 _08016A50: .4byte gBattle_BG0_X _08016A54: .4byte gBattle_BG0_Y @@ -13438,12 +13438,12 @@ _08016A5C: .4byte gEnemyParty _08016A60: .4byte gBaseStats _08016A64: .4byte 0x000004fb _08016A68: - ldr r1, _08016A70 @ =gUnknown_2023E82 + ldr r1, _08016A70 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08016A9C .align 2, 0 -_08016A70: .4byte gUnknown_2023E82 +_08016A70: .4byte gBattleCommunication _08016A74: adds r1, 0x7A ldrb r0, [r1] @@ -13456,37 +13456,37 @@ _08016A74: ldrb r0, [r0] cmp r0, 0 beq _08016A98 - ldr r1, _08016A94 @ =gUnknown_2023E82 + ldr r1, _08016A94 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08016A9C .align 2, 0 -_08016A94: .4byte gUnknown_2023E82 +_08016A94: .4byte gBattleCommunication _08016A98: - ldr r0, _08016AB0 @ =gUnknown_2023E82 + ldr r0, _08016AB0 @ =gBattleCommunication strb r5, [r0, 0x5] _08016A9C: - ldr r1, _08016AB4 @ =gUnknown_2023D74 + ldr r1, _08016AB4 @ =gBattlescriptCurrInstr ldr r0, _08016AB8 @ =gUnknown_81D9A04 ldr r0, [r0] str r0, [r1] - ldr r1, _08016ABC @ =gUnknown_2023BE3 + ldr r1, _08016ABC @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08016AB0: .4byte gUnknown_2023E82 -_08016AB4: .4byte gUnknown_2023D74 +_08016AB0: .4byte gBattleCommunication +_08016AB4: .4byte gBattlescriptCurrInstr _08016AB8: .4byte gUnknown_81D9A04 -_08016ABC: .4byte gUnknown_2023BE3 +_08016ABC: .4byte gCurrentActionFuncId thumb_func_end sub_80169E8 thumb_func_start sub_8016AC0 sub_8016AC0: @ 8016AC0 - ldr r2, _08016AF8 @ =sBattler_AI - ldr r1, _08016AFC @ =gUnknown_2023BDE + ldr r2, _08016AF8 @ =gBattlerAttacker + ldr r1, _08016AFC @ =gBattlerByTurnOrder ldr r0, _08016B00 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13501,35 +13501,35 @@ sub_8016AC0: @ 8016AC0 ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] - ldr r1, _08016B10 @ =gUnknown_2023D68 + ldr r1, _08016B10 @ =gLastUsedItem movs r0, 0x5 strh r0, [r1] - ldr r1, _08016B14 @ =gUnknown_2023D74 + ldr r1, _08016B14 @ =gBattlescriptCurrInstr ldr r0, _08016B18 @ =gUnknown_81D99B0 ldr r0, [r0, 0x14] str r0, [r1] - ldr r1, _08016B1C @ =gUnknown_2023BE3 + ldr r1, _08016B1C @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] bx lr .align 2, 0 -_08016AF8: .4byte sBattler_AI -_08016AFC: .4byte gUnknown_2023BDE +_08016AF8: .4byte gBattlerAttacker +_08016AFC: .4byte gBattlerByTurnOrder _08016B00: .4byte gUnknown_2023BE2 _08016B04: .4byte gBattle_BG0_X _08016B08: .4byte gBattle_BG0_Y _08016B0C: .4byte gNumSafariBalls -_08016B10: .4byte gUnknown_2023D68 -_08016B14: .4byte gUnknown_2023D74 +_08016B10: .4byte gLastUsedItem +_08016B14: .4byte gBattlescriptCurrInstr _08016B18: .4byte gUnknown_81D99B0 -_08016B1C: .4byte gUnknown_2023BE3 +_08016B1C: .4byte gCurrentActionFuncId thumb_func_end sub_8016AC0 thumb_func_start sub_8016B20 sub_8016B20: @ 8016B20 push {r4-r7,lr} - ldr r2, _08016B9C @ =sBattler_AI - ldr r1, _08016BA0 @ =gUnknown_2023BDE + ldr r2, _08016B9C @ =gBattlerAttacker + ldr r1, _08016BA0 @ =gBattlerByTurnOrder ldr r0, _08016BA4 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13578,33 +13578,33 @@ _08016B66: movs r0, 0x3 strb r0, [r1] _08016B86: - ldr r1, _08016BB4 @ =gUnknown_2023D74 + ldr r1, _08016BB4 @ =gBattlescriptCurrInstr ldr r0, _08016BB8 @ =gUnknown_81D9A04 ldr r0, [r0, 0x8] str r0, [r1] - ldr r1, _08016BBC @ =gUnknown_2023BE3 + ldr r1, _08016BBC @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08016B9C: .4byte sBattler_AI -_08016BA0: .4byte gUnknown_2023BDE +_08016B9C: .4byte gBattlerAttacker +_08016BA0: .4byte gBattlerByTurnOrder _08016BA4: .4byte gUnknown_2023BE2 _08016BA8: .4byte gBattle_BG0_X _08016BAC: .4byte gBattle_BG0_Y _08016BB0: .4byte gBattleStruct -_08016BB4: .4byte gUnknown_2023D74 +_08016BB4: .4byte gBattlescriptCurrInstr _08016BB8: .4byte gUnknown_81D9A04 -_08016BBC: .4byte gUnknown_2023BE3 +_08016BBC: .4byte gCurrentActionFuncId thumb_func_end sub_8016B20 thumb_func_start sub_8016BC0 sub_8016BC0: @ 8016BC0 push {r4-r7,lr} - ldr r2, _08016C3C @ =sBattler_AI - ldr r1, _08016C40 @ =gUnknown_2023BDE + ldr r2, _08016C3C @ =gBattlerAttacker + ldr r1, _08016C40 @ =gBattlerByTurnOrder ldr r0, _08016C44 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13653,33 +13653,33 @@ _08016C06: movs r0, 0x14 strb r0, [r1] _08016C26: - ldr r1, _08016C54 @ =gUnknown_2023D74 + ldr r1, _08016C54 @ =gBattlescriptCurrInstr ldr r0, _08016C58 @ =gUnknown_81D9A04 ldr r0, [r0, 0x4] str r0, [r1] - ldr r1, _08016C5C @ =gUnknown_2023BE3 + ldr r1, _08016C5C @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08016C3C: .4byte sBattler_AI -_08016C40: .4byte gUnknown_2023BDE +_08016C3C: .4byte gBattlerAttacker +_08016C40: .4byte gBattlerByTurnOrder _08016C44: .4byte gUnknown_2023BE2 _08016C48: .4byte gBattle_BG0_X _08016C4C: .4byte gBattle_BG0_Y _08016C50: .4byte gBattleStruct -_08016C54: .4byte gUnknown_2023D74 +_08016C54: .4byte gBattlescriptCurrInstr _08016C58: .4byte gUnknown_81D9A04 -_08016C5C: .4byte gUnknown_2023BE3 +_08016C5C: .4byte gCurrentActionFuncId thumb_func_end sub_8016BC0 thumb_func_start HandleAction_SafriZoneRun HandleAction_SafriZoneRun: @ 8016C60 push {r4,lr} - ldr r2, _08016C88 @ =sBattler_AI - ldr r1, _08016C8C @ =gUnknown_2023BDE + ldr r2, _08016C88 @ =gBattlerAttacker + ldr r1, _08016C8C @ =gBattlerByTurnOrder ldr r4, _08016C90 @ =gUnknown_2023BE2 ldrb r0, [r4] adds r0, r1 @@ -13697,8 +13697,8 @@ HandleAction_SafriZoneRun: @ 8016C60 pop {r0} bx r0 .align 2, 0 -_08016C88: .4byte sBattler_AI -_08016C8C: .4byte gUnknown_2023BDE +_08016C88: .4byte gBattlerAttacker +_08016C8C: .4byte gBattlerByTurnOrder _08016C90: .4byte gUnknown_2023BE2 _08016C94: .4byte gBattlersCount _08016C98: .4byte gBattleOutcome @@ -13706,8 +13706,8 @@ _08016C98: .4byte gBattleOutcome thumb_func_start HandleAction_Action9 HandleAction_Action9: @ 8016C9C - ldr r3, _08016CE8 @ =sBattler_AI - ldr r1, _08016CEC @ =gUnknown_2023BDE + ldr r3, _08016CE8 @ =gBattlerAttacker + ldr r1, _08016CEC @ =gBattlerByTurnOrder ldr r0, _08016CF0 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13732,11 +13732,11 @@ HandleAction_Action9: @ 8016C9C strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08016D04 @ =gUnknown_2023D74 + ldr r1, _08016D04 @ =gBattlescriptCurrInstr ldr r0, _08016D08 @ =gUnknown_81D9A04 ldr r0, [r0, 0xC] str r0, [r1] - ldr r1, _08016D0C @ =gUnknown_2023BE3 + ldr r1, _08016D0C @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] ldr r1, _08016D10 @ =gUnknown_2023BDA @@ -13744,16 +13744,16 @@ HandleAction_Action9: @ 8016C9C strb r0, [r1, 0x1] bx lr .align 2, 0 -_08016CE8: .4byte sBattler_AI -_08016CEC: .4byte gUnknown_2023BDE +_08016CE8: .4byte gBattlerAttacker +_08016CEC: .4byte gBattlerByTurnOrder _08016CF0: .4byte gUnknown_2023BE2 _08016CF4: .4byte gBattle_BG0_X _08016CF8: .4byte gBattle_BG0_Y _08016CFC: .4byte gBattleTextBuff1 _08016D00: .4byte gBattlerPartyIndexes -_08016D04: .4byte gUnknown_2023D74 +_08016D04: .4byte gBattlescriptCurrInstr _08016D08: .4byte gUnknown_81D9A04 -_08016D0C: .4byte gUnknown_2023BE3 +_08016D0C: .4byte gCurrentActionFuncId _08016D10: .4byte gUnknown_2023BDA thumb_func_end HandleAction_Action9 @@ -13769,7 +13769,7 @@ HandleAction_Action11: @ 8016D14 ldr r0, [r0] adds r0, 0x4D strb r1, [r0] - ldr r1, _08016D38 @ =gUnknown_2023BE3 + ldr r1, _08016D38 @ =gCurrentActionFuncId movs r0, 0xC strb r0, [r1] _08016D30: @@ -13777,7 +13777,7 @@ _08016D30: bx r0 .align 2, 0 _08016D34: .4byte gBattleStruct -_08016D38: .4byte gUnknown_2023BE3 +_08016D38: .4byte gCurrentActionFuncId thumb_func_end HandleAction_Action11 thumb_func_start HandleAction_NothingIsFainted @@ -13786,13 +13786,13 @@ HandleAction_NothingIsFainted: @ 8016D3C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r3, _08016D60 @ =gUnknown_2023BE3 + ldr r3, _08016D60 @ =gCurrentActionFuncId ldr r2, _08016D64 @ =gUnknown_2023BDA ldrb r0, [r1] adds r0, r2 ldrb r0, [r0] strb r0, [r3] - ldr r2, _08016D68 @ =gUnknown_2023DD0 + ldr r2, _08016D68 @ =gHitMarker ldr r0, [r2] ldr r1, _08016D6C @ =0xf1e892af ands r0, r1 @@ -13800,9 +13800,9 @@ HandleAction_NothingIsFainted: @ 8016D3C bx lr .align 2, 0 _08016D5C: .4byte gUnknown_2023BE2 -_08016D60: .4byte gUnknown_2023BE3 +_08016D60: .4byte gCurrentActionFuncId _08016D64: .4byte gUnknown_2023BDA -_08016D68: .4byte gUnknown_2023DD0 +_08016D68: .4byte gHitMarker _08016D6C: .4byte 0xf1e892af thumb_func_end HandleAction_NothingIsFainted @@ -13813,14 +13813,14 @@ HandleAction_ActionFinished: @ 8016D70 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r3, _08016DE8 @ =gUnknown_2023BE3 + ldr r3, _08016DE8 @ =gCurrentActionFuncId ldr r2, _08016DEC @ =gUnknown_2023BDA ldrb r0, [r1] adds r0, r2 ldrb r0, [r0] strb r0, [r3] bl SpecialStatusesClear - ldr r2, _08016DF0 @ =gUnknown_2023DD0 + ldr r2, _08016DF0 @ =gHitMarker ldr r0, [r2] ldr r1, _08016DF4 @ =0xf1e892af ands r0, r1 @@ -13837,7 +13837,7 @@ HandleAction_ActionFinished: @ 8016D70 strb r1, [r5, 0x18] strb r1, [r5, 0x19] ldr r2, _08016E08 @ =gUnknown_2023DA0 - ldr r3, _08016E0C @ =sBattler_AI + ldr r3, _08016E0C @ =gBattlerAttacker ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -13853,7 +13853,7 @@ HandleAction_ActionFinished: @ 8016D70 ldr r0, _08016E18 @ =gDynamicBasePower strh r4, [r0] strb r1, [r5, 0x14] - ldr r0, _08016E1C @ =gUnknown_2023E82 + ldr r0, _08016E1C @ =gBattleCommunication strb r1, [r0, 0x3] strb r1, [r0, 0x4] strb r1, [r5, 0x16] @@ -13867,20 +13867,20 @@ HandleAction_ActionFinished: @ 8016D70 bx r0 .align 2, 0 _08016DE4: .4byte gUnknown_2023BE2 -_08016DE8: .4byte gUnknown_2023BE3 +_08016DE8: .4byte gCurrentActionFuncId _08016DEC: .4byte gUnknown_2023BDA -_08016DF0: .4byte gUnknown_2023DD0 +_08016DF0: .4byte gHitMarker _08016DF4: .4byte 0xf1e892af _08016DF8: .4byte gCurrentMove _08016DFC: .4byte gBattleMoveDamage _08016E00: .4byte gMoveResultFlags _08016E04: .4byte gBattleScripting _08016E08: .4byte gUnknown_2023DA0 -_08016E0C: .4byte sBattler_AI +_08016E0C: .4byte gBattlerAttacker _08016E10: .4byte gUnknown_2023DA8 _08016E14: .4byte gBattleStruct _08016E18: .4byte gDynamicBasePower -_08016E1C: .4byte gUnknown_2023E82 +_08016E1C: .4byte gBattleCommunication _08016E20: .4byte gBattleResources thumb_func_end HandleAction_ActionFinished |