diff options
Diffstat (limited to 'asm/battle_controller_oak.s')
| -rw-r--r-- | asm/battle_controller_oak.s | 1202 |
1 files changed, 601 insertions, 601 deletions
diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index 0beda379a..54b9c645c 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -13,13 +13,13 @@ nullsub_81: @ 80E75AC thumb_func_start sub_80E75B0 sub_80E75B0: @ 80E75B0 ldr r1, _080E75DC @ =gUnknown_3004FE0 - ldr r0, _080E75E0 @ =gUnknown_2023BC4 + ldr r0, _080E75E0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 ldr r1, _080E75E4 @ =sub_80E75EC str r1, [r0] - ldr r2, _080E75E8 @ =gUnknown_2023FE8 + ldr r2, _080E75E8 @ =gBattleStruct ldr r0, [r2] adds r0, 0x94 movs r1, 0 @@ -36,17 +36,17 @@ sub_80E75B0: @ 80E75B0 bx lr .align 2, 0 _080E75DC: .4byte gUnknown_3004FE0 -_080E75E0: .4byte gUnknown_2023BC4 +_080E75E0: .4byte gActiveBattler _080E75E4: .4byte sub_80E75EC -_080E75E8: .4byte gUnknown_2023FE8 +_080E75E8: .4byte gBattleStruct thumb_func_end sub_80E75B0 thumb_func_start sub_80E75EC sub_80E75EC: @ 80E75EC push {lr} ldr r2, _080E7620 @ =gUnknown_2023BC8 - ldr r1, _080E7624 @ =gUnknown_825E45C - ldr r0, _080E7628 @ =gUnknown_2023BC4 + ldr r1, _080E7624 @ =gBitTable + ldr r0, _080E7628 @ =gActiveBattler ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -70,8 +70,8 @@ sub_80E75EC: @ 80E75EC b _080E7638 .align 2, 0 _080E7620: .4byte gUnknown_2023BC8 -_080E7624: .4byte gUnknown_825E45C -_080E7628: .4byte gUnknown_2023BC4 +_080E7624: .4byte gBitTable +_080E7628: .4byte gActiveBattler _080E762C: .4byte gUnknown_2022BC4 _080E7630: .4byte gUnknown_84020F8 _080E7634: @@ -87,7 +87,7 @@ sub_80E763C: @ 80E763C mov r7, r8 push {r7} ldr r7, _080E769C @ =gUnknown_2022BC4 - ldr r4, _080E76A0 @ =gUnknown_2023BC4 + ldr r4, _080E76A0 @ =gActiveBattler ldrb r0, [r4] lsls r2, r0, 9 adds r1, r7, 0x2 @@ -129,7 +129,7 @@ sub_80E763C: @ 80E763C b _080E781A .align 2, 0 _080E769C: .4byte gUnknown_2022BC4 -_080E76A0: .4byte gUnknown_2023BC4 +_080E76A0: .4byte gActiveBattler _080E76A4: .4byte gMain _080E76A8: .4byte gUnknown_2023FF8 _080E76AC: @@ -269,7 +269,7 @@ _080E77AC: ands r0, r1 cmp r0, 0 beq _080E782C - ldr r6, _080E7820 @ =gUnknown_2022B4C + ldr r6, _080E7820 @ =gBattleTypeFlags ldr r0, [r6] ands r0, r2 cmp r0, 0 @@ -282,9 +282,9 @@ _080E77AC: bne _080E7838 movs r0, 0 bl GetBankByIdentity - ldr r1, _080E7824 @ =gUnknown_2023D70 + ldr r1, _080E7824 @ =gAbsentBattlerFlags ldrb r1, [r1] - ldr r2, _080E7828 @ =gUnknown_825E45C + ldr r2, _080E7828 @ =gBitTable lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -321,9 +321,9 @@ _080E781A: bl WallyBufferExecCompleted b _080E7838 .align 2, 0 -_080E7820: .4byte gUnknown_2022B4C -_080E7824: .4byte gUnknown_2023D70 -_080E7828: .4byte gUnknown_825E45C +_080E7820: .4byte gBattleTypeFlags +_080E7824: .4byte gAbsentBattlerFlags +_080E7828: .4byte gBitTable _080E782C: movs r0, 0x8 ands r0, r1 @@ -341,7 +341,7 @@ _080E7838: thumb_func_start sub_80E7844 sub_80E7844: @ 80E7844 push {r4,lr} - ldr r1, _080E7860 @ =gUnknown_2023FE8 + ldr r1, _080E7860 @ =gBattleStruct ldr r2, [r1] adds r0, r2, 0 adds r0, 0x94 @@ -355,7 +355,7 @@ sub_80E7844: @ 80E7844 beq _080E786A b _080E78D8 .align 2, 0 -_080E7860: .4byte gUnknown_2023FE8 +_080E7860: .4byte gBattleStruct _080E7864: cmp r0, 0x2 beq _080E78B4 @@ -423,7 +423,7 @@ sub_80E78E0: @ 80E78E0 push {lr} ldr r2, _080E7908 @ =gSprites ldr r1, _080E790C @ =gUnknown_2023D44 - ldr r0, _080E7910 @ =gUnknown_2023BC4 + ldr r0, _080E7910 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -443,7 +443,7 @@ _080E7904: .align 2, 0 _080E7908: .4byte gSprites _080E790C: .4byte gUnknown_2023D44 -_080E7910: .4byte gUnknown_2023BC4 +_080E7910: .4byte gActiveBattler _080E7914: .4byte SpriteCallbackDummy thumb_func_end sub_80E78E0 @@ -513,8 +513,8 @@ sub_80E7988: @ 80E7988 push {lr} bl sub_802EA10 ldr r2, _080E79AC @ =gUnknown_2023BC8 - ldr r1, _080E79B0 @ =gUnknown_825E45C - ldr r0, _080E79B4 @ =gUnknown_2023BC4 + ldr r1, _080E79B0 @ =gBitTable + ldr r0, _080E79B4 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -529,8 +529,8 @@ _080E79A8: bx r0 .align 2, 0 _080E79AC: .4byte gUnknown_2023BC8 -_080E79B0: .4byte gUnknown_825E45C -_080E79B4: .4byte gUnknown_2023BC4 +_080E79B0: .4byte gBitTable +_080E79B4: .4byte gActiveBattler thumb_func_end sub_80E7988 thumb_func_start sub_80E79B8 @@ -543,7 +543,7 @@ sub_80E79B8: @ 80E79B8 cmp r0, 0 bne _080E79F6 ldr r1, _080E7A00 @ =gUnknown_3004FE0 - ldr r2, _080E7A04 @ =gUnknown_2023BC4 + ldr r2, _080E7A04 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -570,7 +570,7 @@ _080E79F6: .align 2, 0 _080E79FC: .4byte gUnknown_2037AB8 _080E7A00: .4byte gUnknown_3004FE0 -_080E7A04: .4byte gUnknown_2023BC4 +_080E7A04: .4byte gActiveBattler _080E7A08: .4byte sub_80E7A14 _080E7A0C: .4byte gUnknown_3005090 _080E7A10: .4byte gUnknown_3004FFC @@ -629,7 +629,7 @@ sub_80E7A70: @ 80E7A70 cmp r0, 0 bne _080E7AC0 ldr r1, _080E7AAC @ =gUnknown_3004FE0 - ldr r0, _080E7AB0 @ =gUnknown_2023BC4 + ldr r0, _080E7AB0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -637,7 +637,7 @@ sub_80E7A70: @ 80E7A70 str r1, [r0] bl nullsub_44 bl FreeAllWindowBuffers - ldr r0, _080E7AB8 @ =gUnknown_2022B4C + ldr r0, _080E7AB8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -648,9 +648,9 @@ sub_80E7A70: @ 80E7A70 .align 2, 0 _080E7AA8: .4byte gUnknown_2037AB8 _080E7AAC: .4byte gUnknown_3004FE0 -_080E7AB0: .4byte gUnknown_2023BC4 +_080E7AB0: .4byte gActiveBattler _080E7AB4: .4byte sub_80E7AC4 -_080E7AB8: .4byte gUnknown_2022B4C +_080E7AB8: .4byte gBattleTypeFlags _080E7ABC: bl sub_810AF74 _080E7AC0: @@ -681,7 +681,7 @@ sub_80E7AC4: @ 80E7AC4 ldrh r0, [r0] cmp r0, 0xD bne _080E7B34 - ldr r0, _080E7B24 @ =gUnknown_2022B4C + ldr r0, _080E7B24 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -690,7 +690,7 @@ sub_80E7AC4: @ 80E7AC4 movs r0, 0x4 bl sub_80EB2F4 ldr r1, _080E7B28 @ =gUnknown_3004FE0 - ldr r0, _080E7B2C @ =gUnknown_2023BC4 + ldr r0, _080E7B2C @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -702,9 +702,9 @@ _080E7B14: .4byte gMain _080E7B18: .4byte sub_8011100 _080E7B1C: .4byte gUnknown_2037AB8 _080E7B20: .4byte gUnknown_203AD30 -_080E7B24: .4byte gUnknown_2022B4C +_080E7B24: .4byte gBattleTypeFlags _080E7B28: .4byte gUnknown_3004FE0 -_080E7B2C: .4byte gUnknown_2023BC4 +_080E7B2C: .4byte gActiveBattler _080E7B30: .4byte sub_80E8704 _080E7B34: ldr r0, _080E7B48 @ =gUnknown_203AD30 @@ -724,7 +724,7 @@ sub_80E7B4C: @ 80E7B4C push {r4-r7,lr} ldr r4, _080E7CB0 @ =gUnknown_2024018 ldr r0, [r4] - ldr r5, _080E7CB4 @ =gUnknown_2023BC4 + ldr r5, _080E7CB4 @ =gActiveBattler ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -737,12 +737,12 @@ sub_80E7B4C: @ 80E7B4C ands r0, r1 cmp r0, 0 bne _080E7B80 - ldr r0, _080E7CB8 @ =gUnknown_2023BCE + ldr r0, _080E7CB8 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080E7CBC @ =gUnknown_2024284 + ldr r0, _080E7CBC @ =gPlayerParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -762,12 +762,12 @@ _080E7B80: ands r0, r1 cmp r0, 0 bne _080E7BB2 - ldr r0, _080E7CB8 @ =gUnknown_2023BCE + ldr r0, _080E7CB8 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080E7CBC @ =gUnknown_2024284 + ldr r0, _080E7CBC @ =gPlayerParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -800,7 +800,7 @@ _080E7BB2: lsls r0, 24 cmp r0, 0 beq _080E7C46 - ldr r0, _080E7CC0 @ =gUnknown_2022B4C + ldr r0, _080E7CC0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -823,13 +823,13 @@ _080E7BB2: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _080E7CB8 @ =gUnknown_2023BCE + ldr r2, _080E7CB8 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080E7CBC @ =gUnknown_2024284 + ldr r2, _080E7CBC @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -843,7 +843,7 @@ _080E7BB2: bl SetHealthboxSpriteVisible _080E7C46: ldr r1, _080E7CC4 @ =gUnknown_3004FFC - ldr r4, _080E7CB4 @ =gUnknown_2023BC4 + ldr r4, _080E7CB4 @ =gActiveBattler ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -857,13 +857,13 @@ _080E7C46: ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _080E7CB8 @ =gUnknown_2023BCE + ldr r2, _080E7CB8 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080E7CBC @ =gUnknown_2024284 + ldr r2, _080E7CBC @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -893,10 +893,10 @@ _080E7CA8: bx r0 .align 2, 0 _080E7CB0: .4byte gUnknown_2024018 -_080E7CB4: .4byte gUnknown_2023BC4 -_080E7CB8: .4byte gUnknown_2023BCE -_080E7CBC: .4byte gUnknown_2024284 -_080E7CC0: .4byte gUnknown_2022B4C +_080E7CB4: .4byte gActiveBattler +_080E7CB8: .4byte gBattlerPartyIndexes +_080E7CBC: .4byte gPlayerParty +_080E7CC0: .4byte gBattleTypeFlags _080E7CC4: .4byte gUnknown_3004FFC _080E7CC8: .4byte gSprites _080E7CCC: .4byte gUnknown_3004FF0 @@ -912,7 +912,7 @@ sub_80E7CD8: @ 80E7CD8 movs r4, 0 ldr r2, _080E7DD8 @ =gSprites ldr r0, _080E7DDC @ =gUnknown_3004FF0 - ldr r1, _080E7DE0 @ =gUnknown_2023BC4 + ldr r1, _080E7DE0 @ =gActiveBattler mov r8, r1 ldrb r3, [r1] adds r0, r3, r0 @@ -1008,7 +1008,7 @@ _080E7D02: ldr r0, _080E7DF0 @ =c3_0802FDF4 movs r1, 0xA bl CreateTask - ldr r2, _080E7DF4 @ =gUnknown_2023BCE + ldr r2, _080E7DF4 @ =gBattlerPartyIndexes mov r0, r8 ldrb r1, [r0] lsls r0, r1, 1 @@ -1016,7 +1016,7 @@ _080E7D02: ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _080E7DF8 @ =gUnknown_2024284 + ldr r2, _080E7DF8 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange ldr r1, _080E7DFC @ =gUnknown_3004FE0 @@ -1035,13 +1035,13 @@ _080E7DCE: .align 2, 0 _080E7DD8: .4byte gSprites _080E7DDC: .4byte gUnknown_3004FF0 -_080E7DE0: .4byte gUnknown_2023BC4 +_080E7DE0: .4byte gActiveBattler _080E7DE4: .4byte SpriteCallbackDummy _080E7DE8: .4byte gUnknown_2024018 _080E7DEC: .4byte 0x000027f9 _080E7DF0: .4byte c3_0802FDF4 -_080E7DF4: .4byte gUnknown_2023BCE -_080E7DF8: .4byte gUnknown_2024284 +_080E7DF4: .4byte gBattlerPartyIndexes +_080E7DF8: .4byte gPlayerParty _080E7DFC: .4byte gUnknown_3004FE0 _080E7E00: .4byte sub_80E835C thumb_func_end sub_80E7CD8 @@ -1075,7 +1075,7 @@ sub_80E7E04: @ 80E7E04 lsrs r0, 24 cmp r0, 0x1 beq _080E7E4A - ldr r1, _080E7F08 @ =gUnknown_2023BCE + ldr r1, _080E7F08 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -1086,7 +1086,7 @@ _080E7E4A: movs r0, 0x64 mov r1, r10 muls r1, r0 - ldr r0, _080E7F0C @ =gUnknown_2024284 + ldr r0, _080E7F0C @ =gPlayerParty adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB @@ -1107,7 +1107,7 @@ _080E7E4A: ldr r3, _080E7F10 @ =gUnknown_8253AE4 adds r4, 0x1 lsls r4, 2 - ldr r2, _080E7F14 @ =gUnknown_8254784 + ldr r2, _080E7F14 @ =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -1138,7 +1138,7 @@ _080E7E4A: subs r2, r0 ldr r0, [sp, 0xC] subs r2, r0, r2 - ldr r4, _080E7F18 @ =gUnknown_2023BC4 + ldr r4, _080E7F18 @ =gActiveBattler ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -1152,7 +1152,7 @@ _080E7E4A: lsrs r0, 24 cmp r0, 0x1 bne _080E7F20 - ldr r2, _080E7F08 @ =gUnknown_2023BCE + ldr r2, _080E7F08 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r2 mov r1, r10 @@ -1171,11 +1171,11 @@ _080E7EFE: b _080E7F62 .align 2, 0 _080E7F04: .4byte gUnknown_3005090 -_080E7F08: .4byte gUnknown_2023BCE -_080E7F0C: .4byte gUnknown_2024284 +_080E7F08: .4byte gBattlerPartyIndexes +_080E7F0C: .4byte gPlayerParty _080E7F10: .4byte gUnknown_8253AE4 -_080E7F14: .4byte gUnknown_8254784 -_080E7F18: .4byte gUnknown_2023BC4 +_080E7F14: .4byte gBaseStats +_080E7F18: .4byte gActiveBattler _080E7F1C: .4byte sub_80E8190 _080E7F20: ldr r0, _080E7F30 @ =gUnknown_3005090 @@ -1255,7 +1255,7 @@ sub_80E7F7C: @ 80E7F7C movs r0, 0x64 adds r6, r1, 0 muls r6, r0 - ldr r0, _080E8038 @ =gUnknown_2024284 + ldr r0, _080E8038 @ =gPlayerParty adds r6, r0 adds r0, r6, 0 movs r1, 0x38 @@ -1275,7 +1275,7 @@ sub_80E7F7C: @ 80E7F7C adds r3, r0, 0 ldr r6, _080E803C @ =gUnknown_8253AE4 lsls r1, r4, 2 - ldr r2, _080E8040 @ =gUnknown_8254784 + ldr r2, _080E8040 @ =gBaseStats lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -1317,9 +1317,9 @@ sub_80E7F7C: @ 80E7F7C bx r0 .align 2, 0 _080E8034: .4byte gUnknown_3005090 -_080E8038: .4byte gUnknown_2024284 +_080E8038: .4byte gPlayerParty _080E803C: .4byte gUnknown_8253AE4 -_080E8040: .4byte gUnknown_8254784 +_080E8040: .4byte gBaseStats _080E8044: .4byte gUnknown_3004FF0 _080E8048: .4byte sub_80E804C thumb_func_end sub_80E7F7C @@ -1379,7 +1379,7 @@ _080E807C: movs r0, 0x64 mov r1, r9 muls r1, r0 - ldr r0, _080E8148 @ =gUnknown_2024284 + ldr r0, _080E8148 @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x38 @@ -1399,7 +1399,7 @@ _080E807C: ldr r3, _080E814C @ =gUnknown_8253AE4 adds r4, 0x1 lsls r4, 2 - ldr r2, _080E8150 @ =gUnknown_8254784 + ldr r2, _080E8150 @ =gBaseStats lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -1430,7 +1430,7 @@ _080E807C: ldrh r0, [r0] subs r2, r0 subs r2, r4, r2 - ldr r4, _080E8154 @ =gUnknown_2023BC4 + ldr r4, _080E8154 @ =gActiveBattler ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -1444,10 +1444,10 @@ _080E807C: b _080E8178 .align 2, 0 _080E8144: .4byte gUnknown_3004FF0 -_080E8148: .4byte gUnknown_2024284 +_080E8148: .4byte gPlayerParty _080E814C: .4byte gUnknown_8253AE4 -_080E8150: .4byte gUnknown_8254784 -_080E8154: .4byte gUnknown_2023BC4 +_080E8150: .4byte gBaseStats +_080E8154: .4byte gActiveBattler _080E8158: .4byte sub_80E8190 _080E815C: str r0, [sp, 0x4] @@ -1493,7 +1493,7 @@ sub_80E8190: @ 80E8190 lsrs r0, 24 cmp r0, 0x1 bne _080E81C4 - ldr r1, _080E81E8 @ =gUnknown_2023BCE + ldr r1, _080E81E8 @ =gBattlerPartyIndexes movs r0, 0x2 adds r2, r4, 0 eors r2, r0 @@ -1521,7 +1521,7 @@ _080E81C4: bx r0 .align 2, 0 _080E81E4: .4byte gUnknown_3005090 -_080E81E8: .4byte gUnknown_2023BCE +_080E81E8: .4byte gBattlerPartyIndexes _080E81EC: .4byte sub_80E81F0 thumb_func_end sub_80E8190 @@ -1552,7 +1552,7 @@ sub_80E81F0: @ 80E81F0 movs r0, 0x64 adds r1, r4, 0 muls r1, r0 - ldr r0, _080E8264 @ =gUnknown_2024284 + ldr r0, _080E8264 @ =gPlayerParty adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x38 @@ -1562,7 +1562,7 @@ sub_80E81F0: @ 80E81F0 lsrs r0, 24 cmp r0, 0x1 bne _080E8270 - ldr r1, _080E8268 @ =gUnknown_2023BCE + ldr r1, _080E8268 @ =gBattlerPartyIndexes movs r0, 0x2 adds r2, r5, 0 eors r2, r0 @@ -1581,8 +1581,8 @@ sub_80E81F0: @ 80E81F0 .align 2, 0 _080E825C: .4byte gUnknown_3005090 _080E8260: .4byte gUnknown_2024018 -_080E8264: .4byte gUnknown_2024284 -_080E8268: .4byte gUnknown_2023BCE +_080E8264: .4byte gPlayerParty +_080E8268: .4byte gBattlerPartyIndexes _080E826C: .4byte gUnknown_3004FF0 _080E8270: ldr r0, _080E8298 @ =gUnknown_3004FF0 @@ -1590,7 +1590,7 @@ _080E8270: ldrb r0, [r0] movs r1, 0x64 muls r1, r4 - ldr r2, _080E829C @ =gUnknown_2024284 + ldr r2, _080E829C @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -1608,7 +1608,7 @@ _080E8292: bx r0 .align 2, 0 _080E8298: .4byte gUnknown_3004FF0 -_080E829C: .4byte gUnknown_2024284 +_080E829C: .4byte gPlayerParty _080E82A0: .4byte gUnknown_3005090 _080E82A4: .4byte sub_80E82A8 thumb_func_end sub_80E81F0 @@ -1627,7 +1627,7 @@ sub_80E82A8: @ 80E82A8 ldrb r1, [r4, 0x8] movs r0, 0x64 muls r0, r1 - ldr r1, _080E82E8 @ =gUnknown_2024284 + ldr r1, _080E82E8 @ =gPlayerParty adds r0, r1 movs r1, 0x38 bl GetMonData @@ -1644,7 +1644,7 @@ sub_80E82A8: @ 80E82A8 bx r0 .align 2, 0 _080E82E4: .4byte gUnknown_3005090 -_080E82E8: .4byte gUnknown_2024284 +_080E82E8: .4byte gPlayerParty _080E82EC: .4byte gUnknown_3004FE0 _080E82F0: .4byte sub_80E8930 thumb_func_end sub_80E82A8 @@ -1654,7 +1654,7 @@ sub_80E82F4: @ 80E82F4 push {r4-r6,lr} ldr r6, _080E834C @ =gSprites ldr r5, _080E8350 @ =gUnknown_2023D44 - ldr r4, _080E8354 @ =gUnknown_2023BC4 + ldr r4, _080E8354 @ =gActiveBattler ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -1694,7 +1694,7 @@ _080E8344: .align 2, 0 _080E834C: .4byte gSprites _080E8350: .4byte gUnknown_2023D44 -_080E8354: .4byte gUnknown_2023BC4 +_080E8354: .4byte gActiveBattler _080E8358: .4byte gUnknown_3004FF0 thumb_func_end sub_80E82F4 @@ -1702,7 +1702,7 @@ _080E8358: .4byte gUnknown_3004FF0 sub_80E835C: @ 80E835C push {r4-r7,lr} sub sp, 0x4 - ldr r1, _080E837C @ =gUnknown_2023FE8 + ldr r1, _080E837C @ =gBattleStruct ldr r0, [r1] adds r0, 0x94 ldrb r0, [r0] @@ -1717,7 +1717,7 @@ _080E8370: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E837C: .4byte gUnknown_2023FE8 +_080E837C: .4byte gBattleStruct _080E8380: .4byte _080E8384 .align 2, 0 _080E8384: @@ -1796,8 +1796,8 @@ _080E8420: beq _080E8430 b _080E855E _080E8430: - ldr r2, _080E8460 @ =gUnknown_825E45C - ldr r4, _080E8464 @ =gUnknown_2023FE8 + ldr r2, _080E8460 @ =gBitTable + ldr r4, _080E8464 @ =gBattleStruct ldr r0, [r4] adds r1, r0, 0 adds r1, 0x95 @@ -1820,8 +1820,8 @@ _080E8430: ldr r1, [r4] b _080E8522 .align 2, 0 -_080E8460: .4byte gUnknown_825E45C -_080E8464: .4byte gUnknown_2023FE8 +_080E8460: .4byte gBitTable +_080E8464: .4byte gBattleStruct _080E8468: ldr r0, _080E8484 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1846,8 +1846,8 @@ _080E8490: lsrs r3, r0, 16 cmp r3, 0 bne _080E855E - ldr r2, _080E84D0 @ =gUnknown_825E45C - ldr r4, _080E84D4 @ =gUnknown_2023FE8 + ldr r2, _080E84D0 @ =gBitTable + ldr r4, _080E84D4 @ =gBattleStruct ldr r0, [r4] adds r1, r0, 0 adds r1, 0x95 @@ -1870,8 +1870,8 @@ _080E8490: ldr r1, [r4] b _080E8522 .align 2, 0 -_080E84D0: .4byte gUnknown_825E45C -_080E84D4: .4byte gUnknown_2023FE8 +_080E84D0: .4byte gBitTable +_080E84D4: .4byte gBattleStruct _080E84D8: ldr r0, _080E84F4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1904,7 +1904,7 @@ _080E8500: movs r3, 0 bl BeginNormalPaletteFade _080E851E: - ldr r0, _080E852C @ =gUnknown_2023FE8 + ldr r0, _080E852C @ =gBattleStruct ldr r1, [r0] _080E8522: adds r1, 0x94 @@ -1913,7 +1913,7 @@ _080E8522: strb r0, [r1] b _080E855E .align 2, 0 -_080E852C: .4byte gUnknown_2023FE8 +_080E852C: .4byte gBattleStruct _080E8530: ldr r0, _080E8568 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1929,7 +1929,7 @@ _080E8530: lsrs r0, 24 bl sub_80EF0E0 bl sub_80EB524 - ldr r0, _080E856C @ =gUnknown_2023FE8 + ldr r0, _080E856C @ =gBattleStruct ldr r0, [r0] adds r0, 0x94 strb r4, [r0] @@ -1941,7 +1941,7 @@ _080E855E: bx r0 .align 2, 0 _080E8568: .4byte gUnknown_2037AB8 -_080E856C: .4byte gUnknown_2023FE8 +_080E856C: .4byte gBattleStruct thumb_func_end sub_80E835C thumb_func_start sub_80E8570 @@ -2011,7 +2011,7 @@ sub_80E85D4: @ 80E85D4 adds r2, r0, 0 lsls r1, 24 lsrs r4, r1, 24 - ldr r1, _080E85F8 @ =gUnknown_2023FE8 + ldr r1, _080E85F8 @ =gBattleStruct ldr r0, [r1] adds r0, 0x94 ldrb r0, [r0] @@ -2026,7 +2026,7 @@ _080E85EE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E85F8: .4byte gUnknown_2023FE8 +_080E85F8: .4byte gBattleStruct _080E85FC: .4byte _080E8600 .align 2, 0 _080E8600: @@ -2042,14 +2042,14 @@ _080E8618: lsls r0, 16 cmp r0, 0 bne _080E86F2 - ldr r1, _080E8630 @ =gUnknown_2023FE8 + ldr r1, _080E8630 @ =gBattleStruct ldr r0, [r1] adds r0, 0x97 strb r4, [r0] ldr r1, [r1] b _080E86A6 .align 2, 0 -_080E8630: .4byte gUnknown_2023FE8 +_080E8630: .4byte gBattleStruct _080E8634: ldr r1, [r5] adds r1, 0x97 @@ -2104,7 +2104,7 @@ _080E8684: movs r3, 0 bl BeginNormalPaletteFade _080E86A2: - ldr r0, _080E86B0 @ =gUnknown_2023FE8 + ldr r0, _080E86B0 @ =gBattleStruct ldr r1, [r0] _080E86A6: adds r1, 0x94 @@ -2113,7 +2113,7 @@ _080E86A6: strb r0, [r1] b _080E86F2 .align 2, 0 -_080E86B0: .4byte gUnknown_2023FE8 +_080E86B0: .4byte gBattleStruct _080E86B4: ldr r0, _080E86D8 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2122,7 +2122,7 @@ _080E86B4: cmp r0, 0 bne _080E86F2 bl sub_80EB524 - ldr r0, _080E86DC @ =gUnknown_2023BC4 + ldr r0, _080E86DC @ =gActiveBattler ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2132,14 +2132,14 @@ _080E86B4: b _080E86E4 .align 2, 0 _080E86D8: .4byte gUnknown_2037AB8 -_080E86DC: .4byte gUnknown_2023BC4 +_080E86DC: .4byte gActiveBattler _080E86E0: bl OpponentBufferExecCompleted _080E86E4: ldr r0, _080E86FC @ =gUnknown_2023E82 movs r1, 0 strb r1, [r0, 0x7] - ldr r0, _080E8700 @ =gUnknown_2023FE8 + ldr r0, _080E8700 @ =gBattleStruct ldr r0, [r0] adds r0, 0x94 strb r1, [r0] @@ -2150,14 +2150,14 @@ _080E86F2: bx r0 .align 2, 0 _080E86FC: .4byte gUnknown_2023E82 -_080E8700: .4byte gUnknown_2023FE8 +_080E8700: .4byte gBattleStruct thumb_func_end sub_80E85D4 thumb_func_start sub_80E8704 sub_80E8704: @ 80E8704 push {r4,r5,lr} sub sp, 0x4 - ldr r1, _080E8724 @ =gUnknown_2023FE8 + ldr r1, _080E8724 @ =gBattleStruct ldr r0, [r1] adds r0, 0x94 ldrb r0, [r0] @@ -2172,7 +2172,7 @@ _080E8718: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E8724: .4byte gUnknown_2023FE8 +_080E8724: .4byte gBattleStruct _080E8728: .4byte _080E872C .align 2, 0 _080E872C: @@ -2198,7 +2198,7 @@ _080E875A: adds r0, r1, 0 adds r0, 0x95 adds r1, 0x97 - ldr r2, _080E8784 @ =gUnknown_2023BC4 + ldr r2, _080E8784 @ =gActiveBattler ldrb r2, [r2] bl sub_80EEFC8 movs r0, 0x82 @@ -2212,7 +2212,7 @@ _080E875A: b _080E886C .align 2, 0 _080E8780: .4byte gUnknown_2037AB8 -_080E8784: .4byte gUnknown_2023BC4 +_080E8784: .4byte gActiveBattler _080E8788: ldr r0, _080E87C8 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2224,7 +2224,7 @@ _080E8788: beq _080E879A b _080E88AA _080E879A: - ldr r2, _080E87CC @ =gUnknown_825E45C + ldr r2, _080E87CC @ =gBitTable ldr r0, [r5] adds r1, r0, 0 adds r1, 0x95 @@ -2248,7 +2248,7 @@ _080E879A: b _080E886C .align 2, 0 _080E87C8: .4byte gUnknown_2037AB8 -_080E87CC: .4byte gUnknown_825E45C +_080E87CC: .4byte gBitTable _080E87D0: ldr r0, _080E87E4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2277,8 +2277,8 @@ _080E8800: lsrs r3, r0, 16 cmp r3, 0 bne _080E88AA - ldr r2, _080E8840 @ =gUnknown_825E45C - ldr r4, _080E8844 @ =gUnknown_2023FE8 + ldr r2, _080E8840 @ =gBitTable + ldr r4, _080E8844 @ =gBattleStruct ldr r0, [r4] adds r1, r0, 0 adds r1, 0x95 @@ -2301,8 +2301,8 @@ _080E8800: ldr r1, [r4] b _080E886C .align 2, 0 -_080E8840: .4byte gUnknown_825E45C -_080E8844: .4byte gUnknown_2023FE8 +_080E8840: .4byte gBitTable +_080E8844: .4byte gBattleStruct _080E8848: ldr r0, _080E8878 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2320,7 +2320,7 @@ _080E8848: movs r3, 0 bl BeginNormalPaletteFade _080E8868: - ldr r0, _080E887C @ =gUnknown_2023FE8 + ldr r0, _080E887C @ =gBattleStruct ldr r1, [r0] _080E886C: adds r1, 0x94 @@ -2330,7 +2330,7 @@ _080E886C: b _080E88AA .align 2, 0 _080E8878: .4byte gUnknown_2037AB8 -_080E887C: .4byte gUnknown_2023FE8 +_080E887C: .4byte gBattleStruct _080E8880: ldr r0, _080E88B4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2346,7 +2346,7 @@ _080E8880: movs r0, 0x1 bl EmitOneReturnValue bl WallyBufferExecCompleted - ldr r0, _080E88BC @ =gUnknown_2023FE8 + ldr r0, _080E88BC @ =gBattleStruct ldr r0, [r0] adds r0, 0x94 strb r4, [r0] @@ -2358,13 +2358,13 @@ _080E88AA: .align 2, 0 _080E88B4: .4byte gUnknown_2037AB8 _080E88B8: .4byte gUnknown_203AD30 -_080E88BC: .4byte gUnknown_2023FE8 +_080E88BC: .4byte gBattleStruct thumb_func_end sub_80E8704 thumb_func_start sub_80E88C0 sub_80E88C0: @ 80E88C0 push {r4-r6,lr} - ldr r5, _080E8900 @ =gUnknown_2023BC4 + ldr r5, _080E8900 @ =gActiveBattler ldrb r0, [r5] ldr r6, _080E8904 @ =gUnknown_3004FF0 adds r1, r0, r6 @@ -2392,17 +2392,17 @@ sub_80E88C0: @ 80E88C0 bl sub_8048440 b _080E8922 .align 2, 0 -_080E8900: .4byte gUnknown_2023BC4 +_080E8900: .4byte gActiveBattler _080E8904: .4byte gUnknown_3004FF0 _080E8908: - ldr r2, _080E8928 @ =gUnknown_2023BCE + ldr r2, _080E8928 @ =gBattlerPartyIndexes ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _080E892C @ =gUnknown_2024284 + ldr r2, _080E892C @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange bl WallyBufferExecCompleted @@ -2411,8 +2411,8 @@ _080E8922: pop {r0} bx r0 .align 2, 0 -_080E8928: .4byte gUnknown_2023BCE -_080E892C: .4byte gUnknown_2024284 +_080E8928: .4byte gBattlerPartyIndexes +_080E892C: .4byte gPlayerParty thumb_func_end sub_80E88C0 thumb_func_start sub_80E8930 @@ -2433,7 +2433,7 @@ _080E8942: DoHitAnimBlinkSpriteEffect_3: @ 80E8948 push {r4,lr} ldr r1, _080E8984 @ =gUnknown_2023D44 - ldr r0, _080E8988 @ =gUnknown_2023BC4 + ldr r0, _080E8988 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2461,7 +2461,7 @@ DoHitAnimBlinkSpriteEffect_3: @ 80E8948 b _080E89BE .align 2, 0 _080E8984: .4byte gUnknown_2023D44 -_080E8988: .4byte gUnknown_2023BC4 +_080E8988: .4byte gActiveBattler _080E898C: .4byte gSprites _080E8990: .4byte gUnknown_2024005 _080E8994: @@ -2498,7 +2498,7 @@ sub_80E89C4: @ 80E89C4 push {r4-r6,lr} ldr r0, _080E8A20 @ =gUnknown_2024018 ldr r0, [r0] - ldr r6, _080E8A24 @ =gUnknown_2023BC4 + ldr r6, _080E8A24 @ =gActiveBattler ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -2539,7 +2539,7 @@ _080E8A18: bx r0 .align 2, 0 _080E8A20: .4byte gUnknown_2024018 -_080E8A24: .4byte gUnknown_2023BC4 +_080E8A24: .4byte gActiveBattler _080E8A28: .4byte gUnknown_2023D44 _080E8A2C: .4byte gSprites _080E8A30: .4byte gUnknown_3004FF0 @@ -2550,7 +2550,7 @@ sub_80E8A34: @ 80E8A34 push {lr} ldr r2, _080E8A5C @ =gSprites ldr r1, _080E8A60 @ =gUnknown_2023D44 - ldr r0, _080E8A64 @ =gUnknown_2023BC4 + ldr r0, _080E8A64 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2570,7 +2570,7 @@ _080E8A58: .align 2, 0 _080E8A5C: .4byte gSprites _080E8A60: .4byte gUnknown_2023D44 -_080E8A64: .4byte gUnknown_2023BC4 +_080E8A64: .4byte gActiveBattler _080E8A68: .4byte SpriteCallbackDummy thumb_func_end sub_80E8A34 @@ -2579,7 +2579,7 @@ CompleteOnFinishedBattleAnimation_4: @ 80E8A6C push {lr} ldr r0, _080E8A94 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080E8A98 @ =gUnknown_2023BC4 + ldr r0, _080E8A98 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -2597,7 +2597,7 @@ _080E8A8E: bx r0 .align 2, 0 _080E8A94: .4byte gUnknown_2024018 -_080E8A98: .4byte gUnknown_2023BC4 +_080E8A98: .4byte gActiveBattler thumb_func_end CompleteOnFinishedBattleAnimation_4 thumb_func_start WallyBufferExecCompleted @@ -2605,13 +2605,13 @@ WallyBufferExecCompleted: @ 80E8A9C push {r4,lr} sub sp, 0x4 ldr r1, _080E8ADC @ =gUnknown_3004FE0 - ldr r4, _080E8AE0 @ =gUnknown_2023BC4 + ldr r4, _080E8AE0 @ =gActiveBattler ldrb r0, [r4] lsls r0, 2 adds r0, r1 ldr r1, _080E8AE4 @ =sub_80E75EC str r1, [r0] - ldr r0, _080E8AE8 @ =gUnknown_2022B4C + ldr r0, _080E8AE8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -2633,13 +2633,13 @@ WallyBufferExecCompleted: @ 80E8A9C b _080E8B02 .align 2, 0 _080E8ADC: .4byte gUnknown_3004FE0 -_080E8AE0: .4byte gUnknown_2023BC4 +_080E8AE0: .4byte gActiveBattler _080E8AE4: .4byte sub_80E75EC -_080E8AE8: .4byte gUnknown_2022B4C +_080E8AE8: .4byte gBattleTypeFlags _080E8AEC: .4byte gUnknown_2022BC4 _080E8AF0: ldr r2, _080E8B0C @ =gUnknown_2023BC8 - ldr r1, _080E8B10 @ =gUnknown_825E45C + ldr r1, _080E8B10 @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -2654,7 +2654,7 @@ _080E8B02: bx r0 .align 2, 0 _080E8B0C: .4byte gUnknown_2023BC8 -_080E8B10: .4byte gUnknown_825E45C +_080E8B10: .4byte gBitTable thumb_func_end WallyBufferExecCompleted thumb_func_start CompleteOnFinishedStatusAnimation_4 @@ -2662,7 +2662,7 @@ CompleteOnFinishedStatusAnimation_4: @ 80E8B14 push {lr} ldr r0, _080E8B3C @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080E8B40 @ =gUnknown_2023BC4 + ldr r0, _080E8B40 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -2680,7 +2680,7 @@ _080E8B36: bx r0 .align 2, 0 _080E8B3C: .4byte gUnknown_2024018 -_080E8B40: .4byte gUnknown_2023BC4 +_080E8B40: .4byte gActiveBattler thumb_func_end CompleteOnFinishedStatusAnimation_4 thumb_func_start WallyHandleGetMonData @@ -2689,7 +2689,7 @@ WallyHandleGetMonData: @ 80E8B44 sub sp, 0x100 movs r6, 0 ldr r1, _080E8B70 @ =gUnknown_2022BC4 - ldr r0, _080E8B74 @ =gUnknown_2023BC4 + ldr r0, _080E8B74 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -2697,7 +2697,7 @@ WallyHandleGetMonData: @ 80E8B44 ldrb r0, [r1] cmp r0, 0 bne _080E8B7C - ldr r0, _080E8B78 @ =gUnknown_2023BCE + ldr r0, _080E8B78 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -2707,8 +2707,8 @@ WallyHandleGetMonData: @ 80E8B44 b _080E8B9E .align 2, 0 _080E8B70: .4byte gUnknown_2022BC4 -_080E8B74: .4byte gUnknown_2023BC4 -_080E8B78: .4byte gUnknown_2023BCE +_080E8B74: .4byte gActiveBattler +_080E8B78: .4byte gBattlerPartyIndexes _080E8B7C: ldrb r4, [r1] movs r5, 0 @@ -2754,7 +2754,7 @@ CopyWallyMonData: @ 80E8BB8 lsrs r5, r0, 24 movs r6, 0 ldr r2, _080E8BEC @ =gUnknown_2022BC4 - ldr r3, _080E8BF0 @ =gUnknown_2023BC4 + ldr r3, _080E8BF0 @ =gActiveBattler ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -2771,7 +2771,7 @@ _080E8BE2: mov pc, r0 .align 2, 0 _080E8BEC: .4byte gUnknown_2022BC4 -_080E8BF0: .4byte gUnknown_2023BC4 +_080E8BF0: .4byte gActiveBattler _080E8BF4: .4byte _080E8BF8 .align 2, 0 _080E8BF8: @@ -2839,7 +2839,7 @@ _080E8CE8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080E8EFC @ =gUnknown_2024284 + ldr r0, _080E8EFC @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -2892,7 +2892,7 @@ _080E8D34: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080E8EFC @ =gUnknown_2024284 + ldr r0, _080E8EFC @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -3076,28 +3076,28 @@ _080E8EEC: bls _080E8EEC b _080E934E .align 2, 0 -_080E8EFC: .4byte gUnknown_2024284 +_080E8EFC: .4byte gPlayerParty _080E8F00: .4byte 0xfffffc1f _080E8F04: .4byte 0xfff07fff _080E8F08: .4byte 0xfffffe0f _080E8F0C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E8F18 @ =gUnknown_2024284 + ldr r1, _080E8F18 @ =gPlayerParty adds r0, r1 movs r1, 0xB b _080E9286 .align 2, 0 -_080E8F18: .4byte gUnknown_2024284 +_080E8F18: .4byte gPlayerParty _080E8F1C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E8F28 @ =gUnknown_2024284 + ldr r1, _080E8F28 @ =gPlayerParty adds r0, r1 movs r1, 0xC b _080E9286 .align 2, 0 -_080E8F28: .4byte gUnknown_2024284 +_080E8F28: .4byte gPlayerParty _080E8F2C: movs r6, 0 add r2, sp, 0x58 @@ -3107,7 +3107,7 @@ _080E8F2C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080E8F90 @ =gUnknown_2024284 + ldr r0, _080E8F90 @ =gPlayerParty adds r4, r1, r0 mov r8, r9 _080E8F42: @@ -3131,7 +3131,7 @@ _080E8F42: ble _080E8F42 movs r0, 0x64 muls r0, r5 - ldr r1, _080E8F90 @ =gUnknown_2024284 + ldr r1, _080E8F90 @ =gPlayerParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -3149,11 +3149,11 @@ _080E8F80: bls _080E8F80 b _080E934E .align 2, 0 -_080E8F90: .4byte gUnknown_2024284 +_080E8F90: .4byte gPlayerParty _080E8F94: movs r0, 0x64 muls r0, r5 - ldr r1, _080E8FAC @ =gUnknown_2024284 + ldr r1, _080E8FAC @ =gPlayerParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -3163,13 +3163,13 @@ _080E8F94: adds r1, 0x9 b _080E9286 .align 2, 0 -_080E8FAC: .4byte gUnknown_2024284 +_080E8FAC: .4byte gPlayerParty _080E8FB0: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _080E8FE8 @ =gUnknown_2024284 + ldr r2, _080E8FE8 @ =gPlayerParty mov r8, r2 _080E8FBC: adds r1, r6, 0 @@ -3184,7 +3184,7 @@ _080E8FBC: ble _080E8FBC movs r0, 0x64 muls r0, r5 - ldr r1, _080E8FE8 @ =gUnknown_2024284 + ldr r1, _080E8FE8 @ =gPlayerParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -3193,11 +3193,11 @@ _080E8FBC: adds r6, 0x1 b _080E934E .align 2, 0 -_080E8FE8: .4byte gUnknown_2024284 +_080E8FE8: .4byte gPlayerParty _080E8FEC: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9004 @ =gUnknown_2024284 + ldr r1, _080E9004 @ =gPlayerParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -3207,20 +3207,20 @@ _080E8FEC: adds r1, 0x8 b _080E9346 .align 2, 0 -_080E9004: .4byte gUnknown_2024284 +_080E9004: .4byte gPlayerParty _080E9008: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9014 @ =gUnknown_2024284 + ldr r1, _080E9014 @ =gPlayerParty adds r0, r1 movs r1, 0x1 b _080E9022 .align 2, 0 -_080E9014: .4byte gUnknown_2024284 +_080E9014: .4byte gPlayerParty _080E9018: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9044 @ =gUnknown_2024284 + ldr r1, _080E9044 @ =gPlayerParty adds r0, r1 movs r1, 0x19 _080E9022: @@ -3240,120 +3240,120 @@ _080E9022: movs r6, 0x3 b _080E934E .align 2, 0 -_080E9044: .4byte gUnknown_2024284 +_080E9044: .4byte gPlayerParty _080E9048: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9054 @ =gUnknown_2024284 + ldr r1, _080E9054 @ =gPlayerParty adds r0, r1 movs r1, 0x1A b _080E9346 .align 2, 0 -_080E9054: .4byte gUnknown_2024284 +_080E9054: .4byte gPlayerParty _080E9058: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9064 @ =gUnknown_2024284 + ldr r1, _080E9064 @ =gPlayerParty adds r0, r1 movs r1, 0x1B b _080E9346 .align 2, 0 -_080E9064: .4byte gUnknown_2024284 +_080E9064: .4byte gPlayerParty _080E9068: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9074 @ =gUnknown_2024284 + ldr r1, _080E9074 @ =gPlayerParty adds r0, r1 movs r1, 0x1C b _080E9346 .align 2, 0 -_080E9074: .4byte gUnknown_2024284 +_080E9074: .4byte gPlayerParty _080E9078: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9084 @ =gUnknown_2024284 + ldr r1, _080E9084 @ =gPlayerParty adds r0, r1 movs r1, 0x1D b _080E9346 .align 2, 0 -_080E9084: .4byte gUnknown_2024284 +_080E9084: .4byte gPlayerParty _080E9088: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9094 @ =gUnknown_2024284 + ldr r1, _080E9094 @ =gPlayerParty adds r0, r1 movs r1, 0x1E b _080E9346 .align 2, 0 -_080E9094: .4byte gUnknown_2024284 +_080E9094: .4byte gPlayerParty _080E9098: movs r0, 0x64 muls r0, r5 - ldr r1, _080E90A4 @ =gUnknown_2024284 + ldr r1, _080E90A4 @ =gPlayerParty adds r0, r1 movs r1, 0x1F b _080E9346 .align 2, 0 -_080E90A4: .4byte gUnknown_2024284 +_080E90A4: .4byte gPlayerParty _080E90A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E90B4 @ =gUnknown_2024284 + ldr r1, _080E90B4 @ =gPlayerParty adds r0, r1 movs r1, 0x20 b _080E9346 .align 2, 0 -_080E90B4: .4byte gUnknown_2024284 +_080E90B4: .4byte gPlayerParty _080E90B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E90C4 @ =gUnknown_2024284 + ldr r1, _080E90C4 @ =gPlayerParty adds r0, r1 movs r1, 0x22 b _080E9346 .align 2, 0 -_080E90C4: .4byte gUnknown_2024284 +_080E90C4: .4byte gPlayerParty _080E90C8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E90D4 @ =gUnknown_2024284 + ldr r1, _080E90D4 @ =gPlayerParty adds r0, r1 movs r1, 0x23 b _080E9346 .align 2, 0 -_080E90D4: .4byte gUnknown_2024284 +_080E90D4: .4byte gPlayerParty _080E90D8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E90E4 @ =gUnknown_2024284 + ldr r1, _080E90E4 @ =gPlayerParty adds r0, r1 movs r1, 0x24 b _080E9346 .align 2, 0 -_080E90E4: .4byte gUnknown_2024284 +_080E90E4: .4byte gPlayerParty _080E90E8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E90F4 @ =gUnknown_2024284 + ldr r1, _080E90F4 @ =gPlayerParty adds r0, r1 movs r1, 0x25 b _080E9346 .align 2, 0 -_080E90F4: .4byte gUnknown_2024284 +_080E90F4: .4byte gPlayerParty _080E90F8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9104 @ =gUnknown_2024284 + ldr r1, _080E9104 @ =gPlayerParty adds r0, r1 movs r1, 0x26 b _080E9346 .align 2, 0 -_080E9104: .4byte gUnknown_2024284 +_080E9104: .4byte gPlayerParty _080E9108: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080E9154 @ =gUnknown_2024284 + ldr r0, _080E9154 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -3382,83 +3382,83 @@ _080E9108: movs r6, 0x6 b _080E934E .align 2, 0 -_080E9154: .4byte gUnknown_2024284 +_080E9154: .4byte gPlayerParty _080E9158: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9164 @ =gUnknown_2024284 + ldr r1, _080E9164 @ =gPlayerParty adds r0, r1 movs r1, 0x27 b _080E9346 .align 2, 0 -_080E9164: .4byte gUnknown_2024284 +_080E9164: .4byte gPlayerParty _080E9168: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9174 @ =gUnknown_2024284 + ldr r1, _080E9174 @ =gPlayerParty adds r0, r1 movs r1, 0x28 b _080E9346 .align 2, 0 -_080E9174: .4byte gUnknown_2024284 +_080E9174: .4byte gPlayerParty _080E9178: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9184 @ =gUnknown_2024284 + ldr r1, _080E9184 @ =gPlayerParty adds r0, r1 movs r1, 0x29 b _080E9346 .align 2, 0 -_080E9184: .4byte gUnknown_2024284 +_080E9184: .4byte gPlayerParty _080E9188: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9194 @ =gUnknown_2024284 + ldr r1, _080E9194 @ =gPlayerParty adds r0, r1 movs r1, 0x2A b _080E9346 .align 2, 0 -_080E9194: .4byte gUnknown_2024284 +_080E9194: .4byte gPlayerParty _080E9198: movs r0, 0x64 muls r0, r5 - ldr r1, _080E91A4 @ =gUnknown_2024284 + ldr r1, _080E91A4 @ =gPlayerParty adds r0, r1 movs r1, 0x2B b _080E9346 .align 2, 0 -_080E91A4: .4byte gUnknown_2024284 +_080E91A4: .4byte gPlayerParty _080E91A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E91B4 @ =gUnknown_2024284 + ldr r1, _080E91B4 @ =gPlayerParty adds r0, r1 movs r1, 0x2C b _080E9346 .align 2, 0 -_080E91B4: .4byte gUnknown_2024284 +_080E91B4: .4byte gPlayerParty _080E91B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E91C4 @ =gUnknown_2024284 + ldr r1, _080E91C4 @ =gPlayerParty adds r0, r1 movs r1, 0 b _080E91E2 .align 2, 0 -_080E91C4: .4byte gUnknown_2024284 +_080E91C4: .4byte gPlayerParty _080E91C8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E91D4 @ =gUnknown_2024284 + ldr r1, _080E91D4 @ =gPlayerParty adds r0, r1 movs r1, 0x9 b _080E9286 .align 2, 0 -_080E91D4: .4byte gUnknown_2024284 +_080E91D4: .4byte gPlayerParty _080E91D8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9208 @ =gUnknown_2024284 + ldr r1, _080E9208 @ =gPlayerParty adds r0, r1 movs r1, 0x37 _080E91E2: @@ -3480,74 +3480,74 @@ _080E91E2: movs r6, 0x4 b _080E934E .align 2, 0 -_080E9208: .4byte gUnknown_2024284 +_080E9208: .4byte gPlayerParty _080E920C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9218 @ =gUnknown_2024284 + ldr r1, _080E9218 @ =gPlayerParty adds r0, r1 movs r1, 0x38 b _080E9346 .align 2, 0 -_080E9218: .4byte gUnknown_2024284 +_080E9218: .4byte gPlayerParty _080E921C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9228 @ =gUnknown_2024284 + ldr r1, _080E9228 @ =gPlayerParty adds r0, r1 movs r1, 0x39 b _080E9286 .align 2, 0 -_080E9228: .4byte gUnknown_2024284 +_080E9228: .4byte gPlayerParty _080E922C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9238 @ =gUnknown_2024284 + ldr r1, _080E9238 @ =gPlayerParty adds r0, r1 movs r1, 0x3A b _080E9286 .align 2, 0 -_080E9238: .4byte gUnknown_2024284 +_080E9238: .4byte gPlayerParty _080E923C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9248 @ =gUnknown_2024284 + ldr r1, _080E9248 @ =gPlayerParty adds r0, r1 movs r1, 0x3B b _080E9286 .align 2, 0 -_080E9248: .4byte gUnknown_2024284 +_080E9248: .4byte gPlayerParty _080E924C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9258 @ =gUnknown_2024284 + ldr r1, _080E9258 @ =gPlayerParty adds r0, r1 movs r1, 0x3C b _080E9286 .align 2, 0 -_080E9258: .4byte gUnknown_2024284 +_080E9258: .4byte gPlayerParty _080E925C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9268 @ =gUnknown_2024284 + ldr r1, _080E9268 @ =gPlayerParty adds r0, r1 movs r1, 0x3D b _080E9286 .align 2, 0 -_080E9268: .4byte gUnknown_2024284 +_080E9268: .4byte gPlayerParty _080E926C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9278 @ =gUnknown_2024284 + ldr r1, _080E9278 @ =gPlayerParty adds r0, r1 movs r1, 0x3E b _080E9286 .align 2, 0 -_080E9278: .4byte gUnknown_2024284 +_080E9278: .4byte gPlayerParty _080E927C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9298 @ =gUnknown_2024284 + ldr r1, _080E9298 @ =gPlayerParty adds r0, r1 movs r1, 0x3F _080E9286: @@ -3560,101 +3560,101 @@ _080E9286: movs r6, 0x2 b _080E934E .align 2, 0 -_080E9298: .4byte gUnknown_2024284 +_080E9298: .4byte gPlayerParty _080E929C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E92A8 @ =gUnknown_2024284 + ldr r1, _080E92A8 @ =gPlayerParty adds r0, r1 movs r1, 0x16 b _080E9346 .align 2, 0 -_080E92A8: .4byte gUnknown_2024284 +_080E92A8: .4byte gPlayerParty _080E92AC: movs r0, 0x64 muls r0, r5 - ldr r1, _080E92B8 @ =gUnknown_2024284 + ldr r1, _080E92B8 @ =gPlayerParty adds r0, r1 movs r1, 0x17 b _080E9346 .align 2, 0 -_080E92B8: .4byte gUnknown_2024284 +_080E92B8: .4byte gPlayerParty _080E92BC: movs r0, 0x64 muls r0, r5 - ldr r1, _080E92C8 @ =gUnknown_2024284 + ldr r1, _080E92C8 @ =gPlayerParty adds r0, r1 movs r1, 0x18 b _080E9346 .align 2, 0 -_080E92C8: .4byte gUnknown_2024284 +_080E92C8: .4byte gPlayerParty _080E92CC: movs r0, 0x64 muls r0, r5 - ldr r1, _080E92D8 @ =gUnknown_2024284 + ldr r1, _080E92D8 @ =gPlayerParty adds r0, r1 movs r1, 0x21 b _080E9346 .align 2, 0 -_080E92D8: .4byte gUnknown_2024284 +_080E92D8: .4byte gPlayerParty _080E92DC: movs r0, 0x64 muls r0, r5 - ldr r1, _080E92E8 @ =gUnknown_2024284 + ldr r1, _080E92E8 @ =gPlayerParty adds r0, r1 movs r1, 0x2F b _080E9346 .align 2, 0 -_080E92E8: .4byte gUnknown_2024284 +_080E92E8: .4byte gPlayerParty _080E92EC: movs r0, 0x64 muls r0, r5 - ldr r1, _080E92F8 @ =gUnknown_2024284 + ldr r1, _080E92F8 @ =gPlayerParty adds r0, r1 movs r1, 0x30 b _080E9346 .align 2, 0 -_080E92F8: .4byte gUnknown_2024284 +_080E92F8: .4byte gPlayerParty _080E92FC: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9308 @ =gUnknown_2024284 + ldr r1, _080E9308 @ =gPlayerParty adds r0, r1 movs r1, 0x32 b _080E9346 .align 2, 0 -_080E9308: .4byte gUnknown_2024284 +_080E9308: .4byte gPlayerParty _080E930C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9318 @ =gUnknown_2024284 + ldr r1, _080E9318 @ =gPlayerParty adds r0, r1 movs r1, 0x33 b _080E9346 .align 2, 0 -_080E9318: .4byte gUnknown_2024284 +_080E9318: .4byte gPlayerParty _080E931C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9328 @ =gUnknown_2024284 + ldr r1, _080E9328 @ =gPlayerParty adds r0, r1 movs r1, 0x34 b _080E9346 .align 2, 0 -_080E9328: .4byte gUnknown_2024284 +_080E9328: .4byte gPlayerParty _080E932C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9338 @ =gUnknown_2024284 + ldr r1, _080E9338 @ =gPlayerParty adds r0, r1 movs r1, 0x35 b _080E9346 .align 2, 0 -_080E9338: .4byte gUnknown_2024284 +_080E9338: .4byte gPlayerParty _080E933C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9360 @ =gUnknown_2024284 + ldr r1, _080E9360 @ =gPlayerParty adds r0, r1 movs r1, 0x36 _080E9346: @@ -3672,7 +3672,7 @@ _080E934E: pop {r1} bx r1 .align 2, 0 -_080E9360: .4byte gUnknown_2024284 +_080E9360: .4byte gPlayerParty thumb_func_end CopyWallyMonData thumb_func_start WallyHandleGetRawMonData @@ -3687,7 +3687,7 @@ WallyHandleGetRawMonData: @ 80E9364 WallyHandleSetMonData: @ 80E9370 push {r4,r5,lr} ldr r1, _080E9394 @ =gUnknown_2022BC4 - ldr r0, _080E9398 @ =gUnknown_2023BC4 + ldr r0, _080E9398 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -3695,7 +3695,7 @@ WallyHandleSetMonData: @ 80E9370 ldrb r0, [r1] cmp r0, 0 bne _080E93A0 - ldr r0, _080E939C @ =gUnknown_2023BCE + ldr r0, _080E939C @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -3703,8 +3703,8 @@ WallyHandleSetMonData: @ 80E9370 b _080E93BE .align 2, 0 _080E9394: .4byte gUnknown_2022BC4 -_080E9398: .4byte gUnknown_2023BC4 -_080E939C: .4byte gUnknown_2023BCE +_080E9398: .4byte gActiveBattler +_080E939C: .4byte gBattlerPartyIndexes _080E93A0: ldrb r4, [r1] movs r5, 0 @@ -3739,7 +3739,7 @@ SetWallyMonData: @ 80E93C8 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080E9400 @ =gUnknown_2023BC4 + ldr r0, _080E9400 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 ldr r2, _080E9404 @ =gUnknown_2022BC7 @@ -3759,7 +3759,7 @@ _080E93F4: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E9400: .4byte gUnknown_2023BC4 +_080E9400: .4byte gActiveBattler _080E9404: .4byte gUnknown_2022BC7 _080E9408: .4byte _080E940C .align 2, 0 @@ -3828,7 +3828,7 @@ _080E94FC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080E9690 @ =gUnknown_2024284 + ldr r0, _080E9690 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -3895,7 +3895,7 @@ _080E9562: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080E9690 @ =gUnknown_2024284 + ldr r0, _080E9690 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -4005,13 +4005,13 @@ _080E9562: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9690: .4byte gUnknown_2024284 +_080E9690: .4byte gPlayerParty _080E9694: movs r0, 0x64 muls r0, r5 - ldr r1, _080E96AC @ =gUnknown_2024284 + ldr r1, _080E96AC @ =gPlayerParty adds r0, r1 - ldr r1, _080E96B0 @ =gUnknown_2023BC4 + ldr r1, _080E96B0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4019,14 +4019,14 @@ _080E9694: bl sub_804037C b _080E9D8E .align 2, 0 -_080E96AC: .4byte gUnknown_2024284 -_080E96B0: .4byte gUnknown_2023BC4 +_080E96AC: .4byte gPlayerParty +_080E96B0: .4byte gActiveBattler _080E96B4: movs r0, 0x64 muls r0, r5 - ldr r1, _080E96CC @ =gUnknown_2024284 + ldr r1, _080E96CC @ =gPlayerParty adds r0, r1 - ldr r1, _080E96D0 @ =gUnknown_2023BC4 + ldr r1, _080E96D0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4034,8 +4034,8 @@ _080E96B4: bl sub_804037C b _080E9D8E .align 2, 0 -_080E96CC: .4byte gUnknown_2024284 -_080E96D0: .4byte gUnknown_2023BC4 +_080E96CC: .4byte gPlayerParty +_080E96D0: .4byte gActiveBattler _080E96D4: movs r0, 0 mov r8, r0 @@ -4045,7 +4045,7 @@ _080E96D4: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080E9728 @ =gUnknown_2024284 + ldr r0, _080E9728 @ =gPlayerParty adds r7, r1, r0 adds r6, r3, 0 adds r6, 0x8 @@ -4070,21 +4070,21 @@ _080E96EE: ble _080E96EE movs r0, 0x64 muls r0, r5 - ldr r1, _080E9728 @ =gUnknown_2024284 + ldr r1, _080E9728 @ =gPlayerParty adds r0, r1 movs r1, 0x15 mov r2, r9 bl sub_804037C b _080E9D8E .align 2, 0 -_080E9728: .4byte gUnknown_2024284 +_080E9728: .4byte gPlayerParty _080E972C: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9748 @ =gUnknown_2024284 + ldr r1, _080E9748 @ =gPlayerParty adds r0, r1 ldr r3, _080E974C @ =gUnknown_2022BC4 - ldr r1, _080E9750 @ =gUnknown_2023BC4 + ldr r1, _080E9750 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -4093,16 +4093,16 @@ _080E972C: adds r1, 0x9 b _080E97D0 .align 2, 0 -_080E9748: .4byte gUnknown_2024284 +_080E9748: .4byte gPlayerParty _080E974C: .4byte gUnknown_2022BC4 -_080E9750: .4byte gUnknown_2023BC4 +_080E9750: .4byte gActiveBattler _080E9754: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080E97B0 @ =gUnknown_2024284 + ldr r0, _080E97B0 @ =gPlayerParty adds r4, r0 - ldr r5, _080E97B4 @ =gUnknown_2023BC4 + ldr r5, _080E97B4 @ =gActiveBattler ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -4139,15 +4139,15 @@ _080E9754: bl sub_804037C b _080E9D8E .align 2, 0 -_080E97B0: .4byte gUnknown_2024284 -_080E97B4: .4byte gUnknown_2023BC4 +_080E97B0: .4byte gPlayerParty +_080E97B4: .4byte gActiveBattler _080E97B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E97DC @ =gUnknown_2024284 + ldr r1, _080E97DC @ =gPlayerParty adds r0, r1 ldr r3, _080E97E0 @ =gUnknown_2022BC4 - ldr r1, _080E97E4 @ =gUnknown_2023BC4 + ldr r1, _080E97E4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -4160,15 +4160,15 @@ _080E97D0: bl sub_804037C b _080E9D8E .align 2, 0 -_080E97DC: .4byte gUnknown_2024284 +_080E97DC: .4byte gPlayerParty _080E97E0: .4byte gUnknown_2022BC4 -_080E97E4: .4byte gUnknown_2023BC4 +_080E97E4: .4byte gActiveBattler _080E97E8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9800 @ =gUnknown_2024284 + ldr r1, _080E9800 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9804 @ =gUnknown_2023BC4 + ldr r1, _080E9804 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4176,14 +4176,14 @@ _080E97E8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9800: .4byte gUnknown_2024284 -_080E9804: .4byte gUnknown_2023BC4 +_080E9800: .4byte gPlayerParty +_080E9804: .4byte gActiveBattler _080E9808: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9820 @ =gUnknown_2024284 + ldr r1, _080E9820 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9824 @ =gUnknown_2023BC4 + ldr r1, _080E9824 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4191,14 +4191,14 @@ _080E9808: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9820: .4byte gUnknown_2024284 -_080E9824: .4byte gUnknown_2023BC4 +_080E9820: .4byte gPlayerParty +_080E9824: .4byte gActiveBattler _080E9828: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9840 @ =gUnknown_2024284 + ldr r1, _080E9840 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9844 @ =gUnknown_2023BC4 + ldr r1, _080E9844 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4206,14 +4206,14 @@ _080E9828: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9840: .4byte gUnknown_2024284 -_080E9844: .4byte gUnknown_2023BC4 +_080E9840: .4byte gPlayerParty +_080E9844: .4byte gActiveBattler _080E9848: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9860 @ =gUnknown_2024284 + ldr r1, _080E9860 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9864 @ =gUnknown_2023BC4 + ldr r1, _080E9864 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4221,14 +4221,14 @@ _080E9848: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9860: .4byte gUnknown_2024284 -_080E9864: .4byte gUnknown_2023BC4 +_080E9860: .4byte gPlayerParty +_080E9864: .4byte gActiveBattler _080E9868: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9880 @ =gUnknown_2024284 + ldr r1, _080E9880 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9884 @ =gUnknown_2023BC4 + ldr r1, _080E9884 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4236,14 +4236,14 @@ _080E9868: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9880: .4byte gUnknown_2024284 -_080E9884: .4byte gUnknown_2023BC4 +_080E9880: .4byte gPlayerParty +_080E9884: .4byte gActiveBattler _080E9888: movs r0, 0x64 muls r0, r5 - ldr r1, _080E98A0 @ =gUnknown_2024284 + ldr r1, _080E98A0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E98A4 @ =gUnknown_2023BC4 + ldr r1, _080E98A4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4251,14 +4251,14 @@ _080E9888: bl sub_804037C b _080E9D8E .align 2, 0 -_080E98A0: .4byte gUnknown_2024284 -_080E98A4: .4byte gUnknown_2023BC4 +_080E98A0: .4byte gPlayerParty +_080E98A4: .4byte gActiveBattler _080E98A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E98C0 @ =gUnknown_2024284 + ldr r1, _080E98C0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E98C4 @ =gUnknown_2023BC4 + ldr r1, _080E98C4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4266,14 +4266,14 @@ _080E98A8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E98C0: .4byte gUnknown_2024284 -_080E98C4: .4byte gUnknown_2023BC4 +_080E98C0: .4byte gPlayerParty +_080E98C4: .4byte gActiveBattler _080E98C8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E98E0 @ =gUnknown_2024284 + ldr r1, _080E98E0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E98E4 @ =gUnknown_2023BC4 + ldr r1, _080E98E4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4281,14 +4281,14 @@ _080E98C8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E98E0: .4byte gUnknown_2024284 -_080E98E4: .4byte gUnknown_2023BC4 +_080E98E0: .4byte gPlayerParty +_080E98E4: .4byte gActiveBattler _080E98E8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9900 @ =gUnknown_2024284 + ldr r1, _080E9900 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9904 @ =gUnknown_2023BC4 + ldr r1, _080E9904 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4296,14 +4296,14 @@ _080E98E8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9900: .4byte gUnknown_2024284 -_080E9904: .4byte gUnknown_2023BC4 +_080E9900: .4byte gPlayerParty +_080E9904: .4byte gActiveBattler _080E9908: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9920 @ =gUnknown_2024284 + ldr r1, _080E9920 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9924 @ =gUnknown_2023BC4 + ldr r1, _080E9924 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4311,14 +4311,14 @@ _080E9908: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9920: .4byte gUnknown_2024284 -_080E9924: .4byte gUnknown_2023BC4 +_080E9920: .4byte gPlayerParty +_080E9924: .4byte gActiveBattler _080E9928: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9940 @ =gUnknown_2024284 + ldr r1, _080E9940 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9944 @ =gUnknown_2023BC4 + ldr r1, _080E9944 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4326,14 +4326,14 @@ _080E9928: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9940: .4byte gUnknown_2024284 -_080E9944: .4byte gUnknown_2023BC4 +_080E9940: .4byte gPlayerParty +_080E9944: .4byte gActiveBattler _080E9948: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9960 @ =gUnknown_2024284 + ldr r1, _080E9960 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9964 @ =gUnknown_2023BC4 + ldr r1, _080E9964 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4341,14 +4341,14 @@ _080E9948: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9960: .4byte gUnknown_2024284 -_080E9964: .4byte gUnknown_2023BC4 +_080E9960: .4byte gPlayerParty +_080E9964: .4byte gActiveBattler _080E9968: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9980 @ =gUnknown_2024284 + ldr r1, _080E9980 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9984 @ =gUnknown_2023BC4 + ldr r1, _080E9984 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4356,14 +4356,14 @@ _080E9968: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9980: .4byte gUnknown_2024284 -_080E9984: .4byte gUnknown_2023BC4 +_080E9980: .4byte gPlayerParty +_080E9984: .4byte gActiveBattler _080E9988: movs r0, 0x64 muls r0, r5 - ldr r1, _080E99A0 @ =gUnknown_2024284 + ldr r1, _080E99A0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E99A4 @ =gUnknown_2023BC4 + ldr r1, _080E99A4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4371,15 +4371,15 @@ _080E9988: bl sub_804037C b _080E9D8E .align 2, 0 -_080E99A0: .4byte gUnknown_2024284 -_080E99A4: .4byte gUnknown_2023BC4 +_080E99A0: .4byte gPlayerParty +_080E99A4: .4byte gActiveBattler _080E99A8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080E9A10 @ =gUnknown_2024284 + ldr r0, _080E9A10 @ =gPlayerParty adds r4, r0 - ldr r5, _080E9A14 @ =gUnknown_2023BC4 + ldr r5, _080E9A14 @ =gActiveBattler ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -4421,14 +4421,14 @@ _080E99A8: adds r0, r4, 0 b _080E9AC8 .align 2, 0 -_080E9A10: .4byte gUnknown_2024284 -_080E9A14: .4byte gUnknown_2023BC4 +_080E9A10: .4byte gPlayerParty +_080E9A14: .4byte gActiveBattler _080E9A18: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9A30 @ =gUnknown_2024284 + ldr r1, _080E9A30 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9A34 @ =gUnknown_2023BC4 + ldr r1, _080E9A34 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4436,14 +4436,14 @@ _080E9A18: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9A30: .4byte gUnknown_2024284 -_080E9A34: .4byte gUnknown_2023BC4 +_080E9A30: .4byte gPlayerParty +_080E9A34: .4byte gActiveBattler _080E9A38: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9A50 @ =gUnknown_2024284 + ldr r1, _080E9A50 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9A54 @ =gUnknown_2023BC4 + ldr r1, _080E9A54 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4451,14 +4451,14 @@ _080E9A38: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9A50: .4byte gUnknown_2024284 -_080E9A54: .4byte gUnknown_2023BC4 +_080E9A50: .4byte gPlayerParty +_080E9A54: .4byte gActiveBattler _080E9A58: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9A70 @ =gUnknown_2024284 + ldr r1, _080E9A70 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9A74 @ =gUnknown_2023BC4 + ldr r1, _080E9A74 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4466,14 +4466,14 @@ _080E9A58: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9A70: .4byte gUnknown_2024284 -_080E9A74: .4byte gUnknown_2023BC4 +_080E9A70: .4byte gPlayerParty +_080E9A74: .4byte gActiveBattler _080E9A78: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9A90 @ =gUnknown_2024284 + ldr r1, _080E9A90 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9A94 @ =gUnknown_2023BC4 + ldr r1, _080E9A94 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4481,14 +4481,14 @@ _080E9A78: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9A90: .4byte gUnknown_2024284 -_080E9A94: .4byte gUnknown_2023BC4 +_080E9A90: .4byte gPlayerParty +_080E9A94: .4byte gActiveBattler _080E9A98: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9AB0 @ =gUnknown_2024284 + ldr r1, _080E9AB0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9AB4 @ =gUnknown_2023BC4 + ldr r1, _080E9AB4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4496,14 +4496,14 @@ _080E9A98: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9AB0: .4byte gUnknown_2024284 -_080E9AB4: .4byte gUnknown_2023BC4 +_080E9AB0: .4byte gPlayerParty +_080E9AB4: .4byte gActiveBattler _080E9AB8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9AD0 @ =gUnknown_2024284 + ldr r1, _080E9AD0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9AD4 @ =gUnknown_2023BC4 + ldr r1, _080E9AD4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4512,14 +4512,14 @@ _080E9AC8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9AD0: .4byte gUnknown_2024284 -_080E9AD4: .4byte gUnknown_2023BC4 +_080E9AD0: .4byte gPlayerParty +_080E9AD4: .4byte gActiveBattler _080E9AD8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9AF0 @ =gUnknown_2024284 + ldr r1, _080E9AF0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9AF4 @ =gUnknown_2023BC4 + ldr r1, _080E9AF4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4527,14 +4527,14 @@ _080E9AD8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9AF0: .4byte gUnknown_2024284 -_080E9AF4: .4byte gUnknown_2023BC4 +_080E9AF0: .4byte gPlayerParty +_080E9AF4: .4byte gActiveBattler _080E9AF8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9B10 @ =gUnknown_2024284 + ldr r1, _080E9B10 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9B14 @ =gUnknown_2023BC4 + ldr r1, _080E9B14 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4542,14 +4542,14 @@ _080E9AF8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9B10: .4byte gUnknown_2024284 -_080E9B14: .4byte gUnknown_2023BC4 +_080E9B10: .4byte gPlayerParty +_080E9B14: .4byte gActiveBattler _080E9B18: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9B30 @ =gUnknown_2024284 + ldr r1, _080E9B30 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9B34 @ =gUnknown_2023BC4 + ldr r1, _080E9B34 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4557,14 +4557,14 @@ _080E9B18: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9B30: .4byte gUnknown_2024284 -_080E9B34: .4byte gUnknown_2023BC4 +_080E9B30: .4byte gPlayerParty +_080E9B34: .4byte gActiveBattler _080E9B38: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9B50 @ =gUnknown_2024284 + ldr r1, _080E9B50 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9B54 @ =gUnknown_2023BC4 + ldr r1, _080E9B54 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4572,14 +4572,14 @@ _080E9B38: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9B50: .4byte gUnknown_2024284 -_080E9B54: .4byte gUnknown_2023BC4 +_080E9B50: .4byte gPlayerParty +_080E9B54: .4byte gActiveBattler _080E9B58: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9B70 @ =gUnknown_2024284 + ldr r1, _080E9B70 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9B74 @ =gUnknown_2023BC4 + ldr r1, _080E9B74 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4587,14 +4587,14 @@ _080E9B58: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9B70: .4byte gUnknown_2024284 -_080E9B74: .4byte gUnknown_2023BC4 +_080E9B70: .4byte gPlayerParty +_080E9B74: .4byte gActiveBattler _080E9B78: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9B90 @ =gUnknown_2024284 + ldr r1, _080E9B90 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9B94 @ =gUnknown_2023BC4 + ldr r1, _080E9B94 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4602,14 +4602,14 @@ _080E9B78: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9B90: .4byte gUnknown_2024284 -_080E9B94: .4byte gUnknown_2023BC4 +_080E9B90: .4byte gPlayerParty +_080E9B94: .4byte gActiveBattler _080E9B98: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9BB0 @ =gUnknown_2024284 + ldr r1, _080E9BB0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9BB4 @ =gUnknown_2023BC4 + ldr r1, _080E9BB4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4617,14 +4617,14 @@ _080E9B98: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9BB0: .4byte gUnknown_2024284 -_080E9BB4: .4byte gUnknown_2023BC4 +_080E9BB0: .4byte gPlayerParty +_080E9BB4: .4byte gActiveBattler _080E9BB8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9BD0 @ =gUnknown_2024284 + ldr r1, _080E9BD0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9BD4 @ =gUnknown_2023BC4 + ldr r1, _080E9BD4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4632,14 +4632,14 @@ _080E9BB8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9BD0: .4byte gUnknown_2024284 -_080E9BD4: .4byte gUnknown_2023BC4 +_080E9BD0: .4byte gPlayerParty +_080E9BD4: .4byte gActiveBattler _080E9BD8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9BF0 @ =gUnknown_2024284 + ldr r1, _080E9BF0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9BF4 @ =gUnknown_2023BC4 + ldr r1, _080E9BF4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4647,14 +4647,14 @@ _080E9BD8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9BF0: .4byte gUnknown_2024284 -_080E9BF4: .4byte gUnknown_2023BC4 +_080E9BF0: .4byte gPlayerParty +_080E9BF4: .4byte gActiveBattler _080E9BF8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9C10 @ =gUnknown_2024284 + ldr r1, _080E9C10 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9C14 @ =gUnknown_2023BC4 + ldr r1, _080E9C14 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4662,14 +4662,14 @@ _080E9BF8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9C10: .4byte gUnknown_2024284 -_080E9C14: .4byte gUnknown_2023BC4 +_080E9C10: .4byte gPlayerParty +_080E9C14: .4byte gActiveBattler _080E9C18: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9C30 @ =gUnknown_2024284 + ldr r1, _080E9C30 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9C34 @ =gUnknown_2023BC4 + ldr r1, _080E9C34 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4677,14 +4677,14 @@ _080E9C18: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9C30: .4byte gUnknown_2024284 -_080E9C34: .4byte gUnknown_2023BC4 +_080E9C30: .4byte gPlayerParty +_080E9C34: .4byte gActiveBattler _080E9C38: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9C50 @ =gUnknown_2024284 + ldr r1, _080E9C50 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9C54 @ =gUnknown_2023BC4 + ldr r1, _080E9C54 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4692,14 +4692,14 @@ _080E9C38: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9C50: .4byte gUnknown_2024284 -_080E9C54: .4byte gUnknown_2023BC4 +_080E9C50: .4byte gPlayerParty +_080E9C54: .4byte gActiveBattler _080E9C58: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9C70 @ =gUnknown_2024284 + ldr r1, _080E9C70 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9C74 @ =gUnknown_2023BC4 + ldr r1, _080E9C74 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4707,14 +4707,14 @@ _080E9C58: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9C70: .4byte gUnknown_2024284 -_080E9C74: .4byte gUnknown_2023BC4 +_080E9C70: .4byte gPlayerParty +_080E9C74: .4byte gActiveBattler _080E9C78: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9C90 @ =gUnknown_2024284 + ldr r1, _080E9C90 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9C94 @ =gUnknown_2023BC4 + ldr r1, _080E9C94 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4722,14 +4722,14 @@ _080E9C78: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9C90: .4byte gUnknown_2024284 -_080E9C94: .4byte gUnknown_2023BC4 +_080E9C90: .4byte gPlayerParty +_080E9C94: .4byte gActiveBattler _080E9C98: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9CB0 @ =gUnknown_2024284 + ldr r1, _080E9CB0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9CB4 @ =gUnknown_2023BC4 + ldr r1, _080E9CB4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4737,14 +4737,14 @@ _080E9C98: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9CB0: .4byte gUnknown_2024284 -_080E9CB4: .4byte gUnknown_2023BC4 +_080E9CB0: .4byte gPlayerParty +_080E9CB4: .4byte gActiveBattler _080E9CB8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9CD0 @ =gUnknown_2024284 + ldr r1, _080E9CD0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9CD4 @ =gUnknown_2023BC4 + ldr r1, _080E9CD4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4752,14 +4752,14 @@ _080E9CB8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9CD0: .4byte gUnknown_2024284 -_080E9CD4: .4byte gUnknown_2023BC4 +_080E9CD0: .4byte gPlayerParty +_080E9CD4: .4byte gActiveBattler _080E9CD8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9CF0 @ =gUnknown_2024284 + ldr r1, _080E9CF0 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9CF4 @ =gUnknown_2023BC4 + ldr r1, _080E9CF4 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4767,14 +4767,14 @@ _080E9CD8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9CF0: .4byte gUnknown_2024284 -_080E9CF4: .4byte gUnknown_2023BC4 +_080E9CF0: .4byte gPlayerParty +_080E9CF4: .4byte gActiveBattler _080E9CF8: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9D10 @ =gUnknown_2024284 + ldr r1, _080E9D10 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9D14 @ =gUnknown_2023BC4 + ldr r1, _080E9D14 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4782,14 +4782,14 @@ _080E9CF8: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9D10: .4byte gUnknown_2024284 -_080E9D14: .4byte gUnknown_2023BC4 +_080E9D10: .4byte gPlayerParty +_080E9D14: .4byte gActiveBattler _080E9D18: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9D30 @ =gUnknown_2024284 + ldr r1, _080E9D30 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9D34 @ =gUnknown_2023BC4 + ldr r1, _080E9D34 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4797,14 +4797,14 @@ _080E9D18: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9D30: .4byte gUnknown_2024284 -_080E9D34: .4byte gUnknown_2023BC4 +_080E9D30: .4byte gPlayerParty +_080E9D34: .4byte gActiveBattler _080E9D38: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9D50 @ =gUnknown_2024284 + ldr r1, _080E9D50 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9D54 @ =gUnknown_2023BC4 + ldr r1, _080E9D54 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4812,14 +4812,14 @@ _080E9D38: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9D50: .4byte gUnknown_2024284 -_080E9D54: .4byte gUnknown_2023BC4 +_080E9D50: .4byte gPlayerParty +_080E9D54: .4byte gActiveBattler _080E9D58: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9D70 @ =gUnknown_2024284 + ldr r1, _080E9D70 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9D74 @ =gUnknown_2023BC4 + ldr r1, _080E9D74 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -4827,29 +4827,29 @@ _080E9D58: bl sub_804037C b _080E9D8E .align 2, 0 -_080E9D70: .4byte gUnknown_2024284 -_080E9D74: .4byte gUnknown_2023BC4 +_080E9D70: .4byte gPlayerParty +_080E9D74: .4byte gActiveBattler _080E9D78: movs r0, 0x64 muls r0, r5 - ldr r1, _080E9DB8 @ =gUnknown_2024284 + ldr r1, _080E9DB8 @ =gPlayerParty adds r0, r1 - ldr r1, _080E9DBC @ =gUnknown_2023BC4 + ldr r1, _080E9DBC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl sub_804037C _080E9D8E: - ldr r2, _080E9DC0 @ =gUnknown_2023BCE - ldr r0, _080E9DBC @ =gUnknown_2023BC4 + ldr r2, _080E9DC0 @ =gBattlerPartyIndexes + ldr r0, _080E9DBC @ =gActiveBattler ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _080E9DB8 @ =gUnknown_2024284 + ldr r2, _080E9DB8 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange add sp, 0x34 @@ -4861,9 +4861,9 @@ _080E9D8E: pop {r0} bx r0 .align 2, 0 -_080E9DB8: .4byte gUnknown_2024284 -_080E9DBC: .4byte gUnknown_2023BC4 -_080E9DC0: .4byte gUnknown_2023BCE +_080E9DB8: .4byte gPlayerParty +_080E9DBC: .4byte gActiveBattler +_080E9DC0: .4byte gBattlerPartyIndexes thumb_func_end SetWallyMonData thumb_func_start sub_80E9DC4 @@ -4894,7 +4894,7 @@ sub_80E9DDC: @ 80E9DDC WallyHandleReturnMonToBall: @ 80E9DE8 push {r4-r6,lr} ldr r0, _080E9E14 @ =gUnknown_2022BC4 - ldr r6, _080E9E18 @ =gUnknown_2023BC4 + ldr r6, _080E9E18 @ =gActiveBattler ldrb r2, [r6] lsls r1, r2, 9 adds r0, 0x1 @@ -4915,7 +4915,7 @@ WallyHandleReturnMonToBall: @ 80E9DE8 b _080E9E5A .align 2, 0 _080E9E14: .4byte gUnknown_2022BC4 -_080E9E18: .4byte gUnknown_2023BC4 +_080E9E18: .4byte gActiveBattler _080E9E1C: .4byte gUnknown_3004FE0 _080E9E20: .4byte sub_80E89C4 _080E9E24: @@ -4955,7 +4955,7 @@ _080E9E68: .4byte gUnknown_3004FF0 thumb_func_start sub_80E9E6C sub_80E9E6C: @ 80E9E6C push {r4-r6,lr} - ldr r0, _080E9EC8 @ =gUnknown_2022B4C + ldr r0, _080E9EC8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -4964,7 +4964,7 @@ sub_80E9E6C: @ 80E9E6C ldr r4, _080E9ECC @ =gSaveBlock2Ptr ldr r0, [r4] ldrb r0, [r0, 0x8] - ldr r6, _080E9ED0 @ =gUnknown_2023BC4 + ldr r6, _080E9ED0 @ =gActiveBattler ldrb r1, [r6] bl sub_8034750 ldr r0, [r4] @@ -4997,14 +4997,14 @@ sub_80E9E6C: @ 80E9E6C ldrb r1, [r6] b _080E9F1C .align 2, 0 -_080E9EC8: .4byte gUnknown_2022B4C +_080E9EC8: .4byte gBattleTypeFlags _080E9ECC: .4byte gSaveBlock2Ptr -_080E9ED0: .4byte gUnknown_2023BC4 +_080E9ED0: .4byte gActiveBattler _080E9ED4: .4byte gUnknown_20244DC _080E9ED8: .4byte gUnknown_8239F8C _080E9EDC: .4byte gUnknown_2023D44 _080E9EE0: - ldr r4, _080E9F8C @ =gUnknown_2023BC4 + ldr r4, _080E9F8C @ =gActiveBattler ldrb r1, [r4] movs r0, 0x5 bl sub_8034750 @@ -5035,7 +5035,7 @@ _080E9F1C: strb r0, [r1] ldr r4, _080E9F9C @ =gSprites ldr r5, _080E9F98 @ =gUnknown_2023D44 - ldr r6, _080E9F8C @ =gUnknown_2023BC4 + ldr r6, _080E9F8C @ =gActiveBattler ldrb r3, [r6] adds r0, r3, r5 ldrb r0, [r0] @@ -5087,7 +5087,7 @@ _080E9F1C: pop {r0} bx r0 .align 2, 0 -_080E9F8C: .4byte gUnknown_2023BC4 +_080E9F8C: .4byte gActiveBattler _080E9F90: .4byte gUnknown_20244DC _080E9F94: .4byte gUnknown_8239F8C _080E9F98: .4byte gUnknown_2023D44 @@ -5101,7 +5101,7 @@ _080E9FAC: .4byte sub_80E78E0 thumb_func_start sub_80E9FB0 sub_80E9FB0: @ 80E9FB0 push {r4-r6,lr} - ldr r0, _080EA00C @ =gUnknown_2022B4C + ldr r0, _080EA00C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -5110,7 +5110,7 @@ sub_80E9FB0: @ 80E9FB0 ldr r4, _080EA010 @ =gSaveBlock2Ptr ldr r0, [r4] ldrb r0, [r0, 0x8] - ldr r6, _080EA014 @ =gUnknown_2023BC4 + ldr r6, _080EA014 @ =gActiveBattler ldrb r1, [r6] bl sub_8034750 ldr r0, [r4] @@ -5143,14 +5143,14 @@ sub_80E9FB0: @ 80E9FB0 ldrb r1, [r6] b _080EA060 .align 2, 0 -_080EA00C: .4byte gUnknown_2022B4C +_080EA00C: .4byte gBattleTypeFlags _080EA010: .4byte gSaveBlock2Ptr -_080EA014: .4byte gUnknown_2023BC4 +_080EA014: .4byte gActiveBattler _080EA018: .4byte gUnknown_20244DC _080EA01C: .4byte gUnknown_8239F8C _080EA020: .4byte gUnknown_2023D44 _080EA024: - ldr r4, _080EA0D0 @ =gUnknown_2023BC4 + ldr r4, _080EA0D0 @ =gActiveBattler ldrb r1, [r4] movs r0, 0x5 bl sub_8034750 @@ -5181,7 +5181,7 @@ _080EA060: strb r0, [r1] ldr r4, _080EA0E0 @ =gSprites ldr r5, _080EA0DC @ =gUnknown_2023D44 - ldr r6, _080EA0D0 @ =gUnknown_2023BC4 + ldr r6, _080EA0D0 @ =gActiveBattler ldrb r3, [r6] adds r0, r3, r5 ldrb r0, [r0] @@ -5233,7 +5233,7 @@ _080EA060: pop {r0} bx r0 .align 2, 0 -_080EA0D0: .4byte gUnknown_2023BC4 +_080EA0D0: .4byte gActiveBattler _080EA0D4: .4byte gUnknown_20244DC _080EA0D8: .4byte gUnknown_8239F8C _080EA0DC: .4byte gUnknown_2023D44 @@ -5257,7 +5257,7 @@ sub_80EA100: @ 80EA100 push {r4-r6,lr} ldr r6, _080EA14C @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _080EA150 @ =gUnknown_2023BC4 + ldr r5, _080EA150 @ =gActiveBattler ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -5293,7 +5293,7 @@ _080EA134: b _080EA1CA .align 2, 0 _080EA14C: .4byte gUnknown_2024018 -_080EA150: .4byte gUnknown_2023BC4 +_080EA150: .4byte gActiveBattler _080EA154: ldrb r1, [r3] movs r0, 0x40 @@ -5303,14 +5303,14 @@ _080EA154: cmp r4, 0 bne _080EA1CA strb r4, [r3, 0x4] - ldr r2, _080EA1D0 @ =gUnknown_2023BCE + ldr r2, _080EA1D0 @ =gBattlerPartyIndexes ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _080EA1D4 @ =gUnknown_2024284 + ldr r2, _080EA1D4 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange movs r1, 0x40 @@ -5357,8 +5357,8 @@ _080EA1CA: pop {r0} bx r0 .align 2, 0 -_080EA1D0: .4byte gUnknown_2023BCE -_080EA1D4: .4byte gUnknown_2024284 +_080EA1D0: .4byte gBattlerPartyIndexes +_080EA1D4: .4byte gPlayerParty _080EA1D8: .4byte gSprites _080EA1DC: .4byte gUnknown_2023D44 _080EA1E0: .4byte sub_8012110 @@ -5385,7 +5385,7 @@ sub_80EA1F8: @ 80EA1F8 ldr r1, _080EA23C @ =gUnknown_2024005 movs r0, 0x1 strb r0, [r1] - ldr r5, _080EA240 @ =gUnknown_2023BC4 + ldr r5, _080EA240 @ =gActiveBattler ldrb r4, [r5] movs r0, 0x1 bl GetBankByIdentity @@ -5408,7 +5408,7 @@ sub_80EA1F8: @ 80EA1F8 .align 2, 0 _080EA238: .4byte gUnknown_2024018 _080EA23C: .4byte gUnknown_2024005 -_080EA240: .4byte gUnknown_2023BC4 +_080EA240: .4byte gActiveBattler _080EA244: .4byte gUnknown_3004FE0 _080EA248: .4byte sub_80E7970 thumb_func_end sub_80EA1F8 @@ -5417,7 +5417,7 @@ _080EA248: .4byte sub_80E7970 sub_80EA24C: @ 80EA24C push {r4,r5,lr} ldr r1, _080EA294 @ =gUnknown_2022BC4 - ldr r5, _080EA298 @ =gUnknown_2023BC4 + ldr r5, _080EA298 @ =gActiveBattler ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -5451,7 +5451,7 @@ sub_80EA24C: @ 80EA24C bx r0 .align 2, 0 _080EA294: .4byte gUnknown_2022BC4 -_080EA298: .4byte gUnknown_2023BC4 +_080EA298: .4byte gActiveBattler _080EA29C: .4byte gUnknown_2024018 _080EA2A0: .4byte gUnknown_2024005 _080EA2A4: .4byte gUnknown_3004FE0 @@ -5471,7 +5471,7 @@ sub_80EA2B8: @ 80EA2B8 push {r4-r6,lr} ldr r0, _080EA38C @ =gUnknown_2022BC4 mov r12, r0 - ldr r6, _080EA390 @ =gUnknown_2023BC4 + ldr r6, _080EA390 @ =gActiveBattler ldrb r2, [r6] lsls r2, 9 adds r0, 0x1 @@ -5574,7 +5574,7 @@ sub_80EA2B8: @ 80EA2B8 b _080EA3CE .align 2, 0 _080EA38C: .4byte gUnknown_2022BC4 -_080EA390: .4byte gUnknown_2023BC4 +_080EA390: .4byte gActiveBattler _080EA394: .4byte gUnknown_2037F16 _080EA398: .4byte gUnknown_2037EEC _080EA39C: .4byte gUnknown_2037EE8 @@ -5615,7 +5615,7 @@ sub_80EA3E0: @ 80EA3E0 mov r6, r8 push {r6,r7} ldr r2, _080EA424 @ =gUnknown_2022BC4 - ldr r6, _080EA428 @ =gUnknown_2023BC4 + ldr r6, _080EA428 @ =gActiveBattler ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -5645,7 +5645,7 @@ sub_80EA3E0: @ 80EA3E0 b _080EA520 .align 2, 0 _080EA424: .4byte gUnknown_2022BC4 -_080EA428: .4byte gUnknown_2023BC4 +_080EA428: .4byte gActiveBattler _080EA42C: .4byte gUnknown_2024018 _080EA430: cmp r2, 0x2 @@ -5781,12 +5781,12 @@ sub_80EA52C: @ 80EA52C strh r1, [r0] ldr r0, _080EA560 @ =gUnknown_2022976 strh r1, [r0] - ldr r0, _080EA564 @ =gUnknown_2023BC4 + ldr r0, _080EA564 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 ldr r1, _080EA568 @ =gUnknown_2022BC6 adds r4, r0, r1 - ldr r0, _080EA56C @ =gUnknown_2022B4C + ldr r0, _080EA56C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 2 @@ -5801,9 +5801,9 @@ sub_80EA52C: @ 80EA52C .align 2, 0 _080EA55C: .4byte gUnknown_2022974 _080EA560: .4byte gUnknown_2022976 -_080EA564: .4byte gUnknown_2023BC4 +_080EA564: .4byte gActiveBattler _080EA568: .4byte gUnknown_2022BC6 -_080EA56C: .4byte gUnknown_2022B4C +_080EA56C: .4byte gBattleTypeFlags _080EA570: ldrh r0, [r4] bl sub_80D7274 @@ -5823,7 +5823,7 @@ _080EA590: movs r1, 0 bl sub_80D87BC _080EA598: - ldr r0, _080EA5B8 @ =gUnknown_2022B4C + ldr r0, _080EA5B8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -5839,7 +5839,7 @@ _080EA598: b _080EA64C .align 2, 0 _080EA5B4: .4byte gUnknown_202298C -_080EA5B8: .4byte gUnknown_2022B4C +_080EA5B8: .4byte gBattleTypeFlags _080EA5BC: cmp r1, 0xE3 beq _080EA630 @@ -5858,7 +5858,7 @@ _080EA5CC: movs r0, 0x2 bl sub_80EB2F4 ldr r1, _080EA5EC @ =gUnknown_3004FE0 - ldr r0, _080EA5F0 @ =gUnknown_2023BC4 + ldr r0, _080EA5F0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5866,11 +5866,11 @@ _080EA5CC: b _080EA658 .align 2, 0 _080EA5EC: .4byte gUnknown_3004FE0 -_080EA5F0: .4byte gUnknown_2023BC4 +_080EA5F0: .4byte gActiveBattler _080EA5F4: .4byte sub_80E8584 _080EA5F8: ldr r1, _080EA608 @ =gUnknown_3004FE0 - ldr r0, _080EA60C @ =gUnknown_2023BC4 + ldr r0, _080EA60C @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5878,11 +5878,11 @@ _080EA5F8: b _080EA658 .align 2, 0 _080EA608: .4byte gUnknown_3004FE0 -_080EA60C: .4byte gUnknown_2023BC4 +_080EA60C: .4byte gActiveBattler _080EA610: .4byte sub_80E85AC _080EA614: ldr r1, _080EA624 @ =gUnknown_3004FE0 - ldr r0, _080EA628 @ =gUnknown_2023BC4 + ldr r0, _080EA628 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5890,11 +5890,11 @@ _080EA614: b _080EA658 .align 2, 0 _080EA624: .4byte gUnknown_3004FE0 -_080EA628: .4byte gUnknown_2023BC4 +_080EA628: .4byte gActiveBattler _080EA62C: .4byte sub_80E85C0 _080EA630: ldr r1, _080EA640 @ =gUnknown_3004FE0 - ldr r0, _080EA644 @ =gUnknown_2023BC4 + ldr r0, _080EA644 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5902,11 +5902,11 @@ _080EA630: b _080EA658 .align 2, 0 _080EA640: .4byte gUnknown_3004FE0 -_080EA644: .4byte gUnknown_2023BC4 +_080EA644: .4byte gActiveBattler _080EA648: .4byte sub_80E8598 _080EA64C: ldr r1, _080EA660 @ =gUnknown_3004FE0 - ldr r0, _080EA664 @ =gUnknown_2023BC4 + ldr r0, _080EA664 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5919,14 +5919,14 @@ _080EA65A: bx r0 .align 2, 0 _080EA660: .4byte gUnknown_3004FE0 -_080EA664: .4byte gUnknown_2023BC4 +_080EA664: .4byte gActiveBattler _080EA668: .4byte sub_80E7918 thumb_func_end sub_80EA52C thumb_func_start sub_80EA66C sub_80EA66C: @ 80EA66C push {lr} - ldr r0, _080EA684 @ =gUnknown_2023BC4 + ldr r0, _080EA684 @ =gActiveBattler ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -5935,7 +5935,7 @@ sub_80EA66C: @ 80EA66C bl sub_80EA52C b _080EA68C .align 2, 0 -_080EA684: .4byte gUnknown_2023BC4 +_080EA684: .4byte gActiveBattler _080EA688: bl WallyBufferExecCompleted _080EA68C: @@ -5956,14 +5956,14 @@ sub_80EA690: @ 80EA690 ldr r1, _080EA6C8 @ =gUnknown_2022976 movs r0, 0xA0 strh r0, [r1] - ldr r0, _080EA6CC @ =gUnknown_2022B4C + ldr r0, _080EA6CC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 cmp r0, 0 beq _080EA6DC ldr r1, _080EA6D0 @ =gUnknown_3004FE0 - ldr r0, _080EA6D4 @ =gUnknown_2023BC4 + ldr r0, _080EA6D4 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5972,13 +5972,13 @@ sub_80EA690: @ 80EA690 .align 2, 0 _080EA6C4: .4byte gUnknown_2022974 _080EA6C8: .4byte gUnknown_2022976 -_080EA6CC: .4byte gUnknown_2022B4C +_080EA6CC: .4byte gBattleTypeFlags _080EA6D0: .4byte gUnknown_3004FE0 -_080EA6D4: .4byte gUnknown_2023BC4 +_080EA6D4: .4byte gActiveBattler _080EA6D8: .4byte sub_80E763C _080EA6DC: ldr r1, _080EA6F0 @ =gUnknown_3004FE0 - ldr r0, _080EA6F4 @ =gUnknown_2023BC4 + ldr r0, _080EA6F4 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5990,7 +5990,7 @@ _080EA6EA: bx r0 .align 2, 0 _080EA6F0: .4byte gUnknown_3004FE0 -_080EA6F4: .4byte gUnknown_2023BC4 +_080EA6F4: .4byte gActiveBattler _080EA6F8: .4byte sub_80E7844 thumb_func_end sub_80EA690 @@ -5998,7 +5998,7 @@ _080EA6F8: .4byte sub_80E7844 sub_80EA6FC: @ 80EA6FC push {r4,lr} ldr r1, _080EA750 @ =gUnknown_3004FE0 - ldr r0, _080EA754 @ =gUnknown_2023BC4 + ldr r0, _080EA754 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -6019,13 +6019,13 @@ _080EA71E: cmp r4, 0x3 ble _080EA71E ldr r1, _080EA764 @ =gUnknown_2023FF8 - ldr r0, _080EA754 @ =gUnknown_2023BC4 + ldr r0, _080EA754 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl ActionSelectionCreateCursorAt - ldr r0, _080EA768 @ =gUnknown_2022B4C + ldr r0, _080EA768 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -6036,12 +6036,12 @@ _080EA71E: b _080EA776 .align 2, 0 _080EA750: .4byte gUnknown_3004FE0 -_080EA754: .4byte gUnknown_2023BC4 +_080EA754: .4byte gActiveBattler _080EA758: .4byte sub_80EA690 _080EA75C: .4byte gUnknown_83FDA4C _080EA760: .4byte gUnknown_83FE725 _080EA764: .4byte gUnknown_2023FF8 -_080EA768: .4byte gUnknown_2022B4C +_080EA768: .4byte gBattleTypeFlags _080EA76C: .4byte gUnknown_83FE6D5 _080EA770: ldr r0, _080EA784 @ =gUnknown_83FE6FA @@ -6082,7 +6082,7 @@ sub_80EA798: @ 80EA798 adds r0, r2, 0 strh r0, [r1] ldr r1, _080EA7D0 @ =gUnknown_3004FE0 - ldr r0, _080EA7D4 @ =gUnknown_2023BC4 + ldr r0, _080EA7D4 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -6095,14 +6095,14 @@ _080EA7C2: _080EA7C8: .4byte gUnknown_2022974 _080EA7CC: .4byte gUnknown_2022976 _080EA7D0: .4byte gUnknown_3004FE0 -_080EA7D4: .4byte gUnknown_2023BC4 +_080EA7D4: .4byte gActiveBattler _080EA7D8: .4byte sub_80E7988 thumb_func_end sub_80EA798 thumb_func_start sub_80EA7DC sub_80EA7DC: @ 80EA7DC push {r4,lr} - ldr r0, _080EA800 @ =gUnknown_2022B4C + ldr r0, _080EA800 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -6110,7 +6110,7 @@ sub_80EA7DC: @ 80EA7DC beq _080EA810 bl sub_8032CB4 ldr r1, _080EA804 @ =gUnknown_3004FE0 - ldr r0, _080EA808 @ =gUnknown_2023BC4 + ldr r0, _080EA808 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -6118,12 +6118,12 @@ sub_80EA7DC: @ 80EA7DC str r1, [r0] b _080EA866 .align 2, 0 -_080EA800: .4byte gUnknown_2022B4C +_080EA800: .4byte gBattleTypeFlags _080EA804: .4byte gUnknown_3004FE0 -_080EA808: .4byte gUnknown_2023BC4 +_080EA808: .4byte gActiveBattler _080EA80C: .4byte sub_80EA798 _080EA810: - ldr r4, _080EA824 @ =gUnknown_2023FE8 + ldr r4, _080EA824 @ =gBattleStruct ldr r0, [r4] adds r0, 0x95 ldrb r0, [r0] @@ -6133,7 +6133,7 @@ _080EA810: beq _080EA83E b _080EA866 .align 2, 0 -_080EA824: .4byte gUnknown_2023FE8 +_080EA824: .4byte gBattleStruct _080EA828: bl sub_8032CB4 ldr r1, [r4] @@ -6146,7 +6146,7 @@ _080EA828: movs r1, 0x50 strb r1, [r0] _080EA83E: - ldr r0, _080EA86C @ =gUnknown_2023FE8 + ldr r0, _080EA86C @ =gBattleStruct ldr r1, [r0] adds r1, 0x97 ldrb r0, [r1] @@ -6168,7 +6168,7 @@ _080EA866: pop {r0} bx r0 .align 2, 0 -_080EA86C: .4byte gUnknown_2023FE8 +_080EA86C: .4byte gBattleStruct thumb_func_end sub_80EA7DC thumb_func_start sub_80EA870 @@ -6183,7 +6183,7 @@ sub_80EA870: @ 80EA870 movs r3, 0x10 bl BeginNormalPaletteFade ldr r1, _080EA8BC @ =gUnknown_3004FE0 - ldr r2, _080EA8C0 @ =gUnknown_2023BC4 + ldr r2, _080EA8C0 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -6213,7 +6213,7 @@ _080EA89E: bx r0 .align 2, 0 _080EA8BC: .4byte gUnknown_3004FE0 -_080EA8C0: .4byte gUnknown_2023BC4 +_080EA8C0: .4byte gActiveBattler _080EA8C4: .4byte sub_80E7A70 _080EA8C8: .4byte gUnknown_2024004 _080EA8CC: .4byte gUnknown_203B0DC @@ -6228,7 +6228,7 @@ sub_80EA8D4: @ 80EA8D4 movs r1, 0xFF bl CreateTask ldr r3, _080EA988 @ =gUnknown_3004FFC - ldr r4, _080EA98C @ =gUnknown_2023BC4 + ldr r4, _080EA98C @ =gActiveBattler ldrb r1, [r4] adds r1, r3 strb r0, [r1] @@ -6248,7 +6248,7 @@ sub_80EA8D4: @ 80EA8D4 movs r0, 0xF ands r0, r2 strh r0, [r1, 0x8] - ldr r3, _080EA998 @ =gUnknown_2023FE8 + ldr r3, _080EA998 @ =gBattleStruct ldr r1, [r3] adds r1, 0x49 ldrb r0, [r4] @@ -6295,7 +6295,7 @@ _080EA940: movs r3, 0x10 bl BeginNormalPaletteFade ldr r1, _080EA9A0 @ =gUnknown_3004FE0 - ldr r2, _080EA98C @ =gUnknown_2023BC4 + ldr r2, _080EA98C @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -6311,10 +6311,10 @@ _080EA940: .align 2, 0 _080EA984: .4byte nullsub_43 _080EA988: .4byte gUnknown_3004FFC -_080EA98C: .4byte gUnknown_2023BC4 +_080EA98C: .4byte gActiveBattler _080EA990: .4byte gUnknown_3005090 _080EA994: .4byte gUnknown_2022BC4 -_080EA998: .4byte gUnknown_2023FE8 +_080EA998: .4byte gBattleStruct _080EA99C: .4byte gUnknown_203B0DC _080EA9A0: .4byte gUnknown_3004FE0 _080EA9A4: .4byte sub_80E79B8 @@ -6339,7 +6339,7 @@ sub_80EA9B8: @ 80EA9B8 movs r0, 0 bl LoadBattleBarGfx ldr r3, _080EAA30 @ =gUnknown_2022BC4 - ldr r0, _080EAA34 @ =gUnknown_2023BC4 + ldr r0, _080EAA34 @ =gActiveBattler mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -6356,13 +6356,13 @@ sub_80EA9B8: @ 80EA9B8 ldr r0, _080EAA38 @ =0x00007fff cmp r7, r0 beq _080EAA48 - ldr r6, _080EAA3C @ =gUnknown_2023BCE + ldr r6, _080EAA3C @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _080EAA40 @ =gUnknown_2024284 + ldr r4, _080EAA40 @ =gPlayerParty adds r0, r4 movs r1, 0x3A bl GetMonData @@ -6388,19 +6388,19 @@ sub_80EA9B8: @ 80EA9B8 b _080EAA82 .align 2, 0 _080EAA30: .4byte gUnknown_2022BC4 -_080EAA34: .4byte gUnknown_2023BC4 +_080EAA34: .4byte gActiveBattler _080EAA38: .4byte 0x00007fff -_080EAA3C: .4byte gUnknown_2023BCE -_080EAA40: .4byte gUnknown_2024284 +_080EAA3C: .4byte gBattlerPartyIndexes +_080EAA40: .4byte gPlayerParty _080EAA44: .4byte gUnknown_3004FF0 _080EAA48: - ldr r1, _080EAAA0 @ =gUnknown_2023BCE + ldr r1, _080EAAA0 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080EAAA4 @ =gUnknown_2024284 + ldr r1, _080EAAA4 @ =gPlayerParty adds r0, r1 movs r1, 0x3A bl GetMonData @@ -6422,7 +6422,7 @@ _080EAA48: bl sub_8048440 _080EAA82: ldr r1, _080EAAAC @ =gUnknown_3004FE0 - ldr r0, _080EAAB0 @ =gUnknown_2023BC4 + ldr r0, _080EAAB0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -6436,11 +6436,11 @@ _080EAA82: pop {r0} bx r0 .align 2, 0 -_080EAAA0: .4byte gUnknown_2023BCE -_080EAAA4: .4byte gUnknown_2024284 +_080EAAA0: .4byte gBattlerPartyIndexes +_080EAAA4: .4byte gPlayerParty _080EAAA8: .4byte gUnknown_3004FF0 _080EAAAC: .4byte gUnknown_3004FE0 -_080EAAB0: .4byte gUnknown_2023BC4 +_080EAAB0: .4byte gActiveBattler _080EAAB4: .4byte sub_80E88C0 thumb_func_end sub_80EA9B8 @@ -6448,7 +6448,7 @@ _080EAAB4: .4byte sub_80E88C0 sub_80EAAB8: @ 80EAAB8 push {r4-r7,lr} ldr r5, _080EAAE4 @ =gUnknown_2022BC4 - ldr r6, _080EAAE8 @ =gUnknown_2023BC4 + ldr r6, _080EAAE8 @ =gActiveBattler ldrb r0, [r6] lsls r0, 9 adds r1, r5, 0x1 @@ -6457,7 +6457,7 @@ sub_80EAAB8: @ 80EAAB8 movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _080EAAEC @ =gUnknown_2024284 + ldr r0, _080EAAEC @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x38 @@ -6468,8 +6468,8 @@ sub_80EAAB8: @ 80EAAB8 b _080EAB3C .align 2, 0 _080EAAE4: .4byte gUnknown_2022BC4 -_080EAAE8: .4byte gUnknown_2023BC4 -_080EAAEC: .4byte gUnknown_2024284 +_080EAAE8: .4byte gActiveBattler +_080EAAEC: .4byte gPlayerParty _080EAAF0: movs r0, 0x1 bl LoadBattleBarGfx @@ -6642,7 +6642,7 @@ sub_80EAC08: @ 80EAC08 push {r4,lr} ldr r3, _080EAC30 @ =gSprites ldr r2, _080EAC34 @ =gUnknown_2023D44 - ldr r4, _080EAC38 @ =gUnknown_2023BC4 + ldr r4, _080EAC38 @ =gActiveBattler ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -6660,7 +6660,7 @@ sub_80EAC08: @ 80EAC08 .align 2, 0 _080EAC30: .4byte gSprites _080EAC34: .4byte gUnknown_2023D44 -_080EAC38: .4byte gUnknown_2023BC4 +_080EAC38: .4byte gActiveBattler _080EAC3C: ldr r1, _080EAC6C @ =gUnknown_2024005 movs r0, 0x1 @@ -6704,7 +6704,7 @@ sub_80EAC78: @ 80EAC78 sub_80EAC84: @ 80EAC84 push {lr} ldr r2, _080EACAC @ =gUnknown_2022BC4 - ldr r0, _080EACB0 @ =gUnknown_2023BC4 + ldr r0, _080EACB0 @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -6721,14 +6721,14 @@ sub_80EAC84: @ 80EAC84 bx r0 .align 2, 0 _080EACAC: .4byte gUnknown_2022BC4 -_080EACB0: .4byte gUnknown_2023BC4 +_080EACB0: .4byte gActiveBattler thumb_func_end sub_80EAC84 thumb_func_start sub_80EACB4 sub_80EACB4: @ 80EACB4 push {lr} ldr r2, _080EACDC @ =gUnknown_2022BC4 - ldr r0, _080EACE0 @ =gUnknown_2023BC4 + ldr r0, _080EACE0 @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -6745,21 +6745,21 @@ sub_80EACB4: @ 80EACB4 bx r0 .align 2, 0 _080EACDC: .4byte gUnknown_2022BC4 -_080EACE0: .4byte gUnknown_2023BC4 +_080EACE0: .4byte gActiveBattler thumb_func_end sub_80EACB4 thumb_func_start sub_80EACE4 sub_80EACE4: @ 80EACE4 push {lr} - ldr r1, _080EAD14 @ =gUnknown_2023BCE - ldr r0, _080EAD18 @ =gUnknown_2023BC4 + ldr r1, _080EAD14 @ =gBattlerPartyIndexes + ldr r0, _080EAD18 @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080EAD1C @ =gUnknown_2024284 + ldr r1, _080EAD1C @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -6771,16 +6771,16 @@ sub_80EACE4: @ 80EACE4 pop {r0} bx r0 .align 2, 0 -_080EAD14: .4byte gUnknown_2023BCE -_080EAD18: .4byte gUnknown_2023BC4 -_080EAD1C: .4byte gUnknown_2024284 +_080EAD14: .4byte gBattlerPartyIndexes +_080EAD18: .4byte gActiveBattler +_080EAD1C: .4byte gPlayerParty thumb_func_end sub_80EACE4 thumb_func_start sub_80EAD20 sub_80EAD20: @ 80EAD20 push {lr} ldr r1, _080EAD48 @ =gUnknown_2022BC4 - ldr r0, _080EAD4C @ =gUnknown_2023BC4 + ldr r0, _080EAD4C @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -6797,14 +6797,14 @@ sub_80EAD20: @ 80EAD20 bx r0 .align 2, 0 _080EAD48: .4byte gUnknown_2022BC4 -_080EAD4C: .4byte gUnknown_2023BC4 +_080EAD4C: .4byte gActiveBattler _080EAD50: .4byte gUnknown_2023F4C thumb_func_end sub_80EAD20 thumb_func_start sub_80EAD54 sub_80EAD54: @ 80EAD54 push {r4-r7,lr} - ldr r0, _080EAEA0 @ =gUnknown_2022B4C + ldr r0, _080EAEA0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -6813,7 +6813,7 @@ sub_80EAD54: @ 80EAD54 b _080EAEE4 _080EAD64: ldr r6, _080EAEA4 @ =gUnknown_2023D44 - ldr r7, _080EAEA8 @ =gUnknown_2023BC4 + ldr r7, _080EAEA8 @ =gActiveBattler ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] @@ -6965,9 +6965,9 @@ _080EAE84: str r1, [r0] b _080EAF18 .align 2, 0 -_080EAEA0: .4byte gUnknown_2022B4C +_080EAEA0: .4byte gBattleTypeFlags _080EAEA4: .4byte gUnknown_2023D44 -_080EAEA8: .4byte gUnknown_2023BC4 +_080EAEA8: .4byte gActiveBattler _080EAEAC: .4byte gSprites _080EAEB0: .4byte 0x0000ffd8 _080EAEB4: .4byte sub_8075590 @@ -6985,7 +6985,7 @@ _080EAEE0: .4byte nullsub_13 _080EAEE4: ldr r0, _080EAF20 @ =gUnknown_2024018 ldr r1, [r0] - ldr r0, _080EAF24 @ =gUnknown_2023BC4 + ldr r0, _080EAF24 @ =gActiveBattler ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -7015,7 +7015,7 @@ _080EAF18: bx r0 .align 2, 0 _080EAF20: .4byte gUnknown_2024018 -_080EAF24: .4byte gUnknown_2023BC4 +_080EAF24: .4byte gActiveBattler _080EAF28: .4byte gUnknown_3005090 _080EAF2C: .4byte gUnknown_2024000 _080EAF30: .4byte sub_80491B0 @@ -7038,7 +7038,7 @@ sub_80EAF34: @ 80EAF34 adds r0, r1 movs r1, 0 strh r1, [r0, 0x2] - ldr r0, _080EB080 @ =gUnknown_2023BCE + ldr r0, _080EB080 @ =gBattlerPartyIndexes lsls r2, r6, 1 adds r2, r0 ldr r0, _080EB084 @ =gUnknown_2022BC4 @@ -7050,7 +7050,7 @@ sub_80EAF34: @ 80EAF34 ldrh r1, [r2] movs r0, 0x64 muls r0, r1 - ldr r1, _080EB088 @ =gUnknown_2024284 + ldr r1, _080EB088 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -7179,9 +7179,9 @@ sub_80EAF34: @ 80EAF34 bx r0 .align 2, 0 _080EB07C: .4byte gUnknown_2024018 -_080EB080: .4byte gUnknown_2023BCE +_080EB080: .4byte gBattlerPartyIndexes _080EB084: .4byte gUnknown_2022BC4 -_080EB088: .4byte gUnknown_2024284 +_080EB088: .4byte gPlayerParty _080EB08C: .4byte sub_8033E3C _080EB090: .4byte gUnknown_3004FFC _080EB094: .4byte gUnknown_20244DC @@ -7212,7 +7212,7 @@ sub_80EB0A8: @ 80EB0A8 .align 2, 0 _080EB0C8: .4byte gUnknown_3005090 _080EB0CC: - ldr r4, _080EB108 @ =gUnknown_2023BC4 + ldr r4, _080EB108 @ =gActiveBattler ldrb r5, [r4] ldrh r0, [r1, 0x8] strb r0, [r4] @@ -7221,7 +7221,7 @@ _080EB0CC: lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _080EB110 @ =gUnknown_2023BCE + ldr r0, _080EB110 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -7242,9 +7242,9 @@ _080EB102: pop {r0} bx r0 .align 2, 0 -_080EB108: .4byte gUnknown_2023BC4 +_080EB108: .4byte gActiveBattler _080EB10C: .4byte gUnknown_2022BC4 -_080EB110: .4byte gUnknown_2023BCE +_080EB110: .4byte gBattlerPartyIndexes _080EB114: .4byte gUnknown_3004FE0 _080EB118: .4byte sub_80E7B4C thumb_func_end sub_80EB0A8 @@ -7253,7 +7253,7 @@ _080EB118: .4byte sub_80E7B4C sub_80EB11C: @ 80EB11C push {r4,r5,lr} ldr r1, _080EB144 @ =gUnknown_2022BC4 - ldr r0, _080EB148 @ =gUnknown_2023BC4 + ldr r0, _080EB148 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -7270,11 +7270,11 @@ sub_80EB11C: @ 80EB11C b _080EB18A .align 2, 0 _080EB144: .4byte gUnknown_2022BC4 -_080EB148: .4byte gUnknown_2023BC4 +_080EB148: .4byte gActiveBattler _080EB14C: ldr r0, _080EB190 @ =gUnknown_2024018 ldr r0, [r0] - ldr r5, _080EB194 @ =gUnknown_2023BC4 + ldr r5, _080EB194 @ =gActiveBattler ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -7307,7 +7307,7 @@ _080EB18A: bx r0 .align 2, 0 _080EB190: .4byte gUnknown_2024018 -_080EB194: .4byte gUnknown_2023BC4 +_080EB194: .4byte gActiveBattler _080EB198: .4byte gUnknown_2022BC8 _080EB19C: .4byte gUnknown_2024000 thumb_func_end sub_80EB11C @@ -7323,7 +7323,7 @@ sub_80EB1A0: @ 80EB1A0 thumb_func_start sub_80EB1AC sub_80EB1AC: @ 80EB1AC push {r4,lr} - ldr r4, _080EB1CC @ =gUnknown_2023BC4 + ldr r4, _080EB1CC @ =gActiveBattler ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free @@ -7335,7 +7335,7 @@ sub_80EB1AC: @ 80EB1AC pop {r0} bx r0 .align 2, 0 -_080EB1CC: .4byte gUnknown_2023BC4 +_080EB1CC: .4byte gActiveBattler thumb_func_end sub_80EB1AC thumb_func_start sub_80EB1D0 @@ -7351,7 +7351,7 @@ sub_80EB1DC: @ 80EB1DC push {r4-r6,lr} sub sp, 0x4 ldr r5, _080EB214 @ =gUnknown_2022BC4 - ldr r6, _080EB218 @ =gUnknown_2023BC4 + ldr r6, _080EB218 @ =gActiveBattler ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -7376,7 +7376,7 @@ sub_80EB1DC: @ 80EB1DC b _080EB228 .align 2, 0 _080EB214: .4byte gUnknown_2022BC4 -_080EB218: .4byte gUnknown_2023BC4 +_080EB218: .4byte gActiveBattler _080EB21C: ldr r0, _080EB230 @ =gUnknown_3004FE0 ldrb r1, [r6] @@ -7398,7 +7398,7 @@ _080EB234: .4byte CompleteOnFinishedBattleAnimation_4 sub_80EB238: @ 80EB238 push {r4,lr} ldr r1, _080EB26C @ =gUnknown_2022BC4 - ldr r4, _080EB270 @ =gUnknown_2023BC4 + ldr r4, _080EB270 @ =gActiveBattler ldrb r2, [r4] lsls r0, r2, 9 adds r1, 0x1 @@ -7421,7 +7421,7 @@ _080EB260: bx r0 .align 2, 0 _080EB26C: .4byte gUnknown_2022BC4 -_080EB270: .4byte gUnknown_2023BC4 +_080EB270: .4byte gActiveBattler thumb_func_end sub_80EB238 thumb_func_start sub_80EB274 @@ -7437,7 +7437,7 @@ sub_80EB280: @ 80EB280 push {r4,lr} ldr r2, _080EB2C4 @ =gUnknown_2023E8A ldr r1, _080EB2C8 @ =gUnknown_2022BC4 - ldr r4, _080EB2CC @ =gUnknown_2023BC4 + ldr r4, _080EB2CC @ =gActiveBattler ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -7449,7 +7449,7 @@ sub_80EB280: @ 80EB280 movs r0, 0x3 bl BeginFastPaletteFade bl WallyBufferExecCompleted - ldr r0, _080EB2D0 @ =gUnknown_2022B4C + ldr r0, _080EB2D0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x6 ands r0, r1 @@ -7468,8 +7468,8 @@ _080EB2BC: .align 2, 0 _080EB2C4: .4byte gUnknown_2023E8A _080EB2C8: .4byte gUnknown_2022BC4 -_080EB2CC: .4byte gUnknown_2023BC4 -_080EB2D0: .4byte gUnknown_2022B4C +_080EB2CC: .4byte gActiveBattler +_080EB2D0: .4byte gBattleTypeFlags _080EB2D4: .4byte gUnknown_3004FE0 _080EB2D8: .4byte sub_80E7930 thumb_func_end sub_80EB280 @@ -7482,21 +7482,21 @@ nullsub_82: @ 80EB2DC thumb_func_start sub_80EB2E0 sub_80EB2E0: @ 80EB2E0 adds r1, r0, 0 - ldr r0, _080EB2F0 @ =gUnknown_2023FE8 + ldr r0, _080EB2F0 @ =gBattleStruct ldr r0, [r0] adds r0, 0x96 ldrb r0, [r0] ands r0, r1 bx lr .align 2, 0 -_080EB2F0: .4byte gUnknown_2023FE8 +_080EB2F0: .4byte gBattleStruct thumb_func_end sub_80EB2E0 thumb_func_start sub_80EB2F4 sub_80EB2F4: @ 80EB2F4 lsls r0, 24 lsrs r0, 24 - ldr r1, _080EB308 @ =gUnknown_2023FE8 + ldr r1, _080EB308 @ =gBattleStruct ldr r1, [r1] adds r1, 0x96 ldrb r2, [r1] @@ -7504,7 +7504,7 @@ sub_80EB2F4: @ 80EB2F4 strb r0, [r1] bx lr .align 2, 0 -_080EB308: .4byte gUnknown_2023FE8 +_080EB308: .4byte gBattleStruct thumb_func_end sub_80EB2F4 thumb_func_start sub_80EB30C |