diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-30 12:10:40 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-31 07:58:09 +0800 |
commit | 035df4d7a4a2782cf7bc3789f56471a03ffbfca0 (patch) | |
tree | 6ea7b0b47fe99c7c1d6ef25afa8ba3b9668b9eb9 | |
parent | 1f986e65435c10f3d62b3777beb8acf712dcbbf2 (diff) |
ported documentation of battle_util.s
-rw-r--r-- | asm/battle_2.s | 734 | ||||
-rw-r--r-- | asm/battle_anim_special.s | 4 | ||||
-rw-r--r-- | asm/battle_controller_oak.s | 4 | ||||
-rw-r--r-- | asm/battle_script_commands.s | 3274 | ||||
-rw-r--r-- | asm/battle_util.s | 1450 | ||||
-rw-r--r-- | asm/evolution_scene.s | 100 | ||||
-rw-r--r-- | data/battle_scripts_1.s | 204 | ||||
-rw-r--r-- | data/data.s | 2 | ||||
-rw-r--r-- | include/battle_util.h | 10 | ||||
-rw-r--r-- | src/battle_ai_script_commands.c | 6 | ||||
-rw-r--r-- | src/pokemon.c | 4 | ||||
-rw-r--r-- | sym_ewram.txt | 28 |
12 files changed, 2910 insertions, 2910 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index 910b37d65..365ef0691 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -21,14 +21,14 @@ sub_800FD9C: @ 800FD9C 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] @@ -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: @@ -1013,7 +1013,7 @@ _080105C6: bl sub_80FCEA8 b _080108B8 .align 2, 0 -_080105CC: .4byte gUnknown_2023E82 +_080105CC: .4byte gBattleCommunication _080105D0: .4byte gWirelessCommType _080105D4: ldr r2, _08010640 @ =gBattleTypeFlags @@ -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 @@ -1071,19 +1071,19 @@ _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,14 +1133,14 @@ _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 IsLinkTaskFinished lsls r0, 24 @@ -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,12 +1174,12 @@ _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 IsLinkTaskFinished lsls r0, 24 @@ -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,12 +1213,12 @@ _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 IsLinkTaskFinished lsls r0, 24 @@ -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 @@ -1321,14 +1321,14 @@ _0801088C: .4byte sub_80123E4 _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 @@ -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: @@ -1766,7 +1766,7 @@ _08010C4E: bl sub_80FCEA8 b _080110F0 .align 2, 0 -_08010C54: .4byte gUnknown_2023E82 +_08010C54: .4byte gBattleCommunication _08010C58: .4byte gWirelessCommType _08010C5C: ldr r0, _08010CC0 @ =gReceivedRemoteLinkPlayers @@ -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] @@ -1819,7 +1819,7 @@ _08010CB4: _08010CC0: .4byte gReceivedRemoteLinkPlayers _08010CC4: .4byte gBattleStruct _08010CC8: .4byte 0x00000185 -_08010CCC: .4byte gUnknown_2023E82 +_08010CCC: .4byte gBattleCommunication _08010CD0: .4byte gWirelessCommType _08010CD4: bl GetBlockReceivedStatus @@ -1926,7 +1926,7 @@ _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] @@ -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,11 +2078,11 @@ _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 IsLinkTaskFinished lsls r0, 24 @@ -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 @@ -2325,14 +2325,14 @@ _080110C4: .4byte sub_80123E4 _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,7 +2350,7 @@ _080110F0: pop {r0} bx r0 .align 2, 0 -_080110FC: .4byte gUnknown_2023E82 +_080110FC: .4byte gBattleCommunication thumb_func_end sub_8010BA0 thumb_func_start BattleMainCB2 @@ -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} @@ -3661,7 +3661,7 @@ _08011B80: .4byte sub_80116F4 _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 @@ -4776,7 +4776,7 @@ nullsub_12: @ 80123BC 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 @ =gBattleMainFunc @@ -4785,7 +4785,7 @@ BeginBattleIntro: @ 80123C0 pop {r0} bx r0 .align 2, 0 -_080123D8: .4byte gUnknown_2023E82 +_080123D8: .4byte gBattleCommunication _080123DC: .4byte gBattleMainFunc _080123E0: .4byte BattleIntroGetMonsData thumb_func_end BeginBattleIntro @@ -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] @@ -4927,7 +4927,7 @@ _080124CA: 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 @@ -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: @@ -5183,12 +5183,12 @@ _080126EC: .4byte gUnknown_2023DD4 _080126F0: .4byte gUnknown_2023DC0 _080126F4: .4byte gBattleResources _080126F8: .4byte gSideTimers -_080126FC: .4byte gSideAffecting +_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 @@ -5197,7 +5197,7 @@ _08012724: .4byte gUnknown_2023D72 _08012728: .4byte gBattleOutcome _0801272C: .4byte gBattleControllerExecFlags _08012730: .4byte gUnknown_2023E7E -_08012734: .4byte gUnknown_2023E82 +_08012734: .4byte gBattleCommunication _08012738: .4byte gUnknown_2023E7C _0801273C: .4byte gBattleMoveDamage _08012740: .4byte gIntroSlideFlags @@ -5266,7 +5266,7 @@ _080127B0: ldrb r7, [r7] cmp r5, r7 bge _08012824 - ldr r0, _080128E0 @ =gUnknown_2023C34 + ldr r0, _080128E0 @ =gChosenMoveByBattler mov r8, r0 ldr r3, _080128C4 @ =gDisableStructs ldr r4, _080128D4 @ =gStatuses3 @@ -5403,7 +5403,7 @@ _080128D0: .4byte gCurrentMove _080128D4: .4byte gStatuses3 _080128D8: .4byte gBattleMons _080128DC: .4byte gBattlersCount -_080128E0: .4byte gUnknown_2023C34 +_080128E0: .4byte gChosenMoveByBattler _080128E4: .4byte 0xfbffffff _080128E8: .4byte 0x15100007 _080128EC: .4byte 0x0003043f @@ -5431,7 +5431,7 @@ _0801290C: ldrb r6, [r6] cmp r5, r6 bge _0801296C - ldr r0, _08012B8C @ =gUnknown_2023C34 + ldr r0, _08012B8C @ =gChosenMoveByBattler mov r8, r0 ldr r6, _08012B90 @ =gBitTable ldr r4, _08012B94 @ =gActiveBattler @@ -5749,7 +5749,7 @@ _08012B7C: .4byte gBattleMons _08012B80: .4byte gBattleStruct _08012B84: .4byte gActionSelectionCursor _08012B88: .4byte gBattlersCount -_08012B8C: .4byte gUnknown_2023C34 +_08012B8C: .4byte gChosenMoveByBattler _08012B90: .4byte gBitTable _08012B94: .4byte gActiveBattler _08012B98: .4byte 0xffff1fff @@ -5780,7 +5780,7 @@ sub_8012BC8: @ 8012BC8 mov r8, r0 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 @@ -6241,7 +6241,7 @@ _08012F5C: .4byte gActiveBattler _08012F60: .4byte gStatuses3 _08012F64: .4byte gActionSelectionCursor _08012F68: .4byte gMoveSelectionCursor -_08012F6C: .4byte gUnknown_2023E8C +_08012F6C: .4byte gProtectStructs _08012F70: .4byte gBattleMons _08012F74: .4byte gBattlersCount _08012F78: .4byte gBitTable @@ -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] @@ -6334,11 +6334,11 @@ BattleIntroPrepareBackgroundSlide: @ 8013020 movs r0, 0 bl BtlController_EmitIntroSlide ldrb r0, [r4] - bl MarkBufferBankForExecution + 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: @@ -6351,7 +6351,7 @@ _0801305C: .4byte gActiveBattler _08013060: .4byte gUnknown_2022B50 _08013064: .4byte gBattleMainFunc _08013068: .4byte sub_8013070 -_0801306C: .4byte gUnknown_2023E82 +_0801306C: .4byte gBattleCommunication thumb_func_end BattleIntroPrepareBackgroundSlide thumb_func_start sub_8013070 @@ -6528,7 +6528,7 @@ _080131B6: movs r0, 0 bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080131D0: ldr r5, _08013244 @ =gBattleTypeFlags ldr r0, [r5] @@ -6545,7 +6545,7 @@ _080131D0: movs r0, 0 bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080131F6: ldrb r0, [r4] bl GetBattlerSide @@ -6634,7 +6634,7 @@ _080132B4: bl BtlController_EmitLoadMonSprite mov r1, r9 ldrb r0, [r1] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080132C2: ldr r0, _08013328 @ =gBattleTypeFlags ldr r0, [r0] @@ -6659,7 +6659,7 @@ _080132EC: movs r0, 0 bl BtlController_EmitDrawTrainerPic ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080132F8: mov r2, r9 ldrb r0, [r2] @@ -6770,7 +6770,7 @@ _080133B6: movs r2, 0x80 bl BtlController_EmitDrawPartyStatusSummary ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec movs r7, 0 mov r6, r8 mov r5, sp @@ -6825,7 +6825,7 @@ _0801342E: movs r2, 0x80 bl BtlController_EmitDrawPartyStatusSummary ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r1, _08013460 @ =gBattleMainFunc ldr r0, _08013464 @ =BattleIntroPrintTrainerWantsToBattle b _080134C6 @@ -7009,7 +7009,7 @@ _080135B4: movs r0, 0 bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080135CE: ldr r0, _08013620 @ =gBattleTypeFlags ldr r0, [r0] @@ -7026,7 +7026,7 @@ _080135CE: movs r0, 0 bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080135F4: ldrb r0, [r4] adds r0, 0x1 @@ -7203,7 +7203,7 @@ _08013740: movs r0, 0 bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08013758: ldr r0, _080137C0 @ =gBattleTypeFlags ldr r0, [r0] @@ -7220,7 +7220,7 @@ _08013758: movs r0, 0 bl BtlController_EmitIntroTrainerBallThrow ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0801377E: ldrb r0, [r4] adds r0, 0x1 @@ -7289,7 +7289,7 @@ _080137EA: movs r2, 0 bl BtlController_EmitSwitchInAnim ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0801380C: ldrb r0, [r4] adds r0, 0x1 @@ -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] @@ -7371,14 +7371,14 @@ _0801389A: _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 @@ -7602,7 +7602,7 @@ _08013A32: 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 _08013AFC: .4byte gAbsentBattlerFlags _08013B00: .4byte gBattleMainFunc _08013B04: .4byte sub_8014040 -_08013B08: .4byte gUnknown_2023E82 +_08013B08: .4byte gBattleCommunication _08013B0C: .4byte gBattleScripting _08013B10: .4byte gMoveResultFlags _08013B14: .4byte gBattleMons @@ -7690,10 +7690,10 @@ sub_8013B1C: @ 8013B1C cmp r0, 0 bne _08013BAC ldr r1, _08013BB8 @ =gBattleMainFunc - ldr r0, _08013BBC @ =sub_8013BD4 + 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: @@ -7766,16 +7766,16 @@ _08013BAC: .align 2, 0 _08013BB4: .4byte gBattleControllerExecFlags _08013BB8: .4byte gBattleMainFunc -_08013BBC: .4byte sub_8013BD4 +_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: @@ -7858,7 +7858,7 @@ _08013C58: .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,7 +7866,7 @@ _08013C90: .4byte 0xffefffff _08013C94: .4byte gBattleScripting _08013C98: .4byte gBattleMoveDamage _08013C9C: .4byte gMoveResultFlags -_08013CA0: .4byte gUnknown_2023E82 +_08013CA0: .4byte gBattleCommunication _08013CA4: .4byte gUnknown_2023BE3 _08013CA8: .4byte gBattleMainFunc _08013CAC: .4byte RunTurnActionsFunctions @@ -7948,7 +7948,7 @@ _08013D44: .4byte sub_8014040 _08013D48: .4byte gUnknown_2023D7C _08013D4C: .4byte gUnknown_2023DC4 _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,7 +8499,7 @@ _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] @@ -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 @@ -8616,7 +8616,7 @@ _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 gBattleBufferB @@ -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 @@ -8657,7 +8657,7 @@ _08014318: .4byte gDisableStructs _0801431C: .4byte gActiveBattler _08014320: .4byte gUnknown_2023DC4 _08014324: .4byte gBattleStruct -_08014328: .4byte gUnknown_2023E82 +_08014328: .4byte gBattleCommunication _0801432C: add r2, sp, 0x4 ldr r3, _080143CC @ =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 @@ -8790,7 +8790,7 @@ _08014428: movs r0, 0 bl BtlController_EmitChooseItem ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _080146AC .align 2, 0 _08014448: .4byte gBattleStruct @@ -9011,7 +9011,7 @@ _080145F0: _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 @@ -9075,10 +9075,10 @@ _08014670: 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] @@ -9097,7 +9097,7 @@ _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 @@ -9106,7 +9106,7 @@ _080146D8: .4byte gBattleTypeFlags _080146DC: .4byte gBattleBufferB _080146E0: .4byte gActiveBattler _080146E4: .4byte gUnknown_81D8924 -_080146E8: .4byte gUnknown_2023E82 +_080146E8: .4byte gBattleCommunication _080146EC: bl IsRunningFromBattleImpossible lsls r0, 24 @@ -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 @@ -9148,18 +9148,18 @@ _0801472C: .align 2, 0 _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 @ =gBattleControllerExecFlags @@ -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 @@ -9324,14 +9324,14 @@ _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 _080148D0: .4byte gBattleMons -_080148D4: .4byte gUnknown_2023E82 +_080148D4: .4byte gBattleCommunication _080148D8: ldr r2, _08014900 @ =gBattleBufferB ldr r5, _08014904 @ =gActiveBattler @@ -9351,14 +9351,14 @@ _080148D8: _080148F6: 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 gBattleBufferB _08014904: .4byte gActiveBattler _08014908: .4byte gLastUsedItem -_0801490C: .4byte gUnknown_2023E82 +_0801490C: .4byte gBattleCommunication _08014910: ldr r6, _0801492C @ =gBattleBufferB ldr r7, _08014930 @ =gActiveBattler @@ -9369,7 +9369,7 @@ _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 @@ -9378,7 +9378,7 @@ _08014926: .align 2, 0 _0801492C: .4byte gBattleBufferB _08014930: .4byte gActiveBattler -_08014934: .4byte gUnknown_2023E82 +_08014934: .4byte gBattleCommunication _08014938: ldr r0, _080149FC @ =gBattleStruct mov r12, r0 @@ -9476,80 +9476,80 @@ _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 @ =gBattleControllerExecFlags @@ -9618,8 +9618,8 @@ _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,7 +9630,7 @@ _08014B32: b _08014C4E .align 2, 0 _08014B3C: .4byte gActiveBattler -_08014B40: .4byte gUnknown_2023E82 +_08014B40: .4byte gBattleCommunication _08014B44: ldr r3, _08014B78 @ =gBattleControllerExecFlags ldr r1, _08014B7C @ =gBitTable @@ -9652,7 +9652,7 @@ _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] @@ -9661,7 +9661,7 @@ _08014B44: _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,12 +9682,12 @@ _08014B88: .align 2, 0 _08014BA8: .4byte gActiveBattler _08014BAC: .4byte gBattleStruct -_08014BB0: .4byte gUnknown_2023E82 +_08014BB0: .4byte gBattleCommunication _08014BB4: 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 @@ -9727,8 +9727,8 @@ _08014BFA: b _08014C4E .align 2, 0 _08014C08: .4byte gBattlerAttacker -_08014C0C: .4byte gUnknown_2023D74 -_08014C10: .4byte gUnknown_2023D80 +_08014C0C: .4byte gBattlescriptCurrInstr +_08014C10: .4byte gSelectionBattleScripts _08014C14: .4byte gBattleControllerExecFlags _08014C18: .4byte gBitTable _08014C1C: .4byte gUnknown_825011C @@ -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,7 +9771,7 @@ _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 @@ -9792,7 +9792,7 @@ _08014C78: _08014C88: .4byte gBattleControllerExecFlags _08014C8C: .4byte gBitTable _08014C90: .4byte gActiveBattler -_08014C94: .4byte gUnknown_2023E82 +_08014C94: .4byte gBattleCommunication _08014C98: .4byte gBattlersCount _08014C9C: .4byte gBattleMainFunc _08014CA0: .4byte sub_80150A8 @@ -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,7 +10428,7 @@ _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 @@ -10476,7 +10476,7 @@ _080151CC: _080151D8: .4byte gUnknown_2023D7C _080151DC: .4byte gActiveBattler _080151E0: .4byte gUnknown_2023BDA -_080151E4: .4byte gUnknown_2023BDE +_080151E4: .4byte gBattlerByTurnOrder _080151E8: .4byte gBattleMainFunc _080151EC: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts _080151F0: .4byte gBattleStruct @@ -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 @@ -10635,7 +10635,7 @@ _08015304: bx r0 .align 2, 0 _08015318: .4byte gUnknown_2023BDA -_0801531C: .4byte gUnknown_2023BDE +_0801531C: .4byte gBattlerByTurnOrder _08015320: .4byte gBattlersCount _08015324: .4byte gBattleMainFunc _08015328: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts @@ -10660,9 +10660,9 @@ 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 + ldr r0, _08015394 @ =gChosenMoveByBattler mov r12, r0 ldr r1, _08015398 @ =gDisableStructs mov r8, r1 @@ -10691,8 +10691,8 @@ _0801535E: .align 2, 0 _08015388: .4byte gActiveBattler _0801538C: .4byte gBattlersCount -_08015390: .4byte gUnknown_2023E8C -_08015394: .4byte gUnknown_2023C34 +_08015390: .4byte gProtectStructs +_08015394: .4byte gChosenMoveByBattler _08015398: .4byte gDisableStructs _0801539C: ldrb r0, [r6] @@ -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 @@ -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,7 +10904,7 @@ _080154CC: bl BattleScriptExecute b _08015598 .align 2, 0 -_08015528: .4byte gUnknown_2023DD0 +_08015528: .4byte gHitMarker _0801552C: .4byte gBattleStruct _08015530: .4byte gBattlersCount _08015534: .4byte gActiveBattler @@ -10912,7 +10912,7 @@ _08015538: .4byte gBattlerAttacker _0801553C: .4byte gUnknown_2023DC4 _08015540: .4byte gBattleMons _08015544: .4byte gDisableStructs -_08015548: .4byte gUnknown_2023E8C +_08015548: .4byte gProtectStructs _0801554C: .4byte gUnknown_81D9015 _08015550: mov r2, r12 @@ -10941,7 +10941,7 @@ _0801555E: 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 @@ -10963,7 +10963,7 @@ _080155AC: .4byte gDynamicBasePower _080155B0: .4byte gBattleStruct _080155B4: .4byte gBattleMainFunc _080155B8: .4byte RunTurnActionsFunctions -_080155BC: .4byte gUnknown_2023E82 +_080155BC: .4byte gBattleCommunication _080155C0: .4byte gBattleScripting _080155C4: .4byte gBattleResources thumb_func_end CheckFocusPunch_ClearVarsBeforeTurnStarts @@ -10996,7 +10996,7 @@ _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 @@ -11018,7 +11018,7 @@ _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 gBattleMainFunc _08015640: .4byte gUnknown_8250070 @@ -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 @@ -11065,7 +11065,7 @@ sub_8015670: @ 8015670 bl GetBattlerAtPosition 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] @@ -11079,7 +11079,7 @@ _080156AC: .4byte gBattleTypeFlags _080156B0: .4byte gBattleTextBuff1 _080156B4: .4byte gBattleOutcome _080156B8: .4byte gBattlerAttacker -_080156BC: .4byte gUnknown_2023D74 +_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,7 +11149,7 @@ _0801575E: bl PlayBGM b _0801576E _08015768: - ldr r1, _0801577C @ =gUnknown_2023D74 + ldr r1, _0801577C @ =gBattlescriptCurrInstr ldr r0, _08015780 @ =gUnknown_81D8803 _0801576C: str r0, [r1] @@ -11161,7 +11161,7 @@ _0801576E: pop {r0} bx r0 .align 2, 0 -_0801577C: .4byte gUnknown_2023D74 +_0801577C: .4byte gBattlescriptCurrInstr _08015780: .4byte gUnknown_81D8803 _08015784: .4byte gBattleMainFunc _08015788: .4byte sub_8015910 @@ -11188,7 +11188,7 @@ sub_801578C: @ 801578C bl GetBattlerAtPosition 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] @@ -11202,7 +11202,7 @@ _080157C8: .4byte gBattleTypeFlags _080157CC: .4byte gBattleTextBuff1 _080157D0: .4byte gBattleOutcome _080157D4: .4byte gBattlerAttacker -_080157D8: .4byte gUnknown_2023D74 +_080157D8: .4byte gBattlescriptCurrInstr _080157DC: .4byte gUnknown_81D88CC _080157E0: movs r0, 0x8 @@ -11219,14 +11219,14 @@ _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 @@ -11235,14 +11235,14 @@ _08015810: strb r0, [r1] b _0801582A .align 2, 0 -_0801581C: .4byte gUnknown_2023E82 +_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: @@ -11253,8 +11253,8 @@ _08015830: 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 gBattleMainFunc _0801584C: .4byte sub_8015910 @@ -11266,7 +11266,7 @@ sub_8015850: @ 8015850 ldr r1, _08015878 @ =gUnknown_2023BE3 movs r0, 0 strb r0, [r1] - ldr r1, _0801587C @ =gUnknown_2023E8C + ldr r1, _0801587C @ =gProtectStructs ldr r0, _08015880 @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -11278,24 +11278,24 @@ 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 +_0801587C: .4byte gProtectStructs _08015880: .4byte gBattlerAttacker -_08015884: .4byte gUnknown_2023D74 +_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] @@ -11305,7 +11305,7 @@ _080158A0: pop {r0} bx r0 .align 2, 0 -_080158AC: .4byte gUnknown_2023D74 +_080158AC: .4byte gBattlescriptCurrInstr _080158B0: .4byte gUnknown_81D890F _080158B4: .4byte gBattleMainFunc _080158B8: .4byte sub_8015910 @@ -11332,7 +11332,7 @@ 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 @ =gBattleMainFunc @@ -11344,7 +11344,7 @@ _080158F0: .4byte gUnknown_2023BE3 _080158F4: .4byte gBattleTextBuff1 _080158F8: .4byte gBattlerAttacker _080158FC: .4byte gBattlerPartyIndexes -_08015900: .4byte gUnknown_2023D74 +_08015900: .4byte gBattlescriptCurrInstr _08015904: .4byte gUnknown_81D891D _08015908: .4byte gBattleMainFunc _0801590C: .4byte sub_8015910 @@ -11465,7 +11465,7 @@ _08015A04: cmp r0, 0 bne _08015A1E ldr r1, _08015A28 @ =gUnknown_825011C - ldr r0, _08015A2C @ =gUnknown_2023D74 + ldr r0, _08015A2C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -11479,7 +11479,7 @@ _08015A1E: .align 2, 0 _08015A24: .4byte gBattleControllerExecFlags _08015A28: .4byte gUnknown_825011C -_08015A2C: .4byte gUnknown_2023D74 +_08015A2C: .4byte gBattlescriptCurrInstr thumb_func_end sub_8015910 thumb_func_start sub_8015A30 @@ -11747,7 +11747,7 @@ _08015C48: cmp r0, 0 bne _08015C62 ldr r1, _08015C6C @ =gUnknown_825011C - ldr r0, _08015C70 @ =gUnknown_2023D74 + ldr r0, _08015C70 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -11760,7 +11760,7 @@ _08015C62: .align 2, 0 _08015C68: .4byte gBattleControllerExecFlags _08015C6C: .4byte gUnknown_825011C -_08015C70: .4byte gUnknown_2023D74 +_08015C70: .4byte gBattlescriptCurrInstr thumb_func_end RunBattleScriptCommands_PopCallbacksStack thumb_func_start sub_8015C74 @@ -11771,7 +11771,7 @@ sub_8015C74: @ 8015C74 cmp r0, 0 bne _08015C90 ldr r1, _08015C98 @ =gUnknown_825011C - ldr r0, _08015C9C @ =gUnknown_2023D74 + ldr r0, _08015C9C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -11784,7 +11784,7 @@ _08015C90: .align 2, 0 _08015C94: .4byte gBattleControllerExecFlags _08015C98: .4byte gUnknown_825011C -_08015C9C: .4byte gUnknown_2023D74 +_08015C9C: .4byte gBattlescriptCurrInstr thumb_func_end sub_8015C74 thumb_func_start sub_8015CA0 @@ -11798,7 +11798,7 @@ sub_8015CA0: @ 8015CA0 movs r0, 0x4 str r0, [sp] ldr r6, _08015CE0 @ =gBattlerAttacker - ldr r1, _08015CE4 @ =gUnknown_2023BDE + ldr r1, _08015CE4 @ =gBattlerByTurnOrder ldr r0, _08015CE8 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -11822,7 +11822,7 @@ sub_8015CA0: @ 8015CA0 b _0801634C .align 2, 0 _08015CE0: .4byte gBattlerAttacker -_08015CE4: .4byte gUnknown_2023BDE +_08015CE4: .4byte gBattlerByTurnOrder _08015CE8: .4byte gUnknown_2023BE2 _08015CEC: .4byte gBattleStruct _08015CF0: .4byte gBitTable @@ -11841,7 +11841,7 @@ _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 @@ -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 @@ -11872,7 +11872,7 @@ _08015CF8: 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 +_08015D7C: .4byte gBattleCommunication _08015D80: .4byte gUnknown_2023D48 _08015D84: .4byte gUnknown_2023D49 _08015D88: .4byte gBattleStruct -_08015D8C: .4byte gUnknown_2023E8C +_08015D8C: .4byte gProtectStructs _08015D90: .4byte gCurrentMove _08015D94: .4byte gChosenMove -_08015D98: .4byte gUnknown_2023DD0 +_08015D98: .4byte gHitMarker _08015D9C: ldr r0, _08015DD4 @ =gBattleMons movs r1, 0x58 @@ -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] @@ -12403,7 +12403,7 @@ _080161AA: adds r1, 0x20 ldrb r1, [r1] bl sub_80C71D0 - ldr r2, _080161F0 @ =gUnknown_2023ECC + 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] @@ -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 @@ -12593,7 +12593,7 @@ _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 @@ -12604,7 +12604,7 @@ _08016370: .4byte gUnknown_2023BE3 sub_8016374: @ 8016374 push {r4,lr} ldr r3, _080163E0 @ =gBattlerAttacker - ldr r1, _080163E4 @ =gUnknown_2023BDE + ldr r1, _080163E4 @ =gBattlerByTurnOrder ldr r0, _080163E8 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -12641,7 +12641,7 @@ 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 @@ -12659,7 +12659,7 @@ _080163DA: bx r0 .align 2, 0 _080163E0: .4byte gBattlerAttacker -_080163E4: .4byte gUnknown_2023BDE +_080163E4: .4byte gBattlerByTurnOrder _080163E8: .4byte gUnknown_2023BE2 _080163EC: .4byte gBattle_BG0_X _080163F0: .4byte gBattle_BG0_Y @@ -12668,7 +12668,7 @@ _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 _08016414: .4byte gBattleResults @@ -12683,7 +12683,7 @@ sub_8016418: @ 8016418 push {r5-r7} 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 @@ -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 @@ -12724,13 +12724,13 @@ sub_8016418: @ 8016418 .align 2, 0 _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 gLastUsedItem _08016490: .4byte gBattleBufferB -_08016494: .4byte gUnknown_2023D74 +_08016494: .4byte gBattlescriptCurrInstr _08016498: .4byte gUnknown_81D99B0 _0801649C: adds r0, r3, 0 @@ -12739,7 +12739,7 @@ _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] @@ -12747,7 +12747,7 @@ _0801649C: mov r10, r1 b _0801671E .align 2, 0 -_080164B8: .4byte gUnknown_2023D74 +_080164B8: .4byte gBattlescriptCurrInstr _080164BC: .4byte gUnknown_81D99FC _080164C0: .4byte gUnknown_2023BE3 _080164C4: @@ -12755,7 +12755,7 @@ _080164C4: 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] @@ -12763,7 +12763,7 @@ _080164C4: mov r10, r2 b _0801671E .align 2, 0 -_080164DC: .4byte gUnknown_2023D74 +_080164DC: .4byte gBattlescriptCurrInstr _080164E0: .4byte gUnknown_81D99FC _080164E4: .4byte gUnknown_2023BE3 _080164E8: @@ -12772,7 +12772,7 @@ _080164E8: 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] @@ -12781,7 +12781,7 @@ _080164FC: mov r10, r0 b _0801671E .align 2, 0 -_08016504: .4byte gUnknown_2023D74 +_08016504: .4byte gBattlescriptCurrInstr _08016508: .4byte gUnknown_81D99E4 _0801650C: .4byte gUnknown_2023BE3 _08016510: @@ -12797,7 +12797,7 @@ _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 @@ -12816,7 +12816,7 @@ _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 _0801655C: .4byte _08016560 @@ -12828,7 +12828,7 @@ _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 @ =gBattlerAttacker @@ -12845,7 +12845,7 @@ _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 @@ -12858,13 +12858,13 @@ _080165A6: strb r0, [r5, 0x5] b _08016706 .align 2, 0 -_080165AC: .4byte gUnknown_2023E82 +_080165AC: .4byte gBattleCommunication _080165B0: .4byte gBattlerAttacker -_080165B4: .4byte gUnknown_2023D74 +_080165B4: .4byte gBattlescriptCurrInstr _080165B8: .4byte gUnknown_81D99E4 _080165BC: .4byte gUnknown_2023BE3 _080165C0: - ldr r0, _080165FC @ =gUnknown_2023D74 + ldr r0, _080165FC @ =gBattlescriptCurrInstr mov r9, r0 ldr r6, _08016600 @ =gUnknown_81D99E4 ldr r1, _08016604 @ =gUnknown_2023BE3 @@ -12896,11 +12896,11 @@ _080165D0: beq _080165D0 b _08016706 .align 2, 0 -_080165FC: .4byte gUnknown_2023D74 +_080165FC: .4byte gBattlescriptCurrInstr _08016600: .4byte gUnknown_81D99E4 _08016604: .4byte gUnknown_2023BE3 _08016608: - ldr r3, _0801663C @ =gUnknown_2023E82 + ldr r3, _0801663C @ =gBattleCommunication movs r0, 0x4 strb r0, [r3, 0x5] ldr r2, _08016640 @ =gBattlerAttacker @@ -12920,16 +12920,16 @@ _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 mov r10, r0 b _08016706 .align 2, 0 -_0801663C: .4byte gUnknown_2023E82 +_0801663C: .4byte gBattleCommunication _08016640: .4byte gBattlerAttacker -_08016644: .4byte gUnknown_2023D74 +_08016644: .4byte gBattlescriptCurrInstr _08016648: .4byte gUnknown_81D99E4 _0801664C: .4byte gUnknown_2023BE3 _08016650: @@ -12952,7 +12952,7 @@ _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 @@ -12995,7 +12995,7 @@ _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 _080166D8: @@ -13005,20 +13005,20 @@ _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 @ =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 @@ -13048,9 +13048,9 @@ _0801671E: pop {r0} bx r0 .align 2, 0 -_08016734: .4byte gUnknown_2023E82 +_08016734: .4byte gBattleCommunication _08016738: .4byte gBattlerAttacker -_0801673C: .4byte gUnknown_2023D74 +_0801673C: .4byte gBattlescriptCurrInstr _08016740: .4byte gUnknown_81D99E4 _08016744: .4byte gUnknown_2023BE3 thumb_func_end sub_8016418 @@ -13095,7 +13095,7 @@ _0801677E: 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] @@ -13110,7 +13110,7 @@ _0801677E: _080167AC: .4byte gPotentialItemEffectBattler _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] @@ -13231,7 +13231,7 @@ _080168A0: .4byte gBattleOutcome sub_80168A4: @ 80168A4 push {r4-r6,lr} ldr r4, _080168F4 @ =gBattlerAttacker - ldr r1, _080168F8 @ =gUnknown_2023BDE + ldr r1, _080168F8 @ =gBattlerByTurnOrder ldr r5, _080168FC @ =gUnknown_2023BE2 ldrb r0, [r5] adds r0, r1 @@ -13271,7 +13271,7 @@ _080168D8: b _08016922 .align 2, 0 _080168F4: .4byte gBattlerAttacker -_080168F8: .4byte gUnknown_2023BDE +_080168F8: .4byte gBattlerByTurnOrder _080168FC: .4byte gUnknown_2023BE2 _08016900: .4byte gBattleTypeFlags _08016904: .4byte gBattlersCount @@ -13322,18 +13322,18 @@ _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 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 _0801698C: @@ -13348,10 +13348,10 @@ _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 @@ -13360,8 +13360,8 @@ _0801698C: .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 _080169CC: @@ -13385,7 +13385,7 @@ _080169E4: .4byte gBattleOutcome sub_80169E8: @ 80169E8 push {r4,r5,lr} ldr r2, _08016A44 @ =gBattlerAttacker - ldr r1, _08016A48 @ =gUnknown_2023BDE + ldr r1, _08016A48 @ =gBattlerByTurnOrder ldr r0, _08016A4C @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13429,7 +13429,7 @@ sub_80169E8: @ 80169E8 b _08016A98 .align 2, 0 _08016A44: .4byte gBattlerAttacker -_08016A48: .4byte gUnknown_2023BDE +_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,17 +13456,17 @@ _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] @@ -13477,8 +13477,8 @@ _08016A9C: 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 thumb_func_end sub_80169E8 @@ -13486,7 +13486,7 @@ _08016ABC: .4byte gUnknown_2023BE3 thumb_func_start sub_8016AC0 sub_8016AC0: @ 8016AC0 ldr r2, _08016AF8 @ =gBattlerAttacker - ldr r1, _08016AFC @ =gUnknown_2023BDE + ldr r1, _08016AFC @ =gBattlerByTurnOrder ldr r0, _08016B00 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13504,7 +13504,7 @@ sub_8016AC0: @ 8016AC0 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] @@ -13514,13 +13514,13 @@ sub_8016AC0: @ 8016AC0 bx lr .align 2, 0 _08016AF8: .4byte gBattlerAttacker -_08016AFC: .4byte gUnknown_2023BDE +_08016AFC: .4byte gBattlerByTurnOrder _08016B00: .4byte gUnknown_2023BE2 _08016B04: .4byte gBattle_BG0_X _08016B08: .4byte gBattle_BG0_Y _08016B0C: .4byte gNumSafariBalls _08016B10: .4byte gLastUsedItem -_08016B14: .4byte gUnknown_2023D74 +_08016B14: .4byte gBattlescriptCurrInstr _08016B18: .4byte gUnknown_81D99B0 _08016B1C: .4byte gUnknown_2023BE3 thumb_func_end sub_8016AC0 @@ -13529,7 +13529,7 @@ _08016B1C: .4byte gUnknown_2023BE3 sub_8016B20: @ 8016B20 push {r4-r7,lr} ldr r2, _08016B9C @ =gBattlerAttacker - ldr r1, _08016BA0 @ =gUnknown_2023BDE + ldr r1, _08016BA0 @ =gBattlerByTurnOrder ldr r0, _08016BA4 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13578,7 +13578,7 @@ _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] @@ -13590,12 +13590,12 @@ _08016B86: bx r0 .align 2, 0 _08016B9C: .4byte gBattlerAttacker -_08016BA0: .4byte gUnknown_2023BDE +_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 thumb_func_end sub_8016B20 @@ -13604,7 +13604,7 @@ _08016BBC: .4byte gUnknown_2023BE3 sub_8016BC0: @ 8016BC0 push {r4-r7,lr} ldr r2, _08016C3C @ =gBattlerAttacker - ldr r1, _08016C40 @ =gUnknown_2023BDE + ldr r1, _08016C40 @ =gBattlerByTurnOrder ldr r0, _08016C44 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13653,7 +13653,7 @@ _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] @@ -13665,12 +13665,12 @@ _08016C26: bx r0 .align 2, 0 _08016C3C: .4byte gBattlerAttacker -_08016C40: .4byte gUnknown_2023BDE +_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 thumb_func_end sub_8016BC0 @@ -13679,7 +13679,7 @@ _08016C5C: .4byte gUnknown_2023BE3 HandleAction_SafriZoneRun: @ 8016C60 push {r4,lr} ldr r2, _08016C88 @ =gBattlerAttacker - ldr r1, _08016C8C @ =gUnknown_2023BDE + ldr r1, _08016C8C @ =gBattlerByTurnOrder ldr r4, _08016C90 @ =gUnknown_2023BE2 ldrb r0, [r4] adds r0, r1 @@ -13698,7 +13698,7 @@ HandleAction_SafriZoneRun: @ 8016C60 bx r0 .align 2, 0 _08016C88: .4byte gBattlerAttacker -_08016C8C: .4byte gUnknown_2023BDE +_08016C8C: .4byte gBattlerByTurnOrder _08016C90: .4byte gUnknown_2023BE2 _08016C94: .4byte gBattlersCount _08016C98: .4byte gBattleOutcome @@ -13707,7 +13707,7 @@ _08016C98: .4byte gBattleOutcome thumb_func_start HandleAction_Action9 HandleAction_Action9: @ 8016C9C ldr r3, _08016CE8 @ =gBattlerAttacker - ldr r1, _08016CEC @ =gUnknown_2023BDE + ldr r1, _08016CEC @ =gBattlerByTurnOrder ldr r0, _08016CF0 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 @@ -13732,7 +13732,7 @@ 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] @@ -13745,13 +13745,13 @@ HandleAction_Action9: @ 8016C9C bx lr .align 2, 0 _08016CE8: .4byte gBattlerAttacker -_08016CEC: .4byte gUnknown_2023BDE +_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 _08016D10: .4byte gUnknown_2023BDA @@ -13792,7 +13792,7 @@ HandleAction_NothingIsFainted: @ 8016D3C 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 @@ -13802,7 +13802,7 @@ HandleAction_NothingIsFainted: @ 8016D3C _08016D5C: .4byte gUnknown_2023BE2 _08016D60: .4byte gUnknown_2023BE3 _08016D64: .4byte gUnknown_2023BDA -_08016D68: .4byte gUnknown_2023DD0 +_08016D68: .4byte gHitMarker _08016D6C: .4byte 0xf1e892af thumb_func_end HandleAction_NothingIsFainted @@ -13820,7 +13820,7 @@ HandleAction_ActionFinished: @ 8016D70 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 @@ -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] @@ -13869,7 +13869,7 @@ HandleAction_ActionFinished: @ 8016D70 _08016DE4: .4byte gUnknown_2023BE2 _08016DE8: .4byte gUnknown_2023BE3 _08016DEC: .4byte gUnknown_2023BDA -_08016DF0: .4byte gUnknown_2023DD0 +_08016DF0: .4byte gHitMarker _08016DF4: .4byte 0xf1e892af _08016DF8: .4byte gCurrentMove _08016DFC: .4byte gBattleMoveDamage @@ -13880,7 +13880,7 @@ _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 diff --git a/asm/battle_anim_special.s b/asm/battle_anim_special.s index 8b0422d3f..b703b8334 100644 --- a/asm/battle_anim_special.s +++ b/asm/battle_anim_special.s @@ -6192,7 +6192,7 @@ sub_80F1CE4: @ 80F1CE4 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080F1CF8 @ =gUnknown_2023E82 + ldr r2, _080F1CF8 @ =gBattleCommunication ldrb r0, [r2, 0x5] cmp r0, 0x2 bls _080F1D00 @@ -6200,7 +6200,7 @@ sub_80F1CE4: @ 80F1CE4 movs r0, 0 b _080F1D04 .align 2, 0 -_080F1CF8: .4byte gUnknown_2023E82 +_080F1CF8: .4byte gBattleCommunication _080F1CFC: .4byte gBattleAnimArgs _080F1D00: ldr r1, _080F1D10 @ =gBattleAnimArgs diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index 5afa2231e..3ded95b1d 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -2136,7 +2136,7 @@ _080E86DC: .4byte gActiveBattler _080E86E0: bl OpponentBufferExecCompleted _080E86E4: - ldr r0, _080E86FC @ =gUnknown_2023E82 + ldr r0, _080E86FC @ =gBattleCommunication movs r1, 0 strb r1, [r0, 0x7] ldr r0, _080E8700 @ =gBattleStruct @@ -2149,7 +2149,7 @@ _080E86F2: pop {r0} bx r0 .align 2, 0 -_080E86FC: .4byte gUnknown_2023E82 +_080E86FC: .4byte gBattleCommunication _080E8700: .4byte gBattleStruct thumb_func_end sub_80E85D4 diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 373d191ef..25dbe3ce3 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -33,7 +33,7 @@ _0801D784: ldrh r0, [r0, 0x28] cmp r0, 0 bne _0801D7C8 - ldr r2, _0801D7BC @ =gUnknown_2023DD0 + ldr r2, _0801D7BC @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 2 @@ -44,17 +44,17 @@ _0801D784: lsls r0, 12 orrs r1, r0 str r1, [r2] - ldr r1, _0801D7C0 @ =gUnknown_2023D74 + ldr r1, _0801D7C0 @ =gBattlescriptCurrInstr ldr r0, _0801D7C4 @ =gUnknown_81D694E b _0801DAFA .align 2, 0 _0801D7B4: .4byte gBattleMons _0801D7B8: .4byte gBattlerAttacker -_0801D7BC: .4byte gUnknown_2023DD0 -_0801D7C0: .4byte gUnknown_2023D74 +_0801D7BC: .4byte gHitMarker +_0801D7C0: .4byte gBattlescriptCurrInstr _0801D7C4: .4byte gUnknown_81D694E _0801D7C8: - bl sub_80192D4 + bl AtkCanceller_UnableToUseMove lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 @@ -85,7 +85,7 @@ _0801D7EE: adds r0, 0x24 adds r1, r0 ldrb r0, [r1] - ldr r5, _0801D854 @ =gUnknown_2023DD0 + ldr r5, _0801D854 @ =gHitMarker cmp r0, 0 bne _0801D86C ldr r0, _0801D858 @ =gCurrentMove @@ -106,7 +106,7 @@ _0801D7EE: ands r0, r1 cmp r0, 0 bne _0801D86C - ldr r1, _0801D860 @ =gUnknown_2023D74 + ldr r1, _0801D860 @ =gBattlescriptCurrInstr ldr r0, _0801D864 @ =gUnknown_81D8EA8 str r0, [r1] ldr r2, _0801D868 @ =gMoveResultFlags @@ -120,10 +120,10 @@ _0801D844: .4byte gBattlerTarget _0801D848: .4byte gBattleMons _0801D84C: .4byte gUnknown_2023D48 _0801D850: .4byte gBattlerAttacker -_0801D854: .4byte gUnknown_2023DD0 +_0801D854: .4byte gHitMarker _0801D858: .4byte gCurrentMove _0801D85C: .4byte 0x00800200 -_0801D860: .4byte gUnknown_2023D74 +_0801D860: .4byte gBattlescriptCurrInstr _0801D864: .4byte gUnknown_81D8EA8 _0801D868: .4byte gMoveResultFlags _0801D86C: @@ -148,7 +148,7 @@ _0801D86C: ands r0, r1 cmp r0, 0 bne _0801D8C4 - bl sub_801D438 + bl IsMonDisobedient lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 @@ -171,13 +171,13 @@ _0801D8B4: .align 2, 0 _0801D8C0: .4byte gMoveResultFlags _0801D8C4: - ldr r2, _0801D928 @ =gUnknown_2023DD0 + ldr r2, _0801D928 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 18 orrs r0, r1 str r0, [r2] - ldr r2, _0801D92C @ =gUnknown_2023E8C + ldr r2, _0801D92C @ =gProtectStructs ldr r1, _0801D930 @ =gBattlerTarget ldrb r3, [r1] lsls r0, r3, 4 @@ -215,18 +215,18 @@ _0801D8C4: ands r0, r2 strb r0, [r1] bl BattleScriptPushCursor - ldr r1, _0801D944 @ =gUnknown_2023D74 + ldr r1, _0801D944 @ =gBattlescriptCurrInstr ldr r0, _0801D948 @ =gUnknown_81D8FAA b _0801DAFA .align 2, 0 -_0801D928: .4byte gUnknown_2023DD0 -_0801D92C: .4byte gUnknown_2023E8C +_0801D928: .4byte gHitMarker +_0801D92C: .4byte gProtectStructs _0801D930: .4byte gBattlerTarget _0801D934: .4byte gBattleMoves _0801D938: .4byte gCurrentMove _0801D93C: .4byte gBattlerAttacker _0801D940: .4byte 0x00000115 -_0801D944: .4byte gUnknown_2023D74 +_0801D944: .4byte gBattlescriptCurrInstr _0801D948: .4byte gUnknown_81D8FAA _0801D94C: movs r2, 0 @@ -234,11 +234,11 @@ _0801D94C: ldrb r0, [r0] cmp r2, r0 bge _0801D98E - ldr r6, _0801D9CC @ =gUnknown_2023E8C + ldr r6, _0801D9CC @ =gProtectStructs ldr r1, _0801D9D0 @ =gBattleMoves mov r12, r1 adds r5, r0, 0 - ldr r7, _0801D9D4 @ =gUnknown_2023BDE + ldr r7, _0801D9D4 @ =gBattlerByTurnOrder _0801D960: adds r4, r2, r7 ldrb r3, [r4] @@ -265,7 +265,7 @@ _0801D988: cmp r2, r5 blt _0801D960 _0801D98E: - ldr r0, _0801D9DC @ =gUnknown_2023ECC + ldr r0, _0801D9DC @ =gSpecialStatuses mov r1, r8 ldrb r2, [r1] lsls r1, r2, 2 @@ -284,7 +284,7 @@ _0801D98E: movs r0, 0x1F strb r0, [r4] bl BattleScriptPushCursor - ldr r1, _0801D9E4 @ =gUnknown_2023D74 + ldr r1, _0801D9E4 @ =gBattlescriptCurrInstr ldr r0, _0801D9E8 @ =gUnknown_81D938D str r0, [r1] mov r1, r8 @@ -294,13 +294,13 @@ _0801D98E: b _0801DAFC .align 2, 0 _0801D9C8: .4byte gBattlersCount -_0801D9CC: .4byte gUnknown_2023E8C +_0801D9CC: .4byte gProtectStructs _0801D9D0: .4byte gBattleMoves -_0801D9D4: .4byte gUnknown_2023BDE +_0801D9D4: .4byte gBattlerByTurnOrder _0801D9D8: .4byte gCurrentMove -_0801D9DC: .4byte gUnknown_2023ECC +_0801D9DC: .4byte gSpecialStatuses _0801D9E0: .4byte gLastUsedAbility -_0801D9E4: .4byte gUnknown_2023D74 +_0801D9E4: .4byte gBattlescriptCurrInstr _0801D9E8: .4byte gUnknown_81D938D _0801D9EC: lsls r0, r2, 4 @@ -382,7 +382,7 @@ _0801DA5E: lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r1, _0801DAB0 @ =gUnknown_2023E82 + ldr r1, _0801DAB0 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x6] b _0801DAF4 @@ -395,7 +395,7 @@ _0801DAA0: .4byte gMoveResultFlags _0801DAA4: .4byte gUnknown_2023DA0 _0801DAA8: .4byte gBattlerTarget _0801DAAC: .4byte gUnknown_2023DA8 -_0801DAB0: .4byte gUnknown_2023E82 +_0801DAB0: .4byte gBattleCommunication _0801DAB4: ldr r0, _0801DAE0 @ =gBattlerAttacker ldrb r0, [r0] @@ -414,17 +414,17 @@ _0801DAB4: ldrb r0, [r4] strb r0, [r1, 0x17] bl BattleScriptPushCursor - ldr r1, _0801DAEC @ =gUnknown_2023D74 + ldr r1, _0801DAEC @ =gBattlescriptCurrInstr ldr r0, _0801DAF0 @ =gUnknown_81D8FC2 b _0801DAFA .align 2, 0 _0801DAE0: .4byte gBattlerAttacker _0801DAE4: .4byte 0x00000121 _0801DAE8: .4byte gBattleScripting -_0801DAEC: .4byte gUnknown_2023D74 +_0801DAEC: .4byte gBattlescriptCurrInstr _0801DAF0: .4byte gUnknown_81D8FC2 _0801DAF4: - ldr r1, _0801DB0C @ =gUnknown_2023D74 + ldr r1, _0801DB0C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 _0801DAFA: @@ -438,7 +438,7 @@ _0801DAFC: pop {r0} bx r0 .align 2, 0 -_0801DB0C: .4byte gUnknown_2023D74 +_0801DB0C: .4byte gBattlescriptCurrInstr thumb_func_end atk00_attackcanceler thumb_func_start JumpIfMoveFailed @@ -449,7 +449,7 @@ JumpIfMoveFailed: @ 801DB10 lsrs r0, 24 lsls r1, 16 lsrs r6, r1, 16 - ldr r1, _0801DB5C @ =gUnknown_2023D74 + ldr r1, _0801DB5C @ =gBattlescriptCurrInstr ldr r5, [r1] adds r4, r5, r0 ldr r0, _0801DB60 @ =gMoveResultFlags @@ -482,7 +482,7 @@ JumpIfMoveFailed: @ 801DB10 orrs r4, r0 b _0801DB8A .align 2, 0 -_0801DB5C: .4byte gUnknown_2023D74 +_0801DB5C: .4byte gBattlescriptCurrInstr _0801DB60: .4byte gMoveResultFlags _0801DB64: .4byte gUnknown_2023DA0 _0801DB68: .4byte gBattlerTarget @@ -500,7 +500,7 @@ _0801DB70: cmp r0, 0 bne _0801DB8E _0801DB8A: - ldr r0, _0801DB9C @ =gUnknown_2023D74 + ldr r0, _0801DB9C @ =gBattlescriptCurrInstr str r4, [r0] _0801DB8E: add sp, 0x4 @@ -509,13 +509,13 @@ _0801DB8E: bx r0 .align 2, 0 _0801DB98: .4byte gBattlerTarget -_0801DB9C: .4byte gUnknown_2023D74 +_0801DB9C: .4byte gBattlescriptCurrInstr thumb_func_end JumpIfMoveFailed thumb_func_start atk40_jumpifaffectedbyprotect atk40_jumpifaffectedbyprotect: @ 801DBA0 push {lr} - ldr r1, _0801DBE8 @ =gUnknown_2023E8C + ldr r1, _0801DBE8 @ =gProtectStructs ldr r0, _0801DBEC @ =gBattlerTarget ldrb r0, [r0] lsls r0, 4 @@ -544,19 +544,19 @@ atk40_jumpifaffectedbyprotect: @ 801DBA0 movs r0, 0x5 movs r1, 0 bl JumpIfMoveFailed - ldr r1, _0801DBFC @ =gUnknown_2023E82 + ldr r1, _0801DBFC @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x6] b _0801DC08 .align 2, 0 -_0801DBE8: .4byte gUnknown_2023E8C +_0801DBE8: .4byte gProtectStructs _0801DBEC: .4byte gBattlerTarget _0801DBF0: .4byte gBattleMoves _0801DBF4: .4byte gCurrentMove _0801DBF8: .4byte gMoveResultFlags -_0801DBFC: .4byte gUnknown_2023E82 +_0801DBFC: .4byte gBattleCommunication _0801DC00: - ldr r1, _0801DC0C @ =gUnknown_2023D74 + ldr r1, _0801DC0C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -564,7 +564,7 @@ _0801DC08: pop {r0} bx r0 .align 2, 0 -_0801DC0C: .4byte gUnknown_2023D74 +_0801DC0C: .4byte gBattlescriptCurrInstr thumb_func_end atk40_jumpifaffectedbyprotect thumb_func_start JumpIfMoveAffectedByProtect @@ -573,7 +573,7 @@ JumpIfMoveAffectedByProtect: @ 801DC10 lsls r0, 16 lsrs r3, r0, 16 movs r4, 0 - ldr r1, _0801DC64 @ =gUnknown_2023E8C + ldr r1, _0801DC64 @ =gProtectStructs ldr r0, _0801DC68 @ =gBattlerTarget ldrb r0, [r0] lsls r0, 4 @@ -602,7 +602,7 @@ JumpIfMoveAffectedByProtect: @ 801DC10 movs r0, 0x7 adds r1, r3, 0 bl JumpIfMoveFailed - ldr r1, _0801DC78 @ =gUnknown_2023E82 + ldr r1, _0801DC78 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x6] movs r4, 0x1 @@ -612,12 +612,12 @@ _0801DC5C: pop {r1} bx r1 .align 2, 0 -_0801DC64: .4byte gUnknown_2023E8C +_0801DC64: .4byte gProtectStructs _0801DC68: .4byte gBattlerTarget _0801DC6C: .4byte gBattleMoves _0801DC70: .4byte gCurrentMove _0801DC74: .4byte gMoveResultFlags -_0801DC78: .4byte gUnknown_2023E82 +_0801DC78: .4byte gBattleCommunication thumb_func_end JumpIfMoveAffectedByProtect thumb_func_start AccuracyCalcHelper @@ -648,7 +648,7 @@ AccuracyCalcHelper: @ 801DC7C cmp r0, r1 beq _0801DD98 _0801DCAE: - ldr r0, _0801DCEC @ =gUnknown_2023DD0 + ldr r0, _0801DCEC @ =gHitMarker ldr r1, [r0] movs r2, 0x80 lsls r2, 9 @@ -676,7 +676,7 @@ _0801DCDC: .4byte gStatuses3 _0801DCE0: .4byte gBattlerTarget _0801DCE4: .4byte gDisableStructs _0801DCE8: .4byte gBattlerAttacker -_0801DCEC: .4byte gUnknown_2023DD0 +_0801DCEC: .4byte gHitMarker _0801DCF0: .4byte gMoveResultFlags _0801DCF4: ldr r0, [r2] @@ -791,7 +791,7 @@ sub_801DDC4: @ 801DDC4 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _0801DE60 @ =gUnknown_2023D74 + ldr r0, _0801DE60 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r6, [r0, 0x5] ldrb r0, [r0, 0x6] @@ -862,7 +862,7 @@ _0801DE56: bl JumpIfMoveFailed b _0801E1C2 .align 2, 0 -_0801DE60: .4byte gUnknown_2023D74 +_0801DE60: .4byte gBattlescriptCurrInstr _0801DE64: .4byte gBattleTypeFlags _0801DE68: .4byte gBattleMoves _0801DE6C: .4byte gBattlerAttacker @@ -904,7 +904,7 @@ _0801DEA8: ands r0, r1 cmp r0, 0 beq _0801DEF0 - ldr r3, _0801DEEC @ =gUnknown_2023D74 + ldr r3, _0801DEEC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -925,7 +925,7 @@ _0801DEDC: .4byte 0x0000ffff _0801DEE0: .4byte gDisableStructs _0801DEE4: .4byte gBattlerAttacker _0801DEE8: .4byte 0x000400c0 -_0801DEEC: .4byte gUnknown_2023D74 +_0801DEEC: .4byte gBattlescriptCurrInstr _0801DEF0: movs r0, 0 bl JumpIfMoveAffectedByProtect @@ -934,13 +934,13 @@ _0801DEF0: beq _0801DEFE b _0801E1C2 _0801DEFE: - ldr r1, _0801DF08 @ =gUnknown_2023D74 + ldr r1, _0801DF08 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x7 str r0, [r1] b _0801E1C2 .align 2, 0 -_0801DF08: .4byte gUnknown_2023D74 +_0801DF08: .4byte gBattlescriptCurrInstr _0801DF0C: cmp r6, 0 bne _0801DF14 @@ -1255,7 +1255,7 @@ _0801E150: cmp r0, 0x20 bne _0801E1B0 _0801E192: - ldr r1, _0801E1AC @ =gUnknown_2023E82 + ldr r1, _0801E1AC @ =gBattleCommunication movs r0, 0x2 b _0801E1B4 .align 2, 0 @@ -1264,9 +1264,9 @@ _0801E19C: .4byte gBattlerTarget _0801E1A0: .4byte gMoveResultFlags _0801E1A4: .4byte gBattleTypeFlags _0801E1A8: .4byte gBattleMoves -_0801E1AC: .4byte gUnknown_2023E82 +_0801E1AC: .4byte gBattleCommunication _0801E1B0: - ldr r1, _0801E1D4 @ =gUnknown_2023E82 + ldr r1, _0801E1D4 @ =gBattleCommunication movs r0, 0 _0801E1B4: strb r0, [r1, 0x6] @@ -1285,7 +1285,7 @@ _0801E1C2: pop {r0} bx r0 .align 2, 0 -_0801E1D4: .4byte gUnknown_2023E82 +_0801E1D4: .4byte gBattleCommunication thumb_func_end sub_801DDC4 thumb_func_start atk02_attackstring @@ -1295,7 +1295,7 @@ atk02_attackstring: @ 801E1D8 ldr r5, [r0] cmp r5, 0 bne _0801E210 - ldr r4, _0801E21C @ =gUnknown_2023DD0 + ldr r4, _0801E21C @ =gHitMarker ldr r0, [r4] movs r1, 0xC0 lsls r1, 3 @@ -1312,11 +1312,11 @@ atk02_attackstring: @ 801E1D8 orrs r0, r1 str r0, [r4] _0801E204: - ldr r0, _0801E224 @ =gUnknown_2023D74 + ldr r0, _0801E224 @ =gBattlescriptCurrInstr ldr r1, [r0] adds r1, 0x1 str r1, [r0] - ldr r0, _0801E228 @ =gUnknown_2023E82 + ldr r0, _0801E228 @ =gBattleCommunication strb r5, [r0, 0x7] _0801E210: pop {r4,r5} @@ -1324,10 +1324,10 @@ _0801E210: bx r0 .align 2, 0 _0801E218: .4byte gBattleControllerExecFlags -_0801E21C: .4byte gUnknown_2023DD0 +_0801E21C: .4byte gHitMarker _0801E220: .4byte gBattlerAttacker -_0801E224: .4byte gUnknown_2023D74 -_0801E228: .4byte gUnknown_2023E82 +_0801E224: .4byte gBattlescriptCurrInstr +_0801E228: .4byte gBattleCommunication thumb_func_end atk02_attackstring thumb_func_start atk03_ppreduce @@ -1345,7 +1345,7 @@ atk03_ppreduce: @ 801E22C beq _0801E244 b _0801E3DE _0801E244: - ldr r1, _0801E280 @ =gUnknown_2023ECC + ldr r1, _0801E280 @ =gSpecialStatuses ldr r2, _0801E284 @ =gBattlerAttacker ldrb r3, [r2] lsls r0, r3, 2 @@ -1375,7 +1375,7 @@ _0801E244: b _0801E2C6 .align 2, 0 _0801E27C: .4byte gBattleControllerExecFlags -_0801E280: .4byte gUnknown_2023ECC +_0801E280: .4byte gSpecialStatuses _0801E284: .4byte gBattlerAttacker _0801E288: .4byte gBattleMoves _0801E28C: .4byte gCurrentMove @@ -1425,7 +1425,7 @@ _0801E2C6: bne _0801E2E6 adds r6, 0x1 _0801E2E6: - ldr r0, _0801E350 @ =gUnknown_2023DD0 + ldr r0, _0801E350 @ =gHitMarker ldr r4, [r0] movs r0, 0xA0 lsls r0, 4 @@ -1452,7 +1452,7 @@ _0801E2E6: adds r7, r3, 0 cmp r0, 0 beq _0801E3CC - ldr r0, _0801E35C @ =gUnknown_2023E8C + ldr r0, _0801E35C @ =gProtectStructs lsls r1, r5, 4 adds r1, r0 ldrb r0, [r1, 0x2] @@ -1477,10 +1477,10 @@ _0801E2E6: .align 2, 0 _0801E348: .4byte gBattlerTarget _0801E34C: .4byte gBattleMons -_0801E350: .4byte gUnknown_2023DD0 +_0801E350: .4byte gHitMarker _0801E354: .4byte gUnknown_2023D48 _0801E358: .4byte gBattlerAttacker -_0801E35C: .4byte gUnknown_2023E8C +_0801E35C: .4byte gProtectStructs _0801E360: strb r4, [r2] _0801E362: @@ -1534,14 +1534,14 @@ _0801E362: bl BtlController_EmitSetMonData mov r7, r9 ldrb r0, [r7] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0801E3CC: - ldr r2, _0801E3FC @ =gUnknown_2023DD0 + ldr r2, _0801E3FC @ =gHitMarker ldr r0, [r2] ldr r1, _0801E400 @ =0xfffff7ff ands r0, r1 str r0, [r2] - ldr r1, _0801E404 @ =gUnknown_2023D74 + ldr r1, _0801E404 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -1558,9 +1558,9 @@ _0801E3DE: _0801E3F0: .4byte gDisableStructs _0801E3F4: .4byte gBitTable _0801E3F8: .4byte gActiveBattler -_0801E3FC: .4byte gUnknown_2023DD0 +_0801E3FC: .4byte gHitMarker _0801E400: .4byte 0xfffff7ff -_0801E404: .4byte gUnknown_2023D74 +_0801E404: .4byte gBattlescriptCurrInstr thumb_func_end atk03_ppreduce thumb_func_start sub_801E408 @@ -1755,7 +1755,7 @@ _0801E580: movs r0, 0x1 _0801E584: strb r0, [r1] - ldr r1, _0801E598 @ =gUnknown_2023D74 + ldr r1, _0801E598 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -1764,14 +1764,14 @@ _0801E584: bx r0 .align 2, 0 _0801E594: .4byte gCritMultiplier -_0801E598: .4byte gUnknown_2023D74 +_0801E598: .4byte gBattlescriptCurrInstr thumb_func_end sub_801E408 thumb_func_start atk05_damagecalc atk05_damagecalc: @ 801E59C push {r4-r7,lr} sub sp, 0x10 - ldr r4, _0801E654 @ =gSideAffecting + ldr r4, _0801E654 @ =gSideStatuses ldr r5, _0801E658 @ =gBattlerTarget ldrb r0, [r5] bl GetBattlerPosition @@ -1834,7 +1834,7 @@ atk05_damagecalc: @ 801E59C lsls r0, r3, 1 str r0, [r4] _0801E620: - ldr r1, _0801E684 @ =gUnknown_2023E8C + ldr r1, _0801E684 @ =gProtectStructs ldr r0, _0801E65C @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -1851,7 +1851,7 @@ _0801E620: bl __divsi3 str r0, [r4] _0801E642: - ldr r1, _0801E688 @ =gUnknown_2023D74 + ldr r1, _0801E688 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -1860,7 +1860,7 @@ _0801E642: pop {r0} bx r0 .align 2, 0 -_0801E654: .4byte gSideAffecting +_0801E654: .4byte gSideStatuses _0801E658: .4byte gBattlerTarget _0801E65C: .4byte gBattlerAttacker _0801E660: .4byte gBattleMons @@ -1872,8 +1872,8 @@ _0801E674: .4byte gCritMultiplier _0801E678: .4byte gBattleScripting _0801E67C: .4byte gStatuses3 _0801E680: .4byte gBattleMoves -_0801E684: .4byte gUnknown_2023E8C -_0801E688: .4byte gUnknown_2023D74 +_0801E684: .4byte gProtectStructs +_0801E688: .4byte gBattlescriptCurrInstr thumb_func_end atk05_damagecalc thumb_func_start AI_CalcDmg @@ -1887,7 +1887,7 @@ AI_CalcDmg: @ 801E68C lsrs r7, r0, 24 lsls r5, 24 lsrs r5, 24 - ldr r4, _0801E744 @ =gSideAffecting + ldr r4, _0801E744 @ =gSideStatuses adds r0, r5, 0 bl GetBattlerPosition movs r1, 0x1 @@ -1948,7 +1948,7 @@ AI_CalcDmg: @ 801E68C lsls r0, r3, 1 str r0, [r4] _0801E71A: - ldr r0, _0801E76C @ =gUnknown_2023E8C + ldr r0, _0801E76C @ =gProtectStructs lsls r1, r7, 4 adds r1, r0 ldrb r0, [r1] @@ -1970,7 +1970,7 @@ _0801E738: pop {r0} bx r0 .align 2, 0 -_0801E744: .4byte gSideAffecting +_0801E744: .4byte gSideStatuses _0801E748: .4byte gBattleMons _0801E74C: .4byte gCurrentMove _0801E750: .4byte gDynamicBasePower @@ -1980,7 +1980,7 @@ _0801E75C: .4byte gCritMultiplier _0801E760: .4byte gBattleScripting _0801E764: .4byte gStatuses3 _0801E768: .4byte gBattleMoves -_0801E76C: .4byte gUnknown_2023E8C +_0801E76C: .4byte gProtectStructs thumb_func_end AI_CalcDmg thumb_func_start ModulateDmgByType @@ -2193,7 +2193,7 @@ _0801E8C0: lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r0, _0801E934 @ =gUnknown_2023E82 + ldr r0, _0801E934 @ =gBattleCommunication mov r1, r8 strb r1, [r0, 0x6] ldrb r0, [r4] @@ -2210,7 +2210,7 @@ _0801E924: .4byte gLastUsedAbility _0801E928: .4byte gMoveResultFlags _0801E92C: .4byte gUnknown_2023DA0 _0801E930: .4byte gUnknown_2023DA8 -_0801E934: .4byte gUnknown_2023E82 +_0801E934: .4byte gBattleCommunication _0801E938: ldr r1, _0801E944 @ =gUnknown_824F050 adds r0, r3, r1 @@ -2350,7 +2350,7 @@ _0801EA10: lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r1, _0801EAAC @ =gUnknown_2023E82 + ldr r1, _0801EAAC @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x6] ldrb r0, [r5] @@ -2363,7 +2363,7 @@ _0801EA52: ands r0, r1 cmp r0, 0 beq _0801EA70 - ldr r2, _0801EAB0 @ =gUnknown_2023E8C + ldr r2, _0801EAB0 @ =gProtectStructs ldr r0, _0801EA90 @ =gBattlerAttacker ldrb r1, [r0] lsls r1, 4 @@ -2373,7 +2373,7 @@ _0801EA52: orrs r0, r2 strb r0, [r1, 0x1] _0801EA70: - ldr r1, _0801EAB4 @ =gUnknown_2023D74 + ldr r1, _0801EAB4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -2394,9 +2394,9 @@ _0801EA9C: .4byte gBattleMoves _0801EAA0: .4byte gLastUsedAbility _0801EAA4: .4byte gUnknown_2023DA0 _0801EAA8: .4byte gUnknown_2023DA8 -_0801EAAC: .4byte gUnknown_2023E82 -_0801EAB0: .4byte gUnknown_2023E8C -_0801EAB4: .4byte gUnknown_2023D74 +_0801EAAC: .4byte gBattleCommunication +_0801EAB0: .4byte gProtectStructs +_0801EAB4: .4byte gBattlescriptCurrInstr thumb_func_end atk06_typecalc thumb_func_start CheckWonderGuardAndLevitate @@ -2460,7 +2460,7 @@ _0801EB08: bne _0801EB4C ldr r0, _0801EB44 @ =gLastUsedAbility strb r1, [r0] - ldr r0, _0801EB48 @ =gUnknown_2023E82 + ldr r0, _0801EB48 @ =gBattleCommunication mov r1, r12 strb r1, [r0, 0x6] ldrb r0, [r3] @@ -2471,7 +2471,7 @@ _0801EB08: _0801EB3C: .4byte gBattleMons _0801EB40: .4byte gBattlerTarget _0801EB44: .4byte gLastUsedAbility -_0801EB48: .4byte gUnknown_2023E82 +_0801EB48: .4byte gBattleCommunication _0801EB4C: ldr r1, _0801EB58 @ =gUnknown_824F050 adds r0, r5, r1 @@ -2510,7 +2510,7 @@ _0801EB66: movs r1, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, _0801ED28 @ =gUnknown_2023E8C + ldr r1, _0801ED28 @ =gProtectStructs ldr r0, _0801ED2C @ =gBattlerAttacker ldrb r2, [r0] lsls r2, 4 @@ -2546,7 +2546,7 @@ _0801EBA6: movs r1, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, _0801ED28 @ =gUnknown_2023E8C + ldr r1, _0801ED28 @ =gProtectStructs ldr r0, _0801ED2C @ =gBattlerAttacker ldrb r2, [r0] lsls r2, 4 @@ -2704,7 +2704,7 @@ _0801ECC2: beq _0801ED18 ldr r0, _0801ED34 @ =gLastUsedAbility strb r4, [r0] - ldr r1, _0801ED38 @ =gUnknown_2023E82 + ldr r1, _0801ED38 @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x6] mov r1, r8 @@ -2720,11 +2720,11 @@ _0801ED18: bx r0 .align 2, 0 _0801ED24: .4byte gMoveResultFlags -_0801ED28: .4byte gUnknown_2023E8C +_0801ED28: .4byte gProtectStructs _0801ED2C: .4byte gBattlerAttacker _0801ED30: .4byte gBattleMoves _0801ED34: .4byte gLastUsedAbility -_0801ED38: .4byte gUnknown_2023E82 +_0801ED38: .4byte gBattleCommunication thumb_func_end CheckWonderGuardAndLevitate thumb_func_start ModulateDmgByType2 @@ -3322,7 +3322,7 @@ _0801F186: ldrb r0, [r5] movs r1, 0x27 bl sub_80C7208 - ldr r2, _0801F250 @ =gUnknown_2023ECC + ldr r2, _0801F250 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -3358,14 +3358,14 @@ _0801F1C4: ldrb r0, [r0] cmp r0, 0x65 beq _0801F216 - ldr r0, _0801F260 @ =gUnknown_2023E8C + ldr r0, _0801F260 @ =gProtectStructs lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 blt _0801F216 - ldr r0, _0801F250 @ =gUnknown_2023ECC + ldr r0, _0801F250 @ =gSpecialStatuses lsls r1, r4, 2 adds r1, r4 lsls r1, 2 @@ -3386,7 +3386,7 @@ _0801F216: bgt _0801F294 subs r0, r1, 0x1 str r0, [r2] - ldr r1, _0801F260 @ =gUnknown_2023E8C + ldr r1, _0801F260 @ =gProtectStructs ldrb r3, [r3] lsls r0, r3, 4 adds r0, r1 @@ -3403,15 +3403,15 @@ _0801F216: .align 2, 0 _0801F248: .4byte gPotentialItemEffectBattler _0801F24C: .4byte gBattlerTarget -_0801F250: .4byte gUnknown_2023ECC +_0801F250: .4byte gSpecialStatuses _0801F254: .4byte gBattleMons _0801F258: .4byte gBattleMoves _0801F25C: .4byte gCurrentMove -_0801F260: .4byte gUnknown_2023E8C +_0801F260: .4byte gProtectStructs _0801F264: .4byte gBattleMoveDamage _0801F268: .4byte gMoveResultFlags _0801F26C: - ldr r0, _0801F2A4 @ =gUnknown_2023ECC + ldr r0, _0801F2A4 @ =gSpecialStatuses lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -3432,7 +3432,7 @@ _0801F26C: ldrh r0, [r0, 0x2E] strh r0, [r1] _0801F294: - ldr r1, _0801F2B0 @ =gUnknown_2023D74 + ldr r1, _0801F2B0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3440,10 +3440,10 @@ _0801F294: pop {r0} bx r0 .align 2, 0 -_0801F2A4: .4byte gUnknown_2023ECC +_0801F2A4: .4byte gSpecialStatuses _0801F2A8: .4byte gMoveResultFlags _0801F2AC: .4byte gLastUsedItem -_0801F2B0: .4byte gUnknown_2023D74 +_0801F2B0: .4byte gBattlescriptCurrInstr thumb_func_end atk07_adjustnormaldamage thumb_func_start atk08_adjustnormaldamage2 @@ -3526,7 +3526,7 @@ _0801F336: ldrb r0, [r5] movs r1, 0x27 bl sub_80C7208 - ldr r2, _0801F3E4 @ =gUnknown_2023ECC + ldr r2, _0801F3E4 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -3552,14 +3552,14 @@ _0801F374: ands r0, r1 cmp r0, 0 bne _0801F420 - ldr r5, _0801F3EC @ =gUnknown_2023E8C + ldr r5, _0801F3EC @ =gProtectStructs lsls r0, r2, 4 adds r0, r5 ldrb r0, [r0] lsls r0, 30 cmp r0, 0 blt _0801F3B2 - ldr r0, _0801F3E4 @ =gUnknown_2023ECC + ldr r0, _0801F3E4 @ =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -3593,13 +3593,13 @@ _0801F3B2: .align 2, 0 _0801F3DC: .4byte gPotentialItemEffectBattler _0801F3E0: .4byte gBattlerTarget -_0801F3E4: .4byte gUnknown_2023ECC +_0801F3E4: .4byte gSpecialStatuses _0801F3E8: .4byte gBattleMons -_0801F3EC: .4byte gUnknown_2023E8C +_0801F3EC: .4byte gProtectStructs _0801F3F0: .4byte gBattleMoveDamage _0801F3F4: .4byte gMoveResultFlags _0801F3F8: - ldr r0, _0801F430 @ =gUnknown_2023ECC + ldr r0, _0801F430 @ =gSpecialStatuses lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -3620,7 +3620,7 @@ _0801F3F8: ldrh r0, [r0, 0x2E] strh r0, [r1] _0801F420: - ldr r1, _0801F43C @ =gUnknown_2023D74 + ldr r1, _0801F43C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3628,10 +3628,10 @@ _0801F420: pop {r0} bx r0 .align 2, 0 -_0801F430: .4byte gUnknown_2023ECC +_0801F430: .4byte gSpecialStatuses _0801F434: .4byte gMoveResultFlags _0801F438: .4byte gLastUsedItem -_0801F43C: .4byte gUnknown_2023D74 +_0801F43C: .4byte gBattlescriptCurrInstr thumb_func_end atk08_adjustnormaldamage2 thumb_func_start atk09_attackanimation @@ -3646,7 +3646,7 @@ atk09_attackanimation: @ 801F440 beq _0801F452 b _0801F572 _0801F452: - ldr r0, _0801F48C @ =gUnknown_2023DD0 + ldr r0, _0801F48C @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -3658,7 +3658,7 @@ _0801F452: beq _0801F4A0 cmp r0, 0xA4 beq _0801F4A0 - ldr r4, _0801F494 @ =gUnknown_2023D74 + ldr r4, _0801F494 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -3674,9 +3674,9 @@ _0801F452: b _0801F572 .align 2, 0 _0801F488: .4byte gBattleControllerExecFlags -_0801F48C: .4byte gUnknown_2023DD0 +_0801F48C: .4byte gHitMarker _0801F490: .4byte gCurrentMove -_0801F494: .4byte gUnknown_2023D74 +_0801F494: .4byte gBattlescriptCurrInstr _0801F498: .4byte gUnknown_81D89F1 _0801F49C: .4byte gBattleScripting _0801F4A0: @@ -3751,9 +3751,9 @@ _0801F4CE: strb r0, [r6, 0x19] mov r1, r8 ldrb r0, [r1] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0801F530: - ldr r1, _0801F560 @ =gUnknown_2023D74 + ldr r1, _0801F560 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3768,9 +3768,9 @@ _0801F550: .4byte gBattleMovePower _0801F554: .4byte gBattleMoveDamage _0801F558: .4byte gBattleMons _0801F55C: .4byte gDisableStructs -_0801F560: .4byte gUnknown_2023D74 +_0801F560: .4byte gBattlescriptCurrInstr _0801F564: - ldr r4, _0801F580 @ =gUnknown_2023D74 + ldr r4, _0801F580 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -3784,7 +3784,7 @@ _0801F572: pop {r0} bx r0 .align 2, 0 -_0801F580: .4byte gUnknown_2023D74 +_0801F580: .4byte gBattlescriptCurrInstr _0801F584: .4byte gUnknown_81D89F1 thumb_func_end atk09_attackanimation @@ -3795,7 +3795,7 @@ sub_801F588: @ 801F588 ldr r0, [r0] cmp r0, 0 bne _0801F59A - ldr r1, _0801F5A4 @ =gUnknown_2023D74 + ldr r1, _0801F5A4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3804,7 +3804,7 @@ _0801F59A: bx r0 .align 2, 0 _0801F5A0: .4byte gBattleControllerExecFlags -_0801F5A4: .4byte gUnknown_2023D74 +_0801F5A4: .4byte gBattlescriptCurrInstr thumb_func_end sub_801F588 thumb_func_start atk0B_healthbarupdate @@ -3820,10 +3820,10 @@ atk0B_healthbarupdate: @ 801F5A8 ands r0, r1 cmp r0, 0 bne _0801F662 - ldr r0, _0801F614 @ =gUnknown_2023D74 + ldr r0, _0801F614 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r2, _0801F618 @ =gActiveBattler strb r0, [r2] ldr r1, _0801F61C @ =gBattleMons @@ -3846,7 +3846,7 @@ atk0B_healthbarupdate: @ 801F5A8 ldrb r0, [r1, 0xA] cmp r0, 0 beq _0801F628 - ldr r0, _0801F624 @ =gUnknown_2023DD0 + ldr r0, _0801F624 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -3860,11 +3860,11 @@ atk0B_healthbarupdate: @ 801F5A8 .align 2, 0 _0801F60C: .4byte gBattleControllerExecFlags _0801F610: .4byte gMoveResultFlags -_0801F614: .4byte gUnknown_2023D74 +_0801F614: .4byte gBattlescriptCurrInstr _0801F618: .4byte gActiveBattler _0801F61C: .4byte gBattleMons _0801F620: .4byte gDisableStructs -_0801F624: .4byte gUnknown_2023DD0 +_0801F624: .4byte gHitMarker _0801F628: ldr r0, _0801F670 @ =gBattleMoveDamage ldr r0, [r0] @@ -3878,7 +3878,7 @@ _0801F636: bl BtlController_EmitHealthBarUpdate ldr r4, _0801F678 @ =gActiveBattler ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldrb r0, [r4] bl GetBattlerSide lsls r0, 24 @@ -3894,7 +3894,7 @@ _0801F636: orrs r1, r2 strb r1, [r0, 0x5] _0801F662: - ldr r1, _0801F680 @ =gUnknown_2023D74 + ldr r1, _0801F680 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -3907,7 +3907,7 @@ _0801F670: .4byte gBattleMoveDamage _0801F674: .4byte 0x00002710 _0801F678: .4byte gActiveBattler _0801F67C: .4byte gBattleResults -_0801F680: .4byte gUnknown_2023D74 +_0801F680: .4byte gBattlescriptCurrInstr thumb_func_end atk0B_healthbarupdate thumb_func_start atk0C_datahpupdate @@ -3953,10 +3953,10 @@ _0801F6C4: beq _0801F6D2 b _0801FA34 _0801F6D2: - ldr r0, _0801F75C @ =gUnknown_2023D74 + ldr r0, _0801F75C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r7, _0801F760 @ =gActiveBattler strb r0, [r7] ldr r1, _0801F764 @ =gBattleMons @@ -3980,7 +3980,7 @@ _0801F6D2: mov r12, r0 cmp r1, 0 beq _0801F7E8 - ldr r0, _0801F76C @ =gUnknown_2023DD0 + ldr r0, _0801F76C @ =gHitMarker ldr r3, [r0] movs r0, 0x80 lsls r0, 1 @@ -3992,7 +3992,7 @@ _0801F6D2: ldr r4, [r6] cmp r5, r4 blt _0801F77C - ldr r0, _0801F774 @ =gUnknown_2023ECC + ldr r0, _0801F774 @ =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -4020,16 +4020,16 @@ _0801F736: _0801F750: .4byte gBattleMoves _0801F754: .4byte gCurrentMove _0801F758: .4byte gMoveResultFlags -_0801F75C: .4byte gUnknown_2023D74 +_0801F75C: .4byte gBattlescriptCurrInstr _0801F760: .4byte gActiveBattler _0801F764: .4byte gBattleMons _0801F768: .4byte gDisableStructs -_0801F76C: .4byte gUnknown_2023DD0 +_0801F76C: .4byte gHitMarker _0801F770: .4byte gBattleMoveDamage -_0801F774: .4byte gUnknown_2023ECC +_0801F774: .4byte gSpecialStatuses _0801F778: .4byte gUnknown_2023D54 _0801F77C: - ldr r0, _0801F7D4 @ =gUnknown_2023ECC + ldr r0, _0801F7D4 @ =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -4066,7 +4066,7 @@ _0801F7AC: beq _0801F7C0 b _0801FA5A _0801F7C0: - ldr r4, _0801F7E0 @ =gUnknown_2023D74 + ldr r4, _0801F7E0 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x2 str r0, [r4] @@ -4075,13 +4075,13 @@ _0801F7C0: str r0, [r4] b _0801FA62 .align 2, 0 -_0801F7D4: .4byte gUnknown_2023ECC +_0801F7D4: .4byte gSpecialStatuses _0801F7D8: .4byte gUnknown_2023D54 _0801F7DC: .4byte gActiveBattler -_0801F7E0: .4byte gUnknown_2023D74 +_0801F7E0: .4byte gBattlescriptCurrInstr _0801F7E4: .4byte gUnknown_81D9526 _0801F7E8: - ldr r0, _0801F828 @ =gUnknown_2023DD0 + ldr r0, _0801F828 @ =gHitMarker ldr r2, [r0] ldr r1, _0801F82C @ =0xfffffeff ands r2, r1 @@ -4115,7 +4115,7 @@ _0801F824: strh r3, [r1, 0x28] b _0801F9FA .align 2, 0 -_0801F828: .4byte gUnknown_2023DD0 +_0801F828: .4byte gHitMarker _0801F82C: .4byte 0xfffffeff _0801F830: .4byte gBattleMoveDamage _0801F834: .4byte gBattleMons @@ -4135,7 +4135,7 @@ _0801F83C: .align 2, 0 _0801F854: .4byte gActiveBattler _0801F858: - ldr r0, _0801F880 @ =gUnknown_2023D58 + ldr r0, _0801F880 @ =gTakenDmg ldr r2, _0801F884 @ =gActiveBattler ldrb r1, [r2] lsls r1, 2 @@ -4143,25 +4143,25 @@ _0801F858: ldr r0, [r1] adds r0, r5 str r0, [r1] - ldr r0, _0801F888 @ =gUnknown_2023D74 + ldr r0, _0801F888 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] adds r5, r2, 0 cmp r0, 0 bne _0801F894 - ldr r1, _0801F88C @ =gUnknown_2023DD8 + ldr r1, _0801F88C @ =gTakenDmgByBattler ldrb r0, [r5] adds r0, r1 ldr r1, _0801F890 @ =gBattlerAttacker b _0801F89C .align 2, 0 -_0801F880: .4byte gUnknown_2023D58 +_0801F880: .4byte gTakenDmg _0801F884: .4byte gActiveBattler -_0801F888: .4byte gUnknown_2023D74 -_0801F88C: .4byte gUnknown_2023DD8 +_0801F888: .4byte gBattlescriptCurrInstr +_0801F88C: .4byte gTakenDmgByBattler _0801F890: .4byte gBattlerAttacker _0801F894: - ldr r1, _0801F8C0 @ =gUnknown_2023DD8 + ldr r1, _0801F8C0 @ =gTakenDmgByBattler ldrb r0, [r5] adds r0, r1 ldr r1, _0801F8C4 @ =gBattlerTarget @@ -4185,7 +4185,7 @@ _0801F8A0: adds r7, r0, 0 b _0801F8E0 .align 2, 0 -_0801F8C0: .4byte gUnknown_2023DD8 +_0801F8C0: .4byte gTakenDmgByBattler _0801F8C4: .4byte gBattlerTarget _0801F8C8: .4byte gBattleMons _0801F8CC: .4byte gUnknown_2023D54 @@ -4199,7 +4199,7 @@ _0801F8D0: strh r1, [r0, 0x28] adds r7, r2, 0 _0801F8E0: - ldr r2, _0801F958 @ =gUnknown_2023ECC + ldr r2, _0801F958 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -4233,7 +4233,7 @@ _0801F908: ldrh r0, [r0] cmp r0, 0xDC beq _0801F98C - ldr r3, _0801F960 @ =gUnknown_2023E8C + ldr r3, _0801F960 @ =gProtectStructs ldrb r0, [r5] lsls r0, 4 adds r1, r3, 0x4 @@ -4248,7 +4248,7 @@ _0801F908: adds r1, 0x8 adds r0, r1 str r2, [r0] - ldr r0, _0801F964 @ =gUnknown_2023D74 + ldr r0, _0801F964 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -4260,10 +4260,10 @@ _0801F908: b _0801F974 .align 2, 0 _0801F954: .4byte gUnknown_2023D54 -_0801F958: .4byte gUnknown_2023ECC +_0801F958: .4byte gSpecialStatuses _0801F95C: .4byte gCurrentMove -_0801F960: .4byte gUnknown_2023E8C -_0801F964: .4byte gUnknown_2023D74 +_0801F960: .4byte gProtectStructs +_0801F964: .4byte gBattlescriptCurrInstr _0801F968: .4byte gBattlerAttacker _0801F96C: ldrb r0, [r5] @@ -4294,7 +4294,7 @@ _0801F990: ands r0, r1 cmp r0, 0 bne _0801F9FA - ldr r3, _0801F9D4 @ =gUnknown_2023E8C + ldr r3, _0801F9D4 @ =gProtectStructs ldrb r0, [r5] lsls r0, 4 adds r1, r3, 0 @@ -4310,7 +4310,7 @@ _0801F990: adds r1, 0xC adds r0, r1 str r2, [r0] - ldr r0, _0801F9D8 @ =gUnknown_2023D74 + ldr r0, _0801F9D8 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -4321,8 +4321,8 @@ _0801F990: ldr r2, _0801F9DC @ =gBattlerAttacker b _0801F9E8 .align 2, 0 -_0801F9D4: .4byte gUnknown_2023E8C -_0801F9D8: .4byte gUnknown_2023D74 +_0801F9D4: .4byte gProtectStructs +_0801F9D8: .4byte gBattlescriptCurrInstr _0801F9DC: .4byte gBattlerAttacker _0801F9E0: ldrb r0, [r5] @@ -4358,20 +4358,20 @@ _0801F9FA: movs r3, 0x2 bl BtlController_EmitSetMonData ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _0801FA5A .align 2, 0 _0801FA28: .4byte gBattlerTarget _0801FA2C: .4byte 0xffefffff _0801FA30: .4byte gUnknown_2023C0C _0801FA34: - ldr r0, _0801FA6C @ =gUnknown_2023D74 + ldr r0, _0801FA6C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r1, _0801FA70 @ =gActiveBattler strb r0, [r1] - ldr r2, _0801FA74 @ =gUnknown_2023ECC + ldr r2, _0801FA74 @ =gSpecialStatuses ldrb r1, [r1] lsls r0, r1, 2 adds r0, r1 @@ -4384,7 +4384,7 @@ _0801FA34: ldr r0, _0801FA78 @ =0x0000ffff str r0, [r1] _0801FA5A: - ldr r1, _0801FA6C @ =gUnknown_2023D74 + ldr r1, _0801FA6C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -4394,9 +4394,9 @@ _0801FA62: pop {r0} bx r0 .align 2, 0 -_0801FA6C: .4byte gUnknown_2023D74 +_0801FA6C: .4byte gBattlescriptCurrInstr _0801FA70: .4byte gActiveBattler -_0801FA74: .4byte gUnknown_2023ECC +_0801FA74: .4byte gSpecialStatuses _0801FA78: .4byte 0x0000ffff thumb_func_end atk0C_datahpupdate @@ -4421,11 +4421,11 @@ atk0D_critmessage: @ 801FA7C ldrb r1, [r0] movs r0, 0xD9 bl PrepareStringBattle - ldr r1, _0801FAC8 @ =gUnknown_2023E82 + ldr r1, _0801FAC8 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x7] _0801FAAA: - ldr r1, _0801FACC @ =gUnknown_2023D74 + ldr r1, _0801FACC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -4437,8 +4437,8 @@ _0801FAB8: .4byte gBattleControllerExecFlags _0801FABC: .4byte gCritMultiplier _0801FAC0: .4byte gMoveResultFlags _0801FAC4: .4byte gBattlerAttacker -_0801FAC8: .4byte gUnknown_2023E82 -_0801FACC: .4byte gUnknown_2023D74 +_0801FAC8: .4byte gBattleCommunication +_0801FACC: .4byte gBattlescriptCurrInstr thumb_func_end atk0D_critmessage thumb_func_start atk0E_effectivenesssound @@ -4498,7 +4498,7 @@ _0801FB32: _0801FB36: bl BtlController_EmitPlaySE ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _0801FB88 _0801FB42: ldrb r1, [r1] @@ -4520,7 +4520,7 @@ _0801FB5E: bl BtlController_EmitPlaySE ldr r0, _0801FB6C @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _0801FB88 .align 2, 0 _0801FB6C: .4byte gActiveBattler @@ -4534,9 +4534,9 @@ _0801FB70: bl BtlController_EmitPlaySE ldr r0, _0801FB98 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0801FB88: - ldr r1, _0801FB9C @ =gUnknown_2023D74 + ldr r1, _0801FB9C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -4546,7 +4546,7 @@ _0801FB90: bx r0 .align 2, 0 _0801FB98: .4byte gActiveBattler -_0801FB9C: .4byte gUnknown_2023D74 +_0801FB9C: .4byte gBattlescriptCurrInstr thumb_func_end atk0E_effectivenesssound thumb_func_start atk0F_resultmessage @@ -4565,7 +4565,7 @@ _0801FBAE: adds r0, r4, 0 ands r0, r2 adds r6, r1, 0 - ldr r7, _0801FBE4 @ =gUnknown_2023E82 + ldr r7, _0801FBE4 @ =gBattleCommunication cmp r0, 0 beq _0801FBEC movs r0, 0x8 @@ -4586,7 +4586,7 @@ _0801FBCE: .align 2, 0 _0801FBDC: .4byte gBattleControllerExecFlags _0801FBE0: .4byte gMoveResultFlags -_0801FBE4: .4byte gUnknown_2023E82 +_0801FBE4: .4byte gBattleCommunication _0801FBE8: .4byte gUnknown_83FE514 _0801FBEC: movs r0, 0x1 @@ -4652,7 +4652,7 @@ _0801FC38: ands r0, r5 strb r0, [r6] bl BattleScriptPushCursor - ldr r1, _0801FC70 @ =gUnknown_2023D74 + ldr r1, _0801FC70 @ =gBattlescriptCurrInstr ldr r0, _0801FC74 @ =gUnknown_81D9641 b _0801FD3E .align 2, 0 @@ -4660,7 +4660,7 @@ _0801FC60: .4byte gLastUsedItem _0801FC64: .4byte gBattleMons _0801FC68: .4byte gBattlerTarget _0801FC6C: .4byte gPotentialItemEffectBattler -_0801FC70: .4byte gUnknown_2023D74 +_0801FC70: .4byte gBattlescriptCurrInstr _0801FC74: .4byte gUnknown_81D9641 _0801FC78: adds r2, r6, 0 @@ -4685,11 +4685,11 @@ _0801FC88: ands r0, r1 strb r0, [r2] bl BattleScriptPushCursor - ldr r1, _0801FCA8 @ =gUnknown_2023D74 + ldr r1, _0801FCA8 @ =gBattlescriptCurrInstr ldr r0, _0801FCAC @ =gUnknown_81D8FE4 b _0801FD3E .align 2, 0 -_0801FCA8: .4byte gUnknown_2023D74 +_0801FCA8: .4byte gBattlescriptCurrInstr _0801FCAC: .4byte gUnknown_81D8FE4 _0801FCB0: movs r0, 0x40 @@ -4700,11 +4700,11 @@ _0801FCB0: ands r0, r5 strb r0, [r2] bl BattleScriptPushCursor - ldr r1, _0801FCC8 @ =gUnknown_2023D74 + ldr r1, _0801FCC8 @ =gBattlescriptCurrInstr ldr r0, _0801FCCC @ =gUnknown_81D8FDD b _0801FD3E .align 2, 0 -_0801FCC8: .4byte gUnknown_2023D74 +_0801FCC8: .4byte gBattlescriptCurrInstr _0801FCCC: .4byte gUnknown_81D8FDD _0801FCD0: movs r0, 0x80 @@ -4727,7 +4727,7 @@ _0801FCD0: ands r0, r5 strb r0, [r6] bl BattleScriptPushCursor - ldr r1, _0801FD10 @ =gUnknown_2023D74 + ldr r1, _0801FD10 @ =gBattlescriptCurrInstr ldr r0, _0801FD14 @ =gUnknown_81D9641 b _0801FD3E .align 2, 0 @@ -4735,7 +4735,7 @@ _0801FD00: .4byte gLastUsedItem _0801FD04: .4byte gBattleMons _0801FD08: .4byte gBattlerTarget _0801FD0C: .4byte gPotentialItemEffectBattler -_0801FD10: .4byte gUnknown_2023D74 +_0801FD10: .4byte gBattlescriptCurrInstr _0801FD14: .4byte gUnknown_81D9641 _0801FD18: movs r0, 0x20 @@ -4758,7 +4758,7 @@ _0801FD2E: ldrb r1, [r1] bl PrepareStringBattle _0801FD38: - ldr r1, _0801FD4C @ =gUnknown_2023D74 + ldr r1, _0801FD4C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 _0801FD3E: @@ -4769,7 +4769,7 @@ _0801FD40: bx r0 .align 2, 0 _0801FD48: .4byte gBattlerAttacker -_0801FD4C: .4byte gUnknown_2023D74 +_0801FD4C: .4byte gBattlescriptCurrInstr thumb_func_end atk0F_resultmessage thumb_func_start atk10_printstring @@ -4779,7 +4779,7 @@ atk10_printstring: @ 801FD50 ldr r0, [r0] cmp r0, 0 bne _0801FD7A - ldr r4, _0801FD84 @ =gUnknown_2023D74 + ldr r4, _0801FD84 @ =gBattlescriptCurrInstr ldr r1, [r4] ldrb r0, [r1, 0x1] ldrb r1, [r1, 0x2] @@ -4791,7 +4791,7 @@ atk10_printstring: @ 801FD50 ldr r0, [r4] adds r0, 0x3 str r0, [r4] - ldr r1, _0801FD8C @ =gUnknown_2023E82 + ldr r1, _0801FD8C @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x7] _0801FD7A: @@ -4800,9 +4800,9 @@ _0801FD7A: bx r0 .align 2, 0 _0801FD80: .4byte gBattleControllerExecFlags -_0801FD84: .4byte gUnknown_2023D74 +_0801FD84: .4byte gBattlescriptCurrInstr _0801FD88: .4byte gBattlerAttacker -_0801FD8C: .4byte gUnknown_2023E82 +_0801FD8C: .4byte gBattleCommunication thumb_func_end atk10_printstring thumb_func_start atk11_printselectionstring @@ -4812,7 +4812,7 @@ atk11_printselectionstring: @ 801FD90 ldr r0, _0801FDC8 @ =gBattlerAttacker ldrb r0, [r0] strb r0, [r5] - ldr r4, _0801FDCC @ =gUnknown_2023D74 + ldr r4, _0801FDCC @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -4821,11 +4821,11 @@ atk11_printselectionstring: @ 801FD90 movs r0, 0 bl BtlController_EmitPrintSelectionString ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, 0x3 str r0, [r4] - ldr r1, _0801FDD0 @ =gUnknown_2023E82 + ldr r1, _0801FDD0 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x7] pop {r4,r5} @@ -4834,8 +4834,8 @@ atk11_printselectionstring: @ 801FD90 .align 2, 0 _0801FDC4: .4byte gActiveBattler _0801FDC8: .4byte gBattlerAttacker -_0801FDCC: .4byte gUnknown_2023D74 -_0801FDD0: .4byte gUnknown_2023E82 +_0801FDCC: .4byte gBattlescriptCurrInstr +_0801FDD0: .4byte gBattleCommunication thumb_func_end atk11_printselectionstring thumb_func_start atk12_waitmessage @@ -4845,21 +4845,21 @@ atk12_waitmessage: @ 801FDD4 ldr r4, [r0] cmp r4, 0 bne _0801FE22 - ldr r6, _0801FDF4 @ =gUnknown_2023E82 + ldr r6, _0801FDF4 @ =gBattleCommunication ldrb r0, [r6, 0x7] cmp r0, 0 bne _0801FDFC - ldr r1, _0801FDF8 @ =gUnknown_2023D74 + ldr r1, _0801FDF8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 str r0, [r1] b _0801FE22 .align 2, 0 _0801FDF0: .4byte gBattleControllerExecFlags -_0801FDF4: .4byte gUnknown_2023E82 -_0801FDF8: .4byte gUnknown_2023D74 +_0801FDF4: .4byte gBattleCommunication +_0801FDF8: .4byte gBattlescriptCurrInstr _0801FDFC: - ldr r5, _0801FE28 @ =gUnknown_2023D74 + ldr r5, _0801FE28 @ =gBattlescriptCurrInstr ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -4883,7 +4883,7 @@ _0801FE22: pop {r0} bx r0 .align 2, 0 -_0801FE28: .4byte gUnknown_2023D74 +_0801FE28: .4byte gBattlescriptCurrInstr _0801FE2C: .4byte gUnknown_2023E7C thumb_func_end atk12_waitmessage @@ -4894,7 +4894,7 @@ atk13_printfromtable: @ 801FE30 ldr r0, [r0] cmp r0, 0 bne _0801FE6E - ldr r4, _0801FE78 @ =gUnknown_2023D74 + ldr r4, _0801FE78 @ =gBattlescriptCurrInstr ldr r2, [r4] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -4906,7 +4906,7 @@ atk13_printfromtable: @ 801FE30 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r5, _0801FE7C @ =gUnknown_2023E82 + ldr r5, _0801FE7C @ =gBattleCommunication ldrb r0, [r5, 0x5] lsls r0, 1 adds r1, r0 @@ -4925,8 +4925,8 @@ _0801FE6E: bx r0 .align 2, 0 _0801FE74: .4byte gBattleControllerExecFlags -_0801FE78: .4byte gUnknown_2023D74 -_0801FE7C: .4byte gUnknown_2023E82 +_0801FE78: .4byte gBattlescriptCurrInstr +_0801FE7C: .4byte gBattleCommunication _0801FE80: .4byte gBattlerAttacker thumb_func_end atk13_printfromtable @@ -4937,7 +4937,7 @@ atk14_printselectionstringfromtable: @ 801FE84 ldr r0, [r0] cmp r0, 0 bne _0801FECE - ldr r5, _0801FED8 @ =gUnknown_2023D74 + ldr r5, _0801FED8 @ =gBattlescriptCurrInstr ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -4949,7 +4949,7 @@ atk14_printselectionstringfromtable: @ 801FE84 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r6, _0801FEDC @ =gUnknown_2023E82 + ldr r6, _0801FEDC @ =gBattleCommunication ldrb r0, [r6, 0x5] lsls r0, 1 adds r1, r0 @@ -4961,7 +4961,7 @@ atk14_printselectionstringfromtable: @ 801FE84 movs r0, 0 bl BtlController_EmitPrintSelectionString ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, 0x5 str r0, [r5] @@ -4973,8 +4973,8 @@ _0801FECE: bx r0 .align 2, 0 _0801FED4: .4byte gBattleControllerExecFlags -_0801FED8: .4byte gUnknown_2023D74 -_0801FEDC: .4byte gUnknown_2023E82 +_0801FED8: .4byte gBattlescriptCurrInstr +_0801FEDC: .4byte gBattleCommunication _0801FEE0: .4byte gActiveBattler _0801FEE4: .4byte gBattlerAttacker thumb_func_end atk14_printselectionstringfromtable @@ -4989,7 +4989,7 @@ BankGetTurnOrder: @ 801FEE8 ldrb r3, [r0] cmp r1, r3 bge _0801FF0E - ldr r4, _0801FF1C @ =gUnknown_2023BDE + ldr r4, _0801FF1C @ =gBattlerByTurnOrder ldrb r0, [r4] cmp r0, r2 beq _0801FF0E @@ -5009,11 +5009,11 @@ _0801FF0E: bx r1 .align 2, 0 _0801FF18: .4byte gBattlersCount -_0801FF1C: .4byte gUnknown_2023BDE +_0801FF1C: .4byte gBattlerByTurnOrder thumb_func_end BankGetTurnOrder - thumb_func_start sub_801FF20 -sub_801FF20: @ 801FF20 + thumb_func_start SetMoveEffect +SetMoveEffect: @ 801FF20 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -5029,7 +5029,7 @@ sub_801FF20: @ 801FF20 movs r7, 0 movs r1, 0x1 str r1, [sp, 0x4] - ldr r1, _0801FF64 @ =gUnknown_2023E82 + ldr r1, _0801FF64 @ =gBattleCommunication ldrb r3, [r1, 0x3] movs r0, 0x40 ands r0, r3 @@ -5048,7 +5048,7 @@ sub_801FF20: @ 801FF20 ldr r0, _0801FF74 @ =gBattlerTarget b _0801FF84 .align 2, 0 -_0801FF64: .4byte gUnknown_2023E82 +_0801FF64: .4byte gBattleCommunication _0801FF68: .4byte gEffectBattler _0801FF6C: .4byte gBattlerAttacker _0801FF70: .4byte gBattleScripting @@ -5094,7 +5094,7 @@ _0801FFB2: mov r9, r2 cmp r0, 0x13 bne _0801FFE6 - ldr r0, _080200AC @ =gUnknown_2023DD0 + ldr r0, _080200AC @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5103,7 +5103,7 @@ _0801FFB2: bne _0801FFE6 cmp r4, 0 bne _0801FFE6 - ldr r0, _080200B0 @ =gUnknown_2023E82 + ldr r0, _080200B0 @ =gBattleCommunication ldrb r0, [r0, 0x3] cmp r0, 0x9 bhi _0801FFE6 @@ -5112,7 +5112,7 @@ _0801FFE6: mov r3, r9 ldrb r0, [r3] bl GetBattlerPosition - ldr r2, _080200B4 @ =gSideAffecting + ldr r2, _080200B4 @ =gSideStatuses movs r1, 0x1 ands r1, r0 lsls r1, 1 @@ -5122,7 +5122,7 @@ _0801FFE6: ands r0, r1 cmp r0, 0 beq _08020020 - ldr r0, _080200AC @ =gUnknown_2023DD0 + ldr r0, _080200AC @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5131,7 +5131,7 @@ _0801FFE6: bne _08020020 cmp r4, 0 bne _08020020 - ldr r0, _080200B0 @ =gUnknown_2023E82 + ldr r0, _080200B0 @ =gBattleCommunication ldrb r0, [r0, 0x3] cmp r0, 0x7 bhi _08020020 @@ -5148,7 +5148,7 @@ _08020020: mov r8, r3 cmp r0, 0 bne _08020046 - ldr r0, _080200B0 @ =gUnknown_2023E82 + ldr r0, _080200B0 @ =gBattleCommunication ldrb r0, [r0, 0x3] cmp r0, 0xB beq _08020046 @@ -5173,7 +5173,7 @@ _08020046: beq _08020068 bl _080210EC _08020068: - ldr r0, _080200B0 @ =gUnknown_2023E82 + ldr r0, _080200B0 @ =gBattleCommunication ldrb r1, [r0, 0x3] adds r6, r0, 0 cmp r1, 0x6 @@ -5205,9 +5205,9 @@ _0802009C: .4byte gBattleScripting _080200A0: .4byte gBattlerAttacker _080200A4: .4byte gBattleTypeFlags _080200A8: .4byte gBattleMons -_080200AC: .4byte gUnknown_2023DD0 -_080200B0: .4byte gUnknown_2023E82 -_080200B4: .4byte gSideAffecting +_080200AC: .4byte gHitMarker +_080200B0: .4byte gBattleCommunication +_080200B4: .4byte gSideStatuses _080200B8: .4byte gUnknown_825053C _080200BC: cmp r0, 0x40 @@ -5343,14 +5343,14 @@ _080201A6: ldrb r0, [r3] movs r1, 0x11 bl sub_80C71D0 - ldr r4, _080201D8 @ =gUnknown_2023D74 + ldr r4, _080201D8 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r0, _080201DC @ =gUnknown_81D9438 _080201C0: str r0, [r4] - ldr r2, _080201E0 @ =gUnknown_2023DD0 + ldr r2, _080201E0 @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -5362,9 +5362,9 @@ _080201D2: b _080204A8 .align 2, 0 _080201D4: .4byte gLastUsedAbility -_080201D8: .4byte gUnknown_2023D74 +_080201D8: .4byte gBattlescriptCurrInstr _080201DC: .4byte gUnknown_81D9438 -_080201E0: .4byte gUnknown_2023DD0 +_080201E0: .4byte gHitMarker _080201E4: mov r1, r9 ldrb r0, [r1] @@ -5385,7 +5385,7 @@ _080201E4: cmp r0, 0x8 bne _08020222 _08020208: - ldr r0, _0802026C @ =gUnknown_2023DD0 + ldr r0, _0802026C @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5444,7 +5444,7 @@ _0802025E: _0802026A: b _08020560 .align 2, 0 -_0802026C: .4byte gUnknown_2023DD0 +_0802026C: .4byte gHitMarker _08020270: mov r2, r9 ldrb r1, [r2] @@ -5466,7 +5466,7 @@ _0802028A: ldrb r0, [r3] movs r1, 0x29 bl sub_80C71D0 - ldr r4, _080202AC @ =gUnknown_2023D74 + ldr r4, _080202AC @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -5474,7 +5474,7 @@ _0802028A: b _080201C0 .align 2, 0 _080202A8: .4byte gLastUsedAbility -_080202AC: .4byte gUnknown_2023D74 +_080202AC: .4byte gBattlescriptCurrInstr _080202B0: .4byte gUnknown_81D9420 _080202B4: mov r0, r9 @@ -5494,7 +5494,7 @@ _080202B4: cmp r0, 0xA bne _08020304 _080202D4: - ldr r0, _080202F8 @ =gUnknown_2023DD0 + ldr r0, _080202F8 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5506,15 +5506,15 @@ _080202D4: cmp r5, 0x80 bne _08020304 _080202EA: - ldr r4, _080202FC @ =gUnknown_2023D74 + ldr r4, _080202FC @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r0, _08020300 @ =gUnknown_81D9420 b _080204F4 .align 2, 0 -_080202F8: .4byte gUnknown_2023DD0 -_080202FC: .4byte gUnknown_2023D74 +_080202F8: .4byte gHitMarker +_080202FC: .4byte gBattlescriptCurrInstr _08020300: .4byte gUnknown_81D9420 _08020304: mov r3, r9 @@ -5657,7 +5657,7 @@ _08020402: ldrb r0, [r3] movs r1, 0x7 bl sub_80C71D0 - ldr r4, _08020424 @ =gUnknown_2023D74 + ldr r4, _08020424 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -5665,7 +5665,7 @@ _08020402: b _080201C0 .align 2, 0 _08020420: .4byte gLastUsedAbility -_08020424: .4byte gUnknown_2023D74 +_08020424: .4byte gBattlescriptCurrInstr _08020428: .4byte gUnknown_81D942C _0802042C: mov r0, r8 @@ -5700,13 +5700,13 @@ _0802045A: ldrb r0, [r1] movs r1, 0x11 bl sub_80C71D0 - ldr r4, _08020498 @ =gUnknown_2023D74 + ldr r4, _08020498 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r0, _0802049C @ =gUnknown_81D9438 str r0, [r4] - ldr r2, _080204A0 @ =gUnknown_2023DD0 + ldr r2, _080204A0 @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -5722,9 +5722,9 @@ _08020484: bl _0802110A .align 2, 0 _08020494: .4byte gLastUsedAbility -_08020498: .4byte gUnknown_2023D74 +_08020498: .4byte gBattlescriptCurrInstr _0802049C: .4byte gUnknown_81D9438 -_080204A0: .4byte gUnknown_2023DD0 +_080204A0: .4byte gHitMarker _080204A4: .4byte 0xffffdfff _080204A8: strb r0, [r6, 0x5] @@ -5749,7 +5749,7 @@ _080204AE: cmp r0, 0x8 bne _08020510 _080204D2: - ldr r0, _08020500 @ =gUnknown_2023DD0 + ldr r0, _08020500 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5761,22 +5761,22 @@ _080204D2: cmp r5, 0x80 bne _08020510 _080204E8: - ldr r4, _08020504 @ =gUnknown_2023D74 + ldr r4, _08020504 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r0, _08020508 @ =gUnknown_81D9438 _080204F4: str r0, [r4] - ldr r1, _0802050C @ =gUnknown_2023E82 + ldr r1, _0802050C @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] bl _0802110A .align 2, 0 -_08020500: .4byte gUnknown_2023DD0 -_08020504: .4byte gUnknown_2023D74 +_08020500: .4byte gHitMarker +_08020504: .4byte gBattlescriptCurrInstr _08020508: .4byte gUnknown_81D9438 -_0802050C: .4byte gUnknown_2023E82 +_0802050C: .4byte gBattleCommunication _08020510: mov r3, r9 ldrb r0, [r3] @@ -5834,12 +5834,12 @@ _08020570: beq _08020578 b _08020694 _08020578: - ldr r0, _080205B8 @ =gUnknown_2023D74 + ldr r0, _080205B8 @ =gBattlescriptCurrInstr ldr r0, [r0] adds r0, 0x1 bl BattleScriptPush ldr r1, _080205BC @ =gUnknown_825053C - ldr r0, _080205C0 @ =gUnknown_2023E82 + ldr r0, _080205C0 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -5863,9 +5863,9 @@ _08020578: b _080205E0 .align 2, 0 _080205B4: .4byte gMoveResultFlags -_080205B8: .4byte gUnknown_2023D74 +_080205B8: .4byte gBattlescriptCurrInstr _080205BC: .4byte gUnknown_825053C -_080205C0: .4byte gUnknown_2023E82 +_080205C0: .4byte gBattleCommunication _080205C4: .4byte gBattleMons _080205C8: .4byte gEffectBattler _080205CC: @@ -5880,9 +5880,9 @@ _080205CC: orrs r0, r3 str r0, [r1] _080205E0: - ldr r2, _08020638 @ =gUnknown_2023D74 + ldr r2, _08020638 @ =gBattlescriptCurrInstr ldr r1, _0802063C @ =gUnknown_825062C - ldr r5, _08020640 @ =gUnknown_2023E82 + ldr r5, _08020640 @ =gBattleCommunication ldrb r0, [r5, 0x3] lsls r0, 2 adds r0, r1 @@ -5904,8 +5904,8 @@ _080205E0: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r2, _0802064C @ =gUnknown_2023DD0 + bl MarkBattlerForControllerExec + ldr r2, _0802064C @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -5921,17 +5921,17 @@ _080205E0: .align 2, 0 _08020630: .4byte gBattleMons _08020634: .4byte gEffectBattler -_08020638: .4byte gUnknown_2023D74 +_08020638: .4byte gBattlescriptCurrInstr _0802063C: .4byte gUnknown_825062C -_08020640: .4byte gUnknown_2023E82 +_08020640: .4byte gBattleCommunication _08020644: .4byte gActiveBattler _08020648: .4byte gUnknown_2023C30 -_0802064C: .4byte gUnknown_2023DD0 +_0802064C: .4byte gHitMarker _08020650: .4byte 0xffffdfff _08020654: strb r0, [r5, 0x5] _08020656: - ldr r0, _08020688 @ =gUnknown_2023E82 + ldr r0, _08020688 @ =gBattleCommunication ldrb r2, [r0, 0x3] adds r6, r0, 0 cmp r2, 0x2 @@ -5949,15 +5949,15 @@ _08020670: adds r0, 0xB4 ldrb r1, [r6, 0x3] strb r1, [r0] - ldr r2, _08020690 @ =gUnknown_2023DD0 + ldr r2, _08020690 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 7 bl _08021008 .align 2, 0 -_08020688: .4byte gUnknown_2023E82 +_08020688: .4byte gBattleCommunication _0802068C: .4byte gBattleStruct -_08020690: .4byte gUnknown_2023DD0 +_08020690: .4byte gHitMarker _08020694: mov r2, r10 cmp r2, 0 @@ -6091,21 +6091,21 @@ _080207E6: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r4, _08020820 @ =gUnknown_2023D74 + ldr r4, _08020820 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r1, _08020824 @ =gUnknown_825062C - ldr r0, _08020828 @ =gUnknown_2023E82 + ldr r0, _08020828 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _08021108 .align 2, 0 -_08020820: .4byte gUnknown_2023D74 +_08020820: .4byte gBattlescriptCurrInstr _08020824: .4byte gUnknown_825062C -_08020828: .4byte gUnknown_2023E82 +_08020828: .4byte gBattleCommunication _0802082C: mov r0, r9 ldrb r2, [r0] @@ -6129,13 +6129,13 @@ _0802084C: ldrb r0, [r1] movs r1, 0x27 bl sub_80C71D0 - ldr r1, _08020868 @ =gUnknown_2023D74 + ldr r1, _08020868 @ =gBattlescriptCurrInstr ldr r0, _0802086C @ =gUnknown_81D9452 str r0, [r1] bl _0802110A .align 2, 0 _08020864: .4byte gLastUsedAbility -_08020868: .4byte gUnknown_2023D74 +_08020868: .4byte gBattlescriptCurrInstr _0802086C: .4byte gUnknown_81D9452 _08020870: adds r0, r2, 0 @@ -6156,7 +6156,7 @@ _08020886: adds r0, 0x50 adds r2, r0 ldr r1, _080208B0 @ =gUnknown_825053C - ldr r0, _080208B4 @ =gUnknown_2023E82 + ldr r0, _080208B4 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -6168,7 +6168,7 @@ _08020886: .align 2, 0 _080208AC: .4byte gUnknown_2023BE2 _080208B0: .4byte gUnknown_825053C -_080208B4: .4byte gUnknown_2023E82 +_080208B4: .4byte gBattleCommunication _080208B8: mov r3, r9 ldrb r0, [r3] @@ -6208,12 +6208,12 @@ _080208D4: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r4, _08020928 @ =gUnknown_2023D74 + ldr r4, _08020928 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r1, _0802092C @ =gUnknown_825062C - ldr r0, _08020930 @ =gUnknown_2023E82 + ldr r0, _08020930 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -6222,9 +6222,9 @@ _080208D4: .align 2, 0 _08020920: .4byte gUnknown_2023DB8 _08020924: .4byte gCurrentMove -_08020928: .4byte gUnknown_2023D74 +_08020928: .4byte gBattlescriptCurrInstr _0802092C: .4byte gUnknown_825062C -_08020930: .4byte gUnknown_2023E82 +_08020930: .4byte gBattleCommunication _08020934: ldr r5, _08020984 @ =gBattlerAttacker ldrb r0, [r5] @@ -6254,12 +6254,12 @@ _08020934: adds r0, r3, 0 strh r0, [r4] _0802096C: - ldr r4, _08020994 @ =gUnknown_2023D74 + ldr r4, _08020994 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r1, _08020998 @ =gUnknown_825062C - ldr r0, _0802099C @ =gUnknown_2023E82 + ldr r0, _0802099C @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -6270,9 +6270,9 @@ _08020984: .4byte gBattlerAttacker _08020988: .4byte gUnknown_2023E7E _0802098C: .4byte gBattleMons _08020990: .4byte 0x0000ffff -_08020994: .4byte gUnknown_2023D74 +_08020994: .4byte gBattlescriptCurrInstr _08020998: .4byte gUnknown_825062C -_0802099C: .4byte gUnknown_2023E82 +_0802099C: .4byte gBattleCommunication _080209A0: mov r4, r9 ldrb r1, [r4] @@ -6287,7 +6287,7 @@ _080209A0: b _080210EC _080209B6: bl Random - ldr r4, _080209D4 @ =gUnknown_2023E82 + ldr r4, _080209D4 @ =gBattleCommunication lsls r0, 16 lsrs r0, 16 movs r1, 0x3 @@ -6296,10 +6296,10 @@ _080209B6: strb r0, [r4, 0x3] movs r0, 0 movs r1, 0 - bl sub_801FF20 + bl SetMoveEffect b _0802110A .align 2, 0 -_080209D4: .4byte gUnknown_2023E82 +_080209D4: .4byte gBattleCommunication _080209D8: mov r0, r9 ldrb r1, [r0] @@ -6322,7 +6322,7 @@ _080209D8: ldr r1, _08020A18 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0] - ldr r0, _08020A1C @ =gUnknown_2023E8C + ldr r0, _08020A1C @ =gProtectStructs ldrb r1, [r2] lsls r1, 4 adds r1, r0 @@ -6334,7 +6334,7 @@ _080209D8: .align 2, 0 _08020A14: .4byte gUnknown_2023DB8 _08020A18: .4byte gCurrentMove -_08020A1C: .4byte gUnknown_2023E8C +_08020A1C: .4byte gProtectStructs _08020A20: mov r3, r9 ldrb r0, [r3] @@ -6386,12 +6386,12 @@ _08020A3C: ldr r0, _08020AD8 @ =gBattlerAttacker ldrb r0, [r0] strb r0, [r1, 0x14] - ldr r4, _08020ADC @ =gUnknown_2023D74 + ldr r4, _08020ADC @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r1, _08020AE0 @ =gUnknown_825062C - ldr r2, _08020AE4 @ =gUnknown_2023E82 + ldr r2, _08020AE4 @ =gBattleCommunication ldrb r0, [r2, 0x3] lsls r0, 2 adds r0, r1 @@ -6429,9 +6429,9 @@ _08020ABE: _08020AD0: .4byte gBattleStruct _08020AD4: .4byte gCurrentMove _08020AD8: .4byte gBattlerAttacker -_08020ADC: .4byte gUnknown_2023D74 +_08020ADC: .4byte gBattlescriptCurrInstr _08020AE0: .4byte gUnknown_825062C -_08020AE4: .4byte gUnknown_2023E82 +_08020AE4: .4byte gBattleCommunication _08020AE8: .4byte gUnknown_83FE664 _08020AEC: ldr r1, _08020B1C @ =gBattleMoveDamage @@ -6448,12 +6448,12 @@ _08020AF8: movs r0, 0x1 str r0, [r1] _08020B04: - ldr r4, _08020B24 @ =gUnknown_2023D74 + ldr r4, _08020B24 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r1, _08020B28 @ =gUnknown_825062C - ldr r0, _08020B2C @ =gUnknown_2023E82 + ldr r0, _08020B2C @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -6462,9 +6462,9 @@ _08020B04: .align 2, 0 _08020B1C: .4byte gBattleMoveDamage _08020B20: .4byte gUnknown_2023D54 -_08020B24: .4byte gUnknown_2023D74 +_08020B24: .4byte gBattlescriptCurrInstr _08020B28: .4byte gUnknown_825062C -_08020B2C: .4byte gUnknown_2023E82 +_08020B2C: .4byte gBattleCommunication _08020B30: ldrb r1, [r6, 0x3] adds r1, 0xF2 @@ -6486,7 +6486,7 @@ _08020B4C: ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, _08020B6C @ =gUnknown_2023D74 + ldr r4, _08020B6C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -6494,7 +6494,7 @@ _08020B4C: b _08021108 .align 2, 0 _08020B68: .4byte gBattleScripting -_08020B6C: .4byte gUnknown_2023D74 +_08020B6C: .4byte gBattlescriptCurrInstr _08020B70: .4byte gUnknown_81D6BD1 _08020B74: movs r0, 0x70 @@ -6518,7 +6518,7 @@ _08020B92: ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, _08020BB0 @ =gUnknown_2023D74 + ldr r4, _08020BB0 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -6526,7 +6526,7 @@ _08020B92: b _08021108 .align 2, 0 _08020BAC: .4byte gBattleScripting -_08020BB0: .4byte gUnknown_2023D74 +_08020BB0: .4byte gBattlescriptCurrInstr _08020BB4: .4byte gUnknown_81D6C62 _08020BB8: ldrb r1, [r6, 0x3] @@ -6549,7 +6549,7 @@ _08020BD4: ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, _08020BF4 @ =gUnknown_2023D74 + ldr r4, _08020BF4 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -6557,7 +6557,7 @@ _08020BD4: b _08021108 .align 2, 0 _08020BF0: .4byte gBattleScripting -_08020BF4: .4byte gUnknown_2023D74 +_08020BF4: .4byte gBattlescriptCurrInstr _08020BF8: .4byte gUnknown_81D6BD1 _08020BFC: movs r0, 0x60 @@ -6581,7 +6581,7 @@ _08020C1A: ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, _08020C38 @ =gUnknown_2023D74 + ldr r4, _08020C38 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -6589,7 +6589,7 @@ _08020C1A: b _08021108 .align 2, 0 _08020C34: .4byte gBattleScripting -_08020C38: .4byte gUnknown_2023D74 +_08020C38: .4byte gBattlescriptCurrInstr _08020C3C: .4byte gUnknown_81D6C62 _08020C40: mov r0, r9 @@ -6690,7 +6690,7 @@ _08020CEA: lsls r0, 3 cmp r1, r0 beq _08020D26 - ldr r0, _08020D74 @ =gUnknown_2023F20 + ldr r0, _08020D74 @ =gWishFutureKnock adds r0, 0x29 adds r0, r6, r0 ldrb r1, [r0] @@ -6725,7 +6725,7 @@ _08020D26: ldrb r0, [r0] cmp r0, 0x3C bne _08020D94 - ldr r1, _08020D88 @ =gUnknown_2023D74 + ldr r1, _08020D88 @ =gBattlescriptCurrInstr ldr r0, _08020D8C @ =gUnknown_81D948E str r0, [r1] ldr r1, _08020D90 @ =gLastUsedAbility @@ -6744,12 +6744,12 @@ _08020D64: .4byte gBattleTypeFlags _08020D68: .4byte gBattlerAttacker _08020D6C: .4byte 0x00000902 _08020D70: .4byte gTrainerBattleOpponent_A -_08020D74: .4byte gUnknown_2023F20 +_08020D74: .4byte gWishFutureKnock _08020D78: .4byte gBitTable _08020D7C: .4byte gBattlerPartyIndexes _08020D80: .4byte gBattleMons _08020D84: .4byte gBattlerTarget -_08020D88: .4byte gUnknown_2023D74 +_08020D88: .4byte gBattlescriptCurrInstr _08020D8C: .4byte gUnknown_81D948E _08020D90: .4byte gLastUsedAbility _08020D94: @@ -6816,7 +6816,7 @@ _08020DD4: bl BtlController_EmitSetMonData mov r2, r10 ldrb r0, [r2] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldrb r0, [r7] strb r0, [r4] ldrb r0, [r7] @@ -6833,8 +6833,8 @@ _08020DD4: movs r3, 0x2 bl BtlController_EmitSetMonData ldrb r0, [r7] - bl MarkBufferBankForExecution - ldr r4, _08020E70 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r4, _08020E70 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -6858,7 +6858,7 @@ _08020E60: .4byte gBattlerAttacker _08020E64: .4byte gBattleStruct _08020E68: .4byte gLastUsedItem _08020E6C: .4byte gActiveBattler -_08020E70: .4byte gUnknown_2023D74 +_08020E70: .4byte gBattlescriptCurrInstr _08020E74: .4byte gUnknown_81D9271 _08020E78: ldr r3, _08020EA8 @ =gBattlerTarget @@ -6904,24 +6904,24 @@ _08020EB4: .align 2, 0 _08020ECC: .4byte gBattlerTarget _08020ED0: - ldr r4, _08020EE0 @ =gUnknown_2023D74 + ldr r4, _08020EE0 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r0, _08020EE4 @ =gUnknown_81D8D55 b _08021108 .align 2, 0 -_08020EE0: .4byte gUnknown_2023D74 +_08020EE0: .4byte gBattlescriptCurrInstr _08020EE4: .4byte gUnknown_81D8D55 _08020EE8: - ldr r4, _08020EF8 @ =gUnknown_2023D74 + ldr r4, _08020EF8 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r0, _08020EFC @ =gUnknown_81D8DF1 b _08021108 .align 2, 0 -_08020EF8: .4byte gUnknown_2023D74 +_08020EF8: .4byte gBattlescriptCurrInstr _08020EFC: .4byte gUnknown_81D8DF1 _08020F00: ldr r6, _08020F50 @ =gBattlerTarget @@ -6955,8 +6955,8 @@ _08020F1A: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r4, _08020F58 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r4, _08020F58 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -6965,17 +6965,17 @@ _08020F1A: .align 2, 0 _08020F50: .4byte gBattlerTarget _08020F54: .4byte gActiveBattler -_08020F58: .4byte gUnknown_2023D74 +_08020F58: .4byte gBattlescriptCurrInstr _08020F5C: .4byte gUnknown_81D9177 _08020F60: - ldr r4, _08020F70 @ =gUnknown_2023D74 + ldr r4, _08020F70 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r0, _08020F74 @ =gUnknown_81D8F35 b _08021108 .align 2, 0 -_08020F70: .4byte gUnknown_2023D74 +_08020F70: .4byte gBattlescriptCurrInstr _08020F74: .4byte gUnknown_81D8F35 _08020F78: ldr r4, _08020FA8 @ =gBattleMoveDamage @@ -6989,12 +6989,12 @@ _08020F78: movs r0, 0x1 str r0, [r4] _08020F8E: - ldr r4, _08020FB0 @ =gUnknown_2023D74 + ldr r4, _08020FB0 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush ldr r1, _08020FB4 @ =gUnknown_825062C - ldr r0, _08020FB8 @ =gUnknown_2023E82 + ldr r0, _08020FB8 @ =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -7003,9 +7003,9 @@ _08020F8E: .align 2, 0 _08020FA8: .4byte gBattleMoveDamage _08020FAC: .4byte gUnknown_2023D54 -_08020FB0: .4byte gUnknown_2023D74 +_08020FB0: .4byte gBattlescriptCurrInstr _08020FB4: .4byte gUnknown_825062C -_08020FB8: .4byte gUnknown_2023E82 +_08020FB8: .4byte gBattleCommunication _08020FBC: mov r4, r9 ldrb r0, [r4] @@ -7070,7 +7070,7 @@ _08021018: beq _080210EC ldr r0, _0802104C @ =gLastUsedAbility strb r2, [r0] - ldr r1, _08021050 @ =gUnknown_2023D74 + ldr r1, _08021050 @ =gBattlescriptCurrInstr ldr r0, _08021054 @ =gUnknown_81D948E str r0, [r1] ldrb r0, [r5] @@ -7079,7 +7079,7 @@ _08021018: b _0802110A .align 2, 0 _0802104C: .4byte gLastUsedAbility -_08021050: .4byte gUnknown_2023D74 +_08021050: .4byte gBattlescriptCurrInstr _08021054: .4byte gUnknown_81D948E _08021058: ldrh r0, [r1, 0x2E] @@ -7102,7 +7102,7 @@ _08021058: movs r5, 0 movs r1, 0 strh r1, [r0, 0x2E] - ldr r2, _080210D4 @ =gUnknown_2023F20 + ldr r2, _080210D4 @ =gWishFutureKnock adds r2, 0x29 adds r2, r6, r2 ldr r3, _080210D8 @ =gBitTable @@ -7118,7 +7118,7 @@ _08021058: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r4, _080210E0 @ =gUnknown_2023D74 + ldr r4, _080210E0 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -7142,22 +7142,22 @@ _08021058: b _0802110A .align 2, 0 _080210D0: .4byte gLastUsedItem -_080210D4: .4byte gUnknown_2023F20 +_080210D4: .4byte gWishFutureKnock _080210D8: .4byte gBitTable _080210DC: .4byte gBattlerPartyIndexes -_080210E0: .4byte gUnknown_2023D74 +_080210E0: .4byte gBattlescriptCurrInstr _080210E4: .4byte gUnknown_81D8F86 _080210E8: .4byte gBattleStruct _080210EC: - ldr r1, _080210F8 @ =gUnknown_2023D74 + ldr r1, _080210F8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] b _0802110A .align 2, 0 -_080210F8: .4byte gUnknown_2023D74 +_080210F8: .4byte gBattlescriptCurrInstr _080210FC: - ldr r4, _0802111C @ =gUnknown_2023D74 + ldr r4, _0802111C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -7174,9 +7174,9 @@ _0802110A: pop {r0} bx r0 .align 2, 0 -_0802111C: .4byte gUnknown_2023D74 +_0802111C: .4byte gBattlescriptCurrInstr _08021120: .4byte gUnknown_81D8FEB - thumb_func_end sub_801FF20 + thumb_func_end SetMoveEffect thumb_func_start atk15_seteffectwithchance atk15_seteffectwithchance: @ 8021124 @@ -7216,7 +7216,7 @@ _08021160: adds r0, r2 ldrb r4, [r0, 0x5] _08021170: - ldr r3, _08021198 @ =gUnknown_2023E82 + ldr r3, _08021198 @ =gBattleCommunication ldrb r2, [r3, 0x3] movs r0, 0x80 ands r0, r2 @@ -7235,7 +7235,7 @@ _08021170: .align 2, 0 _08021190: .4byte gBattleMoves _08021194: .4byte gCurrentMove -_08021198: .4byte gUnknown_2023E82 +_08021198: .4byte gBattleCommunication _0802119C: .4byte gMoveResultFlags _080211A0: bl Random @@ -7247,7 +7247,7 @@ _080211A0: lsrs r0, 16 cmp r0, r4 bhi _080211EA - ldr r0, _080211D8 @ =gUnknown_2023E82 + ldr r0, _080211D8 @ =gBattleCommunication ldrb r0, [r0, 0x3] cmp r0, 0 beq _080211EA @@ -7262,23 +7262,23 @@ _080211A0: _080211CE: movs r0, 0 movs r1, 0x80 - bl sub_801FF20 + bl SetMoveEffect b _080211F2 .align 2, 0 -_080211D8: .4byte gUnknown_2023E82 +_080211D8: .4byte gBattleCommunication _080211DC: .4byte gMoveResultFlags _080211E0: movs r0, 0 movs r1, 0 - bl sub_801FF20 + bl SetMoveEffect b _080211F2 _080211EA: - ldr r1, _08021204 @ =gUnknown_2023D74 + ldr r1, _08021204 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] _080211F2: - ldr r0, _08021208 @ =gUnknown_2023E82 + ldr r0, _08021208 @ =gBattleCommunication movs r1, 0 strb r1, [r0, 0x3] ldr r0, _0802120C @ =gBattleScripting @@ -7287,8 +7287,8 @@ _080211F2: pop {r0} bx r0 .align 2, 0 -_08021204: .4byte gUnknown_2023D74 -_08021208: .4byte gUnknown_2023E82 +_08021204: .4byte gBattlescriptCurrInstr +_08021208: .4byte gBattleCommunication _0802120C: .4byte gBattleScripting thumb_func_end atk15_seteffectwithchance @@ -7297,7 +7297,7 @@ atk16_seteffectprimary: @ 8021210 push {lr} movs r0, 0x1 movs r1, 0 - bl sub_801FF20 + bl SetMoveEffect pop {r0} bx r0 thumb_func_end atk16_seteffectprimary @@ -7307,7 +7307,7 @@ atk17_seteffectsecondary: @ 8021220 push {lr} movs r0, 0 movs r1, 0 - bl sub_801FF20 + bl SetMoveEffect pop {r0} bx r0 thumb_func_end atk17_seteffectsecondary @@ -7315,13 +7315,13 @@ atk17_seteffectsecondary: @ 8021220 thumb_func_start atk18_clearstatusfromeffect atk18_clearstatusfromeffect: @ 8021230 push {lr} - ldr r0, _08021254 @ =gUnknown_2023D74 + ldr r0, _08021254 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r2, _08021258 @ =gActiveBattler strb r0, [r2] - ldr r3, _0802125C @ =gUnknown_2023E82 + ldr r3, _0802125C @ =gBattleCommunication ldrb r0, [r3, 0x3] cmp r0, 0x6 bhi _08021264 @@ -7332,9 +7332,9 @@ atk18_clearstatusfromeffect: @ 8021230 adds r1, 0x4C b _0802126E .align 2, 0 -_08021254: .4byte gUnknown_2023D74 +_08021254: .4byte gBattlescriptCurrInstr _08021258: .4byte gActiveBattler -_0802125C: .4byte gUnknown_2023E82 +_0802125C: .4byte gBattleCommunication _08021260: .4byte gBattleMons _08021264: ldr r1, _08021298 @ =gBattleMons @@ -7352,10 +7352,10 @@ _0802126E: ldr r0, [r2] bics r0, r1 str r0, [r2] - ldr r0, _080212A0 @ =gUnknown_2023E82 + ldr r0, _080212A0 @ =gBattleCommunication movs r2, 0 strb r2, [r0, 0x3] - ldr r1, _080212A4 @ =gUnknown_2023D74 + ldr r1, _080212A4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -7366,8 +7366,8 @@ _0802126E: .align 2, 0 _08021298: .4byte gBattleMons _0802129C: .4byte gUnknown_825053C -_080212A0: .4byte gUnknown_2023E82 -_080212A4: .4byte gUnknown_2023D74 +_080212A0: .4byte gBattleCommunication +_080212A4: .4byte gBattlescriptCurrInstr _080212A8: .4byte gBattleScripting thumb_func_end atk18_clearstatusfromeffect @@ -7378,17 +7378,17 @@ atk19_tryfaintmon: @ 80212AC mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r0, _08021318 @ =gUnknown_2023D74 + ldr r0, _08021318 @ =gBattlescriptCurrInstr ldr r2, [r0] ldrb r1, [r2, 0x2] adds r6, r0, 0 cmp r1, 0 beq _08021330 ldrb r0, [r2, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r5, _0802131C @ =gActiveBattler strb r0, [r5] - ldr r2, _08021320 @ =gUnknown_2023DD0 + ldr r2, _08021320 @ =gHitMarker ldr r1, _08021324 @ =gBitTable ldrb r0, [r5] lsls r0, 2 @@ -7416,7 +7416,7 @@ _080212E4: str r4, [r6] ldrb r0, [r5] bl GetBattlerSide - ldr r1, _08021328 @ =gSideAffecting + ldr r1, _08021328 @ =gSideStatuses lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -7426,11 +7426,11 @@ _080212E4: strh r1, [r0] b _08021592 .align 2, 0 -_08021318: .4byte gUnknown_2023D74 +_08021318: .4byte gBattlescriptCurrInstr _0802131C: .4byte gActiveBattler -_08021320: .4byte gUnknown_2023DD0 +_08021320: .4byte gHitMarker _08021324: .4byte gBitTable -_08021328: .4byte gSideAffecting +_08021328: .4byte gSideStatuses _0802132C: .4byte 0x0000fdff _08021330: ldrb r0, [r2, 0x1] @@ -7483,7 +7483,7 @@ _08021382: beq _08021392 b _0802158C _08021392: - ldr r5, _080213EC @ =gUnknown_2023DD0 + ldr r5, _080213EC @ =gHitMarker lsls r1, r2, 28 ldr r0, [r5] orrs r0, r1 @@ -7520,7 +7520,7 @@ _080213DC: .4byte gUnknown_81D8684 _080213E0: .4byte gAbsentBattlerFlags _080213E4: .4byte gBitTable _080213E8: .4byte gBattleMons -_080213EC: .4byte gUnknown_2023DD0 +_080213EC: .4byte gHitMarker _080213F0: .4byte gBattleResults _080213F4: ldr r4, _0802154C @ =gBattleResults @@ -7552,7 +7552,7 @@ _08021400: ldrb r0, [r0] strb r0, [r1] _0802142C: - ldr r2, _08021560 @ =gUnknown_2023DD0 + ldr r2, _08021560 @ =gHitMarker ldr r1, [r2] movs r0, 0x40 ands r0, r1 @@ -7571,7 +7571,7 @@ _0802142C: negs r0, r0 ands r1, r0 str r1, [r2] - ldr r4, _08021568 @ =gUnknown_2023D74 + ldr r4, _08021568 @ =gBattlescriptCurrInstr ldr r0, [r4] bl BattleScriptPush ldr r1, _0802156C @ =gBattleMoveDamage @@ -7596,7 +7596,7 @@ _0802146A: bne _08021482 b _08021592 _08021482: - ldr r0, _08021560 @ =gUnknown_2023DD0 + ldr r0, _08021560 @ =gHitMarker ldr r5, [r0] movs r0, 0x80 lsls r0, 17 @@ -7642,7 +7642,7 @@ _08021492: adds r6, 0x24 adds r0, r6 strb r5, [r0] - ldr r5, _08021568 @ =gUnknown_2023D74 + ldr r5, _08021568 @ =gBattlescriptCurrInstr ldr r0, [r5] bl BattleScriptPush ldr r0, _08021580 @ =gUnknown_81D8FA3 @@ -7665,7 +7665,7 @@ _08021492: movs r3, 0x1 bl BtlController_EmitSetMonData ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r1, _08021588 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] @@ -7698,9 +7698,9 @@ _08021550: .4byte gBattlerPartyIndexes _08021554: .4byte gEnemyParty _08021558: .4byte gBattleStruct _0802155C: .4byte gBattlerAttacker -_08021560: .4byte gUnknown_2023DD0 +_08021560: .4byte gHitMarker _08021564: .4byte gBattleMons -_08021568: .4byte gUnknown_2023D74 +_08021568: .4byte gBattlescriptCurrInstr _0802156C: .4byte gBattleMoveDamage _08021570: .4byte gUnknown_81D8C6C _08021574: .4byte gStatuses3 @@ -7730,16 +7730,16 @@ atk1A_faint_animation: @ 80215A0 ldr r0, [r0] cmp r0, 0 bne _080215CA - ldr r5, _080215D4 @ =gUnknown_2023D74 + ldr r5, _080215D4 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _080215D8 @ =gActiveBattler strb r0, [r4] movs r0, 0 bl BtlController_EmitFaintAnimation ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -7749,7 +7749,7 @@ _080215CA: bx r0 .align 2, 0 _080215D0: .4byte gBattleControllerExecFlags -_080215D4: .4byte gUnknown_2023D74 +_080215D4: .4byte gBattlescriptCurrInstr _080215D8: .4byte gActiveBattler thumb_func_end atk1A_faint_animation @@ -7761,10 +7761,10 @@ atk1B_faint_effects_clear: @ 80215DC ldr r6, [r0] cmp r6, 0 bne _08021628 - ldr r5, _08021634 @ =gUnknown_2023D74 + ldr r5, _08021634 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _08021638 @ =gActiveBattler strb r0, [r4] ldr r1, _0802163C @ =gBattleMons @@ -7784,7 +7784,7 @@ atk1B_faint_effects_clear: @ 80215DC movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec bl sub_8012BC8 ldr r0, [r5] adds r0, 0x2 @@ -7796,7 +7796,7 @@ _08021628: bx r0 .align 2, 0 _08021630: .4byte gBattleControllerExecFlags -_08021634: .4byte gUnknown_2023D74 +_08021634: .4byte gBattlescriptCurrInstr _08021638: .4byte gActiveBattler _0802163C: .4byte gBattleMons thumb_func_end atk1B_faint_effects_clear @@ -7804,10 +7804,10 @@ _0802163C: .4byte gBattleMons thumb_func_start atk1C_jumpifstatus atk1C_jumpifstatus: @ 8021640 push {r4,r5,lr} - ldr r5, _0802169C @ =gUnknown_2023D74 + ldr r5, _0802169C @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript lsls r0, 24 lsrs r0, 24 ldr r2, [r5] @@ -7848,10 +7848,10 @@ atk1C_jumpifstatus: @ 8021640 str r3, [r5] b _080216AC .align 2, 0 -_0802169C: .4byte gUnknown_2023D74 +_0802169C: .4byte gBattlescriptCurrInstr _080216A0: .4byte gBattleMons _080216A4: - ldr r1, _080216B4 @ =gUnknown_2023D74 + ldr r1, _080216B4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -7860,16 +7860,16 @@ _080216AC: pop {r0} bx r0 .align 2, 0 -_080216B4: .4byte gUnknown_2023D74 +_080216B4: .4byte gBattlescriptCurrInstr thumb_func_end atk1C_jumpifstatus thumb_func_start atk1D_jumpifstatus2 atk1D_jumpifstatus2: @ 80216B8 push {r4,r5,lr} - ldr r5, _08021714 @ =gUnknown_2023D74 + ldr r5, _08021714 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript lsls r0, 24 lsrs r0, 24 ldr r2, [r5] @@ -7910,10 +7910,10 @@ atk1D_jumpifstatus2: @ 80216B8 str r3, [r5] b _08021724 .align 2, 0 -_08021714: .4byte gUnknown_2023D74 +_08021714: .4byte gBattlescriptCurrInstr _08021718: .4byte gBattleMons _0802171C: - ldr r1, _0802172C @ =gUnknown_2023D74 + ldr r1, _0802172C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -7922,7 +7922,7 @@ _08021724: pop {r0} bx r0 .align 2, 0 -_0802172C: .4byte gUnknown_2023D74 +_0802172C: .4byte gBattlescriptCurrInstr thumb_func_end atk1D_jumpifstatus2 thumb_func_start atk1E_jumpifability @@ -7931,7 +7931,7 @@ atk1E_jumpifability: @ 8021730 mov r7, r8 push {r7} sub sp, 0x4 - ldr r6, _08021784 @ =gUnknown_2023D74 + ldr r6, _08021784 @ =gBattlescriptCurrInstr ldr r2, [r6] ldrb r5, [r2, 0x2] mov r8, r5 @@ -7969,7 +7969,7 @@ atk1E_jumpifability: @ 8021730 ldrb r1, [r1] b _080217EC .align 2, 0 -_08021784: .4byte gUnknown_2023D74 +_08021784: .4byte gBattlescriptCurrInstr _08021788: .4byte gBattlerAttacker _0802178C: .4byte gLastUsedAbility _08021790: @@ -8000,7 +8000,7 @@ _080217C0: .4byte gBattlerAttacker _080217C4: .4byte gLastUsedAbility _080217C8: ldrb r0, [r2, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript lsls r0, 24 lsrs r4, r0, 24 ldr r1, _080217F8 @ =gBattleMons @@ -8041,7 +8041,7 @@ _0802180A: thumb_func_start atk1F_jumpifsideaffecting atk1F_jumpifsideaffecting: @ 8021818 push {r4-r6,lr} - ldr r0, _08021830 @ =gUnknown_2023D74 + ldr r0, _08021830 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r4, [r0, 0x1] cmp r4, 0x1 @@ -8051,7 +8051,7 @@ atk1F_jumpifsideaffecting: @ 8021818 bl GetBattlerPosition b _08021842 .align 2, 0 -_08021830: .4byte gUnknown_2023D74 +_08021830: .4byte gBattlescriptCurrInstr _08021834: .4byte gBattlerAttacker _08021838: ldr r0, _08021878 @ =gBattlerTarget @@ -8060,7 +8060,7 @@ _08021838: movs r4, 0x1 _08021842: ands r4, r0 - ldr r6, _0802187C @ =gUnknown_2023D74 + ldr r6, _0802187C @ =gBattlescriptCurrInstr ldr r3, [r6] ldrb r2, [r3, 0x2] ldrb r0, [r3, 0x3] @@ -8076,7 +8076,7 @@ _08021842: ldrb r0, [r3, 0x7] lsls r0, 24 adds r5, r1, r0 - ldr r1, _08021880 @ =gSideAffecting + ldr r1, _08021880 @ =gSideStatuses lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -8087,8 +8087,8 @@ _08021842: b _0802188A .align 2, 0 _08021878: .4byte gBattlerTarget -_0802187C: .4byte gUnknown_2023D74 -_08021880: .4byte gSideAffecting +_0802187C: .4byte gBattlescriptCurrInstr +_08021880: .4byte gSideStatuses _08021884: adds r0, r3, 0 adds r0, 0x8 @@ -8103,10 +8103,10 @@ _0802188A: atk20_jumpifstat: @ 8021890 push {r4,r5,lr} movs r5, 0 - ldr r4, _080218C4 @ =gUnknown_2023D74 + ldr r4, _080218C4 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript lsls r0, 24 lsrs r0, 24 ldr r2, _080218C8 @ =gBattleMons @@ -8127,7 +8127,7 @@ atk20_jumpifstat: @ 8021890 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080218C4: .4byte gUnknown_2023D74 +_080218C4: .4byte gBattlescriptCurrInstr _080218C8: .4byte gBattleMons _080218CC: .4byte _080218D0 .align 2, 0 @@ -8139,43 +8139,43 @@ _080218D0: .4byte _08021928 .4byte _0802193C _080218E8: - ldr r0, _080218F4 @ =gUnknown_2023D74 + ldr r0, _080218F4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 bne _0802194E b _08021948 .align 2, 0 -_080218F4: .4byte gUnknown_2023D74 +_080218F4: .4byte gBattlescriptCurrInstr _080218F8: - ldr r0, _08021904 @ =gUnknown_2023D74 + ldr r0, _08021904 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 beq _0802194E b _08021948 .align 2, 0 -_08021904: .4byte gUnknown_2023D74 +_08021904: .4byte gBattlescriptCurrInstr _08021908: - ldr r0, _08021914 @ =gUnknown_2023D74 + ldr r0, _08021914 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 bls _0802194E b _08021948 .align 2, 0 -_08021914: .4byte gUnknown_2023D74 +_08021914: .4byte gBattlescriptCurrInstr _08021918: - ldr r0, _08021924 @ =gUnknown_2023D74 + ldr r0, _08021924 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 bcs _0802194E b _08021948 .align 2, 0 -_08021924: .4byte gUnknown_2023D74 +_08021924: .4byte gBattlescriptCurrInstr _08021928: - ldr r0, _08021938 @ =gUnknown_2023D74 + ldr r0, _08021938 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 @@ -8183,9 +8183,9 @@ _08021928: beq _0802194E b _08021948 .align 2, 0 -_08021938: .4byte gUnknown_2023D74 +_08021938: .4byte gBattlescriptCurrInstr _0802193C: - ldr r0, _08021970 @ =gUnknown_2023D74 + ldr r0, _08021970 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 @@ -8198,7 +8198,7 @@ _08021948: _0802194E: cmp r5, 0 beq _08021974 - ldr r3, _08021970 @ =gUnknown_2023D74 + ldr r3, _08021970 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -8213,9 +8213,9 @@ _0802194E: str r1, [r3] b _0802197C .align 2, 0 -_08021970: .4byte gUnknown_2023D74 +_08021970: .4byte gBattlescriptCurrInstr _08021974: - ldr r1, _08021984 @ =gUnknown_2023D74 + ldr r1, _08021984 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x9 str r0, [r1] @@ -8224,16 +8224,16 @@ _0802197C: pop {r0} bx r0 .align 2, 0 -_08021984: .4byte gUnknown_2023D74 +_08021984: .4byte gBattlescriptCurrInstr thumb_func_end atk20_jumpifstat thumb_func_start atk21_jumpifstatus3condition atk21_jumpifstatus3condition: @ 8021988 push {r4-r6,lr} - ldr r4, _080219DC @ =gUnknown_2023D74 + ldr r4, _080219DC @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r5, _080219E0 @ =gActiveBattler strb r0, [r5] ldr r2, [r4] @@ -8270,7 +8270,7 @@ atk21_jumpifstatus3condition: @ 8021988 bne _08021A00 b _080219F8 .align 2, 0 -_080219DC: .4byte gUnknown_2023D74 +_080219DC: .4byte gBattlescriptCurrInstr _080219E0: .4byte gActiveBattler _080219E4: .4byte gStatuses3 _080219E8: @@ -8300,10 +8300,10 @@ _08021A06: thumb_func_start atk22_jumpiftype atk22_jumpiftype: @ 8021A0C push {r4-r6,lr} - ldr r4, _08021A54 @ =gUnknown_2023D74 + ldr r4, _08021A54 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript lsls r0, 24 lsrs r0, 24 ldr r3, [r4] @@ -8336,7 +8336,7 @@ _08021A50: str r6, [r4] b _08021A60 .align 2, 0 -_08021A54: .4byte gUnknown_2023D74 +_08021A54: .4byte gBattlescriptCurrInstr _08021A58: .4byte gBattleMons _08021A5C: adds r0, r3, 0x7 @@ -8358,13 +8358,13 @@ sub_8021A68: @ 8021A68 ldr r0, [r0] adds r0, 0x50 mov r9, r0 - ldr r0, _08021AB4 @ =gUnknown_2023D74 + ldr r0, _08021AB4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 - ldr r1, _08021AB8 @ =gUnknown_2023D6D + bl GetBattlerForBattleScript + ldr r1, _08021AB8 @ =gBattlerFainted strb r0, [r1] - ldr r2, _08021ABC @ =gUnknown_2023F4E + ldr r2, _08021ABC @ =gSentPokesToOpponent movs r1, 0x2 ands r1, r0 lsls r1, 24 @@ -8385,9 +8385,9 @@ _08021AA4: mov pc, r0 .align 2, 0 _08021AB0: .4byte gBattleStruct -_08021AB4: .4byte gUnknown_2023D74 -_08021AB8: .4byte gUnknown_2023D6D -_08021ABC: .4byte gUnknown_2023F4E +_08021AB4: .4byte gBattlescriptCurrInstr +_08021AB8: .4byte gBattlerFainted +_08021ABC: .4byte gSentPokesToOpponent _08021AC0: .4byte gBattleScripting _08021AC4: .4byte _08021AC8 .align 2, 0 @@ -8400,7 +8400,7 @@ _08021AC8: .4byte _08022368 .4byte _080223B0 _08021AE4: - ldr r4, _08021B34 @ =gUnknown_2023D6D + ldr r4, _08021B34 @ =gBattlerFainted ldrb r0, [r4] bl GetBattlerSide lsls r0, 24 @@ -8438,7 +8438,7 @@ _08021B08: strb r0, [r2] bl _080223DA .align 2, 0 -_08021B34: .4byte gUnknown_2023D6D +_08021B34: .4byte gBattlerFainted _08021B38: .4byte gBattleTypeFlags _08021B3C: .4byte 0x00080982 _08021B40: .4byte gBattleScripting @@ -8506,7 +8506,7 @@ _08021BC2: ble _08021B54 ldr r3, _08021C28 @ =gBaseStats ldr r2, _08021C2C @ =gBattleMons - ldr r0, _08021C30 @ =gUnknown_2023D6D + ldr r0, _08021C30 @ =gBattlerFainted ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -8552,7 +8552,7 @@ _08021C0E: .align 2, 0 _08021C28: .4byte gBaseStats _08021C2C: .4byte gBattleMons -_08021C30: .4byte gUnknown_2023D6D +_08021C30: .4byte gBattlerFainted _08021C34: .4byte gUnknown_2023F52 _08021C38: adds r0, r1, 0 @@ -8922,7 +8922,7 @@ _08021EB6: ldr r1, _08021F6C @ =gPlayerParty adds r0, r1 ldr r3, _08021F70 @ =gBattleMons - ldr r1, _08021F74 @ =gUnknown_2023D6D + ldr r1, _08021F74 @ =gBattlerFainted ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -8944,7 +8944,7 @@ _08021F64: .4byte gBattleTextBuff2 _08021F68: .4byte gBattleTextBuff3 _08021F6C: .4byte gPlayerParty _08021F70: .4byte gBattleMons -_08021F74: .4byte gUnknown_2023D6D +_08021F74: .4byte gBattlerFainted _08021F78: ldr r0, _0802205C @ =gBattleControllerExecFlags ldr r2, [r0] @@ -9045,7 +9045,7 @@ _08021F82: movs r0, 0 bl BtlController_EmitExpUpdate ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08022052: ldr r1, _08022078 @ =gBattleScripting ldrb r0, [r1, 0x1C] @@ -9160,7 +9160,7 @@ _080220DA: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r1, _08022340 @ =gUnknown_2023D74 + ldr r1, _08022340 @ =gBattlescriptCurrInstr ldr r0, _08022344 @ =gUnknown_81D89F5 str r0, [r1] ldr r4, _08022348 @ =gBattleMoveDamage @@ -9390,7 +9390,7 @@ _08022330: .4byte gBattleTextBuff1 _08022334: .4byte gBattleTextBuff2 _08022338: .4byte gUnknown_3004FD4 _0802233C: .4byte gBitTable -_08022340: .4byte gUnknown_2023D74 +_08022340: .4byte gBattlescriptCurrInstr _08022344: .4byte gUnknown_81D89F5 _08022348: .4byte gBattleMoveDamage _0802234C: .4byte gBattleMons @@ -9448,7 +9448,7 @@ _080223B0: cmp r5, 0 bne _080223DA ldr r4, _080223EC @ =gBattleMons - ldr r2, _080223F0 @ =gUnknown_2023D6D + ldr r2, _080223F0 @ =gBattlerFainted ldrb r0, [r2] movs r1, 0x58 muls r0, r1 @@ -9460,7 +9460,7 @@ _080223B0: adds r0, r4 adds r0, 0x20 strb r3, [r0] - ldr r1, _080223F4 @ =gUnknown_2023D74 + ldr r1, _080223F4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -9474,8 +9474,8 @@ _080223DA: .align 2, 0 _080223E8: .4byte gBattleControllerExecFlags _080223EC: .4byte gBattleMons -_080223F0: .4byte gUnknown_2023D6D -_080223F4: .4byte gUnknown_2023D74 +_080223F0: .4byte gBattlerFainted +_080223F4: .4byte gBattlescriptCurrInstr thumb_func_end sub_8021A68 thumb_func_start sub_80223F8 @@ -9576,15 +9576,15 @@ _08022498: ldr r0, _08022548 @ =gBattlersCount ldrb r1, [r0] mov r12, r0 - ldr r7, _0802254C @ =gUnknown_2023D74 + ldr r7, _0802254C @ =gBattlescriptCurrInstr cmp r3, r1 bge _080224E4 - ldr r0, _08022550 @ =gUnknown_2023DD0 + ldr r0, _08022550 @ =gHitMarker movs r6, 0x80 lsls r6, 21 ldr r4, [r0] adds r2, r1, 0 - ldr r1, _08022554 @ =gUnknown_2023ECC + ldr r1, _08022554 @ =gSpecialStatuses _080224C8: adds r0, r6, 0 lsls r0, r5 @@ -9608,12 +9608,12 @@ _080224E4: ldrb r1, [r0] cmp r5, r1 bge _0802251E - ldr r0, _08022550 @ =gUnknown_2023DD0 + ldr r0, _08022550 @ =gHitMarker movs r4, 0x80 lsls r4, 21 mov r12, r4 ldr r6, [r0] - ldr r0, _08022554 @ =gUnknown_2023ECC + ldr r0, _08022554 @ =gSpecialStatuses adds r4, r1, 0 adds r1, r0, 0 adds r1, 0x14 @@ -9651,9 +9651,9 @@ _0802253C: .4byte gBattleOutcome _08022540: .4byte gEnemyParty _08022544: .4byte gBattleTypeFlags _08022548: .4byte gBattlersCount -_0802254C: .4byte gUnknown_2023D74 -_08022550: .4byte gUnknown_2023DD0 -_08022554: .4byte gUnknown_2023ECC +_0802254C: .4byte gBattlescriptCurrInstr +_08022550: .4byte gHitMarker +_08022554: .4byte gSpecialStatuses _08022558: cmp r2, 0 beq _0802257A @@ -9679,7 +9679,7 @@ _0802257A: str r0, [r7] b _0802258A _08022582: - ldr r1, _08022594 @ =gUnknown_2023D74 + ldr r1, _08022594 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -9690,7 +9690,7 @@ _0802258A: pop {r0} bx r0 .align 2, 0 -_08022594: .4byte gUnknown_2023D74 +_08022594: .4byte gBattlescriptCurrInstr thumb_func_end sub_80223F8 thumb_func_start MoveValuesCleanUp @@ -9704,10 +9704,10 @@ MoveValuesCleanUp: @ 8022598 strb r1, [r0, 0xE] ldr r0, _080225C8 @ =gCritMultiplier strb r1, [r0] - ldr r0, _080225CC @ =gUnknown_2023E82 + ldr r0, _080225CC @ =gBattleCommunication strb r2, [r0, 0x3] strb r2, [r0, 0x6] - ldr r2, _080225D0 @ =gUnknown_2023DD0 + ldr r2, _080225D0 @ =gHitMarker ldr r0, [r2] subs r1, 0x42 ands r0, r1 @@ -9719,8 +9719,8 @@ MoveValuesCleanUp: @ 8022598 _080225C0: .4byte gMoveResultFlags _080225C4: .4byte gBattleScripting _080225C8: .4byte gCritMultiplier -_080225CC: .4byte gUnknown_2023E82 -_080225D0: .4byte gUnknown_2023DD0 +_080225CC: .4byte gBattleCommunication +_080225D0: .4byte gHitMarker _080225D4: .4byte 0xffffbfff thumb_func_end MoveValuesCleanUp @@ -9728,20 +9728,20 @@ _080225D4: .4byte 0xffffbfff atk25_movevaluescleanup: @ 80225D8 push {lr} bl MoveValuesCleanUp - ldr r1, _080225EC @ =gUnknown_2023D74 + ldr r1, _080225EC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080225EC: .4byte gUnknown_2023D74 +_080225EC: .4byte gBattlescriptCurrInstr thumb_func_end atk25_movevaluescleanup thumb_func_start atk26_setmultihit atk26_setmultihit: @ 80225F0 ldr r3, _08022600 @ =gUnknown_2023D72 - ldr r2, _08022604 @ =gUnknown_2023D74 + ldr r2, _08022604 @ =gBattlescriptCurrInstr ldr r0, [r2] ldrb r1, [r0, 0x1] strb r1, [r3] @@ -9750,7 +9750,7 @@ atk26_setmultihit: @ 80225F0 bx lr .align 2, 0 _08022600: .4byte gUnknown_2023D72 -_08022604: .4byte gUnknown_2023D74 +_08022604: .4byte gBattlescriptCurrInstr thumb_func_end atk26_setmultihit thumb_func_start atk27_decrementmultihit @@ -9763,16 +9763,16 @@ atk27_decrementmultihit: @ 8022608 lsls r0, 24 cmp r0, 0 bne _0802262C - ldr r1, _08022628 @ =gUnknown_2023D74 + ldr r1, _08022628 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08022646 .align 2, 0 _08022624: .4byte gUnknown_2023D72 -_08022628: .4byte gUnknown_2023D74 +_08022628: .4byte gBattlescriptCurrInstr _0802262C: - ldr r3, _0802264C @ =gUnknown_2023D74 + ldr r3, _0802264C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9789,12 +9789,12 @@ _08022646: pop {r0} bx r0 .align 2, 0 -_0802264C: .4byte gUnknown_2023D74 +_0802264C: .4byte gBattlescriptCurrInstr thumb_func_end atk27_decrementmultihit thumb_func_start atk28_goto atk28_goto: @ 8022650 - ldr r3, _0802266C @ =gUnknown_2023D74 + ldr r3, _0802266C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9809,13 +9809,13 @@ atk28_goto: @ 8022650 str r1, [r3] bx lr .align 2, 0 -_0802266C: .4byte gUnknown_2023D74 +_0802266C: .4byte gBattlescriptCurrInstr thumb_func_end atk28_goto thumb_func_start atk29_jumpifbyte atk29_jumpifbyte: @ 8022670 push {r4-r6,lr} - ldr r3, _080226B4 @ =gUnknown_2023D74 + ldr r3, _080226B4 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -9849,7 +9849,7 @@ atk29_jumpifbyte: @ 8022670 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080226B4: .4byte gUnknown_2023D74 +_080226B4: .4byte gBattlescriptCurrInstr _080226B8: .4byte _080226BC .align 2, 0 _080226BC: @@ -9901,7 +9901,7 @@ _08022708: thumb_func_start atk2A_jumpifhalfword atk2A_jumpifhalfword: @ 8022710 push {r4-r6,lr} - ldr r3, _0802275C @ =gUnknown_2023D74 + ldr r3, _0802275C @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -9938,7 +9938,7 @@ atk2A_jumpifhalfword: @ 8022710 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802275C: .4byte gUnknown_2023D74 +_0802275C: .4byte gBattlescriptCurrInstr _08022760: .4byte _08022764 .align 2, 0 _08022764: @@ -9990,7 +9990,7 @@ _080227B0: thumb_func_start atk2B_jumpifword atk2B_jumpifword: @ 80227B8 push {r4-r6,lr} - ldr r3, _08022810 @ =gUnknown_2023D74 + ldr r3, _08022810 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -10033,7 +10033,7 @@ atk2B_jumpifword: @ 80227B8 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08022810: .4byte gUnknown_2023D74 +_08022810: .4byte gBattlescriptCurrInstr _08022814: .4byte _08022818 .align 2, 0 _08022818: @@ -10085,7 +10085,7 @@ _08022864: thumb_func_start atk2C_jumpifarrayequal atk2C_jumpifarrayequal: @ 802286C push {r4-r7,lr} - ldr r2, _080228C4 @ =gUnknown_2023D74 + ldr r2, _080228C4 @ =gBattlescriptCurrInstr ldr r3, [r2] ldrb r1, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -10129,7 +10129,7 @@ atk2C_jumpifarrayequal: @ 802286C adds r0, r3, 0 b _080228E0 .align 2, 0 -_080228C4: .4byte gUnknown_2023D74 +_080228C4: .4byte gBattlescriptCurrInstr _080228C8: adds r5, 0x1 adds r4, 0x1 @@ -10161,7 +10161,7 @@ _080228EC: atk2D_jumpifarraynotequal: @ 80228F4 push {r4-r7,lr} movs r7, 0 - ldr r3, _08022968 @ =gUnknown_2023D74 + ldr r3, _08022968 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -10220,7 +10220,7 @@ _0802295E: mov r0, r12 b _08022970 .align 2, 0 -_08022968: .4byte gUnknown_2023D74 +_08022968: .4byte gBattlescriptCurrInstr _0802296C: ldr r0, [r3] adds r0, 0xE @@ -10233,7 +10233,7 @@ _08022970: thumb_func_start atk2E_setbyte atk2E_setbyte: @ 8022978 - ldr r3, _0802299C @ =gUnknown_2023D74 + ldr r3, _0802299C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10252,12 +10252,12 @@ atk2E_setbyte: @ 8022978 str r0, [r3] bx lr .align 2, 0 -_0802299C: .4byte gUnknown_2023D74 +_0802299C: .4byte gBattlescriptCurrInstr thumb_func_end atk2E_setbyte thumb_func_start atk2F_addbyte atk2F_addbyte: @ 80229A0 - ldr r3, _080229C8 @ =gUnknown_2023D74 + ldr r3, _080229C8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10278,12 +10278,12 @@ atk2F_addbyte: @ 80229A0 str r0, [r3] bx lr .align 2, 0 -_080229C8: .4byte gUnknown_2023D74 +_080229C8: .4byte gBattlescriptCurrInstr thumb_func_end atk2F_addbyte thumb_func_start atk30_subbyte atk30_subbyte: @ 80229CC - ldr r3, _080229F4 @ =gUnknown_2023D74 + ldr r3, _080229F4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10304,13 +10304,13 @@ atk30_subbyte: @ 80229CC str r0, [r3] bx lr .align 2, 0 -_080229F4: .4byte gUnknown_2023D74 +_080229F4: .4byte gBattlescriptCurrInstr thumb_func_end atk30_subbyte thumb_func_start atk31_copyarray atk31_copyarray: @ 80229F8 push {r4-r6,lr} - ldr r3, _08022A48 @ =gUnknown_2023D74 + ldr r3, _08022A48 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -10352,13 +10352,13 @@ _08022A3C: pop {r0} bx r0 .align 2, 0 -_08022A48: .4byte gUnknown_2023D74 +_08022A48: .4byte gBattlescriptCurrInstr thumb_func_end atk31_copyarray thumb_func_start atk32_copyarraywithindex atk32_copyarraywithindex: @ 8022A4C push {r4-r7,lr} - ldr r3, _08022AB4 @ =gUnknown_2023D74 + ldr r3, _08022AB4 @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -10412,12 +10412,12 @@ _08022AA8: pop {r0} bx r0 .align 2, 0 -_08022AB4: .4byte gUnknown_2023D74 +_08022AB4: .4byte gBattlescriptCurrInstr thumb_func_end atk32_copyarraywithindex thumb_func_start atk33_orbyte atk33_orbyte: @ 8022AB8 - ldr r3, _08022AE0 @ =gUnknown_2023D74 + ldr r3, _08022AE0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10438,13 +10438,13 @@ atk33_orbyte: @ 8022AB8 str r0, [r3] bx lr .align 2, 0 -_08022AE0: .4byte gUnknown_2023D74 +_08022AE0: .4byte gBattlescriptCurrInstr thumb_func_end atk33_orbyte thumb_func_start atk34_orhalfword atk34_orhalfword: @ 8022AE4 push {r4,lr} - ldr r4, _08022B18 @ =gUnknown_2023D74 + ldr r4, _08022B18 @ =gBattlescriptCurrInstr ldr r3, [r4] ldrb r2, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -10470,13 +10470,13 @@ atk34_orhalfword: @ 8022AE4 pop {r0} bx r0 .align 2, 0 -_08022B18: .4byte gUnknown_2023D74 +_08022B18: .4byte gBattlescriptCurrInstr thumb_func_end atk34_orhalfword thumb_func_start atk35_orword atk35_orword: @ 8022B1C push {r4,lr} - ldr r4, _08022B5C @ =gUnknown_2023D74 + ldr r4, _08022B5C @ =gBattlescriptCurrInstr ldr r2, [r4] ldrb r3, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10508,12 +10508,12 @@ atk35_orword: @ 8022B1C pop {r0} bx r0 .align 2, 0 -_08022B5C: .4byte gUnknown_2023D74 +_08022B5C: .4byte gBattlescriptCurrInstr thumb_func_end atk35_orword thumb_func_start atk36_bicbyte atk36_bicbyte: @ 8022B60 - ldr r3, _08022B88 @ =gUnknown_2023D74 + ldr r3, _08022B88 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10534,13 +10534,13 @@ atk36_bicbyte: @ 8022B60 str r0, [r3] bx lr .align 2, 0 -_08022B88: .4byte gUnknown_2023D74 +_08022B88: .4byte gBattlescriptCurrInstr thumb_func_end atk36_bicbyte thumb_func_start atk37_bichalfword atk37_bichalfword: @ 8022B8C push {r4,lr} - ldr r4, _08022BC0 @ =gUnknown_2023D74 + ldr r4, _08022BC0 @ =gBattlescriptCurrInstr ldr r3, [r4] ldrb r1, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -10566,13 +10566,13 @@ atk37_bichalfword: @ 8022B8C pop {r0} bx r0 .align 2, 0 -_08022BC0: .4byte gUnknown_2023D74 +_08022BC0: .4byte gBattlescriptCurrInstr thumb_func_end atk37_bichalfword thumb_func_start atk38_bicword atk38_bicword: @ 8022BC4 push {r4,lr} - ldr r4, _08022C04 @ =gUnknown_2023D74 + ldr r4, _08022C04 @ =gBattlescriptCurrInstr ldr r2, [r4] ldrb r3, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10604,7 +10604,7 @@ atk38_bicword: @ 8022BC4 pop {r0} bx r0 .align 2, 0 -_08022C04: .4byte gUnknown_2023D74 +_08022C04: .4byte gBattlescriptCurrInstr thumb_func_end atk38_bicword thumb_func_start atk39_pause @@ -10614,7 +10614,7 @@ atk39_pause: @ 8022C08 ldr r4, [r0] cmp r4, 0 bne _08022C34 - ldr r5, _08022C40 @ =gUnknown_2023D74 + ldr r5, _08022C40 @ =gBattlescriptCurrInstr ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -10637,7 +10637,7 @@ _08022C34: bx r0 .align 2, 0 _08022C3C: .4byte gBattleControllerExecFlags -_08022C40: .4byte gUnknown_2023D74 +_08022C40: .4byte gBattlescriptCurrInstr _08022C44: .4byte gUnknown_2023E7C thumb_func_end atk39_pause @@ -10648,7 +10648,7 @@ sub_8022C48: @ 8022C48 ldr r0, [r0] cmp r0, 0 bne _08022C5A - ldr r1, _08022C64 @ =gUnknown_2023D74 + ldr r1, _08022C64 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -10657,13 +10657,13 @@ _08022C5A: bx r0 .align 2, 0 _08022C60: .4byte gBattleControllerExecFlags -_08022C64: .4byte gUnknown_2023D74 +_08022C64: .4byte gBattlescriptCurrInstr thumb_func_end sub_8022C48 thumb_func_start atk3B_healthbar_update atk3B_healthbar_update: @ 8022C68 push {lr} - ldr r0, _08022C7C @ =gUnknown_2023D74 + ldr r0, _08022C7C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -10672,7 +10672,7 @@ atk3B_healthbar_update: @ 8022C68 ldr r1, _08022C84 @ =gBattlerTarget b _08022C8C .align 2, 0 -_08022C7C: .4byte gUnknown_2023D74 +_08022C7C: .4byte gBattlescriptCurrInstr _08022C80: .4byte gActiveBattler _08022C84: .4byte gBattlerTarget _08022C88: @@ -10687,8 +10687,8 @@ _08022C8C: bl BtlController_EmitHealthBarUpdate ldr r0, _08022CB0 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution - ldr r1, _08022CBC @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _08022CBC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -10698,7 +10698,7 @@ _08022C8C: _08022CB0: .4byte gActiveBattler _08022CB4: .4byte gBattlerAttacker _08022CB8: .4byte gBattleMoveDamage -_08022CBC: .4byte gUnknown_2023D74 +_08022CBC: .4byte gBattlescriptCurrInstr thumb_func_end atk3B_healthbar_update thumb_func_start atk3C_return @@ -10775,7 +10775,7 @@ _08022D3C: .4byte gBattleMainFunc thumb_func_start atk41_call atk41_call: @ 8022D40 push {r4,lr} - ldr r4, _08022D6C @ =gUnknown_2023D74 + ldr r4, _08022D6C @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x5 bl BattleScriptPush @@ -10795,16 +10795,16 @@ atk41_call: @ 8022D40 pop {r0} bx r0 .align 2, 0 -_08022D6C: .4byte gUnknown_2023D74 +_08022D6C: .4byte gBattlescriptCurrInstr thumb_func_end atk41_call thumb_func_start atk42_jumpiftype2 atk42_jumpiftype2: @ 8022D70 push {r4,lr} - ldr r4, _08022DB8 @ =gUnknown_2023D74 + ldr r4, _08022DB8 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript lsls r0, 24 lsrs r0, 24 ldr r3, [r4] @@ -10836,7 +10836,7 @@ _08022D9E: str r1, [r4] b _08022DC4 .align 2, 0 -_08022DB8: .4byte gUnknown_2023D74 +_08022DB8: .4byte gBattlescriptCurrInstr _08022DBC: .4byte gBattleMons _08022DC0: adds r0, r3, 0x7 @@ -10851,7 +10851,7 @@ _08022DC4: atk43_jumpifabilitypresent: @ 8022DCC push {r4,lr} sub sp, 0x4 - ldr r4, _08022E04 @ =gUnknown_2023D74 + ldr r4, _08022E04 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r2, [r0, 0x1] movs r0, 0 @@ -10877,7 +10877,7 @@ atk43_jumpifabilitypresent: @ 8022DCC str r1, [r4] b _08022E0E .align 2, 0 -_08022E04: .4byte gUnknown_2023D74 +_08022E04: .4byte gBattlescriptCurrInstr _08022E08: ldr r0, [r4] adds r0, 0x6 @@ -10908,10 +10908,10 @@ _08022E30: .4byte gBattleStruct thumb_func_start sub_8022E34 sub_8022E34: @ 8022E34 push {r4-r6,lr} - ldr r4, _08022E84 @ =gUnknown_2023D74 + ldr r4, _08022E84 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r6, _08022E88 @ =gActiveBattler strb r0, [r6] ldr r2, [r4] @@ -10936,7 +10936,7 @@ sub_8022E34: @ 8022E34 cmp r0, 0x19 bne _08022E8C _08022E6E: - ldr r4, _08022E84 @ =gUnknown_2023D74 + ldr r4, _08022E84 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x2] ldrh r2, [r3] @@ -10946,10 +10946,10 @@ _08022E6E: ldrb r0, [r0] b _08022EE4 .align 2, 0 -_08022E84: .4byte gUnknown_2023D74 +_08022E84: .4byte gBattlescriptCurrInstr _08022E88: .4byte gActiveBattler _08022E8C: - ldr r0, _08022EA4 @ =gUnknown_2023DD0 + ldr r0, _08022EA4 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -10960,7 +10960,7 @@ _08022E8C: ldr r0, _08022EA8 @ =gUnknown_81D89F1 b _08022EEC .align 2, 0 -_08022EA4: .4byte gUnknown_2023DD0 +_08022EA4: .4byte gHitMarker _08022EA8: .4byte gUnknown_81D89F1 _08022EAC: adds r0, r5, 0 @@ -10990,7 +10990,7 @@ _08022ED8: bl BtlController_EmitBattleAnimation ldrb r0, [r6] _08022EE4: - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, 0x7 _08022EEC: @@ -11003,10 +11003,10 @@ _08022EEC: thumb_func_start atk46_playanimation2 atk46_playanimation2: @ 8022EF4 push {r4-r7,lr} - ldr r6, _08022F5C @ =gUnknown_2023D74 + ldr r6, _08022F5C @ =gBattlescriptCurrInstr ldr r0, [r6] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r7, _08022F60 @ =gActiveBattler strb r0, [r7] ldr r2, [r6] @@ -11045,17 +11045,17 @@ _08022F3E: bl BtlController_EmitBattleAnimation ldr r0, _08022F60 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution - ldr r1, _08022F5C @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _08022F5C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] b _08022FBA .align 2, 0 -_08022F5C: .4byte gUnknown_2023D74 +_08022F5C: .4byte gBattlescriptCurrInstr _08022F60: .4byte gActiveBattler _08022F64: - ldr r0, _08022F74 @ =gUnknown_2023DD0 + ldr r0, _08022F74 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -11064,7 +11064,7 @@ _08022F64: adds r0, r2, 0 b _08022FB6 .align 2, 0 -_08022F74: .4byte gUnknown_2023DD0 +_08022F74: .4byte gHitMarker _08022F78: adds r0, r5, 0 subs r0, 0xA @@ -11092,7 +11092,7 @@ _08022FA4: movs r0, 0 bl BtlController_EmitBattleAnimation ldrb r0, [r7] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r6] _08022FB6: adds r0, 0xA @@ -11147,7 +11147,7 @@ _08022FF8: movs r1, 0 strb r0, [r4, 0x10] strb r1, [r4, 0x11] - ldr r1, _08023018 @ =gUnknown_2023D74 + ldr r1, _08023018 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -11155,7 +11155,7 @@ _08022FF8: pop {r0} bx r0 .align 2, 0 -_08023018: .4byte gUnknown_2023D74 +_08023018: .4byte gBattlescriptCurrInstr thumb_func_end atk47_setgraphicalstatchangevalues thumb_func_start atk48_playstatchangeanimation @@ -11170,11 +11170,11 @@ atk48_playstatchangeanimation: @ 802301C movs r0, 0 mov r8, r0 movs r3, 0 - ldr r5, _08023090 @ =gUnknown_2023D74 + ldr r5, _08023090 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] str r3, [sp] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r2, _08023094 @ =gActiveBattler strb r0, [r2] ldr r0, [r5] @@ -11205,7 +11205,7 @@ _0802306A: ands r0, r1 cmp r0, 0 beq _080230F6 - ldr r0, _08023090 @ =gUnknown_2023D74 + ldr r0, _08023090 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x8 @@ -11219,7 +11219,7 @@ _0802306A: adds r0, r7, r0 b _080230E4 .align 2, 0 -_08023090: .4byte gUnknown_2023D74 +_08023090: .4byte gBattlescriptCurrInstr _08023094: .4byte gActiveBattler _08023098: .4byte gUnknown_2023BFC _0802309C: @@ -11279,7 +11279,7 @@ _080230F6: cmp r4, 0 bne _0802306A _08023104: - ldr r0, _0802312C @ =gUnknown_2023D74 + ldr r0, _0802312C @ =gBattlescriptCurrInstr mov r9, r0 cmp r3, 0x1 ble _08023192 @@ -11297,7 +11297,7 @@ _08023104: _08023120: .4byte gActiveBattler _08023124: .4byte gSideTimers _08023128: .4byte gBattleMons -_0802312C: .4byte gUnknown_2023D74 +_0802312C: .4byte gBattlescriptCurrInstr _08023130: movs r0, 0x2 ands r0, r1 @@ -11382,8 +11382,8 @@ _080231B0: bl BtlController_EmitBattleAnimation ldr r0, _080231F0 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution - ldr r0, _080231F4 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r0, _080231F4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x4 @@ -11396,12 +11396,12 @@ _080231B0: movs r0, 0x1 strb r0, [r4, 0x1B] _080231E8: - ldr r1, _080231F4 @ =gUnknown_2023D74 + ldr r1, _080231F4 @ =gBattlescriptCurrInstr b _080231FA .align 2, 0 _080231EC: .4byte gBattleScripting _080231F0: .4byte gActiveBattler -_080231F4: .4byte gUnknown_2023D74 +_080231F4: .4byte gBattlescriptCurrInstr _080231F8: mov r1, r9 _080231FA: @@ -11439,7 +11439,7 @@ atk49_moveend: @ 8023210 ldrh r2, [r2] str r2, [sp, 0x18] _08023232: - ldr r0, _08023268 @ =gUnknown_2023D74 + ldr r0, _08023268 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r4, [r0, 0x1] str r4, [sp, 0x10] @@ -11464,7 +11464,7 @@ _08023232: .align 2, 0 _08023260: .4byte gChosenMove _08023264: .4byte 0x0000ffff -_08023268: .4byte gUnknown_2023D74 +_08023268: .4byte gBattlescriptCurrInstr _0802326C: .4byte gBattleMons _08023270: .4byte gBattlerAttacker _08023274: .4byte gEnigmaBerries @@ -11500,7 +11500,7 @@ _080232AC: movs r1, 0x1 bl BtlController_EmitSpriteInvisibility ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _0802379E .align 2, 0 _080232C0: .4byte gActiveBattler @@ -11511,7 +11511,7 @@ _080232C4: movs r1, 0 bl BtlController_EmitSpriteInvisibility ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldrb r1, [r6] lsls r1, 2 adds r1, r5 @@ -11543,13 +11543,13 @@ _080232F0: adds r0, r2 ldr r0, [r0] bl BattleScriptPush - ldr r1, _0802332C @ =gUnknown_2023D74 + ldr r1, _0802332C @ =gBattlescriptCurrInstr ldr r0, _08023330 @ =gUnknown_81D96A8 bl _08023BFC .align 2, 0 _08023324: .4byte gBattleScripting _08023328: .4byte gUnknown_81D65A8 -_0802332C: .4byte gUnknown_2023D74 +_0802332C: .4byte gBattlescriptCurrInstr _08023330: .4byte gUnknown_81D96A8 _08023334: ldr r2, _0802334C @ =gBattleMoves @@ -11657,7 +11657,7 @@ _08023410: beq _0802341E b _080237C8 _0802341E: - ldr r2, _0802348C @ =gUnknown_2023ECC + ldr r2, _0802348C @ =gSpecialStatuses ldrb r3, [r5] lsls r0, r3, 2 adds r0, r3 @@ -11701,7 +11701,7 @@ _0802346A: adds r0, r2, 0x1 strb r0, [r1, 0x19] bl BattleScriptPushCursor - ldr r1, _08023498 @ =gUnknown_2023D74 + ldr r1, _08023498 @ =gBattlescriptCurrInstr ldr r0, _0802349C @ =gUnknown_81D8C48 str r0, [r1] b _080236FC @@ -11710,10 +11710,10 @@ _0802347C: .4byte gBattleMons _08023480: .4byte gBattlerTarget _08023484: .4byte gBattlerAttacker _08023488: .4byte gMoveResultFlags -_0802348C: .4byte gUnknown_2023ECC +_0802348C: .4byte gSpecialStatuses _08023490: .4byte gBattleMoves _08023494: .4byte gCurrentMove -_08023498: .4byte gUnknown_2023D74 +_08023498: .4byte gBattlescriptCurrInstr _0802349C: .4byte gUnknown_81D8C48 _080234A0: ldr r4, _0802353C @ =gBattleMons @@ -11745,7 +11745,7 @@ _080234CA: bne _080234D4 b _080237C8 _080234D4: - ldr r0, _08023548 @ =gUnknown_2023ECC + ldr r0, _08023548 @ =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -11788,9 +11788,9 @@ _080234FE: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec bl BattleScriptPushCursor - ldr r1, _08023554 @ =gUnknown_2023D74 + ldr r1, _08023554 @ =gBattlescriptCurrInstr ldr r0, _08023558 @ =gUnknown_81D9098 str r0, [r1] movs r2, 0x1 @@ -11800,10 +11800,10 @@ _080234FE: _0802353C: .4byte gBattleMons _08023540: .4byte gBattlerTarget _08023544: .4byte gBattlerAttacker -_08023548: .4byte gUnknown_2023ECC +_08023548: .4byte gSpecialStatuses _0802354C: .4byte gMoveResultFlags _08023550: .4byte gActiveBattler -_08023554: .4byte gUnknown_2023D74 +_08023554: .4byte gBattlescriptCurrInstr _08023558: .4byte gUnknown_81D9098 _0802355C: ldr r0, _0802357C @ =gBattlerTarget @@ -11876,7 +11876,7 @@ _080235DA: .align 2, 0 _080235E0: .4byte gBattlerAttacker _080235E4: - ldr r0, _08023674 @ =gUnknown_2023DD0 + ldr r0, _08023674 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 18 @@ -11955,7 +11955,7 @@ _0802366A: strb r0, [r2, 0x14] b _08023BB4 .align 2, 0 -_08023674: .4byte gUnknown_2023DD0 +_08023674: .4byte gHitMarker _08023678: .4byte gChosenMove _0802367C: .4byte 0x0000ffff _08023680: .4byte gMoveResultFlags @@ -11998,7 +11998,7 @@ _080236CC: movs r0, 0x3 movs r1, 0 movs r2, 0 - bl sub_801BC68 + bl ItemBattleEffects lsls r0, 24 cmp r0, 0 beq _080237C8 @@ -12013,7 +12013,7 @@ _080236EC: movs r0, 0x4 movs r1, 0 movs r2, 0 - bl sub_801BC68 + bl ItemBattleEffects _080236F6: lsls r0, 24 cmp r0, 0 @@ -12035,7 +12035,7 @@ _08023702: bne _08023718 b _08023AFA _08023718: - ldr r0, _08023734 @ =gUnknown_2023DD0 + ldr r0, _08023734 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -12048,7 +12048,7 @@ _08023726: _08023728: .4byte gStatuses3 _0802372C: .4byte gBattlerAttacker _08023730: .4byte 0x000400c0 -_08023734: .4byte gUnknown_2023DD0 +_08023734: .4byte gHitMarker _08023738: ldr r0, _080237A8 @ =gMoveResultFlags ldrb r1, [r0] @@ -12080,7 +12080,7 @@ _08023764: movs r1, 0 bl BtlController_EmitSpriteInvisibility ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, _080237AC @ =gStatuses3 ldrb r2, [r5] lsls r2, 2 @@ -12089,7 +12089,7 @@ _08023764: ldr r1, _080237BC @ =0xfffbff3f ands r0, r1 str r0, [r2] - ldr r2, _080237C0 @ =gUnknown_2023ECC + ldr r2, _080237C0 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -12112,7 +12112,7 @@ _080237B0: .4byte gBattlerAttacker _080237B4: .4byte 0x000400c0 _080237B8: .4byte gActiveBattler _080237BC: .4byte 0xfffbff3f -_080237C0: .4byte gUnknown_2023ECC +_080237C0: .4byte gSpecialStatuses _080237C4: .4byte gBattleScripting _080237C8: ldr r1, _080237D4 @ =gBattleScripting @@ -12124,7 +12124,7 @@ _080237C8: .align 2, 0 _080237D4: .4byte gBattleScripting _080237D8: - ldr r0, _08023808 @ =gUnknown_2023ECC + ldr r0, _08023808 @ =gSpecialStatuses ldr r6, _0802380C @ =gBattlerTarget ldrb r2, [r6] lsls r3, r2, 2 @@ -12150,7 +12150,7 @@ _080237D8: _08023806: b _08023846 .align 2, 0 -_08023808: .4byte gUnknown_2023ECC +_08023808: .4byte gSpecialStatuses _0802380C: .4byte gBattlerTarget _08023810: .4byte gBattlersCount _08023814: .4byte gStatuses3 @@ -12164,7 +12164,7 @@ _0802381C: ldr r2, _08023854 @ =gDisableStructs ldr r5, _08023858 @ =0xfeffffff adds r3, r0, 0 - ldr r1, _0802385C @ =gUnknown_2023C34 + ldr r1, _0802385C @ =gChosenMoveByBattler _0802382E: ldrb r0, [r2, 0xA] cmp r0, 0 @@ -12189,9 +12189,9 @@ _08023846: _08023850: .4byte gBattlersCount _08023854: .4byte gDisableStructs _08023858: .4byte 0xfeffffff -_0802385C: .4byte gUnknown_2023C34 +_0802385C: .4byte gChosenMoveByBattler _08023860: - ldr r1, _08023914 @ =gUnknown_2023DD0 + ldr r1, _08023914 @ =gHitMarker ldr r3, [r1] movs r0, 0x80 lsls r0, 5 @@ -12286,7 +12286,7 @@ _080238E8: strh r0, [r1] b _08023966 .align 2, 0 -_08023914: .4byte gUnknown_2023DD0 +_08023914: .4byte gHitMarker _08023918: .4byte gBattlerAttacker _0802391C: .4byte gActiveBattler _08023920: .4byte gBattlerTarget @@ -12450,7 +12450,7 @@ _08023A40: ands r0, r1 cmp r0, 0 beq _08023AFA - ldr r0, _08023B18 @ =gUnknown_2023DD0 + ldr r0, _08023B18 @ =gHitMarker ldr r1, [r0] movs r0, 0x80 lsls r0, 18 @@ -12524,12 +12524,12 @@ _08023B08: .4byte gBitTable _08023B0C: .4byte gBattlerAttacker _08023B10: .4byte gBattleStruct _08023B14: .4byte gBattleMoves -_08023B18: .4byte gUnknown_2023DD0 +_08023B18: .4byte gHitMarker _08023B1C: .4byte gBattlerTarget _08023B20: .4byte gMoveResultFlags _08023B24: .4byte gChosenMove _08023B28: - ldr r5, _08023C10 @ =gUnknown_2023DD0 + ldr r5, _08023C10 @ =gHitMarker ldr r2, [r5] movs r0, 0x80 lsls r0, 12 @@ -12542,7 +12542,7 @@ _08023B28: ands r0, r1 cmp r0, 0 beq _08023BAC - ldr r1, _08023C18 @ =gUnknown_2023E8C + ldr r1, _08023C18 @ =gProtectStructs ldr r0, _08023C1C @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -12634,7 +12634,7 @@ _08023BE8: mov r2, r10 cmp r2, 0 bne _08023BFE - ldr r1, _08023C34 @ =gUnknown_2023D74 + ldr r1, _08023C34 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 _08023BFC: @@ -12649,16 +12649,16 @@ _08023BFE: pop {r0} bx r0 .align 2, 0 -_08023C10: .4byte gUnknown_2023DD0 +_08023C10: .4byte gHitMarker _08023C14: .4byte gBattleTypeFlags -_08023C18: .4byte gUnknown_2023E8C +_08023C18: .4byte gProtectStructs _08023C1C: .4byte gBattlerAttacker _08023C20: .4byte gBattleMoves _08023C24: .4byte gCurrentMove _08023C28: .4byte gBattlerTarget _08023C2C: .4byte gBattleMons _08023C30: .4byte gBattleScripting -_08023C34: .4byte gUnknown_2023D74 +_08023C34: .4byte gBattlescriptCurrInstr thumb_func_end atk49_moveend thumb_func_start atk4A_typecalc2 @@ -12704,7 +12704,7 @@ atk4A_typecalc2: @ 8023C38 lsls r0, 1 adds r0, r1 strh r4, [r0] - ldr r0, _08023CB8 @ =gUnknown_2023E82 + ldr r0, _08023CB8 @ =gBattleCommunication mov r2, r8 strb r2, [r0, 0x6] ldrb r0, [r7] @@ -12719,7 +12719,7 @@ _08023CA8: .4byte gBattlerTarget _08023CAC: .4byte gLastUsedAbility _08023CB0: .4byte gMoveResultFlags _08023CB4: .4byte gUnknown_2023DA0 -_08023CB8: .4byte gUnknown_2023E82 +_08023CB8: .4byte gBattleCommunication _08023CBC: ldr r0, _08023CC8 @ =gMoveResultFlags ldrb r1, [r0] @@ -12905,7 +12905,7 @@ _08023DF0: lsls r0, 1 adds r0, r1 strh r5, [r0] - ldr r1, _08023E7C @ =gUnknown_2023E82 + ldr r1, _08023E7C @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x6] ldrb r0, [r2] @@ -12918,7 +12918,7 @@ _08023E2A: ands r0, r1 cmp r0, 0 beq _08023E48 - ldr r2, _08023E80 @ =gUnknown_2023E8C + ldr r2, _08023E80 @ =gProtectStructs ldr r0, _08023E64 @ =gBattlerAttacker ldrb r1, [r0] lsls r1, 4 @@ -12928,7 +12928,7 @@ _08023E2A: orrs r0, r2 strb r0, [r1, 0x1] _08023E48: - ldr r1, _08023E84 @ =gUnknown_2023D74 + ldr r1, _08023E84 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -12946,9 +12946,9 @@ _08023E6C: .4byte gBattleMoves _08023E70: .4byte gLastUsedAbility _08023E74: .4byte gMoveResultFlags _08023E78: .4byte gUnknown_2023DA0 -_08023E7C: .4byte gUnknown_2023E82 -_08023E80: .4byte gUnknown_2023E8C -_08023E84: .4byte gUnknown_2023D74 +_08023E7C: .4byte gBattleCommunication +_08023E80: .4byte gProtectStructs +_08023E84: .4byte gBattlescriptCurrInstr thumb_func_end atk4A_typecalc2 thumb_func_start atk4B_returnatktoball @@ -12958,7 +12958,7 @@ atk4B_returnatktoball: @ 8023E88 ldr r0, _08023EC8 @ =gBattlerAttacker ldrb r0, [r0] strb r0, [r4] - ldr r2, _08023ECC @ =gUnknown_2023DD0 + ldr r2, _08023ECC @ =gHitMarker ldr r1, _08023ED0 @ =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -12973,9 +12973,9 @@ atk4B_returnatktoball: @ 8023E88 movs r1, 0 bl BtlController_EmitReturnMonToBall ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08023EB6: - ldr r1, _08023ED4 @ =gUnknown_2023D74 + ldr r1, _08023ED4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -12985,9 +12985,9 @@ _08023EB6: .align 2, 0 _08023EC4: .4byte gActiveBattler _08023EC8: .4byte gBattlerAttacker -_08023ECC: .4byte gUnknown_2023DD0 +_08023ECC: .4byte gHitMarker _08023ED0: .4byte gBitTable -_08023ED4: .4byte gUnknown_2023D74 +_08023ED4: .4byte gBattlescriptCurrInstr thumb_func_end atk4B_returnatktoball thumb_func_start atk4C_getswitchedmondata @@ -12997,10 +12997,10 @@ atk4C_getswitchedmondata: @ 8023ED8 ldr r0, [r0] cmp r0, 0 bne _08023F28 - ldr r5, _08023F34 @ =gUnknown_2023D74 + ldr r5, _08023F34 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _08023F38 @ =gActiveBattler strb r0, [r4] ldr r3, _08023F3C @ =gBattlerPartyIndexes @@ -13025,7 +13025,7 @@ atk4C_getswitchedmondata: @ 8023ED8 movs r1, 0 bl BtlController_EmitGetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -13035,7 +13035,7 @@ _08023F28: bx r0 .align 2, 0 _08023F30: .4byte gBattleControllerExecFlags -_08023F34: .4byte gUnknown_2023D74 +_08023F34: .4byte gBattlescriptCurrInstr _08023F38: .4byte gActiveBattler _08023F3C: .4byte gBattlerPartyIndexes _08023F40: .4byte gBattleStruct @@ -13052,10 +13052,10 @@ sub_8023F48: @ 8023F48 beq _08023F56 b _08024098 _08023F56: - ldr r0, _080240A4 @ =gUnknown_2023D74 + ldr r0, _080240A4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _080240A8 @ =gActiveBattler strb r0, [r4] ldr r6, _080240AC @ =gBattleMons @@ -13129,7 +13129,7 @@ _08023F84: bl GetBattlerSide lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080240B8 @ =gUnknown_2023F20 + ldr r0, _080240B8 @ =gWishFutureKnock adds r0, 0x29 adds r0, r2, r0 ldrb r1, [r0] @@ -13208,7 +13208,7 @@ _08024068: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _080240A4 @ =gUnknown_2023D74 + ldr r1, _080240A4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -13219,12 +13219,12 @@ _08024098: bx r0 .align 2, 0 _080240A0: .4byte gBattleControllerExecFlags -_080240A4: .4byte gUnknown_2023D74 +_080240A4: .4byte gBattlescriptCurrInstr _080240A8: .4byte gActiveBattler _080240AC: .4byte gBattleMons _080240B0: .4byte gBattleBufferB _080240B4: .4byte gBaseStats -_080240B8: .4byte gUnknown_2023F20 +_080240B8: .4byte gWishFutureKnock _080240BC: .4byte gBitTable _080240C0: .4byte gBattlerPartyIndexes _080240C4: .4byte gBattleMoves @@ -13240,10 +13240,10 @@ sub_80240D4: @ 80240D4 ldr r0, [r0] cmp r0, 0 bne _08024160 - ldr r0, _0802416C @ =gUnknown_2023D74 + ldr r0, _0802416C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r6, _08024170 @ =gActiveBattler strb r0, [r6] ldrb r0, [r6] @@ -13290,13 +13290,13 @@ _0802412A: lsls r0, 1 adds r0, r1 ldrb r1, [r0] - ldr r4, _0802416C @ =gUnknown_2023D74 + ldr r4, _0802416C @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r2, [r0, 0x2] movs r0, 0 bl BtlController_EmitSwitchInAnim ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, 0x3 str r0, [r4] @@ -13306,7 +13306,7 @@ _08024160: bx r0 .align 2, 0 _08024168: .4byte gBattleControllerExecFlags -_0802416C: .4byte gUnknown_2023D74 +_0802416C: .4byte gBattlescriptCurrInstr _08024170: .4byte gActiveBattler _08024174: .4byte gBattleTypeFlags _08024178: .4byte 0x0001aa02 @@ -13321,12 +13321,12 @@ sub_802418C: @ 802418C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _080241F0 @ =gUnknown_2023D74 + ldr r4, _080241F0 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] movs r0, 0x7F ands r0, r1 - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r3, _080241F4 @ =gActiveBattler strb r0, [r3] ldr r2, [r4] @@ -13369,7 +13369,7 @@ _080241D8: str r1, [r4] b _08024388 .align 2, 0 -_080241F0: .4byte gUnknown_2023D74 +_080241F0: .4byte gBattlescriptCurrInstr _080241F4: .4byte gActiveBattler _080241F8: .4byte gBattleMons _080241FC: .4byte 0x0400e000 @@ -13542,7 +13542,7 @@ _08024354: cmp r5, 0x6 bne _08024380 _08024358: - ldr r3, _0802437C @ =gUnknown_2023D74 + ldr r3, _0802437C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -13559,9 +13559,9 @@ _08024358: .align 2, 0 _08024374: .4byte gPlayerParty _08024378: .4byte gBattlerPartyIndexes -_0802437C: .4byte gUnknown_2023D74 +_0802437C: .4byte gBattlescriptCurrInstr _08024380: - ldr r1, _08024394 @ =gUnknown_2023D74 + ldr r1, _08024394 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -13572,7 +13572,7 @@ _08024388: pop {r0} bx r0 .align 2, 0 -_08024394: .4byte gUnknown_2023D74 +_08024394: .4byte gBattlescriptCurrInstr thumb_func_end sub_802418C thumb_func_start sub_8024398 @@ -13605,7 +13605,7 @@ sub_8024398: @ 8024398 movs r3, 0 bl BtlController_EmitChoosePokemon ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec add sp, 0x4 pop {r4,r5} pop {r0} @@ -13626,7 +13626,7 @@ sub_80243EC: @ 80243EC movs r7, 0 movs r0, 0 mov r9, r0 - ldr r6, _08024498 @ =gUnknown_2023D74 + ldr r6, _08024498 @ =gBattlescriptCurrInstr ldr r2, [r6] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -13660,7 +13660,7 @@ _08024422: bcc _0802443C b _080248A6 _0802443C: - ldr r7, _080244A8 @ =gUnknown_2023DD0 + ldr r7, _080244A8 @ =gHitMarker ldr r6, _080244AC @ =gBitTable adds r4, r1, 0 ldr r2, _080244B0 @ =gAbsentBattlerFlags @@ -13678,7 +13678,7 @@ _08024446: adds r0, r2, 0 movs r1, 0x6 movs r2, 0x6 - bl sub_8019C10 + bl HasNoMonsToSwitch lsls r0, 24 cmp r0, 0 beq _080244B4 @@ -13702,18 +13702,18 @@ _08024446: movs r1, 0x2 bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _080244F6 .align 2, 0 -_08024498: .4byte gUnknown_2023D74 +_08024498: .4byte gBattlescriptCurrInstr _0802449C: .4byte gBattleTypeFlags _080244A0: .4byte gActiveBattler _080244A4: .4byte gBattlersCount -_080244A8: .4byte gUnknown_2023DD0 +_080244A8: .4byte gHitMarker _080244AC: .4byte gBitTable _080244B0: .4byte gAbsentBattlerFlags _080244B4: - ldr r5, _080244E4 @ =gUnknown_2023ECC + ldr r5, _080244E4 @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -13736,13 +13736,13 @@ _080244B4: strb r1, [r0] b _080244F6 .align 2, 0 -_080244E4: .4byte gUnknown_2023ECC +_080244E4: .4byte gSpecialStatuses _080244E8: movs r0, 0 movs r1, 0x2 bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080244F6: ldrb r0, [r4] adds r0, 0x1 @@ -13762,7 +13762,7 @@ _08024510: bne _08024518 b _080248A6 _08024518: - ldr r0, _08024570 @ =gUnknown_2023DD0 + ldr r0, _08024570 @ =gHitMarker mov r8, r0 ldr r0, [r0] lsrs r5, r0, 28 @@ -13776,7 +13776,7 @@ _08024518: movs r0, 0 movs r1, 0x6 movs r2, 0x6 - bl sub_8019C10 + bl HasNoMonsToSwitch lsls r0, 24 cmp r0, 0 beq _08024580 @@ -13800,15 +13800,15 @@ _08024518: movs r0, 0 bl BtlController_EmitCmd42 ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _080245CE .align 2, 0 -_08024570: .4byte gUnknown_2023DD0 +_08024570: .4byte gHitMarker _08024574: .4byte gBitTable _08024578: .4byte gActiveBattler _0802457C: .4byte gAbsentBattlerFlags _08024580: - ldr r6, _080245B4 @ =gUnknown_2023ECC + ldr r6, _080245B4 @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -13834,14 +13834,14 @@ _08024580: strb r1, [r0] b _080245CE .align 2, 0 -_080245B4: .4byte gUnknown_2023ECC +_080245B4: .4byte gSpecialStatuses _080245B8: .4byte gBattleStruct _080245BC: movs r0, 0 movs r1, 0x2 bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec movs r0, 0x1 mov r9, r0 _080245CE: @@ -13860,7 +13860,7 @@ _080245CE: movs r0, 0x2 movs r1, 0x6 movs r2, 0x6 - bl sub_8019C10 + bl HasNoMonsToSwitch lsls r0, 24 cmp r0, 0 beq _08024638 @@ -13872,7 +13872,7 @@ _080245CE: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _08024634 @ =gUnknown_2023DD0 + ldr r2, _08024634 @ =gHitMarker ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13884,15 +13884,15 @@ _080245CE: movs r0, 0 bl BtlController_EmitCmd42 ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _0802468C .align 2, 0 _08024628: .4byte gBitTable _0802462C: .4byte gActiveBattler _08024630: .4byte gAbsentBattlerFlags -_08024634: .4byte gUnknown_2023DD0 +_08024634: .4byte gHitMarker _08024638: - ldr r6, _0802466C @ =gUnknown_2023ECC + ldr r6, _0802466C @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -13918,7 +13918,7 @@ _08024638: strb r1, [r0] b _0802468C .align 2, 0 -_0802466C: .4byte gUnknown_2023ECC +_0802466C: .4byte gSpecialStatuses _08024670: .4byte gBattleStruct _08024674: movs r0, 0x1 @@ -13930,7 +13930,7 @@ _08024674: movs r1, 0x2 bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0802468C: ldr r6, _080246DC @ =gBitTable ldr r0, [r6, 0x4] @@ -13943,7 +13943,7 @@ _0802468C: movs r0, 0x1 movs r1, 0x6 movs r2, 0x6 - bl sub_8019C10 + bl HasNoMonsToSwitch lsls r0, 24 cmp r0, 0 beq _080246EC @@ -13955,7 +13955,7 @@ _0802468C: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _080246E8 @ =gUnknown_2023DD0 + ldr r2, _080246E8 @ =gHitMarker ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13967,15 +13967,15 @@ _0802468C: movs r0, 0 bl BtlController_EmitCmd42 ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _0802473E .align 2, 0 _080246DC: .4byte gBitTable _080246E0: .4byte gActiveBattler _080246E4: .4byte gAbsentBattlerFlags -_080246E8: .4byte gUnknown_2023DD0 +_080246E8: .4byte gHitMarker _080246EC: - ldr r6, _08024720 @ =gUnknown_2023ECC + ldr r6, _08024720 @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -14001,14 +14001,14 @@ _080246EC: strb r1, [r0] b _0802473E .align 2, 0 -_08024720: .4byte gUnknown_2023ECC +_08024720: .4byte gSpecialStatuses _08024724: .4byte gBattleStruct _08024728: movs r0, 0 movs r1, 0x2 bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec movs r0, 0x2 mov r2, r9 orrs r2, r0 @@ -14029,7 +14029,7 @@ _0802473E: movs r0, 0x3 movs r1, 0x6 movs r2, 0x6 - bl sub_8019C10 + bl HasNoMonsToSwitch lsls r0, 24 cmp r0, 0 beq _080247A8 @@ -14041,7 +14041,7 @@ _0802473E: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _080247A4 @ =gUnknown_2023DD0 + ldr r2, _080247A4 @ =gHitMarker ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -14053,15 +14053,15 @@ _0802473E: movs r0, 0 bl BtlController_EmitCmd42 ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _080247FC .align 2, 0 _08024798: .4byte gBitTable _0802479C: .4byte gActiveBattler _080247A0: .4byte gAbsentBattlerFlags -_080247A4: .4byte gUnknown_2023DD0 +_080247A4: .4byte gHitMarker _080247A8: - ldr r6, _080247DC @ =gUnknown_2023ECC + ldr r6, _080247DC @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -14087,7 +14087,7 @@ _080247A8: strb r1, [r0] b _080247FC .align 2, 0 -_080247DC: .4byte gUnknown_2023ECC +_080247DC: .4byte gSpecialStatuses _080247E0: .4byte gBattleStruct _080247E4: movs r0, 0x2 @@ -14099,9 +14099,9 @@ _080247E4: movs r1, 0x2 bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080247FC: - ldr r1, _0802482C @ =gUnknown_2023ECC + ldr r1, _0802482C @ =gSpecialStatuses ldrb r0, [r1] lsls r0, 25 cmp r0, 0 @@ -14126,7 +14126,7 @@ _080247FC: strb r0, [r1] b _08024840 .align 2, 0 -_0802482C: .4byte gUnknown_2023ECC +_0802482C: .4byte gSpecialStatuses _08024830: .4byte gAbsentBattlerFlags _08024834: .4byte gBitTable _08024838: .4byte gActiveBattler @@ -14139,9 +14139,9 @@ _08024840: bl BtlController_EmitLinkStandbyMsg ldr r0, _08024880 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08024850: - ldr r1, _08024884 @ =gUnknown_2023ECC + ldr r1, _08024884 @ =gSpecialStatuses ldrb r0, [r1, 0x14] lsls r0, 25 cmp r0, 0 @@ -14166,7 +14166,7 @@ _08024850: b _08024894 .align 2, 0 _08024880: .4byte gActiveBattler -_08024884: .4byte gUnknown_2023ECC +_08024884: .4byte gSpecialStatuses _08024888: .4byte gAbsentBattlerFlags _0802488C: .4byte gBitTable _08024890: @@ -14179,16 +14179,16 @@ _08024894: bl BtlController_EmitLinkStandbyMsg ldr r0, _080248B0 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080248A6: - ldr r1, _080248B4 @ =gUnknown_2023D74 + ldr r1, _080248B4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] b _08024C2E .align 2, 0 _080248B0: .4byte gActiveBattler -_080248B4: .4byte gUnknown_2023D74 +_080248B4: .4byte gBattlescriptCurrInstr _080248B8: cmp r0, 0x6 beq _080248BE @@ -14208,7 +14208,7 @@ _080248CC: bne _080248D6 b _08024A48 _080248D6: - ldr r7, _08024938 @ =gUnknown_2023DD0 + ldr r7, _08024938 @ =gHitMarker ldr r0, [r7] lsrs r5, r0, 28 ldr r4, _0802493C @ =gBitTable @@ -14227,7 +14227,7 @@ _080248D6: ldrb r1, [r0, 0x1] movs r0, 0x2 movs r2, 0x6 - bl sub_8019C10 + bl HasNoMonsToSwitch lsls r0, 24 cmp r0, 0 beq _0802494C @@ -14250,17 +14250,17 @@ _080248D6: movs r0, 0 bl BtlController_EmitCmd42 ldrb r0, [r6] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _0802497E .align 2, 0 _08024934: .4byte gBattleTypeFlags -_08024938: .4byte gUnknown_2023DD0 +_08024938: .4byte gHitMarker _0802493C: .4byte gBitTable _08024940: .4byte gActiveBattler _08024944: .4byte gBattleBufferB _08024948: .4byte gAbsentBattlerFlags _0802494C: - ldr r4, _080249DC @ =gUnknown_2023ECC + ldr r4, _080249DC @ =gSpecialStatuses ldrb r0, [r6] lsls r1, r0, 2 adds r1, r0 @@ -14303,7 +14303,7 @@ _0802497E: ldrb r1, [r0] movs r0, 0x3 movs r2, 0x6 - bl sub_8019C10 + bl HasNoMonsToSwitch lsls r0, 24 cmp r0, 0 beq _080249FC @@ -14315,7 +14315,7 @@ _0802497E: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _080249F8 @ =gUnknown_2023DD0 + ldr r2, _080249F8 @ =gHitMarker ldrb r0, [r5] lsls r0, 2 adds r0, r4 @@ -14327,19 +14327,19 @@ _0802497E: movs r0, 0 bl BtlController_EmitCmd42 ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _08024A2E .align 2, 0 -_080249DC: .4byte gUnknown_2023ECC +_080249DC: .4byte gSpecialStatuses _080249E0: .4byte gBattleStruct _080249E4: .4byte gBitTable _080249E8: .4byte gActiveBattler _080249EC: .4byte gBattleBufferB _080249F0: .4byte 0x00000201 _080249F4: .4byte gAbsentBattlerFlags -_080249F8: .4byte gUnknown_2023DD0 +_080249F8: .4byte gHitMarker _080249FC: - ldr r4, _08024A3C @ =gUnknown_2023ECC + ldr r4, _08024A3C @ =gSpecialStatuses ldrb r0, [r5] lsls r1, r0, 2 adds r1, r0 @@ -14364,24 +14364,24 @@ _080249FC: orrs r1, r2 strb r1, [r0] _08024A2E: - ldr r1, _08024A44 @ =gUnknown_2023D74 + ldr r1, _08024A44 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] mov r12, r1 b _08024A4C .align 2, 0 -_08024A3C: .4byte gUnknown_2023ECC +_08024A3C: .4byte gSpecialStatuses _08024A40: .4byte gBattleStruct -_08024A44: .4byte gUnknown_2023D74 +_08024A44: .4byte gBattlescriptCurrInstr _08024A48: adds r0, r2, 0x6 str r0, [r6] _08024A4C: - ldr r0, _08024A9C @ =gUnknown_2023DD0 + ldr r0, _08024A9C @ =gHitMarker ldr r0, [r0] lsrs r5, r0, 28 - ldr r1, _08024AA0 @ =gUnknown_2023D6D + ldr r1, _08024AA0 @ =gBattlerFainted movs r0, 0 strb r0, [r1] ldr r4, _08024AA4 @ =gBitTable @@ -14421,8 +14421,8 @@ _08024A92: str r1, [r2] b _08024C2E .align 2, 0 -_08024A9C: .4byte gUnknown_2023DD0 -_08024AA0: .4byte gUnknown_2023D6D +_08024A9C: .4byte gHitMarker +_08024AA0: .4byte gBattlerFainted _08024AA4: .4byte gBitTable _08024AA8: .4byte gBattlersCount _08024AAC: @@ -14435,10 +14435,10 @@ _08024AAC: _08024AB8: movs r0, 0x7F ands r0, r1 - bl sub_8016E24 + bl GetBattlerForBattleScript lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _08024AE0 @ =gUnknown_2023ECC + ldr r1, _08024AE0 @ =gSpecialStatuses lsls r0, r7, 2 adds r0, r7 lsls r0, 2 @@ -14452,12 +14452,12 @@ _08024AB8: str r0, [r6] b _08024C2E .align 2, 0 -_08024AE0: .4byte gUnknown_2023ECC +_08024AE0: .4byte gSpecialStatuses _08024AE4: adds r0, r7, 0 movs r1, 0x6 movs r2, 0x6 - bl sub_8019C10 + bl HasNoMonsToSwitch lsls r0, 24 cmp r0, 0 beq _08024B34 @@ -14472,7 +14472,7 @@ _08024AE4: ldrb r1, [r3] orrs r0, r1 strb r0, [r3] - ldr r3, _08024B30 @ =gUnknown_2023DD0 + ldr r3, _08024B30 @ =gHitMarker ldrb r0, [r2] lsls r0, 2 adds r0, r4 @@ -14488,7 +14488,7 @@ _08024AE4: _08024B24: .4byte gActiveBattler _08024B28: .4byte gAbsentBattlerFlags _08024B2C: .4byte gBitTable -_08024B30: .4byte gUnknown_2023DD0 +_08024B30: .4byte gHitMarker _08024B34: ldr r4, _08024BD8 @ =gActiveBattler strb r7, [r4] @@ -14520,7 +14520,7 @@ _08024B34: movs r3, 0 bl BtlController_EmitChoosePokemon ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r6] adds r0, 0x6 str r0, [r6] @@ -14558,7 +14558,7 @@ _08024BB0: movs r1, 0x2 bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08024BC4: ldrb r0, [r4] adds r0, 0x1 @@ -14605,7 +14605,7 @@ _08024C20: movs r1, 0x2 bl BtlController_EmitLinkStandbyMsg ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08024C2E: add sp, 0x4 pop {r3,r4} @@ -14629,10 +14629,10 @@ sub_8024C48: @ 8024C48 beq _08024C54 b _08024E16 _08024C54: - ldr r4, _08024C78 @ =gUnknown_2023D74 + ldr r4, _08024C78 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r7, _08024C7C @ =gActiveBattler strb r0, [r7] ldr r0, [r4] @@ -14646,7 +14646,7 @@ _08024C54: b _08024E0E .align 2, 0 _08024C74: .4byte gBattleControllerExecFlags -_08024C78: .4byte gUnknown_2023D74 +_08024C78: .4byte gBattlescriptCurrInstr _08024C7C: .4byte gActiveBattler _08024C80: cmp r0, 0x2 @@ -14700,7 +14700,7 @@ _08024CD2: .align 2, 0 _08024CDC: .4byte gBattleTypeFlags _08024CE0: - ldr r1, _08024DAC @ =gUnknown_2023E82 + ldr r1, _08024DAC @ =gBattleCommunication ldr r4, _08024DB0 @ =gBattleBufferB ldrb r0, [r7] lsls r0, 9 @@ -14803,7 +14803,7 @@ _08024CE0: strb r0, [r1] b _08024DC2 .align 2, 0 -_08024DAC: .4byte gUnknown_2023E82 +_08024DAC: .4byte gBattleCommunication _08024DB0: .4byte gBattleBufferB _08024DB4: .4byte gBattleStruct _08024DB8: .4byte gBattleTypeFlags @@ -14850,7 +14850,7 @@ _08024DC2: negs r0, r0 strb r0, [r2, 0x4] _08024E0E: - ldr r1, _08024E34 @ =gUnknown_2023D74 + ldr r1, _08024E34 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 str r0, [r1] @@ -14865,7 +14865,7 @@ _08024E24: .4byte gBattlerAttacker _08024E28: .4byte gBattleTextBuff2 _08024E2C: .4byte gActiveBattler _08024E30: .4byte gBattleBufferB -_08024E34: .4byte gUnknown_2023D74 +_08024E34: .4byte gBattlescriptCurrInstr thumb_func_end sub_8024C48 thumb_func_start sub_8024E38 @@ -14875,15 +14875,15 @@ sub_8024E38: @ 8024E38 mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r6, _08024F40 @ =gUnknown_2023D74 + ldr r6, _08024F40 @ =gBattlescriptCurrInstr ldr r0, [r6] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _08024F44 @ =gActiveBattler strb r0, [r4] ldrb r0, [r4] bl sub_80174B8 - ldr r2, _08024F48 @ =gUnknown_2023DD0 + ldr r2, _08024F48 @ =gHitMarker ldr r1, _08024F4C @ =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -14893,7 +14893,7 @@ sub_8024E38: @ 8024E38 ldr r0, [r2] bics r0, r1 str r0, [r2] - ldr r2, _08024F50 @ =gUnknown_2023ECC + ldr r2, _08024F50 @ =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -14906,7 +14906,7 @@ sub_8024E38: @ 8024E38 strb r0, [r1] ldrb r0, [r4] bl GetBattlerSide - ldr r5, _08024F54 @ =gSideAffecting + ldr r5, _08024F54 @ =gSideStatuses lsls r0, 24 lsrs r0, 23 adds r0, r5 @@ -14996,12 +14996,12 @@ _08024F28: str r0, [r6] b _080250C6 .align 2, 0 -_08024F40: .4byte gUnknown_2023D74 +_08024F40: .4byte gBattlescriptCurrInstr _08024F44: .4byte gActiveBattler -_08024F48: .4byte gUnknown_2023DD0 +_08024F48: .4byte gHitMarker _08024F4C: .4byte gBitTable -_08024F50: .4byte gUnknown_2023ECC -_08024F54: .4byte gSideAffecting +_08024F50: .4byte gSpecialStatuses +_08024F54: .4byte gSideStatuses _08024F58: .4byte gBattleMons _08024F5C: .4byte gSideTimers _08024F60: .4byte gBattleMoveDamage @@ -15056,13 +15056,13 @@ _08024FC4: ldrb r1, [r5] movs r0, 0 movs r2, 0 - bl sub_801BC68 + bl ItemBattleEffects lsls r0, 24 cmp r0, 0 bne _080250C6 ldrb r0, [r5] bl GetBattlerSide - ldr r1, _08025070 @ =gSideAffecting + ldr r1, _08025070 @ =gSideStatuses lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -15075,7 +15075,7 @@ _08024FC4: ldrb r3, [r0] cmp r4, r3 bge _08025012 - ldr r6, _0802507C @ =gUnknown_2023BDE + ldr r6, _0802507C @ =gBattlerByTurnOrder ldr r3, _08025080 @ =gUnknown_2023BDA movs r2, 0xC adds r1, r0, 0 @@ -15120,16 +15120,16 @@ _08025020: cmp r4, r0 blt _08025020 _08025046: - ldr r0, _08025088 @ =gUnknown_2023D74 + ldr r0, _08025088 @ =gBattlescriptCurrInstr ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x5 bne _080250C0 - ldr r0, _0802508C @ =gUnknown_2023DD0 + ldr r0, _0802508C @ =gHitMarker ldr r0, [r0] lsrs r4, r0, 28 - ldr r1, _08025090 @ =gUnknown_2023D6D + ldr r1, _08025090 @ =gBattlerFainted ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -15139,15 +15139,15 @@ _08025046: _08025064: .4byte gBattleMons _08025068: .4byte gActiveBattler _0802506C: .4byte gDisableStructs -_08025070: .4byte gSideAffecting +_08025070: .4byte gSideStatuses _08025074: .4byte 0x0000fdff _08025078: .4byte gBattlersCount -_0802507C: .4byte gUnknown_2023BDE +_0802507C: .4byte gBattlerByTurnOrder _08025080: .4byte gUnknown_2023BDA _08025084: .4byte gBattleStruct -_08025088: .4byte gUnknown_2023D74 -_0802508C: .4byte gUnknown_2023DD0 -_08025090: .4byte gUnknown_2023D6D +_08025088: .4byte gBattlescriptCurrInstr +_0802508C: .4byte gHitMarker +_08025090: .4byte gBattlerFainted _08025094: .4byte gBitTable _08025098: ldr r0, _080250D4 @ =gBattlersCount @@ -15191,7 +15191,7 @@ _080250D8: .4byte gAbsentBattlerFlags thumb_func_start atk53_trainer_slide atk53_trainer_slide: @ 80250DC push {lr} - ldr r0, _080250EC @ =gUnknown_2023D74 + ldr r0, _080250EC @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -15199,7 +15199,7 @@ atk53_trainer_slide: @ 80250DC movs r0, 0 b _080250F2 .align 2, 0 -_080250EC: .4byte gUnknown_2023D74 +_080250EC: .4byte gBattlescriptCurrInstr _080250F0: movs r0, 0x1 _080250F2: @@ -15210,8 +15210,8 @@ _080250F2: bl BtlController_EmitTrainerSlide ldr r0, _08025114 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution - ldr r1, _08025118 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _08025118 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -15219,7 +15219,7 @@ _080250F2: bx r0 .align 2, 0 _08025114: .4byte gActiveBattler -_08025118: .4byte gUnknown_2023D74 +_08025118: .4byte gBattlescriptCurrInstr thumb_func_end atk53_trainer_slide thumb_func_start atk54_playse @@ -15229,7 +15229,7 @@ atk54_playse: @ 802511C ldr r0, _08025150 @ =gBattlerAttacker ldrb r0, [r0] strb r0, [r5] - ldr r4, _08025154 @ =gUnknown_2023D74 + ldr r4, _08025154 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -15238,7 +15238,7 @@ atk54_playse: @ 802511C movs r0, 0 bl BtlController_EmitPlaySE ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, 0x3 str r0, [r4] @@ -15248,7 +15248,7 @@ atk54_playse: @ 802511C .align 2, 0 _0802514C: .4byte gActiveBattler _08025150: .4byte gBattlerAttacker -_08025154: .4byte gUnknown_2023D74 +_08025154: .4byte gBattlescriptCurrInstr thumb_func_end atk54_playse thumb_func_start atk55_play_sound @@ -15258,7 +15258,7 @@ atk55_play_sound: @ 8025158 ldr r0, _0802518C @ =gBattlerAttacker ldrb r0, [r0] strb r0, [r5] - ldr r4, _08025190 @ =gUnknown_2023D74 + ldr r4, _08025190 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -15267,7 +15267,7 @@ atk55_play_sound: @ 8025158 movs r0, 0 bl BtlController_EmitPlayFanfare ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r4] adds r0, 0x3 str r0, [r4] @@ -15277,22 +15277,22 @@ atk55_play_sound: @ 8025158 .align 2, 0 _08025188: .4byte gActiveBattler _0802518C: .4byte gBattlerAttacker -_08025190: .4byte gUnknown_2023D74 +_08025190: .4byte gBattlescriptCurrInstr thumb_func_end atk55_play_sound thumb_func_start atk56_playfaintcry atk56_playfaintcry: @ 8025194 push {r4,r5,lr} - ldr r5, _080251BC @ =gUnknown_2023D74 + ldr r5, _080251BC @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _080251C0 @ =gActiveBattler strb r0, [r4] movs r0, 0 bl BtlController_EmitFaintingCry ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -15300,7 +15300,7 @@ atk56_playfaintcry: @ 8025194 pop {r0} bx r0 .align 2, 0 -_080251BC: .4byte gUnknown_2023D74 +_080251BC: .4byte gBattlescriptCurrInstr _080251C0: .4byte gActiveBattler thumb_func_end atk56_playfaintcry @@ -15316,8 +15316,8 @@ atk57: @ 80251C4 movs r0, 0 bl BtlController_EmitCmd55 ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r1, _080251F8 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _080251F8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -15327,23 +15327,23 @@ atk57: @ 80251C4 .align 2, 0 _080251F0: .4byte gActiveBattler _080251F4: .4byte gBattleOutcome -_080251F8: .4byte gUnknown_2023D74 +_080251F8: .4byte gBattlescriptCurrInstr thumb_func_end atk57 thumb_func_start atk58_returntoball atk58_returntoball: @ 80251FC push {r4,r5,lr} - ldr r5, _08025228 @ =gUnknown_2023D74 + ldr r5, _08025228 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _0802522C @ =gActiveBattler strb r0, [r4] movs r0, 0 movs r1, 0x1 bl BtlController_EmitReturnMonToBall ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -15351,14 +15351,14 @@ atk58_returntoball: @ 80251FC pop {r0} bx r0 .align 2, 0 -_08025228: .4byte gUnknown_2023D74 +_08025228: .4byte gBattlescriptCurrInstr _0802522C: .4byte gActiveBattler thumb_func_end atk58_returntoball thumb_func_start atk59_handlelearnnewmove atk59_handlelearnnewmove: @ 8025230 push {r4-r7,lr} - ldr r0, _080252A4 @ =gUnknown_2023D74 + ldr r0, _080252A4 @ =gBattlescriptCurrInstr ldr r2, [r0] ldrb r6, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -15412,11 +15412,11 @@ _0802527E: _0802529A: cmp r5, 0 bne _080252B4 - ldr r0, _080252A4 @ =gUnknown_2023D74 + ldr r0, _080252A4 @ =gBattlescriptCurrInstr str r4, [r0] b _0802535C .align 2, 0 -_080252A4: .4byte gUnknown_2023D74 +_080252A4: .4byte gBattlescriptCurrInstr _080252A8: .4byte gBattleStruct _080252AC: .4byte gPlayerParty _080252B0: .4byte 0x0000fffe @@ -15424,14 +15424,14 @@ _080252B4: ldr r0, _080252C4 @ =0x0000ffff cmp r5, r0 bne _080252CC - ldr r1, _080252C8 @ =gUnknown_2023D74 + ldr r1, _080252C8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] b _0802535C .align 2, 0 _080252C4: .4byte 0x0000ffff -_080252C8: .4byte gUnknown_2023D74 +_080252C8: .4byte gBattlescriptCurrInstr _080252CC: movs r0, 0 bl GetBattlerAtPosition @@ -15501,7 +15501,7 @@ _0802530C: adds r1, r5, 0 bl GiveMoveToBattleMon _08025358: - ldr r0, _08025378 @ =gUnknown_2023D74 + ldr r0, _08025378 @ =gBattlescriptCurrInstr str r6, [r0] _0802535C: pop {r4-r7} @@ -15513,7 +15513,7 @@ _08025368: .4byte gBattlerPartyIndexes _0802536C: .4byte gBattleStruct _08025370: .4byte gBattleMons _08025374: .4byte gBattleTypeFlags -_08025378: .4byte gUnknown_2023D74 +_08025378: .4byte gBattlescriptCurrInstr thumb_func_end atk59_handlelearnnewmove thumb_func_start sub_802537C @@ -15564,14 +15564,14 @@ _080253C4: ldrb r0, [r1, 0x1F] adds r0, 0x1 strb r0, [r1, 0x1F] - ldr r0, _080253F8 @ =gUnknown_2023E82 + ldr r0, _080253F8 @ =gBattleCommunication strb r4, [r0, 0x1] bl sub_802DCB8 b _080256D0 .align 2, 0 _080253F0: .4byte gUnknown_83FE791 _080253F4: .4byte gBattleScripting -_080253F8: .4byte gUnknown_2023E82 +_080253F8: .4byte gBattleCommunication _080253FC: ldr r0, _08025484 @ =gMain ldrh r1, [r0, 0x2E] @@ -15579,7 +15579,7 @@ _080253FC: ands r0, r1 cmp r0, 0 beq _08025422 - ldr r4, _08025488 @ =gUnknown_2023E82 + ldr r4, _08025488 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _08025422 @@ -15596,7 +15596,7 @@ _08025422: ands r0, r1 cmp r0, 0 beq _08025448 - ldr r4, _08025488 @ =gUnknown_2023E82 + ldr r4, _08025488 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _08025448 @@ -15616,7 +15616,7 @@ _08025448: beq _0802548C movs r0, 0x5 bl PlaySE - ldr r0, _08025488 @ =gUnknown_2023E82 + ldr r0, _08025488 @ =gBattleCommunication ldrb r4, [r0, 0x1] cmp r4, 0 bne _0802549C @@ -15636,7 +15636,7 @@ _08025448: b _080254D8 .align 2, 0 _08025484: .4byte gMain -_08025488: .4byte gUnknown_2023E82 +_08025488: .4byte gBattleCommunication _0802548C: movs r0, 0x2 ands r0, r1 @@ -15755,7 +15755,7 @@ _08025580: .4byte 0x0000013f _08025584: .4byte gActiveBattler _08025588: .4byte gBattleScripting _0802558C: - ldr r3, _08025680 @ =gUnknown_2023D74 + ldr r3, _08025680 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -15872,7 +15872,7 @@ _08025622: bl SetBattleMonMoveSlot b _080256D0 .align 2, 0 -_08025680: .4byte gUnknown_2023D74 +_08025680: .4byte gBattlescriptCurrInstr _08025684: .4byte gBattleTextBuff2 _08025688: .4byte gMoveToLearn _0802568C: .4byte gBattlerPartyIndexes @@ -15889,13 +15889,13 @@ _080256A4: movs r2, 0x1D movs r3, 0xD bl sub_802DB7C - ldr r1, _080256C0 @ =gUnknown_2023D74 + ldr r1, _080256C0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080256D0 .align 2, 0 -_080256C0: .4byte gUnknown_2023D74 +_080256C0: .4byte gBattlescriptCurrInstr _080256C4: ldr r0, _080256DC @ =gBattleControllerExecFlags ldr r0, [r0] @@ -15940,13 +15940,13 @@ _080256F8: ldrb r0, [r5, 0x1F] adds r0, 0x1 strb r0, [r5, 0x1F] - ldr r0, _08025724 @ =gUnknown_2023E82 + ldr r0, _08025724 @ =gBattleCommunication strb r4, [r0, 0x1] bl sub_802DCB8 b _0802580E .align 2, 0 _08025720: .4byte gUnknown_83FE791 -_08025724: .4byte gUnknown_2023E82 +_08025724: .4byte gBattleCommunication _08025728: ldr r0, _080257AC @ =gMain ldrh r1, [r0, 0x2E] @@ -15954,7 +15954,7 @@ _08025728: ands r0, r1 cmp r0, 0 beq _0802574E - ldr r4, _080257B0 @ =gUnknown_2023E82 + ldr r4, _080257B0 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _0802574E @@ -15971,7 +15971,7 @@ _0802574E: ands r0, r1 cmp r0, 0 beq _08025774 - ldr r4, _080257B0 @ =gUnknown_2023E82 + ldr r4, _080257B0 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _08025774 @@ -15991,11 +15991,11 @@ _08025774: beq _080257D8 movs r0, 0x5 bl PlaySE - ldr r0, _080257B0 @ =gUnknown_2023E82 + ldr r0, _080257B0 @ =gBattleCommunication ldrb r0, [r0, 0x1] cmp r0, 0 beq _080257B8 - ldr r3, _080257B4 @ =gUnknown_2023D74 + ldr r3, _080257B4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -16011,10 +16011,10 @@ _08025774: b _080257C0 .align 2, 0 _080257AC: .4byte gMain -_080257B0: .4byte gUnknown_2023E82 -_080257B4: .4byte gUnknown_2023D74 +_080257B0: .4byte gBattleCommunication +_080257B4: .4byte gBattlescriptCurrInstr _080257B8: - ldr r1, _080257D4 @ =gUnknown_2023D74 + ldr r1, _080257D4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -16028,7 +16028,7 @@ _080257C0: bl sub_802DB7C b _0802580E .align 2, 0 -_080257D4: .4byte gUnknown_2023D74 +_080257D4: .4byte gBattlescriptCurrInstr _080257D8: movs r0, 0x2 ands r0, r1 @@ -16036,7 +16036,7 @@ _080257D8: beq _0802580E movs r0, 0x5 bl PlaySE - ldr r3, _08025818 @ =gUnknown_2023D74 + ldr r3, _08025818 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -16061,16 +16061,16 @@ _0802580E: pop {r0} bx r0 .align 2, 0 -_08025818: .4byte gUnknown_2023D74 +_08025818: .4byte gBattlescriptCurrInstr thumb_func_end sub_80256E0 thumb_func_start sub_802581C sub_802581C: @ 802581C push {r4,lr} - ldr r4, _08025888 @ =gUnknown_2023D74 + ldr r4, _08025888 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r2, _0802588C @ =gActiveBattler strb r0, [r2] ldr r0, _08025890 @ =gMoveResultFlags @@ -16079,7 +16079,7 @@ sub_802581C: @ 802581C ands r0, r1 cmp r0, 0 bne _080258A0 - ldr r0, _08025894 @ =gUnknown_2023DD0 + ldr r0, _08025894 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -16111,17 +16111,17 @@ _0802586E: bl BtlController_EmitHitAnimation ldr r0, _0802588C @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution - ldr r1, _08025888 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _08025888 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] b _080258A6 .align 2, 0 -_08025888: .4byte gUnknown_2023D74 +_08025888: .4byte gBattlescriptCurrInstr _0802588C: .4byte gActiveBattler _08025890: .4byte gMoveResultFlags -_08025894: .4byte gUnknown_2023DD0 +_08025894: .4byte gHitMarker _08025898: .4byte gBattleMons _0802589C: .4byte gDisableStructs _080258A0: @@ -16334,16 +16334,16 @@ _08025A00: strb r0, [r1, 0x8] cmp r4, 0 beq _08025A48 - ldr r1, _08025A44 @ =gUnknown_2023D74 + ldr r1, _08025A44 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08025A62 .align 2, 0 _08025A40: .4byte gBattleTextBuff1 -_08025A44: .4byte gUnknown_2023D74 +_08025A44: .4byte gBattlescriptCurrInstr _08025A48: - ldr r3, _08025A6C @ =gUnknown_2023D74 + ldr r3, _08025A6C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -16363,7 +16363,7 @@ _08025A62: pop {r0} bx r0 .align 2, 0 -_08025A6C: .4byte gUnknown_2023D74 +_08025A6C: .4byte gBattlescriptCurrInstr thumb_func_end sub_80258AC thumb_func_start atk5E @@ -16371,13 +16371,13 @@ atk5E: @ 8025A70 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _08025A94 @ =gUnknown_2023D74 + ldr r4, _08025A94 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r6, _08025A98 @ =gActiveBattler strb r0, [r6] - ldr r5, _08025A9C @ =gUnknown_2023E82 + ldr r5, _08025A9C @ =gBattleCommunication ldrb r0, [r5] mov r8, r4 cmp r0, 0 @@ -16386,16 +16386,16 @@ atk5E: @ 8025A70 beq _08025AB8 b _08025B0C .align 2, 0 -_08025A94: .4byte gUnknown_2023D74 +_08025A94: .4byte gBattlescriptCurrInstr _08025A98: .4byte gActiveBattler -_08025A9C: .4byte gUnknown_2023E82 +_08025A9C: .4byte gBattleCommunication _08025AA0: movs r0, 0 movs r1, 0 movs r2, 0 bl BtlController_EmitGetMonData ldrb r0, [r6] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -16467,7 +16467,7 @@ atk5F: @ 8025B24 ldrb r0, [r1] strb r0, [r2] strb r3, [r1] - ldr r2, _08025B58 @ =gUnknown_2023DD0 + ldr r2, _08025B58 @ =gHitMarker ldr r1, [r2] movs r3, 0x80 lsls r3, 5 @@ -16482,20 +16482,20 @@ atk5F: @ 8025B24 _08025B4C: .4byte gActiveBattler _08025B50: .4byte gBattlerAttacker _08025B54: .4byte gBattlerTarget -_08025B58: .4byte gUnknown_2023DD0 +_08025B58: .4byte gHitMarker _08025B5C: .4byte 0xffffefff _08025B60: orrs r1, r3 _08025B62: str r1, [r2] - ldr r1, _08025B70 @ =gUnknown_2023D74 + ldr r1, _08025B70 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08025B70: .4byte gUnknown_2023D74 +_08025B70: .4byte gBattlescriptCurrInstr thumb_func_end atk5F thumb_func_start atk60_incrementgamestat @@ -16507,12 +16507,12 @@ atk60_incrementgamestat: @ 8025B74 lsls r0, 24 cmp r0, 0 bne _08025B8E - ldr r0, _08025BA0 @ =gUnknown_2023D74 + ldr r0, _08025BA0 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl IncrementGameStat _08025B8E: - ldr r1, _08025BA0 @ =gUnknown_2023D74 + ldr r1, _08025BA0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -16520,7 +16520,7 @@ _08025B8E: bx r0 .align 2, 0 _08025B9C: .4byte gBattlerAttacker -_08025BA0: .4byte gUnknown_2023D74 +_08025BA0: .4byte gBattlescriptCurrInstr thumb_func_end atk60_incrementgamestat thumb_func_start atk61_drawpartystatussummary @@ -16533,10 +16533,10 @@ atk61_drawpartystatussummary: @ 8025BA4 ldr r0, [r0] cmp r0, 0 bne _08025C58 - ldr r0, _08025C0C @ =gUnknown_2023D74 + ldr r0, _08025C0C @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r1, _08025C10 @ =gActiveBattler strb r0, [r1] ldrb r0, [r1] @@ -16576,7 +16576,7 @@ _08025C00: b _08025C32 .align 2, 0 _08025C08: .4byte gBattleControllerExecFlags -_08025C0C: .4byte gUnknown_2023D74 +_08025C0C: .4byte gBattlescriptCurrInstr _08025C10: .4byte gActiveBattler _08025C14: .4byte gEnemyParty _08025C18: .4byte gPlayerParty @@ -16602,8 +16602,8 @@ _08025C32: bl BtlController_EmitDrawPartyStatusSummary ldr r0, _08025C64 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution - ldr r1, _08025C68 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _08025C68 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -16616,22 +16616,22 @@ _08025C58: bx r0 .align 2, 0 _08025C64: .4byte gActiveBattler -_08025C68: .4byte gUnknown_2023D74 +_08025C68: .4byte gBattlescriptCurrInstr thumb_func_end atk61_drawpartystatussummary thumb_func_start atk62 atk62: @ 8025C6C push {r4,r5,lr} - ldr r5, _08025C94 @ =gUnknown_2023D74 + ldr r5, _08025C94 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _08025C98 @ =gActiveBattler strb r0, [r4] movs r0, 0 bl BtlController_EmitHidePartyStatusSummary ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -16639,14 +16639,14 @@ atk62: @ 8025C6C pop {r0} bx r0 .align 2, 0 -_08025C94: .4byte gUnknown_2023D74 +_08025C94: .4byte gBattlescriptCurrInstr _08025C98: .4byte gActiveBattler thumb_func_end atk62 thumb_func_start atk63_jumptorandomattack atk63_jumptorandomattack: @ 8025C9C push {r4,lr} - ldr r0, _08025CB4 @ =gUnknown_2023D74 + ldr r0, _08025CB4 @ =gBattlescriptCurrInstr ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 @@ -16658,7 +16658,7 @@ atk63_jumptorandomattack: @ 8025C9C strh r1, [r0] b _08025CCE .align 2, 0 -_08025CB4: .4byte gUnknown_2023D74 +_08025CB4: .4byte gBattlescriptCurrInstr _08025CB8: .4byte gCurrentMove _08025CBC: .4byte gUnknown_2023D4E _08025CC0: @@ -16700,10 +16700,10 @@ atk64_statusanimation: @ 8025D00 ldr r0, [r0] cmp r0, 0 bne _08025D68 - ldr r0, _08025D74 @ =gUnknown_2023D74 + ldr r0, _08025D74 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _08025D78 @ =gActiveBattler strb r0, [r4] ldr r1, _08025D7C @ =gStatuses3 @@ -16723,7 +16723,7 @@ atk64_statusanimation: @ 8025D00 ldrb r0, [r1, 0xA] cmp r0, 0 bne _08025D60 - ldr r0, _08025D88 @ =gUnknown_2023DD0 + ldr r0, _08025D88 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -16739,9 +16739,9 @@ atk64_statusanimation: @ 8025D00 movs r1, 0 bl BtlController_EmitStatusAnimation ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08025D60: - ldr r1, _08025D74 @ =gUnknown_2023D74 + ldr r1, _08025D74 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -16751,12 +16751,12 @@ _08025D68: bx r0 .align 2, 0 _08025D70: .4byte gBattleControllerExecFlags -_08025D74: .4byte gUnknown_2023D74 +_08025D74: .4byte gBattlescriptCurrInstr _08025D78: .4byte gActiveBattler _08025D7C: .4byte gStatuses3 _08025D80: .4byte 0x000400c0 _08025D84: .4byte gDisableStructs -_08025D88: .4byte gUnknown_2023DD0 +_08025D88: .4byte gHitMarker _08025D8C: .4byte gBattleMons thumb_func_end atk64_statusanimation @@ -16767,10 +16767,10 @@ atk65_status2animation: @ 8025D90 ldr r0, [r0] cmp r0, 0 bne _08025E10 - ldr r4, _08025E1C @ =gUnknown_2023D74 + ldr r4, _08025E1C @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r5, _08025E20 @ =gActiveBattler strb r0, [r5] ldr r1, [r4] @@ -16801,7 +16801,7 @@ atk65_status2animation: @ 8025D90 ldrb r0, [r1, 0xA] cmp r0, 0 bne _08025E08 - ldr r0, _08025E30 @ =gUnknown_2023DD0 + ldr r0, _08025E30 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -16818,9 +16818,9 @@ atk65_status2animation: @ 8025D90 movs r1, 0x1 bl BtlController_EmitStatusAnimation ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08025E08: - ldr r1, _08025E1C @ =gUnknown_2023D74 + ldr r1, _08025E1C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -16830,12 +16830,12 @@ _08025E10: bx r0 .align 2, 0 _08025E18: .4byte gBattleControllerExecFlags -_08025E1C: .4byte gUnknown_2023D74 +_08025E1C: .4byte gBattlescriptCurrInstr _08025E20: .4byte gActiveBattler _08025E24: .4byte gStatuses3 _08025E28: .4byte 0x000400c0 _08025E2C: .4byte gDisableStructs -_08025E30: .4byte gUnknown_2023DD0 +_08025E30: .4byte gHitMarker _08025E34: .4byte gBattleMons thumb_func_end atk65_status2animation @@ -16846,10 +16846,10 @@ atk66_chosenstatusanimation: @ 8025E38 ldr r0, [r0] cmp r0, 0 bne _08025EAA - ldr r4, _08025EB4 @ =gUnknown_2023D74 + ldr r4, _08025EB4 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r5, _08025EB8 @ =gActiveBattler strb r0, [r5] ldr r4, [r4] @@ -16880,7 +16880,7 @@ atk66_chosenstatusanimation: @ 8025E38 ldrb r0, [r1, 0xA] cmp r0, 0 bne _08025EA2 - ldr r0, _08025EC8 @ =gUnknown_2023DD0 + ldr r0, _08025EC8 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -16890,9 +16890,9 @@ atk66_chosenstatusanimation: @ 8025E38 movs r0, 0 bl BtlController_EmitStatusAnimation ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08025EA2: - ldr r1, _08025EB4 @ =gUnknown_2023D74 + ldr r1, _08025EB4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x7 str r0, [r1] @@ -16902,19 +16902,19 @@ _08025EAA: bx r0 .align 2, 0 _08025EB0: .4byte gBattleControllerExecFlags -_08025EB4: .4byte gUnknown_2023D74 +_08025EB4: .4byte gBattlescriptCurrInstr _08025EB8: .4byte gActiveBattler _08025EBC: .4byte gStatuses3 _08025EC0: .4byte 0x000400c0 _08025EC4: .4byte gDisableStructs -_08025EC8: .4byte gUnknown_2023DD0 +_08025EC8: .4byte gHitMarker thumb_func_end atk66_chosenstatusanimation thumb_func_start atk67_yesnobox atk67_yesnobox: @ 8025ECC push {r4,r5,lr} sub sp, 0x4 - ldr r5, _08025EE0 @ =gUnknown_2023E82 + ldr r5, _08025EE0 @ =gBattleCommunication ldrb r4, [r5] cmp r4, 0 beq _08025EE4 @@ -16922,7 +16922,7 @@ atk67_yesnobox: @ 8025ECC beq _08025F0C b _08025F9A .align 2, 0 -_08025EE0: .4byte gUnknown_2023E82 +_08025EE0: .4byte gBattleCommunication _08025EE4: str r4, [sp] movs r0, 0x17 @@ -16964,7 +16964,7 @@ _08025F30: ands r0, r1 cmp r0, 0 beq _08025F56 - ldr r4, _08025F70 @ =gUnknown_2023E82 + ldr r4, _08025F70 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _08025F56 @@ -16981,13 +16981,13 @@ _08025F56: ands r0, r1 cmp r0, 0 beq _08025F74 - ldr r0, _08025F70 @ =gUnknown_2023E82 + ldr r0, _08025F70 @ =gBattleCommunication movs r4, 0x1 strb r4, [r0, 0x1] b _08025F7E .align 2, 0 _08025F6C: .4byte gMain -_08025F70: .4byte gUnknown_2023E82 +_08025F70: .4byte gBattleCommunication _08025F74: movs r4, 0x1 adds r0, r4, 0 @@ -17003,7 +17003,7 @@ _08025F7E: movs r2, 0x1D movs r3, 0xD bl sub_802DB7C - ldr r1, _08025FA4 @ =gUnknown_2023D74 + ldr r1, _08025FA4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17013,7 +17013,7 @@ _08025F9A: pop {r0} bx r0 .align 2, 0 -_08025FA4: .4byte gUnknown_2023D74 +_08025FA4: .4byte gBattlescriptCurrInstr thumb_func_end atk67_yesnobox thumb_func_start atk68_cancelallactions @@ -17021,7 +17021,7 @@ atk68_cancelallactions: @ 8025FA8 push {r4,r5,lr} movs r1, 0 ldr r2, _08025FD4 @ =gBattlersCount - ldr r5, _08025FD8 @ =gUnknown_2023D74 + ldr r5, _08025FD8 @ =gBattlescriptCurrInstr ldrb r0, [r2] cmp r1, r0 bge _08025FC6 @@ -17043,7 +17043,7 @@ _08025FC6: bx r0 .align 2, 0 _08025FD4: .4byte gBattlersCount -_08025FD8: .4byte gUnknown_2023D74 +_08025FD8: .4byte gBattlescriptCurrInstr _08025FDC: .4byte gUnknown_2023BDA thumb_func_end atk68_cancelallactions @@ -17103,7 +17103,7 @@ _0802602E: ldrb r0, [r5] movs r1, 0x27 bl sub_80C7208 - ldr r2, _080260F8 @ =gUnknown_2023ECC + ldr r2, _080260F8 @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -17139,14 +17139,14 @@ _0802606C: ldrb r0, [r0] cmp r0, 0x65 beq _080260BE - ldr r0, _08026108 @ =gUnknown_2023E8C + ldr r0, _08026108 @ =gProtectStructs lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 blt _080260BE - ldr r0, _080260F8 @ =gUnknown_2023ECC + ldr r0, _080260F8 @ =gSpecialStatuses lsls r1, r4, 2 adds r1, r4 lsls r1, 2 @@ -17167,7 +17167,7 @@ _080260BE: bgt _0802613C subs r0, r1, 0x1 str r0, [r2] - ldr r1, _08026108 @ =gUnknown_2023E8C + ldr r1, _08026108 @ =gProtectStructs ldrb r3, [r3] lsls r0, r3, 4 adds r0, r1 @@ -17184,15 +17184,15 @@ _080260BE: .align 2, 0 _080260F0: .4byte gPotentialItemEffectBattler _080260F4: .4byte gBattlerTarget -_080260F8: .4byte gUnknown_2023ECC +_080260F8: .4byte gSpecialStatuses _080260FC: .4byte gBattleMons _08026100: .4byte gBattleMoves _08026104: .4byte gCurrentMove -_08026108: .4byte gUnknown_2023E8C +_08026108: .4byte gProtectStructs _0802610C: .4byte gBattleMoveDamage _08026110: .4byte gMoveResultFlags _08026114: - ldr r0, _0802614C @ =gUnknown_2023ECC + ldr r0, _0802614C @ =gSpecialStatuses lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -17213,7 +17213,7 @@ _08026114: ldrh r0, [r0, 0x2E] strh r0, [r1] _0802613C: - ldr r1, _08026158 @ =gUnknown_2023D74 + ldr r1, _08026158 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17221,20 +17221,20 @@ _0802613C: pop {r0} bx r0 .align 2, 0 -_0802614C: .4byte gUnknown_2023ECC +_0802614C: .4byte gSpecialStatuses _08026150: .4byte gMoveResultFlags _08026154: .4byte gLastUsedItem -_08026158: .4byte gUnknown_2023D74 +_08026158: .4byte gBattlescriptCurrInstr thumb_func_end atk69_adjustsetdamage thumb_func_start atk6A_removeitem atk6A_removeitem: @ 802615C push {r4-r6,lr} sub sp, 0x4 - ldr r6, _080261BC @ =gUnknown_2023D74 + ldr r6, _080261BC @ =gBattlescriptCurrInstr ldr r0, [r6] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r5, _080261C0 @ =gActiveBattler strb r0, [r5] ldr r1, _080261C4 @ =gBattleStruct @@ -17266,7 +17266,7 @@ atk6A_removeitem: @ 802615C movs r3, 0x2 bl BtlController_EmitSetMonData ldrb r0, [r5] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r6] adds r0, 0x2 str r0, [r6] @@ -17275,7 +17275,7 @@ atk6A_removeitem: @ 802615C pop {r0} bx r0 .align 2, 0 -_080261BC: .4byte gUnknown_2023D74 +_080261BC: .4byte gBattlescriptCurrInstr _080261C0: .4byte gActiveBattler _080261C4: .4byte gBattleStruct _080261C8: .4byte gBattleMons @@ -17299,7 +17299,7 @@ atk6B_atknameinbuff1: @ 80261CC strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08026204 @ =gUnknown_2023D74 + ldr r1, _08026204 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17308,7 +17308,7 @@ atk6B_atknameinbuff1: @ 80261CC _080261F8: .4byte gBattleTextBuff1 _080261FC: .4byte gBattlerAttacker _08026200: .4byte gBattlerPartyIndexes -_08026204: .4byte gUnknown_2023D74 +_08026204: .4byte gBattlescriptCurrInstr thumb_func_end atk6B_atknameinbuff1 thumb_func_start atk6C_drawlvlupbox @@ -17524,7 +17524,7 @@ _080263C4: bl ShowBg movs r0, 0x1 bl ShowBg - ldr r1, _08026400 @ =gUnknown_2023D74 + ldr r1, _08026400 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17534,7 +17534,7 @@ _080263F6: pop {r0} bx r0 .align 2, 0 -_08026400: .4byte gUnknown_2023D74 +_08026400: .4byte gBattlescriptCurrInstr thumb_func_end atk6C_drawlvlupbox thumb_func_start sub_8026404 @@ -18025,14 +18025,14 @@ _080267D2: atk6D_resetsentmonsvalue: @ 80267D8 push {lr} bl ResetSentPokesToOpponentValue - ldr r1, _080267EC @ =gUnknown_2023D74 + ldr r1, _080267EC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080267EC: .4byte gUnknown_2023D74 +_080267EC: .4byte gBattlescriptCurrInstr thumb_func_end atk6D_resetsentmonsvalue thumb_func_start atk6E_setatktoplayer0 @@ -18042,7 +18042,7 @@ atk6E_setatktoplayer0: @ 80267F0 bl GetBattlerAtPosition ldr r1, _08026808 @ =gBattlerAttacker strb r0, [r1] - ldr r1, _0802680C @ =gUnknown_2023D74 + ldr r1, _0802680C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18050,23 +18050,23 @@ atk6E_setatktoplayer0: @ 80267F0 bx r0 .align 2, 0 _08026808: .4byte gBattlerAttacker -_0802680C: .4byte gUnknown_2023D74 +_0802680C: .4byte gBattlescriptCurrInstr thumb_func_end atk6E_setatktoplayer0 thumb_func_start atk6F_makevisible atk6F_makevisible: @ 8026810 push {r4,r5,lr} - ldr r5, _0802683C @ =gUnknown_2023D74 + ldr r5, _0802683C @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _08026840 @ =gActiveBattler strb r0, [r4] movs r0, 0 movs r1, 0 bl BtlController_EmitSpriteInvisibility ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -18074,17 +18074,17 @@ atk6F_makevisible: @ 8026810 pop {r0} bx r0 .align 2, 0 -_0802683C: .4byte gUnknown_2023D74 +_0802683C: .4byte gBattlescriptCurrInstr _08026840: .4byte gActiveBattler thumb_func_end atk6F_makevisible thumb_func_start atk70_recordlastability atk70_recordlastability: @ 8026844 push {r4,lr} - ldr r4, _0802686C @ =gUnknown_2023D74 + ldr r4, _0802686C @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r1, _08026870 @ =gActiveBattler strb r0, [r1] ldrb r0, [r1] @@ -18098,7 +18098,7 @@ atk70_recordlastability: @ 8026844 pop {r0} bx r0 .align 2, 0 -_0802686C: .4byte gUnknown_2023D74 +_0802686C: .4byte gBattlescriptCurrInstr _08026870: .4byte gActiveBattler _08026874: .4byte gLastUsedAbility thumb_func_end atk70_recordlastability @@ -18130,26 +18130,26 @@ _0802689C: .4byte gMoveToLearn atk71_buffermovetolearn: @ 80268A0 push {lr} bl BufferMoveToLearnIntoBattleTextBuff2 - ldr r1, _080268B4 @ =gUnknown_2023D74 + ldr r1, _080268B4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080268B4: .4byte gUnknown_2023D74 +_080268B4: .4byte gBattlescriptCurrInstr thumb_func_end atk71_buffermovetolearn thumb_func_start atk72_jumpifplayerran atk72_jumpifplayerran: @ 80268B8 push {lr} - ldr r0, _080268E4 @ =gUnknown_2023D6D + ldr r0, _080268E4 @ =gBattlerFainted ldrb r0, [r0] bl sub_8016748 lsls r0, 24 cmp r0, 0 beq _080268EC - ldr r3, _080268E8 @ =gUnknown_2023D74 + ldr r3, _080268E8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -18164,10 +18164,10 @@ atk72_jumpifplayerran: @ 80268B8 str r1, [r3] b _080268F4 .align 2, 0 -_080268E4: .4byte gUnknown_2023D6D -_080268E8: .4byte gUnknown_2023D74 +_080268E4: .4byte gBattlerFainted +_080268E8: .4byte gBattlescriptCurrInstr _080268EC: - ldr r1, _080268F8 @ =gUnknown_2023D74 + ldr r1, _080268F8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -18175,7 +18175,7 @@ _080268F4: pop {r0} bx r0 .align 2, 0 -_080268F8: .4byte gUnknown_2023D74 +_080268F8: .4byte gBattlescriptCurrInstr thumb_func_end atk72_jumpifplayerran thumb_func_start atk73_hpthresholds @@ -18187,10 +18187,10 @@ atk73_hpthresholds: @ 80268FC ands r4, r6 cmp r4, 0 bne _08026992 - ldr r0, _08026950 @ =gUnknown_2023D74 + ldr r0, _08026950 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r1, _08026954 @ =gActiveBattler strb r0, [r1] movs r1, 0x1 @@ -18222,7 +18222,7 @@ _08026942: b _08026992 .align 2, 0 _0802694C: .4byte gBattleTypeFlags -_08026950: .4byte gUnknown_2023D74 +_08026950: .4byte gBattlescriptCurrInstr _08026954: .4byte gActiveBattler _08026958: .4byte gBattleMons _0802695C: .4byte gBattleStruct @@ -18254,7 +18254,7 @@ _08026988: _08026990: strb r1, [r0] _08026992: - ldr r1, _080269A4 @ =gUnknown_2023D74 + ldr r1, _080269A4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -18263,7 +18263,7 @@ _08026992: bx r0 .align 2, 0 _080269A0: .4byte gBattleStruct -_080269A4: .4byte gUnknown_2023D74 +_080269A4: .4byte gBattlescriptCurrInstr thumb_func_end atk73_hpthresholds thumb_func_start atk74_hpthresholds2 @@ -18278,10 +18278,10 @@ atk74_hpthresholds2: @ 80269A8 ands r7, r0 cmp r7, 0 bne _08026A42 - ldr r0, _08026A10 @ =gUnknown_2023D74 + ldr r0, _08026A10 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript adds r4, r0, 0 ldr r0, _08026A14 @ =gActiveBattler strb r4, [r0] @@ -18317,7 +18317,7 @@ atk74_hpthresholds2: @ 80269A8 b _08026A42 .align 2, 0 _08026A0C: .4byte gBattleTypeFlags -_08026A10: .4byte gUnknown_2023D74 +_08026A10: .4byte gBattlescriptCurrInstr _08026A14: .4byte gActiveBattler _08026A18: .4byte gBattleStruct _08026A1C: .4byte gBattleMons @@ -18343,7 +18343,7 @@ _08026A3A: _08026A40: strb r0, [r1] _08026A42: - ldr r1, _08026A54 @ =gUnknown_2023D74 + ldr r1, _08026A54 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -18353,7 +18353,7 @@ _08026A42: pop {r0} bx r0 .align 2, 0 -_08026A54: .4byte gUnknown_2023D74 +_08026A54: .4byte gBattlescriptCurrInstr thumb_func_end atk74_hpthresholds2 thumb_func_start atk75_useitemonopponent @@ -18381,7 +18381,7 @@ atk75_useitemonopponent: @ 8026A58 str r3, [sp] movs r3, 0 bl PokemonUseItemEffects - ldr r1, _08026AAC @ =gUnknown_2023D74 + ldr r1, _08026AAC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18394,7 +18394,7 @@ _08026A9C: .4byte gBattlerAttacker _08026AA0: .4byte gBattlerPartyIndexes _08026AA4: .4byte gEnemyParty _08026AA8: .4byte gLastUsedItem -_08026AAC: .4byte gUnknown_2023D74 +_08026AAC: .4byte gBattlescriptCurrInstr thumb_func_end atk75_useitemonopponent thumb_func_start sub_8026AB0 @@ -18404,10 +18404,10 @@ sub_8026AB0: @ 8026AB0 mov r6, r8 push {r6,r7} sub sp, 0x8 - ldr r4, _08026ADC @ =gUnknown_2023D74 + ldr r4, _08026ADC @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r1, _08026AE0 @ =gActiveBattler strb r0, [r1] ldr r0, [r4] @@ -18422,7 +18422,7 @@ _08026AD2: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08026ADC: .4byte gUnknown_2023D74 +_08026ADC: .4byte gBattlescriptCurrInstr _08026AE0: .4byte gActiveBattler _08026AE4: .4byte _08026AE8 .align 2, 0 @@ -18492,11 +18492,11 @@ _08026B84: .4byte gBattlerTarget _08026B88: .4byte gActiveBattler _08026B8C: bl IsRunningFromBattleImpossible - ldr r1, _08026B98 @ =gUnknown_2023E82 + ldr r1, _08026B98 @ =gBattleCommunication strb r0, [r1] b _08026F4E .align 2, 0 -_08026B98: .4byte gUnknown_2023E82 +_08026B98: .4byte gBattleCommunication _08026B9C: ldr r0, _08026BAC @ =gCurrentMove ldrh r0, [r0] @@ -18509,7 +18509,7 @@ _08026B9C: _08026BAC: .4byte gCurrentMove _08026BB0: .4byte gBattlerTarget _08026BB4: - ldr r2, _08026BD4 @ =gUnknown_2023DD0 + ldr r2, _08026BD4 @ =gHitMarker ldr r1, _08026BD8 @ =gBitTable ldr r0, _08026BDC @ =gActiveBattler ldrb r0, [r0] @@ -18521,23 +18521,23 @@ _08026BB4: ands r2, r0 cmp r2, 0 beq _08026BE4 - ldr r1, _08026BE0 @ =gUnknown_2023E82 + ldr r1, _08026BE0 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1] b _08026F4E .align 2, 0 -_08026BD4: .4byte gUnknown_2023DD0 +_08026BD4: .4byte gHitMarker _08026BD8: .4byte gBitTable _08026BDC: .4byte gActiveBattler -_08026BE0: .4byte gUnknown_2023E82 +_08026BE0: .4byte gBattleCommunication _08026BE4: - ldr r0, _08026BEC @ =gUnknown_2023E82 + ldr r0, _08026BEC @ =gBattleCommunication strb r2, [r0] b _08026F4E .align 2, 0 -_08026BEC: .4byte gUnknown_2023E82 +_08026BEC: .4byte gBattleCommunication _08026BF0: - ldr r4, _08026C20 @ =gUnknown_2023ECC + ldr r4, _08026C20 @ =gSpecialStatuses ldr r3, _08026C24 @ =gActiveBattler ldrb r0, [r3] lsls r1, r0, 2 @@ -18561,7 +18561,7 @@ _08026BF0: strb r0, [r1] b _08026F4E .align 2, 0 -_08026C20: .4byte gUnknown_2023ECC +_08026C20: .4byte gSpecialStatuses _08026C24: .4byte gActiveBattler _08026C28: ldr r4, _08026C4C @ =gBattlerPartyIndexes @@ -18658,7 +18658,7 @@ _08026CCC: bne _08026CD8 b _08026F4E _08026CD8: - ldr r0, _08026CEC @ =gUnknown_2023DD0 + ldr r0, _08026CEC @ =gHitMarker ldr r1, [r0] ldr r2, _08026CF0 @ =0xffbfffff ands r1, r2 @@ -18667,11 +18667,11 @@ _08026CD8: .align 2, 0 _08026CE4: .4byte gBattleTypeFlags _08026CE8: .4byte gBattleMons -_08026CEC: .4byte gUnknown_2023DD0 +_08026CEC: .4byte gHitMarker _08026CF0: .4byte 0xffbfffff _08026CF4: movs r7, 0 - ldr r2, _08026D3C @ =gUnknown_2023E82 + ldr r2, _08026D3C @ =gBattleCommunication strb r7, [r2, 0x5] ldr r1, _08026D40 @ =gActiveBattler movs r0, 0x1 @@ -18709,7 +18709,7 @@ _08026D2A: bls _08026D0C b _08026F4E .align 2, 0 -_08026D3C: .4byte gUnknown_2023E82 +_08026D3C: .4byte gBattleCommunication _08026D40: .4byte gActiveBattler _08026D44: .4byte gBattlersCount _08026D48: .4byte gBattleMons @@ -18748,14 +18748,14 @@ _08026D84: movs r1, 0 bl BtlController_EmitReturnMonToBall ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _08026F4E .align 2, 0 _08026D94: .4byte gBattlersCount _08026D98: .4byte gActiveBattler _08026D9C: .4byte gBattleMons _08026DA0: - ldr r0, _08026F28 @ =gUnknown_2023E82 + ldr r0, _08026F28 @ =gBattleCommunication movs r1, 0 strb r1, [r0, 0x5] mov r8, r1 @@ -18865,8 +18865,8 @@ _08026E4E: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r1, _08026F28 @ =gUnknown_2023E82 + bl MarkBattlerForControllerExec + ldr r1, _08026F28 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _08026E88: @@ -18940,13 +18940,13 @@ _08026EEC: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r1, _08026F28 @ =gUnknown_2023E82 + bl MarkBattlerForControllerExec + ldr r1, _08026F28 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08026F4E .align 2, 0 -_08026F28: .4byte gUnknown_2023E82 +_08026F28: .4byte gBattleCommunication _08026F2C: .4byte gBattlersCount _08026F30: .4byte gBattleMons _08026F34: .4byte 0xf7ffffff @@ -18959,7 +18959,7 @@ _08026F44: cmp r0, 0 beq _08026F56 _08026F4E: - ldr r1, _08026F64 @ =gUnknown_2023D74 + ldr r1, _08026F64 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 str r0, [r1] @@ -18972,7 +18972,7 @@ _08026F56: pop {r0} bx r0 .align 2, 0 -_08026F64: .4byte gUnknown_2023D74 +_08026F64: .4byte gBattlescriptCurrInstr thumb_func_end sub_8026AB0 thumb_func_start atk77_setprotectlike @@ -19039,7 +19039,7 @@ _08026FA8: ldrb r0, [r1] cmp r0, 0x6F bne _08026FF8 - ldr r0, _08027054 @ =gUnknown_2023E8C + ldr r0, _08027054 @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -19047,7 +19047,7 @@ _08026FA8: movs r2, 0x1 orrs r0, r2 strb r0, [r1] - ldr r1, _08027058 @ =gUnknown_2023E82 + ldr r1, _08027058 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] _08026FF8: @@ -19059,7 +19059,7 @@ _08026FF8: ldrb r0, [r1] cmp r0, 0x74 bne _0802701E - ldr r0, _08027054 @ =gUnknown_2023E8C + ldr r0, _08027054 @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -19067,7 +19067,7 @@ _08026FF8: movs r2, 0x2 orrs r0, r2 strb r0, [r1] - ldr r1, _08027058 @ =gUnknown_2023E82 + ldr r1, _08027058 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _0802701E: @@ -19090,8 +19090,8 @@ _08027044: .4byte gBattlersCount _08027048: .4byte gUnknown_82507E0 _0802704C: .4byte gBattleMoves _08027050: .4byte gCurrentMove -_08027054: .4byte gUnknown_2023E8C -_08027058: .4byte gUnknown_2023E82 +_08027054: .4byte gProtectStructs +_08027058: .4byte gBattleCommunication _0802705C: ldr r2, _08027090 @ =gDisableStructs ldr r0, _08027094 @ =gBattlerAttacker @@ -19102,7 +19102,7 @@ _0802705C: adds r0, r2 movs r1, 0 strb r1, [r0, 0x8] - ldr r1, _08027098 @ =gUnknown_2023E82 + ldr r1, _08027098 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] ldr r2, _0802709C @ =gMoveResultFlags @@ -19111,7 +19111,7 @@ _0802705C: orrs r0, r1 strb r0, [r2] _0802707E: - ldr r1, _080270A0 @ =gUnknown_2023D74 + ldr r1, _080270A0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19123,9 +19123,9 @@ _0802707E: .align 2, 0 _08027090: .4byte gDisableStructs _08027094: .4byte gBattlerAttacker -_08027098: .4byte gUnknown_2023E82 +_08027098: .4byte gBattleCommunication _0802709C: .4byte gMoveResultFlags -_080270A0: .4byte gUnknown_2023D74 +_080270A0: .4byte gBattlescriptCurrInstr thumb_func_end atk77_setprotectlike thumb_func_start atk78_faintifabilitynotdamp @@ -19190,8 +19190,8 @@ _080270F0: movs r0, 0 bl BtlController_EmitHealthBarUpdate ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r1, _08027180 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _08027180 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19235,7 +19235,7 @@ _08027170: .4byte gActiveBattler _08027174: .4byte gBattlerAttacker _08027178: .4byte gBattleMoveDamage _0802717C: .4byte 0x00007fff -_08027180: .4byte gUnknown_2023D74 +_08027180: .4byte gBattlescriptCurrInstr _08027184: .4byte gBitTable _08027188: .4byte gAbsentBattlerFlags _0802718C: @@ -19249,7 +19249,7 @@ _0802718C: adds r1, 0x20 ldrb r1, [r1] bl sub_80C71D0 - ldr r1, _080271B8 @ =gUnknown_2023D74 + ldr r1, _080271B8 @ =gBattlescriptCurrInstr ldr r0, _080271BC @ =gUnknown_81D93AF str r0, [r1] _080271A8: @@ -19260,7 +19260,7 @@ _080271A8: bx r0 .align 2, 0 _080271B4: .4byte gLastUsedAbility -_080271B8: .4byte gUnknown_2023D74 +_080271B8: .4byte gBattlescriptCurrInstr _080271BC: .4byte gUnknown_81D93AF thumb_func_end atk78_faintifabilitynotdamp @@ -19293,8 +19293,8 @@ atk79_setatkhptozero: @ 80271C0 movs r3, 0x2 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r1, _0802721C @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _0802721C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19308,13 +19308,13 @@ _0802720C: .4byte gBattleControllerExecFlags _08027210: .4byte gActiveBattler _08027214: .4byte gBattlerAttacker _08027218: .4byte gBattleMons -_0802721C: .4byte gUnknown_2023D74 +_0802721C: .4byte gBattlescriptCurrInstr thumb_func_end atk79_setatkhptozero thumb_func_start atk7A_jumpifnexttargetvalid atk7A_jumpifnexttargetvalid: @ 8027220 push {r4-r7,lr} - ldr r3, _08027298 @ =gUnknown_2023D74 + ldr r3, _08027298 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r4, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -19376,7 +19376,7 @@ _08027276: str r0, [r7] b _080272BC .align 2, 0 -_08027298: .4byte gUnknown_2023D74 +_08027298: .4byte gBattlescriptCurrInstr _0802729C: .4byte gBattleTypeFlags _080272A0: .4byte gBattlerTarget _080272A4: .4byte gBattlerAttacker @@ -19398,7 +19398,7 @@ _080272BC: thumb_func_start atk7B_tryhealhalfhealth atk7B_tryhealhalfhealth: @ 80272C4 push {r4-r6,lr} - ldr r4, _08027320 @ =gUnknown_2023D74 + ldr r4, _08027320 @ =gBattlescriptCurrInstr ldr r1, [r4] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -19445,7 +19445,7 @@ _08027306: str r2, [r4] b _0802733A .align 2, 0 -_08027320: .4byte gUnknown_2023D74 +_08027320: .4byte gBattlescriptCurrInstr _08027324: .4byte gBattlerTarget _08027328: .4byte gBattlerAttacker _0802732C: .4byte gBattleMoveDamage @@ -19538,7 +19538,7 @@ _080273AC: ldr r0, _080273EC @ =0x0000ffff cmp r3, r0 beq _080273FC - ldr r2, _080273F0 @ =gUnknown_2023DD0 + ldr r2, _080273F0 @ =gHitMarker ldr r0, [r2] ldr r1, _080273F4 @ =0xfffffbff ands r0, r1 @@ -19551,14 +19551,14 @@ _080273E0: .4byte gBattlersCount _080273E4: .4byte gBattleStruct _080273E8: .4byte gBattlerAttacker _080273EC: .4byte 0x0000ffff -_080273F0: .4byte gUnknown_2023DD0 +_080273F0: .4byte gHitMarker _080273F4: .4byte 0xfffffbff _080273F8: .4byte gCurrentMove _080273FC: mov r0, r8 cmp r0, 0 beq _0802746C - ldr r2, _08027450 @ =gUnknown_2023DD0 + ldr r2, _08027450 @ =gHitMarker ldr r0, [r2] ldr r1, _08027454 @ =0xfffffbff ands r0, r1 @@ -19580,7 +19580,7 @@ _08027426: bl GetMoveTarget ldr r1, _0802745C @ =gBattlerTarget strb r0, [r1] - ldr r5, _08027460 @ =gUnknown_2023D74 + ldr r5, _08027460 @ =gBattlescriptCurrInstr ldr r3, _08027464 @ =gUnknown_81D65A8 ldr r2, _08027468 @ =gBattleMoves ldrh r1, [r4] @@ -19595,15 +19595,15 @@ _08027426: str r0, [r5] b _0802748A .align 2, 0 -_08027450: .4byte gUnknown_2023DD0 +_08027450: .4byte gHitMarker _08027454: .4byte 0xfffffbff _08027458: .4byte gCurrentMove _0802745C: .4byte gBattlerTarget -_08027460: .4byte gUnknown_2023D74 +_08027460: .4byte gBattlescriptCurrInstr _08027464: .4byte gUnknown_81D65A8 _08027468: .4byte gBattleMoves _0802746C: - ldr r2, _0802749C @ =gUnknown_2023ECC + ldr r2, _0802749C @ =gSpecialStatuses ldr r0, _080274A0 @ =gBattlerAttacker ldrb r1, [r0] lsls r0, r1, 2 @@ -19614,7 +19614,7 @@ _0802746C: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r1, _080274A4 @ =gUnknown_2023D74 + ldr r1, _080274A4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19628,9 +19628,9 @@ _0802748A: pop {r0} bx r0 .align 2, 0 -_0802749C: .4byte gUnknown_2023ECC +_0802749C: .4byte gSpecialStatuses _080274A0: .4byte gBattlerAttacker -_080274A4: .4byte gUnknown_2023D74 +_080274A4: .4byte gBattlescriptCurrInstr thumb_func_end atk7C_trymirrormove thumb_func_start atk7D_setrain @@ -19647,34 +19647,34 @@ atk7D_setrain: @ 80274A8 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _080274D0 @ =gUnknown_2023E82 + ldr r1, _080274D0 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _080274E4 .align 2, 0 _080274C8: .4byte gBattleWeather _080274CC: .4byte gMoveResultFlags -_080274D0: .4byte gUnknown_2023E82 +_080274D0: .4byte gBattleCommunication _080274D4: movs r0, 0x1 strh r0, [r2] - ldr r0, _080274F0 @ =gUnknown_2023E82 + ldr r0, _080274F0 @ =gBattleCommunication strb r1, [r0, 0x5] - ldr r0, _080274F4 @ =gUnknown_2023F20 + ldr r0, _080274F4 @ =gWishFutureKnock adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _080274E4: - ldr r1, _080274F8 @ =gUnknown_2023D74 + ldr r1, _080274F8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080274F0: .4byte gUnknown_2023E82 -_080274F4: .4byte gUnknown_2023F20 -_080274F8: .4byte gUnknown_2023D74 +_080274F0: .4byte gBattleCommunication +_080274F4: .4byte gWishFutureKnock +_080274F8: .4byte gBattlescriptCurrInstr thumb_func_end atk7D_setrain thumb_func_start atk7E_setreflect @@ -19683,7 +19683,7 @@ atk7E_setreflect: @ 80274FC ldr r6, _0802752C @ =gBattlerAttacker ldrb r0, [r6] bl GetBattlerPosition - ldr r4, _08027530 @ =gSideAffecting + ldr r4, _08027530 @ =gSideStatuses movs r5, 0x1 adds r1, r5, 0 ands r1, r0 @@ -19699,14 +19699,14 @@ atk7E_setreflect: @ 80274FC movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08027538 @ =gUnknown_2023E82 + ldr r1, _08027538 @ =gBattleCommunication movs r0, 0 b _080275B0 .align 2, 0 _0802752C: .4byte gBattlerAttacker -_08027530: .4byte gSideAffecting +_08027530: .4byte gSideStatuses _08027534: .4byte gMoveResultFlags -_08027538: .4byte gUnknown_2023E82 +_08027538: .4byte gBattleCommunication _0802753C: ldrb r0, [r6] bl GetBattlerPosition @@ -19750,20 +19750,20 @@ _0802753C: lsrs r1, r0, 24 cmp r1, 0x2 bne _080275AC - ldr r0, _080275A8 @ =gUnknown_2023E82 + ldr r0, _080275A8 @ =gBattleCommunication strb r1, [r0, 0x5] b _080275B2 .align 2, 0 _080275A0: .4byte gSideTimers _080275A4: .4byte gBattleTypeFlags -_080275A8: .4byte gUnknown_2023E82 +_080275A8: .4byte gBattleCommunication _080275AC: - ldr r1, _080275C0 @ =gUnknown_2023E82 + ldr r1, _080275C0 @ =gBattleCommunication movs r0, 0x1 _080275B0: strb r0, [r1, 0x5] _080275B2: - ldr r1, _080275C4 @ =gUnknown_2023D74 + ldr r1, _080275C4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19771,8 +19771,8 @@ _080275B2: pop {r0} bx r0 .align 2, 0 -_080275C0: .4byte gUnknown_2023E82 -_080275C4: .4byte gUnknown_2023D74 +_080275C0: .4byte gBattleCommunication +_080275C4: .4byte gBattlescriptCurrInstr thumb_func_end atk7E_setreflect thumb_func_start atk7F_setseeded @@ -19806,7 +19806,7 @@ _080275FA: movs r0, 0x1 orrs r0, r5 strb r0, [r7] - ldr r1, _08027614 @ =gUnknown_2023E82 + ldr r1, _08027614 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08027668 @@ -19814,7 +19814,7 @@ _080275FA: _08027608: .4byte gMoveResultFlags _0802760C: .4byte gStatuses3 _08027610: .4byte gBattlerTarget -_08027614: .4byte gUnknown_2023E82 +_08027614: .4byte gBattleCommunication _08027618: ldr r1, _08027644 @ =gBattleMons movs r0, 0x58 @@ -19834,13 +19834,13 @@ _08027634: movs r0, 0x1 orrs r0, r5 strb r0, [r7] - ldr r1, _08027648 @ =gUnknown_2023E82 + ldr r1, _08027648 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08027668 .align 2, 0 _08027644: .4byte gBattleMons -_08027648: .4byte gUnknown_2023E82 +_08027648: .4byte gBattleCommunication _0802764C: ldr r0, _0802767C @ =gBattlerAttacker ldrb r0, [r0] @@ -19854,10 +19854,10 @@ _0802764C: mov r2, r12 orrs r0, r2 str r0, [r1] - ldr r0, _08027680 @ =gUnknown_2023E82 + ldr r0, _08027680 @ =gBattleCommunication strb r3, [r0, 0x5] _08027668: - ldr r1, _08027684 @ =gUnknown_2023D74 + ldr r1, _08027684 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19869,14 +19869,14 @@ _08027668: bx r0 .align 2, 0 _0802767C: .4byte gBattlerAttacker -_08027680: .4byte gUnknown_2023E82 -_08027684: .4byte gUnknown_2023D74 +_08027680: .4byte gBattleCommunication +_08027684: .4byte gBattlescriptCurrInstr thumb_func_end atk7F_setseeded thumb_func_start atk80_manipulatedamage atk80_manipulatedamage: @ 8027688 push {r4,lr} - ldr r1, _080276A0 @ =gUnknown_2023D74 + ldr r1, _080276A0 @ =gBattlescriptCurrInstr ldr r0, [r1] ldrb r2, [r0, 0x1] adds r4, r1, 0 @@ -19888,7 +19888,7 @@ atk80_manipulatedamage: @ 8027688 beq _080276AA b _080276F8 .align 2, 0 -_080276A0: .4byte gUnknown_2023D74 +_080276A0: .4byte gBattlescriptCurrInstr _080276A4: cmp r2, 0x2 beq _080276F0 @@ -19949,7 +19949,7 @@ _08027704: .4byte gBattleMoveDamage atk81_trysetrest: @ 8027708 push {r4-r7,lr} sub sp, 0x4 - ldr r0, _08027760 @ =gUnknown_2023D74 + ldr r0, _08027760 @ =gBattlescriptCurrInstr mov r12, r0 ldr r1, [r0] ldrb r6, [r1, 0x1] @@ -19992,7 +19992,7 @@ atk81_trysetrest: @ 8027708 str r6, [r0] b _080277C8 .align 2, 0 -_08027760: .4byte gUnknown_2023D74 +_08027760: .4byte gBattlescriptCurrInstr _08027764: .4byte gActiveBattler _08027768: .4byte gBattlerTarget _0802776C: .4byte gBattlerAttacker @@ -20007,14 +20007,14 @@ _08027778: ands r1, r0 cmp r1, 0 beq _08027794 - ldr r1, _08027790 @ =gUnknown_2023E82 + ldr r1, _08027790 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08027798 .align 2, 0 -_08027790: .4byte gUnknown_2023E82 +_08027790: .4byte gBattleCommunication _08027794: - ldr r0, _080277D0 @ =gUnknown_2023E82 + ldr r0, _080277D0 @ =gBattleCommunication strb r1, [r0, 0x5] _08027798: ldrb r0, [r5] @@ -20034,8 +20034,8 @@ _08027798: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r7] - bl MarkBufferBankForExecution - ldr r1, _080277D4 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _080277D4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -20045,14 +20045,14 @@ _080277C8: pop {r0} bx r0 .align 2, 0 -_080277D0: .4byte gUnknown_2023E82 -_080277D4: .4byte gUnknown_2023D74 +_080277D0: .4byte gBattleCommunication +_080277D4: .4byte gBattlescriptCurrInstr thumb_func_end atk81_trysetrest thumb_func_start atk82_jumpifnotfirstturn atk82_jumpifnotfirstturn: @ 80277D8 push {r4,r5,lr} - ldr r5, _0802780C @ =gUnknown_2023D74 + ldr r5, _0802780C @ =gBattlescriptCurrInstr ldr r4, [r5] ldrb r3, [r4, 0x1] ldrb r0, [r4, 0x2] @@ -20078,7 +20078,7 @@ atk82_jumpifnotfirstturn: @ 80277D8 str r0, [r5] b _0802781A .align 2, 0 -_0802780C: .4byte gUnknown_2023D74 +_0802780C: .4byte gBattlescriptCurrInstr _08027810: .4byte gDisableStructs _08027814: .4byte gBattlerAttacker _08027818: @@ -20091,13 +20091,13 @@ _0802781A: thumb_func_start atk83_nop atk83_nop: @ 8027820 - ldr r1, _0802782C @ =gUnknown_2023D74 + ldr r1, _0802782C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_0802782C: .4byte gUnknown_2023D74 +_0802782C: .4byte gBattlescriptCurrInstr thumb_func_end atk83_nop thumb_func_start UproarWakeUpCheck @@ -20123,7 +20123,7 @@ UproarWakeUpCheck: @ 8027830 adds r4, r1, 0 movs r3, 0 ldr r6, _08027890 @ =gBattleScripting - ldr r7, _08027894 @ =gUnknown_2023E82 + ldr r7, _08027894 @ =gBattleCommunication _0802785C: mov r0, r12 adds r0, 0x50 @@ -20151,7 +20151,7 @@ _0802785C: _08027888: .4byte gBattlersCount _0802788C: .4byte gBattleMons _08027890: .4byte gBattleScripting -_08027894: .4byte gUnknown_2023E82 +_08027894: .4byte gBattleCommunication _08027898: .4byte gBattlerTarget _0802789C: adds r3, 0x58 @@ -20166,11 +20166,11 @@ _080278A4: movs r0, 0x1 b _080278C2 _080278B0: - ldr r0, _080278B8 @ =gUnknown_2023E82 + ldr r0, _080278B8 @ =gBattleCommunication strb r3, [r0, 0x5] b _080278A4 .align 2, 0 -_080278B8: .4byte gUnknown_2023E82 +_080278B8: .4byte gBattleCommunication _080278BC: strb r2, [r1] b _080278A4 @@ -20187,7 +20187,7 @@ _080278C2: thumb_func_start atk84_jumpifcantmakeasleep atk84_jumpifcantmakeasleep: @ 80278CC push {r4-r6,lr} - ldr r5, _080278F8 @ =gUnknown_2023D74 + ldr r5, _080278F8 @ =gBattlescriptCurrInstr ldr r1, [r5] ldrb r4, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -20208,7 +20208,7 @@ atk84_jumpifcantmakeasleep: @ 80278CC str r4, [r5] b _08027942 .align 2, 0 -_080278F8: .4byte gUnknown_2023D74 +_080278F8: .4byte gBattlescriptCurrInstr _080278FC: .4byte gBattlerTarget _08027900: ldr r1, _08027930 @ =gBattleMons @@ -20226,7 +20226,7 @@ _08027900: _08027918: ldr r2, _08027934 @ =gLastUsedAbility strb r0, [r2] - ldr r1, _08027938 @ =gUnknown_2023E82 + ldr r1, _08027938 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] str r4, [r5] @@ -20237,7 +20237,7 @@ _08027918: .align 2, 0 _08027930: .4byte gBattleMons _08027934: .4byte gLastUsedAbility -_08027938: .4byte gUnknown_2023E82 +_08027938: .4byte gBattleCommunication _0802793C: ldr r0, [r5] adds r0, 0x5 @@ -20266,7 +20266,7 @@ atk85_stockpile: @ 8027948 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _0802797C @ =gUnknown_2023E82 + ldr r1, _0802797C @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _080279AA @@ -20274,7 +20274,7 @@ atk85_stockpile: @ 8027948 _08027970: .4byte gDisableStructs _08027974: .4byte gBattlerAttacker _08027978: .4byte gMoveResultFlags -_0802797C: .4byte gUnknown_2023E82 +_0802797C: .4byte gBattleCommunication _08027980: adds r0, 0x1 movs r3, 0 @@ -20295,10 +20295,10 @@ _08027980: strb r0, [r2, 0x4] movs r0, 0xFF strb r0, [r2, 0x5] - ldr r0, _080279BC @ =gUnknown_2023E82 + ldr r0, _080279BC @ =gBattleCommunication strb r3, [r0, 0x5] _080279AA: - ldr r1, _080279C0 @ =gUnknown_2023D74 + ldr r1, _080279C0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20307,8 +20307,8 @@ _080279AA: bx r0 .align 2, 0 _080279B8: .4byte gBattleTextBuff1 -_080279BC: .4byte gUnknown_2023E82 -_080279C0: .4byte gUnknown_2023D74 +_080279BC: .4byte gBattleCommunication +_080279C0: .4byte gBattlescriptCurrInstr thumb_func_end atk85_stockpile thumb_func_start atk86_stockpiletobasedamage @@ -20317,7 +20317,7 @@ atk86_stockpiletobasedamage: @ 80279C4 mov r7, r8 push {r7} sub sp, 0x10 - ldr r3, _080279FC @ =gUnknown_2023D74 + ldr r3, _080279FC @ =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -20342,17 +20342,17 @@ atk86_stockpiletobasedamage: @ 80279C4 str r2, [r3] b _08027AAA .align 2, 0 -_080279FC: .4byte gUnknown_2023D74 +_080279FC: .4byte gBattlescriptCurrInstr _08027A00: .4byte gDisableStructs _08027A04: .4byte gBattlerAttacker _08027A08: - ldr r0, _08027AB8 @ =gUnknown_2023E82 + ldr r0, _08027AB8 @ =gBattleCommunication ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _08027A90 ldr r0, _08027ABC @ =gBattleMoveDamage mov r8, r0 - ldr r4, _08027AC0 @ =gSideAffecting + ldr r4, _08027AC0 @ =gSideStatuses ldr r5, _08027AC4 @ =gBattlerTarget ldrb r0, [r5] bl GetBattlerPosition @@ -20397,7 +20397,7 @@ _08027A08: adds r0, r7 ldrb r0, [r0, 0x9] strb r0, [r2, 0x18] - ldr r1, _08027AD4 @ =gUnknown_2023E8C + ldr r1, _08027AD4 @ =gProtectStructs ldrb r0, [r6] lsls r0, 4 adds r0, r1 @@ -20421,7 +20421,7 @@ _08027A90: adds r0, r2 movs r1, 0 strb r1, [r0, 0x9] - ldr r1, _08027AE0 @ =gUnknown_2023D74 + ldr r1, _08027AE0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -20433,17 +20433,17 @@ _08027AAA: pop {r0} bx r0 .align 2, 0 -_08027AB8: .4byte gUnknown_2023E82 +_08027AB8: .4byte gBattleCommunication _08027ABC: .4byte gBattleMoveDamage -_08027AC0: .4byte gSideAffecting +_08027AC0: .4byte gSideStatuses _08027AC4: .4byte gBattlerTarget _08027AC8: .4byte gBattleMons _08027ACC: .4byte gCurrentMove _08027AD0: .4byte gBattleScripting -_08027AD4: .4byte gUnknown_2023E8C +_08027AD4: .4byte gProtectStructs _08027AD8: .4byte gDisableStructs _08027ADC: .4byte gBattlerAttacker -_08027AE0: .4byte gUnknown_2023D74 +_08027AE0: .4byte gBattlescriptCurrInstr thumb_func_end atk86_stockpiletobasedamage thumb_func_start atk87_stockpiletohpheal @@ -20451,7 +20451,7 @@ atk87_stockpiletohpheal: @ 8027AE4 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _08027B24 @ =gUnknown_2023D74 + ldr r7, _08027B24 @ =gBattlescriptCurrInstr ldr r1, [r7] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -20476,14 +20476,14 @@ atk87_stockpiletohpheal: @ 8027AE4 cmp r1, 0 bne _08027B34 str r2, [r7] - ldr r0, _08027B30 @ =gUnknown_2023E82 + ldr r0, _08027B30 @ =gBattleCommunication strb r1, [r0, 0x5] b _08027BB0 .align 2, 0 -_08027B24: .4byte gUnknown_2023D74 +_08027B24: .4byte gBattlescriptCurrInstr _08027B28: .4byte gDisableStructs _08027B2C: .4byte gBattlerAttacker -_08027B30: .4byte gUnknown_2023E82 +_08027B30: .4byte gBattleCommunication _08027B34: ldr r1, _08027B58 @ =gBattleMons movs r0, 0x58 @@ -20499,14 +20499,14 @@ _08027B34: ldr r1, _08027B5C @ =gBattlerTarget ldrb r0, [r6] strb r0, [r1] - ldr r1, _08027B60 @ =gUnknown_2023E82 + ldr r1, _08027B60 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08027BB0 .align 2, 0 _08027B58: .4byte gBattleMons _08027B5C: .4byte gBattlerTarget -_08027B60: .4byte gUnknown_2023E82 +_08027B60: .4byte gBattleCommunication _08027B64: ldr r5, _08027BBC @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] @@ -20575,7 +20575,7 @@ atk88_negativedamage: @ 8027BC8 negs r0, r0 str r0, [r2] _08027BE4: - ldr r1, _08027BF8 @ =gUnknown_2023D74 + ldr r1, _08027BF8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20584,7 +20584,7 @@ _08027BE4: .align 2, 0 _08027BF0: .4byte gBattleMoveDamage _08027BF4: .4byte gUnknown_2023D54 -_08027BF8: .4byte gUnknown_2023D74 +_08027BF8: .4byte gBattlescriptCurrInstr thumb_func_end atk88_negativedamage thumb_func_start ChangeStatBuffs @@ -20685,7 +20685,7 @@ _08027C88: beq _08027D58 cmp r5, 0x1 bne _08027D48 - ldr r4, _08027CE8 @ =gUnknown_2023ECC + ldr r4, _08027CE8 @ =gSpecialStatuses ldr r3, _08027CD4 @ =gActiveBattler ldrb r0, [r3] lsls r1, r0, 2 @@ -20696,7 +20696,7 @@ _08027C88: lsls r0, 31 cmp r0, 0 beq _08027CF0 - ldr r0, _08027CEC @ =gUnknown_2023D74 + ldr r0, _08027CEC @ =gBattlescriptCurrInstr mov r4, r8 str r4, [r0] b _08027D48 @@ -20706,8 +20706,8 @@ _08027CD8: .4byte gBattlerTarget _08027CDC: .4byte gBattleTextBuff1 _08027CE0: .4byte gSideTimers _08027CE4: .4byte gCurrentMove -_08027CE8: .4byte gUnknown_2023ECC -_08027CEC: .4byte gUnknown_2023D74 +_08027CE8: .4byte gSpecialStatuses +_08027CEC: .4byte gBattlescriptCurrInstr _08027CF0: mov r0, r8 bl BattleScriptPush @@ -20715,7 +20715,7 @@ _08027CF0: ldr r6, _08027D1C @ =gActiveBattler ldrb r0, [r6] strb r0, [r1, 0x17] - ldr r1, _08027D20 @ =gUnknown_2023D74 + ldr r1, _08027D20 @ =gBattlescriptCurrInstr ldr r0, _08027D24 @ =gUnknown_81D8C3E str r0, [r1] ldrb r1, [r6] @@ -20731,7 +20731,7 @@ _08027CF0: .align 2, 0 _08027D18: .4byte gBattleScripting _08027D1C: .4byte gActiveBattler -_08027D20: .4byte gUnknown_2023D74 +_08027D20: .4byte gBattlescriptCurrInstr _08027D24: .4byte gUnknown_81D8C3E _08027D28: ldr r0, _08027D4C @ =gCurrentMove @@ -20746,7 +20746,7 @@ _08027D28: lsls r0, 24 cmp r0, 0 beq _08027D58 - ldr r1, _08027D50 @ =gUnknown_2023D74 + ldr r1, _08027D50 @ =gBattlescriptCurrInstr ldr r0, _08027D54 @ =gUnknown_81D7DF2 str r0, [r1] _08027D48: @@ -20754,7 +20754,7 @@ _08027D48: b _08028060 .align 2, 0 _08027D4C: .4byte gCurrentMove -_08027D50: .4byte gUnknown_2023D74 +_08027D50: .4byte gBattlescriptCurrInstr _08027D54: .4byte gUnknown_81D7DF2 _08027D58: ldr r2, _08027DA0 @ =gBattleMons @@ -20781,7 +20781,7 @@ _08027D74: beq _08027E0C cmp r5, 0x1 bne _08027D48 - ldr r4, _08027DAC @ =gUnknown_2023ECC + ldr r4, _08027DAC @ =gSpecialStatuses lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -20790,7 +20790,7 @@ _08027D74: lsls r0, 31 cmp r0, 0 beq _08027DB4 - ldr r0, _08027DB0 @ =gUnknown_2023D74 + ldr r0, _08027DB0 @ =gBattlescriptCurrInstr mov r1, r8 str r1, [r0] b _08027D48 @@ -20798,8 +20798,8 @@ _08027D74: _08027DA0: .4byte gBattleMons _08027DA4: .4byte gActiveBattler _08027DA8: .4byte gCurrentMove -_08027DAC: .4byte gUnknown_2023ECC -_08027DB0: .4byte gUnknown_2023D74 +_08027DAC: .4byte gSpecialStatuses +_08027DB0: .4byte gBattlescriptCurrInstr _08027DB4: mov r0, r8 bl BattleScriptPush @@ -20807,7 +20807,7 @@ _08027DB4: ldr r2, _08027DFC @ =gActiveBattler ldrb r0, [r2] strb r0, [r1, 0x17] - ldr r1, _08027E00 @ =gUnknown_2023D74 + ldr r1, _08027E00 @ =gBattlescriptCurrInstr ldr r0, _08027E04 @ =gUnknown_81D9416 str r0, [r1] ldr r1, _08027E08 @ =gLastUsedAbility @@ -20835,7 +20835,7 @@ _08027DB4: .align 2, 0 _08027DF8: .4byte gBattleScripting _08027DFC: .4byte gActiveBattler -_08027E00: .4byte gUnknown_2023D74 +_08027E00: .4byte gBattlescriptCurrInstr _08027E04: .4byte gUnknown_81D9416 _08027E08: .4byte gLastUsedAbility _08027E0C: @@ -20861,7 +20861,7 @@ _08027E0C: ldr r3, _08027E58 @ =gActiveBattler ldrb r0, [r3] strb r0, [r1, 0x17] - ldr r1, _08027E60 @ =gUnknown_2023D74 + ldr r1, _08027E60 @ =gBattlescriptCurrInstr ldr r0, _08027E64 @ =gUnknown_81D947E str r0, [r1] ldr r1, _08027E68 @ =gLastUsedAbility @@ -20878,7 +20878,7 @@ _08027E0C: .align 2, 0 _08027E58: .4byte gActiveBattler _08027E5C: .4byte gBattleScripting -_08027E60: .4byte gUnknown_2023D74 +_08027E60: .4byte gBattlescriptCurrInstr _08027E64: .4byte gUnknown_81D947E _08027E68: .4byte gLastUsedAbility _08027E6C: @@ -20906,7 +20906,7 @@ _08027E8E: ldr r2, _08027EBC @ =gActiveBattler ldrb r0, [r2] strb r0, [r1, 0x17] - ldr r1, _08027EC4 @ =gUnknown_2023D74 + ldr r1, _08027EC4 @ =gBattlescriptCurrInstr ldr r0, _08027EC8 @ =gUnknown_81D947E str r0, [r1] ldr r1, _08027ECC @ =gLastUsedAbility @@ -20923,7 +20923,7 @@ _08027E8E: .align 2, 0 _08027EBC: .4byte gActiveBattler _08027EC0: .4byte gBattleScripting -_08027EC4: .4byte gUnknown_2023D74 +_08027EC4: .4byte gBattlescriptCurrInstr _08027EC8: .4byte gUnknown_81D947E _08027ECC: .4byte gLastUsedAbility _08027ED0: @@ -20991,7 +20991,7 @@ _08027F12: movs r1, 0 ldr r0, _08027F64 @ =gBattlerTarget ldrb r0, [r0] - ldr r3, _08027F68 @ =gUnknown_2023E82 + ldr r3, _08027F68 @ =gBattleCommunication mov r8, r3 cmp r0, r2 bne _08027F56 @@ -21004,7 +21004,7 @@ _08027F56: _08027F5C: .4byte gActiveBattler _08027F60: .4byte gBattleTextBuff2 _08027F64: .4byte gBattlerTarget -_08027F68: .4byte gUnknown_2023E82 +_08027F68: .4byte gBattleCommunication _08027F6C: asrs r6, r0, 28 movs r0, 0x7 @@ -21051,7 +21051,7 @@ _08027F86: cmp r0, 0xC bne _08027FDC _08027FC2: - ldr r1, _08027FD8 @ =gUnknown_2023E82 + ldr r1, _08027FD8 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] mov r8, r1 @@ -21060,12 +21060,12 @@ _08027FC2: _08027FCC: .4byte gBattleTextBuff2 _08027FD0: .4byte gBattleMons _08027FD4: .4byte gActiveBattler -_08027FD8: .4byte gUnknown_2023E82 +_08027FD8: .4byte gBattleCommunication _08027FDC: movs r1, 0 ldr r0, _08028070 @ =gBattlerTarget ldrb r0, [r0] - ldr r2, _08028074 @ =gUnknown_2023E82 + ldr r2, _08028074 @ =gBattleCommunication mov r8, r2 cmp r0, r3 bne _08027FEC @@ -21144,7 +21144,7 @@ _08028060: bx r1 .align 2, 0 _08028070: .4byte gBattlerTarget -_08028074: .4byte gUnknown_2023E82 +_08028074: .4byte gBattleCommunication _08028078: .4byte gActiveBattler _0802807C: .4byte gMoveResultFlags thumb_func_end ChangeStatBuffs @@ -21152,7 +21152,7 @@ _0802807C: .4byte gMoveResultFlags thumb_func_start atk89_statbuffchange atk89_statbuffchange: @ 8028080 push {r4,r5,lr} - ldr r5, _080280C4 @ =gUnknown_2023D74 + ldr r5, _080280C4 @ =gBattlescriptCurrInstr ldr r2, [r5] ldrb r3, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -21185,7 +21185,7 @@ _080280BC: pop {r0} bx r0 .align 2, 0 -_080280C4: .4byte gUnknown_2023D74 +_080280C4: .4byte gBattlescriptCurrInstr _080280C8: .4byte gBattleScripting thumb_func_end atk89_statbuffchange @@ -21195,7 +21195,7 @@ atk8A_normalisebuffs: @ 80280CC movs r2, 0 ldr r0, _08028114 @ =gBattlersCount ldrb r1, [r0] - ldr r0, _08028118 @ =gUnknown_2023D74 + ldr r0, _08028118 @ =gBattlescriptCurrInstr mov r12, r0 cmp r2, r1 bge _08028104 @@ -21231,7 +21231,7 @@ _08028104: bx r0 .align 2, 0 _08028114: .4byte gBattlersCount -_08028118: .4byte gUnknown_2023D74 +_08028118: .4byte gBattlescriptCurrInstr _0802811C: .4byte gBattleMons thumb_func_end atk8A_normalisebuffs @@ -21259,7 +21259,7 @@ atk8B_setbide: @ 8028120 ldrh r1, [r1] movs r2, 0 strh r1, [r0] - ldr r1, _08028188 @ =gUnknown_2023D58 + ldr r1, _08028188 @ =gTakenDmg ldrb r0, [r3] lsls r0, 2 adds r0, r1 @@ -21273,7 +21273,7 @@ atk8B_setbide: @ 8028120 lsls r2, 2 orrs r0, r2 str r0, [r1] - ldr r1, _0802818C @ =gUnknown_2023D74 + ldr r1, _0802818C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -21285,8 +21285,8 @@ _08028178: .4byte gBattleMons _0802817C: .4byte gBattlerAttacker _08028180: .4byte gUnknown_2023DB8 _08028184: .4byte gCurrentMove -_08028188: .4byte gUnknown_2023D58 -_0802818C: .4byte gUnknown_2023D74 +_08028188: .4byte gTakenDmg +_0802818C: .4byte gBattlescriptCurrInstr thumb_func_end atk8B_setbide thumb_func_start atk8C_confuseifrepeatingattackends @@ -21305,11 +21305,11 @@ atk8C_confuseifrepeatingattackends: @ 8028190 ands r0, r1 cmp r0, 0 bne _080281B2 - ldr r1, _080281C8 @ =gUnknown_2023E82 + ldr r1, _080281C8 @ =gBattleCommunication movs r0, 0x75 strb r0, [r1, 0x3] _080281B2: - ldr r1, _080281CC @ =gUnknown_2023D74 + ldr r1, _080281CC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -21318,14 +21318,14 @@ _080281B2: .align 2, 0 _080281C0: .4byte gBattleMons _080281C4: .4byte gBattlerAttacker -_080281C8: .4byte gUnknown_2023E82 -_080281CC: .4byte gUnknown_2023D74 +_080281C8: .4byte gBattleCommunication +_080281CC: .4byte gBattlescriptCurrInstr thumb_func_end atk8C_confuseifrepeatingattackends thumb_func_start atk8D_setmultihitcounter atk8D_setmultihitcounter: @ 80281D0 push {r4,r5,lr} - ldr r0, _080281E4 @ =gUnknown_2023D74 + ldr r0, _080281E4 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x1] cmp r1, 0 @@ -21334,7 +21334,7 @@ atk8D_setmultihitcounter: @ 80281D0 strb r1, [r0] b _08028206 .align 2, 0 -_080281E4: .4byte gUnknown_2023D74 +_080281E4: .4byte gBattlescriptCurrInstr _080281E8: .4byte gUnknown_2023D72 _080281EC: ldr r4, _08028214 @ =gUnknown_2023D72 @@ -21350,7 +21350,7 @@ _08028202: adds r0, 0x2 strb r0, [r4] _08028206: - ldr r1, _08028218 @ =gUnknown_2023D74 + ldr r1, _08028218 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -21359,7 +21359,7 @@ _08028206: bx r0 .align 2, 0 _08028214: .4byte gUnknown_2023D72 -_08028218: .4byte gUnknown_2023D74 +_08028218: .4byte gBattlescriptCurrInstr thumb_func_end atk8D_setmultihitcounter thumb_func_start atk8E_initmultihitstring @@ -21375,14 +21375,14 @@ atk8E_initmultihitstring: @ 802821C strb r2, [r1, 0xC] movs r0, 0xFF strb r0, [r1, 0xD] - ldr r1, _08028240 @ =gUnknown_2023D74 + ldr r1, _08028240 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 _0802823C: .4byte gBattleScripting -_08028240: .4byte gUnknown_2023D74 +_08028240: .4byte gBattlescriptCurrInstr thumb_func_end atk8E_initmultihitstring thumb_func_start TryDoForceSwitchOut @@ -21442,7 +21442,7 @@ _0802828C: lsrs r1, 2 cmp r0, r1 bhi _080282DC - ldr r3, _080282D8 @ =gUnknown_2023D74 + ldr r3, _080282D8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -21458,7 +21458,7 @@ _0802828C: movs r0, 0 b _080282F6 .align 2, 0 -_080282D8: .4byte gUnknown_2023D74 +_080282D8: .4byte gBattlescriptCurrInstr _080282DC: ldr r0, _080282FC @ =gBattleStruct ldr r1, [r0] @@ -21470,7 +21470,7 @@ _080282E8: adds r0, r2 ldrh r0, [r0] strb r0, [r1] - ldr r1, _08028304 @ =gUnknown_2023D74 + ldr r1, _08028304 @ =gBattlescriptCurrInstr ldr r0, _08028308 @ =gUnknown_81D8C10 str r0, [r1] movs r0, 0x1 @@ -21481,7 +21481,7 @@ _080282F6: .align 2, 0 _080282FC: .4byte gBattleStruct _08028300: .4byte gBattlerPartyIndexes -_08028304: .4byte gUnknown_2023D74 +_08028304: .4byte gBattlescriptCurrInstr _08028308: .4byte gUnknown_81D8C10 thumb_func_end TryDoForceSwitchOut @@ -21622,7 +21622,7 @@ _08028404: cmp r1, 0 bne _08028440 _0802841C: - ldr r3, _0802843C @ =gUnknown_2023D74 + ldr r3, _0802843C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -21638,7 +21638,7 @@ _0802841C: b _080285F8 .align 2, 0 _08028438: .4byte gBattleTypeFlags -_0802843C: .4byte gUnknown_2023D74 +_0802843C: .4byte gBattlescriptCurrInstr _08028440: bl TryDoForceSwitchOut lsls r0, 24 @@ -21955,7 +21955,7 @@ _080286BE: _080286C8: cmp r3, r6 bne _080286EC - ldr r3, _080286E8 @ =gUnknown_2023D74 + ldr r3, _080286E8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -21970,7 +21970,7 @@ _080286C8: str r1, [r3] b _08028790 .align 2, 0 -_080286E8: .4byte gUnknown_2023D74 +_080286E8: .4byte gBattlescriptCurrInstr _080286EC: movs r7, 0x3 ldr r5, _08028744 @ =gBattleMoves @@ -22051,7 +22051,7 @@ _08028752: strb r2, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _080287A4 @ =gUnknown_2023D74 + ldr r1, _080287A4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -22065,7 +22065,7 @@ _08028790: bx r0 .align 2, 0 _080287A0: .4byte gBattleTextBuff1 -_080287A4: .4byte gUnknown_2023D74 +_080287A4: .4byte gBattlescriptCurrInstr thumb_func_end atk90_tryconversiontypechange thumb_func_start atk91_givepaydaymoney @@ -22111,7 +22111,7 @@ atk91_givepaydaymoney: @ 80287A8 strb r4, [r1, 0x5] movs r0, 0xFF strb r0, [r1, 0x6] - ldr r4, _08028820 @ =gUnknown_2023D74 + ldr r4, _08028820 @ =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl BattleScriptPush @@ -22124,10 +22124,10 @@ _08028810: .4byte gUnknown_2023E7E _08028814: .4byte gBattleStruct _08028818: .4byte gSaveBlock1Ptr _0802881C: .4byte gBattleTextBuff1 -_08028820: .4byte gUnknown_2023D74 +_08028820: .4byte gBattlescriptCurrInstr _08028824: .4byte gUnknown_81D911D _08028828: - ldr r1, _08028838 @ =gUnknown_2023D74 + ldr r1, _08028838 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22136,7 +22136,7 @@ _08028830: pop {r0} bx r0 .align 2, 0 -_08028838: .4byte gUnknown_2023D74 +_08028838: .4byte gBattlescriptCurrInstr thumb_func_end atk91_givepaydaymoney thumb_func_start atk92_setlightscreen @@ -22145,7 +22145,7 @@ atk92_setlightscreen: @ 802883C ldr r5, _0802886C @ =gBattlerAttacker ldrb r0, [r5] bl GetBattlerPosition - ldr r4, _08028870 @ =gSideAffecting + ldr r4, _08028870 @ =gSideStatuses movs r6, 0x1 adds r1, r6, 0 ands r1, r0 @@ -22161,14 +22161,14 @@ atk92_setlightscreen: @ 802883C movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08028878 @ =gUnknown_2023E82 + ldr r1, _08028878 @ =gBattleCommunication movs r0, 0 b _080288F0 .align 2, 0 _0802886C: .4byte gBattlerAttacker -_08028870: .4byte gSideAffecting +_08028870: .4byte gSideStatuses _08028874: .4byte gMoveResultFlags -_08028878: .4byte gUnknown_2023E82 +_08028878: .4byte gBattleCommunication _0802887C: ldrb r0, [r5] bl GetBattlerPosition @@ -22212,19 +22212,19 @@ _0802887C: lsrs r0, 24 cmp r0, 0x2 bne _080288EC - ldr r1, _080288E8 @ =gUnknown_2023E82 + ldr r1, _080288E8 @ =gBattleCommunication movs r0, 0x4 b _080288F0 .align 2, 0 _080288E0: .4byte gSideTimers _080288E4: .4byte gBattleTypeFlags -_080288E8: .4byte gUnknown_2023E82 +_080288E8: .4byte gBattleCommunication _080288EC: - ldr r1, _08028900 @ =gUnknown_2023E82 + ldr r1, _08028900 @ =gBattleCommunication movs r0, 0x3 _080288F0: strb r0, [r1, 0x5] - ldr r1, _08028904 @ =gUnknown_2023D74 + ldr r1, _08028904 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22232,8 +22232,8 @@ _080288F0: pop {r0} bx r0 .align 2, 0 -_08028900: .4byte gUnknown_2023E82 -_08028904: .4byte gUnknown_2023D74 +_08028900: .4byte gBattleCommunication +_08028904: .4byte gBattlescriptCurrInstr thumb_func_end atk92_setlightscreen thumb_func_start atk93_tryKO @@ -22295,7 +22295,7 @@ _0802895A: ldrb r0, [r5] movs r1, 0x27 bl sub_80C7208 - ldr r2, _080289DC @ =gUnknown_2023ECC + ldr r2, _080289DC @ =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -22327,7 +22327,7 @@ _08028998: strb r0, [r2] ldr r0, _080289E8 @ =gLastUsedAbility strb r4, [r0] - ldr r1, _080289EC @ =gUnknown_2023D74 + ldr r1, _080289EC @ =gBattlescriptCurrInstr ldr r0, _080289F0 @ =gUnknown_81D93A1 str r0, [r1] mov r1, r9 @@ -22338,11 +22338,11 @@ _08028998: .align 2, 0 _080289D4: .4byte gPotentialItemEffectBattler _080289D8: .4byte gBattlerTarget -_080289DC: .4byte gUnknown_2023ECC +_080289DC: .4byte gSpecialStatuses _080289E0: .4byte gBattleMons _080289E4: .4byte gMoveResultFlags _080289E8: .4byte gLastUsedAbility -_080289EC: .4byte gUnknown_2023D74 +_080289EC: .4byte gBattlescriptCurrInstr _080289F0: .4byte gUnknown_81D93A1 _080289F4: ldr r1, _08028A68 @ =gStatuses3 @@ -22491,7 +22491,7 @@ _08028B0E: cmp r4, 0 beq _08028BE0 _08028B1A: - ldr r0, _08028B5C @ =gUnknown_2023E8C + ldr r0, _08028B5C @ =gProtectStructs mov r1, r9 ldrb r2, [r1] lsls r1, r2, 4 @@ -22518,11 +22518,11 @@ _08028B4C: .4byte gBattleMoves _08028B50: .4byte gCurrentMove _08028B54: .4byte gBattleMons _08028B58: .4byte gBattlerTarget -_08028B5C: .4byte gUnknown_2023E8C +_08028B5C: .4byte gProtectStructs _08028B60: .4byte gBattleMoveDamage _08028B64: .4byte gMoveResultFlags _08028B68: - ldr r0, _08028BA4 @ =gUnknown_2023ECC + ldr r0, _08028BA4 @ =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -22553,7 +22553,7 @@ _08028B68: strh r0, [r1] b _08028BCA .align 2, 0 -_08028BA4: .4byte gUnknown_2023ECC +_08028BA4: .4byte gSpecialStatuses _08028BA8: .4byte gBattleMoveDamage _08028BAC: .4byte gMoveResultFlags _08028BB0: .4byte gLastUsedItem @@ -22571,7 +22571,7 @@ _08028BC6: orrs r0, r1 strb r0, [r2] _08028BCA: - ldr r1, _08028BDC @ =gUnknown_2023D74 + ldr r1, _08028BDC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -22579,7 +22579,7 @@ _08028BCA: .align 2, 0 _08028BD4: .4byte gBattleMoveDamage _08028BD8: .4byte gMoveResultFlags -_08028BDC: .4byte gUnknown_2023D74 +_08028BDC: .4byte gBattlescriptCurrInstr _08028BE0: ldr r2, _08028C14 @ =gMoveResultFlags ldrb r0, [r2] @@ -22603,7 +22603,7 @@ _08028BE0: ldrb r0, [r0] cmp r1, r0 bcc _08028C28 - ldr r1, _08028C24 @ =gUnknown_2023E82 + ldr r1, _08028C24 @ =gBattleCommunication movs r0, 0 b _08028C2C .align 2, 0 @@ -22611,13 +22611,13 @@ _08028C14: .4byte gMoveResultFlags _08028C18: .4byte gBattleMons _08028C1C: .4byte gBattlerAttacker _08028C20: .4byte gBattlerTarget -_08028C24: .4byte gUnknown_2023E82 +_08028C24: .4byte gBattleCommunication _08028C28: - ldr r1, _08028C54 @ =gUnknown_2023E82 + ldr r1, _08028C54 @ =gBattleCommunication movs r0, 0x1 _08028C2C: strb r0, [r1, 0x5] - ldr r3, _08028C58 @ =gUnknown_2023D74 + ldr r3, _08028C58 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -22638,8 +22638,8 @@ _08028C48: pop {r0} bx r0 .align 2, 0 -_08028C54: .4byte gUnknown_2023E82 -_08028C58: .4byte gUnknown_2023D74 +_08028C54: .4byte gBattleCommunication +_08028C58: .4byte gBattlescriptCurrInstr thumb_func_end atk93_tryKO thumb_func_start atk94_damagetohalftargethp @@ -22660,7 +22660,7 @@ atk94_damagetohalftargethp: @ 8028C5C movs r0, 0x1 str r0, [r3] _08028C7A: - ldr r1, _08028C94 @ =gUnknown_2023D74 + ldr r1, _08028C94 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22670,7 +22670,7 @@ _08028C7A: _08028C88: .4byte gBattleMoveDamage _08028C8C: .4byte gBattleMons _08028C90: .4byte gBattlerTarget -_08028C94: .4byte gUnknown_2023D74 +_08028C94: .4byte gBattlescriptCurrInstr thumb_func_end atk94_damagetohalftargethp thumb_func_start atk95_setsandstorm @@ -22687,35 +22687,35 @@ atk95_setsandstorm: @ 8028C98 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08028CC0 @ =gUnknown_2023E82 + ldr r1, _08028CC0 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08028CD6 .align 2, 0 _08028CB8: .4byte gBattleWeather _08028CBC: .4byte gMoveResultFlags -_08028CC0: .4byte gUnknown_2023E82 +_08028CC0: .4byte gBattleCommunication _08028CC4: movs r0, 0x8 strh r0, [r2] - ldr r1, _08028CE4 @ =gUnknown_2023E82 + ldr r1, _08028CE4 @ =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x5] - ldr r0, _08028CE8 @ =gUnknown_2023F20 + ldr r0, _08028CE8 @ =gWishFutureKnock adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _08028CD6: - ldr r1, _08028CEC @ =gUnknown_2023D74 + ldr r1, _08028CEC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08028CE4: .4byte gUnknown_2023E82 -_08028CE8: .4byte gUnknown_2023F20 -_08028CEC: .4byte gUnknown_2023D74 +_08028CE4: .4byte gBattleCommunication +_08028CE8: .4byte gWishFutureKnock +_08028CEC: .4byte gBattlescriptCurrInstr thumb_func_end atk95_setsandstorm thumb_func_start sub_8028CF0 @@ -22909,7 +22909,7 @@ _08028E64: movs r0, 0 str r0, [r1] _08028E6A: - ldr r1, _08028E8C @ =gUnknown_2023D74 + ldr r1, _08028E8C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22922,7 +22922,7 @@ _08028E7C: .4byte gBattleMoveDamage _08028E80: .4byte gBattlerAttacker _08028E84: .4byte gAbsentBattlerFlags _08028E88: .4byte gBitTable -_08028E8C: .4byte gUnknown_2023D74 +_08028E8C: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028CF0 thumb_func_start sub_8028E90 @@ -23023,7 +23023,7 @@ _08028F1C: ldrb r2, [r0] cmp r2, 0xC bne _08028F94 - ldr r1, _08028F88 @ =gUnknown_2023D74 + ldr r1, _08028F88 @ =gBattlescriptCurrInstr ldr r0, _08028F8C @ =gUnknown_81D9444 str r0, [r1] ldr r0, _08028F90 @ =gLastUsedAbility @@ -23037,7 +23037,7 @@ _08028F78: .4byte gBattlerPartyIndexes _08028F7C: .4byte gEnemyParty _08028F80: .4byte gBattlerTarget _08028F84: .4byte gBattleMons -_08028F88: .4byte gUnknown_2023D74 +_08028F88: .4byte gBattlescriptCurrInstr _08028F8C: .4byte gUnknown_81D9444 _08028F90: .4byte gLastUsedAbility _08028F94: @@ -23078,7 +23078,7 @@ _08028F94: cmp r0, 0xFF bne _08029008 _08028FE4: - ldr r3, _08029004 @ =gUnknown_2023D74 + ldr r3, _08029004 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23094,7 +23094,7 @@ _08028FE4: b _0802902C .align 2, 0 _08029000: .4byte gBattleMons -_08029004: .4byte gUnknown_2023D74 +_08029004: .4byte gBattlescriptCurrInstr _08029008: ldrb r0, [r5] adds r2, r0, 0 @@ -23110,7 +23110,7 @@ _08029008: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r1, _08029044 @ =gUnknown_2023D74 + ldr r1, _08029044 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -23125,7 +23125,7 @@ _0802902C: .align 2, 0 _0802903C: .4byte gBitTable _08029040: .4byte gBattlerAttacker -_08029044: .4byte gUnknown_2023D74 +_08029044: .4byte gBattlescriptCurrInstr thumb_func_end sub_8028E90 thumb_func_start sub_8029048 @@ -23137,7 +23137,7 @@ sub_8029048: @ 8029048 beq _08029054 b _080291C0 _08029054: - ldr r5, _080290BC @ =gUnknown_2023D74 + ldr r5, _080290BC @ =gBattlescriptCurrInstr ldr r2, [r5] ldrb r0, [r2, 0x1] cmp r0, 0xD @@ -23174,7 +23174,7 @@ _08029074: movs r0, 0 bl BtlController_EmitStatusIconUpdate ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080290A2: ldrb r0, [r4] adds r0, 0x1 @@ -23188,7 +23188,7 @@ _080290A2: b _08029164 .align 2, 0 _080290B8: .4byte gBattleControllerExecFlags -_080290BC: .4byte gUnknown_2023D74 +_080290BC: .4byte gBattlescriptCurrInstr _080290C0: .4byte gActiveBattler _080290C4: .4byte gBattlersCount _080290C8: .4byte gBitTable @@ -23224,7 +23224,7 @@ _080290D4: movs r0, 0 bl BtlController_EmitStatusIconUpdate ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08029114: ldr r0, _08029184 @ =gBattleTypeFlags ldr r0, [r0] @@ -23261,9 +23261,9 @@ _08029114: movs r0, 0 bl BtlController_EmitStatusIconUpdate ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08029164: - ldr r1, _08029188 @ =gUnknown_2023D74 + ldr r1, _08029188 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -23275,10 +23275,10 @@ _08029178: .4byte gAbsentBattlerFlags _0802917C: .4byte gBitTable _08029180: .4byte gBattleMons _08029184: .4byte gBattleTypeFlags -_08029188: .4byte gUnknown_2023D74 +_08029188: .4byte gBattlescriptCurrInstr _0802918C: ldrb r0, [r2, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _080291C8 @ =gActiveBattler strb r0, [r4] ldr r3, _080291CC @ =gBattleMons @@ -23296,7 +23296,7 @@ _0802918C: movs r0, 0 bl BtlController_EmitStatusIconUpdate ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r0, [r5] adds r0, 0x2 str r0, [r5] @@ -23331,14 +23331,14 @@ atk99_setmist: @ 80291D0 movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r0, _0802920C @ =gUnknown_2023E82 + ldr r0, _0802920C @ =gBattleCommunication strb r5, [r0, 0x5] b _0802925E .align 2, 0 _08029200: .4byte gSideTimers _08029204: .4byte gBattlerAttacker _08029208: .4byte gMoveResultFlags -_0802920C: .4byte gUnknown_2023E82 +_0802920C: .4byte gBattleCommunication _08029210: ldrb r0, [r4] bl GetBattlerPosition @@ -23362,7 +23362,7 @@ _08029210: strb r1, [r0, 0x5] ldrb r0, [r4] bl GetBattlerPosition - ldr r2, _0802926C @ =gSideAffecting + ldr r2, _0802926C @ =gSideStatuses adds r1, r5, 0 ands r1, r0 lsls r1, 1 @@ -23374,10 +23374,10 @@ _08029210: movs r3, 0 orrs r0, r2 strh r0, [r1] - ldr r0, _08029270 @ =gUnknown_2023E82 + ldr r0, _08029270 @ =gBattleCommunication strb r3, [r0, 0x5] _0802925E: - ldr r1, _08029274 @ =gUnknown_2023D74 + ldr r1, _08029274 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -23385,9 +23385,9 @@ _0802925E: pop {r0} bx r0 .align 2, 0 -_0802926C: .4byte gSideAffecting -_08029270: .4byte gUnknown_2023E82 -_08029274: .4byte gUnknown_2023D74 +_0802926C: .4byte gSideStatuses +_08029270: .4byte gBattleCommunication +_08029274: .4byte gBattlescriptCurrInstr thumb_func_end atk99_setmist thumb_func_start atk9A_setfocusenergy @@ -23412,7 +23412,7 @@ atk9A_setfocusenergy: @ 8029278 movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r1, _080292B4 @ =gUnknown_2023E82 + ldr r1, _080292B4 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _080292C0 @@ -23420,22 +23420,22 @@ atk9A_setfocusenergy: @ 8029278 _080292A8: .4byte gBattleMons _080292AC: .4byte gBattlerAttacker _080292B0: .4byte gMoveResultFlags -_080292B4: .4byte gUnknown_2023E82 +_080292B4: .4byte gBattleCommunication _080292B8: orrs r1, r3 str r1, [r0] - ldr r0, _080292CC @ =gUnknown_2023E82 + ldr r0, _080292CC @ =gBattleCommunication strb r2, [r0, 0x5] _080292C0: - ldr r1, _080292D0 @ =gUnknown_2023D74 + ldr r1, _080292D0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080292CC: .4byte gUnknown_2023E82 -_080292D0: .4byte gUnknown_2023D74 +_080292CC: .4byte gBattleCommunication +_080292D0: .4byte gBattlescriptCurrInstr thumb_func_end atk9A_setfocusenergy thumb_func_start atk9B_transformdataexecution @@ -23447,7 +23447,7 @@ atk9B_transformdataexecution: @ 80292D4 ldr r2, _08029330 @ =0x0000ffff adds r0, r2, 0 strh r0, [r1] - ldr r1, _08029334 @ =gUnknown_2023D74 + ldr r1, _08029334 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -23481,19 +23481,19 @@ _0802931A: movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r1, _0802934C @ =gUnknown_2023E82 + ldr r1, _0802934C @ =gBattleCommunication movs r0, 0x1 b _08029464 .align 2, 0 _0802932C: .4byte gChosenMove _08029330: .4byte 0x0000ffff -_08029334: .4byte gUnknown_2023D74 +_08029334: .4byte gBattlescriptCurrInstr _08029338: .4byte gBattleMons _0802933C: .4byte gBattlerTarget _08029340: .4byte gStatuses3 _08029344: .4byte 0x000400c0 _08029348: .4byte gMoveResultFlags -_0802934C: .4byte gUnknown_2023E82 +_0802934C: .4byte gBattleCommunication _08029350: ldr r3, _08029424 @ =gBattlerAttacker ldrb r0, [r3] @@ -23626,8 +23626,8 @@ _08029442: bl BtlController_EmitResetActionMoveSelection mov r2, r8 ldrb r0, [r2] - bl MarkBufferBankForExecution - ldr r1, _08029470 @ =gUnknown_2023E82 + bl MarkBattlerForControllerExec + ldr r1, _08029470 @ =gBattleCommunication movs r0, 0 _08029464: strb r0, [r1, 0x5] @@ -23637,7 +23637,7 @@ _08029464: pop {r0} bx r0 .align 2, 0 -_08029470: .4byte gUnknown_2023E82 +_08029470: .4byte gBattleCommunication thumb_func_end atk9B_transformdataexecution thumb_func_start atk9C_setsubstitute @@ -23662,7 +23662,7 @@ _0802948E: ldr r1, _080294AC @ =gBattleMoveDamage movs r0, 0 str r0, [r1] - ldr r1, _080294B0 @ =gUnknown_2023E82 + ldr r1, _080294B0 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08029508 @@ -23670,7 +23670,7 @@ _0802948E: _080294A4: .4byte gBattleMons _080294A8: .4byte gBattlerAttacker _080294AC: .4byte gBattleMoveDamage -_080294B0: .4byte gUnknown_2023E82 +_080294B0: .4byte gBattleCommunication _080294B4: ldr r4, _08029518 @ =gBattleMoveDamage str r1, [r4] @@ -23707,16 +23707,16 @@ _080294C0: ldr r1, [r4] movs r2, 0 strb r1, [r0, 0xA] - ldr r0, _08029524 @ =gUnknown_2023E82 + ldr r0, _08029524 @ =gBattleCommunication strb r2, [r0, 0x5] - ldr r2, _08029528 @ =gUnknown_2023DD0 + ldr r2, _08029528 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 1 orrs r0, r1 str r0, [r2] _08029508: - ldr r1, _0802952C @ =gUnknown_2023D74 + ldr r1, _0802952C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -23727,9 +23727,9 @@ _08029508: _08029518: .4byte gBattleMoveDamage _0802951C: .4byte 0xffff1fff _08029520: .4byte gDisableStructs -_08029524: .4byte gUnknown_2023E82 -_08029528: .4byte gUnknown_2023DD0 -_0802952C: .4byte gUnknown_2023D74 +_08029524: .4byte gBattleCommunication +_08029528: .4byte gHitMarker +_0802952C: .4byte gBattlescriptCurrInstr thumb_func_end atk9C_setsubstitute thumb_func_start IsMoveUncopyableByMimic @@ -23819,7 +23819,7 @@ atk9D_mimicattackcopy: @ 8029578 cmp r1, r7 bne _0802960C _080295D2: - ldr r3, _08029608 @ =gUnknown_2023D74 + ldr r3, _08029608 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23840,14 +23840,14 @@ _080295F8: .4byte gLastUsedMove _080295FC: .4byte gBattlerTarget _08029600: .4byte gBattleMons _08029604: .4byte gBattlerAttacker -_08029608: .4byte gUnknown_2023D74 +_08029608: .4byte gBattlescriptCurrInstr _0802960C: movs r2, 0 mov r3, r12 adds r3, 0xC adds r0, r4, r3 ldrh r0, [r0] - ldr r4, _0802969C @ =gUnknown_2023D74 + ldr r4, _0802969C @ =gBattlescriptCurrInstr mov r10, r4 cmp r0, r1 beq _08029646 @@ -23916,7 +23916,7 @@ _08029646: strb r4, [r0] b _080296C4 .align 2, 0 -_0802969C: .4byte gUnknown_2023D74 +_0802969C: .4byte gBattlescriptCurrInstr _080296A0: .4byte gUnknown_2023D48 _080296A4: .4byte gLastUsedMove _080296A8: .4byte gBattlerTarget @@ -24014,7 +24014,7 @@ atk9E_metronome: @ 8029754 movs r6, 0xB1 lsls r6, 1 ldr r5, _080297D8 @ =gUnknown_82507E8 - ldr r0, _080297DC @ =gUnknown_2023D74 + ldr r0, _080297DC @ =gBattlescriptCurrInstr mov r8, r0 _08029766: bl Random @@ -24045,7 +24045,7 @@ _08029794: ldr r0, _080297E4 @ =0x0000ffff cmp r1, r0 bne _08029766 - ldr r2, _080297E8 @ =gUnknown_2023DD0 + ldr r2, _080297E8 @ =gHitMarker ldr r0, [r2] ldr r1, _080297EC @ =0xfffffbff ands r0, r1 @@ -24076,10 +24076,10 @@ _08029794: .align 2, 0 _080297D4: .4byte gCurrentMove _080297D8: .4byte gUnknown_82507E8 -_080297DC: .4byte gUnknown_2023D74 +_080297DC: .4byte gBattlescriptCurrInstr _080297E0: .4byte 0x000001ff _080297E4: .4byte 0x0000ffff -_080297E8: .4byte gUnknown_2023DD0 +_080297E8: .4byte gHitMarker _080297EC: .4byte 0xfffffbff _080297F0: .4byte gUnknown_81D65A8 _080297F4: .4byte gBattleMoves @@ -24098,7 +24098,7 @@ atk9F_dmgtolevel: @ 80297FC adds r0, 0x2A ldrb r0, [r0] str r0, [r3] - ldr r1, _08029828 @ =gUnknown_2023D74 + ldr r1, _08029828 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -24107,7 +24107,7 @@ atk9F_dmgtolevel: @ 80297FC _0802981C: .4byte gBattleMoveDamage _08029820: .4byte gBattleMons _08029824: .4byte gBattlerAttacker -_08029828: .4byte gUnknown_2023D74 +_08029828: .4byte gBattlescriptCurrInstr thumb_func_end atk9F_dmgtolevel thumb_func_start atkA0_psywavedamageeffect @@ -24138,7 +24138,7 @@ _08029830: movs r1, 0x64 bl __divsi3 str r0, [r4] - ldr r1, _0802987C @ =gUnknown_2023D74 + ldr r1, _0802987C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -24149,7 +24149,7 @@ _08029830: _08029870: .4byte gBattleMoveDamage _08029874: .4byte gBattleMons _08029878: .4byte gBattlerAttacker -_0802987C: .4byte gUnknown_2023D74 +_0802987C: .4byte gBattlescriptCurrInstr thumb_func_end atkA0_psywavedamageeffect thumb_func_start atkA1_counterdamagecalculator @@ -24160,7 +24160,7 @@ atkA1_counterdamagecalculator: @ 8029880 bl GetBattlerSide lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _080298F4 @ =gUnknown_2023E8C + ldr r5, _080298F4 @ =gProtectStructs ldrb r0, [r4] lsls r0, 4 adds r0, r5 @@ -24209,14 +24209,14 @@ atkA1_counterdamagecalculator: @ 8029880 b _08029918 .align 2, 0 _080298F0: .4byte gBattlerAttacker -_080298F4: .4byte gUnknown_2023E8C +_080298F4: .4byte gProtectStructs _080298F8: .4byte gBattleMons _080298FC: .4byte gBattleMoveDamage _08029900: .4byte gSideTimers _08029904: .4byte gBattlerTarget _08029908: ldr r2, _08029924 @ =gBattlerTarget - ldr r1, _08029928 @ =gUnknown_2023E8C + ldr r1, _08029928 @ =gProtectStructs ldr r0, _0802992C @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -24224,18 +24224,18 @@ _08029908: ldrb r0, [r0, 0xC] strb r0, [r2] _08029918: - ldr r1, _08029930 @ =gUnknown_2023D74 + ldr r1, _08029930 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08029964 .align 2, 0 _08029924: .4byte gBattlerTarget -_08029928: .4byte gUnknown_2023E8C +_08029928: .4byte gProtectStructs _0802992C: .4byte gBattlerAttacker -_08029930: .4byte gUnknown_2023D74 +_08029930: .4byte gBattlescriptCurrInstr _08029934: - ldr r2, _0802996C @ =gUnknown_2023ECC + ldr r2, _0802996C @ =gSpecialStatuses ldr r0, _08029970 @ =gBattlerAttacker ldrb r1, [r0] lsls r0, r1, 2 @@ -24246,7 +24246,7 @@ _08029934: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, _08029974 @ =gUnknown_2023D74 + ldr r3, _08029974 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24264,9 +24264,9 @@ _08029964: pop {r0} bx r0 .align 2, 0 -_0802996C: .4byte gUnknown_2023ECC +_0802996C: .4byte gSpecialStatuses _08029970: .4byte gBattlerAttacker -_08029974: .4byte gUnknown_2023D74 +_08029974: .4byte gBattlescriptCurrInstr thumb_func_end atkA1_counterdamagecalculator thumb_func_start atkA2_mirrorcoatdamagecalculator @@ -24277,7 +24277,7 @@ atkA2_mirrorcoatdamagecalculator: @ 8029978 bl GetBattlerSide lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _080299EC @ =gUnknown_2023E8C + ldr r5, _080299EC @ =gProtectStructs ldrb r0, [r4] lsls r0, 4 adds r0, r5 @@ -24327,14 +24327,14 @@ atkA2_mirrorcoatdamagecalculator: @ 8029978 b _08029A10 .align 2, 0 _080299E8: .4byte gBattlerAttacker -_080299EC: .4byte gUnknown_2023E8C +_080299EC: .4byte gProtectStructs _080299F0: .4byte gBattleMons _080299F4: .4byte gBattleMoveDamage _080299F8: .4byte gSideTimers _080299FC: .4byte gBattlerTarget _08029A00: ldr r2, _08029A1C @ =gBattlerTarget - ldr r1, _08029A20 @ =gUnknown_2023E8C + ldr r1, _08029A20 @ =gProtectStructs ldr r0, _08029A24 @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -24342,18 +24342,18 @@ _08029A00: ldrb r0, [r0, 0xD] strb r0, [r2] _08029A10: - ldr r1, _08029A28 @ =gUnknown_2023D74 + ldr r1, _08029A28 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08029A5C .align 2, 0 _08029A1C: .4byte gBattlerTarget -_08029A20: .4byte gUnknown_2023E8C +_08029A20: .4byte gProtectStructs _08029A24: .4byte gBattlerAttacker -_08029A28: .4byte gUnknown_2023D74 +_08029A28: .4byte gBattlescriptCurrInstr _08029A2C: - ldr r2, _08029A64 @ =gUnknown_2023ECC + ldr r2, _08029A64 @ =gSpecialStatuses ldr r0, _08029A68 @ =gBattlerAttacker ldrb r1, [r0] lsls r0, r1, 2 @@ -24364,7 +24364,7 @@ _08029A2C: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, _08029A6C @ =gUnknown_2023D74 + ldr r3, _08029A6C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24382,9 +24382,9 @@ _08029A5C: pop {r0} bx r0 .align 2, 0 -_08029A64: .4byte gUnknown_2023ECC +_08029A64: .4byte gSpecialStatuses _08029A68: .4byte gBattlerAttacker -_08029A6C: .4byte gUnknown_2023D74 +_08029A6C: .4byte gBattlescriptCurrInstr thumb_func_end atkA2_mirrorcoatdamagecalculator thumb_func_start atkA3_disablelastusedattack @@ -24513,7 +24513,7 @@ _08029AC4: ands r0, r3 orrs r0, r2 strb r0, [r1, 0xB] - ldr r1, _08029B84 @ =gUnknown_2023D74 + ldr r1, _08029B84 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -24524,9 +24524,9 @@ _08029B74: .4byte gBattlerTarget _08029B78: .4byte gLastUsedMove _08029B7C: .4byte gDisableStructs _08029B80: .4byte gBattleTextBuff1 -_08029B84: .4byte gUnknown_2023D74 +_08029B84: .4byte gBattlescriptCurrInstr _08029B88: - ldr r3, _08029BB0 @ =gUnknown_2023D74 + ldr r3, _08029BB0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24547,7 +24547,7 @@ _08029BA2: pop {r0} bx r0 .align 2, 0 -_08029BB0: .4byte gUnknown_2023D74 +_08029BB0: .4byte gBattlescriptCurrInstr thumb_func_end atkA3_disablelastusedattack thumb_func_start atkA4_trysetencore @@ -24672,7 +24672,7 @@ _08029C24: ands r0, r3 orrs r0, r2 strb r0, [r1, 0xE] - ldr r1, _08029CB8 @ =gUnknown_2023D74 + ldr r1, _08029CB8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -24682,9 +24682,9 @@ _08029CA8: .4byte gBattleMons _08029CAC: .4byte gBattlerTarget _08029CB0: .4byte gLastUsedMove _08029CB4: .4byte gDisableStructs -_08029CB8: .4byte gUnknown_2023D74 +_08029CB8: .4byte gBattlescriptCurrInstr _08029CBC: - ldr r3, _08029CE4 @ =gUnknown_2023D74 + ldr r3, _08029CE4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24706,7 +24706,7 @@ _08029CD6: pop {r0} bx r0 .align 2, 0 -_08029CE4: .4byte gUnknown_2023D74 +_08029CE4: .4byte gBattlescriptCurrInstr thumb_func_end atkA4_trysetencore thumb_func_start atkA5_painsplitdmgcalc @@ -24760,7 +24760,7 @@ atkA5_painsplitdmgcalc: @ 8029CE8 ldrh r0, [r0, 0x28] subs r0, r3 str r0, [r4] - ldr r2, _08029D7C @ =gUnknown_2023ECC + ldr r2, _08029D7C @ =gSpecialStatuses mov r0, r12 ldrb r1, [r0] lsls r0, r1, 2 @@ -24770,7 +24770,7 @@ atkA5_painsplitdmgcalc: @ 8029CE8 adds r0, r2 ldr r1, _08029D80 @ =0x0000ffff str r1, [r0] - ldr r1, _08029D84 @ =gUnknown_2023D74 + ldr r1, _08029D84 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -24781,11 +24781,11 @@ _08029D6C: .4byte gBattlerTarget _08029D70: .4byte gBattlerAttacker _08029D74: .4byte gBattleMoveDamage _08029D78: .4byte gBattleScripting -_08029D7C: .4byte gUnknown_2023ECC +_08029D7C: .4byte gSpecialStatuses _08029D80: .4byte 0x0000ffff -_08029D84: .4byte gUnknown_2023D74 +_08029D84: .4byte gBattlescriptCurrInstr _08029D88: - ldr r3, _08029DA8 @ =gUnknown_2023D74 + ldr r3, _08029DA8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24803,7 +24803,7 @@ _08029DA2: pop {r0} bx r0 .align 2, 0 -_08029DA8: .4byte gUnknown_2023D74 +_08029DA8: .4byte gBattlescriptCurrInstr thumb_func_end atkA5_painsplitdmgcalc thumb_func_start atkA6_settypetorandomresistance @@ -24845,7 +24845,7 @@ atkA6_settypetorandomresistance: @ 8029DAC cmp r0, 0 beq _08029E94 _08029DF6: - ldr r3, _08029E28 @ =gUnknown_2023D74 + ldr r3, _08029E28 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24865,7 +24865,7 @@ _08029E18: .4byte gBattlerAttacker _08029E1C: .4byte 0x0000ffff _08029E20: .4byte gBattleMons _08029E24: .4byte gUnknown_2023DC0 -_08029E28: .4byte gUnknown_2023D74 +_08029E28: .4byte gBattlescriptCurrInstr _08029E2C: mov r0, r12 strb r5, [r0] @@ -24883,11 +24883,11 @@ _08029E2C: strb r5, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _08029E54 @ =gUnknown_2023D74 + ldr r1, _08029E54 @ =gBattlescriptCurrInstr b _08029E82 .align 2, 0 _08029E50: .4byte gBattleTextBuff1 -_08029E54: .4byte gUnknown_2023D74 +_08029E54: .4byte gBattlescriptCurrInstr _08029E58: mov r0, r8 adds r0, 0x1 @@ -24977,7 +24977,7 @@ _08029EF8: ble _08029E9C movs r0, 0 mov r8, r0 - ldr r1, _08029FA4 @ =gUnknown_2023D74 + ldr r1, _08029FA4 @ =gBattlescriptCurrInstr mov r12, r1 ldr r3, _08029F90 @ =gUnknown_824F050 adds r0, r4, 0x1 @@ -25055,7 +25055,7 @@ _08029F94: .4byte gUnknown_2023DA8 _08029F98: .4byte gBattlerAttacker _08029F9C: .4byte gBattleMons _08029FA0: .4byte 0x000003e7 -_08029FA4: .4byte gUnknown_2023D74 +_08029FA4: .4byte gBattlescriptCurrInstr _08029FA8: .4byte 0x0000014f thumb_func_end atkA6_settypetorandomresistance @@ -25088,7 +25088,7 @@ atkA7_setalwayshitflag: @ 8029FAC ldr r1, _08029FFC @ =gBattlerAttacker ldrb r1, [r1] strb r1, [r0, 0x15] - ldr r1, _0802A000 @ =gUnknown_2023D74 + ldr r1, _0802A000 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -25100,7 +25100,7 @@ _08029FF0: .4byte gStatuses3 _08029FF4: .4byte gBattlerTarget _08029FF8: .4byte gDisableStructs _08029FFC: .4byte gBattlerAttacker -_0802A000: .4byte gUnknown_2023D74 +_0802A000: .4byte gBattlescriptCurrInstr thumb_func_end atkA7_setalwayshitflag thumb_func_start atkA8_copymovepermanently @@ -25263,7 +25263,7 @@ _0802A0F2: bl BtlController_EmitSetMonData ldr r0, _0802A184 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r1, _0802A188 @ =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] @@ -25284,7 +25284,7 @@ _0802A0F2: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0802A18C @ =gUnknown_2023D74 + ldr r1, _0802A18C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -25300,9 +25300,9 @@ _0802A17C: .4byte gUnknown_2023D48 _0802A180: .4byte gBattleMoves _0802A184: .4byte gActiveBattler _0802A188: .4byte gBattleTextBuff1 -_0802A18C: .4byte gUnknown_2023D74 +_0802A18C: .4byte gBattlescriptCurrInstr _0802A190: - ldr r3, _0802A1BC @ =gUnknown_2023D74 + ldr r3, _0802A1BC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25325,7 +25325,7 @@ _0802A1AA: pop {r0} bx r0 .align 2, 0 -_0802A1BC: .4byte gUnknown_2023D74 +_0802A1BC: .4byte gBattlescriptCurrInstr thumb_func_end atkA8_copymovepermanently thumb_func_start IsTwoTurnsMove @@ -25429,7 +25429,7 @@ _0802A248: cmp r0, 0x1A bne _0802A288 _0802A26A: - ldr r0, _0802A284 @ =gUnknown_2023DD0 + ldr r0, _0802A284 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 20 @@ -25441,7 +25441,7 @@ _0802A26A: .align 2, 0 _0802A27C: .4byte gBattleMoves _0802A280: .4byte gBattleWeather -_0802A284: .4byte gUnknown_2023DD0 +_0802A284: .4byte gHitMarker _0802A288: movs r0, 0x2 _0802A28A: @@ -25518,7 +25518,7 @@ _0802A2FC: lsrs r6, r0, 24 cmp r6, 0xF bne _0802A330 - ldr r1, _0802A32C @ =gUnknown_2023D74 + ldr r1, _0802A32C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -25527,7 +25527,7 @@ _0802A2FC: _0802A320: .4byte gBattlerAttacker _0802A324: .4byte gUnknown_2023BF0 _0802A328: .4byte gBitTable -_0802A32C: .4byte gUnknown_2023D74 +_0802A32C: .4byte gBattlescriptCurrInstr _0802A330: movs r7, 0x3 ldr r4, _0802A3A4 @ =gBitTable @@ -25555,7 +25555,7 @@ _0802A334: strh r0, [r4] ldr r0, _0802A3B4 @ =gUnknown_2023D48 strb r5, [r0] - ldr r2, _0802A3B8 @ =gUnknown_2023DD0 + ldr r2, _0802A3B8 @ =gHitMarker ldr r0, [r2] ldr r1, _0802A3BC @ =0xfffffbff ands r0, r1 @@ -25565,7 +25565,7 @@ _0802A334: bl GetMoveTarget ldr r1, _0802A3C0 @ =gBattlerTarget strb r0, [r1] - ldr r3, _0802A3C4 @ =gUnknown_2023D74 + ldr r3, _0802A3C4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25592,10 +25592,10 @@ _0802A3A8: .4byte gUnknown_2023D4E _0802A3AC: .4byte gBattleMons _0802A3B0: .4byte gBattlerAttacker _0802A3B4: .4byte gUnknown_2023D48 -_0802A3B8: .4byte gUnknown_2023DD0 +_0802A3B8: .4byte gHitMarker _0802A3BC: .4byte 0xfffffbff _0802A3C0: .4byte gBattlerTarget -_0802A3C4: .4byte gUnknown_2023D74 +_0802A3C4: .4byte gBattlescriptCurrInstr thumb_func_end atkA9_trychoosesleeptalkmove thumb_func_start atkAA_setdestinybond @@ -25612,7 +25612,7 @@ atkAA_setdestinybond: @ 802A3C8 lsls r1, 18 orrs r0, r1 str r0, [r2] - ldr r1, _0802A3F4 @ =gUnknown_2023D74 + ldr r1, _0802A3F4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -25620,7 +25620,7 @@ atkAA_setdestinybond: @ 802A3C8 .align 2, 0 _0802A3EC: .4byte gBattleMons _0802A3F0: .4byte gBattlerAttacker -_0802A3F4: .4byte gUnknown_2023D74 +_0802A3F4: .4byte gBattlescriptCurrInstr thumb_func_end atkAA_setdestinybond thumb_func_start TrySetDestinyBondToHappen @@ -25650,7 +25650,7 @@ TrySetDestinyBondToHappen: @ 802A3F8 beq _0802A442 cmp r5, r3 beq _0802A442 - ldr r2, _0802A454 @ =gUnknown_2023DD0 + ldr r2, _0802A454 @ =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 17 @@ -25668,21 +25668,21 @@ _0802A442: _0802A448: .4byte gBattlerAttacker _0802A44C: .4byte gBattlerTarget _0802A450: .4byte gBattleMons -_0802A454: .4byte gUnknown_2023DD0 +_0802A454: .4byte gHitMarker thumb_func_end TrySetDestinyBondToHappen thumb_func_start atkAB_trysetdestinybondtohappen atkAB_trysetdestinybondtohappen: @ 802A458 push {lr} bl TrySetDestinyBondToHappen - ldr r1, _0802A46C @ =gUnknown_2023D74 + ldr r1, _0802A46C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0802A46C: .4byte gUnknown_2023D74 +_0802A46C: .4byte gBattlescriptCurrInstr thumb_func_end atkAB_trysetdestinybondtohappen thumb_func_start atkAC_remaininghptopower @@ -25723,7 +25723,7 @@ _0802A4AA: adds r0, r1 ldrb r0, [r0] strh r0, [r2] - ldr r1, _0802A4D4 @ =gUnknown_2023D74 + ldr r1, _0802A4D4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -25734,7 +25734,7 @@ _0802A4C4: .4byte gBattleMons _0802A4C8: .4byte gBattlerAttacker _0802A4CC: .4byte gUnknown_8250810 _0802A4D0: .4byte gDynamicBasePower -_0802A4D4: .4byte gUnknown_2023D74 +_0802A4D4: .4byte gBattlescriptCurrInstr thumb_func_end atkAC_remaininghptopower thumb_func_start atkAD_tryspiteppreduce @@ -25913,9 +25913,9 @@ _0802A57C: movs r3, 0x1 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0802A630: - ldr r1, _0802A67C @ =gUnknown_2023D74 + ldr r1, _0802A67C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -25943,9 +25943,9 @@ _0802A66C: .4byte gBattleTextBuff2 _0802A670: .4byte gActiveBattler _0802A674: .4byte gDisableStructs _0802A678: .4byte gBitTable -_0802A67C: .4byte gUnknown_2023D74 +_0802A67C: .4byte gBattlescriptCurrInstr _0802A680: - ldr r3, _0802A6AC @ =gUnknown_2023D74 + ldr r3, _0802A6AC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25968,7 +25968,7 @@ _0802A69A: pop {r0} bx r0 .align 2, 0 -_0802A6AC: .4byte gUnknown_2023D74 +_0802A6AC: .4byte gBattlescriptCurrInstr thumb_func_end atkAD_tryspiteppreduce thumb_func_start atkAE_healpartystatus @@ -25988,7 +25988,7 @@ atkAE_healpartystatus: @ 802A6B0 beq _0802A6CC b _0802A8B6 _0802A6CC: - ldr r6, _0802A724 @ =gUnknown_2023E82 + ldr r6, _0802A724 @ =gBattleCommunication mov r0, r8 strb r0, [r6, 0x5] ldr r5, _0802A728 @ =gBattlerAttacker @@ -26031,7 +26031,7 @@ _0802A6E8: b _0802A74C .align 2, 0 _0802A720: .4byte gCurrentMove -_0802A724: .4byte gUnknown_2023E82 +_0802A724: .4byte gBattleCommunication _0802A728: .4byte gBattlerAttacker _0802A72C: .4byte gEnemyParty _0802A730: .4byte gPlayerParty @@ -26114,7 +26114,7 @@ _0802A7E0: ldrb r1, [r1] adds r0, r3, 0 bl sub_80C71D0 - ldr r1, _0802A838 @ =gUnknown_2023E82 + ldr r1, _0802A838 @ =gBattleCommunication ldrb r0, [r1, 0x5] mov r2, r9 orrs r0, r2 @@ -26155,7 +26155,7 @@ _0802A7F6: muls r0, r1 b _0802A878 .align 2, 0 -_0802A838: .4byte gUnknown_2023E82 +_0802A838: .4byte gBattleCommunication _0802A83C: .4byte gBattleMons _0802A840: .4byte gBattlerPartyIndexes _0802A844: .4byte gBattlerAttacker @@ -26216,7 +26216,7 @@ _0802A8AE: ble _0802A7F6 b _0802A934 _0802A8B6: - ldr r1, _0802A970 @ =gUnknown_2023E82 + ldr r1, _0802A970 @ =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] movs r2, 0x3F @@ -26292,9 +26292,9 @@ _0802A934: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0802A956: - ldr r1, _0802A990 @ =gUnknown_2023D74 + ldr r1, _0802A990 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26307,7 +26307,7 @@ _0802A956: pop {r0} bx r0 .align 2, 0 -_0802A970: .4byte gUnknown_2023E82 +_0802A970: .4byte gBattleCommunication _0802A974: .4byte gBattleMons _0802A978: .4byte gBattlerAttacker _0802A97C: .4byte 0xf7ffffff @@ -26315,7 +26315,7 @@ _0802A980: .4byte gActiveBattler _0802A984: .4byte gBattleTypeFlags _0802A988: .4byte gAbsentBattlerFlags _0802A98C: .4byte gBitTable -_0802A990: .4byte gUnknown_2023D74 +_0802A990: .4byte gBattlescriptCurrInstr thumb_func_end atkAE_healpartystatus thumb_func_start atkAF_cursetarget @@ -26337,7 +26337,7 @@ atkAF_cursetarget: @ 802A994 ands r0, r3 cmp r0, 0 beq _0802A9E0 - ldr r3, _0802A9DC @ =gUnknown_2023D74 + ldr r3, _0802A9DC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -26354,7 +26354,7 @@ atkAF_cursetarget: @ 802A994 .align 2, 0 _0802A9D4: .4byte gBattleMons _0802A9D8: .4byte gBattlerTarget -_0802A9DC: .4byte gUnknown_2023D74 +_0802A9DC: .4byte gBattlescriptCurrInstr _0802A9E0: orrs r2, r3 str r2, [r1] @@ -26371,7 +26371,7 @@ _0802A9E0: movs r0, 0x1 str r0, [r1] _0802A9FC: - ldr r1, _0802AA14 @ =gUnknown_2023D74 + ldr r1, _0802AA14 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -26382,7 +26382,7 @@ _0802AA04: .align 2, 0 _0802AA0C: .4byte gBattleMoveDamage _0802AA10: .4byte gBattlerAttacker -_0802AA14: .4byte gUnknown_2023D74 +_0802AA14: .4byte gBattlescriptCurrInstr thumb_func_end atkAF_cursetarget thumb_func_start atkB0_trysetspikes @@ -26403,7 +26403,7 @@ atkB0_trysetspikes: @ 802AA18 ldrb r0, [r3, 0xA] cmp r0, 0x3 bne _0802AA7C - ldr r2, _0802AA74 @ =gUnknown_2023ECC + ldr r2, _0802AA74 @ =gSpecialStatuses ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -26413,7 +26413,7 @@ atkB0_trysetspikes: @ 802AA18 movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, _0802AA78 @ =gUnknown_2023D74 + ldr r3, _0802AA78 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -26430,10 +26430,10 @@ atkB0_trysetspikes: @ 802AA18 .align 2, 0 _0802AA6C: .4byte gBattlerAttacker _0802AA70: .4byte gSideTimers -_0802AA74: .4byte gUnknown_2023ECC -_0802AA78: .4byte gUnknown_2023D74 +_0802AA74: .4byte gSpecialStatuses +_0802AA78: .4byte gBattlescriptCurrInstr _0802AA7C: - ldr r1, _0802AA9C @ =gSideAffecting + ldr r1, _0802AA9C @ =gSideStatuses adds r1, r2, r1 ldrh r2, [r1] movs r0, 0x10 @@ -26442,7 +26442,7 @@ _0802AA7C: ldrb r0, [r3, 0xA] adds r0, 0x1 strb r0, [r3, 0xA] - ldr r1, _0802AAA0 @ =gUnknown_2023D74 + ldr r1, _0802AAA0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -26451,8 +26451,8 @@ _0802AA96: pop {r0} bx r0 .align 2, 0 -_0802AA9C: .4byte gSideAffecting -_0802AAA0: .4byte gUnknown_2023D74 +_0802AA9C: .4byte gSideStatuses +_0802AAA0: .4byte gBattlescriptCurrInstr thumb_func_end atkB0_trysetspikes thumb_func_start atkB1_setforesight @@ -26469,7 +26469,7 @@ atkB1_setforesight: @ 802AAA4 lsls r1, 22 orrs r0, r1 str r0, [r2] - ldr r1, _0802AAD0 @ =gUnknown_2023D74 + ldr r1, _0802AAD0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26477,7 +26477,7 @@ atkB1_setforesight: @ 802AAA4 .align 2, 0 _0802AAC8: .4byte gBattleMons _0802AACC: .4byte gBattlerTarget -_0802AAD0: .4byte gUnknown_2023D74 +_0802AAD0: .4byte gBattlescriptCurrInstr thumb_func_end atkB1_setforesight thumb_func_start atkB2_trysetperishsong @@ -26544,7 +26544,7 @@ _0802AB40: ldrb r0, [r0] cmp r6, r0 bne _0802AB74 - ldr r3, _0802AB70 @ =gUnknown_2023D74 + ldr r3, _0802AB70 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -26560,9 +26560,9 @@ _0802AB40: b _0802AB7C .align 2, 0 _0802AB6C: .4byte gBattlersCount -_0802AB70: .4byte gUnknown_2023D74 +_0802AB70: .4byte gBattlescriptCurrInstr _0802AB74: - ldr r1, _0802AB88 @ =gUnknown_2023D74 + ldr r1, _0802AB88 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -26574,7 +26574,7 @@ _0802AB7C: pop {r0} bx r0 .align 2, 0 -_0802AB88: .4byte gUnknown_2023D74 +_0802AB88: .4byte gBattlescriptCurrInstr thumb_func_end atkB2_trysetperishsong thumb_func_start atkB3_rolloutdamagecalculation @@ -26592,14 +26592,14 @@ atkB3_rolloutdamagecalculation: @ 802AB8C ldr r0, _0802ABB4 @ =gBattlerAttacker ldrb r0, [r0] bl CancelMultiTurnMoves - ldr r1, _0802ABB8 @ =gUnknown_2023D74 + ldr r1, _0802ABB8 @ =gBattlescriptCurrInstr ldr r0, _0802ABBC @ =gUnknown_81D6960 str r0, [r1] b _0802ACD8 .align 2, 0 _0802ABB0: .4byte gMoveResultFlags _0802ABB4: .4byte gBattlerAttacker -_0802ABB8: .4byte gUnknown_2023D74 +_0802ABB8: .4byte gBattlescriptCurrInstr _0802ABBC: .4byte gUnknown_81D6960 _0802ABC0: ldr r2, _0802ACE4 @ =gBattleMons @@ -26709,7 +26709,7 @@ _0802AC66: lsrs r0, 28 movs r1, 0x5 subs r1, r0 - ldr r7, _0802AD04 @ =gUnknown_2023D74 + ldr r7, _0802AD04 @ =gBattlescriptCurrInstr adds r5, r3, 0 cmp r2, r1 bge _0802ACB4 @@ -26763,7 +26763,7 @@ _0802ACF4: .4byte gUnknown_2023DB8 _0802ACF8: .4byte 0xffffefff _0802ACFC: .4byte gDynamicBasePower _0802AD00: .4byte gBattleMoves -_0802AD04: .4byte gUnknown_2023D74 +_0802AD04: .4byte gBattlescriptCurrInstr thumb_func_end atkB3_rolloutdamagecalculation thumb_func_start atkB4_jumpifconfusedandstatmaxed @@ -26781,7 +26781,7 @@ atkB4_jumpifconfusedandstatmaxed: @ 802AD08 ldr r0, [r0] movs r1, 0x7 ands r0, r1 - ldr r4, _0802AD60 @ =gUnknown_2023D74 + ldr r4, _0802AD60 @ =gBattlescriptCurrInstr cmp r0, 0 beq _0802AD64 ldr r2, [r4] @@ -26810,7 +26810,7 @@ atkB4_jumpifconfusedandstatmaxed: @ 802AD08 .align 2, 0 _0802AD58: .4byte gBattleMons _0802AD5C: .4byte gBattlerTarget -_0802AD60: .4byte gUnknown_2023D74 +_0802AD60: .4byte gBattlescriptCurrInstr _0802AD64: ldr r0, [r4] adds r0, 0x6 @@ -26839,7 +26839,7 @@ atkB5_furycuttercalc: @ 802AD70 adds r0, r2 movs r1, 0 strb r1, [r0, 0x10] - ldr r1, _0802ADA4 @ =gUnknown_2023D74 + ldr r1, _0802ADA4 @ =gBattlescriptCurrInstr ldr r0, _0802ADA8 @ =gUnknown_81D6960 str r0, [r1] b _0802AE04 @@ -26847,7 +26847,7 @@ atkB5_furycuttercalc: @ 802AD70 _0802AD98: .4byte gMoveResultFlags _0802AD9C: .4byte gDisableStructs _0802ADA0: .4byte gBattlerAttacker -_0802ADA4: .4byte gUnknown_2023D74 +_0802ADA4: .4byte gBattlescriptCurrInstr _0802ADA8: .4byte gUnknown_81D6960 _0802ADAC: ldr r5, _0802AE0C @ =gDisableStructs @@ -26879,7 +26879,7 @@ _0802ADC4: subs r0, r1 lsls r0, 2 adds r0, r5 - ldr r4, _0802AE20 @ =gUnknown_2023D74 + ldr r4, _0802AE20 @ =gBattlescriptCurrInstr ldrb r1, [r0, 0x10] cmp r2, r1 bge _0802ADFE @@ -26907,7 +26907,7 @@ _0802AE10: .4byte gBattlerAttacker _0802AE14: .4byte gDynamicBasePower _0802AE18: .4byte gBattleMoves _0802AE1C: .4byte gCurrentMove -_0802AE20: .4byte gUnknown_2023D74 +_0802AE20: .4byte gBattlescriptCurrInstr thumb_func_end atkB5_furycuttercalc thumb_func_start atkB6_happinesstodamagecalculation @@ -26958,7 +26958,7 @@ _0802AE7A: movs r1, 0x19 bl __divsi3 strh r0, [r4] - ldr r1, _0802AEA4 @ =gUnknown_2023D74 + ldr r1, _0802AEA4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26969,7 +26969,7 @@ _0802AE7A: _0802AE98: .4byte gDynamicBasePower _0802AE9C: .4byte gBattleMons _0802AEA0: .4byte gBattlerAttacker -_0802AEA4: .4byte gUnknown_2023D74 +_0802AEA4: .4byte gBattlescriptCurrInstr thumb_func_end atkB6_happinesstodamagecalculation thumb_func_start atkB7_presentdamagecalculation @@ -27026,14 +27026,14 @@ _0802AF00: _0802AF06: cmp r4, 0xCB bgt _0802AF24 - ldr r1, _0802AF1C @ =gUnknown_2023D74 + ldr r1, _0802AF1C @ =gBattlescriptCurrInstr ldr r0, _0802AF20 @ =gUnknown_81D6930 b _0802AF5E .align 2, 0 _0802AF10: .4byte gBattleMoveDamage _0802AF14: .4byte gBattleMons _0802AF18: .4byte gBattlerTarget -_0802AF1C: .4byte gUnknown_2023D74 +_0802AF1C: .4byte gBattlescriptCurrInstr _0802AF20: .4byte gUnknown_81D6930 _0802AF24: ldr r2, _0802AF40 @ =gBattleMons @@ -27046,13 +27046,13 @@ _0802AF24: ldrh r0, [r0, 0x28] cmp r1, r0 bne _0802AF50 - ldr r1, _0802AF48 @ =gUnknown_2023D74 + ldr r1, _0802AF48 @ =gBattlescriptCurrInstr ldr r0, _0802AF4C @ =gUnknown_81D7DD1 b _0802AF5E .align 2, 0 _0802AF40: .4byte gBattleMons _0802AF44: .4byte gBattlerTarget -_0802AF48: .4byte gUnknown_2023D74 +_0802AF48: .4byte gBattlescriptCurrInstr _0802AF4C: .4byte gUnknown_81D7DD1 _0802AF50: ldr r2, _0802AF68 @ =gMoveResultFlags @@ -27060,7 +27060,7 @@ _0802AF50: movs r0, 0xF7 ands r0, r1 strb r0, [r2] - ldr r1, _0802AF6C @ =gUnknown_2023D74 + ldr r1, _0802AF6C @ =gBattlescriptCurrInstr ldr r0, _0802AF70 @ =gUnknown_81D7DB7 _0802AF5E: str r0, [r1] @@ -27069,7 +27069,7 @@ _0802AF5E: bx r0 .align 2, 0 _0802AF68: .4byte gMoveResultFlags -_0802AF6C: .4byte gUnknown_2023D74 +_0802AF6C: .4byte gBattlescriptCurrInstr _0802AF70: .4byte gUnknown_81D7DB7 thumb_func_end atkB7_presentdamagecalculation @@ -27079,7 +27079,7 @@ atkB8_setsafeguard: @ 802AF74 ldr r7, _0802AFA8 @ =gBattlerAttacker ldrb r0, [r7] bl GetBattlerPosition - ldr r4, _0802AFAC @ =gSideAffecting + ldr r4, _0802AFAC @ =gSideStatuses movs r6, 0x1 adds r1, r6, 0 ands r1, r0 @@ -27095,15 +27095,15 @@ atkB8_setsafeguard: @ 802AF74 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _0802AFB4 @ =gUnknown_2023E82 + ldr r1, _0802AFB4 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] b _0802B000 .align 2, 0 _0802AFA8: .4byte gBattlerAttacker -_0802AFAC: .4byte gSideAffecting +_0802AFAC: .4byte gSideStatuses _0802AFB0: .4byte gMoveResultFlags -_0802AFB4: .4byte gUnknown_2023E82 +_0802AFB4: .4byte gBattleCommunication _0802AFB8: ldrb r0, [r7] bl GetBattlerPosition @@ -27136,10 +27136,10 @@ _0802AFB8: adds r0, r5 ldrb r1, [r7] strb r1, [r0, 0x7] - ldr r0, _0802B014 @ =gUnknown_2023E82 + ldr r0, _0802B014 @ =gBattleCommunication strb r4, [r0, 0x5] _0802B000: - ldr r1, _0802B018 @ =gUnknown_2023D74 + ldr r1, _0802B018 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -27148,8 +27148,8 @@ _0802B000: bx r0 .align 2, 0 _0802B010: .4byte gSideTimers -_0802B014: .4byte gUnknown_2023E82 -_0802B018: .4byte gUnknown_2023D74 +_0802B014: .4byte gBattleCommunication +_0802B018: .4byte gBattlescriptCurrInstr thumb_func_end atkB8_setsafeguard thumb_func_start atkB9_magnitudedamagecalculation @@ -27246,7 +27246,7 @@ _0802B0B4: ldr r0, _0802B12C @ =gBattlersCount ldrb r3, [r0] adds r6, r1, 0 - ldr r0, _0802B130 @ =gUnknown_2023D74 + ldr r0, _0802B130 @ =gBattlescriptCurrInstr mov r8, r0 cmp r2, r3 bcs _0802B10C @@ -27290,7 +27290,7 @@ _0802B120: .4byte gDynamicBasePower _0802B124: .4byte gBattleTextBuff1 _0802B128: .4byte gBattlerTarget _0802B12C: .4byte gBattlersCount -_0802B130: .4byte gUnknown_2023D74 +_0802B130: .4byte gBattlescriptCurrInstr _0802B134: .4byte gBattlerAttacker _0802B138: .4byte gBitTable _0802B13C: .4byte gAbsentBattlerFlags @@ -27396,12 +27396,12 @@ _0802B1A2: mov r10, r7 ldr r2, _0802B28C @ =gUnknown_2023D49 mov r9, r2 - ldr r7, _0802B290 @ =gUnknown_2023DD0 + ldr r7, _0802B290 @ =gHitMarker mov r12, r7 ldrb r2, [r0] cmp r1, r2 bge _0802B22E - ldr r6, _0802B294 @ =gUnknown_2023BDE + ldr r6, _0802B294 @ =gBattlerByTurnOrder ldr r5, _0802B264 @ =gBattlerTarget ldr r4, _0802B298 @ =gUnknown_2023BDA movs r3, 0xB @@ -27434,7 +27434,7 @@ _0802B22E: strb r0, [r1] mov r2, r10 strb r0, [r2] - ldr r7, _0802B29C @ =gUnknown_2023D74 + ldr r7, _0802B29C @ =gBattlescriptCurrInstr ldr r0, [r7] adds r0, 0x5 str r0, [r7] @@ -27459,14 +27459,14 @@ _0802B280: .4byte gBattlersCount _0802B284: .4byte gCurrentMove _0802B288: .4byte gUnknown_2023D48 _0802B28C: .4byte gUnknown_2023D49 -_0802B290: .4byte gUnknown_2023DD0 -_0802B294: .4byte gUnknown_2023BDE +_0802B290: .4byte gHitMarker +_0802B294: .4byte gBattlerByTurnOrder _0802B298: .4byte gUnknown_2023BDA -_0802B29C: .4byte gUnknown_2023D74 +_0802B29C: .4byte gBattlescriptCurrInstr _0802B2A0: .4byte gBattleScripting _0802B2A4: .4byte 0xfffffbff _0802B2A8: - ldr r3, _0802B2D0 @ =gUnknown_2023D74 + ldr r3, _0802B2D0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27488,7 +27488,7 @@ _0802B2C2: pop {r0} bx r0 .align 2, 0 -_0802B2D0: .4byte gUnknown_2023D74 +_0802B2D0: .4byte gBattlescriptCurrInstr thumb_func_end atkBA_jumpifnopursuitswitchdmg thumb_func_start atkBB_setsunny @@ -27505,35 +27505,35 @@ atkBB_setsunny: @ 802B2D4 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _0802B2FC @ =gUnknown_2023E82 + ldr r1, _0802B2FC @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _0802B312 .align 2, 0 _0802B2F4: .4byte gBattleWeather _0802B2F8: .4byte gMoveResultFlags -_0802B2FC: .4byte gUnknown_2023E82 +_0802B2FC: .4byte gBattleCommunication _0802B300: movs r0, 0x20 strh r0, [r2] - ldr r1, _0802B320 @ =gUnknown_2023E82 + ldr r1, _0802B320 @ =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] - ldr r0, _0802B324 @ =gUnknown_2023F20 + ldr r0, _0802B324 @ =gWishFutureKnock adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _0802B312: - ldr r1, _0802B328 @ =gUnknown_2023D74 + ldr r1, _0802B328 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0802B320: .4byte gUnknown_2023E82 -_0802B324: .4byte gUnknown_2023F20 -_0802B328: .4byte gUnknown_2023D74 +_0802B320: .4byte gBattleCommunication +_0802B324: .4byte gWishFutureKnock +_0802B328: .4byte gBattlescriptCurrInstr thumb_func_end atkBB_setsunny thumb_func_start atkBC_maxattackhalvehp @@ -27572,7 +27572,7 @@ _0802B344: movs r0, 0x1 str r0, [r1] _0802B36C: - ldr r1, _0802B384 @ =gUnknown_2023D74 + ldr r1, _0802B384 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -27581,9 +27581,9 @@ _0802B36C: _0802B378: .4byte gBattleMons _0802B37C: .4byte gBattlerAttacker _0802B380: .4byte gBattleMoveDamage -_0802B384: .4byte gUnknown_2023D74 +_0802B384: .4byte gBattlescriptCurrInstr _0802B388: - ldr r3, _0802B3A8 @ =gUnknown_2023D74 + ldr r3, _0802B3A8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27601,14 +27601,14 @@ _0802B3A2: pop {r0} bx r0 .align 2, 0 -_0802B3A8: .4byte gUnknown_2023D74 +_0802B3A8: .4byte gBattlescriptCurrInstr thumb_func_end atkBC_maxattackhalvehp thumb_func_start atkBD_copyfoestats atkBD_copyfoestats: @ 802B3AC push {r4-r7,lr} movs r2, 0 - ldr r7, _0802B3E4 @ =gUnknown_2023D74 + ldr r7, _0802B3E4 @ =gBattlescriptCurrInstr ldr r6, _0802B3E8 @ =gBattlerAttacker movs r4, 0x58 ldr r3, _0802B3EC @ =gUnknown_2023BFC @@ -27635,7 +27635,7 @@ _0802B3BA: pop {r0} bx r0 .align 2, 0 -_0802B3E4: .4byte gUnknown_2023D74 +_0802B3E4: .4byte gBattlescriptCurrInstr _0802B3E8: .4byte gBattlerAttacker _0802B3EC: .4byte gUnknown_2023BFC _0802B3F0: .4byte gBattlerTarget @@ -27695,7 +27695,7 @@ atkBE_rapidspinfree: @ 802B3F4 movs r0, 0xFF strb r0, [r1, 0x4] bl BattleScriptPushCursor - ldr r1, _0802B480 @ =gUnknown_2023D74 + ldr r1, _0802B480 @ =gBattlescriptCurrInstr ldr r0, _0802B484 @ =gUnknown_81D8DF3 b _0802B532 .align 2, 0 @@ -27706,7 +27706,7 @@ _0802B470: .4byte gBattlerTarget _0802B474: .4byte 0xffff1fff _0802B478: .4byte gBattleStruct _0802B47C: .4byte gBattleTextBuff1 -_0802B480: .4byte gUnknown_2023D74 +_0802B480: .4byte gBattlescriptCurrInstr _0802B484: .4byte gUnknown_81D8DF3 _0802B488: ldr r4, _0802B4BC @ =gStatuses3 @@ -27730,17 +27730,17 @@ _0802B488: ands r0, r2 str r0, [r1] bl BattleScriptPushCursor - ldr r1, _0802B4C0 @ =gUnknown_2023D74 + ldr r1, _0802B4C0 @ =gBattlescriptCurrInstr ldr r0, _0802B4C4 @ =gUnknown_81D8E04 b _0802B532 .align 2, 0 _0802B4BC: .4byte gStatuses3 -_0802B4C0: .4byte gUnknown_2023D74 +_0802B4C0: .4byte gBattlescriptCurrInstr _0802B4C4: .4byte gUnknown_81D8E04 _0802B4C8: adds r0, r2, 0 bl GetBattlerSide - ldr r4, _0802B518 @ =gSideAffecting + ldr r4, _0802B518 @ =gSideStatuses lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -27770,17 +27770,17 @@ _0802B4C8: adds r1, r2 strb r4, [r1, 0xA] bl BattleScriptPushCursor - ldr r1, _0802B524 @ =gUnknown_2023D74 + ldr r1, _0802B524 @ =gBattlescriptCurrInstr ldr r0, _0802B528 @ =gUnknown_81D8E0B b _0802B532 .align 2, 0 -_0802B518: .4byte gSideAffecting +_0802B518: .4byte gSideStatuses _0802B51C: .4byte 0x0000ffef _0802B520: .4byte gSideTimers -_0802B524: .4byte gUnknown_2023D74 +_0802B524: .4byte gBattlescriptCurrInstr _0802B528: .4byte gUnknown_81D8E0B _0802B52C: - ldr r1, _0802B53C @ =gUnknown_2023D74 + ldr r1, _0802B53C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 _0802B532: @@ -27789,7 +27789,7 @@ _0802B532: pop {r0} bx r0 .align 2, 0 -_0802B53C: .4byte gUnknown_2023D74 +_0802B53C: .4byte gBattlescriptCurrInstr thumb_func_end atkBE_rapidspinfree thumb_func_start atkBF_setdefensecurlbit @@ -27806,7 +27806,7 @@ atkBF_setdefensecurlbit: @ 802B540 lsls r1, 23 orrs r0, r1 str r0, [r2] - ldr r1, _0802B56C @ =gUnknown_2023D74 + ldr r1, _0802B56C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -27814,7 +27814,7 @@ atkBF_setdefensecurlbit: @ 802B540 .align 2, 0 _0802B564: .4byte gBattleMons _0802B568: .4byte gBattlerAttacker -_0802B56C: .4byte gUnknown_2023D74 +_0802B56C: .4byte gBattlescriptCurrInstr thumb_func_end atkBF_setdefensecurlbit thumb_func_start atkC0_recoverbasedonsunlight @@ -27917,16 +27917,16 @@ _0802B636: ldr r0, [r1] negs r0, r0 str r0, [r1] - ldr r1, _0802B64C @ =gUnknown_2023D74 + ldr r1, _0802B64C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802B66A .align 2, 0 _0802B648: .4byte gBattleMoveDamage -_0802B64C: .4byte gUnknown_2023D74 +_0802B64C: .4byte gBattlescriptCurrInstr _0802B650: - ldr r3, _0802B674 @ =gUnknown_2023D74 + ldr r3, _0802B674 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27945,7 +27945,7 @@ _0802B66A: pop {r0} bx r0 .align 2, 0 -_0802B674: .4byte gUnknown_2023D74 +_0802B674: .4byte gBattlescriptCurrInstr thumb_func_end atkC0_recoverbasedonsunlight thumb_func_start sub_802B678 @@ -28055,7 +28055,7 @@ _0802B742: movs r1, 0xC0 orrs r0, r1 strb r0, [r2, 0x13] - ldr r1, _0802B770 @ =gUnknown_2023D74 + ldr r1, _0802B770 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28070,7 +28070,7 @@ _0802B760: .4byte gBattleMons _0802B764: .4byte gBattlerAttacker _0802B768: .4byte gDynamicBasePower _0802B76C: .4byte gBattleStruct -_0802B770: .4byte gUnknown_2023D74 +_0802B770: .4byte gBattlescriptCurrInstr thumb_func_end sub_802B678 thumb_func_start atkC2_selectfirstvalidtarget @@ -28084,7 +28084,7 @@ atkC2_selectfirstvalidtarget: @ 802B774 ldr r1, _0802B7D4 @ =gBattlersCount ldrb r1, [r1] adds r6, r0, 0 - ldr r0, _0802B7D8 @ =gUnknown_2023D74 + ldr r0, _0802B7D8 @ =gBattlescriptCurrInstr mov r8, r0 cmp r1, 0 beq _0802B7BE @@ -28127,7 +28127,7 @@ _0802B7BE: .align 2, 0 _0802B7D0: .4byte gBattlerTarget _0802B7D4: .4byte gBattlersCount -_0802B7D8: .4byte gUnknown_2023D74 +_0802B7D8: .4byte gBattlescriptCurrInstr _0802B7DC: .4byte gBattlerAttacker _0802B7E0: .4byte gBitTable _0802B7E4: .4byte gAbsentBattlerFlags @@ -28141,7 +28141,7 @@ atkC3_trysetfutureattack: @ 802B7E8 mov r5, r8 push {r5-r7} sub sp, 0x10 - ldr r0, _0802B820 @ =gUnknown_2023F20 + ldr r0, _0802B820 @ =gWishFutureKnock mov r8, r0 ldr r7, _0802B824 @ =gBattlerTarget ldrb r1, [r7] @@ -28149,7 +28149,7 @@ atkC3_trysetfutureattack: @ 802B7E8 ldrb r6, [r0] cmp r6, 0 beq _0802B82C - ldr r3, _0802B828 @ =gUnknown_2023D74 + ldr r3, _0802B828 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28164,9 +28164,9 @@ atkC3_trysetfutureattack: @ 802B7E8 str r1, [r3] b _0802B8F6 .align 2, 0 -_0802B820: .4byte gUnknown_2023F20 +_0802B820: .4byte gWishFutureKnock _0802B824: .4byte gBattlerTarget -_0802B828: .4byte gUnknown_2023D74 +_0802B828: .4byte gBattlescriptCurrInstr _0802B82C: lsls r1, 1 mov r0, r8 @@ -28187,7 +28187,7 @@ _0802B82C: add r0, r8 movs r1, 0x3 strb r1, [r0] - ldr r4, _0802B8D4 @ =gSideAffecting + ldr r4, _0802B8D4 @ =gSideStatuses ldrb r0, [r7] bl GetBattlerPosition movs r1, 0x1 @@ -28219,7 +28219,7 @@ _0802B82C: adds r2, 0x8 adds r1, r2 str r0, [r1] - ldr r1, _0802B8DC @ =gUnknown_2023E8C + ldr r1, _0802B8DC @ =gProtectStructs ldrb r0, [r5] lsls r0, 4 adds r0, r1 @@ -28242,24 +28242,24 @@ _0802B8BA: ldr r0, _0802B8E0 @ =0x00000161 cmp r1, r0 bne _0802B8E8 - ldr r0, _0802B8E4 @ =gUnknown_2023E82 + ldr r0, _0802B8E4 @ =gBattleCommunication mov r1, r10 strb r1, [r0, 0x5] b _0802B8EE .align 2, 0 _0802B8CC: .4byte gCurrentMove _0802B8D0: .4byte gBattlerAttacker -_0802B8D4: .4byte gSideAffecting +_0802B8D4: .4byte gSideStatuses _0802B8D8: .4byte gBattleMons -_0802B8DC: .4byte gUnknown_2023E8C +_0802B8DC: .4byte gProtectStructs _0802B8E0: .4byte 0x00000161 -_0802B8E4: .4byte gUnknown_2023E82 +_0802B8E4: .4byte gBattleCommunication _0802B8E8: - ldr r1, _0802B908 @ =gUnknown_2023E82 + ldr r1, _0802B908 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] _0802B8EE: - ldr r1, _0802B90C @ =gUnknown_2023D74 + ldr r1, _0802B90C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28273,8 +28273,8 @@ _0802B8F6: pop {r0} bx r0 .align 2, 0 -_0802B908: .4byte gUnknown_2023E82 -_0802B90C: .4byte gUnknown_2023D74 +_0802B908: .4byte gBattleCommunication +_0802B90C: .4byte gBattlescriptCurrInstr thumb_func_end atkC3_trysetfutureattack thumb_func_start atkC4_trydobeatup @@ -28301,7 +28301,7 @@ _0802B92A: ldrh r0, [r0, 0x28] cmp r0, 0 bne _0802B96C - ldr r3, _0802B968 @ =gUnknown_2023D74 + ldr r3, _0802B968 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28318,9 +28318,9 @@ _0802B958: .4byte gEnemyParty _0802B95C: .4byte gPlayerParty _0802B960: .4byte gBattleMons _0802B964: .4byte gBattlerTarget -_0802B968: .4byte gUnknown_2023D74 +_0802B968: .4byte gBattlescriptCurrInstr _0802B96C: - ldr r6, _0802BAA8 @ =gUnknown_2023E82 + ldr r6, _0802BAA8 @ =gBattleCommunication ldrb r0, [r6] mov r8, r0 cmp r0, 0x5 @@ -28370,7 +28370,7 @@ _0802B9C0: cmp r0, 0x5 bls _0802B97C _0802B9D0: - ldr r1, _0802BAA8 @ =gUnknown_2023E82 + ldr r1, _0802BAA8 @ =gBattleCommunication mov r9, r1 ldrb r2, [r1] cmp r2, 0x5 @@ -28386,7 +28386,7 @@ _0802B9D0: strb r2, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0802BAB4 @ =gUnknown_2023D74 + ldr r1, _0802BAB4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x9 str r0, [r1] @@ -28452,7 +28452,7 @@ _0802B9D0: adds r2, r0, 0x2 mov r0, r8 str r2, [r0] - ldr r1, _0802BAD0 @ =gUnknown_2023E8C + ldr r1, _0802BAD0 @ =gProtectStructs ldrb r0, [r6] lsls r0, 4 adds r0, r1 @@ -28473,22 +28473,22 @@ _0802BA9C: strb r0, [r2] b _0802BB0E .align 2, 0 -_0802BAA8: .4byte gUnknown_2023E82 +_0802BAA8: .4byte gBattleCommunication _0802BAAC: .4byte gBattleTextBuff1 _0802BAB0: .4byte gBattlerAttacker -_0802BAB4: .4byte gUnknown_2023D74 +_0802BAB4: .4byte gBattlescriptCurrInstr _0802BAB8: .4byte gBattleMoveDamage _0802BABC: .4byte gBaseStats _0802BAC0: .4byte gBattleMoves _0802BAC4: .4byte gCurrentMove _0802BAC8: .4byte gBattleMons _0802BACC: .4byte gBattlerTarget -_0802BAD0: .4byte gUnknown_2023E8C +_0802BAD0: .4byte gProtectStructs _0802BAD4: mov r0, r8 cmp r0, 0 beq _0802BAF4 - ldr r3, _0802BAF0 @ =gUnknown_2023D74 + ldr r3, _0802BAF0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28500,9 +28500,9 @@ _0802BAD4: ldrb r0, [r2, 0x4] b _0802BB08 .align 2, 0 -_0802BAF0: .4byte gUnknown_2023D74 +_0802BAF0: .4byte gBattlescriptCurrInstr _0802BAF4: - ldr r3, _0802BB1C @ =gUnknown_2023D74 + ldr r3, _0802BB1C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -28524,7 +28524,7 @@ _0802BB0E: pop {r0} bx r0 .align 2, 0 -_0802BB1C: .4byte gUnknown_2023D74 +_0802BB1C: .4byte gBattlescriptCurrInstr thumb_func_end atkC4_trydobeatup thumb_func_start atkC5_setsemiinvulnerablebit @@ -28586,7 +28586,7 @@ _0802BB88: orrs r0, r2 str r0, [r1] _0802BB8C: - ldr r1, _0802BBA0 @ =gUnknown_2023D74 + ldr r1, _0802BBA0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28595,7 +28595,7 @@ _0802BB8C: .align 2, 0 _0802BB98: .4byte gStatuses3 _0802BB9C: .4byte gBattlerAttacker -_0802BBA0: .4byte gUnknown_2023D74 +_0802BBA0: .4byte gBattlescriptCurrInstr thumb_func_end atkC5_setsemiinvulnerablebit thumb_func_start atkC6_clearsemiinvulnerablebit @@ -28658,7 +28658,7 @@ _0802BC12: ands r0, r2 str r0, [r1] _0802BC16: - ldr r1, _0802BC30 @ =gUnknown_2023D74 + ldr r1, _0802BC30 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28668,13 +28668,13 @@ _0802BC16: _0802BC24: .4byte gStatuses3 _0802BC28: .4byte gBattlerAttacker _0802BC2C: .4byte 0xfffbffff -_0802BC30: .4byte gUnknown_2023D74 +_0802BC30: .4byte gBattlescriptCurrInstr thumb_func_end atkC6_clearsemiinvulnerablebit thumb_func_start atkC7_setminimize atkC7_setminimize: @ 802BC34 push {lr} - ldr r0, _0802BC64 @ =gUnknown_2023DD0 + ldr r0, _0802BC64 @ =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 18 @@ -28692,17 +28692,17 @@ atkC7_setminimize: @ 802BC34 orrs r0, r2 str r0, [r1] _0802BC58: - ldr r1, _0802BC70 @ =gUnknown_2023D74 + ldr r1, _0802BC70 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0802BC64: .4byte gUnknown_2023DD0 +_0802BC64: .4byte gHitMarker _0802BC68: .4byte gStatuses3 _0802BC6C: .4byte gBattlerAttacker -_0802BC70: .4byte gUnknown_2023D74 +_0802BC70: .4byte gBattlescriptCurrInstr thumb_func_end atkC7_setminimize thumb_func_start atkC8_sethail @@ -28720,33 +28720,33 @@ atkC8_sethail: @ 802BC74 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _0802BCA0 @ =gUnknown_2023E82 + ldr r1, _0802BCA0 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _0802BCB2 .align 2, 0 _0802BC98: .4byte gBattleWeather _0802BC9C: .4byte gMoveResultFlags -_0802BCA0: .4byte gUnknown_2023E82 +_0802BCA0: .4byte gBattleCommunication _0802BCA4: strh r2, [r3] - ldr r0, _0802BCC0 @ =gUnknown_2023E82 + ldr r0, _0802BCC0 @ =gBattleCommunication movs r1, 0x5 strb r1, [r0, 0x5] - ldr r0, _0802BCC4 @ =gUnknown_2023F20 + ldr r0, _0802BCC4 @ =gWishFutureKnock adds r0, 0x28 strb r1, [r0] _0802BCB2: - ldr r1, _0802BCC8 @ =gUnknown_2023D74 + ldr r1, _0802BCC8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0802BCC0: .4byte gUnknown_2023E82 -_0802BCC4: .4byte gUnknown_2023F20 -_0802BCC8: .4byte gUnknown_2023D74 +_0802BCC0: .4byte gBattleCommunication +_0802BCC4: .4byte gWishFutureKnock +_0802BCC8: .4byte gBattlescriptCurrInstr thumb_func_end atkC8_sethail thumb_func_start atkC9_jumpifattackandspecialattackcannotfall @@ -28767,11 +28767,11 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 802BCCC ldrsb r0, [r1, r0] cmp r0, 0 bne _0802BD20 - ldr r0, _0802BD18 @ =gUnknown_2023E82 + ldr r0, _0802BD18 @ =gBattleCommunication ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _0802BD20 - ldr r3, _0802BD1C @ =gUnknown_2023D74 + ldr r3, _0802BD1C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28788,8 +28788,8 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 802BCCC .align 2, 0 _0802BD10: .4byte gBattleMons _0802BD14: .4byte gBattlerTarget -_0802BD18: .4byte gUnknown_2023E82 -_0802BD1C: .4byte gUnknown_2023D74 +_0802BD18: .4byte gBattleCommunication +_0802BD1C: .4byte gBattlescriptCurrInstr _0802BD20: ldr r4, _0802BD54 @ =gActiveBattler ldr r0, _0802BD58 @ =gBattlerAttacker @@ -28806,8 +28806,8 @@ _0802BD20: movs r0, 0 bl BtlController_EmitHealthBarUpdate ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r1, _0802BD64 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _0802BD64 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28820,7 +28820,7 @@ _0802BD54: .4byte gActiveBattler _0802BD58: .4byte gBattlerAttacker _0802BD5C: .4byte gBattleMoveDamage _0802BD60: .4byte 0x00007fff -_0802BD64: .4byte gUnknown_2023D74 +_0802BD64: .4byte gBattlescriptCurrInstr thumb_func_end atkC9_jumpifattackandspecialattackcannotfall thumb_func_start atkCA_setforcedtarget @@ -28848,7 +28848,7 @@ atkCA_setforcedtarget: @ 802BD68 adds r1, r5 ldrb r0, [r4] strb r0, [r1, 0x9] - ldr r1, _0802BDB0 @ =gUnknown_2023D74 + ldr r1, _0802BDB0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28858,7 +28858,7 @@ atkCA_setforcedtarget: @ 802BD68 .align 2, 0 _0802BDA8: .4byte gBattlerAttacker _0802BDAC: .4byte gSideTimers -_0802BDB0: .4byte gUnknown_2023D74 +_0802BDB0: .4byte gBattlescriptCurrInstr thumb_func_end atkCA_setforcedtarget thumb_func_start atkCB_setcharge @@ -28898,7 +28898,7 @@ atkCB_setcharge: @ 802BDB4 movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x12] - ldr r1, _0802BE14 @ =gUnknown_2023D74 + ldr r1, _0802BE14 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28909,13 +28909,13 @@ atkCB_setcharge: @ 802BDB4 _0802BE08: .4byte gStatuses3 _0802BE0C: .4byte gBattlerAttacker _0802BE10: .4byte gDisableStructs -_0802BE14: .4byte gUnknown_2023D74 +_0802BE14: .4byte gBattlescriptCurrInstr thumb_func_end atkCB_setcharge thumb_func_start atkCC_callterrainattack atkCC_callterrainattack: @ 802BE18 push {r4,lr} - ldr r2, _0802BE68 @ =gUnknown_2023DD0 + ldr r2, _0802BE68 @ =gHitMarker ldr r0, [r2] ldr r1, _0802BE6C @ =0xfffffbff ands r0, r1 @@ -28945,7 +28945,7 @@ atkCC_callterrainattack: @ 802BE18 adds r0, r3 ldr r0, [r0] bl BattleScriptPush - ldr r1, _0802BE88 @ =gUnknown_2023D74 + ldr r1, _0802BE88 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28953,7 +28953,7 @@ atkCC_callterrainattack: @ 802BE18 pop {r0} bx r0 .align 2, 0 -_0802BE68: .4byte gUnknown_2023DD0 +_0802BE68: .4byte gHitMarker _0802BE6C: .4byte 0xfffffbff _0802BE70: .4byte gCurrentMove _0802BE74: .4byte gUnknown_825081C @@ -28961,7 +28961,7 @@ _0802BE78: .4byte gUnknown_2022B50 _0802BE7C: .4byte gBattlerTarget _0802BE80: .4byte gUnknown_81D65A8 _0802BE84: .4byte gBattleMoves -_0802BE88: .4byte gUnknown_2023D74 +_0802BE88: .4byte gBattlescriptCurrInstr thumb_func_end atkCC_callterrainattack thumb_func_start atkCD_cureifburnedparalysedorpoisoned @@ -28983,7 +28983,7 @@ atkCD_cureifburnedparalysedorpoisoned: @ 802BE8C beq _0802BEE8 movs r0, 0 str r0, [r2] - ldr r1, _0802BEE0 @ =gUnknown_2023D74 + ldr r1, _0802BEE0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29000,15 +29000,15 @@ atkCD_cureifburnedparalysedorpoisoned: @ 802BE8C movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _0802BF02 .align 2, 0 _0802BED8: .4byte gBattleMons _0802BEDC: .4byte gBattlerAttacker -_0802BEE0: .4byte gUnknown_2023D74 +_0802BEE0: .4byte gBattlescriptCurrInstr _0802BEE4: .4byte gActiveBattler _0802BEE8: - ldr r3, _0802BF0C @ =gUnknown_2023D74 + ldr r3, _0802BF0C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29027,7 +29027,7 @@ _0802BF02: pop {r0} bx r0 .align 2, 0 -_0802BF0C: .4byte gUnknown_2023D74 +_0802BF0C: .4byte gBattlescriptCurrInstr thumb_func_end atkCD_cureifburnedparalysedorpoisoned thumb_func_start atkCE_settorment @@ -29045,7 +29045,7 @@ atkCE_settorment: @ 802BF10 lsls r2, 24 cmp r1, 0 bge _0802BF54 - ldr r3, _0802BF50 @ =gUnknown_2023D74 + ldr r3, _0802BF50 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29062,11 +29062,11 @@ atkCE_settorment: @ 802BF10 .align 2, 0 _0802BF48: .4byte gBattleMons _0802BF4C: .4byte gBattlerTarget -_0802BF50: .4byte gUnknown_2023D74 +_0802BF50: .4byte gBattlescriptCurrInstr _0802BF54: orrs r1, r2 str r1, [r0] - ldr r1, _0802BF64 @ =gUnknown_2023D74 + ldr r1, _0802BF64 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29074,13 +29074,13 @@ _0802BF60: pop {r0} bx r0 .align 2, 0 -_0802BF64: .4byte gUnknown_2023D74 +_0802BF64: .4byte gBattlescriptCurrInstr thumb_func_end atkCE_settorment thumb_func_start atkCF_jumpifnodamage atkCF_jumpifnodamage: @ 802BF68 push {lr} - ldr r2, _0802BF94 @ =gUnknown_2023E8C + ldr r2, _0802BF94 @ =gProtectStructs ldr r0, _0802BF98 @ =gBattlerAttacker ldrb r0, [r0] lsls r1, r0, 4 @@ -29096,17 +29096,17 @@ atkCF_jumpifnodamage: @ 802BF68 cmp r0, 0 beq _0802BFA0 _0802BF88: - ldr r1, _0802BF9C @ =gUnknown_2023D74 + ldr r1, _0802BF9C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802BFBA .align 2, 0 -_0802BF94: .4byte gUnknown_2023E8C +_0802BF94: .4byte gProtectStructs _0802BF98: .4byte gBattlerAttacker -_0802BF9C: .4byte gUnknown_2023D74 +_0802BF9C: .4byte gBattlescriptCurrInstr _0802BFA0: - ldr r3, _0802BFC0 @ =gUnknown_2023D74 + ldr r3, _0802BFC0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29123,7 +29123,7 @@ _0802BFBA: pop {r0} bx r0 .align 2, 0 -_0802BFC0: .4byte gUnknown_2023D74 +_0802BFC0: .4byte gBattlescriptCurrInstr thumb_func_end atkCF_jumpifnodamage thumb_func_start atkD0_settaunt @@ -29157,7 +29157,7 @@ atkD0_settaunt: @ 802BFC4 movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x13] - ldr r1, _0802C010 @ =gUnknown_2023D74 + ldr r1, _0802C010 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29165,9 +29165,9 @@ atkD0_settaunt: @ 802BFC4 .align 2, 0 _0802C008: .4byte gDisableStructs _0802C00C: .4byte gBattlerTarget -_0802C010: .4byte gUnknown_2023D74 +_0802C010: .4byte gBattlescriptCurrInstr _0802C014: - ldr r3, _0802C034 @ =gUnknown_2023D74 + ldr r3, _0802C034 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29185,7 +29185,7 @@ _0802C02E: pop {r0} bx r0 .align 2, 0 -_0802C034: .4byte gUnknown_2023D74 +_0802C034: .4byte gBattlescriptCurrInstr thumb_func_end atkD0_settaunt thumb_func_start atkD1_trysethelpinghand @@ -29217,7 +29217,7 @@ atkD1_trysethelpinghand: @ 802C038 ands r1, r0 cmp r1, 0 bne _0802C0BC - ldr r1, _0802C0B4 @ =gUnknown_2023E8C + ldr r1, _0802C0B4 @ =gProtectStructs ldrb r0, [r4] lsls r0, 4 adds r0, r1 @@ -29234,7 +29234,7 @@ atkD1_trysethelpinghand: @ 802C038 movs r0, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, _0802C0B8 @ =gUnknown_2023D74 + ldr r1, _0802C0B8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29245,10 +29245,10 @@ _0802C0A4: .4byte gBattlerTarget _0802C0A8: .4byte gBattleTypeFlags _0802C0AC: .4byte gAbsentBattlerFlags _0802C0B0: .4byte gBitTable -_0802C0B4: .4byte gUnknown_2023E8C -_0802C0B8: .4byte gUnknown_2023D74 +_0802C0B4: .4byte gProtectStructs +_0802C0B8: .4byte gBattlescriptCurrInstr _0802C0BC: - ldr r3, _0802C0DC @ =gUnknown_2023D74 + ldr r3, _0802C0DC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29266,7 +29266,7 @@ _0802C0D6: pop {r0} bx r0 .align 2, 0 -_0802C0DC: .4byte gUnknown_2023D74 +_0802C0DC: .4byte gBattlescriptCurrInstr thumb_func_end atkD1_trysethelpinghand thumb_func_start sub_802C0E0 @@ -29325,7 +29325,7 @@ _0802C120: lsls r0, 3 cmp r1, r0 beq _0802C18A - ldr r0, _0802C210 @ =gUnknown_2023F20 + ldr r0, _0802C210 @ =gWishFutureKnock adds r2, r0, 0 adds r2, 0x29 adds r0, r4, r2 @@ -29399,7 +29399,7 @@ _0802C1B2: cmp r0, 0xB bhi _0802C224 _0802C1DE: - ldr r3, _0802C220 @ =gUnknown_2023D74 + ldr r3, _0802C220 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29419,18 +29419,18 @@ _0802C200: .4byte gBattlerAttacker _0802C204: .4byte 0x00000902 _0802C208: .4byte gTrainerBattleOpponent_A _0802C20C: .4byte gBattlerTarget -_0802C210: .4byte gUnknown_2023F20 +_0802C210: .4byte gWishFutureKnock _0802C214: .4byte gBitTable _0802C218: .4byte gBattlerPartyIndexes _0802C21C: .4byte gBattleMons -_0802C220: .4byte gUnknown_2023D74 +_0802C220: .4byte gBattlescriptCurrInstr _0802C224: adds r0, r1, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x3C bne _0802C258 - ldr r1, _0802C24C @ =gUnknown_2023D74 + ldr r1, _0802C24C @ =gBattlescriptCurrInstr ldr r0, _0802C250 @ =gUnknown_81D948E str r0, [r1] ldr r1, _0802C254 @ =gLastUsedAbility @@ -29445,7 +29445,7 @@ _0802C224: bl sub_80C71D0 b _0802C37A .align 2, 0 -_0802C24C: .4byte gUnknown_2023D74 +_0802C24C: .4byte gBattlescriptCurrInstr _0802C250: .4byte gUnknown_81D948E _0802C254: .4byte gLastUsedAbility _0802C258: @@ -29482,7 +29482,7 @@ _0802C258: bl BtlController_EmitSetMonData ldr r1, _0802C348 @ =gBattlerAttacker ldrb r0, [r1] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldrb r0, [r7] strb r0, [r4] ldrb r0, [r7] @@ -29497,7 +29497,7 @@ _0802C258: movs r3, 0x2 bl BtlController_EmitSetMonData ldrb r0, [r7] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldrb r0, [r7] mov r2, r10 ldr r1, [r2] @@ -29528,7 +29528,7 @@ _0802C258: adds r0, 0xC9 movs r1, 0 strb r1, [r0] - ldr r1, _0802C350 @ =gUnknown_2023D74 + ldr r1, _0802C350 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29560,29 +29560,29 @@ _0802C258: ldrh r0, [r6] cmp r0, 0 beq _0802C374 - ldr r1, _0802C35C @ =gUnknown_2023E82 + ldr r1, _0802C35C @ =gBattleCommunication movs r0, 0x2 b _0802C378 .align 2, 0 _0802C344: .4byte gBattleStruct _0802C348: .4byte gBattlerAttacker _0802C34C: .4byte gActiveBattler -_0802C350: .4byte gUnknown_2023D74 +_0802C350: .4byte gBattlescriptCurrInstr _0802C354: .4byte gBattleTextBuff1 _0802C358: .4byte gBattleTextBuff2 -_0802C35C: .4byte gUnknown_2023E82 +_0802C35C: .4byte gBattleCommunication _0802C360: ldrh r0, [r6] cmp r0, 0 beq _0802C374 - ldr r0, _0802C370 @ =gUnknown_2023E82 + ldr r0, _0802C370 @ =gBattleCommunication movs r1, 0 strb r1, [r0, 0x5] b _0802C37A .align 2, 0 -_0802C370: .4byte gUnknown_2023E82 +_0802C370: .4byte gBattleCommunication _0802C374: - ldr r1, _0802C38C @ =gUnknown_2023E82 + ldr r1, _0802C38C @ =gBattleCommunication movs r0, 0x1 _0802C378: strb r0, [r1, 0x5] @@ -29596,7 +29596,7 @@ _0802C37A: pop {r0} bx r0 .align 2, 0 -_0802C38C: .4byte gUnknown_2023E82 +_0802C38C: .4byte gBattleCommunication thumb_func_end sub_802C0E0 thumb_func_start atkD3_trycopyability @@ -29628,7 +29628,7 @@ atkD3_trycopyability: @ 802C390 adds r0, 0x20 ldrb r0, [r0] strb r0, [r1] - ldr r1, _0802C3E0 @ =gUnknown_2023D74 + ldr r1, _0802C3E0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29638,9 +29638,9 @@ _0802C3D0: .4byte gBattleMons _0802C3D4: .4byte gBattlerTarget _0802C3D8: .4byte gBattlerAttacker _0802C3DC: .4byte gLastUsedAbility -_0802C3E0: .4byte gUnknown_2023D74 +_0802C3E0: .4byte gBattlescriptCurrInstr _0802C3E4: - ldr r3, _0802C404 @ =gUnknown_2023D74 + ldr r3, _0802C404 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29658,13 +29658,13 @@ _0802C3FE: pop {r0} bx r0 .align 2, 0 -_0802C404: .4byte gUnknown_2023D74 +_0802C404: .4byte gBattlescriptCurrInstr thumb_func_end atkD3_trycopyability thumb_func_start atkD4_trywish atkD4_trywish: @ 802C408 push {r4-r7,lr} - ldr r7, _0802C41C @ =gUnknown_2023D74 + ldr r7, _0802C41C @ =gBattlescriptCurrInstr ldr r2, [r7] ldrb r3, [r2, 0x1] cmp r3, 0 @@ -29673,9 +29673,9 @@ atkD4_trywish: @ 802C408 beq _0802C458 b _0802C4D4 .align 2, 0 -_0802C41C: .4byte gUnknown_2023D74 +_0802C41C: .4byte gBattlescriptCurrInstr _0802C420: - ldr r1, _0802C44C @ =gUnknown_2023F20 + ldr r1, _0802C44C @ =gWishFutureKnock ldr r4, _0802C450 @ =gBattlerAttacker adds r0, r1, 0 adds r0, 0x20 @@ -29698,7 +29698,7 @@ _0802C420: adds r0, 0x6 b _0802C4D2 .align 2, 0 -_0802C44C: .4byte gUnknown_2023F20 +_0802C44C: .4byte gWishFutureKnock _0802C450: .4byte gBattlerAttacker _0802C454: .4byte gBattlerPartyIndexes _0802C458: @@ -29710,7 +29710,7 @@ _0802C458: ldr r4, _0802C4C0 @ =gBattlerTarget ldrb r0, [r4] strb r0, [r1, 0x2] - ldr r0, _0802C4C4 @ =gUnknown_2023F20 + ldr r0, _0802C4C4 @ =gWishFutureKnock adds r0, 0x24 ldrb r5, [r4] adds r0, r5 @@ -29757,7 +29757,7 @@ _0802C4A4: .align 2, 0 _0802C4BC: .4byte gBattleTextBuff1 _0802C4C0: .4byte gBattlerTarget -_0802C4C4: .4byte gUnknown_2023F20 +_0802C4C4: .4byte gWishFutureKnock _0802C4C8: .4byte gBattleMoveDamage _0802C4CC: .4byte gBattleMons _0802C4D0: @@ -29785,7 +29785,7 @@ atkD5_trysetroots: @ 802C4DC ands r0, r3 cmp r0, 0 beq _0802C520 - ldr r3, _0802C51C @ =gUnknown_2023D74 + ldr r3, _0802C51C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29802,11 +29802,11 @@ atkD5_trysetroots: @ 802C4DC .align 2, 0 _0802C514: .4byte gStatuses3 _0802C518: .4byte gBattlerAttacker -_0802C51C: .4byte gUnknown_2023D74 +_0802C51C: .4byte gBattlescriptCurrInstr _0802C520: orrs r1, r3 str r1, [r2] - ldr r1, _0802C530 @ =gUnknown_2023D74 + ldr r1, _0802C530 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29814,13 +29814,13 @@ _0802C52C: pop {r0} bx r0 .align 2, 0 -_0802C530: .4byte gUnknown_2023D74 +_0802C530: .4byte gBattlescriptCurrInstr thumb_func_end atkD5_trysetroots thumb_func_start atkD6_doubledamagedealtifdamaged atkD6_doubledamagedealtifdamaged: @ 802C534 push {lr} - ldr r3, _0802C580 @ =gUnknown_2023E8C + ldr r3, _0802C580 @ =gProtectStructs ldr r0, _0802C584 @ =gBattlerAttacker ldrb r0, [r0] lsls r2, r0, 4 @@ -29853,18 +29853,18 @@ _0802C56C: movs r0, 0x2 strb r0, [r1, 0xE] _0802C572: - ldr r1, _0802C590 @ =gUnknown_2023D74 + ldr r1, _0802C590 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0802C580: .4byte gUnknown_2023E8C +_0802C580: .4byte gProtectStructs _0802C584: .4byte gBattlerAttacker _0802C588: .4byte gBattlerTarget _0802C58C: .4byte gBattleScripting -_0802C590: .4byte gUnknown_2023D74 +_0802C590: .4byte gBattlescriptCurrInstr thumb_func_end atkD6_doubledamagedealtifdamaged thumb_func_start atkD7_setyawn @@ -29890,7 +29890,7 @@ atkD7_setyawn: @ 802C594 cmp r0, 0 beq _0802C5E8 _0802C5BC: - ldr r3, _0802C5E4 @ =gUnknown_2023D74 + ldr r3, _0802C5E4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29908,13 +29908,13 @@ _0802C5BC: _0802C5D8: .4byte gStatuses3 _0802C5DC: .4byte gBattlerTarget _0802C5E0: .4byte gBattleMons -_0802C5E4: .4byte gUnknown_2023D74 +_0802C5E4: .4byte gBattlescriptCurrInstr _0802C5E8: movs r0, 0x80 lsls r0, 5 orrs r2, r0 str r2, [r4] - ldr r1, _0802C600 @ =gUnknown_2023D74 + ldr r1, _0802C600 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29923,7 +29923,7 @@ _0802C5F8: pop {r0} bx r0 .align 2, 0 -_0802C600: .4byte gUnknown_2023D74 +_0802C600: .4byte gBattlescriptCurrInstr thumb_func_end atkD7_setyawn thumb_func_start atkD8_setdamagetohealthdifference @@ -29943,7 +29943,7 @@ atkD8_setdamagetohealthdifference: @ 802C604 ldrh r2, [r1, 0x28] cmp r0, r2 bhi _0802C650 - ldr r3, _0802C64C @ =gUnknown_2023D74 + ldr r3, _0802C64C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29961,14 +29961,14 @@ atkD8_setdamagetohealthdifference: @ 802C604 _0802C640: .4byte gBattleMons _0802C644: .4byte gBattlerTarget _0802C648: .4byte gBattlerAttacker -_0802C64C: .4byte gUnknown_2023D74 +_0802C64C: .4byte gBattlescriptCurrInstr _0802C650: ldr r2, _0802C668 @ =gBattleMoveDamage ldrh r0, [r3, 0x28] ldrh r1, [r1, 0x28] subs r0, r1 str r0, [r2] - ldr r1, _0802C66C @ =gUnknown_2023D74 + ldr r1, _0802C66C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -29977,7 +29977,7 @@ _0802C662: bx r0 .align 2, 0 _0802C668: .4byte gBattleMoveDamage -_0802C66C: .4byte gUnknown_2023D74 +_0802C66C: .4byte gBattlescriptCurrInstr thumb_func_end atkD8_setdamagetohealthdifference thumb_func_start atkD9_scaledamagebyhealthratio @@ -30012,7 +30012,7 @@ atkD9_scaledamagebyhealthratio: @ 802C670 movs r0, 0x1 strh r0, [r4] _0802C6AC: - ldr r1, _0802C6D0 @ =gUnknown_2023D74 + ldr r1, _0802C6D0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -30025,7 +30025,7 @@ _0802C6C0: .4byte gBattleMoves _0802C6C4: .4byte gCurrentMove _0802C6C8: .4byte gBattleMons _0802C6CC: .4byte gBattlerAttacker -_0802C6D0: .4byte gUnknown_2023D74 +_0802C6D0: .4byte gBattlescriptCurrInstr thumb_func_end atkD9_scaledamagebyhealthratio thumb_func_start atkDA_tryswapabilities @@ -30068,7 +30068,7 @@ _0802C6FC: cmp r0, 0 beq _0802C74C _0802C71C: - ldr r3, _0802C748 @ =gUnknown_2023D74 + ldr r3, _0802C748 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30087,7 +30087,7 @@ _0802C738: .4byte gBattleMons _0802C73C: .4byte gBattlerAttacker _0802C740: .4byte gBattlerTarget _0802C744: .4byte gMoveResultFlags -_0802C748: .4byte gUnknown_2023D74 +_0802C748: .4byte gBattlescriptCurrInstr _0802C74C: ldrb r1, [r2] strb r3, [r2] @@ -30096,7 +30096,7 @@ _0802C74C: adds r0, r5 adds r0, 0x20 strb r1, [r0] - ldr r1, _0802C768 @ =gUnknown_2023D74 + ldr r1, _0802C768 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30105,7 +30105,7 @@ _0802C762: pop {r0} bx r0 .align 2, 0 -_0802C768: .4byte gUnknown_2023D74 +_0802C768: .4byte gBattlescriptCurrInstr thumb_func_end atkDA_tryswapabilities thumb_func_start atkDB_tryimprision @@ -30140,14 +30140,14 @@ _0802C794: lsls r2, 6 orrs r0, r2 str r0, [r1] - ldr r1, _0802C7B8 @ =gUnknown_2023D74 + ldr r1, _0802C7B8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802C836 .align 2, 0 _0802C7B4: .4byte gStatuses3 -_0802C7B8: .4byte gUnknown_2023D74 +_0802C7B8: .4byte gBattlescriptCurrInstr _0802C7BC: adds r0, r2, 0 bl GetBattlerSide @@ -30221,7 +30221,7 @@ _0802C836: cmp r6, r0 bne _0802C858 _0802C83E: - ldr r3, _0802C870 @ =gUnknown_2023D74 + ldr r3, _0802C870 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30245,7 +30245,7 @@ _0802C858: _0802C864: .4byte gBattlerAttacker _0802C868: .4byte gBattleMons _0802C86C: .4byte gBattlersCount -_0802C870: .4byte gUnknown_2023D74 +_0802C870: .4byte gBattlescriptCurrInstr thumb_func_end atkDB_tryimprision thumb_func_start atkDC_trysetgrudge @@ -30263,7 +30263,7 @@ atkDC_trysetgrudge: @ 802C874 ands r0, r3 cmp r0, 0 beq _0802C8B8 - ldr r3, _0802C8B4 @ =gUnknown_2023D74 + ldr r3, _0802C8B4 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30280,11 +30280,11 @@ atkDC_trysetgrudge: @ 802C874 .align 2, 0 _0802C8AC: .4byte gStatuses3 _0802C8B0: .4byte gBattlerAttacker -_0802C8B4: .4byte gUnknown_2023D74 +_0802C8B4: .4byte gBattlescriptCurrInstr _0802C8B8: orrs r1, r3 str r1, [r2] - ldr r1, _0802C8C8 @ =gUnknown_2023D74 + ldr r1, _0802C8C8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30292,7 +30292,7 @@ _0802C8C4: pop {r0} bx r0 .align 2, 0 -_0802C8C8: .4byte gUnknown_2023D74 +_0802C8C8: .4byte gBattlescriptCurrInstr thumb_func_end atkDC_trysetgrudge thumb_func_start atkDD_weightdamagecalculation @@ -30358,7 +30358,7 @@ _0802C944: movs r0, 0x78 strh r0, [r1] _0802C94A: - ldr r1, _0802C960 @ =gUnknown_2023D74 + ldr r1, _0802C960 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -30369,7 +30369,7 @@ _0802C94A: bx r0 .align 2, 0 _0802C95C: .4byte gDynamicBasePower -_0802C960: .4byte gUnknown_2023D74 +_0802C960: .4byte gBattlescriptCurrInstr thumb_func_end atkDD_weightdamagecalculation thumb_func_start atkDE_asistattackselect @@ -30491,7 +30491,7 @@ _0802CA3C: mov r1, r10 cmp r1, 0 beq _0802CAB4 - ldr r2, _0802CAA0 @ =gUnknown_2023DD0 + ldr r2, _0802CAA0 @ =gHitMarker ldr r0, [r2] ldr r1, _0802CAA4 @ =0xfffffbff ands r0, r1 @@ -30513,7 +30513,7 @@ _0802CA3C: bl GetMoveTarget ldr r1, _0802CAAC @ =gBattlerTarget strb r0, [r1] - ldr r1, _0802CAB0 @ =gUnknown_2023D74 + ldr r1, _0802CAB0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30526,13 +30526,13 @@ _0802CA90: .4byte gEnemyParty _0802CA94: .4byte gBattlerPartyIndexes _0802CA98: .4byte 0x0000ffff _0802CA9C: .4byte gUnknown_82507E8 -_0802CAA0: .4byte gUnknown_2023DD0 +_0802CAA0: .4byte gHitMarker _0802CAA4: .4byte 0xfffffbff _0802CAA8: .4byte gUnknown_2023D4E _0802CAAC: .4byte gBattlerTarget -_0802CAB0: .4byte gUnknown_2023D74 +_0802CAB0: .4byte gBattlescriptCurrInstr _0802CAB4: - ldr r3, _0802CAE0 @ =gUnknown_2023D74 + ldr r3, _0802CAE0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30555,7 +30555,7 @@ _0802CACE: pop {r0} bx r0 .align 2, 0 -_0802CAE0: .4byte gUnknown_2023D74 +_0802CAE0: .4byte gBattlescriptCurrInstr thumb_func_end atkDE_asistattackselect thumb_func_start atkDF_trysetmagiccoat @@ -30565,7 +30565,7 @@ atkDF_trysetmagiccoat: @ 802CAE4 ldr r3, _0802CB30 @ =gBattlerAttacker ldrb r0, [r3] strb r0, [r1] - ldr r2, _0802CB34 @ =gUnknown_2023ECC + ldr r2, _0802CB34 @ =gSpecialStatuses ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -30582,7 +30582,7 @@ atkDF_trysetmagiccoat: @ 802CAE4 subs r0, 0x1 cmp r1, r0 bne _0802CB44 - ldr r3, _0802CB40 @ =gUnknown_2023D74 + ldr r3, _0802CB40 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30599,12 +30599,12 @@ atkDF_trysetmagiccoat: @ 802CAE4 .align 2, 0 _0802CB2C: .4byte gBattlerTarget _0802CB30: .4byte gBattlerAttacker -_0802CB34: .4byte gUnknown_2023ECC +_0802CB34: .4byte gSpecialStatuses _0802CB38: .4byte gUnknown_2023BE2 _0802CB3C: .4byte gBattlersCount -_0802CB40: .4byte gUnknown_2023D74 +_0802CB40: .4byte gBattlescriptCurrInstr _0802CB44: - ldr r0, _0802CB60 @ =gUnknown_2023E8C + ldr r0, _0802CB60 @ =gProtectStructs ldrb r1, [r3] lsls r1, 4 adds r1, r0 @@ -30612,7 +30612,7 @@ _0802CB44: movs r2, 0x10 orrs r0, r2 strb r0, [r1] - ldr r1, _0802CB64 @ =gUnknown_2023D74 + ldr r1, _0802CB64 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30620,14 +30620,14 @@ _0802CB5C: pop {r0} bx r0 .align 2, 0 -_0802CB60: .4byte gUnknown_2023E8C -_0802CB64: .4byte gUnknown_2023D74 +_0802CB60: .4byte gProtectStructs +_0802CB64: .4byte gBattlescriptCurrInstr thumb_func_end atkDF_trysetmagiccoat thumb_func_start atkE0_trysetsnatch atkE0_trysetsnatch: @ 802CB68 push {lr} - ldr r2, _0802CBAC @ =gUnknown_2023ECC + ldr r2, _0802CBAC @ =gSpecialStatuses ldr r3, _0802CBB0 @ =gBattlerAttacker ldrb r1, [r3] lsls r0, r1, 2 @@ -30645,7 +30645,7 @@ atkE0_trysetsnatch: @ 802CB68 subs r0, 0x1 cmp r1, r0 bne _0802CBC0 - ldr r3, _0802CBBC @ =gUnknown_2023D74 + ldr r3, _0802CBBC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30660,20 +30660,20 @@ atkE0_trysetsnatch: @ 802CB68 str r1, [r3] b _0802CBD6 .align 2, 0 -_0802CBAC: .4byte gUnknown_2023ECC +_0802CBAC: .4byte gSpecialStatuses _0802CBB0: .4byte gBattlerAttacker _0802CBB4: .4byte gUnknown_2023BE2 _0802CBB8: .4byte gBattlersCount -_0802CBBC: .4byte gUnknown_2023D74 +_0802CBBC: .4byte gBattlescriptCurrInstr _0802CBC0: - ldr r0, _0802CBDC @ =gUnknown_2023E8C + ldr r0, _0802CBDC @ =gProtectStructs ldrb r1, [r3] lsls r1, 4 adds r1, r0 ldrb r0, [r1] orrs r0, r2 strb r0, [r1] - ldr r1, _0802CBE0 @ =gUnknown_2023D74 + ldr r1, _0802CBE0 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30681,8 +30681,8 @@ _0802CBD6: pop {r0} bx r0 .align 2, 0 -_0802CBDC: .4byte gUnknown_2023E8C -_0802CBE0: .4byte gUnknown_2023D74 +_0802CBDC: .4byte gProtectStructs +_0802CBE0: .4byte gBattlescriptCurrInstr thumb_func_end atkE0_trysetsnatch thumb_func_start atkE1_trygetintimidatetarget @@ -30756,7 +30756,7 @@ _0802CC60: cmp r0, r2 bcc _0802CCAC _0802CC6A: - ldr r3, _0802CCA8 @ =gUnknown_2023D74 + ldr r3, _0802CCA8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30779,9 +30779,9 @@ _0802CC98: .4byte gBattlerTarget _0802CC9C: .4byte gBattlersCount _0802CCA0: .4byte gBitTable _0802CCA4: .4byte gAbsentBattlerFlags -_0802CCA8: .4byte gUnknown_2023D74 +_0802CCA8: .4byte gBattlescriptCurrInstr _0802CCAC: - ldr r1, _0802CCBC @ =gUnknown_2023D74 + ldr r1, _0802CCBC @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30790,17 +30790,17 @@ _0802CCB4: pop {r0} bx r0 .align 2, 0 -_0802CCBC: .4byte gUnknown_2023D74 +_0802CCBC: .4byte gBattlescriptCurrInstr thumb_func_end atkE1_trygetintimidatetarget thumb_func_start atkE2_switchoutabilities atkE2_switchoutabilities: @ 802CCC0 push {r4-r6,lr} sub sp, 0x4 - ldr r5, _0802CD28 @ =gUnknown_2023D74 + ldr r5, _0802CD28 @ =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r4, _0802CD2C @ =gActiveBattler strb r0, [r4] ldr r3, _0802CD30 @ =gBattleMons @@ -30836,7 +30836,7 @@ atkE2_switchoutabilities: @ 802CCC0 movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _0802CD1A: ldr r0, [r5] adds r0, 0x2 @@ -30846,7 +30846,7 @@ _0802CD1A: pop {r0} bx r0 .align 2, 0 -_0802CD28: .4byte gUnknown_2023D74 +_0802CD28: .4byte gBattlescriptCurrInstr _0802CD2C: .4byte gActiveBattler _0802CD30: .4byte gBattleMons _0802CD34: .4byte gBitTable @@ -30856,10 +30856,10 @@ _0802CD38: .4byte gBattleStruct thumb_func_start atkE3_jumpifhasnohp atkE3_jumpifhasnohp: @ 802CD3C push {r4,lr} - ldr r4, _0802CD78 @ =gUnknown_2023D74 + ldr r4, _0802CD78 @ =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] - bl sub_8016E24 + bl GetBattlerForBattleScript ldr r1, _0802CD7C @ =gActiveBattler strb r0, [r1] ldr r2, _0802CD80 @ =gBattleMons @@ -30884,7 +30884,7 @@ atkE3_jumpifhasnohp: @ 802CD3C str r1, [r4] b _0802CD8A .align 2, 0 -_0802CD78: .4byte gUnknown_2023D74 +_0802CD78: .4byte gBattlescriptCurrInstr _0802CD7C: .4byte gActiveBattler _0802CD80: .4byte gBattleMons _0802CD84: @@ -30923,67 +30923,67 @@ _0802CDAC: .4byte _0802CE14 .4byte _0802CE20 _0802CDCC: - ldr r1, _0802CDD4 @ =gUnknown_2023E82 + ldr r1, _0802CDD4 @ =gBattleCommunication movs r0, 0x2 b _0802CE30 .align 2, 0 -_0802CDD4: .4byte gUnknown_2023E82 +_0802CDD4: .4byte gBattleCommunication _0802CDD8: - ldr r1, _0802CDE0 @ =gUnknown_2023E82 + ldr r1, _0802CDE0 @ =gBattleCommunication movs r0, 0x1 b _0802CE30 .align 2, 0 -_0802CDE0: .4byte gUnknown_2023E82 +_0802CDE0: .4byte gBattleCommunication _0802CDE4: - ldr r1, _0802CDEC @ =gUnknown_2023E82 + ldr r1, _0802CDEC @ =gBattleCommunication movs r0, 0x1B b _0802CE30 .align 2, 0 -_0802CDEC: .4byte gUnknown_2023E82 +_0802CDEC: .4byte gBattleCommunication _0802CDF0: - ldr r1, _0802CDF8 @ =gUnknown_2023E82 + ldr r1, _0802CDF8 @ =gBattleCommunication movs r0, 0x17 b _0802CE30 .align 2, 0 -_0802CDF8: .4byte gUnknown_2023E82 +_0802CDF8: .4byte gBattleCommunication _0802CDFC: - ldr r1, _0802CE04 @ =gUnknown_2023E82 + ldr r1, _0802CE04 @ =gBattleCommunication movs r0, 0x16 b _0802CE30 .align 2, 0 -_0802CE04: .4byte gUnknown_2023E82 +_0802CE04: .4byte gBattleCommunication _0802CE08: - ldr r1, _0802CE10 @ =gUnknown_2023E82 + ldr r1, _0802CE10 @ =gBattleCommunication movs r0, 0x18 b _0802CE30 .align 2, 0 -_0802CE10: .4byte gUnknown_2023E82 +_0802CE10: .4byte gBattleCommunication _0802CE14: - ldr r1, _0802CE1C @ =gUnknown_2023E82 + ldr r1, _0802CE1C @ =gBattleCommunication movs r0, 0x7 b _0802CE30 .align 2, 0 -_0802CE1C: .4byte gUnknown_2023E82 +_0802CE1C: .4byte gBattleCommunication _0802CE20: - ldr r1, _0802CE28 @ =gUnknown_2023E82 + ldr r1, _0802CE28 @ =gBattleCommunication movs r0, 0x8 b _0802CE30 .align 2, 0 -_0802CE28: .4byte gUnknown_2023E82 +_0802CE28: .4byte gBattleCommunication _0802CE2C: - ldr r1, _0802CE40 @ =gUnknown_2023E82 + ldr r1, _0802CE40 @ =gBattleCommunication movs r0, 0x5 _0802CE30: strb r0, [r1, 0x3] - ldr r1, _0802CE44 @ =gUnknown_2023D74 + ldr r1, _0802CE44 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0802CE40: .4byte gUnknown_2023E82 -_0802CE44: .4byte gUnknown_2023D74 +_0802CE40: .4byte gBattleCommunication +_0802CE44: .4byte gBattlescriptCurrInstr thumb_func_end atkE4_getsecretpowereffect thumb_func_start sub_802CE48 @@ -31085,7 +31085,7 @@ _0802CF0A: adds r7, r4, 0 cmp r7, 0x5 ble _0802CE54 - ldr r1, _0802CF2C @ =gUnknown_2023D74 + ldr r1, _0802CF2C @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31097,7 +31097,7 @@ _0802CF0A: .align 2, 0 _0802CF24: .4byte gPlayerParty _0802CF28: .4byte gUnknown_8250848 -_0802CF2C: .4byte gUnknown_2023D74 +_0802CF2C: .4byte gBattlescriptCurrInstr thumb_func_end sub_802CE48 thumb_func_start atkE6_docastformchangeanimation @@ -31134,8 +31134,8 @@ _0802CF60: movs r1, 0 bl BtlController_EmitBattleAnimation ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r1, _0802CF94 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _0802CF94 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31147,24 +31147,24 @@ _0802CF84: .4byte gActiveBattler _0802CF88: .4byte gBattleScripting _0802CF8C: .4byte gBattleMons _0802CF90: .4byte gBattleStruct -_0802CF94: .4byte gUnknown_2023D74 +_0802CF94: .4byte gBattlescriptCurrInstr thumb_func_end atkE6_docastformchangeanimation thumb_func_start atkE7_trycastformdatachange atkE7_trycastformdatachange: @ 802CF98 push {r4,lr} - ldr r1, _0802CFC8 @ =gUnknown_2023D74 + ldr r1, _0802CFC8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] ldr r0, _0802CFCC @ =gBattleScripting ldrb r0, [r0, 0x17] - bl sub_8019DAC + bl CastformDataTypeChange lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 beq _0802CFC2 - ldr r0, _0802CFD0 @ =gUnknown_81D92F8 + ldr r0, _0802CFD0 @ =BattleScript_CastformChange bl BattleScriptPushCursorAndCallback ldr r0, _0802CFD4 @ =gBattleStruct ldr r0, [r0] @@ -31176,9 +31176,9 @@ _0802CFC2: pop {r0} bx r0 .align 2, 0 -_0802CFC8: .4byte gUnknown_2023D74 +_0802CFC8: .4byte gBattlescriptCurrInstr _0802CFCC: .4byte gBattleScripting -_0802CFD0: .4byte gUnknown_81D92F8 +_0802CFD0: .4byte BattleScript_CastformChange _0802CFD4: .4byte gBattleStruct thumb_func_end atkE7_trycastformdatachange @@ -31210,7 +31210,7 @@ atkE8_settypebasedhalvers: @ 802CFD8 bne _0802D04C orrs r1, r3 str r1, [r2] - ldr r0, _0802D024 @ =gUnknown_2023E82 + ldr r0, _0802D024 @ =gBattleCommunication strb r4, [r0, 0x5] b _0802D050 .align 2, 0 @@ -31218,7 +31218,7 @@ _0802D014: .4byte gBattleMoves _0802D018: .4byte gCurrentMove _0802D01C: .4byte gStatuses3 _0802D020: .4byte gBattlerAttacker -_0802D024: .4byte gUnknown_2023E82 +_0802D024: .4byte gBattleCommunication _0802D028: ldr r1, _0802D05C @ =gStatuses3 ldr r0, _0802D060 @ =gBattlerAttacker @@ -31234,7 +31234,7 @@ _0802D028: bne _0802D04C orrs r1, r3 str r1, [r2] - ldr r1, _0802D064 @ =gUnknown_2023E82 + ldr r1, _0802D064 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] movs r4, 0x1 @@ -31242,7 +31242,7 @@ _0802D04C: cmp r4, 0 beq _0802D06C _0802D050: - ldr r1, _0802D068 @ =gUnknown_2023D74 + ldr r1, _0802D068 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -31250,10 +31250,10 @@ _0802D050: .align 2, 0 _0802D05C: .4byte gStatuses3 _0802D060: .4byte gBattlerAttacker -_0802D064: .4byte gUnknown_2023E82 -_0802D068: .4byte gUnknown_2023D74 +_0802D064: .4byte gBattleCommunication +_0802D068: .4byte gBattlescriptCurrInstr _0802D06C: - ldr r3, _0802D08C @ =gUnknown_2023D74 + ldr r3, _0802D08C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -31271,7 +31271,7 @@ _0802D086: pop {r0} bx r0 .align 2, 0 -_0802D08C: .4byte gUnknown_2023D74 +_0802D08C: .4byte gBattlescriptCurrInstr thumb_func_end atkE8_settypebasedhalvers thumb_func_start atkE9_setweatherballtype @@ -31359,7 +31359,7 @@ _0802D128: _0802D12E: strb r0, [r1, 0x13] _0802D130: - ldr r1, _0802D144 @ =gUnknown_2023D74 + ldr r1, _0802D144 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31368,7 +31368,7 @@ _0802D130: bx r0 .align 2, 0 _0802D140: .4byte gBattleStruct -_0802D144: .4byte gUnknown_2023D74 +_0802D144: .4byte gBattlescriptCurrInstr thumb_func_end atkE9_setweatherballtype thumb_func_start atkEA_tryrecycleitem @@ -31416,8 +31416,8 @@ atkEA_tryrecycleitem: @ 802D148 movs r3, 0x2 bl BtlController_EmitSetMonData ldrb r0, [r7] - bl MarkBufferBankForExecution - ldr r1, _0802D1C4 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _0802D1C4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -31428,9 +31428,9 @@ _0802D1B4: .4byte gBattlerAttacker _0802D1B8: .4byte gBattleStruct _0802D1BC: .4byte gBattleMons _0802D1C0: .4byte gLastUsedItem -_0802D1C4: .4byte gUnknown_2023D74 +_0802D1C4: .4byte gBattlescriptCurrInstr _0802D1C8: - ldr r3, _0802D1EC @ =gUnknown_2023D74 + ldr r3, _0802D1EC @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -31449,7 +31449,7 @@ _0802D1E2: pop {r0} bx r0 .align 2, 0 -_0802D1EC: .4byte gUnknown_2023D74 +_0802D1EC: .4byte gBattlescriptCurrInstr thumb_func_end atkEA_tryrecycleitem thumb_func_start atkEB_settypetoterrain @@ -31505,7 +31505,7 @@ atkEB_settypetoterrain: @ 802D1F0 strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _0802D274 @ =gUnknown_2023D74 + ldr r1, _0802D274 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -31516,9 +31516,9 @@ _0802D264: .4byte gBattlerAttacker _0802D268: .4byte gUnknown_8250888 _0802D26C: .4byte gUnknown_2022B50 _0802D270: .4byte gBattleTextBuff1 -_0802D274: .4byte gUnknown_2023D74 +_0802D274: .4byte gBattlescriptCurrInstr _0802D278: - ldr r3, _0802D29C @ =gUnknown_2023D74 + ldr r3, _0802D29C @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -31538,7 +31538,7 @@ _0802D292: pop {r0} bx r0 .align 2, 0 -_0802D29C: .4byte gUnknown_2023D74 +_0802D29C: .4byte gBattlescriptCurrInstr thumb_func_end atkEB_settypetoterrain thumb_func_start atkEC_pursuitrelated @@ -31587,7 +31587,7 @@ atkEC_pursuitrelated: @ 802D2A0 strb r1, [r0] ldr r0, _0802D334 @ =gCurrentMove strh r2, [r0] - ldr r1, _0802D338 @ =gUnknown_2023D74 + ldr r1, _0802D338 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -31609,10 +31609,10 @@ _0802D328: .4byte gUnknown_2023D7C _0802D32C: .4byte gUnknown_2023DC4 _0802D330: .4byte gUnknown_2023BDA _0802D334: .4byte gCurrentMove -_0802D338: .4byte gUnknown_2023D74 +_0802D338: .4byte gBattlescriptCurrInstr _0802D33C: .4byte gBattleScripting _0802D340: - ldr r3, _0802D360 @ =gUnknown_2023D74 + ldr r3, _0802D360 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -31630,7 +31630,7 @@ _0802D35A: pop {r0} bx r0 .align 2, 0 -_0802D360: .4byte gUnknown_2023D74 +_0802D360: .4byte gBattlescriptCurrInstr thumb_func_end atkEC_pursuitrelated thumb_func_start atkEF_snatchsetbanks @@ -31664,7 +31664,7 @@ _0802D398: _0802D39E: ldrb r0, [r4] strb r0, [r1, 0x17] - ldr r1, _0802D3B4 @ =gUnknown_2023D74 + ldr r1, _0802D3B4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31673,7 +31673,7 @@ _0802D39E: bx r0 .align 2, 0 _0802D3B0: .4byte gBattleScripting -_0802D3B4: .4byte gUnknown_2023D74 +_0802D3B4: .4byte gBattlescriptCurrInstr thumb_func_end atkEF_snatchsetbanks thumb_func_start atkEE_removelightscreenreflect @@ -31698,7 +31698,7 @@ atkEE_removelightscreenreflect: @ 802D3B8 cmp r1, 0 beq _0802D418 _0802D3E0: - ldr r2, _0802D408 @ =gSideAffecting + ldr r2, _0802D408 @ =gSideStatuses adds r2, r3, r2 ldrh r1, [r2] ldr r0, _0802D40C @ =0x0000fffe @@ -31717,7 +31717,7 @@ _0802D3E0: .align 2, 0 _0802D400: .4byte gBattlerAttacker _0802D404: .4byte gSideTimers -_0802D408: .4byte gSideAffecting +_0802D408: .4byte gSideStatuses _0802D40C: .4byte 0x0000fffe _0802D410: .4byte 0x0000fffd _0802D414: .4byte gBattleScripting @@ -31726,7 +31726,7 @@ _0802D418: strb r1, [r0, 0x18] strb r1, [r0, 0x19] _0802D41E: - ldr r1, _0802D430 @ =gUnknown_2023D74 + ldr r1, _0802D430 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31735,7 +31735,7 @@ _0802D41E: bx r0 .align 2, 0 _0802D42C: .4byte gBattleScripting -_0802D430: .4byte gUnknown_2023D74 +_0802D430: .4byte gBattlescriptCurrInstr thumb_func_end atkEE_removelightscreenreflect thumb_func_start sub_802D434 @@ -31767,8 +31767,8 @@ _0802D442: movs r1, 0x6 bl BtlController_EmitBallThrowAnim ldrb r0, [r5] - bl MarkBufferBankForExecution - ldr r1, _0802D488 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _0802D488 @ =gBattlescriptCurrInstr ldr r0, _0802D48C @ =gUnknown_81D9AD1 b _0802D7EC .align 2, 0 @@ -31777,7 +31777,7 @@ _0802D478: .4byte gActiveBattler _0802D47C: .4byte gBattlerAttacker _0802D480: .4byte gBattlerTarget _0802D484: .4byte gBattleTypeFlags -_0802D488: .4byte gUnknown_2023D74 +_0802D488: .4byte gBattlescriptCurrInstr _0802D48C: .4byte gUnknown_81D9AD1 _0802D490: movs r0, 0x8 @@ -31788,12 +31788,12 @@ _0802D490: movs r1, 0x5 bl BtlController_EmitBallThrowAnim ldrb r0, [r5] - bl MarkBufferBankForExecution - ldr r1, _0802D4AC @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _0802D4AC @ =gBattlescriptCurrInstr ldr r0, _0802D4B0 @ =gUnknown_81D9AC1 b _0802D7EC .align 2, 0 -_0802D4AC: .4byte gUnknown_2023D74 +_0802D4AC: .4byte gBattlescriptCurrInstr _0802D4B0: .4byte gUnknown_81D9AC1 _0802D4B4: movs r0, 0x81 @@ -31805,12 +31805,12 @@ _0802D4B4: movs r1, 0x4 bl BtlController_EmitBallThrowAnim ldrb r0, [r5] - bl MarkBufferBankForExecution - ldr r1, _0802D4D4 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _0802D4D4 @ =gBattlescriptCurrInstr ldr r0, _0802D4D8 @ =gUnknown_81D9A88 b _0802D7EC .align 2, 0 -_0802D4D4: .4byte gUnknown_2023D74 +_0802D4D4: .4byte gBattlescriptCurrInstr _0802D4D8: .4byte gUnknown_81D9A88 _0802D4DC: ldr r0, _0802D500 @ =gLastUsedItem @@ -32051,8 +32051,8 @@ _0802D6BC: bl BtlController_EmitBallThrowAnim ldr r0, _0802D704 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution - ldr r1, _0802D708 @ =gUnknown_2023D74 + bl MarkBattlerForControllerExec + ldr r1, _0802D708 @ =gBattlescriptCurrInstr ldr r0, _0802D70C @ =gUnknown_81D9A42 str r0, [r1] ldr r1, _0802D710 @ =gBattlerPartyIndexes @@ -32077,7 +32077,7 @@ _0802D6BC: .align 2, 0 _0802D700: .4byte gBattleResults _0802D704: .4byte gActiveBattler -_0802D708: .4byte gUnknown_2023D74 +_0802D708: .4byte gBattlescriptCurrInstr _0802D70C: .4byte gUnknown_81D9A42 _0802D710: .4byte gBattlerPartyIndexes _0802D714: .4byte gBattlerTarget @@ -32126,10 +32126,10 @@ _0802D76C: bl BtlController_EmitBallThrowAnim ldr r0, _0802D7BC @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec cmp r4, 0x4 bne _0802D7E4 - ldr r1, _0802D7C0 @ =gUnknown_2023D74 + ldr r1, _0802D7C0 @ =gBattlescriptCurrInstr ldr r0, _0802D7C4 @ =gUnknown_81D9A42 str r0, [r1] ldr r1, _0802D7C8 @ =gBattlerPartyIndexes @@ -32151,30 +32151,30 @@ _0802D76C: cmp r0, 0x6 bne _0802D7D8 _0802D7AE: - ldr r1, _0802D7D4 @ =gUnknown_2023E82 + ldr r1, _0802D7D4 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] b _0802D7EE .align 2, 0 _0802D7B8: .4byte gLastUsedItem _0802D7BC: .4byte gActiveBattler -_0802D7C0: .4byte gUnknown_2023D74 +_0802D7C0: .4byte gBattlescriptCurrInstr _0802D7C4: .4byte gUnknown_81D9A42 _0802D7C8: .4byte gBattlerPartyIndexes _0802D7CC: .4byte gBattlerTarget _0802D7D0: .4byte gEnemyParty -_0802D7D4: .4byte gUnknown_2023E82 +_0802D7D4: .4byte gBattleCommunication _0802D7D8: - ldr r1, _0802D7E0 @ =gUnknown_2023E82 + ldr r1, _0802D7E0 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _0802D7EE .align 2, 0 -_0802D7E0: .4byte gUnknown_2023E82 +_0802D7E0: .4byte gBattleCommunication _0802D7E4: - ldr r0, _0802D7F4 @ =gUnknown_2023E82 + ldr r0, _0802D7F4 @ =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, _0802D7F8 @ =gUnknown_2023D74 + ldr r1, _0802D7F8 @ =gBattlescriptCurrInstr ldr r0, _0802D7FC @ =gUnknown_81D9A93 _0802D7EC: str r0, [r1] @@ -32183,8 +32183,8 @@ _0802D7EE: pop {r0} bx r0 .align 2, 0 -_0802D7F4: .4byte gUnknown_2023E82 -_0802D7F8: .4byte gUnknown_2023D74 +_0802D7F4: .4byte gBattleCommunication +_0802D7F8: .4byte gBattlescriptCurrInstr _0802D7FC: .4byte gUnknown_81D9A93 thumb_func_end sub_802D434 @@ -32217,7 +32217,7 @@ sub_802D800: @ 802D800 lsrs r1, r0, 24 cmp r1, 0 bne _0802D88C - ldr r0, _0802D87C @ =gUnknown_2023E82 + ldr r0, _0802D87C @ =gBattleCommunication strb r1, [r0, 0x5] ldr r4, _0802D880 @ =gStringVar1 ldr r0, _0802D884 @ =0x00004037 @@ -32243,7 +32243,7 @@ sub_802D800: @ 802D800 _0802D870: .4byte gBattlerPartyIndexes _0802D874: .4byte gBattlerAttacker _0802D878: .4byte gEnemyParty -_0802D87C: .4byte gUnknown_2023E82 +_0802D87C: .4byte gBattleCommunication _0802D880: .4byte gStringVar1 _0802D884: .4byte 0x00004037 _0802D888: .4byte gStringVar2 @@ -32275,7 +32275,7 @@ _0802D88C: adds r1, r0, 0 adds r0, r4, 0 bl StringCopy - ldr r1, _0802D93C @ =gUnknown_2023E82 + ldr r1, _0802D93C @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] _0802D8D6: @@ -32284,7 +32284,7 @@ _0802D8D6: lsls r0, 24 cmp r0, 0 beq _0802D8EA - ldr r1, _0802D93C @ =gUnknown_2023E82 + ldr r1, _0802D93C @ =gBattleCommunication ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] @@ -32311,7 +32311,7 @@ _0802D8EA: adds r2, 0x2A movs r1, 0x2 bl GetMonData - ldr r1, _0802D958 @ =gUnknown_2023D74 + ldr r1, _0802D958 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -32326,14 +32326,14 @@ _0802D92C: .4byte gStringVar1 _0802D930: .4byte 0x00004037 _0802D934: .4byte gStringVar2 _0802D938: .4byte gStringVar3 -_0802D93C: .4byte gUnknown_2023E82 +_0802D93C: .4byte gBattleCommunication _0802D940: .4byte 0x00000834 _0802D944: .4byte gBattleResults _0802D948: .4byte gBattleMons _0802D94C: .4byte gBattlerAttacker _0802D950: .4byte gBattlerPartyIndexes _0802D954: .4byte gEnemyParty -_0802D958: .4byte gUnknown_2023D74 +_0802D958: .4byte gBattlescriptCurrInstr thumb_func_end sub_802D800 thumb_func_start sub_802D95C @@ -32360,7 +32360,7 @@ sub_802D95C: @ 802D95C lsls r0, 24 cmp r0, 0 beq _0802D9B4 - ldr r3, _0802D9B0 @ =gUnknown_2023D74 + ldr r3, _0802D9B0 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -32376,7 +32376,7 @@ sub_802D95C: @ 802D95C b _0802D9CE .align 2, 0 _0802D9AC: .4byte gEnemyParty -_0802D9B0: .4byte gUnknown_2023D74 +_0802D9B0: .4byte gBattlescriptCurrInstr _0802D9B4: adds r0, r5, 0 bl SpeciesToNationalPokedexNum @@ -32385,7 +32385,7 @@ _0802D9B4: movs r1, 0x3 adds r2, r4, 0 bl HandleSetPokedexFlag - ldr r1, _0802D9D4 @ =gUnknown_2023D74 + ldr r1, _0802D9D4 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -32394,7 +32394,7 @@ _0802D9CE: pop {r0} bx r0 .align 2, 0 -_0802D9D4: .4byte gUnknown_2023D74 +_0802D9D4: .4byte gBattlescriptCurrInstr thumb_func_end sub_802D95C thumb_func_start sub_802D9D8 @@ -32407,7 +32407,7 @@ sub_802D9D8: @ 802D9D8 bl GetMonData lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _0802DA04 @ =gUnknown_2023E82 + ldr r0, _0802DA04 @ =gBattleCommunication ldrb r0, [r0] cmp r0, 0x5 bls _0802D9F4 @@ -32420,7 +32420,7 @@ _0802D9F4: mov pc, r0 .align 2, 0 _0802DA00: .4byte gEnemyParty -_0802DA04: .4byte gUnknown_2023E82 +_0802DA04: .4byte gBattleCommunication _0802DA08: .4byte _0802DA0C .align 2, 0 _0802DA0C: @@ -32454,12 +32454,12 @@ _0802DA4A: bl FreeAllWindowBuffers adds r0, r5, 0 bl sub_8106B60 - ldr r1, _0802DA60 @ =gUnknown_2023E82 + ldr r1, _0802DA60 @ =gBattleCommunication strb r0, [r1, 0x1] b _0802DB36 .align 2, 0 _0802DA5C: .4byte gPaletteFade -_0802DA60: .4byte gUnknown_2023E82 +_0802DA60: .4byte gBattleCommunication _0802DA64: ldr r0, _0802DAAC @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -32475,7 +32475,7 @@ _0802DA72: cmp r1, r0 bne _0802DB6C ldr r2, _0802DAB8 @ =gTasks - ldr r4, _0802DABC @ =gUnknown_2023E82 + ldr r4, _0802DABC @ =gBattleCommunication ldrb r1, [r4, 0x1] lsls r0, r1, 2 adds r0, r1 @@ -32501,7 +32501,7 @@ _0802DAAC: .4byte gPaletteFade _0802DAB0: .4byte gMain _0802DAB4: .4byte BattleMainCB2 _0802DAB8: .4byte gTasks -_0802DABC: .4byte gUnknown_2023E82 +_0802DABC: .4byte gBattleCommunication _0802DAC0: .4byte 0x05006000 _0802DAC4: .4byte sub_80116F4 _0802DAC8: @@ -32553,7 +32553,7 @@ _0802DAE0: movs r0, 0x3 bl ShowBg _0802DB34: - ldr r1, _0802DB54 @ =gUnknown_2023E82 + ldr r1, _0802DB54 @ =gBattleCommunication _0802DB36: ldrb r0, [r1] adds r0, 0x1 @@ -32565,7 +32565,7 @@ _0802DB44: .4byte 0x0000ffff _0802DB48: .4byte gPlttBufferFaded _0802DB4C: .4byte 0x05000080 _0802DB50: .4byte 0x0001ffff -_0802DB54: .4byte gUnknown_2023E82 +_0802DB54: .4byte gBattleCommunication _0802DB58: ldr r0, _0802DB74 @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -32573,7 +32573,7 @@ _0802DB58: ands r0, r1 cmp r0, 0 bne _0802DB6C - ldr r1, _0802DB78 @ =gUnknown_2023D74 + ldr r1, _0802DB78 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -32584,7 +32584,7 @@ _0802DB6C: bx r0 .align 2, 0 _0802DB74: .4byte gPaletteFade -_0802DB78: .4byte gUnknown_2023D74 +_0802DB78: .4byte gBattlescriptCurrInstr thumb_func_end sub_802D9D8 thumb_func_start sub_802DB7C @@ -32765,7 +32765,7 @@ sub_802DCB8: @ 802DCB8 strh r2, [r0] movs r1, 0x2 strh r1, [r0, 0x2] - ldr r0, _0802DCF4 @ =gUnknown_2023E82 + ldr r0, _0802DCF4 @ =gBattleCommunication ldrb r3, [r0, 0x1] lsls r3, 25 movs r0, 0x90 @@ -32786,7 +32786,7 @@ sub_802DCB8: @ 802DCB8 pop {r0} bx r0 .align 2, 0 -_0802DCF4: .4byte gUnknown_2023E82 +_0802DCF4: .4byte gBattleCommunication thumb_func_end sub_802DCB8 thumb_func_start sub_802DCF8 @@ -32797,7 +32797,7 @@ sub_802DCF8: @ 802DCF8 movs r1, 0x20 strh r1, [r0] strh r1, [r0, 0x2] - ldr r0, _0802DD34 @ =gUnknown_2023E82 + ldr r0, _0802DD34 @ =gBattleCommunication ldrb r3, [r0, 0x1] lsls r3, 25 movs r0, 0x90 @@ -32820,7 +32820,7 @@ sub_802DCF8: @ 802DCF8 pop {r0} bx r0 .align 2, 0 -_0802DD34: .4byte gUnknown_2023E82 +_0802DD34: .4byte gBattleCommunication thumb_func_end sub_802DCF8 thumb_func_start sub_802DD38 @@ -32831,7 +32831,7 @@ sub_802DD38: @ 802DD38 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _0802DD5C @ =gUnknown_2023E82 + ldr r0, _0802DD5C @ =gBattleCommunication ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x4 @@ -32844,7 +32844,7 @@ _0802DD50: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802DD5C: .4byte gUnknown_2023E82 +_0802DD5C: .4byte gBattleCommunication _0802DD60: .4byte _0802DD64 .align 2, 0 _0802DD64: @@ -32864,7 +32864,7 @@ _0802DD78: ldr r0, _0802DDA0 @ =gUnknown_83FE791 movs r1, 0xE bl BattlePutTextOnWindow - ldr r1, _0802DDA4 @ =gUnknown_2023E82 + ldr r1, _0802DDA4 @ =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -32873,7 +32873,7 @@ _0802DD78: b _0802DFA6 .align 2, 0 _0802DDA0: .4byte gUnknown_83FE791 -_0802DDA4: .4byte gUnknown_2023E82 +_0802DDA4: .4byte gBattleCommunication _0802DDA8: ldr r0, _0802DE1C @ =gMain ldrh r1, [r0, 0x2E] @@ -32897,7 +32897,7 @@ _0802DDCC: ands r0, r1 cmp r0, 0 beq _0802DDF2 - ldr r4, _0802DE20 @ =gUnknown_2023E82 + ldr r4, _0802DE20 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _0802DDF2 @@ -32916,7 +32916,7 @@ _0802DDF2: beq _0802DE24 movs r0, 0x5 bl PlaySE - ldr r1, _0802DE20 @ =gUnknown_2023E82 + ldr r1, _0802DE20 @ =gBattleCommunication ldrb r0, [r1, 0x1] cmp r0, 0 bne _0802DE36 @@ -32928,7 +32928,7 @@ _0802DDF2: b _0802DFA6 .align 2, 0 _0802DE1C: .4byte gMain -_0802DE20: .4byte gUnknown_2023E82 +_0802DE20: .4byte gBattleCommunication _0802DE24: movs r0, 0x2 ands r0, r1 @@ -32938,13 +32938,13 @@ _0802DE24: _0802DE2E: movs r0, 0x5 bl PlaySE - ldr r1, _0802DE3C @ =gUnknown_2023E82 + ldr r1, _0802DE3C @ =gBattleCommunication _0802DE36: movs r0, 0x4 strb r0, [r1] b _0802DFA6 .align 2, 0 -_0802DE3C: .4byte gUnknown_2023E82 +_0802DE3C: .4byte gBattleCommunication _0802DE40: ldr r0, _0802DEFC @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -33029,7 +33029,7 @@ _0802DE4E: adds r2, r6, 0 adds r3, r5, 0 bl DoNamingScreen - ldr r1, _0802DF14 @ =gUnknown_2023E82 + ldr r1, _0802DF14 @ =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -33041,7 +33041,7 @@ _0802DF04: .4byte gBattlerAttacker _0802DF08: .4byte gEnemyParty _0802DF0C: .4byte gBattleStruct _0802DF10: .4byte BattleMainCB2 -_0802DF14: .4byte gUnknown_2023E82 +_0802DF14: .4byte gBattleCommunication _0802DF18: ldr r0, _0802DF54 @ =gMain ldr r1, [r0, 0x4] @@ -33086,15 +33086,15 @@ _0802DF70: lsrs r0, 24 cmp r0, 0x6 bne _0802DF8C - ldr r1, _0802DF88 @ =gUnknown_2023D74 + ldr r1, _0802DF88 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0802DFA6 .align 2, 0 -_0802DF88: .4byte gUnknown_2023D74 +_0802DF88: .4byte gBattlescriptCurrInstr _0802DF8C: - ldr r3, _0802DFB8 @ =gUnknown_2023D74 + ldr r3, _0802DFB8 @ =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -33117,7 +33117,7 @@ _0802DFA6: pop {r0} bx r0 .align 2, 0 -_0802DFB8: .4byte gUnknown_2023D74 +_0802DFB8: .4byte gBattlescriptCurrInstr thumb_func_end sub_802DD38 thumb_func_start atkF4_subattackerhpbydmg @@ -33133,7 +33133,7 @@ atkF4_subattackerhpbydmg: @ 802DFBC ldrh r0, [r1, 0x28] subs r0, r2 strh r0, [r1, 0x28] - ldr r1, _0802DFE8 @ =gUnknown_2023D74 + ldr r1, _0802DFE8 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -33142,7 +33142,7 @@ atkF4_subattackerhpbydmg: @ 802DFBC _0802DFDC: .4byte gBattleMons _0802DFE0: .4byte gBattlerAttacker _0802DFE4: .4byte gBattleMoveDamage -_0802DFE8: .4byte gUnknown_2023D74 +_0802DFE8: .4byte gBattlescriptCurrInstr thumb_func_end atkF4_subattackerhpbydmg thumb_func_start atkF5_removeattackerstatus1 @@ -33156,7 +33156,7 @@ atkF5_removeattackerstatus1: @ 802DFEC adds r0, r1 movs r1, 0 str r1, [r0] - ldr r1, _0802E010 @ =gUnknown_2023D74 + ldr r1, _0802E010 @ =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -33164,7 +33164,7 @@ atkF5_removeattackerstatus1: @ 802DFEC .align 2, 0 _0802E008: .4byte gBattleMons _0802E00C: .4byte gBattlerAttacker -_0802E010: .4byte gUnknown_2023D74 +_0802E010: .4byte gBattlescriptCurrInstr thumb_func_end atkF5_removeattackerstatus1 thumb_func_start sub_802E014 diff --git a/asm/battle_util.s b/asm/battle_util.s index 34e4ad428..d73ed9e0e 100644 --- a/asm/battle_util.s +++ b/asm/battle_util.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8016E24 -sub_8016E24: @ 8016E24 + thumb_func_start GetBattlerForBattleScript +GetBattlerForBattleScript: @ 8016E24 push {lr} lsls r0, 24 lsrs r0, 24 @@ -63,11 +63,11 @@ _08016E9C: .align 2, 0 _08016EA4: .4byte gBattleScripting _08016EA8: - ldr r0, _08016EB0 @ =gUnknown_2023D6D + ldr r0, _08016EB0 @ =gBattlerFainted ldrb r2, [r0] b _08016EC2 .align 2, 0 -_08016EB0: .4byte gUnknown_2023D6D +_08016EB0: .4byte gBattlerFainted _08016EB4: movs r0, 0 b _08016EBA @@ -81,7 +81,7 @@ _08016EC2: adds r0, r2, 0 pop {r1} bx r1 - thumb_func_end sub_8016E24 + thumb_func_end GetBattlerForBattleScript thumb_func_start PressurePPLose PressurePPLose: @ 8016EC8 @@ -174,7 +174,7 @@ _08016F26: movs r3, 0x1 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08016F7A: add sp, 0x4 pop {r4-r7} @@ -324,7 +324,7 @@ _08017038: movs r3, 0x1 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080170A0: add sp, 0x4 pop {r3-r5} @@ -461,7 +461,7 @@ _08017146: movs r3, 0x1 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _080171AA: add sp, 0x4 pop {r3-r5} @@ -481,8 +481,8 @@ _080171D0: .4byte gBitTable _080171D4: .4byte gActiveBattler thumb_func_end PressurePPLoseOnUsingPerishSong - thumb_func_start MarkAllBufferBanksForExecution -MarkAllBufferBanksForExecution: @ 80171D8 + thumb_func_start MarkAllBattlersForControllerExec +MarkAllBattlersForControllerExec: @ 80171D8 push {r4,r5,lr} ldr r0, _08017208 @ =gBattleTypeFlags ldr r0, [r0] @@ -538,10 +538,10 @@ _08017236: _0801723C: .4byte gBattlersCount _08017240: .4byte gBattleControllerExecFlags _08017244: .4byte gBitTable - thumb_func_end MarkAllBufferBanksForExecution + thumb_func_end MarkAllBattlersForControllerExec - thumb_func_start MarkBufferBankForExecution -MarkBufferBankForExecution: @ 8017248 + thumb_func_start MarkBattlerForControllerExec +MarkBattlerForControllerExec: @ 8017248 push {lr} lsls r0, 24 lsrs r3, r0, 24 @@ -580,7 +580,7 @@ _0801728C: .align 2, 0 _08017290: .4byte gBattleControllerExecFlags _08017294: .4byte gBitTable - thumb_func_end MarkBufferBankForExecution + thumb_func_end MarkBattlerForControllerExec thumb_func_start sub_8017298 sub_8017298: @ 8017298 @@ -679,7 +679,7 @@ _08017350: .4byte gDisableStructs WasUnableToUseMove: @ 8017354 push {lr} lsls r0, 24 - ldr r1, _080173A0 @ =gUnknown_2023E8C + ldr r1, _080173A0 @ =gProtectStructs lsrs r0, 20 adds r1, r0, r1 ldrb r0, [r1] @@ -716,7 +716,7 @@ _0801739A: movs r0, 0x1 b _080173A6 .align 2, 0 -_080173A0: .4byte gUnknown_2023E8C +_080173A0: .4byte gProtectStructs _080173A4: movs r0, 0 _080173A6: @@ -736,7 +736,7 @@ PrepareStringBattle: @ 80173AC adds r1, r2, 0 bl BtlController_EmitPrintString ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec pop {r4} pop {r0} bx r0 @@ -748,7 +748,7 @@ _080173CC: .4byte gActiveBattler ResetSentPokesToOpponentValue: @ 80173D0 push {r4-r6,lr} movs r3, 0 - ldr r0, _08017424 @ =gUnknown_2023F4E + ldr r0, _08017424 @ =gSentPokesToOpponent strb r3, [r0] strb r3, [r0, 0x1] movs r1, 0 @@ -776,7 +776,7 @@ _080173FE: ldrb r0, [r2] cmp r1, r0 bge _0801741E - ldr r5, _08017424 @ =gUnknown_2023F4E + ldr r5, _08017424 @ =gSentPokesToOpponent movs r4, 0x2 _0801740C: adds r0, r1, 0 @@ -793,7 +793,7 @@ _0801741E: pop {r0} bx r0 .align 2, 0 -_08017424: .4byte gUnknown_2023F4E +_08017424: .4byte gSentPokesToOpponent _08017428: .4byte gBattlersCount _0801742C: .4byte gBitTable _08017430: .4byte gBattlerPartyIndexes @@ -818,7 +818,7 @@ sub_8017434: @ 8017434 lsls r0, 24 lsrs r0, 25 mov r12, r0 - ldr r1, _080174A4 @ =gUnknown_2023F4E + ldr r1, _080174A4 @ =gSentPokesToOpponent adds r0, r1 strb r4, [r0] adds r5, r4, 0 @@ -860,7 +860,7 @@ _08017498: pop {r0} bx r0 .align 2, 0 -_080174A4: .4byte gUnknown_2023F4E +_080174A4: .4byte gSentPokesToOpponent _080174A8: .4byte gBattlersCount _080174AC: .4byte gAbsentBattlerFlags _080174B0: .4byte gBitTable @@ -887,7 +887,7 @@ _080174D4: ldrb r0, [r5] cmp r3, r0 bge _0801750A - ldr r0, _08017514 @ =gUnknown_2023F4E + ldr r0, _08017514 @ =gSentPokesToOpponent mov r12, r0 movs r7, 0x2 ldr r6, _08017518 @ =gBitTable @@ -916,7 +916,7 @@ _0801750A: bx r0 .align 2, 0 _08017510: .4byte gBattlersCount -_08017514: .4byte gUnknown_2023F4E +_08017514: .4byte gSentPokesToOpponent _08017518: .4byte gBitTable _0801751C: .4byte gBattlerPartyIndexes thumb_func_end sub_80174B8 @@ -956,18 +956,18 @@ BattleScriptPushCursor: @ 8017544 lsls r0, 24 lsrs r0, 22 adds r2, r0 - ldr r0, _08017568 @ =gUnknown_2023D74 + ldr r0, _08017568 @ =gBattlescriptCurrInstr ldr r0, [r0] str r0, [r2] bx lr .align 2, 0 _08017564: .4byte gBattleResources -_08017568: .4byte gUnknown_2023D74 +_08017568: .4byte gBattlescriptCurrInstr thumb_func_end BattleScriptPushCursor thumb_func_start BattleScriptPop BattleScriptPop: @ 801756C - ldr r3, _0801758C @ =gUnknown_2023D74 + ldr r3, _0801758C @ =gBattlescriptCurrInstr ldr r0, _08017590 @ =gBattleResources ldr r0, [r0] ldr r1, [r0, 0x8] @@ -983,12 +983,12 @@ BattleScriptPop: @ 801756C str r0, [r3] bx lr .align 2, 0 -_0801758C: .4byte gUnknown_2023D74 +_0801758C: .4byte gBattlescriptCurrInstr _08017590: .4byte gBattleResources thumb_func_end BattleScriptPop - thumb_func_start sub_8017594 -sub_8017594: @ 8017594 + thumb_func_start TrySetCantSelectMoveBattleScript +TrySetCantSelectMoveBattleScript: @ 8017594 push {r4-r7,lr} mov r7, r8 push {r7} @@ -1028,11 +1028,11 @@ sub_8017594: @ 8017594 strb r3, [r0, 0x17] ldr r0, _080176C4 @ =gCurrentMove strh r4, [r0] - ldr r1, _080176C8 @ =gUnknown_2023D80 + ldr r1, _080176C8 @ =gSelectionBattleScripts ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _080176CC @ =gUnknown_81D8C5A + ldr r1, _080176CC @ =BattleScript_SelectingDisabledMove str r1, [r0] movs r6, 0x1 _080175F0: @@ -1056,11 +1056,11 @@ _080175F0: bge _0801762C adds r0, r2, 0 bl CancelMultiTurnMoves - ldr r1, _080176C8 @ =gUnknown_2023D80 + ldr r1, _080176C8 @ =gSelectionBattleScripts ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _080176D4 @ =gUnknown_81D8EB7 + ldr r1, _080176D4 @ =BattleScript_SelectingTormentedMove str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 @@ -1087,11 +1087,11 @@ _0801762C: bne _08017668 ldr r0, _080176C4 @ =gCurrentMove strh r4, [r0] - ldr r1, _080176C8 @ =gUnknown_2023D80 + ldr r1, _080176C8 @ =gSelectionBattleScripts ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, _080176DC @ =gUnknown_81D8EC6 + ldr r1, _080176DC @ =BattleScript_SelectingNotAllowedMoveTaunt str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 @@ -1106,11 +1106,11 @@ _08017668: beq _0801768E ldr r0, _080176C4 @ =gCurrentMove strh r4, [r0] - ldr r1, _080176C8 @ =gUnknown_2023D80 + ldr r1, _080176C8 @ =gSelectionBattleScripts ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _080176E0 @ =gUnknown_81D8F9F + ldr r1, _080176E0 @ =BattleScript_SelectingImprisonedMove str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 @@ -1139,13 +1139,13 @@ _080176B8: .4byte gBattleStruct _080176BC: .4byte gDisableStructs _080176C0: .4byte gBattleScripting _080176C4: .4byte gCurrentMove -_080176C8: .4byte gUnknown_2023D80 -_080176CC: .4byte gUnknown_81D8C5A +_080176C8: .4byte gSelectionBattleScripts +_080176CC: .4byte BattleScript_SelectingDisabledMove _080176D0: .4byte gLastUsedMove -_080176D4: .4byte gUnknown_81D8EB7 +_080176D4: .4byte BattleScript_SelectingTormentedMove _080176D8: .4byte gBattleMoves -_080176DC: .4byte gUnknown_81D8EC6 -_080176E0: .4byte gUnknown_81D8F9F +_080176DC: .4byte BattleScript_SelectingNotAllowedMoveTaunt +_080176E0: .4byte BattleScript_SelectingImprisonedMove _080176E4: .4byte gEnigmaBerries _080176E8: ldrh r0, [r1, 0x2E] @@ -1180,11 +1180,11 @@ _080176F2: adds r0, r7 ldrh r0, [r0, 0x2E] strh r0, [r2] - ldr r1, _0801778C @ =gUnknown_2023D80 + ldr r1, _0801778C @ =gSelectionBattleScripts ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08017790 @ =gUnknown_81D963D + ldr r1, _08017790 @ =BattleScript_SelectingNotAllowedMoveChoiceItem str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 @@ -1205,10 +1205,10 @@ _0801773A: ldrb r0, [r0] cmp r0, 0 bne _08017768 - ldr r1, _0801778C @ =gUnknown_2023D80 + ldr r1, _0801778C @ =gSelectionBattleScripts lsls r0, r2, 2 adds r0, r1 - ldr r1, _08017798 @ =gUnknown_81D8EA4 + ldr r1, _08017798 @ =BattleScript_SelectingMoveWithNoPP str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 @@ -1227,11 +1227,11 @@ _0801777C: .4byte gBattleMons _08017780: .4byte 0x0000ffff _08017784: .4byte gCurrentMove _08017788: .4byte gLastUsedItem -_0801778C: .4byte gUnknown_2023D80 -_08017790: .4byte gUnknown_81D963D +_0801778C: .4byte gSelectionBattleScripts +_08017790: .4byte BattleScript_SelectingNotAllowedMoveChoiceItem _08017794: .4byte gBattleBufferB -_08017798: .4byte gUnknown_81D8EA4 - thumb_func_end sub_8017594 +_08017798: .4byte BattleScript_SelectingMoveWithNoPP + thumb_func_end TrySetCantSelectMoveBattleScript thumb_func_start CheckMoveLimitations CheckMoveLimitations: @ 801779C @@ -1491,8 +1491,8 @@ _08017990: .4byte gBattleMoves _08017994: .4byte 0x0000ffff thumb_func_end CheckMoveLimitations - thumb_func_start sub_8017998 -sub_8017998: @ 8017998 + thumb_func_start AreAllMovesUnusable +AreAllMovesUnusable: @ 8017998 push {r4-r6,lr} ldr r5, _08017A04 @ =gActiveBattler ldrb r0, [r5] @@ -1503,7 +1503,7 @@ sub_8017998: @ 8017998 lsrs r6, r0, 24 cmp r6, 0xF bne _08017A40 - ldr r0, _08017A08 @ =gUnknown_2023E8C + ldr r0, _08017A08 @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -1511,7 +1511,7 @@ sub_8017998: @ 8017998 movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r1, _08017A0C @ =gUnknown_2023D80 + ldr r1, _08017A0C @ =gSelectionBattleScripts ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -1544,8 +1544,8 @@ sub_8017998: @ 8017998 b _08017A50 .align 2, 0 _08017A04: .4byte gActiveBattler -_08017A08: .4byte gUnknown_2023E8C -_08017A0C: .4byte gUnknown_2023D80 +_08017A08: .4byte gProtectStructs +_08017A0C: .4byte gSelectionBattleScripts _08017A10: .4byte gUnknown_81D8EA0 _08017A14: .4byte gBattleTypeFlags _08017A18: .4byte gBattleBufferB @@ -1566,7 +1566,7 @@ _08017A1C: .align 2, 0 _08017A3C: .4byte gBattleBufferB _08017A40: - ldr r0, _08017A60 @ =gUnknown_2023E8C + ldr r0, _08017A60 @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -1585,8 +1585,8 @@ _08017A5A: pop {r1} bx r1 .align 2, 0 -_08017A60: .4byte gUnknown_2023E8C - thumb_func_end sub_8017998 +_08017A60: .4byte gProtectStructs + thumb_func_end AreAllMovesUnusable thumb_func_start GetImprisonedMovesCount GetImprisonedMovesCount: @ 8017A64 @@ -1672,8 +1672,8 @@ _08017AFC: .4byte gUnknown_2023BF0 _08017B00: .4byte gStatuses3 thumb_func_end GetImprisonedMovesCount - thumb_func_start UpdateTurnCounters -UpdateTurnCounters: @ 8017B04 + thumb_func_start DoFieldEndTurnEffects +DoFieldEndTurnEffects: @ 8017B04 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1789,7 +1789,7 @@ _08017BF0: ldrb r2, [r1] cmp r5, r2 bge _08017C0A - ldr r2, _08017C14 @ =gUnknown_2023BDE + ldr r2, _08017C14 @ =gBattlerByTurnOrder _08017BFE: adds r0, r5, r2 strb r5, [r0] @@ -1802,14 +1802,14 @@ _08017C0A: b _08017C58 .align 2, 0 _08017C10: .4byte gBattlersCount -_08017C14: .4byte gUnknown_2023BDE +_08017C14: .4byte gBattlerByTurnOrder _08017C18: adds r4, r5, 0x1 adds r6, r4, 0 ldrb r1, [r1] cmp r6, r1 bge _08017C56 - ldr r7, _08017D14 @ =gUnknown_2023BDE + ldr r7, _08017D14 @ =gBattlerByTurnOrder ldr r0, _08017D18 @ =gBattlersCount mov r10, r0 lsls r1, r5, 24 @@ -1880,7 +1880,7 @@ _08017C8E: strb r0, [r6] mov r3, r8 strb r0, [r3] - ldr r0, _08017D30 @ =gSideAffecting + ldr r0, _08017D30 @ =gSideStatuses adds r3, r1, r0 ldrh r1, [r3] movs r0, 0x1 @@ -1899,7 +1899,7 @@ _08017C8E: adds r1, r2, 0 ands r0, r1 strh r0, [r3] - ldr r0, _08017D38 @ =gUnknown_81D8B32 + ldr r0, _08017D38 @ =BattleScript_SideStatusWoreOff bl BattleScriptExecute movs r0, 0xFD strb r0, [r5] @@ -1937,16 +1937,16 @@ _08017D06: bls _08017C8E b _08017F60 .align 2, 0 -_08017D14: .4byte gUnknown_2023BDE +_08017D14: .4byte gBattlerByTurnOrder _08017D18: .4byte gBattlersCount _08017D1C: .4byte gBattleStruct _08017D20: .4byte gActiveBattler _08017D24: .4byte gBattlerAttacker _08017D28: .4byte gBattleTextBuff1 _08017D2C: .4byte gSideTimers -_08017D30: .4byte gSideAffecting +_08017D30: .4byte gSideStatuses _08017D34: .4byte 0x0000fffe -_08017D38: .4byte gUnknown_81D8B32 +_08017D38: .4byte BattleScript_SideStatusWoreOff _08017D3C: mov r1, r12 ldr r0, [r1] @@ -1975,7 +1975,7 @@ _08017D56: strb r0, [r7] ldr r3, _08017DF0 @ =gActiveBattler strb r0, [r3] - ldr r0, _08017DF4 @ =gSideAffecting + ldr r0, _08017DF4 @ =gSideStatuses adds r3, r1, r0 ldrh r1, [r3] movs r0, 0x2 @@ -1994,9 +1994,9 @@ _08017D56: adds r1, r2, 0 ands r0, r1 strh r0, [r3] - ldr r0, _08017DFC @ =gUnknown_81D8B32 + ldr r0, _08017DFC @ =BattleScript_SideStatusWoreOff bl BattleScriptExecute - ldr r0, _08017E00 @ =gUnknown_2023E82 + ldr r0, _08017E00 @ =gBattleCommunication strb r4, [r0, 0x5] movs r0, 0xFD strb r0, [r5] @@ -2039,10 +2039,10 @@ _08017DE4: .4byte gBattlerAttacker _08017DE8: .4byte gBattleTextBuff1 _08017DEC: .4byte gSideTimers _08017DF0: .4byte gActiveBattler -_08017DF4: .4byte gSideAffecting +_08017DF4: .4byte gSideStatuses _08017DF8: .4byte 0x0000fffd -_08017DFC: .4byte gUnknown_81D8B32 -_08017E00: .4byte gUnknown_2023E82 +_08017DFC: .4byte BattleScript_SideStatusWoreOff +_08017E00: .4byte gBattleCommunication _08017E04: .4byte gBattleStruct _08017E08: mov r1, r12 @@ -2079,16 +2079,16 @@ _08017E20: lsls r0, 24 cmp r0, 0 bne _08017E82 - ldr r2, _08017ED0 @ =gSideAffecting + ldr r2, _08017ED0 @ =gSideStatuses adds r2, r3, r2 ldrh r0, [r2] ldr r3, _08017ED4 @ =0x0000feff adds r1, r3, 0 ands r0, r1 strh r0, [r2] - ldr r0, _08017ED8 @ =gUnknown_81D8B32 + ldr r0, _08017ED8 @ =BattleScript_SideStatusWoreOff bl BattleScriptExecute - ldr r0, _08017EDC @ =gUnknown_2023E82 + ldr r0, _08017EDC @ =gBattleCommunication strb r4, [r0, 0x5] movs r0, 0xFD strb r0, [r5] @@ -2145,10 +2145,10 @@ _08017EC0: .4byte gActiveBattler _08017EC4: .4byte gBattlerAttacker _08017EC8: .4byte gBattleTextBuff1 _08017ECC: .4byte gSideTimers -_08017ED0: .4byte gSideAffecting +_08017ED0: .4byte gSideStatuses _08017ED4: .4byte 0x0000feff -_08017ED8: .4byte gUnknown_81D8B32 -_08017EDC: .4byte gUnknown_2023E82 +_08017ED8: .4byte BattleScript_SideStatusWoreOff +_08017EDC: .4byte gBattleCommunication _08017EE0: .4byte gBattleStruct _08017EE4: mov r1, r12 @@ -2171,7 +2171,7 @@ _08017EF4: ldrb r0, [r2, 0x7] strb r0, [r5] strb r0, [r6] - ldr r0, _08017F8C @ =gSideAffecting + ldr r0, _08017F8C @ =gSideStatuses adds r3, r1, r0 ldrh r1, [r3] movs r0, 0x20 @@ -2189,7 +2189,7 @@ _08017EF4: adds r1, r2, 0 ands r0, r1 strh r0, [r3] - ldr r0, _08017F94 @ =gUnknown_81D8B43 + ldr r0, _08017F94 @ =BattleScript_SafeguardEnds bl BattleScriptExecute mov r0, r9 adds r0, 0x1 @@ -2236,9 +2236,9 @@ _08017F68: _08017F80: .4byte gActiveBattler _08017F84: .4byte gBattlerAttacker _08017F88: .4byte gSideTimers -_08017F8C: .4byte gSideAffecting +_08017F8C: .4byte gSideStatuses _08017F90: .4byte 0x0000ffdf -_08017F94: .4byte gUnknown_81D8B43 +_08017F94: .4byte BattleScript_SafeguardEnds _08017F98: .4byte gBattleStruct _08017F9C: mov r2, r12 @@ -2250,7 +2250,7 @@ _08017F9C: cmp r0, r1 bcs _0801801C ldr r4, _08018034 @ =gActiveBattler - ldr r5, _08018038 @ =gUnknown_2023BDE + ldr r5, _08018038 @ =gBattlerByTurnOrder _08017FB0: ldr r0, [r2] adds r0, 0xDB @@ -2258,7 +2258,7 @@ _08017FB0: adds r0, r5 ldrb r0, [r0] strb r0, [r4] - ldr r0, _0801803C @ =gUnknown_2023F20 + ldr r0, _0801803C @ =gWishFutureKnock adds r0, 0x20 ldrb r2, [r4] adds r1, r0, r2 @@ -2280,7 +2280,7 @@ _08017FB0: beq _08017FF8 ldr r0, _08018044 @ =gBattlerTarget strb r2, [r0] - ldr r0, _08018048 @ =gUnknown_81D8ED5 + ldr r0, _08018048 @ =BattleScript_WishComesTrue bl BattleScriptExecute mov r0, r9 adds r0, 0x1 @@ -2322,11 +2322,11 @@ _08018024: .align 2, 0 _08018030: .4byte gBattlersCount _08018034: .4byte gActiveBattler -_08018038: .4byte gUnknown_2023BDE -_0801803C: .4byte gUnknown_2023F20 +_08018038: .4byte gBattlerByTurnOrder +_0801803C: .4byte gWishFutureKnock _08018040: .4byte gBattleMons _08018044: .4byte gBattlerTarget -_08018048: .4byte gUnknown_81D8ED5 +_08018048: .4byte BattleScript_WishComesTrue _0801804C: .4byte gBattleStruct _08018050: ldr r3, _08018088 @ =gBattleWeather @@ -2341,7 +2341,7 @@ _0801805E: ands r0, r2 cmp r0, 0 bne _080180AA - ldr r1, _0801808C @ =gUnknown_2023F20 + ldr r1, _0801808C @ =gWishFutureKnock adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -2354,16 +2354,16 @@ _0801805E: ldr r1, _08018094 @ =0x0000fffd ands r0, r1 strh r0, [r3] - ldr r1, _08018098 @ =gUnknown_2023E82 + ldr r1, _08018098 @ =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _080180C8 .align 2, 0 _08018088: .4byte gBattleWeather -_0801808C: .4byte gUnknown_2023F20 +_0801808C: .4byte gWishFutureKnock _08018090: .4byte 0x0000fffe _08018094: .4byte 0x0000fffd -_08018098: .4byte gUnknown_2023E82 +_08018098: .4byte gBattleCommunication _0801809C: movs r0, 0x2 ands r0, r2 @@ -2380,21 +2380,21 @@ _080180AA: cmp r1, 0 beq _080180C4 _080180B6: - ldr r1, _080180C0 @ =gUnknown_2023E82 + ldr r1, _080180C0 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _080180C8 .align 2, 0 -_080180C0: .4byte gUnknown_2023E82 +_080180C0: .4byte gBattleCommunication _080180C4: - ldr r0, _080180CC @ =gUnknown_2023E82 + ldr r0, _080180CC @ =gBattleCommunication strb r1, [r0, 0x5] _080180C8: - ldr r0, _080180D0 @ =gUnknown_81D8A64 + ldr r0, _080180D0 @ =BattleScript_RainContinuesOrEnds b _080181EE .align 2, 0 -_080180CC: .4byte gUnknown_2023E82 -_080180D0: .4byte gUnknown_81D8A64 +_080180CC: .4byte gBattleCommunication +_080180D0: .4byte BattleScript_RainContinuesOrEnds _080180D4: ldr r3, _08018108 @ =gBattleWeather ldrh r2, [r3] @@ -2408,7 +2408,7 @@ _080180E2: ands r0, r2 cmp r0, 0 bne _0801811C - ldr r1, _0801810C @ =gUnknown_2023F20 + ldr r1, _0801810C @ =gWishFutureKnock adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -2419,18 +2419,18 @@ _080180E2: ldr r0, _08018110 @ =0x0000fff7 ands r0, r2 strh r0, [r3] - ldr r1, _08018114 @ =gUnknown_2023D74 - ldr r0, _08018118 @ =gUnknown_81D8B01 + ldr r1, _08018114 @ =gBattlescriptCurrInstr + ldr r0, _08018118 @ =BattleScript_SandStormHailEnds b _08018120 .align 2, 0 _08018108: .4byte gBattleWeather -_0801810C: .4byte gUnknown_2023F20 +_0801810C: .4byte gWishFutureKnock _08018110: .4byte 0x0000fff7 -_08018114: .4byte gUnknown_2023D74 -_08018118: .4byte gUnknown_81D8B01 +_08018114: .4byte gBattlescriptCurrInstr +_08018118: .4byte BattleScript_SandStormHailEnds _0801811C: - ldr r1, _08018134 @ =gUnknown_2023D74 - ldr r0, _08018138 @ =gUnknown_81D8A7F + ldr r1, _08018134 @ =gBattlescriptCurrInstr + ldr r0, _08018138 @ =BattleScript_DamagingWeatherContinues _08018120: str r0, [r1] adds r3, r1, 0 @@ -2438,14 +2438,14 @@ _08018120: movs r2, 0 movs r0, 0xC strb r0, [r1, 0x10] - ldr r0, _08018140 @ =gUnknown_2023E82 + ldr r0, _08018140 @ =gBattleCommunication strb r2, [r0, 0x5] b _080181EC .align 2, 0 -_08018134: .4byte gUnknown_2023D74 -_08018138: .4byte gUnknown_81D8A7F +_08018134: .4byte gBattlescriptCurrInstr +_08018138: .4byte BattleScript_DamagingWeatherContinues _0801813C: .4byte gBattleScripting -_08018140: .4byte gUnknown_2023E82 +_08018140: .4byte gBattleCommunication _08018144: ldr r3, _08018174 @ =gBattleWeather ldrh r2, [r3] @@ -2457,7 +2457,7 @@ _08018144: ands r0, r2 cmp r0, 0 bne _08018188 - ldr r1, _08018178 @ =gUnknown_2023F20 + ldr r1, _08018178 @ =gWishFutureKnock adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -2468,25 +2468,25 @@ _08018144: ldr r0, _0801817C @ =0x0000ffdf ands r0, r2 strh r0, [r3] - ldr r1, _08018180 @ =gUnknown_2023D74 - ldr r0, _08018184 @ =gUnknown_81D8B18 + ldr r1, _08018180 @ =gBattlescriptCurrInstr + ldr r0, _08018184 @ =BattleScript_SunlightFaded b _0801818C .align 2, 0 _08018174: .4byte gBattleWeather -_08018178: .4byte gUnknown_2023F20 +_08018178: .4byte gWishFutureKnock _0801817C: .4byte 0x0000ffdf -_08018180: .4byte gUnknown_2023D74 -_08018184: .4byte gUnknown_81D8B18 +_08018180: .4byte gBattlescriptCurrInstr +_08018184: .4byte BattleScript_SunlightFaded _08018188: - ldr r1, _08018194 @ =gUnknown_2023D74 - ldr r0, _08018198 @ =gUnknown_81D8B0A + ldr r1, _08018194 @ =gBattlescriptCurrInstr + ldr r0, _08018198 @ =BattleScript_SunlightContinues _0801818C: str r0, [r1] adds r3, r1, 0 b _080181EC .align 2, 0 -_08018194: .4byte gUnknown_2023D74 -_08018198: .4byte gUnknown_81D8B0A +_08018194: .4byte gBattlescriptCurrInstr +_08018198: .4byte BattleScript_SunlightContinues _0801819C: ldr r3, _080181C4 @ =gBattleWeather ldrh r2, [r3] @@ -2494,7 +2494,7 @@ _0801819C: ands r0, r2 cmp r0, 0 beq _080181FC - ldr r1, _080181C8 @ =gUnknown_2023F20 + ldr r1, _080181C8 @ =gWishFutureKnock adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -2505,25 +2505,25 @@ _0801819C: ldr r0, _080181CC @ =0x0000ff7f ands r0, r2 strh r0, [r3] - ldr r1, _080181D0 @ =gUnknown_2023D74 - ldr r0, _080181D4 @ =gUnknown_81D8B01 + ldr r1, _080181D0 @ =gBattlescriptCurrInstr + ldr r0, _080181D4 @ =BattleScript_SandStormHailEnds b _080181DC .align 2, 0 _080181C4: .4byte gBattleWeather -_080181C8: .4byte gUnknown_2023F20 +_080181C8: .4byte gWishFutureKnock _080181CC: .4byte 0x0000ff7f -_080181D0: .4byte gUnknown_2023D74 -_080181D4: .4byte gUnknown_81D8B01 +_080181D0: .4byte gBattlescriptCurrInstr +_080181D4: .4byte BattleScript_SandStormHailEnds _080181D8: - ldr r1, _0801820C @ =gUnknown_2023D74 - ldr r0, _08018210 @ =gUnknown_81D8A7F + ldr r1, _0801820C @ =gBattlescriptCurrInstr + ldr r0, _08018210 @ =BattleScript_DamagingWeatherContinues _080181DC: str r0, [r1] adds r3, r1, 0 ldr r1, _08018214 @ =gBattleScripting movs r0, 0xD strb r0, [r1, 0x10] - ldr r1, _08018218 @ =gUnknown_2023E82 + ldr r1, _08018218 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _080181EC: @@ -2544,10 +2544,10 @@ _080181FC: mov r12, r2 b _0801822A .align 2, 0 -_0801820C: .4byte gUnknown_2023D74 -_08018210: .4byte gUnknown_81D8A7F +_0801820C: .4byte gBattlescriptCurrInstr +_08018210: .4byte BattleScript_DamagingWeatherContinues _08018214: .4byte gBattleScripting -_08018218: .4byte gUnknown_2023E82 +_08018218: .4byte gBattleCommunication _0801821C: .4byte gBattleStruct _08018220: mov r0, r9 @@ -2563,7 +2563,7 @@ _0801822A: _08018232: ldr r0, _08018250 @ =gBattleMainFunc ldr r1, [r0] - ldr r0, _08018254 @ =sub_8013BD4 + ldr r0, _08018254 @ =BattleTurnPassed eors r1, r0 negs r0, r1 orrs r0, r1 @@ -2577,11 +2577,11 @@ _08018232: bx r1 .align 2, 0 _08018250: .4byte gBattleMainFunc -_08018254: .4byte sub_8013BD4 - thumb_func_end UpdateTurnCounters +_08018254: .4byte BattleTurnPassed + thumb_func_end DoFieldEndTurnEffects - thumb_func_start TurnBasedEffects -TurnBasedEffects: @ 8018258 + thumb_func_start DoBattlerEndTurnEffects +DoBattlerEndTurnEffects: @ 8018258 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2590,7 +2590,7 @@ TurnBasedEffects: @ 8018258 sub sp, 0x8 movs r0, 0 mov r9, r0 - ldr r2, _0801828C @ =gUnknown_2023DD0 + ldr r2, _0801828C @ =gHitMarker ldr r0, [r2] ldr r1, _08018290 @ =0x01000020 orrs r0, r1 @@ -2608,14 +2608,14 @@ TurnBasedEffects: @ 8018258 _08018288: bl _08018C62 .align 2, 0 -_0801828C: .4byte gUnknown_2023DD0 +_0801828C: .4byte gHitMarker _08018290: .4byte 0x01000020 _08018294: .4byte gBattleStruct _08018298: .4byte gBattlersCount _0801829C: ldr r3, _080182D0 @ =gActiveBattler ldr r4, _080182D4 @ =gBattlerAttacker - ldr r1, _080182D8 @ =gUnknown_2023BDE + ldr r1, _080182D8 @ =gBattlerByTurnOrder ldr r5, [r5] ldrb r0, [r5, 0x1] adds r0, r1 @@ -2640,7 +2640,7 @@ _0801829C: .align 2, 0 _080182D0: .4byte gActiveBattler _080182D4: .4byte gBattlerAttacker -_080182D8: .4byte gUnknown_2023BDE +_080182D8: .4byte gBattlerByTurnOrder _080182DC: .4byte gAbsentBattlerFlags _080182E0: .4byte gBitTable _080182E4: @@ -2717,13 +2717,13 @@ _08018390: ldr r0, [r1] negs r0, r0 str r0, [r1] - ldr r0, _080183A8 @ =gUnknown_81D8F0C + ldr r0, _080183A8 @ =BattleScript_IngrainTurnHeal bl _08018C04 .align 2, 0 _0801839C: .4byte gStatuses3 _080183A0: .4byte gBattleMons _080183A4: .4byte gBattleMoveDamage -_080183A8: .4byte gUnknown_81D8F0C +_080183A8: .4byte BattleScript_IngrainTurnHeal _080183AC: ldrb r1, [r6] movs r0, 0 @@ -2742,7 +2742,7 @@ _080183CA: ldrb r1, [r6] movs r0, 0x1 movs r2, 0 - bl sub_801BC68 + bl ItemBattleEffects lsls r0, 24 cmp r0, 0 bne _080183DE @@ -2753,7 +2753,7 @@ _080183E2: ldrb r1, [r6] movs r0, 0x1 movs r2, 0x1 - bl sub_801BC68 + bl ItemBattleEffects lsls r0, 24 cmp r0, 0 bne _080183F6 @@ -2810,7 +2810,7 @@ _08018452: strb r5, [r1, 0x10] ldrb r0, [r4] strb r0, [r1, 0x11] - ldr r0, _08018474 @ =gUnknown_81D8B4D + ldr r0, _08018474 @ =BattleScript_LeechSeedTurnDrain b _08018C04 .align 2, 0 _08018460: .4byte gStatuses3 @@ -2818,7 +2818,7 @@ _08018464: .4byte gBattleMons _08018468: .4byte gBattlerTarget _0801846C: .4byte gBattleMoveDamage _08018470: .4byte gBattleScripting -_08018474: .4byte gUnknown_81D8B4D +_08018474: .4byte BattleScript_LeechSeedTurnDrain _08018478: ldr r2, _080184B4 @ =gBattleMons ldrb r1, [r6] @@ -2850,12 +2850,12 @@ _0801849E: movs r0, 0x1 str r0, [r2] _080184AE: - ldr r0, _080184BC @ =gUnknown_81D9053 + ldr r0, _080184BC @ =BattleScript_PoisonTurnDmg b _08018C04 .align 2, 0 _080184B4: .4byte gBattleMons _080184B8: .4byte gBattleMoveDamage -_080184BC: .4byte gUnknown_81D9053 +_080184BC: .4byte BattleScript_PoisonTurnDmg _080184C0: ldr r4, _08018534 @ =gBattleMons ldrb r0, [r6] @@ -2916,12 +2916,12 @@ _08018518: ldr r1, [r5] muls r0, r1 str r0, [r5] - ldr r0, _0801853C @ =gUnknown_81D9053 + ldr r0, _0801853C @ =BattleScript_PoisonTurnDmg b _08018C04 .align 2, 0 _08018534: .4byte gBattleMons _08018538: .4byte gBattleMoveDamage -_0801853C: .4byte gUnknown_81D9053 +_0801853C: .4byte BattleScript_PoisonTurnDmg _08018540: ldr r2, _0801857C @ =gBattleMons ldrb r1, [r6] @@ -2953,12 +2953,12 @@ _08018566: movs r0, 0x1 str r0, [r2] _08018576: - ldr r0, _08018584 @ =gUnknown_81D9075 + ldr r0, _08018584 @ =BattleScript_BurnTurnDmg b _08018C04 .align 2, 0 _0801857C: .4byte gBattleMons _08018580: .4byte gBattleMoveDamage -_08018584: .4byte gUnknown_81D9075 +_08018584: .4byte BattleScript_BurnTurnDmg _08018588: ldr r4, _080185D4 @ =gBattleMons ldrb r1, [r6] @@ -2998,12 +2998,12 @@ _080185AE: movs r0, 0x1 str r0, [r1] _080185CE: - ldr r0, _080185DC @ =gUnknown_81D9155 + ldr r0, _080185DC @ =BattleScript_NightmareTurnDmg b _08018C04 .align 2, 0 _080185D4: .4byte gBattleMons _080185D8: .4byte gBattleMoveDamage -_080185DC: .4byte gUnknown_81D9155 +_080185DC: .4byte BattleScript_NightmareTurnDmg _080185E0: ldr r0, _080185E8 @ =0xf7ffffff ands r2, r0 @@ -3043,12 +3043,12 @@ _08018614: movs r0, 0x1 str r0, [r2] _08018624: - ldr r0, _08018630 @ =gUnknown_81D9166 + ldr r0, _08018630 @ =BattleScript_CurseTurnDmg b _08018C04 .align 2, 0 _08018628: .4byte gBattleMons _0801862C: .4byte gBattleMoveDamage -_08018630: .4byte gUnknown_81D9166 +_08018630: .4byte BattleScript_CurseTurnDmg _08018634: ldr r3, _080186D4 @ =gBattleMons mov r8, r3 @@ -3116,8 +3116,8 @@ _08018664: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _080186E8 @ =gUnknown_2023D74 - ldr r0, _080186EC @ =gUnknown_81D9124 + ldr r1, _080186E8 @ =gBattlescriptCurrInstr + ldr r0, _080186EC @ =BattleScript_WrapTurnDmg str r0, [r1] ldr r2, _080186F0 @ =gBattleMoveDamage ldrb r0, [r6] @@ -3137,8 +3137,8 @@ _080186D8: .4byte 0xffffe000 _080186DC: .4byte gBattleScripting _080186E0: .4byte gBattleStruct _080186E4: .4byte gBattleTextBuff1 -_080186E8: .4byte gUnknown_2023D74 -_080186EC: .4byte gUnknown_81D9124 +_080186E8: .4byte gBattlescriptCurrInstr +_080186EC: .4byte BattleScript_WrapTurnDmg _080186F0: .4byte gBattleMoveDamage _080186F4: ldr r2, _08018724 @ =gBattleTextBuff1 @@ -3160,8 +3160,8 @@ _080186F4: strb r0, [r2, 0x3] movs r0, 0xFF strb r0, [r2, 0x4] - ldr r1, _0801872C @ =gUnknown_2023D74 - ldr r0, _08018730 @ =gUnknown_81D9136 + ldr r1, _0801872C @ =gBattlescriptCurrInstr + ldr r0, _08018730 @ =BattleScript_WrapEnds str r0, [r1] _08018720: ldr r0, [r1] @@ -3169,8 +3169,8 @@ _08018720: .align 2, 0 _08018724: .4byte gBattleTextBuff1 _08018728: .4byte gBattleStruct -_0801872C: .4byte gUnknown_2023D74 -_08018730: .4byte gUnknown_81D9136 +_0801872C: .4byte gBattlescriptCurrInstr +_08018730: .4byte BattleScript_WrapEnds _08018734: movs r0, 0x8 negs r0, r0 @@ -3186,10 +3186,10 @@ _08018734: ldr r1, _08018784 @ =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r1, _08018788 @ =gUnknown_2023E82 + ldr r1, _08018788 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] - ldr r0, _0801878C @ =gUnknown_81D904A + ldr r0, _0801878C @ =BattleScript_MonWokeUpInUproar bl BattleScriptExecute ldr r4, _08018790 @ =gActiveBattler ldrb r0, [r6] @@ -3206,12 +3206,12 @@ _08018734: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _080187FC .align 2, 0 _08018784: .4byte 0xf7ffffff -_08018788: .4byte gUnknown_2023E82 -_0801878C: .4byte gUnknown_81D904A +_08018788: .4byte gBattleCommunication +_0801878C: .4byte BattleScript_MonWokeUpInUproar _08018790: .4byte gActiveBattler _08018794: ldr r2, _08018810 @ =gBattleMons @@ -3305,14 +3305,14 @@ _0801881C: beq _08018860 ldrb r0, [r5] bl CancelMultiTurnMoves - ldr r1, _0801885C @ =gUnknown_2023E82 + ldr r1, _0801885C @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08018894 .align 2, 0 _08018854: .4byte gActiveBattler _08018858: .4byte gBattleMons -_0801885C: .4byte gUnknown_2023E82 +_0801885C: .4byte gBattleCommunication _08018860: ldrb r3, [r5] adds r0, r3, 0 @@ -3323,7 +3323,7 @@ _08018860: ands r0, r1 cmp r0, 0 beq _08018888 - ldr r0, _08018884 @ =gUnknown_2023E82 + ldr r0, _08018884 @ =gBattleCommunication strb r4, [r0, 0x5] ldr r0, [r2] movs r1, 0x80 @@ -3332,15 +3332,15 @@ _08018860: str r0, [r2] b _08018894 .align 2, 0 -_08018884: .4byte gUnknown_2023E82 +_08018884: .4byte gBattleCommunication _08018888: - ldr r1, _080188A8 @ =gUnknown_2023E82 + ldr r1, _080188A8 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] adds r0, r3, 0 bl CancelMultiTurnMoves _08018894: - ldr r0, _080188AC @ =gUnknown_81D90BC + ldr r0, _080188AC @ =BattleScript_PrintUproarOverTurns bl BattleScriptExecute movs r5, 0x1 mov r9, r5 @@ -3352,8 +3352,8 @@ _0801889E: _080188A6: b _08018C12 .align 2, 0 -_080188A8: .4byte gUnknown_2023E82 -_080188AC: .4byte gUnknown_81D90BC +_080188A8: .4byte gBattleCommunication +_080188AC: .4byte BattleScript_PrintUproarOverTurns _080188B0: ldr r1, _080188E8 @ =gBattleMons ldrb r0, [r6] @@ -3416,12 +3416,12 @@ _0801890E: beq _08018926 b _08018C12 _08018926: - ldr r1, _08018950 @ =gUnknown_2023E82 + ldr r1, _08018950 @ =gBattleCommunication movs r0, 0x47 strb r0, [r1, 0x3] movs r0, 0x1 movs r1, 0 - bl sub_801FF20 + bl SetMoveEffect ldrb r0, [r6] muls r0, r7 adds r0, r5 @@ -3431,13 +3431,13 @@ _08018926: bne _08018944 b _08018C08 _08018944: - ldr r0, _08018954 @ =gUnknown_81D90C5 + ldr r0, _08018954 @ =BattleScript_ThrashConfuses bl BattleScriptExecute b _08018C08 .align 2, 0 _0801894C: .4byte 0xffffefff -_08018950: .4byte gUnknown_2023E82 -_08018954: .4byte gUnknown_81D90C5 +_08018950: .4byte gBattleCommunication +_08018954: .4byte BattleScript_ThrashConfuses _08018958: ldr r0, _080189D8 @ =gDisableStructs ldrb r3, [r6] @@ -3536,10 +3536,10 @@ _08018A08: lsls r0, 2 adds r0, r7 strh r2, [r0, 0x4] - ldr r0, _08018A18 @ =gUnknown_81D8C5E + ldr r0, _08018A18 @ =BattleScript_DisabledNoMore b _08018C04 .align 2, 0 -_08018A18: .4byte gUnknown_81D8C5E +_08018A18: .4byte BattleScript_DisabledNoMore _08018A1C: ldr r3, _08018A68 @ =gDisableStructs ldrb r1, [r6] @@ -3628,10 +3628,10 @@ _08018AA6: adds r0, r4, 0 ands r0, r2 strb r0, [r1, 0xE] - ldr r0, _08018ACC @ =gUnknown_81D8C65 + ldr r0, _08018ACC @ =BattleScript_EncoredNoMore b _08018C04 .align 2, 0 -_08018ACC: .4byte gUnknown_81D8C65 +_08018ACC: .4byte BattleScript_EncoredNoMore _08018AD0: ldr r0, _08018AEC @ =gStatuses3 ldrb r1, [r6] @@ -3779,11 +3779,11 @@ _08018B6C: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r6] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec ldr r1, _08018C2C @ =gEffectBattler ldrb r0, [r6] strb r0, [r1] - ldr r0, _08018C30 @ =gUnknown_81D91C7 + ldr r0, _08018C30 @ =BattleScript_YawnMakesAsleep _08018C04: bl BattleScriptExecute _08018C08: @@ -3805,7 +3805,7 @@ _08018C20: .4byte gStatuses3 _08018C24: .4byte 0xfffff800 _08018C28: .4byte gBattleMons _08018C2C: .4byte gEffectBattler -_08018C30: .4byte gUnknown_81D91C7 +_08018C30: .4byte BattleScript_YawnMakesAsleep _08018C34: .4byte gBattleStruct _08018C38: ldr r1, [r7] @@ -3838,7 +3838,7 @@ _08018C62: bhi _08018C6C bl _0801829C _08018C6C: - ldr r0, _08018C90 @ =gUnknown_2023DD0 + ldr r0, _08018C90 @ =gHitMarker ldr r1, [r0] ldr r2, _08018C94 @ =0xfeffffdf ands r1, r2 @@ -3856,18 +3856,18 @@ _08018C78: .align 2, 0 _08018C88: .4byte gBattleStruct _08018C8C: .4byte gBattlersCount -_08018C90: .4byte gUnknown_2023DD0 +_08018C90: .4byte gHitMarker _08018C94: .4byte 0xfeffffdf - thumb_func_end TurnBasedEffects + thumb_func_end DoBattlerEndTurnEffects - thumb_func_start sub_8018C98 -sub_8018C98: @ 8018C98 + thumb_func_start HandleWishPerishSongOnTurnEnd +HandleWishPerishSongOnTurnEnd: @ 8018C98 push {r4-r7,lr} mov r7, r10 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _08018CC8 @ =gUnknown_2023DD0 + ldr r2, _08018CC8 @ =gHitMarker ldr r0, [r2] ldr r1, _08018CCC @ =0x01000020 orrs r0, r1 @@ -3887,7 +3887,7 @@ sub_8018C98: @ 8018C98 _08018CC4: b _08018F68 .align 2, 0 -_08018CC8: .4byte gUnknown_2023DD0 +_08018CC8: .4byte gHitMarker _08018CCC: .4byte 0x01000020 _08018CD0: .4byte gBattleStruct _08018CD4: @@ -3903,7 +3903,7 @@ _08018CD4: _08018CE6: ldr r4, _08018D28 @ =gActiveBattler ldr r5, _08018D2C @ =gBattleTextBuff1 - ldr r6, _08018D30 @ =gUnknown_2023F20 + ldr r6, _08018D30 @ =gWishFutureKnock movs r0, 0x8 adds r0, r6 mov r10, r0 @@ -3936,7 +3936,7 @@ _08018D20: .4byte 0x00000181 _08018D24: .4byte gBattlersCount _08018D28: .4byte gActiveBattler _08018D2C: .4byte gBattleTextBuff1 -_08018D30: .4byte gUnknown_2023F20 +_08018D30: .4byte gWishFutureKnock _08018D34: .4byte gBattlerTarget _08018D38: .4byte gAbsentBattlerFlags _08018D3C: .4byte gBitTable @@ -3944,7 +3944,7 @@ _08018D40: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] - ldr r1, _08018D80 @ =gUnknown_2023F20 + ldr r1, _08018D80 @ =gWishFutureKnock ldrb r0, [r4] adds r1, r0, r1 ldrb r0, [r1] @@ -3969,15 +3969,15 @@ _08018D40: ldrh r0, [r0] cmp r0, 0xF8 bne _08018D8C - ldr r0, _08018D88 @ =gUnknown_2023E82 + ldr r0, _08018D88 @ =gBattleCommunication strb r3, [r0, 0x5] b _08018D92 .align 2, 0 -_08018D80: .4byte gUnknown_2023F20 +_08018D80: .4byte gWishFutureKnock _08018D84: .4byte gBattleMons -_08018D88: .4byte gUnknown_2023E82 +_08018D88: .4byte gBattleCommunication _08018D8C: - ldr r1, _08018DEC @ =gUnknown_2023E82 + ldr r1, _08018DEC @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _08018D92: @@ -4013,7 +4013,7 @@ _08018D92: add r0, r10 ldr r0, [r0] str r0, [r1] - ldr r2, _08018DF8 @ =gUnknown_2023ECC + ldr r2, _08018DF8 @ =gSpecialStatuses mov r3, r9 ldrb r1, [r3] lsls r0, r1, 2 @@ -4023,15 +4023,15 @@ _08018D92: adds r0, r2 ldr r1, _08018DFC @ =0x0000ffff str r1, [r0] - ldr r0, _08018E00 @ =gUnknown_81D8E12 + ldr r0, _08018E00 @ =BattleScript_MonTookFutureAttack b _08018F44 .align 2, 0 -_08018DEC: .4byte gUnknown_2023E82 +_08018DEC: .4byte gBattleCommunication _08018DF0: .4byte gBattlerAttacker _08018DF4: .4byte gBattleMoveDamage -_08018DF8: .4byte gUnknown_2023ECC +_08018DF8: .4byte gSpecialStatuses _08018DFC: .4byte 0x0000ffff -_08018E00: .4byte gUnknown_81D8E12 +_08018E00: .4byte BattleScript_MonTookFutureAttack _08018E04: ldr r0, [r7] ldr r2, _08018E7C @ =0x00000181 @@ -4074,7 +4074,7 @@ _08018E42: ldr r0, _08018E90 @ =gBattlerAttacker mov r9, r0 _08018E4E: - ldr r1, _08018E94 @ =gUnknown_2023BDE + ldr r1, _08018E94 @ =gBattlerByTurnOrder ldr r0, [r3] adds r3, r0, r2 ldrb r0, [r3] @@ -4104,7 +4104,7 @@ _08018E84: .4byte gActiveBattler _08018E88: .4byte gBattleTextBuff1 _08018E8C: .4byte gDisableStructs _08018E90: .4byte gBattlerAttacker -_08018E94: .4byte gUnknown_2023BDE +_08018E94: .4byte gBattlerByTurnOrder _08018E98: .4byte gAbsentBattlerFlags _08018E9C: .4byte gBitTable _08018EA0: @@ -4162,15 +4162,15 @@ _08018EA0: adds r0, r2 ldrh r0, [r0, 0x28] str r0, [r3] - ldr r1, _08018F20 @ =gUnknown_2023D74 - ldr r0, _08018F24 @ =gUnknown_81D8D33 + ldr r1, _08018F20 @ =gBattlescriptCurrInstr + ldr r0, _08018F24 @ =BattleScript_PerishSongTakesLife b _08018F40 .align 2, 0 _08018F14: .4byte gStatuses3 _08018F18: .4byte gBattleMoveDamage _08018F1C: .4byte gBattleMons -_08018F20: .4byte gUnknown_2023D74 -_08018F24: .4byte gUnknown_81D8D33 +_08018F20: .4byte gBattlescriptCurrInstr +_08018F24: .4byte BattleScript_PerishSongTakesLife _08018F28: lsrs r1, 28 subs r1, 0x1 @@ -4182,8 +4182,8 @@ _08018F28: ands r0, r3 orrs r0, r1 strb r0, [r4, 0xF] - ldr r1, _08018F4C @ =gUnknown_2023D74 - ldr r0, _08018F50 @ =gUnknown_81D8D4E + ldr r1, _08018F4C @ =gBattlescriptCurrInstr + ldr r0, _08018F50 @ =BattleScript_PerishSongCountGoesDown _08018F40: str r0, [r1] ldr r0, [r1] @@ -4192,8 +4192,8 @@ _08018F44: movs r0, 0x1 b _08018F74 .align 2, 0 -_08018F4C: .4byte gUnknown_2023D74 -_08018F50: .4byte gUnknown_81D8D4E +_08018F4C: .4byte gBattlescriptCurrInstr +_08018F50: .4byte BattleScript_PerishSongCountGoesDown _08018F54: adds r3, r7, 0 ldr r0, [r3] @@ -4206,7 +4206,7 @@ _08018F54: bcs _08018F68 b _08018E4E _08018F68: - ldr r2, _08018F88 @ =gUnknown_2023DD0 + ldr r2, _08018F88 @ =gHitMarker ldr r0, [r2] ldr r1, _08018F8C @ =0xfeffffdf ands r0, r1 @@ -4222,9 +4222,9 @@ _08018F74: bx r1 .align 2, 0 _08018F84: .4byte 0x00000181 -_08018F88: .4byte gUnknown_2023DD0 +_08018F88: .4byte gHitMarker _08018F8C: .4byte 0xfeffffdf - thumb_func_end sub_8018C98 + thumb_func_end HandleWishPerishSongOnTurnEnd thumb_func_start HandleFaintedMonActions HandleFaintedMonActions: @ 8018F90 @@ -4242,16 +4242,16 @@ HandleFaintedMonActions: @ 8018F90 .align 2, 0 _08018FA8: .4byte gBattleTypeFlags _08018FAC: - ldr r0, _08018FBC @ =gUnknown_81D8694 + ldr r0, _08018FBC @ =BattleScript_GiveExp bl BattleScriptExecute ldr r0, [r5] adds r0, 0x4D movs r1, 0x2 b _08018FCC .align 2, 0 -_08018FBC: .4byte gUnknown_81D8694 +_08018FBC: .4byte BattleScript_GiveExp _08018FC0: - ldr r0, _08018FD4 @ =gUnknown_81D869D + ldr r0, _08018FD4 @ =BattleScript_HandleFaintedMon bl BattleScriptExecute ldr r0, [r5] adds r0, 0x4D @@ -4262,7 +4262,7 @@ _08018FCE: movs r0, 0x1 b _08019274 .align 2, 0 -_08018FD4: .4byte gUnknown_81D869D +_08018FD4: .4byte BattleScript_HandleFaintedMon _08018FD8: ldr r0, _08018FF4 @ =gBattleStruct mov r8, r0 @@ -4323,7 +4323,7 @@ _0801903C: lsrs r0, 24 movs r1, 0x6 movs r2, 0x6 - bl sub_8019C10 + bl HasNoMonsToSwitch lsls r0, 24 cmp r0, 0 bne _08019064 @@ -4339,7 +4339,7 @@ _08019064: _0801906E: ldr r0, _080190F4 @ =gBattleStruct mov r8, r0 - ldr r1, _080190F8 @ =gUnknown_2023D6D + ldr r1, _080190F8 @ =gBattlerFainted mov r12, r1 ldr r2, _080190FC @ =gBattlerTarget mov r5, r8 @@ -4405,12 +4405,12 @@ _080190E8: .4byte gBattlersCount _080190EC: .4byte gAbsentBattlerFlags _080190F0: .4byte gBitTable _080190F4: .4byte gBattleStruct -_080190F8: .4byte gUnknown_2023D6D +_080190F8: .4byte gBattlerFainted _080190FC: .4byte gBattlerTarget _08019100: .4byte gBattleMons _08019104: .4byte gBattlerPartyIndexes _08019108: - ldr r0, _08019134 @ =gUnknown_2023D6D + ldr r0, _08019134 @ =gBattlerFainted ldrb r0, [r0] bl sub_8017434 ldr r2, _08019138 @ =gBattleStruct @@ -4431,7 +4431,7 @@ _08019108: strb r1, [r0] b _08019262 .align 2, 0 -_08019134: .4byte gUnknown_2023D6D +_08019134: .4byte gBattlerFainted _08019138: .4byte gBattleStruct _0801913C: .4byte gBattlersCount _08019140: @@ -4452,7 +4452,7 @@ _0801914A: adds r0, 0x1 strb r0, [r1] _0801915E: - ldr r0, _080191AC @ =gUnknown_2023D6D + ldr r0, _080191AC @ =gBattlerFainted mov r12, r0 ldr r7, _080191B0 @ =gBattlerTarget ldr r5, _080191B4 @ =gBattleStruct @@ -4493,7 +4493,7 @@ _08019198: bne _0801916A b _080191E0 .align 2, 0 -_080191AC: .4byte gUnknown_2023D6D +_080191AC: .4byte gBattlerFainted _080191B0: .4byte gBattlerTarget _080191B4: .4byte gBattleStruct _080191B8: .4byte gBattleMons @@ -4557,7 +4557,7 @@ _0801922C: movs r0, 0x1 movs r1, 0 movs r2, 0x1 - bl sub_801BC68 + bl ItemBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -4616,7 +4616,7 @@ TryClearRageStatuses: @ 8019284 ldr r4, _080192C8 @ =gUnknown_2023DC4 movs r6, 0x80 lsls r6, 16 - ldr r2, _080192CC @ =gUnknown_2023C34 + ldr r2, _080192CC @ =gChosenMoveByBattler _0801929A: ldr r1, [r2] adds r0, r1, 0 @@ -4643,12 +4643,12 @@ _080192BC: .align 2, 0 _080192C4: .4byte gBattlersCount _080192C8: .4byte gUnknown_2023DC4 -_080192CC: .4byte gUnknown_2023C34 +_080192CC: .4byte gChosenMoveByBattler _080192D0: .4byte 0xff7fffff thumb_func_end TryClearRageStatuses - thumb_func_start sub_80192D4 -sub_80192D4: @ 80192D4 + thumb_func_start AtkCanceller_UnableToUseMove +AtkCanceller_UnableToUseMove: @ 80192D4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -4776,11 +4776,11 @@ _080193C4: ands r0, r1 str r0, [r2] bl BattleScriptPushCursor - ldr r1, _08019418 @ =gUnknown_2023E82 + ldr r1, _08019418 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] - ldr r1, _0801941C @ =gUnknown_2023D74 - ldr r0, _08019420 @ =gUnknown_81D9036 + ldr r1, _0801941C @ =gBattlescriptCurrInstr + ldr r0, _08019420 @ =BattleScript_MoveUsedWokeUp str r0, [r1] movs r4, 0x2 mov r9, r4 @@ -4789,9 +4789,9 @@ _080193C4: _0801940C: .4byte gBattleMons _08019410: .4byte gBattlerAttacker _08019414: .4byte 0xf7ffffff -_08019418: .4byte gUnknown_2023E82 -_0801941C: .4byte gUnknown_2023D74 -_08019420: .4byte gUnknown_81D9036 +_08019418: .4byte gBattleCommunication +_0801941C: .4byte gBattlescriptCurrInstr +_08019420: .4byte BattleScript_MoveUsedWokeUp _08019424: ldrb r0, [r4] adds r1, r0, 0 @@ -4843,10 +4843,10 @@ _08019478: bne _0801947E b _08019946 _0801947E: - ldr r1, _080194A4 @ =gUnknown_2023D74 - ldr r0, _080194A8 @ =gUnknown_81D9029 + ldr r1, _080194A4 @ =gBattlescriptCurrInstr + ldr r0, _080194A8 @ =BattleScript_MoveUsedIsAsleep str r0, [r1] - ldr r2, _080194AC @ =gUnknown_2023DD0 + ldr r2, _080194AC @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4859,9 +4859,9 @@ _0801947E: _08019498: .4byte gBattleMons _0801949C: .4byte gBattlerAttacker _080194A0: .4byte gCurrentMove -_080194A4: .4byte gUnknown_2023D74 -_080194A8: .4byte gUnknown_81D9029 -_080194AC: .4byte gUnknown_2023DD0 +_080194A4: .4byte gBattlescriptCurrInstr +_080194A8: .4byte BattleScript_MoveUsedIsAsleep +_080194AC: .4byte gHitMarker _080194B0: adds r2, 0x50 adds r2, r1, r2 @@ -4870,19 +4870,19 @@ _080194B0: ands r0, r1 str r0, [r2] bl BattleScriptPushCursor - ldr r0, _080194D4 @ =gUnknown_2023E82 + ldr r0, _080194D4 @ =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, _080194D8 @ =gUnknown_2023D74 - ldr r0, _080194DC @ =gUnknown_81D9036 + ldr r1, _080194D8 @ =gBattlescriptCurrInstr + ldr r0, _080194DC @ =BattleScript_MoveUsedWokeUp str r0, [r1] movs r1, 0x2 mov r9, r1 b _08019946 .align 2, 0 _080194D0: .4byte 0xf7ffffff -_080194D4: .4byte gUnknown_2023E82 -_080194D8: .4byte gUnknown_2023D74 -_080194DC: .4byte gUnknown_81D9036 +_080194D4: .4byte gBattleCommunication +_080194D8: .4byte gBattlescriptCurrInstr +_080194DC: .4byte BattleScript_MoveUsedWokeUp _080194E0: ldr r1, _0801953C @ =gBattleMons ldr r7, _08019540 @ =gBattlerAttacker @@ -4918,10 +4918,10 @@ _080194E0: bne _08019526 b _08019946 _08019526: - ldr r1, _0801954C @ =gUnknown_2023D74 - ldr r0, _08019550 @ =gUnknown_81D9080 + ldr r1, _0801954C @ =gBattlescriptCurrInstr + ldr r0, _08019550 @ =BattleScript_MoveUsedIsFrozen str r0, [r1] - ldr r2, _08019554 @ =gUnknown_2023DD0 + ldr r2, _08019554 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 2 @@ -4933,9 +4933,9 @@ _0801953C: .4byte gBattleMons _08019540: .4byte gBattlerAttacker _08019544: .4byte gBattleMoves _08019548: .4byte gCurrentMove -_0801954C: .4byte gUnknown_2023D74 -_08019550: .4byte gUnknown_81D9080 -_08019554: .4byte gUnknown_2023DD0 +_0801954C: .4byte gBattlescriptCurrInstr +_08019550: .4byte BattleScript_MoveUsedIsFrozen +_08019554: .4byte gHitMarker _08019558: ldrb r0, [r7] adds r2, r0, 0 @@ -4947,10 +4947,10 @@ _08019558: ands r0, r1 str r0, [r2] bl BattleScriptPushCursor - ldr r1, _08019588 @ =gUnknown_2023D74 - ldr r0, _0801958C @ =gUnknown_81D908D + ldr r1, _08019588 @ =gBattlescriptCurrInstr + ldr r0, _0801958C @ =BattleScript_MoveUsedUnfroze str r0, [r1] - ldr r0, _08019590 @ =gUnknown_2023E82 + ldr r0, _08019590 @ =gBattleCommunication strb r4, [r0, 0x5] _08019578: movs r2, 0x2 @@ -4962,9 +4962,9 @@ _08019580: ldr r1, [r7] b _08019B90 .align 2, 0 -_08019588: .4byte gUnknown_2023D74 -_0801958C: .4byte gUnknown_81D908D -_08019590: .4byte gUnknown_2023E82 +_08019588: .4byte gBattlescriptCurrInstr +_0801958C: .4byte BattleScript_MoveUsedUnfroze +_08019590: .4byte gBattleCommunication _08019594: .4byte gBattleStruct _08019598: ldr r1, _080195EC @ =gBattleMons @@ -4992,17 +4992,17 @@ _080195AE: _080195C2: adds r0, r2, 0 bl CancelMultiTurnMoves - ldr r2, _080195F8 @ =gUnknown_2023DD0 + ldr r2, _080195F8 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] - ldr r1, _080195FC @ =gUnknown_2023E82 + ldr r1, _080195FC @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] - ldr r1, _08019600 @ =gUnknown_2023D74 - ldr r0, _08019604 @ =gUnknown_81D94F2 + ldr r1, _08019600 @ =gBattlescriptCurrInstr + ldr r0, _08019604 @ =BattleScript_MoveUsedLoafingAround str r0, [r1] ldr r2, _08019608 @ =gMoveResultFlags ldrb r0, [r2] @@ -5014,10 +5014,10 @@ _080195C2: _080195EC: .4byte gBattleMons _080195F0: .4byte gBattlerAttacker _080195F4: .4byte gDisableStructs -_080195F8: .4byte gUnknown_2023DD0 -_080195FC: .4byte gUnknown_2023E82 -_08019600: .4byte gUnknown_2023D74 -_08019604: .4byte gUnknown_81D94F2 +_080195F8: .4byte gHitMarker +_080195FC: .4byte gBattleCommunication +_08019600: .4byte gBattlescriptCurrInstr +_08019604: .4byte BattleScript_MoveUsedLoafingAround _08019608: .4byte gMoveResultFlags _0801960C: ldr r1, _0801965C @ =gBattleMons @@ -5048,10 +5048,10 @@ _08019628: strb r1, [r0, 0x19] ldrb r0, [r3] bl CancelMultiTurnMoves - ldr r1, _0801966C @ =gUnknown_2023D74 - ldr r0, _08019670 @ =gUnknown_81D7342 + ldr r1, _0801966C @ =gBattlescriptCurrInstr + ldr r0, _08019670 @ =BattleScript_MoveUsedMustRecharge str r0, [r1] - ldr r2, _08019674 @ =gUnknown_2023DD0 + ldr r2, _08019674 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -5065,9 +5065,9 @@ _0801965C: .4byte gBattleMons _08019660: .4byte gBattlerAttacker _08019664: .4byte 0xffbfffff _08019668: .4byte gDisableStructs -_0801966C: .4byte gUnknown_2023D74 -_08019670: .4byte gUnknown_81D7342 -_08019674: .4byte gUnknown_2023DD0 +_0801966C: .4byte gBattlescriptCurrInstr +_08019670: .4byte BattleScript_MoveUsedMustRecharge +_08019674: .4byte gHitMarker _08019678: ldr r1, _080196C8 @ =gBattleMons ldr r3, _080196CC @ =gBattlerAttacker @@ -5087,7 +5087,7 @@ _08019692: negs r0, r0 ands r1, r0 str r1, [r2] - ldr r0, _080196D0 @ =gUnknown_2023E8C + ldr r0, _080196D0 @ =gProtectStructs ldrb r2, [r3] lsls r2, 4 adds r2, r0 @@ -5097,10 +5097,10 @@ _08019692: strb r0, [r2, 0x2] ldrb r0, [r3] bl CancelMultiTurnMoves - ldr r1, _080196D4 @ =gUnknown_2023D74 - ldr r0, _080196D8 @ =gUnknown_81D90B1 + ldr r1, _080196D4 @ =gBattlescriptCurrInstr + ldr r0, _080196D8 @ =BattleScript_MoveUsedFlinched str r0, [r1] - ldr r2, _080196DC @ =gUnknown_2023DD0 + ldr r2, _080196DC @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -5112,10 +5112,10 @@ _08019692: .align 2, 0 _080196C8: .4byte gBattleMons _080196CC: .4byte gBattlerAttacker -_080196D0: .4byte gUnknown_2023E8C -_080196D4: .4byte gUnknown_2023D74 -_080196D8: .4byte gUnknown_81D90B1 -_080196DC: .4byte gUnknown_2023DD0 +_080196D0: .4byte gProtectStructs +_080196D4: .4byte gBattlescriptCurrInstr +_080196D8: .4byte BattleScript_MoveUsedFlinched +_080196DC: .4byte gHitMarker _080196E0: ldr r0, _08019734 @ =gDisableStructs ldr r3, _08019738 @ =gBattlerAttacker @@ -5135,7 +5135,7 @@ _080196FA: bne _08019700 b _08019946 _08019700: - ldr r0, _08019740 @ =gUnknown_2023E8C + ldr r0, _08019740 @ =gProtectStructs lsls r2, 4 adds r2, r0 ldrb r0, [r2, 0x1] @@ -5147,10 +5147,10 @@ _08019700: strb r0, [r1, 0x17] ldrb r0, [r3] bl CancelMultiTurnMoves - ldr r1, _08019748 @ =gUnknown_2023D74 - ldr r0, _0801974C @ =gUnknown_81D8C4F + ldr r1, _08019748 @ =gBattlescriptCurrInstr + ldr r0, _0801974C @ =BattleScript_MoveUsedIsDisabled str r0, [r1] - ldr r2, _08019750 @ =gUnknown_2023DD0 + ldr r2, _08019750 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -5163,11 +5163,11 @@ _08019700: _08019734: .4byte gDisableStructs _08019738: .4byte gBattlerAttacker _0801973C: .4byte gCurrentMove -_08019740: .4byte gUnknown_2023E8C +_08019740: .4byte gProtectStructs _08019744: .4byte gBattleScripting -_08019748: .4byte gUnknown_2023D74 -_0801974C: .4byte gUnknown_81D8C4F -_08019750: .4byte gUnknown_2023DD0 +_08019748: .4byte gBattlescriptCurrInstr +_0801974C: .4byte BattleScript_MoveUsedIsDisabled +_08019750: .4byte gHitMarker _08019754: ldr r0, _0801979C @ =gDisableStructs ldr r4, _080197A0 @ =gBattlerAttacker @@ -5194,7 +5194,7 @@ _0801976C: beq _08019782 b _08019946 _08019782: - ldr r0, _080197AC @ =gUnknown_2023E8C + ldr r0, _080197AC @ =gProtectStructs lsls r2, r3, 4 adds r2, r0 ldrb r0, [r2, 0x2] @@ -5203,17 +5203,17 @@ _08019782: strb r0, [r2, 0x2] ldrb r0, [r4] bl CancelMultiTurnMoves - ldr r1, _080197B0 @ =gUnknown_2023D74 - ldr r0, _080197B4 @ =gUnknown_81D8ECA + ldr r1, _080197B0 @ =gBattlescriptCurrInstr + ldr r0, _080197B4 @ =BattleScript_MoveUsedIsTaunted b _08019934 .align 2, 0 _0801979C: .4byte gDisableStructs _080197A0: .4byte gBattlerAttacker _080197A4: .4byte gBattleMoves _080197A8: .4byte gCurrentMove -_080197AC: .4byte gUnknown_2023E8C -_080197B0: .4byte gUnknown_2023D74 -_080197B4: .4byte gUnknown_81D8ECA +_080197AC: .4byte gProtectStructs +_080197B0: .4byte gBattlescriptCurrInstr +_080197B4: .4byte BattleScript_MoveUsedIsTaunted _080197B8: ldr r4, _080197FC @ =gBattlerAttacker ldrb r0, [r4] @@ -5225,7 +5225,7 @@ _080197B8: bne _080197CC b _08019946 _080197CC: - ldr r0, _08019804 @ =gUnknown_2023E8C + ldr r0, _08019804 @ =gProtectStructs ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -5235,10 +5235,10 @@ _080197CC: strb r0, [r2, 0x1] ldrb r0, [r4] bl CancelMultiTurnMoves - ldr r1, _08019808 @ =gUnknown_2023D74 - ldr r0, _0801980C @ =gUnknown_81D8F94 + ldr r1, _08019808 @ =gBattlescriptCurrInstr + ldr r0, _0801980C @ =BattleScript_MoveUsedIsImprisoned str r0, [r1] - ldr r2, _08019810 @ =gUnknown_2023DD0 + ldr r2, _08019810 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -5251,10 +5251,10 @@ _080197F4: .align 2, 0 _080197FC: .4byte gBattlerAttacker _08019800: .4byte gCurrentMove -_08019804: .4byte gUnknown_2023E8C -_08019808: .4byte gUnknown_2023D74 -_0801980C: .4byte gUnknown_81D8F94 -_08019810: .4byte gUnknown_2023DD0 +_08019804: .4byte gProtectStructs +_08019808: .4byte gBattlescriptCurrInstr +_0801980C: .4byte BattleScript_MoveUsedIsImprisoned +_08019810: .4byte gHitMarker _08019814: ldr r7, _0801985C @ =gBattleMons ldr r5, _08019860 @ =gBattlerAttacker @@ -5285,7 +5285,7 @@ _08019814: ands r2, r0 cmp r2, 0 beq _08019868 - ldr r1, _08019864 @ =gUnknown_2023E82 + ldr r1, _08019864 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] bl BattleScriptPushCursor @@ -5293,9 +5293,9 @@ _08019814: .align 2, 0 _0801985C: .4byte gBattleMons _08019860: .4byte gBattlerAttacker -_08019864: .4byte gUnknown_2023E82 +_08019864: .4byte gBattleCommunication _08019868: - ldr r0, _080198B8 @ =gUnknown_2023E82 + ldr r0, _080198B8 @ =gBattleCommunication movs r4, 0x1 strb r1, [r0, 0x5] ldr r1, _080198BC @ =gBattlerTarget @@ -5318,35 +5318,35 @@ _08019868: bl CalculateBaseDamage ldr r1, _080198C0 @ =gBattleMoveDamage str r0, [r1] - ldr r0, _080198C4 @ =gUnknown_2023E8C + ldr r0, _080198C4 @ =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 ldrb r0, [r1, 0x1] orrs r0, r4 strb r0, [r1, 0x1] - ldr r2, _080198C8 @ =gUnknown_2023DD0 + ldr r2, _080198C8 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] _080198B2: - ldr r1, _080198CC @ =gUnknown_2023D74 - ldr r0, _080198D0 @ =gUnknown_81D90D3 + ldr r1, _080198CC @ =gBattlescriptCurrInstr + ldr r0, _080198D0 @ =BattleScript_MoveUsedIsConfused b _080198DC .align 2, 0 -_080198B8: .4byte gUnknown_2023E82 +_080198B8: .4byte gBattleCommunication _080198BC: .4byte gBattlerTarget _080198C0: .4byte gBattleMoveDamage -_080198C4: .4byte gUnknown_2023E8C -_080198C8: .4byte gUnknown_2023DD0 -_080198CC: .4byte gUnknown_2023D74 -_080198D0: .4byte gUnknown_81D90D3 +_080198C4: .4byte gProtectStructs +_080198C8: .4byte gHitMarker +_080198CC: .4byte gBattlescriptCurrInstr +_080198D0: .4byte BattleScript_MoveUsedIsConfused _080198D4: bl BattleScriptPushCursor - ldr r1, _080198EC @ =gUnknown_2023D74 - ldr r0, _080198F0 @ =gUnknown_81D9116 + ldr r1, _080198EC @ =gBattlescriptCurrInstr + ldr r0, _080198F0 @ =BattleScript_MoveUsedIsConfusedNoMore _080198DC: str r0, [r1] movs r1, 0x1 @@ -5358,8 +5358,8 @@ _080198E6: ldr r1, [r4] b _08019B90 .align 2, 0 -_080198EC: .4byte gUnknown_2023D74 -_080198F0: .4byte gUnknown_81D9116 +_080198EC: .4byte gBattlescriptCurrInstr +_080198F0: .4byte BattleScript_MoveUsedIsConfusedNoMore _080198F4: .4byte gBattleStruct _080198F8: ldr r1, _08019958 @ =gBattleMons @@ -5381,7 +5381,7 @@ _080198F8: ands r1, r0 cmp r1, 0 bne _08019946 - ldr r0, _08019960 @ =gUnknown_2023E8C + ldr r0, _08019960 @ =gProtectStructs ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -5389,11 +5389,11 @@ _080198F8: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _08019964 @ =gUnknown_2023D74 - ldr r0, _08019968 @ =gUnknown_81D90A1 + ldr r1, _08019964 @ =gBattlescriptCurrInstr + ldr r0, _08019968 @ =BattleScript_MoveUsedIsParalyzed _08019934: str r0, [r1] - ldr r2, _0801996C @ =gUnknown_2023DD0 + ldr r2, _0801996C @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -5413,10 +5413,10 @@ _08019946: .align 2, 0 _08019958: .4byte gBattleMons _0801995C: .4byte gBattlerAttacker -_08019960: .4byte gUnknown_2023E8C -_08019964: .4byte gUnknown_2023D74 -_08019968: .4byte gUnknown_81D90A1 -_0801996C: .4byte gUnknown_2023DD0 +_08019960: .4byte gProtectStructs +_08019964: .4byte gBattlescriptCurrInstr +_08019968: .4byte BattleScript_MoveUsedIsParalyzed +_0801996C: .4byte gHitMarker _08019970: .4byte gBattleStruct _08019974: ldr r0, _0801999C @ =gBattleTypeFlags @@ -5436,28 +5436,28 @@ _08019988: lsls r0, 24 cmp r0, 0 bne _080199AC - ldr r1, _080199A4 @ =gUnknown_2023D74 + ldr r1, _080199A4 @ =gBattlescriptCurrInstr ldr r0, _080199A8 @ =gUnknown_81D9180 b _080199B0 .align 2, 0 _0801999C: .4byte gBattleTypeFlags _080199A0: .4byte gBattlerAttacker -_080199A4: .4byte gUnknown_2023D74 +_080199A4: .4byte gBattlescriptCurrInstr _080199A8: .4byte gUnknown_81D9180 _080199AC: - ldr r1, _080199BC @ =gUnknown_2023D74 + ldr r1, _080199BC @ =gBattlescriptCurrInstr ldr r0, _080199C0 @ =gUnknown_81D9192 _080199B0: str r0, [r1] - ldr r1, _080199C4 @ =gUnknown_2023E82 + ldr r1, _080199C4 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] movs r0, 0x1 b _08019B86 .align 2, 0 -_080199BC: .4byte gUnknown_2023D74 +_080199BC: .4byte gBattlescriptCurrInstr _080199C0: .4byte gUnknown_81D9192 -_080199C4: .4byte gUnknown_2023E82 +_080199C4: .4byte gBattleCommunication _080199C8: ldr r1, _08019A00 @ =gBattleMons ldr r4, _08019A04 @ =gBattlerAttacker @@ -5488,15 +5488,15 @@ _08019A00: .4byte gBattleMons _08019A04: .4byte gBattlerAttacker _08019A08: .4byte gBattleScripting _08019A0C: - ldr r0, _08019A48 @ =gUnknown_81D914A + ldr r0, _08019A48 @ =BattleScript_MoveUsedIsInLoveCantAttack bl BattleScriptPush - ldr r2, _08019A4C @ =gUnknown_2023DD0 + ldr r2, _08019A4C @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] - ldr r0, _08019A50 @ =gUnknown_2023E8C + ldr r0, _08019A50 @ =gProtectStructs ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -5507,8 +5507,8 @@ _08019A0C: ldrb r0, [r4] bl CancelMultiTurnMoves _08019A34: - ldr r1, _08019A54 @ =gUnknown_2023D74 - ldr r0, _08019A58 @ =gUnknown_81D913D + ldr r1, _08019A54 @ =gBattlescriptCurrInstr + ldr r0, _08019A58 @ =BattleScript_MoveUsedIsInLove str r0, [r1] movs r4, 0x1 mov r9, r4 @@ -5519,11 +5519,11 @@ _08019A42: ldr r1, [r0] b _08019B90 .align 2, 0 -_08019A48: .4byte gUnknown_81D914A -_08019A4C: .4byte gUnknown_2023DD0 -_08019A50: .4byte gUnknown_2023E8C -_08019A54: .4byte gUnknown_2023D74 -_08019A58: .4byte gUnknown_81D913D +_08019A48: .4byte BattleScript_MoveUsedIsInLoveCantAttack +_08019A4C: .4byte gHitMarker +_08019A50: .4byte gProtectStructs +_08019A54: .4byte gBattlescriptCurrInstr +_08019A58: .4byte BattleScript_MoveUsedIsInLove _08019A5C: .4byte gBattleStruct _08019A60: ldr r1, _08019A98 @ =gBattleMons @@ -5551,17 +5551,17 @@ _08019A60: ands r0, r4 cmp r0, 0 beq _08019AAC - ldr r1, _08019AA4 @ =gUnknown_2023D74 - ldr r0, _08019AA8 @ =gUnknown_81D8BA9 + ldr r1, _08019AA4 @ =gBattlescriptCurrInstr + ldr r0, _08019AA8 @ =BattleScript_BideStoringEnergy b _08019B2C .align 2, 0 _08019A98: .4byte gBattleMons _08019A9C: .4byte gBattlerAttacker _08019AA0: .4byte 0xffffff00 -_08019AA4: .4byte gUnknown_2023D74 -_08019AA8: .4byte gUnknown_81D8BA9 +_08019AA4: .4byte gBattlescriptCurrInstr +_08019AA8: .4byte BattleScript_BideStoringEnergy _08019AAC: - ldr r3, _08019B04 @ =gUnknown_2023D58 + ldr r3, _08019B04 @ =gTakenDmg lsls r0, r2, 2 adds r0, r3 ldr r0, [r0] @@ -5578,7 +5578,7 @@ _08019AAC: mov r1, r10 str r0, [r1] ldr r4, _08019B0C @ =gBattlerTarget - ldr r1, _08019B10 @ =gUnknown_2023DD8 + ldr r1, _08019B10 @ =gTakenDmgByBattler ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -5598,25 +5598,25 @@ _08019AAC: bl GetMoveTarget strb r0, [r4] _08019AF6: - ldr r1, _08019B1C @ =gUnknown_2023D74 - ldr r0, _08019B20 @ =gUnknown_81D8BB4 + ldr r1, _08019B1C @ =gBattlescriptCurrInstr + ldr r0, _08019B20 @ =BattleScript_BideAttack str r0, [r1] ldr r2, _08019B24 @ =gBattleStruct mov r8, r2 b _08019B2E .align 2, 0 -_08019B04: .4byte gUnknown_2023D58 +_08019B04: .4byte gTakenDmg _08019B08: .4byte gCurrentMove _08019B0C: .4byte gBattlerTarget -_08019B10: .4byte gUnknown_2023DD8 +_08019B10: .4byte gTakenDmgByBattler _08019B14: .4byte gAbsentBattlerFlags _08019B18: .4byte gBitTable -_08019B1C: .4byte gUnknown_2023D74 -_08019B20: .4byte gUnknown_81D8BB4 +_08019B1C: .4byte gBattlescriptCurrInstr +_08019B20: .4byte BattleScript_BideAttack _08019B24: .4byte gBattleStruct _08019B28: - ldr r1, _08019B38 @ =gUnknown_2023D74 - ldr r0, _08019B3C @ =gUnknown_81D8BFC + ldr r1, _08019B38 @ =gBattlescriptCurrInstr + ldr r0, _08019B3C @ =BattleScript_BideNoEnergyToAttack _08019B2C: str r0, [r1] _08019B2E: @@ -5627,8 +5627,8 @@ _08019B32: ldr r1, [r7] b _08019B90 .align 2, 0 -_08019B38: .4byte gUnknown_2023D74 -_08019B3C: .4byte gUnknown_81D8BFC +_08019B38: .4byte gBattlescriptCurrInstr +_08019B3C: .4byte BattleScript_BideNoEnergyToAttack _08019B40: ldr r1, _08019BE8 @ =gBattleMons ldr r0, _08019BEC @ =gBattlerAttacker @@ -5657,10 +5657,10 @@ _08019B40: ands r3, r0 str r3, [r4] bl BattleScriptPushCursor - ldr r1, _08019BF8 @ =gUnknown_2023D74 - ldr r0, _08019BFC @ =gUnknown_81D908D + ldr r1, _08019BF8 @ =gBattlescriptCurrInstr + ldr r0, _08019BFC @ =BattleScript_MoveUsedUnfroze str r0, [r1] - ldr r1, _08019C00 @ =gUnknown_2023E82 + ldr r1, _08019C00 @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _08019B84: @@ -5705,7 +5705,7 @@ _08019BA8: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec _08019BD4: mov r0, r9 add sp, 0x10 @@ -5721,16 +5721,16 @@ _08019BE8: .4byte gBattleMons _08019BEC: .4byte gBattlerAttacker _08019BF0: .4byte gBattleMoves _08019BF4: .4byte gCurrentMove -_08019BF8: .4byte gUnknown_2023D74 -_08019BFC: .4byte gUnknown_81D908D -_08019C00: .4byte gUnknown_2023E82 +_08019BF8: .4byte gBattlescriptCurrInstr +_08019BFC: .4byte BattleScript_MoveUsedUnfroze +_08019C00: .4byte gBattleCommunication _08019C04: .4byte gBattleStruct _08019C08: .4byte gActiveBattler _08019C0C: .4byte gUnknown_2023C30 - thumb_func_end sub_80192D4 + thumb_func_end AtkCanceller_UnableToUseMove - thumb_func_start sub_8019C10 -sub_8019C10: @ 8019C10 + thumb_func_start HasNoMonsToSwitch +HasNoMonsToSwitch: @ 8019C10 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -5934,10 +5934,10 @@ _08019D90: _08019DA0: .4byte gPlayerParty _08019DA4: .4byte gBattlerPartyIndexes _08019DA8: .4byte gBattleStruct - thumb_func_end sub_8019C10 + thumb_func_end HasNoMonsToSwitch - thumb_func_start sub_8019DAC -sub_8019DAC: @ 8019DAC + thumb_func_start CastformDataTypeChange +CastformDataTypeChange: @ 8019DAC push {r4-r6,lr} sub sp, 0x4 lsls r0, 24 @@ -6122,7 +6122,7 @@ _08019F08: .align 2, 0 _08019F10: .4byte gBattleWeather _08019F14: .4byte gBattleMons - thumb_func_end sub_8019DAC + thumb_func_end CastformDataTypeChange thumb_func_start AbilityBattleEffects AbilityBattleEffects: @ 8019F18 @@ -6515,16 +6515,16 @@ _0801A250: bl _0801BBC6 _0801A25A: bl weather_get_current - ldr r1, _0801A274 @ =gUnknown_2023E82 + ldr r1, _0801A274 @ =gBattleCommunication strb r0, [r1, 0x5] - ldr r0, _0801A278 @ =gUnknown_81D8B1F + ldr r0, _0801A278 @ =BattleScript_OverworldWeatherStarts bl BattleScriptPushCursorAndCallback bl _0801BBAA .align 2, 0 _0801A26C: .4byte gBattleWeather _0801A270: .4byte gBattleScripting -_0801A274: .4byte gUnknown_2023E82 -_0801A278: .4byte gUnknown_81D8B1F +_0801A274: .4byte gBattleCommunication +_0801A278: .4byte BattleScript_OverworldWeatherStarts _0801A27C: ldr r2, _0801A2A0 @ =gBattleWeather ldrh r1, [r2] @@ -6536,7 +6536,7 @@ _0801A27C: _0801A28C: movs r0, 0x5 strh r0, [r2] - ldr r0, _0801A2A4 @ =gUnknown_81D927F + ldr r0, _0801A2A4 @ =BattleScript_DrizzleActivates bl BattleScriptPushCursorAndCallback ldr r0, _0801A2A8 @ =gBattleScripting mov r1, r10 @@ -6544,7 +6544,7 @@ _0801A28C: bl _0801BB5A .align 2, 0 _0801A2A0: .4byte gBattleWeather -_0801A2A4: .4byte gUnknown_81D927F +_0801A2A4: .4byte BattleScript_DrizzleActivates _0801A2A8: .4byte gBattleScripting _0801A2AC: ldr r2, _0801A2D0 @ =gBattleWeather @@ -6557,7 +6557,7 @@ _0801A2AC: _0801A2BC: movs r0, 0x18 strh r0, [r2] - ldr r0, _0801A2D4 @ =gUnknown_81D92BF + ldr r0, _0801A2D4 @ =BattleScript_SandstreamActivates bl BattleScriptPushCursorAndCallback ldr r0, _0801A2D8 @ =gBattleScripting mov r2, r10 @@ -6565,7 +6565,7 @@ _0801A2BC: bl _0801BB5A .align 2, 0 _0801A2D0: .4byte gBattleWeather -_0801A2D4: .4byte gUnknown_81D92BF +_0801A2D4: .4byte BattleScript_SandstreamActivates _0801A2D8: .4byte gBattleScripting _0801A2DC: ldr r2, _0801A300 @ =gBattleWeather @@ -6578,7 +6578,7 @@ _0801A2DC: _0801A2EC: movs r0, 0x60 strh r0, [r2] - ldr r0, _0801A304 @ =gUnknown_81D9379 + ldr r0, _0801A304 @ =BattleScript_DroughtActivates bl BattleScriptPushCursorAndCallback ldr r0, _0801A308 @ =gBattleScripting mov r3, r10 @@ -6586,10 +6586,10 @@ _0801A2EC: bl _0801BB5A .align 2, 0 _0801A300: .4byte gBattleWeather -_0801A304: .4byte gUnknown_81D9379 +_0801A304: .4byte BattleScript_DroughtActivates _0801A308: .4byte gBattleScripting _0801A30C: - ldr r0, _0801A338 @ =gUnknown_2023ECC + ldr r0, _0801A338 @ =gSpecialStatuses mov r4, r10 lsls r2, r4, 2 adds r1, r2, r4 @@ -6612,11 +6612,11 @@ _0801A324: movs r1, 0x8 b _0801A396 .align 2, 0 -_0801A338: .4byte gUnknown_2023ECC +_0801A338: .4byte gSpecialStatuses _0801A33C: .4byte gStatuses3 _0801A340: mov r0, r10 - bl sub_8019DAC + bl CastformDataTypeChange lsls r0, 24 lsrs r0, 24 mov r9, r0 @@ -6624,17 +6624,17 @@ _0801A340: bne _0801A354 bl _0801BBC6 _0801A354: - ldr r0, _0801A364 @ =gUnknown_81D92F8 + ldr r0, _0801A364 @ =BattleScript_CastformChange bl BattleScriptPushCursorAndCallback ldr r0, _0801A368 @ =gBattleScripting mov r1, r10 strb r1, [r0, 0x17] bl _0801BA6A .align 2, 0 -_0801A364: .4byte gUnknown_81D92F8 +_0801A364: .4byte BattleScript_CastformChange _0801A368: .4byte gBattleScripting _0801A36C: - ldr r0, _0801A3A0 @ =gUnknown_2023ECC + ldr r0, _0801A3A0 @ =gSpecialStatuses mov r3, r10 lsls r2, r3, 2 adds r1, r2, r3 @@ -6660,7 +6660,7 @@ _0801A396: strb r0, [r3] bl _0801BBAA .align 2, 0 -_0801A3A0: .4byte gUnknown_2023ECC +_0801A3A0: .4byte gSpecialStatuses _0801A3A4: .4byte gStatuses3 _0801A3A8: movs r4, 0 @@ -6670,7 +6670,7 @@ _0801A3A8: bl _0801BBAA _0801A3B4: adds r0, r4, 0 - bl sub_8019DAC + bl CastformDataTypeChange lsls r0, 24 lsrs r0, 24 mov r9, r0 @@ -6765,7 +6765,7 @@ _0801A46A: _0801A476: mov r0, r8 strb r5, [r0] - ldr r0, _0801A4A0 @ =gUnknown_81D92AB + ldr r0, _0801A4A0 @ =BattleScript_RainDishActivates bl BattleScriptPushCursorAndCallback ldr r1, _0801A4A4 @ =gBattleMoveDamage ldrh r0, [r4, 0x2C] @@ -6782,7 +6782,7 @@ _0801A490: bl _0801BB5A .align 2, 0 _0801A49C: .4byte gBattleWeather -_0801A4A0: .4byte gUnknown_81D92AB +_0801A4A0: .4byte BattleScript_RainDishActivates _0801A4A4: .4byte gBattleMoveDamage _0801A4A8: adds r0, r7, 0 @@ -6862,7 +6862,7 @@ _0801A52C: mov r1, r10 strb r1, [r4] strb r1, [r0, 0x17] - ldr r0, _0801A588 @ =gUnknown_81D92D3 + ldr r0, _0801A588 @ =BattleScript_ShedSkinActivates bl BattleScriptPushCursorAndCallback str r5, [sp] movs r0, 0 @@ -6871,7 +6871,7 @@ _0801A52C: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec bl _0801BB5A .align 2, 0 _0801A564: .4byte gBattleTextBuff1 @@ -6883,7 +6883,7 @@ _0801A578: .4byte gUnknown_82500B4 _0801A57C: .4byte 0xf7ffffff _0801A580: .4byte gBattleScripting _0801A584: .4byte gActiveBattler -_0801A588: .4byte gUnknown_81D92D3 +_0801A588: .4byte BattleScript_ShedSkinActivates _0801A58C: ldrb r2, [r4, 0x1B] movs r0, 0x1B @@ -6910,7 +6910,7 @@ _0801A5B0: movs r0, 0x11 strb r0, [r4, 0x10] strb r1, [r4, 0x11] - ldr r0, _0801A5D4 @ =gUnknown_81D9293 + ldr r0, _0801A5D4 @ =BattleScript_SpeedBoostActivates bl BattleScriptPushCursorAndCallback mov r0, r10 strb r0, [r4, 0x17] @@ -6918,7 +6918,7 @@ _0801A5B0: .align 2, 0 _0801A5CC: .4byte gDisableStructs _0801A5D0: .4byte gBattleScripting -_0801A5D4: .4byte gUnknown_81D9293 +_0801A5D4: .4byte BattleScript_SpeedBoostActivates _0801A5D8: ldr r2, _0801A5FC @ =gDisableStructs ldrb r0, [r0] @@ -6947,7 +6947,7 @@ _0801A600: bl _0801BBAA _0801A60C: movs r5, 0 - ldr r0, _0801A67C @ =gUnknown_8250104 + ldr r0, _0801A67C @ =sSoundMovesTable ldrh r2, [r0] ldr r3, _0801A680 @ =0x0000ffff adds r1, r0, 0 @@ -6990,27 +6990,27 @@ _0801A646: ands r0, r1 cmp r0, 0 beq _0801A66C - ldr r0, _0801A68C @ =gUnknown_2023DD0 + ldr r0, _0801A68C @ =gHitMarker ldr r1, [r0] movs r2, 0x80 lsls r2, 4 orrs r1, r2 str r1, [r0] _0801A66C: - ldr r1, _0801A690 @ =gUnknown_2023D74 - ldr r0, _0801A694 @ =gUnknown_81D946E + ldr r1, _0801A690 @ =gBattlescriptCurrInstr + ldr r0, _0801A694 @ =BattleScript_SoundproofProtected str r0, [r1] movs r2, 0x1 mov r9, r2 bl _0801BBB0 .align 2, 0 -_0801A67C: .4byte gUnknown_8250104 +_0801A67C: .4byte sSoundMovesTable _0801A680: .4byte 0x0000ffff _0801A684: .4byte gBattleMons _0801A688: .4byte gBattlerAttacker -_0801A68C: .4byte gUnknown_2023DD0 -_0801A690: .4byte gUnknown_2023D74 -_0801A694: .4byte gUnknown_81D946E +_0801A68C: .4byte gHitMarker +_0801A690: .4byte gBattlescriptCurrInstr +_0801A694: .4byte BattleScript_SoundproofProtected _0801A698: cmp r4, 0 bne _0801A6A0 @@ -7044,7 +7044,7 @@ _0801A6BE: bne _0801A6D0 b _0801A832 _0801A6D0: - ldr r1, _0801A6EC @ =gUnknown_2023E8C + ldr r1, _0801A6EC @ =gProtectStructs ldr r0, _0801A6F0 @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -7053,26 +7053,26 @@ _0801A6D0: lsls r0, 28 cmp r0, 0 bge _0801A6FC - ldr r1, _0801A6F4 @ =gUnknown_2023D74 - ldr r0, _0801A6F8 @ =gUnknown_81D93BE + ldr r1, _0801A6F4 @ =gBattlescriptCurrInstr + ldr r0, _0801A6F8 @ =BattleScript_MoveHPDrain b _0801A700 .align 2, 0 _0801A6E8: .4byte gBattleMoves -_0801A6EC: .4byte gUnknown_2023E8C +_0801A6EC: .4byte gProtectStructs _0801A6F0: .4byte gBattlerAttacker -_0801A6F4: .4byte gUnknown_2023D74 -_0801A6F8: .4byte gUnknown_81D93BE +_0801A6F4: .4byte gBattlescriptCurrInstr +_0801A6F8: .4byte BattleScript_MoveHPDrain _0801A6FC: - ldr r1, _0801A708 @ =gUnknown_2023D74 - ldr r0, _0801A70C @ =gUnknown_81D93BD + ldr r1, _0801A708 @ =gBattlescriptCurrInstr + ldr r0, _0801A70C @ =BattleScript_MoveHPDrain_PPLoss _0801A700: str r0, [r1] movs r4, 0x1 mov r9, r4 b _0801A832 .align 2, 0 -_0801A708: .4byte gUnknown_2023D74 -_0801A70C: .4byte gUnknown_81D93BD +_0801A708: .4byte gBattlescriptCurrInstr +_0801A70C: .4byte BattleScript_MoveHPDrain_PPLoss _0801A710: cmp r5, 0xB beq _0801A716 @@ -7088,7 +7088,7 @@ _0801A716: bne _0801A728 b _0801A832 _0801A728: - ldr r1, _0801A744 @ =gUnknown_2023E8C + ldr r1, _0801A744 @ =gProtectStructs ldr r0, _0801A748 @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -7097,25 +7097,25 @@ _0801A728: lsls r0, 28 cmp r0, 0 bge _0801A754 - ldr r1, _0801A74C @ =gUnknown_2023D74 - ldr r0, _0801A750 @ =gUnknown_81D93BE + ldr r1, _0801A74C @ =gBattlescriptCurrInstr + ldr r0, _0801A750 @ =BattleScript_MoveHPDrain b _0801A758 .align 2, 0 _0801A740: .4byte gBattleMoves -_0801A744: .4byte gUnknown_2023E8C +_0801A744: .4byte gProtectStructs _0801A748: .4byte gBattlerAttacker -_0801A74C: .4byte gUnknown_2023D74 -_0801A750: .4byte gUnknown_81D93BE +_0801A74C: .4byte gBattlescriptCurrInstr +_0801A750: .4byte BattleScript_MoveHPDrain _0801A754: - ldr r1, _0801A760 @ =gUnknown_2023D74 - ldr r0, _0801A764 @ =gUnknown_81D93BD + ldr r1, _0801A760 @ =gBattlescriptCurrInstr + ldr r0, _0801A764 @ =BattleScript_MoveHPDrain_PPLoss _0801A758: str r0, [r1] movs r0, 0x1 b _0801A830 .align 2, 0 -_0801A760: .4byte gUnknown_2023D74 -_0801A764: .4byte gUnknown_81D93BD +_0801A760: .4byte gBattlescriptCurrInstr +_0801A764: .4byte BattleScript_MoveHPDrain_PPLoss _0801A768: cmp r5, 0xA bne _0801A832 @@ -7143,9 +7143,9 @@ _0801A768: adds r5, r1, 0 cmp r3, 0 bne _0801A7F8 - ldr r0, _0801A7C0 @ =gUnknown_2023E82 + ldr r0, _0801A7C0 @ =gBattleCommunication strb r3, [r0, 0x5] - ldr r1, _0801A7C4 @ =gUnknown_2023E8C + ldr r1, _0801A7C4 @ =gProtectStructs ldr r0, _0801A7C8 @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -7154,20 +7154,20 @@ _0801A768: lsls r0, 28 cmp r0, 0 bge _0801A7D4 - ldr r1, _0801A7CC @ =gUnknown_2023D74 - ldr r0, _0801A7D0 @ =gUnknown_81D93F7 + ldr r1, _0801A7CC @ =gBattlescriptCurrInstr + ldr r0, _0801A7D0 @ =BattleScript_FlashFireBoost b _0801A7D8 .align 2, 0 _0801A7B8: .4byte gBattleMons _0801A7BC: .4byte gBattleResources -_0801A7C0: .4byte gUnknown_2023E82 -_0801A7C4: .4byte gUnknown_2023E8C +_0801A7C0: .4byte gBattleCommunication +_0801A7C4: .4byte gProtectStructs _0801A7C8: .4byte gBattlerAttacker -_0801A7CC: .4byte gUnknown_2023D74 -_0801A7D0: .4byte gUnknown_81D93F7 +_0801A7CC: .4byte gBattlescriptCurrInstr +_0801A7D0: .4byte BattleScript_FlashFireBoost _0801A7D4: - ldr r1, _0801A7F0 @ =gUnknown_2023D74 - ldr r0, _0801A7F4 @ =gUnknown_81D93F6 + ldr r1, _0801A7F0 @ =gBattlescriptCurrInstr + ldr r0, _0801A7F4 @ =BattleScript_FlashFireBoost_PPLoss _0801A7D8: str r0, [r1] ldr r0, [r2] @@ -7181,12 +7181,12 @@ _0801A7D8: mov r9, r4 b _0801A832 .align 2, 0 -_0801A7F0: .4byte gUnknown_2023D74 -_0801A7F4: .4byte gUnknown_81D93F6 +_0801A7F0: .4byte gBattlescriptCurrInstr +_0801A7F4: .4byte BattleScript_FlashFireBoost_PPLoss _0801A7F8: - ldr r0, _0801A814 @ =gUnknown_2023E82 + ldr r0, _0801A814 @ =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, _0801A818 @ =gUnknown_2023E8C + ldr r1, _0801A818 @ =gProtectStructs ldr r0, _0801A81C @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -7195,18 +7195,18 @@ _0801A7F8: lsls r0, 28 cmp r0, 0 bge _0801A828 - ldr r1, _0801A820 @ =gUnknown_2023D74 - ldr r0, _0801A824 @ =gUnknown_81D93F7 + ldr r1, _0801A820 @ =gBattlescriptCurrInstr + ldr r0, _0801A824 @ =BattleScript_FlashFireBoost b _0801A82C .align 2, 0 -_0801A814: .4byte gUnknown_2023E82 -_0801A818: .4byte gUnknown_2023E8C +_0801A814: .4byte gBattleCommunication +_0801A818: .4byte gProtectStructs _0801A81C: .4byte gBattlerAttacker -_0801A820: .4byte gUnknown_2023D74 -_0801A824: .4byte gUnknown_81D93F7 +_0801A820: .4byte gBattlescriptCurrInstr +_0801A824: .4byte BattleScript_FlashFireBoost _0801A828: - ldr r1, _0801A86C @ =gUnknown_2023D74 - ldr r0, _0801A870 @ =gUnknown_81D93F6 + ldr r1, _0801A86C @ =gBattlescriptCurrInstr + ldr r0, _0801A870 @ =BattleScript_FlashFireBoost_PPLoss _0801A82C: str r0, [r1] movs r0, 0x2 @@ -7228,7 +7228,7 @@ _0801A83C: ldrh r3, [r1, 0x28] cmp r0, r3 bne _0801A898 - ldr r1, _0801A878 @ =gUnknown_2023E8C + ldr r1, _0801A878 @ =gProtectStructs ldr r0, _0801A87C @ =gBattlerAttacker ldrb r0, [r0] lsls r0, 4 @@ -7237,25 +7237,25 @@ _0801A83C: lsls r0, 28 cmp r0, 0 bge _0801A884 - ldr r1, _0801A86C @ =gUnknown_2023D74 - ldr r0, _0801A880 @ =gUnknown_81D93E1 + ldr r1, _0801A86C @ =gBattlescriptCurrInstr + ldr r0, _0801A880 @ =BattleScript_MonMadeMoveUseless str r0, [r1] bl _0801BBAA .align 2, 0 -_0801A86C: .4byte gUnknown_2023D74 -_0801A870: .4byte gUnknown_81D93F6 +_0801A86C: .4byte gBattlescriptCurrInstr +_0801A870: .4byte BattleScript_FlashFireBoost_PPLoss _0801A874: .4byte gBattleMons -_0801A878: .4byte gUnknown_2023E8C +_0801A878: .4byte gProtectStructs _0801A87C: .4byte gBattlerAttacker -_0801A880: .4byte gUnknown_81D93E1 +_0801A880: .4byte BattleScript_MonMadeMoveUseless _0801A884: - ldr r1, _0801A890 @ =gUnknown_2023D74 - ldr r0, _0801A894 @ =gUnknown_81D93E0 + ldr r1, _0801A890 @ =gBattlescriptCurrInstr + ldr r0, _0801A894 @ =BattleScript_MonMadeMoveUseless_PPLoss str r0, [r1] bl _0801BBAA .align 2, 0 -_0801A890: .4byte gUnknown_2023D74 -_0801A894: .4byte gUnknown_81D93E0 +_0801A890: .4byte gBattlescriptCurrInstr +_0801A894: .4byte BattleScript_MonMadeMoveUseless_PPLoss _0801A898: ldr r2, _0801A8B4 @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] @@ -7360,7 +7360,7 @@ _0801A9AC: bne _0801A9C0 bl _0801BBAA _0801A9C0: - ldr r2, _0801AA44 @ =gUnknown_2023ECC + ldr r2, _0801AA44 @ =gSpecialStatuses ldr r0, _0801AA48 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 @@ -7416,19 +7416,19 @@ _0801AA1A: movs r0, 0xFF strb r0, [r1, 0x3] bl BattleScriptPushCursor - ldr r1, _0801AA54 @ =gUnknown_2023D74 - ldr r0, _0801AA58 @ =gUnknown_81D949C + ldr r1, _0801AA54 @ =gBattlescriptCurrInstr + ldr r0, _0801AA58 @ =BattleScript_ColorChangeActivates str r0, [r1] bl _0801BB5A .align 2, 0 _0801AA3C: .4byte gMoveResultFlags _0801AA40: .4byte gBattleMoves -_0801AA44: .4byte gUnknown_2023ECC +_0801AA44: .4byte gSpecialStatuses _0801AA48: .4byte gBattlerTarget _0801AA4C: .4byte gBattleMons _0801AA50: .4byte gBattleTextBuff1 -_0801AA54: .4byte gUnknown_2023D74 -_0801AA58: .4byte gUnknown_81D949C +_0801AA54: .4byte gBattlescriptCurrInstr +_0801AA58: .4byte BattleScript_ColorChangeActivates _0801AA5C: ldr r0, _0801AAF4 @ =gMoveResultFlags ldrb r1, [r0] @@ -7449,7 +7449,7 @@ _0801AA6C: bne _0801AA82 bl _0801BBAA _0801AA82: - ldr r0, _0801AB00 @ =gUnknown_2023E8C + ldr r0, _0801AB00 @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -7458,7 +7458,7 @@ _0801AA82: beq _0801AA94 bl _0801BBAA _0801AA94: - ldr r2, _0801AB04 @ =gUnknown_2023ECC + ldr r2, _0801AB04 @ =gSpecialStatuses ldr r0, _0801AB08 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 @@ -7500,21 +7500,21 @@ _0801AAD6: str r2, [r1] _0801AAE4: bl BattleScriptPushCursor - ldr r1, _0801AB14 @ =gUnknown_2023D74 - ldr r0, _0801AB18 @ =gUnknown_81D94A3 + ldr r1, _0801AB14 @ =gBattlescriptCurrInstr + ldr r0, _0801AB18 @ =BattleScript_RoughSkinActivates str r0, [r1] bl _0801BB5A .align 2, 0 _0801AAF4: .4byte gMoveResultFlags _0801AAF8: .4byte gBattleMons _0801AAFC: .4byte gBattlerAttacker -_0801AB00: .4byte gUnknown_2023E8C -_0801AB04: .4byte gUnknown_2023ECC +_0801AB00: .4byte gProtectStructs +_0801AB04: .4byte gSpecialStatuses _0801AB08: .4byte gBattlerTarget _0801AB0C: .4byte gBattleMoves _0801AB10: .4byte gBattleMoveDamage -_0801AB14: .4byte gUnknown_2023D74 -_0801AB18: .4byte gUnknown_81D94A3 +_0801AB14: .4byte gBattlescriptCurrInstr +_0801AB18: .4byte BattleScript_RoughSkinActivates _0801AB1C: ldr r0, _0801ABE8 @ =gMoveResultFlags ldrb r1, [r0] @@ -7535,7 +7535,7 @@ _0801AB2C: bne _0801AB42 bl _0801BBAA _0801AB42: - ldr r0, _0801ABF4 @ =gUnknown_2023E8C + ldr r0, _0801ABF4 @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -7544,7 +7544,7 @@ _0801AB42: beq _0801AB54 bl _0801BBAA _0801AB54: - ldr r2, _0801ABF8 @ =gUnknown_2023ECC + ldr r2, _0801ABF8 @ =gSpecialStatuses ldr r0, _0801ABFC @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 @@ -7586,7 +7586,7 @@ _0801AB94: beq _0801ABAC bl _0801BBAA _0801ABAC: - ldr r5, _0801AC04 @ =gUnknown_2023E82 + ldr r5, _0801AC04 @ =gBattleCommunication movs r4, 0x3 _0801ABB0: bl Random @@ -7594,7 +7594,7 @@ _0801ABB0: strb r0, [r5, 0x3] cmp r0, 0 beq _0801ABB0 - ldr r1, _0801AC04 @ =gUnknown_2023E82 + ldr r1, _0801AC04 @ =gBattleCommunication ldrb r0, [r1, 0x3] cmp r0, 0x3 bne _0801ABC8 @@ -7605,10 +7605,10 @@ _0801ABC8: adds r0, 0x40 strb r0, [r1, 0x3] bl BattleScriptPushCursor - ldr r1, _0801AC08 @ =gUnknown_2023D74 - ldr r0, _0801AC0C @ =gUnknown_81D94CB + ldr r1, _0801AC08 @ =gBattlescriptCurrInstr + ldr r0, _0801AC0C @ =BattleScript_ApplySecondaryEffect str r0, [r1] - ldr r2, _0801AC10 @ =gUnknown_2023DD0 + ldr r2, _0801AC10 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -7619,14 +7619,14 @@ _0801ABC8: _0801ABE8: .4byte gMoveResultFlags _0801ABEC: .4byte gBattleMons _0801ABF0: .4byte gBattlerAttacker -_0801ABF4: .4byte gUnknown_2023E8C -_0801ABF8: .4byte gUnknown_2023ECC +_0801ABF4: .4byte gProtectStructs +_0801ABF8: .4byte gSpecialStatuses _0801ABFC: .4byte gBattlerTarget _0801AC00: .4byte gBattleMoves -_0801AC04: .4byte gUnknown_2023E82 -_0801AC08: .4byte gUnknown_2023D74 -_0801AC0C: .4byte gUnknown_81D94CB -_0801AC10: .4byte gUnknown_2023DD0 +_0801AC04: .4byte gBattleCommunication +_0801AC08: .4byte gBattlescriptCurrInstr +_0801AC0C: .4byte BattleScript_ApplySecondaryEffect +_0801AC10: .4byte gHitMarker _0801AC14: ldr r0, _0801ACC4 @ =gMoveResultFlags ldrb r1, [r0] @@ -7647,7 +7647,7 @@ _0801AC24: bne _0801AC3A bl _0801BBAA _0801AC3A: - ldr r0, _0801ACD0 @ =gUnknown_2023E8C + ldr r0, _0801ACD0 @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -7656,7 +7656,7 @@ _0801AC3A: beq _0801AC4C bl _0801BBAA _0801AC4C: - ldr r2, _0801ACD4 @ =gUnknown_2023ECC + ldr r2, _0801ACD4 @ =gSpecialStatuses ldr r0, _0801ACD8 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 @@ -7698,14 +7698,14 @@ _0801AC8C: beq _0801ACA4 bl _0801BBAA _0801ACA4: - ldr r1, _0801ACE0 @ =gUnknown_2023E82 + ldr r1, _0801ACE0 @ =gBattleCommunication movs r0, 0x42 strb r0, [r1, 0x3] bl BattleScriptPushCursor - ldr r1, _0801ACE4 @ =gUnknown_2023D74 - ldr r0, _0801ACE8 @ =gUnknown_81D94CB + ldr r1, _0801ACE4 @ =gBattlescriptCurrInstr + ldr r0, _0801ACE8 @ =BattleScript_ApplySecondaryEffect str r0, [r1] - ldr r2, _0801ACEC @ =gUnknown_2023DD0 + ldr r2, _0801ACEC @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -7716,14 +7716,14 @@ _0801ACA4: _0801ACC4: .4byte gMoveResultFlags _0801ACC8: .4byte gBattleMons _0801ACCC: .4byte gBattlerAttacker -_0801ACD0: .4byte gUnknown_2023E8C -_0801ACD4: .4byte gUnknown_2023ECC +_0801ACD0: .4byte gProtectStructs +_0801ACD4: .4byte gSpecialStatuses _0801ACD8: .4byte gBattlerTarget _0801ACDC: .4byte gBattleMoves -_0801ACE0: .4byte gUnknown_2023E82 -_0801ACE4: .4byte gUnknown_2023D74 -_0801ACE8: .4byte gUnknown_81D94CB -_0801ACEC: .4byte gUnknown_2023DD0 +_0801ACE0: .4byte gBattleCommunication +_0801ACE4: .4byte gBattlescriptCurrInstr +_0801ACE8: .4byte BattleScript_ApplySecondaryEffect +_0801ACEC: .4byte gHitMarker _0801ACF0: ldr r0, _0801ADA0 @ =gMoveResultFlags ldrb r1, [r0] @@ -7744,7 +7744,7 @@ _0801AD00: bne _0801AD16 bl _0801BBAA _0801AD16: - ldr r0, _0801ADAC @ =gUnknown_2023E8C + ldr r0, _0801ADAC @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -7753,7 +7753,7 @@ _0801AD16: beq _0801AD28 bl _0801BBAA _0801AD28: - ldr r2, _0801ADB0 @ =gUnknown_2023ECC + ldr r2, _0801ADB0 @ =gSpecialStatuses ldr r0, _0801ADB4 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 @@ -7795,14 +7795,14 @@ _0801AD68: beq _0801AD80 bl _0801BBAA _0801AD80: - ldr r1, _0801ADBC @ =gUnknown_2023E82 + ldr r1, _0801ADBC @ =gBattleCommunication movs r0, 0x45 strb r0, [r1, 0x3] bl BattleScriptPushCursor - ldr r1, _0801ADC0 @ =gUnknown_2023D74 - ldr r0, _0801ADC4 @ =gUnknown_81D94CB + ldr r1, _0801ADC0 @ =gBattlescriptCurrInstr + ldr r0, _0801ADC4 @ =BattleScript_ApplySecondaryEffect str r0, [r1] - ldr r2, _0801ADC8 @ =gUnknown_2023DD0 + ldr r2, _0801ADC8 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -7813,14 +7813,14 @@ _0801AD80: _0801ADA0: .4byte gMoveResultFlags _0801ADA4: .4byte gBattleMons _0801ADA8: .4byte gBattlerAttacker -_0801ADAC: .4byte gUnknown_2023E8C -_0801ADB0: .4byte gUnknown_2023ECC +_0801ADAC: .4byte gProtectStructs +_0801ADB0: .4byte gSpecialStatuses _0801ADB4: .4byte gBattlerTarget _0801ADB8: .4byte gBattleMoves -_0801ADBC: .4byte gUnknown_2023E82 -_0801ADC0: .4byte gUnknown_2023D74 -_0801ADC4: .4byte gUnknown_81D94CB -_0801ADC8: .4byte gUnknown_2023DD0 +_0801ADBC: .4byte gBattleCommunication +_0801ADC0: .4byte gBattlescriptCurrInstr +_0801ADC4: .4byte BattleScript_ApplySecondaryEffect +_0801ADC8: .4byte gHitMarker _0801ADCC: ldr r0, _0801AE7C @ =gMoveResultFlags ldrb r1, [r0] @@ -7841,7 +7841,7 @@ _0801ADDC: bne _0801ADF2 bl _0801BBAA _0801ADF2: - ldr r0, _0801AE88 @ =gUnknown_2023E8C + ldr r0, _0801AE88 @ =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -7862,7 +7862,7 @@ _0801AE04: bne _0801AE1C bl _0801BBAA _0801AE1C: - ldr r2, _0801AE90 @ =gUnknown_2023ECC + ldr r2, _0801AE90 @ =gSpecialStatuses ldr r0, _0801AE94 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 @@ -7892,14 +7892,14 @@ _0801AE44: beq _0801AE5C bl _0801BBAA _0801AE5C: - ldr r1, _0801AE98 @ =gUnknown_2023E82 + ldr r1, _0801AE98 @ =gBattleCommunication movs r0, 0x43 strb r0, [r1, 0x3] bl BattleScriptPushCursor - ldr r1, _0801AE9C @ =gUnknown_2023D74 - ldr r0, _0801AEA0 @ =gUnknown_81D94CB + ldr r1, _0801AE9C @ =gBattlescriptCurrInstr + ldr r0, _0801AEA0 @ =BattleScript_ApplySecondaryEffect str r0, [r1] - ldr r2, _0801AEA4 @ =gUnknown_2023DD0 + ldr r2, _0801AEA4 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -7910,14 +7910,14 @@ _0801AE5C: _0801AE7C: .4byte gMoveResultFlags _0801AE80: .4byte gBattleMons _0801AE84: .4byte gBattlerAttacker -_0801AE88: .4byte gUnknown_2023E8C +_0801AE88: .4byte gProtectStructs _0801AE8C: .4byte gBattleMoves -_0801AE90: .4byte gUnknown_2023ECC +_0801AE90: .4byte gSpecialStatuses _0801AE94: .4byte gBattlerTarget -_0801AE98: .4byte gUnknown_2023E82 -_0801AE9C: .4byte gUnknown_2023D74 -_0801AEA0: .4byte gUnknown_81D94CB -_0801AEA4: .4byte gUnknown_2023DD0 +_0801AE98: .4byte gBattleCommunication +_0801AE9C: .4byte gBattlescriptCurrInstr +_0801AEA0: .4byte BattleScript_ApplySecondaryEffect +_0801AEA4: .4byte gHitMarker _0801AEA8: ldr r0, _0801AFE8 @ =gMoveResultFlags ldrb r1, [r0] @@ -7939,7 +7939,7 @@ _0801AEB8: bne _0801AED0 bl _0801BBAA _0801AED0: - ldr r0, _0801AFF4 @ =gUnknown_2023E8C + ldr r0, _0801AFF4 @ =gProtectStructs lsls r1, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -7960,7 +7960,7 @@ _0801AEE2: bne _0801AEFA bl _0801BBAA _0801AEFA: - ldr r3, _0801AFFC @ =gUnknown_2023ECC + ldr r3, _0801AFFC @ =gSpecialStatuses ldr r4, _0801B000 @ =gBattlerTarget mov r8, r4 ldrb r1, [r4] @@ -8067,21 +8067,21 @@ _0801AFBE: orrs r0, r1 str r0, [r2] bl BattleScriptPushCursor - ldr r1, _0801B008 @ =gUnknown_2023D74 - ldr r0, _0801B00C @ =gUnknown_81D94BE + ldr r1, _0801B008 @ =gBattlescriptCurrInstr + ldr r0, _0801B00C @ =BattleScript_CuteCharmActivates str r0, [r1] bl _0801BB5A .align 2, 0 _0801AFE8: .4byte gMoveResultFlags _0801AFEC: .4byte gBattleMons _0801AFF0: .4byte gBattlerAttacker -_0801AFF4: .4byte gUnknown_2023E8C +_0801AFF4: .4byte gProtectStructs _0801AFF8: .4byte gBattleMoves -_0801AFFC: .4byte gUnknown_2023ECC +_0801AFFC: .4byte gSpecialStatuses _0801B000: .4byte gBattlerTarget _0801B004: .4byte gBitTable -_0801B008: .4byte gUnknown_2023D74 -_0801B00C: .4byte gUnknown_81D94BE +_0801B008: .4byte gBattlescriptCurrInstr +_0801B00C: .4byte BattleScript_CuteCharmActivates _0801B010: movs r4, 0 mov r10, r4 @@ -8399,8 +8399,8 @@ _0801B302: str r0, [r2] _0801B304: bl BattleScriptPushCursor - ldr r1, _0801B344 @ =gUnknown_2023D74 - ldr r0, _0801B348 @ =gUnknown_81D94D1 + ldr r1, _0801B344 @ =gBattlescriptCurrInstr + ldr r0, _0801B348 @ =BattleScript_AbilityCuredStatus str r0, [r1] ldr r0, _0801B34C @ =gBattleScripting mov r1, r10 @@ -8419,13 +8419,13 @@ _0801B304: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec bl _0801BBC6 .align 2, 0 _0801B33C: .4byte gBattleMons _0801B340: .4byte 0xfff0ffff -_0801B344: .4byte gUnknown_2023D74 -_0801B348: .4byte gUnknown_81D94D1 +_0801B344: .4byte gBattlescriptCurrInstr +_0801B348: .4byte BattleScript_AbilityCuredStatus _0801B34C: .4byte gBattleScripting _0801B350: .4byte gActiveBattler _0801B354: .4byte gUnknown_2023C30 @@ -8465,7 +8465,7 @@ _0801B386: cmp r0, 0x3B bne _0801B3AA mov r0, r10 - bl sub_8019DAC + bl CastformDataTypeChange lsls r0, 24 lsrs r0, 24 mov r9, r0 @@ -8493,7 +8493,7 @@ _0801B3C8: beq _0801B3D4 bl _0801BBAA _0801B3D4: - ldr r4, _0801B434 @ =gUnknown_2023DD0 + ldr r4, _0801B434 @ =gHitMarker ldr r1, [r4] movs r0, 0x80 lsls r0, 7 @@ -8520,7 +8520,7 @@ _0801B3E6: movs r0, 0x2 strb r0, [r1] _0801B408: - ldr r1, _0801B43C @ =gUnknown_2023E82 + ldr r1, _0801B43C @ =gBattleCommunication ldr r0, [r6] adds r0, 0xB4 ldrb r0, [r0] @@ -8531,8 +8531,8 @@ _0801B408: ldrb r0, [r0] strb r0, [r1, 0x17] bl BattleScriptPushCursor - ldr r1, _0801B448 @ =gUnknown_2023D74 - ldr r0, _0801B44C @ =gUnknown_81D94CE + ldr r1, _0801B448 @ =gBattlescriptCurrInstr + ldr r0, _0801B44C @ =BattleScript_SynchronizeActivates str r0, [r1] ldr r0, [r4] movs r1, 0x80 @@ -8541,13 +8541,13 @@ _0801B408: str r0, [r4] b _0801BB5A .align 2, 0 -_0801B434: .4byte gUnknown_2023DD0 +_0801B434: .4byte gHitMarker _0801B438: .4byte 0xffffbfff -_0801B43C: .4byte gUnknown_2023E82 +_0801B43C: .4byte gBattleCommunication _0801B440: .4byte gBattleScripting _0801B444: .4byte gBattlerTarget -_0801B448: .4byte gUnknown_2023D74 -_0801B44C: .4byte gUnknown_81D94CE +_0801B448: .4byte gBattlescriptCurrInstr +_0801B44C: .4byte BattleScript_SynchronizeActivates _0801B450: mov r1, r8 ldrb r0, [r1] @@ -8555,7 +8555,7 @@ _0801B450: beq _0801B45A b _0801BBAA _0801B45A: - ldr r4, _0801B4B8 @ =gUnknown_2023DD0 + ldr r4, _0801B4B8 @ =gHitMarker ldr r1, [r4] movs r0, 0x80 lsls r0, 7 @@ -8583,7 +8583,7 @@ _0801B46A: movs r0, 0x2 strb r0, [r1] _0801B48E: - ldr r1, _0801B4C0 @ =gUnknown_2023E82 + ldr r1, _0801B4C0 @ =gBattleCommunication ldr r0, [r6] adds r0, 0xB4 ldrb r0, [r0] @@ -8593,8 +8593,8 @@ _0801B48E: ldrb r0, [r0] strb r0, [r1, 0x17] bl BattleScriptPushCursor - ldr r1, _0801B4CC @ =gUnknown_2023D74 - ldr r0, _0801B4D0 @ =gUnknown_81D94CE + ldr r1, _0801B4CC @ =gBattlescriptCurrInstr + ldr r0, _0801B4D0 @ =BattleScript_SynchronizeActivates str r0, [r1] ldr r0, [r4] movs r1, 0x80 @@ -8603,13 +8603,13 @@ _0801B48E: str r0, [r4] b _0801BB5A .align 2, 0 -_0801B4B8: .4byte gUnknown_2023DD0 +_0801B4B8: .4byte gHitMarker _0801B4BC: .4byte 0xffffbfff -_0801B4C0: .4byte gUnknown_2023E82 +_0801B4C0: .4byte gBattleCommunication _0801B4C4: .4byte gBattleScripting _0801B4C8: .4byte gBattlerAttacker -_0801B4CC: .4byte gUnknown_2023D74 -_0801B4D0: .4byte gUnknown_81D94CE +_0801B4CC: .4byte gBattlescriptCurrInstr +_0801B4D0: .4byte BattleScript_SynchronizeActivates _0801B4D4: movs r5, 0 ldr r0, _0801B50C @ =gBattlersCount @@ -9336,7 +9336,7 @@ _0801BA54: .4byte gBattlersCount _0801BA58: .4byte gBattleMons _0801BA5C: .4byte gLastUsedAbility _0801BA60: - ldr r0, _0801BA78 @ =gUnknown_81D92F8 + ldr r0, _0801BA78 @ =BattleScript_CastformChange bl BattleScriptPushCursorAndCallback ldr r0, _0801BA7C @ =gBattleScripting strb r4, [r0, 0x17] @@ -9349,11 +9349,11 @@ _0801BA6A: strb r1, [r0] b _0801BBAA .align 2, 0 -_0801BA78: .4byte gUnknown_81D92F8 +_0801BA78: .4byte BattleScript_CastformChange _0801BA7C: .4byte gBattleScripting _0801BA80: .4byte gBattleStruct _0801BA84: - ldr r0, _0801BAA0 @ =gUnknown_81D92F8 + ldr r0, _0801BAA0 @ =BattleScript_CastformChange bl BattleScriptPushCursorAndCallback ldr r0, _0801BAA4 @ =gBattleScripting mov r3, r10 @@ -9366,7 +9366,7 @@ _0801BA84: strb r1, [r0] b _0801BBC6 .align 2, 0 -_0801BAA0: .4byte gUnknown_81D92F8 +_0801BAA0: .4byte BattleScript_CastformChange _0801BAA4: .4byte gBattleScripting _0801BAA8: .4byte gBattleStruct _0801BAAC: @@ -9376,14 +9376,14 @@ _0801BAAC: ldr r1, _0801BAC0 @ =0xfff7ffff ands r0, r1 str r0, [r2] - ldr r0, _0801BAC4 @ =gUnknown_81D9307 + ldr r0, _0801BAC4 @ =BattleScript_IntimidateActivatesEnd3 bl BattleScriptPushCursorAndCallback b _0801BB52 .align 2, 0 _0801BAC0: .4byte 0xfff7ffff -_0801BAC4: .4byte gUnknown_81D9307 +_0801BAC4: .4byte BattleScript_IntimidateActivatesEnd3 _0801BAC8: - ldr r0, _0801BB18 @ =gUnknown_81D92A1 + ldr r0, _0801BB18 @ =BattleScript_TraceActivates bl BattleScriptPushCursorAndCallback ldr r1, _0801BB1C @ =gStatuses3 ldr r0, [sp, 0x18] @@ -9422,7 +9422,7 @@ _0801BAC8: strb r0, [r1, 0x3] b _0801BBAA .align 2, 0 -_0801BB18: .4byte gUnknown_81D92A1 +_0801BB18: .4byte BattleScript_TraceActivates _0801BB1C: .4byte gStatuses3 _0801BB20: .4byte 0xffefffff _0801BB24: .4byte gBattleScripting @@ -9439,8 +9439,8 @@ _0801BB3C: ands r0, r1 str r0, [r2] bl BattleScriptPushCursor - ldr r1, _0801BB6C @ =gUnknown_2023D74 - ldr r0, _0801BB70 @ =gUnknown_81D9310 + ldr r1, _0801BB6C @ =gBattlescriptCurrInstr + ldr r0, _0801BB70 @ =BattleScript_IntimidateActivates str r0, [r1] _0801BB52: ldr r0, _0801BB74 @ =gBattleStruct @@ -9456,8 +9456,8 @@ _0801BB5A: b _0801BBAA .align 2, 0 _0801BB68: .4byte 0xfff7ffff -_0801BB6C: .4byte gUnknown_2023D74 -_0801BB70: .4byte gUnknown_81D9310 +_0801BB6C: .4byte gBattlescriptCurrInstr +_0801BB70: .4byte BattleScript_IntimidateActivates _0801BB74: .4byte gBattleStruct _0801BB78: movs r5, 0 @@ -9520,7 +9520,7 @@ _0801BBE0: .4byte gLastUsedAbility thumb_func_start BattleScriptExecute BattleScriptExecute: @ 801BBE4 - ldr r1, _0801BC10 @ =gUnknown_2023D74 + ldr r1, _0801BC10 @ =gBattlescriptCurrInstr str r0, [r1] ldr r0, _0801BC14 @ =gBattleResources ldr r0, [r0] @@ -9543,7 +9543,7 @@ BattleScriptExecute: @ 801BBE4 strb r0, [r1] bx lr .align 2, 0 -_0801BC10: .4byte gUnknown_2023D74 +_0801BC10: .4byte gBattlescriptCurrInstr _0801BC14: .4byte gBattleResources _0801BC18: .4byte gBattleMainFunc _0801BC1C: .4byte RunBattleScriptCommands_PopCallbacksStack @@ -9555,7 +9555,7 @@ BattleScriptPushCursorAndCallback: @ 801BC24 push {r4,lr} adds r4, r0, 0 bl BattleScriptPushCursor - ldr r0, _0801BC58 @ =gUnknown_2023D74 + ldr r0, _0801BC58 @ =gBattlescriptCurrInstr str r4, [r0] ldr r0, _0801BC5C @ =gBattleResources ldr r0, [r0] @@ -9577,14 +9577,14 @@ BattleScriptPushCursorAndCallback: @ 801BC24 pop {r0} bx r0 .align 2, 0 -_0801BC58: .4byte gUnknown_2023D74 +_0801BC58: .4byte gBattlescriptCurrInstr _0801BC5C: .4byte gBattleResources _0801BC60: .4byte gBattleMainFunc _0801BC64: .4byte sub_8015C74 thumb_func_end BattleScriptPushCursorAndCallback - thumb_func_start sub_801BC68 -sub_801BC68: @ 801BC68 + thumb_func_start ItemBattleEffects +ItemBattleEffects: @ 801BC68 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -9764,7 +9764,7 @@ _0801BDD0: ldr r0, _0801BDFC @ =gBattlerAttacker strb r7, [r0] strb r7, [r1] - ldr r0, _0801BE00 @ =gUnknown_81D95D9 + ldr r0, _0801BE00 @ =BattleScript_WhiteHerbEnd2 bl BattleScriptExecute bl _0801CFA6 .align 2, 0 @@ -9773,7 +9773,7 @@ _0801BDF0: .4byte gBattleScripting _0801BDF4: .4byte gPotentialItemEffectBattler _0801BDF8: .4byte gActiveBattler _0801BDFC: .4byte gBattlerAttacker -_0801BE00: .4byte gUnknown_81D95D9 +_0801BE00: .4byte BattleScript_WhiteHerbEnd2 _0801BE04: ldr r1, _0801BE2C @ =gBattleMons movs r0, 0x58 @@ -9874,12 +9874,12 @@ _0801BF14: ldr r0, [r4] negs r0, r0 str r0, [r4] - ldr r0, _0801BF28 @ =gUnknown_81D95EF + ldr r0, _0801BF28 @ =BattleScript_ItemHealHP_RemoveItem bl BattleScriptExecute b _0801C27E .align 2, 0 _0801BF24: .4byte gBattleMoveDamage -_0801BF28: .4byte gUnknown_81D95EF +_0801BF28: .4byte BattleScript_ItemHealHP_RemoveItem _0801BF2C: cmp r6, 0 beq _0801BF34 @@ -9980,7 +9980,7 @@ _0801BFE0: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r0, _0801C024 @ =gUnknown_81D960C + ldr r0, _0801C024 @ =BattleScript_BerryPPHealEnd2 bl BattleScriptExecute mov r1, r10 adds r1, 0x9 @@ -9994,13 +9994,13 @@ _0801BFE0: bl BtlController_EmitSetMonData ldr r0, _0801C028 @ =gActiveBattler ldrb r0, [r0] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec movs r0, 0x3 str r0, [sp, 0xC] bl _0801C95A .align 2, 0 _0801C020: .4byte gBattleTextBuff1 -_0801C024: .4byte gUnknown_81D960C +_0801C024: .4byte BattleScript_BerryPPHealEnd2 _0801C028: .4byte gActiveBattler _0801C02C: ldr r0, _0801C080 @ =gBattleMons @@ -10042,7 +10042,7 @@ _0801C066: ldr r0, _0801C090 @ =gBattlerAttacker strb r7, [r0] strb r7, [r1] - ldr r0, _0801C094 @ =gUnknown_81D95D9 + ldr r0, _0801C094 @ =BattleScript_WhiteHerbEnd2 bl BattleScriptExecute bl _0801C952 .align 2, 0 @@ -10051,7 +10051,7 @@ _0801C084: .4byte gBattleScripting _0801C088: .4byte gPotentialItemEffectBattler _0801C08C: .4byte gActiveBattler _0801C090: .4byte gBattlerAttacker -_0801C094: .4byte gUnknown_81D95D9 +_0801C094: .4byte BattleScript_WhiteHerbEnd2 _0801C098: movs r0, 0x58 muls r0, r7 @@ -10088,7 +10088,7 @@ _0801C0D4: ldr r0, [r3] negs r0, r0 str r0, [r3] - ldr r0, _0801C0F4 @ =gUnknown_81D961C + ldr r0, _0801C0F4 @ =BattleScript_ItemHealHP_End2 bl BattleScriptExecute movs r0, 0x4 str r0, [sp, 0xC] @@ -10098,7 +10098,7 @@ _0801C0D4: bl _0801C952 .align 2, 0 _0801C0F0: .4byte gBattleMoveDamage -_0801C0F4: .4byte gUnknown_81D961C +_0801C0F4: .4byte BattleScript_ItemHealHP_End2 _0801C0F8: movs r0, 0x58 adds r1, r7, 0 @@ -10285,22 +10285,22 @@ _0801C248: lsls r0, 24 cmp r0, 0 bge _0801C278 - ldr r0, _0801C274 @ =gUnknown_81D964F + ldr r0, _0801C274 @ =BattleScript_BerryConfuseHealEnd2 bl BattleScriptExecute b _0801C27E .align 2, 0 _0801C26C: .4byte gBattleTextBuff1 _0801C270: .4byte gBattleMoveDamage -_0801C274: .4byte gUnknown_81D964F +_0801C274: .4byte BattleScript_BerryConfuseHealEnd2 _0801C278: - ldr r0, _0801C284 @ =gUnknown_81D95EF + ldr r0, _0801C284 @ =BattleScript_ItemHealHP_RemoveItem bl BattleScriptExecute _0801C27E: movs r0, 0x4 str r0, [sp, 0xC] b _0801C95A .align 2, 0 -_0801C284: .4byte gUnknown_81D95EF +_0801C284: .4byte BattleScript_ItemHealHP_RemoveItem _0801C288: movs r0, 0x58 adds r1, r7, 0 @@ -10361,22 +10361,22 @@ _0801C2DC: cmp r0, 0 bge _0801C30C _0801C2F8: - ldr r0, _0801C308 @ =gUnknown_81D964F + ldr r0, _0801C308 @ =BattleScript_BerryConfuseHealEnd2 bl BattleScriptExecute b _0801C312 .align 2, 0 _0801C300: .4byte gBattleTextBuff1 _0801C304: .4byte gBattleMoveDamage -_0801C308: .4byte gUnknown_81D964F +_0801C308: .4byte BattleScript_BerryConfuseHealEnd2 _0801C30C: - ldr r0, _0801C318 @ =gUnknown_81D95EF + ldr r0, _0801C318 @ =BattleScript_ItemHealHP_RemoveItem bl BattleScriptExecute _0801C312: movs r3, 0x4 str r3, [sp, 0xC] b _0801C95A .align 2, 0 -_0801C318: .4byte gUnknown_81D95EF +_0801C318: .4byte BattleScript_ItemHealHP_RemoveItem _0801C31C: movs r0, 0x58 adds r5, r7, 0 @@ -10436,22 +10436,22 @@ _0801C36E: cmp r0, 0 bge _0801C3A0 _0801C38A: - ldr r0, _0801C39C @ =gUnknown_81D964F + ldr r0, _0801C39C @ =BattleScript_BerryConfuseHealEnd2 bl BattleScriptExecute b _0801C3A6 .align 2, 0 _0801C394: .4byte gBattleTextBuff1 _0801C398: .4byte gBattleMoveDamage -_0801C39C: .4byte gUnknown_81D964F +_0801C39C: .4byte BattleScript_BerryConfuseHealEnd2 _0801C3A0: - ldr r0, _0801C3AC @ =gUnknown_81D95EF + ldr r0, _0801C3AC @ =BattleScript_ItemHealHP_RemoveItem bl BattleScriptExecute _0801C3A6: movs r2, 0x4 str r2, [sp, 0xC] b _0801C95A .align 2, 0 -_0801C3AC: .4byte gUnknown_81D95EF +_0801C3AC: .4byte BattleScript_ItemHealHP_RemoveItem _0801C3B0: movs r0, 0x58 muls r0, r7 @@ -10631,7 +10631,7 @@ _0801C4E8: _0801C506: strb r0, [r1, 0x10] strb r6, [r1, 0x11] - ldr r0, _0801C524 @ =gUnknown_81D9679 + ldr r0, _0801C524 @ =BattleScript_BerryStatRaiseEnd2 bl BattleScriptExecute movs r2, 0x5 str r2, [sp, 0xC] @@ -10640,7 +10640,7 @@ _0801C506: _0801C518: .4byte gBattleTextBuff1 _0801C51C: .4byte gEffectBattler _0801C520: .4byte gBattleScripting -_0801C524: .4byte gUnknown_81D9679 +_0801C524: .4byte BattleScript_BerryStatRaiseEnd2 _0801C528: movs r0, 0x58 muls r0, r7 @@ -10681,7 +10681,7 @@ _0801C550: _0801C56C: strb r0, [r1, 0x10] strb r6, [r1, 0x11] - ldr r0, _0801C588 @ =gUnknown_81D9679 + ldr r0, _0801C588 @ =BattleScript_BerryStatRaiseEnd2 bl BattleScriptExecute movs r5, 0x5 str r5, [sp, 0xC] @@ -10690,7 +10690,7 @@ _0801C56C: _0801C57C: .4byte gBattleTextBuff1 _0801C580: .4byte gEffectBattler _0801C584: .4byte gBattleScripting -_0801C588: .4byte gUnknown_81D9679 +_0801C588: .4byte BattleScript_BerryStatRaiseEnd2 _0801C58C: movs r0, 0x58 adds r5, r7, 0 @@ -10723,13 +10723,13 @@ _0801C5AC: _0801C5C2: orrs r2, r3 str r2, [r1] - ldr r0, _0801C5D4 @ =gUnknown_81D9694 + ldr r0, _0801C5D4 @ =BattleScript_BerryFocusEnergyEnd2 bl BattleScriptExecute movs r2, 0x2 str r2, [sp, 0xC] b _0801C95A .align 2, 0 -_0801C5D4: .4byte gUnknown_81D9694 +_0801C5D4: .4byte BattleScript_BerryFocusEnergyEnd2 _0801C5D8: cmp r6, 0 beq _0801C5DE @@ -10831,7 +10831,7 @@ _0801C638: adds r0, 0x6 strb r0, [r1, 0x10] strb r2, [r1, 0x11] - ldr r0, _0801C6BC @ =gUnknown_81D9679 + ldr r0, _0801C6BC @ =BattleScript_BerryStatRaiseEnd2 bl BattleScriptExecute movs r0, 0x5 str r0, [sp, 0xC] @@ -10842,7 +10842,7 @@ _0801C6AC: .4byte gBattleTextBuff1 _0801C6B0: .4byte gBattleTextBuff2 _0801C6B4: .4byte gEffectBattler _0801C6B8: .4byte gBattleScripting -_0801C6BC: .4byte gUnknown_81D9679 +_0801C6BC: .4byte BattleScript_BerryStatRaiseEnd2 _0801C6C0: movs r0, 0x58 adds r1, r7, 0 @@ -10861,13 +10861,13 @@ _0801C6D8: negs r0, r0 ands r2, r0 str r2, [r1] - ldr r0, _0801C6EC @ =gUnknown_81D9531 + ldr r0, _0801C6EC @ =BattleScript_BerryCurePrlzEnd2 bl BattleScriptExecute movs r1, 0x1 str r1, [sp, 0xC] b _0801C95A .align 2, 0 -_0801C6EC: .4byte gUnknown_81D9531 +_0801C6EC: .4byte BattleScript_BerryCurePrlzEnd2 _0801C6F0: movs r0, 0x58 adds r1, r7, 0 @@ -10885,14 +10885,14 @@ _0801C708: ldr r0, _0801C71C @ =0xfffff077 ands r2, r0 str r2, [r1] - ldr r0, _0801C720 @ =gUnknown_81D9549 + ldr r0, _0801C720 @ =BattleScript_BerryCurePsnEnd2 bl BattleScriptExecute movs r2, 0x1 str r2, [sp, 0xC] b _0801C95A .align 2, 0 _0801C71C: .4byte 0xfffff077 -_0801C720: .4byte gUnknown_81D9549 +_0801C720: .4byte BattleScript_BerryCurePsnEnd2 _0801C724: movs r0, 0x58 adds r1, r7, 0 @@ -10911,13 +10911,13 @@ _0801C73C: negs r0, r0 ands r2, r0 str r2, [r1] - ldr r0, _0801C750 @ =gUnknown_81D9561 + ldr r0, _0801C750 @ =BattleScript_BerryCureBrnEnd2 bl BattleScriptExecute movs r3, 0x1 str r3, [sp, 0xC] b _0801C95A .align 2, 0 -_0801C750: .4byte gUnknown_81D9561 +_0801C750: .4byte BattleScript_BerryCureBrnEnd2 _0801C754: movs r0, 0x58 adds r1, r7, 0 @@ -10936,13 +10936,13 @@ _0801C76C: negs r0, r0 ands r2, r0 str r2, [r1] - ldr r0, _0801C780 @ =gUnknown_81D9579 + ldr r0, _0801C780 @ =BattleScript_BerryCureFrzEnd2 bl BattleScriptExecute movs r5, 0x1 str r5, [sp, 0xC] b _0801C95A .align 2, 0 -_0801C780: .4byte gUnknown_81D9579 +_0801C780: .4byte BattleScript_BerryCureFrzEnd2 _0801C784: movs r0, 0x58 adds r3, r7, 0 @@ -10968,11 +10968,11 @@ _0801C79C: ldr r2, _0801C7B8 @ =0xf7ffffff ands r0, r2 str r0, [r1] - ldr r0, _0801C7BC @ =gUnknown_81D9591 + ldr r0, _0801C7BC @ =BattleScript_BerryCureSlpEnd2 b _0801C906 .align 2, 0 _0801C7B8: .4byte 0xf7ffffff -_0801C7BC: .4byte gUnknown_81D9591 +_0801C7BC: .4byte BattleScript_BerryCureSlpEnd2 _0801C7C0: movs r0, 0x58 adds r1, r7, 0 @@ -10991,13 +10991,13 @@ _0801C7D8: negs r0, r0 ands r2, r0 str r2, [r1] - ldr r0, _0801C7EC @ =gUnknown_81D95A9 + ldr r0, _0801C7EC @ =BattleScript_BerryCureConfusionEnd2 bl BattleScriptExecute movs r1, 0x2 str r1, [sp, 0xC] b _0801C95A .align 2, 0 -_0801C7EC: .4byte gUnknown_81D95A9 +_0801C7EC: .4byte BattleScript_BerryCureConfusionEnd2 _0801C7F0: movs r0, 0x58 adds r5, r7, 0 @@ -11098,7 +11098,7 @@ _0801C8AE: mov r5, r10 cmp r5, 0x1 bgt _0801C8E0 - ldr r1, _0801C8DC @ =gUnknown_2023E82 + ldr r1, _0801C8DC @ =gBattleCommunication movs r0, 0 b _0801C8E4 .align 2, 0 @@ -11110,9 +11110,9 @@ _0801C8CC: .4byte gUnknown_82500A4 _0801C8D0: .4byte gUnknown_82500AC _0801C8D4: .4byte gUnknown_82500B4 _0801C8D8: .4byte gUnknown_82500BC -_0801C8DC: .4byte gUnknown_2023E82 +_0801C8DC: .4byte gBattleCommunication _0801C8E0: - ldr r1, _0801C910 @ =gUnknown_2023E82 + ldr r1, _0801C910 @ =gBattleCommunication movs r0, 0x1 _0801C8E4: strb r0, [r1, 0x5] @@ -11131,16 +11131,16 @@ _0801C8E4: subs r1, 0x8 ands r0, r1 str r0, [r3] - ldr r0, _0801C918 @ =gUnknown_81D95BF + ldr r0, _0801C918 @ =BattleScript_BerryCureChosenStatusEnd2 _0801C906: bl BattleScriptExecute movs r0, 0x1 str r0, [sp, 0xC] b _0801C95A .align 2, 0 -_0801C910: .4byte gUnknown_2023E82 +_0801C910: .4byte gBattleCommunication _0801C914: .4byte gBattleMons -_0801C918: .4byte gUnknown_81D95BF +_0801C918: .4byte BattleScript_BerryCureChosenStatusEnd2 _0801C91C: movs r0, 0x58 adds r1, r7, 0 @@ -11160,9 +11160,9 @@ _0801C91C: ldr r0, _0801C97C @ =gBattleTextBuff1 ldr r1, _0801C980 @ =gUnknown_82500C4 bl StringCopy - ldr r0, _0801C984 @ =gUnknown_81D95BF + ldr r0, _0801C984 @ =BattleScript_BerryCureChosenStatusEnd2 bl BattleScriptExecute - ldr r1, _0801C988 @ =gUnknown_2023E82 + ldr r1, _0801C988 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] movs r1, 0x2 @@ -11191,8 +11191,8 @@ _0801C95A: _0801C978: .4byte 0xfff0ffff _0801C97C: .4byte gBattleTextBuff1 _0801C980: .4byte gUnknown_82500C4 -_0801C984: .4byte gUnknown_81D95BF -_0801C988: .4byte gUnknown_2023E82 +_0801C984: .4byte BattleScript_BerryCureChosenStatusEnd2 +_0801C988: .4byte gBattleCommunication _0801C98C: .4byte gBattleScripting _0801C990: .4byte gPotentialItemEffectBattler _0801C994: .4byte gActiveBattler @@ -11344,16 +11344,16 @@ _0801CAE6: ands r1, r0 str r1, [r2] bl BattleScriptPushCursor - ldr r1, _0801CB04 @ =gUnknown_2023D74 - ldr r0, _0801CB08 @ =gUnknown_81D9537 + ldr r1, _0801CB04 @ =gBattlescriptCurrInstr + ldr r0, _0801CB08 @ =BattleScript_BerryCureParRet str r0, [r1] movs r0, 0x1 str r0, [sp, 0xC] b _0801CDF6 .align 2, 0 _0801CB00: .4byte gBattleMons -_0801CB04: .4byte gUnknown_2023D74 -_0801CB08: .4byte gUnknown_81D9537 +_0801CB04: .4byte gBattlescriptCurrInstr +_0801CB08: .4byte BattleScript_BerryCureParRet _0801CB0C: ldr r1, _0801CB38 @ =gBattleMons movs r0, 0x58 @@ -11371,8 +11371,8 @@ _0801CB22: ands r1, r0 str r1, [r2] bl BattleScriptPushCursor - ldr r1, _0801CB40 @ =gUnknown_2023D74 - ldr r0, _0801CB44 @ =gUnknown_81D954F + ldr r1, _0801CB40 @ =gBattlescriptCurrInstr + ldr r0, _0801CB44 @ =BattleScript_BerryCurePsnRet str r0, [r1] movs r1, 0x1 str r1, [sp, 0xC] @@ -11380,8 +11380,8 @@ _0801CB22: .align 2, 0 _0801CB38: .4byte gBattleMons _0801CB3C: .4byte 0xfffff077 -_0801CB40: .4byte gUnknown_2023D74 -_0801CB44: .4byte gUnknown_81D954F +_0801CB40: .4byte gBattlescriptCurrInstr +_0801CB44: .4byte BattleScript_BerryCurePsnRet _0801CB48: ldr r1, _0801CB78 @ =gBattleMons movs r0, 0x58 @@ -11400,16 +11400,16 @@ _0801CB5E: ands r1, r0 str r1, [r2] bl BattleScriptPushCursor - ldr r1, _0801CB7C @ =gUnknown_2023D74 - ldr r0, _0801CB80 @ =gUnknown_81D9567 + ldr r1, _0801CB7C @ =gBattlescriptCurrInstr + ldr r0, _0801CB80 @ =BattleScript_BerryCureBrnRet str r0, [r1] movs r2, 0x1 str r2, [sp, 0xC] b _0801CDF6 .align 2, 0 _0801CB78: .4byte gBattleMons -_0801CB7C: .4byte gUnknown_2023D74 -_0801CB80: .4byte gUnknown_81D9567 +_0801CB7C: .4byte gBattlescriptCurrInstr +_0801CB80: .4byte BattleScript_BerryCureBrnRet _0801CB84: ldr r1, _0801CBB4 @ =gBattleMons movs r0, 0x58 @@ -11428,16 +11428,16 @@ _0801CB9A: ands r1, r0 str r1, [r2] bl BattleScriptPushCursor - ldr r1, _0801CBB8 @ =gUnknown_2023D74 - ldr r0, _0801CBBC @ =gUnknown_81D957F + ldr r1, _0801CBB8 @ =gBattlescriptCurrInstr + ldr r0, _0801CBBC @ =BattleScript_BerryCureFrzRet str r0, [r1] movs r3, 0x1 str r3, [sp, 0xC] b _0801CDF6 .align 2, 0 _0801CBB4: .4byte gBattleMons -_0801CBB8: .4byte gUnknown_2023D74 -_0801CBBC: .4byte gUnknown_81D957F +_0801CBB8: .4byte gBattlescriptCurrInstr +_0801CBBC: .4byte BattleScript_BerryCureFrzRet _0801CBC0: ldr r2, _0801CBF8 @ =gBattleMons movs r0, 0x58 @@ -11464,14 +11464,14 @@ _0801CBDA: ands r0, r1 str r0, [r2] bl BattleScriptPushCursor - ldr r1, _0801CC00 @ =gUnknown_2023D74 - ldr r0, _0801CC04 @ =gUnknown_81D9597 + ldr r1, _0801CC00 @ =gBattlescriptCurrInstr + ldr r0, _0801CC04 @ =BattleScript_BerryCureSlpRet b _0801CD58 .align 2, 0 _0801CBF8: .4byte gBattleMons _0801CBFC: .4byte 0xf7ffffff -_0801CC00: .4byte gUnknown_2023D74 -_0801CC04: .4byte gUnknown_81D9597 +_0801CC00: .4byte gBattlescriptCurrInstr +_0801CC04: .4byte BattleScript_BerryCureSlpRet _0801CC08: ldr r1, _0801CC38 @ =gBattleMons movs r0, 0x58 @@ -11490,16 +11490,16 @@ _0801CC1E: ands r1, r0 str r1, [r2] bl BattleScriptPushCursor - ldr r1, _0801CC3C @ =gUnknown_2023D74 - ldr r0, _0801CC40 @ =gUnknown_81D95AF + ldr r1, _0801CC3C @ =gBattlescriptCurrInstr + ldr r0, _0801CC40 @ =BattleScript_BerryCureConfusionRet str r0, [r1] movs r0, 0x2 str r0, [sp, 0xC] b _0801CDF6 .align 2, 0 _0801CC38: .4byte gBattleMons -_0801CC3C: .4byte gUnknown_2023D74 -_0801CC40: .4byte gUnknown_81D95AF +_0801CC3C: .4byte gBattlescriptCurrInstr +_0801CC40: .4byte BattleScript_BerryCureConfusionRet _0801CC44: ldr r1, _0801CC80 @ =gBattleMons movs r0, 0x58 @@ -11521,11 +11521,11 @@ _0801CC5C: ldr r1, _0801CC8C @ =gUnknown_82500C4 bl StringCopy bl BattleScriptPushCursor - ldr r1, _0801CC90 @ =gUnknown_2023E82 + ldr r1, _0801CC90 @ =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] - ldr r1, _0801CC94 @ =gUnknown_2023D74 - ldr r0, _0801CC98 @ =gUnknown_81D95C5 + ldr r1, _0801CC94 @ =gBattlescriptCurrInstr + ldr r0, _0801CC98 @ =BattleScript_BerryCureChosenStatusRet str r0, [r1] movs r1, 0x2 str r1, [sp, 0xC] @@ -11535,9 +11535,9 @@ _0801CC80: .4byte gBattleMons _0801CC84: .4byte 0xfff0ffff _0801CC88: .4byte gBattleTextBuff1 _0801CC8C: .4byte gUnknown_82500C4 -_0801CC90: .4byte gUnknown_2023E82 -_0801CC94: .4byte gUnknown_2023D74 -_0801CC98: .4byte gUnknown_81D95C5 +_0801CC90: .4byte gBattleCommunication +_0801CC94: .4byte gBattlescriptCurrInstr +_0801CC98: .4byte BattleScript_BerryCureChosenStatusRet _0801CC9C: ldr r4, _0801CD60 @ =gBattleMons movs r0, 0x58 @@ -11629,10 +11629,10 @@ _0801CD3E: ands r0, r1 str r0, [r5] bl BattleScriptPushCursor - ldr r0, _0801CD84 @ =gUnknown_2023E82 + ldr r0, _0801CD84 @ =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, _0801CD88 @ =gUnknown_2023D74 - ldr r0, _0801CD8C @ =gUnknown_81D95C5 + ldr r1, _0801CD88 @ =gBattlescriptCurrInstr + ldr r0, _0801CD8C @ =BattleScript_BerryCureChosenStatusRet _0801CD58: str r0, [r1] movs r5, 0x1 @@ -11648,9 +11648,9 @@ _0801CD74: .4byte gUnknown_82500A4 _0801CD78: .4byte gUnknown_82500AC _0801CD7C: .4byte gUnknown_82500B4 _0801CD80: .4byte gUnknown_82500BC -_0801CD84: .4byte gUnknown_2023E82 -_0801CD88: .4byte gUnknown_2023D74 -_0801CD8C: .4byte gUnknown_81D95C5 +_0801CD84: .4byte gBattleCommunication +_0801CD88: .4byte gBattlescriptCurrInstr +_0801CD8C: .4byte BattleScript_BerryCureChosenStatusRet _0801CD90: ldr r0, _0801CDDC @ =gBattleMons mov r8, r0 @@ -11687,16 +11687,16 @@ _0801CDB4: ldr r0, _0801CDE4 @ =gPotentialItemEffectBattler strb r7, [r0] bl BattleScriptPushCursor - ldr r1, _0801CDE8 @ =gUnknown_2023D74 - ldr r0, _0801CDEC @ =gUnknown_81D95DF + ldr r1, _0801CDE8 @ =gBattlescriptCurrInstr + ldr r0, _0801CDEC @ =BattleScript_WhiteHerbRet str r0, [r1] b _0801CFA6 .align 2, 0 _0801CDDC: .4byte gBattleMons _0801CDE0: .4byte gBattleScripting _0801CDE4: .4byte gPotentialItemEffectBattler -_0801CDE8: .4byte gUnknown_2023D74 -_0801CDEC: .4byte gUnknown_81D95DF +_0801CDE8: .4byte gBattlescriptCurrInstr +_0801CDEC: .4byte BattleScript_WhiteHerbRet _0801CDF0: ldr r0, [sp, 0xC] cmp r0, 0 @@ -11721,7 +11721,7 @@ _0801CE08: movs r3, 0x4 bl BtlController_EmitSetMonData ldrb r0, [r4] - bl MarkBufferBankForExecution + bl MarkBattlerForControllerExec b _0801CFA6 .align 2, 0 _0801CE24: .4byte gBattleScripting @@ -11765,7 +11765,7 @@ _0801CE68: beq _0801CE76 b _0801CFA6 _0801CE76: - ldr r2, _0801CEF8 @ =gUnknown_2023ECC + ldr r2, _0801CEF8 @ =gSpecialStatuses ldr r4, _0801CEFC @ =gBattlerTarget ldrb r1, [r4] lsls r0, r1, 2 @@ -11814,23 +11814,23 @@ _0801CE9C: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0801CFA6 - ldr r1, _0801CF0C @ =gUnknown_2023E82 + ldr r1, _0801CF0C @ =gBattleCommunication movs r0, 0x8 strb r0, [r1, 0x3] bl BattleScriptPushCursor movs r0, 0 movs r1, 0 - bl sub_801FF20 + bl SetMoveEffect bl BattleScriptPop b _0801CFA6 .align 2, 0 _0801CEF4: .4byte gMoveResultFlags -_0801CEF8: .4byte gUnknown_2023ECC +_0801CEF8: .4byte gSpecialStatuses _0801CEFC: .4byte gBattlerTarget _0801CF00: .4byte gBattleMoves _0801CF04: .4byte gCurrentMove _0801CF08: .4byte gBattleMons -_0801CF0C: .4byte gUnknown_2023E82 +_0801CF0C: .4byte gBattleCommunication _0801CF10: ldr r0, _0801CFB8 @ =gMoveResultFlags ldrb r0, [r0] @@ -11838,7 +11838,7 @@ _0801CF10: ands r5, r0 cmp r5, 0 bne _0801CFA6 - ldr r1, _0801CFBC @ =gUnknown_2023ECC + ldr r1, _0801CFBC @ =gSpecialStatuses ldr r4, _0801CFC0 @ =gBattlerTarget ldrb r2, [r4] lsls r0, r2, 2 @@ -11898,8 +11898,8 @@ _0801CF88: adds r0, r6 str r5, [r0] bl BattleScriptPushCursor - ldr r1, _0801CFDC @ =gUnknown_2023D74 - ldr r0, _0801CFE0 @ =gUnknown_81D9622 + ldr r1, _0801CFDC @ =gBattlescriptCurrInstr + ldr r0, _0801CFE0 @ =BattleScript_ItemHealHP_Ret str r0, [r1] ldr r0, [sp, 0xC] adds r0, 0x1 @@ -11918,7 +11918,7 @@ _0801CFA6: bx r1 .align 2, 0 _0801CFB8: .4byte gMoveResultFlags -_0801CFBC: .4byte gUnknown_2023ECC +_0801CFBC: .4byte gSpecialStatuses _0801CFC0: .4byte gBattlerTarget _0801CFC4: .4byte 0x0000ffff _0801CFC8: .4byte gBattlerAttacker @@ -11926,9 +11926,9 @@ _0801CFCC: .4byte gBattleMons _0801CFD0: .4byte gLastUsedItem _0801CFD4: .4byte gPotentialItemEffectBattler _0801CFD8: .4byte gBattleScripting -_0801CFDC: .4byte gUnknown_2023D74 -_0801CFE0: .4byte gUnknown_81D9622 - thumb_func_end sub_801BC68 +_0801CFDC: .4byte gBattlescriptCurrInstr +_0801CFE0: .4byte BattleScript_ItemHealHP_Ret + thumb_func_end ItemBattleEffects thumb_func_start ClearFuryCutterDestinyBondGrudge ClearFuryCutterDestinyBondGrudge: @ 801CFE4 @@ -11967,15 +11967,15 @@ _0801D028: .4byte gStatuses3 _0801D02C: .4byte 0xffffbfff thumb_func_end ClearFuryCutterDestinyBondGrudge - thumb_func_start sub_801D030 -sub_801D030: @ 801D030 + thumb_func_start HandleAction_RunBattleScript +HandleAction_RunBattleScript: @ 801D030 push {lr} ldr r0, _0801D050 @ =gBattleControllerExecFlags ldr r0, [r0] cmp r0, 0 bne _0801D04C ldr r1, _0801D054 @ =gUnknown_825011C - ldr r0, _0801D058 @ =gUnknown_2023D74 + ldr r0, _0801D058 @ =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -11988,8 +11988,8 @@ _0801D04C: .align 2, 0 _0801D050: .4byte gBattleControllerExecFlags _0801D054: .4byte gUnknown_825011C -_0801D058: .4byte gUnknown_2023D74 - thumb_func_end sub_801D030 +_0801D058: .4byte gBattlescriptCurrInstr + thumb_func_end HandleAction_RunBattleScript thumb_func_start GetMoveTarget GetMoveTarget: @ 801D05C @@ -12197,7 +12197,7 @@ _0801D25E: ldrb r1, [r0] adds r0, r5, 0 bl sub_80C71D0 - ldr r1, _0801D2A0 @ =gUnknown_2023ECC + ldr r1, _0801D2A0 @ =gSpecialStatuses lsls r0, r5, 2 adds r0, r5 lsls r0, 2 @@ -12214,7 +12214,7 @@ _0801D290: .4byte gBattlersCount _0801D294: .4byte gAbsentBattlerFlags _0801D298: .4byte gBitTable _0801D29C: .4byte gBattleMoves -_0801D2A0: .4byte gUnknown_2023ECC +_0801D2A0: .4byte gSpecialStatuses _0801D2A4: ldr r0, _0801D2B8 @ =gBattlerAttacker ldrb r0, [r0] @@ -12414,8 +12414,8 @@ _0801D430: .4byte gBattlerPartyIndexes _0801D434: .4byte gPlayerParty thumb_func_end HasObedientBitSet - thumb_func_start sub_801D438 -sub_801D438: @ 801D438 + thumb_func_start IsMonDisobedient +IsMonDisobedient: @ 801D438 push {r4-r7,lr} mov r7, r8 push {r7} @@ -12547,14 +12547,14 @@ _0801D52E: cmp r0, 0xD6 bne _0801D564 _0801D54E: - ldr r1, _0801D55C @ =gUnknown_2023D74 - ldr r0, _0801D560 @ =gUnknown_81D94DA + ldr r1, _0801D55C @ =gBattlescriptCurrInstr + ldr r0, _0801D560 @ =BattleScript_IgnoresWhileAsleep b _0801D6E2 .align 2, 0 _0801D554: .4byte gCurrentMove _0801D558: .4byte 0xff7fffff -_0801D55C: .4byte gUnknown_2023D74 -_0801D560: .4byte gUnknown_81D94DA +_0801D55C: .4byte gBattlescriptCurrInstr +_0801D560: .4byte BattleScript_IgnoresWhileAsleep _0801D564: bl Random movs r1, 0xFF @@ -12623,15 +12623,15 @@ _0801D5B6: adds r0, r3 ldrh r0, [r0] strh r0, [r4] - ldr r1, _0801D624 @ =gUnknown_2023D74 - ldr r0, _0801D628 @ =gUnknown_81D94EA + ldr r1, _0801D624 @ =gBattlescriptCurrInstr + ldr r0, _0801D628 @ =BattleScript_IgnoresAndUsesRandomMove str r0, [r1] ldrh r0, [r4] movs r1, 0 bl GetMoveTarget ldr r1, _0801D62C @ =gBattlerTarget strb r0, [r1] - ldr r2, _0801D630 @ =gUnknown_2023DD0 + ldr r2, _0801D630 @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 14 @@ -12644,10 +12644,10 @@ _0801D614: .4byte gBitTable _0801D618: .4byte gUnknown_2023D48 _0801D61C: .4byte gUnknown_2023D49 _0801D620: .4byte gUnknown_2023D4E -_0801D624: .4byte gUnknown_2023D74 -_0801D628: .4byte gUnknown_81D94EA +_0801D624: .4byte gBattlescriptCurrInstr +_0801D628: .4byte BattleScript_IgnoresAndUsesRandomMove _0801D62C: .4byte gBattlerTarget -_0801D630: .4byte gUnknown_2023DD0 +_0801D630: .4byte gHitMarker _0801D634: ldr r5, _0801D6B8 @ =gBattleMons ldr r2, _0801D6BC @ =gBattlerAttacker @@ -12712,35 +12712,35 @@ _0801D6AA: ldrb r7, [r7] cmp r2, r7 bne _0801D6CC - ldr r1, _0801D6C4 @ =gUnknown_2023D74 - ldr r0, _0801D6C8 @ =gUnknown_81D9504 + ldr r1, _0801D6C4 @ =gBattlescriptCurrInstr + ldr r0, _0801D6C8 @ =BattleScript_IgnoresAndFallsAsleep b _0801D6E2 .align 2, 0 _0801D6B8: .4byte gBattleMons _0801D6BC: .4byte gBattlerAttacker _0801D6C0: .4byte gBattlersCount -_0801D6C4: .4byte gUnknown_2023D74 -_0801D6C8: .4byte gUnknown_81D9504 +_0801D6C4: .4byte gBattlescriptCurrInstr +_0801D6C8: .4byte BattleScript_IgnoresAndFallsAsleep _0801D6CC: subs r4, r6 cmp r4, r6 blt _0801D6F4 _0801D6D2: bl Random - ldr r2, _0801D6E8 @ =gUnknown_2023E82 + ldr r2, _0801D6E8 @ =gBattleCommunication movs r1, 0x3 ands r1, r0 strb r1, [r2, 0x5] - ldr r1, _0801D6EC @ =gUnknown_2023D74 - ldr r0, _0801D6F0 @ =gUnknown_81D94F2 + ldr r1, _0801D6EC @ =gBattlescriptCurrInstr + ldr r0, _0801D6F0 @ =BattleScript_MoveUsedLoafingAround _0801D6E2: str r0, [r1] movs r0, 0x1 b _0801D738 .align 2, 0 -_0801D6E8: .4byte gUnknown_2023E82 -_0801D6EC: .4byte gUnknown_2023D74 -_0801D6F0: .4byte gUnknown_81D94F2 +_0801D6E8: .4byte gBattleCommunication +_0801D6EC: .4byte gBattlescriptCurrInstr +_0801D6F0: .4byte BattleScript_MoveUsedLoafingAround _0801D6F4: ldr r4, _0801D744 @ =gBattlerAttacker ldrb r1, [r4] @@ -12765,10 +12765,10 @@ _0801D6F4: ldr r1, _0801D750 @ =gBattlerTarget ldrb r0, [r4] strb r0, [r1] - ldr r1, _0801D754 @ =gUnknown_2023D74 - ldr r0, _0801D758 @ =gUnknown_81D951B + ldr r1, _0801D754 @ =gBattlescriptCurrInstr + ldr r0, _0801D758 @ =BattleScript_IgnoresAndHitsItself str r0, [r1] - ldr r2, _0801D75C @ =gUnknown_2023DD0 + ldr r2, _0801D75C @ =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -12788,9 +12788,9 @@ _0801D744: .4byte gBattlerAttacker _0801D748: .4byte gBattleMons _0801D74C: .4byte gBattleMoveDamage _0801D750: .4byte gBattlerTarget -_0801D754: .4byte gUnknown_2023D74 -_0801D758: .4byte gUnknown_81D951B -_0801D75C: .4byte gUnknown_2023DD0 - thumb_func_end sub_801D438 +_0801D754: .4byte gBattlescriptCurrInstr +_0801D758: .4byte BattleScript_IgnoresAndHitsItself +_0801D75C: .4byte gHitMarker + thumb_func_end IsMonDisobedient .align 2, 0 @ Don't pad with nop. diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 8830ae009..0062040ec 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -1337,7 +1337,7 @@ sub_80CE8DC: @ 80CE8DC strh r0, [r5, 0x8] movs r2, 0x1 strh r2, [r5, 0x1A] - ldr r0, _080CE944 @ =gUnknown_2023E82 + ldr r0, _080CE944 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1349,7 +1349,7 @@ sub_80CE8DC: @ 80CE8DC .align 2, 0 _080CE93C: .4byte gTasks _080CE940: .4byte gPlayerParty -_080CE944: .4byte gUnknown_2023E82 +_080CE944: .4byte gBattleCommunication _080CE948: ldr r0, _080CE9A0 @ =gMain ldrh r1, [r0, 0x2C] @@ -1367,7 +1367,7 @@ _080CE948: ldrsh r0, [r2, r3] cmp r0, 0x8 bne _080CE9AC - ldr r4, _080CE9A8 @ =gUnknown_2023E82 + ldr r4, _080CE9A8 @ =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1395,7 +1395,7 @@ _080CE948: .align 2, 0 _080CE9A0: .4byte gMain _080CE9A4: .4byte gTasks -_080CE9A8: .4byte gUnknown_2023E82 +_080CE9A8: .4byte gBattleCommunication _080CE9AC: mov r1, r8 adds r0, r1, r7 @@ -1584,7 +1584,7 @@ _080CEB68: bl InitMovingBackgroundTask movs r0, 0x11 bl LaunchTask_PreEvoSparklesSet1 - ldr r1, _080CEB88 @ =gUnknown_2023E82 + ldr r1, _080CEB88 @ =gBattleCommunication strb r0, [r1, 0x2] ldr r0, _080CEB8C @ =gTasks mov r2, r8 @@ -1594,10 +1594,10 @@ _080CEB68: b _080CEFDE .align 2, 0 _080CEB84: .4byte gPaletteFade -_080CEB88: .4byte gUnknown_2023E82 +_080CEB88: .4byte gBattleCommunication _080CEB8C: .4byte gTasks _080CEB90: - ldr r4, _080CEBC8 @ =gUnknown_2023E82 + ldr r4, _080CEBC8 @ =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1623,10 +1623,10 @@ _080CEBA6: strb r0, [r4, 0x2] bl _080CF528 .align 2, 0 -_080CEBC8: .4byte gUnknown_2023E82 +_080CEBC8: .4byte gBattleCommunication _080CEBCC: .4byte gUnknown_2039A20 _080CEBD0: - ldr r4, _080CEC00 @ =gUnknown_2023E82 + ldr r4, _080CEC00 @ =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1649,7 +1649,7 @@ _080CEBE6: add r1, r10 b _080CEFDE .align 2, 0 -_080CEC00: .4byte gUnknown_2023E82 +_080CEC00: .4byte gBattleCommunication _080CEC04: .4byte gUnknown_2039A20 _080CEC08: ldr r2, _080CEC44 @ =gUnknown_2039A20 @@ -1665,7 +1665,7 @@ _080CEC1C: ldr r1, [r2] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, _080CEC48 @ =gUnknown_2023E82 + ldr r0, _080CEC48 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1683,10 +1683,10 @@ _080CEC38: b _080CEFDE .align 2, 0 _080CEC44: .4byte gUnknown_2039A20 -_080CEC48: .4byte gUnknown_2023E82 +_080CEC48: .4byte gBattleCommunication _080CEC4C: bl sub_80F5F74 - ldr r1, _080CEC60 @ =gUnknown_2023E82 + ldr r1, _080CEC60 @ =gBattleCommunication strb r0, [r1, 0x2] ldr r0, _080CEC64 @ =gTasks mov r3, r8 @@ -1695,10 +1695,10 @@ _080CEC4C: adds r1, r0 b _080CEFDE .align 2, 0 -_080CEC60: .4byte gUnknown_2023E82 +_080CEC60: .4byte gBattleCommunication _080CEC64: .4byte gTasks _080CEC68: - ldr r6, _080CEC90 @ =gUnknown_2023E82 + ldr r6, _080CEC90 @ =gBattleCommunication ldrb r0, [r6, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1718,9 +1718,9 @@ _080CEC7E: strb r0, [r6, 0x2] b _080CEF2E .align 2, 0 -_080CEC90: .4byte gUnknown_2023E82 +_080CEC90: .4byte gBattleCommunication _080CEC94: - ldr r0, _080CECBC @ =gUnknown_2023E82 + ldr r0, _080CECBC @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1739,7 +1739,7 @@ _080CECAA: add r1, r10 b _080CEFDE .align 2, 0 -_080CECBC: .4byte gUnknown_2023E82 +_080CECBC: .4byte gBattleCommunication _080CECC0: bl IsSEPlaying lsls r0, 24 @@ -1971,7 +1971,7 @@ _080CEEC4: .4byte gPaletteFade _080CEEC8: .4byte gUnknown_2039A20 _080CEECC: .4byte gUnknown_300537C _080CEED0: - ldr r0, _080CEF04 @ =gUnknown_2023E82 + ldr r0, _080CEF04 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1996,7 +1996,7 @@ _080CEEE4: add r1, r10 b _080CEFDE .align 2, 0 -_080CEF04: .4byte gUnknown_2023E82 +_080CEF04: .4byte gBattleCommunication _080CEF08: .4byte 0x0006001c _080CEF0C: .4byte 0x00007fff _080CEF10: @@ -2299,7 +2299,7 @@ _080CF176: adds r0, 0x1 movs r2, 0 strh r0, [r1, 0x14] - ldr r0, _080CF1B8 @ =gUnknown_2023E82 + ldr r0, _080CF1B8 @ =gBattleCommunication strb r2, [r0, 0x1] bl sub_802DCB8 b _080CF528 @@ -2308,7 +2308,7 @@ _080CF1A8: .4byte gUnknown_83FDF3C _080CF1AC: .4byte gDisplayedStringBattle _080CF1B0: .4byte gTasks _080CF1B4: .4byte gUnknown_83FE791 -_080CF1B8: .4byte gUnknown_2023E82 +_080CF1B8: .4byte gBattleCommunication _080CF1BC: ldr r0, _080CF244 @ =gMain ldrh r1, [r0, 0x2E] @@ -2316,7 +2316,7 @@ _080CF1BC: ands r0, r1 cmp r0, 0 beq _080CF1E2 - ldr r4, _080CF248 @ =gUnknown_2023E82 + ldr r4, _080CF248 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _080CF1E2 @@ -2333,7 +2333,7 @@ _080CF1E2: ands r0, r1 cmp r0, 0 beq _080CF208 - ldr r4, _080CF248 @ =gUnknown_2023E82 + ldr r4, _080CF248 @ =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _080CF208 @@ -2359,7 +2359,7 @@ _080CF208: bl sub_802DB7C movs r0, 0x5 bl PlaySE - ldr r0, _080CF248 @ =gUnknown_2023E82 + ldr r0, _080CF248 @ =gBattleCommunication ldrb r2, [r0, 0x1] cmp r2, 0 beq _080CF250 @@ -2373,7 +2373,7 @@ _080CF208: b _080CF276 .align 2, 0 _080CF244: .4byte gMain -_080CF248: .4byte gUnknown_2023E82 +_080CF248: .4byte gBattleCommunication _080CF24C: .4byte gTasks _080CF250: ldr r0, _080CF2AC @ =gTasks @@ -2751,7 +2751,7 @@ sub_80CF53C: @ 80CF53C strh r0, [r4, 0x8] movs r2, 0x1 strh r2, [r4, 0x1A] - ldr r0, _080CF5C4 @ =gUnknown_2023E82 + ldr r0, _080CF5C4 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -2784,7 +2784,7 @@ _080CF5B2: .align 2, 0 _080CF5BC: .4byte gTasks _080CF5C0: .4byte gPlayerParty -_080CF5C4: .4byte gUnknown_2023E82 +_080CF5C4: .4byte gBattleCommunication _080CF5C8: .4byte _080CF5CC .align 2, 0 _080CF5CC: @@ -2911,7 +2911,7 @@ _080CF6E0: adds r5, 0x10 adds r0, r5, 0 bl LaunchTask_PreEvoSparklesSet1 - ldr r1, _080CF730 @ =gUnknown_2023E82 + ldr r1, _080CF730 @ =gBattleCommunication strb r0, [r1, 0x2] ldr r0, _080CF734 @ =gTasks adds r1, r7, r6 @@ -2928,11 +2928,11 @@ _080CF6E0: _080CF724: .4byte gPaletteFade _080CF728: .4byte gSprites _080CF72C: .4byte gUnknown_2039A20 -_080CF730: .4byte gUnknown_2023E82 +_080CF730: .4byte gBattleCommunication _080CF734: .4byte gTasks _080CF738: .4byte 0x00000603 _080CF73C: - ldr r4, _080CF770 @ =gUnknown_2023E82 + ldr r4, _080CF770 @ =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -2957,10 +2957,10 @@ _080CF752: strb r0, [r4, 0x2] bl _080D003A .align 2, 0 -_080CF770: .4byte gUnknown_2023E82 +_080CF770: .4byte gBattleCommunication _080CF774: .4byte gUnknown_2039A20 _080CF778: - ldr r4, _080CF7A4 @ =gUnknown_2023E82 + ldr r4, _080CF7A4 @ =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -2982,7 +2982,7 @@ _080CF78E: adds r1, r5 b _080CFB1A .align 2, 0 -_080CF7A4: .4byte gUnknown_2023E82 +_080CF7A4: .4byte gBattleCommunication _080CF7A8: .4byte gUnknown_2039A20 _080CF7AC: ldr r2, _080CF7E4 @ =gUnknown_2039A20 @@ -2998,7 +2998,7 @@ _080CF7C0: ldr r1, [r2] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, _080CF7E8 @ =gUnknown_2023E82 + ldr r0, _080CF7E8 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -3015,10 +3015,10 @@ _080CF7DC: b _080CFB1A .align 2, 0 _080CF7E4: .4byte gUnknown_2039A20 -_080CF7E8: .4byte gUnknown_2023E82 +_080CF7E8: .4byte gBattleCommunication _080CF7EC: bl sub_80F5F74 - ldr r1, _080CF800 @ =gUnknown_2023E82 + ldr r1, _080CF800 @ =gBattleCommunication strb r0, [r1, 0x2] ldr r0, _080CF804 @ =gTasks adds r1, r7, r6 @@ -3026,10 +3026,10 @@ _080CF7EC: adds r1, r0 b _080CFB1A .align 2, 0 -_080CF800: .4byte gUnknown_2023E82 +_080CF800: .4byte gBattleCommunication _080CF804: .4byte gTasks _080CF808: - ldr r0, _080CF834 @ =gUnknown_2023E82 + ldr r0, _080CF834 @ =gBattleCommunication mov r8, r0 ldrb r0, [r0, 0x2] lsls r1, r0, 2 @@ -3050,9 +3050,9 @@ _080CF820: strb r0, [r1, 0x2] b _080CFA90 .align 2, 0 -_080CF834: .4byte gUnknown_2023E82 +_080CF834: .4byte gBattleCommunication _080CF838: - ldr r0, _080CF85C @ =gUnknown_2023E82 + ldr r0, _080CF85C @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -3070,7 +3070,7 @@ _080CF84E: adds r1, r5 b _080CFB1A .align 2, 0 -_080CF85C: .4byte gUnknown_2023E82 +_080CF85C: .4byte gBattleCommunication _080CF860: bl IsSEPlaying lsls r0, 24 @@ -3261,7 +3261,7 @@ _080CFA08: .4byte gUnknown_2039A20 _080CFA0C: .4byte gTextFlags _080CFA10: .4byte gUnknown_300537C _080CFA14: - ldr r0, _080CFA60 @ =gUnknown_2023E82 + ldr r0, _080CFA60 @ =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -3299,7 +3299,7 @@ _080CFA28: adds r1, r5 b _080CFB1A .align 2, 0 -_080CFA60: .4byte gUnknown_2023E82 +_080CFA60: .4byte gBattleCommunication _080CFA64: .4byte gSprites _080CFA68: .4byte gUnknown_2039A20 _080CFA6C: .4byte 0x0004001c @@ -3578,7 +3578,7 @@ _080CFCAE: movs r2, 0 movs r3, 0x2 bl CreateYesNoMenu - ldr r3, _080CFCF8 @ =gUnknown_2023E82 + ldr r3, _080CFCF8 @ =gBattleCommunication strb r4, [r3, 0x1] ldr r0, _080CFCF0 @ =gTasks adds r1, r7, r6 @@ -3595,7 +3595,7 @@ _080CFCE8: .4byte gUnknown_83FDF3C _080CFCEC: .4byte gDisplayedStringBattle _080CFCF0: .4byte gTasks _080CFCF4: .4byte gUnknown_826D1CC -_080CFCF8: .4byte gUnknown_2023E82 +_080CFCF8: .4byte gBattleCommunication _080CFCFC: bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, 24 @@ -3614,7 +3614,7 @@ _080CFD16: beq _080CFD70 b _080D003A _080CFD1C: - ldr r0, _080CFD60 @ =gUnknown_2023E82 + ldr r0, _080CFD60 @ =gBattleCommunication strb r4, [r0, 0x1] ldr r0, _080CFD64 @ =gUnknown_83FDF3C movs r3, 0x92 @@ -3648,12 +3648,12 @@ _080CFD56: bl BeginNormalPaletteFade b _080D003A .align 2, 0 -_080CFD60: .4byte gUnknown_2023E82 +_080CFD60: .4byte gBattleCommunication _080CFD64: .4byte gUnknown_83FDF3C _080CFD68: .4byte gDisplayedStringBattle _080CFD6C: .4byte gTasks _080CFD70: - ldr r1, _080CFD9C @ =gUnknown_2023E82 + ldr r1, _080CFD9C @ =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x1] ldr r0, _080CFDA0 @ =gUnknown_83FDF3C @@ -3674,7 +3674,7 @@ _080CFD70: strh r1, [r0, 0x14] b _080D003A .align 2, 0 -_080CFD9C: .4byte gUnknown_2023E82 +_080CFD9C: .4byte gBattleCommunication _080CFDA0: .4byte gUnknown_83FDF3C _080CFDA4: .4byte gDisplayedStringBattle _080CFDA8: .4byte gTasks diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a3b44dc0d..c604211bc 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -18,7 +18,7 @@ gUnknown_81D6BD1:: @ 81D6BD1 gUnknown_81D6C62:: @ 81D6C62 .incbin "baserom.gba", 0x1D6C62, 0x6E0 -gUnknown_81D7342:: @ 81D7342 +BattleScript_MoveUsedMustRecharge:: @ 81D7342 .incbin "baserom.gba", 0x1D7342, 0xA75 gUnknown_81D7DB7:: @ 81D7DB7 @@ -36,10 +36,10 @@ gUnknown_81D8674:: @ 81D8674 gUnknown_81D8684:: @ 81D8684 .incbin "baserom.gba", 0x1D8684, 0x10 -gUnknown_81D8694:: @ 81D8694 +BattleScript_GiveExp:: @ 81D8694 .incbin "baserom.gba", 0x1D8694, 0x9 -gUnknown_81D869D:: @ 81D869D +BattleScript_HandleFaintedMon:: @ 81D869D .incbin "baserom.gba", 0x1D869D, 0x152 gUnknown_81D87EF:: @ 81D87EF @@ -90,40 +90,40 @@ gUnknown_81D89F1:: @ 81D89F1 gUnknown_81D89F5:: @ 81D89F5 .incbin "baserom.gba", 0x1D89F5, 0x6F -gUnknown_81D8A64:: @ 81D8A64 +BattleScript_RainContinuesOrEnds:: @ 81D8A64 .incbin "baserom.gba", 0x1D8A64, 0x1B -gUnknown_81D8A7F:: @ 81D8A7F +BattleScript_DamagingWeatherContinues:: @ 81D8A7F .incbin "baserom.gba", 0x1D8A7F, 0x82 -gUnknown_81D8B01:: @ 81D8B01 +BattleScript_SandStormHailEnds:: @ 81D8B01 .incbin "baserom.gba", 0x1D8B01, 0x9 -gUnknown_81D8B0A:: @ 81D8B0A +BattleScript_SunlightContinues:: @ 81D8B0A .incbin "baserom.gba", 0x1D8B0A, 0xE -gUnknown_81D8B18:: @ 81D8B18 +BattleScript_SunlightFaded:: @ 81D8B18 .incbin "baserom.gba", 0x1D8B18, 0x7 -gUnknown_81D8B1F:: @ 81D8B1F +BattleScript_OverworldWeatherStarts:: @ 81D8B1F .incbin "baserom.gba", 0x1D8B1F, 0x13 -gUnknown_81D8B32:: @ 81D8B32 +BattleScript_SideStatusWoreOff:: @ 81D8B32 .incbin "baserom.gba", 0x1D8B32, 0x11 -gUnknown_81D8B43:: @ 81D8B43 +BattleScript_SafeguardEnds:: @ 81D8B43 .incbin "baserom.gba", 0x1D8B43, 0xA -gUnknown_81D8B4D:: @ 81D8B4D +BattleScript_LeechSeedTurnDrain:: @ 81D8B4D .incbin "baserom.gba", 0x1D8B4D, 0x5C -gUnknown_81D8BA9:: @ 81D8BA9 +BattleScript_BideStoringEnergy:: @ 81D8BA9 .incbin "baserom.gba", 0x1D8BA9, 0xB -gUnknown_81D8BB4:: @ 81D8BB4 +BattleScript_BideAttack:: @ 81D8BB4 .incbin "baserom.gba", 0x1D8BB4, 0x48 -gUnknown_81D8BFC:: @ 81D8BFC +BattleScript_BideNoEnergyToAttack:: @ 81D8BFC .incbin "baserom.gba", 0x1D8BFC, 0x14 gUnknown_81D8C10:: @ 81D8C10 @@ -135,16 +135,16 @@ gUnknown_81D8C3E:: @ 81D8C3E gUnknown_81D8C48:: @ 81D8C48 .incbin "baserom.gba", 0x1D8C48, 0x7 -gUnknown_81D8C4F:: @ 81D8C4F +BattleScript_MoveUsedIsDisabled:: @ 81D8C4F .incbin "baserom.gba", 0x1D8C4F, 0xB -gUnknown_81D8C5A:: @ 81D8C5A +BattleScript_SelectingDisabledMove:: @ 81D8C5A .incbin "baserom.gba", 0x1D8C5A, 0x4 -gUnknown_81D8C5E:: @ 81D8C5E +BattleScript_DisabledNoMore:: @ 81D8C5E .incbin "baserom.gba", 0x1D8C5E, 0x7 -gUnknown_81D8C65:: @ 81D8C65 +BattleScript_EncoredNoMore:: @ 81D8C65 .incbin "baserom.gba", 0x1D8C65, 0x7 gUnknown_81D8C6C:: @ 81D8C6C @@ -159,10 +159,10 @@ gUnknown_81D8CBE:: @ 81D8CBE gUnknown_81D8CF5:: @ 81D8CF5 .incbin "baserom.gba", 0x1D8CF5, 0x3E -gUnknown_81D8D33:: @ 81D8D33 +BattleScript_PerishSongTakesLife:: @ 81D8D33 .incbin "baserom.gba", 0x1D8D33, 0x1B -gUnknown_81D8D4E:: @ 81D8D4E +BattleScript_PerishSongCountGoesDown:: @ 81D8D4E .incbin "baserom.gba", 0x1D8D4E, 0x7 gUnknown_81D8D55:: @ 81D8D55 @@ -180,31 +180,31 @@ gUnknown_81D8E04:: @ 81D8E04 gUnknown_81D8E0B:: @ 81D8E0B .incbin "baserom.gba", 0x1D8E0B, 0x7 -gUnknown_81D8E12:: @ 81D8E12 +BattleScript_MonTookFutureAttack:: @ 81D8E12 .incbin "baserom.gba", 0x1D8E12, 0x8E gUnknown_81D8EA0:: @ 81D8EA0 .incbin "baserom.gba", 0x1D8EA0, 0x4 -gUnknown_81D8EA4:: @ 81D8EA4 +BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4 .incbin "baserom.gba", 0x1D8EA4, 0x4 gUnknown_81D8EA8:: @ 81D8EA8 .incbin "baserom.gba", 0x1D8EA8, 0xF -gUnknown_81D8EB7:: @ 81D8EB7 +BattleScript_SelectingTormentedMove:: @ 81D8EB7 .incbin "baserom.gba", 0x1D8EB7, 0xF -gUnknown_81D8EC6:: @ 81D8EC6 +BattleScript_SelectingNotAllowedMoveTaunt:: @ 81D8EC6 .incbin "baserom.gba", 0x1D8EC6, 0x4 -gUnknown_81D8ECA:: @ 81D8ECA +BattleScript_MoveUsedIsTaunted:: @ 81D8ECA .incbin "baserom.gba", 0x1D8ECA, 0xB -gUnknown_81D8ED5:: @ 81D8ED5 +BattleScript_WishComesTrue:: @ 81D8ED5 .incbin "baserom.gba", 0x1D8ED5, 0x37 -gUnknown_81D8F0C:: @ 81D8F0C +BattleScript_IngrainTurnHeal:: @ 81D8F0C .incbin "baserom.gba", 0x1D8F0C, 0x29 gUnknown_81D8F35:: @ 81D8F35 @@ -213,10 +213,10 @@ gUnknown_81D8F35:: @ 81D8F35 gUnknown_81D8F86:: @ 81D8F86 .incbin "baserom.gba", 0x1D8F86, 0xE -gUnknown_81D8F94:: @ 81D8F94 +BattleScript_MoveUsedIsImprisoned:: @ 81D8F94 .incbin "baserom.gba", 0x1D8F94, 0xB -gUnknown_81D8F9F:: @ 81D8F9F +BattleScript_SelectingImprisonedMove:: @ 81D8F9F .incbin "baserom.gba", 0x1D8F9F, 0x4 gUnknown_81D8FA3:: @ 81D8FA3 @@ -240,67 +240,67 @@ gUnknown_81D8FEB:: @ 81D8FEB gUnknown_81D9015:: @ 81D9015 .incbin "baserom.gba", 0x1D9015, 0x14 -gUnknown_81D9029:: @ 81D9029 +BattleScript_MoveUsedIsAsleep:: @ 81D9029 .incbin "baserom.gba", 0x1D9029, 0xD -gUnknown_81D9036:: @ 81D9036 +BattleScript_MoveUsedWokeUp:: @ 81D9036 .incbin "baserom.gba", 0x1D9036, 0x14 -gUnknown_81D904A:: @ 81D904A +BattleScript_MonWokeUpInUproar:: @ 81D904A .incbin "baserom.gba", 0x1D904A, 0x9 -gUnknown_81D9053:: @ 81D9053 +BattleScript_PoisonTurnDmg:: @ 81D9053 .incbin "baserom.gba", 0x1D9053, 0x22 -gUnknown_81D9075:: @ 81D9075 +BattleScript_BurnTurnDmg:: @ 81D9075 .incbin "baserom.gba", 0x1D9075, 0xB -gUnknown_81D9080:: @ 81D9080 +BattleScript_MoveUsedIsFrozen:: @ 81D9080 .incbin "baserom.gba", 0x1D9080, 0xD -gUnknown_81D908D:: @ 81D908D +BattleScript_MoveUsedUnfroze:: @ 81D908D .incbin "baserom.gba", 0x1D908D, 0xB gUnknown_81D9098:: @ 81D9098 .incbin "baserom.gba", 0x1D9098, 0x9 -gUnknown_81D90A1:: @ 81D90A1 +BattleScript_MoveUsedIsParalyzed:: @ 81D90A1 .incbin "baserom.gba", 0x1D90A1, 0x10 -gUnknown_81D90B1:: @ 81D90B1 +BattleScript_MoveUsedFlinched:: @ 81D90B1 .incbin "baserom.gba", 0x1D90B1, 0xB -gUnknown_81D90BC:: @ 81D90BC +BattleScript_PrintUproarOverTurns:: @ 81D90BC .incbin "baserom.gba", 0x1D90BC, 0x9 -gUnknown_81D90C5:: @ 81D90C5 +BattleScript_ThrashConfuses:: @ 81D90C5 .incbin "baserom.gba", 0x1D90C5, 0xE -gUnknown_81D90D3:: @ 81D90D3 +BattleScript_MoveUsedIsConfused:: @ 81D90D3 .incbin "baserom.gba", 0x1D90D3, 0x43 -gUnknown_81D9116:: @ 81D9116 +BattleScript_MoveUsedIsConfusedNoMore:: @ 81D9116 .incbin "baserom.gba", 0x1D9116, 0x7 gUnknown_81D911D:: @ 81D911D .incbin "baserom.gba", 0x1D911D, 0x7 -gUnknown_81D9124:: @ 81D9124 +BattleScript_WrapTurnDmg:: @ 81D9124 .incbin "baserom.gba", 0x1D9124, 0x12 -gUnknown_81D9136:: @ 81D9136 +BattleScript_WrapEnds:: @ 81D9136 .incbin "baserom.gba", 0x1D9136, 0x7 -gUnknown_81D913D:: @ 81D913D +BattleScript_MoveUsedIsInLove:: @ 81D913D .incbin "baserom.gba", 0x1D913D, 0xD -gUnknown_81D914A:: @ 81D914A +BattleScript_MoveUsedIsInLoveCantAttack:: @ 81D914A .incbin "baserom.gba", 0x1D914A, 0xB -gUnknown_81D9155:: @ 81D9155 +BattleScript_NightmareTurnDmg:: @ 81D9155 .incbin "baserom.gba", 0x1D9155, 0x11 -gUnknown_81D9166:: @ 81D9166 +BattleScript_CurseTurnDmg:: @ 81D9166 .incbin "baserom.gba", 0x1D9166, 0x11 gUnknown_81D9177:: @ 81D9177 @@ -315,40 +315,40 @@ gUnknown_81D9192:: @ 81D9192 gUnknown_81D91A1:: @ 81D91A1 .incbin "baserom.gba", 0x1D91A1, 0x26 -gUnknown_81D91C7:: @ 81D91C7 +BattleScript_YawnMakesAsleep:: @ 81D91C7 .incbin "baserom.gba", 0x1D91C7, 0xAA gUnknown_81D9271:: @ 81D9271 .incbin "baserom.gba", 0x1D9271, 0xE -gUnknown_81D927F:: @ 81D927F +BattleScript_DrizzleActivates:: @ 81D927F .incbin "baserom.gba", 0x1D927F, 0x14 -gUnknown_81D9293:: @ 81D9293 +BattleScript_SpeedBoostActivates:: @ 81D9293 .incbin "baserom.gba", 0x1D9293, 0xE -gUnknown_81D92A1:: @ 81D92A1 +BattleScript_TraceActivates:: @ 81D92A1 .incbin "baserom.gba", 0x1D92A1, 0xA -gUnknown_81D92AB:: @ 81D92AB +BattleScript_RainDishActivates:: @ 81D92AB .incbin "baserom.gba", 0x1D92AB, 0x14 -gUnknown_81D92BF:: @ 81D92BF +BattleScript_SandstreamActivates:: @ 81D92BF .incbin "baserom.gba", 0x1D92BF, 0x14 -gUnknown_81D92D3:: @ 81D92D3 +BattleScript_ShedSkinActivates:: @ 81D92D3 .incbin "baserom.gba", 0x1D92D3, 0x25 -gUnknown_81D92F8:: @ 81D92F8 +BattleScript_CastformChange:: @ 81D92F8 .incbin "baserom.gba", 0x1D92F8, 0xF -gUnknown_81D9307:: @ 81D9307 +BattleScript_IntimidateActivatesEnd3:: @ 81D9307 .incbin "baserom.gba", 0x1D9307, 0x9 -gUnknown_81D9310:: @ 81D9310 +BattleScript_IntimidateActivates:: @ 81D9310 .incbin "baserom.gba", 0x1D9310, 0x69 -gUnknown_81D9379:: @ 81D9379 +BattleScript_DroughtActivates:: @ 81D9379 .incbin "baserom.gba", 0x1D9379, 0x14 gUnknown_81D938D:: @ 81D938D @@ -360,22 +360,22 @@ gUnknown_81D93A1:: @ 81D93A1 gUnknown_81D93AF:: @ 81D93AF .incbin "baserom.gba", 0x1D93AF, 0xE -gUnknown_81D93BD:: @ 81D93BD +BattleScript_MoveHPDrain_PPLoss:: @ 81D93BD .incbin "baserom.gba", 0x1D93BD, 0x1 -gUnknown_81D93BE:: @ 81D93BE +BattleScript_MoveHPDrain:: @ 81D93BE .incbin "baserom.gba", 0x1D93BE, 0x22 -gUnknown_81D93E0:: @ 81D93E0 +BattleScript_MonMadeMoveUseless_PPLoss:: @ 81D93E0 .incbin "baserom.gba", 0x1D93E0, 0x1 -gUnknown_81D93E1:: @ 81D93E1 +BattleScript_MonMadeMoveUseless:: @ 81D93E1 .incbin "baserom.gba", 0x1D93E1, 0x15 -gUnknown_81D93F6:: @ 81D93F6 +BattleScript_FlashFireBoost_PPLoss:: @ 81D93F6 .incbin "baserom.gba", 0x1D93F6, 0x1 -gUnknown_81D93F7:: @ 81D93F7 +BattleScript_FlashFireBoost:: @ 81D93F7 .incbin "baserom.gba", 0x1D93F7, 0x1F gUnknown_81D9416:: @ 81D9416 @@ -396,7 +396,7 @@ gUnknown_81D9444:: @ 81D9444 gUnknown_81D9452:: @ 81D9452 .incbin "baserom.gba", 0x1D9452, 0x1C -gUnknown_81D946E:: @ 81D946E +BattleScript_SoundproofProtected:: @ 81D946E .incbin "baserom.gba", 0x1D946E, 0x10 gUnknown_81D947E:: @ 81D947E @@ -405,115 +405,115 @@ gUnknown_81D947E:: @ 81D947E gUnknown_81D948E:: @ 81D948E .incbin "baserom.gba", 0x1D948E, 0xE -gUnknown_81D949C:: @ 81D949C +BattleScript_ColorChangeActivates:: @ 81D949C .incbin "baserom.gba", 0x1D949C, 0x7 -gUnknown_81D94A3:: @ 81D94A3 +BattleScript_RoughSkinActivates:: @ 81D94A3 .incbin "baserom.gba", 0x1D94A3, 0x1B -gUnknown_81D94BE:: @ 81D94BE +BattleScript_CuteCharmActivates:: @ 81D94BE .incbin "baserom.gba", 0x1D94BE, 0xD -gUnknown_81D94CB:: @ 81D94CB +BattleScript_ApplySecondaryEffect:: @ 81D94CB .incbin "baserom.gba", 0x1D94CB, 0x3 -gUnknown_81D94CE:: @ 81D94CE +BattleScript_SynchronizeActivates:: @ 81D94CE .incbin "baserom.gba", 0x1D94CE, 0x3 -gUnknown_81D94D1:: @ 81D94D1 +BattleScript_AbilityCuredStatus:: @ 81D94D1 .incbin "baserom.gba", 0x1D94D1, 0x9 -gUnknown_81D94DA:: @ 81D94DA +BattleScript_IgnoresWhileAsleep:: @ 81D94DA .incbin "baserom.gba", 0x1D94DA, 0x10 -gUnknown_81D94EA:: @ 81D94EA +BattleScript_IgnoresAndUsesRandomMove:: @ 81D94EA .incbin "baserom.gba", 0x1D94EA, 0x8 -gUnknown_81D94F2:: @ 81D94F2 +BattleScript_MoveUsedLoafingAround:: @ 81D94F2 .incbin "baserom.gba", 0x1D94F2, 0x12 -gUnknown_81D9504:: @ 81D9504 +BattleScript_IgnoresAndFallsAsleep:: @ 81D9504 .incbin "baserom.gba", 0x1D9504, 0x17 -gUnknown_81D951B:: @ 81D951B +BattleScript_IgnoresAndHitsItself:: @ 81D951B .incbin "baserom.gba", 0x1D951B, 0xB gUnknown_81D9526:: @ 81D9526 .incbin "baserom.gba", 0x1D9526, 0xB -gUnknown_81D9531:: @ 81D9531 +BattleScript_BerryCurePrlzEnd2:: @ 81D9531 .incbin "baserom.gba", 0x1D9531, 0x6 -gUnknown_81D9537:: @ 81D9537 +BattleScript_BerryCureParRet:: @ 81D9537 .incbin "baserom.gba", 0x1D9537, 0x12 -gUnknown_81D9549:: @ 81D9549 +BattleScript_BerryCurePsnEnd2:: @ 81D9549 .incbin "baserom.gba", 0x1D9549, 0x6 -gUnknown_81D954F:: @ 81D954F +BattleScript_BerryCurePsnRet:: @ 81D954F .incbin "baserom.gba", 0x1D954F, 0x12 -gUnknown_81D9561:: @ 81D9561 +BattleScript_BerryCureBrnEnd2:: @ 81D9561 .incbin "baserom.gba", 0x1D9561, 0x6 -gUnknown_81D9567:: @ 81D9567 +BattleScript_BerryCureBrnRet:: @ 81D9567 .incbin "baserom.gba", 0x1D9567, 0x12 -gUnknown_81D9579:: @ 81D9579 +BattleScript_BerryCureFrzEnd2:: @ 81D9579 .incbin "baserom.gba", 0x1D9579, 0x6 -gUnknown_81D957F:: @ 81D957F +BattleScript_BerryCureFrzRet:: @ 81D957F .incbin "baserom.gba", 0x1D957F, 0x12 -gUnknown_81D9591:: @ 81D9591 +BattleScript_BerryCureSlpEnd2:: @ 81D9591 .incbin "baserom.gba", 0x1D9591, 0x6 -gUnknown_81D9597:: @ 81D9597 +BattleScript_BerryCureSlpRet:: @ 81D9597 .incbin "baserom.gba", 0x1D9597, 0x12 -gUnknown_81D95A9:: @ 81D95A9 +BattleScript_BerryCureConfusionEnd2:: @ 81D95A9 .incbin "baserom.gba", 0x1D95A9, 0x6 -gUnknown_81D95AF:: @ 81D95AF +BattleScript_BerryCureConfusionRet:: @ 81D95AF .incbin "baserom.gba", 0x1D95AF, 0x10 -gUnknown_81D95BF:: @ 81D95BF +BattleScript_BerryCureChosenStatusEnd2:: @ 81D95BF .incbin "baserom.gba", 0x1D95BF, 0x6 -gUnknown_81D95C5:: @ 81D95C5 +BattleScript_BerryCureChosenStatusRet:: @ 81D95C5 .incbin "baserom.gba", 0x1D95C5, 0x14 -gUnknown_81D95D9:: @ 81D95D9 +BattleScript_WhiteHerbEnd2:: @ 81D95D9 .incbin "baserom.gba", 0x1D95D9, 0x6 -gUnknown_81D95DF:: @ 81D95DF +BattleScript_WhiteHerbRet:: @ 81D95DF .incbin "baserom.gba", 0x1D95DF, 0x10 -gUnknown_81D95EF:: @ 81D95EF +BattleScript_ItemHealHP_RemoveItem:: @ 81D95EF .incbin "baserom.gba", 0x1D95EF, 0x1D -gUnknown_81D960C:: @ 81D960C +BattleScript_BerryPPHealEnd2:: @ 81D960C .incbin "baserom.gba", 0x1D960C, 0x10 -gUnknown_81D961C:: @ 81D961C +BattleScript_ItemHealHP_End2:: @ 81D961C .incbin "baserom.gba", 0x1D961C, 0x6 -gUnknown_81D9622:: @ 81D9622 +BattleScript_ItemHealHP_Ret:: @ 81D9622 .incbin "baserom.gba", 0x1D9622, 0x1B -gUnknown_81D963D:: @ 81D963D +BattleScript_SelectingNotAllowedMoveChoiceItem:: @ 81D963D .incbin "baserom.gba", 0x1D963D, 0x4 gUnknown_81D9641:: @ 81D9641 .incbin "baserom.gba", 0x1D9641, 0xE -gUnknown_81D964F:: @ 81D964F +BattleScript_BerryConfuseHealEnd2:: @ 81D964F .incbin "baserom.gba", 0x1D964F, 0x2A -gUnknown_81D9679:: @ 81D9679 +BattleScript_BerryStatRaiseEnd2:: @ 81D9679 .incbin "baserom.gba", 0x1D9679, 0x1B -gUnknown_81D9694:: @ 81D9694 +BattleScript_BerryFocusEnergyEnd2:: @ 81D9694 .incbin "baserom.gba", 0x1D9694, 0x10 gUnknown_81D96A4:: @ 81D96A4 diff --git a/data/data.s b/data/data.s index 41bbdfade..05747376d 100644 --- a/data/data.s +++ b/data/data.s @@ -278,7 +278,7 @@ gUnknown_82500C4:: @ 82500C4 gUnknown_82500CC:: @ 82500CC .incbin "baserom.gba", 0x2500CC, 0x38 -gUnknown_8250104:: @ 8250104 +sSoundMovesTable:: @ 8250104 .incbin "baserom.gba", 0x250104, 0x18 gUnknown_825011C:: @ 825011C diff --git a/include/battle_util.h b/include/battle_util.h index 88b35e1a4..e7cb8dc99 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -54,8 +54,8 @@ u8 GetBattleBank(u8 caseId); void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move); void PressurePPLoseOnUsingPerishSong(u8 bankAtk); void PressurePPLoseOnUsingImprision(u8 bankAtk); -void MarkAllBufferBanksForExecution(void); // unused -void MarkBufferBankForExecution(u8 bank); +void MarkAllBattlersForControllerExec(void); // unused +void MarkBattlerForControllerExec(u8 bank); void sub_803F850(u8 arg0); void CancelMultiTurnMoves(u8 bank); bool8 WasUnableToUseMove(u8 bank); @@ -70,8 +70,8 @@ u8 TrySetCantSelectMoveBattleScript(void); u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check); bool8 AreAllMovesUnusable(void); u8 GetImprisonedMovesCount(u8 bank, u16 move); -u8 UpdateTurnCounters(void); -u8 TurnBasedEffects(void); +u8 DoFieldEndTurnEffects(void); +u8 DoBattlerEndTurnEffects(void); bool8 HandleWishPerishSongOnTurnEnd(void); bool8 HandleFaintedMonActions(void); void TryClearRageStatuses(void); @@ -86,7 +86,7 @@ void ClearFuryCutterDestinyBondGrudge(u8 bank); void HandleAction_RunBattleScript(void); u8 GetMoveTarget(u16 move, u8 useMoveTarget); u8 IsMonDisobedient(void); -void MarkBufferBankForExecution(u8 battlerId); +void MarkBattlerForControllerExec(u8 battlerId); void sub_80174B8(u8 battlerId); void sub_8017298(u8 battlerId); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 86e7d3143..1c281e853 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -252,7 +252,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] = extern u8 gBattlerAttacker; extern const u32 gBitTable[]; // util.h extern u32 gStatuses3[]; // battle_2.h -extern u16 gSideAffecting[2]; +extern u16 gSideStatuses[2]; extern const struct BattleMove gBattleMoves[]; extern u16 gDynamicBasePower; extern u8 gMoveResultFlags; @@ -720,7 +720,7 @@ static void BattleAICmd_if_status4(void) arg1 = GetBattlerPosition(index) & 1; arg2 = T1_READ_32(gAIScriptPtr + 2); - if ((gSideAffecting[arg1] & arg2) != 0) + if ((gSideStatuses[arg1] & arg2) != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -739,7 +739,7 @@ static void BattleAICmd_if_not_status4(void) arg1 = GetBattlerPosition(index) & 1; arg2 = T1_READ_32(gAIScriptPtr + 2); - if ((gSideAffecting[arg1] & arg2) == 0) + if ((gSideStatuses[arg1] & arg2) == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; diff --git a/src/pokemon.c b/src/pokemon.c index ffe407daf..d75650d91 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4170,7 +4170,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo r5 = gActiveBattler; gActiveBattler = sp34; BtlController_EmitGetMonData(0, 0, 0); - MarkBufferBankForExecution(gActiveBattler); + MarkBattlerForControllerExec(gActiveBattler); gActiveBattler = r5; } } @@ -4709,7 +4709,7 @@ bool8 PokemonUseItemEffects2(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 m r5 = gActiveBattler; gActiveBattler = sp34; BtlController_EmitGetMonData(0, 0, 0); - MarkBufferBankForExecution(gActiveBattler); + MarkBattlerForControllerExec(gActiveBattler); gActiveBattler = r5; } } diff --git a/sym_ewram.txt b/sym_ewram.txt index 4532d441c..585a2843c 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -189,7 +189,7 @@ gBattlerPositions: @ 2023BD6 gUnknown_2023BDA: @ 2023BDA .space 0x4 -gUnknown_2023BDE: @ 2023BDE +gBattlerByTurnOrder: @ 2023BDE .space 0x4 gUnknown_2023BE2: @ 2023BE2 @@ -216,7 +216,7 @@ gUnknown_2023C0C: @ 2023C0C gUnknown_2023C30: @ 2023C30 .space 0x4 -gUnknown_2023C34: @ 2023C34 +gChosenMoveByBattler: @ 2023C34 .space 0x110 gBattlerSpriteIds: @ 2023D44 @@ -243,7 +243,7 @@ gBattleMoveDamage: @ 2023D50 gUnknown_2023D54: @ 2023D54 .space 0x4 -gUnknown_2023D58: @ 2023D58 +gTakenDmg: @ 2023D58 .space 0x10 gLastUsedItem: @ 2023D68 @@ -258,7 +258,7 @@ gBattlerAttacker: @ 2023D6B gBattlerTarget: @ 2023D6C .space 0x1 -gUnknown_2023D6D: @ 2023D6D +gBattlerFainted: @ 2023D6D .space 0x1 gEffectBattler: @ 2023D6E @@ -276,13 +276,13 @@ gCritMultiplier: @ 2023D71 gUnknown_2023D72: @ 2023D72 .space 0x2 -gUnknown_2023D74: @ 2023D74 +gBattlescriptCurrInstr: @ 2023D74 .space 0x8 gUnknown_2023D7C: @ 2023D7C .space 0x4 -gUnknown_2023D80: @ 2023D80 +gSelectionBattleScripts: @ 2023D80 .space 0x10 gUnknown_2023D90: @ 2023D90 @@ -312,19 +312,19 @@ gUnknown_2023DC4: @ 2023DC4 gMoveResultFlags: @ 2023DCC .space 0x4 -gUnknown_2023DD0: @ 2023DD0 +gHitMarker: @ 2023DD0 .space 0x4 gUnknown_2023DD4: @ 2023DD4 .space 0x4 -gUnknown_2023DD8: @ 2023DD8 +gTakenDmgByBattler: @ 2023DD8 .space 0x4 gUnknown_2023DDC: @ 2023DDC .space 0x2 -gSideAffecting: @ 2023DDE +gSideStatuses: @ 2023DDE .space 0x6 gSideTimers: @ 2023DE4 @@ -345,7 +345,7 @@ gUnknown_2023E7E: @ 2023E7E gUnknown_2023E80: @ 2023E80 .space 0x2 -gUnknown_2023E82: @ 2023E82 +gBattleCommunication: @ 2023E82 .space 0x1 gUnknown_2023E83: @ 2023E83 @@ -354,22 +354,22 @@ gUnknown_2023E83: @ 2023E83 gBattleOutcome: @ 2023E8A .space 0x2 -gUnknown_2023E8C: @ 2023E8C +gProtectStructs: @ 2023E8C .space 0x40 -gUnknown_2023ECC: @ 2023ECC +gSpecialStatuses: @ 2023ECC .space 0x50 gBattleWeather: @ 2023F1C .space 0x4 -gUnknown_2023F20: @ 2023F20 +gWishFutureKnock: @ 2023F20 .space 0x2C gIntroSlideFlags: @ 2023F4C .space 0x2 -gUnknown_2023F4E: @ 2023F4E +gSentPokesToOpponent: @ 2023F4E .space 0x2 gDynamicBasePower: @ 2023F50 |