diff options
86 files changed, 12681 insertions, 16148 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index 6df441371..c89d50d7f 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -246,7 +246,7 @@ sub_800F380: @ 800F380 adds r1, r5, 0 movs r2, 0x4 bl CpuSet - ldr r0, _0800F404 @ =gUnknown_2022B4C + ldr r0, _0800F404 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _0800F408 @ =0x00010010 ands r0, r1 @@ -276,7 +276,7 @@ _0800F3F4: .4byte 0x00002529 _0800F3F8: .4byte 0x00007fff _0800F3FC: .4byte 0x0000675a _0800F400: .4byte gUnknown_20376B0 -_0800F404: .4byte gUnknown_2022B4C +_0800F404: .4byte gBattleTypeFlags _0800F408: .4byte 0x00010010 thumb_func_end sub_800F380 @@ -342,7 +342,7 @@ sub_800F460: @ 800F460 lsrs r4, 24 mov r9, r4 movs r4, 0 - ldr r0, _0800F4B8 @ =gUnknown_2022B4C + ldr r0, _0800F4B8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -365,7 +365,7 @@ sub_800F460: @ 800F460 beq _0800F4CA b _0800F504 .align 2, 0 -_0800F4B8: .4byte gUnknown_2022B4C +_0800F4B8: .4byte gBattleTypeFlags _0800F4BC: .4byte gUnknown_3005090 _0800F4C0: cmp r5, 0x2 @@ -447,7 +447,7 @@ _0800F50E: .align 2, 0 _0800F544: .4byte 0x00006001 _0800F548: - ldr r0, _0800F564 @ =gUnknown_2023FE8 + ldr r0, _0800F564 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r0, [r0] @@ -461,7 +461,7 @@ _0800F548: ldrh r4, [r0, 0xE] b _0800F578 .align 2, 0 -_0800F564: .4byte gUnknown_2023FE8 +_0800F564: .4byte gBattleStruct _0800F568: .4byte gUnknown_3005090 _0800F56C: ldr r1, _0800F5C4 @ =gUnknown_3005090 @@ -529,7 +529,7 @@ sub_800F5CC: @ 800F5CC _0800F5E0: .4byte gUnknown_2023E8A _0800F5E4: .4byte gUnknown_83FE883 _0800F5E8: - ldr r0, _0800F61C @ =gUnknown_2022B4C + ldr r0, _0800F61C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -538,7 +538,7 @@ _0800F5E8: cmp r2, 0x1 bne _0800F632 ldr r2, _0800F620 @ =gUnknown_202273C - ldr r0, _0800F624 @ =gUnknown_2023FE8 + ldr r0, _0800F624 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r1, [r0] @@ -555,9 +555,9 @@ _0800F5E8: beq _0800F6BC b _0800F6F0 .align 2, 0 -_0800F61C: .4byte gUnknown_2022B4C +_0800F61C: .4byte gBattleTypeFlags _0800F620: .4byte gUnknown_202273C -_0800F624: .4byte gUnknown_2023FE8 +_0800F624: .4byte gBattleStruct _0800F628: cmp r0, 0x2 beq _0800F6BC @@ -566,7 +566,7 @@ _0800F628: b _0800F682 _0800F632: ldr r2, _0800F654 @ =gUnknown_202273C - ldr r0, _0800F658 @ =gUnknown_2023FE8 + ldr r0, _0800F658 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r1, [r0] @@ -584,7 +584,7 @@ _0800F632: b _0800F6F0 .align 2, 0 _0800F654: .4byte gUnknown_202273C -_0800F658: .4byte gUnknown_2023FE8 +_0800F658: .4byte gBattleStruct _0800F65C: cmp r0, 0x2 beq _0800F682 @@ -595,7 +595,7 @@ _0800F666: cmp r2, 0x1 bne _0800F6A4 ldr r2, _0800F694 @ =gUnknown_202273C - ldr r0, _0800F698 @ =gUnknown_2023FE8 + ldr r0, _0800F698 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r1, [r0] @@ -616,12 +616,12 @@ _0800F682: b _0800F6F0 .align 2, 0 _0800F694: .4byte gUnknown_202273C -_0800F698: .4byte gUnknown_2023FE8 +_0800F698: .4byte gBattleStruct _0800F69C: .4byte gUnknown_83FE874 _0800F6A0: .4byte gUnknown_83FE87B _0800F6A4: ldr r2, _0800F6D0 @ =gUnknown_202273C - ldr r0, _0800F6D4 @ =gUnknown_2023FE8 + ldr r0, _0800F6D4 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r1, [r0] @@ -642,7 +642,7 @@ _0800F6BC: b _0800F6F0 .align 2, 0 _0800F6D0: .4byte gUnknown_202273C -_0800F6D4: .4byte gUnknown_2023FE8 +_0800F6D4: .4byte gBattleStruct _0800F6D8: .4byte gUnknown_83FE874 _0800F6DC: .4byte gUnknown_83FE87B _0800F6E0: @@ -694,7 +694,7 @@ _0800F72C: _0800F732: b _0800FAC4 _0800F734: - ldr r0, _0800F75C @ =gUnknown_2022B4C + ldr r0, _0800F75C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -716,7 +716,7 @@ _0800F744: beq _0800F76E b _0800F7C2 .align 2, 0 -_0800F75C: .4byte gUnknown_2022B4C +_0800F75C: .4byte gBattleTypeFlags _0800F760: .4byte gUnknown_2022744 _0800F764: cmp r0, 0x2 @@ -773,7 +773,7 @@ _0800F7C2: bge _0800F744 b _0800F830 _0800F7CC: - ldr r0, _0800F844 @ =gUnknown_2023FE8 + ldr r0, _0800F844 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r5, [r0] @@ -831,7 +831,7 @@ _0800F830: strh r0, [r1, 0x8] b _0800FAC4 .align 2, 0 -_0800F844: .4byte gUnknown_2023FE8 +_0800F844: .4byte gBattleStruct _0800F848: .4byte gUnknown_202273C _0800F84C: .4byte gUnknown_3005090 _0800F850: @@ -853,7 +853,7 @@ _0800F850: movs r2, 0x50 movs r3, 0 bl CreateSprite - ldr r4, _0800F8E4 @ =gUnknown_2023FE8 + ldr r4, _0800F8E4 @ =gBattleStruct ldr r1, [r4] adds r1, 0x7D strb r0, [r1] @@ -900,7 +900,7 @@ _0800F8D4: .4byte 0x0000021e _0800F8D8: .4byte gUnknown_20375F8 _0800F8DC: .4byte 0x00007fff _0800F8E0: .4byte gUnknown_82482E8 -_0800F8E4: .4byte gUnknown_2023FE8 +_0800F8E4: .4byte gBattleStruct _0800F8E8: .4byte gUnknown_8248300 _0800F8EC: .4byte gSprites _0800F8F0: @@ -1042,7 +1042,7 @@ _0800FA08: adds r0, r7, 0 bl DestroyTask ldr r4, _0800FAD0 @ =gSprites - ldr r5, _0800FAD4 @ =gUnknown_2023FE8 + ldr r5, _0800FAD4 @ =gBattleStruct ldr r0, [r5] adds r0, 0x7D ldrb r0, [r0] @@ -1138,7 +1138,7 @@ _0800FAC4: bx r0 .align 2, 0 _0800FAD0: .4byte gSprites -_0800FAD4: .4byte gUnknown_2023FE8 +_0800FAD4: .4byte gBattleStruct _0800FAD8: .4byte 0x000003ff _0800FADC: .4byte 0xfffffc00 thumb_func_end sub_800F6FC @@ -1146,7 +1146,7 @@ _0800FADC: .4byte 0xfffffc00 thumb_func_start sub_800FAE0 sub_800FAE0: @ 800FAE0 push {r4,lr} - ldr r0, _0800FB64 @ =gUnknown_2022B4C + ldr r0, _0800FB64 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x2 ands r0, r1 @@ -1200,7 +1200,7 @@ sub_800FAE0: @ 800FAE0 bl sub_800F034 b _0800FC26 .align 2, 0 -_0800FB64: .4byte gUnknown_2022B4C +_0800FB64: .4byte gBattleTypeFlags _0800FB68: .4byte gUnknown_8E7737C _0800FB6C: .4byte 0x06004000 _0800FB70: .4byte gUnknown_8E77598 @@ -1250,8 +1250,8 @@ _0800FBD8: ands r1, r0 cmp r1, 0 beq _0800FC08 - ldr r2, _0800FC00 @ =gUnknown_823EAC8 - ldr r0, _0800FC04 @ =gUnknown_20386AE + ldr r2, _0800FC00 @ =gTrainers + ldr r0, _0800FC04 @ =gTrainerBattleOpponent_A ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -1267,8 +1267,8 @@ _0800FBF8: bl sub_800F2AC b _0800FC26 .align 2, 0 -_0800FC00: .4byte gUnknown_823EAC8 -_0800FC04: .4byte gUnknown_20386AE +_0800FC00: .4byte gTrainers +_0800FC04: .4byte gTrainerBattleOpponent_A _0800FC08: bl sav1_map_get_battletype lsls r0, 24 @@ -1292,7 +1292,7 @@ _0800FC26: thumb_func_start sub_800FC2C sub_800FC2C: @ 800FC2C push {lr} - ldr r0, _0800FC40 @ =gUnknown_2022B4C + ldr r0, _0800FC40 @ =gBattleTypeFlags ldr r1, [r0] ldr r2, _0800FC44 @ =0x00080902 ands r2, r1 @@ -1301,7 +1301,7 @@ sub_800FC2C: @ 800FC2C movs r0, 0xA b _0800FCAA .align 2, 0 -_0800FC40: .4byte gUnknown_2022B4C +_0800FC40: .4byte gBattleTypeFlags _0800FC44: .4byte 0x00080902 _0800FC48: movs r0, 0x80 @@ -1320,8 +1320,8 @@ _0800FC60: ands r1, r0 cmp r1, 0 beq _0800FC90 - ldr r2, _0800FC80 @ =gUnknown_823EAC8 - ldr r0, _0800FC84 @ =gUnknown_20386AE + ldr r2, _0800FC80 @ =gTrainers + ldr r0, _0800FC84 @ =gTrainerBattleOpponent_A ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -1333,8 +1333,8 @@ _0800FC60: movs r0, 0xC b _0800FCAA .align 2, 0 -_0800FC80: .4byte gUnknown_823EAC8 -_0800FC84: .4byte gUnknown_20386AE +_0800FC80: .4byte gTrainers +_0800FC84: .4byte gTrainerBattleOpponent_A _0800FC88: cmp r0, 0x5A bne _0800FC90 diff --git a/asm/battle_2.s b/asm/battle_2.s index 1f7b7bb78..3db6273b0 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -12,7 +12,7 @@ sub_800FD9C: @ 800FD9C bl sub_802E03C bl AllocateBattleSpritesData bl AllocateMonSpritesGfx - ldr r4, _0800FDCC @ =gUnknown_2022B4C + ldr r4, _0800FDCC @ =gBattleTypeFlags ldr r0, [r4] movs r1, 0x40 ands r0, r1 @@ -26,7 +26,7 @@ sub_800FD9C: @ 800FD9C strb r0, [r1] b _0800FE1C .align 2, 0 -_0800FDCC: .4byte gUnknown_2022B4C +_0800FDCC: .4byte gBattleTypeFlags _0800FDD0: .4byte sub_80109C8 _0800FDD4: .4byte gUnknown_2023E82 _0800FDD8: @@ -172,7 +172,7 @@ _0800FEA6: ldr r0, _0800FF6C @ =sub_80116F4 bl SetVBlankCallback bl sub_800D278 - ldr r0, _0800FF70 @ =gUnknown_2022B4C + ldr r0, _0800FF70 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -200,20 +200,20 @@ _0800FF60: .4byte gUnknown_2022982 _0800FF64: .4byte gUnknown_2022B50 _0800FF68: .4byte gReservedSpritePaletteCount _0800FF6C: .4byte sub_80116F4 -_0800FF70: .4byte gUnknown_2022B4C +_0800FF70: .4byte gBattleTypeFlags _0800FF74: .4byte sub_8010BA0 _0800FF78: ldr r0, _0800FFCC @ =sub_8010508 bl SetMainCallback2 _0800FF7E: - ldr r0, _0800FFD0 @ =gUnknown_2022B4C + ldr r0, _0800FFD0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 bne _0800FF98 - ldr r0, _0800FFD4 @ =gUnknown_202402C - ldr r1, _0800FFD8 @ =gUnknown_20386AE + ldr r0, _0800FFD4 @ =gEnemyParty + ldr r1, _0800FFD8 @ =gTrainerBattleOpponent_A ldrh r1, [r1] bl sub_80112E0 bl SetWildMonHeldItem @@ -225,7 +225,7 @@ _0800FF98: movs r2, 0x2 orrs r1, r2 strb r1, [r0] - ldr r4, _0800FFE4 @ =gUnknown_2024284 + ldr r4, _0800FFE4 @ =gPlayerParty movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 @@ -245,12 +245,12 @@ _0800FFAE: bx r0 .align 2, 0 _0800FFCC: .4byte sub_8010508 -_0800FFD0: .4byte gUnknown_2022B4C -_0800FFD4: .4byte gUnknown_202402C -_0800FFD8: .4byte gUnknown_20386AE +_0800FFD0: .4byte gBattleTypeFlags +_0800FFD4: .4byte gEnemyParty +_0800FFD8: .4byte gTrainerBattleOpponent_A _0800FFDC: .4byte gMain _0800FFE0: .4byte 0x00000439 -_0800FFE4: .4byte gUnknown_2024284 +_0800FFE4: .4byte gPlayerParty _0800FFE8: .4byte gUnknown_2023E82 thumb_func_end sub_800FE24 @@ -271,7 +271,7 @@ _08010002: movs r0, 0x64 mov r4, r9 muls r4, r0 - ldr r0, _080100B0 @ =gUnknown_2024284 + ldr r0, _080100B0 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -338,7 +338,7 @@ _0801007E: mov r2, r9 cmp r2, 0x5 ble _08010002 - ldr r1, _080100B4 @ =gUnknown_2023FE8 + ldr r1, _080100B4 @ =gBattleStruct ldr r0, [r1] movs r2, 0xC3 lsls r2, 1 @@ -357,14 +357,14 @@ _0801007E: pop {r0} bx r0 .align 2, 0 -_080100B0: .4byte gUnknown_2024284 -_080100B4: .4byte gUnknown_2023FE8 +_080100B0: .4byte gPlayerParty +_080100B4: .4byte gBattleStruct thumb_func_end sub_800FFEC thumb_func_start sub_80100B8 sub_80100B8: @ 80100B8 push {r4-r7,lr} - ldr r0, _08010120 @ =gUnknown_2023FE8 + ldr r0, _08010120 @ =gBattleStruct ldr r5, [r0] movs r0, 0xC4 lsls r0, 1 @@ -417,7 +417,7 @@ _080100FA: ldrb r0, [r0] b _08010174 .align 2, 0 -_08010120: .4byte gUnknown_2023FE8 +_08010120: .4byte gBattleStruct _08010124: .4byte gSaveBlock1Ptr _08010128: .4byte 0x000030ec _0801012C: .4byte 0x00003108 @@ -469,7 +469,7 @@ sub_801017C: @ 801017C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08010234 @ =gUnknown_2022B4C + ldr r0, _08010234 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x2 ands r0, r1 @@ -559,7 +559,7 @@ _080101EC: strb r1, [r0] b _080103FC .align 2, 0 -_08010234: .4byte gUnknown_2022B4C +_08010234: .4byte gBattleTypeFlags _08010238: .4byte gUnknown_2023F54 _0801023C: .4byte gSaveBlock1Ptr _08010240: .4byte 0x000030ec @@ -819,15 +819,15 @@ sub_8010414: @ 8010414 bne _08010458 cmp r3, 0 bne _08010448 - ldr r0, _08010444 @ =gUnknown_2022B4C + ldr r0, _08010444 @ =gBattleTypeFlags ldr r1, [r0] movs r2, 0xC b _0801044E .align 2, 0 _08010440: .4byte gUnknown_2022118 -_08010444: .4byte gUnknown_2022B4C +_08010444: .4byte gBattleTypeFlags _08010448: - ldr r0, _0801048C @ =gUnknown_2022B4C + ldr r0, _0801048C @ =gBattleTypeFlags ldr r1, [r0] movs r2, 0x8 _0801044E: @@ -861,15 +861,15 @@ _0801047C: bne _080104A4 cmp r3, 0 bne _08010494 - ldr r0, _0801048C @ =gUnknown_2022B4C + ldr r0, _0801048C @ =gBattleTypeFlags ldr r1, [r0] movs r2, 0xC b _0801049A .align 2, 0 -_0801048C: .4byte gUnknown_2022B4C +_0801048C: .4byte gBattleTypeFlags _08010490: .4byte gUnknown_2022118 _08010494: - ldr r0, _080104EC @ =gUnknown_2022B4C + ldr r0, _080104EC @ =gBattleTypeFlags ldr r1, [r0] movs r2, 0x8 _0801049A: @@ -882,7 +882,7 @@ _080104A4: cmp r6, 0 bne _080104FC movs r2, 0 - ldr r5, _080104EC @ =gUnknown_2022B4C + ldr r5, _080104EC @ =gBattleTypeFlags cmp r2, r4 bge _080104E2 mov r0, r12 @@ -920,7 +920,7 @@ _080104E2: movs r1, 0xC b _080104F8 .align 2, 0 -_080104EC: .4byte gUnknown_2022B4C +_080104EC: .4byte gBattleTypeFlags _080104F0: .4byte 0x00000201 _080104F4: ldr r0, [r5] @@ -945,7 +945,7 @@ sub_8010508: @ 8010508 bl GetMultiplayerId lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08010540 @ =gUnknown_2023FE8 + ldr r0, _08010540 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 strb r4, [r0] @@ -964,7 +964,7 @@ _08010536: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08010540: .4byte gUnknown_2023FE8 +_08010540: .4byte gBattleStruct _08010544: .4byte gUnknown_2023E82 _08010548: .4byte _0801054C .align 2, 0 @@ -1016,7 +1016,7 @@ _080105C6: _080105CC: .4byte gUnknown_2023E82 _080105D0: .4byte gUnknown_3003F3C _080105D4: - ldr r2, _08010640 @ =gUnknown_2022B4C + ldr r2, _08010640 @ =gBattleTypeFlags ldr r1, [r2] movs r6, 0x2 adds r0, r1, 0 @@ -1033,7 +1033,7 @@ _080105EC: lsls r0, 24 cmp r0, 0 beq _0801062A - ldr r4, _08010648 @ =gUnknown_2023FE8 + ldr r4, _08010648 @ =gBattleStruct ldr r0, [r4] movs r5, 0xC2 lsls r5, 1 @@ -1067,9 +1067,9 @@ _08010634: bl sub_80FCD74 b _080108B8 .align 2, 0 -_08010640: .4byte gUnknown_2022B4C +_08010640: .4byte gBattleTypeFlags _08010644: .4byte gUnknown_3003F64 -_08010648: .4byte gUnknown_2023FE8 +_08010648: .4byte gBattleStruct _0801064C: .4byte 0x00000185 _08010650: .4byte gUnknown_2023E82 _08010654: .4byte gUnknown_3003F3C @@ -1114,7 +1114,7 @@ _0801067E: movs r0, 0x5A strh r0, [r2, 0xC] strh r1, [r2, 0x12] - ldr r0, _080106E8 @ =gUnknown_2023FE8 + ldr r0, _080106E8 @ =gBattleStruct ldr r3, [r0] movs r4, 0xC3 lsls r4, 1 @@ -1138,7 +1138,7 @@ _0801067E: .align 2, 0 _080106E0: .4byte sub_800F6FC _080106E4: .4byte gUnknown_3005090 -_080106E8: .4byte gUnknown_2023FE8 +_080106E8: .4byte gBattleStruct _080106EC: .4byte gUnknown_2022118 _080106F0: .4byte gUnknown_2023E82 _080106F4: @@ -1151,13 +1151,13 @@ _08010700: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08010714 @ =gUnknown_2024284 + ldr r1, _08010714 @ =gPlayerParty movs r2, 0xC8 bl SendBlock ldr r1, _08010718 @ =gUnknown_2023E82 b _080108B2 .align 2, 0 -_08010714: .4byte gUnknown_2024284 +_08010714: .4byte gPlayerParty _08010718: .4byte gUnknown_2023E82 _0801071C: bl GetBlockReceivedStatus @@ -1168,7 +1168,7 @@ _0801071C: b _080108B8 _0801072A: bl ResetBlockReceivedFlags - ldr r0, _08010740 @ =gUnknown_202402C + ldr r0, _08010740 @ =gEnemyParty lsls r1, r5, 8 ldr r2, _08010744 @ =gUnknown_2022118 adds r1, r2 @@ -1177,7 +1177,7 @@ _0801072A: ldr r1, _08010748 @ =gUnknown_2023E82 b _080108B2 .align 2, 0 -_08010740: .4byte gUnknown_202402C +_08010740: .4byte gEnemyParty _08010744: .4byte gUnknown_2022118 _08010748: .4byte gUnknown_2023E82 _0801074C: @@ -1303,7 +1303,7 @@ _0801084C: str r0, [r1] ldr r0, _08010890 @ =sub_8011100 bl SetMainCallback2 - ldr r2, _08010894 @ =gUnknown_2022B4C + ldr r2, _08010894 @ =gBattleTypeFlags ldr r1, [r2] movs r0, 0x2 ands r0, r1 @@ -1319,7 +1319,7 @@ _08010884: .4byte gUnknown_3004F80 _08010888: .4byte gMain _0801088C: .4byte sub_80123E4 _08010890: .4byte sub_8011100 -_08010894: .4byte gUnknown_2022B4C +_08010894: .4byte gBattleTypeFlags _08010898: ldr r0, _080108C0 @ =gUnknown_2023E82 ldrb r1, [r0] @@ -1365,7 +1365,7 @@ _080108DC: movs r0, 0x64 mov r4, r8 muls r4, r0 - ldr r0, _080109C0 @ =gUnknown_2024284 + ldr r0, _080109C0 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -1451,7 +1451,7 @@ _08010994: mov r8, r4 cmp r4, 0x2 ble _080108DC - ldr r0, _080109C4 @ =gUnknown_2023FE8 + ldr r0, _080109C4 @ =gBattleStruct ldr r0, [r0] movs r1, 0xC2 lsls r1, 1 @@ -1468,8 +1468,8 @@ _08010994: bx r0 .align 2, 0 _080109BC: .4byte gUnknown_2022B58 -_080109C0: .4byte gUnknown_2024284 -_080109C4: .4byte gUnknown_2023FE8 +_080109C0: .4byte gPlayerParty +_080109C4: .4byte gBattleStruct thumb_func_end sub_80108C4 thumb_func_start sub_80109C8 @@ -1481,7 +1481,7 @@ sub_80109C8: @ 80109C8 bl GetMultiplayerId lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _08010A0C @ =gUnknown_2023FE8 + ldr r4, _08010A0C @ =gBattleStruct ldr r0, [r4] adds r0, 0xB5 strb r6, [r0] @@ -1504,7 +1504,7 @@ sub_80109C8: @ 80109C8 beq _08010A20 b _08010B82 .align 2, 0 -_08010A0C: .4byte gUnknown_2023FE8 +_08010A0C: .4byte gBattleStruct _08010A10: .4byte gUnknown_2023E82 _08010A14: cmp r0, 0x2 @@ -1604,7 +1604,7 @@ _08010ABA: ldr r0, [r1, 0x8] mov r2, r9 str r0, [r2] - ldr r0, _08010AF4 @ =gUnknown_2022B4C + ldr r0, _08010AF4 @ =gBattleTypeFlags ldr r0, [r0] mov r2, r8 strh r0, [r2] @@ -1617,7 +1617,7 @@ _08010AE4: .4byte gUnknown_2022118 _08010AE8: .4byte gUnknown_2022B58 _08010AEC: .4byte gUnknown_2023E82 _08010AF0: .4byte gMain -_08010AF4: .4byte gUnknown_2022B4C +_08010AF4: .4byte gBattleTypeFlags _08010AF8: .4byte sub_80109C8 _08010AFC: ldr r0, _08010B1C @ =gUnknown_2037AB8 @@ -1649,7 +1649,7 @@ _08010B2A: lsls r0, 24 cmp r0, 0 beq _08010B82 - ldr r1, _08010B58 @ =gUnknown_2022B4C + ldr r1, _08010B58 @ =gBattleTypeFlags mov r2, r8 ldrh r0, [r2] str r0, [r1] @@ -1662,7 +1662,7 @@ _08010B2A: b _08010B82 .align 2, 0 _08010B54: .4byte gUnknown_3003F3C -_08010B58: .4byte gUnknown_2022B4C +_08010B58: .4byte gBattleTypeFlags _08010B5C: .4byte gMain _08010B60: .4byte sub_800FE24 _08010B64: @@ -1670,7 +1670,7 @@ _08010B64: ldrb r0, [r0] cmp r0, 0 bne _08010B82 - ldr r1, _08010B94 @ =gUnknown_2022B4C + ldr r1, _08010B94 @ =gBattleTypeFlags mov r2, r8 ldrh r0, [r2] str r0, [r1] @@ -1689,7 +1689,7 @@ _08010B82: bx r0 .align 2, 0 _08010B90: .4byte gUnknown_3003F64 -_08010B94: .4byte gUnknown_2022B4C +_08010B94: .4byte gBattleTypeFlags _08010B98: .4byte gMain _08010B9C: .4byte sub_800FE24 thumb_func_end sub_80109C8 @@ -1702,7 +1702,7 @@ sub_8010BA0: @ 8010BA0 bl GetMultiplayerId lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08010BD8 @ =gUnknown_2023FE8 + ldr r0, _08010BD8 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 strb r7, [r0] @@ -1721,7 +1721,7 @@ _08010BCC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08010BD8: .4byte gUnknown_2023FE8 +_08010BD8: .4byte gBattleStruct _08010BDC: .4byte gUnknown_2023E82 _08010BE0: .4byte _08010BE4 .align 2, 0 @@ -1779,7 +1779,7 @@ _08010C66: lsls r0, 24 cmp r0, 0 beq _08010CAA - ldr r4, _08010CC4 @ =gUnknown_2023FE8 + ldr r4, _08010CC4 @ =gBattleStruct ldr r0, [r4] movs r5, 0xC2 lsls r5, 1 @@ -1817,7 +1817,7 @@ _08010CB4: b _080110F0 .align 2, 0 _08010CC0: .4byte gUnknown_3003F64 -_08010CC4: .4byte gUnknown_2023FE8 +_08010CC4: .4byte gBattleStruct _08010CC8: .4byte 0x00000185 _08010CCC: .4byte gUnknown_2023E82 _08010CD0: .4byte gUnknown_3003F3C @@ -1836,7 +1836,7 @@ _08010CE2: bl sub_801017C bl sub_8044708 ldr r0, _08010D4C @ =gUnknown_201C000 - ldr r1, _08010D50 @ =gUnknown_2024284 + ldr r1, _08010D50 @ =gPlayerParty movs r2, 0x96 lsls r2, 1 bl memcpy @@ -1878,7 +1878,7 @@ _08010D3A: b _08010D9C .align 2, 0 _08010D4C: .4byte gUnknown_201C000 -_08010D50: .4byte gUnknown_2024284 +_08010D50: .4byte gPlayerParty _08010D54: .4byte sub_800F6FC _08010D58: .4byte gUnknown_3005090 _08010D5C: .4byte gUnknown_2022118 @@ -1984,10 +1984,10 @@ _08010E20: cmp r0, 0x3 bne _08010EBE _08010E24: - ldr r0, _08010E28 @ =gUnknown_2024284 + ldr r0, _08010E28 @ =gPlayerParty b _08010EA4 .align 2, 0 -_08010E28: .4byte gUnknown_2024284 +_08010E28: .4byte gPlayerParty _08010E2C: ldr r0, _08010E30 @ =gUnknown_20243B0 b _08010EA4 @@ -2034,10 +2034,10 @@ _08010E78: cmp r2, 0x3 bne _08010EBE _08010E7C: - ldr r0, _08010E80 @ =gUnknown_2024284 + ldr r0, _08010E80 @ =gPlayerParty b _08010EA4 .align 2, 0 -_08010E80: .4byte gUnknown_2024284 +_08010E80: .4byte gPlayerParty _08010E84: ldr r0, _08010E88 @ =gUnknown_20243B0 b _08010EA4 @@ -2057,14 +2057,14 @@ _08010E9E: cmp r2, 0x3 bne _08010EBE _08010EA2: - ldr r0, _08010EB0 @ =gUnknown_202402C + ldr r0, _08010EB0 @ =gEnemyParty _08010EA4: adds r1, r4, 0 movs r2, 0xC8 bl memcpy b _08010EBE .align 2, 0 -_08010EB0: .4byte gUnknown_202402C +_08010EB0: .4byte gEnemyParty _08010EB4: ldr r0, _08010ED0 @ =gUnknown_2024158 adds r1, r4, 0 @@ -2231,7 +2231,7 @@ _08010FDE: adds r6, 0x1 cmp r6, 0x3 ble _08010F20 - ldr r4, _08011060 @ =gUnknown_2024284 + ldr r4, _08011060 @ =gPlayerParty adds r0, r4, 0 bl sub_8011D0C adds r0, r4, 0 @@ -2252,7 +2252,7 @@ _08010FDE: lsls r1, 1 adds r0, r4, r1 bl sub_8011D0C - ldr r4, _08011064 @ =gUnknown_202402C + ldr r4, _08011064 @ =gEnemyParty adds r0, r4, 0 bl sub_8011D0C adds r0, r4, 0 @@ -2277,8 +2277,8 @@ _08010FDE: b _080110EA .align 2, 0 _0801105C: .4byte gUnknown_2024220 -_08011060: .4byte gUnknown_2024284 -_08011064: .4byte gUnknown_202402C +_08011060: .4byte gPlayerParty +_08011064: .4byte gEnemyParty _08011068: .4byte gUnknown_2023E82 _0801106C: bl sub_800D30C @@ -2307,7 +2307,7 @@ _08011084: str r0, [r1] ldr r0, _080110C8 @ =sub_8011100 bl SetMainCallback2 - ldr r2, _080110CC @ =gUnknown_2022B4C + ldr r2, _080110CC @ =gBattleTypeFlags ldr r1, [r2] movs r0, 0x2 ands r0, r1 @@ -2323,7 +2323,7 @@ _080110BC: .4byte gUnknown_3004F80 _080110C0: .4byte gMain _080110C4: .4byte sub_80123E4 _080110C8: .4byte sub_8011100 -_080110CC: .4byte gUnknown_2022B4C +_080110CC: .4byte gBattleTypeFlags _080110D0: ldr r0, _080110FC @ =gUnknown_2023E82 ldrb r1, [r0] @@ -2368,7 +2368,7 @@ sub_8011100: @ 8011100 ands r0, r1 cmp r0, 0 beq _08011158 - ldr r0, _08011164 @ =gUnknown_2022B4C + ldr r0, _08011164 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 9 @@ -2397,7 +2397,7 @@ _08011158: bx r0 .align 2, 0 _08011160: .4byte gMain -_08011164: .4byte gUnknown_2022B4C +_08011164: .4byte gBattleTypeFlags _08011168: .4byte gUnknown_20370D0 _0801116C: .4byte gUnknown_2023E8A _08011170: .4byte CB2_QuitRecordedBattle @@ -2607,7 +2607,7 @@ sub_80112E0: @ 80112E0 movs r0, 0 b _080116AC _08011304: - ldr r0, _08011334 @ =gUnknown_2022B4C + ldr r0, _08011334 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _08011338 @ =0x00080908 ands r0, r1 @@ -2621,7 +2621,7 @@ _08011318: bl ZeroEnemyPartyMons movs r2, 0 str r2, [sp, 0x18] - ldr r2, _0801133C @ =gUnknown_823EAC8 + ldr r2, _0801133C @ =gTrainers ldr r1, [sp, 0x20] ldr r3, [sp, 0x14] adds r0, r1, r3 @@ -2631,9 +2631,9 @@ _08011318: ldr r4, [sp, 0x18] b _0801167E .align 2, 0 -_08011334: .4byte gUnknown_2022B4C +_08011334: .4byte gBattleTypeFlags _08011338: .4byte 0x00080908 -_0801133C: .4byte gUnknown_823EAC8 +_0801133C: .4byte gTrainers _08011340: ldr r3, [sp, 0x14] adds r0, r1, r3 @@ -2657,7 +2657,7 @@ _08011354: mov r10, r2 _08011366: movs r6, 0 - ldr r0, _080113BC @ =gUnknown_823EAC8 + ldr r0, _080113BC @ =gTrainers ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] adds r1, r2, r3 @@ -2701,7 +2701,7 @@ _0801139E: beq _080113CE b _0801166C .align 2, 0 -_080113BC: .4byte gUnknown_823EAC8 +_080113BC: .4byte gTrainers _080113C0: cmp r0, 0x2 bne _080113C6 @@ -3049,7 +3049,7 @@ _08011642: _0801166C: ldr r4, [sp, 0x1C] str r4, [sp, 0x18] - ldr r2, _080116C4 @ =gUnknown_823EAC8 + ldr r2, _080116C4 @ =gTrainers ldr r1, [sp, 0x20] ldr r3, [sp, 0x14] adds r0, r1, r3 @@ -3062,8 +3062,8 @@ _0801167E: bge _08011686 b _08011340 _08011686: - ldr r2, _080116C8 @ =gUnknown_2022B4C - ldr r1, _080116C4 @ =gUnknown_823EAC8 + ldr r2, _080116C8 @ =gBattleTypeFlags + ldr r1, _080116C4 @ =gTrainers ldr r4, [sp, 0x20] ldr r3, [sp, 0x14] adds r0, r4, r3 @@ -3074,7 +3074,7 @@ _08011686: orrs r0, r1 str r0, [r2] _0801169C: - ldr r0, _080116C4 @ =gUnknown_823EAC8 + ldr r0, _080116C4 @ =gTrainers ldr r4, [sp, 0x20] ldr r2, [sp, 0x14] adds r1, r4, r2 @@ -3094,8 +3094,8 @@ _080116AC: .align 2, 0 _080116BC: .4byte gUnknown_8245EE0 _080116C0: .4byte gUnknown_8250C08 -_080116C4: .4byte gUnknown_823EAC8 -_080116C8: .4byte gUnknown_2022B4C +_080116C4: .4byte gTrainers +_080116C8: .4byte gBattleTypeFlags thumb_func_end sub_80112E0 thumb_func_start sub_80116CC @@ -3290,11 +3290,11 @@ sub_801184C: @ 801184C str r0, [sp, 0x4] movs r1, 0 str r1, [sp, 0x8] - ldr r0, _08011894 @ =gUnknown_2023FE8 + ldr r0, _08011894 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r2, [r0] - ldr r0, _08011898 @ =gUnknown_2022B4C + ldr r0, _08011898 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -3314,8 +3314,8 @@ sub_801184C: @ 801184C beq _080118BC b _080118C4 .align 2, 0 -_08011894: .4byte gUnknown_2023FE8 -_08011898: .4byte gUnknown_2022B4C +_08011894: .4byte gBattleStruct +_08011898: .4byte gBattleTypeFlags _0801189C: .4byte gUnknown_202273C _080118A0: cmp r0, 0x2 @@ -3323,18 +3323,18 @@ _080118A0: cmp r0, 0x3 bne _080118C4 _080118A8: - ldr r0, _080118B4 @ =gUnknown_202402C + ldr r0, _080118B4 @ =gEnemyParty str r0, [sp, 0x4] - ldr r1, _080118B8 @ =gUnknown_2024284 + ldr r1, _080118B8 @ =gPlayerParty str r1, [sp, 0x8] b _080118C4 .align 2, 0 -_080118B4: .4byte gUnknown_202402C -_080118B8: .4byte gUnknown_2024284 +_080118B4: .4byte gEnemyParty +_080118B8: .4byte gPlayerParty _080118BC: - ldr r2, _08011A10 @ =gUnknown_2024284 + ldr r2, _08011A10 @ =gPlayerParty str r2, [sp, 0x4] - ldr r3, _08011A14 @ =gUnknown_202402C + ldr r3, _08011A14 @ =gEnemyParty str r3, [sp, 0x8] _080118C4: movs r7, 0 @@ -3507,8 +3507,8 @@ _080119E2: pop {r0} bx r0 .align 2, 0 -_08011A10: .4byte gUnknown_2024284 -_08011A14: .4byte gUnknown_202402C +_08011A10: .4byte gPlayerParty +_08011A14: .4byte gEnemyParty _08011A18: .4byte gUnknown_3005090 thumb_func_end sub_801184C @@ -4087,7 +4087,7 @@ _08011EC8: mov r0, r9 ldrh r4, [r0, 0x32] _08011ECC: - ldr r1, _08011F34 @ =gUnknown_2023BCE + ldr r1, _08011F34 @ =gBattlerPartyIndexes lsls r0, r6, 1 adds r5, r0, r1 ldrh r0, [r5] @@ -4096,7 +4096,7 @@ _08011ECC: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r7, _08011F38 @ =gUnknown_202402C + ldr r7, _08011F38 @ =gEnemyParty adds r0, r7 movs r1, 0 bl GetMonData @@ -4136,8 +4136,8 @@ _08011ECC: movs r0, 0xC9 b _08011F46 .align 2, 0 -_08011F34: .4byte gUnknown_2023BCE -_08011F38: .4byte gUnknown_202402C +_08011F34: .4byte gBattlerPartyIndexes +_08011F38: .4byte gEnemyParty _08011F3C: movs r1, 0xCE lsls r1, 1 @@ -4796,7 +4796,7 @@ sub_80123E4: @ 80123E4 ldr r0, _08012424 @ =gUnknown_3004F84 ldr r0, [r0] bl _call_via_r0 - ldr r1, _08012428 @ =gUnknown_2023BC4 + ldr r1, _08012428 @ =gActiveBattler movs r0, 0 strb r0, [r1] ldr r0, _0801242C @ =gUnknown_2023BCC @@ -4826,7 +4826,7 @@ _0801241E: bx r0 .align 2, 0 _08012424: .4byte gUnknown_3004F84 -_08012428: .4byte gUnknown_2023BC4 +_08012428: .4byte gActiveBattler _0801242C: .4byte gUnknown_2023BCC _08012430: .4byte gUnknown_3004FE0 thumb_func_end sub_80123E4 @@ -4849,14 +4849,14 @@ sub_8012434: @ 8012434 mov r12, r1 ldr r0, _080126D4 @ =gUnknown_2023DA0 mov r9, r0 - ldr r1, _080126D8 @ =gUnknown_2023D98 + ldr r1, _080126D8 @ =gLastUsedMove mov r8, r1 - ldr r4, _080126DC @ =gUnknown_2023E0C + ldr r4, _080126DC @ =gDisableStructs movs r5, 0 ldr r7, _080126E0 @ =gUnknown_2023D90 ldr r6, _080126E4 @ =gUnknown_2023DB8 _08012464: - ldr r0, _080126E8 @ =gUnknown_2023DFC + ldr r0, _080126E8 @ =gStatuses3 adds r0, r5, r0 str r3, [r0] movs r1, 0 @@ -4885,7 +4885,7 @@ _0801246C: strb r0, [r1] strh r3, [r6] strh r3, [r7] - ldr r1, _080126F4 @ =gUnknown_2023FF4 + ldr r1, _080126F4 @ =gBattleResources ldr r0, [r1] ldr r0, [r0, 0x4] adds r0, r5 @@ -4904,7 +4904,7 @@ _0801246C: ble _08012464 movs r5, 0 ldr r3, _080126F8 @ =gUnknown_2023DE4 - ldr r4, _080126FC @ =gUnknown_2023DDE + ldr r4, _080126FC @ =gSideAffecting movs r2, 0x1 _080124C6: strh r5, [r4] @@ -4921,11 +4921,11 @@ _080124CA: cmp r2, 0 bge _080124C6 movs r1, 0 - ldr r2, _08012700 @ =gUnknown_2023D6B + ldr r2, _08012700 @ =sBattler_AI strb r1, [r2] - ldr r0, _08012704 @ =gUnknown_2023D6C + ldr r0, _08012704 @ =gBattlerTarget strb r1, [r0] - ldr r2, _08012708 @ =gUnknown_2023F1C + ldr r2, _08012708 @ =gBattleWeather strh r1, [r2] ldr r1, _0801270C @ =gUnknown_2023F20 movs r2, 0 @@ -4939,7 +4939,7 @@ _080124F2: movs r0, 0 ldr r1, _08012710 @ =gUnknown_2023DD0 str r0, [r1] - ldr r2, _08012714 @ =gUnknown_2022B4C + ldr r2, _08012714 @ =gBattleTypeFlags ldr r0, [r2] ldr r1, _08012718 @ =0x00010002 ands r0, r1 @@ -4962,7 +4962,7 @@ _08012522: lsls r0, 30 lsrs r0, 31 movs r1, 0 - ldr r2, _08012720 @ =gUnknown_2023FC4 + ldr r2, _08012720 @ =gBattleScripting strb r0, [r2, 0x1D] ldr r0, _08012724 @ =gUnknown_2023D72 strb r1, [r0] @@ -4973,7 +4973,7 @@ _08012522: movs r2, 0 ldr r0, _08012730 @ =gUnknown_2023E7E strh r1, [r0] - ldr r1, _080126F4 @ =gUnknown_2023FF4 + ldr r1, _080126F4 @ =gBattleResources ldr r0, [r1] ldr r0, [r0, 0x8] adds r0, 0x20 @@ -4995,19 +4995,19 @@ _0801255C: ldr r0, _08012738 @ =gUnknown_2023E7C strh r2, [r0] movs r0, 0 - ldr r1, _0801273C @ =gUnknown_2023D50 + ldr r1, _0801273C @ =gBattleMoveDamage str r0, [r1] ldr r2, _08012740 @ =gUnknown_2023F4C strh r0, [r2] mov r1, r9 - ldr r0, _08012720 @ =gUnknown_2023FC4 + ldr r0, _08012720 @ =gBattleScripting strb r1, [r0, 0x18] strb r1, [r0, 0x19] ldr r2, _08012744 @ =gUnknown_3004FD4 strb r1, [r2] - ldr r0, _08012748 @ =gUnknown_2023D70 + ldr r0, _08012748 @ =gAbsentBattlerFlags strb r1, [r0] - ldr r7, _0801274C @ =gUnknown_2023FE8 + ldr r7, _0801274C @ =gBattleStruct ldr r0, [r7] adds r0, 0x6C strb r1, [r0] @@ -5017,12 +5017,12 @@ _0801255C: ldr r0, [r7] adds r0, 0x7A strb r1, [r0] - ldr r0, _08012750 @ =gUnknown_202402C + ldr r0, _08012750 @ =gEnemyParty movs r1, 0xB bl GetMonData ldr r4, [r7] adds r4, 0x7C - ldr r1, _08012754 @ =gUnknown_8254784 + ldr r1, _08012754 @ =gBaseStats mov r8, r1 lsls r1, r0, 3 subs r1, r0 @@ -5035,7 +5035,7 @@ _0801255C: adds r1, r6, 0 bl __divsi3 strb r0, [r4] - ldr r0, _08012750 @ =gUnknown_202402C + ldr r0, _08012750 @ =gEnemyParty movs r1, 0xB bl GetMonData ldr r4, [r7] @@ -5067,7 +5067,7 @@ _080125F2: strb r1, [r0] movs r2, 0 adds r4, r7, 0 - ldr r5, _0801275C @ =gUnknown_3004F90 + ldr r5, _0801275C @ =gBattleResults adds r3, r4, 0 movs r1, 0 _0801260A: @@ -5117,7 +5117,7 @@ _0801260A: adds r0, 0xDF movs r1, 0 strb r1, [r0] - ldr r0, _0801275C @ =gUnknown_3004F90 + ldr r0, _0801275C @ =gBattleResults movs r1, 0 movs r2, 0xA adds r0, 0x40 @@ -5174,40 +5174,40 @@ _080126AE: _080126CC: .4byte gUnknown_2023DB0 _080126D0: .4byte gUnknown_2023DA8 _080126D4: .4byte gUnknown_2023DA0 -_080126D8: .4byte gUnknown_2023D98 -_080126DC: .4byte gUnknown_2023E0C +_080126D8: .4byte gLastUsedMove +_080126DC: .4byte gDisableStructs _080126E0: .4byte gUnknown_2023D90 _080126E4: .4byte gUnknown_2023DB8 -_080126E8: .4byte gUnknown_2023DFC +_080126E8: .4byte gStatuses3 _080126EC: .4byte gUnknown_2023DD4 _080126F0: .4byte gUnknown_2023DC0 -_080126F4: .4byte gUnknown_2023FF4 +_080126F4: .4byte gBattleResources _080126F8: .4byte gUnknown_2023DE4 -_080126FC: .4byte gUnknown_2023DDE -_08012700: .4byte gUnknown_2023D6B -_08012704: .4byte gUnknown_2023D6C -_08012708: .4byte gUnknown_2023F1C +_080126FC: .4byte gSideAffecting +_08012700: .4byte sBattler_AI +_08012704: .4byte gBattlerTarget +_08012708: .4byte gBattleWeather _0801270C: .4byte gUnknown_2023F20 _08012710: .4byte gUnknown_2023DD0 -_08012714: .4byte gUnknown_2022B4C +_08012714: .4byte gBattleTypeFlags _08012718: .4byte 0x00010002 _0801271C: .4byte gSaveBlock2Ptr -_08012720: .4byte gUnknown_2023FC4 +_08012720: .4byte gBattleScripting _08012724: .4byte gUnknown_2023D72 _08012728: .4byte gUnknown_2023E8A _0801272C: .4byte gUnknown_2023BC8 _08012730: .4byte gUnknown_2023E7E _08012734: .4byte gUnknown_2023E82 _08012738: .4byte gUnknown_2023E7C -_0801273C: .4byte gUnknown_2023D50 +_0801273C: .4byte gBattleMoveDamage _08012740: .4byte gUnknown_2023F4C _08012744: .4byte gUnknown_3004FD4 -_08012748: .4byte gUnknown_2023D70 -_0801274C: .4byte gUnknown_2023FE8 -_08012750: .4byte gUnknown_202402C -_08012754: .4byte gUnknown_8254784 +_08012748: .4byte gAbsentBattlerFlags +_0801274C: .4byte gBattleStruct +_08012750: .4byte gEnemyParty +_08012754: .4byte gBaseStats _08012758: .4byte 0x000004fb -_0801275C: .4byte gUnknown_3004F90 +_0801275C: .4byte gBattleResults thumb_func_end sub_8012434 thumb_func_start sub_8012760 @@ -5218,8 +5218,8 @@ sub_8012760: @ 8012760 mov r5, r8 push {r5-r7} sub sp, 0x1C - ldr r4, _080128C4 @ =gUnknown_2023E0C - ldr r5, _080128C8 @ =gUnknown_2023BC4 + ldr r4, _080128C4 @ =gDisableStructs + ldr r5, _080128C8 @ =gActiveBattler ldrb r1, [r5] lsls r0, r1, 3 subs r0, r1 @@ -5232,8 +5232,8 @@ sub_8012760: @ 8012760 stm r1!, {r2,r3,r7} ldr r0, [r0] str r0, [r1] - ldr r2, _080128CC @ =gUnknown_8250C04 - ldr r3, _080128D0 @ =gUnknown_2023D4A + ldr r2, _080128CC @ =gBattleMoves + ldr r3, _080128D0 @ =gCurrentMove ldrh r1, [r3] lsls r0, r1, 1 adds r0, r1 @@ -5242,14 +5242,14 @@ sub_8012760: @ 8012760 ldrb r0, [r0] mov r9, r4 mov r12, r5 - ldr r6, _080128D4 @ =gUnknown_2023DFC + ldr r6, _080128D4 @ =gStatuses3 mov r10, r6 cmp r0, 0x7F beq _08012838 movs r5, 0 mov r4, r12 movs r3, 0x58 - ldr r2, _080128D8 @ =gUnknown_2023BE4 + ldr r2, _080128D8 @ =gBattleMons adds r2, 0x18 movs r1, 0x6 _080127B0: @@ -5268,8 +5268,8 @@ _080127B0: bge _08012824 ldr r0, _080128E0 @ =gUnknown_2023C34 mov r8, r0 - ldr r3, _080128C4 @ =gUnknown_2023E0C - ldr r4, _080128D4 @ =gUnknown_2023DFC + ldr r3, _080128C4 @ =gDisableStructs + ldr r4, _080128D4 @ =gStatuses3 _080127D2: movs r0, 0x58 muls r0, r5 @@ -5282,7 +5282,7 @@ _080127D2: cmp r0, 0 beq _080127F6 ldrb r0, [r3, 0x14] - ldr r6, _080128C8 @ =gUnknown_2023BC4 + ldr r6, _080128C8 @ =gActiveBattler ldrb r6, [r6] cmp r0, r6 bne _080127F6 @@ -5296,7 +5296,7 @@ _080127F6: cmp r0, 0 beq _08012816 ldrb r0, [r3, 0x15] - ldr r7, _080128C8 @ =gUnknown_2023BC4 + ldr r7, _080128C8 @ =gActiveBattler ldrb r7, [r7] cmp r0, r7 bne _08012816 @@ -5315,12 +5315,12 @@ _08012816: cmp r5, r0 blt _080127D2 _08012824: - ldr r1, _080128D0 @ =gUnknown_2023D4A + ldr r1, _080128D0 @ =gCurrentMove ldrh r0, [r1] lsls r1, r0, 1 adds r1, r0 lsls r1, 2 - ldr r2, _080128CC @ =gUnknown_8250C04 + ldr r2, _080128CC @ =gBattleMoves adds r1, r2 ldrb r0, [r1] cmp r0, 0x7F @@ -5331,7 +5331,7 @@ _08012838: movs r0, 0x58 adds r2, r1, 0 muls r2, r0 - ldr r0, _080128D8 @ =gUnknown_2023BE4 + ldr r0, _080128D8 @ =gBattleMons adds r0, 0x50 adds r2, r0 ldr r0, [r2] @@ -5363,7 +5363,7 @@ _0801286C: lsls r0, 24 cmp r4, r0 beq _080128AC - ldr r1, _080128D4 @ =gUnknown_2023DFC + ldr r1, _080128D4 @ =gStatuses3 lsls r0, r5, 2 adds r2, r0, r1 ldr r1, [r2] @@ -5371,7 +5371,7 @@ _0801286C: ands r0, r1 cmp r0, 0 beq _080128AC - ldr r0, _080128C4 @ =gUnknown_2023E0C + ldr r0, _080128C4 @ =gDisableStructs adds r0, r6, r0 ldrb r0, [r0, 0x15] ldrb r3, [r7] @@ -5390,18 +5390,18 @@ _080128AC: ldrb r0, [r0] cmp r5, r0 blt _0801286C - ldr r6, _080128C4 @ =gUnknown_2023E0C + ldr r6, _080128C4 @ =gDisableStructs mov r9, r6 - ldr r7, _080128C8 @ =gUnknown_2023BC4 + ldr r7, _080128C8 @ =gActiveBattler mov r12, r7 b _0801290C .align 2, 0 -_080128C4: .4byte gUnknown_2023E0C -_080128C8: .4byte gUnknown_2023BC4 -_080128CC: .4byte gUnknown_8250C04 -_080128D0: .4byte gUnknown_2023D4A -_080128D4: .4byte gUnknown_2023DFC -_080128D8: .4byte gUnknown_2023BE4 +_080128C4: .4byte gDisableStructs +_080128C8: .4byte gActiveBattler +_080128CC: .4byte gBattleMoves +_080128D0: .4byte gCurrentMove +_080128D4: .4byte gStatuses3 +_080128D8: .4byte gBattleMons _080128DC: .4byte gUnknown_2023BCC _080128E0: .4byte gUnknown_2023C34 _080128E4: .4byte 0xfbffffff @@ -5412,7 +5412,7 @@ _080128F0: ldrb r1, [r0] movs r0, 0x58 muls r0, r1 - ldr r1, _08012B7C @ =gUnknown_2023BE4 + ldr r1, _08012B7C @ =gBattleMons adds r1, 0x50 adds r0, r1 movs r1, 0 @@ -5424,7 +5424,7 @@ _080128F0: str r1, [r0] _0801290C: movs r5, 0 - ldr r7, _08012B80 @ =gUnknown_2023FE8 + ldr r7, _08012B80 @ =gBattleStruct ldr r3, _08012B84 @ =gUnknown_2023FF8 mov r10, r3 ldr r6, _08012B88 @ =gUnknown_2023BCC @@ -5433,8 +5433,8 @@ _0801290C: bge _0801296C ldr r0, _08012B8C @ =gUnknown_2023C34 mov r8, r0 - ldr r6, _08012B90 @ =gUnknown_825E45C - ldr r4, _08012B94 @ =gUnknown_2023BC4 + ldr r6, _08012B90 @ =gBitTable + ldr r4, _08012B94 @ =gActiveBattler _08012924: movs r0, 0x58 muls r0, r5 @@ -5498,12 +5498,12 @@ _0801298E: adds r5, 0x1 cmp r5, 0x1B bls _0801298E - ldr r6, _08012BA0 @ =gUnknown_2023D4A + ldr r6, _08012BA0 @ =gCurrentMove ldrh r0, [r6] lsls r1, r0, 1 adds r1, r0 lsls r1, 2 - ldr r0, _08012BA4 @ =gUnknown_8250C04 + ldr r0, _08012BA4 @ =gBattleMoves adds r1, r0 ldrb r0, [r1] cmp r0, 0x7F @@ -5565,7 +5565,7 @@ _0801298E: strb r1, [r0, 0x14] _08012A1A: movs r0, 0 - ldr r6, _08012BA8 @ =gUnknown_2023DCC + ldr r6, _08012BA8 @ =gMoveResultFlags strb r0, [r6] mov r0, r12 ldrb r1, [r0] @@ -5579,7 +5579,7 @@ _08012A1A: mov r1, r12 ldrb r0, [r1] lsls r0, 1 - ldr r3, _08012BAC @ =gUnknown_2023D98 + ldr r3, _08012BAC @ =gLastUsedMove adds r0, r3 movs r3, 0 strh r2, [r0] @@ -5726,7 +5726,7 @@ _08012B3C: adds r0, r1 adds r0, 0xC9 strb r2, [r0] - ldr r6, _08012BC4 @ =gUnknown_2023FF4 + ldr r6, _08012BC4 @ =gBattleResources ldr r0, [r6] ldr r1, [r0, 0x4] ldrb r0, [r3] @@ -5734,7 +5734,7 @@ _08012B3C: adds r1, r0 movs r0, 0 str r0, [r1] - ldr r7, _08012BA0 @ =gUnknown_2023D4A + ldr r7, _08012BA0 @ =gCurrentMove strh r0, [r7] add sp, 0x1C pop {r3-r5} @@ -5745,25 +5745,25 @@ _08012B3C: pop {r0} bx r0 .align 2, 0 -_08012B7C: .4byte gUnknown_2023BE4 -_08012B80: .4byte gUnknown_2023FE8 +_08012B7C: .4byte gBattleMons +_08012B80: .4byte gBattleStruct _08012B84: .4byte gUnknown_2023FF8 _08012B88: .4byte gUnknown_2023BCC _08012B8C: .4byte gUnknown_2023C34 -_08012B90: .4byte gUnknown_825E45C -_08012B94: .4byte gUnknown_2023BC4 +_08012B90: .4byte gBitTable +_08012B94: .4byte gActiveBattler _08012B98: .4byte 0xffff1fff _08012B9C: .4byte gUnknown_2023FFC -_08012BA0: .4byte gUnknown_2023D4A -_08012BA4: .4byte gUnknown_8250C04 -_08012BA8: .4byte gUnknown_2023DCC -_08012BAC: .4byte gUnknown_2023D98 +_08012BA0: .4byte gCurrentMove +_08012BA4: .4byte gBattleMoves +_08012BA8: .4byte gMoveResultFlags +_08012BAC: .4byte gLastUsedMove _08012BB0: .4byte gUnknown_2023DA0 _08012BB4: .4byte gUnknown_2023DA8 _08012BB8: .4byte gUnknown_2023DB0 _08012BBC: .4byte gUnknown_2023D90 _08012BC0: .4byte gUnknown_2023DC0 -_08012BC4: .4byte gUnknown_2023FF4 +_08012BC4: .4byte gBattleResources thumb_func_end sub_8012760 thumb_func_start sub_8012BC8 @@ -5774,8 +5774,8 @@ sub_8012BC8: @ 8012BC8 mov r5, r8 push {r5-r7} movs r3, 0 - ldr r7, _08012F5C @ =gUnknown_2023BC4 - ldr r6, _08012F60 @ =gUnknown_2023DFC + ldr r7, _08012F5C @ =gActiveBattler + ldr r6, _08012F60 @ =gStatuses3 ldr r0, _08012F64 @ =gUnknown_2023FF8 mov r8, r0 ldr r1, _08012F68 @ =gUnknown_2023FFC @@ -5784,7 +5784,7 @@ sub_8012BC8: @ 8012BC8 mov r12, r2 adds r5, r7, 0 movs r4, 0x58 - ldr r2, _08012F70 @ =gUnknown_2023BE4 + ldr r2, _08012F70 @ =gBattleMons adds r2, 0x18 movs r1, 0x6 _08012BEE: @@ -5799,7 +5799,7 @@ _08012BEE: ldrb r1, [r7] movs r0, 0x58 muls r0, r1 - ldr r2, _08012F70 @ =gUnknown_2023BE4 + ldr r2, _08012F70 @ =gBattleMons adds r2, 0x50 adds r0, r2 movs r1, 0 @@ -5815,7 +5815,7 @@ _08012BEE: bge _08012C8A adds r4, r2, 0 movs r5, 0 - ldr r6, _08012F78 @ =gUnknown_825E45C + ldr r6, _08012F78 @ =gBitTable _08012C26: ldr r1, [r4] movs r0, 0x80 @@ -5823,7 +5823,7 @@ _08012C26: ands r0, r1 cmp r0, 0 beq _08012C44 - ldr r2, _08012F7C @ =gUnknown_2023E0C + ldr r2, _08012F7C @ =gDisableStructs adds r0, r5, r2 ldrb r0, [r0, 0x14] ldrb r2, [r7] @@ -5852,7 +5852,7 @@ _08012C5C: ands r0, r1 cmp r0, 0 beq _08012C7C - ldr r2, _08012F84 @ =gUnknown_2023FE8 + ldr r2, _08012F84 @ =gBattleStruct ldr r0, [r2] adds r0, r3, r0 ldrb r0, [r0, 0x14] @@ -5882,7 +5882,7 @@ _08012C8A: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r2, _08012F7C @ =gUnknown_2023E0C + ldr r2, _08012F7C @ =gDisableStructs adds r1, r0, r2 movs r3, 0 movs r2, 0 @@ -6040,14 +6040,14 @@ _08012CA8: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _08012F7C @ =gUnknown_2023E0C + ldr r1, _08012F7C @ =gDisableStructs adds r0, r1 movs r2, 0 movs r1, 0x2 strb r1, [r0, 0x16] ldrb r0, [r7] lsls r0, 1 - ldr r1, _08012F8C @ =gUnknown_2023D98 + ldr r1, _08012F8C @ =gLastUsedMove adds r0, r1 movs r3, 0 strh r2, [r0] @@ -6077,7 +6077,7 @@ _08012CA8: movs r1, 0xFF strb r1, [r0] ldrb r0, [r7] - ldr r2, _08012F84 @ =gUnknown_2023FE8 + ldr r2, _08012F84 @ =gBattleStruct ldr r1, [r2] lsls r0, 1 adds r0, r1 @@ -6192,7 +6192,7 @@ _08012EDC: cmp r3, r2 blt _08012EC4 _08012F04: - ldr r1, _08012FA4 @ =gUnknown_2023FF4 + ldr r1, _08012FA4 @ =gBattleResources ldr r0, [r1] ldr r1, [r0, 0x4] ldrb r0, [r7] @@ -6204,13 +6204,13 @@ _08012F04: movs r3, 0x58 adds r1, r0, 0 muls r1, r3 - ldr r2, _08012F70 @ =gUnknown_2023BE4 + ldr r2, _08012F70 @ =gBattleMons adds r1, r2 ldrh r2, [r1] lsls r0, r2, 3 subs r0, r2 lsls r0, 2 - ldr r2, _08012FA8 @ =gUnknown_8254784 + ldr r2, _08012FA8 @ =gBaseStats adds r0, r2 ldrb r0, [r0, 0x6] adds r1, 0x21 @@ -6218,13 +6218,13 @@ _08012F04: ldrb r0, [r7] adds r1, r0, 0 muls r1, r3 - ldr r0, _08012F70 @ =gUnknown_2023BE4 + ldr r0, _08012F70 @ =gBattleMons adds r1, r0 ldrh r2, [r1] lsls r0, r2, 3 subs r0, r2 lsls r0, 2 - ldr r2, _08012FA8 @ =gUnknown_8254784 + ldr r2, _08012FA8 @ =gBaseStats adds r0, r2 ldrb r0, [r0, 0x7] adds r1, 0x22 @@ -6237,26 +6237,26 @@ _08012F04: pop {r0} bx r0 .align 2, 0 -_08012F5C: .4byte gUnknown_2023BC4 -_08012F60: .4byte gUnknown_2023DFC +_08012F5C: .4byte gActiveBattler +_08012F60: .4byte gStatuses3 _08012F64: .4byte gUnknown_2023FF8 _08012F68: .4byte gUnknown_2023FFC _08012F6C: .4byte gUnknown_2023E8C -_08012F70: .4byte gUnknown_2023BE4 +_08012F70: .4byte gBattleMons _08012F74: .4byte gUnknown_2023BCC -_08012F78: .4byte gUnknown_825E45C -_08012F7C: .4byte gUnknown_2023E0C +_08012F78: .4byte gBitTable +_08012F7C: .4byte gDisableStructs _08012F80: .4byte 0xfbffffff -_08012F84: .4byte gUnknown_2023FE8 +_08012F84: .4byte gBattleStruct _08012F88: .4byte 0xffff1fff -_08012F8C: .4byte gUnknown_2023D98 +_08012F8C: .4byte gLastUsedMove _08012F90: .4byte gUnknown_2023DA0 _08012F94: .4byte gUnknown_2023DA8 _08012F98: .4byte gUnknown_2023DB0 _08012F9C: .4byte gUnknown_2023D90 _08012FA0: .4byte gUnknown_2023DC0 -_08012FA4: .4byte gUnknown_2023FF4 -_08012FA8: .4byte gUnknown_8254784 +_08012FA4: .4byte gBattleResources +_08012FA8: .4byte gBaseStats thumb_func_end sub_8012BC8 thumb_func_start BattleIntroGetMonsData @@ -6272,7 +6272,7 @@ BattleIntroGetMonsData: @ 8012FAC .align 2, 0 _08012FBC: .4byte gUnknown_2023E82 _08012FC0: - ldr r4, _08012FE0 @ =gUnknown_2023BC4 + ldr r4, _08012FE0 @ =gActiveBattler ldrb r0, [r5, 0x1] strb r0, [r4] movs r0, 0 @@ -6286,7 +6286,7 @@ _08012FC0: strb r0, [r5] b _0801301A .align 2, 0 -_08012FE0: .4byte gUnknown_2023BC4 +_08012FE0: .4byte gActiveBattler _08012FE4: ldr r0, _08013008 @ =gUnknown_2023BC8 ldr r2, [r0] @@ -6327,7 +6327,7 @@ BattleIntroPrepareBackgroundSlide: @ 8013020 bne _08013050 movs r0, 0 bl GetBankByIdentity - ldr r4, _0801305C @ =gUnknown_2023BC4 + ldr r4, _0801305C @ =gActiveBattler strb r0, [r4] ldr r0, _08013060 @ =gUnknown_2022B50 ldrb r1, [r0] @@ -6347,7 +6347,7 @@ _08013050: bx r0 .align 2, 0 _08013058: .4byte gUnknown_2023BC8 -_0801305C: .4byte gUnknown_2023BC4 +_0801305C: .4byte gActiveBattler _08013060: .4byte gUnknown_2022B50 _08013064: .4byte gUnknown_3004F84 _08013068: .4byte sub_8013070 @@ -6367,7 +6367,7 @@ sub_8013070: @ 8013070 beq _08013084 b _08013314 _08013084: - ldr r2, _080130D8 @ =gUnknown_2023BC4 + ldr r2, _080130D8 @ =gActiveBattler strb r1, [r2] ldr r0, _080130DC @ =gUnknown_2023BCC ldrb r0, [r0] @@ -6376,20 +6376,20 @@ _08013084: b _0801330E _08013092: movs r7, 0x58 - ldr r0, _080130E0 @ =gUnknown_2023BE4 + ldr r0, _080130E0 @ =gBattleMons mov r8, r0 mov r9, r2 movs r1, 0x48 add r1, r8 mov r10, r1 _080130A0: - ldr r0, _080130E4 @ =gUnknown_2022B4C + ldr r0, _080130E4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 beq _080130E8 - ldr r4, _080130D8 @ =gUnknown_2023BC4 + ldr r4, _080130D8 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -6410,10 +6410,10 @@ _080130C6: b _080131B6 .align 2, 0 _080130D4: .4byte gUnknown_2023BC8 -_080130D8: .4byte gUnknown_2023BC4 +_080130D8: .4byte gActiveBattler _080130DC: .4byte gUnknown_2023BCC -_080130E0: .4byte gUnknown_2023BE4 -_080130E4: .4byte gUnknown_2022B4C +_080130E0: .4byte gBattleMons +_080130E4: .4byte gBattleTypeFlags _080130E8: mov r1, r9 ldrb r0, [r1] @@ -6421,9 +6421,9 @@ _080130E8: mov r2, r8 adds r3, r0, r2 movs r2, 0 - ldr r6, _08013230 @ =gUnknown_8254784 + ldr r6, _08013230 @ =gBaseStats ldr r5, _08013234 @ =gUnknown_20233C4 - ldr r4, _08013238 @ =gUnknown_2023BC4 + ldr r4, _08013238 @ =gActiveBattler _080130FA: adds r0, r3, r2 ldrb r1, [r4] @@ -6479,7 +6479,7 @@ _080130FA: strb r0, [r1] ldrb r0, [r2] bl GetBankSide - ldr r1, _0801323C @ =gUnknown_2023FE8 + ldr r1, _0801323C @ =gBattleStruct lsls r0, 24 lsrs r0, 23 adds r0, 0xA8 @@ -6492,7 +6492,7 @@ _080130FA: ldrh r0, [r0, 0x28] strh r0, [r1] movs r2, 0 - ldr r4, _08013238 @ =gUnknown_2023BC4 + ldr r4, _08013238 @ =gActiveBattler movs r5, 0x58 ldr r1, _08013240 @ =gUnknown_2023BFC adds r6, r4, 0 @@ -6519,7 +6519,7 @@ _08013196: movs r0, 0 str r0, [r1] _080131B6: - ldr r4, _08013238 @ =gUnknown_2023BC4 + ldr r4, _08013238 @ =gActiveBattler ldrb r0, [r4] bl GetBankIdentity lsls r0, 24 @@ -6530,7 +6530,7 @@ _080131B6: ldrb r0, [r4] bl MarkBufferBankForExecution _080131D0: - ldr r5, _08013244 @ =gUnknown_2022B4C + ldr r5, _08013244 @ =gBattleTypeFlags ldr r0, [r5] movs r1, 0x8 ands r0, r1 @@ -6573,12 +6573,12 @@ _080131F6: bl sub_8044898 b _080132C2 .align 2, 0 -_08013230: .4byte gUnknown_8254784 +_08013230: .4byte gBaseStats _08013234: .4byte gUnknown_20233C4 -_08013238: .4byte gUnknown_2023BC4 -_0801323C: .4byte gUnknown_2023FE8 +_08013238: .4byte gActiveBattler +_0801323C: .4byte gBattleStruct _08013240: .4byte gUnknown_2023BFC -_08013244: .4byte gUnknown_2022B4C +_08013244: .4byte gBattleTypeFlags _08013248: .4byte 0x0001aa02 _0801324C: ldrb r0, [r4] @@ -6636,13 +6636,13 @@ _080132B4: ldrb r0, [r1] bl MarkBufferBankForExecution _080132C2: - ldr r0, _08013328 @ =gUnknown_2022B4C + ldr r0, _08013328 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _080132F8 - ldr r4, _0801332C @ =gUnknown_2023BC4 + ldr r4, _0801332C @ =gActiveBattler ldrb r0, [r4] bl GetBankIdentity lsls r0, 24 @@ -6686,8 +6686,8 @@ _08013314: bx r0 .align 2, 0 _08013324: .4byte 0x0001aa02 -_08013328: .4byte gUnknown_2022B4C -_0801332C: .4byte gUnknown_2023BC4 +_08013328: .4byte gBattleTypeFlags +_0801332C: .4byte gActiveBattler _08013330: .4byte gUnknown_2023BCC _08013334: .4byte gUnknown_3004F84 _08013338: .4byte BattleIntroDrawPartySummaryScreens @@ -6705,7 +6705,7 @@ BattleIntroDrawPartySummaryScreens: @ 801333C beq _0801334E b _080134C8 _0801334E: - ldr r0, _08013398 @ =gUnknown_2022B4C + ldr r0, _08013398 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x8 ands r0, r1 @@ -6722,7 +6722,7 @@ _08013366: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0801339C @ =gUnknown_202402C + ldr r0, _0801339C @ =gEnemyParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -6743,8 +6743,8 @@ _0801338C: b _080133B6 .align 2, 0 _08013394: .4byte gUnknown_2023BC8 -_08013398: .4byte gUnknown_2022B4C -_0801339C: .4byte gUnknown_202402C +_08013398: .4byte gBattleTypeFlags +_0801339C: .4byte gEnemyParty _080133A0: .4byte 0x0000ffff _080133A4: adds r0, r4, 0 @@ -6763,7 +6763,7 @@ _080133B6: ble _08013366 movs r0, 0x1 bl GetBankByIdentity - ldr r4, _08013410 @ =gUnknown_2023BC4 + ldr r4, _08013410 @ =gActiveBattler strb r0, [r4] movs r0, 0 mov r1, sp @@ -6778,7 +6778,7 @@ _080133E2: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08013414 @ =gUnknown_2024284 + ldr r0, _08013414 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -6798,8 +6798,8 @@ _08013408: movs r0, 0 b _0801342E .align 2, 0 -_08013410: .4byte gUnknown_2023BC4 -_08013414: .4byte gUnknown_2024284 +_08013410: .4byte gActiveBattler +_08013414: .4byte gPlayerParty _08013418: .4byte 0x0000ffff _0801341C: adds r0, r4, 0 @@ -6818,7 +6818,7 @@ _0801342E: ble _080133E2 movs r0, 0 bl GetBankByIdentity - ldr r4, _0801345C @ =gUnknown_2023BC4 + ldr r4, _0801345C @ =gActiveBattler strb r0, [r4] movs r0, 0 mov r1, sp @@ -6830,7 +6830,7 @@ _0801342E: ldr r0, _08013464 @ =BattleIntroPrintTrainerWantsToBattle b _080134C6 .align 2, 0 -_0801345C: .4byte gUnknown_2023BC4 +_0801345C: .4byte gActiveBattler _08013460: .4byte gUnknown_3004F84 _08013464: .4byte BattleIntroPrintTrainerWantsToBattle _08013468: @@ -6841,7 +6841,7 @@ _0801346E: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0801349C @ =gUnknown_2024284 + ldr r0, _0801349C @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -6861,7 +6861,7 @@ _08013494: movs r0, 0 b _080134B6 .align 2, 0 -_0801349C: .4byte gUnknown_2024284 +_0801349C: .4byte gPlayerParty _080134A0: .4byte 0x0000ffff _080134A4: adds r0, r4, 0 @@ -6903,7 +6903,7 @@ BattleIntroPrintTrainerWantsToBattle: @ 80134DC bne _080134FE movs r0, 0x1 bl GetBankByIdentity - ldr r1, _08013508 @ =gUnknown_2023BC4 + ldr r1, _08013508 @ =gActiveBattler strb r0, [r1] ldrb r1, [r1] movs r0, 0 @@ -6916,7 +6916,7 @@ _080134FE: bx r0 .align 2, 0 _08013504: .4byte gUnknown_2023BC8 -_08013508: .4byte gUnknown_2023BC4 +_08013508: .4byte gActiveBattler _0801350C: .4byte gUnknown_3004F84 _08013510: .4byte sub_8013568 thumb_func_end BattleIntroPrintTrainerWantsToBattle @@ -6934,7 +6934,7 @@ sub_8013514: @ 8013514 movs r0, 0 movs r1, 0 bl PrepareStringBattle - ldr r0, _0801355C @ =gUnknown_2022B4C + ldr r0, _0801355C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0xA0 lsls r1, 8 @@ -6943,7 +6943,7 @@ sub_8013514: @ 8013514 bne _0801354A movs r0, 0x1 bl GetBankByIdentity - ldr r1, _08013560 @ =gUnknown_2023FC4 + ldr r1, _08013560 @ =gBattleScripting strb r0, [r1, 0x17] ldr r0, _08013564 @ =gUnknown_81D91A1 bl BattleScriptExecute @@ -6954,8 +6954,8 @@ _0801354A: _08013550: .4byte gUnknown_2023BC8 _08013554: .4byte gUnknown_3004F84 _08013558: .4byte sub_80136E4 -_0801355C: .4byte gUnknown_2022B4C -_08013560: .4byte gUnknown_2023FC4 +_0801355C: .4byte gBattleTypeFlags +_08013560: .4byte gBattleScripting _08013564: .4byte gUnknown_81D91A1 thumb_func_end sub_8013514 @@ -6992,7 +6992,7 @@ sub_801359C: @ 801359C ldr r1, [r0] cmp r1, 0 bne _0801360C - ldr r2, _08013618 @ =gUnknown_2023BC4 + ldr r2, _08013618 @ =gActiveBattler strb r1, [r2] ldr r0, _0801361C @ =gUnknown_2023BCC ldrb r0, [r0] @@ -7011,7 +7011,7 @@ _080135B4: ldrb r0, [r4] bl MarkBufferBankForExecution _080135CE: - ldr r0, _08013620 @ =gUnknown_2022B4C + ldr r0, _08013620 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -7047,9 +7047,9 @@ _0801360C: bx r0 .align 2, 0 _08013614: .4byte gUnknown_2023BC8 -_08013618: .4byte gUnknown_2023BC4 +_08013618: .4byte gActiveBattler _0801361C: .4byte gUnknown_2023BCC -_08013620: .4byte gUnknown_2022B4C +_08013620: .4byte gBattleTypeFlags _08013624: .4byte gUnknown_3004F84 _08013628: .4byte sub_801362C thumb_func_end sub_801359C @@ -7061,14 +7061,14 @@ sub_801362C: @ 801362C ldr r1, [r0] cmp r1, 0 bne _0801369C - ldr r2, _080136A8 @ =gUnknown_2023BC4 + ldr r2, _080136A8 @ =gActiveBattler strb r1, [r2] ldr r0, _080136AC @ =gUnknown_2023BCC ldrb r0, [r0] cmp r1, r0 bcs _08013696 adds r4, r2, 0 - ldr r6, _080136B0 @ =gUnknown_2023BE4 + ldr r6, _080136B0 @ =gBattleMons movs r5, 0x58 adds r7, r6, 0 adds r7, 0x48 @@ -7079,7 +7079,7 @@ _0801364C: lsrs r0, 24 cmp r0, 0x1 bne _08013684 - ldr r0, _080136B4 @ =gUnknown_2022B4C + ldr r0, _080136B4 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _080136B8 @ =0x0001aa02 ands r0, r1 @@ -7118,10 +7118,10 @@ _0801369C: bx r0 .align 2, 0 _080136A4: .4byte gUnknown_2023BC8 -_080136A8: .4byte gUnknown_2023BC4 +_080136A8: .4byte gActiveBattler _080136AC: .4byte gUnknown_2023BCC -_080136B0: .4byte gUnknown_2023BE4 -_080136B4: .4byte gUnknown_2022B4C +_080136B0: .4byte gBattleMons +_080136B4: .4byte gBattleTypeFlags _080136B8: .4byte 0x0001aa02 _080136BC: .4byte gUnknown_3004F84 _080136C0: .4byte sub_80136E4 @@ -7153,7 +7153,7 @@ sub_80136E4: @ 80136E4 ldr r0, [r0] cmp r0, 0 bne _08013712 - ldr r0, _0801371C @ =gUnknown_2022B4C + ldr r0, _0801371C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -7175,7 +7175,7 @@ _08013712: bx r0 .align 2, 0 _08013718: .4byte gUnknown_2023BC8 -_0801371C: .4byte gUnknown_2022B4C +_0801371C: .4byte gBattleTypeFlags _08013720: .4byte gUnknown_3004F84 _08013724: .4byte sub_8013728 thumb_func_end sub_80136E4 @@ -7187,7 +7187,7 @@ sub_8013728: @ 8013728 ldr r1, [r0] cmp r1, 0 bne _080137AC - ldr r2, _080137B8 @ =gUnknown_2023BC4 + ldr r2, _080137B8 @ =gActiveBattler strb r1, [r2] ldr r0, _080137BC @ =gUnknown_2023BCC ldrb r0, [r0] @@ -7205,7 +7205,7 @@ _08013740: ldrb r0, [r4] bl MarkBufferBankForExecution _08013758: - ldr r0, _080137C0 @ =gUnknown_2022B4C + ldr r0, _080137C0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -7232,7 +7232,7 @@ _0801377E: cmp r0, r1 bcc _08013740 _08013790: - ldr r2, _080137C4 @ =gUnknown_2023FE8 + ldr r2, _080137C4 @ =gBattleStruct ldr r0, [r2] adds r0, 0x4C movs r1, 0 @@ -7252,10 +7252,10 @@ _080137AC: bx r0 .align 2, 0 _080137B4: .4byte gUnknown_2023BC8 -_080137B8: .4byte gUnknown_2023BC4 +_080137B8: .4byte gActiveBattler _080137BC: .4byte gUnknown_2023BCC -_080137C0: .4byte gUnknown_2022B4C -_080137C4: .4byte gUnknown_2023FE8 +_080137C0: .4byte gBattleTypeFlags +_080137C4: .4byte gBattleStruct _080137C8: .4byte gUnknown_3004F84 _080137CC: .4byte sub_801385C thumb_func_end sub_8013728 @@ -7267,14 +7267,14 @@ sub_80137D0: @ 80137D0 ldr r1, [r0] cmp r1, 0 bne _0801383A - ldr r2, _08013844 @ =gUnknown_2023BC4 + ldr r2, _08013844 @ =gActiveBattler strb r1, [r2] ldr r0, _08013848 @ =gUnknown_2023BCC ldrb r0, [r0] cmp r1, r0 bcs _0801381E adds r4, r2, 0 - ldr r5, _0801384C @ =gUnknown_2023BCE + ldr r5, _0801384C @ =gBattlerPartyIndexes _080137EA: ldrb r0, [r4] bl GetBankSide @@ -7301,7 +7301,7 @@ _0801380C: cmp r0, r1 bcc _080137EA _0801381E: - ldr r2, _08013850 @ =gUnknown_2023FE8 + ldr r2, _08013850 @ =gBattleStruct ldr r0, [r2] adds r0, 0x4C movs r1, 0 @@ -7321,10 +7321,10 @@ _0801383A: bx r0 .align 2, 0 _08013840: .4byte gUnknown_2023BC8 -_08013844: .4byte gUnknown_2023BC4 +_08013844: .4byte gActiveBattler _08013848: .4byte gUnknown_2023BCC -_0801384C: .4byte gUnknown_2023BCE -_08013850: .4byte gUnknown_2023FE8 +_0801384C: .4byte gBattlerPartyIndexes +_08013850: .4byte gBattleStruct _08013854: .4byte gUnknown_3004F84 _08013858: .4byte sub_801385C thumb_func_end sub_80137D0 @@ -7344,7 +7344,7 @@ sub_801385C: @ 801385C beq _08013874 b _08013ADA _08013874: - ldr r0, _080138A4 @ =gUnknown_2023FE8 + ldr r0, _080138A4 @ =gBattleStruct ldr r0, [r0] adds r0, 0x4C ldrb r0, [r0] @@ -7369,7 +7369,7 @@ _0801389A: b _080138F0 .align 2, 0 _080138A0: .4byte gUnknown_2023BC8 -_080138A4: .4byte gUnknown_2023FE8 +_080138A4: .4byte gBattleStruct _080138A8: .4byte gUnknown_2023BCC _080138AC: .4byte gUnknown_2023BDE _080138B0: @@ -7413,7 +7413,7 @@ _080138F0: cmp r5, r0 blt _080138B0 _080138FA: - ldr r4, _0801392C @ =gUnknown_2023FE8 + ldr r4, _0801392C @ =gBattleStruct ldr r0, [r4] adds r0, 0xB6 ldrb r0, [r0] @@ -7436,9 +7436,9 @@ _080138FA: .align 2, 0 _08013924: .4byte gUnknown_2023BDE _08013928: .4byte gUnknown_2023BCC -_0801392C: .4byte gUnknown_2023FE8 +_0801392C: .4byte gBattleStruct _08013930: - ldr r2, _08013AE8 @ =gUnknown_2023FE8 + ldr r2, _08013AE8 @ =gBattleStruct ldr r0, [r2] adds r0, 0x4C ldr r1, _08013AEC @ =gUnknown_2023BCC @@ -7510,7 +7510,7 @@ _080139A4: beq _080139BA b _08013ADA _080139BA: - ldr r2, _08013AE8 @ =gUnknown_2023FE8 + ldr r2, _08013AE8 @ =gBattleStruct ldr r0, [r2] adds r0, 0xD9 ldr r1, _08013AEC @ =gUnknown_2023BCC @@ -7567,7 +7567,7 @@ _08013A1C: bne _08013A1C _08013A22: movs r5, 0 - ldr r1, _08013AE8 @ =gUnknown_2023FE8 + ldr r1, _08013AE8 @ =gBattleStruct mov r8, r1 movs r7, 0x6 ldr r6, _08013AF4 @ =gUnknown_2023D7C @@ -7592,10 +7592,10 @@ _08013A32: movs r0, 0 bl TurnValuesCleanUp bl SpecialStatusesClear - ldr r0, _08013AE8 @ =gUnknown_2023FE8 + ldr r0, _08013AE8 @ =gBattleStruct ldr r0, [r0] adds r0, 0x91 - ldr r1, _08013AFC @ =gUnknown_2023D70 + ldr r1, _08013AFC @ =gAbsentBattlerFlags ldrb r1, [r1] strb r1, [r0] ldr r1, _08013B00 @ =gUnknown_3004F84 @@ -7612,13 +7612,13 @@ _08013A74: bge _08013A74 movs r5, 0 ldr r3, _08013AEC @ =gUnknown_2023BCC - ldr r2, _08013AE8 @ =gUnknown_2023FE8 - ldr r6, _08013B0C @ =gUnknown_2023FC4 - ldr r7, _08013B10 @ =gUnknown_2023DCC + ldr r2, _08013AE8 @ =gBattleStruct + ldr r6, _08013B0C @ =gBattleScripting + ldr r7, _08013B10 @ =gMoveResultFlags ldrb r0, [r3] cmp r5, r0 bge _08013AA6 - ldr r0, _08013B14 @ =gUnknown_2023BE4 + ldr r0, _08013B14 @ =gBattleMons movs r4, 0x9 negs r4, r4 adds r1, r0, 0 @@ -7667,18 +7667,18 @@ _08013ADA: pop {r0} bx r0 .align 2, 0 -_08013AE8: .4byte gUnknown_2023FE8 +_08013AE8: .4byte gBattleStruct _08013AEC: .4byte gUnknown_2023BCC _08013AF0: .4byte gUnknown_2023BDE _08013AF4: .4byte gUnknown_2023D7C _08013AF8: .4byte gUnknown_2023DC4 -_08013AFC: .4byte gUnknown_2023D70 +_08013AFC: .4byte gAbsentBattlerFlags _08013B00: .4byte gUnknown_3004F84 _08013B04: .4byte sub_8014040 _08013B08: .4byte gUnknown_2023E82 -_08013B0C: .4byte gUnknown_2023FC4 -_08013B10: .4byte gUnknown_2023DCC -_08013B14: .4byte gUnknown_2023BE4 +_08013B0C: .4byte gBattleScripting +_08013B10: .4byte gMoveResultFlags +_08013B14: .4byte gBattleMons _08013B18: .4byte gUnknown_2023E80 thumb_func_end sub_801385C @@ -7705,7 +7705,7 @@ _08013B34: ldrb r3, [r3] cmp r4, r3 bge _08013B86 - ldr r5, _08013BC8 @ =gUnknown_2023BE4 + ldr r5, _08013BC8 @ =gBattleMons adds r6, r5, 0 adds r6, 0x4C _08013B4A: @@ -7740,7 +7740,7 @@ _08013B7C: cmp r4, r0 blt _08013B4A _08013B86: - ldr r2, _08013BCC @ =gUnknown_2023FE8 + ldr r2, _08013BCC @ =gBattleStruct ldr r0, [r2] movs r1, 0 strb r1, [r0] @@ -7757,7 +7757,7 @@ _08013B86: strb r1, [r0] ldr r0, [r2] strb r1, [r0, 0x3] - ldr r0, _08013BD0 @ =gUnknown_2023DCC + ldr r0, _08013BD0 @ =gMoveResultFlags strb r1, [r0] _08013BAC: pop {r4-r6} @@ -7769,9 +7769,9 @@ _08013BB8: .4byte gUnknown_3004F84 _08013BBC: .4byte sub_8013BD4 _08013BC0: .4byte gUnknown_2023BCC _08013BC4: .4byte gUnknown_2023E82 -_08013BC8: .4byte gUnknown_2023BE4 -_08013BCC: .4byte gUnknown_2023FE8 -_08013BD0: .4byte gUnknown_2023DCC +_08013BC8: .4byte gBattleMons +_08013BCC: .4byte gBattleStruct +_08013BD0: .4byte gMoveResultFlags thumb_func_end sub_8013B1C thumb_func_start sub_8013BD4 @@ -7806,7 +7806,7 @@ _08013C04: beq _08013C12 b _08013D20 _08013C12: - ldr r0, _08013C7C @ =gUnknown_2023FE8 + ldr r0, _08013C7C @ =gBattleStruct ldr r0, [r0] adds r0, 0x4D strb r1, [r0] @@ -7828,13 +7828,13 @@ _08013C12: ldr r1, _08013C90 @ =0xffefffff ands r0, r1 str r0, [r2] - ldr r0, _08013C94 @ =gUnknown_2023FC4 + ldr r0, _08013C94 @ =gBattleScripting strb r4, [r0, 0x18] strb r4, [r0, 0x19] strb r4, [r0, 0x14] - ldr r0, _08013C98 @ =gUnknown_2023D50 + ldr r0, _08013C98 @ =gBattleMoveDamage str r4, [r0] - ldr r0, _08013C9C @ =gUnknown_2023DCC + ldr r0, _08013C9C @ =gMoveResultFlags strb r4, [r0] ldr r1, _08013CA0 @ =gUnknown_2023E82 movs r2, 0 @@ -7857,21 +7857,21 @@ _08013C58: b _08013D20 .align 2, 0 _08013C78: .4byte gUnknown_2023E8A -_08013C7C: .4byte gUnknown_2023FE8 +_08013C7C: .4byte gBattleStruct _08013C80: .4byte gUnknown_2023DD0 _08013C84: .4byte 0xfffffdff _08013C88: .4byte 0xfff7ffff _08013C8C: .4byte 0xffbfffff _08013C90: .4byte 0xffefffff -_08013C94: .4byte gUnknown_2023FC4 -_08013C98: .4byte gUnknown_2023D50 -_08013C9C: .4byte gUnknown_2023DCC +_08013C94: .4byte gBattleScripting +_08013C98: .4byte gBattleMoveDamage +_08013C9C: .4byte gMoveResultFlags _08013CA0: .4byte gUnknown_2023E82 _08013CA4: .4byte gUnknown_2023BE3 _08013CA8: .4byte gUnknown_3004F84 _08013CAC: .4byte RunTurnActionsFunctions _08013CB0: - ldr r1, _08013D30 @ =gUnknown_3004F90 + ldr r1, _08013D30 @ =gBattleResults ldrb r0, [r1, 0x13] cmp r0, 0xFE bhi _08013CBC @@ -7880,11 +7880,11 @@ _08013CB0: _08013CBC: movs r2, 0 ldr r4, _08013D34 @ =gUnknown_2023BCC - ldr r0, _08013D38 @ =gUnknown_2023FE8 + ldr r0, _08013D38 @ =gBattleStruct mov r8, r0 ldr r1, _08013D3C @ =gUnknown_3004F84 mov r10, r1 - ldr r0, _08013D40 @ =gUnknown_2023D70 + ldr r0, _08013D40 @ =gAbsentBattlerFlags mov r12, r0 ldr r1, _08013D44 @ =sub_8014040 mov r9, r1 @@ -7908,7 +7908,7 @@ _08013CDE: blt _08013CDE _08013CF2: movs r2, 0 - ldr r3, _08013D38 @ =gUnknown_2023FE8 + ldr r3, _08013D38 @ =gBattleStruct movs r1, 0x6 _08013CF8: ldr r0, [r3] @@ -7939,11 +7939,11 @@ _08013D20: pop {r0} bx r0 .align 2, 0 -_08013D30: .4byte gUnknown_3004F90 +_08013D30: .4byte gBattleResults _08013D34: .4byte gUnknown_2023BCC -_08013D38: .4byte gUnknown_2023FE8 +_08013D38: .4byte gBattleStruct _08013D3C: .4byte gUnknown_3004F84 -_08013D40: .4byte gUnknown_2023D70 +_08013D40: .4byte gAbsentBattlerFlags _08013D44: .4byte sub_8014040 _08013D48: .4byte gUnknown_2023D7C _08013D4C: .4byte gUnknown_2023DC4 @@ -7954,8 +7954,8 @@ _08013D50: .4byte gUnknown_2023E80 IsRunningFromBattleImpossible: @ 8013D54 push {r4-r7,lr} sub sp, 0x4 - ldr r1, _08013D78 @ =gUnknown_2023BE4 - ldr r0, _08013D7C @ =gUnknown_2023BC4 + ldr r1, _08013D78 @ =gBattleMons + ldr r0, _08013D7C @ =gActiveBattler ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -7971,8 +7971,8 @@ IsRunningFromBattleImpossible: @ 8013D54 ldrb r2, [r0, 0x7] b _08013D8E .align 2, 0 -_08013D78: .4byte gUnknown_2023BE4 -_08013D7C: .4byte gUnknown_2023BC4 +_08013D78: .4byte gBattleMons +_08013D7C: .4byte gActiveBattler _08013D80: .4byte gUnknown_2023F54 _08013D84: ldrh r0, [r1, 0x2E] @@ -7981,14 +7981,14 @@ _08013D84: lsrs r2, r0, 24 _08013D8E: ldr r1, _08013EA4 @ =gUnknown_2023D6F - ldr r3, _08013EA8 @ =gUnknown_2023BC4 + ldr r3, _08013EA8 @ =gActiveBattler ldrb r0, [r3] strb r0, [r1] cmp r2, 0x25 bne _08013D9C b _08013F18 _08013D9C: - ldr r0, _08013EAC @ =gUnknown_2022B4C + ldr r0, _08013EAC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -7996,7 +7996,7 @@ _08013D9C: beq _08013DAA b _08013F18 _08013DAA: - ldr r1, _08013EB0 @ =gUnknown_2023BE4 + ldr r1, _08013EB0 @ =gBattleMons ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -8025,7 +8025,7 @@ _08013DD4: lsrs r0, 24 cmp r6, r0 beq _08013DF8 - ldr r1, _08013EB0 @ =gUnknown_2023BE4 + ldr r1, _08013EB0 @ =gBattleMons movs r0, 0x58 muls r0, r5 adds r0, r1 @@ -8042,8 +8042,8 @@ _08013DF8: lsrs r0, 24 cmp r6, r0 beq _08013E42 - ldr r3, _08013EB0 @ =gUnknown_2023BE4 - ldr r0, _08013EA8 @ =gUnknown_2023BC4 + ldr r3, _08013EB0 @ =gBattleMons + ldr r0, _08013EA8 @ =gActiveBattler ldrb r0, [r0] movs r2, 0x58 muls r0, r2 @@ -8082,7 +8082,7 @@ _08013E42: cmp r5, r0 blt _08013DD4 _08013E52: - ldr r4, _08013EA8 @ =gUnknown_2023BC4 + ldr r4, _08013EA8 @ =gActiveBattler ldrb r1, [r4] movs r0, 0 str r0, [sp] @@ -8094,7 +8094,7 @@ _08013E52: lsrs r5, r0, 24 cmp r5, 0 beq _08013EC4 - ldr r6, _08013EB0 @ =gUnknown_2023BE4 + ldr r6, _08013EB0 @ =gBattleMons ldrb r0, [r4] movs r3, 0x58 muls r0, r3 @@ -8110,7 +8110,7 @@ _08013E52: cmp r0, 0x8 bne _08013EC4 _08013E8A: - ldr r0, _08013EB8 @ =gUnknown_2023FC4 + ldr r0, _08013EB8 @ =gBattleScripting subs r1, r5, 0x1 strb r1, [r0, 0x17] ldr r2, _08013EBC @ =gUnknown_2023D6A @@ -8125,16 +8125,16 @@ _08013E8A: b _08013F5C .align 2, 0 _08013EA4: .4byte gUnknown_2023D6F -_08013EA8: .4byte gUnknown_2023BC4 -_08013EAC: .4byte gUnknown_2022B4C -_08013EB0: .4byte gUnknown_2023BE4 +_08013EA8: .4byte gActiveBattler +_08013EAC: .4byte gBattleTypeFlags +_08013EB0: .4byte gBattleMons _08013EB4: .4byte gUnknown_2023BCC -_08013EB8: .4byte gUnknown_2023FC4 +_08013EB8: .4byte gBattleScripting _08013EBC: .4byte gUnknown_2023D6A _08013EC0: .4byte gUnknown_2023E82 _08013EC4: - ldr r1, _08013EF8 @ =gUnknown_2023BE4 - ldr r0, _08013EFC @ =gUnknown_2023BC4 + ldr r1, _08013EF8 @ =gBattleMons + ldr r0, _08013EFC @ =gActiveBattler ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -8145,7 +8145,7 @@ _08013EC4: ands r0, r1 cmp r0, 0 bne _08013EEE - ldr r1, _08013F04 @ =gUnknown_2023DFC + ldr r1, _08013F04 @ =gStatuses3 lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] @@ -8161,13 +8161,13 @@ _08013EEE: movs r0, 0x1 b _08013F5E .align 2, 0 -_08013EF8: .4byte gUnknown_2023BE4 -_08013EFC: .4byte gUnknown_2023BC4 +_08013EF8: .4byte gBattleMons +_08013EFC: .4byte gActiveBattler _08013F00: .4byte 0x0400e000 -_08013F04: .4byte gUnknown_2023DFC +_08013F04: .4byte gStatuses3 _08013F08: .4byte gUnknown_2023E82 _08013F0C: - ldr r0, _08013F1C @ =gUnknown_2022B4C + ldr r0, _08013F1C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -8177,9 +8177,9 @@ _08013F18: movs r0, 0 b _08013F5E .align 2, 0 -_08013F1C: .4byte gUnknown_2022B4C +_08013F1C: .4byte gBattleTypeFlags _08013F20: - ldr r0, _08013F30 @ =gUnknown_2023FC4 + ldr r0, _08013F30 @ =gBattleScripting strb r5, [r0, 0x17] ldr r1, _08013F34 @ =gUnknown_2023D6A ldrb r0, [r2] @@ -8188,11 +8188,11 @@ _08013F20: movs r0, 0x2 b _08013F5C .align 2, 0 -_08013F30: .4byte gUnknown_2023FC4 +_08013F30: .4byte gBattleScripting _08013F34: .4byte gUnknown_2023D6A _08013F38: .4byte gUnknown_2023E82 _08013F3C: - ldr r0, _08013F4C @ =gUnknown_2023FC4 + ldr r0, _08013F4C @ =gBattleScripting strb r5, [r0, 0x17] ldr r1, _08013F50 @ =gUnknown_2023D6A ldrb r0, [r2] @@ -8201,7 +8201,7 @@ _08013F3C: movs r0, 0x2 b _08013F5C .align 2, 0 -_08013F4C: .4byte gUnknown_2023FC4 +_08013F4C: .4byte gBattleScripting _08013F50: .4byte gUnknown_2023D6A _08013F54: .4byte gUnknown_2023E82 _08013F58: @@ -8226,11 +8226,11 @@ sub_8013F6C: @ 8013F6C lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - ldr r0, _08014008 @ =gUnknown_2023BCE + ldr r0, _08014008 @ =gBattlerPartyIndexes mov r8, r0 ldr r1, _0801400C @ =gUnknown_203B0DC mov r12, r1 - ldr r7, _08014010 @ =gUnknown_2023FE8 + ldr r7, _08014010 @ =gBattleStruct lsls r0, r5, 1 adds r4, r0, r5 adds r6, r0, 0 @@ -8253,7 +8253,7 @@ _08013F88: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r7, _08014010 @ =gUnknown_2023FE8 + ldr r7, _08014010 @ =gBattleStruct ldr r0, [r7] adds r0, r5, r0 adds r0, 0x5C @@ -8264,7 +8264,7 @@ _08013F88: lsrs r1, 24 adds r0, r4, 0 bl sub_8127FF4 - ldr r0, _08014014 @ =gUnknown_2022B4C + ldr r0, _08014014 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -8298,10 +8298,10 @@ _08013FE6: ble _08013FE6 b _08014032 .align 2, 0 -_08014008: .4byte gUnknown_2023BCE +_08014008: .4byte gBattlerPartyIndexes _0801400C: .4byte gUnknown_203B0DC -_08014010: .4byte gUnknown_2023FE8 -_08014014: .4byte gUnknown_2022B4C +_08014010: .4byte gBattleStruct +_08014014: .4byte gBattleTypeFlags _08014018: movs r3, 0 adds r2, r6, r5 @@ -8338,7 +8338,7 @@ sub_8014040: @ 8014040 ldr r0, _0801408C @ =gUnknown_2023E82 movs r1, 0 strb r1, [r0, 0x4] - ldr r0, _08014090 @ =gUnknown_2023BC4 + ldr r0, _08014090 @ =gActiveBattler strb r1, [r0] ldr r0, _08014094 @ =gUnknown_2023BCC adds r2, r0, 0 @@ -8347,7 +8347,7 @@ sub_8014040: @ 8014040 bcc _08014064 bl _08014C68 _08014064: - ldr r4, _08014090 @ =gUnknown_2023BC4 + ldr r4, _08014090 @ =gActiveBattler ldrb r0, [r4] bl GetBankIdentity lsls r0, 24 @@ -8367,7 +8367,7 @@ _08014080: mov pc, r0 .align 2, 0 _0801408C: .4byte gUnknown_2023E82 -_08014090: .4byte gUnknown_2023BC4 +_08014090: .4byte gActiveBattler _08014094: .4byte gUnknown_2023BCC _08014098: .4byte _0801409C .align 2, 0 @@ -8380,15 +8380,15 @@ _0801409C: .4byte _08014B88 .4byte _08014C20 _080140B8: - ldr r0, _08014150 @ =gUnknown_2023BC4 + ldr r0, _08014150 @ =gActiveBattler ldrb r1, [r0] - ldr r4, _08014154 @ =gUnknown_2023FE8 + ldr r4, _08014154 @ =gBattleStruct ldr r0, [r4] adds r1, r0 adds r1, 0x5C movs r0, 0x6 strb r0, [r1] - ldr r0, _08014158 @ =gUnknown_2022B4C + ldr r0, _08014158 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -8405,7 +8405,7 @@ _080140B8: ldr r1, [r4] adds r1, 0x91 ldrb r1, [r1] - ldr r2, _0801415C @ =gUnknown_825E45C + ldr r2, _0801415C @ =gBitTable lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -8424,12 +8424,12 @@ _080140B8: beq _08014114 bl _08014C4E _08014114: - ldr r0, _08014154 @ =gUnknown_2023FE8 + ldr r0, _08014154 @ =gBattleStruct ldr r0, [r0] adds r0, 0x91 ldrb r3, [r0] - ldr r1, _0801415C @ =gUnknown_825E45C - ldr r4, _08014150 @ =gUnknown_2023BC4 + ldr r1, _0801415C @ =gBitTable + ldr r4, _08014150 @ =gActiveBattler ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -8441,7 +8441,7 @@ _08014114: adds r0, r2, r0 movs r1, 0xD strb r1, [r0] - ldr r0, _08014158 @ =gUnknown_2022B4C + ldr r0, _08014158 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -8454,10 +8454,10 @@ _08014114: strb r0, [r1] bl _08014C4E .align 2, 0 -_08014150: .4byte gUnknown_2023BC4 -_08014154: .4byte gUnknown_2023FE8 -_08014158: .4byte gUnknown_2022B4C -_0801415C: .4byte gUnknown_825E45C +_08014150: .4byte gActiveBattler +_08014154: .4byte gBattleStruct +_08014158: .4byte gBattleTypeFlags +_0801415C: .4byte gBitTable _08014160: .4byte gUnknown_2023E82 _08014164: .4byte gUnknown_2023D7C _08014168: @@ -8470,7 +8470,7 @@ _08014168: .align 2, 0 _08014178: .4byte gUnknown_2023E82 _0801417C: - ldr r1, _080141B0 @ =gUnknown_2023BE4 + ldr r1, _080141B0 @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r1, 0x50 @@ -8497,7 +8497,7 @@ _0801419C: strb r1, [r0] bl _08014C4E .align 2, 0 -_080141B0: .4byte gUnknown_2023BE4 +_080141B0: .4byte gBattleMons _080141B4: .4byte gUnknown_2023D7C _080141B8: .4byte gUnknown_2023E82 _080141BC: @@ -8516,8 +8516,8 @@ _080141D4: .4byte gUnknown_2023D7C _080141D8: .4byte gUnknown_20233C4 _080141DC: ldr r4, _08014234 @ =gUnknown_2023BC8 - ldr r1, _08014238 @ =gUnknown_825E45C - ldr r3, _0801423C @ =gUnknown_2023BC4 + ldr r1, _08014238 @ =gBitTable + ldr r3, _0801423C @ =gActiveBattler ldrb r5, [r3] lsls r0, r5, 2 adds r0, r1 @@ -8561,8 +8561,8 @@ _08014228: mov pc, r0 .align 2, 0 _08014234: .4byte gUnknown_2023BC8 -_08014238: .4byte gUnknown_825E45C -_0801423C: .4byte gUnknown_2023BC4 +_08014238: .4byte gBitTable +_0801423C: .4byte gActiveBattler _08014240: .4byte gUnknown_2023D7C _08014244: .4byte gUnknown_20233C4 _08014248: .4byte _0801424C @@ -8587,14 +8587,14 @@ _08014280: cmp r0, 0 beq _080142D8 ldr r0, _080142C8 @ =gUnknown_2023E82 - ldr r3, _080142CC @ =gUnknown_2023BC4 + ldr r3, _080142CC @ =gActiveBattler ldrb r1, [r3] adds r1, r0 movs r4, 0 movs r0, 0x5 strb r0, [r1] ldrb r1, [r3] - ldr r2, _080142D0 @ =gUnknown_2023FE8 + ldr r2, _080142D0 @ =gBattleStruct ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -8617,12 +8617,12 @@ _08014280: bl _08014C78 .align 2, 0 _080142C8: .4byte gUnknown_2023E82 -_080142CC: .4byte gUnknown_2023BC4 -_080142D0: .4byte gUnknown_2023FE8 +_080142CC: .4byte gActiveBattler +_080142D0: .4byte gBattleStruct _080142D4: .4byte gUnknown_20233C4 _080142D8: - ldr r3, _08014318 @ =gUnknown_2023E0C - ldr r5, _0801431C @ =gUnknown_2023BC4 + ldr r3, _08014318 @ =gDisableStructs + ldr r5, _0801431C @ =gActiveBattler ldrb r4, [r5] lsls r0, r4, 3 subs r0, r4 @@ -8636,7 +8636,7 @@ _080142D8: adds r0, r1 strh r2, [r0] ldrb r2, [r5] - ldr r0, _08014324 @ =gUnknown_2023FE8 + ldr r0, _08014324 @ =gBattleStruct ldr r1, [r0] adds r1, r2, r1 adds r1, 0x80 @@ -8653,14 +8653,14 @@ _080142D8: strb r1, [r0] bl _08014C78 .align 2, 0 -_08014318: .4byte gUnknown_2023E0C -_0801431C: .4byte gUnknown_2023BC4 +_08014318: .4byte gDisableStructs +_0801431C: .4byte gActiveBattler _08014320: .4byte gUnknown_2023DC4 -_08014324: .4byte gUnknown_2023FE8 +_08014324: .4byte gBattleStruct _08014328: .4byte gUnknown_2023E82 _0801432C: add r2, sp, 0x4 - ldr r3, _080143CC @ =gUnknown_2023BE4 + ldr r3, _080143CC @ =gBattleMons movs r1, 0x58 adds r0, r4, 0 muls r0, r1 @@ -8729,7 +8729,7 @@ _0801436E: adds r4, 0x1 cmp r4, 0x3 ble _0801436E - ldr r0, _080143D0 @ =gUnknown_2022B4C + ldr r0, _080143D0 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x1 ands r1, r0 @@ -8739,10 +8739,10 @@ _0801436E: bl EmitChooseMove b _0801460E .align 2, 0 -_080143CC: .4byte gUnknown_2023BE4 -_080143D0: .4byte gUnknown_2022B4C +_080143CC: .4byte gBattleMons +_080143D0: .4byte gBattleTypeFlags _080143D4: - ldr r0, _08014410 @ =gUnknown_2022B4C + ldr r0, _08014410 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _08014414 @ =0x00000902 ands r0, r1 @@ -8763,7 +8763,7 @@ _080143D4: strb r0, [r1] mov r0, r8 ldrb r1, [r0] - ldr r2, _08014424 @ =gUnknown_2023FE8 + ldr r2, _08014424 @ =gBattleStruct ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -8772,15 +8772,15 @@ _080143D4: ldrb r0, [r1] b _0801472C .align 2, 0 -_08014410: .4byte gUnknown_2022B4C +_08014410: .4byte gBattleTypeFlags _08014414: .4byte 0x00000902 _08014418: .4byte gUnknown_2023D80 _0801441C: .4byte gUnknown_81D96A4 _08014420: .4byte gUnknown_2023E82 -_08014424: .4byte gUnknown_2023FE8 +_08014424: .4byte gBattleStruct _08014428: - ldr r2, _08014448 @ =gUnknown_2023FE8 - ldr r4, _0801444C @ =gUnknown_2023BC4 + ldr r2, _08014448 @ =gBattleStruct + ldr r4, _0801444C @ =gActiveBattler ldrb r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -8793,21 +8793,21 @@ _08014428: bl MarkBufferBankForExecution b _080146AC .align 2, 0 -_08014448: .4byte gUnknown_2023FE8 -_0801444C: .4byte gUnknown_2023BC4 +_08014448: .4byte gBattleStruct +_0801444C: .4byte gActiveBattler _08014450: - ldr r5, _080144A8 @ =gUnknown_2023BC4 + ldr r5, _080144A8 @ =gActiveBattler ldrb r0, [r5] - ldr r3, _080144AC @ =gUnknown_2023FE8 + ldr r3, _080144AC @ =gBattleStruct ldr r1, [r3] adds r1, r0, r1 adds r1, 0x58 - ldr r2, _080144B0 @ =gUnknown_2023BCE + ldr r2, _080144B0 @ =gBattlerPartyIndexes lsls r0, 1 adds r0, r2 ldrh r0, [r0] strb r0, [r1] - ldr r7, _080144B4 @ =gUnknown_2023BE4 + ldr r7, _080144B4 @ =gBattleMons ldrb r2, [r5] movs r6, 0x58 adds r0, r2, 0 @@ -8820,7 +8820,7 @@ _08014450: ands r0, r1 cmp r0, 0 bne _08014492 - ldr r0, _080144BC @ =gUnknown_2023DFC + ldr r0, _080144BC @ =gStatuses3 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -8841,12 +8841,12 @@ _08014492: movs r2, 0x6 b _080145DE .align 2, 0 -_080144A8: .4byte gUnknown_2023BC4 -_080144AC: .4byte gUnknown_2023FE8 -_080144B0: .4byte gUnknown_2023BCE -_080144B4: .4byte gUnknown_2023BE4 +_080144A8: .4byte gActiveBattler +_080144AC: .4byte gBattleStruct +_080144B0: .4byte gBattlerPartyIndexes +_080144B4: .4byte gBattleMons _080144B8: .4byte 0x0400e000 -_080144BC: .4byte gUnknown_2023DFC +_080144BC: .4byte gStatuses3 _080144C0: str r1, [sp] movs r0, 0xC @@ -8887,7 +8887,7 @@ _080144C0: cmp r0, 0x1A bne _08014548 _08014510: - ldr r5, _08014574 @ =gUnknown_2023BC4 + ldr r5, _08014574 @ =gActiveBattler ldrb r1, [r5] movs r0, 0 str r0, [sp] @@ -8899,7 +8899,7 @@ _08014510: lsrs r4, r0, 24 cmp r4, 0 beq _08014584 - ldr r2, _08014578 @ =gUnknown_2023BE4 + ldr r2, _08014578 @ =gBattleMons ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -8923,8 +8923,8 @@ _08014548: lsrs r1, 24 ldr r0, _0801457C @ =gUnknown_2023D6A ldrb r3, [r0] - ldr r4, _08014580 @ =gUnknown_2023FE8 - ldr r0, _08014574 @ =gUnknown_2023BC4 + ldr r4, _08014580 @ =gBattleStruct + ldr r0, _08014574 @ =gActiveBattler ldrb r0, [r0] lsls r2, r0, 1 adds r2, r0 @@ -8937,12 +8937,12 @@ _08014548: bl EmitChoosePokemon b _0801460E .align 2, 0 -_08014574: .4byte gUnknown_2023BC4 -_08014578: .4byte gUnknown_2023BE4 +_08014574: .4byte gActiveBattler +_08014578: .4byte gBattleMons _0801457C: .4byte gUnknown_2023D6A -_08014580: .4byte gUnknown_2023FE8 +_08014580: .4byte gBattleStruct _08014584: - ldr r0, _080145A8 @ =gUnknown_2023BC4 + ldr r0, _080145A8 @ =gActiveBattler ldrb r1, [r0] mov r8, r0 cmp r1, 0x2 @@ -8951,7 +8951,7 @@ _08014584: ldrb r0, [r0] cmp r0, 0x2 bne _080145B4 - ldr r0, _080145B0 @ =gUnknown_2023FE8 + ldr r0, _080145B0 @ =gBattleStruct ldr r3, [r0] adds r0, r3, 0 adds r0, 0x5C @@ -8960,9 +8960,9 @@ _08014584: ldrb r1, [r0] b _080145D0 .align 2, 0 -_080145A8: .4byte gUnknown_2023BC4 +_080145A8: .4byte gActiveBattler _080145AC: .4byte gUnknown_2023D7C -_080145B0: .4byte gUnknown_2023FE8 +_080145B0: .4byte gBattleStruct _080145B4: mov r1, r8 ldrb r0, [r1] @@ -8972,7 +8972,7 @@ _080145B4: ldrb r0, [r0, 0x1] cmp r0, 0x2 bne _080145F0 - ldr r0, _080145EC @ =gUnknown_2023FE8 + ldr r0, _080145EC @ =gBattleStruct ldr r3, [r0] adds r0, r3, 0 adds r0, 0x5D @@ -8992,10 +8992,10 @@ _080145DE: b _0801460E .align 2, 0 _080145E8: .4byte gUnknown_2023D7C -_080145EC: .4byte gUnknown_2023FE8 +_080145EC: .4byte gBattleStruct _080145F0: - ldr r2, _08014618 @ =gUnknown_2023FE8 - ldr r0, _0801461C @ =gUnknown_2023BC4 + ldr r2, _08014618 @ =gBattleStruct + ldr r0, _0801461C @ =gActiveBattler ldrb r0, [r0] lsls r1, r0, 1 adds r1, r0 @@ -9009,20 +9009,20 @@ _080145F0: movs r3, 0 bl EmitChoosePokemon _0801460E: - ldr r0, _0801461C @ =gUnknown_2023BC4 + ldr r0, _0801461C @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution b _080146AC .align 2, 0 -_08014618: .4byte gUnknown_2023FE8 -_0801461C: .4byte gUnknown_2023BC4 +_08014618: .4byte gBattleStruct +_0801461C: .4byte gActiveBattler _08014620: bl IsPlayerPartyAndPokemonStorageFull lsls r0, 24 cmp r0, 0 beq _080146AC ldr r1, _0801465C @ =gUnknown_2023D80 - ldr r3, _08014660 @ =gUnknown_2023BC4 + ldr r3, _08014660 @ =gActiveBattler ldrb r0, [r3] lsls r0, 2 adds r0, r1 @@ -9035,7 +9035,7 @@ _08014620: movs r0, 0x5 strb r0, [r1] ldrb r1, [r3] - ldr r2, _0801466C @ =gUnknown_2023FE8 + ldr r2, _0801466C @ =gBattleStruct ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -9048,10 +9048,10 @@ _08014620: b _08014C78 .align 2, 0 _0801465C: .4byte gUnknown_2023D80 -_08014660: .4byte gUnknown_2023BC4 +_08014660: .4byte gActiveBattler _08014664: .4byte gUnknown_81D8949 _08014668: .4byte gUnknown_2023E82 -_0801466C: .4byte gUnknown_2023FE8 +_0801466C: .4byte gBattleStruct _08014670: ldr r4, _080146A8 @ =gUnknown_2023E82 mov r2, r8 @@ -9080,14 +9080,14 @@ _08014670: .align 2, 0 _080146A8: .4byte gUnknown_2023E82 _080146AC: - ldr r0, _080146D8 @ =gUnknown_2022B4C + ldr r0, _080146D8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0xA ands r0, r1 cmp r0, 0x8 bne _080146EC ldr r0, _080146DC @ =gUnknown_20233C4 - ldr r4, _080146E0 @ =gUnknown_2023BC4 + ldr r4, _080146E0 @ =gActiveBattler ldrb r1, [r4] lsls r1, 9 adds r0, 0x1 @@ -9102,9 +9102,9 @@ _080146AC: adds r0, r1 b _08014926 .align 2, 0 -_080146D8: .4byte gUnknown_2022B4C +_080146D8: .4byte gBattleTypeFlags _080146DC: .4byte gUnknown_20233C4 -_080146E0: .4byte gUnknown_2023BC4 +_080146E0: .4byte gActiveBattler _080146E4: .4byte gUnknown_81D8924 _080146E8: .4byte gUnknown_2023E82 _080146EC: @@ -9113,7 +9113,7 @@ _080146EC: cmp r0, 0 beq _08014750 ldr r0, _08014738 @ =gUnknown_20233C4 - ldr r4, _0801473C @ =gUnknown_2023BC4 + ldr r4, _0801473C @ =gActiveBattler ldrb r2, [r4] lsls r1, r2, 9 adds r0, 0x1 @@ -9133,7 +9133,7 @@ _080146EC: movs r0, 0x5 strb r0, [r1] ldrb r1, [r4] - ldr r2, _0801474C @ =gUnknown_2023FE8 + ldr r2, _0801474C @ =gBattleStruct ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -9147,24 +9147,24 @@ _0801472C: b _08014C78 .align 2, 0 _08014738: .4byte gUnknown_20233C4 -_0801473C: .4byte gUnknown_2023BC4 +_0801473C: .4byte gActiveBattler _08014740: .4byte gUnknown_2023D80 _08014744: .4byte gUnknown_81D8943 _08014748: .4byte gUnknown_2023E82 -_0801474C: .4byte gUnknown_2023FE8 +_0801474C: .4byte gBattleStruct _08014750: ldr r2, _0801475C @ =gUnknown_2023E82 - ldr r0, _08014760 @ =gUnknown_2023BC4 + ldr r0, _08014760 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 _0801475C: .4byte gUnknown_2023E82 -_08014760: .4byte gUnknown_2023BC4 +_08014760: .4byte gActiveBattler _08014764: ldr r4, _080147A8 @ =gUnknown_2023BC8 - ldr r1, _080147AC @ =gUnknown_825E45C - ldr r3, _080147B0 @ =gUnknown_2023BC4 + ldr r1, _080147AC @ =gBitTable + ldr r3, _080147B0 @ =gActiveBattler ldrb r5, [r3] lsls r0, r5, 2 adds r0, r1 @@ -9200,8 +9200,8 @@ _0801479E: mov pc, r0 .align 2, 0 _080147A8: .4byte gUnknown_2023BC8 -_080147AC: .4byte gUnknown_825E45C -_080147B0: .4byte gUnknown_2023BC4 +_080147AC: .4byte gBitTable +_080147B0: .4byte gActiveBattler _080147B4: .4byte gUnknown_2023D7C _080147B8: .4byte _080147BC .align 2, 0 @@ -9269,7 +9269,7 @@ _08014838: movs r0, 0x5 strb r0, [r1] ldrb r1, [r5] - ldr r2, _08014878 @ =gUnknown_2023FE8 + ldr r2, _08014878 @ =gBattleStruct ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -9288,11 +9288,11 @@ _08014838: b _08014C78 .align 2, 0 _08014874: .4byte gUnknown_2023E82 -_08014878: .4byte gUnknown_2023FE8 +_08014878: .4byte gBattleStruct _0801487C: mov r2, r8 ldrb r0, [r2] - ldr r4, _080148C8 @ =gUnknown_2023FE8 + ldr r4, _080148C8 @ =gBattleStruct ldr r1, [r4] adds r1, r0, r1 adds r1, 0x80 @@ -9304,7 +9304,7 @@ _0801487C: ldrb r2, [r2] lsls r5, r2, 1 adds r5, r0 - ldr r3, _080148D0 @ =gUnknown_2023BE4 + ldr r3, _080148D0 @ =gBattleMons ldr r4, [r4] adds r0, r2, r4 adds r0, 0x80 @@ -9328,13 +9328,13 @@ _0801487C: ldrb r1, [r3] b _08014B30 .align 2, 0 -_080148C8: .4byte gUnknown_2023FE8 +_080148C8: .4byte gBattleStruct _080148CC: .4byte gUnknown_2023DC4 -_080148D0: .4byte gUnknown_2023BE4 +_080148D0: .4byte gBattleMons _080148D4: .4byte gUnknown_2023E82 _080148D8: ldr r2, _08014900 @ =gUnknown_20233C4 - ldr r5, _08014904 @ =gUnknown_2023BC4 + ldr r5, _08014904 @ =gActiveBattler ldrb r4, [r5] lsls r1, r4, 9 adds r0, r2, 0x1 @@ -9356,12 +9356,12 @@ _080148F6: b _08014B30 .align 2, 0 _08014900: .4byte gUnknown_20233C4 -_08014904: .4byte gUnknown_2023BC4 +_08014904: .4byte gActiveBattler _08014908: .4byte gUnknown_2023D68 _0801490C: .4byte gUnknown_2023E82 _08014910: ldr r6, _0801492C @ =gUnknown_20233C4 - ldr r7, _08014930 @ =gUnknown_2023BC4 + ldr r7, _08014930 @ =gActiveBattler ldrb r2, [r7] lsls r0, r2, 9 adds r1, r6, 0x1 @@ -9377,16 +9377,16 @@ _08014926: b _08014C4E .align 2, 0 _0801492C: .4byte gUnknown_20233C4 -_08014930: .4byte gUnknown_2023BC4 +_08014930: .4byte gActiveBattler _08014934: .4byte gUnknown_2023E82 _08014938: - ldr r0, _080149FC @ =gUnknown_2023FE8 + ldr r0, _080149FC @ =gBattleStruct mov r12, r0 ldr r0, [r0] adds r0, r2, r0 adds r0, 0x5C strb r1, [r0] - ldr r0, _08014A00 @ =gUnknown_2022B4C + ldr r0, _08014A00 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -9480,8 +9480,8 @@ _080149F6: ldrb r1, [r7] b _08014B30 .align 2, 0 -_080149FC: .4byte gUnknown_2023FE8 -_08014A00: .4byte gUnknown_2022B4C +_080149FC: .4byte gBattleStruct +_08014A00: .4byte gBattleTypeFlags _08014A04: .4byte gUnknown_2023E82 _08014A08: ldr r2, _08014A20 @ =gUnknown_2023DD0 @@ -9491,41 +9491,41 @@ _08014A08: orrs r0, r1 str r0, [r2] ldr r2, _08014A24 @ =gUnknown_2023E82 - ldr r0, _08014A28 @ =gUnknown_2023BC4 + ldr r0, _08014A28 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 _08014A20: .4byte gUnknown_2023DD0 _08014A24: .4byte gUnknown_2023E82 -_08014A28: .4byte gUnknown_2023BC4 +_08014A28: .4byte gActiveBattler _08014A2C: ldr r2, _08014A38 @ =gUnknown_2023E82 - ldr r0, _08014A3C @ =gUnknown_2023BC4 + ldr r0, _08014A3C @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 _08014A38: .4byte gUnknown_2023E82 -_08014A3C: .4byte gUnknown_2023BC4 +_08014A3C: .4byte gActiveBattler _08014A40: ldr r2, _08014A4C @ =gUnknown_2023E82 - ldr r0, _08014A50 @ =gUnknown_2023BC4 + ldr r0, _08014A50 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 _08014A4C: .4byte gUnknown_2023E82 -_08014A50: .4byte gUnknown_2023BC4 +_08014A50: .4byte gActiveBattler _08014A54: ldr r2, _08014A60 @ =gUnknown_2023E82 - ldr r0, _08014A64 @ =gUnknown_2023BC4 + ldr r0, _08014A64 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 _08014A60: .4byte gUnknown_2023E82 -_08014A64: .4byte gUnknown_2023BC4 +_08014A64: .4byte gActiveBattler _08014A68: ldr r2, _08014A80 @ =gUnknown_2023DD0 ldr r0, [r2] @@ -9534,27 +9534,27 @@ _08014A68: orrs r0, r1 str r0, [r2] ldr r2, _08014A84 @ =gUnknown_2023E82 - ldr r0, _08014A88 @ =gUnknown_2023BC4 + ldr r0, _08014A88 @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 _08014A80: .4byte gUnknown_2023DD0 _08014A84: .4byte gUnknown_2023E82 -_08014A88: .4byte gUnknown_2023BC4 +_08014A88: .4byte gActiveBattler _08014A8C: ldr r2, _08014A98 @ =gUnknown_2023E82 - ldr r0, _08014A9C @ =gUnknown_2023BC4 + ldr r0, _08014A9C @ =gActiveBattler ldrb r1, [r0] adds r1, r2 b _08014B32 .align 2, 0 _08014A98: .4byte gUnknown_2023E82 -_08014A9C: .4byte gUnknown_2023BC4 +_08014A9C: .4byte gActiveBattler _08014AA0: ldr r3, _08014B08 @ =gUnknown_2023BC8 - ldr r4, _08014B0C @ =gUnknown_825E45C - ldr r0, _08014B10 @ =gUnknown_2023BC4 + ldr r4, _08014B0C @ =gBitTable + ldr r0, _08014B10 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r4 @@ -9574,7 +9574,7 @@ _08014AA0: beq _08014ACA b _08014C4E _08014ACA: - ldr r0, _08014B14 @ =gUnknown_2022B4C + ldr r0, _08014B14 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x41 ands r0, r1 @@ -9588,7 +9588,7 @@ _08014ACA: adds r0, r5, 0 eors r0, r1 bl GetBankByIdentity - ldr r1, _08014B18 @ =gUnknown_2023FE8 + ldr r1, _08014B18 @ =gBattleStruct ldr r1, [r1] adds r1, 0x91 ldrb r1, [r1] @@ -9606,16 +9606,16 @@ _08014AFE: b _08014B24 .align 2, 0 _08014B08: .4byte gUnknown_2023BC8 -_08014B0C: .4byte gUnknown_825E45C -_08014B10: .4byte gUnknown_2023BC4 -_08014B14: .4byte gUnknown_2022B4C -_08014B18: .4byte gUnknown_2023FE8 +_08014B0C: .4byte gBitTable +_08014B10: .4byte gActiveBattler +_08014B14: .4byte gBattleTypeFlags +_08014B18: .4byte gBattleStruct _08014B1C: movs r0, 0 movs r1, 0x1 bl EmitLinkStandbyMsg _08014B24: - ldr r4, _08014B3C @ =gUnknown_2023BC4 + ldr r4, _08014B3C @ =gActiveBattler _08014B26: ldrb r0, [r4] bl MarkBufferBankForExecution @@ -9629,12 +9629,12 @@ _08014B32: strb r0, [r1] b _08014C4E .align 2, 0 -_08014B3C: .4byte gUnknown_2023BC4 +_08014B3C: .4byte gActiveBattler _08014B40: .4byte gUnknown_2023E82 _08014B44: ldr r3, _08014B78 @ =gUnknown_2023BC8 - ldr r1, _08014B7C @ =gUnknown_825E45C - ldr r0, _08014B80 @ =gUnknown_2023BC4 + ldr r1, _08014B7C @ =gBitTable + ldr r0, _08014B80 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -9659,13 +9659,13 @@ _08014B44: b _08014C4E .align 2, 0 _08014B78: .4byte gUnknown_2023BC8 -_08014B7C: .4byte gUnknown_825E45C -_08014B80: .4byte gUnknown_2023BC4 +_08014B7C: .4byte gBitTable +_08014B80: .4byte gActiveBattler _08014B84: .4byte gUnknown_2023E82 _08014B88: - ldr r5, _08014BA8 @ =gUnknown_2023BC4 + ldr r5, _08014BA8 @ =gActiveBattler ldrb r2, [r5] - ldr r0, _08014BAC @ =gUnknown_2023FE8 + ldr r0, _08014BAC @ =gBattleStruct ldr r0, [r0] adds r1, r2, r0 adds r0, r1, 0 @@ -9680,11 +9680,11 @@ _08014B88: strb r1, [r0] b _08014C4E .align 2, 0 -_08014BA8: .4byte gUnknown_2023BC4 -_08014BAC: .4byte gUnknown_2023FE8 +_08014BA8: .4byte gActiveBattler +_08014BAC: .4byte gBattleStruct _08014BB0: .4byte gUnknown_2023E82 _08014BB4: - ldr r0, _08014C08 @ =gUnknown_2023D6B + ldr r0, _08014C08 @ =sBattler_AI strb r2, [r0] ldr r7, _08014C0C @ =gUnknown_2023D74 ldr r6, _08014C10 @ =gUnknown_2023D80 @@ -9694,7 +9694,7 @@ _08014BB4: ldr r4, [r0] str r4, [r7] ldr r3, _08014C14 @ =gUnknown_2023BC8 - ldr r1, _08014C18 @ =gUnknown_825E45C + ldr r1, _08014C18 @ =gBitTable ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -9726,16 +9726,16 @@ _08014BFA: str r1, [r0] b _08014C4E .align 2, 0 -_08014C08: .4byte gUnknown_2023D6B +_08014C08: .4byte sBattler_AI _08014C0C: .4byte gUnknown_2023D74 _08014C10: .4byte gUnknown_2023D80 _08014C14: .4byte gUnknown_2023BC8 -_08014C18: .4byte gUnknown_825E45C +_08014C18: .4byte gBitTable _08014C1C: .4byte gUnknown_825011C _08014C20: ldr r3, _08014C88 @ =gUnknown_2023BC8 - ldr r1, _08014C8C @ =gUnknown_825E45C - ldr r0, _08014C90 @ =gUnknown_2023BC4 + ldr r1, _08014C8C @ =gBitTable + ldr r0, _08014C90 @ =gActiveBattler ldrb r4, [r0] lsls r0, r4, 2 adds r0, r1 @@ -9758,7 +9758,7 @@ _08014C48: adds r0, r4, r0 strb r3, [r0] _08014C4E: - ldr r0, _08014C90 @ =gUnknown_2023BC4 + ldr r0, _08014C90 @ =gActiveBattler ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] @@ -9790,8 +9790,8 @@ _08014C78: bx r0 .align 2, 0 _08014C88: .4byte gUnknown_2023BC8 -_08014C8C: .4byte gUnknown_825E45C -_08014C90: .4byte gUnknown_2023BC4 +_08014C8C: .4byte gBitTable +_08014C90: .4byte gActiveBattler _08014C94: .4byte gUnknown_2023E82 _08014C98: .4byte gUnknown_2023BCC _08014C9C: .4byte gUnknown_3004F84 @@ -9865,7 +9865,7 @@ GetWhoStrikesFirst: @ 8014CD8 lsls r0, 24 cmp r0, 0 bne _08014DA0 - ldr r1, _08014D58 @ =gUnknown_2023BE4 + ldr r1, _08014D58 @ =gBattleMons movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -9875,7 +9875,7 @@ GetWhoStrikesFirst: @ 8014CD8 ldrb r3, [r0] cmp r3, 0x21 bne _08014D44 - ldr r0, _08014D5C @ =gUnknown_2023F1C + ldr r0, _08014D5C @ =gBattleWeather ldrh r1, [r0] movs r0, 0x7 ands r0, r1 @@ -9884,7 +9884,7 @@ GetWhoStrikesFirst: @ 8014CD8 _08014D44: cmp r3, 0x22 bne _08014D60 - ldr r0, _08014D5C @ =gUnknown_2023F1C + ldr r0, _08014D5C @ =gBattleWeather ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -9894,8 +9894,8 @@ _08014D54: movs r3, 0x2 b _08014D62 .align 2, 0 -_08014D58: .4byte gUnknown_2023BE4 -_08014D5C: .4byte gUnknown_2023F1C +_08014D58: .4byte gBattleMons +_08014D5C: .4byte gBattleWeather _08014D60: movs r3, 0x1 _08014D62: @@ -9903,13 +9903,13 @@ _08014D62: mov r1, r10 muls r1, r0 adds r0, r1, 0 - ldr r2, _08014D98 @ =gUnknown_2023BE4 + ldr r2, _08014D98 @ =gBattleMons adds r0, r2 adds r0, 0x20 ldrb r2, [r0] cmp r2, 0x21 bne _08014D82 - ldr r0, _08014D9C @ =gUnknown_2023F1C + ldr r0, _08014D9C @ =gBattleWeather ldrh r1, [r0] movs r0, 0x7 ands r0, r1 @@ -9918,7 +9918,7 @@ _08014D62: _08014D82: cmp r2, 0x22 bne _08014DA2 - ldr r0, _08014D9C @ =gUnknown_2023F1C + ldr r0, _08014D9C @ =gBattleWeather ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -9928,14 +9928,14 @@ _08014D92: movs r7, 0x2 b _08014DA4 .align 2, 0 -_08014D98: .4byte gUnknown_2023BE4 -_08014D9C: .4byte gUnknown_2023F1C +_08014D98: .4byte gBattleMons +_08014D9C: .4byte gBattleWeather _08014DA0: movs r3, 0x1 _08014DA2: movs r7, 0x1 _08014DA4: - ldr r1, _08014DE8 @ =gUnknown_2023BE4 + ldr r1, _08014DE8 @ =gBattleMons movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -9968,7 +9968,7 @@ _08014DA4: ldrb r5, [r0, 0x1A] b _08014E08 .align 2, 0 -_08014DE8: .4byte gUnknown_2023BE4 +_08014DE8: .4byte gBattleMons _08014DEC: .4byte gUnknown_825DEAD _08014DF0: .4byte gUnknown_2023F54 _08014DF4: @@ -9981,7 +9981,7 @@ _08014DF4: lsls r0, 24 lsrs r5, r0, 24 _08014E08: - ldr r0, _08014EC4 @ =gUnknown_2022B4C + ldr r0, _08014EC4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -10011,7 +10011,7 @@ _08014E3C: lsrs r2, 1 mov r8, r2 _08014E46: - ldr r1, _08014ECC @ =gUnknown_2023BE4 + ldr r1, _08014ECC @ =gBattleMons movs r0, 0x58 mov r3, r9 muls r3, r0 @@ -10041,7 +10041,7 @@ _08014E64: negs r1, r1 mov r8, r1 _08014E80: - ldr r1, _08014ECC @ =gUnknown_2023BE4 + ldr r1, _08014ECC @ =gBattleMons movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -10075,9 +10075,9 @@ _08014E80: ldrb r5, [r0, 0x1A] b _08014EF0 .align 2, 0 -_08014EC4: .4byte gUnknown_2022B4C +_08014EC4: .4byte gBattleTypeFlags _08014EC8: .4byte 0x00000822 -_08014ECC: .4byte gUnknown_2023BE4 +_08014ECC: .4byte gBattleMons _08014ED0: .4byte gUnknown_2023E80 _08014ED4: .4byte gUnknown_825DEAD _08014ED8: .4byte gUnknown_2023F54 @@ -10091,7 +10091,7 @@ _08014EDC: lsls r0, 24 lsrs r5, r0, 24 _08014EF0: - ldr r0, _08014F68 @ =gUnknown_2022B4C + ldr r0, _08014F68 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -10117,7 +10117,7 @@ _08014F20: bne _08014F26 lsrs r7, 1 _08014F26: - ldr r2, _08014F70 @ =gUnknown_2023BE4 + ldr r2, _08014F70 @ =gBattleMons movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -10151,9 +10151,9 @@ _08014F5C: movs r3, 0 b _08015014 .align 2, 0 -_08014F68: .4byte gUnknown_2022B4C +_08014F68: .4byte gBattleTypeFlags _08014F6C: .4byte 0x00000822 -_08014F70: .4byte gUnknown_2023BE4 +_08014F70: .4byte gBattleMons _08014F74: .4byte gUnknown_2023E80 _08014F78: ldr r0, _08014F98 @ =gUnknown_2023D7C @@ -10176,7 +10176,7 @@ _08014F78: _08014F98: .4byte gUnknown_2023D7C _08014F9C: .4byte gUnknown_2023E8C _08014FA0: - ldr r0, _08014FC0 @ =gUnknown_2023FE8 + ldr r0, _08014FC0 @ =gBattleStruct ldr r0, [r0] add r0, r9 adds r0, 0x80 @@ -10187,14 +10187,14 @@ _08014FA0: muls r3, r1 adds r1, r3, 0 adds r0, r1 - ldr r1, _08014FC4 @ =gUnknown_2023BE4 + ldr r1, _08014FC4 @ =gBattleMons adds r1, 0xC adds r0, r1 ldrh r3, [r0] b _08014FCA .align 2, 0 -_08014FC0: .4byte gUnknown_2023FE8 -_08014FC4: .4byte gUnknown_2023BE4 +_08014FC0: .4byte gBattleStruct +_08014FC4: .4byte gBattleMons _08014FC8: movs r3, 0 _08014FCA: @@ -10215,7 +10215,7 @@ _08014FCA: .align 2, 0 _08014FE8: .4byte gUnknown_2023E8C _08014FEC: - ldr r0, _0801500C @ =gUnknown_2023FE8 + ldr r0, _0801500C @ =gBattleStruct ldr r0, [r0] add r0, r10 adds r0, 0x80 @@ -10226,18 +10226,18 @@ _08014FEC: muls r2, r1 adds r1, r2, 0 adds r0, r1 - ldr r1, _08015010 @ =gUnknown_2023BE4 + ldr r1, _08015010 @ =gBattleMons adds r1, 0xC adds r0, r1 ldrh r2, [r0] b _08015016 .align 2, 0 -_0801500C: .4byte gUnknown_2023FE8 -_08015010: .4byte gUnknown_2023BE4 +_0801500C: .4byte gBattleStruct +_08015010: .4byte gBattleMons _08015014: movs r2, 0 _08015016: - ldr r4, _08015060 @ =gUnknown_8250C04 + ldr r4, _08015060 @ =gBattleMoves lsls r0, r3, 1 adds r0, r3 lsls r0, 2 @@ -10274,7 +10274,7 @@ _0801503A: movs r3, 0x2 b _08015094 .align 2, 0 -_08015060: .4byte gUnknown_8250C04 +_08015060: .4byte gBattleMoves _08015064: cmp r8, r7 bcs _08015096 @@ -10324,13 +10324,13 @@ sub_80150A8: @ 80150A8 mov r5, r8 push {r5-r7} movs r3, 0 - ldr r0, _080150FC @ =gUnknown_2022B4C + ldr r0, _080150FC @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _08015114 - ldr r0, _08015100 @ =gUnknown_2023BC4 + ldr r0, _08015100 @ =gActiveBattler strb r3, [r0] ldr r4, _08015104 @ =gUnknown_2023BCC mov r8, r0 @@ -10363,8 +10363,8 @@ _080150D8: bcc _080150D8 b _080152FA .align 2, 0 -_080150FC: .4byte gUnknown_2022B4C -_08015100: .4byte gUnknown_2023BC4 +_080150FC: .4byte gBattleTypeFlags +_08015100: .4byte gActiveBattler _08015104: .4byte gUnknown_2023BCC _08015108: .4byte gUnknown_2023BDA _0801510C: .4byte gUnknown_2023D7C @@ -10374,7 +10374,7 @@ _08015114: ands r1, r0 cmp r1, 0 beq _08015164 - ldr r0, _08015158 @ =gUnknown_2023BC4 + ldr r0, _08015158 @ =gActiveBattler strb r3, [r0] ldr r1, _0801515C @ =gUnknown_2023BCC mov r8, r0 @@ -10405,13 +10405,13 @@ _08015136: bne _08015136 b _08015172 .align 2, 0 -_08015158: .4byte gUnknown_2023BC4 +_08015158: .4byte gActiveBattler _0801515C: .4byte gUnknown_2023BCC _08015160: .4byte gUnknown_2023D7C _08015164: ldr r0, _080151D8 @ =gUnknown_2023D7C ldrb r0, [r0] - ldr r2, _080151DC @ =gUnknown_2023BC4 + ldr r2, _080151DC @ =gActiveBattler mov r8, r2 cmp r0, 0x3 bne _08015174 @@ -10438,7 +10438,7 @@ _08015174: mov r10, r7 ldr r0, _080151EC @ =CheckFocusPunch_ClearVarsBeforeTurnStarts mov r12, r0 - ldr r1, _080151F0 @ =gUnknown_2023FE8 + ldr r1, _080151F0 @ =gBattleStruct mov r9, r1 ldr r7, _080151F4 @ =gUnknown_2023BCC ldrb r7, [r7] @@ -10474,12 +10474,12 @@ _080151CC: b _08015304 .align 2, 0 _080151D8: .4byte gUnknown_2023D7C -_080151DC: .4byte gUnknown_2023BC4 +_080151DC: .4byte gActiveBattler _080151E0: .4byte gUnknown_2023BDA _080151E4: .4byte gUnknown_2023BDE _080151E8: .4byte gUnknown_3004F84 _080151EC: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts -_080151F0: .4byte gUnknown_2023FE8 +_080151F0: .4byte gBattleStruct _080151F4: .4byte gUnknown_2023BCC _080151F8: movs r0, 0 @@ -10620,7 +10620,7 @@ _080152FA: ldr r1, _08015324 @ =gUnknown_3004F84 ldr r0, _08015328 @ =CheckFocusPunch_ClearVarsBeforeTurnStarts str r0, [r1] - ldr r0, _0801532C @ =gUnknown_2023FE8 + ldr r0, _0801532C @ =gBattleStruct ldr r0, [r0] _08015304: adds r0, 0x48 @@ -10639,7 +10639,7 @@ _0801531C: .4byte gUnknown_2023BDE _08015320: .4byte gUnknown_2023BCC _08015324: .4byte gUnknown_3004F84 _08015328: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts -_0801532C: .4byte gUnknown_2023FE8 +_0801532C: .4byte gBattleStruct thumb_func_end sub_80150A8 thumb_func_start TurnValuesCleanUp @@ -10652,7 +10652,7 @@ TurnValuesCleanUp: @ 8015330 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _08015388 @ =gUnknown_2023BC4 + ldr r1, _08015388 @ =gActiveBattler movs r0, 0 strb r0, [r1] ldr r0, _0801538C @ =gUnknown_2023BCC @@ -10664,7 +10664,7 @@ TurnValuesCleanUp: @ 8015330 adds r6, r5, 0 ldr r0, _08015394 @ =gUnknown_2023C34 mov r12, r0 - ldr r1, _08015398 @ =gUnknown_2023E0C + ldr r1, _08015398 @ =gDisableStructs mov r8, r1 mov r10, r8 _0801535E: @@ -10689,11 +10689,11 @@ _0801535E: strb r0, [r1] b _080153F8 .align 2, 0 -_08015388: .4byte gUnknown_2023BC4 +_08015388: .4byte gActiveBattler _0801538C: .4byte gUnknown_2023BCC _08015390: .4byte gUnknown_2023E8C _08015394: .4byte gUnknown_2023C34 -_08015398: .4byte gUnknown_2023E0C +_08015398: .4byte gDisableStructs _0801539C: ldrb r0, [r6] lsls r0, 4 @@ -10791,7 +10791,7 @@ _0801544C: .4byte gUnknown_2023DE4 thumb_func_start SpecialStatusesClear SpecialStatusesClear: @ 8015450 push {r4-r6,lr} - ldr r2, _08015494 @ =gUnknown_2023BC4 + ldr r2, _08015494 @ =gActiveBattler movs r0, 0 strb r0, [r2] ldr r0, _08015498 @ =gUnknown_2023BCC @@ -10828,7 +10828,7 @@ _0801548E: pop {r0} bx r0 .align 2, 0 -_08015494: .4byte gUnknown_2023BC4 +_08015494: .4byte gActiveBattler _08015498: .4byte gUnknown_2023BCC _0801549C: .4byte gUnknown_2023ECC thumb_func_end SpecialStatusesClear @@ -10843,7 +10843,7 @@ CheckFocusPunch_ClearVarsBeforeTurnStarts: @ 80154A0 ands r0, r1 cmp r0, 0 bne _0801555E - ldr r2, _0801552C @ =gUnknown_2023FE8 + ldr r2, _0801552C @ =gBattleStruct ldr r0, [r2] adds r0, 0x48 ldr r1, _08015530 @ =gUnknown_2023BCC @@ -10853,8 +10853,8 @@ CheckFocusPunch_ClearVarsBeforeTurnStarts: @ 80154A0 ldrb r1, [r6] cmp r0, r1 bcs _0801555E - ldr r5, _08015534 @ =gUnknown_2023BC4 - ldr r4, _08015538 @ =gUnknown_2023D6B + ldr r5, _08015534 @ =gActiveBattler + ldr r4, _08015538 @ =sBattler_AI movs r7, 0x84 lsls r7, 1 _080154CC: @@ -10873,7 +10873,7 @@ _080154CC: ldrh r0, [r0] cmp r0, r7 bne _08015550 - ldr r1, _08015540 @ =gUnknown_2023BE4 + ldr r1, _08015540 @ =gBattleMons movs r0, 0x58 muls r0, r3 adds r1, 0x4C @@ -10883,7 +10883,7 @@ _080154CC: ands r0, r1 cmp r0, 0 bne _08015550 - ldr r2, _08015544 @ =gUnknown_2023E0C + ldr r2, _08015544 @ =gDisableStructs ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -10905,13 +10905,13 @@ _080154CC: b _08015598 .align 2, 0 _08015528: .4byte gUnknown_2023DD0 -_0801552C: .4byte gUnknown_2023FE8 +_0801552C: .4byte gBattleStruct _08015530: .4byte gUnknown_2023BCC -_08015534: .4byte gUnknown_2023BC4 -_08015538: .4byte gUnknown_2023D6B +_08015534: .4byte gActiveBattler +_08015538: .4byte sBattler_AI _0801553C: .4byte gUnknown_2023DC4 -_08015540: .4byte gUnknown_2023BE4 -_08015544: .4byte gUnknown_2023E0C +_08015540: .4byte gBattleMons +_08015544: .4byte gDisableStructs _08015548: .4byte gUnknown_2023E8C _0801554C: .4byte gUnknown_81D9015 _08015550: @@ -10932,10 +10932,10 @@ _0801555E: movs r3, 0 ldrb r0, [r0] strb r0, [r1] - ldr r0, _080155AC @ =gUnknown_2023F50 + ldr r0, _080155AC @ =gDynamicBasePower movs r2, 0 strh r3, [r0] - ldr r0, _080155B0 @ =gUnknown_2023FE8 + ldr r0, _080155B0 @ =gBattleStruct ldr r0, [r0] strb r2, [r0, 0x13] ldr r1, _080155B4 @ =gUnknown_3004F84 @@ -10944,9 +10944,9 @@ _0801555E: ldr r0, _080155BC @ =gUnknown_2023E82 strb r2, [r0, 0x3] strb r2, [r0, 0x4] - ldr r0, _080155C0 @ =gUnknown_2023FC4 + ldr r0, _080155C0 @ =gBattleScripting strb r2, [r0, 0x16] - ldr r0, _080155C4 @ =gUnknown_2023FF4 + ldr r0, _080155C4 @ =gBattleResources ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0x20 @@ -10959,13 +10959,13 @@ _08015598: _080155A0: .4byte gUnknown_2023BE2 _080155A4: .4byte gUnknown_2023BE3 _080155A8: .4byte gUnknown_2023BDA -_080155AC: .4byte gUnknown_2023F50 -_080155B0: .4byte gUnknown_2023FE8 +_080155AC: .4byte gDynamicBasePower +_080155B0: .4byte gBattleStruct _080155B4: .4byte gUnknown_3004F84 _080155B8: .4byte RunTurnActionsFunctions _080155BC: .4byte gUnknown_2023E82 -_080155C0: .4byte gUnknown_2023FC4 -_080155C4: .4byte gUnknown_2023FF4 +_080155C0: .4byte gBattleScripting +_080155C4: .4byte gBattleResources thumb_func_end CheckFocusPunch_ClearVarsBeforeTurnStarts thumb_func_start RunTurnActionsFunctions @@ -10979,7 +10979,7 @@ RunTurnActionsFunctions: @ 80155C8 movs r0, 0xC strb r0, [r2] _080155D8: - ldr r5, _08015624 @ =gUnknown_2023FE8 + ldr r5, _08015624 @ =gBattleStruct ldr r0, [r5] adds r0, 0x4B ldr r4, _08015628 @ =gUnknown_2023BE2 @@ -11014,7 +11014,7 @@ _080155D8: .align 2, 0 _0801561C: .4byte gUnknown_2023E8A _08015620: .4byte gUnknown_2023BE3 -_08015624: .4byte gUnknown_2023FE8 +_08015624: .4byte gBattleStruct _08015628: .4byte gUnknown_2023BE2 _0801562C: .4byte gUnknown_8250038 _08015630: .4byte gUnknown_2023BCC @@ -11051,7 +11051,7 @@ sub_8015670: @ 8015670 ldr r1, _080156A8 @ =gUnknown_2023BE3 movs r0, 0 strb r0, [r1] - ldr r0, _080156AC @ =gUnknown_2022B4C + ldr r0, _080156AC @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x2 ands r0, r1 @@ -11063,7 +11063,7 @@ sub_8015670: @ 8015670 strb r0, [r1] movs r0, 0 bl GetBankByIdentity - ldr r1, _080156B8 @ =gUnknown_2023D6B + ldr r1, _080156B8 @ =sBattler_AI strb r0, [r1] ldr r1, _080156BC @ =gUnknown_2023D74 ldr r0, _080156C0 @ =gUnknown_81D88CC @@ -11075,10 +11075,10 @@ sub_8015670: @ 8015670 b _0801576E .align 2, 0 _080156A8: .4byte gUnknown_2023BE3 -_080156AC: .4byte gUnknown_2022B4C +_080156AC: .4byte gBattleTypeFlags _080156B0: .4byte gUnknown_2022AB8 _080156B4: .4byte gUnknown_2023E8A -_080156B8: .4byte gUnknown_2023D6B +_080156B8: .4byte sBattler_AI _080156BC: .4byte gUnknown_2023D74 _080156C0: .4byte gUnknown_81D88CC _080156C4: @@ -11106,8 +11106,8 @@ _080156EC: ldr r1, _08015720 @ =gUnknown_2023D74 ldr r0, _08015724 @ =gUnknown_81D87EF str r0, [r1] - ldr r2, _08015728 @ =gUnknown_823EAC8 - ldr r0, _0801572C @ =gUnknown_20386AE + ldr r2, _08015728 @ =gTrainers + ldr r0, _0801572C @ =gTrainerBattleOpponent_A ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -11125,8 +11125,8 @@ _080156EC: .align 2, 0 _08015720: .4byte gUnknown_2023D74 _08015724: .4byte gUnknown_81D87EF -_08015728: .4byte gUnknown_823EAC8 -_0801572C: .4byte gUnknown_20386AE +_08015728: .4byte gTrainers +_0801572C: .4byte gTrainerBattleOpponent_A _08015730: .4byte _08015734 .align 2, 0 _08015734: @@ -11173,7 +11173,7 @@ sub_801578C: @ 801578C ldr r1, _080157C4 @ =gUnknown_2023BE3 movs r0, 0 strb r0, [r1] - ldr r0, _080157C8 @ =gUnknown_2022B4C + ldr r0, _080157C8 @ =gBattleTypeFlags ldr r1, [r0] movs r4, 0x2 adds r0, r1, 0 @@ -11186,7 +11186,7 @@ sub_801578C: @ 801578C strb r0, [r1] movs r0, 0 bl GetBankByIdentity - ldr r1, _080157D4 @ =gUnknown_2023D6B + ldr r1, _080157D4 @ =sBattler_AI strb r0, [r1] ldr r1, _080157D8 @ =gUnknown_2023D74 ldr r0, _080157DC @ =gUnknown_81D88CC @@ -11198,10 +11198,10 @@ sub_801578C: @ 801578C b _08015830 .align 2, 0 _080157C4: .4byte gUnknown_2023BE3 -_080157C8: .4byte gUnknown_2022B4C +_080157C8: .4byte gBattleTypeFlags _080157CC: .4byte gUnknown_2022AB8 _080157D0: .4byte gUnknown_2023E8A -_080157D4: .4byte gUnknown_2023D6B +_080157D4: .4byte sBattler_AI _080157D8: .4byte gUnknown_2023D74 _080157DC: .4byte gUnknown_81D88CC _080157E0: @@ -11231,12 +11231,12 @@ _0801580C: _08015810: movs r0, 0x1 bl GetBankByIdentity - ldr r1, _08015820 @ =gUnknown_2023D6B + ldr r1, _08015820 @ =sBattler_AI strb r0, [r1] b _0801582A .align 2, 0 _0801581C: .4byte gUnknown_2023E82 -_08015820: .4byte gUnknown_2023D6B +_08015820: .4byte sBattler_AI _08015824: ldr r1, _0801583C @ =gUnknown_2023E82 movs r0, 0 @@ -11267,7 +11267,7 @@ sub_8015850: @ 8015850 movs r0, 0 strb r0, [r1] ldr r1, _0801587C @ =gUnknown_2023E8C - ldr r0, _08015880 @ =gUnknown_2023D6B + ldr r0, _08015880 @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -11284,7 +11284,7 @@ sub_8015850: @ 8015850 .align 2, 0 _08015878: .4byte gUnknown_2023BE3 _0801587C: .4byte gUnknown_2023E8C -_08015880: .4byte gUnknown_2023D6B +_08015880: .4byte sBattler_AI _08015884: .4byte gUnknown_2023D74 _08015888: .4byte gUnknown_81D8916 _0801588C: @@ -11321,10 +11321,10 @@ sub_80158BC: @ 80158BC strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] - ldr r2, _080158F8 @ =gUnknown_2023D6B + ldr r2, _080158F8 @ =sBattler_AI ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, _080158FC @ =gUnknown_2023BCE + ldr r3, _080158FC @ =gBattlerPartyIndexes ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -11342,8 +11342,8 @@ sub_80158BC: @ 80158BC .align 2, 0 _080158F0: .4byte gUnknown_2023BE3 _080158F4: .4byte gUnknown_2022AB8 -_080158F8: .4byte gUnknown_2023D6B -_080158FC: .4byte gUnknown_2023BCE +_080158F8: .4byte sBattler_AI +_080158FC: .4byte gBattlerPartyIndexes _08015900: .4byte gUnknown_2023D74 _08015904: .4byte gUnknown_81D891D _08015908: .4byte gUnknown_3004F84 @@ -11360,20 +11360,20 @@ sub_8015910: @ 8015910 lsrs r0, 24 cmp r0, 0x1 bhi _08015A04 - ldr r0, _08015978 @ =gUnknown_2022B4C + ldr r0, _08015978 @ =gBattleTypeFlags ldr r1, [r0] ldr r0, _0801597C @ =0x00080b92 ands r1, r0 cmp r1, 0 bne _080159BC - ldr r2, _08015980 @ =gUnknown_2023BC4 + ldr r2, _08015980 @ =gActiveBattler strb r1, [r2] ldr r0, _08015984 @ =gUnknown_2023BCC ldrb r0, [r0] cmp r1, r0 bcs _080159BC adds r4, r2, 0 - ldr r6, _08015988 @ =gUnknown_2023BE4 + ldr r6, _08015988 @ =gBattleMons movs r5, 0x58 adds r7, r6, 0 adds r7, 0x30 @@ -11383,7 +11383,7 @@ _08015942: lsls r0, 24 cmp r0, 0 bne _080159AA - ldr r2, _0801598C @ =gUnknown_3004F90 + ldr r2, _0801598C @ =gBattleResults ldrh r0, [r2, 0x6] cmp r0, 0 bne _08015990 @@ -11402,12 +11402,12 @@ _08015942: b _080159AA .align 2, 0 _08015974: .4byte gUnknown_2023BE3 -_08015978: .4byte gUnknown_2022B4C +_08015978: .4byte gBattleTypeFlags _0801597C: .4byte 0x00080b92 -_08015980: .4byte gUnknown_2023BC4 +_08015980: .4byte gActiveBattler _08015984: .4byte gUnknown_2023BCC -_08015988: .4byte gUnknown_2023BE4 -_0801598C: .4byte gUnknown_3004F90 +_08015988: .4byte gBattleMons +_0801598C: .4byte gBattleResults _08015990: ldrb r0, [r4] muls r0, r5 @@ -11433,7 +11433,7 @@ _080159AA: bcc _08015942 _080159BC: bl sub_812BFDC - ldr r0, _080159F0 @ =gUnknown_2022B4C + ldr r0, _080159F0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x8 ands r0, r1 @@ -11454,7 +11454,7 @@ _080159D0: b _08015A1E .align 2, 0 _080159EC: .4byte gUnknown_2023BCC -_080159F0: .4byte gUnknown_2022B4C +_080159F0: .4byte gBattleTypeFlags _080159F4: .4byte gUnknown_3004F84 _080159F8: .4byte sub_8015A30 _080159FC: .4byte gUnknown_300537C @@ -11516,7 +11516,7 @@ _08015A6C: _08015A70: str r0, [r1] bl FreeAllWindowBuffers - ldr r0, _08015A9C @ =gUnknown_2022B4C + ldr r0, _08015A9C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -11531,7 +11531,7 @@ _08015A8E: .align 2, 0 _08015A94: .4byte gUnknown_3004F84 _08015A98: .4byte sub_8015AA0 -_08015A9C: .4byte gUnknown_2022B4C +_08015A9C: .4byte gBattleTypeFlags thumb_func_end sub_8015A30 thumb_func_start sub_8015AA0 @@ -11546,7 +11546,7 @@ _08015AAC: movs r5, 0 _08015AAE: ldrb r2, [r3] - ldr r0, _08015AF8 @ =gUnknown_825E45C + ldr r0, _08015AF8 @ =gBitTable lsls r1, r5, 2 adds r1, r0 ldr r1, [r1] @@ -11559,7 +11559,7 @@ _08015AAE: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08015AFC @ =gUnknown_2024284 + ldr r0, _08015AFC @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0 @@ -11580,8 +11580,8 @@ _08015AAE: b _08015B1C .align 2, 0 _08015AF4: .4byte gUnknown_3004FD4 -_08015AF8: .4byte gUnknown_825E45C -_08015AFC: .4byte gUnknown_2024284 +_08015AF8: .4byte gBitTable +_08015AFC: .4byte gPlayerParty _08015B00: .4byte gUnknown_3004F84 _08015B04: .4byte sub_8015B30 _08015B08: @@ -11630,13 +11630,13 @@ _08015B54: .4byte sub_8015AA0 thumb_func_start ReturnFromBattleToOverworld ReturnFromBattleToOverworld: @ 8015B58 push {r4-r6,lr} - ldr r6, _08015BDC @ =gUnknown_2022B4C + ldr r6, _08015BDC @ =gBattleTypeFlags ldr r0, [r6] movs r5, 0x2 ands r0, r5 cmp r0, 0 bne _08015B74 - ldr r4, _08015BE0 @ =gUnknown_2024284 + ldr r4, _08015BE0 @ =gPlayerParty adds r0, r4, 0 bl sub_8043A68 adds r0, r4, 0 @@ -11672,7 +11672,7 @@ _08015B86: ands r4, r0 cmp r4, 0 beq _08015BC6 - ldr r0, _08015BFC @ =gUnknown_202402C + ldr r0, _08015BFC @ =gEnemyParty bl UpdateRoamerHPStatus ldrb r1, [r5] movs r0, 0x1 @@ -11694,15 +11694,15 @@ _08015BD4: pop {r0} bx r0 .align 2, 0 -_08015BDC: .4byte gUnknown_2022B4C -_08015BE0: .4byte gUnknown_2024284 +_08015BDC: .4byte gBattleTypeFlags +_08015BE0: .4byte gPlayerParty _08015BE4: .4byte gUnknown_3003F64 _08015BE8: .4byte gUnknown_20370D0 _08015BEC: .4byte gUnknown_2023E8A _08015BF0: .4byte gMain _08015BF4: .4byte 0x00000439 _08015BF8: .4byte gUnknown_3004F80 -_08015BFC: .4byte gUnknown_202402C +_08015BFC: .4byte gEnemyParty thumb_func_end ReturnFromBattleToOverworld thumb_func_start RunBattleScriptCommands_PopCallbacksStack @@ -11715,7 +11715,7 @@ RunBattleScriptCommands_PopCallbacksStack: @ 8015C00 lsrs r0, 24 cmp r0, 0x1 bhi _08015C48 - ldr r3, _08015C40 @ =gUnknown_2023FF4 + ldr r3, _08015C40 @ =gBattleResources ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0 @@ -11739,7 +11739,7 @@ _08015C24: b _08015C62 .align 2, 0 _08015C3C: .4byte gUnknown_2023BE3 -_08015C40: .4byte gUnknown_2023FF4 +_08015C40: .4byte gBattleResources _08015C44: .4byte gUnknown_3004F84 _08015C48: ldr r0, _08015C68 @ =gUnknown_2023BC8 @@ -11797,19 +11797,19 @@ sub_8015CA0: @ 8015CA0 sub sp, 0x8 movs r0, 0x4 str r0, [sp] - ldr r6, _08015CE0 @ =gUnknown_2023D6B + ldr r6, _08015CE0 @ =sBattler_AI ldr r1, _08015CE4 @ =gUnknown_2023BDE ldr r0, _08015CE8 @ =gUnknown_2023BE2 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r6] - ldr r1, _08015CEC @ =gUnknown_2023FE8 + ldr r1, _08015CEC @ =gBattleStruct ldr r3, [r1] adds r0, r3, 0 adds r0, 0x91 ldrb r2, [r0] - ldr r1, _08015CF0 @ =gUnknown_825E45C + ldr r1, _08015CF0 @ =gBitTable ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -11821,23 +11821,23 @@ sub_8015CA0: @ 8015CA0 movs r0, 0xC b _0801634C .align 2, 0 -_08015CE0: .4byte gUnknown_2023D6B +_08015CE0: .4byte sBattler_AI _08015CE4: .4byte gUnknown_2023BDE _08015CE8: .4byte gUnknown_2023BE2 -_08015CEC: .4byte gUnknown_2023FE8 -_08015CF0: .4byte gUnknown_825E45C +_08015CEC: .4byte gBattleStruct +_08015CF0: .4byte gBitTable _08015CF4: .4byte gUnknown_2023BE3 _08015CF8: - ldr r1, _08015D6C @ =gUnknown_2023D71 + ldr r1, _08015D6C @ =gCritMultiplier movs r0, 0x1 strb r0, [r1] - ldr r1, _08015D70 @ =gUnknown_2023FC4 + ldr r1, _08015D70 @ =gBattleScripting movs r0, 0x1 strb r0, [r1, 0xE] adds r0, r3, 0 adds r0, 0xB7 strb r2, [r0] - ldr r0, _08015D74 @ =gUnknown_2023DCC + ldr r0, _08015D74 @ =gMoveResultFlags strb r2, [r0] ldr r0, _08015D78 @ =gUnknown_2023D72 strb r2, [r0] @@ -11847,7 +11847,7 @@ _08015CF8: ldr r3, _08015D84 @ =gUnknown_2023D49 mov r9, r3 ldrb r0, [r6] - ldr r4, _08015D88 @ =gUnknown_2023FE8 + ldr r4, _08015D88 @ =gBattleStruct ldr r1, [r4] adds r0, r1 adds r0, 0x80 @@ -11867,7 +11867,7 @@ _08015CF8: negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r2, _08015D90 @ =gUnknown_2023D4A + ldr r2, _08015D90 @ =gCurrentMove ldr r1, _08015D94 @ =gUnknown_2023D4C movs r0, 0xA5 strh r0, [r1] @@ -11882,24 +11882,24 @@ _08015CF8: movs r1, 0 bl GetMoveTarget ldrb r1, [r6] - ldr r3, _08015D88 @ =gUnknown_2023FE8 + ldr r3, _08015D88 @ =gBattleStruct ldr r2, [r3] b _08015EF6 .align 2, 0 -_08015D6C: .4byte gUnknown_2023D71 -_08015D70: .4byte gUnknown_2023FC4 -_08015D74: .4byte gUnknown_2023DCC +_08015D6C: .4byte gCritMultiplier +_08015D70: .4byte gBattleScripting +_08015D74: .4byte gMoveResultFlags _08015D78: .4byte gUnknown_2023D72 _08015D7C: .4byte gUnknown_2023E82 _08015D80: .4byte gUnknown_2023D48 _08015D84: .4byte gUnknown_2023D49 -_08015D88: .4byte gUnknown_2023FE8 +_08015D88: .4byte gBattleStruct _08015D8C: .4byte gUnknown_2023E8C -_08015D90: .4byte gUnknown_2023D4A +_08015D90: .4byte gCurrentMove _08015D94: .4byte gUnknown_2023D4C _08015D98: .4byte gUnknown_2023DD0 _08015D9C: - ldr r0, _08015DD4 @ =gUnknown_2023BE4 + ldr r0, _08015DD4 @ =gBattleMons movs r1, 0x58 adds r5, r4, 0 muls r5, r1 @@ -11919,7 +11919,7 @@ _08015D9C: cmp r7, 0 beq _08015DE4 _08015DC2: - ldr r3, _08015DD8 @ =gUnknown_2023D4A + ldr r3, _08015DD8 @ =gCurrentMove ldr r2, _08015DDC @ =gUnknown_2023D4C ldr r1, _08015DE0 @ =gUnknown_2023DB8 lsls r0, r4, 1 @@ -11929,12 +11929,12 @@ _08015DC2: strh r0, [r3] b _08015F18 .align 2, 0 -_08015DD4: .4byte gUnknown_2023BE4 -_08015DD8: .4byte gUnknown_2023D4A +_08015DD4: .4byte gBattleMons +_08015DD8: .4byte gCurrentMove _08015DDC: .4byte gUnknown_2023D4C _08015DE0: .4byte gUnknown_2023DB8 _08015DE4: - ldr r3, _08015E38 @ =gUnknown_2023E0C + ldr r3, _08015E38 @ =gDisableStructs mov r12, r3 lsls r0, r4, 3 subs r0, r4 @@ -11953,7 +11953,7 @@ _08015DE4: ldrh r1, [r0] cmp r2, r1 bne _08015E48 - ldr r2, _08015E3C @ =gUnknown_2023D4A + ldr r2, _08015E3C @ =gCurrentMove ldr r0, _08015E40 @ =gUnknown_2023D4C strh r4, [r0] strh r4, [r2] @@ -11971,14 +11971,14 @@ _08015DE4: movs r1, 0 bl GetMoveTarget ldrb r1, [r6] - ldr r3, _08015E44 @ =gUnknown_2023FE8 + ldr r3, _08015E44 @ =gBattleStruct ldr r2, [r3] b _08015EF6 .align 2, 0 -_08015E38: .4byte gUnknown_2023E0C -_08015E3C: .4byte gUnknown_2023D4A +_08015E38: .4byte gDisableStructs +_08015E3C: .4byte gCurrentMove _08015E40: .4byte gUnknown_2023D4C -_08015E44: .4byte gUnknown_2023FE8 +_08015E44: .4byte gBattleStruct _08015E48: cmp r2, 0 beq _08015EBC @@ -11988,7 +11988,7 @@ _08015E48: strb r3, [r4] mov r0, r8 strb r3, [r0] - ldr r3, _08015EB0 @ =gUnknown_2023D4A + ldr r3, _08015EB0 @ =gCurrentMove ldr r2, _08015EB4 @ =gUnknown_2023D4C ldrb r0, [r0] lsls r0, 1 @@ -12027,18 +12027,18 @@ _08015E48: movs r1, 0 bl GetMoveTarget ldrb r1, [r6] - ldr r3, _08015EB8 @ =gUnknown_2023FE8 + ldr r3, _08015EB8 @ =gBattleStruct ldr r2, [r3] b _08015EF6 .align 2, 0 -_08015EB0: .4byte gUnknown_2023D4A +_08015EB0: .4byte gCurrentMove _08015EB4: .4byte gUnknown_2023D4C -_08015EB8: .4byte gUnknown_2023FE8 +_08015EB8: .4byte gBattleStruct _08015EBC: mov r4, r8 ldrb r0, [r4] lsls r0, 1 - ldr r4, _08015EFC @ =gUnknown_2023D6B + ldr r4, _08015EFC @ =sBattler_AI ldrb r2, [r4] movs r1, 0x58 muls r1, r2 @@ -12053,7 +12053,7 @@ _08015EBC: ldrh r2, [r2] cmp r3, r2 beq _08015F10 - ldr r1, _08015F04 @ =gUnknown_2023D4A + ldr r1, _08015F04 @ =gCurrentMove ldr r0, _08015F08 @ =gUnknown_2023D4C strh r3, [r0] strh r3, [r1] @@ -12061,47 +12061,47 @@ _08015EBC: movs r1, 0 bl GetMoveTarget ldrb r1, [r4] - ldr r2, _08015F0C @ =gUnknown_2023FE8 + ldr r2, _08015F0C @ =gBattleStruct ldr r2, [r2] _08015EF6: adds r1, r2 strb r0, [r1, 0xC] b _08015F18 .align 2, 0 -_08015EFC: .4byte gUnknown_2023D6B +_08015EFC: .4byte sBattler_AI _08015F00: .4byte gUnknown_2023DC4 -_08015F04: .4byte gUnknown_2023D4A +_08015F04: .4byte gCurrentMove _08015F08: .4byte gUnknown_2023D4C -_08015F0C: .4byte gUnknown_2023FE8 +_08015F0C: .4byte gBattleStruct _08015F10: - ldr r1, _08015F30 @ =gUnknown_2023D4A + ldr r1, _08015F30 @ =gCurrentMove ldr r0, _08015F34 @ =gUnknown_2023D4C strh r3, [r0] strh r3, [r1] _08015F18: - ldr r0, _08015F38 @ =gUnknown_2023D6B + ldr r0, _08015F38 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08015F40 - ldr r0, _08015F3C @ =gUnknown_3004F90 - ldr r1, _08015F30 @ =gUnknown_2023D4A + ldr r0, _08015F3C @ =gBattleResults + ldr r1, _08015F30 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0, 0x22] b _08015F48 .align 2, 0 -_08015F30: .4byte gUnknown_2023D4A +_08015F30: .4byte gCurrentMove _08015F34: .4byte gUnknown_2023D4C -_08015F38: .4byte gUnknown_2023D6B -_08015F3C: .4byte gUnknown_3004F90 +_08015F38: .4byte sBattler_AI +_08015F3C: .4byte gBattleResults _08015F40: - ldr r0, _08015FAC @ =gUnknown_3004F90 - ldr r1, _08015FB0 @ =gUnknown_2023D4A + ldr r0, _08015FAC @ =gBattleResults + ldr r1, _08015FB0 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0, 0x24] _08015F48: - ldr r4, _08015FB4 @ =gUnknown_2023D6B + ldr r4, _08015FB4 @ =sBattler_AI ldrb r0, [r4] bl GetBankSide movs r1, 0x1 @@ -12117,8 +12117,8 @@ _08015F48: adds r3, r4, 0 cmp r0, 0 beq _08015FC8 - ldr r2, _08015FBC @ =gUnknown_8250C04 - ldr r0, _08015FB0 @ =gUnknown_2023D4A + ldr r2, _08015FBC @ =gBattleMoves + ldr r0, _08015FB0 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -12136,7 +12136,7 @@ _08015F48: lsls r0, 24 cmp r4, r0 beq _08015FC8 - ldr r1, _08015FC0 @ =gUnknown_2023BE4 + ldr r1, _08015FC0 @ =gBattleMons ldrb r2, [r5, 0x9] movs r0, 0x58 muls r0, r2 @@ -12144,23 +12144,23 @@ _08015F48: ldrh r0, [r0, 0x28] cmp r0, 0 beq _08015FC8 - ldr r0, _08015FC4 @ =gUnknown_2023D6C + ldr r0, _08015FC4 @ =gBattlerTarget strb r2, [r0] b _0801632C .align 2, 0 -_08015FAC: .4byte gUnknown_3004F90 -_08015FB0: .4byte gUnknown_2023D4A -_08015FB4: .4byte gUnknown_2023D6B +_08015FAC: .4byte gBattleResults +_08015FB0: .4byte gCurrentMove +_08015FB4: .4byte sBattler_AI _08015FB8: .4byte gUnknown_2023DE4 -_08015FBC: .4byte gUnknown_8250C04 -_08015FC0: .4byte gUnknown_2023BE4 -_08015FC4: .4byte gUnknown_2023D6C +_08015FBC: .4byte gBattleMoves +_08015FC0: .4byte gBattleMons +_08015FC4: .4byte gBattlerTarget _08015FC8: - ldr r2, _080160E4 @ =gUnknown_2022B4C + ldr r2, _080160E4 @ =gBattleTypeFlags ldr r1, [r2] movs r0, 0x1 ands r1, r0 - ldr r3, _080160E8 @ =gUnknown_2023D6B + ldr r3, _080160E8 @ =sBattler_AI adds r7, r2, 0 cmp r1, 0 bne _08015FDA @@ -12176,8 +12176,8 @@ _08015FDA: beq _08015FEC b _080161F8 _08015FEC: - ldr r2, _080160F0 @ =gUnknown_8250C04 - ldr r0, _080160F4 @ =gUnknown_2023D4A + ldr r2, _080160F0 @ =gBattleMoves + ldr r0, _080160F4 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -12191,10 +12191,10 @@ _08015FEC: bne _08016008 b _080161F8 _08016008: - ldr r3, _080160F8 @ =gUnknown_2023BE4 - ldr r2, _080160E8 @ =gUnknown_2023D6B + ldr r3, _080160F8 @ =gBattleMons + ldr r2, _080160E8 @ =sBattler_AI ldrb r6, [r2] - ldr r0, _080160FC @ =gUnknown_2023FE8 + ldr r0, _080160FC @ =gBattleStruct ldr r0, [r0] adds r0, r6, r0 ldrb r1, [r0, 0xC] @@ -12217,7 +12217,7 @@ _08016030: bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08016100 @ =gUnknown_2023BC4 + ldr r1, _08016100 @ =gActiveBattler strb r5, [r1] ldr r0, _08016104 @ =gUnknown_2023BCC ldrb r0, [r0] @@ -12231,16 +12231,16 @@ _08016048: lsrs r0, 24 cmp r6, r0 beq _08016096 - ldr r0, _080160E8 @ =gUnknown_2023D6B + ldr r0, _080160E8 @ =sBattler_AI ldrb r1, [r0] - ldr r0, _080160FC @ =gUnknown_2023FE8 + ldr r0, _080160FC @ =gBattleStruct ldr r0, [r0] adds r1, r0 ldrb r0, [r1, 0xC] ldrb r1, [r4] cmp r0, r1 beq _08016096 - ldr r1, _080160F8 @ =gUnknown_2023BE4 + ldr r1, _080160F8 @ =gBattleMons ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -12277,7 +12277,7 @@ _080160A8: beq _080160B0 b _080161AA _080160B0: - ldr r2, _080160F0 @ =gUnknown_8250C04 + ldr r2, _080160F0 @ =gBattleMoves ldr r0, _08016108 @ =gUnknown_2023D4C ldrh r1, [r0] lsls r0, r1, 1 @@ -12288,7 +12288,7 @@ _080160B0: ands r4, r0 cmp r4, 0 beq _08016130 - ldr r0, _080160E8 @ =gUnknown_2023D6B + ldr r0, _080160E8 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12302,14 +12302,14 @@ _080160B0: movs r0, 0x1 b _08016122 .align 2, 0 -_080160E4: .4byte gUnknown_2022B4C -_080160E8: .4byte gUnknown_2023D6B +_080160E4: .4byte gBattleTypeFlags +_080160E8: .4byte sBattler_AI _080160EC: .4byte gUnknown_2023DE4 -_080160F0: .4byte gUnknown_8250C04 -_080160F4: .4byte gUnknown_2023D4A -_080160F8: .4byte gUnknown_2023BE4 -_080160FC: .4byte gUnknown_2023FE8 -_08016100: .4byte gUnknown_2023BC4 +_080160F0: .4byte gBattleMoves +_080160F4: .4byte gCurrentMove +_080160F8: .4byte gBattleMons +_080160FC: .4byte gBattleStruct +_08016100: .4byte gActiveBattler _08016104: .4byte gUnknown_2023BCC _08016108: .4byte gUnknown_2023D4C _0801610C: @@ -12327,26 +12327,26 @@ _08016120: movs r0, 0x2 _08016122: bl GetBankByIdentity - ldr r1, _0801612C @ =gUnknown_2023D6C + ldr r1, _0801612C @ =gBattlerTarget strb r0, [r1] b _08016140 .align 2, 0 -_0801612C: .4byte gUnknown_2023D6C +_0801612C: .4byte gBattlerTarget _08016130: - ldr r2, _08016178 @ =gUnknown_2023D6C - ldr r0, _0801617C @ =gUnknown_2023D6B + ldr r2, _08016178 @ =gBattlerTarget + ldr r0, _0801617C @ =sBattler_AI ldrb r0, [r0] - ldr r1, _08016180 @ =gUnknown_2023FE8 + ldr r1, _08016180 @ =gBattleStruct ldr r1, [r1] adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r2] _08016140: - ldr r7, _08016184 @ =gUnknown_2023D70 + ldr r7, _08016184 @ =gAbsentBattlerFlags ldrb r0, [r7] - ldr r1, _08016188 @ =gUnknown_825E45C + ldr r1, _08016188 @ =gBitTable mov r8, r1 - ldr r5, _08016178 @ =gUnknown_2023D6C + ldr r5, _08016178 @ =gBattlerTarget ldrb r1, [r5] lsls r1, 2 add r1, r8 @@ -12356,7 +12356,7 @@ _08016140: bne _0801615A b _0801632C _0801615A: - ldr r6, _0801617C @ =gUnknown_2023D6B + ldr r6, _0801617C @ =sBattler_AI ldrb r0, [r6] bl GetBankSide adds r4, r0, 0 @@ -12369,11 +12369,11 @@ _0801615A: ldrb r0, [r5] b _0801631A .align 2, 0 -_08016178: .4byte gUnknown_2023D6C -_0801617C: .4byte gUnknown_2023D6B -_08016180: .4byte gUnknown_2023FE8 -_08016184: .4byte gUnknown_2023D70 -_08016188: .4byte gUnknown_825E45C +_08016178: .4byte gBattlerTarget +_0801617C: .4byte sBattler_AI +_08016180: .4byte gBattleStruct +_08016184: .4byte gAbsentBattlerFlags +_08016188: .4byte gBitTable _0801618C: ldrb r0, [r6] bl GetBankIdentity @@ -12389,14 +12389,14 @@ _0801618C: add r0, r8 b _08016310 _080161AA: - ldr r4, _080161E4 @ =gUnknown_2023BC4 + ldr r4, _080161E4 @ =gActiveBattler ldr r0, _080161E8 @ =gUnknown_2023BDE ldr r3, [sp] adds r0, r3, r0 ldrb r0, [r0] strb r0, [r4] ldrb r0, [r4] - ldr r2, _080161EC @ =gUnknown_2023BE4 + ldr r2, _080161EC @ =gBattleMons movs r1, 0x58 muls r1, r0 adds r1, r2 @@ -12413,23 +12413,23 @@ _080161AA: movs r2, 0x2 orrs r1, r2 strb r1, [r0] - ldr r1, _080161F4 @ =gUnknown_2023D6C + ldr r1, _080161F4 @ =gBattlerTarget ldrb r0, [r4] strb r0, [r1] b _0801632C .align 2, 0 -_080161E4: .4byte gUnknown_2023BC4 +_080161E4: .4byte gActiveBattler _080161E8: .4byte gUnknown_2023BDE -_080161EC: .4byte gUnknown_2023BE4 +_080161EC: .4byte gBattleMons _080161F0: .4byte gUnknown_2023ECC -_080161F4: .4byte gUnknown_2023D6C +_080161F4: .4byte gBattlerTarget _080161F8: ldr r0, [r7] movs r4, 0x1 ands r0, r4 cmp r0, 0 beq _080162A0 - ldr r2, _08016238 @ =gUnknown_8250C04 + ldr r2, _08016238 @ =gBattleMoves ldr r0, _0801623C @ =gUnknown_2023D4C ldrh r1, [r0] lsls r0, r1, 1 @@ -12454,7 +12454,7 @@ _080161F8: movs r0, 0x1 b _08016256 .align 2, 0 -_08016238: .4byte gUnknown_8250C04 +_08016238: .4byte gBattleMoves _0801623C: .4byte gUnknown_2023D4C _08016240: movs r0, 0x3 @@ -12471,12 +12471,12 @@ _08016254: movs r0, 0x2 _08016256: bl GetBankByIdentity - ldr r1, _08016290 @ =gUnknown_2023D6C + ldr r1, _08016290 @ =gBattlerTarget strb r0, [r1] - ldr r0, _08016294 @ =gUnknown_2023D70 + ldr r0, _08016294 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _08016298 @ =gUnknown_825E45C - ldr r5, _08016290 @ =gUnknown_2023D6C + ldr r2, _08016298 @ =gBitTable + ldr r5, _08016290 @ =gBattlerTarget ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -12484,7 +12484,7 @@ _08016256: ands r1, r0 cmp r1, 0 beq _0801632C - ldr r0, _0801629C @ =gUnknown_2023D6B + ldr r0, _0801629C @ =sBattler_AI ldrb r0, [r0] bl GetBankSide adds r4, r0, 0 @@ -12497,22 +12497,22 @@ _08016256: ldrb r0, [r5] b _0801631A .align 2, 0 -_08016290: .4byte gUnknown_2023D6C -_08016294: .4byte gUnknown_2023D70 -_08016298: .4byte gUnknown_825E45C -_0801629C: .4byte gUnknown_2023D6B +_08016290: .4byte gBattlerTarget +_08016294: .4byte gAbsentBattlerFlags +_08016298: .4byte gBitTable +_0801629C: .4byte sBattler_AI _080162A0: - ldr r5, _080162E4 @ =gUnknown_2023D6C + ldr r5, _080162E4 @ =gBattlerTarget adds r2, r3, 0 ldrb r0, [r2] - ldr r1, _080162E8 @ =gUnknown_2023FE8 + ldr r1, _080162E8 @ =gBattleStruct ldr r1, [r1] adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r5] - ldr r6, _080162EC @ =gUnknown_2023D70 + ldr r6, _080162EC @ =gAbsentBattlerFlags ldrb r1, [r6] - ldr r7, _080162F0 @ =gUnknown_825E45C + ldr r7, _080162F0 @ =gBitTable ldrb r0, [r5] lsls r0, 2 adds r0, r7 @@ -12534,10 +12534,10 @@ _080162A0: ldrb r0, [r5] b _0801631A .align 2, 0 -_080162E4: .4byte gUnknown_2023D6C -_080162E8: .4byte gUnknown_2023FE8 -_080162EC: .4byte gUnknown_2023D70 -_080162F0: .4byte gUnknown_825E45C +_080162E4: .4byte gBattlerTarget +_080162E8: .4byte gBattleStruct +_080162EC: .4byte gAbsentBattlerFlags +_080162F0: .4byte gBitTable _080162F4: ldrb r0, [r3] bl GetBankIdentity @@ -12568,8 +12568,8 @@ _0801631A: _0801632C: ldr r4, _08016360 @ =gUnknown_2023D74 ldr r3, _08016364 @ =gUnknown_81D65A8 - ldr r2, _08016368 @ =gUnknown_8250C04 - ldr r0, _0801636C @ =gUnknown_2023D4A + ldr r2, _08016368 @ =gBattleMoves + ldr r0, _0801636C @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -12595,15 +12595,15 @@ _0801634C: .align 2, 0 _08016360: .4byte gUnknown_2023D74 _08016364: .4byte gUnknown_81D65A8 -_08016368: .4byte gUnknown_8250C04 -_0801636C: .4byte gUnknown_2023D4A +_08016368: .4byte gBattleMoves +_0801636C: .4byte gCurrentMove _08016370: .4byte gUnknown_2023BE3 thumb_func_end sub_8015CA0 thumb_func_start sub_8016374 sub_8016374: @ 8016374 push {r4,lr} - ldr r3, _080163E0 @ =gUnknown_2023D6B + ldr r3, _080163E0 @ =sBattler_AI ldr r1, _080163E4 @ =gUnknown_2023BDE ldr r0, _080163E8 @ =gUnknown_2023BE2 ldrb r0, [r0] @@ -12631,7 +12631,7 @@ sub_8016374: @ 8016374 ldrb r4, [r3] strb r4, [r2, 0x2] ldrb r0, [r3] - ldr r1, _08016400 @ =gUnknown_2023FE8 + ldr r1, _08016400 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x58 @@ -12639,7 +12639,7 @@ sub_8016374: @ 8016374 strb r0, [r2, 0x3] movs r0, 0xFF strb r0, [r2, 0x4] - ldr r0, _08016404 @ =gUnknown_2023FC4 + ldr r0, _08016404 @ =gBattleScripting strb r4, [r0, 0x17] ldr r1, _08016408 @ =gUnknown_2023D74 ldr r0, _0801640C @ =gUnknown_81D894D @@ -12647,7 +12647,7 @@ sub_8016374: @ 8016374 ldr r1, _08016410 @ =gUnknown_2023BE3 movs r0, 0xA strb r0, [r1] - ldr r1, _08016414 @ =gUnknown_3004F90 + ldr r1, _08016414 @ =gBattleResults ldrb r0, [r1, 0x2] cmp r0, 0xFE bhi _080163DA @@ -12658,7 +12658,7 @@ _080163DA: pop {r0} bx r0 .align 2, 0 -_080163E0: .4byte gUnknown_2023D6B +_080163E0: .4byte sBattler_AI _080163E4: .4byte gUnknown_2023BDE _080163E8: .4byte gUnknown_2023BE2 _080163EC: .4byte gUnknown_2022974 @@ -12666,12 +12666,12 @@ _080163F0: .4byte gUnknown_2022976 _080163F4: .4byte gUnknown_2023FF8 _080163F8: .4byte gUnknown_2023FFC _080163FC: .4byte gUnknown_2022AB8 -_08016400: .4byte gUnknown_2023FE8 -_08016404: .4byte gUnknown_2023FC4 +_08016400: .4byte gBattleStruct +_08016404: .4byte gBattleScripting _08016408: .4byte gUnknown_2023D74 _0801640C: .4byte gUnknown_81D894D _08016410: .4byte gUnknown_2023BE3 -_08016414: .4byte gUnknown_3004F90 +_08016414: .4byte gBattleResults thumb_func_end sub_8016374 thumb_func_start sub_8016418 @@ -12681,8 +12681,8 @@ sub_8016418: @ 8016418 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _08016474 @ =gUnknown_2023D6B - ldr r2, _08016478 @ =gUnknown_2023D6C + ldr r4, _08016474 @ =sBattler_AI + ldr r2, _08016478 @ =gBattlerTarget ldr r1, _0801647C @ =gUnknown_2023BDE ldr r0, _08016480 @ =gUnknown_2023BE2 ldrb r0, [r0] @@ -12722,8 +12722,8 @@ sub_8016418: @ 8016418 str r0, [r2] b _080164FC .align 2, 0 -_08016474: .4byte gUnknown_2023D6B -_08016478: .4byte gUnknown_2023D6C +_08016474: .4byte sBattler_AI +_08016478: .4byte gBattlerTarget _0801647C: .4byte gUnknown_2023BDE _08016480: .4byte gUnknown_2023BE2 _08016484: .4byte gUnknown_2022974 @@ -12785,12 +12785,12 @@ _08016504: .4byte gUnknown_2023D74 _08016508: .4byte gUnknown_81D99E4 _0801650C: .4byte gUnknown_2023BE3 _08016510: - ldr r3, _08016548 @ =gUnknown_2023FC4 + ldr r3, _08016548 @ =gBattleScripting ldrb r0, [r4] strb r0, [r3, 0x17] lsls r0, 24 lsrs r0, 25 - ldr r2, _0801654C @ =gUnknown_2023FE8 + ldr r2, _0801654C @ =gBattleStruct ldr r1, [r2] adds r0, r1 adds r0, 0xC4 @@ -12814,8 +12814,8 @@ _0801653C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08016548: .4byte gUnknown_2023FC4 -_0801654C: .4byte gUnknown_2023FE8 +_08016548: .4byte gBattleScripting +_0801654C: .4byte gBattleStruct _08016550: .4byte gUnknown_2023D74 _08016554: .4byte gUnknown_81D99E4 _08016558: .4byte gUnknown_2023BE3 @@ -12831,7 +12831,7 @@ _08016574: ldr r5, _080165AC @ =gUnknown_2023E82 movs r0, 0 strb r0, [r5, 0x5] - ldr r2, _080165B0 @ =gUnknown_2023D6B + ldr r2, _080165B0 @ =sBattler_AI ldrb r0, [r2] lsrs r0, 1 ldr r1, [r7] @@ -12859,7 +12859,7 @@ _080165A6: b _08016706 .align 2, 0 _080165AC: .4byte gUnknown_2023E82 -_080165B0: .4byte gUnknown_2023D6B +_080165B0: .4byte sBattler_AI _080165B4: .4byte gUnknown_2023D74 _080165B8: .4byte gUnknown_81D99E4 _080165BC: .4byte gUnknown_2023BE3 @@ -12903,7 +12903,7 @@ _08016608: ldr r3, _0801663C @ =gUnknown_2023E82 movs r0, 0x4 strb r0, [r3, 0x5] - ldr r2, _08016640 @ =gUnknown_2023D6B + ldr r2, _08016640 @ =sBattler_AI ldrb r0, [r2] lsrs r0, 1 ldr r1, [r7] @@ -12928,7 +12928,7 @@ _08016608: b _08016706 .align 2, 0 _0801663C: .4byte gUnknown_2023E82 -_08016640: .4byte gUnknown_2023D6B +_08016640: .4byte sBattler_AI _08016644: .4byte gUnknown_2023D74 _08016648: .4byte gUnknown_81D99E4 _0801664C: .4byte gUnknown_2023BE3 @@ -12999,7 +12999,7 @@ _080166CC: .4byte gUnknown_2023D74 _080166D0: .4byte gUnknown_81D99E4 _080166D4: .4byte gUnknown_2023BE3 _080166D8: - ldr r0, _080166EC @ =gUnknown_2022B4C + ldr r0, _080166EC @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x1 ands r1, r0 @@ -13010,13 +13010,13 @@ _080166D8: strb r0, [r1, 0x5] b _080166F8 .align 2, 0 -_080166EC: .4byte gUnknown_2022B4C +_080166EC: .4byte gBattleTypeFlags _080166F0: .4byte gUnknown_2023E82 _080166F4: ldr r0, _08016734 @ =gUnknown_2023E82 strb r1, [r0, 0x5] _080166F8: - ldr r0, _08016738 @ =gUnknown_2023D6B + ldr r0, _08016738 @ =sBattler_AI mov r8, r0 ldr r1, _0801673C @ =gUnknown_2023D74 mov r9, r1 @@ -13049,7 +13049,7 @@ _0801671E: bx r0 .align 2, 0 _08016734: .4byte gUnknown_2023E82 -_08016738: .4byte gUnknown_2023D6B +_08016738: .4byte sBattler_AI _0801673C: .4byte gUnknown_2023D74 _08016740: .4byte gUnknown_81D99E4 _08016744: .4byte gUnknown_2023BE3 @@ -13061,7 +13061,7 @@ sub_8016748: @ 8016748 lsls r0, 24 lsrs r4, r0, 24 movs r6, 0 - ldr r1, _0801676C @ =gUnknown_2023BE4 + ldr r1, _0801676C @ =gBattleMons movs r0, 0x58 muls r0, r4 adds r1, r0, r1 @@ -13076,7 +13076,7 @@ sub_8016748: @ 8016748 ldrb r1, [r0, 0x7] b _0801677E .align 2, 0 -_0801676C: .4byte gUnknown_2023BE4 +_0801676C: .4byte gBattleMons _08016770: .4byte gUnknown_2023F54 _08016774: ldrh r0, [r1, 0x2E] @@ -13089,7 +13089,7 @@ _0801677E: cmp r1, 0x25 bne _080167BC ldr r2, _080167B0 @ =gUnknown_2023D68 - ldr r1, _080167B4 @ =gUnknown_2023BE4 + ldr r1, _080167B4 @ =gBattleMons movs r0, 0x58 muls r0, r4 adds r0, r1 @@ -13109,10 +13109,10 @@ _0801677E: .align 2, 0 _080167AC: .4byte gUnknown_2023D6F _080167B0: .4byte gUnknown_2023D68 -_080167B4: .4byte gUnknown_2023BE4 +_080167B4: .4byte gBattleMons _080167B8: .4byte gUnknown_2023E8C _080167BC: - ldr r7, _080167EC @ =gUnknown_2023BE4 + ldr r7, _080167EC @ =gBattleMons movs r2, 0x58 adds r0, r4, 0 muls r0, r2 @@ -13136,11 +13136,11 @@ _080167BC: strb r0, [r2, 0x1] b _08016816 .align 2, 0 -_080167EC: .4byte gUnknown_2023BE4 +_080167EC: .4byte gBattleMons _080167F0: .4byte gUnknown_2023D6A _080167F4: .4byte gUnknown_2023E8C _080167F8: - ldr r0, _08016820 @ =gUnknown_2022B4C + ldr r0, _08016820 @ =gBattleTypeFlags ldr r3, [r0] movs r0, 0xA0 lsls r0, 8 @@ -13160,7 +13160,7 @@ _08016816: lsrs r6, r0, 24 b _0801687A .align 2, 0 -_08016820: .4byte gUnknown_2022B4C +_08016820: .4byte gBattleTypeFlags _08016824: movs r0, 0x1 ands r3, r0 @@ -13179,7 +13179,7 @@ _08016824: ldrh r1, [r2, 0x6] bl __divsi3 adds r4, r0, 0 - ldr r0, _08016894 @ =gUnknown_2023FE8 + ldr r0, _08016894 @ =gBattleStruct ldr r0, [r0] adds r0, 0x6C ldrb r1, [r0] @@ -13199,7 +13199,7 @@ _08016868: lsls r0, 24 lsrs r6, r0, 24 _0801686E: - ldr r0, _08016894 @ =gUnknown_2023FE8 + ldr r0, _08016894 @ =gBattleStruct ldr r1, [r0] adds r1, 0x6C ldrb r0, [r1] @@ -13221,7 +13221,7 @@ _0801688C: pop {r1} bx r1 .align 2, 0 -_08016894: .4byte gUnknown_2023FE8 +_08016894: .4byte gBattleStruct _08016898: .4byte gUnknown_2023BE2 _0801689C: .4byte gUnknown_2023BCC _080168A0: .4byte gUnknown_2023E8A @@ -13230,14 +13230,14 @@ _080168A0: .4byte gUnknown_2023E8A thumb_func_start sub_80168A4 sub_80168A4: @ 80168A4 push {r4-r6,lr} - ldr r4, _080168F4 @ =gUnknown_2023D6B + ldr r4, _080168F4 @ =sBattler_AI ldr r1, _080168F8 @ =gUnknown_2023BDE ldr r5, _080168FC @ =gUnknown_2023BE2 ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] strb r0, [r4] - ldr r0, _08016900 @ =gUnknown_2022B4C + ldr r0, _08016900 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -13246,7 +13246,7 @@ sub_80168A4: @ 80168A4 ldr r0, _08016904 @ =gUnknown_2023BCC ldrb r1, [r0] strb r1, [r5] - ldr r2, _08016908 @ =gUnknown_2023BC4 + ldr r2, _08016908 @ =gActiveBattler movs r0, 0 strb r0, [r2] lsls r1, 24 @@ -13270,12 +13270,12 @@ _080168D8: movs r1, 0x2 b _08016922 .align 2, 0 -_080168F4: .4byte gUnknown_2023D6B +_080168F4: .4byte sBattler_AI _080168F8: .4byte gUnknown_2023BDE _080168FC: .4byte gUnknown_2023BE2 -_08016900: .4byte gUnknown_2022B4C +_08016900: .4byte gBattleTypeFlags _08016904: .4byte gUnknown_2023BCC -_08016908: .4byte gUnknown_2023BC4 +_08016908: .4byte gActiveBattler _0801690C: .4byte gUnknown_2023D7C _08016910: .4byte gUnknown_2023E8A _08016914: @@ -13337,7 +13337,7 @@ _08016980: .4byte gUnknown_2023D74 _08016984: .4byte gUnknown_81D893A _08016988: .4byte gUnknown_2023BE3 _0801698C: - ldr r1, _080169B4 @ =gUnknown_2023BE4 + ldr r1, _080169B4 @ =gBattleMons ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -13358,7 +13358,7 @@ _0801698C: movs r0, 0xA b _080169D6 .align 2, 0 -_080169B4: .4byte gUnknown_2023BE4 +_080169B4: .4byte gBattleMons _080169B8: .4byte 0x0400e000 _080169BC: .4byte gUnknown_2023E82 _080169C0: .4byte gUnknown_2023D74 @@ -13384,7 +13384,7 @@ _080169E4: .4byte gUnknown_2023E8A thumb_func_start sub_80169E8 sub_80169E8: @ 80169E8 push {r4,r5,lr} - ldr r2, _08016A44 @ =gUnknown_2023D6B + ldr r2, _08016A44 @ =sBattler_AI ldr r1, _08016A48 @ =gUnknown_2023BDE ldr r0, _08016A4C @ =gUnknown_2023BE2 ldrb r0, [r0] @@ -13396,7 +13396,7 @@ sub_80169E8: @ 80169E8 strh r5, [r0] ldr r0, _08016A54 @ =gUnknown_2022976 strh r5, [r0] - ldr r4, _08016A58 @ =gUnknown_2023FE8 + ldr r4, _08016A58 @ =gBattleStruct ldr r1, [r4] adds r2, r1, 0 adds r2, 0x79 @@ -13410,12 +13410,12 @@ sub_80169E8: @ 80169E8 ldrb r0, [r0] cmp r0, 0 bne _08016A68 - ldr r0, _08016A5C @ =gUnknown_202402C + ldr r0, _08016A5C @ =gEnemyParty movs r1, 0xB bl GetMonData ldr r4, [r4] adds r4, 0x7C - ldr r2, _08016A60 @ =gUnknown_8254784 + ldr r2, _08016A60 @ =gBaseStats lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -13428,14 +13428,14 @@ sub_80169E8: @ 80169E8 strb r0, [r4] b _08016A98 .align 2, 0 -_08016A44: .4byte gUnknown_2023D6B +_08016A44: .4byte sBattler_AI _08016A48: .4byte gUnknown_2023BDE _08016A4C: .4byte gUnknown_2023BE2 _08016A50: .4byte gUnknown_2022974 _08016A54: .4byte gUnknown_2022976 -_08016A58: .4byte gUnknown_2023FE8 -_08016A5C: .4byte gUnknown_202402C -_08016A60: .4byte gUnknown_8254784 +_08016A58: .4byte gBattleStruct +_08016A5C: .4byte gEnemyParty +_08016A60: .4byte gBaseStats _08016A64: .4byte 0x000004fb _08016A68: ldr r1, _08016A70 @ =gUnknown_2023E82 @@ -13485,7 +13485,7 @@ _08016ABC: .4byte gUnknown_2023BE3 thumb_func_start sub_8016AC0 sub_8016AC0: @ 8016AC0 - ldr r2, _08016AF8 @ =gUnknown_2023D6B + ldr r2, _08016AF8 @ =sBattler_AI ldr r1, _08016AFC @ =gUnknown_2023BDE ldr r0, _08016B00 @ =gUnknown_2023BE2 ldrb r0, [r0] @@ -13513,7 +13513,7 @@ sub_8016AC0: @ 8016AC0 strb r0, [r1] bx lr .align 2, 0 -_08016AF8: .4byte gUnknown_2023D6B +_08016AF8: .4byte sBattler_AI _08016AFC: .4byte gUnknown_2023BDE _08016B00: .4byte gUnknown_2023BE2 _08016B04: .4byte gUnknown_2022974 @@ -13528,7 +13528,7 @@ _08016B1C: .4byte gUnknown_2023BE3 thumb_func_start sub_8016B20 sub_8016B20: @ 8016B20 push {r4-r7,lr} - ldr r2, _08016B9C @ =gUnknown_2023D6B + ldr r2, _08016B9C @ =sBattler_AI ldr r1, _08016BA0 @ =gUnknown_2023BDE ldr r0, _08016BA4 @ =gUnknown_2023BE2 ldrb r0, [r0] @@ -13541,7 +13541,7 @@ sub_8016B20: @ 8016B20 ldr r0, _08016BAC @ =gUnknown_2022976 strh r7, [r0] bl Random - ldr r6, _08016BB0 @ =gUnknown_2023FE8 + ldr r6, _08016BB0 @ =gBattleStruct ldr r5, [r6] adds r5, 0x7A ldrb r4, [r5] @@ -13589,12 +13589,12 @@ _08016B86: pop {r0} bx r0 .align 2, 0 -_08016B9C: .4byte gUnknown_2023D6B +_08016B9C: .4byte sBattler_AI _08016BA0: .4byte gUnknown_2023BDE _08016BA4: .4byte gUnknown_2023BE2 _08016BA8: .4byte gUnknown_2022974 _08016BAC: .4byte gUnknown_2022976 -_08016BB0: .4byte gUnknown_2023FE8 +_08016BB0: .4byte gBattleStruct _08016BB4: .4byte gUnknown_2023D74 _08016BB8: .4byte gUnknown_81D9A04 _08016BBC: .4byte gUnknown_2023BE3 @@ -13603,7 +13603,7 @@ _08016BBC: .4byte gUnknown_2023BE3 thumb_func_start sub_8016BC0 sub_8016BC0: @ 8016BC0 push {r4-r7,lr} - ldr r2, _08016C3C @ =gUnknown_2023D6B + ldr r2, _08016C3C @ =sBattler_AI ldr r1, _08016C40 @ =gUnknown_2023BDE ldr r0, _08016C44 @ =gUnknown_2023BE2 ldrb r0, [r0] @@ -13616,7 +13616,7 @@ sub_8016BC0: @ 8016BC0 ldr r0, _08016C4C @ =gUnknown_2022976 strh r7, [r0] bl Random - ldr r6, _08016C50 @ =gUnknown_2023FE8 + ldr r6, _08016C50 @ =gBattleStruct ldr r5, [r6] adds r5, 0x79 ldrb r4, [r5] @@ -13664,12 +13664,12 @@ _08016C26: pop {r0} bx r0 .align 2, 0 -_08016C3C: .4byte gUnknown_2023D6B +_08016C3C: .4byte sBattler_AI _08016C40: .4byte gUnknown_2023BDE _08016C44: .4byte gUnknown_2023BE2 _08016C48: .4byte gUnknown_2022974 _08016C4C: .4byte gUnknown_2022976 -_08016C50: .4byte gUnknown_2023FE8 +_08016C50: .4byte gBattleStruct _08016C54: .4byte gUnknown_2023D74 _08016C58: .4byte gUnknown_81D9A04 _08016C5C: .4byte gUnknown_2023BE3 @@ -13678,7 +13678,7 @@ _08016C5C: .4byte gUnknown_2023BE3 thumb_func_start HandleAction_SafriZoneRun HandleAction_SafriZoneRun: @ 8016C60 push {r4,lr} - ldr r2, _08016C88 @ =gUnknown_2023D6B + ldr r2, _08016C88 @ =sBattler_AI ldr r1, _08016C8C @ =gUnknown_2023BDE ldr r4, _08016C90 @ =gUnknown_2023BE2 ldrb r0, [r4] @@ -13697,7 +13697,7 @@ HandleAction_SafriZoneRun: @ 8016C60 pop {r0} bx r0 .align 2, 0 -_08016C88: .4byte gUnknown_2023D6B +_08016C88: .4byte sBattler_AI _08016C8C: .4byte gUnknown_2023BDE _08016C90: .4byte gUnknown_2023BE2 _08016C94: .4byte gUnknown_2023BCC @@ -13706,7 +13706,7 @@ _08016C98: .4byte gUnknown_2023E8A thumb_func_start HandleAction_Action9 HandleAction_Action9: @ 8016C9C - ldr r3, _08016CE8 @ =gUnknown_2023D6B + ldr r3, _08016CE8 @ =sBattler_AI ldr r1, _08016CEC @ =gUnknown_2023BDE ldr r0, _08016CF0 @ =gUnknown_2023BE2 ldrb r0, [r0] @@ -13724,7 +13724,7 @@ HandleAction_Action9: @ 8016C9C movs r0, 0x7 strb r0, [r1, 0x1] strb r2, [r1, 0x2] - ldr r2, _08016D00 @ =gUnknown_2023BCE + ldr r2, _08016D00 @ =gBattlerPartyIndexes ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -13744,13 +13744,13 @@ HandleAction_Action9: @ 8016C9C strb r0, [r1, 0x1] bx lr .align 2, 0 -_08016CE8: .4byte gUnknown_2023D6B +_08016CE8: .4byte sBattler_AI _08016CEC: .4byte gUnknown_2023BDE _08016CF0: .4byte gUnknown_2023BE2 _08016CF4: .4byte gUnknown_2022974 _08016CF8: .4byte gUnknown_2022976 _08016CFC: .4byte gUnknown_2022AB8 -_08016D00: .4byte gUnknown_2023BCE +_08016D00: .4byte gBattlerPartyIndexes _08016D04: .4byte gUnknown_2023D74 _08016D08: .4byte gUnknown_81D9A04 _08016D0C: .4byte gUnknown_2023BE3 @@ -13765,7 +13765,7 @@ HandleAction_Action11: @ 8016D14 lsrs r1, r0, 24 cmp r1, 0 bne _08016D30 - ldr r0, _08016D34 @ =gUnknown_2023FE8 + ldr r0, _08016D34 @ =gBattleStruct ldr r0, [r0] adds r0, 0x4D strb r1, [r0] @@ -13776,7 +13776,7 @@ _08016D30: pop {r0} bx r0 .align 2, 0 -_08016D34: .4byte gUnknown_2023FE8 +_08016D34: .4byte gBattleStruct _08016D38: .4byte gUnknown_2023BE3 thumb_func_end HandleAction_Action11 @@ -13825,19 +13825,19 @@ HandleAction_ActionFinished: @ 8016D70 ldr r1, _08016DF4 @ =0xf1e892af ands r0, r1 str r0, [r2] - ldr r0, _08016DF8 @ =gUnknown_2023D4A + ldr r0, _08016DF8 @ =gCurrentMove movs r1, 0 strh r1, [r0] - ldr r0, _08016DFC @ =gUnknown_2023D50 + ldr r0, _08016DFC @ =gBattleMoveDamage movs r4, 0 str r4, [r0] - ldr r0, _08016E00 @ =gUnknown_2023DCC + ldr r0, _08016E00 @ =gMoveResultFlags strb r1, [r0] - ldr r5, _08016E04 @ =gUnknown_2023FC4 + ldr r5, _08016E04 @ =gBattleScripting strb r1, [r5, 0x18] strb r1, [r5, 0x19] ldr r2, _08016E08 @ =gUnknown_2023DA0 - ldr r3, _08016E0C @ =gUnknown_2023D6B + ldr r3, _08016E0C @ =sBattler_AI ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -13847,17 +13847,17 @@ HandleAction_ActionFinished: @ 8016D70 lsls r0, 1 adds r0, r2 strh r4, [r0] - ldr r0, _08016E14 @ =gUnknown_2023FE8 + ldr r0, _08016E14 @ =gBattleStruct ldr r0, [r0] strb r1, [r0, 0x13] - ldr r0, _08016E18 @ =gUnknown_2023F50 + ldr r0, _08016E18 @ =gDynamicBasePower strh r4, [r0] strb r1, [r5, 0x14] ldr r0, _08016E1C @ =gUnknown_2023E82 strb r1, [r0, 0x3] strb r1, [r0, 0x4] strb r1, [r5, 0x16] - ldr r0, _08016E20 @ =gUnknown_2023FF4 + ldr r0, _08016E20 @ =gBattleResources ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0x20 @@ -13871,17 +13871,17 @@ _08016DE8: .4byte gUnknown_2023BE3 _08016DEC: .4byte gUnknown_2023BDA _08016DF0: .4byte gUnknown_2023DD0 _08016DF4: .4byte 0xf1e892af -_08016DF8: .4byte gUnknown_2023D4A -_08016DFC: .4byte gUnknown_2023D50 -_08016E00: .4byte gUnknown_2023DCC -_08016E04: .4byte gUnknown_2023FC4 +_08016DF8: .4byte gCurrentMove +_08016DFC: .4byte gBattleMoveDamage +_08016E00: .4byte gMoveResultFlags +_08016E04: .4byte gBattleScripting _08016E08: .4byte gUnknown_2023DA0 -_08016E0C: .4byte gUnknown_2023D6B +_08016E0C: .4byte sBattler_AI _08016E10: .4byte gUnknown_2023DA8 -_08016E14: .4byte gUnknown_2023FE8 -_08016E18: .4byte gUnknown_2023F50 +_08016E14: .4byte gBattleStruct +_08016E18: .4byte gDynamicBasePower _08016E1C: .4byte gUnknown_2023E82 -_08016E20: .4byte gUnknown_2023FF4 +_08016E20: .4byte gBattleResources thumb_func_end HandleAction_ActionFinished .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_ai_script_commands.s b/asm/battle_ai_script_commands.s deleted file mode 100644 index 84bd60462..000000000 --- a/asm/battle_ai_script_commands.s +++ /dev/null @@ -1,5796 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80C6D0C -sub_80C6D0C: @ 80C6D0C - push {r4-r7,lr} - ldr r1, _080C6D8C @ =gUnknown_2023FF4 - ldr r0, [r1] - ldr r3, [r0, 0x18] - movs r4, 0 - adds r7, r1, 0 - ldr r2, _080C6D90 @ =gUnknown_2022B4C - movs r1, 0 -_080C6D1C: - adds r0, r3, r4 - strb r1, [r0] - adds r4, 0x1 - cmp r4, 0x2F - bls _080C6D1C - ldr r3, [r2] - movs r0, 0x8 - ands r0, r3 - cmp r0, 0 - beq _080C6D80 - ldr r0, _080C6D94 @ =gUnknown_20386AE - ldrh r2, [r0] - movs r1, 0x80 - lsls r1, 3 - adds r6, r0, 0 - cmp r2, r1 - beq _080C6D80 - ldr r0, _080C6D98 @ =0x00080982 - ands r3, r0 - cmp r3, 0 - bne _080C6D80 - movs r4, 0 - ldr r5, _080C6D9C @ =gUnknown_823EAD8 -_080C6D4A: - lsls r2, r4, 1 - ldrh r1, [r6] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r2, r0 - adds r2, r5 - ldrh r3, [r2] - cmp r3, 0 - beq _080C6D7A - ldr r2, [r7] - ldr r1, [r2, 0x18] - adds r0, r1, 0 - adds r0, 0x2C - ldrb r0, [r0] - lsls r0, 1 - adds r1, 0x24 - adds r1, r0 - strh r3, [r1] - ldr r1, [r2, 0x18] - adds r1, 0x2C - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_080C6D7A: - adds r4, 0x1 - cmp r4, 0x3 - ble _080C6D4A -_080C6D80: - bl sub_80C6DA0 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C6D8C: .4byte gUnknown_2023FF4 -_080C6D90: .4byte gUnknown_2022B4C -_080C6D94: .4byte gUnknown_20386AE -_080C6D98: .4byte 0x00080982 -_080C6D9C: .4byte gUnknown_823EAD8 - thumb_func_end sub_80C6D0C - - thumb_func_start sub_80C6DA0 -sub_80C6DA0: @ 80C6DA0 - push {r4-r7,lr} - ldr r0, _080C6E60 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r4, 0 - ldr r3, _080C6E64 @ =gUnknown_2023BC4 - movs r2, 0 -_080C6DAE: - adds r0, r1, r4 - strb r2, [r0] - adds r4, 0x1 - cmp r4, 0x1B - bls _080C6DAE - movs r4, 0 - ldr r2, _080C6E60 @ =gUnknown_2023FF4 - movs r1, 0x64 -_080C6DBE: - ldr r0, [r2] - ldr r0, [r0, 0x14] - adds r0, 0x4 - adds r0, r4 - strb r1, [r0] - adds r4, 0x1 - cmp r4, 0x3 - ble _080C6DBE - ldrb r0, [r3] - movs r1, 0 - movs r2, 0xFF - bl sub_801779C - lsls r0, 24 - lsrs r6, r0, 24 - movs r4, 0 - ldr r5, _080C6E60 @ =gUnknown_2023FF4 -_080C6DE0: - ldr r7, _080C6E68 @ =gUnknown_825E45C - lsls r0, r4, 2 - adds r0, r7 - ldr r0, [r0] - ands r0, r6 - cmp r0, 0 - beq _080C6DFA - ldr r0, [r5] - ldr r0, [r0, 0x14] - adds r0, 0x4 - adds r0, r4 - movs r1, 0 - strb r1, [r0] -_080C6DFA: - bl Random - ldr r1, [r5] - ldr r2, [r1, 0x14] - adds r2, 0x18 - adds r2, r4 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xF - ands r0, r1 - movs r1, 0x64 - subs r1, r0 - strb r1, [r2] - adds r4, 0x1 - cmp r4, 0x3 - ble _080C6DE0 - ldr r0, _080C6E60 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x1C] - adds r0, 0x20 - movs r1, 0 - strb r1, [r0] - ldr r1, _080C6E6C @ =gUnknown_2023D6B - ldr r0, _080C6E64 @ =gUnknown_2023BC4 - ldrb r2, [r0] - strb r2, [r1] - ldr r0, _080C6E70 @ =gUnknown_2022B4C - ldr r0, [r0] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C6E7C - ldr r4, _080C6E74 @ =gUnknown_2023D6C - bl Random - movs r3, 0x2 - ands r0, r3 - strb r0, [r4] - ldr r0, _080C6E78 @ =gUnknown_2023D70 - ldrb r1, [r0] - ldrb r2, [r4] - lsls r0, r2, 2 - adds r0, r7 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _080C6E84 - eors r2, r3 - strb r2, [r4] - b _080C6E84 - .align 2, 0 -_080C6E60: .4byte gUnknown_2023FF4 -_080C6E64: .4byte gUnknown_2023BC4 -_080C6E68: .4byte gUnknown_825E45C -_080C6E6C: .4byte gUnknown_2023D6B -_080C6E70: .4byte gUnknown_2022B4C -_080C6E74: .4byte gUnknown_2023D6C -_080C6E78: .4byte gUnknown_2023D70 -_080C6E7C: - ldr r0, _080C6EA0 @ =gUnknown_2023D6C - movs r1, 0x1 - eors r1, r2 - strb r1, [r0] -_080C6E84: - ldr r0, _080C6EA4 @ =gUnknown_2022B4C - ldr r1, [r0] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _080C6EAC - ldr r0, _080C6EA8 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0x80 - lsls r0, 23 - str r0, [r1, 0xC] - b _080C6F34 - .align 2, 0 -_080C6EA0: .4byte gUnknown_2023D6C -_080C6EA4: .4byte gUnknown_2022B4C -_080C6EA8: .4byte gUnknown_2023FF4 -_080C6EAC: - movs r2, 0x80 - lsls r2, 3 - adds r0, r1, 0 - ands r0, r2 - cmp r0, 0 - beq _080C6ECC - ldr r0, _080C6EC8 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0x80 - lsls r0, 22 - str r0, [r1, 0xC] - b _080C6F34 - .align 2, 0 -_080C6EC8: .4byte gUnknown_2023FF4 -_080C6ECC: - ldr r0, _080C6EF4 @ =0x00080900 - ands r0, r1 - cmp r0, 0 - bne _080C6F0A - ldr r4, _080C6EF8 @ =gUnknown_20386AE - ldrh r0, [r4] - cmp r0, r2 - beq _080C6F0A - movs r0, 0x80 - lsls r0, 10 - ands r0, r1 - cmp r0, 0 - beq _080C6F00 - ldr r0, _080C6EFC @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0x1 - str r0, [r1, 0xC] - b _080C6F34 - .align 2, 0 -_080C6EF4: .4byte 0x00080900 -_080C6EF8: .4byte gUnknown_20386AE -_080C6EFC: .4byte gUnknown_2023FF4 -_080C6F00: - movs r0, 0x80 - lsls r0, 11 - ands r1, r0 - cmp r1, 0 - beq _080C6F1C -_080C6F0A: - ldr r0, _080C6F18 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0x7 - str r0, [r1, 0xC] - b _080C6F34 - .align 2, 0 -_080C6F18: .4byte gUnknown_2023FF4 -_080C6F1C: - ldr r0, _080C6F3C @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C6F40 @ =gUnknown_823EAC8 - ldrh r1, [r4] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r2, 0x1C - adds r0, r2 - ldr r0, [r0] - str r0, [r3, 0xC] -_080C6F34: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C6F3C: .4byte gUnknown_2023FF4 -_080C6F40: .4byte gUnknown_823EAC8 - thumb_func_end sub_80C6DA0 - - thumb_func_start sub_80C6F44 -sub_80C6F44: @ 80C6F44 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - bl sub_80C7164 - ldr r1, _080C6FA8 @ =gUnknown_2023FF4 - ldr r0, [r1] - ldr r0, [r0, 0x14] - ldr r0, [r0, 0xC] - cmp r0, 0 - beq _080C6F94 - adds r4, r1, 0 - movs r5, 0 -_080C6F60: - ldr r0, [r4] - ldr r2, [r0, 0x14] - ldr r0, [r2, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C6F74 - strb r5, [r2] - bl sub_80C7038 -_080C6F74: - ldr r0, [r4] - ldr r1, [r0, 0x14] - ldr r0, [r1, 0xC] - lsrs r0, 1 - str r0, [r1, 0xC] - ldrb r0, [r1, 0x11] - adds r0, 0x1 - strb r0, [r1, 0x11] - ldr r0, [r4] - ldr r0, [r0, 0x14] - strb r5, [r0, 0x1] - ldr r0, [r4] - ldr r0, [r0, 0x14] - ldr r0, [r0, 0xC] - cmp r0, 0 - bne _080C6F60 -_080C6F94: - ldr r6, _080C6FA8 @ =gUnknown_2023FF4 - ldr r0, [r6] - ldr r3, [r0, 0x14] - ldrb r1, [r3, 0x10] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080C6FAC - movs r0, 0x4 - b _080C702A - .align 2, 0 -_080C6FA8: .4byte gUnknown_2023FF4 -_080C6FAC: - movs r0, 0x4 - ands r0, r1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0 - beq _080C6FBC - movs r0, 0x5 - b _080C702A -_080C6FBC: - movs r5, 0x1 - mov r0, sp - ldrb r1, [r3, 0x4] - strb r1, [r0] - add r0, sp, 0x4 - strb r2, [r0] - movs r3, 0x1 - mov r8, r0 - mov r4, sp - adds r7, r6, 0 - mov r6, r8 -_080C6FD2: - ldrb r1, [r4] - ldr r0, [r7] - ldr r0, [r0, 0x14] - adds r0, 0x4 - adds r2, r0, r3 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - bge _080C6FEC - movs r5, 0x1 - ldrb r0, [r2] - strb r0, [r4] - strb r3, [r6] -_080C6FEC: - ldrb r1, [r4] - ldr r0, [r7] - ldr r0, [r0, 0x14] - adds r0, 0x4 - adds r2, r0, r3 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - bne _080C7012 - mov r0, sp - adds r1, r0, r5 - ldrb r0, [r2] - strb r0, [r1] - adds r1, r5, 0 - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r1, r6, r1 - strb r3, [r1] -_080C7012: - adds r3, 0x1 - cmp r3, 0x3 - ble _080C6FD2 - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r1, r5, 0 - bl __modsi3 - add r0, r8 - ldrb r0, [r0] -_080C702A: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80C6F44 - - thumb_func_start sub_80C7038 -sub_80C7038: @ 80C7038 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r7, _080C70B0 @ =gUnknown_2023FF4 - ldr r0, [r7] - ldr r0, [r0, 0x14] - ldrb r0, [r0] - adds r6, r7, 0 - cmp r0, 0x2 - bne _080C7050 - b _080C7156 -_080C7050: - mov r9, r7 - ldr r0, _080C70B4 @ =gUnknown_2039A00 - mov r8, r0 -_080C7056: - mov r1, r9 - ldr r0, [r1] - ldr r2, [r0, 0x14] - ldrb r0, [r2] - cmp r0, 0x1 - beq _080C70C4 - cmp r0, 0x1 - bgt _080C714A - cmp r0, 0 - bne _080C714A - ldr r1, _080C70B8 @ =gUnknown_81D9BF4 - ldrb r0, [r2, 0x11] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - mov r1, r8 - str r0, [r1] - ldr r5, _080C70BC @ =gUnknown_2023BE4 - ldrb r4, [r2, 0x1] - ldr r0, _080C70C0 @ =gUnknown_2023D6B - ldrb r1, [r0] - movs r0, 0x58 - adds r3, r1, 0 - muls r3, r0 - adds r0, r4, r3 - adds r1, r5, 0 - adds r1, 0x24 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080C70A0 - lsls r0, r4, 1 - adds r0, r3 - adds r1, r5, 0 - adds r1, 0xC - adds r0, r1 - ldrh r0, [r0] -_080C70A0: - strh r0, [r2, 0x2] - ldr r0, [r6] - ldr r1, [r0, 0x14] - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _080C714A - .align 2, 0 -_080C70B0: .4byte gUnknown_2023FF4 -_080C70B4: .4byte gUnknown_2039A00 -_080C70B8: .4byte gUnknown_81D9BF4 -_080C70BC: .4byte gUnknown_2023BE4 -_080C70C0: .4byte gUnknown_2023D6B -_080C70C4: - ldrh r1, [r2, 0x2] - cmp r1, 0 - beq _080C70E4 - ldr r1, _080C70E0 @ =gUnknown_83F55A4 - mov r2, r8 - ldr r0, [r2] - ldrb r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - b _080C70FA - .align 2, 0 -_080C70E0: .4byte gUnknown_83F55A4 -_080C70E4: - adds r0, r2, 0x4 - ldrb r2, [r2, 0x1] - adds r0, r2 - strb r1, [r0] - mov r1, r9 - ldr r0, [r1] - ldr r2, [r0, 0x14] - ldrb r1, [r2, 0x10] - movs r0, 0x1 - orrs r0, r1 - strb r0, [r2, 0x10] -_080C70FA: - ldr r2, _080C7130 @ =gUnknown_2023FF4 - ldr r0, [r2] - ldr r3, [r0, 0x14] - ldrb r1, [r3, 0x10] - movs r0, 0x1 - ands r0, r1 - adds r6, r2, 0 - cmp r0, 0 - beq _080C714A - ldrb r0, [r3, 0x1] - adds r0, 0x1 - strb r0, [r3, 0x1] - ldr r0, [r6] - ldr r2, [r0, 0x14] - ldrb r0, [r2, 0x1] - cmp r0, 0x3 - bhi _080C7134 - ldrb r1, [r2, 0x10] - movs r0, 0x8 - ands r0, r1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - bne _080C7134 - strb r0, [r2] - b _080C713E - .align 2, 0 -_080C7130: .4byte gUnknown_2023FF4 -_080C7134: - ldr r0, [r6] - ldr r1, [r0, 0x14] - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_080C713E: - ldr r0, [r6] - ldr r2, [r0, 0x14] - ldrb r1, [r2, 0x10] - movs r0, 0xFE - ands r0, r1 - strb r0, [r2, 0x10] -_080C714A: - ldr r0, [r7] - ldr r0, [r0, 0x14] - ldrb r0, [r0] - cmp r0, 0x2 - beq _080C7156 - b _080C7056 -_080C7156: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C7038 - - thumb_func_start sub_80C7164 -sub_80C7164: @ 80C7164 - push {r4-r6,lr} - movs r3, 0 - ldr r5, _080C7190 @ =gUnknown_2023FF4 - ldr r4, _080C7194 @ =gUnknown_2023D6C - ldr r6, _080C7198 @ =gUnknown_2023D98 -_080C716E: - ldr r0, [r5] - ldr r2, [r0, 0x18] - lsls r1, r3, 1 - ldrb r0, [r4] - lsrs r0, 1 - lsls r0, 4 - adds r1, r0 - adds r2, r1 - ldrh r0, [r2] - cmp r0, 0 - bne _080C719C - ldrb r0, [r4] - lsls r0, 1 - adds r0, r6 - ldrh r0, [r0] - strh r0, [r2] - b _080C71A2 - .align 2, 0 -_080C7190: .4byte gUnknown_2023FF4 -_080C7194: .4byte gUnknown_2023D6C -_080C7198: .4byte gUnknown_2023D98 -_080C719C: - adds r3, 0x1 - cmp r3, 0x7 - ble _080C716E -_080C71A2: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80C7164 - - thumb_func_start sub_80C71A8 -sub_80C71A8: @ 80C71A8 - push {r4,lr} - lsls r0, 24 - ldr r4, _080C71CC @ =gUnknown_2023FF4 - lsrs r0, 25 - lsls r1, r0, 4 - movs r3, 0 - movs r2, 0x7 -_080C71B6: - ldr r0, [r4] - ldr r0, [r0, 0x18] - adds r0, r1 - strh r3, [r0] - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bge _080C71B6 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C71CC: .4byte gUnknown_2023FF4 - thumb_func_end sub_80C71A8 - - thumb_func_start sub_80C71D0 -sub_80C71D0: @ 80C71D0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - adds r0, r4, 0 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080C71FC - adds r0, r4, 0 - bl GetBankIdentity - ldr r1, _080C7204 @ =gUnknown_2023FF4 - ldr r1, [r1] - ldr r2, [r1, 0x18] - movs r1, 0x1 - ands r1, r0 - adds r2, 0x20 - adds r2, r1 - strb r5, [r2] -_080C71FC: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C7204: .4byte gUnknown_2023FF4 - thumb_func_end sub_80C71D0 - - thumb_func_start sub_80C7208 -sub_80C7208: @ 80C7208 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - adds r0, r4, 0 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080C7234 - adds r0, r4, 0 - bl GetBankIdentity - ldr r1, _080C723C @ =gUnknown_2023FF4 - ldr r1, [r1] - ldr r2, [r1, 0x18] - movs r1, 0x1 - ands r1, r0 - adds r2, 0x22 - adds r2, r1 - strb r5, [r2] -_080C7234: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C723C: .4byte gUnknown_2023FF4 - thumb_func_end sub_80C7208 - - thumb_func_start sub_80C7240 -sub_80C7240: @ 80C7240 - push {lr} - bl Random - lsls r0, 16 - movs r1, 0xFF - lsls r1, 16 - ldr r3, _080C7274 @ =gUnknown_2039A00 - ldr r2, [r3] - ands r1, r0 - lsrs r1, 16 - ldrb r0, [r2, 0x1] - cmp r1, r0 - bcs _080C7278 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C727C - .align 2, 0 -_080C7274: .4byte gUnknown_2039A00 -_080C7278: - adds r0, r2, 0x6 - str r0, [r3] -_080C727C: - pop {r0} - bx r0 - thumb_func_end sub_80C7240 - - thumb_func_start sub_80C7280 -sub_80C7280: @ 80C7280 - push {lr} - bl Random - lsls r0, 16 - movs r1, 0xFF - lsls r1, 16 - ldr r3, _080C72B4 @ =gUnknown_2039A00 - ldr r2, [r3] - ands r1, r0 - lsrs r1, 16 - ldrb r0, [r2, 0x1] - cmp r1, r0 - bls _080C72B8 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C72BC - .align 2, 0 -_080C72B4: .4byte gUnknown_2039A00 -_080C72B8: - adds r0, r2, 0x6 - str r0, [r3] -_080C72BC: - pop {r0} - bx r0 - thumb_func_end sub_80C7280 - - thumb_func_start sub_80C72C0 -sub_80C72C0: @ 80C72C0 - push {lr} - bl Random - lsls r0, 16 - movs r1, 0xFF - lsls r1, 16 - ldr r3, _080C72F4 @ =gUnknown_2039A00 - ldr r2, [r3] - ands r1, r0 - lsrs r1, 16 - ldrb r0, [r2, 0x1] - cmp r1, r0 - bne _080C72F8 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C72FC - .align 2, 0 -_080C72F4: .4byte gUnknown_2039A00 -_080C72F8: - adds r0, r2, 0x6 - str r0, [r3] -_080C72FC: - pop {r0} - bx r0 - thumb_func_end sub_80C72C0 - - thumb_func_start sub_80C7300 -sub_80C7300: @ 80C7300 - push {lr} - bl Random - lsls r0, 16 - movs r1, 0xFF - lsls r1, 16 - ldr r3, _080C7334 @ =gUnknown_2039A00 - ldr r2, [r3] - ands r1, r0 - lsrs r1, 16 - ldrb r0, [r2, 0x1] - cmp r1, r0 - beq _080C7338 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C733C - .align 2, 0 -_080C7334: .4byte gUnknown_2039A00 -_080C7338: - adds r0, r2, 0x6 - str r0, [r3] -_080C733C: - pop {r0} - bx r0 - thumb_func_end sub_80C7300 - - thumb_func_start BattleAICmd_score -BattleAICmd_score: @ 80C7340 - push {r4,lr} - ldr r2, _080C737C @ =gUnknown_2023FF4 - ldr r0, [r2] - ldr r0, [r0, 0x14] - adds r1, r0, 0x4 - ldrb r0, [r0, 0x1] - adds r1, r0 - ldr r3, _080C7380 @ =gUnknown_2039A00 - ldr r0, [r3] - ldrb r0, [r0, 0x1] - ldrb r4, [r1] - adds r0, r4 - strb r0, [r1] - ldr r0, [r2] - ldr r1, [r0, 0x14] - adds r0, r1, 0x4 - ldrb r1, [r1, 0x1] - adds r1, r0, r1 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - bge _080C7370 - movs r0, 0 - strb r0, [r1] -_080C7370: - ldr r0, [r3] - adds r0, 0x2 - str r0, [r3] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C737C: .4byte gUnknown_2023FF4 -_080C7380: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_score - - thumb_func_start sub_80C7384 -sub_80C7384: @ 80C7384 - push {r4,lr} - ldr r0, _080C7398 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C73A0 - ldr r0, _080C739C @ =gUnknown_2023D6B - b _080C73A2 - .align 2, 0 -_080C7398: .4byte gUnknown_2039A00 -_080C739C: .4byte gUnknown_2023D6B -_080C73A0: - ldr r0, _080C73D8 @ =gUnknown_2023D6C -_080C73A2: - ldrb r1, [r0] - ldr r2, _080C73DC @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r1, r0 - adds r1, r2 - ldrh r2, [r1, 0x28] - movs r0, 0x64 - muls r0, r2 - ldrh r1, [r1, 0x2C] - bl __divsi3 - ldr r2, [r4] - ldrb r1, [r2, 0x2] - cmp r0, r1 - bcs _080C73E0 - ldrb r1, [r2, 0x3] - ldrb r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C73E4 - .align 2, 0 -_080C73D8: .4byte gUnknown_2023D6C -_080C73DC: .4byte gUnknown_2023BE4 -_080C73E0: - adds r0, r2, 0x7 - str r0, [r4] -_080C73E4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C7384 - - thumb_func_start sub_80C73EC -sub_80C73EC: @ 80C73EC - push {r4,lr} - ldr r0, _080C7400 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C7408 - ldr r0, _080C7404 @ =gUnknown_2023D6B - b _080C740A - .align 2, 0 -_080C7400: .4byte gUnknown_2039A00 -_080C7404: .4byte gUnknown_2023D6B -_080C7408: - ldr r0, _080C7440 @ =gUnknown_2023D6C -_080C740A: - ldrb r1, [r0] - ldr r2, _080C7444 @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r1, r0 - adds r1, r2 - ldrh r2, [r1, 0x28] - movs r0, 0x64 - muls r0, r2 - ldrh r1, [r1, 0x2C] - bl __divsi3 - ldr r2, [r4] - ldrb r1, [r2, 0x2] - cmp r0, r1 - bls _080C7448 - ldrb r1, [r2, 0x3] - ldrb r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C744C - .align 2, 0 -_080C7440: .4byte gUnknown_2023D6C -_080C7444: .4byte gUnknown_2023BE4 -_080C7448: - adds r0, r2, 0x7 - str r0, [r4] -_080C744C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C73EC - - thumb_func_start sub_80C7454 -sub_80C7454: @ 80C7454 - push {r4,lr} - ldr r0, _080C7468 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C7470 - ldr r0, _080C746C @ =gUnknown_2023D6B - b _080C7472 - .align 2, 0 -_080C7468: .4byte gUnknown_2039A00 -_080C746C: .4byte gUnknown_2023D6B -_080C7470: - ldr r0, _080C74A8 @ =gUnknown_2023D6C -_080C7472: - ldrb r1, [r0] - ldr r2, _080C74AC @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r1, r0 - adds r1, r2 - ldrh r2, [r1, 0x28] - movs r0, 0x64 - muls r0, r2 - ldrh r1, [r1, 0x2C] - bl __divsi3 - ldr r2, [r4] - ldrb r1, [r2, 0x2] - cmp r0, r1 - bne _080C74B0 - ldrb r1, [r2, 0x3] - ldrb r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C74B4 - .align 2, 0 -_080C74A8: .4byte gUnknown_2023D6C -_080C74AC: .4byte gUnknown_2023BE4 -_080C74B0: - adds r0, r2, 0x7 - str r0, [r4] -_080C74B4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C7454 - - thumb_func_start sub_80C74BC -sub_80C74BC: @ 80C74BC - push {r4,lr} - ldr r0, _080C74D0 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C74D8 - ldr r0, _080C74D4 @ =gUnknown_2023D6B - b _080C74DA - .align 2, 0 -_080C74D0: .4byte gUnknown_2039A00 -_080C74D4: .4byte gUnknown_2023D6B -_080C74D8: - ldr r0, _080C7510 @ =gUnknown_2023D6C -_080C74DA: - ldrb r1, [r0] - ldr r2, _080C7514 @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r1, r0 - adds r1, r2 - ldrh r2, [r1, 0x28] - movs r0, 0x64 - muls r0, r2 - ldrh r1, [r1, 0x2C] - bl __divsi3 - ldr r2, [r4] - ldrb r1, [r2, 0x2] - cmp r0, r1 - beq _080C7518 - ldrb r1, [r2, 0x3] - ldrb r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C751C - .align 2, 0 -_080C7510: .4byte gUnknown_2023D6C -_080C7514: .4byte gUnknown_2023BE4 -_080C7518: - adds r0, r2, 0x7 - str r0, [r4] -_080C751C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C74BC - - thumb_func_start sub_80C7524 -sub_80C7524: @ 80C7524 - push {r4,r5,lr} - ldr r0, _080C7538 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r5, r0, 0 - cmp r1, 0x1 - bne _080C7540 - ldr r0, _080C753C @ =gUnknown_2023D6B - b _080C7542 - .align 2, 0 -_080C7538: .4byte gUnknown_2039A00 -_080C753C: .4byte gUnknown_2023D6B -_080C7540: - ldr r0, _080C7584 @ =gUnknown_2023D6C -_080C7542: - ldrb r4, [r0] - ldr r3, [r5] - ldrb r2, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r2, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r2, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r2, r0 - ldr r1, _080C7588 @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r0, r4 - adds r1, 0x4C - adds r0, r1 - ldr r0, [r0] - ands r0, r2 - cmp r0, 0 - beq _080C758C - ldrb r1, [r3, 0x6] - ldrb r0, [r3, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] - b _080C7592 - .align 2, 0 -_080C7584: .4byte gUnknown_2023D6C -_080C7588: .4byte gUnknown_2023BE4 -_080C758C: - adds r0, r3, 0 - adds r0, 0xA - str r0, [r5] -_080C7592: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80C7524 - - thumb_func_start sub_80C7598 -sub_80C7598: @ 80C7598 - push {r4,r5,lr} - ldr r0, _080C75AC @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r5, r0, 0 - cmp r1, 0x1 - bne _080C75B4 - ldr r0, _080C75B0 @ =gUnknown_2023D6B - b _080C75B6 - .align 2, 0 -_080C75AC: .4byte gUnknown_2039A00 -_080C75B0: .4byte gUnknown_2023D6B -_080C75B4: - ldr r0, _080C75F8 @ =gUnknown_2023D6C -_080C75B6: - ldrb r4, [r0] - ldr r3, [r5] - ldrb r2, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r2, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r2, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r2, r0 - ldr r1, _080C75FC @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r0, r4 - adds r1, 0x4C - adds r0, r1 - ldr r0, [r0] - ands r0, r2 - cmp r0, 0 - bne _080C7600 - ldrb r1, [r3, 0x6] - ldrb r0, [r3, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] - b _080C7606 - .align 2, 0 -_080C75F8: .4byte gUnknown_2023D6C -_080C75FC: .4byte gUnknown_2023BE4 -_080C7600: - adds r0, r3, 0 - adds r0, 0xA - str r0, [r5] -_080C7606: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80C7598 - - thumb_func_start sub_80C760C -sub_80C760C: @ 80C760C - push {r4,r5,lr} - ldr r0, _080C7620 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r5, r0, 0 - cmp r1, 0x1 - bne _080C7628 - ldr r0, _080C7624 @ =gUnknown_2023D6B - b _080C762A - .align 2, 0 -_080C7620: .4byte gUnknown_2039A00 -_080C7624: .4byte gUnknown_2023D6B -_080C7628: - ldr r0, _080C766C @ =gUnknown_2023D6C -_080C762A: - ldrb r4, [r0] - ldr r3, [r5] - ldrb r2, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r2, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r2, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r2, r0 - ldr r1, _080C7670 @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r0, r4 - adds r1, 0x50 - adds r0, r1 - ldr r0, [r0] - ands r0, r2 - cmp r0, 0 - beq _080C7674 - ldrb r1, [r3, 0x6] - ldrb r0, [r3, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] - b _080C767A - .align 2, 0 -_080C766C: .4byte gUnknown_2023D6C -_080C7670: .4byte gUnknown_2023BE4 -_080C7674: - adds r0, r3, 0 - adds r0, 0xA - str r0, [r5] -_080C767A: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80C760C - - thumb_func_start sub_80C7680 -sub_80C7680: @ 80C7680 - push {r4,r5,lr} - ldr r0, _080C7694 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r5, r0, 0 - cmp r1, 0x1 - bne _080C769C - ldr r0, _080C7698 @ =gUnknown_2023D6B - b _080C769E - .align 2, 0 -_080C7694: .4byte gUnknown_2039A00 -_080C7698: .4byte gUnknown_2023D6B -_080C769C: - ldr r0, _080C76E0 @ =gUnknown_2023D6C -_080C769E: - ldrb r4, [r0] - ldr r3, [r5] - ldrb r2, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r2, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r2, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r2, r0 - ldr r1, _080C76E4 @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r0, r4 - adds r1, 0x50 - adds r0, r1 - ldr r0, [r0] - ands r0, r2 - cmp r0, 0 - bne _080C76E8 - ldrb r1, [r3, 0x6] - ldrb r0, [r3, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] - b _080C76EE - .align 2, 0 -_080C76E0: .4byte gUnknown_2023D6C -_080C76E4: .4byte gUnknown_2023BE4 -_080C76E8: - adds r0, r3, 0 - adds r0, 0xA - str r0, [r5] -_080C76EE: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80C7680 - - thumb_func_start sub_80C76F4 -sub_80C76F4: @ 80C76F4 - push {r4,r5,lr} - ldr r0, _080C7708 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r5, r0, 0 - cmp r1, 0x1 - bne _080C7710 - ldr r0, _080C770C @ =gUnknown_2023D6B - b _080C7712 - .align 2, 0 -_080C7708: .4byte gUnknown_2039A00 -_080C770C: .4byte gUnknown_2023D6B -_080C7710: - ldr r0, _080C7750 @ =gUnknown_2023D6C -_080C7712: - ldrb r4, [r0] - ldr r3, [r5] - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - ldr r2, _080C7754 @ =gUnknown_2023DFC - lsls r0, r4, 2 - adds r0, r2 - ldr r0, [r0] - ands r0, r1 - cmp r0, 0 - beq _080C7758 - ldrb r1, [r3, 0x6] - ldrb r0, [r3, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] - b _080C775E - .align 2, 0 -_080C7750: .4byte gUnknown_2023D6C -_080C7754: .4byte gUnknown_2023DFC -_080C7758: - adds r0, r3, 0 - adds r0, 0xA - str r0, [r5] -_080C775E: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80C76F4 - - thumb_func_start sub_80C7764 -sub_80C7764: @ 80C7764 - push {r4,r5,lr} - ldr r0, _080C7778 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r5, r0, 0 - cmp r1, 0x1 - bne _080C7780 - ldr r0, _080C777C @ =gUnknown_2023D6B - b _080C7782 - .align 2, 0 -_080C7778: .4byte gUnknown_2039A00 -_080C777C: .4byte gUnknown_2023D6B -_080C7780: - ldr r0, _080C77C0 @ =gUnknown_2023D6C -_080C7782: - ldrb r4, [r0] - ldr r3, [r5] - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - ldr r2, _080C77C4 @ =gUnknown_2023DFC - lsls r0, r4, 2 - adds r0, r2 - ldr r0, [r0] - ands r0, r1 - cmp r0, 0 - bne _080C77C8 - ldrb r1, [r3, 0x6] - ldrb r0, [r3, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] - b _080C77CE - .align 2, 0 -_080C77C0: .4byte gUnknown_2023D6C -_080C77C4: .4byte gUnknown_2023DFC -_080C77C8: - adds r0, r3, 0 - adds r0, 0xA - str r0, [r5] -_080C77CE: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80C7764 - - thumb_func_start sub_80C77D4 -sub_80C77D4: @ 80C77D4 - push {r4,lr} - ldr r0, _080C77E4 @ =gUnknown_2039A00 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bne _080C77EC - ldr r0, _080C77E8 @ =gUnknown_2023D6B - b _080C77EE - .align 2, 0 -_080C77E4: .4byte gUnknown_2039A00 -_080C77E8: .4byte gUnknown_2023D6B -_080C77EC: - ldr r0, _080C7838 @ =gUnknown_2023D6C -_080C77EE: - ldrb r0, [r0] - bl GetBankIdentity - movs r2, 0x1 - ands r2, r0 - ldr r4, _080C783C @ =gUnknown_2039A00 - ldr r3, [r4] - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - ldr r0, _080C7840 @ =gUnknown_2023DDE - lsls r2, 1 - adds r2, r0 - ldrh r0, [r2] - ands r0, r1 - cmp r0, 0 - beq _080C7844 - ldrb r1, [r3, 0x6] - ldrb r0, [r3, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C784A - .align 2, 0 -_080C7838: .4byte gUnknown_2023D6C -_080C783C: .4byte gUnknown_2039A00 -_080C7840: .4byte gUnknown_2023DDE -_080C7844: - adds r0, r3, 0 - adds r0, 0xA - str r0, [r4] -_080C784A: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C77D4 - - thumb_func_start sub_80C7850 -sub_80C7850: @ 80C7850 - push {r4,lr} - ldr r0, _080C7860 @ =gUnknown_2039A00 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bne _080C7868 - ldr r0, _080C7864 @ =gUnknown_2023D6B - b _080C786A - .align 2, 0 -_080C7860: .4byte gUnknown_2039A00 -_080C7864: .4byte gUnknown_2023D6B -_080C7868: - ldr r0, _080C78B4 @ =gUnknown_2023D6C -_080C786A: - ldrb r0, [r0] - bl GetBankIdentity - movs r2, 0x1 - ands r2, r0 - ldr r4, _080C78B8 @ =gUnknown_2039A00 - ldr r3, [r4] - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - ldr r0, _080C78BC @ =gUnknown_2023DDE - lsls r2, 1 - adds r2, r0 - ldrh r0, [r2] - ands r0, r1 - cmp r0, 0 - bne _080C78C0 - ldrb r1, [r3, 0x6] - ldrb r0, [r3, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C78C6 - .align 2, 0 -_080C78B4: .4byte gUnknown_2023D6C -_080C78B8: .4byte gUnknown_2039A00 -_080C78BC: .4byte gUnknown_2023DDE -_080C78C0: - adds r0, r3, 0 - adds r0, 0xA - str r0, [r4] -_080C78C6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C7850 - - thumb_func_start sub_80C78CC -sub_80C78CC: @ 80C78CC - push {lr} - ldr r0, _080C78F8 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r3, _080C78FC @ =gUnknown_2039A00 - ldr r2, [r3] - ldr r0, [r0, 0x8] - ldrb r1, [r2, 0x1] - cmp r0, r1 - bcs _080C7900 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C7904 - .align 2, 0 -_080C78F8: .4byte gUnknown_2023FF4 -_080C78FC: .4byte gUnknown_2039A00 -_080C7900: - adds r0, r2, 0x6 - str r0, [r3] -_080C7904: - pop {r0} - bx r0 - thumb_func_end sub_80C78CC - - thumb_func_start sub_80C7908 -sub_80C7908: @ 80C7908 - push {lr} - ldr r0, _080C7934 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r3, _080C7938 @ =gUnknown_2039A00 - ldr r2, [r3] - ldr r0, [r0, 0x8] - ldrb r1, [r2, 0x1] - cmp r0, r1 - bls _080C793C - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C7940 - .align 2, 0 -_080C7934: .4byte gUnknown_2023FF4 -_080C7938: .4byte gUnknown_2039A00 -_080C793C: - adds r0, r2, 0x6 - str r0, [r3] -_080C7940: - pop {r0} - bx r0 - thumb_func_end sub_80C7908 - - thumb_func_start sub_80C7944 -sub_80C7944: @ 80C7944 - push {lr} - ldr r0, _080C7970 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r3, _080C7974 @ =gUnknown_2039A00 - ldr r2, [r3] - ldr r0, [r0, 0x8] - ldrb r1, [r2, 0x1] - cmp r0, r1 - bne _080C7978 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C797C - .align 2, 0 -_080C7970: .4byte gUnknown_2023FF4 -_080C7974: .4byte gUnknown_2039A00 -_080C7978: - adds r0, r2, 0x6 - str r0, [r3] -_080C797C: - pop {r0} - bx r0 - thumb_func_end sub_80C7944 - - thumb_func_start sub_80C7980 -sub_80C7980: @ 80C7980 - push {lr} - ldr r0, _080C79AC @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r3, _080C79B0 @ =gUnknown_2039A00 - ldr r2, [r3] - ldr r0, [r0, 0x8] - ldrb r1, [r2, 0x1] - cmp r0, r1 - beq _080C79B4 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C79B8 - .align 2, 0 -_080C79AC: .4byte gUnknown_2023FF4 -_080C79B0: .4byte gUnknown_2039A00 -_080C79B4: - adds r0, r2, 0x6 - str r0, [r3] -_080C79B8: - pop {r0} - bx r0 - thumb_func_end sub_80C7980 - - thumb_func_start sub_80C79BC -sub_80C79BC: @ 80C79BC - push {lr} - ldr r3, _080C79FC @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - ldr r0, _080C7A00 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r0, [r0, 0x8] - ldrb r1, [r1] - cmp r0, r1 - bcs _080C7A04 - ldrb r1, [r2, 0x5] - ldrb r0, [r2, 0x6] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C7A0A - .align 2, 0 -_080C79FC: .4byte gUnknown_2039A00 -_080C7A00: .4byte gUnknown_2023FF4 -_080C7A04: - adds r0, r2, 0 - adds r0, 0x9 - str r0, [r3] -_080C7A0A: - pop {r0} - bx r0 - thumb_func_end sub_80C79BC - - thumb_func_start sub_80C7A10 -sub_80C7A10: @ 80C7A10 - push {lr} - ldr r3, _080C7A50 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - ldr r0, _080C7A54 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r0, [r0, 0x8] - ldrb r1, [r1] - cmp r0, r1 - bls _080C7A58 - ldrb r1, [r2, 0x5] - ldrb r0, [r2, 0x6] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C7A5E - .align 2, 0 -_080C7A50: .4byte gUnknown_2039A00 -_080C7A54: .4byte gUnknown_2023FF4 -_080C7A58: - adds r0, r2, 0 - adds r0, 0x9 - str r0, [r3] -_080C7A5E: - pop {r0} - bx r0 - thumb_func_end sub_80C7A10 - - thumb_func_start sub_80C7A64 -sub_80C7A64: @ 80C7A64 - push {lr} - ldr r3, _080C7AA4 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - ldr r0, _080C7AA8 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r0, [r0, 0x8] - ldrb r1, [r1] - cmp r0, r1 - bne _080C7AAC - ldrb r1, [r2, 0x5] - ldrb r0, [r2, 0x6] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C7AB2 - .align 2, 0 -_080C7AA4: .4byte gUnknown_2039A00 -_080C7AA8: .4byte gUnknown_2023FF4 -_080C7AAC: - adds r0, r2, 0 - adds r0, 0x9 - str r0, [r3] -_080C7AB2: - pop {r0} - bx r0 - thumb_func_end sub_80C7A64 - - thumb_func_start sub_80C7AB8 -sub_80C7AB8: @ 80C7AB8 - push {lr} - ldr r3, _080C7AF8 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - ldr r0, _080C7AFC @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r0, [r0, 0x8] - ldrb r1, [r1] - cmp r0, r1 - beq _080C7B00 - ldrb r1, [r2, 0x5] - ldrb r0, [r2, 0x6] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C7B06 - .align 2, 0 -_080C7AF8: .4byte gUnknown_2039A00 -_080C7AFC: .4byte gUnknown_2023FF4 -_080C7B00: - adds r0, r2, 0 - adds r0, 0x9 - str r0, [r3] -_080C7B06: - pop {r0} - bx r0 - thumb_func_end sub_80C7AB8 - - thumb_func_start sub_80C7B0C -sub_80C7B0C: @ 80C7B0C - push {lr} - ldr r3, _080C7B40 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldr r0, _080C7B44 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldrh r0, [r0, 0x2] - cmp r0, r1 - bne _080C7B48 - ldrb r1, [r2, 0x3] - ldrb r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C7B4C - .align 2, 0 -_080C7B40: .4byte gUnknown_2039A00 -_080C7B44: .4byte gUnknown_2023FF4 -_080C7B48: - adds r0, r2, 0x7 - str r0, [r3] -_080C7B4C: - pop {r0} - bx r0 - thumb_func_end sub_80C7B0C - - thumb_func_start sub_80C7B50 -sub_80C7B50: @ 80C7B50 - push {lr} - ldr r3, _080C7B84 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldr r0, _080C7B88 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldrh r0, [r0, 0x2] - cmp r0, r1 - beq _080C7B8C - ldrb r1, [r2, 0x3] - ldrb r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C7B90 - .align 2, 0 -_080C7B84: .4byte gUnknown_2039A00 -_080C7B88: .4byte gUnknown_2023FF4 -_080C7B8C: - adds r0, r2, 0x7 - str r0, [r3] -_080C7B90: - pop {r0} - bx r0 - thumb_func_end sub_80C7B50 - - thumb_func_start BattleAICmd_if_in_bytes -BattleAICmd_if_in_bytes: @ 80C7B94 - push {r4,lr} - ldr r2, _080C7BE0 @ =gUnknown_2039A00 - ldr r1, [r2] - ldrb r3, [r1, 0x1] - ldrb r0, [r1, 0x2] - lsls r0, 8 - orrs r3, r0 - ldrb r0, [r1, 0x3] - lsls r0, 16 - orrs r3, r0 - ldrb r0, [r1, 0x4] - lsls r0, 24 - orrs r3, r0 - ldrb r0, [r3] - cmp r0, 0xFF - beq _080C7BF0 - ldr r0, _080C7BE4 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r1, [r0, 0x8] - adds r4, r2, 0 -_080C7BBE: - ldrb r0, [r3] - cmp r1, r0 - bne _080C7BE8 - ldr r2, [r4] - ldrb r1, [r2, 0x5] - ldrb r0, [r2, 0x6] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C7BF6 - .align 2, 0 -_080C7BE0: .4byte gUnknown_2039A00 -_080C7BE4: .4byte gUnknown_2023FF4 -_080C7BE8: - adds r3, 0x1 - ldrb r0, [r3] - cmp r0, 0xFF - bne _080C7BBE -_080C7BF0: - ldr r0, [r2] - adds r0, 0x9 - str r0, [r2] -_080C7BF6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end BattleAICmd_if_in_bytes - - thumb_func_start BattleAICmd_if_not_in_bytes -BattleAICmd_if_not_in_bytes: @ 80C7BFC - push {r4,lr} - ldr r2, _080C7C38 @ =gUnknown_2039A00 - ldr r1, [r2] - ldrb r3, [r1, 0x1] - ldrb r0, [r1, 0x2] - lsls r0, 8 - orrs r3, r0 - ldrb r0, [r1, 0x3] - lsls r0, 16 - orrs r3, r0 - ldrb r0, [r1, 0x4] - lsls r0, 24 - orrs r3, r0 - ldrb r0, [r3] - adds r4, r2, 0 - cmp r0, 0xFF - beq _080C7C48 - ldr r0, _080C7C3C @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r2, [r0, 0x8] - adds r1, r4, 0 -_080C7C28: - ldrb r0, [r3] - cmp r2, r0 - bne _080C7C40 - ldr r0, [r1] - adds r0, 0x9 - str r0, [r1] - b _080C7C60 - .align 2, 0 -_080C7C38: .4byte gUnknown_2039A00 -_080C7C3C: .4byte gUnknown_2023FF4 -_080C7C40: - adds r3, 0x1 - ldrb r0, [r3] - cmp r0, 0xFF - bne _080C7C28 -_080C7C48: - ldr r2, [r4] - ldrb r1, [r2, 0x5] - ldrb r0, [r2, 0x6] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] -_080C7C60: - pop {r4} - pop {r0} - bx r0 - thumb_func_end BattleAICmd_if_not_in_bytes - - thumb_func_start BattleAICmd_if_in_hwords -BattleAICmd_if_in_hwords: @ 80C7C68 - push {r4,r5,lr} - ldr r2, _080C7CB4 @ =gUnknown_2039A00 - ldr r1, [r2] - ldrb r3, [r1, 0x1] - ldrb r0, [r1, 0x2] - lsls r0, 8 - orrs r3, r0 - ldrb r0, [r1, 0x3] - lsls r0, 16 - orrs r3, r0 - ldrb r0, [r1, 0x4] - lsls r0, 24 - orrs r3, r0 - ldrh r0, [r3] - ldr r5, _080C7CB8 @ =0x0000ffff - cmp r0, r5 - beq _080C7CC8 - ldr r0, _080C7CBC @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r1, [r0, 0x8] - adds r4, r2, 0 -_080C7C94: - ldrh r0, [r3] - cmp r1, r0 - bne _080C7CC0 - ldr r2, [r4] - ldrb r1, [r2, 0x5] - ldrb r0, [r2, 0x6] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C7CCE - .align 2, 0 -_080C7CB4: .4byte gUnknown_2039A00 -_080C7CB8: .4byte 0x0000ffff -_080C7CBC: .4byte gUnknown_2023FF4 -_080C7CC0: - adds r3, 0x2 - ldrh r0, [r3] - cmp r0, r5 - bne _080C7C94 -_080C7CC8: - ldr r0, [r2] - adds r0, 0x9 - str r0, [r2] -_080C7CCE: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end BattleAICmd_if_in_hwords - - thumb_func_start BattleAICmd_if_not_in_hwords -BattleAICmd_if_not_in_hwords: @ 80C7CD4 - push {r4,r5,lr} - ldr r2, _080C7D10 @ =gUnknown_2039A00 - ldr r1, [r2] - ldrb r3, [r1, 0x1] - ldrb r0, [r1, 0x2] - lsls r0, 8 - orrs r3, r0 - ldrb r0, [r1, 0x3] - lsls r0, 16 - orrs r3, r0 - ldrb r0, [r1, 0x4] - lsls r0, 24 - orrs r3, r0 - ldrh r0, [r3] - ldr r4, _080C7D14 @ =0x0000ffff - adds r5, r2, 0 - cmp r0, r4 - beq _080C7D24 - ldr r0, _080C7D18 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r2, [r0, 0x8] - adds r1, r5, 0 -_080C7D02: - ldrh r0, [r3] - cmp r2, r0 - bne _080C7D1C - ldr r0, [r1] - adds r0, 0x9 - str r0, [r1] - b _080C7D3C - .align 2, 0 -_080C7D10: .4byte gUnknown_2039A00 -_080C7D14: .4byte 0x0000ffff -_080C7D18: .4byte gUnknown_2023FF4 -_080C7D1C: - adds r3, 0x2 - ldrh r0, [r3] - cmp r0, r4 - bne _080C7D02 -_080C7D24: - ldr r2, [r5] - ldrb r1, [r2, 0x5] - ldrb r0, [r2, 0x6] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] -_080C7D3C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end BattleAICmd_if_not_in_hwords - - thumb_func_start sub_80C7D44 -sub_80C7D44: @ 80C7D44 - push {r4,r5,lr} - movs r3, 0 - ldr r4, _080C7D84 @ =gUnknown_2039A00 - ldr r1, _080C7D88 @ =gUnknown_2023BE4 - ldr r0, _080C7D8C @ =gUnknown_2023D6B - ldrb r2, [r0] - ldr r5, _080C7D90 @ =gUnknown_8250C04 - movs r0, 0x58 - muls r0, r2 - adds r1, 0xC - adds r2, r0, r1 -_080C7D5A: - ldrh r0, [r2] - cmp r0, 0 - beq _080C7D6E - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - ldrb r0, [r1, 0x1] - cmp r0, 0 - bne _080C7D76 -_080C7D6E: - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080C7D5A -_080C7D76: - cmp r3, 0x4 - bne _080C7D94 - ldr r0, [r4] - adds r0, 0x5 - str r0, [r4] - b _080C7DAC - .align 2, 0 -_080C7D84: .4byte gUnknown_2039A00 -_080C7D88: .4byte gUnknown_2023BE4 -_080C7D8C: .4byte gUnknown_2023D6B -_080C7D90: .4byte gUnknown_8250C04 -_080C7D94: - ldr r2, [r4] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] -_080C7DAC: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80C7D44 - - thumb_func_start sub_80C7DB4 -sub_80C7DB4: @ 80C7DB4 - push {r4,r5,lr} - movs r3, 0 - ldr r4, _080C7DF4 @ =gUnknown_2039A00 - ldr r1, _080C7DF8 @ =gUnknown_2023BE4 - ldr r0, _080C7DFC @ =gUnknown_2023D6B - ldrb r2, [r0] - ldr r5, _080C7E00 @ =gUnknown_8250C04 - movs r0, 0x58 - muls r0, r2 - adds r1, 0xC - adds r2, r0, r1 -_080C7DCA: - ldrh r0, [r2] - cmp r0, 0 - beq _080C7DDE - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - ldrb r0, [r1, 0x1] - cmp r0, 0 - bne _080C7DE6 -_080C7DDE: - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080C7DCA -_080C7DE6: - cmp r3, 0x4 - beq _080C7E04 - ldr r0, [r4] - adds r0, 0x5 - str r0, [r4] - b _080C7E1C - .align 2, 0 -_080C7DF4: .4byte gUnknown_2039A00 -_080C7DF8: .4byte gUnknown_2023BE4 -_080C7DFC: .4byte gUnknown_2023D6B -_080C7E00: .4byte gUnknown_8250C04 -_080C7E04: - ldr r2, [r4] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] -_080C7E1C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80C7DB4 - - thumb_func_start BattleAICmd_get_turn_count -BattleAICmd_get_turn_count: @ 80C7E24 - ldr r0, _080C7E3C @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - ldr r0, _080C7E40 @ =gUnknown_3004F90 - ldrb r0, [r0, 0x13] - str r0, [r1, 0x8] - ldr r1, _080C7E44 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_080C7E3C: .4byte gUnknown_2023FF4 -_080C7E40: .4byte gUnknown_3004F90 -_080C7E44: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_turn_count - - thumb_func_start BattleAICmd_get_type -BattleAICmd_get_type: @ 80C7E48 - push {r4,lr} - ldr r1, _080C7E60 @ =gUnknown_2039A00 - ldr r0, [r1] - ldrb r0, [r0, 0x1] - adds r4, r1, 0 - cmp r0, 0x4 - bhi _080C7F22 - lsls r0, 2 - ldr r1, _080C7E64 @ =_080C7E68 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080C7E60: .4byte gUnknown_2039A00 -_080C7E64: .4byte _080C7E68 - .align 2, 0 -_080C7E68: - .4byte _080C7EA0 - .4byte _080C7E7C - .4byte _080C7EE8 - .4byte _080C7EC4 - .4byte _080C7F0C -_080C7E7C: - ldr r0, _080C7E94 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C7E98 @ =gUnknown_2023BE4 - ldr r0, _080C7E9C @ =gUnknown_2023D6B - ldrb r1, [r0] - movs r0, 0x58 - muls r0, r1 - adds r0, r2 - adds r0, 0x21 - ldrb r0, [r0] - b _080C7F20 - .align 2, 0 -_080C7E94: .4byte gUnknown_2023FF4 -_080C7E98: .4byte gUnknown_2023BE4 -_080C7E9C: .4byte gUnknown_2023D6B -_080C7EA0: - ldr r0, _080C7EB8 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C7EBC @ =gUnknown_2023BE4 - ldr r0, _080C7EC0 @ =gUnknown_2023D6C - ldrb r1, [r0] - movs r0, 0x58 - muls r0, r1 - adds r0, r2 - adds r0, 0x21 - ldrb r0, [r0] - b _080C7F20 - .align 2, 0 -_080C7EB8: .4byte gUnknown_2023FF4 -_080C7EBC: .4byte gUnknown_2023BE4 -_080C7EC0: .4byte gUnknown_2023D6C -_080C7EC4: - ldr r0, _080C7EDC @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C7EE0 @ =gUnknown_2023BE4 - ldr r0, _080C7EE4 @ =gUnknown_2023D6B - ldrb r1, [r0] - movs r0, 0x58 - muls r0, r1 - adds r0, r2 - adds r0, 0x22 - ldrb r0, [r0] - b _080C7F20 - .align 2, 0 -_080C7EDC: .4byte gUnknown_2023FF4 -_080C7EE0: .4byte gUnknown_2023BE4 -_080C7EE4: .4byte gUnknown_2023D6B -_080C7EE8: - ldr r0, _080C7F00 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C7F04 @ =gUnknown_2023BE4 - ldr r0, _080C7F08 @ =gUnknown_2023D6C - ldrb r1, [r0] - movs r0, 0x58 - muls r0, r1 - adds r0, r2 - adds r0, 0x22 - ldrb r0, [r0] - b _080C7F20 - .align 2, 0 -_080C7F00: .4byte gUnknown_2023FF4 -_080C7F04: .4byte gUnknown_2023BE4 -_080C7F08: .4byte gUnknown_2023D6C -_080C7F0C: - ldr r0, _080C7F30 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C7F34 @ =gUnknown_8250C04 - ldrh r1, [r3, 0x2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x2] -_080C7F20: - str r0, [r3, 0x8] -_080C7F22: - ldr r0, [r4] - adds r0, 0x2 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C7F30: .4byte gUnknown_2023FF4 -_080C7F34: .4byte gUnknown_8250C04 - thumb_func_end BattleAICmd_get_type - - thumb_func_start BattleAICmd_get_last_used_bank_move_power -BattleAICmd_get_last_used_bank_move_power: @ 80C7F38 - ldr r0, _080C7F58 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C7F5C @ =gUnknown_8250C04 - ldrh r1, [r3, 0x2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x1] - str r0, [r3, 0x8] - ldr r1, _080C7F60 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_080C7F58: .4byte gUnknown_2023FF4 -_080C7F5C: .4byte gUnknown_8250C04 -_080C7F60: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_last_used_bank_move_power - - thumb_func_start BattleAICmd_is_most_powerful_move -BattleAICmd_is_most_powerful_move: @ 80C7F64 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - movs r3, 0 - ldr r0, _080C80A4 @ =gUnknown_83F571C - ldrh r1, [r0] - ldr r5, _080C80A8 @ =0x0000ffff - ldr r6, _080C80AC @ =gUnknown_8250C04 - ldr r2, _080C80B0 @ =gUnknown_2023FF4 - cmp r1, r5 - beq _080C7FA2 - ldr r0, [r2] - ldr r0, [r0, 0x14] - ldrh r1, [r0, 0x2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - ldrb r4, [r0] - ldr r1, _080C80A4 @ =gUnknown_83F571C -_080C7F92: - ldrh r0, [r1] - cmp r4, r0 - beq _080C7FA2 - adds r1, 0x2 - adds r3, 0x1 - ldrh r0, [r1] - cmp r0, r5 - bne _080C7F92 -_080C7FA2: - ldr r0, [r2] - ldr r0, [r0, 0x14] - ldrh r1, [r0, 0x2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bhi _080C7FB8 - b _080C8142 -_080C7FB8: - lsls r0, r3, 1 - ldr r1, _080C80A4 @ =gUnknown_83F571C - adds r0, r1 - ldrh r3, [r0] - ldr r0, _080C80A8 @ =0x0000ffff - cmp r3, r0 - beq _080C7FC8 - b _080C8142 -_080C7FC8: - ldr r0, _080C80B4 @ =gUnknown_2023F50 - movs r1, 0 - strh r1, [r0] - ldr r0, _080C80B8 @ =gUnknown_2023FE8 - ldr r0, [r0] - strb r1, [r0, 0x13] - ldr r0, _080C80BC @ =gUnknown_2023FC4 - movs r2, 0x1 - strb r2, [r0, 0xE] - ldr r0, _080C80C0 @ =gUnknown_2023DCC - strb r1, [r0] - ldr r0, _080C80C4 @ =gUnknown_2023D71 - strb r2, [r0] - movs r6, 0 - mov r9, r3 - ldr r2, _080C80A4 @ =gUnknown_83F571C - ldrh r2, [r2] - str r2, [sp, 0x10] -_080C7FEC: - movs r3, 0 - ldr r5, _080C80C8 @ =gUnknown_2023BE4 - lsls r4, r6, 1 - ldr r7, _080C80CC @ =gUnknown_2023D6B - lsls r0, r6, 2 - mov r8, r0 - adds r1, r6, 0x1 - mov r10, r1 - ldr r2, [sp, 0x10] - cmp r2, r9 - beq _080C8030 - ldr r2, _080C80AC @ =gUnknown_8250C04 - ldrb r1, [r7] - movs r0, 0x58 - muls r0, r1 - adds r0, r4, r0 - adds r1, r5, 0 - adds r1, 0xC - adds r0, r1 - ldrh r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r2, [r0] - ldr r1, _080C80A4 @ =gUnknown_83F571C -_080C8020: - ldrh r0, [r1] - cmp r2, r0 - beq _080C8030 - adds r1, 0x2 - adds r3, 0x1 - ldrh r0, [r1] - cmp r0, r9 - bne _080C8020 -_080C8030: - ldrb r1, [r7] - movs r0, 0x58 - muls r0, r1 - adds r0, r4, r0 - adds r1, r5, 0 - adds r1, 0xC - adds r1, r0, r1 - ldrh r0, [r1] - cmp r0, 0 - beq _080C80DC - lsls r0, r3, 1 - ldr r2, _080C80A4 @ =gUnknown_83F571C - adds r0, r2 - ldrh r0, [r0] - cmp r0, r9 - bne _080C80DC - ldr r0, _080C80AC @ =gUnknown_8250C04 - ldrh r2, [r1] - lsls r1, r2, 1 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldrb r0, [r1, 0x1] - cmp r0, 0x1 - bls _080C80DC - ldr r5, _080C80D0 @ =gUnknown_2023D4A - strh r2, [r5] - ldrb r0, [r7] - ldr r4, _080C80D4 @ =gUnknown_2023D6C - ldrb r1, [r4] - bl AI_CalcDmg - ldrh r0, [r5] - ldrb r1, [r7] - ldrb r2, [r4] - bl TypeCalc - mov r4, sp - add r4, r8 - ldr r2, _080C80D8 @ =gUnknown_2023D50 - ldr r0, _080C80B0 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - adds r0, 0x18 - adds r0, r6 - ldrb r1, [r0] - ldr r0, [r2] - muls r0, r1 - movs r1, 0x64 - bl __divsi3 - str r0, [r4] - cmp r0, 0 - bne _080C80E4 - movs r0, 0x1 - str r0, [r4] - b _080C80E4 - .align 2, 0 -_080C80A4: .4byte gUnknown_83F571C -_080C80A8: .4byte 0x0000ffff -_080C80AC: .4byte gUnknown_8250C04 -_080C80B0: .4byte gUnknown_2023FF4 -_080C80B4: .4byte gUnknown_2023F50 -_080C80B8: .4byte gUnknown_2023FE8 -_080C80BC: .4byte gUnknown_2023FC4 -_080C80C0: .4byte gUnknown_2023DCC -_080C80C4: .4byte gUnknown_2023D71 -_080C80C8: .4byte gUnknown_2023BE4 -_080C80CC: .4byte gUnknown_2023D6B -_080C80D0: .4byte gUnknown_2023D4A -_080C80D4: .4byte gUnknown_2023D6C -_080C80D8: .4byte gUnknown_2023D50 -_080C80DC: - mov r1, sp - add r1, r8 - movs r0, 0 - str r0, [r1] -_080C80E4: - mov r6, r10 - cmp r6, 0x3 - bgt _080C80EC - b _080C7FEC -_080C80EC: - movs r6, 0 - ldr r2, _080C8130 @ =gUnknown_2023FF4 - ldr r0, [r2] - ldr r0, [r0, 0x14] - ldrb r0, [r0, 0x1] - lsls r0, 2 - add r0, sp - ldr r1, [sp] - ldr r0, [r0] - ldr r5, _080C8134 @ =gUnknown_2039A00 - cmp r1, r0 - bgt _080C8122 - adds r4, r2, 0 - mov r3, sp -_080C8108: - adds r3, 0x4 - adds r6, 0x1 - cmp r6, 0x3 - bgt _080C8122 - ldr r0, [r4] - ldr r0, [r0, 0x14] - ldrb r0, [r0, 0x1] - lsls r0, 2 - add r0, sp - ldr r1, [r3] - ldr r0, [r0] - cmp r1, r0 - ble _080C8108 -_080C8122: - cmp r6, 0x4 - bne _080C8138 - ldr r0, [r2] - ldr r1, [r0, 0x14] - movs r0, 0x2 - str r0, [r1, 0x8] - b _080C814C - .align 2, 0 -_080C8130: .4byte gUnknown_2023FF4 -_080C8134: .4byte gUnknown_2039A00 -_080C8138: - ldr r0, [r2] - ldr r1, [r0, 0x14] - movs r0, 0x1 - str r0, [r1, 0x8] - b _080C814C -_080C8142: - ldr r0, [r2] - ldr r1, [r0, 0x14] - movs r0, 0 - str r0, [r1, 0x8] - ldr r5, _080C8164 @ =gUnknown_2039A00 -_080C814C: - ldr r0, [r5] - adds r0, 0x1 - str r0, [r5] - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C8164: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_is_most_powerful_move - - thumb_func_start BattleAICmd_get_last_used_bank_move -BattleAICmd_get_last_used_bank_move: @ 80C8168 - push {lr} - ldr r0, _080C8184 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r3, r0, 0 - cmp r1, 0x1 - bne _080C8194 - ldr r0, _080C8188 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r1, _080C818C @ =gUnknown_2023D98 - ldr r0, _080C8190 @ =gUnknown_2023D6B - b _080C819E - .align 2, 0 -_080C8184: .4byte gUnknown_2039A00 -_080C8188: .4byte gUnknown_2023FF4 -_080C818C: .4byte gUnknown_2023D98 -_080C8190: .4byte gUnknown_2023D6B -_080C8194: - ldr r0, _080C81B4 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r1, _080C81B8 @ =gUnknown_2023D98 - ldr r0, _080C81BC @ =gUnknown_2023D6C -_080C819E: - ldrb r0, [r0] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - str r0, [r2, 0x8] - ldr r0, [r3] - adds r0, 0x2 - str r0, [r3] - pop {r0} - bx r0 - .align 2, 0 -_080C81B4: .4byte gUnknown_2023FF4 -_080C81B8: .4byte gUnknown_2023D98 -_080C81BC: .4byte gUnknown_2023D6C - thumb_func_end BattleAICmd_get_last_used_bank_move - - thumb_func_start sub_80C81C0 -sub_80C81C0: @ 80C81C0 - push {lr} - ldr r3, _080C81EC @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldr r0, _080C81F0 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r0, [r0, 0x8] - cmp r1, r0 - bne _080C81F4 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C81F8 - .align 2, 0 -_080C81EC: .4byte gUnknown_2039A00 -_080C81F0: .4byte gUnknown_2023FF4 -_080C81F4: - adds r0, r2, 0x6 - str r0, [r3] -_080C81F8: - pop {r0} - bx r0 - thumb_func_end sub_80C81C0 - - thumb_func_start sub_80C81FC -sub_80C81FC: @ 80C81FC - push {lr} - ldr r3, _080C8228 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldr r0, _080C822C @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldr r0, [r0, 0x8] - cmp r1, r0 - beq _080C8230 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C8234 - .align 2, 0 -_080C8228: .4byte gUnknown_2039A00 -_080C822C: .4byte gUnknown_2023FF4 -_080C8230: - adds r0, r2, 0x6 - str r0, [r3] -_080C8234: - pop {r0} - bx r0 - thumb_func_end sub_80C81FC - - thumb_func_start sub_80C8238 -sub_80C8238: @ 80C8238 - push {lr} - ldr r0, _080C8270 @ =gUnknown_2023D6B - ldrb r0, [r0] - ldr r1, _080C8274 @ =gUnknown_2023D6C - ldrb r1, [r1] - movs r2, 0x1 - bl GetWhoStrikesFirst - ldr r3, _080C8278 @ =gUnknown_2039A00 - ldr r2, [r3] - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r2, 0x1] - cmp r0, r1 - bne _080C827C - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C8280 - .align 2, 0 -_080C8270: .4byte gUnknown_2023D6B -_080C8274: .4byte gUnknown_2023D6C -_080C8278: .4byte gUnknown_2039A00 -_080C827C: - adds r0, r2, 0x6 - str r0, [r3] -_080C8280: - pop {r0} - bx r0 - thumb_func_end sub_80C8238 - - thumb_func_start sub_80C8284 -sub_80C8284: @ 80C8284 - push {lr} - ldr r0, _080C82BC @ =gUnknown_2023D6B - ldrb r0, [r0] - ldr r1, _080C82C0 @ =gUnknown_2023D6C - ldrb r1, [r1] - movs r2, 0x1 - bl GetWhoStrikesFirst - ldr r3, _080C82C4 @ =gUnknown_2039A00 - ldr r2, [r3] - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r2, 0x1] - cmp r0, r1 - beq _080C82C8 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C82CC - .align 2, 0 -_080C82BC: .4byte gUnknown_2023D6B -_080C82C0: .4byte gUnknown_2023D6C -_080C82C4: .4byte gUnknown_2039A00 -_080C82C8: - adds r0, r2, 0x6 - str r0, [r3] -_080C82CC: - pop {r0} - bx r0 - thumb_func_end sub_80C8284 - - thumb_func_start nullsub_64 -nullsub_64: @ 80C82D0 - bx lr - thumb_func_end nullsub_64 - - thumb_func_start nullsub_65 -nullsub_65: @ 80C82D4 - bx lr - thumb_func_end nullsub_65 - - thumb_func_start BattleAICmd_count_alive_pokemon -BattleAICmd_count_alive_pokemon: @ 80C82D8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r0, _080C82F8 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0 - str r0, [r1, 0x8] - ldr r0, _080C82FC @ =gUnknown_2039A00 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bne _080C8304 - ldr r0, _080C8300 @ =gUnknown_2023D6B - b _080C8306 - .align 2, 0 -_080C82F8: .4byte gUnknown_2023FF4 -_080C82FC: .4byte gUnknown_2039A00 -_080C8300: .4byte gUnknown_2023D6B -_080C8304: - ldr r0, _080C834C @ =gUnknown_2023D6C -_080C8306: - ldrb r5, [r0] - adds r0, r5, 0 - bl GetBankSide - lsls r0, 24 - ldr r1, _080C8350 @ =gUnknown_202402C - mov r8, r1 - cmp r0, 0 - bne _080C831C - ldr r0, _080C8354 @ =gUnknown_2024284 - mov r8, r0 -_080C831C: - ldr r0, _080C8358 @ =gUnknown_2022B4C - ldr r0, [r0] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C8360 - ldr r4, _080C835C @ =gUnknown_2023BCE - lsls r0, r5, 1 - adds r0, r4 - ldrb r7, [r0] - adds r0, r5, 0 - bl GetBankIdentity - movs r1, 0x2 - eors r0, r1 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - lsls r0, 24 - lsrs r0, 23 - adds r0, r4 - ldrb r6, [r0] - b _080C836A - .align 2, 0 -_080C834C: .4byte gUnknown_2023D6C -_080C8350: .4byte gUnknown_202402C -_080C8354: .4byte gUnknown_2024284 -_080C8358: .4byte gUnknown_2022B4C -_080C835C: .4byte gUnknown_2023BCE -_080C8360: - ldr r1, _080C83C8 @ =gUnknown_2023BCE - lsls r0, r5, 1 - adds r0, r1 - ldrb r6, [r0] - adds r7, r6, 0 -_080C836A: - movs r5, 0 -_080C836C: - cmp r5, r7 - beq _080C83B0 - cmp r5, r6 - beq _080C83B0 - movs r0, 0x64 - muls r0, r5 - mov r1, r8 - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _080C83B0 - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - cmp r0, 0 - beq _080C83B0 - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - beq _080C83B0 - ldr r0, _080C83CC @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - ldr r0, [r1, 0x8] - adds r0, 0x1 - str r0, [r1, 0x8] -_080C83B0: - adds r5, 0x1 - cmp r5, 0x5 - ble _080C836C - ldr r1, _080C83D0 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x2 - str r0, [r1] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C83C8: .4byte gUnknown_2023BCE -_080C83CC: .4byte gUnknown_2023FF4 -_080C83D0: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_count_alive_pokemon - - thumb_func_start BattleAICmd_get_considered_move -BattleAICmd_get_considered_move: @ 80C83D4 - ldr r0, _080C83E8 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - ldrh r0, [r1, 0x2] - str r0, [r1, 0x8] - ldr r1, _080C83EC @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_080C83E8: .4byte gUnknown_2023FF4 -_080C83EC: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_considered_move - - thumb_func_start BattleAICmd_get_considered_move_effect -BattleAICmd_get_considered_move_effect: @ 80C83F0 - ldr r0, _080C8410 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C8414 @ =gUnknown_8250C04 - ldrh r1, [r3, 0x2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0] - str r0, [r3, 0x8] - ldr r1, _080C8418 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_080C8410: .4byte gUnknown_2023FF4 -_080C8414: .4byte gUnknown_8250C04 -_080C8418: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_considered_move_effect - - thumb_func_start sub_80C841C -sub_80C841C: @ 80C841C - push {r4-r7,lr} - ldr r0, _080C842C @ =gUnknown_2039A00 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bne _080C8434 - ldr r0, _080C8430 @ =gUnknown_2023D6B - b _080C8436 - .align 2, 0 -_080C842C: .4byte gUnknown_2039A00 -_080C8430: .4byte gUnknown_2023D6B -_080C8434: - ldr r0, _080C8468 @ =gUnknown_2023D6C -_080C8436: - ldrb r4, [r0] - adds r0, r4, 0 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080C8506 - adds r0, r4, 0 - bl GetBankIdentity - movs r7, 0x1 - adds r1, r7, 0 - ands r1, r0 - ldr r6, _080C846C @ =gUnknown_2023FF4 - ldr r3, [r6] - ldr r0, [r3, 0x18] - adds r0, 0x20 - adds r2, r0, r1 - ldrb r0, [r2] - cmp r0, 0 - beq _080C8470 - ldr r1, [r3, 0x14] - str r0, [r1, 0x8] - b _080C851A - .align 2, 0 -_080C8468: .4byte gUnknown_2023D6C -_080C846C: .4byte gUnknown_2023FF4 -_080C8470: - ldr r1, _080C84A0 @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r0, r4 - adds r5, r0, r1 - adds r0, r5, 0 - adds r0, 0x20 - ldrb r0, [r0] - adds r2, r1, 0 - cmp r0, 0x17 - beq _080C848C - cmp r0, 0x2A - beq _080C848C - cmp r0, 0x47 - bne _080C84A8 -_080C848C: - ldr r0, _080C84A4 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0x58 - muls r0, r4 - adds r0, r2 - adds r0, 0x20 - ldrb r0, [r0] - str r0, [r1, 0x8] - b _080C851A - .align 2, 0 -_080C84A0: .4byte gUnknown_2023BE4 -_080C84A4: .4byte gUnknown_2023FF4 -_080C84A8: - ldr r4, _080C84E0 @ =gUnknown_8254784 - ldrh r0, [r5] - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r2, r1, r4 - ldrb r0, [r2, 0x16] - cmp r0, 0 - beq _080C84FE - ldrb r0, [r2, 0x17] - cmp r0, 0 - beq _080C84F6 - bl Random - adds r1, r7, 0 - ands r1, r0 - cmp r1, 0 - beq _080C84E4 - ldr r0, [r6] - ldr r2, [r0, 0x14] - ldrh r1, [r5] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x16] - b _080C8518 - .align 2, 0 -_080C84E0: .4byte gUnknown_8254784 -_080C84E4: - ldr r0, [r6] - ldr r2, [r0, 0x14] - ldrh r1, [r5] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x17] - b _080C8518 -_080C84F6: - ldr r1, [r3, 0x14] - ldrb r0, [r2, 0x16] - str r0, [r1, 0x8] - b _080C851A -_080C84FE: - ldr r1, [r3, 0x14] - ldrb r0, [r2, 0x17] - str r0, [r1, 0x8] - b _080C851A -_080C8506: - ldr r0, _080C8528 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r1, _080C852C @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r0, r4 - adds r0, r1 - adds r0, 0x20 - ldrb r0, [r0] -_080C8518: - str r0, [r2, 0x8] -_080C851A: - ldr r1, _080C8530 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x2 - str r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C8528: .4byte gUnknown_2023FF4 -_080C852C: .4byte gUnknown_2023BE4 -_080C8530: .4byte gUnknown_2039A00 - thumb_func_end sub_80C841C - - thumb_func_start BattleAICmd_get_highest_type_effectiveness -BattleAICmd_get_highest_type_effectiveness: @ 80C8534 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r0, _080C85F0 @ =gUnknown_2023F50 - movs r1, 0 - strh r1, [r0] - ldr r0, _080C85F4 @ =gUnknown_2023FE8 - ldr r0, [r0] - strb r1, [r0, 0x13] - ldr r0, _080C85F8 @ =gUnknown_2023FC4 - movs r3, 0 - movs r2, 0x1 - strb r2, [r0, 0xE] - ldr r0, _080C85FC @ =gUnknown_2023DCC - strb r1, [r0] - ldr r0, _080C8600 @ =gUnknown_2023D71 - strb r2, [r0] - ldr r0, _080C8604 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - str r3, [r0, 0x8] - movs r5, 0 - ldr r4, _080C8608 @ =gUnknown_2023D50 - ldr r7, _080C860C @ =gUnknown_2023D4A - ldr r0, _080C8610 @ =gUnknown_2023BF0 - mov r8, r0 - ldr r6, _080C8614 @ =gUnknown_2023D6B -_080C856A: - movs r0, 0x28 - str r0, [r4] - lsls r1, r5, 1 - ldrb r2, [r6] - movs r0, 0x58 - muls r0, r2 - adds r1, r0 - add r1, r8 - ldrh r0, [r1] - strh r0, [r7] - lsls r0, 16 - cmp r0, 0 - beq _080C85D8 - ldrh r0, [r7] - ldrb r1, [r6] - ldr r2, _080C8618 @ =gUnknown_2023D6C - ldrb r2, [r2] - bl TypeCalc - ldr r0, [r4] - cmp r0, 0x78 - bne _080C859A - movs r0, 0x50 - str r0, [r4] -_080C859A: - ldr r0, [r4] - cmp r0, 0xF0 - bne _080C85A4 - movs r0, 0xA0 - str r0, [r4] -_080C85A4: - ldr r0, [r4] - cmp r0, 0x1E - bne _080C85AE - movs r0, 0x14 - str r0, [r4] -_080C85AE: - ldr r0, [r4] - cmp r0, 0xF - bne _080C85B8 - movs r0, 0xA - str r0, [r4] -_080C85B8: - ldr r0, _080C85FC @ =gUnknown_2023DCC - ldrb r1, [r0] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _080C85C8 - movs r0, 0 - str r0, [r4] -_080C85C8: - ldr r0, _080C8604 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r0, [r2, 0x8] - ldr r1, [r4] - cmp r0, r1 - bcs _080C85D8 - str r1, [r2, 0x8] -_080C85D8: - adds r5, 0x1 - cmp r5, 0x3 - ble _080C856A - ldr r1, _080C861C @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C85F0: .4byte gUnknown_2023F50 -_080C85F4: .4byte gUnknown_2023FE8 -_080C85F8: .4byte gUnknown_2023FC4 -_080C85FC: .4byte gUnknown_2023DCC -_080C8600: .4byte gUnknown_2023D71 -_080C8604: .4byte gUnknown_2023FF4 -_080C8608: .4byte gUnknown_2023D50 -_080C860C: .4byte gUnknown_2023D4A -_080C8610: .4byte gUnknown_2023BF0 -_080C8614: .4byte gUnknown_2023D6B -_080C8618: .4byte gUnknown_2023D6C -_080C861C: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_highest_type_effectiveness - - thumb_func_start BattleAICmd_if_type_effectiveness -BattleAICmd_if_type_effectiveness: @ 80C8620 - push {r4,r5,lr} - ldr r0, _080C86B8 @ =gUnknown_2023F50 - movs r1, 0 - strh r1, [r0] - ldr r0, _080C86BC @ =gUnknown_2023FE8 - ldr r0, [r0] - strb r1, [r0, 0x13] - ldr r0, _080C86C0 @ =gUnknown_2023FC4 - movs r2, 0x1 - strb r2, [r0, 0xE] - ldr r5, _080C86C4 @ =gUnknown_2023DCC - strb r1, [r5] - ldr r0, _080C86C8 @ =gUnknown_2023D71 - strb r2, [r0] - ldr r4, _080C86CC @ =gUnknown_2023D50 - movs r0, 0x28 - str r0, [r4] - ldr r1, _080C86D0 @ =gUnknown_2023D4A - ldr r0, _080C86D4 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldrh r0, [r0, 0x2] - strh r0, [r1] - ldrh r0, [r1] - ldr r1, _080C86D8 @ =gUnknown_2023D6B - ldrb r1, [r1] - ldr r2, _080C86DC @ =gUnknown_2023D6C - ldrb r2, [r2] - bl TypeCalc - ldr r0, [r4] - cmp r0, 0x78 - bne _080C8666 - movs r0, 0x50 - str r0, [r4] -_080C8666: - ldr r0, [r4] - cmp r0, 0xF0 - bne _080C8670 - movs r0, 0xA0 - str r0, [r4] -_080C8670: - ldr r0, [r4] - cmp r0, 0x1E - bne _080C867A - movs r0, 0x14 - str r0, [r4] -_080C867A: - ldr r0, [r4] - cmp r0, 0xF - bne _080C8684 - movs r0, 0xA - str r0, [r4] -_080C8684: - ldrb r1, [r5] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _080C8692 - movs r0, 0 - str r0, [r4] -_080C8692: - ldrb r0, [r4] - ldr r3, _080C86E0 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - cmp r0, r1 - bne _080C86E4 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C86E8 - .align 2, 0 -_080C86B8: .4byte gUnknown_2023F50 -_080C86BC: .4byte gUnknown_2023FE8 -_080C86C0: .4byte gUnknown_2023FC4 -_080C86C4: .4byte gUnknown_2023DCC -_080C86C8: .4byte gUnknown_2023D71 -_080C86CC: .4byte gUnknown_2023D50 -_080C86D0: .4byte gUnknown_2023D4A -_080C86D4: .4byte gUnknown_2023FF4 -_080C86D8: .4byte gUnknown_2023D6B -_080C86DC: .4byte gUnknown_2023D6C -_080C86E0: .4byte gUnknown_2039A00 -_080C86E4: - adds r0, r2, 0x6 - str r0, [r3] -_080C86E8: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end BattleAICmd_if_type_effectiveness - - thumb_func_start nullsub_66 -nullsub_66: @ 80C86F0 - bx lr - thumb_func_end nullsub_66 - - thumb_func_start nullsub_67 -nullsub_67: @ 80C86F4 - bx lr - thumb_func_end nullsub_67 - - thumb_func_start BattleAICmd_if_status_in_party -BattleAICmd_if_status_in_party: @ 80C86F8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, _080C8710 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - cmp r1, 0x1 - bne _080C8738 - ldr r1, _080C8714 @ =gUnknown_202402C - b _080C873A - .align 2, 0 -_080C8710: .4byte gUnknown_2039A00 -_080C8714: .4byte gUnknown_202402C -_080C8718: - ldr r3, _080C8734 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x6] - ldrb r0, [r2, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C87A6 - .align 2, 0 -_080C8734: .4byte gUnknown_2039A00 -_080C8738: - ldr r1, _080C87B4 @ =gUnknown_2024284 -_080C873A: - mov r9, r1 - ldr r1, [r0] - ldrb r7, [r1, 0x2] - ldrb r0, [r1, 0x3] - lsls r0, 8 - orrs r7, r0 - ldrb r0, [r1, 0x4] - lsls r0, 16 - orrs r7, r0 - ldrb r0, [r1, 0x5] - lsls r0, 24 - orrs r7, r0 - movs r0, 0 - mov r8, r0 - movs r1, 0xCE - lsls r1, 1 - mov r10, r1 -_080C875C: - movs r0, 0x64 - mov r4, r8 - muls r4, r0 - add r4, r9 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - lsls r0, 16 - lsrs r6, r0, 16 - adds r0, r4, 0 - movs r1, 0x37 - bl GetMonData - cmp r5, 0 - beq _080C8794 - cmp r5, r10 - beq _080C8794 - cmp r6, 0 - beq _080C8794 - cmp r0, r7 - beq _080C8718 -_080C8794: - movs r0, 0x1 - add r8, r0 - mov r1, r8 - cmp r1, 0x5 - ble _080C875C - ldr r1, _080C87B8 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0xA - str r0, [r1] -_080C87A6: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C87B4: .4byte gUnknown_2024284 -_080C87B8: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_if_status_in_party - - thumb_func_start BattleAICmd_if_status_not_in_party -BattleAICmd_if_status_not_in_party: @ 80C87BC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, _080C87D8 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r2, r0, 0 - cmp r1, 0x1 - bne _080C87E0 - ldr r0, _080C87DC @ =gUnknown_202402C - mov r10, r0 - b _080C87E4 - .align 2, 0 -_080C87D8: .4byte gUnknown_2039A00 -_080C87DC: .4byte gUnknown_202402C -_080C87E0: - ldr r1, _080C8878 @ =gUnknown_2024284 - mov r10, r1 -_080C87E4: - ldr r1, [r2] - ldrb r7, [r1, 0x2] - ldrb r0, [r1, 0x3] - lsls r0, 8 - orrs r7, r0 - ldrb r0, [r1, 0x4] - lsls r0, 16 - orrs r7, r0 - ldrb r0, [r1, 0x5] - lsls r0, 24 - orrs r7, r0 - movs r0, 0 - mov r8, r0 - mov r9, r2 -_080C8800: - movs r0, 0x64 - mov r4, r8 - muls r4, r0 - add r4, r10 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - lsls r0, 16 - lsrs r6, r0, 16 - adds r0, r4, 0 - movs r1, 0x37 - bl GetMonData - cmp r5, 0 - beq _080C8844 - movs r1, 0xCE - lsls r1, 1 - cmp r5, r1 - beq _080C8844 - cmp r6, 0 - beq _080C8844 - cmp r0, r7 - bne _080C8844 - mov r1, r9 - ldr r0, [r1] - adds r0, 0xA - str r0, [r1] -_080C8844: - movs r0, 0x1 - add r8, r0 - mov r1, r8 - cmp r1, 0x5 - ble _080C8800 - ldr r3, _080C887C @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x6] - ldrb r0, [r2, 0x7] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x8] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x9] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C8878: .4byte gUnknown_2024284 -_080C887C: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_if_status_not_in_party - - thumb_func_start BattleAICmd_get_weather -BattleAICmd_get_weather: @ 80C8880 - push {lr} - ldr r2, _080C88E0 @ =gUnknown_2023F1C - ldrh r1, [r2] - movs r0, 0x7 - ands r0, r1 - cmp r0, 0 - beq _080C8898 - ldr r0, _080C88E4 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0x1 - str r0, [r1, 0x8] -_080C8898: - ldrh r1, [r2] - movs r0, 0x18 - ands r0, r1 - cmp r0, 0 - beq _080C88AC - ldr r0, _080C88E4 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0x2 - str r0, [r1, 0x8] -_080C88AC: - ldrh r1, [r2] - movs r0, 0x60 - ands r0, r1 - cmp r0, 0 - beq _080C88C0 - ldr r0, _080C88E4 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0 - str r0, [r1, 0x8] -_080C88C0: - ldrh r1, [r2] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _080C88D4 - ldr r0, _080C88E4 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x14] - movs r0, 0x3 - str r0, [r1, 0x8] -_080C88D4: - ldr r1, _080C88E8 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_080C88E0: .4byte gUnknown_2023F1C -_080C88E4: .4byte gUnknown_2023FF4 -_080C88E8: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_weather - - thumb_func_start sub_80C88EC -sub_80C88EC: @ 80C88EC - push {lr} - ldr r2, _080C8924 @ =gUnknown_8250C04 - ldr r0, _080C8928 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldrh r1, [r0, 0x2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r3, _080C892C @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r0, [r0] - ldrb r1, [r2, 0x1] - cmp r0, r1 - bne _080C8930 - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C8934 - .align 2, 0 -_080C8924: .4byte gUnknown_8250C04 -_080C8928: .4byte gUnknown_2023FF4 -_080C892C: .4byte gUnknown_2039A00 -_080C8930: - adds r0, r2, 0x6 - str r0, [r3] -_080C8934: - pop {r0} - bx r0 - thumb_func_end sub_80C88EC - - thumb_func_start sub_80C8938 -sub_80C8938: @ 80C8938 - push {lr} - ldr r2, _080C8970 @ =gUnknown_8250C04 - ldr r0, _080C8974 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldrh r1, [r0, 0x2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r3, _080C8978 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r0, [r0] - ldrb r1, [r2, 0x1] - cmp r0, r1 - beq _080C897C - ldrb r1, [r2, 0x2] - ldrb r0, [r2, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C8980 - .align 2, 0 -_080C8970: .4byte gUnknown_8250C04 -_080C8974: .4byte gUnknown_2023FF4 -_080C8978: .4byte gUnknown_2039A00 -_080C897C: - adds r0, r2, 0x6 - str r0, [r3] -_080C8980: - pop {r0} - bx r0 - thumb_func_end sub_80C8938 - - thumb_func_start sub_80C8984 -sub_80C8984: @ 80C8984 - push {r4,lr} - ldr r0, _080C8998 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C89A0 - ldr r0, _080C899C @ =gUnknown_2023D6B - b _080C89A2 - .align 2, 0 -_080C8998: .4byte gUnknown_2039A00 -_080C899C: .4byte gUnknown_2023D6B -_080C89A0: - ldr r0, _080C89D8 @ =gUnknown_2023D6C -_080C89A2: - ldrb r3, [r0] - ldr r1, _080C89DC @ =gUnknown_2023BE4 - ldr r2, [r4] - movs r0, 0x58 - muls r0, r3 - ldrb r3, [r2, 0x2] - adds r0, r3 - adds r1, 0x18 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrb r1, [r2, 0x3] - cmp r0, r1 - bge _080C89E0 - ldrb r1, [r2, 0x4] - ldrb r0, [r2, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C89E6 - .align 2, 0 -_080C89D8: .4byte gUnknown_2023D6C -_080C89DC: .4byte gUnknown_2023BE4 -_080C89E0: - adds r0, r2, 0 - adds r0, 0x8 - str r0, [r4] -_080C89E6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C8984 - - thumb_func_start sub_80C89EC -sub_80C89EC: @ 80C89EC - push {r4,lr} - ldr r0, _080C8A00 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C8A08 - ldr r0, _080C8A04 @ =gUnknown_2023D6B - b _080C8A0A - .align 2, 0 -_080C8A00: .4byte gUnknown_2039A00 -_080C8A04: .4byte gUnknown_2023D6B -_080C8A08: - ldr r0, _080C8A40 @ =gUnknown_2023D6C -_080C8A0A: - ldrb r3, [r0] - ldr r1, _080C8A44 @ =gUnknown_2023BE4 - ldr r2, [r4] - movs r0, 0x58 - muls r0, r3 - ldrb r3, [r2, 0x2] - adds r0, r3 - adds r1, 0x18 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrb r1, [r2, 0x3] - cmp r0, r1 - ble _080C8A48 - ldrb r1, [r2, 0x4] - ldrb r0, [r2, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C8A4E - .align 2, 0 -_080C8A40: .4byte gUnknown_2023D6C -_080C8A44: .4byte gUnknown_2023BE4 -_080C8A48: - adds r0, r2, 0 - adds r0, 0x8 - str r0, [r4] -_080C8A4E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C89EC - - thumb_func_start sub_80C8A54 -sub_80C8A54: @ 80C8A54 - push {r4,lr} - ldr r0, _080C8A68 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C8A70 - ldr r0, _080C8A6C @ =gUnknown_2023D6B - b _080C8A72 - .align 2, 0 -_080C8A68: .4byte gUnknown_2039A00 -_080C8A6C: .4byte gUnknown_2023D6B -_080C8A70: - ldr r0, _080C8AA8 @ =gUnknown_2023D6C -_080C8A72: - ldrb r3, [r0] - ldr r1, _080C8AAC @ =gUnknown_2023BE4 - ldr r2, [r4] - movs r0, 0x58 - muls r0, r3 - ldrb r3, [r2, 0x2] - adds r0, r3 - adds r1, 0x18 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrb r1, [r2, 0x3] - cmp r0, r1 - bne _080C8AB0 - ldrb r1, [r2, 0x4] - ldrb r0, [r2, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C8AB6 - .align 2, 0 -_080C8AA8: .4byte gUnknown_2023D6C -_080C8AAC: .4byte gUnknown_2023BE4 -_080C8AB0: - adds r0, r2, 0 - adds r0, 0x8 - str r0, [r4] -_080C8AB6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C8A54 - - thumb_func_start sub_80C8ABC -sub_80C8ABC: @ 80C8ABC - push {r4,lr} - ldr r0, _080C8AD0 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C8AD8 - ldr r0, _080C8AD4 @ =gUnknown_2023D6B - b _080C8ADA - .align 2, 0 -_080C8AD0: .4byte gUnknown_2039A00 -_080C8AD4: .4byte gUnknown_2023D6B -_080C8AD8: - ldr r0, _080C8B10 @ =gUnknown_2023D6C -_080C8ADA: - ldrb r3, [r0] - ldr r1, _080C8B14 @ =gUnknown_2023BE4 - ldr r2, [r4] - movs r0, 0x58 - muls r0, r3 - ldrb r3, [r2, 0x2] - adds r0, r3 - adds r1, 0x18 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrb r1, [r2, 0x3] - cmp r0, r1 - beq _080C8B18 - ldrb r1, [r2, 0x4] - ldrb r0, [r2, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C8B1E - .align 2, 0 -_080C8B10: .4byte gUnknown_2023D6C -_080C8B14: .4byte gUnknown_2023BE4 -_080C8B18: - adds r0, r2, 0 - adds r0, 0x8 - str r0, [r4] -_080C8B1E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C8ABC - - thumb_func_start BattleAICmd_if_can_faint -BattleAICmd_if_can_faint: @ 80C8B24 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r2, _080C8BD4 @ =gUnknown_8250C04 - ldr r0, _080C8BD8 @ =gUnknown_2023FF4 - mov r8, r0 - ldr r0, [r0] - ldr r0, [r0, 0x14] - ldrh r1, [r0, 0x2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bls _080C8C08 - ldr r0, _080C8BDC @ =gUnknown_2023F50 - movs r1, 0 - strh r1, [r0] - ldr r0, _080C8BE0 @ =gUnknown_2023FE8 - ldr r0, [r0] - strb r1, [r0, 0x13] - ldr r0, _080C8BE4 @ =gUnknown_2023FC4 - movs r7, 0x1 - strb r7, [r0, 0xE] - ldr r0, _080C8BE8 @ =gUnknown_2023DCC - strb r1, [r0] - ldr r0, _080C8BEC @ =gUnknown_2023D71 - strb r7, [r0] - ldr r5, _080C8BF0 @ =gUnknown_2023D4A - mov r1, r8 - ldr r0, [r1] - ldr r0, [r0, 0x14] - ldrh r0, [r0, 0x2] - strh r0, [r5] - ldr r4, _080C8BF4 @ =gUnknown_2023D6B - ldrb r0, [r4] - ldr r6, _080C8BF8 @ =gUnknown_2023D6C - ldrb r1, [r6] - bl AI_CalcDmg - ldrh r0, [r5] - ldrb r1, [r4] - ldrb r2, [r6] - bl TypeCalc - ldr r4, _080C8BFC @ =gUnknown_2023D50 - mov r1, r8 - ldr r0, [r1] - ldr r1, [r0, 0x14] - adds r0, r1, 0 - adds r0, 0x18 - ldrb r1, [r1, 0x1] - adds r0, r1 - ldrb r1, [r0] - ldr r0, [r4] - muls r0, r1 - movs r1, 0x64 - bl __divsi3 - str r0, [r4] - cmp r0, 0 - bne _080C8BA4 - str r7, [r4] -_080C8BA4: - ldr r2, _080C8C00 @ =gUnknown_2023BE4 - ldrb r1, [r6] - movs r0, 0x58 - muls r0, r1 - adds r0, r2 - ldrh r1, [r0, 0x28] - ldr r0, [r4] - cmp r1, r0 - bgt _080C8C08 - ldr r3, _080C8C04 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C8C10 - .align 2, 0 -_080C8BD4: .4byte gUnknown_8250C04 -_080C8BD8: .4byte gUnknown_2023FF4 -_080C8BDC: .4byte gUnknown_2023F50 -_080C8BE0: .4byte gUnknown_2023FE8 -_080C8BE4: .4byte gUnknown_2023FC4 -_080C8BE8: .4byte gUnknown_2023DCC -_080C8BEC: .4byte gUnknown_2023D71 -_080C8BF0: .4byte gUnknown_2023D4A -_080C8BF4: .4byte gUnknown_2023D6B -_080C8BF8: .4byte gUnknown_2023D6C -_080C8BFC: .4byte gUnknown_2023D50 -_080C8C00: .4byte gUnknown_2023BE4 -_080C8C04: .4byte gUnknown_2039A00 -_080C8C08: - ldr r1, _080C8C1C @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x5 - str r0, [r1] -_080C8C10: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C8C1C: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_if_can_faint - - thumb_func_start BattleAICmd_if_cant_faint -BattleAICmd_if_cant_faint: @ 80C8C20 - push {r4-r7,lr} - ldr r2, _080C8CBC @ =gUnknown_8250C04 - ldr r7, _080C8CC0 @ =gUnknown_2023FF4 - ldr r0, [r7] - ldr r0, [r0, 0x14] - ldrh r1, [r0, 0x2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bls _080C8CF0 - ldr r0, _080C8CC4 @ =gUnknown_2023F50 - movs r1, 0 - strh r1, [r0] - ldr r0, _080C8CC8 @ =gUnknown_2023FE8 - ldr r0, [r0] - strb r1, [r0, 0x13] - ldr r0, _080C8CCC @ =gUnknown_2023FC4 - movs r2, 0x1 - strb r2, [r0, 0xE] - ldr r0, _080C8CD0 @ =gUnknown_2023DCC - strb r1, [r0] - ldr r0, _080C8CD4 @ =gUnknown_2023D71 - strb r2, [r0] - ldr r6, _080C8CD8 @ =gUnknown_2023D4A - ldr r0, [r7] - ldr r0, [r0, 0x14] - ldrh r0, [r0, 0x2] - strh r0, [r6] - ldr r4, _080C8CDC @ =gUnknown_2023D6B - ldrb r0, [r4] - ldr r5, _080C8CE0 @ =gUnknown_2023D6C - ldrb r1, [r5] - bl AI_CalcDmg - ldrh r0, [r6] - ldrb r1, [r4] - ldrb r2, [r5] - bl TypeCalc - ldr r4, _080C8CE4 @ =gUnknown_2023D50 - ldr r0, [r7] - ldr r1, [r0, 0x14] - adds r0, r1, 0 - adds r0, 0x18 - ldrb r1, [r1, 0x1] - adds r0, r1 - ldrb r1, [r0] - ldr r0, [r4] - muls r0, r1 - movs r1, 0x64 - bl __divsi3 - str r0, [r4] - ldr r3, _080C8CE8 @ =gUnknown_2023BE4 - ldrb r2, [r5] - movs r1, 0x58 - muls r1, r2 - adds r1, r3 - ldrh r1, [r1, 0x28] - cmp r1, r0 - ble _080C8CF0 - ldr r3, _080C8CEC @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C8CF8 - .align 2, 0 -_080C8CBC: .4byte gUnknown_8250C04 -_080C8CC0: .4byte gUnknown_2023FF4 -_080C8CC4: .4byte gUnknown_2023F50 -_080C8CC8: .4byte gUnknown_2023FE8 -_080C8CCC: .4byte gUnknown_2023FC4 -_080C8CD0: .4byte gUnknown_2023DCC -_080C8CD4: .4byte gUnknown_2023D71 -_080C8CD8: .4byte gUnknown_2023D4A -_080C8CDC: .4byte gUnknown_2023D6B -_080C8CE0: .4byte gUnknown_2023D6C -_080C8CE4: .4byte gUnknown_2023D50 -_080C8CE8: .4byte gUnknown_2023BE4 -_080C8CEC: .4byte gUnknown_2039A00 -_080C8CF0: - ldr r1, _080C8D00 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x5 - str r0, [r1] -_080C8CF8: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C8D00: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_if_cant_faint - - thumb_func_start sub_80C8D04 -sub_80C8D04: @ 80C8D04 - push {r4-r7,lr} - ldr r1, _080C8D20 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r6, r0, 0x2 - ldrb r0, [r0, 0x1] - adds r5, r1, 0 - cmp r0, 0x1 - beq _080C8D2C - cmp r0, 0x1 - bgt _080C8D24 - cmp r0, 0 - beq _080C8D70 - b _080C8DD8 - .align 2, 0 -_080C8D20: .4byte gUnknown_2039A00 -_080C8D24: - cmp r0, 0x2 - beq _080C8D70 - cmp r0, 0x3 - bne _080C8DD8 -_080C8D2C: - movs r3, 0 - ldr r2, _080C8D68 @ =gUnknown_2023BE4 - ldr r4, _080C8D6C @ =gUnknown_2023D6B - ldrb r1, [r4] - movs r0, 0x58 - muls r0, r1 - adds r2, 0xC - adds r0, r2 - ldrh r0, [r0] - ldrh r1, [r6] - cmp r0, r1 - beq _080C8D62 - adds r7, r4, 0 - movs r6, 0x58 - adds r4, r2, 0 - adds r2, r1, 0 -_080C8D4C: - adds r3, 0x1 - cmp r3, 0x3 - bgt _080C8D62 - lsls r1, r3, 1 - ldrb r0, [r7] - muls r0, r6 - adds r1, r0 - adds r1, r4 - ldrh r0, [r1] - cmp r0, r2 - bne _080C8D4C -_080C8D62: - cmp r3, 0x4 - beq _080C8DB0 - b _080C8DC0 - .align 2, 0 -_080C8D68: .4byte gUnknown_2023BE4 -_080C8D6C: .4byte gUnknown_2023D6B -_080C8D70: - movs r3, 0 - ldr r4, _080C8DB8 @ =gUnknown_2023FF4 - ldr r0, [r4] - ldr r1, [r0, 0x18] - ldr r2, _080C8DBC @ =gUnknown_2023D6C - ldrb r0, [r2] - lsrs r0, 1 - lsls r0, 4 - adds r1, r0 - ldrh r0, [r1] - ldrh r1, [r6] - cmp r0, r1 - beq _080C8DAC - adds r7, r4, 0 - adds r4, r1, 0 - adds r6, r2, 0 -_080C8D90: - adds r3, 0x1 - cmp r3, 0x7 - bgt _080C8DAC - ldr r0, [r7] - ldr r2, [r0, 0x18] - lsls r1, r3, 1 - ldrb r0, [r6] - lsrs r0, 1 - lsls r0, 4 - adds r1, r0 - adds r2, r1 - ldrh r0, [r2] - cmp r0, r4 - bne _080C8D90 -_080C8DAC: - cmp r3, 0x8 - bne _080C8DC0 -_080C8DB0: - ldr r0, [r5] - adds r0, 0x8 - str r0, [r5] - b _080C8DD8 - .align 2, 0 -_080C8DB8: .4byte gUnknown_2023FF4 -_080C8DBC: .4byte gUnknown_2023D6C -_080C8DC0: - ldr r2, [r5] - ldrb r1, [r2, 0x4] - ldrb r0, [r2, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] -_080C8DD8: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C8D04 - - thumb_func_start sub_80C8DE0 -sub_80C8DE0: @ 80C8DE0 - push {r4-r7,lr} - ldr r1, _080C8DFC @ =gUnknown_2039A00 - ldr r0, [r1] - adds r6, r0, 0x2 - ldrb r0, [r0, 0x1] - adds r5, r1, 0 - cmp r0, 0x1 - beq _080C8E08 - cmp r0, 0x1 - bgt _080C8E00 - cmp r0, 0 - beq _080C8E4C - b _080C8EB4 - .align 2, 0 -_080C8DFC: .4byte gUnknown_2039A00 -_080C8E00: - cmp r0, 0x2 - beq _080C8E4C - cmp r0, 0x3 - bne _080C8EB4 -_080C8E08: - movs r3, 0 - ldr r2, _080C8E44 @ =gUnknown_2023BE4 - ldr r4, _080C8E48 @ =gUnknown_2023D6B - ldrb r1, [r4] - movs r0, 0x58 - muls r0, r1 - adds r2, 0xC - adds r0, r2 - ldrh r0, [r0] - ldrh r1, [r6] - cmp r0, r1 - beq _080C8E3E - adds r7, r4, 0 - movs r6, 0x58 - adds r4, r2, 0 - adds r2, r1, 0 -_080C8E28: - adds r3, 0x1 - cmp r3, 0x3 - bgt _080C8E3E - lsls r1, r3, 1 - ldrb r0, [r7] - muls r0, r6 - adds r1, r0 - adds r1, r4 - ldrh r0, [r1] - cmp r0, r2 - bne _080C8E28 -_080C8E3E: - cmp r3, 0x4 - bne _080C8E8C - b _080C8E9C - .align 2, 0 -_080C8E44: .4byte gUnknown_2023BE4 -_080C8E48: .4byte gUnknown_2023D6B -_080C8E4C: - movs r3, 0 - ldr r4, _080C8E94 @ =gUnknown_2023FF4 - ldr r0, [r4] - ldr r1, [r0, 0x18] - ldr r2, _080C8E98 @ =gUnknown_2023D6C - ldrb r0, [r2] - lsrs r0, 1 - lsls r0, 4 - adds r1, r0 - ldrh r0, [r1] - ldrh r1, [r6] - cmp r0, r1 - beq _080C8E88 - adds r7, r4, 0 - adds r4, r1, 0 - adds r6, r2, 0 -_080C8E6C: - adds r3, 0x1 - cmp r3, 0x7 - bgt _080C8E88 - ldr r0, [r7] - ldr r2, [r0, 0x18] - lsls r1, r3, 1 - ldrb r0, [r6] - lsrs r0, 1 - lsls r0, 4 - adds r1, r0 - adds r2, r1 - ldrh r0, [r2] - cmp r0, r4 - bne _080C8E6C -_080C8E88: - cmp r3, 0x8 - beq _080C8E9C -_080C8E8C: - ldr r0, [r5] - adds r0, 0x8 - str r0, [r5] - b _080C8EB4 - .align 2, 0 -_080C8E94: .4byte gUnknown_2023FF4 -_080C8E98: .4byte gUnknown_2023D6C -_080C8E9C: - ldr r2, [r5] - ldrb r1, [r2, 0x4] - ldrb r0, [r2, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] -_080C8EB4: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C8DE0 - - thumb_func_start sub_80C8EBC -sub_80C8EBC: @ 80C8EBC - push {r4-r7,lr} - ldr r1, _080C8ED4 @ =gUnknown_2039A00 - ldr r0, [r1] - ldrb r0, [r0, 0x1] - adds r5, r1, 0 - cmp r0, 0x1 - beq _080C8EE0 - cmp r0, 0x1 - bgt _080C8ED8 - cmp r0, 0 - beq _080C8F34 - b _080C8F96 - .align 2, 0 -_080C8ED4: .4byte gUnknown_2039A00 -_080C8ED8: - cmp r0, 0x2 - beq _080C8F34 - cmp r0, 0x3 - bne _080C8F96 -_080C8EE0: - movs r3, 0 - ldr r1, _080C8F24 @ =gUnknown_2023BE4 - ldr r0, _080C8F28 @ =gUnknown_2023D6B - ldrb r2, [r0] - ldr r6, _080C8F2C @ =gUnknown_8250C04 - movs r0, 0x58 - muls r0, r2 - adds r1, 0xC - adds r2, r0, r1 - ldr r4, _080C8F30 @ =gUnknown_2039A00 -_080C8EF4: - ldrh r0, [r2] - cmp r0, 0 - beq _080C8F0E - adds r1, r0, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - ldr r1, [r4] - ldrb r0, [r0] - ldrb r1, [r1, 0x2] - cmp r0, r1 - beq _080C8F16 -_080C8F0E: - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080C8EF4 -_080C8F16: - cmp r3, 0x4 - bne _080C8F7E - ldr r0, [r5] - adds r0, 0x7 - str r0, [r5] - b _080C8F96 - .align 2, 0 -_080C8F24: .4byte gUnknown_2023BE4 -_080C8F28: .4byte gUnknown_2023D6B -_080C8F2C: .4byte gUnknown_8250C04 -_080C8F30: .4byte gUnknown_2039A00 -_080C8F34: - movs r3, 0 - ldr r1, _080C8F9C @ =gUnknown_2023BE4 - ldr r0, _080C8FA0 @ =gUnknown_2023D6B - ldrb r2, [r0] - ldr r0, _080C8FA4 @ =gUnknown_8250C04 - mov r12, r0 - ldr r7, _080C8FA8 @ =gUnknown_2023FF4 - ldr r6, _080C8FAC @ =gUnknown_2023D6C - movs r0, 0x58 - muls r0, r2 - adds r1, 0xC - adds r4, r0, r1 -_080C8F4C: - lsls r2, r3, 1 - ldrh r0, [r4] - cmp r0, 0 - beq _080C8F76 - ldr r0, [r7] - ldr r1, [r0, 0x18] - ldrb r0, [r6] - lsrs r0, 1 - lsls r0, 4 - adds r0, r2, r0 - adds r1, r0 - ldrh r1, [r1] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - add r0, r12 - ldr r1, [r5] - ldrb r0, [r0] - ldrb r1, [r1, 0x2] - cmp r0, r1 - beq _080C8F7E -_080C8F76: - adds r4, 0x2 - adds r3, 0x1 - cmp r3, 0x7 - ble _080C8F4C -_080C8F7E: - ldr r2, [r5] - ldrb r1, [r2, 0x3] - ldrb r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] -_080C8F96: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C8F9C: .4byte gUnknown_2023BE4 -_080C8FA0: .4byte gUnknown_2023D6B -_080C8FA4: .4byte gUnknown_8250C04 -_080C8FA8: .4byte gUnknown_2023FF4 -_080C8FAC: .4byte gUnknown_2023D6C - thumb_func_end sub_80C8EBC - - thumb_func_start sub_80C8FB0 -sub_80C8FB0: @ 80C8FB0 - push {r4-r6,lr} - ldr r1, _080C8FC8 @ =gUnknown_2039A00 - ldr r0, [r1] - ldrb r0, [r0, 0x1] - adds r4, r1, 0 - cmp r0, 0x1 - beq _080C8FD4 - cmp r0, 0x1 - bgt _080C8FCC - cmp r0, 0 - beq _080C9038 - b _080C9074 - .align 2, 0 -_080C8FC8: .4byte gUnknown_2039A00 -_080C8FCC: - cmp r0, 0x2 - beq _080C9038 - cmp r0, 0x3 - bne _080C9074 -_080C8FD4: - movs r3, 0 - ldr r1, _080C9028 @ =gUnknown_2023BE4 - ldr r0, _080C902C @ =gUnknown_2023D6B - ldrb r2, [r0] - ldr r6, _080C9030 @ =gUnknown_8250C04 - movs r0, 0x58 - muls r0, r2 - adds r1, 0xC - adds r2, r0, r1 - ldr r5, _080C9034 @ =gUnknown_2039A00 -_080C8FE8: - ldrh r0, [r2] - cmp r0, 0 - beq _080C9002 - adds r1, r0, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - ldr r1, [r5] - ldrb r0, [r0] - ldrb r1, [r1, 0x2] - cmp r0, r1 - beq _080C900A -_080C9002: - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080C8FE8 -_080C900A: - cmp r3, 0x4 - bne _080C906E - ldr r2, [r4] - ldrb r1, [r2, 0x3] - ldrb r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C9074 - .align 2, 0 -_080C9028: .4byte gUnknown_2023BE4 -_080C902C: .4byte gUnknown_2023D6B -_080C9030: .4byte gUnknown_8250C04 -_080C9034: .4byte gUnknown_2039A00 -_080C9038: - movs r3, 0 - ldr r0, _080C907C @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r1, [r0, 0x18] - ldr r0, _080C9080 @ =gUnknown_2023D6C - ldrb r0, [r0] - lsrs r0, 1 - lsls r0, 4 - adds r2, r0, r1 - ldr r5, _080C9084 @ =gUnknown_8250C04 -_080C904C: - ldrh r0, [r2] - cmp r0, 0 - beq _080C9066 - adds r1, r0, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldr r1, [r4] - ldrb r0, [r0] - ldrb r1, [r1, 0x2] - cmp r0, r1 - beq _080C906E -_080C9066: - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x7 - ble _080C904C -_080C906E: - ldr r0, [r4] - adds r0, 0x7 - str r0, [r4] -_080C9074: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080C907C: .4byte gUnknown_2023FF4 -_080C9080: .4byte gUnknown_2023D6C -_080C9084: .4byte gUnknown_8250C04 - thumb_func_end sub_80C8FB0 - - thumb_func_start BattleAICmd_if_any_move_disabled_or_encored -BattleAICmd_if_any_move_disabled_or_encored: @ 80C9088 - push {r4,r5,lr} - ldr r0, _080C909C @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r5, r0, 0 - cmp r1, 0x1 - bne _080C90A4 - ldr r0, _080C90A0 @ =gUnknown_2023D6B - b _080C90A6 - .align 2, 0 -_080C909C: .4byte gUnknown_2039A00 -_080C90A0: .4byte gUnknown_2023D6B -_080C90A4: - ldr r0, _080C90C4 @ =gUnknown_2023D6C -_080C90A6: - ldrb r3, [r0] - adds r4, r5, 0 - ldr r2, [r4] - ldrb r0, [r2, 0x2] - cmp r0, 0 - bne _080C90CC - ldr r0, _080C90C8 @ =gUnknown_2023E0C - lsls r1, r3, 3 - subs r1, r3 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r1, 0x4] - cmp r0, 0 - beq _080C90D0 - b _080C90E6 - .align 2, 0 -_080C90C4: .4byte gUnknown_2023D6C -_080C90C8: .4byte gUnknown_2023E0C -_080C90CC: - cmp r0, 0x1 - beq _080C90D6 -_080C90D0: - adds r0, r2, 0x7 - str r0, [r4] - b _080C9108 -_080C90D6: - ldr r0, _080C9100 @ =gUnknown_2023E0C - lsls r1, r3, 3 - subs r1, r3 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r1, 0x6] - cmp r0, 0 - beq _080C9104 -_080C90E6: - ldrb r1, [r2, 0x3] - ldrb r0, [r2, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C9108 - .align 2, 0 -_080C9100: .4byte gUnknown_2023E0C -_080C9104: - adds r0, r2, 0x7 - str r0, [r5] -_080C9108: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end BattleAICmd_if_any_move_disabled_or_encored - - thumb_func_start BattleAICmd_if_curr_move_disabled_or_encored -BattleAICmd_if_curr_move_disabled_or_encored: @ 80C9110 - push {r4,lr} - ldr r4, _080C9124 @ =gUnknown_2039A00 - ldr r3, [r4] - ldrb r0, [r3, 0x1] - cmp r0, 0 - beq _080C9128 - cmp r0, 0x1 - beq _080C9154 - b _080C9194 - .align 2, 0 -_080C9124: .4byte gUnknown_2039A00 -_080C9128: - ldr r2, _080C9148 @ =gUnknown_2023E0C - ldr r0, _080C914C @ =gUnknown_2023BC4 - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, _080C9150 @ =gUnknown_2023FF4 - ldr r1, [r1] - ldr r1, [r1, 0x14] - ldrh r0, [r0, 0x4] - ldrh r1, [r1, 0x2] - cmp r0, r1 - beq _080C9170 - b _080C9194 - .align 2, 0 -_080C9148: .4byte gUnknown_2023E0C -_080C914C: .4byte gUnknown_2023BC4 -_080C9150: .4byte gUnknown_2023FF4 -_080C9154: - ldr r2, _080C9188 @ =gUnknown_2023E0C - ldr r0, _080C918C @ =gUnknown_2023BC4 - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, _080C9190 @ =gUnknown_2023FF4 - ldr r1, [r1] - ldr r1, [r1, 0x14] - ldrh r0, [r0, 0x6] - ldrh r1, [r1, 0x2] - cmp r0, r1 - bne _080C9194 -_080C9170: - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _080C9198 - .align 2, 0 -_080C9188: .4byte gUnknown_2023E0C -_080C918C: .4byte gUnknown_2023BC4 -_080C9190: .4byte gUnknown_2023FF4 -_080C9194: - adds r0, r3, 0x6 - str r0, [r4] -_080C9198: - pop {r4} - pop {r0} - bx r0 - thumb_func_end BattleAICmd_if_curr_move_disabled_or_encored - - thumb_func_start BattleAICmd_flee -BattleAICmd_flee: @ 80C91A0 - ldr r0, _080C91B0 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldrb r1, [r2, 0x10] - movs r0, 0xB - orrs r0, r1 - strb r0, [r2, 0x10] - bx lr - .align 2, 0 -_080C91B0: .4byte gUnknown_2023FF4 - thumb_func_end BattleAICmd_flee - - thumb_func_start sub_80C91B4 -sub_80C91B4: @ 80C91B4 - push {r4,lr} - ldr r0, _080C91D8 @ =gUnknown_2023FE8 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0x79 - ldrb r0, [r0] - cmp r0, 0 - beq _080C91DC - adds r0, r1, 0 - adds r0, 0x7B - ldrb r0, [r0] - lsls r0, 25 - lsrs r4, r0, 24 - cmp r4, 0x14 - bls _080C91FC - movs r4, 0x14 - b _080C91FC - .align 2, 0 -_080C91D8: .4byte gUnknown_2023FE8 -_080C91DC: - adds r0, r1, 0 - adds r0, 0x7A - ldrb r0, [r0] - cmp r0, 0 - beq _080C91F6 - adds r0, r1, 0 - adds r0, 0x7B - ldrb r0, [r0] - lsrs r4, r0, 2 - cmp r4, 0 - bne _080C91FC - movs r4, 0x1 - b _080C91FC -_080C91F6: - adds r0, r1, 0 - adds r0, 0x7B - ldrb r4, [r0] -_080C91FC: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 24 - lsrs r4, r0, 24 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x64 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, r4 - bcs _080C923C - ldr r3, _080C9238 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C9244 - .align 2, 0 -_080C9238: .4byte gUnknown_2039A00 -_080C923C: - ldr r1, _080C924C @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x5 - str r0, [r1] -_080C9244: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C924C: .4byte gUnknown_2039A00 - thumb_func_end sub_80C91B4 - - thumb_func_start BattleAICmd_watch -BattleAICmd_watch: @ 80C9250 - ldr r0, _080C9260 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldrb r1, [r2, 0x10] - movs r0, 0xD - orrs r0, r1 - strb r0, [r2, 0x10] - bx lr - .align 2, 0 -_080C9260: .4byte gUnknown_2023FF4 - thumb_func_end BattleAICmd_watch - - thumb_func_start BattleAICmd_get_hold_effect -BattleAICmd_get_hold_effect: @ 80C9264 - push {r4,lr} - ldr r0, _080C9274 @ =gUnknown_2039A00 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bne _080C927C - ldr r0, _080C9278 @ =gUnknown_2023D6B - b _080C927E - .align 2, 0 -_080C9274: .4byte gUnknown_2039A00 -_080C9278: .4byte gUnknown_2023D6B -_080C927C: - ldr r0, _080C92A8 @ =gUnknown_2023D6C -_080C927E: - ldrb r4, [r0] - adds r0, r4, 0 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080C92B0 - adds r0, r4, 0 - bl GetBankIdentity - movs r1, 0x1 - ands r1, r0 - ldr r0, _080C92AC @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r0, [r0, 0x18] - adds r0, 0x22 - adds r0, r1 - ldrb r0, [r0] - str r0, [r2, 0x8] - b _080C92CA - .align 2, 0 -_080C92A8: .4byte gUnknown_2023D6C -_080C92AC: .4byte gUnknown_2023FF4 -_080C92B0: - ldr r1, _080C92D8 @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r0, r4 - adds r0, r1 - ldrh r0, [r0, 0x2E] - bl ItemId_GetHoldEffect - ldr r1, _080C92DC @ =gUnknown_2023FF4 - ldr r1, [r1] - ldr r1, [r1, 0x14] - lsls r0, 24 - lsrs r0, 24 - str r0, [r1, 0x8] -_080C92CA: - ldr r1, _080C92E0 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x2 - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C92D8: .4byte gUnknown_2023BE4 -_080C92DC: .4byte gUnknown_2023FF4 -_080C92E0: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_hold_effect - - thumb_func_start BattleAICmd_get_gender -BattleAICmd_get_gender: @ 80C92E4 - push {lr} - ldr r0, _080C92F4 @ =gUnknown_2039A00 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - bne _080C92FC - ldr r0, _080C92F8 @ =gUnknown_2023D6B - b _080C92FE - .align 2, 0 -_080C92F4: .4byte gUnknown_2039A00 -_080C92F8: .4byte gUnknown_2023D6B -_080C92FC: - ldr r0, _080C932C @ =gUnknown_2023D6C -_080C92FE: - ldrb r1, [r0] - ldr r2, _080C9330 @ =gUnknown_2023BE4 - movs r0, 0x58 - muls r1, r0 - adds r0, r1, r2 - ldrh r0, [r0] - adds r2, 0x48 - adds r1, r2 - ldr r1, [r1] - bl GetGenderFromSpeciesAndPersonality - ldr r1, _080C9334 @ =gUnknown_2023FF4 - ldr r1, [r1] - ldr r1, [r1, 0x14] - lsls r0, 24 - lsrs r0, 24 - str r0, [r1, 0x8] - ldr r1, _080C9338 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x2 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_080C932C: .4byte gUnknown_2023D6C -_080C9330: .4byte gUnknown_2023BE4 -_080C9334: .4byte gUnknown_2023FF4 -_080C9338: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_gender - - thumb_func_start BattleAICmd_is_first_turn -BattleAICmd_is_first_turn: @ 80C933C - push {r4,lr} - ldr r0, _080C9350 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C9358 - ldr r0, _080C9354 @ =gUnknown_2023D6B - b _080C935A - .align 2, 0 -_080C9350: .4byte gUnknown_2039A00 -_080C9354: .4byte gUnknown_2023D6B -_080C9358: - ldr r0, _080C937C @ =gUnknown_2023D6C -_080C935A: - ldrb r3, [r0] - ldr r0, _080C9380 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r1, _080C9384 @ =gUnknown_2023E0C - lsls r0, r3, 3 - subs r0, r3 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x16] - str r0, [r2, 0x8] - ldr r0, [r4] - adds r0, 0x2 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C937C: .4byte gUnknown_2023D6C -_080C9380: .4byte gUnknown_2023FF4 -_080C9384: .4byte gUnknown_2023E0C - thumb_func_end BattleAICmd_is_first_turn - - thumb_func_start BattleAICmd_get_stockpile_count -BattleAICmd_get_stockpile_count: @ 80C9388 - push {r4,lr} - ldr r0, _080C939C @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C93A4 - ldr r0, _080C93A0 @ =gUnknown_2023D6B - b _080C93A6 - .align 2, 0 -_080C939C: .4byte gUnknown_2039A00 -_080C93A0: .4byte gUnknown_2023D6B -_080C93A4: - ldr r0, _080C93C8 @ =gUnknown_2023D6C -_080C93A6: - ldrb r3, [r0] - ldr r0, _080C93CC @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r1, _080C93D0 @ =gUnknown_2023E0C - lsls r0, r3, 3 - subs r0, r3 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x9] - str r0, [r2, 0x8] - ldr r0, [r4] - adds r0, 0x2 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C93C8: .4byte gUnknown_2023D6C -_080C93CC: .4byte gUnknown_2023FF4 -_080C93D0: .4byte gUnknown_2023E0C - thumb_func_end BattleAICmd_get_stockpile_count - - thumb_func_start BattleAICmd_is_double_battle -BattleAICmd_is_double_battle: @ 80C93D4 - ldr r0, _080C93F0 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r0, _080C93F4 @ =gUnknown_2022B4C - ldr r0, [r0] - movs r1, 0x1 - ands r0, r1 - str r0, [r2, 0x8] - ldr r1, _080C93F8 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_080C93F0: .4byte gUnknown_2023FF4 -_080C93F4: .4byte gUnknown_2022B4C -_080C93F8: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_is_double_battle - - thumb_func_start BattleAICmd_get_used_held_item -BattleAICmd_get_used_held_item: @ 80C93FC - push {r4,lr} - ldr r0, _080C9410 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C9418 - ldr r0, _080C9414 @ =gUnknown_2023D6B - b _080C941A - .align 2, 0 -_080C9410: .4byte gUnknown_2039A00 -_080C9414: .4byte gUnknown_2023D6B -_080C9418: - ldr r0, _080C943C @ =gUnknown_2023D6C -_080C941A: - ldrb r3, [r0] - ldr r0, _080C9440 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r0, _080C9444 @ =gUnknown_2023FE8 - ldr r1, [r0] - lsls r0, r3, 1 - adds r0, r1 - adds r0, 0xB8 - ldrb r0, [r0] - str r0, [r2, 0x8] - ldr r0, [r4] - adds r0, 0x2 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C943C: .4byte gUnknown_2023D6C -_080C9440: .4byte gUnknown_2023FF4 -_080C9444: .4byte gUnknown_2023FE8 - thumb_func_end BattleAICmd_get_used_held_item - - thumb_func_start BattleAICmd_get_move_type_from_result -BattleAICmd_get_move_type_from_result: @ 80C9448 - ldr r0, _080C9468 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C946C @ =gUnknown_8250C04 - ldr r1, [r3, 0x8] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x2] - str r0, [r3, 0x8] - ldr r1, _080C9470 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_080C9468: .4byte gUnknown_2023FF4 -_080C946C: .4byte gUnknown_8250C04 -_080C9470: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_move_type_from_result - - thumb_func_start BattleAICmd_get_move_power_from_result -BattleAICmd_get_move_power_from_result: @ 80C9474 - ldr r0, _080C9494 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C9498 @ =gUnknown_8250C04 - ldr r1, [r3, 0x8] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x1] - str r0, [r3, 0x8] - ldr r1, _080C949C @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_080C9494: .4byte gUnknown_2023FF4 -_080C9498: .4byte gUnknown_8250C04 -_080C949C: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_move_power_from_result - - thumb_func_start BattleAICmd_get_move_effect_from_result -BattleAICmd_get_move_effect_from_result: @ 80C94A0 - ldr r0, _080C94C0 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r3, [r0, 0x14] - ldr r2, _080C94C4 @ =gUnknown_8250C04 - ldr r1, [r3, 0x8] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0] - str r0, [r3, 0x8] - ldr r1, _080C94C8 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_080C94C0: .4byte gUnknown_2023FF4 -_080C94C4: .4byte gUnknown_8250C04 -_080C94C8: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_get_move_effect_from_result - - thumb_func_start BattleAICmd_get_protect_count -BattleAICmd_get_protect_count: @ 80C94CC - push {r4,lr} - ldr r0, _080C94E0 @ =gUnknown_2039A00 - ldr r1, [r0] - ldrb r1, [r1, 0x1] - adds r4, r0, 0 - cmp r1, 0x1 - bne _080C94E8 - ldr r0, _080C94E4 @ =gUnknown_2023D6B - b _080C94EA - .align 2, 0 -_080C94E0: .4byte gUnknown_2039A00 -_080C94E4: .4byte gUnknown_2023D6B -_080C94E8: - ldr r0, _080C950C @ =gUnknown_2023D6C -_080C94EA: - ldrb r3, [r0] - ldr r0, _080C9510 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldr r1, _080C9514 @ =gUnknown_2023E0C - lsls r0, r3, 3 - subs r0, r3 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x8] - str r0, [r2, 0x8] - ldr r0, [r4] - adds r0, 0x2 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C950C: .4byte gUnknown_2023D6C -_080C9510: .4byte gUnknown_2023FF4 -_080C9514: .4byte gUnknown_2023E0C - thumb_func_end BattleAICmd_get_protect_count - - thumb_func_start nullsub_68 -nullsub_68: @ 80C9518 - bx lr - thumb_func_end nullsub_68 - - thumb_func_start nullsub_69 -nullsub_69: @ 80C951C - bx lr - thumb_func_end nullsub_69 - - thumb_func_start nullsub_70 -nullsub_70: @ 80C9520 - bx lr - thumb_func_end nullsub_70 - - thumb_func_start nullsub_71 -nullsub_71: @ 80C9524 - bx lr - thumb_func_end nullsub_71 - - thumb_func_start nullsub_72 -nullsub_72: @ 80C9528 - bx lr - thumb_func_end nullsub_72 - - thumb_func_start nullsub_73 -nullsub_73: @ 80C952C - bx lr - thumb_func_end nullsub_73 - - thumb_func_start BattleAICmd_call -BattleAICmd_call: @ 80C9530 - push {r4,lr} - ldr r4, _080C955C @ =gUnknown_2039A00 - ldr r0, [r4] - adds r0, 0x5 - bl AIStackPushVar - ldr r2, [r4] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C955C: .4byte gUnknown_2039A00 - thumb_func_end BattleAICmd_call - - thumb_func_start sub_80C9560 -sub_80C9560: @ 80C9560 - ldr r3, _080C957C @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - bx lr - .align 2, 0 -_080C957C: .4byte gUnknown_2039A00 - thumb_func_end sub_80C9560 - - thumb_func_start BattleAICmd_end -BattleAICmd_end: @ 80C9580 - push {lr} - bl AIStackPop - lsls r0, 24 - cmp r0, 0 - bne _080C959A - ldr r0, _080C95A0 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x14] - ldrb r1, [r2, 0x10] - movs r0, 0x1 - orrs r0, r1 - strb r0, [r2, 0x10] -_080C959A: - pop {r0} - bx r0 - .align 2, 0 -_080C95A0: .4byte gUnknown_2023FF4 - thumb_func_end BattleAICmd_end - - thumb_func_start BattleAICmd_if_level_cond -BattleAICmd_if_level_cond: @ 80C95A4 - push {r4,r5,lr} - ldr r5, _080C95BC @ =gUnknown_2039A00 - ldr r4, [r5] - ldrb r0, [r4, 0x1] - cmp r0, 0x1 - beq _080C95F8 - cmp r0, 0x1 - bgt _080C95C0 - cmp r0, 0 - beq _080C95C6 - b _080C9674 - .align 2, 0 -_080C95BC: .4byte gUnknown_2039A00 -_080C95C0: - cmp r0, 0x2 - beq _080C9628 - b _080C9674 -_080C95C6: - ldr r3, _080C95EC @ =gUnknown_2023BE4 - ldr r0, _080C95F0 @ =gUnknown_2023D6B - ldrb r0, [r0] - movs r2, 0x58 - adds r1, r0, 0 - muls r1, r2 - adds r1, r3 - adds r1, 0x2A - ldr r0, _080C95F4 @ =gUnknown_2023D6C - ldrb r0, [r0] - muls r0, r2 - adds r0, r3 - adds r0, 0x2A - ldrb r1, [r1] - ldrb r0, [r0] - cmp r1, r0 - bhi _080C964A - b _080C9670 - .align 2, 0 -_080C95EC: .4byte gUnknown_2023BE4 -_080C95F0: .4byte gUnknown_2023D6B -_080C95F4: .4byte gUnknown_2023D6C -_080C95F8: - ldr r3, _080C961C @ =gUnknown_2023BE4 - ldr r0, _080C9620 @ =gUnknown_2023D6B - ldrb r0, [r0] - movs r2, 0x58 - adds r1, r0, 0 - muls r1, r2 - adds r1, r3 - adds r1, 0x2A - ldr r0, _080C9624 @ =gUnknown_2023D6C - ldrb r0, [r0] - muls r0, r2 - adds r0, r3 - adds r0, 0x2A - ldrb r1, [r1] - ldrb r0, [r0] - cmp r1, r0 - bcc _080C964A - b _080C9670 - .align 2, 0 -_080C961C: .4byte gUnknown_2023BE4 -_080C9620: .4byte gUnknown_2023D6B -_080C9624: .4byte gUnknown_2023D6C -_080C9628: - ldr r3, _080C9664 @ =gUnknown_2023BE4 - ldr r0, _080C9668 @ =gUnknown_2023D6B - ldrb r0, [r0] - movs r2, 0x58 - adds r1, r0, 0 - muls r1, r2 - adds r1, r3 - adds r1, 0x2A - ldr r0, _080C966C @ =gUnknown_2023D6C - ldrb r0, [r0] - muls r0, r2 - adds r0, r3 - adds r0, 0x2A - ldrb r1, [r1] - ldrb r0, [r0] - cmp r1, r0 - bne _080C9670 -_080C964A: - ldrb r1, [r4, 0x2] - ldrb r0, [r4, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r4, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r4, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r5] - b _080C9674 - .align 2, 0 -_080C9664: .4byte gUnknown_2023BE4 -_080C9668: .4byte gUnknown_2023D6B -_080C966C: .4byte gUnknown_2023D6C -_080C9670: - adds r0, r4, 0x6 - str r0, [r5] -_080C9674: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end BattleAICmd_if_level_cond - - thumb_func_start sub_80C967C -sub_80C967C: @ 80C967C - push {lr} - ldr r2, _080C96B0 @ =gUnknown_2023E0C - ldr r0, _080C96B4 @ =gUnknown_2023D6C - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x13] - lsls r0, 28 - cmp r0, 0 - beq _080C96BC - ldr r3, _080C96B8 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C96C4 - .align 2, 0 -_080C96B0: .4byte gUnknown_2023E0C -_080C96B4: .4byte gUnknown_2023D6C -_080C96B8: .4byte gUnknown_2039A00 -_080C96BC: - ldr r1, _080C96C8 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x5 - str r0, [r1] -_080C96C4: - pop {r0} - bx r0 - .align 2, 0 -_080C96C8: .4byte gUnknown_2039A00 - thumb_func_end sub_80C967C - - thumb_func_start sub_80C96CC -sub_80C96CC: @ 80C96CC - push {lr} - ldr r2, _080C9700 @ =gUnknown_2023E0C - ldr r0, _080C9704 @ =gUnknown_2023D6C - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x13] - lsls r0, 28 - cmp r0, 0 - bne _080C970C - ldr r3, _080C9708 @ =gUnknown_2039A00 - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _080C9714 - .align 2, 0 -_080C9700: .4byte gUnknown_2023E0C -_080C9704: .4byte gUnknown_2023D6C -_080C9708: .4byte gUnknown_2039A00 -_080C970C: - ldr r1, _080C9718 @ =gUnknown_2039A00 - ldr r0, [r1] - adds r0, 0x5 - str r0, [r1] -_080C9714: - pop {r0} - bx r0 - .align 2, 0 -_080C9718: .4byte gUnknown_2039A00 - thumb_func_end sub_80C96CC - - thumb_func_start AIStackPushVar -AIStackPushVar: @ 80C971C - push {r4,lr} - ldr r1, _080C973C @ =gUnknown_2023FF4 - ldr r1, [r1] - ldr r3, [r1, 0x1C] - adds r4, r3, 0 - adds r4, 0x20 - ldrb r1, [r4] - adds r2, r1, 0x1 - strb r2, [r4] - lsls r1, 24 - lsrs r1, 22 - adds r3, r1 - str r0, [r3] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C973C: .4byte gUnknown_2023FF4 - thumb_func_end AIStackPushVar - - thumb_func_start AIStackPushVar_cursor -AIStackPushVar_cursor: @ 80C9740 - ldr r0, _080C9760 @ =gUnknown_2023FF4 - ldr r0, [r0] - ldr r2, [r0, 0x1C] - adds r3, r2, 0 - adds r3, 0x20 - ldrb r0, [r3] - adds r1, r0, 0x1 - strb r1, [r3] - lsls r0, 24 - lsrs r0, 22 - adds r2, r0 - ldr r0, _080C9764 @ =gUnknown_2039A00 - ldr r0, [r0] - str r0, [r2] - bx lr - .align 2, 0 -_080C9760: .4byte gUnknown_2023FF4 -_080C9764: .4byte gUnknown_2039A00 - thumb_func_end AIStackPushVar_cursor - - thumb_func_start AIStackPop -AIStackPop: @ 80C9768 - push {lr} - ldr r3, _080C9780 @ =gUnknown_2023FF4 - ldr r0, [r3] - ldr r0, [r0, 0x1C] - adds r1, r0, 0 - adds r1, 0x20 - ldrb r0, [r1] - cmp r0, 0 - bne _080C9784 - movs r0, 0 - b _080C979E - .align 2, 0 -_080C9780: .4byte gUnknown_2023FF4 -_080C9784: - subs r0, 0x1 - strb r0, [r1] - ldr r2, _080C97A4 @ =gUnknown_2039A00 - ldr r0, [r3] - ldr r1, [r0, 0x1C] - adds r0, r1, 0 - adds r0, 0x20 - ldrb r0, [r0] - lsls r0, 2 - adds r1, r0 - ldr r0, [r1] - str r0, [r2] - movs r0, 0x1 -_080C979E: - pop {r1} - bx r1 - .align 2, 0 -_080C97A4: .4byte gUnknown_2039A00 - thumb_func_end AIStackPop - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_ai_switch_items.s b/asm/battle_ai_switch_items.s index 0baf7014e..f38d58172 100644 --- a/asm/battle_ai_switch_items.s +++ b/asm/battle_ai_switch_items.s @@ -8,8 +8,8 @@ thumb_func_start ShouldSwitchIfPerishSong ShouldSwitchIfPerishSong: @ 8039188 push {lr} - ldr r1, _080391D4 @ =gUnknown_2023DFC - ldr r0, _080391D8 @ =gUnknown_2023BC4 + ldr r1, _080391D4 @ =gStatuses3 + ldr r0, _080391D8 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -18,7 +18,7 @@ ShouldSwitchIfPerishSong: @ 8039188 ands r0, r1 cmp r0, 0 beq _080391E4 - ldr r0, _080391DC @ =gUnknown_2023E0C + ldr r0, _080391DC @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -31,7 +31,7 @@ ShouldSwitchIfPerishSong: @ 8039188 bl GetBankIdentity lsls r0, 24 lsrs r0, 25 - ldr r1, _080391E0 @ =gUnknown_2023FE8 + ldr r1, _080391E0 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x92 @@ -44,10 +44,10 @@ ShouldSwitchIfPerishSong: @ 8039188 movs r0, 0x1 b _080391E6 .align 2, 0 -_080391D4: .4byte gUnknown_2023DFC -_080391D8: .4byte gUnknown_2023BC4 -_080391DC: .4byte gUnknown_2023E0C -_080391E0: .4byte gUnknown_2023FE8 +_080391D4: .4byte gStatuses3 +_080391D8: .4byte gActiveBattler +_080391DC: .4byte gDisableStructs +_080391E0: .4byte gBattleStruct _080391E4: movs r0, 0 _080391E6: @@ -61,7 +61,7 @@ sub_80391EC: @ 80391EC mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _08039204 @ =gUnknown_2022B4C + ldr r0, _08039204 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -69,14 +69,14 @@ sub_80391EC: @ 80391EC beq _08039234 b _0803935C .align 2, 0 -_08039204: .4byte gUnknown_2022B4C +_08039204: .4byte gBattleTypeFlags _08039208: - ldr r0, _0803922C @ =gUnknown_2023BC4 + ldr r0, _0803922C @ =gActiveBattler ldrb r0, [r0] bl GetBankIdentity lsls r0, 24 lsrs r0, 25 - ldr r1, _08039230 @ =gUnknown_2023FE8 + ldr r1, _08039230 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x92 @@ -88,10 +88,10 @@ _08039208: movs r0, 0x1 b _0803935E .align 2, 0 -_0803922C: .4byte gUnknown_2023BC4 -_08039230: .4byte gUnknown_2023FE8 +_0803922C: .4byte gActiveBattler +_08039230: .4byte gBattleStruct _08039234: - ldr r4, _0803936C @ =gUnknown_2023BE4 + ldr r4, _0803936C @ =gBattleMons movs r0, 0 bl GetBankByIdentity lsls r0, 24 @@ -120,7 +120,7 @@ _08039250: mov r8, r0 _0803926C: lsls r1, r6, 1 - ldr r0, _08039370 @ =gUnknown_2023BC4 + ldr r0, _08039370 @ =gActiveBattler ldrb r0, [r0] muls r0, r5 adds r1, r0 @@ -145,7 +145,7 @@ _08039298: cmp r6, 0x3 ble _0803926C movs r6, 0 - ldr r0, _08039374 @ =gUnknown_202402C + ldr r0, _08039374 @ =gEnemyParty mov r9, r0 _080392A4: movs r0, 0x64 @@ -170,8 +170,8 @@ _080392A4: lsls r1, 1 cmp r0, r1 beq _08039356 - ldr r1, _08039378 @ =gUnknown_2023BCE - ldr r0, _08039370 @ =gUnknown_2023BC4 + ldr r1, _08039378 @ =gBattlerPartyIndexes + ldr r0, _08039370 @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -190,7 +190,7 @@ _080392A4: lsrs r2, r0, 24 movs r4, 0 mov r8, r5 - ldr r1, _0803936C @ =gUnknown_2023BE4 + ldr r1, _0803936C @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r5, r0, r1 @@ -243,10 +243,10 @@ _0803935E: pop {r1} bx r1 .align 2, 0 -_0803936C: .4byte gUnknown_2023BE4 -_08039370: .4byte gUnknown_2023BC4 -_08039374: .4byte gUnknown_202402C -_08039378: .4byte gUnknown_2023BCE +_0803936C: .4byte gBattleMons +_08039370: .4byte gActiveBattler +_08039374: .4byte gEnemyParty +_08039378: .4byte gBattlerPartyIndexes thumb_func_end sub_80391EC thumb_func_start sub_803937C @@ -272,7 +272,7 @@ sub_803937C: @ 803937C b _08039588 _080393A8: ldr r1, _08039410 @ =gUnknown_2023DA0 - ldr r5, _08039414 @ =gUnknown_2023BC4 + ldr r5, _08039414 @ =gActiveBattler ldrb r3, [r5] lsls r0, r3, 1 adds r4, r0, r1 @@ -286,7 +286,7 @@ _080393BA: bne _080393C2 b _08039588 _080393C2: - ldr r2, _0803941C @ =gUnknown_8250C04 + ldr r2, _0803941C @ =gBattleMoves ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -297,7 +297,7 @@ _080393C2: bne _080393D6 b _08039588 _080393D6: - ldr r0, _08039420 @ =gUnknown_2022B4C + ldr r0, _08039420 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -311,9 +311,9 @@ _080393D6: lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r1, _08039424 @ =gUnknown_2023D70 + ldr r1, _08039424 @ =gAbsentBattlerFlags ldrb r1, [r1] - ldr r2, _08039428 @ =gUnknown_825E45C + ldr r2, _08039428 @ =gBitTable lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -325,12 +325,12 @@ _080393D6: b _08039446 .align 2, 0 _08039410: .4byte gUnknown_2023DA0 -_08039414: .4byte gUnknown_2023BC4 +_08039414: .4byte gActiveBattler _08039418: .4byte 0x0000ffff -_0803941C: .4byte gUnknown_8250C04 -_08039420: .4byte gUnknown_2022B4C -_08039424: .4byte gUnknown_2023D70 -_08039428: .4byte gUnknown_825E45C +_0803941C: .4byte gBattleMoves +_08039420: .4byte gBattleTypeFlags +_08039424: .4byte gAbsentBattlerFlags +_08039428: .4byte gBitTable _0803942C: ldrb r0, [r5] bl GetBankIdentity @@ -345,9 +345,9 @@ _08039442: adds r7, r3, 0 mov r8, r7 _08039446: - ldr r3, _08039468 @ =gUnknown_8250C04 + ldr r3, _08039468 @ =gBattleMoves ldr r1, _0803946C @ =gUnknown_2023DA0 - ldr r2, _08039470 @ =gUnknown_2023BC4 + ldr r2, _08039470 @ =gActiveBattler ldrb r0, [r2] lsls r0, 1 adds r0, r1 @@ -363,9 +363,9 @@ _08039446: movs r0, 0x12 b _08039486 .align 2, 0 -_08039468: .4byte gUnknown_8250C04 +_08039468: .4byte gBattleMoves _0803946C: .4byte gUnknown_2023DA0 -_08039470: .4byte gUnknown_2023BC4 +_08039470: .4byte gActiveBattler _08039474: cmp r0, 0xB bne _0803947E @@ -381,7 +381,7 @@ _08039484: _08039486: mov r10, r0 _08039488: - ldr r2, _0803949C @ =gUnknown_2023BE4 + ldr r2, _0803949C @ =gBattleMons ldrb r1, [r1] movs r0, 0x58 muls r0, r1 @@ -392,14 +392,14 @@ _08039488: bne _080394CC b _08039588 .align 2, 0 -_0803949C: .4byte gUnknown_2023BE4 +_0803949C: .4byte gBattleMons _080394A0: - ldr r0, _080394C4 @ =gUnknown_2023BC4 + ldr r0, _080394C4 @ =gActiveBattler ldrb r0, [r0] bl GetBankIdentity lsls r0, 24 lsrs r0, 25 - ldr r1, _080394C8 @ =gUnknown_2023FE8 + ldr r1, _080394C8 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x92 @@ -411,17 +411,17 @@ _080394A0: movs r0, 0x1 b _0803958A .align 2, 0 -_080394C4: .4byte gUnknown_2023BC4 -_080394C8: .4byte gUnknown_2023FE8 +_080394C4: .4byte gActiveBattler +_080394C8: .4byte gBattleStruct _080394CC: movs r6, 0 - ldr r2, _08039558 @ =gUnknown_8254784 + ldr r2, _08039558 @ =gBaseStats mov r9, r2 _080394D2: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _0803955C @ =gUnknown_202402C + ldr r0, _0803955C @ =gEnemyParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x39 @@ -440,7 +440,7 @@ _080394D2: lsls r1, 1 cmp r0, r1 beq _08039582 - ldr r1, _08039560 @ =gUnknown_2023BCE + ldr r1, _08039560 @ =gBattlerPartyIndexes mov r2, r8 lsls r0, r2, 1 adds r0, r1 @@ -452,7 +452,7 @@ _080394D2: ldrh r0, [r0] cmp r6, r0 beq _08039582 - ldr r0, _08039564 @ =gUnknown_2023FE8 + ldr r0, _08039564 @ =gBattleStruct ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C @@ -481,10 +481,10 @@ _080394D2: ldrb r0, [r0, 0x17] b _08039572 .align 2, 0 -_08039558: .4byte gUnknown_8254784 -_0803955C: .4byte gUnknown_202402C -_08039560: .4byte gUnknown_2023BCE -_08039564: .4byte gUnknown_2023FE8 +_08039558: .4byte gBaseStats +_0803955C: .4byte gEnemyParty +_08039560: .4byte gBattlerPartyIndexes +_08039564: .4byte gBattleStruct _08039568: lsls r0, r4, 3 subs r0, r4 @@ -518,8 +518,8 @@ _0803958A: thumb_func_start sub_8039598 sub_8039598: @ 8039598 push {r4,r5,lr} - ldr r3, _080395F0 @ =gUnknown_2023BE4 - ldr r5, _080395F4 @ =gUnknown_2023BC4 + ldr r3, _080395F0 @ =gBattleMons + ldr r5, _080395F4 @ =gActiveBattler ldrb r4, [r5] movs r0, 0x58 adds r2, r4, 0 @@ -561,14 +561,14 @@ _080395DE: ldrb r0, [r5] b _08039668 .align 2, 0 -_080395F0: .4byte gUnknown_2023BE4 -_080395F4: .4byte gUnknown_2023BC4 +_080395F0: .4byte gBattleMons +_080395F4: .4byte gActiveBattler _080395F8: .4byte gUnknown_2023DA0 _080395FC: .4byte 0x0000ffff _08039600: - ldr r2, _0803962C @ =gUnknown_8250C04 + ldr r2, _0803962C @ =gBattleMoves ldr r1, _08039630 @ =gUnknown_2023DA0 - ldr r4, _08039634 @ =gUnknown_2023BC4 + ldr r4, _08039634 @ =gActiveBattler ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -588,9 +588,9 @@ _08039600: ldrb r0, [r4] b _08039668 .align 2, 0 -_0803962C: .4byte gUnknown_8250C04 +_0803962C: .4byte gBattleMoves _08039630: .4byte gUnknown_2023DA0 -_08039634: .4byte gUnknown_2023BC4 +_08039634: .4byte gActiveBattler _08039638: movs r0, 0x8 movs r1, 0x1 @@ -613,13 +613,13 @@ _08039660: movs r0, 0 b _08039688 _08039664: - ldr r0, _08039690 @ =gUnknown_2023BC4 + ldr r0, _08039690 @ =gActiveBattler ldrb r0, [r0] _08039668: bl GetBankIdentity lsls r0, 24 lsrs r0, 25 - ldr r1, _08039694 @ =gUnknown_2023FE8 + ldr r1, _08039694 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x92 @@ -636,8 +636,8 @@ _08039688: pop {r1} bx r1 .align 2, 0 -_08039690: .4byte gUnknown_2023BC4 -_08039694: .4byte gUnknown_2023FE8 +_08039690: .4byte gActiveBattler +_08039694: .4byte gBattleStruct thumb_func_end sub_8039598 thumb_func_start ai_has_super_effective_move_on_field @@ -653,9 +653,9 @@ ai_has_super_effective_move_on_field: @ 8039698 bl GetBankByIdentity lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _08039730 @ =gUnknown_2023D70 + ldr r0, _08039730 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _08039734 @ =gUnknown_825E45C + ldr r2, _08039734 @ =gBitTable lsls r0, r3, 2 adds r0, r2 ldr r0, [r0] @@ -663,7 +663,7 @@ ai_has_super_effective_move_on_field: @ 8039698 cmp r1, 0 bne _08039720 movs r4, 0 - ldr r6, _08039738 @ =gUnknown_2023BE4 + ldr r6, _08039738 @ =gBattleMons movs r7, 0x58 adds r0, r3, 0 muls r0, r7 @@ -673,7 +673,7 @@ ai_has_super_effective_move_on_field: @ 8039698 mov r9, r0 _080396D4: lsls r1, r4, 1 - ldr r0, _0803973C @ =gUnknown_2023BC4 + ldr r0, _0803973C @ =gActiveBattler ldrb r0, [r0] muls r0, r7 adds r1, r0 @@ -709,7 +709,7 @@ _0803971A: cmp r4, 0x3 ble _080396D4 _08039720: - ldr r0, _08039740 @ =gUnknown_2022B4C + ldr r0, _08039740 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -717,11 +717,11 @@ _08039720: bne _08039748 b _080397C2 .align 2, 0 -_08039730: .4byte gUnknown_2023D70 -_08039734: .4byte gUnknown_825E45C -_08039738: .4byte gUnknown_2023BE4 -_0803973C: .4byte gUnknown_2023BC4 -_08039740: .4byte gUnknown_2022B4C +_08039730: .4byte gAbsentBattlerFlags +_08039734: .4byte gBitTable +_08039738: .4byte gBattleMons +_0803973C: .4byte gActiveBattler +_08039740: .4byte gBattleTypeFlags _08039744: movs r0, 0x1 b _080397C4 @@ -730,9 +730,9 @@ _08039748: bl GetBankByIdentity lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _080397D0 @ =gUnknown_2023D70 + ldr r0, _080397D0 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _080397D4 @ =gUnknown_825E45C + ldr r2, _080397D4 @ =gBitTable lsls r0, r3, 2 adds r0, r2 ldr r0, [r0] @@ -740,7 +740,7 @@ _08039748: cmp r1, 0 bne _080397C2 movs r4, 0 - ldr r6, _080397D8 @ =gUnknown_2023BE4 + ldr r6, _080397D8 @ =gBattleMons movs r7, 0x58 adds r0, r3, 0 muls r0, r7 @@ -750,7 +750,7 @@ _08039748: mov r9, r3 _08039776: lsls r1, r4, 1 - ldr r0, _080397DC @ =gUnknown_2023BC4 + ldr r0, _080397DC @ =gActiveBattler ldrb r0, [r0] muls r0, r7 adds r1, r0 @@ -795,18 +795,18 @@ _080397C4: pop {r1} bx r1 .align 2, 0 -_080397D0: .4byte gUnknown_2023D70 -_080397D4: .4byte gUnknown_825E45C -_080397D8: .4byte gUnknown_2023BE4 -_080397DC: .4byte gUnknown_2023BC4 +_080397D0: .4byte gAbsentBattlerFlags +_080397D4: .4byte gBitTable +_080397D8: .4byte gBattleMons +_080397DC: .4byte gActiveBattler thumb_func_end ai_has_super_effective_move_on_field thumb_func_start AI_AreStatsRaised AI_AreStatsRaised: @ 80397E0 push {r4,lr} movs r4, 0 - ldr r1, _08039820 @ =gUnknown_2023BE4 - ldr r0, _08039824 @ =gUnknown_2023BC4 + ldr r1, _08039820 @ =gBattleMons + ldr r0, _08039824 @ =gActiveBattler ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -839,8 +839,8 @@ _0803981A: pop {r1} bx r1 .align 2, 0 -_08039820: .4byte gUnknown_2023BE4 -_08039824: .4byte gUnknown_2023BC4 +_08039820: .4byte gBattleMons +_08039824: .4byte gActiveBattler thumb_func_end AI_AreStatsRaised thumb_func_start sub_8039828 @@ -858,7 +858,7 @@ sub_8039828: @ 8039828 lsrs r1, 24 str r1, [sp, 0x4] ldr r1, _080398B4 @ =gUnknown_2023DA0 - ldr r5, _080398B8 @ =gUnknown_2023BC4 + ldr r5, _080398B8 @ =gActiveBattler ldrb r3, [r5] lsls r0, r3, 1 adds r4, r0, r1 @@ -879,7 +879,7 @@ _0803985A: bne _08039866 b _08039A54 _08039866: - ldr r2, _080398C4 @ =gUnknown_8250C04 + ldr r2, _080398C4 @ =gBattleMoves ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -890,7 +890,7 @@ _08039866: bne _0803987A b _08039A54 _0803987A: - ldr r0, _080398C8 @ =gUnknown_2022B4C + ldr r0, _080398C8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -904,9 +904,9 @@ _0803987A: lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r1, _080398CC @ =gUnknown_2023D70 + ldr r1, _080398CC @ =gAbsentBattlerFlags ldrb r1, [r1] - ldr r2, _080398D0 @ =gUnknown_825E45C + ldr r2, _080398D0 @ =gBitTable lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -919,13 +919,13 @@ _0803987A: b _0803991C .align 2, 0 _080398B4: .4byte gUnknown_2023DA0 -_080398B8: .4byte gUnknown_2023BC4 +_080398B8: .4byte gActiveBattler _080398BC: .4byte 0x0000ffff _080398C0: .4byte gUnknown_2023DC0 -_080398C4: .4byte gUnknown_8250C04 -_080398C8: .4byte gUnknown_2022B4C -_080398CC: .4byte gUnknown_2023D70 -_080398D0: .4byte gUnknown_825E45C +_080398C4: .4byte gBattleMoves +_080398C8: .4byte gBattleTypeFlags +_080398CC: .4byte gAbsentBattlerFlags +_080398D0: .4byte gBitTable _080398D4: ldrb r0, [r5] bl GetBankIdentity @@ -938,12 +938,12 @@ _080398D4: mov r10, r0 b _0803991C _080398EC: - ldr r0, _08039910 @ =gUnknown_2023BC4 + ldr r0, _08039910 @ =gActiveBattler ldrb r0, [r0] bl GetBankIdentity lsls r0, 24 lsrs r0, 25 - ldr r1, _08039914 @ =gUnknown_2023FE8 + ldr r1, _08039914 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x92 @@ -955,8 +955,8 @@ _080398EC: movs r0, 0x1 b _08039A56 .align 2, 0 -_08039910: .4byte gUnknown_2023BC4 -_08039914: .4byte gUnknown_2023FE8 +_08039910: .4byte gActiveBattler +_08039914: .4byte gBattleStruct _08039918: mov r9, r3 mov r10, r9 @@ -966,7 +966,7 @@ _0803991E: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _080399B0 @ =gUnknown_202402C + ldr r0, _080399B0 @ =gEnemyParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x39 @@ -989,7 +989,7 @@ _08039944: lsls r1, 1 cmp r0, r1 beq _08039A4C - ldr r1, _080399B4 @ =gUnknown_2023BCE + ldr r1, _080399B4 @ =gBattlerPartyIndexes mov r2, r9 lsls r0, r2, 1 adds r0, r1 @@ -1002,7 +1002,7 @@ _08039944: ldrh r0, [r0] cmp r7, r0 beq _08039A4C - ldr r0, _080399B8 @ =gUnknown_2023FE8 + ldr r0, _080399B8 @ =gBattleStruct ldr r1, [r0] mov r2, r9 adds r0, r2, r1 @@ -1029,25 +1029,25 @@ _08039944: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _080399BC @ =gUnknown_8254784 + ldr r1, _080399BC @ =gBaseStats adds r0, r1 ldrb r2, [r0, 0x17] b _080399CC .align 2, 0 -_080399B0: .4byte gUnknown_202402C -_080399B4: .4byte gUnknown_2023BCE -_080399B8: .4byte gUnknown_2023FE8 -_080399BC: .4byte gUnknown_8254784 +_080399B0: .4byte gEnemyParty +_080399B4: .4byte gBattlerPartyIndexes +_080399B8: .4byte gBattleStruct +_080399BC: .4byte gBaseStats _080399C0: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r2, _08039A68 @ =gUnknown_8254784 + ldr r2, _08039A68 @ =gBaseStats adds r0, r2 ldrb r2, [r0, 0x16] _080399CC: ldr r1, _08039A6C @ =gUnknown_2023DA0 - ldr r5, _08039A70 @ =gUnknown_2023BC4 + ldr r5, _08039A70 @ =gActiveBattler ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -1068,7 +1068,7 @@ _080399CC: adds r1, r7, 0 muls r1, r0 mov r8, r1 - ldr r1, _08039A78 @ =gUnknown_2023BE4 + ldr r1, _08039A78 @ =gBattleMons movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -1077,7 +1077,7 @@ _080399CC: adds r6, r5, 0 adds r6, 0x20 _08039A0A: - ldr r0, _08039A7C @ =gUnknown_202402C + ldr r0, _08039A7C @ =gEnemyParty adds r1, r4, 0 adds r1, 0xD add r0, r8 @@ -1124,12 +1124,12 @@ _08039A56: pop {r1} bx r1 .align 2, 0 -_08039A68: .4byte gUnknown_8254784 +_08039A68: .4byte gBaseStats _08039A6C: .4byte gUnknown_2023DA0 -_08039A70: .4byte gUnknown_2023BC4 +_08039A70: .4byte gActiveBattler _08039A74: .4byte gUnknown_2023DC0 -_08039A78: .4byte gUnknown_2023BE4 -_08039A7C: .4byte gUnknown_202402C +_08039A78: .4byte gBattleMons +_08039A7C: .4byte gEnemyParty thumb_func_end sub_8039828 thumb_func_start sub_8039A80 @@ -1138,8 +1138,8 @@ sub_8039A80: @ 8039A80 mov r7, r8 push {r7} sub sp, 0x4 - ldr r6, _08039B5C @ =gUnknown_2023BE4 - ldr r4, _08039B60 @ =gUnknown_2023BC4 + ldr r6, _08039B5C @ =gBattleMons + ldr r4, _08039B60 @ =gActiveBattler ldrb r2, [r4] movs r5, 0x58 adds r0, r2, 0 @@ -1154,7 +1154,7 @@ sub_8039A80: @ 8039A80 beq _08039AA6 b _08039C74 _08039AA6: - ldr r0, _08039B68 @ =gUnknown_2023DFC + ldr r0, _08039B68 @ =gStatuses3 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -1217,13 +1217,13 @@ _08039B10: _08039B1C: movs r0, 0 mov r8, r0 - ldr r0, _08039B6C @ =gUnknown_2022B4C + ldr r0, _08039B6C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08039B8E - ldr r4, _08039B60 @ =gUnknown_2023BC4 + ldr r4, _08039B60 @ =gActiveBattler ldrb r7, [r4] adds r0, r7, 0 bl GetBankIdentity @@ -1232,9 +1232,9 @@ _08039B1C: lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r1, _08039B70 @ =gUnknown_2023D70 + ldr r1, _08039B70 @ =gAbsentBattlerFlags ldrb r1, [r1] - ldr r2, _08039B74 @ =gUnknown_825E45C + ldr r2, _08039B74 @ =gBitTable lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -1245,13 +1245,13 @@ _08039B1C: ldrb r6, [r4] b _08039B94 .align 2, 0 -_08039B5C: .4byte gUnknown_2023BE4 -_08039B60: .4byte gUnknown_2023BC4 +_08039B5C: .4byte gBattleMons +_08039B60: .4byte gActiveBattler _08039B64: .4byte 0x0400e000 -_08039B68: .4byte gUnknown_2023DFC -_08039B6C: .4byte gUnknown_2022B4C -_08039B70: .4byte gUnknown_2023D70 -_08039B74: .4byte gUnknown_825E45C +_08039B68: .4byte gStatuses3 +_08039B6C: .4byte gBattleTypeFlags +_08039B70: .4byte gAbsentBattlerFlags +_08039B74: .4byte gBitTable _08039B78: ldrb r0, [r4] bl GetBankIdentity @@ -1263,7 +1263,7 @@ _08039B78: lsrs r6, r0, 24 b _08039B94 _08039B8E: - ldr r0, _08039C64 @ =gUnknown_2023BC4 + ldr r0, _08039C64 @ =gActiveBattler ldrb r6, [r0] adds r7, r6, 0 _08039B94: @@ -1272,7 +1272,7 @@ _08039B96: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08039C68 @ =gUnknown_202402C + ldr r0, _08039C68 @ =gEnemyParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x39 @@ -1291,7 +1291,7 @@ _08039B96: lsls r1, 1 cmp r0, r1 beq _08039BFA - ldr r1, _08039C6C @ =gUnknown_2023BCE + ldr r1, _08039C6C @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -1302,7 +1302,7 @@ _08039B96: ldrh r0, [r0] cmp r5, r0 beq _08039BFA - ldr r0, _08039C70 @ =gUnknown_2023FE8 + ldr r0, _08039C70 @ =gBattleStruct ldr r1, [r0] adds r0, r7, r1 adds r0, 0x5C @@ -1364,10 +1364,10 @@ _08039C60: movs r0, 0x1 b _08039C76 .align 2, 0 -_08039C64: .4byte gUnknown_2023BC4 -_08039C68: .4byte gUnknown_202402C -_08039C6C: .4byte gUnknown_2023BCE -_08039C70: .4byte gUnknown_2023FE8 +_08039C64: .4byte gActiveBattler +_08039C68: .4byte gEnemyParty +_08039C6C: .4byte gBattlerPartyIndexes +_08039C70: .4byte gBattleStruct _08039C74: movs r0, 0 _08039C76: @@ -1382,7 +1382,7 @@ _08039C76: thumb_func_start sub_8039C84 sub_8039C84: @ 8039C84 push {r4-r6,lr} - ldr r5, _08039CDC @ =gUnknown_2022B4C + ldr r5, _08039CDC @ =gBattleTypeFlags ldr r0, [r5] movs r1, 0x8 ands r0, r1 @@ -1394,12 +1394,12 @@ _08039C94: lsls r0, 24 cmp r0, 0 beq _08039D8C - ldr r0, _08039CE0 @ =gUnknown_2023BC4 + ldr r0, _08039CE0 @ =gActiveBattler ldrb r0, [r0] bl GetBankIdentity lsls r0, 24 lsrs r0, 25 - ldr r1, _08039CE4 @ =gUnknown_2023FE8 + ldr r1, _08039CE4 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x92 @@ -1423,9 +1423,9 @@ _08039C94: adds r6, r5, 0 b _08039CFC .align 2, 0 -_08039CDC: .4byte gUnknown_2022B4C -_08039CE0: .4byte gUnknown_2023BC4 -_08039CE4: .4byte gUnknown_2023FE8 +_08039CDC: .4byte gBattleTypeFlags +_08039CE0: .4byte gActiveBattler +_08039CE4: .4byte gBattleStruct _08039CE8: movs r0, 0x1 bl GetBankByIdentity @@ -1440,13 +1440,13 @@ _08039CFC: _08039CFE: movs r0, 0x64 muls r0, r4 - ldr r1, _08039D7C @ =gUnknown_202402C + ldr r1, _08039D7C @ =gEnemyParty adds r0, r1 movs r1, 0x39 bl GetMonData cmp r0, 0 beq _08039D3E - ldr r1, _08039D80 @ =gUnknown_2023BCE + ldr r1, _08039D80 @ =gBattlerPartyIndexes lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] @@ -1457,7 +1457,7 @@ _08039CFE: ldrh r0, [r0] cmp r4, r0 beq _08039D3E - ldr r0, _08039D84 @ =gUnknown_2023FE8 + ldr r0, _08039D84 @ =gBattleStruct ldr r1, [r0] adds r0, r6, r1 adds r0, 0x5C @@ -1474,22 +1474,22 @@ _08039D3E: cmp r4, 0x5 ble _08039CFE _08039D44: - ldr r0, _08039D88 @ =gUnknown_2023BC4 + ldr r0, _08039D88 @ =gActiveBattler ldrb r0, [r0] bl GetBankIdentity lsls r0, 24 lsrs r0, 25 - ldr r1, _08039D84 @ =gUnknown_2023FE8 + ldr r1, _08039D84 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x92 strb r4, [r0] _08039D5A: - ldr r4, _08039D88 @ =gUnknown_2023BC4 + ldr r4, _08039D88 @ =gActiveBattler ldrb r0, [r4] bl GetBankIdentity ldrb r2, [r4] - ldr r1, _08039D84 @ =gUnknown_2023FE8 + ldr r1, _08039D84 @ =gBattleStruct ldr r1, [r1] adds r2, r1 adds r2, 0x5C @@ -1501,17 +1501,17 @@ _08039D5A: strb r0, [r2] b _08039DA8 .align 2, 0 -_08039D7C: .4byte gUnknown_202402C -_08039D80: .4byte gUnknown_2023BCE -_08039D84: .4byte gUnknown_2023FE8 -_08039D88: .4byte gUnknown_2023BC4 +_08039D7C: .4byte gEnemyParty +_08039D80: .4byte gBattlerPartyIndexes +_08039D84: .4byte gBattleStruct +_08039D88: .4byte gActiveBattler _08039D8C: bl sub_803A1F4 lsls r0, 24 cmp r0, 0 bne _08039DA8 _08039D96: - ldr r0, _08039DB0 @ =gUnknown_2023BC4 + ldr r0, _08039DB0 @ =gActiveBattler ldrb r0, [r0] movs r2, 0x1 eors r2, r0 @@ -1524,7 +1524,7 @@ _08039DA8: pop {r0} bx r0 .align 2, 0 -_08039DB0: .4byte gUnknown_2023BC4 +_08039DB0: .4byte gActiveBattler thumb_func_end sub_8039C84 thumb_func_start sub_8039DB4 @@ -1608,9 +1608,9 @@ sub_8039E3C: @ 8039E3C mov r5, r8 push {r5-r7} sub sp, 0x1C - ldr r4, _08039E98 @ =gUnknown_2023BC4 + ldr r4, _08039E98 @ =gActiveBattler ldrb r2, [r4] - ldr r0, _08039E9C @ =gUnknown_2023FE8 + ldr r0, _08039E9C @ =gBattleStruct ldr r0, [r0] adds r0, r2, r0 adds r1, r0, 0 @@ -1620,7 +1620,7 @@ sub_8039E3C: @ 8039E3C beq _08039E5E b _0803A160 _08039E5E: - ldr r0, _08039EA0 @ =gUnknown_2022B4C + ldr r0, _08039EA0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -1634,9 +1634,9 @@ _08039E5E: lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r1, _08039EA4 @ =gUnknown_2023D70 + ldr r1, _08039EA4 @ =gAbsentBattlerFlags ldrb r1, [r1] - ldr r2, _08039EA8 @ =gUnknown_825E45C + ldr r2, _08039EA8 @ =gBitTable lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -1648,11 +1648,11 @@ _08039E5E: str r4, [sp, 0x10] b _08039EC2 .align 2, 0 -_08039E98: .4byte gUnknown_2023BC4 -_08039E9C: .4byte gUnknown_2023FE8 -_08039EA0: .4byte gUnknown_2022B4C -_08039EA4: .4byte gUnknown_2023D70 -_08039EA8: .4byte gUnknown_825E45C +_08039E98: .4byte gActiveBattler +_08039E9C: .4byte gBattleStruct +_08039EA0: .4byte gBattleTypeFlags +_08039EA4: .4byte gAbsentBattlerFlags +_08039EA8: .4byte gBitTable _08039EAC: ldrb r0, [r4] bl GetBankIdentity @@ -1670,9 +1670,9 @@ _08039EC2: lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _08039EF0 @ =gUnknown_2023D70 + ldr r0, _08039EF0 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _08039EF4 @ =gUnknown_825E45C + ldr r2, _08039EF4 @ =gBitTable mov r4, r10 lsls r0, r4, 2 adds r0, r2 @@ -1686,8 +1686,8 @@ _08039EC2: mov r10, r0 b _08039F0A .align 2, 0 -_08039EF0: .4byte gUnknown_2023D70 -_08039EF4: .4byte gUnknown_825E45C +_08039EF0: .4byte gAbsentBattlerFlags +_08039EF4: .4byte gBitTable _08039EF8: movs r0, 0 bl GetBankByIdentity @@ -1708,13 +1708,13 @@ _08039F12: movs r4, 0x6 str r4, [sp, 0x8] movs r7, 0 - ldr r0, _08039FD8 @ =gUnknown_825E45C + ldr r0, _08039FD8 @ =gBitTable mov r8, r0 _08039F20: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08039FDC @ =gUnknown_202402C + ldr r0, _08039FDC @ =gEnemyParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -1734,7 +1734,7 @@ _08039F20: ands r0, r2 cmp r0, 0 bne _08039FF0 - ldr r1, _08039FE0 @ =gUnknown_2023BCE + ldr r1, _08039FE0 @ =gBattlerPartyIndexes ldr r4, [sp, 0xC] lsls r0, r4, 1 adds r0, r1 @@ -1747,7 +1747,7 @@ _08039F20: ldrh r0, [r0] cmp r0, r7 beq _08039FF0 - ldr r0, _08039FE4 @ =gUnknown_2023FE8 + ldr r0, _08039FE4 @ =gBattleStruct ldr r1, [r0] adds r0, r4, r1 adds r0, 0x5C @@ -1759,7 +1759,7 @@ _08039F20: ldrb r0, [r0] cmp r7, r0 beq _08039FF0 - ldr r1, _08039FE8 @ =gUnknown_8254784 + ldr r1, _08039FE8 @ =gBaseStats lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -1772,7 +1772,7 @@ _08039F20: movs r0, 0x58 mov r4, r10 muls r4, r0 - ldr r0, _08039FEC @ =gUnknown_2023BE4 + ldr r0, _08039FEC @ =gBattleMons adds r4, r0 adds r0, r4, 0 adds r0, 0x21 @@ -1800,12 +1800,12 @@ _08039F20: str r0, [sp, 0x8] b _08039FFE .align 2, 0 -_08039FD8: .4byte gUnknown_825E45C -_08039FDC: .4byte gUnknown_202402C -_08039FE0: .4byte gUnknown_2023BCE -_08039FE4: .4byte gUnknown_2023FE8 -_08039FE8: .4byte gUnknown_8254784 -_08039FEC: .4byte gUnknown_2023BE4 +_08039FD8: .4byte gBitTable +_08039FDC: .4byte gEnemyParty +_08039FE0: .4byte gBattlerPartyIndexes +_08039FE4: .4byte gBattleStruct +_08039FE8: .4byte gBaseStats +_08039FEC: .4byte gBattleMons _08039FF0: mov r4, r8 ldr r0, [r4] @@ -1827,7 +1827,7 @@ _08039FFE: movs r0, 0x64 adds r5, r4, 0 muls r5, r0 - ldr r6, _0803A060 @ =gUnknown_202402C + ldr r6, _0803A060 @ =gEnemyParty _0803A018: adds r1, r7, 0 adds r1, 0xD @@ -1837,7 +1837,7 @@ _0803A018: lsrs r4, r0, 16 cmp r4, 0 beq _0803A03E - ldr r0, _0803A064 @ =gUnknown_2023BC4 + ldr r0, _0803A064 @ =gActiveBattler ldrb r1, [r0] adds r0, r4, 0 mov r2, r10 @@ -1857,7 +1857,7 @@ _0803A044: _0803A04A: ldr r1, [sp, 0x8] lsls r0, r1, 2 - ldr r2, _0803A068 @ =gUnknown_825E45C + ldr r2, _0803A068 @ =gBitTable adds r0, r2 ldr r0, [r0] mov r4, r9 @@ -1866,9 +1866,9 @@ _0803A04A: lsrs r0, 24 b _0803A06E .align 2, 0 -_0803A060: .4byte gUnknown_202402C -_0803A064: .4byte gUnknown_2023BC4 -_0803A068: .4byte gUnknown_825E45C +_0803A060: .4byte gEnemyParty +_0803A064: .4byte gActiveBattler +_0803A068: .4byte gBitTable _0803A06C: movs r0, 0x3F _0803A06E: @@ -1878,18 +1878,18 @@ _0803A06E: beq _0803A078 b _08039F12 _0803A078: - ldr r0, _0803A170 @ =gUnknown_2023F50 + ldr r0, _0803A170 @ =gDynamicBasePower movs r1, 0 strh r1, [r0] - ldr r0, _0803A174 @ =gUnknown_2023FE8 + ldr r0, _0803A174 @ =gBattleStruct ldr r0, [r0] strb r1, [r0, 0x13] - ldr r0, _0803A178 @ =gUnknown_2023FC4 + ldr r0, _0803A178 @ =gBattleScripting movs r2, 0x1 strb r2, [r0, 0xE] - ldr r0, _0803A17C @ =gUnknown_2023DCC + ldr r0, _0803A17C @ =gMoveResultFlags strb r1, [r0] - ldr r0, _0803A180 @ =gUnknown_2023D71 + ldr r0, _0803A180 @ =gCritMultiplier strb r2, [r0] movs r2, 0 str r2, [sp, 0x4] @@ -1900,7 +1900,7 @@ _0803A09C: movs r0, 0x64 adds r6, r7, 0 muls r6, r0 - ldr r0, _0803A184 @ =gUnknown_202402C + ldr r0, _0803A184 @ =gEnemyParty adds r4, r6, r0 adds r0, r4, 0 movs r1, 0xB @@ -1915,7 +1915,7 @@ _0803A09C: bl GetMonData cmp r0, 0 beq _0803A158 - ldr r1, _0803A188 @ =gUnknown_2023BCE + ldr r1, _0803A188 @ =gBattlerPartyIndexes ldr r2, [sp, 0xC] lsls r0, r2, 1 adds r0, r1 @@ -1928,7 +1928,7 @@ _0803A09C: ldrh r0, [r0] cmp r0, r7 beq _0803A158 - ldr r0, _0803A174 @ =gUnknown_2023FE8 + ldr r0, _0803A174 @ =gBattleStruct ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C @@ -1942,13 +1942,13 @@ _0803A09C: beq _0803A158 movs r5, 0 mov r9, r6 - ldr r0, _0803A18C @ =gUnknown_2023D50 + ldr r0, _0803A18C @ =gBattleMoveDamage mov r8, r0 - ldr r6, _0803A190 @ =gUnknown_2023BC4 + ldr r6, _0803A190 @ =gActiveBattler _0803A100: adds r1, r5, 0 adds r1, 0xD - ldr r0, _0803A184 @ =gUnknown_202402C + ldr r0, _0803A184 @ =gEnemyParty add r0, r9 bl GetMonData lsls r0, 16 @@ -1958,7 +1958,7 @@ _0803A100: str r0, [r1] cmp r4, 0 beq _0803A13C - ldr r0, _0803A194 @ =gUnknown_8250C04 + ldr r0, _0803A194 @ =gBattleMoves lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -2005,16 +2005,16 @@ _0803A160: pop {r1} bx r1 .align 2, 0 -_0803A170: .4byte gUnknown_2023F50 -_0803A174: .4byte gUnknown_2023FE8 -_0803A178: .4byte gUnknown_2023FC4 -_0803A17C: .4byte gUnknown_2023DCC -_0803A180: .4byte gUnknown_2023D71 -_0803A184: .4byte gUnknown_202402C -_0803A188: .4byte gUnknown_2023BCE -_0803A18C: .4byte gUnknown_2023D50 -_0803A190: .4byte gUnknown_2023BC4 -_0803A194: .4byte gUnknown_8250C04 +_0803A170: .4byte gDynamicBasePower +_0803A174: .4byte gBattleStruct +_0803A178: .4byte gBattleScripting +_0803A17C: .4byte gMoveResultFlags +_0803A180: .4byte gCritMultiplier +_0803A184: .4byte gEnemyParty +_0803A188: .4byte gBattlerPartyIndexes +_0803A18C: .4byte gBattleMoveDamage +_0803A190: .4byte gActiveBattler +_0803A194: .4byte gBattleMoves thumb_func_end sub_8039E3C thumb_func_start sub_803A198 @@ -2091,7 +2091,7 @@ _0803A20A: movs r0, 0x64 mov r1, r8 muls r1, r0 - ldr r0, _0803A2A8 @ =gUnknown_202402C + ldr r0, _0803A2A8 @ =gEnemyParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x39 @@ -2124,7 +2124,7 @@ _0803A246: movs r1, 0 mov r8, r1 _0803A254: - ldr r1, _0803A2AC @ =gUnknown_2023FF4 + ldr r1, _0803A2AC @ =gBattleResources mov r2, r8 cmp r2, 0 beq _0803A26E @@ -2169,8 +2169,8 @@ _0803A296: adds r5, r0, r1 b _0803A2BE .align 2, 0 -_0803A2A8: .4byte gUnknown_202402C -_0803A2AC: .4byte gUnknown_2023FF4 +_0803A2A8: .4byte gEnemyParty +_0803A2AC: .4byte gBattleResources _0803A2B0: .4byte gUnknown_82528BC _0803A2B4: .4byte gSaveBlock1Ptr _0803A2B8: .4byte 0x00003108 @@ -2182,10 +2182,10 @@ _0803A2BE: lsrs r0, 24 adds r1, r5, 0 bl sub_803A198 - ldr r4, _0803A2F8 @ =gUnknown_2023BC4 + ldr r4, _0803A2F8 @ =gActiveBattler ldrb r1, [r4] lsrs r1, 1 - ldr r3, _0803A2FC @ =gUnknown_2023FE8 + ldr r3, _0803A2FC @ =gBattleStruct ldr r2, [r3] adds r1, r2 adds r1, 0xC4 @@ -2207,8 +2207,8 @@ _0803A2EE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803A2F8: .4byte gUnknown_2023BC4 -_0803A2FC: .4byte gUnknown_2023FE8 +_0803A2F8: .4byte gActiveBattler +_0803A2FC: .4byte gBattleStruct _0803A300: .4byte _0803A304 .align 2, 0 _0803A304: @@ -2219,8 +2219,8 @@ _0803A304: .4byte _0803A5C8 .4byte _0803A650 _0803A31C: - ldr r2, _0803A340 @ =gUnknown_2023BE4 - ldr r0, _0803A344 @ =gUnknown_2023BC4 + ldr r2, _0803A340 @ =gBattleMons + ldr r0, _0803A344 @ =gActiveBattler ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -2239,8 +2239,8 @@ _0803A33A: movs r7, 0x1 b _0803A5FC .align 2, 0 -_0803A340: .4byte gUnknown_2023BE4 -_0803A344: .4byte gUnknown_2023BC4 +_0803A340: .4byte gBattleMons +_0803A344: .4byte gActiveBattler _0803A348: mov r0, r9 movs r1, 0x4 @@ -2252,8 +2252,8 @@ _0803A348: bne _0803A35C b _0803A5F8 _0803A35C: - ldr r2, _0803A388 @ =gUnknown_2023BE4 - ldr r0, _0803A38C @ =gUnknown_2023BC4 + ldr r2, _0803A388 @ =gBattleMons + ldr r0, _0803A38C @ =gActiveBattler ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -2277,13 +2277,13 @@ _0803A370: _0803A386: b _0803A33A .align 2, 0 -_0803A388: .4byte gUnknown_2023BE4 -_0803A38C: .4byte gUnknown_2023BC4 +_0803A388: .4byte gBattleMons +_0803A38C: .4byte gActiveBattler _0803A390: - ldr r3, _0803A4DC @ =gUnknown_2023BC4 + ldr r3, _0803A4DC @ =gActiveBattler ldrb r0, [r3] lsrs r0, 1 - ldr r2, _0803A4E0 @ =gUnknown_2023FE8 + ldr r2, _0803A4E0 @ =gBattleStruct ldr r1, [r2] adds r0, r1 adds r0, 0xC6 @@ -2295,7 +2295,7 @@ _0803A390: ands r0, r1 cmp r0, 0 beq _0803A3D4 - ldr r1, _0803A4E4 @ =gUnknown_2023BE4 + ldr r1, _0803A4E4 @ =gBattleMons ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -2321,7 +2321,7 @@ _0803A3D4: ands r0, r1 cmp r0, 0 beq _0803A40E - ldr r1, _0803A4E4 @ =gUnknown_2023BE4 + ldr r1, _0803A4E4 @ =gBattleMons ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -2352,7 +2352,7 @@ _0803A40E: ands r0, r1 cmp r0, 0 beq _0803A440 - ldr r1, _0803A4E4 @ =gUnknown_2023BE4 + ldr r1, _0803A4E4 @ =gBattleMons ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -2378,7 +2378,7 @@ _0803A440: ands r0, r1 cmp r0, 0 beq _0803A472 - ldr r1, _0803A4E4 @ =gUnknown_2023BE4 + ldr r1, _0803A4E4 @ =gBattleMons ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -2404,7 +2404,7 @@ _0803A472: ands r0, r1 cmp r0, 0 beq _0803A4A4 - ldr r1, _0803A4E4 @ =gUnknown_2023BE4 + ldr r1, _0803A4E4 @ =gBattleMons ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -2432,7 +2432,7 @@ _0803A4A4: bne _0803A4B2 b _0803A5F8 _0803A4B2: - ldr r1, _0803A4E4 @ =gUnknown_2023BE4 + ldr r1, _0803A4E4 @ =gBattleMons ldrb r3, [r3] movs r0, 0x58 muls r0, r3 @@ -2454,20 +2454,20 @@ _0803A4CA: strb r0, [r1] b _0803A33A .align 2, 0 -_0803A4DC: .4byte gUnknown_2023BC4 -_0803A4E0: .4byte gUnknown_2023FE8 -_0803A4E4: .4byte gUnknown_2023BE4 +_0803A4DC: .4byte gActiveBattler +_0803A4E0: .4byte gBattleStruct +_0803A4E4: .4byte gBattleMons _0803A4E8: - ldr r4, _0803A5BC @ =gUnknown_2023BC4 + ldr r4, _0803A5BC @ =gActiveBattler ldrb r0, [r4] lsrs r0, 1 - ldr r3, _0803A5C0 @ =gUnknown_2023FE8 + ldr r3, _0803A5C0 @ =gBattleStruct ldr r1, [r3] adds r0, r1 adds r0, 0xC6 movs r1, 0 strb r1, [r0] - ldr r1, _0803A5C4 @ =gUnknown_2023E0C + ldr r1, _0803A5C4 @ =gDisableStructs ldrb r2, [r4] lsls r0, r2, 3 subs r0, r2 @@ -2570,16 +2570,16 @@ _0803A5A6: strb r1, [r0] b _0803A33A .align 2, 0 -_0803A5BC: .4byte gUnknown_2023BC4 -_0803A5C0: .4byte gUnknown_2023FE8 -_0803A5C4: .4byte gUnknown_2023E0C +_0803A5BC: .4byte gActiveBattler +_0803A5C0: .4byte gBattleStruct +_0803A5C4: .4byte gDisableStructs _0803A5C8: - ldr r4, _0803A630 @ =gUnknown_2023BC4 + ldr r4, _0803A630 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _0803A634 @ =gUnknown_2023E0C + ldr r2, _0803A634 @ =gDisableStructs ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -2605,17 +2605,17 @@ _0803A5FC: movs r1, 0x1 movs r2, 0 bl EmitTwoReturnValues - ldr r0, _0803A630 @ =gUnknown_2023BC4 + ldr r0, _0803A630 @ =gActiveBattler ldrb r0, [r0] lsrs r0, 1 - ldr r1, _0803A63C @ =gUnknown_2023FE8 + ldr r1, _0803A63C @ =gBattleStruct ldr r1, [r1] lsls r0, 1 adds r0, r1 adds r0, 0xC0 mov r1, r9 strb r1, [r0] - ldr r0, _0803A640 @ =gUnknown_2023FF4 + ldr r0, _0803A640 @ =gBattleResources ldr r0, [r0] ldr r0, [r0, 0x18] adds r0, 0x24 @@ -2626,11 +2626,11 @@ _0803A5FC: adds r0, r7, 0 b _0803A652 .align 2, 0 -_0803A630: .4byte gUnknown_2023BC4 -_0803A634: .4byte gUnknown_2023E0C +_0803A630: .4byte gActiveBattler +_0803A634: .4byte gDisableStructs _0803A638: .4byte gUnknown_2023DE4 -_0803A63C: .4byte gUnknown_2023FE8 -_0803A640: .4byte gUnknown_2023FF4 +_0803A63C: .4byte gBattleStruct +_0803A640: .4byte gBattleResources _0803A644: movs r0, 0x1 add r8, r0 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index c27ed0062..08fd1d03e 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -111,11 +111,11 @@ DoMoveAnim: @ 807259C lsls r1, 16 lsrs r1, 16 ldr r2, _080725C0 @ =gUnknown_2037F1A - ldr r0, _080725C4 @ =gUnknown_2023D6B + ldr r0, _080725C4 @ =sBattler_AI ldrb r0, [r0] strb r0, [r2] ldr r2, _080725C8 @ =gUnknown_2037F1B - ldr r0, _080725CC @ =gUnknown_2023D6C + ldr r0, _080725CC @ =gBattlerTarget ldrb r0, [r0] strb r0, [r2] ldr r0, _080725D0 @ =gUnknown_81C68F4 @@ -125,9 +125,9 @@ DoMoveAnim: @ 807259C bx r0 .align 2, 0 _080725C0: .4byte gUnknown_2037F1A -_080725C4: .4byte gUnknown_2023D6B +_080725C4: .4byte sBattler_AI _080725C8: .4byte gUnknown_2037F1B -_080725CC: .4byte gUnknown_2023D6C +_080725CC: .4byte gBattlerTarget _080725D0: .4byte gUnknown_81C68F4 thumb_func_end DoMoveAnim @@ -150,7 +150,7 @@ sub_80725D4: @ 80725D4 movs r0, 0 bl UpdateOamPriorityInAllHealthboxes movs r4, 0 - ldr r6, _08072618 @ =gUnknown_2023BCE + ldr r6, _08072618 @ =gBattlerPartyIndexes movs r7, 0x64 ldr r5, _0807261C @ =gUnknown_2037F1C _08072600: @@ -162,16 +162,16 @@ _08072600: beq _08072624 ldrh r0, [r6] muls r0, r7 - ldr r1, _08072620 @ =gUnknown_202402C + ldr r1, _08072620 @ =gEnemyParty b _0807262A .align 2, 0 -_08072618: .4byte gUnknown_2023BCE +_08072618: .4byte gBattlerPartyIndexes _0807261C: .4byte gUnknown_2037F1C -_08072620: .4byte gUnknown_202402C +_08072620: .4byte gEnemyParty _08072624: ldrh r0, [r6] muls r0, r7 - ldr r1, _0807264C @ =gUnknown_2024284 + ldr r1, _0807264C @ =gPlayerParty _0807262A: adds r0, r1 movs r1, 0xB @@ -189,7 +189,7 @@ _0807262A: mov r1, r9 b _08072658 .align 2, 0 -_0807264C: .4byte gUnknown_2024284 +_0807264C: .4byte gPlayerParty _08072650: .4byte gUnknown_2037F18 _08072654: ldr r0, _080726C0 @ =gUnknown_2037F18 diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s index 8dc72c43d..e3b60c269 100644 --- a/asm/battle_anim_8074480.s +++ b/asm/battle_anim_8074480.s @@ -34,7 +34,7 @@ _080744B0: bl GetBankIdentity lsls r0, 24 lsrs r0, 22 - ldr r1, _080744D4 @ =gUnknown_2022B4C + ldr r1, _080744D4 @ =gBattleTypeFlags ldr r1, [r1] movs r2, 0x1 ands r1, r2 @@ -45,14 +45,14 @@ _080744B0: b _08074588 .align 2, 0 _080744D0: .4byte gUnknown_83AE01C -_080744D4: .4byte gUnknown_2022B4C +_080744D4: .4byte gBattleTypeFlags _080744D8: ldr r4, _080744F8 @ =gUnknown_83AE01C adds r0, r5, 0 bl GetBankIdentity lsls r0, 24 lsrs r0, 22 - ldr r1, _080744FC @ =gUnknown_2022B4C + ldr r1, _080744FC @ =gBattleTypeFlags ldr r1, [r1] movs r2, 0x1 ands r1, r2 @@ -63,7 +63,7 @@ _080744D8: b _08074588 .align 2, 0 _080744F8: .4byte gUnknown_83AE01C -_080744FC: .4byte gUnknown_2022B4C +_080744FC: .4byte gBattleTypeFlags _08074500: adds r0, r5, 0 bl GetBankSide @@ -78,18 +78,18 @@ _08074500: ldrh r0, [r1, 0x2] cmp r0, 0 bne _08074570 - ldr r1, _08074530 @ =gUnknown_2023BCE + ldr r1, _08074530 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08074534 @ =gUnknown_202402C + ldr r1, _08074534 @ =gEnemyParty b _08074556 .align 2, 0 _0807452C: .4byte gUnknown_2024018 -_08074530: .4byte gUnknown_2023BCE -_08074534: .4byte gUnknown_202402C +_08074530: .4byte gBattlerPartyIndexes +_08074534: .4byte gEnemyParty _08074538: ldr r0, _08074564 @ =gUnknown_2024018 ldr r0, [r0] @@ -99,13 +99,13 @@ _08074538: ldrh r0, [r1, 0x2] cmp r0, 0 bne _08074570 - ldr r1, _08074568 @ =gUnknown_2023BCE + ldr r1, _08074568 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0807456C @ =gUnknown_2024284 + ldr r1, _0807456C @ =gPlayerParty _08074556: adds r0, r1 movs r1, 0xB @@ -115,8 +115,8 @@ _08074556: b _08074572 .align 2, 0 _08074564: .4byte gUnknown_2024018 -_08074568: .4byte gUnknown_2023BCE -_0807456C: .4byte gUnknown_2024284 +_08074568: .4byte gBattlerPartyIndexes +_0807456C: .4byte gPlayerParty _08074570: ldrh r1, [r1, 0x2] _08074572: @@ -162,13 +162,13 @@ sub_8074590: @ 8074590 ldrh r0, [r0, 0x2] cmp r0, 0 bne _080745E4 - ldr r1, _080745DC @ =gUnknown_2023BCE + ldr r1, _080745DC @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080745E0 @ =gUnknown_2024284 + ldr r1, _080745E0 @ =gPlayerParty adds r0, r1 movs r1, 0 bl GetMonData @@ -176,8 +176,8 @@ sub_8074590: @ 8074590 b _080745EA .align 2, 0 _080745D8: .4byte gUnknown_2024018 -_080745DC: .4byte gUnknown_2023BCE -_080745E0: .4byte gUnknown_2024284 +_080745DC: .4byte gBattlerPartyIndexes +_080745E0: .4byte gPlayerParty _080745E4: ldr r0, _08074620 @ =gUnknown_2024008 adds r0, r1, r0 @@ -263,13 +263,13 @@ _08074674: ldrh r0, [r0, 0x2] cmp r0, 0 bne _080746B0 - ldr r1, _080746A8 @ =gUnknown_2023BCE + ldr r1, _080746A8 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080746AC @ =gUnknown_202402C + ldr r1, _080746AC @ =gEnemyParty adds r0, r1 movs r1, 0 bl GetMonData @@ -277,8 +277,8 @@ _08074674: b _080746B6 .align 2, 0 _080746A4: .4byte gUnknown_2024018 -_080746A8: .4byte gUnknown_2023BCE -_080746AC: .4byte gUnknown_202402C +_080746A8: .4byte gBattlerPartyIndexes +_080746AC: .4byte gEnemyParty _080746B0: ldr r0, _080746EC @ =gUnknown_2024008 adds r0, r1, r0 @@ -455,7 +455,7 @@ _080747F2: ldr r3, _0807483C @ =gUnknown_83AE01C lsls r0, 24 lsrs r0, 22 - ldr r1, _08074840 @ =gUnknown_2022B4C + ldr r1, _08074840 @ =gBattleTypeFlags ldr r1, [r1] movs r2, 0x1 ands r1, r2 @@ -488,7 +488,7 @@ _08074832: bx r1 .align 2, 0 _0807483C: .4byte gUnknown_83AE01C -_08074840: .4byte gUnknown_2022B4C +_08074840: .4byte gBattleTypeFlags thumb_func_end sub_80747AC thumb_func_start sub_8074844 @@ -643,18 +643,18 @@ sub_807492C: @ 807492C ldrh r0, [r1, 0x2] cmp r0, 0 bne _080749B0 - ldr r1, _08074970 @ =gUnknown_2023BCE + ldr r1, _08074970 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08074974 @ =gUnknown_202402C + ldr r1, _08074974 @ =gEnemyParty b _08074996 .align 2, 0 _0807496C: .4byte gUnknown_2024018 -_08074970: .4byte gUnknown_2023BCE -_08074974: .4byte gUnknown_202402C +_08074970: .4byte gBattlerPartyIndexes +_08074974: .4byte gEnemyParty _08074978: ldr r0, _080749A4 @ =gUnknown_2024018 ldr r0, [r0] @@ -664,13 +664,13 @@ _08074978: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080749B0 - ldr r1, _080749A8 @ =gUnknown_2023BCE + ldr r1, _080749A8 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080749AC @ =gUnknown_2024284 + ldr r1, _080749AC @ =gPlayerParty _08074996: adds r0, r1 movs r1, 0xB @@ -680,8 +680,8 @@ _08074996: b _080749B2 .align 2, 0 _080749A4: .4byte gUnknown_2024018 -_080749A8: .4byte gUnknown_2023BCE -_080749AC: .4byte gUnknown_2024284 +_080749A8: .4byte gBattlerPartyIndexes +_080749AC: .4byte gPlayerParty _080749B0: ldrh r4, [r1, 0x2] _080749B2: @@ -1896,26 +1896,26 @@ sub_8075224: @ 8075224 lsls r0, 24 cmp r0, 0 beq _08075260 - ldr r1, _08075258 @ =gUnknown_2023BCE + ldr r1, _08075258 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0807525C @ =gUnknown_202402C + ldr r1, _0807525C @ =gEnemyParty b _0807526E .align 2, 0 _08075254: .4byte gUnknown_2023BD6 -_08075258: .4byte gUnknown_2023BCE -_0807525C: .4byte gUnknown_202402C +_08075258: .4byte gBattlerPartyIndexes +_0807525C: .4byte gEnemyParty _08075260: - ldr r1, _08075280 @ =gUnknown_2023BCE + ldr r1, _08075280 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08075284 @ =gUnknown_2024284 + ldr r1, _08075284 @ =gPlayerParty _0807526E: adds r0, r1 movs r1, 0x39 @@ -1925,8 +1925,8 @@ _0807526E: movs r0, 0x1 b _0807528A .align 2, 0 -_08075280: .4byte gUnknown_2023BCE -_08075284: .4byte gUnknown_2024284 +_08075280: .4byte gBattlerPartyIndexes +_08075284: .4byte gPlayerParty _08075288: movs r0, 0 _0807528A: @@ -1937,13 +1937,13 @@ _0807528A: thumb_func_start sub_8075290 sub_8075290: @ 8075290 - ldr r0, _0807529C @ =gUnknown_2022B4C + ldr r0, _0807529C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 bx lr .align 2, 0 -_0807529C: .4byte gUnknown_2022B4C +_0807529C: .4byte gBattleTypeFlags thumb_func_end sub_8075290 thumb_func_start sub_80752A0 @@ -4429,7 +4429,7 @@ sub_80764EC: @ 80764EC lsrs r5, r0, 24 movs r4, 0 ldr r1, _0807654C @ =gUnknown_2023D44 - ldr r6, _08076550 @ =gUnknown_2023BCE + ldr r6, _08076550 @ =gBattlerPartyIndexes _08076508: adds r0, r4, r1 ldrb r0, [r0] @@ -4454,7 +4454,7 @@ _08076508: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08076558 @ =gUnknown_2024284 + ldr r1, _08076558 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -4464,9 +4464,9 @@ _08076508: .align 2, 0 _08076548: .4byte gSprites _0807654C: .4byte gUnknown_2023D44 -_08076550: .4byte gUnknown_2023BCE +_08076550: .4byte gBattlerPartyIndexes _08076554: .4byte gUnknown_2024018 -_08076558: .4byte gUnknown_2024284 +_08076558: .4byte gPlayerParty _0807655C: ldrh r1, [r1, 0x2] _0807655E: @@ -4488,7 +4488,7 @@ _08076568: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08076598 @ =gUnknown_202402C + ldr r1, _08076598 @ =gEnemyParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -4497,7 +4497,7 @@ _08076568: b _0807659E .align 2, 0 _08076594: .4byte gUnknown_2024018 -_08076598: .4byte gUnknown_202402C +_08076598: .4byte gEnemyParty _0807659C: ldrh r1, [r1, 0x2] _0807659E: @@ -5263,14 +5263,14 @@ sub_8076B2C: @ 8076B2C ldrh r0, [r1, 0x2] cmp r0, 0 bne _08076B94 - ldr r0, _08076B8C @ =gUnknown_2023BCE + ldr r0, _08076B8C @ =gBattlerPartyIndexes mov r1, r8 lsls r4, r1, 1 adds r4, r0 ldrh r0, [r4] movs r6, 0x64 muls r0, r6 - ldr r5, _08076B90 @ =gUnknown_2024284 + ldr r5, _08076B90 @ =gPlayerParty adds r0, r5 movs r1, 0xB bl GetMonData @@ -5285,8 +5285,8 @@ sub_8076B2C: @ 8076B2C b _08076B9C .align 2, 0 _08076B88: .4byte gUnknown_2024018 -_08076B8C: .4byte gUnknown_2023BCE -_08076B90: .4byte gUnknown_2024284 +_08076B8C: .4byte gBattlerPartyIndexes +_08076B90: .4byte gPlayerParty _08076B94: ldrh r7, [r1, 0x2] ldr r0, _08076BD4 @ =gUnknown_2024008 @@ -5359,14 +5359,14 @@ _08076C08: ldrh r0, [r1, 0x2] cmp r0, 0 bne _08076C54 - ldr r0, _08076C4C @ =gUnknown_2023BCE + ldr r0, _08076C4C @ =gBattlerPartyIndexes mov r1, r8 lsls r4, r1, 1 adds r4, r0 ldrh r0, [r4] movs r6, 0x64 muls r0, r6 - ldr r5, _08076C50 @ =gUnknown_202402C + ldr r5, _08076C50 @ =gEnemyParty adds r0, r5 movs r1, 0xB bl GetMonData @@ -5381,8 +5381,8 @@ _08076C08: b _08076C5C .align 2, 0 _08076C48: .4byte gUnknown_2024018 -_08076C4C: .4byte gUnknown_2023BCE -_08076C50: .4byte gUnknown_202402C +_08076C4C: .4byte gBattlerPartyIndexes +_08076C50: .4byte gEnemyParty _08076C54: ldrh r7, [r1, 0x2] ldr r0, _08076C94 @ =gUnknown_2024008 diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 143d2fb8a..e17cb5903 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -11132,7 +11132,7 @@ _080A77B6: lsrs r0, 24 strh r0, [r4, 0x1C] mov r9, r0 - ldr r0, _080A7818 @ =gUnknown_2022B4C + ldr r0, _080A7818 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -11155,7 +11155,7 @@ _080A77B6: .align 2, 0 _080A7810: .4byte gUnknown_2037F1A _080A7814: .4byte gUnknown_3005090 -_080A7818: .4byte gUnknown_2022B4C +_080A7818: .4byte gBattleTypeFlags _080A781C: .4byte gUnknown_2037F1B _080A7820: mov r5, sp @@ -17711,7 +17711,7 @@ _080AAADE: sub_80AAAE4: @ 80AAAE4 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080AAB28 @ =gUnknown_2022B4C + ldr r0, _080AAB28 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -17740,7 +17740,7 @@ sub_80AAAE4: @ 80AAAE4 bl StartSpriteAffineAnim b _080AAB50 .align 2, 0 -_080AAB28: .4byte gUnknown_2022B4C +_080AAB28: .4byte gBattleTypeFlags _080AAB2C: .4byte gUnknown_2037F1A _080AAB30: ldr r4, _080AAB70 @ =gUnknown_2037F1A @@ -20135,31 +20135,31 @@ sub_80ABDC8: @ 80ABDC8 lsls r0, 24 cmp r0, 0 bne _080ABDFC - ldr r1, _080ABDF0 @ =gUnknown_2023BCE + ldr r1, _080ABDF0 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080ABDF4 @ =gUnknown_2024284 + ldr r0, _080ABDF4 @ =gPlayerParty b _080ABE0C .align 2, 0 _080ABDEC: .4byte gUnknown_2037F1A -_080ABDF0: .4byte gUnknown_2023BCE -_080ABDF4: .4byte gUnknown_2024284 +_080ABDF0: .4byte gBattlerPartyIndexes +_080ABDF4: .4byte gPlayerParty _080ABDF8: adds r0, r2, 0 b _080ABE3E _080ABDFC: - ldr r1, _080ABE44 @ =gUnknown_2023BCE + ldr r1, _080ABE44 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080ABE48 @ =gUnknown_202402C + ldr r0, _080ABE48 @ =gEnemyParty _080ABE0C: adds r5, r1, r0 adds r0, r5, 0 @@ -20190,8 +20190,8 @@ _080ABE3E: pop {r1} bx r1 .align 2, 0 -_080ABE44: .4byte gUnknown_2023BCE -_080ABE48: .4byte gUnknown_202402C +_080ABE44: .4byte gBattlerPartyIndexes +_080ABE48: .4byte gEnemyParty thumb_func_end sub_80ABDC8 thumb_func_start sub_80ABE4C @@ -30866,7 +30866,7 @@ sub_80B107C: @ 80B107C ldrsh r0, [r0, r1] cmp r0, 0 bne _080B10D8 - ldr r4, _080B10CC @ =gUnknown_2023D6B + ldr r4, _080B10CC @ =sBattler_AI ldrb r0, [r4] movs r1, 0x2 bl sub_8074480 @@ -30895,7 +30895,7 @@ sub_80B107C: @ 80B107C b _080B10F4 .align 2, 0 _080B10C8: .4byte gUnknown_2037F02 -_080B10CC: .4byte gUnknown_2023D6B +_080B10CC: .4byte sBattler_AI _080B10D0: .4byte gUnknown_2037F1A _080B10D4: .4byte gUnknown_2037F1B _080B10D8: @@ -31170,7 +31170,7 @@ sub_80B12E8: @ 80B12E8 ldrsh r0, [r0, r1] cmp r0, 0 bne _080B132C - ldr r4, _080B1320 @ =gUnknown_2023D6B + ldr r4, _080B1320 @ =sBattler_AI ldrb r0, [r4] movs r1, 0x2 bl sub_8074480 @@ -31189,7 +31189,7 @@ sub_80B12E8: @ 80B12E8 b _080B1332 .align 2, 0 _080B131C: .4byte gUnknown_2037F02 -_080B1320: .4byte gUnknown_2023D6B +_080B1320: .4byte sBattler_AI _080B1324: .4byte gUnknown_2037F1B _080B1328: .4byte gUnknown_2037F1A _080B132C: @@ -43678,7 +43678,7 @@ sub_80B7448: @ 80B7448 ldr r0, _080B74A0 @ =gUnknown_2037F02 ldrh r0, [r0] strh r0, [r6, 0x3A] - ldr r4, _080B74A4 @ =gUnknown_2023D6B + ldr r4, _080B74A4 @ =sBattler_AI ldrb r0, [r4] movs r1, 0 bl sub_8076B2C @@ -43696,7 +43696,7 @@ sub_80B7448: @ 80B7448 .align 2, 0 _080B749C: .4byte gUnknown_2037F1A _080B74A0: .4byte gUnknown_2037F02 -_080B74A4: .4byte gUnknown_2023D6B +_080B74A4: .4byte sBattler_AI _080B74A8: lsrs r0, r1, 17 _080B74AA: @@ -46138,14 +46138,14 @@ _080B87CA: lsls r0, 24 cmp r0, 0 beq _080B8818 - ldr r1, _080B8810 @ =gUnknown_2023BCE + ldr r1, _080B8810 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080B8814 @ =gUnknown_202402C + ldr r1, _080B8814 @ =gEnemyParty b _080B8828 .align 2, 0 _080B87EC: .4byte gUnknown_2022984 @@ -46157,17 +46157,17 @@ _080B8800: .4byte 0x00000c08 _080B8804: .4byte gUnknown_2037F1A _080B8808: .4byte gSprites _080B880C: .4byte gUnknown_2023D44 -_080B8810: .4byte gUnknown_2023BCE -_080B8814: .4byte gUnknown_202402C +_080B8810: .4byte gBattlerPartyIndexes +_080B8814: .4byte gEnemyParty _080B8818: - ldr r1, _080B88B8 @ =gUnknown_2023BCE + ldr r1, _080B88B8 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080B88BC @ =gUnknown_2024284 + ldr r1, _080B88BC @ =gPlayerParty _080B8828: adds r0, r1 movs r1, 0xB @@ -46233,8 +46233,8 @@ _080B8828: bl sub_8075B48 b _080B88EC .align 2, 0 -_080B88B8: .4byte gUnknown_2023BCE -_080B88BC: .4byte gUnknown_2024284 +_080B88B8: .4byte gBattlerPartyIndexes +_080B88BC: .4byte gPlayerParty _080B88C0: .4byte gUnknown_2037F1A _080B88C4: .4byte gUnknown_8D1D388 _080B88C8: .4byte gUnknown_8D1D224 @@ -51093,14 +51093,14 @@ _080BADFE: lsls r0, 24 cmp r0, 0 beq _080BAE4C - ldr r1, _080BAE44 @ =gUnknown_2023BCE + ldr r1, _080BAE44 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080BAE48 @ =gUnknown_202402C + ldr r1, _080BAE48 @ =gEnemyParty b _080BAE5C .align 2, 0 _080BAE20: .4byte gUnknown_2022984 @@ -51112,17 +51112,17 @@ _080BAE34: .4byte 0x00000c08 _080BAE38: .4byte gUnknown_2037F1A _080BAE3C: .4byte gSprites _080BAE40: .4byte gUnknown_2023D44 -_080BAE44: .4byte gUnknown_2023BCE -_080BAE48: .4byte gUnknown_202402C +_080BAE44: .4byte gBattlerPartyIndexes +_080BAE48: .4byte gEnemyParty _080BAE4C: - ldr r1, _080BAF0C @ =gUnknown_2023BCE + ldr r1, _080BAF0C @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080BAF10 @ =gUnknown_2024284 + ldr r1, _080BAF10 @ =gPlayerParty _080BAE5C: adds r0, r1 movs r1, 0xB @@ -51204,8 +51204,8 @@ _080BAEAC: pop {r0} bx r0 .align 2, 0 -_080BAF0C: .4byte gUnknown_2023BCE -_080BAF10: .4byte gUnknown_2024284 +_080BAF0C: .4byte gBattlerPartyIndexes +_080BAF10: .4byte gPlayerParty _080BAF14: .4byte gUnknown_2037F1A _080BAF18: .4byte gUnknown_8D20858 _080BAF1C: .4byte gUnknown_8D2083C @@ -51561,7 +51561,7 @@ _080BB20A: lsls r0, 24 cmp r0, 0 beq _080BB25C - ldr r1, _080BB254 @ =gUnknown_2023BCE + ldr r1, _080BB254 @ =gBattlerPartyIndexes ldr r0, [r4] ldrb r0, [r0] lsls r0, 1 @@ -51569,7 +51569,7 @@ _080BB20A: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080BB258 @ =gUnknown_202402C + ldr r1, _080BB258 @ =gEnemyParty b _080BB26E .align 2, 0 _080BB230: .4byte gUnknown_2037F1B @@ -51581,10 +51581,10 @@ _080BB244: .4byte 0x00003f3d _080BB248: .4byte 0x00003f42 _080BB24C: .4byte gSprites _080BB250: .4byte gUnknown_2023D44 -_080BB254: .4byte gUnknown_2023BCE -_080BB258: .4byte gUnknown_202402C +_080BB254: .4byte gBattlerPartyIndexes +_080BB258: .4byte gEnemyParty _080BB25C: - ldr r1, _080BB290 @ =gUnknown_2023BCE + ldr r1, _080BB290 @ =gBattlerPartyIndexes ldr r0, [r4] ldrb r0, [r0] lsls r0, 1 @@ -51592,7 +51592,7 @@ _080BB25C: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080BB294 @ =gUnknown_2024284 + ldr r1, _080BB294 @ =gPlayerParty _080BB26E: adds r0, r1 movs r1, 0xB @@ -51610,8 +51610,8 @@ _080BB26E: pop {r0} bx r0 .align 2, 0 -_080BB290: .4byte gUnknown_2023BCE -_080BB294: .4byte gUnknown_2024284 +_080BB290: .4byte gBattlerPartyIndexes +_080BB294: .4byte gPlayerParty _080BB298: .4byte gUnknown_3005090 _080BB29C: .4byte sub_80BB2A0 thumb_func_end sub_80BB0D8 @@ -52693,13 +52693,13 @@ _080BBAFC: lsls r0, 24 cmp r0, 0 beq _080BBB3C - ldr r1, _080BBB34 @ =gUnknown_2023BCE + ldr r1, _080BBB34 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080BBB38 @ =gUnknown_202402C + ldr r1, _080BBB38 @ =gEnemyParty b _080BBB4A .align 2, 0 _080BBB20: .4byte gUnknown_2022984 @@ -52707,16 +52707,16 @@ _080BBB24: .4byte gUnknown_2022986 _080BBB28: .4byte 0x00003f3f _080BBB2C: .4byte 0x00003f3d _080BBB30: .4byte 0x00003f42 -_080BBB34: .4byte gUnknown_2023BCE -_080BBB38: .4byte gUnknown_202402C +_080BBB34: .4byte gBattlerPartyIndexes +_080BBB38: .4byte gEnemyParty _080BBB3C: - ldr r1, _080BBC10 @ =gUnknown_2023BCE + ldr r1, _080BBC10 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080BBC14 @ =gUnknown_2024284 + ldr r1, _080BBC14 @ =gPlayerParty _080BBB4A: adds r0, r1 movs r1, 0xB @@ -52811,8 +52811,8 @@ _080BBBA8: pop {r0} bx r0 .align 2, 0 -_080BBC10: .4byte gUnknown_2023BCE -_080BBC14: .4byte gUnknown_2024284 +_080BBC10: .4byte gBattlerPartyIndexes +_080BBC14: .4byte gPlayerParty _080BBC18: .4byte gUnknown_2023D44 _080BBC1C: .4byte gUnknown_2022978 _080BBC20: .4byte gUnknown_202297A @@ -53377,7 +53377,7 @@ sub_80BC060: @ 80BC060 lsls r0, 24 lsrs r0, 24 ldr r2, _080BC080 @ =gUnknown_2037F1A - ldr r1, _080BC084 @ =gUnknown_2023D6C + ldr r1, _080BC084 @ =gBattlerTarget ldrb r1, [r1] strb r1, [r2] ldr r2, _080BC088 @ =gUnknown_2037F1B @@ -53389,7 +53389,7 @@ sub_80BC060: @ 80BC060 bx r0 .align 2, 0 _080BC080: .4byte gUnknown_2037F1A -_080BC084: .4byte gUnknown_2023D6C +_080BC084: .4byte gBattlerTarget _080BC088: .4byte gUnknown_2037F1B _080BC08C: .4byte gUnknown_2023D6E thumb_func_end sub_80BC060 @@ -53437,7 +53437,7 @@ sub_80BC0DC: @ 80BC0DC lsls r0, 24 lsrs r0, 24 ldr r2, _080BC0F4 @ =gUnknown_2037F1B - ldr r1, _080BC0F8 @ =gUnknown_2023D6C + ldr r1, _080BC0F8 @ =gBattlerTarget ldrb r1, [r1] strb r1, [r2] bl DestroyAnimVisualTask @@ -53445,7 +53445,7 @@ sub_80BC0DC: @ 80BC0DC bx r0 .align 2, 0 _080BC0F4: .4byte gUnknown_2037F1B -_080BC0F8: .4byte gUnknown_2023D6C +_080BC0F8: .4byte gBattlerTarget thumb_func_end sub_80BC0DC thumb_func_start sub_80BC0FC @@ -53454,7 +53454,7 @@ sub_80BC0FC: @ 80BC0FC lsls r0, 24 lsrs r0, 24 ldr r2, _080BC11C @ =gUnknown_2037F1A - ldr r1, _080BC120 @ =gUnknown_2023D6B + ldr r1, _080BC120 @ =sBattler_AI ldrb r1, [r1] strb r1, [r2] ldr r2, _080BC124 @ =gUnknown_2037F1B @@ -53466,7 +53466,7 @@ sub_80BC0FC: @ 80BC0FC bx r0 .align 2, 0 _080BC11C: .4byte gUnknown_2037F1A -_080BC120: .4byte gUnknown_2023D6B +_080BC120: .4byte sBattler_AI _080BC124: .4byte gUnknown_2037F1B _080BC128: .4byte gUnknown_2023D6E thumb_func_end sub_80BC0FC @@ -53796,7 +53796,7 @@ sub_80BC3A0: @ 80BC3A0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BC3B8 @ =gUnknown_2022B4C + ldr r0, _080BC3B8 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x2 ands r0, r1 @@ -53805,7 +53805,7 @@ sub_80BC3A0: @ 80BC3A0 ldr r0, _080BC3BC @ =sub_80BCC4C b _080BC3E8 .align 2, 0 -_080BC3B8: .4byte gUnknown_2022B4C +_080BC3B8: .4byte gBattleTypeFlags _080BC3BC: .4byte sub_80BCC4C _080BC3C0: movs r0, 0x80 @@ -53938,7 +53938,7 @@ _080BC4C0: .4byte _080BC574 .4byte _080BC6B4 _080BC4D4: - ldr r0, _080BC4EC @ =gUnknown_2022B4C + ldr r0, _080BC4EC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -53951,7 +53951,7 @@ _080BC4D4: movs r1, 0x10 b _080BC4FA .align 2, 0 -_080BC4EC: .4byte gUnknown_2022B4C +_080BC4EC: .4byte gBattleTypeFlags _080BC4F0: lsls r0, r4, 2 adds r0, r4 @@ -54310,7 +54310,7 @@ _080BC7AC: adds r2, r0, r1 movs r3, 0x10 strh r3, [r2, 0x10] - ldr r0, _080BC7CC @ =gUnknown_2022B4C + ldr r0, _080BC7CC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -54320,7 +54320,7 @@ _080BC7AC: b _080BC7D4 .align 2, 0 _080BC7C8: .4byte gUnknown_3005090 -_080BC7CC: .4byte gUnknown_2022B4C +_080BC7CC: .4byte gBattleTypeFlags _080BC7D0: movs r0, 0x1 strh r0, [r2, 0xC] @@ -54629,7 +54629,7 @@ _080BCA28: lsls r0, 3 adds r2, r0, r1 strh r4, [r2, 0x10] - ldr r0, _080BCA6C @ =gUnknown_2022B4C + ldr r0, _080BCA6C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -54641,7 +54641,7 @@ _080BCA28: _080BCA60: .4byte 0x00001842 _080BCA64: .4byte 0x00000808 _080BCA68: .4byte gUnknown_3005090 -_080BCA6C: .4byte gUnknown_2022B4C +_080BCA6C: .4byte gBattleTypeFlags _080BCA70: movs r0, 0x1 _080BCA72: @@ -54999,7 +54999,7 @@ _080BCD34: adds r0, 0x1 strh r0, [r1, 0x8] ldr r4, _080BCDB4 @ =gSprites - ldr r5, _080BCDB8 @ =gUnknown_2023FE8 + ldr r5, _080BCDB8 @ =gBattleStruct ldr r0, [r5] adds r0, 0x7D ldrb r0, [r0] @@ -55058,7 +55058,7 @@ _080BCD34: b _080BCEE6 .align 2, 0 _080BCDB4: .4byte gSprites -_080BCDB8: .4byte gUnknown_2023FE8 +_080BCDB8: .4byte gBattleStruct _080BCDBC: .4byte sub_801182C _080BCDC0: .4byte 0x00003f06 _080BCDC4: diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s index 88f09c90b..a1f859d03 100644 --- a/asm/battle_anim_80DE2C0.s +++ b/asm/battle_anim_80DE2C0.s @@ -5834,7 +5834,7 @@ sub_80E0FB8: @ 80E0FB8 beq _080E107C movs r0, 0 str r0, [sp, 0x1C] - ldr r6, _080E1044 @ =gUnknown_2023BCE + ldr r6, _080E1044 @ =gBattlerPartyIndexes ldr r4, _080E1048 @ =gUnknown_2037F1B ldrb r0, [r4] lsls r0, 1 @@ -5842,7 +5842,7 @@ sub_80E0FB8: @ 80E0FB8 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r7, _080E104C @ =gUnknown_2024284 + ldr r7, _080E104C @ =gPlayerParty adds r0, r7 movs r1, 0 bl GetMonData @@ -5879,9 +5879,9 @@ sub_80E0FB8: @ 80E0FB8 b _080E1062 .align 2, 0 _080E1040: .4byte gUnknown_2037F1A -_080E1044: .4byte gUnknown_2023BCE +_080E1044: .4byte gBattlerPartyIndexes _080E1048: .4byte gUnknown_2037F1B -_080E104C: .4byte gUnknown_2024284 +_080E104C: .4byte gPlayerParty _080E1050: .4byte gUnknown_2024018 _080E1054: ldrb r0, [r4] @@ -5889,7 +5889,7 @@ _080E1054: adds r0, r6 ldrh r0, [r0] muls r0, r5 - ldr r1, _080E1070 @ =gUnknown_202402C + ldr r1, _080E1070 @ =gEnemyParty adds r0, r1 _080E1062: movs r1, 0xB @@ -5898,7 +5898,7 @@ _080E1062: lsrs r6, r0, 16 b _080E1076 .align 2, 0 -_080E1070: .4byte gUnknown_202402C +_080E1070: .4byte gEnemyParty _080E1074: ldrh r6, [r1, 0x2] _080E1076: @@ -5908,7 +5908,7 @@ _080E1076: _080E107C: movs r2, 0x1 str r2, [sp, 0x1C] - ldr r6, _080E10E0 @ =gUnknown_2023BCE + ldr r6, _080E10E0 @ =gBattlerPartyIndexes ldr r4, _080E10E4 @ =gUnknown_2037F1B ldrb r0, [r4] lsls r0, 1 @@ -5916,7 +5916,7 @@ _080E107C: ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r7, _080E10E8 @ =gUnknown_202402C + ldr r7, _080E10E8 @ =gEnemyParty adds r0, r7 movs r1, 0 bl GetMonData @@ -5949,15 +5949,15 @@ _080E107C: adds r0, r6 ldrh r0, [r0] muls r0, r5 - ldr r1, _080E10F0 @ =gUnknown_2024284 + ldr r1, _080E10F0 @ =gPlayerParty adds r0, r1 b _080E1100 .align 2, 0 -_080E10E0: .4byte gUnknown_2023BCE +_080E10E0: .4byte gBattlerPartyIndexes _080E10E4: .4byte gUnknown_2037F1B -_080E10E8: .4byte gUnknown_202402C +_080E10E8: .4byte gEnemyParty _080E10EC: .4byte gUnknown_2024018 -_080E10F0: .4byte gUnknown_2024284 +_080E10F0: .4byte gPlayerParty _080E10F4: ldrb r0, [r4] lsls r0, 1 @@ -11343,14 +11343,14 @@ _080E3A2C: lsls r0, 24 cmp r0, 0 bne _080E3ACC - ldr r7, _080E3A94 @ =gUnknown_2023BCE + ldr r7, _080E3A94 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r7 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080E3A98 @ =gUnknown_2024284 + ldr r5, _080E3A98 @ =gPlayerParty adds r0, r5 movs r1, 0 bl GetMonData @@ -11385,8 +11385,8 @@ _080E3A2C: b _080E3AA2 .align 2, 0 _080E3A90: .4byte gUnknown_2037F1A -_080E3A94: .4byte gUnknown_2023BCE -_080E3A98: .4byte gUnknown_2024284 +_080E3A94: .4byte gBattlerPartyIndexes +_080E3A98: .4byte gPlayerParty _080E3A9C: .4byte gUnknown_2024018 _080E3AA0: ldrh r5, [r1, 0x2] @@ -11412,14 +11412,14 @@ _080E3AA2: .align 2, 0 _080E3AC8: .4byte gSprites _080E3ACC: - ldr r7, _080E3B24 @ =gUnknown_2023BCE + ldr r7, _080E3B24 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r7 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080E3B28 @ =gUnknown_202402C + ldr r5, _080E3B28 @ =gEnemyParty adds r0, r5 movs r1, 0 bl GetMonData @@ -11453,8 +11453,8 @@ _080E3ACC: lsrs r5, r0, 16 b _080E3B32 .align 2, 0 -_080E3B24: .4byte gUnknown_2023BCE -_080E3B28: .4byte gUnknown_202402C +_080E3B24: .4byte gBattlerPartyIndexes +_080E3B28: .4byte gEnemyParty _080E3B2C: .4byte gUnknown_2024018 _080E3B30: ldrh r5, [r1, 0x2] diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index a96a11373..5dabfe561 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -910,29 +910,29 @@ sub_80EF344: @ 80EF344 lsls r0, 24 cmp r0, 0 bne _080EF38C - ldr r1, _080EF384 @ =gUnknown_2023BCE + ldr r1, _080EF384 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080EF388 @ =gUnknown_2024284 + ldr r1, _080EF388 @ =gPlayerParty b _080EF39C .align 2, 0 _080EF37C: .4byte gUnknown_2023D44 _080EF380: .4byte gUnknown_2037F1A -_080EF384: .4byte gUnknown_2023BCE -_080EF388: .4byte gUnknown_2024284 +_080EF384: .4byte gBattlerPartyIndexes +_080EF388: .4byte gPlayerParty _080EF38C: - ldr r1, _080EF3CC @ =gUnknown_2023BCE + ldr r1, _080EF3CC @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080EF3D0 @ =gUnknown_202402C + ldr r1, _080EF3D0 @ =gEnemyParty _080EF39C: adds r0, r1 movs r1, 0x26 @@ -956,8 +956,8 @@ _080EF39C: beq _080EF458 b _080EF482 .align 2, 0 -_080EF3CC: .4byte gUnknown_2023BCE -_080EF3D0: .4byte gUnknown_202402C +_080EF3CC: .4byte gBattlerPartyIndexes +_080EF3D0: .4byte gEnemyParty _080EF3D4: .4byte gUnknown_3005090 _080EF3D8: ldr r5, _080EF450 @ =gUnknown_2037F1A @@ -1347,7 +1347,7 @@ sub_80EF6D4: @ 80EF6D4 push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080EF6F4 @ =gUnknown_2022B4C + ldr r0, _080EF6F4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 2 @@ -1358,7 +1358,7 @@ sub_80EF6D4: @ 80EF6D4 movs r6, 0xB b _080EF708 .align 2, 0 -_080EF6F4: .4byte gUnknown_2022B4C +_080EF6F4: .4byte gBattleTypeFlags _080EF6F8: movs r5, 0x17 movs r6, 0xB diff --git a/asm/battle_anim_sound_tasks.s b/asm/battle_anim_sound_tasks.s index 66750777a..9b85eb2d9 100644 --- a/asm/battle_anim_sound_tasks.s +++ b/asm/battle_anim_sound_tasks.s @@ -379,25 +379,25 @@ _080DD0E8: lsls r0, 24 cmp r0, 0 beq _080DD10C - ldr r1, _080DD104 @ =gUnknown_2023BCE + ldr r1, _080DD104 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080DD108 @ =gUnknown_202402C + ldr r1, _080DD108 @ =gEnemyParty b _080DD11A .align 2, 0 -_080DD104: .4byte gUnknown_2023BCE -_080DD108: .4byte gUnknown_202402C +_080DD104: .4byte gBattlerPartyIndexes +_080DD108: .4byte gEnemyParty _080DD10C: - ldr r1, _080DD140 @ =gUnknown_2023BCE + ldr r1, _080DD140 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080DD144 @ =gUnknown_2024284 + ldr r1, _080DD144 @ =gPlayerParty _080DD11A: adds r0, r1 movs r1, 0xB @@ -418,8 +418,8 @@ _080DD13A: pop {r0} bx r0 .align 2, 0 -_080DD140: .4byte gUnknown_2023BCE -_080DD144: .4byte gUnknown_2024284 +_080DD140: .4byte gBattlerPartyIndexes +_080DD144: .4byte gPlayerParty thumb_func_end sub_80DD06C thumb_func_start sub_80DD148 @@ -491,25 +491,25 @@ _080DD1C4: lsls r0, 24 cmp r0, 0 beq _080DD1E8 - ldr r1, _080DD1E0 @ =gUnknown_2023BCE + ldr r1, _080DD1E0 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080DD1E4 @ =gUnknown_202402C + ldr r1, _080DD1E4 @ =gEnemyParty b _080DD1F6 .align 2, 0 -_080DD1E0: .4byte gUnknown_2023BCE -_080DD1E4: .4byte gUnknown_202402C +_080DD1E0: .4byte gBattlerPartyIndexes +_080DD1E4: .4byte gEnemyParty _080DD1E8: - ldr r1, _080DD234 @ =gUnknown_2023BCE + ldr r1, _080DD234 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080DD238 @ =gUnknown_2024284 + ldr r1, _080DD238 @ =gPlayerParty _080DD1F6: adds r0, r1 movs r1, 0xB @@ -540,8 +540,8 @@ _080DD1F6: bl PlayCry3 b _080DD24C .align 2, 0 -_080DD234: .4byte gUnknown_2023BCE -_080DD238: .4byte gUnknown_2024284 +_080DD234: .4byte gBattlerPartyIndexes +_080DD238: .4byte gPlayerParty _080DD23C: .4byte gUnknown_3005090 _080DD240: .4byte gUnknown_2037F02 _080DD244: diff --git a/asm/battle_controller_link_opponent.s b/asm/battle_controller_link_opponent.s index 36393e771..7284f88fd 100644 --- a/asm/battle_controller_link_opponent.s +++ b/asm/battle_controller_link_opponent.s @@ -13,7 +13,7 @@ nullsub_19: @ 803A664 thumb_func_start sub_803A668 sub_803A668: @ 803A668 ldr r1, _0803A678 @ =gUnknown_3004FE0 - ldr r0, _0803A67C @ =gUnknown_2023BC4 + ldr r0, _0803A67C @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -22,7 +22,7 @@ sub_803A668: @ 803A668 bx lr .align 2, 0 _0803A678: .4byte gUnknown_3004FE0 -_0803A67C: .4byte gUnknown_2023BC4 +_0803A67C: .4byte gActiveBattler _0803A680: .4byte sub_803A684 thumb_func_end sub_803A668 @@ -30,8 +30,8 @@ _0803A680: .4byte sub_803A684 sub_803A684: @ 803A684 push {lr} ldr r2, _0803A6B8 @ =gUnknown_2023BC8 - ldr r1, _0803A6BC @ =gUnknown_825E45C - ldr r0, _0803A6C0 @ =gUnknown_2023BC4 + ldr r1, _0803A6BC @ =gBitTable + ldr r0, _0803A6C0 @ =gActiveBattler ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -55,8 +55,8 @@ sub_803A684: @ 803A684 b _0803A6D0 .align 2, 0 _0803A6B8: .4byte gUnknown_2023BC8 -_0803A6BC: .4byte gUnknown_825E45C -_0803A6C0: .4byte gUnknown_2023BC4 +_0803A6BC: .4byte gBitTable +_0803A6C0: .4byte gActiveBattler _0803A6C4: .4byte gUnknown_2022BC4 _0803A6C8: .4byte gUnknown_8250B20 _0803A6CC: @@ -71,7 +71,7 @@ sub_803A6D4: @ 803A6D4 push {lr} ldr r2, _0803A6FC @ =gSprites ldr r1, _0803A700 @ =gUnknown_2023D44 - ldr r0, _0803A704 @ =gUnknown_2023BC4 + ldr r0, _0803A704 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -91,7 +91,7 @@ _0803A6F8: .align 2, 0 _0803A6FC: .4byte gSprites _0803A700: .4byte gUnknown_2023D44 -_0803A704: .4byte gUnknown_2023BC4 +_0803A704: .4byte gActiveBattler _0803A708: .4byte SpriteCallbackDummy thumb_func_end sub_803A6D4 @@ -100,7 +100,7 @@ sub_803A70C: @ 803A70C push {r4-r6,lr} ldr r4, _0803A784 @ =gSprites ldr r6, _0803A788 @ =gUnknown_2023D44 - ldr r5, _0803A78C @ =gUnknown_2023BC4 + ldr r5, _0803A78C @ =gActiveBattler ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -156,7 +156,7 @@ _0803A77C: .align 2, 0 _0803A784: .4byte gSprites _0803A788: .4byte gUnknown_2023D44 -_0803A78C: .4byte gUnknown_2023BC4 +_0803A78C: .4byte gActiveBattler _0803A790: .4byte SpriteCallbackDummy _0803A794: .4byte 0x000003ff _0803A798: .4byte 0xfffffc00 @@ -167,7 +167,7 @@ sub_803A79C: @ 803A79C push {r4,lr} ldr r4, _0803A7DC @ =gUnknown_2024018 ldr r1, [r4] - ldr r3, _0803A7E0 @ =gUnknown_2023BC4 + ldr r3, _0803A7E0 @ =gActiveBattler ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -197,7 +197,7 @@ _0803A7D4: bx r0 .align 2, 0 _0803A7DC: .4byte gUnknown_2024018 -_0803A7E0: .4byte gUnknown_2023BC4 +_0803A7E0: .4byte gActiveBattler thumb_func_end sub_803A79C thumb_func_start sub_803A7E4 @@ -214,7 +214,7 @@ sub_803A7E4: @ 803A7E4 lsls r0, 24 cmp r0, 0 beq _0803A840 - ldr r0, _0803A82C @ =gUnknown_2022B4C + ldr r0, _0803A82C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -223,7 +223,7 @@ sub_803A7E4: @ 803A7E4 _0803A80C: ldr r2, _0803A830 @ =gSprites ldr r1, _0803A834 @ =gUnknown_3004FF0 - ldr r0, _0803A838 @ =gUnknown_2023BC4 + ldr r0, _0803A838 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -238,15 +238,15 @@ _0803A80C: bne _0803A876 b _0803A874 .align 2, 0 -_0803A82C: .4byte gUnknown_2022B4C +_0803A82C: .4byte gBattleTypeFlags _0803A830: .4byte gSprites _0803A834: .4byte gUnknown_3004FF0 -_0803A838: .4byte gUnknown_2023BC4 +_0803A838: .4byte gActiveBattler _0803A83C: .4byte SpriteCallbackDummy _0803A840: ldr r2, _0803A95C @ =gSprites ldr r5, _0803A960 @ =gUnknown_3004FF0 - ldr r0, _0803A964 @ =gUnknown_2023BC4 + ldr r0, _0803A964 @ =gActiveBattler ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -283,7 +283,7 @@ _0803A882: bne _0803A888 b _0803A9AA _0803A888: - ldr r0, _0803A964 @ =gUnknown_2023BC4 + ldr r0, _0803A964 @ =gActiveBattler mov r8, r0 ldrb r0, [r0] bl GetBankIdentity @@ -368,7 +368,7 @@ _0803A888: adds r0, r4, 0 bl FreeSpritePaletteByTag _0803A936: - ldr r0, _0803A974 @ =gUnknown_2022B4C + ldr r0, _0803A974 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -387,11 +387,11 @@ _0803A936: .align 2, 0 _0803A95C: .4byte gSprites _0803A960: .4byte gUnknown_3004FF0 -_0803A964: .4byte gUnknown_2023BC4 +_0803A964: .4byte gActiveBattler _0803A968: .4byte SpriteCallbackDummy _0803A96C: .4byte gUnknown_2024018 _0803A970: .4byte 0x000027f9 -_0803A974: .4byte gUnknown_2022B4C +_0803A974: .4byte gBattleTypeFlags _0803A978: .4byte gMPlay_BGM _0803A97C: ldr r0, _0803A9B4 @ =gMPlay_BGM @@ -402,7 +402,7 @@ _0803A97C: _0803A988: ldr r0, _0803A9BC @ =gUnknown_2024018 ldr r0, [r0] - ldr r3, _0803A9C0 @ =gUnknown_2023BC4 + ldr r3, _0803A9C0 @ =gActiveBattler ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -427,7 +427,7 @@ _0803A9AA: _0803A9B4: .4byte gMPlay_BGM _0803A9B8: .4byte 0x0000ffff _0803A9BC: .4byte gUnknown_2024018 -_0803A9C0: .4byte gUnknown_2023BC4 +_0803A9C0: .4byte gActiveBattler _0803A9C4: .4byte gUnknown_3004FE0 _0803A9C8: .4byte sub_803A79C thumb_func_end sub_803A7E4 @@ -442,7 +442,7 @@ sub_803A9CC: @ 803A9CC ldr r0, _0803ABEC @ =gUnknown_2024018 mov r8, r0 ldr r0, [r0] - ldr r7, _0803ABF0 @ =gUnknown_2023BC4 + ldr r7, _0803ABF0 @ =gActiveBattler ldrb r2, [r7] ldr r3, [r0, 0x4] lsls r5, r2, 1 @@ -481,12 +481,12 @@ _0803AA1C: ands r0, r4 cmp r0, 0 bne _0803AA3A - ldr r0, _0803ABF4 @ =gUnknown_2023BCE + ldr r0, _0803ABF4 @ =gBattlerPartyIndexes adds r0, r5, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0803ABF8 @ =gUnknown_202402C + ldr r0, _0803ABF8 @ =gEnemyParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -506,17 +506,17 @@ _0803AA3A: ands r0, r1 cmp r0, 0 bne _0803AA6C - ldr r0, _0803ABF4 @ =gUnknown_2023BCE + ldr r0, _0803ABF4 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0803ABF8 @ =gUnknown_202402C + ldr r0, _0803ABF8 @ =gEnemyParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 _0803AA6C: - ldr r0, _0803ABFC @ =gUnknown_2022B4C + ldr r0, _0803ABFC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -560,14 +560,14 @@ _0803AABA: lsls r0, 24 cmp r0, 0 beq _0803AB50 - ldr r0, _0803ABFC @ =gUnknown_2022B4C + ldr r0, _0803ABFC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _0803AB50 ldr r1, _0803AC00 @ =gUnknown_3004FFC - ldr r5, _0803ABF0 @ =gUnknown_2023BC4 + ldr r5, _0803ABF0 @ =gActiveBattler ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -586,7 +586,7 @@ _0803AABA: eors r1, r0 adds r0, r1, r2 ldrb r0, [r0] - ldr r2, _0803ABF4 @ =gUnknown_2023BCE + ldr r2, _0803ABF4 @ =gBattlerPartyIndexes mov r10, r2 lsls r1, 1 add r1, r10 @@ -596,7 +596,7 @@ _0803AABA: mov r2, r9 muls r2, r1 adds r1, r2, 0 - ldr r6, _0803ABF8 @ =gUnknown_202402C + ldr r6, _0803ABF8 @ =gEnemyParty adds r1, r6 movs r2, 0 bl UpdateHealthboxAttribute @@ -626,7 +626,7 @@ _0803AABA: bl SetBankEnemyShadowSpriteCallback _0803AB50: ldr r1, _0803AC00 @ =gUnknown_3004FFC - ldr r5, _0803ABF0 @ =gUnknown_2023BC4 + ldr r5, _0803ABF0 @ =gActiveBattler ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -640,7 +640,7 @@ _0803AB50: ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0803ABF4 @ =gUnknown_2023BCE + ldr r2, _0803ABF4 @ =gBattlerPartyIndexes mov r9, r2 lsls r1, 1 add r1, r9 @@ -650,7 +650,7 @@ _0803AB50: mov r2, r8 muls r2, r1 adds r1, r2, 0 - ldr r6, _0803ABF8 @ =gUnknown_202402C + ldr r6, _0803ABF8 @ =gEnemyParty adds r1, r6 movs r2, 0 bl UpdateHealthboxAttribute @@ -699,10 +699,10 @@ _0803ABDC: bx r0 .align 2, 0 _0803ABEC: .4byte gUnknown_2024018 -_0803ABF0: .4byte gUnknown_2023BC4 -_0803ABF4: .4byte gUnknown_2023BCE -_0803ABF8: .4byte gUnknown_202402C -_0803ABFC: .4byte gUnknown_2022B4C +_0803ABF0: .4byte gActiveBattler +_0803ABF4: .4byte gBattlerPartyIndexes +_0803ABF8: .4byte gEnemyParty +_0803ABFC: .4byte gBattleTypeFlags _0803AC00: .4byte gUnknown_3004FFC _0803AC04: .4byte gSprites _0803AC08: .4byte gUnknown_3004FF0 @@ -715,7 +715,7 @@ sub_803AC14: @ 803AC14 push {r4-r7,lr} ldr r2, _0803AC70 @ =gSprites ldr r0, _0803AC74 @ =gUnknown_2023D44 - ldr r7, _0803AC78 @ =gUnknown_2023BC4 + ldr r7, _0803AC78 @ =gActiveBattler ldrb r3, [r7] adds r0, r3, r0 ldrb r1, [r0] @@ -746,12 +746,12 @@ sub_803AC14: @ 803AC14 ands r0, r5 cmp r0, 0 bne _0803AC88 - ldr r0, _0803AC80 @ =gUnknown_2023BCE + ldr r0, _0803AC80 @ =gBattlerPartyIndexes adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0803AC84 @ =gUnknown_202402C + ldr r0, _0803AC84 @ =gEnemyParty adds r1, r0 adds r0, r3, 0 bl sub_80F1720 @@ -759,10 +759,10 @@ sub_803AC14: @ 803AC14 .align 2, 0 _0803AC70: .4byte gSprites _0803AC74: .4byte gUnknown_2023D44 -_0803AC78: .4byte gUnknown_2023BC4 +_0803AC78: .4byte gActiveBattler _0803AC7C: .4byte gUnknown_2024018 -_0803AC80: .4byte gUnknown_2023BCE -_0803AC84: .4byte gUnknown_202402C +_0803AC80: .4byte gBattlerPartyIndexes +_0803AC84: .4byte gEnemyParty _0803AC88: ldrb r0, [r1, 0x1] ands r2, r0 @@ -800,7 +800,7 @@ _0803ACC8: .4byte 0x000027f9 thumb_func_start CompleteOnHealthbarDone_4 CompleteOnHealthbarDone_4: @ 803ACCC push {r4-r6,lr} - ldr r6, _0803AD0C @ =gUnknown_2023BC4 + ldr r6, _0803AD0C @ =gActiveBattler ldrb r0, [r6] ldr r5, _0803AD10 @ =gUnknown_3004FF0 adds r1, r0, r5 @@ -828,7 +828,7 @@ CompleteOnHealthbarDone_4: @ 803ACCC bl sub_8048440 b _0803AD18 .align 2, 0 -_0803AD0C: .4byte gUnknown_2023BC4 +_0803AD0C: .4byte gActiveBattler _0803AD10: .4byte gUnknown_3004FF0 _0803AD14: bl RecordedOpponentBufferExecCompleted @@ -843,7 +843,7 @@ sub_803AD20: @ 803AD20 push {lr} ldr r2, _0803AD54 @ =gSprites ldr r0, _0803AD58 @ =gUnknown_2023D44 - ldr r1, _0803AD5C @ =gUnknown_2023BC4 + ldr r1, _0803AD5C @ =gActiveBattler ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -867,7 +867,7 @@ _0803AD4E: .align 2, 0 _0803AD54: .4byte gSprites _0803AD58: .4byte gUnknown_2023D44 -_0803AD5C: .4byte gUnknown_2023BC4 +_0803AD5C: .4byte gActiveBattler _0803AD60: .4byte gUnknown_3004FF0 thumb_func_end sub_803AD20 @@ -876,7 +876,7 @@ sub_803AD64: @ 803AD64 push {r4-r6,lr} ldr r0, _0803ADC4 @ =gUnknown_2024018 ldr r0, [r0] - ldr r6, _0803ADC8 @ =gUnknown_2023BC4 + ldr r6, _0803ADC8 @ =gActiveBattler ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -919,7 +919,7 @@ _0803ADBE: bx r0 .align 2, 0 _0803ADC4: .4byte gUnknown_2024018 -_0803ADC8: .4byte gUnknown_2023BC4 +_0803ADC8: .4byte gActiveBattler _0803ADCC: .4byte gUnknown_2023D44 _0803ADD0: .4byte gSprites _0803ADD4: .4byte gUnknown_3004FF0 @@ -943,7 +943,7 @@ _0803ADEA: DoHitAnimBlinkSpriteEffect_4: @ 803ADF0 push {r4,lr} ldr r1, _0803AE2C @ =gUnknown_2023D44 - ldr r0, _0803AE30 @ =gUnknown_2023BC4 + ldr r0, _0803AE30 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -971,7 +971,7 @@ DoHitAnimBlinkSpriteEffect_4: @ 803ADF0 b _0803AE66 .align 2, 0 _0803AE2C: .4byte gUnknown_2023D44 -_0803AE30: .4byte gUnknown_2023BC4 +_0803AE30: .4byte gActiveBattler _0803AE34: .4byte gSprites _0803AE38: .4byte gUnknown_2024005 _0803AE3C: @@ -1008,7 +1008,7 @@ sub_803AE6C: @ 803AE6C push {r4,lr} ldr r2, _0803AEC0 @ =gSprites ldr r0, _0803AEC4 @ =gUnknown_3004FF0 - ldr r4, _0803AEC8 @ =gUnknown_2023BC4 + ldr r4, _0803AEC8 @ =gActiveBattler ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -1050,7 +1050,7 @@ _0803AEB8: .align 2, 0 _0803AEC0: .4byte gSprites _0803AEC4: .4byte gUnknown_3004FF0 -_0803AEC8: .4byte gUnknown_2023BC4 +_0803AEC8: .4byte gActiveBattler _0803AECC: .4byte SpriteCallbackDummy _0803AED0: .4byte gUnknown_2024018 _0803AED4: .4byte gUnknown_3004FE0 @@ -1062,7 +1062,7 @@ sub_803AEDC: @ 803AEDC push {lr} ldr r0, _0803AF18 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _0803AF1C @ =gUnknown_2023BC4 + ldr r0, _0803AF1C @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1089,7 +1089,7 @@ _0803AF14: bx r0 .align 2, 0 _0803AF18: .4byte gUnknown_2024018 -_0803AF1C: .4byte gUnknown_2023BC4 +_0803AF1C: .4byte gActiveBattler _0803AF20: .4byte gMPlay_BGM _0803AF24: .4byte 0x0000ffff thumb_func_end sub_803AEDC @@ -1099,7 +1099,7 @@ sub_803AF28: @ 803AF28 push {r4,r5,lr} ldr r3, _0803AFD4 @ =gUnknown_2024018 ldr r0, [r3] - ldr r5, _0803AFD8 @ =gUnknown_2023BC4 + ldr r5, _0803AFD8 @ =gActiveBattler ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -1147,13 +1147,13 @@ sub_803AF28: @ 803AF28 ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0803AFEC @ =gUnknown_2023BCE + ldr r2, _0803AFEC @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0803AFF0 @ =gUnknown_202402C + ldr r2, _0803AFF0 @ =gEnemyParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -1177,13 +1177,13 @@ _0803AFCC: bx r0 .align 2, 0 _0803AFD4: .4byte gUnknown_2024018 -_0803AFD8: .4byte gUnknown_2023BC4 +_0803AFD8: .4byte gActiveBattler _0803AFDC: .4byte 0x000027f9 _0803AFE0: .4byte gUnknown_2023D44 _0803AFE4: .4byte gSprites _0803AFE8: .4byte gUnknown_3004FF0 -_0803AFEC: .4byte gUnknown_2023BCE -_0803AFF0: .4byte gUnknown_202402C +_0803AFEC: .4byte gBattlerPartyIndexes +_0803AFF0: .4byte gEnemyParty _0803AFF4: .4byte gUnknown_3004FE0 _0803AFF8: .4byte sub_803AE6C thumb_func_end sub_803AF28 @@ -1193,7 +1193,7 @@ sub_803AFFC: @ 803AFFC push {r4-r6,lr} ldr r6, _0803B0A0 @ =gUnknown_2024018 ldr r0, [r6] - ldr r5, _0803B0A4 @ =gUnknown_2023BC4 + ldr r5, _0803B0A4 @ =gActiveBattler ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -1205,12 +1205,12 @@ sub_803AFFC: @ 803AFFC ands r0, r1 cmp r0, 0 bne _0803B02E - ldr r0, _0803B0A8 @ =gUnknown_2023BCE + ldr r0, _0803B0A8 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0803B0AC @ =gUnknown_202402C + ldr r0, _0803B0AC @ =gEnemyParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -1244,13 +1244,13 @@ _0803B02E: adds r0, r3, r4 bl DestroySprite ldrb r4, [r5] - ldr r1, _0803B0A8 @ =gUnknown_2023BCE + ldr r1, _0803B0A8 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0803B0AC @ =gUnknown_202402C + ldr r1, _0803B0AC @ =gEnemyParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -1271,9 +1271,9 @@ _0803B098: bx r0 .align 2, 0 _0803B0A0: .4byte gUnknown_2024018 -_0803B0A4: .4byte gUnknown_2023BC4 -_0803B0A8: .4byte gUnknown_2023BCE -_0803B0AC: .4byte gUnknown_202402C +_0803B0A4: .4byte gActiveBattler +_0803B0A8: .4byte gBattlerPartyIndexes +_0803B0AC: .4byte gEnemyParty _0803B0B0: .4byte gSprites _0803B0B4: .4byte gUnknown_3004FFC _0803B0B8: .4byte SpriteCallbackDummy @@ -1286,7 +1286,7 @@ CompleteOnFinishedStatusAnimation_5: @ 803B0C4 push {lr} ldr r0, _0803B0EC @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _0803B0F0 @ =gUnknown_2023BC4 + ldr r0, _0803B0F0 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1304,7 +1304,7 @@ _0803B0E6: bx r0 .align 2, 0 _0803B0EC: .4byte gUnknown_2024018 -_0803B0F0: .4byte gUnknown_2023BC4 +_0803B0F0: .4byte gActiveBattler thumb_func_end CompleteOnFinishedStatusAnimation_5 thumb_func_start CompleteOnFinishedBattleAnimation_5 @@ -1312,7 +1312,7 @@ CompleteOnFinishedBattleAnimation_5: @ 803B0F4 push {lr} ldr r0, _0803B11C @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _0803B120 @ =gUnknown_2023BC4 + ldr r0, _0803B120 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1330,7 +1330,7 @@ _0803B116: bx r0 .align 2, 0 _0803B11C: .4byte gUnknown_2024018 -_0803B120: .4byte gUnknown_2023BC4 +_0803B120: .4byte gActiveBattler thumb_func_end CompleteOnFinishedBattleAnimation_5 thumb_func_start RecordedOpponentBufferExecCompleted @@ -1338,13 +1338,13 @@ RecordedOpponentBufferExecCompleted: @ 803B124 push {r4,lr} sub sp, 0x4 ldr r1, _0803B164 @ =gUnknown_3004FE0 - ldr r4, _0803B168 @ =gUnknown_2023BC4 + ldr r4, _0803B168 @ =gActiveBattler ldrb r0, [r4] lsls r0, 2 adds r0, r1 ldr r1, _0803B16C @ =sub_803A684 str r1, [r0] - ldr r0, _0803B170 @ =gUnknown_2022B4C + ldr r0, _0803B170 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -1366,13 +1366,13 @@ RecordedOpponentBufferExecCompleted: @ 803B124 b _0803B18A .align 2, 0 _0803B164: .4byte gUnknown_3004FE0 -_0803B168: .4byte gUnknown_2023BC4 +_0803B168: .4byte gActiveBattler _0803B16C: .4byte sub_803A684 -_0803B170: .4byte gUnknown_2022B4C +_0803B170: .4byte gBattleTypeFlags _0803B174: .4byte gUnknown_2022BC4 _0803B178: ldr r2, _0803B194 @ =gUnknown_2023BC8 - ldr r1, _0803B198 @ =gUnknown_825E45C + ldr r1, _0803B198 @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -1387,7 +1387,7 @@ _0803B18A: bx r0 .align 2, 0 _0803B194: .4byte gUnknown_2023BC8 -_0803B198: .4byte gUnknown_825E45C +_0803B198: .4byte gBitTable thumb_func_end RecordedOpponentBufferExecCompleted thumb_func_start RecordedOpponentHandleGetMonData @@ -1396,7 +1396,7 @@ RecordedOpponentHandleGetMonData: @ 803B19C sub sp, 0x100 movs r6, 0 ldr r1, _0803B1C8 @ =gUnknown_2022BC4 - ldr r0, _0803B1CC @ =gUnknown_2023BC4 + ldr r0, _0803B1CC @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -1404,7 +1404,7 @@ RecordedOpponentHandleGetMonData: @ 803B19C ldrb r0, [r1] cmp r0, 0 bne _0803B1D4 - ldr r0, _0803B1D0 @ =gUnknown_2023BCE + ldr r0, _0803B1D0 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -1414,8 +1414,8 @@ RecordedOpponentHandleGetMonData: @ 803B19C b _0803B1F6 .align 2, 0 _0803B1C8: .4byte gUnknown_2022BC4 -_0803B1CC: .4byte gUnknown_2023BC4 -_0803B1D0: .4byte gUnknown_2023BCE +_0803B1CC: .4byte gActiveBattler +_0803B1D0: .4byte gBattlerPartyIndexes _0803B1D4: ldrb r4, [r1] movs r5, 0 @@ -1461,7 +1461,7 @@ CopyRecordedOpponentMonData: @ 803B210 lsrs r5, r0, 24 movs r6, 0 ldr r2, _0803B244 @ =gUnknown_2022BC4 - ldr r3, _0803B248 @ =gUnknown_2023BC4 + ldr r3, _0803B248 @ =gActiveBattler ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -1478,7 +1478,7 @@ _0803B23A: mov pc, r0 .align 2, 0 _0803B244: .4byte gUnknown_2022BC4 -_0803B248: .4byte gUnknown_2023BC4 +_0803B248: .4byte gActiveBattler _0803B24C: .4byte _0803B250 .align 2, 0 _0803B250: @@ -1546,7 +1546,7 @@ _0803B340: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0803B554 @ =gUnknown_202402C + ldr r0, _0803B554 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -1599,7 +1599,7 @@ _0803B38C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0803B554 @ =gUnknown_202402C + ldr r0, _0803B554 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -1783,28 +1783,28 @@ _0803B544: bls _0803B544 b _0803B9A6 .align 2, 0 -_0803B554: .4byte gUnknown_202402C +_0803B554: .4byte gEnemyParty _0803B558: .4byte 0xfffffc1f _0803B55C: .4byte 0xfff07fff _0803B560: .4byte 0xfffffe0f _0803B564: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B570 @ =gUnknown_202402C + ldr r1, _0803B570 @ =gEnemyParty adds r0, r1 movs r1, 0xB b _0803B8DE .align 2, 0 -_0803B570: .4byte gUnknown_202402C +_0803B570: .4byte gEnemyParty _0803B574: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B580 @ =gUnknown_202402C + ldr r1, _0803B580 @ =gEnemyParty adds r0, r1 movs r1, 0xC b _0803B8DE .align 2, 0 -_0803B580: .4byte gUnknown_202402C +_0803B580: .4byte gEnemyParty _0803B584: movs r6, 0 add r2, sp, 0x58 @@ -1814,7 +1814,7 @@ _0803B584: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0803B5E8 @ =gUnknown_202402C + ldr r0, _0803B5E8 @ =gEnemyParty adds r4, r1, r0 mov r8, r9 _0803B59A: @@ -1838,7 +1838,7 @@ _0803B59A: ble _0803B59A movs r0, 0x64 muls r0, r5 - ldr r1, _0803B5E8 @ =gUnknown_202402C + ldr r1, _0803B5E8 @ =gEnemyParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -1856,11 +1856,11 @@ _0803B5D8: bls _0803B5D8 b _0803B9A6 .align 2, 0 -_0803B5E8: .4byte gUnknown_202402C +_0803B5E8: .4byte gEnemyParty _0803B5EC: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B604 @ =gUnknown_202402C + ldr r1, _0803B604 @ =gEnemyParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -1870,13 +1870,13 @@ _0803B5EC: adds r1, 0x9 b _0803B8DE .align 2, 0 -_0803B604: .4byte gUnknown_202402C +_0803B604: .4byte gEnemyParty _0803B608: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _0803B640 @ =gUnknown_202402C + ldr r2, _0803B640 @ =gEnemyParty mov r8, r2 _0803B614: adds r1, r6, 0 @@ -1891,7 +1891,7 @@ _0803B614: ble _0803B614 movs r0, 0x64 muls r0, r5 - ldr r1, _0803B640 @ =gUnknown_202402C + ldr r1, _0803B640 @ =gEnemyParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -1900,11 +1900,11 @@ _0803B614: adds r6, 0x1 b _0803B9A6 .align 2, 0 -_0803B640: .4byte gUnknown_202402C +_0803B640: .4byte gEnemyParty _0803B644: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B65C @ =gUnknown_202402C + ldr r1, _0803B65C @ =gEnemyParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -1914,20 +1914,20 @@ _0803B644: adds r1, 0x8 b _0803B99E .align 2, 0 -_0803B65C: .4byte gUnknown_202402C +_0803B65C: .4byte gEnemyParty _0803B660: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B66C @ =gUnknown_202402C + ldr r1, _0803B66C @ =gEnemyParty adds r0, r1 movs r1, 0x1 b _0803B67A .align 2, 0 -_0803B66C: .4byte gUnknown_202402C +_0803B66C: .4byte gEnemyParty _0803B670: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B69C @ =gUnknown_202402C + ldr r1, _0803B69C @ =gEnemyParty adds r0, r1 movs r1, 0x19 _0803B67A: @@ -1947,120 +1947,120 @@ _0803B67A: movs r6, 0x3 b _0803B9A6 .align 2, 0 -_0803B69C: .4byte gUnknown_202402C +_0803B69C: .4byte gEnemyParty _0803B6A0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B6AC @ =gUnknown_202402C + ldr r1, _0803B6AC @ =gEnemyParty adds r0, r1 movs r1, 0x1A b _0803B99E .align 2, 0 -_0803B6AC: .4byte gUnknown_202402C +_0803B6AC: .4byte gEnemyParty _0803B6B0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B6BC @ =gUnknown_202402C + ldr r1, _0803B6BC @ =gEnemyParty adds r0, r1 movs r1, 0x1B b _0803B99E .align 2, 0 -_0803B6BC: .4byte gUnknown_202402C +_0803B6BC: .4byte gEnemyParty _0803B6C0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B6CC @ =gUnknown_202402C + ldr r1, _0803B6CC @ =gEnemyParty adds r0, r1 movs r1, 0x1C b _0803B99E .align 2, 0 -_0803B6CC: .4byte gUnknown_202402C +_0803B6CC: .4byte gEnemyParty _0803B6D0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B6DC @ =gUnknown_202402C + ldr r1, _0803B6DC @ =gEnemyParty adds r0, r1 movs r1, 0x1D b _0803B99E .align 2, 0 -_0803B6DC: .4byte gUnknown_202402C +_0803B6DC: .4byte gEnemyParty _0803B6E0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B6EC @ =gUnknown_202402C + ldr r1, _0803B6EC @ =gEnemyParty adds r0, r1 movs r1, 0x1E b _0803B99E .align 2, 0 -_0803B6EC: .4byte gUnknown_202402C +_0803B6EC: .4byte gEnemyParty _0803B6F0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B6FC @ =gUnknown_202402C + ldr r1, _0803B6FC @ =gEnemyParty adds r0, r1 movs r1, 0x1F b _0803B99E .align 2, 0 -_0803B6FC: .4byte gUnknown_202402C +_0803B6FC: .4byte gEnemyParty _0803B700: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B70C @ =gUnknown_202402C + ldr r1, _0803B70C @ =gEnemyParty adds r0, r1 movs r1, 0x20 b _0803B99E .align 2, 0 -_0803B70C: .4byte gUnknown_202402C +_0803B70C: .4byte gEnemyParty _0803B710: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B71C @ =gUnknown_202402C + ldr r1, _0803B71C @ =gEnemyParty adds r0, r1 movs r1, 0x22 b _0803B99E .align 2, 0 -_0803B71C: .4byte gUnknown_202402C +_0803B71C: .4byte gEnemyParty _0803B720: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B72C @ =gUnknown_202402C + ldr r1, _0803B72C @ =gEnemyParty adds r0, r1 movs r1, 0x23 b _0803B99E .align 2, 0 -_0803B72C: .4byte gUnknown_202402C +_0803B72C: .4byte gEnemyParty _0803B730: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B73C @ =gUnknown_202402C + ldr r1, _0803B73C @ =gEnemyParty adds r0, r1 movs r1, 0x24 b _0803B99E .align 2, 0 -_0803B73C: .4byte gUnknown_202402C +_0803B73C: .4byte gEnemyParty _0803B740: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B74C @ =gUnknown_202402C + ldr r1, _0803B74C @ =gEnemyParty adds r0, r1 movs r1, 0x25 b _0803B99E .align 2, 0 -_0803B74C: .4byte gUnknown_202402C +_0803B74C: .4byte gEnemyParty _0803B750: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B75C @ =gUnknown_202402C + ldr r1, _0803B75C @ =gEnemyParty adds r0, r1 movs r1, 0x26 b _0803B99E .align 2, 0 -_0803B75C: .4byte gUnknown_202402C +_0803B75C: .4byte gEnemyParty _0803B760: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0803B7AC @ =gUnknown_202402C + ldr r0, _0803B7AC @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -2089,83 +2089,83 @@ _0803B760: movs r6, 0x6 b _0803B9A6 .align 2, 0 -_0803B7AC: .4byte gUnknown_202402C +_0803B7AC: .4byte gEnemyParty _0803B7B0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B7BC @ =gUnknown_202402C + ldr r1, _0803B7BC @ =gEnemyParty adds r0, r1 movs r1, 0x27 b _0803B99E .align 2, 0 -_0803B7BC: .4byte gUnknown_202402C +_0803B7BC: .4byte gEnemyParty _0803B7C0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B7CC @ =gUnknown_202402C + ldr r1, _0803B7CC @ =gEnemyParty adds r0, r1 movs r1, 0x28 b _0803B99E .align 2, 0 -_0803B7CC: .4byte gUnknown_202402C +_0803B7CC: .4byte gEnemyParty _0803B7D0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B7DC @ =gUnknown_202402C + ldr r1, _0803B7DC @ =gEnemyParty adds r0, r1 movs r1, 0x29 b _0803B99E .align 2, 0 -_0803B7DC: .4byte gUnknown_202402C +_0803B7DC: .4byte gEnemyParty _0803B7E0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B7EC @ =gUnknown_202402C + ldr r1, _0803B7EC @ =gEnemyParty adds r0, r1 movs r1, 0x2A b _0803B99E .align 2, 0 -_0803B7EC: .4byte gUnknown_202402C +_0803B7EC: .4byte gEnemyParty _0803B7F0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B7FC @ =gUnknown_202402C + ldr r1, _0803B7FC @ =gEnemyParty adds r0, r1 movs r1, 0x2B b _0803B99E .align 2, 0 -_0803B7FC: .4byte gUnknown_202402C +_0803B7FC: .4byte gEnemyParty _0803B800: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B80C @ =gUnknown_202402C + ldr r1, _0803B80C @ =gEnemyParty adds r0, r1 movs r1, 0x2C b _0803B99E .align 2, 0 -_0803B80C: .4byte gUnknown_202402C +_0803B80C: .4byte gEnemyParty _0803B810: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B81C @ =gUnknown_202402C + ldr r1, _0803B81C @ =gEnemyParty adds r0, r1 movs r1, 0 b _0803B83A .align 2, 0 -_0803B81C: .4byte gUnknown_202402C +_0803B81C: .4byte gEnemyParty _0803B820: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B82C @ =gUnknown_202402C + ldr r1, _0803B82C @ =gEnemyParty adds r0, r1 movs r1, 0x9 b _0803B8DE .align 2, 0 -_0803B82C: .4byte gUnknown_202402C +_0803B82C: .4byte gEnemyParty _0803B830: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B860 @ =gUnknown_202402C + ldr r1, _0803B860 @ =gEnemyParty adds r0, r1 movs r1, 0x37 _0803B83A: @@ -2187,74 +2187,74 @@ _0803B83A: movs r6, 0x4 b _0803B9A6 .align 2, 0 -_0803B860: .4byte gUnknown_202402C +_0803B860: .4byte gEnemyParty _0803B864: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B870 @ =gUnknown_202402C + ldr r1, _0803B870 @ =gEnemyParty adds r0, r1 movs r1, 0x38 b _0803B99E .align 2, 0 -_0803B870: .4byte gUnknown_202402C +_0803B870: .4byte gEnemyParty _0803B874: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B880 @ =gUnknown_202402C + ldr r1, _0803B880 @ =gEnemyParty adds r0, r1 movs r1, 0x39 b _0803B8DE .align 2, 0 -_0803B880: .4byte gUnknown_202402C +_0803B880: .4byte gEnemyParty _0803B884: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B890 @ =gUnknown_202402C + ldr r1, _0803B890 @ =gEnemyParty adds r0, r1 movs r1, 0x3A b _0803B8DE .align 2, 0 -_0803B890: .4byte gUnknown_202402C +_0803B890: .4byte gEnemyParty _0803B894: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B8A0 @ =gUnknown_202402C + ldr r1, _0803B8A0 @ =gEnemyParty adds r0, r1 movs r1, 0x3B b _0803B8DE .align 2, 0 -_0803B8A0: .4byte gUnknown_202402C +_0803B8A0: .4byte gEnemyParty _0803B8A4: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B8B0 @ =gUnknown_202402C + ldr r1, _0803B8B0 @ =gEnemyParty adds r0, r1 movs r1, 0x3C b _0803B8DE .align 2, 0 -_0803B8B0: .4byte gUnknown_202402C +_0803B8B0: .4byte gEnemyParty _0803B8B4: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B8C0 @ =gUnknown_202402C + ldr r1, _0803B8C0 @ =gEnemyParty adds r0, r1 movs r1, 0x3D b _0803B8DE .align 2, 0 -_0803B8C0: .4byte gUnknown_202402C +_0803B8C0: .4byte gEnemyParty _0803B8C4: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B8D0 @ =gUnknown_202402C + ldr r1, _0803B8D0 @ =gEnemyParty adds r0, r1 movs r1, 0x3E b _0803B8DE .align 2, 0 -_0803B8D0: .4byte gUnknown_202402C +_0803B8D0: .4byte gEnemyParty _0803B8D4: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B8F0 @ =gUnknown_202402C + ldr r1, _0803B8F0 @ =gEnemyParty adds r0, r1 movs r1, 0x3F _0803B8DE: @@ -2267,101 +2267,101 @@ _0803B8DE: movs r6, 0x2 b _0803B9A6 .align 2, 0 -_0803B8F0: .4byte gUnknown_202402C +_0803B8F0: .4byte gEnemyParty _0803B8F4: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B900 @ =gUnknown_202402C + ldr r1, _0803B900 @ =gEnemyParty adds r0, r1 movs r1, 0x16 b _0803B99E .align 2, 0 -_0803B900: .4byte gUnknown_202402C +_0803B900: .4byte gEnemyParty _0803B904: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B910 @ =gUnknown_202402C + ldr r1, _0803B910 @ =gEnemyParty adds r0, r1 movs r1, 0x17 b _0803B99E .align 2, 0 -_0803B910: .4byte gUnknown_202402C +_0803B910: .4byte gEnemyParty _0803B914: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B920 @ =gUnknown_202402C + ldr r1, _0803B920 @ =gEnemyParty adds r0, r1 movs r1, 0x18 b _0803B99E .align 2, 0 -_0803B920: .4byte gUnknown_202402C +_0803B920: .4byte gEnemyParty _0803B924: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B930 @ =gUnknown_202402C + ldr r1, _0803B930 @ =gEnemyParty adds r0, r1 movs r1, 0x21 b _0803B99E .align 2, 0 -_0803B930: .4byte gUnknown_202402C +_0803B930: .4byte gEnemyParty _0803B934: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B940 @ =gUnknown_202402C + ldr r1, _0803B940 @ =gEnemyParty adds r0, r1 movs r1, 0x2F b _0803B99E .align 2, 0 -_0803B940: .4byte gUnknown_202402C +_0803B940: .4byte gEnemyParty _0803B944: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B950 @ =gUnknown_202402C + ldr r1, _0803B950 @ =gEnemyParty adds r0, r1 movs r1, 0x30 b _0803B99E .align 2, 0 -_0803B950: .4byte gUnknown_202402C +_0803B950: .4byte gEnemyParty _0803B954: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B960 @ =gUnknown_202402C + ldr r1, _0803B960 @ =gEnemyParty adds r0, r1 movs r1, 0x32 b _0803B99E .align 2, 0 -_0803B960: .4byte gUnknown_202402C +_0803B960: .4byte gEnemyParty _0803B964: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B970 @ =gUnknown_202402C + ldr r1, _0803B970 @ =gEnemyParty adds r0, r1 movs r1, 0x33 b _0803B99E .align 2, 0 -_0803B970: .4byte gUnknown_202402C +_0803B970: .4byte gEnemyParty _0803B974: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B980 @ =gUnknown_202402C + ldr r1, _0803B980 @ =gEnemyParty adds r0, r1 movs r1, 0x34 b _0803B99E .align 2, 0 -_0803B980: .4byte gUnknown_202402C +_0803B980: .4byte gEnemyParty _0803B984: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B990 @ =gUnknown_202402C + ldr r1, _0803B990 @ =gEnemyParty adds r0, r1 movs r1, 0x35 b _0803B99E .align 2, 0 -_0803B990: .4byte gUnknown_202402C +_0803B990: .4byte gEnemyParty _0803B994: movs r0, 0x64 muls r0, r5 - ldr r1, _0803B9B8 @ =gUnknown_202402C + ldr r1, _0803B9B8 @ =gEnemyParty adds r0, r1 movs r1, 0x36 _0803B99E: @@ -2379,7 +2379,7 @@ _0803B9A6: pop {r1} bx r1 .align 2, 0 -_0803B9B8: .4byte gUnknown_202402C +_0803B9B8: .4byte gEnemyParty thumb_func_end CopyRecordedOpponentMonData thumb_func_start sub_803B9BC @@ -2394,7 +2394,7 @@ sub_803B9BC: @ 803B9BC RecordedOpponentHandleSetMonData: @ 803B9C8 push {r4,r5,lr} ldr r1, _0803B9EC @ =gUnknown_2022BC4 - ldr r0, _0803B9F0 @ =gUnknown_2023BC4 + ldr r0, _0803B9F0 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -2402,7 +2402,7 @@ RecordedOpponentHandleSetMonData: @ 803B9C8 ldrb r0, [r1] cmp r0, 0 bne _0803B9F8 - ldr r0, _0803B9F4 @ =gUnknown_2023BCE + ldr r0, _0803B9F4 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -2410,8 +2410,8 @@ RecordedOpponentHandleSetMonData: @ 803B9C8 b _0803BA16 .align 2, 0 _0803B9EC: .4byte gUnknown_2022BC4 -_0803B9F0: .4byte gUnknown_2023BC4 -_0803B9F4: .4byte gUnknown_2023BCE +_0803B9F0: .4byte gActiveBattler +_0803B9F4: .4byte gBattlerPartyIndexes _0803B9F8: ldrb r4, [r1] movs r5, 0 @@ -2446,7 +2446,7 @@ SetRecordedOpponentMonData: @ 803BA20 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, _0803BA58 @ =gUnknown_2023BC4 + ldr r3, _0803BA58 @ =gActiveBattler ldrb r0, [r3] lsls r0, 9 ldr r2, _0803BA5C @ =gUnknown_2022BC7 @@ -2467,7 +2467,7 @@ _0803BA4E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803BA58: .4byte gUnknown_2023BC4 +_0803BA58: .4byte gActiveBattler _0803BA5C: .4byte gUnknown_2022BC7 _0803BA60: .4byte _0803BA64 .align 2, 0 @@ -2536,7 +2536,7 @@ _0803BB54: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0803BCE8 @ =gUnknown_202402C + ldr r0, _0803BCE8 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -2603,7 +2603,7 @@ _0803BBBA: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0803BCE8 @ =gUnknown_202402C + ldr r0, _0803BCE8 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -2713,11 +2713,11 @@ _0803BBBA: bl sub_804037C b _0803C32C .align 2, 0 -_0803BCE8: .4byte gUnknown_202402C +_0803BCE8: .4byte gEnemyParty _0803BCEC: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BD04 @ =gUnknown_202402C + ldr r1, _0803BD04 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2726,11 +2726,11 @@ _0803BCEC: bl sub_804037C b _0803C32C .align 2, 0 -_0803BD04: .4byte gUnknown_202402C +_0803BD04: .4byte gEnemyParty _0803BD08: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BD20 @ =gUnknown_202402C + ldr r1, _0803BD20 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2739,7 +2739,7 @@ _0803BD08: bl sub_804037C b _0803C32C .align 2, 0 -_0803BD20: .4byte gUnknown_202402C +_0803BD20: .4byte gEnemyParty _0803BD24: movs r0, 0 mov r8, r0 @@ -2749,7 +2749,7 @@ _0803BD24: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0803BD74 @ =gUnknown_202402C + ldr r0, _0803BD74 @ =gEnemyParty adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 @@ -2773,18 +2773,18 @@ _0803BD3C: ble _0803BD3C movs r0, 0x64 muls r0, r5 - ldr r1, _0803BD74 @ =gUnknown_202402C + ldr r1, _0803BD74 @ =gEnemyParty adds r0, r1 movs r1, 0x15 mov r2, r9 bl sub_804037C b _0803C32C .align 2, 0 -_0803BD74: .4byte gUnknown_202402C +_0803BD74: .4byte gEnemyParty _0803BD78: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BD90 @ =gUnknown_202402C + ldr r1, _0803BD90 @ =gEnemyParty adds r0, r1 ldr r3, _0803BD94 @ =gUnknown_2022BC4 ldrb r2, [r6] @@ -2795,13 +2795,13 @@ _0803BD78: adds r1, 0x9 b _0803BE16 .align 2, 0 -_0803BD90: .4byte gUnknown_202402C +_0803BD90: .4byte gEnemyParty _0803BD94: .4byte gUnknown_2022BC4 _0803BD98: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0803BDFC @ =gUnknown_202402C + ldr r0, _0803BDFC @ =gEnemyParty adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -2844,11 +2844,11 @@ _0803BD98: bl sub_804037C b _0803C32C .align 2, 0 -_0803BDFC: .4byte gUnknown_202402C +_0803BDFC: .4byte gEnemyParty _0803BE00: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BE20 @ =gUnknown_202402C + ldr r1, _0803BE20 @ =gEnemyParty adds r0, r1 ldr r3, _0803BE24 @ =gUnknown_2022BC4 ldrb r2, [r6] @@ -2863,12 +2863,12 @@ _0803BE16: bl sub_804037C b _0803C32C .align 2, 0 -_0803BE20: .4byte gUnknown_202402C +_0803BE20: .4byte gEnemyParty _0803BE24: .4byte gUnknown_2022BC4 _0803BE28: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BE40 @ =gUnknown_202402C + ldr r1, _0803BE40 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2877,11 +2877,11 @@ _0803BE28: bl sub_804037C b _0803C32C .align 2, 0 -_0803BE40: .4byte gUnknown_202402C +_0803BE40: .4byte gEnemyParty _0803BE44: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BE5C @ =gUnknown_202402C + ldr r1, _0803BE5C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2890,11 +2890,11 @@ _0803BE44: bl sub_804037C b _0803C32C .align 2, 0 -_0803BE5C: .4byte gUnknown_202402C +_0803BE5C: .4byte gEnemyParty _0803BE60: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BE78 @ =gUnknown_202402C + ldr r1, _0803BE78 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2903,11 +2903,11 @@ _0803BE60: bl sub_804037C b _0803C32C .align 2, 0 -_0803BE78: .4byte gUnknown_202402C +_0803BE78: .4byte gEnemyParty _0803BE7C: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BE94 @ =gUnknown_202402C + ldr r1, _0803BE94 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2916,11 +2916,11 @@ _0803BE7C: bl sub_804037C b _0803C32C .align 2, 0 -_0803BE94: .4byte gUnknown_202402C +_0803BE94: .4byte gEnemyParty _0803BE98: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BEB0 @ =gUnknown_202402C + ldr r1, _0803BEB0 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2929,11 +2929,11 @@ _0803BE98: bl sub_804037C b _0803C32C .align 2, 0 -_0803BEB0: .4byte gUnknown_202402C +_0803BEB0: .4byte gEnemyParty _0803BEB4: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BECC @ =gUnknown_202402C + ldr r1, _0803BECC @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2942,11 +2942,11 @@ _0803BEB4: bl sub_804037C b _0803C32C .align 2, 0 -_0803BECC: .4byte gUnknown_202402C +_0803BECC: .4byte gEnemyParty _0803BED0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BEE8 @ =gUnknown_202402C + ldr r1, _0803BEE8 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2955,11 +2955,11 @@ _0803BED0: bl sub_804037C b _0803C32C .align 2, 0 -_0803BEE8: .4byte gUnknown_202402C +_0803BEE8: .4byte gEnemyParty _0803BEEC: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BF04 @ =gUnknown_202402C + ldr r1, _0803BF04 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2968,11 +2968,11 @@ _0803BEEC: bl sub_804037C b _0803C32C .align 2, 0 -_0803BF04: .4byte gUnknown_202402C +_0803BF04: .4byte gEnemyParty _0803BF08: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BF20 @ =gUnknown_202402C + ldr r1, _0803BF20 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2981,11 +2981,11 @@ _0803BF08: bl sub_804037C b _0803C32C .align 2, 0 -_0803BF20: .4byte gUnknown_202402C +_0803BF20: .4byte gEnemyParty _0803BF24: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BF3C @ =gUnknown_202402C + ldr r1, _0803BF3C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2994,11 +2994,11 @@ _0803BF24: bl sub_804037C b _0803C32C .align 2, 0 -_0803BF3C: .4byte gUnknown_202402C +_0803BF3C: .4byte gEnemyParty _0803BF40: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BF58 @ =gUnknown_202402C + ldr r1, _0803BF58 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3007,11 +3007,11 @@ _0803BF40: bl sub_804037C b _0803C32C .align 2, 0 -_0803BF58: .4byte gUnknown_202402C +_0803BF58: .4byte gEnemyParty _0803BF5C: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BF74 @ =gUnknown_202402C + ldr r1, _0803BF74 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3020,11 +3020,11 @@ _0803BF5C: bl sub_804037C b _0803C32C .align 2, 0 -_0803BF74: .4byte gUnknown_202402C +_0803BF74: .4byte gEnemyParty _0803BF78: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BF90 @ =gUnknown_202402C + ldr r1, _0803BF90 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3033,11 +3033,11 @@ _0803BF78: bl sub_804037C b _0803C32C .align 2, 0 -_0803BF90: .4byte gUnknown_202402C +_0803BF90: .4byte gEnemyParty _0803BF94: movs r0, 0x64 muls r0, r5 - ldr r1, _0803BFAC @ =gUnknown_202402C + ldr r1, _0803BFAC @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3046,12 +3046,12 @@ _0803BF94: bl sub_804037C b _0803C32C .align 2, 0 -_0803BFAC: .4byte gUnknown_202402C +_0803BFAC: .4byte gEnemyParty _0803BFB0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0803C020 @ =gUnknown_202402C + ldr r0, _0803C020 @ =gEnemyParty adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -3100,11 +3100,11 @@ _0803BFB0: adds r0, r4, 0 b _0803C0BE .align 2, 0 -_0803C020: .4byte gUnknown_202402C +_0803C020: .4byte gEnemyParty _0803C024: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C03C @ =gUnknown_202402C + ldr r1, _0803C03C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3113,11 +3113,11 @@ _0803C024: bl sub_804037C b _0803C32C .align 2, 0 -_0803C03C: .4byte gUnknown_202402C +_0803C03C: .4byte gEnemyParty _0803C040: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C058 @ =gUnknown_202402C + ldr r1, _0803C058 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3126,11 +3126,11 @@ _0803C040: bl sub_804037C b _0803C32C .align 2, 0 -_0803C058: .4byte gUnknown_202402C +_0803C058: .4byte gEnemyParty _0803C05C: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C074 @ =gUnknown_202402C + ldr r1, _0803C074 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3139,11 +3139,11 @@ _0803C05C: bl sub_804037C b _0803C32C .align 2, 0 -_0803C074: .4byte gUnknown_202402C +_0803C074: .4byte gEnemyParty _0803C078: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C090 @ =gUnknown_202402C + ldr r1, _0803C090 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3152,11 +3152,11 @@ _0803C078: bl sub_804037C b _0803C32C .align 2, 0 -_0803C090: .4byte gUnknown_202402C +_0803C090: .4byte gEnemyParty _0803C094: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C0AC @ =gUnknown_202402C + ldr r1, _0803C0AC @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3165,11 +3165,11 @@ _0803C094: bl sub_804037C b _0803C32C .align 2, 0 -_0803C0AC: .4byte gUnknown_202402C +_0803C0AC: .4byte gEnemyParty _0803C0B0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C0C8 @ =gUnknown_202402C + ldr r1, _0803C0C8 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3179,11 +3179,11 @@ _0803C0BE: bl sub_804037C b _0803C32C .align 2, 0 -_0803C0C8: .4byte gUnknown_202402C +_0803C0C8: .4byte gEnemyParty _0803C0CC: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C0E4 @ =gUnknown_202402C + ldr r1, _0803C0E4 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3192,11 +3192,11 @@ _0803C0CC: bl sub_804037C b _0803C32C .align 2, 0 -_0803C0E4: .4byte gUnknown_202402C +_0803C0E4: .4byte gEnemyParty _0803C0E8: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C100 @ =gUnknown_202402C + ldr r1, _0803C100 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3205,11 +3205,11 @@ _0803C0E8: bl sub_804037C b _0803C32C .align 2, 0 -_0803C100: .4byte gUnknown_202402C +_0803C100: .4byte gEnemyParty _0803C104: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C11C @ =gUnknown_202402C + ldr r1, _0803C11C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3218,11 +3218,11 @@ _0803C104: bl sub_804037C b _0803C32C .align 2, 0 -_0803C11C: .4byte gUnknown_202402C +_0803C11C: .4byte gEnemyParty _0803C120: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C138 @ =gUnknown_202402C + ldr r1, _0803C138 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3231,11 +3231,11 @@ _0803C120: bl sub_804037C b _0803C32C .align 2, 0 -_0803C138: .4byte gUnknown_202402C +_0803C138: .4byte gEnemyParty _0803C13C: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C154 @ =gUnknown_202402C + ldr r1, _0803C154 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3244,11 +3244,11 @@ _0803C13C: bl sub_804037C b _0803C32C .align 2, 0 -_0803C154: .4byte gUnknown_202402C +_0803C154: .4byte gEnemyParty _0803C158: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C170 @ =gUnknown_202402C + ldr r1, _0803C170 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3257,11 +3257,11 @@ _0803C158: bl sub_804037C b _0803C32C .align 2, 0 -_0803C170: .4byte gUnknown_202402C +_0803C170: .4byte gEnemyParty _0803C174: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C18C @ =gUnknown_202402C + ldr r1, _0803C18C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3270,11 +3270,11 @@ _0803C174: bl sub_804037C b _0803C32C .align 2, 0 -_0803C18C: .4byte gUnknown_202402C +_0803C18C: .4byte gEnemyParty _0803C190: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C1A8 @ =gUnknown_202402C + ldr r1, _0803C1A8 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3283,11 +3283,11 @@ _0803C190: bl sub_804037C b _0803C32C .align 2, 0 -_0803C1A8: .4byte gUnknown_202402C +_0803C1A8: .4byte gEnemyParty _0803C1AC: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C1C4 @ =gUnknown_202402C + ldr r1, _0803C1C4 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3296,11 +3296,11 @@ _0803C1AC: bl sub_804037C b _0803C32C .align 2, 0 -_0803C1C4: .4byte gUnknown_202402C +_0803C1C4: .4byte gEnemyParty _0803C1C8: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C1E0 @ =gUnknown_202402C + ldr r1, _0803C1E0 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3309,11 +3309,11 @@ _0803C1C8: bl sub_804037C b _0803C32C .align 2, 0 -_0803C1E0: .4byte gUnknown_202402C +_0803C1E0: .4byte gEnemyParty _0803C1E4: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C1FC @ =gUnknown_202402C + ldr r1, _0803C1FC @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3322,11 +3322,11 @@ _0803C1E4: bl sub_804037C b _0803C32C .align 2, 0 -_0803C1FC: .4byte gUnknown_202402C +_0803C1FC: .4byte gEnemyParty _0803C200: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C218 @ =gUnknown_202402C + ldr r1, _0803C218 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3335,11 +3335,11 @@ _0803C200: bl sub_804037C b _0803C32C .align 2, 0 -_0803C218: .4byte gUnknown_202402C +_0803C218: .4byte gEnemyParty _0803C21C: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C234 @ =gUnknown_202402C + ldr r1, _0803C234 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3348,11 +3348,11 @@ _0803C21C: bl sub_804037C b _0803C32C .align 2, 0 -_0803C234: .4byte gUnknown_202402C +_0803C234: .4byte gEnemyParty _0803C238: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C250 @ =gUnknown_202402C + ldr r1, _0803C250 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3361,11 +3361,11 @@ _0803C238: bl sub_804037C b _0803C32C .align 2, 0 -_0803C250: .4byte gUnknown_202402C +_0803C250: .4byte gEnemyParty _0803C254: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C26C @ =gUnknown_202402C + ldr r1, _0803C26C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3374,11 +3374,11 @@ _0803C254: bl sub_804037C b _0803C32C .align 2, 0 -_0803C26C: .4byte gUnknown_202402C +_0803C26C: .4byte gEnemyParty _0803C270: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C288 @ =gUnknown_202402C + ldr r1, _0803C288 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3387,11 +3387,11 @@ _0803C270: bl sub_804037C b _0803C32C .align 2, 0 -_0803C288: .4byte gUnknown_202402C +_0803C288: .4byte gEnemyParty _0803C28C: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C2A4 @ =gUnknown_202402C + ldr r1, _0803C2A4 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3400,11 +3400,11 @@ _0803C28C: bl sub_804037C b _0803C32C .align 2, 0 -_0803C2A4: .4byte gUnknown_202402C +_0803C2A4: .4byte gEnemyParty _0803C2A8: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C2C0 @ =gUnknown_202402C + ldr r1, _0803C2C0 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3413,11 +3413,11 @@ _0803C2A8: bl sub_804037C b _0803C32C .align 2, 0 -_0803C2C0: .4byte gUnknown_202402C +_0803C2C0: .4byte gEnemyParty _0803C2C4: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C2DC @ =gUnknown_202402C + ldr r1, _0803C2DC @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3426,11 +3426,11 @@ _0803C2C4: bl sub_804037C b _0803C32C .align 2, 0 -_0803C2DC: .4byte gUnknown_202402C +_0803C2DC: .4byte gEnemyParty _0803C2E0: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C2F8 @ =gUnknown_202402C + ldr r1, _0803C2F8 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3439,11 +3439,11 @@ _0803C2E0: bl sub_804037C b _0803C32C .align 2, 0 -_0803C2F8: .4byte gUnknown_202402C +_0803C2F8: .4byte gEnemyParty _0803C2FC: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C314 @ =gUnknown_202402C + ldr r1, _0803C314 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3452,11 +3452,11 @@ _0803C2FC: bl sub_804037C b _0803C32C .align 2, 0 -_0803C314: .4byte gUnknown_202402C +_0803C314: .4byte gEnemyParty _0803C318: movs r0, 0x64 muls r0, r5 - ldr r1, _0803C33C @ =gUnknown_202402C + ldr r1, _0803C33C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3473,14 +3473,14 @@ _0803C32C: pop {r0} bx r0 .align 2, 0 -_0803C33C: .4byte gUnknown_202402C +_0803C33C: .4byte gEnemyParty thumb_func_end SetRecordedOpponentMonData thumb_func_start RecordedOpponentHandleSetRawMonData RecordedOpponentHandleSetRawMonData: @ 803C340 push {r4-r7,lr} - ldr r1, _0803C3A4 @ =gUnknown_2023BCE - ldr r7, _0803C3A8 @ =gUnknown_2023BC4 + ldr r1, _0803C3A4 @ =gBattlerPartyIndexes + ldr r7, _0803C3A8 @ =gActiveBattler ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -3493,7 +3493,7 @@ RecordedOpponentHandleSetRawMonData: @ 803C340 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _0803C3B0 @ =gUnknown_202402C + ldr r1, _0803C3B0 @ =gEnemyParty adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -3529,10 +3529,10 @@ _0803C398: pop {r0} bx r0 .align 2, 0 -_0803C3A4: .4byte gUnknown_2023BCE -_0803C3A8: .4byte gUnknown_2023BC4 +_0803C3A4: .4byte gBattlerPartyIndexes +_0803C3A8: .4byte gActiveBattler _0803C3AC: .4byte gUnknown_2022BC4 -_0803C3B0: .4byte gUnknown_202402C +_0803C3B0: .4byte gEnemyParty thumb_func_end RecordedOpponentHandleSetRawMonData thumb_func_start LinkOpponentHandleLoadPokeSprite @@ -3542,8 +3542,8 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r7, _0803C4DC @ =gUnknown_2023BCE - ldr r6, _0803C4E0 @ =gUnknown_2023BC4 + ldr r7, _0803C4DC @ =gBattlerPartyIndexes + ldr r6, _0803C4E0 @ =gActiveBattler ldrb r0, [r6] lsls r0, 1 adds r0, r7 @@ -3553,7 +3553,7 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4 mov r2, r10 muls r2, r0 adds r0, r2, 0 - ldr r1, _0803C4E4 @ =gUnknown_202402C + ldr r1, _0803C4E4 @ =gEnemyParty mov r9, r1 add r0, r9 movs r1, 0xB @@ -3674,9 +3674,9 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4 pop {r0} bx r0 .align 2, 0 -_0803C4DC: .4byte gUnknown_2023BCE -_0803C4E0: .4byte gUnknown_2023BC4 -_0803C4E4: .4byte gUnknown_202402C +_0803C4DC: .4byte gBattlerPartyIndexes +_0803C4E0: .4byte gActiveBattler +_0803C4E4: .4byte gEnemyParty _0803C4E8: .4byte gUnknown_20244DC _0803C4EC: .4byte gUnknown_2023D44 _0803C4F0: .4byte gSprites @@ -3689,8 +3689,8 @@ _0803C500: .4byte sub_803AC14 thumb_func_start LinkOpponentHandleSendOutPoke LinkOpponentHandleSendOutPoke: @ 803C504 push {r4,lr} - ldr r1, _0803C53C @ =gUnknown_2023BCE - ldr r4, _0803C540 @ =gUnknown_2023BC4 + ldr r1, _0803C53C @ =gBattlerPartyIndexes + ldr r4, _0803C540 @ =gActiveBattler ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 @@ -3716,8 +3716,8 @@ LinkOpponentHandleSendOutPoke: @ 803C504 pop {r0} bx r0 .align 2, 0 -_0803C53C: .4byte gUnknown_2023BCE -_0803C540: .4byte gUnknown_2023BC4 +_0803C53C: .4byte gBattlerPartyIndexes +_0803C540: .4byte gActiveBattler _0803C544: .4byte gUnknown_2022BC4 _0803C548: .4byte gUnknown_3004FE0 _0803C54C: .4byte sub_803AFFC @@ -3737,7 +3737,7 @@ sub_803C550: @ 803C550 lsrs r1, 24 adds r0, r6, 0 bl ClearTemporarySpeciesSpriteData - ldr r0, _0803C6AC @ =gUnknown_2023BCE + ldr r0, _0803C6AC @ =gBattlerPartyIndexes lsls r4, r6, 1 adds r4, r0 ldr r0, _0803C6B0 @ =gUnknown_2022BC4 @@ -3752,7 +3752,7 @@ sub_803C550: @ 803C550 mov r1, r9 muls r1, r0 adds r0, r1, 0 - ldr r5, _0803C6B4 @ =gUnknown_202402C + ldr r5, _0803C6B4 @ =gEnemyParty adds r0, r5 movs r1, 0xB bl GetMonData @@ -3887,9 +3887,9 @@ sub_803C550: @ 803C550 pop {r0} bx r0 .align 2, 0 -_0803C6AC: .4byte gUnknown_2023BCE +_0803C6AC: .4byte gBattlerPartyIndexes _0803C6B0: .4byte gUnknown_2022BC4 -_0803C6B4: .4byte gUnknown_202402C +_0803C6B4: .4byte gEnemyParty _0803C6B8: .4byte sub_8033E3C _0803C6BC: .4byte gUnknown_3004FFC _0803C6C0: .4byte gUnknown_20244DC @@ -3903,7 +3903,7 @@ _0803C6D0: .4byte SpriteCallbackDummy LinkOpponentHandleReturnPokeToBall: @ 803C6D4 push {r4-r6,lr} ldr r1, _0803C708 @ =gUnknown_2022BC4 - ldr r6, _0803C70C @ =gUnknown_2023BC4 + ldr r6, _0803C70C @ =gActiveBattler ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -3928,7 +3928,7 @@ LinkOpponentHandleReturnPokeToBall: @ 803C6D4 b _0803C758 .align 2, 0 _0803C708: .4byte gUnknown_2022BC4 -_0803C70C: .4byte gUnknown_2023BC4 +_0803C70C: .4byte gActiveBattler _0803C710: .4byte gUnknown_2024018 _0803C714: .4byte gUnknown_3004FE0 _0803C718: .4byte sub_803C76C @@ -3973,7 +3973,7 @@ sub_803C76C: @ 803C76C push {r4-r6,lr} ldr r6, _0803C78C @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _0803C790 @ =gUnknown_2023BC4 + ldr r5, _0803C790 @ =gActiveBattler ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -3988,7 +3988,7 @@ sub_803C76C: @ 803C76C b _0803C7EA .align 2, 0 _0803C78C: .4byte gUnknown_2024018 -_0803C790: .4byte gUnknown_2023BC4 +_0803C790: .4byte gActiveBattler _0803C794: ldr r1, [r4] lsls r0, r2, 2 @@ -4048,13 +4048,13 @@ sub_803C7F8: @ 803C7F8 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0803C884 @ =gUnknown_2022B4C + ldr r0, _0803C884 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0803C8C0 - ldr r6, _0803C888 @ =gUnknown_2023BC4 + ldr r6, _0803C888 @ =gActiveBattler ldrb r0, [r6] bl GetBankIdentity movs r1, 0x2 @@ -4098,7 +4098,7 @@ _0803C820: bne _0803C8A0 _0803C866: ldr r4, _0803C88C @ =gUnknown_202273C - ldr r0, _0803C888 @ =gUnknown_2023BC4 + ldr r0, _0803C888 @ =gActiveBattler ldrb r0, [r0] bl GetBankMultiplayerId lsls r1, r0, 3 @@ -4112,8 +4112,8 @@ _0803C866: adds r0, 0x3D b _0803C990 .align 2, 0 -_0803C884: .4byte gUnknown_2022B4C -_0803C888: .4byte gUnknown_2023BC4 +_0803C884: .4byte gBattleTypeFlags +_0803C888: .4byte gActiveBattler _0803C88C: .4byte gUnknown_202273C _0803C890: .4byte gUnknown_82538A8 _0803C894: @@ -4139,7 +4139,7 @@ _0803C8A0: _0803C8BC: .4byte gUnknown_82538A8 _0803C8C0: movs r7, 0xB0 - ldr r0, _0803C8D8 @ =gUnknown_20386AE + ldr r0, _0803C8D8 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 @@ -4150,7 +4150,7 @@ _0803C8C0: lsrs r0, 16 b _0803C992 .align 2, 0 -_0803C8D8: .4byte gUnknown_20386AE +_0803C8D8: .4byte gTrainerBattleOpponent_A _0803C8DC: bl GetMultiplayerId ldr r6, _0803C954 @ =gUnknown_202273C @@ -4241,7 +4241,7 @@ _0803C990: ldrb r0, [r0] _0803C992: mov r9, r0 - ldr r0, _0803CACC @ =gUnknown_2023BC4 + ldr r0, _0803CACC @ =gActiveBattler mov r8, r0 ldrb r1, [r0] mov r0, r9 @@ -4389,7 +4389,7 @@ _0803C992: bx r0 .align 2, 0 _0803CAC8: .4byte gUnknown_82538A8 -_0803CACC: .4byte gUnknown_2023BC4 +_0803CACC: .4byte gActiveBattler _0803CAD0: .4byte gUnknown_20244DC _0803CAD4: .4byte gUnknown_823932C _0803CAD8: .4byte gUnknown_2023D44 @@ -4416,7 +4416,7 @@ sub_803CB00: @ 803CB00 sub_803CB0C: @ 803CB0C push {r4-r6,lr} ldr r6, _0803CB9C @ =gUnknown_2023D44 - ldr r4, _0803CBA0 @ =gUnknown_2023BC4 + ldr r4, _0803CBA0 @ =gActiveBattler ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -4485,7 +4485,7 @@ sub_803CB0C: @ 803CB0C bx r0 .align 2, 0 _0803CB9C: .4byte gUnknown_2023D44 -_0803CBA0: .4byte gUnknown_2023BC4 +_0803CBA0: .4byte gActiveBattler _0803CBA4: .4byte gSprites _0803CBA8: .4byte sub_8075590 _0803CBAC: .4byte SpriteCallbackDummy @@ -4498,7 +4498,7 @@ sub_803CBB8: @ 803CBB8 push {r4-r6,lr} ldr r6, _0803CC04 @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _0803CC08 @ =gUnknown_2023BC4 + ldr r5, _0803CC08 @ =gActiveBattler ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -4534,7 +4534,7 @@ _0803CBEC: b _0803CC48 .align 2, 0 _0803CC04: .4byte gUnknown_2024018 -_0803CC08: .4byte gUnknown_2023BC4 +_0803CC08: .4byte gActiveBattler _0803CC0C: ldrb r1, [r3] movs r0, 0x40 @@ -4612,7 +4612,7 @@ sub_803CC88: @ 803CC88 thumb_func_start RecordedOpponentHandleMoveAnimation RecordedOpponentHandleMoveAnimation: @ 803CC94 push {r4-r6,lr} - ldr r6, _0803CD78 @ =gUnknown_2023BC4 + ldr r6, _0803CD78 @ =gActiveBattler ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -4723,7 +4723,7 @@ _0803CCA6: bl RecordedOpponentBufferExecCompleted b _0803CDBA .align 2, 0 -_0803CD78: .4byte gUnknown_2023BC4 +_0803CD78: .4byte gActiveBattler _0803CD7C: .4byte gUnknown_2022BC4 _0803CD80: .4byte gUnknown_2037F16 _0803CD84: .4byte gUnknown_2037EEC @@ -4766,7 +4766,7 @@ RecordedOpponentDoMoveAnimation: @ 803CDCC mov r5, r8 push {r5-r7} ldr r2, _0803CE18 @ =gUnknown_2022BC4 - ldr r6, _0803CE1C @ =gUnknown_2023BC4 + ldr r6, _0803CE1C @ =gActiveBattler ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -4800,7 +4800,7 @@ RecordedOpponentDoMoveAnimation: @ 803CDCC b _0803CF40 .align 2, 0 _0803CE18: .4byte gUnknown_2022BC4 -_0803CE1C: .4byte gUnknown_2023BC4 +_0803CE1C: .4byte gActiveBattler _0803CE20: .4byte gUnknown_2024018 _0803CE24: cmp r2, 0x2 @@ -4896,7 +4896,7 @@ _0803CE8E: _0803CEDC: ldr r0, _0803CEFC @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _0803CF00 @ =gUnknown_2023BC4 + ldr r0, _0803CF00 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -4910,7 +4910,7 @@ _0803CEDC: _0803CEF4: .4byte gUnknown_2037EDC _0803CEF8: .4byte gUnknown_2037EE1 _0803CEFC: .4byte gUnknown_2024018 -_0803CF00: .4byte gUnknown_2023BC4 +_0803CF00: .4byte gActiveBattler _0803CF04: ldrb r1, [r0] movs r0, 0x40 @@ -4957,7 +4957,7 @@ sub_803CF50: @ 803CF50 strh r1, [r0] ldr r0, _0803CF88 @ =gUnknown_2022976 strh r1, [r0] - ldr r0, _0803CF8C @ =gUnknown_2023BC4 + ldr r0, _0803CF8C @ =gActiveBattler ldrb r4, [r0] lsls r4, 9 ldr r0, _0803CF90 @ =gUnknown_2022BC6 @@ -4976,7 +4976,7 @@ sub_803CF50: @ 803CF50 .align 2, 0 _0803CF84: .4byte gUnknown_2022974 _0803CF88: .4byte gUnknown_2022976 -_0803CF8C: .4byte gUnknown_2023BC4 +_0803CF8C: .4byte gActiveBattler _0803CF90: .4byte gUnknown_2022BC6 _0803CF94: .4byte gUnknown_202298C _0803CF98: @@ -4985,7 +4985,7 @@ _0803CF98: bl sub_80D87BC _0803CFA0: ldr r1, _0803CFB8 @ =gUnknown_3004FE0 - ldr r0, _0803CFBC @ =gUnknown_2023BC4 + ldr r0, _0803CFBC @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4997,7 +4997,7 @@ _0803CFA0: .align 2, 0 _0803CFB4: .4byte gUnknown_202298C _0803CFB8: .4byte gUnknown_3004FE0 -_0803CFBC: .4byte gUnknown_2023BC4 +_0803CFBC: .4byte gActiveBattler _0803CFC0: .4byte CompleteOnInactiveTextPrinter_5 thumb_func_end sub_803CF50 @@ -5067,7 +5067,7 @@ sub_803D018: @ 803D018 movs r0, 0 bl LoadBattleBarGfx ldr r3, _0803D090 @ =gUnknown_2022BC4 - ldr r0, _0803D094 @ =gUnknown_2023BC4 + ldr r0, _0803D094 @ =gActiveBattler mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -5084,13 +5084,13 @@ sub_803D018: @ 803D018 ldr r0, _0803D098 @ =0x00007fff cmp r7, r0 beq _0803D0A8 - ldr r6, _0803D09C @ =gUnknown_2023BCE + ldr r6, _0803D09C @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _0803D0A0 @ =gUnknown_202402C + ldr r4, _0803D0A0 @ =gEnemyParty adds r0, r4 movs r1, 0x3A bl GetMonData @@ -5116,19 +5116,19 @@ sub_803D018: @ 803D018 b _0803D0D2 .align 2, 0 _0803D090: .4byte gUnknown_2022BC4 -_0803D094: .4byte gUnknown_2023BC4 +_0803D094: .4byte gActiveBattler _0803D098: .4byte 0x00007fff -_0803D09C: .4byte gUnknown_2023BCE -_0803D0A0: .4byte gUnknown_202402C +_0803D09C: .4byte gBattlerPartyIndexes +_0803D0A0: .4byte gEnemyParty _0803D0A4: .4byte gUnknown_3004FF0 _0803D0A8: - ldr r1, _0803D0F0 @ =gUnknown_2023BCE + ldr r1, _0803D0F0 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0803D0F4 @ =gUnknown_202402C + ldr r1, _0803D0F4 @ =gEnemyParty adds r0, r1 movs r1, 0x3A bl GetMonData @@ -5143,7 +5143,7 @@ _0803D0A8: bl SetBattleBarStruct _0803D0D2: ldr r1, _0803D0FC @ =gUnknown_3004FE0 - ldr r0, _0803D100 @ =gUnknown_2023BC4 + ldr r0, _0803D100 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5157,11 +5157,11 @@ _0803D0D2: pop {r0} bx r0 .align 2, 0 -_0803D0F0: .4byte gUnknown_2023BCE -_0803D0F4: .4byte gUnknown_202402C +_0803D0F0: .4byte gBattlerPartyIndexes +_0803D0F4: .4byte gEnemyParty _0803D0F8: .4byte gUnknown_3004FF0 _0803D0FC: .4byte gUnknown_3004FE0 -_0803D100: .4byte gUnknown_2023BC4 +_0803D100: .4byte gActiveBattler _0803D104: .4byte CompleteOnHealthbarDone_4 thumb_func_end sub_803D018 @@ -5176,7 +5176,7 @@ sub_803D108: @ 803D108 thumb_func_start sub_803D114 sub_803D114: @ 803D114 push {r4,lr} - ldr r4, _0803D170 @ =gUnknown_2023BC4 + ldr r4, _0803D170 @ =gActiveBattler ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -5186,13 +5186,13 @@ sub_803D114: @ 803D114 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _0803D178 @ =gUnknown_2023BCE + ldr r2, _0803D178 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0803D17C @ =gUnknown_202402C + ldr r2, _0803D17C @ =gEnemyParty adds r1, r2 movs r2, 0x9 bl UpdateHealthboxAttribute @@ -5220,10 +5220,10 @@ _0803D168: pop {r0} bx r0 .align 2, 0 -_0803D170: .4byte gUnknown_2023BC4 +_0803D170: .4byte gActiveBattler _0803D174: .4byte gUnknown_3004FF0 -_0803D178: .4byte gUnknown_2023BCE -_0803D17C: .4byte gUnknown_202402C +_0803D178: .4byte gBattlerPartyIndexes +_0803D17C: .4byte gEnemyParty _0803D180: .4byte gUnknown_2024018 _0803D184: .4byte gUnknown_3004FE0 _0803D188: .4byte CompleteOnFinishedStatusAnimation_5 @@ -5232,7 +5232,7 @@ _0803D188: .4byte CompleteOnFinishedStatusAnimation_5 thumb_func_start sub_803D18C sub_803D18C: @ 803D18C push {r4,r5,lr} - ldr r5, _0803D1E4 @ =gUnknown_2023BC4 + ldr r5, _0803D1E4 @ =gActiveBattler ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -5274,7 +5274,7 @@ _0803D1DC: pop {r0} bx r0 .align 2, 0 -_0803D1E4: .4byte gUnknown_2023BC4 +_0803D1E4: .4byte gActiveBattler _0803D1E8: .4byte gUnknown_2022BC4 _0803D1EC: .4byte gUnknown_3004FE0 _0803D1F0: .4byte CompleteOnFinishedStatusAnimation_5 @@ -5373,7 +5373,7 @@ RecordedOpponentHandleCmd38: @ 803D27C push {lr} ldr r3, _0803D2A8 @ =gUnknown_2022870 ldr r1, _0803D2AC @ =gUnknown_2022BC4 - ldr r0, _0803D2B0 @ =gUnknown_2023BC4 + ldr r0, _0803D2B0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -5393,7 +5393,7 @@ RecordedOpponentHandleCmd38: @ 803D27C .align 2, 0 _0803D2A8: .4byte gUnknown_2022870 _0803D2AC: .4byte gUnknown_2022BC4 -_0803D2B0: .4byte gUnknown_2023BC4 +_0803D2B0: .4byte gActiveBattler thumb_func_end RecordedOpponentHandleCmd38 thumb_func_start RecordedOpponentHandleCmd39 @@ -5438,7 +5438,7 @@ RecordedOpponentHandleHitAnimation: @ 803D2F4 push {r4,lr} ldr r3, _0803D31C @ =gSprites ldr r2, _0803D320 @ =gUnknown_2023D44 - ldr r4, _0803D324 @ =gUnknown_2023BC4 + ldr r4, _0803D324 @ =gActiveBattler ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -5456,7 +5456,7 @@ RecordedOpponentHandleHitAnimation: @ 803D2F4 .align 2, 0 _0803D31C: .4byte gSprites _0803D320: .4byte gUnknown_2023D44 -_0803D324: .4byte gUnknown_2023BC4 +_0803D324: .4byte gActiveBattler _0803D328: ldr r1, _0803D358 @ =gUnknown_2024005 movs r0, 0x1 @@ -5499,7 +5499,7 @@ sub_803D364: @ 803D364 thumb_func_start RecordedOpponentHandlePlaySE RecordedOpponentHandlePlaySE: @ 803D370 push {r4,lr} - ldr r4, _0803D3AC @ =gUnknown_2023BC4 + ldr r4, _0803D3AC @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -5527,7 +5527,7 @@ _0803D384: pop {r0} bx r0 .align 2, 0 -_0803D3AC: .4byte gUnknown_2023BC4 +_0803D3AC: .4byte gActiveBattler _0803D3B0: .4byte gUnknown_2022BC4 thumb_func_end RecordedOpponentHandlePlaySE @@ -5535,7 +5535,7 @@ _0803D3B0: .4byte gUnknown_2022BC4 LinkOpponentHandlecmd44: @ 803D3B4 push {lr} ldr r2, _0803D3DC @ =gUnknown_2022BC4 - ldr r0, _0803D3E0 @ =gUnknown_2023BC4 + ldr r0, _0803D3E0 @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -5552,21 +5552,21 @@ LinkOpponentHandlecmd44: @ 803D3B4 bx r0 .align 2, 0 _0803D3DC: .4byte gUnknown_2022BC4 -_0803D3E0: .4byte gUnknown_2023BC4 +_0803D3E0: .4byte gActiveBattler thumb_func_end LinkOpponentHandlecmd44 thumb_func_start RecordedOpponentHandleFaintingCry RecordedOpponentHandleFaintingCry: @ 803D3E4 push {lr} - ldr r1, _0803D414 @ =gUnknown_2023BCE - ldr r0, _0803D418 @ =gUnknown_2023BC4 + ldr r1, _0803D414 @ =gBattlerPartyIndexes + ldr r0, _0803D418 @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0803D41C @ =gUnknown_202402C + ldr r1, _0803D41C @ =gEnemyParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -5579,16 +5579,16 @@ RecordedOpponentHandleFaintingCry: @ 803D3E4 pop {r0} bx r0 .align 2, 0 -_0803D414: .4byte gUnknown_2023BCE -_0803D418: .4byte gUnknown_2023BC4 -_0803D41C: .4byte gUnknown_202402C +_0803D414: .4byte gBattlerPartyIndexes +_0803D418: .4byte gActiveBattler +_0803D41C: .4byte gEnemyParty thumb_func_end RecordedOpponentHandleFaintingCry thumb_func_start RecordedOpponentHandleIntroSlide RecordedOpponentHandleIntroSlide: @ 803D420 push {lr} ldr r1, _0803D448 @ =gUnknown_2022BC4 - ldr r0, _0803D44C @ =gUnknown_2023BC4 + ldr r0, _0803D44C @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -5605,7 +5605,7 @@ RecordedOpponentHandleIntroSlide: @ 803D420 bx r0 .align 2, 0 _0803D448: .4byte gUnknown_2022BC4 -_0803D44C: .4byte gUnknown_2023BC4 +_0803D44C: .4byte gActiveBattler _0803D450: .4byte gUnknown_2023F4C thumb_func_end RecordedOpponentHandleIntroSlide @@ -5613,7 +5613,7 @@ _0803D450: .4byte gUnknown_2023F4C sub_803D454: @ 803D454 push {r4-r6,lr} ldr r5, _0803D534 @ =gUnknown_2023D44 - ldr r6, _0803D538 @ =gUnknown_2023BC4 + ldr r6, _0803D538 @ =gActiveBattler ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -5723,7 +5723,7 @@ _0803D516: bx r0 .align 2, 0 _0803D534: .4byte gUnknown_2023D44 -_0803D538: .4byte gUnknown_2023BC4 +_0803D538: .4byte gActiveBattler _0803D53C: .4byte gSprites _0803D540: .4byte sub_8075590 _0803D544: .4byte sub_803D648 @@ -5745,7 +5745,7 @@ sub_803D564: @ 803D564 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, _0803D5BC @ =gUnknown_2023BC4 + ldr r7, _0803D5BC @ =gActiveBattler ldrb r0, [r7] mov r9, r0 ldr r1, _0803D5C0 @ =gUnknown_3005090 @@ -5760,7 +5760,7 @@ sub_803D564: @ 803D564 lsls r0, 24 cmp r0, 0 beq _0803D59E - ldr r0, _0803D5C4 @ =gUnknown_2022B4C + ldr r0, _0803D5C4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -5772,7 +5772,7 @@ _0803D59E: lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _0803D5CC @ =gUnknown_2023BCE + ldr r0, _0803D5CC @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -5782,18 +5782,18 @@ _0803D59E: bl sub_803C550 b _0803D610 .align 2, 0 -_0803D5BC: .4byte gUnknown_2023BC4 +_0803D5BC: .4byte gActiveBattler _0803D5C0: .4byte gUnknown_3005090 -_0803D5C4: .4byte gUnknown_2022B4C +_0803D5C4: .4byte gBattleTypeFlags _0803D5C8: .4byte gUnknown_2022BC4 -_0803D5CC: .4byte gUnknown_2023BCE +_0803D5CC: .4byte gBattlerPartyIndexes _0803D5D0: ldr r4, _0803D634 @ =gUnknown_2022BC4 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, _0803D638 @ =gUnknown_2023BCE + ldr r6, _0803D638 @ =gBattlerPartyIndexes lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -5820,7 +5820,7 @@ _0803D5D0: strb r0, [r7] _0803D610: ldr r1, _0803D63C @ =gUnknown_3004FE0 - ldr r2, _0803D640 @ =gUnknown_2023BC4 + ldr r2, _0803D640 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -5838,9 +5838,9 @@ _0803D610: bx r0 .align 2, 0 _0803D634: .4byte gUnknown_2022BC4 -_0803D638: .4byte gUnknown_2023BCE +_0803D638: .4byte gBattlerPartyIndexes _0803D63C: .4byte gUnknown_3004FE0 -_0803D640: .4byte gUnknown_2023BC4 +_0803D640: .4byte gActiveBattler _0803D644: .4byte sub_803A9CC thumb_func_end sub_803D564 @@ -5874,7 +5874,7 @@ _0803D678: .4byte 0xfffffc00 RecordedOpponentHandleDrawPartyStatusSummary: @ 803D67C push {r4-r7,lr} ldr r1, _0803D6A4 @ =gUnknown_2022BC4 - ldr r0, _0803D6A8 @ =gUnknown_2023BC4 + ldr r0, _0803D6A8 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -5891,11 +5891,11 @@ RecordedOpponentHandleDrawPartyStatusSummary: @ 803D67C b _0803D776 .align 2, 0 _0803D6A4: .4byte gUnknown_2022BC4 -_0803D6A8: .4byte gUnknown_2023BC4 +_0803D6A8: .4byte gActiveBattler _0803D6AC: ldr r4, _0803D704 @ =gUnknown_2024018 ldr r0, [r4] - ldr r3, _0803D708 @ =gUnknown_2023BC4 + ldr r3, _0803D708 @ =gActiveBattler ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -5938,7 +5938,7 @@ _0803D6AC: b _0803D776 .align 2, 0 _0803D704: .4byte gUnknown_2024018 -_0803D708: .4byte gUnknown_2023BC4 +_0803D708: .4byte gActiveBattler _0803D70C: .4byte gUnknown_2022BC4 _0803D710: movs r0, 0x3F @@ -6010,7 +6010,7 @@ sub_803D790: @ 803D790 push {r4,lr} ldr r4, _0803D7D0 @ =gUnknown_2024018 ldr r0, [r4] - ldr r3, _0803D7D4 @ =gUnknown_2023BC4 + ldr r3, _0803D7D4 @ =gActiveBattler ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -6040,7 +6040,7 @@ _0803D7C8: bx r0 .align 2, 0 _0803D7D0: .4byte gUnknown_2024018 -_0803D7D4: .4byte gUnknown_2023BC4 +_0803D7D4: .4byte gActiveBattler thumb_func_end sub_803D790 thumb_func_start RecordedOpponentHandleCmd49 @@ -6048,7 +6048,7 @@ RecordedOpponentHandleCmd49: @ 803D7D8 push {lr} ldr r0, _0803D814 @ =gUnknown_2024018 ldr r1, [r0] - ldr r0, _0803D818 @ =gUnknown_2023BC4 + ldr r0, _0803D818 @ =gActiveBattler ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -6076,7 +6076,7 @@ _0803D80A: bx r0 .align 2, 0 _0803D814: .4byte gUnknown_2024018 -_0803D818: .4byte gUnknown_2023BC4 +_0803D818: .4byte gActiveBattler _0803D81C: .4byte gUnknown_3005090 _0803D820: .4byte gUnknown_2024000 _0803D824: .4byte sub_80491B0 @@ -6093,7 +6093,7 @@ sub_803D828: @ 803D828 thumb_func_start RecordedOpponentHandleSpriteInvisibility RecordedOpponentHandleSpriteInvisibility: @ 803D834 push {r4,lr} - ldr r4, _0803D884 @ =gUnknown_2023BC4 + ldr r4, _0803D884 @ =gActiveBattler ldrb r0, [r4] bl sub_8075224 lsls r0, 24 @@ -6131,7 +6131,7 @@ _0803D87A: pop {r0} bx r0 .align 2, 0 -_0803D884: .4byte gUnknown_2023BC4 +_0803D884: .4byte gActiveBattler _0803D888: .4byte gSprites _0803D88C: .4byte gUnknown_2023D44 _0803D890: .4byte gUnknown_2022BC4 @@ -6141,7 +6141,7 @@ _0803D890: .4byte gUnknown_2022BC4 RecordedOpponentHandleBattleAnimation: @ 803D894 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _0803D8D8 @ =gUnknown_2023BC4 + ldr r6, _0803D8D8 @ =gActiveBattler ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -6171,7 +6171,7 @@ RecordedOpponentHandleBattleAnimation: @ 803D894 bl RecordedOpponentBufferExecCompleted b _0803D8EC .align 2, 0 -_0803D8D8: .4byte gUnknown_2023BC4 +_0803D8D8: .4byte gActiveBattler _0803D8DC: .4byte gUnknown_2022BC4 _0803D8E0: ldr r0, _0803D8F4 @ =gUnknown_3004FE0 @@ -6210,7 +6210,7 @@ sub_803D908: @ 803D908 RecordedOpponentHandleCmd55: @ 803D914 push {lr} ldr r1, _0803D930 @ =gUnknown_2022BC4 - ldr r0, _0803D934 @ =gUnknown_2023BC4 + ldr r0, _0803D934 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -6223,7 +6223,7 @@ RecordedOpponentHandleCmd55: @ 803D914 b _0803D944 .align 2, 0 _0803D930: .4byte gUnknown_2022BC4 -_0803D934: .4byte gUnknown_2023BC4 +_0803D934: .4byte gActiveBattler _0803D938: .4byte gUnknown_2023E8A _0803D93C: ldr r0, _0803D968 @ =gUnknown_2023E8A @@ -6237,7 +6237,7 @@ _0803D944: bl BeginFastPaletteFade bl RecordedOpponentBufferExecCompleted ldr r1, _0803D96C @ =gUnknown_3004FE0 - ldr r0, _0803D970 @ =gUnknown_2023BC4 + ldr r0, _0803D970 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -6248,7 +6248,7 @@ _0803D944: .align 2, 0 _0803D968: .4byte gUnknown_2023E8A _0803D96C: .4byte gUnknown_3004FE0 -_0803D970: .4byte gUnknown_2023BC4 +_0803D970: .4byte gActiveBattler _0803D974: .4byte sub_802F6A8 thumb_func_end RecordedOpponentHandleCmd55 diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s index 33d0f6ff3..42682e47d 100644 --- a/asm/battle_controller_link_partner.s +++ b/asm/battle_controller_link_partner.s @@ -13,7 +13,7 @@ nullsub_77: @ 80D4200 thumb_func_start sub_80D4204 sub_80D4204: @ 80D4204 ldr r1, _080D4214 @ =gUnknown_3004FE0 - ldr r0, _080D4218 @ =gUnknown_2023BC4 + ldr r0, _080D4218 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -22,7 +22,7 @@ sub_80D4204: @ 80D4204 bx lr .align 2, 0 _080D4214: .4byte gUnknown_3004FE0 -_080D4218: .4byte gUnknown_2023BC4 +_080D4218: .4byte gActiveBattler _080D421C: .4byte LinkPartnerBufferRunCommand thumb_func_end sub_80D4204 @@ -30,8 +30,8 @@ _080D421C: .4byte LinkPartnerBufferRunCommand LinkPartnerBufferRunCommand: @ 80D4220 push {lr} ldr r2, _080D4254 @ =gUnknown_2023BC8 - ldr r1, _080D4258 @ =gUnknown_825E45C - ldr r0, _080D425C @ =gUnknown_2023BC4 + ldr r1, _080D4258 @ =gBitTable + ldr r0, _080D425C @ =gActiveBattler ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -55,8 +55,8 @@ LinkPartnerBufferRunCommand: @ 80D4220 b _080D426C .align 2, 0 _080D4254: .4byte gUnknown_2023BC8 -_080D4258: .4byte gUnknown_825E45C -_080D425C: .4byte gUnknown_2023BC4 +_080D4258: .4byte gBitTable +_080D425C: .4byte gActiveBattler _080D4260: .4byte gUnknown_2022BC4 _080D4264: .4byte gUnknown_83FB134 _080D4268: @@ -71,7 +71,7 @@ sub_80D4270: @ 80D4270 push {lr} ldr r2, _080D4298 @ =gSprites ldr r1, _080D429C @ =gUnknown_2023D44 - ldr r0, _080D42A0 @ =gUnknown_2023BC4 + ldr r0, _080D42A0 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -91,7 +91,7 @@ _080D4294: .align 2, 0 _080D4298: .4byte gSprites _080D429C: .4byte gUnknown_2023D44 -_080D42A0: .4byte gUnknown_2023BC4 +_080D42A0: .4byte gActiveBattler _080D42A4: .4byte SpriteCallbackDummy thumb_func_end sub_80D4270 @@ -100,7 +100,7 @@ sub_80D42A8: @ 80D42A8 push {r4-r6,lr} ldr r6, _080D4300 @ =gSprites ldr r5, _080D4304 @ =gUnknown_2023D44 - ldr r4, _080D4308 @ =gUnknown_2023BC4 + ldr r4, _080D4308 @ =gActiveBattler ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -140,7 +140,7 @@ _080D42F8: .align 2, 0 _080D4300: .4byte gSprites _080D4304: .4byte gUnknown_2023D44 -_080D4308: .4byte gUnknown_2023BC4 +_080D4308: .4byte gActiveBattler _080D430C: .4byte SpriteCallbackDummy thumb_func_end sub_80D42A8 @@ -149,7 +149,7 @@ sub_80D4310: @ 80D4310 push {r4,lr} ldr r4, _080D4350 @ =gUnknown_2024018 ldr r1, [r4] - ldr r3, _080D4354 @ =gUnknown_2023BC4 + ldr r3, _080D4354 @ =gActiveBattler ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -179,7 +179,7 @@ _080D4348: bx r0 .align 2, 0 _080D4350: .4byte gUnknown_2024018 -_080D4354: .4byte gUnknown_2023BC4 +_080D4354: .4byte gActiveBattler thumb_func_end sub_80D4310 thumb_func_start sub_80D4358 @@ -194,7 +194,7 @@ sub_80D4358: @ 80D4358 lsls r0, 24 cmp r0, 0 beq _080D43B0 - ldr r0, _080D439C @ =gUnknown_2022B4C + ldr r0, _080D439C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -203,7 +203,7 @@ sub_80D4358: @ 80D4358 _080D437C: ldr r2, _080D43A0 @ =gSprites ldr r1, _080D43A4 @ =gUnknown_3004FF0 - ldr r0, _080D43A8 @ =gUnknown_2023BC4 + ldr r0, _080D43A8 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -218,15 +218,15 @@ _080D437C: bne _080D43E8 b _080D43E6 .align 2, 0 -_080D439C: .4byte gUnknown_2022B4C +_080D439C: .4byte gBattleTypeFlags _080D43A0: .4byte gSprites _080D43A4: .4byte gUnknown_3004FF0 -_080D43A8: .4byte gUnknown_2023BC4 +_080D43A8: .4byte gActiveBattler _080D43AC: .4byte SpriteCallbackDummy _080D43B0: ldr r2, _080D4420 @ =gSprites ldr r5, _080D4424 @ =gUnknown_3004FF0 - ldr r0, _080D4428 @ =gUnknown_2023BC4 + ldr r0, _080D4428 @ =gActiveBattler ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -264,7 +264,7 @@ _080D43F4: beq _080D441A ldr r0, _080D4430 @ =gUnknown_2024018 ldr r0, [r0] - ldr r3, _080D4428 @ =gUnknown_2023BC4 + ldr r3, _080D4428 @ =gActiveBattler ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -286,7 +286,7 @@ _080D441A: .align 2, 0 _080D4420: .4byte gSprites _080D4424: .4byte gUnknown_3004FF0 -_080D4428: .4byte gUnknown_2023BC4 +_080D4428: .4byte gActiveBattler _080D442C: .4byte SpriteCallbackDummy _080D4430: .4byte gUnknown_2024018 _080D4434: .4byte gUnknown_3004FE0 @@ -299,7 +299,7 @@ sub_80D443C: @ 80D443C ldr r0, _080D4568 @ =gUnknown_2024018 mov r12, r0 ldr r0, [r0] - ldr r6, _080D456C @ =gUnknown_2023BC4 + ldr r6, _080D456C @ =gActiveBattler ldrb r2, [r6] ldr r4, [r0, 0x4] lsls r0, r2, 1 @@ -348,7 +348,7 @@ _080D4460: lsls r0, 24 cmp r0, 0 beq _080D4500 - ldr r0, _080D4570 @ =gUnknown_2022B4C + ldr r0, _080D4570 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -371,13 +371,13 @@ _080D4460: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _080D4580 @ =gUnknown_2023BCE + ldr r2, _080D4580 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080D4584 @ =gUnknown_2024284 + ldr r2, _080D4584 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -391,7 +391,7 @@ _080D4460: bl SetHealthboxSpriteVisible _080D4500: ldr r1, _080D4574 @ =gUnknown_3004FFC - ldr r4, _080D456C @ =gUnknown_2023BC4 + ldr r4, _080D456C @ =gActiveBattler ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -405,13 +405,13 @@ _080D4500: ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _080D4580 @ =gUnknown_2023BCE + ldr r2, _080D4580 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080D4584 @ =gUnknown_2024284 + ldr r2, _080D4584 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -441,13 +441,13 @@ _080D4562: bx r0 .align 2, 0 _080D4568: .4byte gUnknown_2024018 -_080D456C: .4byte gUnknown_2023BC4 -_080D4570: .4byte gUnknown_2022B4C +_080D456C: .4byte gActiveBattler +_080D4570: .4byte gBattleTypeFlags _080D4574: .4byte gUnknown_3004FFC _080D4578: .4byte gSprites _080D457C: .4byte gUnknown_3004FF0 -_080D4580: .4byte gUnknown_2023BCE -_080D4584: .4byte gUnknown_2024284 +_080D4580: .4byte gBattlerPartyIndexes +_080D4584: .4byte gPlayerParty _080D4588: .4byte gUnknown_3004FE0 _080D458C: .4byte sub_80D4358 thumb_func_end sub_80D443C @@ -457,7 +457,7 @@ sub_80D4590: @ 80D4590 push {lr} ldr r2, _080D45C4 @ =gSprites ldr r1, _080D45C8 @ =gUnknown_2023D44 - ldr r0, _080D45CC @ =gUnknown_2023BC4 + ldr r0, _080D45CC @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -482,13 +482,13 @@ _080D45BE: .align 2, 0 _080D45C4: .4byte gSprites _080D45C8: .4byte gUnknown_2023D44 -_080D45CC: .4byte gUnknown_2023BC4 +_080D45CC: .4byte gActiveBattler thumb_func_end sub_80D4590 thumb_func_start sub_80D45D0 sub_80D45D0: @ 80D45D0 push {r4-r6,lr} - ldr r5, _080D4610 @ =gUnknown_2023BC4 + ldr r5, _080D4610 @ =gActiveBattler ldrb r0, [r5] ldr r6, _080D4614 @ =gUnknown_3004FF0 adds r1, r0, r6 @@ -516,17 +516,17 @@ sub_80D45D0: @ 80D45D0 bl sub_8048440 b _080D4632 .align 2, 0 -_080D4610: .4byte gUnknown_2023BC4 +_080D4610: .4byte gActiveBattler _080D4614: .4byte gUnknown_3004FF0 _080D4618: - ldr r2, _080D4638 @ =gUnknown_2023BCE + ldr r2, _080D4638 @ =gBattlerPartyIndexes ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _080D463C @ =gUnknown_2024284 + ldr r2, _080D463C @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange bl sub_80D49E8 @@ -535,8 +535,8 @@ _080D4632: pop {r0} bx r0 .align 2, 0 -_080D4638: .4byte gUnknown_2023BCE -_080D463C: .4byte gUnknown_2024284 +_080D4638: .4byte gBattlerPartyIndexes +_080D463C: .4byte gPlayerParty thumb_func_end sub_80D45D0 thumb_func_start sub_80D4640 @@ -544,7 +544,7 @@ sub_80D4640: @ 80D4640 push {r4-r6,lr} ldr r6, _080D4698 @ =gSprites ldr r5, _080D469C @ =gUnknown_2023D44 - ldr r4, _080D46A0 @ =gUnknown_2023BC4 + ldr r4, _080D46A0 @ =gActiveBattler ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -584,7 +584,7 @@ _080D4690: .align 2, 0 _080D4698: .4byte gSprites _080D469C: .4byte gUnknown_2023D44 -_080D46A0: .4byte gUnknown_2023BC4 +_080D46A0: .4byte gActiveBattler _080D46A4: .4byte gUnknown_3004FF0 thumb_func_end sub_80D4640 @@ -593,7 +593,7 @@ sub_80D46A8: @ 80D46A8 push {r4-r6,lr} ldr r0, _080D4704 @ =gUnknown_2024018 ldr r0, [r0] - ldr r6, _080D4708 @ =gUnknown_2023BC4 + ldr r6, _080D4708 @ =gActiveBattler ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -634,7 +634,7 @@ _080D46FC: bx r0 .align 2, 0 _080D4704: .4byte gUnknown_2024018 -_080D4708: .4byte gUnknown_2023BC4 +_080D4708: .4byte gActiveBattler _080D470C: .4byte gUnknown_2023D44 _080D4710: .4byte gSprites _080D4714: .4byte gUnknown_3004FF0 @@ -658,7 +658,7 @@ _080D472A: sub_80D4730: @ 80D4730 push {r4,lr} ldr r1, _080D476C @ =gUnknown_2023D44 - ldr r0, _080D4770 @ =gUnknown_2023BC4 + ldr r0, _080D4770 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -686,7 +686,7 @@ sub_80D4730: @ 80D4730 b _080D47A6 .align 2, 0 _080D476C: .4byte gUnknown_2023D44 -_080D4770: .4byte gUnknown_2023BC4 +_080D4770: .4byte gActiveBattler _080D4774: .4byte gSprites _080D4778: .4byte gUnknown_2024005 _080D477C: @@ -723,7 +723,7 @@ sub_80D47AC: @ 80D47AC push {r4,lr} ldr r2, _080D4800 @ =gSprites ldr r0, _080D4804 @ =gUnknown_3004FF0 - ldr r4, _080D4808 @ =gUnknown_2023BC4 + ldr r4, _080D4808 @ =gActiveBattler ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -765,7 +765,7 @@ _080D47F8: .align 2, 0 _080D4800: .4byte gSprites _080D4804: .4byte gUnknown_3004FF0 -_080D4808: .4byte gUnknown_2023BC4 +_080D4808: .4byte gActiveBattler _080D480C: .4byte SpriteCallbackDummy _080D4810: .4byte gUnknown_2024018 _080D4814: .4byte gUnknown_3004FE0 @@ -777,7 +777,7 @@ sub_80D481C: @ 80D481C push {lr} ldr r0, _080D4844 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080D4848 @ =gUnknown_2023BC4 + ldr r0, _080D4848 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -795,7 +795,7 @@ _080D483E: bx r0 .align 2, 0 _080D4844: .4byte gUnknown_2024018 -_080D4848: .4byte gUnknown_2023BC4 +_080D4848: .4byte gActiveBattler thumb_func_end sub_80D481C thumb_func_start sub_80D484C @@ -805,7 +805,7 @@ sub_80D484C: @ 80D484C push {r7} ldr r3, _080D4918 @ =gUnknown_2024018 ldr r0, [r3] - ldr r7, _080D491C @ =gUnknown_2023BC4 + ldr r7, _080D491C @ =gActiveBattler ldrb r1, [r7] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -841,7 +841,7 @@ sub_80D484C: @ 80D484C ldr r0, _080D4924 @ =c3_0802FDF4 movs r1, 0xA bl CreateTask - ldr r0, _080D4928 @ =gUnknown_2023BCE + ldr r0, _080D4928 @ =gBattlerPartyIndexes mov r8, r0 ldrb r1, [r7] lsls r0, r1, 1 @@ -849,7 +849,7 @@ sub_80D484C: @ 80D484C ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080D492C @ =gUnknown_2024284 + ldr r5, _080D492C @ =gPlayerParty adds r0, r5 bl HandleLowHpMusicChange ldr r1, _080D4930 @ =gUnknown_2023D44 @@ -896,11 +896,11 @@ _080D490E: bx r0 .align 2, 0 _080D4918: .4byte gUnknown_2024018 -_080D491C: .4byte gUnknown_2023BC4 +_080D491C: .4byte gActiveBattler _080D4920: .4byte 0x000027f9 _080D4924: .4byte c3_0802FDF4 -_080D4928: .4byte gUnknown_2023BCE -_080D492C: .4byte gUnknown_2024284 +_080D4928: .4byte gBattlerPartyIndexes +_080D492C: .4byte gPlayerParty _080D4930: .4byte gUnknown_2023D44 _080D4934: .4byte gSprites _080D4938: .4byte gUnknown_3004FF0 @@ -913,7 +913,7 @@ sub_80D4944: @ 80D4944 push {r4-r6,lr} ldr r6, _080D49C4 @ =gUnknown_2024018 ldr r0, [r6] - ldr r4, _080D49C8 @ =gUnknown_2023BC4 + ldr r4, _080D49C8 @ =gActiveBattler ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -925,12 +925,12 @@ sub_80D4944: @ 80D4944 ands r0, r1 cmp r0, 0 bne _080D4976 - ldr r0, _080D49CC @ =gUnknown_2023BCE + ldr r0, _080D49CC @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080D49D0 @ =gUnknown_2024284 + ldr r0, _080D49D0 @ =gPlayerParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -975,9 +975,9 @@ _080D49BC: bx r0 .align 2, 0 _080D49C4: .4byte gUnknown_2024018 -_080D49C8: .4byte gUnknown_2023BC4 -_080D49CC: .4byte gUnknown_2023BCE -_080D49D0: .4byte gUnknown_2024284 +_080D49C8: .4byte gActiveBattler +_080D49CC: .4byte gBattlerPartyIndexes +_080D49D0: .4byte gPlayerParty _080D49D4: .4byte gSprites _080D49D8: .4byte gUnknown_3004FFC _080D49DC: .4byte SpriteCallbackDummy @@ -990,13 +990,13 @@ sub_80D49E8: @ 80D49E8 push {r4,lr} sub sp, 0x4 ldr r1, _080D4A28 @ =gUnknown_3004FE0 - ldr r4, _080D4A2C @ =gUnknown_2023BC4 + ldr r4, _080D4A2C @ =gActiveBattler ldrb r0, [r4] lsls r0, 2 adds r0, r1 ldr r1, _080D4A30 @ =LinkPartnerBufferRunCommand str r1, [r0] - ldr r0, _080D4A34 @ =gUnknown_2022B4C + ldr r0, _080D4A34 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -1018,13 +1018,13 @@ sub_80D49E8: @ 80D49E8 b _080D4A4E .align 2, 0 _080D4A28: .4byte gUnknown_3004FE0 -_080D4A2C: .4byte gUnknown_2023BC4 +_080D4A2C: .4byte gActiveBattler _080D4A30: .4byte LinkPartnerBufferRunCommand -_080D4A34: .4byte gUnknown_2022B4C +_080D4A34: .4byte gBattleTypeFlags _080D4A38: .4byte gUnknown_2022BC4 _080D4A3C: ldr r2, _080D4A58 @ =gUnknown_2023BC8 - ldr r1, _080D4A5C @ =gUnknown_825E45C + ldr r1, _080D4A5C @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -1039,7 +1039,7 @@ _080D4A4E: bx r0 .align 2, 0 _080D4A58: .4byte gUnknown_2023BC8 -_080D4A5C: .4byte gUnknown_825E45C +_080D4A5C: .4byte gBitTable thumb_func_end sub_80D49E8 thumb_func_start sub_80D4A60 @@ -1047,7 +1047,7 @@ sub_80D4A60: @ 80D4A60 push {lr} ldr r0, _080D4A88 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080D4A8C @ =gUnknown_2023BC4 + ldr r0, _080D4A8C @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1065,7 +1065,7 @@ _080D4A82: bx r0 .align 2, 0 _080D4A88: .4byte gUnknown_2024018 -_080D4A8C: .4byte gUnknown_2023BC4 +_080D4A8C: .4byte gActiveBattler thumb_func_end sub_80D4A60 thumb_func_start sub_80D4A90 @@ -1073,7 +1073,7 @@ sub_80D4A90: @ 80D4A90 push {lr} ldr r0, _080D4AB8 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080D4ABC @ =gUnknown_2023BC4 + ldr r0, _080D4ABC @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1091,7 +1091,7 @@ _080D4AB2: bx r0 .align 2, 0 _080D4AB8: .4byte gUnknown_2024018 -_080D4ABC: .4byte gUnknown_2023BC4 +_080D4ABC: .4byte gActiveBattler thumb_func_end sub_80D4A90 thumb_func_start LinkPartnerHandleGetAttributes @@ -1100,7 +1100,7 @@ LinkPartnerHandleGetAttributes: @ 80D4AC0 sub sp, 0x100 movs r6, 0 ldr r1, _080D4AEC @ =gUnknown_2022BC4 - ldr r0, _080D4AF0 @ =gUnknown_2023BC4 + ldr r0, _080D4AF0 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -1108,7 +1108,7 @@ LinkPartnerHandleGetAttributes: @ 80D4AC0 ldrb r0, [r1] cmp r0, 0 bne _080D4AF8 - ldr r0, _080D4AF4 @ =gUnknown_2023BCE + ldr r0, _080D4AF4 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -1118,8 +1118,8 @@ LinkPartnerHandleGetAttributes: @ 80D4AC0 b _080D4B1A .align 2, 0 _080D4AEC: .4byte gUnknown_2022BC4 -_080D4AF0: .4byte gUnknown_2023BC4 -_080D4AF4: .4byte gUnknown_2023BCE +_080D4AF0: .4byte gActiveBattler +_080D4AF4: .4byte gBattlerPartyIndexes _080D4AF8: ldrb r4, [r1] movs r5, 0 @@ -1165,7 +1165,7 @@ dp01_getattr_by_ch1_for_player_pokemon: @ 80D4B34 lsrs r5, r0, 24 movs r6, 0 ldr r2, _080D4B68 @ =gUnknown_2022BC4 - ldr r3, _080D4B6C @ =gUnknown_2023BC4 + ldr r3, _080D4B6C @ =gActiveBattler ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -1182,7 +1182,7 @@ _080D4B5E: mov pc, r0 .align 2, 0 _080D4B68: .4byte gUnknown_2022BC4 -_080D4B6C: .4byte gUnknown_2023BC4 +_080D4B6C: .4byte gActiveBattler _080D4B70: .4byte _080D4B74 .align 2, 0 _080D4B74: @@ -1250,7 +1250,7 @@ _080D4C64: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080D4E78 @ =gUnknown_2024284 + ldr r0, _080D4E78 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -1303,7 +1303,7 @@ _080D4CB0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080D4E78 @ =gUnknown_2024284 + ldr r0, _080D4E78 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -1487,28 +1487,28 @@ _080D4E68: bls _080D4E68 b _080D52CA .align 2, 0 -_080D4E78: .4byte gUnknown_2024284 +_080D4E78: .4byte gPlayerParty _080D4E7C: .4byte 0xfffffc1f _080D4E80: .4byte 0xfff07fff _080D4E84: .4byte 0xfffffe0f _080D4E88: movs r0, 0x64 muls r0, r5 - ldr r1, _080D4E94 @ =gUnknown_2024284 + ldr r1, _080D4E94 @ =gPlayerParty adds r0, r1 movs r1, 0xB b _080D5202 .align 2, 0 -_080D4E94: .4byte gUnknown_2024284 +_080D4E94: .4byte gPlayerParty _080D4E98: movs r0, 0x64 muls r0, r5 - ldr r1, _080D4EA4 @ =gUnknown_2024284 + ldr r1, _080D4EA4 @ =gPlayerParty adds r0, r1 movs r1, 0xC b _080D5202 .align 2, 0 -_080D4EA4: .4byte gUnknown_2024284 +_080D4EA4: .4byte gPlayerParty _080D4EA8: movs r6, 0 add r2, sp, 0x58 @@ -1518,7 +1518,7 @@ _080D4EA8: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080D4F0C @ =gUnknown_2024284 + ldr r0, _080D4F0C @ =gPlayerParty adds r4, r1, r0 mov r8, r9 _080D4EBE: @@ -1542,7 +1542,7 @@ _080D4EBE: ble _080D4EBE movs r0, 0x64 muls r0, r5 - ldr r1, _080D4F0C @ =gUnknown_2024284 + ldr r1, _080D4F0C @ =gPlayerParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -1560,11 +1560,11 @@ _080D4EFC: bls _080D4EFC b _080D52CA .align 2, 0 -_080D4F0C: .4byte gUnknown_2024284 +_080D4F0C: .4byte gPlayerParty _080D4F10: movs r0, 0x64 muls r0, r5 - ldr r1, _080D4F28 @ =gUnknown_2024284 + ldr r1, _080D4F28 @ =gPlayerParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -1574,13 +1574,13 @@ _080D4F10: adds r1, 0x9 b _080D5202 .align 2, 0 -_080D4F28: .4byte gUnknown_2024284 +_080D4F28: .4byte gPlayerParty _080D4F2C: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _080D4F64 @ =gUnknown_2024284 + ldr r2, _080D4F64 @ =gPlayerParty mov r8, r2 _080D4F38: adds r1, r6, 0 @@ -1595,7 +1595,7 @@ _080D4F38: ble _080D4F38 movs r0, 0x64 muls r0, r5 - ldr r1, _080D4F64 @ =gUnknown_2024284 + ldr r1, _080D4F64 @ =gPlayerParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -1604,11 +1604,11 @@ _080D4F38: adds r6, 0x1 b _080D52CA .align 2, 0 -_080D4F64: .4byte gUnknown_2024284 +_080D4F64: .4byte gPlayerParty _080D4F68: movs r0, 0x64 muls r0, r5 - ldr r1, _080D4F80 @ =gUnknown_2024284 + ldr r1, _080D4F80 @ =gPlayerParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -1618,20 +1618,20 @@ _080D4F68: adds r1, 0x8 b _080D52C2 .align 2, 0 -_080D4F80: .4byte gUnknown_2024284 +_080D4F80: .4byte gPlayerParty _080D4F84: movs r0, 0x64 muls r0, r5 - ldr r1, _080D4F90 @ =gUnknown_2024284 + ldr r1, _080D4F90 @ =gPlayerParty adds r0, r1 movs r1, 0x1 b _080D4F9E .align 2, 0 -_080D4F90: .4byte gUnknown_2024284 +_080D4F90: .4byte gPlayerParty _080D4F94: movs r0, 0x64 muls r0, r5 - ldr r1, _080D4FC0 @ =gUnknown_2024284 + ldr r1, _080D4FC0 @ =gPlayerParty adds r0, r1 movs r1, 0x19 _080D4F9E: @@ -1651,120 +1651,120 @@ _080D4F9E: movs r6, 0x3 b _080D52CA .align 2, 0 -_080D4FC0: .4byte gUnknown_2024284 +_080D4FC0: .4byte gPlayerParty _080D4FC4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D4FD0 @ =gUnknown_2024284 + ldr r1, _080D4FD0 @ =gPlayerParty adds r0, r1 movs r1, 0x1A b _080D52C2 .align 2, 0 -_080D4FD0: .4byte gUnknown_2024284 +_080D4FD0: .4byte gPlayerParty _080D4FD4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D4FE0 @ =gUnknown_2024284 + ldr r1, _080D4FE0 @ =gPlayerParty adds r0, r1 movs r1, 0x1B b _080D52C2 .align 2, 0 -_080D4FE0: .4byte gUnknown_2024284 +_080D4FE0: .4byte gPlayerParty _080D4FE4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D4FF0 @ =gUnknown_2024284 + ldr r1, _080D4FF0 @ =gPlayerParty adds r0, r1 movs r1, 0x1C b _080D52C2 .align 2, 0 -_080D4FF0: .4byte gUnknown_2024284 +_080D4FF0: .4byte gPlayerParty _080D4FF4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5000 @ =gUnknown_2024284 + ldr r1, _080D5000 @ =gPlayerParty adds r0, r1 movs r1, 0x1D b _080D52C2 .align 2, 0 -_080D5000: .4byte gUnknown_2024284 +_080D5000: .4byte gPlayerParty _080D5004: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5010 @ =gUnknown_2024284 + ldr r1, _080D5010 @ =gPlayerParty adds r0, r1 movs r1, 0x1E b _080D52C2 .align 2, 0 -_080D5010: .4byte gUnknown_2024284 +_080D5010: .4byte gPlayerParty _080D5014: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5020 @ =gUnknown_2024284 + ldr r1, _080D5020 @ =gPlayerParty adds r0, r1 movs r1, 0x1F b _080D52C2 .align 2, 0 -_080D5020: .4byte gUnknown_2024284 +_080D5020: .4byte gPlayerParty _080D5024: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5030 @ =gUnknown_2024284 + ldr r1, _080D5030 @ =gPlayerParty adds r0, r1 movs r1, 0x20 b _080D52C2 .align 2, 0 -_080D5030: .4byte gUnknown_2024284 +_080D5030: .4byte gPlayerParty _080D5034: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5040 @ =gUnknown_2024284 + ldr r1, _080D5040 @ =gPlayerParty adds r0, r1 movs r1, 0x22 b _080D52C2 .align 2, 0 -_080D5040: .4byte gUnknown_2024284 +_080D5040: .4byte gPlayerParty _080D5044: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5050 @ =gUnknown_2024284 + ldr r1, _080D5050 @ =gPlayerParty adds r0, r1 movs r1, 0x23 b _080D52C2 .align 2, 0 -_080D5050: .4byte gUnknown_2024284 +_080D5050: .4byte gPlayerParty _080D5054: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5060 @ =gUnknown_2024284 + ldr r1, _080D5060 @ =gPlayerParty adds r0, r1 movs r1, 0x24 b _080D52C2 .align 2, 0 -_080D5060: .4byte gUnknown_2024284 +_080D5060: .4byte gPlayerParty _080D5064: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5070 @ =gUnknown_2024284 + ldr r1, _080D5070 @ =gPlayerParty adds r0, r1 movs r1, 0x25 b _080D52C2 .align 2, 0 -_080D5070: .4byte gUnknown_2024284 +_080D5070: .4byte gPlayerParty _080D5074: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5080 @ =gUnknown_2024284 + ldr r1, _080D5080 @ =gPlayerParty adds r0, r1 movs r1, 0x26 b _080D52C2 .align 2, 0 -_080D5080: .4byte gUnknown_2024284 +_080D5080: .4byte gPlayerParty _080D5084: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080D50D0 @ =gUnknown_2024284 + ldr r0, _080D50D0 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -1793,83 +1793,83 @@ _080D5084: movs r6, 0x6 b _080D52CA .align 2, 0 -_080D50D0: .4byte gUnknown_2024284 +_080D50D0: .4byte gPlayerParty _080D50D4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D50E0 @ =gUnknown_2024284 + ldr r1, _080D50E0 @ =gPlayerParty adds r0, r1 movs r1, 0x27 b _080D52C2 .align 2, 0 -_080D50E0: .4byte gUnknown_2024284 +_080D50E0: .4byte gPlayerParty _080D50E4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D50F0 @ =gUnknown_2024284 + ldr r1, _080D50F0 @ =gPlayerParty adds r0, r1 movs r1, 0x28 b _080D52C2 .align 2, 0 -_080D50F0: .4byte gUnknown_2024284 +_080D50F0: .4byte gPlayerParty _080D50F4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5100 @ =gUnknown_2024284 + ldr r1, _080D5100 @ =gPlayerParty adds r0, r1 movs r1, 0x29 b _080D52C2 .align 2, 0 -_080D5100: .4byte gUnknown_2024284 +_080D5100: .4byte gPlayerParty _080D5104: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5110 @ =gUnknown_2024284 + ldr r1, _080D5110 @ =gPlayerParty adds r0, r1 movs r1, 0x2A b _080D52C2 .align 2, 0 -_080D5110: .4byte gUnknown_2024284 +_080D5110: .4byte gPlayerParty _080D5114: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5120 @ =gUnknown_2024284 + ldr r1, _080D5120 @ =gPlayerParty adds r0, r1 movs r1, 0x2B b _080D52C2 .align 2, 0 -_080D5120: .4byte gUnknown_2024284 +_080D5120: .4byte gPlayerParty _080D5124: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5130 @ =gUnknown_2024284 + ldr r1, _080D5130 @ =gPlayerParty adds r0, r1 movs r1, 0x2C b _080D52C2 .align 2, 0 -_080D5130: .4byte gUnknown_2024284 +_080D5130: .4byte gPlayerParty _080D5134: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5140 @ =gUnknown_2024284 + ldr r1, _080D5140 @ =gPlayerParty adds r0, r1 movs r1, 0 b _080D515E .align 2, 0 -_080D5140: .4byte gUnknown_2024284 +_080D5140: .4byte gPlayerParty _080D5144: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5150 @ =gUnknown_2024284 + ldr r1, _080D5150 @ =gPlayerParty adds r0, r1 movs r1, 0x9 b _080D5202 .align 2, 0 -_080D5150: .4byte gUnknown_2024284 +_080D5150: .4byte gPlayerParty _080D5154: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5184 @ =gUnknown_2024284 + ldr r1, _080D5184 @ =gPlayerParty adds r0, r1 movs r1, 0x37 _080D515E: @@ -1891,74 +1891,74 @@ _080D515E: movs r6, 0x4 b _080D52CA .align 2, 0 -_080D5184: .4byte gUnknown_2024284 +_080D5184: .4byte gPlayerParty _080D5188: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5194 @ =gUnknown_2024284 + ldr r1, _080D5194 @ =gPlayerParty adds r0, r1 movs r1, 0x38 b _080D52C2 .align 2, 0 -_080D5194: .4byte gUnknown_2024284 +_080D5194: .4byte gPlayerParty _080D5198: movs r0, 0x64 muls r0, r5 - ldr r1, _080D51A4 @ =gUnknown_2024284 + ldr r1, _080D51A4 @ =gPlayerParty adds r0, r1 movs r1, 0x39 b _080D5202 .align 2, 0 -_080D51A4: .4byte gUnknown_2024284 +_080D51A4: .4byte gPlayerParty _080D51A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080D51B4 @ =gUnknown_2024284 + ldr r1, _080D51B4 @ =gPlayerParty adds r0, r1 movs r1, 0x3A b _080D5202 .align 2, 0 -_080D51B4: .4byte gUnknown_2024284 +_080D51B4: .4byte gPlayerParty _080D51B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080D51C4 @ =gUnknown_2024284 + ldr r1, _080D51C4 @ =gPlayerParty adds r0, r1 movs r1, 0x3B b _080D5202 .align 2, 0 -_080D51C4: .4byte gUnknown_2024284 +_080D51C4: .4byte gPlayerParty _080D51C8: movs r0, 0x64 muls r0, r5 - ldr r1, _080D51D4 @ =gUnknown_2024284 + ldr r1, _080D51D4 @ =gPlayerParty adds r0, r1 movs r1, 0x3C b _080D5202 .align 2, 0 -_080D51D4: .4byte gUnknown_2024284 +_080D51D4: .4byte gPlayerParty _080D51D8: movs r0, 0x64 muls r0, r5 - ldr r1, _080D51E4 @ =gUnknown_2024284 + ldr r1, _080D51E4 @ =gPlayerParty adds r0, r1 movs r1, 0x3D b _080D5202 .align 2, 0 -_080D51E4: .4byte gUnknown_2024284 +_080D51E4: .4byte gPlayerParty _080D51E8: movs r0, 0x64 muls r0, r5 - ldr r1, _080D51F4 @ =gUnknown_2024284 + ldr r1, _080D51F4 @ =gPlayerParty adds r0, r1 movs r1, 0x3E b _080D5202 .align 2, 0 -_080D51F4: .4byte gUnknown_2024284 +_080D51F4: .4byte gPlayerParty _080D51F8: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5214 @ =gUnknown_2024284 + ldr r1, _080D5214 @ =gPlayerParty adds r0, r1 movs r1, 0x3F _080D5202: @@ -1971,101 +1971,101 @@ _080D5202: movs r6, 0x2 b _080D52CA .align 2, 0 -_080D5214: .4byte gUnknown_2024284 +_080D5214: .4byte gPlayerParty _080D5218: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5224 @ =gUnknown_2024284 + ldr r1, _080D5224 @ =gPlayerParty adds r0, r1 movs r1, 0x16 b _080D52C2 .align 2, 0 -_080D5224: .4byte gUnknown_2024284 +_080D5224: .4byte gPlayerParty _080D5228: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5234 @ =gUnknown_2024284 + ldr r1, _080D5234 @ =gPlayerParty adds r0, r1 movs r1, 0x17 b _080D52C2 .align 2, 0 -_080D5234: .4byte gUnknown_2024284 +_080D5234: .4byte gPlayerParty _080D5238: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5244 @ =gUnknown_2024284 + ldr r1, _080D5244 @ =gPlayerParty adds r0, r1 movs r1, 0x18 b _080D52C2 .align 2, 0 -_080D5244: .4byte gUnknown_2024284 +_080D5244: .4byte gPlayerParty _080D5248: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5254 @ =gUnknown_2024284 + ldr r1, _080D5254 @ =gPlayerParty adds r0, r1 movs r1, 0x21 b _080D52C2 .align 2, 0 -_080D5254: .4byte gUnknown_2024284 +_080D5254: .4byte gPlayerParty _080D5258: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5264 @ =gUnknown_2024284 + ldr r1, _080D5264 @ =gPlayerParty adds r0, r1 movs r1, 0x2F b _080D52C2 .align 2, 0 -_080D5264: .4byte gUnknown_2024284 +_080D5264: .4byte gPlayerParty _080D5268: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5274 @ =gUnknown_2024284 + ldr r1, _080D5274 @ =gPlayerParty adds r0, r1 movs r1, 0x30 b _080D52C2 .align 2, 0 -_080D5274: .4byte gUnknown_2024284 +_080D5274: .4byte gPlayerParty _080D5278: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5284 @ =gUnknown_2024284 + ldr r1, _080D5284 @ =gPlayerParty adds r0, r1 movs r1, 0x32 b _080D52C2 .align 2, 0 -_080D5284: .4byte gUnknown_2024284 +_080D5284: .4byte gPlayerParty _080D5288: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5294 @ =gUnknown_2024284 + ldr r1, _080D5294 @ =gPlayerParty adds r0, r1 movs r1, 0x33 b _080D52C2 .align 2, 0 -_080D5294: .4byte gUnknown_2024284 +_080D5294: .4byte gPlayerParty _080D5298: movs r0, 0x64 muls r0, r5 - ldr r1, _080D52A4 @ =gUnknown_2024284 + ldr r1, _080D52A4 @ =gPlayerParty adds r0, r1 movs r1, 0x34 b _080D52C2 .align 2, 0 -_080D52A4: .4byte gUnknown_2024284 +_080D52A4: .4byte gPlayerParty _080D52A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080D52B4 @ =gUnknown_2024284 + ldr r1, _080D52B4 @ =gPlayerParty adds r0, r1 movs r1, 0x35 b _080D52C2 .align 2, 0 -_080D52B4: .4byte gUnknown_2024284 +_080D52B4: .4byte gPlayerParty _080D52B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080D52DC @ =gUnknown_2024284 + ldr r1, _080D52DC @ =gPlayerParty adds r0, r1 movs r1, 0x36 _080D52C2: @@ -2083,7 +2083,7 @@ _080D52CA: pop {r1} bx r1 .align 2, 0 -_080D52DC: .4byte gUnknown_2024284 +_080D52DC: .4byte gPlayerParty thumb_func_end dp01_getattr_by_ch1_for_player_pokemon thumb_func_start sub_80D52E0 @@ -2098,7 +2098,7 @@ sub_80D52E0: @ 80D52E0 LinkPartnerHandleSetAttributes: @ 80D52EC push {r4,r5,lr} ldr r1, _080D5310 @ =gUnknown_2022BC4 - ldr r0, _080D5314 @ =gUnknown_2023BC4 + ldr r0, _080D5314 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -2106,7 +2106,7 @@ LinkPartnerHandleSetAttributes: @ 80D52EC ldrb r0, [r1] cmp r0, 0 bne _080D531C - ldr r0, _080D5318 @ =gUnknown_2023BCE + ldr r0, _080D5318 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -2114,8 +2114,8 @@ LinkPartnerHandleSetAttributes: @ 80D52EC b _080D533A .align 2, 0 _080D5310: .4byte gUnknown_2022BC4 -_080D5314: .4byte gUnknown_2023BC4 -_080D5318: .4byte gUnknown_2023BCE +_080D5314: .4byte gActiveBattler +_080D5318: .4byte gBattlerPartyIndexes _080D531C: ldrb r4, [r1] movs r5, 0 @@ -2150,7 +2150,7 @@ sub_80D5344: @ 80D5344 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080D537C @ =gUnknown_2023BC4 + ldr r0, _080D537C @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 ldr r2, _080D5380 @ =gUnknown_2022BC7 @@ -2170,7 +2170,7 @@ _080D5370: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D537C: .4byte gUnknown_2023BC4 +_080D537C: .4byte gActiveBattler _080D5380: .4byte gUnknown_2022BC7 _080D5384: .4byte _080D5388 .align 2, 0 @@ -2239,7 +2239,7 @@ _080D5478: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080D560C @ =gUnknown_2024284 + ldr r0, _080D560C @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -2306,7 +2306,7 @@ _080D54DE: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080D560C @ =gUnknown_2024284 + ldr r0, _080D560C @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -2416,13 +2416,13 @@ _080D54DE: bl sub_804037C b _080D5D0A .align 2, 0 -_080D560C: .4byte gUnknown_2024284 +_080D560C: .4byte gPlayerParty _080D5610: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5628 @ =gUnknown_2024284 + ldr r1, _080D5628 @ =gPlayerParty adds r0, r1 - ldr r1, _080D562C @ =gUnknown_2023BC4 + ldr r1, _080D562C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2430,14 +2430,14 @@ _080D5610: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5628: .4byte gUnknown_2024284 -_080D562C: .4byte gUnknown_2023BC4 +_080D5628: .4byte gPlayerParty +_080D562C: .4byte gActiveBattler _080D5630: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5648 @ =gUnknown_2024284 + ldr r1, _080D5648 @ =gPlayerParty adds r0, r1 - ldr r1, _080D564C @ =gUnknown_2023BC4 + ldr r1, _080D564C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2445,8 +2445,8 @@ _080D5630: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5648: .4byte gUnknown_2024284 -_080D564C: .4byte gUnknown_2023BC4 +_080D5648: .4byte gPlayerParty +_080D564C: .4byte gActiveBattler _080D5650: movs r0, 0 mov r8, r0 @@ -2456,7 +2456,7 @@ _080D5650: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080D56A4 @ =gUnknown_2024284 + ldr r0, _080D56A4 @ =gPlayerParty adds r7, r1, r0 adds r6, r3, 0 adds r6, 0x8 @@ -2481,21 +2481,21 @@ _080D566A: ble _080D566A movs r0, 0x64 muls r0, r5 - ldr r1, _080D56A4 @ =gUnknown_2024284 + ldr r1, _080D56A4 @ =gPlayerParty adds r0, r1 movs r1, 0x15 mov r2, r9 bl sub_804037C b _080D5D0A .align 2, 0 -_080D56A4: .4byte gUnknown_2024284 +_080D56A4: .4byte gPlayerParty _080D56A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080D56C4 @ =gUnknown_2024284 + ldr r1, _080D56C4 @ =gPlayerParty adds r0, r1 ldr r3, _080D56C8 @ =gUnknown_2022BC4 - ldr r1, _080D56CC @ =gUnknown_2023BC4 + ldr r1, _080D56CC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -2504,16 +2504,16 @@ _080D56A8: adds r1, 0x9 b _080D574C .align 2, 0 -_080D56C4: .4byte gUnknown_2024284 +_080D56C4: .4byte gPlayerParty _080D56C8: .4byte gUnknown_2022BC4 -_080D56CC: .4byte gUnknown_2023BC4 +_080D56CC: .4byte gActiveBattler _080D56D0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080D572C @ =gUnknown_2024284 + ldr r0, _080D572C @ =gPlayerParty adds r4, r0 - ldr r5, _080D5730 @ =gUnknown_2023BC4 + ldr r5, _080D5730 @ =gActiveBattler ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -2550,15 +2550,15 @@ _080D56D0: bl sub_804037C b _080D5D0A .align 2, 0 -_080D572C: .4byte gUnknown_2024284 -_080D5730: .4byte gUnknown_2023BC4 +_080D572C: .4byte gPlayerParty +_080D5730: .4byte gActiveBattler _080D5734: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5758 @ =gUnknown_2024284 + ldr r1, _080D5758 @ =gPlayerParty adds r0, r1 ldr r3, _080D575C @ =gUnknown_2022BC4 - ldr r1, _080D5760 @ =gUnknown_2023BC4 + ldr r1, _080D5760 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -2571,15 +2571,15 @@ _080D574C: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5758: .4byte gUnknown_2024284 +_080D5758: .4byte gPlayerParty _080D575C: .4byte gUnknown_2022BC4 -_080D5760: .4byte gUnknown_2023BC4 +_080D5760: .4byte gActiveBattler _080D5764: movs r0, 0x64 muls r0, r5 - ldr r1, _080D577C @ =gUnknown_2024284 + ldr r1, _080D577C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5780 @ =gUnknown_2023BC4 + ldr r1, _080D5780 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2587,14 +2587,14 @@ _080D5764: bl sub_804037C b _080D5D0A .align 2, 0 -_080D577C: .4byte gUnknown_2024284 -_080D5780: .4byte gUnknown_2023BC4 +_080D577C: .4byte gPlayerParty +_080D5780: .4byte gActiveBattler _080D5784: movs r0, 0x64 muls r0, r5 - ldr r1, _080D579C @ =gUnknown_2024284 + ldr r1, _080D579C @ =gPlayerParty adds r0, r1 - ldr r1, _080D57A0 @ =gUnknown_2023BC4 + ldr r1, _080D57A0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2602,14 +2602,14 @@ _080D5784: bl sub_804037C b _080D5D0A .align 2, 0 -_080D579C: .4byte gUnknown_2024284 -_080D57A0: .4byte gUnknown_2023BC4 +_080D579C: .4byte gPlayerParty +_080D57A0: .4byte gActiveBattler _080D57A4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D57BC @ =gUnknown_2024284 + ldr r1, _080D57BC @ =gPlayerParty adds r0, r1 - ldr r1, _080D57C0 @ =gUnknown_2023BC4 + ldr r1, _080D57C0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2617,14 +2617,14 @@ _080D57A4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D57BC: .4byte gUnknown_2024284 -_080D57C0: .4byte gUnknown_2023BC4 +_080D57BC: .4byte gPlayerParty +_080D57C0: .4byte gActiveBattler _080D57C4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D57DC @ =gUnknown_2024284 + ldr r1, _080D57DC @ =gPlayerParty adds r0, r1 - ldr r1, _080D57E0 @ =gUnknown_2023BC4 + ldr r1, _080D57E0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2632,14 +2632,14 @@ _080D57C4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D57DC: .4byte gUnknown_2024284 -_080D57E0: .4byte gUnknown_2023BC4 +_080D57DC: .4byte gPlayerParty +_080D57E0: .4byte gActiveBattler _080D57E4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D57FC @ =gUnknown_2024284 + ldr r1, _080D57FC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5800 @ =gUnknown_2023BC4 + ldr r1, _080D5800 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2647,14 +2647,14 @@ _080D57E4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D57FC: .4byte gUnknown_2024284 -_080D5800: .4byte gUnknown_2023BC4 +_080D57FC: .4byte gPlayerParty +_080D5800: .4byte gActiveBattler _080D5804: movs r0, 0x64 muls r0, r5 - ldr r1, _080D581C @ =gUnknown_2024284 + ldr r1, _080D581C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5820 @ =gUnknown_2023BC4 + ldr r1, _080D5820 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2662,14 +2662,14 @@ _080D5804: bl sub_804037C b _080D5D0A .align 2, 0 -_080D581C: .4byte gUnknown_2024284 -_080D5820: .4byte gUnknown_2023BC4 +_080D581C: .4byte gPlayerParty +_080D5820: .4byte gActiveBattler _080D5824: movs r0, 0x64 muls r0, r5 - ldr r1, _080D583C @ =gUnknown_2024284 + ldr r1, _080D583C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5840 @ =gUnknown_2023BC4 + ldr r1, _080D5840 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2677,14 +2677,14 @@ _080D5824: bl sub_804037C b _080D5D0A .align 2, 0 -_080D583C: .4byte gUnknown_2024284 -_080D5840: .4byte gUnknown_2023BC4 +_080D583C: .4byte gPlayerParty +_080D5840: .4byte gActiveBattler _080D5844: movs r0, 0x64 muls r0, r5 - ldr r1, _080D585C @ =gUnknown_2024284 + ldr r1, _080D585C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5860 @ =gUnknown_2023BC4 + ldr r1, _080D5860 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2692,14 +2692,14 @@ _080D5844: bl sub_804037C b _080D5D0A .align 2, 0 -_080D585C: .4byte gUnknown_2024284 -_080D5860: .4byte gUnknown_2023BC4 +_080D585C: .4byte gPlayerParty +_080D5860: .4byte gActiveBattler _080D5864: movs r0, 0x64 muls r0, r5 - ldr r1, _080D587C @ =gUnknown_2024284 + ldr r1, _080D587C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5880 @ =gUnknown_2023BC4 + ldr r1, _080D5880 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2707,14 +2707,14 @@ _080D5864: bl sub_804037C b _080D5D0A .align 2, 0 -_080D587C: .4byte gUnknown_2024284 -_080D5880: .4byte gUnknown_2023BC4 +_080D587C: .4byte gPlayerParty +_080D5880: .4byte gActiveBattler _080D5884: movs r0, 0x64 muls r0, r5 - ldr r1, _080D589C @ =gUnknown_2024284 + ldr r1, _080D589C @ =gPlayerParty adds r0, r1 - ldr r1, _080D58A0 @ =gUnknown_2023BC4 + ldr r1, _080D58A0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2722,14 +2722,14 @@ _080D5884: bl sub_804037C b _080D5D0A .align 2, 0 -_080D589C: .4byte gUnknown_2024284 -_080D58A0: .4byte gUnknown_2023BC4 +_080D589C: .4byte gPlayerParty +_080D58A0: .4byte gActiveBattler _080D58A4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D58BC @ =gUnknown_2024284 + ldr r1, _080D58BC @ =gPlayerParty adds r0, r1 - ldr r1, _080D58C0 @ =gUnknown_2023BC4 + ldr r1, _080D58C0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2737,14 +2737,14 @@ _080D58A4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D58BC: .4byte gUnknown_2024284 -_080D58C0: .4byte gUnknown_2023BC4 +_080D58BC: .4byte gPlayerParty +_080D58C0: .4byte gActiveBattler _080D58C4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D58DC @ =gUnknown_2024284 + ldr r1, _080D58DC @ =gPlayerParty adds r0, r1 - ldr r1, _080D58E0 @ =gUnknown_2023BC4 + ldr r1, _080D58E0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2752,14 +2752,14 @@ _080D58C4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D58DC: .4byte gUnknown_2024284 -_080D58E0: .4byte gUnknown_2023BC4 +_080D58DC: .4byte gPlayerParty +_080D58E0: .4byte gActiveBattler _080D58E4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D58FC @ =gUnknown_2024284 + ldr r1, _080D58FC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5900 @ =gUnknown_2023BC4 + ldr r1, _080D5900 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2767,14 +2767,14 @@ _080D58E4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D58FC: .4byte gUnknown_2024284 -_080D5900: .4byte gUnknown_2023BC4 +_080D58FC: .4byte gPlayerParty +_080D5900: .4byte gActiveBattler _080D5904: movs r0, 0x64 muls r0, r5 - ldr r1, _080D591C @ =gUnknown_2024284 + ldr r1, _080D591C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5920 @ =gUnknown_2023BC4 + ldr r1, _080D5920 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2782,15 +2782,15 @@ _080D5904: bl sub_804037C b _080D5D0A .align 2, 0 -_080D591C: .4byte gUnknown_2024284 -_080D5920: .4byte gUnknown_2023BC4 +_080D591C: .4byte gPlayerParty +_080D5920: .4byte gActiveBattler _080D5924: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080D598C @ =gUnknown_2024284 + ldr r0, _080D598C @ =gPlayerParty adds r4, r0 - ldr r5, _080D5990 @ =gUnknown_2023BC4 + ldr r5, _080D5990 @ =gActiveBattler ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -2832,14 +2832,14 @@ _080D5924: adds r0, r4, 0 b _080D5A44 .align 2, 0 -_080D598C: .4byte gUnknown_2024284 -_080D5990: .4byte gUnknown_2023BC4 +_080D598C: .4byte gPlayerParty +_080D5990: .4byte gActiveBattler _080D5994: movs r0, 0x64 muls r0, r5 - ldr r1, _080D59AC @ =gUnknown_2024284 + ldr r1, _080D59AC @ =gPlayerParty adds r0, r1 - ldr r1, _080D59B0 @ =gUnknown_2023BC4 + ldr r1, _080D59B0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2847,14 +2847,14 @@ _080D5994: bl sub_804037C b _080D5D0A .align 2, 0 -_080D59AC: .4byte gUnknown_2024284 -_080D59B0: .4byte gUnknown_2023BC4 +_080D59AC: .4byte gPlayerParty +_080D59B0: .4byte gActiveBattler _080D59B4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D59CC @ =gUnknown_2024284 + ldr r1, _080D59CC @ =gPlayerParty adds r0, r1 - ldr r1, _080D59D0 @ =gUnknown_2023BC4 + ldr r1, _080D59D0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2862,14 +2862,14 @@ _080D59B4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D59CC: .4byte gUnknown_2024284 -_080D59D0: .4byte gUnknown_2023BC4 +_080D59CC: .4byte gPlayerParty +_080D59D0: .4byte gActiveBattler _080D59D4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D59EC @ =gUnknown_2024284 + ldr r1, _080D59EC @ =gPlayerParty adds r0, r1 - ldr r1, _080D59F0 @ =gUnknown_2023BC4 + ldr r1, _080D59F0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2877,14 +2877,14 @@ _080D59D4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D59EC: .4byte gUnknown_2024284 -_080D59F0: .4byte gUnknown_2023BC4 +_080D59EC: .4byte gPlayerParty +_080D59F0: .4byte gActiveBattler _080D59F4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5A0C @ =gUnknown_2024284 + ldr r1, _080D5A0C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5A10 @ =gUnknown_2023BC4 + ldr r1, _080D5A10 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2892,14 +2892,14 @@ _080D59F4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5A0C: .4byte gUnknown_2024284 -_080D5A10: .4byte gUnknown_2023BC4 +_080D5A0C: .4byte gPlayerParty +_080D5A10: .4byte gActiveBattler _080D5A14: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5A2C @ =gUnknown_2024284 + ldr r1, _080D5A2C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5A30 @ =gUnknown_2023BC4 + ldr r1, _080D5A30 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2907,14 +2907,14 @@ _080D5A14: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5A2C: .4byte gUnknown_2024284 -_080D5A30: .4byte gUnknown_2023BC4 +_080D5A2C: .4byte gPlayerParty +_080D5A30: .4byte gActiveBattler _080D5A34: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5A4C @ =gUnknown_2024284 + ldr r1, _080D5A4C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5A50 @ =gUnknown_2023BC4 + ldr r1, _080D5A50 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2923,14 +2923,14 @@ _080D5A44: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5A4C: .4byte gUnknown_2024284 -_080D5A50: .4byte gUnknown_2023BC4 +_080D5A4C: .4byte gPlayerParty +_080D5A50: .4byte gActiveBattler _080D5A54: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5A6C @ =gUnknown_2024284 + ldr r1, _080D5A6C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5A70 @ =gUnknown_2023BC4 + ldr r1, _080D5A70 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2938,14 +2938,14 @@ _080D5A54: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5A6C: .4byte gUnknown_2024284 -_080D5A70: .4byte gUnknown_2023BC4 +_080D5A6C: .4byte gPlayerParty +_080D5A70: .4byte gActiveBattler _080D5A74: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5A8C @ =gUnknown_2024284 + ldr r1, _080D5A8C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5A90 @ =gUnknown_2023BC4 + ldr r1, _080D5A90 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2953,14 +2953,14 @@ _080D5A74: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5A8C: .4byte gUnknown_2024284 -_080D5A90: .4byte gUnknown_2023BC4 +_080D5A8C: .4byte gPlayerParty +_080D5A90: .4byte gActiveBattler _080D5A94: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5AAC @ =gUnknown_2024284 + ldr r1, _080D5AAC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5AB0 @ =gUnknown_2023BC4 + ldr r1, _080D5AB0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2968,14 +2968,14 @@ _080D5A94: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5AAC: .4byte gUnknown_2024284 -_080D5AB0: .4byte gUnknown_2023BC4 +_080D5AAC: .4byte gPlayerParty +_080D5AB0: .4byte gActiveBattler _080D5AB4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5ACC @ =gUnknown_2024284 + ldr r1, _080D5ACC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5AD0 @ =gUnknown_2023BC4 + ldr r1, _080D5AD0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2983,14 +2983,14 @@ _080D5AB4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5ACC: .4byte gUnknown_2024284 -_080D5AD0: .4byte gUnknown_2023BC4 +_080D5ACC: .4byte gPlayerParty +_080D5AD0: .4byte gActiveBattler _080D5AD4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5AEC @ =gUnknown_2024284 + ldr r1, _080D5AEC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5AF0 @ =gUnknown_2023BC4 + ldr r1, _080D5AF0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -2998,14 +2998,14 @@ _080D5AD4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5AEC: .4byte gUnknown_2024284 -_080D5AF0: .4byte gUnknown_2023BC4 +_080D5AEC: .4byte gPlayerParty +_080D5AF0: .4byte gActiveBattler _080D5AF4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5B0C @ =gUnknown_2024284 + ldr r1, _080D5B0C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5B10 @ =gUnknown_2023BC4 + ldr r1, _080D5B10 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3013,14 +3013,14 @@ _080D5AF4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5B0C: .4byte gUnknown_2024284 -_080D5B10: .4byte gUnknown_2023BC4 +_080D5B0C: .4byte gPlayerParty +_080D5B10: .4byte gActiveBattler _080D5B14: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5B2C @ =gUnknown_2024284 + ldr r1, _080D5B2C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5B30 @ =gUnknown_2023BC4 + ldr r1, _080D5B30 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3028,14 +3028,14 @@ _080D5B14: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5B2C: .4byte gUnknown_2024284 -_080D5B30: .4byte gUnknown_2023BC4 +_080D5B2C: .4byte gPlayerParty +_080D5B30: .4byte gActiveBattler _080D5B34: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5B4C @ =gUnknown_2024284 + ldr r1, _080D5B4C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5B50 @ =gUnknown_2023BC4 + ldr r1, _080D5B50 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3043,14 +3043,14 @@ _080D5B34: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5B4C: .4byte gUnknown_2024284 -_080D5B50: .4byte gUnknown_2023BC4 +_080D5B4C: .4byte gPlayerParty +_080D5B50: .4byte gActiveBattler _080D5B54: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5B6C @ =gUnknown_2024284 + ldr r1, _080D5B6C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5B70 @ =gUnknown_2023BC4 + ldr r1, _080D5B70 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3058,14 +3058,14 @@ _080D5B54: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5B6C: .4byte gUnknown_2024284 -_080D5B70: .4byte gUnknown_2023BC4 +_080D5B6C: .4byte gPlayerParty +_080D5B70: .4byte gActiveBattler _080D5B74: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5B8C @ =gUnknown_2024284 + ldr r1, _080D5B8C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5B90 @ =gUnknown_2023BC4 + ldr r1, _080D5B90 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3073,14 +3073,14 @@ _080D5B74: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5B8C: .4byte gUnknown_2024284 -_080D5B90: .4byte gUnknown_2023BC4 +_080D5B8C: .4byte gPlayerParty +_080D5B90: .4byte gActiveBattler _080D5B94: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5BAC @ =gUnknown_2024284 + ldr r1, _080D5BAC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5BB0 @ =gUnknown_2023BC4 + ldr r1, _080D5BB0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3088,14 +3088,14 @@ _080D5B94: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5BAC: .4byte gUnknown_2024284 -_080D5BB0: .4byte gUnknown_2023BC4 +_080D5BAC: .4byte gPlayerParty +_080D5BB0: .4byte gActiveBattler _080D5BB4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5BCC @ =gUnknown_2024284 + ldr r1, _080D5BCC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5BD0 @ =gUnknown_2023BC4 + ldr r1, _080D5BD0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3103,14 +3103,14 @@ _080D5BB4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5BCC: .4byte gUnknown_2024284 -_080D5BD0: .4byte gUnknown_2023BC4 +_080D5BCC: .4byte gPlayerParty +_080D5BD0: .4byte gActiveBattler _080D5BD4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5BEC @ =gUnknown_2024284 + ldr r1, _080D5BEC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5BF0 @ =gUnknown_2023BC4 + ldr r1, _080D5BF0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3118,14 +3118,14 @@ _080D5BD4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5BEC: .4byte gUnknown_2024284 -_080D5BF0: .4byte gUnknown_2023BC4 +_080D5BEC: .4byte gPlayerParty +_080D5BF0: .4byte gActiveBattler _080D5BF4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5C0C @ =gUnknown_2024284 + ldr r1, _080D5C0C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5C10 @ =gUnknown_2023BC4 + ldr r1, _080D5C10 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3133,14 +3133,14 @@ _080D5BF4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5C0C: .4byte gUnknown_2024284 -_080D5C10: .4byte gUnknown_2023BC4 +_080D5C0C: .4byte gPlayerParty +_080D5C10: .4byte gActiveBattler _080D5C14: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5C2C @ =gUnknown_2024284 + ldr r1, _080D5C2C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5C30 @ =gUnknown_2023BC4 + ldr r1, _080D5C30 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3148,14 +3148,14 @@ _080D5C14: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5C2C: .4byte gUnknown_2024284 -_080D5C30: .4byte gUnknown_2023BC4 +_080D5C2C: .4byte gPlayerParty +_080D5C30: .4byte gActiveBattler _080D5C34: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5C4C @ =gUnknown_2024284 + ldr r1, _080D5C4C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5C50 @ =gUnknown_2023BC4 + ldr r1, _080D5C50 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3163,14 +3163,14 @@ _080D5C34: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5C4C: .4byte gUnknown_2024284 -_080D5C50: .4byte gUnknown_2023BC4 +_080D5C4C: .4byte gPlayerParty +_080D5C50: .4byte gActiveBattler _080D5C54: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5C6C @ =gUnknown_2024284 + ldr r1, _080D5C6C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5C70 @ =gUnknown_2023BC4 + ldr r1, _080D5C70 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3178,14 +3178,14 @@ _080D5C54: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5C6C: .4byte gUnknown_2024284 -_080D5C70: .4byte gUnknown_2023BC4 +_080D5C6C: .4byte gPlayerParty +_080D5C70: .4byte gActiveBattler _080D5C74: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5C8C @ =gUnknown_2024284 + ldr r1, _080D5C8C @ =gPlayerParty adds r0, r1 - ldr r1, _080D5C90 @ =gUnknown_2023BC4 + ldr r1, _080D5C90 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3193,14 +3193,14 @@ _080D5C74: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5C8C: .4byte gUnknown_2024284 -_080D5C90: .4byte gUnknown_2023BC4 +_080D5C8C: .4byte gPlayerParty +_080D5C90: .4byte gActiveBattler _080D5C94: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5CAC @ =gUnknown_2024284 + ldr r1, _080D5CAC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5CB0 @ =gUnknown_2023BC4 + ldr r1, _080D5CB0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3208,14 +3208,14 @@ _080D5C94: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5CAC: .4byte gUnknown_2024284 -_080D5CB0: .4byte gUnknown_2023BC4 +_080D5CAC: .4byte gPlayerParty +_080D5CB0: .4byte gActiveBattler _080D5CB4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5CCC @ =gUnknown_2024284 + ldr r1, _080D5CCC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5CD0 @ =gUnknown_2023BC4 + ldr r1, _080D5CD0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3223,14 +3223,14 @@ _080D5CB4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5CCC: .4byte gUnknown_2024284 -_080D5CD0: .4byte gUnknown_2023BC4 +_080D5CCC: .4byte gPlayerParty +_080D5CD0: .4byte gActiveBattler _080D5CD4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5CEC @ =gUnknown_2024284 + ldr r1, _080D5CEC @ =gPlayerParty adds r0, r1 - ldr r1, _080D5CF0 @ =gUnknown_2023BC4 + ldr r1, _080D5CF0 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -3238,29 +3238,29 @@ _080D5CD4: bl sub_804037C b _080D5D0A .align 2, 0 -_080D5CEC: .4byte gUnknown_2024284 -_080D5CF0: .4byte gUnknown_2023BC4 +_080D5CEC: .4byte gPlayerParty +_080D5CF0: .4byte gActiveBattler _080D5CF4: movs r0, 0x64 muls r0, r5 - ldr r1, _080D5D34 @ =gUnknown_2024284 + ldr r1, _080D5D34 @ =gPlayerParty adds r0, r1 - ldr r1, _080D5D38 @ =gUnknown_2023BC4 + ldr r1, _080D5D38 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl sub_804037C _080D5D0A: - ldr r2, _080D5D3C @ =gUnknown_2023BCE - ldr r0, _080D5D38 @ =gUnknown_2023BC4 + ldr r2, _080D5D3C @ =gBattlerPartyIndexes + ldr r0, _080D5D38 @ =gActiveBattler ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _080D5D34 @ =gUnknown_2024284 + ldr r2, _080D5D34 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange add sp, 0x34 @@ -3272,16 +3272,16 @@ _080D5D0A: pop {r0} bx r0 .align 2, 0 -_080D5D34: .4byte gUnknown_2024284 -_080D5D38: .4byte gUnknown_2023BC4 -_080D5D3C: .4byte gUnknown_2023BCE +_080D5D34: .4byte gPlayerParty +_080D5D38: .4byte gActiveBattler +_080D5D3C: .4byte gBattlerPartyIndexes thumb_func_end sub_80D5344 thumb_func_start LinkPartnerHandlecmd3 LinkPartnerHandlecmd3: @ 80D5D40 push {r4-r7,lr} - ldr r1, _080D5DA4 @ =gUnknown_2023BCE - ldr r7, _080D5DA8 @ =gUnknown_2023BC4 + ldr r1, _080D5DA4 @ =gBattlerPartyIndexes + ldr r7, _080D5DA8 @ =gActiveBattler ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -3294,7 +3294,7 @@ LinkPartnerHandlecmd3: @ 80D5D40 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _080D5DB0 @ =gUnknown_2024284 + ldr r1, _080D5DB0 @ =gPlayerParty adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -3330,10 +3330,10 @@ _080D5D98: pop {r0} bx r0 .align 2, 0 -_080D5DA4: .4byte gUnknown_2023BCE -_080D5DA8: .4byte gUnknown_2023BC4 +_080D5DA4: .4byte gBattlerPartyIndexes +_080D5DA8: .4byte gActiveBattler _080D5DAC: .4byte gUnknown_2022BC4 -_080D5DB0: .4byte gUnknown_2024284 +_080D5DB0: .4byte gPlayerParty thumb_func_end LinkPartnerHandlecmd3 thumb_func_start LinkPartnerHandleLoadPokeSprite @@ -3341,16 +3341,16 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _080D5EA8 @ =gUnknown_2023BCE + ldr r0, _080D5EA8 @ =gBattlerPartyIndexes mov r8, r0 - ldr r6, _080D5EAC @ =gUnknown_2023BC4 + ldr r6, _080D5EAC @ =gActiveBattler ldrb r1, [r6] lsls r0, r1, 1 add r0, r8 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _080D5EB0 @ =gUnknown_2024284 + ldr r4, _080D5EB0 @ =gPlayerParty adds r0, r4 bl sub_8034498 ldrb r0, [r6] @@ -3451,9 +3451,9 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4 pop {r0} bx r0 .align 2, 0 -_080D5EA8: .4byte gUnknown_2023BCE -_080D5EAC: .4byte gUnknown_2023BC4 -_080D5EB0: .4byte gUnknown_2024284 +_080D5EA8: .4byte gBattlerPartyIndexes +_080D5EAC: .4byte gActiveBattler +_080D5EB0: .4byte gPlayerParty _080D5EB4: .4byte gUnknown_20244DC _080D5EB8: .4byte gUnknown_2023D44 _080D5EBC: .4byte gSprites @@ -3466,7 +3466,7 @@ _080D5ECC: .4byte sub_80D4590 thumb_func_start LinkPartnerHandleSendOutPoke LinkPartnerHandleSendOutPoke: @ 80D5ED0 push {r4-r6,lr} - ldr r5, _080D5F28 @ =gUnknown_2023BC4 + ldr r5, _080D5F28 @ =gActiveBattler ldrb r0, [r5] ldr r4, _080D5F2C @ =gUnknown_2022BC4 lsls r1, r0, 9 @@ -3474,7 +3474,7 @@ LinkPartnerHandleSendOutPoke: @ 80D5ED0 adds r1, r6 ldrb r1, [r1] bl ClearTemporarySpeciesSpriteData - ldr r2, _080D5F30 @ =gUnknown_2023BCE + ldr r2, _080D5F30 @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -3489,7 +3489,7 @@ LinkPartnerHandleSendOutPoke: @ 80D5ED0 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _080D5F34 @ =gUnknown_2024284 + ldr r2, _080D5F34 @ =gPlayerParty adds r0, r2 bl sub_8034498 ldrb r0, [r5] @@ -3507,10 +3507,10 @@ LinkPartnerHandleSendOutPoke: @ 80D5ED0 pop {r0} bx r0 .align 2, 0 -_080D5F28: .4byte gUnknown_2023BC4 +_080D5F28: .4byte gActiveBattler _080D5F2C: .4byte gUnknown_2022BC4 -_080D5F30: .4byte gUnknown_2023BCE -_080D5F34: .4byte gUnknown_2024284 +_080D5F30: .4byte gBattlerPartyIndexes +_080D5F34: .4byte gPlayerParty _080D5F38: .4byte gUnknown_3004FE0 _080D5F3C: .4byte sub_80D4944 thumb_func_end LinkPartnerHandleSendOutPoke @@ -3529,7 +3529,7 @@ sub_80D5F40: @ 80D5F40 lsrs r1, 24 adds r0, r6, 0 bl ClearTemporarySpeciesSpriteData - ldr r0, _080D6084 @ =gUnknown_2023BCE + ldr r0, _080D6084 @ =gBattlerPartyIndexes lsls r2, r6, 1 adds r2, r0 ldr r0, _080D6088 @ =gUnknown_2022BC4 @@ -3541,7 +3541,7 @@ sub_80D5F40: @ 80D5F40 ldrh r1, [r2] movs r0, 0x64 muls r0, r1 - ldr r1, _080D608C @ =gUnknown_2024284 + ldr r1, _080D608C @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -3669,9 +3669,9 @@ sub_80D5F40: @ 80D5F40 pop {r0} bx r0 .align 2, 0 -_080D6084: .4byte gUnknown_2023BCE +_080D6084: .4byte gBattlerPartyIndexes _080D6088: .4byte gUnknown_2022BC4 -_080D608C: .4byte gUnknown_2024284 +_080D608C: .4byte gPlayerParty _080D6090: .4byte sub_8033E3C _080D6094: .4byte gUnknown_3004FFC _080D6098: .4byte gUnknown_20244DC @@ -3685,7 +3685,7 @@ _080D60A8: .4byte SpriteCallbackDummy LinkPartnerHandleReturnPokeToBall: @ 80D60AC push {r4-r6,lr} ldr r1, _080D60E0 @ =gUnknown_2022BC4 - ldr r6, _080D60E4 @ =gUnknown_2023BC4 + ldr r6, _080D60E4 @ =gActiveBattler ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -3710,7 +3710,7 @@ LinkPartnerHandleReturnPokeToBall: @ 80D60AC b _080D612A .align 2, 0 _080D60E0: .4byte gUnknown_2022BC4 -_080D60E4: .4byte gUnknown_2023BC4 +_080D60E4: .4byte gActiveBattler _080D60E8: .4byte gUnknown_2024018 _080D60EC: .4byte gUnknown_3004FE0 _080D60F0: .4byte sub_80D613C @@ -3753,7 +3753,7 @@ sub_80D613C: @ 80D613C push {r4-r6,lr} ldr r6, _080D615C @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _080D6160 @ =gUnknown_2023BC4 + ldr r5, _080D6160 @ =gActiveBattler ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -3768,7 +3768,7 @@ sub_80D613C: @ 80D613C b _080D61BA .align 2, 0 _080D615C: .4byte gUnknown_2024018 -_080D6160: .4byte gUnknown_2023BC4 +_080D6160: .4byte gActiveBattler _080D6164: ldr r1, [r4] lsls r0, r2, 2 @@ -3827,7 +3827,7 @@ sub_80D61C8: @ 80D61C8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r6, _080D6240 @ =gUnknown_2023BC4 + ldr r6, _080D6240 @ =gActiveBattler ldrb r0, [r6] bl GetBankIdentity movs r1, 0x2 @@ -3870,7 +3870,7 @@ _080D61E2: cmp r4, 0x3 bne _080D6248 _080D6228: - ldr r0, _080D6240 @ =gUnknown_2023BC4 + ldr r0, _080D6240 @ =gActiveBattler ldrb r0, [r0] bl GetBankMultiplayerId ldr r2, _080D6244 @ =gUnknown_202273C @@ -3882,7 +3882,7 @@ _080D6228: adds r4, r0, 0x2 b _080D6258 .align 2, 0 -_080D6240: .4byte gUnknown_2023BC4 +_080D6240: .4byte gActiveBattler _080D6244: .4byte gUnknown_202273C _080D6248: ldrb r0, [r6] @@ -3893,7 +3893,7 @@ _080D6248: adds r1, r5 ldrb r4, [r1, 0x13] _080D6258: - ldr r5, _080D6318 @ =gUnknown_2023BC4 + ldr r5, _080D6318 @ =gActiveBattler ldrb r1, [r5] adds r0, r4, 0 bl sub_8034750 @@ -3984,7 +3984,7 @@ _080D6258: pop {r0} bx r0 .align 2, 0 -_080D6318: .4byte gUnknown_2023BC4 +_080D6318: .4byte gActiveBattler _080D631C: .4byte gUnknown_20244DC _080D6320: .4byte gUnknown_8239F8C _080D6324: .4byte gUnknown_2023D44 @@ -4007,7 +4007,7 @@ sub_80D633C: @ 80D633C sub_80D6348: @ 80D6348 push {r4-r6,lr} ldr r6, _080D63D4 @ =gUnknown_2023D44 - ldr r4, _080D63D8 @ =gUnknown_2023BC4 + ldr r4, _080D63D8 @ =gActiveBattler ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -4075,7 +4075,7 @@ sub_80D6348: @ 80D6348 bx r0 .align 2, 0 _080D63D4: .4byte gUnknown_2023D44 -_080D63D8: .4byte gUnknown_2023BC4 +_080D63D8: .4byte gActiveBattler _080D63DC: .4byte gSprites _080D63E0: .4byte 0x0000ffd8 _080D63E4: .4byte sub_8075590 @@ -4089,7 +4089,7 @@ sub_80D63F4: @ 80D63F4 push {r4-r6,lr} ldr r6, _080D6440 @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _080D6444 @ =gUnknown_2023BC4 + ldr r5, _080D6444 @ =gActiveBattler ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -4125,7 +4125,7 @@ _080D6428: b _080D64BE .align 2, 0 _080D6440: .4byte gUnknown_2024018 -_080D6444: .4byte gUnknown_2023BC4 +_080D6444: .4byte gActiveBattler _080D6448: ldrb r1, [r3] movs r0, 0x40 @@ -4135,14 +4135,14 @@ _080D6448: cmp r4, 0 bne _080D64BE strb r4, [r3, 0x4] - ldr r2, _080D64C4 @ =gUnknown_2023BCE + ldr r2, _080D64C4 @ =gBattlerPartyIndexes ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _080D64C8 @ =gUnknown_2024284 + ldr r2, _080D64C8 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange movs r1, 0x40 @@ -4189,8 +4189,8 @@ _080D64BE: pop {r0} bx r0 .align 2, 0 -_080D64C4: .4byte gUnknown_2023BCE -_080D64C8: .4byte gUnknown_2024284 +_080D64C4: .4byte gBattlerPartyIndexes +_080D64C8: .4byte gPlayerParty _080D64CC: .4byte gSprites _080D64D0: .4byte gUnknown_2023D44 _080D64D4: .4byte sub_8012110 @@ -4233,7 +4233,7 @@ sub_80D6504: @ 80D6504 thumb_func_start sub_80D6510 sub_80D6510: @ 80D6510 push {r4-r6,lr} - ldr r6, _080D65F4 @ =gUnknown_2023BC4 + ldr r6, _080D65F4 @ =gActiveBattler ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -4344,7 +4344,7 @@ _080D6522: bl sub_80D49E8 b _080D6636 .align 2, 0 -_080D65F4: .4byte gUnknown_2023BC4 +_080D65F4: .4byte gActiveBattler _080D65F8: .4byte gUnknown_2022BC4 _080D65FC: .4byte gUnknown_2037F16 _080D6600: .4byte gUnknown_2037EEC @@ -4387,7 +4387,7 @@ sub_80D6648: @ 80D6648 mov r5, r8 push {r5-r7} ldr r2, _080D6694 @ =gUnknown_2022BC4 - ldr r6, _080D6698 @ =gUnknown_2023BC4 + ldr r6, _080D6698 @ =gActiveBattler ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -4421,7 +4421,7 @@ sub_80D6648: @ 80D6648 b _080D67BC .align 2, 0 _080D6694: .4byte gUnknown_2022BC4 -_080D6698: .4byte gUnknown_2023BC4 +_080D6698: .4byte gActiveBattler _080D669C: .4byte gUnknown_2024018 _080D66A0: cmp r2, 0x2 @@ -4517,7 +4517,7 @@ _080D670A: _080D6758: ldr r0, _080D6778 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080D677C @ =gUnknown_2023BC4 + ldr r0, _080D677C @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -4531,7 +4531,7 @@ _080D6758: _080D6770: .4byte gUnknown_2037EDC _080D6774: .4byte gUnknown_2037EE1 _080D6778: .4byte gUnknown_2024018 -_080D677C: .4byte gUnknown_2023BC4 +_080D677C: .4byte gActiveBattler _080D6780: ldrb r1, [r0] movs r0, 0x40 @@ -4578,7 +4578,7 @@ sub_80D67CC: @ 80D67CC strh r1, [r0] ldr r0, _080D6804 @ =gUnknown_2022976 strh r1, [r0] - ldr r0, _080D6808 @ =gUnknown_2023BC4 + ldr r0, _080D6808 @ =gActiveBattler ldrb r4, [r0] lsls r4, 9 ldr r0, _080D680C @ =gUnknown_2022BC6 @@ -4597,7 +4597,7 @@ sub_80D67CC: @ 80D67CC .align 2, 0 _080D6800: .4byte gUnknown_2022974 _080D6804: .4byte gUnknown_2022976 -_080D6808: .4byte gUnknown_2023BC4 +_080D6808: .4byte gActiveBattler _080D680C: .4byte gUnknown_2022BC6 _080D6810: .4byte gUnknown_202298C _080D6814: @@ -4606,7 +4606,7 @@ _080D6814: bl sub_80D87BC _080D681C: ldr r1, _080D6834 @ =gUnknown_3004FE0 - ldr r0, _080D6838 @ =gUnknown_2023BC4 + ldr r0, _080D6838 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4618,7 +4618,7 @@ _080D681C: .align 2, 0 _080D6830: .4byte gUnknown_202298C _080D6834: .4byte gUnknown_3004FE0 -_080D6838: .4byte gUnknown_2023BC4 +_080D6838: .4byte gActiveBattler _080D683C: .4byte sub_80D4718 thumb_func_end sub_80D67CC @@ -4688,7 +4688,7 @@ sub_80D6894: @ 80D6894 movs r0, 0 bl LoadBattleBarGfx ldr r3, _080D690C @ =gUnknown_2022BC4 - ldr r0, _080D6910 @ =gUnknown_2023BC4 + ldr r0, _080D6910 @ =gActiveBattler mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -4705,13 +4705,13 @@ sub_80D6894: @ 80D6894 ldr r0, _080D6914 @ =0x00007fff cmp r7, r0 beq _080D6924 - ldr r6, _080D6918 @ =gUnknown_2023BCE + ldr r6, _080D6918 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _080D691C @ =gUnknown_2024284 + ldr r4, _080D691C @ =gPlayerParty adds r0, r4 movs r1, 0x3A bl GetMonData @@ -4737,19 +4737,19 @@ sub_80D6894: @ 80D6894 b _080D694E .align 2, 0 _080D690C: .4byte gUnknown_2022BC4 -_080D6910: .4byte gUnknown_2023BC4 +_080D6910: .4byte gActiveBattler _080D6914: .4byte 0x00007fff -_080D6918: .4byte gUnknown_2023BCE -_080D691C: .4byte gUnknown_2024284 +_080D6918: .4byte gBattlerPartyIndexes +_080D691C: .4byte gPlayerParty _080D6920: .4byte gUnknown_3004FF0 _080D6924: - ldr r1, _080D696C @ =gUnknown_2023BCE + ldr r1, _080D696C @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D6970 @ =gUnknown_2024284 + ldr r1, _080D6970 @ =gPlayerParty adds r0, r1 movs r1, 0x3A bl GetMonData @@ -4764,7 +4764,7 @@ _080D6924: bl SetBattleBarStruct _080D694E: ldr r1, _080D6978 @ =gUnknown_3004FE0 - ldr r0, _080D697C @ =gUnknown_2023BC4 + ldr r0, _080D697C @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4778,11 +4778,11 @@ _080D694E: pop {r0} bx r0 .align 2, 0 -_080D696C: .4byte gUnknown_2023BCE -_080D6970: .4byte gUnknown_2024284 +_080D696C: .4byte gBattlerPartyIndexes +_080D6970: .4byte gPlayerParty _080D6974: .4byte gUnknown_3004FF0 _080D6978: .4byte gUnknown_3004FE0 -_080D697C: .4byte gUnknown_2023BC4 +_080D697C: .4byte gActiveBattler _080D6980: .4byte sub_80D45D0 thumb_func_end sub_80D6894 @@ -4797,7 +4797,7 @@ sub_80D6984: @ 80D6984 thumb_func_start sub_80D6990 sub_80D6990: @ 80D6990 push {r4,lr} - ldr r4, _080D69EC @ =gUnknown_2023BC4 + ldr r4, _080D69EC @ =gActiveBattler ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -4807,13 +4807,13 @@ sub_80D6990: @ 80D6990 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _080D69F4 @ =gUnknown_2023BCE + ldr r2, _080D69F4 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080D69F8 @ =gUnknown_2024284 + ldr r2, _080D69F8 @ =gPlayerParty adds r1, r2 movs r2, 0x9 bl UpdateHealthboxAttribute @@ -4841,10 +4841,10 @@ _080D69E4: pop {r0} bx r0 .align 2, 0 -_080D69EC: .4byte gUnknown_2023BC4 +_080D69EC: .4byte gActiveBattler _080D69F0: .4byte gUnknown_3004FF0 -_080D69F4: .4byte gUnknown_2023BCE -_080D69F8: .4byte gUnknown_2024284 +_080D69F4: .4byte gBattlerPartyIndexes +_080D69F8: .4byte gPlayerParty _080D69FC: .4byte gUnknown_2024018 _080D6A00: .4byte gUnknown_3004FE0 _080D6A04: .4byte sub_80D4A60 @@ -4853,7 +4853,7 @@ _080D6A04: .4byte sub_80D4A60 thumb_func_start sub_80D6A08 sub_80D6A08: @ 80D6A08 push {r4,r5,lr} - ldr r5, _080D6A60 @ =gUnknown_2023BC4 + ldr r5, _080D6A60 @ =gActiveBattler ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -4895,7 +4895,7 @@ _080D6A58: pop {r0} bx r0 .align 2, 0 -_080D6A60: .4byte gUnknown_2023BC4 +_080D6A60: .4byte gActiveBattler _080D6A64: .4byte gUnknown_2022BC4 _080D6A68: .4byte gUnknown_3004FE0 _080D6A6C: .4byte sub_80D4A60 @@ -4994,7 +4994,7 @@ LinkPartnerHandlecmd38: @ 80D6AF8 push {lr} ldr r3, _080D6B24 @ =gUnknown_2022870 ldr r1, _080D6B28 @ =gUnknown_2022BC4 - ldr r0, _080D6B2C @ =gUnknown_2023BC4 + ldr r0, _080D6B2C @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -5014,7 +5014,7 @@ LinkPartnerHandlecmd38: @ 80D6AF8 .align 2, 0 _080D6B24: .4byte gUnknown_2022870 _080D6B28: .4byte gUnknown_2022BC4 -_080D6B2C: .4byte gUnknown_2023BC4 +_080D6B2C: .4byte gActiveBattler thumb_func_end LinkPartnerHandlecmd38 thumb_func_start LinkPartnerHandlecmd39 @@ -5059,7 +5059,7 @@ LinkPartnerHandleHitAnimation: @ 80D6B70 push {r4,lr} ldr r3, _080D6B98 @ =gSprites ldr r2, _080D6B9C @ =gUnknown_2023D44 - ldr r4, _080D6BA0 @ =gUnknown_2023BC4 + ldr r4, _080D6BA0 @ =gActiveBattler ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -5077,7 +5077,7 @@ LinkPartnerHandleHitAnimation: @ 80D6B70 .align 2, 0 _080D6B98: .4byte gSprites _080D6B9C: .4byte gUnknown_2023D44 -_080D6BA0: .4byte gUnknown_2023BC4 +_080D6BA0: .4byte gActiveBattler _080D6BA4: ldr r1, _080D6BD4 @ =gUnknown_2024005 movs r0, 0x1 @@ -5120,7 +5120,7 @@ sub_80D6BE0: @ 80D6BE0 thumb_func_start LinkPartnerHandleEffectivenessSound LinkPartnerHandleEffectivenessSound: @ 80D6BEC push {r4,lr} - ldr r4, _080D6C28 @ =gUnknown_2023BC4 + ldr r4, _080D6C28 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -5148,7 +5148,7 @@ _080D6C00: pop {r0} bx r0 .align 2, 0 -_080D6C28: .4byte gUnknown_2023BC4 +_080D6C28: .4byte gActiveBattler _080D6C2C: .4byte gUnknown_2022BC4 thumb_func_end LinkPartnerHandleEffectivenessSound @@ -5156,7 +5156,7 @@ _080D6C2C: .4byte gUnknown_2022BC4 LinkPartnerHandlecmd44: @ 80D6C30 push {lr} ldr r2, _080D6C58 @ =gUnknown_2022BC4 - ldr r0, _080D6C5C @ =gUnknown_2023BC4 + ldr r0, _080D6C5C @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -5173,21 +5173,21 @@ LinkPartnerHandlecmd44: @ 80D6C30 bx r0 .align 2, 0 _080D6C58: .4byte gUnknown_2022BC4 -_080D6C5C: .4byte gUnknown_2023BC4 +_080D6C5C: .4byte gActiveBattler thumb_func_end LinkPartnerHandlecmd44 thumb_func_start LinkPartnerHandleFaintingCry LinkPartnerHandleFaintingCry: @ 80D6C60 push {lr} - ldr r1, _080D6C94 @ =gUnknown_2023BCE - ldr r0, _080D6C98 @ =gUnknown_2023BC4 + ldr r1, _080D6C94 @ =gBattlerPartyIndexes + ldr r0, _080D6C98 @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D6C9C @ =gUnknown_2024284 + ldr r1, _080D6C9C @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -5201,16 +5201,16 @@ LinkPartnerHandleFaintingCry: @ 80D6C60 pop {r0} bx r0 .align 2, 0 -_080D6C94: .4byte gUnknown_2023BCE -_080D6C98: .4byte gUnknown_2023BC4 -_080D6C9C: .4byte gUnknown_2024284 +_080D6C94: .4byte gBattlerPartyIndexes +_080D6C98: .4byte gActiveBattler +_080D6C9C: .4byte gPlayerParty thumb_func_end LinkPartnerHandleFaintingCry thumb_func_start LinkPartnerHandleIntroSlide LinkPartnerHandleIntroSlide: @ 80D6CA0 push {lr} ldr r1, _080D6CC8 @ =gUnknown_2022BC4 - ldr r0, _080D6CCC @ =gUnknown_2023BC4 + ldr r0, _080D6CCC @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -5227,7 +5227,7 @@ LinkPartnerHandleIntroSlide: @ 80D6CA0 bx r0 .align 2, 0 _080D6CC8: .4byte gUnknown_2022BC4 -_080D6CCC: .4byte gUnknown_2023BC4 +_080D6CCC: .4byte gActiveBattler _080D6CD0: .4byte gUnknown_2023F4C thumb_func_end LinkPartnerHandleIntroSlide @@ -5235,7 +5235,7 @@ _080D6CD0: .4byte gUnknown_2023F4C sub_80D6CD4: @ 80D6CD4 push {r4-r7,lr} ldr r5, _080D6DDC @ =gUnknown_2023D44 - ldr r6, _080D6DE0 @ =gUnknown_2023BC4 + ldr r6, _080D6DE0 @ =gActiveBattler ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -5346,7 +5346,7 @@ sub_80D6CD4: @ 80D6CD4 cmp r5, 0x3 bne _080D6DFC _080D6DC2: - ldr r0, _080D6DE0 @ =gUnknown_2023BC4 + ldr r0, _080D6DE0 @ =gActiveBattler ldrb r0, [r0] bl GetBankMultiplayerId ldr r2, _080D6DF8 @ =gUnknown_202273C @@ -5359,7 +5359,7 @@ _080D6DC2: b _080D6E0C .align 2, 0 _080D6DDC: .4byte gUnknown_2023D44 -_080D6DE0: .4byte gUnknown_2023BC4 +_080D6DE0: .4byte gActiveBattler _080D6DE4: .4byte gSprites _080D6DE8: .4byte 0x0000ffd8 _080D6DEC: .4byte sub_8075590 @@ -5387,7 +5387,7 @@ _080D6E0C: bl LoadCompressedPalette ldr r2, _080D6EA8 @ =gSprites ldr r1, _080D6EAC @ =gUnknown_2023D44 - ldr r5, _080D6EB0 @ =gUnknown_2023BC4 + ldr r5, _080D6EB0 @ =gActiveBattler ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -5454,7 +5454,7 @@ _080D6E86: _080D6EA4: .4byte gUnknown_8239FD4 _080D6EA8: .4byte gSprites _080D6EAC: .4byte gUnknown_2023D44 -_080D6EB0: .4byte gUnknown_2023BC4 +_080D6EB0: .4byte gActiveBattler _080D6EB4: .4byte sub_80D6ED0 _080D6EB8: .4byte gUnknown_3005090 _080D6EBC: .4byte gUnknown_2024018 @@ -5489,7 +5489,7 @@ sub_80D6ED0: @ 80D6ED0 .align 2, 0 _080D6EF8: .4byte gUnknown_3005090 _080D6EFC: - ldr r7, _080D6F3C @ =gUnknown_2023BC4 + ldr r7, _080D6F3C @ =gActiveBattler ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -5498,7 +5498,7 @@ _080D6EFC: lsls r0, 24 cmp r0, 0 beq _080D6F1C - ldr r0, _080D6F40 @ =gUnknown_2022B4C + ldr r0, _080D6F40 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -5510,7 +5510,7 @@ _080D6F1C: lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _080D6F48 @ =gUnknown_2023BCE + ldr r0, _080D6F48 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -5520,17 +5520,17 @@ _080D6F1C: bl sub_80D5F40 b _080D6FA0 .align 2, 0 -_080D6F3C: .4byte gUnknown_2023BC4 -_080D6F40: .4byte gUnknown_2022B4C +_080D6F3C: .4byte gActiveBattler +_080D6F40: .4byte gBattleTypeFlags _080D6F44: .4byte gUnknown_2022BC4 -_080D6F48: .4byte gUnknown_2023BCE +_080D6F48: .4byte gBattlerPartyIndexes _080D6F4C: ldr r4, _080D6FC4 @ =gUnknown_2022BC4 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, _080D6FC8 @ =gUnknown_2023BCE + ldr r5, _080D6FC8 @ =gBattlerPartyIndexes lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -5555,7 +5555,7 @@ _080D6F4C: ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _080D6FCC @ =gUnknown_2024284 + ldr r2, _080D6FCC @ =gPlayerParty adds r0, r2 bl sub_8034498 ldrb r0, [r7] @@ -5566,7 +5566,7 @@ _080D6F4C: strb r0, [r7] _080D6FA0: ldr r1, _080D6FD0 @ =gUnknown_3004FE0 - ldr r2, _080D6FD4 @ =gUnknown_2023BC4 + ldr r2, _080D6FD4 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -5585,10 +5585,10 @@ _080D6FB8: bx r0 .align 2, 0 _080D6FC4: .4byte gUnknown_2022BC4 -_080D6FC8: .4byte gUnknown_2023BCE -_080D6FCC: .4byte gUnknown_2024284 +_080D6FC8: .4byte gBattlerPartyIndexes +_080D6FCC: .4byte gPlayerParty _080D6FD0: .4byte gUnknown_3004FE0 -_080D6FD4: .4byte gUnknown_2023BC4 +_080D6FD4: .4byte gActiveBattler _080D6FD8: .4byte sub_80D443C thumb_func_end sub_80D6ED0 @@ -5596,7 +5596,7 @@ _080D6FD8: .4byte sub_80D443C sub_80D6FDC: @ 80D6FDC push {r4-r6,lr} ldr r1, _080D7004 @ =gUnknown_2022BC4 - ldr r0, _080D7008 @ =gUnknown_2023BC4 + ldr r0, _080D7008 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -5613,11 +5613,11 @@ sub_80D6FDC: @ 80D6FDC b _080D7080 .align 2, 0 _080D7004: .4byte gUnknown_2022BC4 -_080D7008: .4byte gUnknown_2023BC4 +_080D7008: .4byte gActiveBattler _080D700C: ldr r6, _080D7088 @ =gUnknown_2024018 ldr r0, [r6] - ldr r5, _080D708C @ =gUnknown_2023BC4 + ldr r5, _080D708C @ =gActiveBattler ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -5679,7 +5679,7 @@ _080D7080: bx r0 .align 2, 0 _080D7088: .4byte gUnknown_2024018 -_080D708C: .4byte gUnknown_2023BC4 +_080D708C: .4byte gActiveBattler _080D7090: .4byte gUnknown_2022BC8 _080D7094: .4byte gUnknown_2024000 _080D7098: .4byte gUnknown_3004FE0 @@ -5691,7 +5691,7 @@ sub_80D70A0: @ 80D70A0 push {r4,lr} ldr r4, _080D70E0 @ =gUnknown_2024018 ldr r0, [r4] - ldr r3, _080D70E4 @ =gUnknown_2023BC4 + ldr r3, _080D70E4 @ =gActiveBattler ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -5721,7 +5721,7 @@ _080D70D8: bx r0 .align 2, 0 _080D70E0: .4byte gUnknown_2024018 -_080D70E4: .4byte gUnknown_2023BC4 +_080D70E4: .4byte gActiveBattler thumb_func_end sub_80D70A0 thumb_func_start sub_80D70E8 @@ -5729,7 +5729,7 @@ sub_80D70E8: @ 80D70E8 push {lr} ldr r0, _080D7124 @ =gUnknown_2024018 ldr r1, [r0] - ldr r0, _080D7128 @ =gUnknown_2023BC4 + ldr r0, _080D7128 @ =gActiveBattler ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -5757,7 +5757,7 @@ _080D711A: bx r0 .align 2, 0 _080D7124: .4byte gUnknown_2024018 -_080D7128: .4byte gUnknown_2023BC4 +_080D7128: .4byte gActiveBattler _080D712C: .4byte gUnknown_3005090 _080D7130: .4byte gUnknown_2024000 _080D7134: .4byte sub_80491B0 @@ -5774,7 +5774,7 @@ sub_80D7138: @ 80D7138 thumb_func_start LinkPartnerHandleSpriteInvisibility LinkPartnerHandleSpriteInvisibility: @ 80D7144 push {r4,lr} - ldr r4, _080D7194 @ =gUnknown_2023BC4 + ldr r4, _080D7194 @ =gActiveBattler ldrb r0, [r4] bl sub_8075224 lsls r0, 24 @@ -5812,7 +5812,7 @@ _080D718A: pop {r0} bx r0 .align 2, 0 -_080D7194: .4byte gUnknown_2023BC4 +_080D7194: .4byte gActiveBattler _080D7198: .4byte gSprites _080D719C: .4byte gUnknown_2023D44 _080D71A0: .4byte gUnknown_2022BC4 @@ -5822,7 +5822,7 @@ _080D71A0: .4byte gUnknown_2022BC4 LinkPartnerHandleBattleAnimation: @ 80D71A4 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _080D71E8 @ =gUnknown_2023BC4 + ldr r6, _080D71E8 @ =gActiveBattler ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -5852,7 +5852,7 @@ LinkPartnerHandleBattleAnimation: @ 80D71A4 bl sub_80D49E8 b _080D71FC .align 2, 0 -_080D71E8: .4byte gUnknown_2023BC4 +_080D71E8: .4byte gActiveBattler _080D71EC: .4byte gUnknown_2022BC4 _080D71F0: ldr r0, _080D7204 @ =gUnknown_3004FE0 @@ -5892,7 +5892,7 @@ LinkPartnerHandlecmd55: @ 80D7224 push {r4,lr} ldr r2, _080D725C @ =gUnknown_2023E8A ldr r1, _080D7260 @ =gUnknown_2022BC4 - ldr r4, _080D7264 @ =gUnknown_2023BC4 + ldr r4, _080D7264 @ =gActiveBattler ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -5916,7 +5916,7 @@ LinkPartnerHandlecmd55: @ 80D7224 .align 2, 0 _080D725C: .4byte gUnknown_2023E8A _080D7260: .4byte gUnknown_2022BC4 -_080D7264: .4byte gUnknown_2023BC4 +_080D7264: .4byte gActiveBattler _080D7268: .4byte gUnknown_3004FE0 _080D726C: .4byte sub_802F6A8 thumb_func_end LinkPartnerHandlecmd55 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 diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index e73268b38..635aae83a 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -13,7 +13,7 @@ nullsub_17: @ 8035A78 thumb_func_start sub_8035A7C sub_8035A7C: @ 8035A7C ldr r1, _08035A8C @ =gUnknown_3004FE0 - ldr r0, _08035A90 @ =gUnknown_2023BC4 + ldr r0, _08035A90 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -22,7 +22,7 @@ sub_8035A7C: @ 8035A7C bx lr .align 2, 0 _08035A8C: .4byte gUnknown_3004FE0 -_08035A90: .4byte gUnknown_2023BC4 +_08035A90: .4byte gActiveBattler _08035A94: .4byte sub_8035A98 thumb_func_end sub_8035A7C @@ -30,8 +30,8 @@ _08035A94: .4byte sub_8035A98 sub_8035A98: @ 8035A98 push {lr} ldr r2, _08035ACC @ =gUnknown_2023BC8 - ldr r1, _08035AD0 @ =gUnknown_825E45C - ldr r0, _08035AD4 @ =gUnknown_2023BC4 + ldr r1, _08035AD0 @ =gBitTable + ldr r0, _08035AD4 @ =gActiveBattler ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -55,8 +55,8 @@ sub_8035A98: @ 8035A98 b _08035AE4 .align 2, 0 _08035ACC: .4byte gUnknown_2023BC8 -_08035AD0: .4byte gUnknown_825E45C -_08035AD4: .4byte gUnknown_2023BC4 +_08035AD0: .4byte gBitTable +_08035AD4: .4byte gActiveBattler _08035AD8: .4byte gUnknown_2022BC4 _08035ADC: .4byte gUnknown_8250A34 _08035AE0: @@ -71,7 +71,7 @@ sub_8035AE8: @ 8035AE8 push {lr} ldr r2, _08035B10 @ =gSprites ldr r1, _08035B14 @ =gUnknown_2023D44 - ldr r0, _08035B18 @ =gUnknown_2023BC4 + ldr r0, _08035B18 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -91,7 +91,7 @@ _08035B0C: .align 2, 0 _08035B10: .4byte gSprites _08035B14: .4byte gUnknown_2023D44 -_08035B18: .4byte gUnknown_2023BC4 +_08035B18: .4byte gActiveBattler _08035B1C: .4byte SpriteCallbackDummy thumb_func_end sub_8035AE8 @@ -100,7 +100,7 @@ sub_8035B20: @ 8035B20 push {lr} ldr r2, _08035B48 @ =gSprites ldr r1, _08035B4C @ =gUnknown_2023D44 - ldr r0, _08035B50 @ =gUnknown_2023BC4 + ldr r0, _08035B50 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -120,7 +120,7 @@ _08035B44: .align 2, 0 _08035B48: .4byte gSprites _08035B4C: .4byte gUnknown_2023D44 -_08035B50: .4byte gUnknown_2023BC4 +_08035B50: .4byte gActiveBattler _08035B54: .4byte SpriteCallbackDummy thumb_func_end sub_8035B20 @@ -129,7 +129,7 @@ sub_8035B58: @ 8035B58 push {r4-r6,lr} ldr r4, _08035BD0 @ =gSprites ldr r6, _08035BD4 @ =gUnknown_2023D44 - ldr r5, _08035BD8 @ =gUnknown_2023BC4 + ldr r5, _08035BD8 @ =gActiveBattler ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -185,7 +185,7 @@ _08035BC8: .align 2, 0 _08035BD0: .4byte gSprites _08035BD4: .4byte gUnknown_2023D44 -_08035BD8: .4byte gUnknown_2023BC4 +_08035BD8: .4byte gActiveBattler _08035BDC: .4byte SpriteCallbackDummy _08035BE0: .4byte 0x000003ff _08035BE4: .4byte 0xfffffc00 @@ -196,7 +196,7 @@ sub_8035BE8: @ 8035BE8 push {r4,lr} ldr r4, _08035C28 @ =gUnknown_2024018 ldr r1, [r4] - ldr r3, _08035C2C @ =gUnknown_2023BC4 + ldr r3, _08035C2C @ =gActiveBattler ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -226,7 +226,7 @@ _08035C20: bx r0 .align 2, 0 _08035C28: .4byte gUnknown_2024018 -_08035C2C: .4byte gUnknown_2023BC4 +_08035C2C: .4byte gActiveBattler thumb_func_end sub_8035BE8 thumb_func_start sub_8035C30 @@ -241,7 +241,7 @@ sub_8035C30: @ 8035C30 lsls r0, 24 cmp r0, 0 beq _08035C88 - ldr r0, _08035C74 @ =gUnknown_2022B4C + ldr r0, _08035C74 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -250,7 +250,7 @@ sub_8035C30: @ 8035C30 _08035C54: ldr r2, _08035C78 @ =gSprites ldr r1, _08035C7C @ =gUnknown_3004FF0 - ldr r0, _08035C80 @ =gUnknown_2023BC4 + ldr r0, _08035C80 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -265,15 +265,15 @@ _08035C54: bne _08035CBE b _08035CBC .align 2, 0 -_08035C74: .4byte gUnknown_2022B4C +_08035C74: .4byte gBattleTypeFlags _08035C78: .4byte gSprites _08035C7C: .4byte gUnknown_3004FF0 -_08035C80: .4byte gUnknown_2023BC4 +_08035C80: .4byte gActiveBattler _08035C84: .4byte SpriteCallbackDummy _08035C88: ldr r2, _08035D84 @ =gSprites ldr r5, _08035D88 @ =gUnknown_3004FF0 - ldr r0, _08035D8C @ =gUnknown_2023BC4 + ldr r0, _08035D8C @ =gActiveBattler ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -313,7 +313,7 @@ _08035CD0: ldr r0, _08035D94 @ =gUnknown_2024018 mov r12, r0 ldr r0, [r0] - ldr r7, _08035D8C @ =gUnknown_2023BC4 + ldr r7, _08035D8C @ =gActiveBattler ldrb r2, [r7] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -388,7 +388,7 @@ _08035CD0: bl FreeSpriteTilesByTag adds r0, r4, 0 bl FreeSpritePaletteByTag - ldr r0, _08035D9C @ =gUnknown_2022B4C + ldr r0, _08035D9C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -400,11 +400,11 @@ _08035CD0: .align 2, 0 _08035D84: .4byte gSprites _08035D88: .4byte gUnknown_3004FF0 -_08035D8C: .4byte gUnknown_2023BC4 +_08035D8C: .4byte gActiveBattler _08035D90: .4byte SpriteCallbackDummy _08035D94: .4byte gUnknown_2024018 _08035D98: .4byte 0x000027f9 -_08035D9C: .4byte gUnknown_2022B4C +_08035D9C: .4byte gBattleTypeFlags _08035DA0: .4byte gMPlay_BGM _08035DA4: ldr r0, _08035DD8 @ =gMPlay_BGM @@ -415,7 +415,7 @@ _08035DA4: _08035DB0: ldr r0, _08035DE0 @ =gUnknown_2024018 ldr r0, [r0] - ldr r3, _08035DE4 @ =gUnknown_2023BC4 + ldr r3, _08035DE4 @ =gActiveBattler ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -438,7 +438,7 @@ _08035DD2: _08035DD8: .4byte gMPlay_BGM _08035DDC: .4byte 0x0000ffff _08035DE0: .4byte gUnknown_2024018 -_08035DE4: .4byte gUnknown_2023BC4 +_08035DE4: .4byte gActiveBattler _08035DE8: .4byte gUnknown_3004FE0 _08035DEC: .4byte sub_8035BE8 thumb_func_end sub_8035C30 @@ -451,7 +451,7 @@ sub_8035DF0: @ 8035DF0 push {r6,r7} ldr r4, _08035FC0 @ =gUnknown_2024018 ldr r0, [r4] - ldr r1, _08035FC4 @ =gUnknown_2023BC4 + ldr r1, _08035FC4 @ =gActiveBattler mov r9, r1 ldrb r2, [r1] ldr r1, [r0, 0x4] @@ -465,12 +465,12 @@ sub_8035DF0: @ 8035DF0 ands r0, r1 cmp r0, 0 bne _08035E2C - ldr r0, _08035FC8 @ =gUnknown_2023BCE + ldr r0, _08035FC8 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08035FCC @ =gUnknown_202402C + ldr r0, _08035FCC @ =gEnemyParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -491,12 +491,12 @@ _08035E2C: ands r0, r1 cmp r0, 0 bne _08035E60 - ldr r0, _08035FC8 @ =gUnknown_2023BCE + ldr r0, _08035FC8 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08035FCC @ =gUnknown_202402C + ldr r0, _08035FCC @ =gEnemyParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -534,7 +534,7 @@ _08035E96: lsls r0, 24 cmp r0, 0 beq _08035F28 - ldr r0, _08035FD0 @ =gUnknown_2022B4C + ldr r0, _08035FD0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -559,14 +559,14 @@ _08035E96: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08035FC8 @ =gUnknown_2023BCE + ldr r2, _08035FC8 @ =gBattlerPartyIndexes mov r8, r2 lsls r1, 1 add r1, r8 ldrh r1, [r1] movs r6, 0x64 muls r1, r6 - ldr r5, _08035FCC @ =gUnknown_202402C + ldr r5, _08035FCC @ =gEnemyParty adds r1, r5 movs r2, 0 bl UpdateHealthboxAttribute @@ -598,7 +598,7 @@ _08035E96: bl SetBankEnemyShadowSpriteCallback _08035F28: ldr r1, _08035FD4 @ =gUnknown_3004FFC - ldr r5, _08035FC4 @ =gUnknown_2023BC4 + ldr r5, _08035FC4 @ =gActiveBattler ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -612,7 +612,7 @@ _08035F28: ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08035FC8 @ =gUnknown_2023BCE + ldr r2, _08035FC8 @ =gBattlerPartyIndexes mov r9, r2 lsls r1, 1 add r1, r9 @@ -622,7 +622,7 @@ _08035F28: mov r2, r8 muls r2, r1 adds r1, r2, 0 - ldr r6, _08035FCC @ =gUnknown_202402C + ldr r6, _08035FCC @ =gEnemyParty adds r1, r6 movs r2, 0 bl UpdateHealthboxAttribute @@ -670,10 +670,10 @@ _08035FB4: bx r0 .align 2, 0 _08035FC0: .4byte gUnknown_2024018 -_08035FC4: .4byte gUnknown_2023BC4 -_08035FC8: .4byte gUnknown_2023BCE -_08035FCC: .4byte gUnknown_202402C -_08035FD0: .4byte gUnknown_2022B4C +_08035FC4: .4byte gActiveBattler +_08035FC8: .4byte gBattlerPartyIndexes +_08035FCC: .4byte gEnemyParty +_08035FD0: .4byte gBattleTypeFlags _08035FD4: .4byte gUnknown_3004FFC _08035FD8: .4byte gSprites _08035FDC: .4byte gUnknown_3004FF0 @@ -686,7 +686,7 @@ sub_8035FE8: @ 8035FE8 push {r4-r7,lr} ldr r2, _08036044 @ =gSprites ldr r0, _08036048 @ =gUnknown_2023D44 - ldr r7, _0803604C @ =gUnknown_2023BC4 + ldr r7, _0803604C @ =gActiveBattler ldrb r3, [r7] adds r0, r3, r0 ldrb r1, [r0] @@ -717,12 +717,12 @@ sub_8035FE8: @ 8035FE8 ands r0, r5 cmp r0, 0 bne _0803605C - ldr r0, _08036054 @ =gUnknown_2023BCE + ldr r0, _08036054 @ =gBattlerPartyIndexes adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08036058 @ =gUnknown_202402C + ldr r0, _08036058 @ =gEnemyParty adds r1, r0 adds r0, r3, 0 bl sub_80F1720 @@ -730,10 +730,10 @@ sub_8035FE8: @ 8035FE8 .align 2, 0 _08036044: .4byte gSprites _08036048: .4byte gUnknown_2023D44 -_0803604C: .4byte gUnknown_2023BC4 +_0803604C: .4byte gActiveBattler _08036050: .4byte gUnknown_2024018 -_08036054: .4byte gUnknown_2023BCE -_08036058: .4byte gUnknown_202402C +_08036054: .4byte gBattlerPartyIndexes +_08036058: .4byte gEnemyParty _0803605C: ldrb r0, [r1, 0x1] ands r2, r0 @@ -771,7 +771,7 @@ _0803609C: .4byte 0x000027f9 thumb_func_start sub_80360A0 sub_80360A0: @ 80360A0 push {r4-r6,lr} - ldr r6, _080360E0 @ =gUnknown_2023BC4 + ldr r6, _080360E0 @ =gActiveBattler ldrb r0, [r6] ldr r5, _080360E4 @ =gUnknown_3004FF0 adds r1, r0, r5 @@ -799,7 +799,7 @@ sub_80360A0: @ 80360A0 bl sub_8048440 b _08036124 .align 2, 0 -_080360E0: .4byte gUnknown_2023BC4 +_080360E0: .4byte gActiveBattler _080360E4: .4byte gUnknown_3004FF0 _080360E8: movs r0, 0x1 @@ -807,7 +807,7 @@ _080360E8: lsls r0, 24 cmp r0, 0 bne _08036120 - ldr r0, _08036114 @ =gUnknown_2022B4C + ldr r0, _08036114 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -823,7 +823,7 @@ _080360E8: str r0, [r1] b _08036124 .align 2, 0 -_08036114: .4byte gUnknown_2022B4C +_08036114: .4byte gBattleTypeFlags _08036118: .4byte gUnknown_3004FE0 _0803611C: .4byte sub_80E8570 _08036120: @@ -839,7 +839,7 @@ sub_803612C: @ 803612C push {lr} ldr r2, _08036160 @ =gSprites ldr r0, _08036164 @ =gUnknown_2023D44 - ldr r1, _08036168 @ =gUnknown_2023BC4 + ldr r1, _08036168 @ =gActiveBattler ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -863,7 +863,7 @@ _0803615A: .align 2, 0 _08036160: .4byte gSprites _08036164: .4byte gUnknown_2023D44 -_08036168: .4byte gUnknown_2023BC4 +_08036168: .4byte gActiveBattler _0803616C: .4byte gUnknown_3004FF0 thumb_func_end sub_803612C @@ -872,7 +872,7 @@ sub_8036170: @ 8036170 push {r4-r6,lr} ldr r0, _080361D0 @ =gUnknown_2024018 ldr r0, [r0] - ldr r6, _080361D4 @ =gUnknown_2023BC4 + ldr r6, _080361D4 @ =gActiveBattler ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -915,7 +915,7 @@ _080361CA: bx r0 .align 2, 0 _080361D0: .4byte gUnknown_2024018 -_080361D4: .4byte gUnknown_2023BC4 +_080361D4: .4byte gActiveBattler _080361D8: .4byte gUnknown_2023D44 _080361DC: .4byte gSprites _080361E0: .4byte gUnknown_3004FF0 @@ -939,7 +939,7 @@ _080361F6: sub_80361FC: @ 80361FC push {r4,lr} ldr r1, _08036238 @ =gUnknown_2023D44 - ldr r0, _0803623C @ =gUnknown_2023BC4 + ldr r0, _0803623C @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -967,7 +967,7 @@ sub_80361FC: @ 80361FC b _08036272 .align 2, 0 _08036238: .4byte gUnknown_2023D44 -_0803623C: .4byte gUnknown_2023BC4 +_0803623C: .4byte gActiveBattler _08036240: .4byte gSprites _08036244: .4byte gUnknown_2024005 _08036248: @@ -1004,7 +1004,7 @@ sub_8036278: @ 8036278 push {r4,lr} ldr r2, _080362CC @ =gSprites ldr r0, _080362D0 @ =gUnknown_3004FF0 - ldr r4, _080362D4 @ =gUnknown_2023BC4 + ldr r4, _080362D4 @ =gActiveBattler ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -1046,7 +1046,7 @@ _080362C4: .align 2, 0 _080362CC: .4byte gSprites _080362D0: .4byte gUnknown_3004FF0 -_080362D4: .4byte gUnknown_2023BC4 +_080362D4: .4byte gActiveBattler _080362D8: .4byte SpriteCallbackDummy _080362DC: .4byte gUnknown_2024018 _080362E0: .4byte gUnknown_3004FE0 @@ -1058,7 +1058,7 @@ sub_80362E8: @ 80362E8 push {lr} ldr r0, _08036324 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _08036328 @ =gUnknown_2023BC4 + ldr r0, _08036328 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1085,7 +1085,7 @@ _08036320: bx r0 .align 2, 0 _08036324: .4byte gUnknown_2024018 -_08036328: .4byte gUnknown_2023BC4 +_08036328: .4byte gActiveBattler _0803632C: .4byte gMPlay_BGM _08036330: .4byte 0x0000ffff thumb_func_end sub_80362E8 @@ -1095,7 +1095,7 @@ sub_8036334: @ 8036334 push {r4,r5,lr} ldr r3, _080363E0 @ =gUnknown_2024018 ldr r0, [r3] - ldr r5, _080363E4 @ =gUnknown_2023BC4 + ldr r5, _080363E4 @ =gActiveBattler ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -1143,13 +1143,13 @@ sub_8036334: @ 8036334 ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _080363F8 @ =gUnknown_2023BCE + ldr r2, _080363F8 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080363FC @ =gUnknown_202402C + ldr r2, _080363FC @ =gEnemyParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -1173,13 +1173,13 @@ _080363D8: bx r0 .align 2, 0 _080363E0: .4byte gUnknown_2024018 -_080363E4: .4byte gUnknown_2023BC4 +_080363E4: .4byte gActiveBattler _080363E8: .4byte 0x000027f9 _080363EC: .4byte gUnknown_2023D44 _080363F0: .4byte gSprites _080363F4: .4byte gUnknown_3004FF0 -_080363F8: .4byte gUnknown_2023BCE -_080363FC: .4byte gUnknown_202402C +_080363F8: .4byte gBattlerPartyIndexes +_080363FC: .4byte gEnemyParty _08036400: .4byte gUnknown_3004FE0 _08036404: .4byte sub_8036278 thumb_func_end sub_8036334 @@ -1189,7 +1189,7 @@ sub_8036408: @ 8036408 push {r4-r6,lr} ldr r6, _080364AC @ =gUnknown_2024018 ldr r0, [r6] - ldr r5, _080364B0 @ =gUnknown_2023BC4 + ldr r5, _080364B0 @ =gActiveBattler ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -1201,12 +1201,12 @@ sub_8036408: @ 8036408 ands r0, r1 cmp r0, 0 bne _0803643A - ldr r0, _080364B4 @ =gUnknown_2023BCE + ldr r0, _080364B4 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080364B8 @ =gUnknown_202402C + ldr r0, _080364B8 @ =gEnemyParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -1240,13 +1240,13 @@ _0803643A: adds r0, r3, r4 bl DestroySprite ldrb r4, [r5] - ldr r1, _080364B4 @ =gUnknown_2023BCE + ldr r1, _080364B4 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080364B8 @ =gUnknown_202402C + ldr r1, _080364B8 @ =gEnemyParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -1267,9 +1267,9 @@ _080364A4: bx r0 .align 2, 0 _080364AC: .4byte gUnknown_2024018 -_080364B0: .4byte gUnknown_2023BC4 -_080364B4: .4byte gUnknown_2023BCE -_080364B8: .4byte gUnknown_202402C +_080364B0: .4byte gActiveBattler +_080364B4: .4byte gBattlerPartyIndexes +_080364B8: .4byte gEnemyParty _080364BC: .4byte gSprites _080364C0: .4byte gUnknown_3004FFC _080364C4: .4byte SpriteCallbackDummy @@ -1282,7 +1282,7 @@ sub_80364D0: @ 80364D0 push {lr} ldr r0, _080364F8 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080364FC @ =gUnknown_2023BC4 + ldr r0, _080364FC @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1300,7 +1300,7 @@ _080364F2: bx r0 .align 2, 0 _080364F8: .4byte gUnknown_2024018 -_080364FC: .4byte gUnknown_2023BC4 +_080364FC: .4byte gActiveBattler thumb_func_end sub_80364D0 thumb_func_start sub_8036500 @@ -1308,7 +1308,7 @@ sub_8036500: @ 8036500 push {lr} ldr r0, _08036528 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _0803652C @ =gUnknown_2023BC4 + ldr r0, _0803652C @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1326,20 +1326,20 @@ _08036522: bx r0 .align 2, 0 _08036528: .4byte gUnknown_2024018 -_0803652C: .4byte gUnknown_2023BC4 +_0803652C: .4byte gActiveBattler thumb_func_end sub_8036500 thumb_func_start OpponentBufferExecCompleted OpponentBufferExecCompleted: @ 8036530 ldr r1, _08036554 @ =gUnknown_3004FE0 - ldr r2, _08036558 @ =gUnknown_2023BC4 + ldr r2, _08036558 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 ldr r1, _0803655C @ =sub_8035A98 str r1, [r0] ldr r3, _08036560 @ =gUnknown_2023BC8 - ldr r1, _08036564 @ =gUnknown_825E45C + ldr r1, _08036564 @ =gBitTable ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -1350,10 +1350,10 @@ OpponentBufferExecCompleted: @ 8036530 bx lr .align 2, 0 _08036554: .4byte gUnknown_3004FE0 -_08036558: .4byte gUnknown_2023BC4 +_08036558: .4byte gActiveBattler _0803655C: .4byte sub_8035A98 _08036560: .4byte gUnknown_2023BC8 -_08036564: .4byte gUnknown_825E45C +_08036564: .4byte gBitTable thumb_func_end OpponentBufferExecCompleted thumb_func_start OpponentHandleGetAttributes @@ -1362,7 +1362,7 @@ OpponentHandleGetAttributes: @ 8036568 sub sp, 0x100 movs r6, 0 ldr r1, _08036594 @ =gUnknown_2022BC4 - ldr r0, _08036598 @ =gUnknown_2023BC4 + ldr r0, _08036598 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -1370,7 +1370,7 @@ OpponentHandleGetAttributes: @ 8036568 ldrb r0, [r1] cmp r0, 0 bne _080365A0 - ldr r0, _0803659C @ =gUnknown_2023BCE + ldr r0, _0803659C @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -1380,8 +1380,8 @@ OpponentHandleGetAttributes: @ 8036568 b _080365C2 .align 2, 0 _08036594: .4byte gUnknown_2022BC4 -_08036598: .4byte gUnknown_2023BC4 -_0803659C: .4byte gUnknown_2023BCE +_08036598: .4byte gActiveBattler +_0803659C: .4byte gBattlerPartyIndexes _080365A0: ldrb r4, [r1] movs r5, 0 @@ -1427,7 +1427,7 @@ sub_80365DC: @ 80365DC lsrs r5, r0, 24 movs r6, 0 ldr r2, _08036610 @ =gUnknown_2022BC4 - ldr r3, _08036614 @ =gUnknown_2023BC4 + ldr r3, _08036614 @ =gActiveBattler ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -1444,7 +1444,7 @@ _08036606: mov pc, r0 .align 2, 0 _08036610: .4byte gUnknown_2022BC4 -_08036614: .4byte gUnknown_2023BC4 +_08036614: .4byte gActiveBattler _08036618: .4byte _0803661C .align 2, 0 _0803661C: @@ -1512,7 +1512,7 @@ _0803670C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08036920 @ =gUnknown_202402C + ldr r0, _08036920 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -1565,7 +1565,7 @@ _08036758: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08036920 @ =gUnknown_202402C + ldr r0, _08036920 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -1749,28 +1749,28 @@ _08036910: bls _08036910 b _08036D72 .align 2, 0 -_08036920: .4byte gUnknown_202402C +_08036920: .4byte gEnemyParty _08036924: .4byte 0xfffffc1f _08036928: .4byte 0xfff07fff _0803692C: .4byte 0xfffffe0f _08036930: movs r0, 0x64 muls r0, r5 - ldr r1, _0803693C @ =gUnknown_202402C + ldr r1, _0803693C @ =gEnemyParty adds r0, r1 movs r1, 0xB b _08036CAA .align 2, 0 -_0803693C: .4byte gUnknown_202402C +_0803693C: .4byte gEnemyParty _08036940: movs r0, 0x64 muls r0, r5 - ldr r1, _0803694C @ =gUnknown_202402C + ldr r1, _0803694C @ =gEnemyParty adds r0, r1 movs r1, 0xC b _08036CAA .align 2, 0 -_0803694C: .4byte gUnknown_202402C +_0803694C: .4byte gEnemyParty _08036950: movs r6, 0 add r2, sp, 0x58 @@ -1780,7 +1780,7 @@ _08036950: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080369B4 @ =gUnknown_202402C + ldr r0, _080369B4 @ =gEnemyParty adds r4, r1, r0 mov r8, r9 _08036966: @@ -1804,7 +1804,7 @@ _08036966: ble _08036966 movs r0, 0x64 muls r0, r5 - ldr r1, _080369B4 @ =gUnknown_202402C + ldr r1, _080369B4 @ =gEnemyParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -1822,11 +1822,11 @@ _080369A4: bls _080369A4 b _08036D72 .align 2, 0 -_080369B4: .4byte gUnknown_202402C +_080369B4: .4byte gEnemyParty _080369B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080369D0 @ =gUnknown_202402C + ldr r1, _080369D0 @ =gEnemyParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -1836,13 +1836,13 @@ _080369B8: adds r1, 0x9 b _08036CAA .align 2, 0 -_080369D0: .4byte gUnknown_202402C +_080369D0: .4byte gEnemyParty _080369D4: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _08036A0C @ =gUnknown_202402C + ldr r2, _08036A0C @ =gEnemyParty mov r8, r2 _080369E0: adds r1, r6, 0 @@ -1857,7 +1857,7 @@ _080369E0: ble _080369E0 movs r0, 0x64 muls r0, r5 - ldr r1, _08036A0C @ =gUnknown_202402C + ldr r1, _08036A0C @ =gEnemyParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -1866,11 +1866,11 @@ _080369E0: adds r6, 0x1 b _08036D72 .align 2, 0 -_08036A0C: .4byte gUnknown_202402C +_08036A0C: .4byte gEnemyParty _08036A10: movs r0, 0x64 muls r0, r5 - ldr r1, _08036A28 @ =gUnknown_202402C + ldr r1, _08036A28 @ =gEnemyParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -1880,20 +1880,20 @@ _08036A10: adds r1, 0x8 b _08036D6A .align 2, 0 -_08036A28: .4byte gUnknown_202402C +_08036A28: .4byte gEnemyParty _08036A2C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036A38 @ =gUnknown_202402C + ldr r1, _08036A38 @ =gEnemyParty adds r0, r1 movs r1, 0x1 b _08036A46 .align 2, 0 -_08036A38: .4byte gUnknown_202402C +_08036A38: .4byte gEnemyParty _08036A3C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036A68 @ =gUnknown_202402C + ldr r1, _08036A68 @ =gEnemyParty adds r0, r1 movs r1, 0x19 _08036A46: @@ -1913,120 +1913,120 @@ _08036A46: movs r6, 0x3 b _08036D72 .align 2, 0 -_08036A68: .4byte gUnknown_202402C +_08036A68: .4byte gEnemyParty _08036A6C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036A78 @ =gUnknown_202402C + ldr r1, _08036A78 @ =gEnemyParty adds r0, r1 movs r1, 0x1A b _08036D6A .align 2, 0 -_08036A78: .4byte gUnknown_202402C +_08036A78: .4byte gEnemyParty _08036A7C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036A88 @ =gUnknown_202402C + ldr r1, _08036A88 @ =gEnemyParty adds r0, r1 movs r1, 0x1B b _08036D6A .align 2, 0 -_08036A88: .4byte gUnknown_202402C +_08036A88: .4byte gEnemyParty _08036A8C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036A98 @ =gUnknown_202402C + ldr r1, _08036A98 @ =gEnemyParty adds r0, r1 movs r1, 0x1C b _08036D6A .align 2, 0 -_08036A98: .4byte gUnknown_202402C +_08036A98: .4byte gEnemyParty _08036A9C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036AA8 @ =gUnknown_202402C + ldr r1, _08036AA8 @ =gEnemyParty adds r0, r1 movs r1, 0x1D b _08036D6A .align 2, 0 -_08036AA8: .4byte gUnknown_202402C +_08036AA8: .4byte gEnemyParty _08036AAC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036AB8 @ =gUnknown_202402C + ldr r1, _08036AB8 @ =gEnemyParty adds r0, r1 movs r1, 0x1E b _08036D6A .align 2, 0 -_08036AB8: .4byte gUnknown_202402C +_08036AB8: .4byte gEnemyParty _08036ABC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036AC8 @ =gUnknown_202402C + ldr r1, _08036AC8 @ =gEnemyParty adds r0, r1 movs r1, 0x1F b _08036D6A .align 2, 0 -_08036AC8: .4byte gUnknown_202402C +_08036AC8: .4byte gEnemyParty _08036ACC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036AD8 @ =gUnknown_202402C + ldr r1, _08036AD8 @ =gEnemyParty adds r0, r1 movs r1, 0x20 b _08036D6A .align 2, 0 -_08036AD8: .4byte gUnknown_202402C +_08036AD8: .4byte gEnemyParty _08036ADC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036AE8 @ =gUnknown_202402C + ldr r1, _08036AE8 @ =gEnemyParty adds r0, r1 movs r1, 0x22 b _08036D6A .align 2, 0 -_08036AE8: .4byte gUnknown_202402C +_08036AE8: .4byte gEnemyParty _08036AEC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036AF8 @ =gUnknown_202402C + ldr r1, _08036AF8 @ =gEnemyParty adds r0, r1 movs r1, 0x23 b _08036D6A .align 2, 0 -_08036AF8: .4byte gUnknown_202402C +_08036AF8: .4byte gEnemyParty _08036AFC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036B08 @ =gUnknown_202402C + ldr r1, _08036B08 @ =gEnemyParty adds r0, r1 movs r1, 0x24 b _08036D6A .align 2, 0 -_08036B08: .4byte gUnknown_202402C +_08036B08: .4byte gEnemyParty _08036B0C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036B18 @ =gUnknown_202402C + ldr r1, _08036B18 @ =gEnemyParty adds r0, r1 movs r1, 0x25 b _08036D6A .align 2, 0 -_08036B18: .4byte gUnknown_202402C +_08036B18: .4byte gEnemyParty _08036B1C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036B28 @ =gUnknown_202402C + ldr r1, _08036B28 @ =gEnemyParty adds r0, r1 movs r1, 0x26 b _08036D6A .align 2, 0 -_08036B28: .4byte gUnknown_202402C +_08036B28: .4byte gEnemyParty _08036B2C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08036B78 @ =gUnknown_202402C + ldr r0, _08036B78 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -2055,83 +2055,83 @@ _08036B2C: movs r6, 0x6 b _08036D72 .align 2, 0 -_08036B78: .4byte gUnknown_202402C +_08036B78: .4byte gEnemyParty _08036B7C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036B88 @ =gUnknown_202402C + ldr r1, _08036B88 @ =gEnemyParty adds r0, r1 movs r1, 0x27 b _08036D6A .align 2, 0 -_08036B88: .4byte gUnknown_202402C +_08036B88: .4byte gEnemyParty _08036B8C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036B98 @ =gUnknown_202402C + ldr r1, _08036B98 @ =gEnemyParty adds r0, r1 movs r1, 0x28 b _08036D6A .align 2, 0 -_08036B98: .4byte gUnknown_202402C +_08036B98: .4byte gEnemyParty _08036B9C: movs r0, 0x64 muls r0, r5 - ldr r1, _08036BA8 @ =gUnknown_202402C + ldr r1, _08036BA8 @ =gEnemyParty adds r0, r1 movs r1, 0x29 b _08036D6A .align 2, 0 -_08036BA8: .4byte gUnknown_202402C +_08036BA8: .4byte gEnemyParty _08036BAC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036BB8 @ =gUnknown_202402C + ldr r1, _08036BB8 @ =gEnemyParty adds r0, r1 movs r1, 0x2A b _08036D6A .align 2, 0 -_08036BB8: .4byte gUnknown_202402C +_08036BB8: .4byte gEnemyParty _08036BBC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036BC8 @ =gUnknown_202402C + ldr r1, _08036BC8 @ =gEnemyParty adds r0, r1 movs r1, 0x2B b _08036D6A .align 2, 0 -_08036BC8: .4byte gUnknown_202402C +_08036BC8: .4byte gEnemyParty _08036BCC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036BD8 @ =gUnknown_202402C + ldr r1, _08036BD8 @ =gEnemyParty adds r0, r1 movs r1, 0x2C b _08036D6A .align 2, 0 -_08036BD8: .4byte gUnknown_202402C +_08036BD8: .4byte gEnemyParty _08036BDC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036BE8 @ =gUnknown_202402C + ldr r1, _08036BE8 @ =gEnemyParty adds r0, r1 movs r1, 0 b _08036C06 .align 2, 0 -_08036BE8: .4byte gUnknown_202402C +_08036BE8: .4byte gEnemyParty _08036BEC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036BF8 @ =gUnknown_202402C + ldr r1, _08036BF8 @ =gEnemyParty adds r0, r1 movs r1, 0x9 b _08036CAA .align 2, 0 -_08036BF8: .4byte gUnknown_202402C +_08036BF8: .4byte gEnemyParty _08036BFC: movs r0, 0x64 muls r0, r5 - ldr r1, _08036C2C @ =gUnknown_202402C + ldr r1, _08036C2C @ =gEnemyParty adds r0, r1 movs r1, 0x37 _08036C06: @@ -2153,74 +2153,74 @@ _08036C06: movs r6, 0x4 b _08036D72 .align 2, 0 -_08036C2C: .4byte gUnknown_202402C +_08036C2C: .4byte gEnemyParty _08036C30: movs r0, 0x64 muls r0, r5 - ldr r1, _08036C3C @ =gUnknown_202402C + ldr r1, _08036C3C @ =gEnemyParty adds r0, r1 movs r1, 0x38 b _08036D6A .align 2, 0 -_08036C3C: .4byte gUnknown_202402C +_08036C3C: .4byte gEnemyParty _08036C40: movs r0, 0x64 muls r0, r5 - ldr r1, _08036C4C @ =gUnknown_202402C + ldr r1, _08036C4C @ =gEnemyParty adds r0, r1 movs r1, 0x39 b _08036CAA .align 2, 0 -_08036C4C: .4byte gUnknown_202402C +_08036C4C: .4byte gEnemyParty _08036C50: movs r0, 0x64 muls r0, r5 - ldr r1, _08036C5C @ =gUnknown_202402C + ldr r1, _08036C5C @ =gEnemyParty adds r0, r1 movs r1, 0x3A b _08036CAA .align 2, 0 -_08036C5C: .4byte gUnknown_202402C +_08036C5C: .4byte gEnemyParty _08036C60: movs r0, 0x64 muls r0, r5 - ldr r1, _08036C6C @ =gUnknown_202402C + ldr r1, _08036C6C @ =gEnemyParty adds r0, r1 movs r1, 0x3B b _08036CAA .align 2, 0 -_08036C6C: .4byte gUnknown_202402C +_08036C6C: .4byte gEnemyParty _08036C70: movs r0, 0x64 muls r0, r5 - ldr r1, _08036C7C @ =gUnknown_202402C + ldr r1, _08036C7C @ =gEnemyParty adds r0, r1 movs r1, 0x3C b _08036CAA .align 2, 0 -_08036C7C: .4byte gUnknown_202402C +_08036C7C: .4byte gEnemyParty _08036C80: movs r0, 0x64 muls r0, r5 - ldr r1, _08036C8C @ =gUnknown_202402C + ldr r1, _08036C8C @ =gEnemyParty adds r0, r1 movs r1, 0x3D b _08036CAA .align 2, 0 -_08036C8C: .4byte gUnknown_202402C +_08036C8C: .4byte gEnemyParty _08036C90: movs r0, 0x64 muls r0, r5 - ldr r1, _08036C9C @ =gUnknown_202402C + ldr r1, _08036C9C @ =gEnemyParty adds r0, r1 movs r1, 0x3E b _08036CAA .align 2, 0 -_08036C9C: .4byte gUnknown_202402C +_08036C9C: .4byte gEnemyParty _08036CA0: movs r0, 0x64 muls r0, r5 - ldr r1, _08036CBC @ =gUnknown_202402C + ldr r1, _08036CBC @ =gEnemyParty adds r0, r1 movs r1, 0x3F _08036CAA: @@ -2233,101 +2233,101 @@ _08036CAA: movs r6, 0x2 b _08036D72 .align 2, 0 -_08036CBC: .4byte gUnknown_202402C +_08036CBC: .4byte gEnemyParty _08036CC0: movs r0, 0x64 muls r0, r5 - ldr r1, _08036CCC @ =gUnknown_202402C + ldr r1, _08036CCC @ =gEnemyParty adds r0, r1 movs r1, 0x16 b _08036D6A .align 2, 0 -_08036CCC: .4byte gUnknown_202402C +_08036CCC: .4byte gEnemyParty _08036CD0: movs r0, 0x64 muls r0, r5 - ldr r1, _08036CDC @ =gUnknown_202402C + ldr r1, _08036CDC @ =gEnemyParty adds r0, r1 movs r1, 0x17 b _08036D6A .align 2, 0 -_08036CDC: .4byte gUnknown_202402C +_08036CDC: .4byte gEnemyParty _08036CE0: movs r0, 0x64 muls r0, r5 - ldr r1, _08036CEC @ =gUnknown_202402C + ldr r1, _08036CEC @ =gEnemyParty adds r0, r1 movs r1, 0x18 b _08036D6A .align 2, 0 -_08036CEC: .4byte gUnknown_202402C +_08036CEC: .4byte gEnemyParty _08036CF0: movs r0, 0x64 muls r0, r5 - ldr r1, _08036CFC @ =gUnknown_202402C + ldr r1, _08036CFC @ =gEnemyParty adds r0, r1 movs r1, 0x21 b _08036D6A .align 2, 0 -_08036CFC: .4byte gUnknown_202402C +_08036CFC: .4byte gEnemyParty _08036D00: movs r0, 0x64 muls r0, r5 - ldr r1, _08036D0C @ =gUnknown_202402C + ldr r1, _08036D0C @ =gEnemyParty adds r0, r1 movs r1, 0x2F b _08036D6A .align 2, 0 -_08036D0C: .4byte gUnknown_202402C +_08036D0C: .4byte gEnemyParty _08036D10: movs r0, 0x64 muls r0, r5 - ldr r1, _08036D1C @ =gUnknown_202402C + ldr r1, _08036D1C @ =gEnemyParty adds r0, r1 movs r1, 0x30 b _08036D6A .align 2, 0 -_08036D1C: .4byte gUnknown_202402C +_08036D1C: .4byte gEnemyParty _08036D20: movs r0, 0x64 muls r0, r5 - ldr r1, _08036D2C @ =gUnknown_202402C + ldr r1, _08036D2C @ =gEnemyParty adds r0, r1 movs r1, 0x32 b _08036D6A .align 2, 0 -_08036D2C: .4byte gUnknown_202402C +_08036D2C: .4byte gEnemyParty _08036D30: movs r0, 0x64 muls r0, r5 - ldr r1, _08036D3C @ =gUnknown_202402C + ldr r1, _08036D3C @ =gEnemyParty adds r0, r1 movs r1, 0x33 b _08036D6A .align 2, 0 -_08036D3C: .4byte gUnknown_202402C +_08036D3C: .4byte gEnemyParty _08036D40: movs r0, 0x64 muls r0, r5 - ldr r1, _08036D4C @ =gUnknown_202402C + ldr r1, _08036D4C @ =gEnemyParty adds r0, r1 movs r1, 0x34 b _08036D6A .align 2, 0 -_08036D4C: .4byte gUnknown_202402C +_08036D4C: .4byte gEnemyParty _08036D50: movs r0, 0x64 muls r0, r5 - ldr r1, _08036D5C @ =gUnknown_202402C + ldr r1, _08036D5C @ =gEnemyParty adds r0, r1 movs r1, 0x35 b _08036D6A .align 2, 0 -_08036D5C: .4byte gUnknown_202402C +_08036D5C: .4byte gEnemyParty _08036D60: movs r0, 0x64 muls r0, r5 - ldr r1, _08036D84 @ =gUnknown_202402C + ldr r1, _08036D84 @ =gEnemyParty adds r0, r1 movs r1, 0x36 _08036D6A: @@ -2345,15 +2345,15 @@ _08036D72: pop {r1} bx r1 .align 2, 0 -_08036D84: .4byte gUnknown_202402C +_08036D84: .4byte gEnemyParty thumb_func_end sub_80365DC thumb_func_start OpponentHandlecmd1 OpponentHandlecmd1: @ 8036D88 push {r4-r7,lr} sub sp, 0x58 - ldr r2, _08036E00 @ =gUnknown_2023BCE - ldr r5, _08036E04 @ =gUnknown_2023BC4 + ldr r2, _08036E00 @ =gBattlerPartyIndexes + ldr r5, _08036E04 @ =gActiveBattler ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -2366,7 +2366,7 @@ OpponentHandlecmd1: @ 8036D88 adds r0, r3, 0x1 adds r0, r1, r0 ldrb r2, [r0] - ldr r0, _08036E0C @ =gUnknown_202402C + ldr r0, _08036E0C @ =gEnemyParty adds r0, r2, r0 adds r6, r4, r0 mov r0, sp @@ -2410,17 +2410,17 @@ _08036DDE: pop {r0} bx r0 .align 2, 0 -_08036E00: .4byte gUnknown_2023BCE -_08036E04: .4byte gUnknown_2023BC4 +_08036E00: .4byte gBattlerPartyIndexes +_08036E04: .4byte gActiveBattler _08036E08: .4byte gUnknown_2022BC4 -_08036E0C: .4byte gUnknown_202402C +_08036E0C: .4byte gEnemyParty thumb_func_end OpponentHandlecmd1 thumb_func_start OpponentHandleSetAttributes OpponentHandleSetAttributes: @ 8036E10 push {r4,r5,lr} ldr r1, _08036E34 @ =gUnknown_2022BC4 - ldr r0, _08036E38 @ =gUnknown_2023BC4 + ldr r0, _08036E38 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -2428,7 +2428,7 @@ OpponentHandleSetAttributes: @ 8036E10 ldrb r0, [r1] cmp r0, 0 bne _08036E40 - ldr r0, _08036E3C @ =gUnknown_2023BCE + ldr r0, _08036E3C @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -2436,8 +2436,8 @@ OpponentHandleSetAttributes: @ 8036E10 b _08036E5E .align 2, 0 _08036E34: .4byte gUnknown_2022BC4 -_08036E38: .4byte gUnknown_2023BC4 -_08036E3C: .4byte gUnknown_2023BCE +_08036E38: .4byte gActiveBattler +_08036E3C: .4byte gBattlerPartyIndexes _08036E40: ldrb r4, [r1] movs r5, 0 @@ -2472,7 +2472,7 @@ sub_8036E68: @ 8036E68 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, _08036EA0 @ =gUnknown_2023BC4 + ldr r3, _08036EA0 @ =gActiveBattler ldrb r0, [r3] lsls r0, 9 ldr r2, _08036EA4 @ =gUnknown_2022BC7 @@ -2493,7 +2493,7 @@ _08036E96: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08036EA0: .4byte gUnknown_2023BC4 +_08036EA0: .4byte gActiveBattler _08036EA4: .4byte gUnknown_2022BC7 _08036EA8: .4byte _08036EAC .align 2, 0 @@ -2562,7 +2562,7 @@ _08036F9C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08037130 @ =gUnknown_202402C + ldr r0, _08037130 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -2629,7 +2629,7 @@ _08037002: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08037130 @ =gUnknown_202402C + ldr r0, _08037130 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -2739,11 +2739,11 @@ _08037002: bl sub_804037C b _08037774 .align 2, 0 -_08037130: .4byte gUnknown_202402C +_08037130: .4byte gEnemyParty _08037134: movs r0, 0x64 muls r0, r5 - ldr r1, _0803714C @ =gUnknown_202402C + ldr r1, _0803714C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2752,11 +2752,11 @@ _08037134: bl sub_804037C b _08037774 .align 2, 0 -_0803714C: .4byte gUnknown_202402C +_0803714C: .4byte gEnemyParty _08037150: movs r0, 0x64 muls r0, r5 - ldr r1, _08037168 @ =gUnknown_202402C + ldr r1, _08037168 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2765,7 +2765,7 @@ _08037150: bl sub_804037C b _08037774 .align 2, 0 -_08037168: .4byte gUnknown_202402C +_08037168: .4byte gEnemyParty _0803716C: movs r0, 0 mov r8, r0 @@ -2775,7 +2775,7 @@ _0803716C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080371BC @ =gUnknown_202402C + ldr r0, _080371BC @ =gEnemyParty adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 @@ -2799,18 +2799,18 @@ _08037184: ble _08037184 movs r0, 0x64 muls r0, r5 - ldr r1, _080371BC @ =gUnknown_202402C + ldr r1, _080371BC @ =gEnemyParty adds r0, r1 movs r1, 0x15 mov r2, r9 bl sub_804037C b _08037774 .align 2, 0 -_080371BC: .4byte gUnknown_202402C +_080371BC: .4byte gEnemyParty _080371C0: movs r0, 0x64 muls r0, r5 - ldr r1, _080371D8 @ =gUnknown_202402C + ldr r1, _080371D8 @ =gEnemyParty adds r0, r1 ldr r3, _080371DC @ =gUnknown_2022BC4 ldrb r2, [r6] @@ -2821,13 +2821,13 @@ _080371C0: adds r1, 0x9 b _0803725E .align 2, 0 -_080371D8: .4byte gUnknown_202402C +_080371D8: .4byte gEnemyParty _080371DC: .4byte gUnknown_2022BC4 _080371E0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08037244 @ =gUnknown_202402C + ldr r0, _08037244 @ =gEnemyParty adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -2870,11 +2870,11 @@ _080371E0: bl sub_804037C b _08037774 .align 2, 0 -_08037244: .4byte gUnknown_202402C +_08037244: .4byte gEnemyParty _08037248: movs r0, 0x64 muls r0, r5 - ldr r1, _08037268 @ =gUnknown_202402C + ldr r1, _08037268 @ =gEnemyParty adds r0, r1 ldr r3, _0803726C @ =gUnknown_2022BC4 ldrb r2, [r6] @@ -2889,12 +2889,12 @@ _0803725E: bl sub_804037C b _08037774 .align 2, 0 -_08037268: .4byte gUnknown_202402C +_08037268: .4byte gEnemyParty _0803726C: .4byte gUnknown_2022BC4 _08037270: movs r0, 0x64 muls r0, r5 - ldr r1, _08037288 @ =gUnknown_202402C + ldr r1, _08037288 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2903,11 +2903,11 @@ _08037270: bl sub_804037C b _08037774 .align 2, 0 -_08037288: .4byte gUnknown_202402C +_08037288: .4byte gEnemyParty _0803728C: movs r0, 0x64 muls r0, r5 - ldr r1, _080372A4 @ =gUnknown_202402C + ldr r1, _080372A4 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2916,11 +2916,11 @@ _0803728C: bl sub_804037C b _08037774 .align 2, 0 -_080372A4: .4byte gUnknown_202402C +_080372A4: .4byte gEnemyParty _080372A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080372C0 @ =gUnknown_202402C + ldr r1, _080372C0 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2929,11 +2929,11 @@ _080372A8: bl sub_804037C b _08037774 .align 2, 0 -_080372C0: .4byte gUnknown_202402C +_080372C0: .4byte gEnemyParty _080372C4: movs r0, 0x64 muls r0, r5 - ldr r1, _080372DC @ =gUnknown_202402C + ldr r1, _080372DC @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2942,11 +2942,11 @@ _080372C4: bl sub_804037C b _08037774 .align 2, 0 -_080372DC: .4byte gUnknown_202402C +_080372DC: .4byte gEnemyParty _080372E0: movs r0, 0x64 muls r0, r5 - ldr r1, _080372F8 @ =gUnknown_202402C + ldr r1, _080372F8 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2955,11 +2955,11 @@ _080372E0: bl sub_804037C b _08037774 .align 2, 0 -_080372F8: .4byte gUnknown_202402C +_080372F8: .4byte gEnemyParty _080372FC: movs r0, 0x64 muls r0, r5 - ldr r1, _08037314 @ =gUnknown_202402C + ldr r1, _08037314 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2968,11 +2968,11 @@ _080372FC: bl sub_804037C b _08037774 .align 2, 0 -_08037314: .4byte gUnknown_202402C +_08037314: .4byte gEnemyParty _08037318: movs r0, 0x64 muls r0, r5 - ldr r1, _08037330 @ =gUnknown_202402C + ldr r1, _08037330 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2981,11 +2981,11 @@ _08037318: bl sub_804037C b _08037774 .align 2, 0 -_08037330: .4byte gUnknown_202402C +_08037330: .4byte gEnemyParty _08037334: movs r0, 0x64 muls r0, r5 - ldr r1, _0803734C @ =gUnknown_202402C + ldr r1, _0803734C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -2994,11 +2994,11 @@ _08037334: bl sub_804037C b _08037774 .align 2, 0 -_0803734C: .4byte gUnknown_202402C +_0803734C: .4byte gEnemyParty _08037350: movs r0, 0x64 muls r0, r5 - ldr r1, _08037368 @ =gUnknown_202402C + ldr r1, _08037368 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3007,11 +3007,11 @@ _08037350: bl sub_804037C b _08037774 .align 2, 0 -_08037368: .4byte gUnknown_202402C +_08037368: .4byte gEnemyParty _0803736C: movs r0, 0x64 muls r0, r5 - ldr r1, _08037384 @ =gUnknown_202402C + ldr r1, _08037384 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3020,11 +3020,11 @@ _0803736C: bl sub_804037C b _08037774 .align 2, 0 -_08037384: .4byte gUnknown_202402C +_08037384: .4byte gEnemyParty _08037388: movs r0, 0x64 muls r0, r5 - ldr r1, _080373A0 @ =gUnknown_202402C + ldr r1, _080373A0 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3033,11 +3033,11 @@ _08037388: bl sub_804037C b _08037774 .align 2, 0 -_080373A0: .4byte gUnknown_202402C +_080373A0: .4byte gEnemyParty _080373A4: movs r0, 0x64 muls r0, r5 - ldr r1, _080373BC @ =gUnknown_202402C + ldr r1, _080373BC @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3046,11 +3046,11 @@ _080373A4: bl sub_804037C b _08037774 .align 2, 0 -_080373BC: .4byte gUnknown_202402C +_080373BC: .4byte gEnemyParty _080373C0: movs r0, 0x64 muls r0, r5 - ldr r1, _080373D8 @ =gUnknown_202402C + ldr r1, _080373D8 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3059,11 +3059,11 @@ _080373C0: bl sub_804037C b _08037774 .align 2, 0 -_080373D8: .4byte gUnknown_202402C +_080373D8: .4byte gEnemyParty _080373DC: movs r0, 0x64 muls r0, r5 - ldr r1, _080373F4 @ =gUnknown_202402C + ldr r1, _080373F4 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3072,12 +3072,12 @@ _080373DC: bl sub_804037C b _08037774 .align 2, 0 -_080373F4: .4byte gUnknown_202402C +_080373F4: .4byte gEnemyParty _080373F8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08037468 @ =gUnknown_202402C + ldr r0, _08037468 @ =gEnemyParty adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -3126,11 +3126,11 @@ _080373F8: adds r0, r4, 0 b _08037506 .align 2, 0 -_08037468: .4byte gUnknown_202402C +_08037468: .4byte gEnemyParty _0803746C: movs r0, 0x64 muls r0, r5 - ldr r1, _08037484 @ =gUnknown_202402C + ldr r1, _08037484 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3139,11 +3139,11 @@ _0803746C: bl sub_804037C b _08037774 .align 2, 0 -_08037484: .4byte gUnknown_202402C +_08037484: .4byte gEnemyParty _08037488: movs r0, 0x64 muls r0, r5 - ldr r1, _080374A0 @ =gUnknown_202402C + ldr r1, _080374A0 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3152,11 +3152,11 @@ _08037488: bl sub_804037C b _08037774 .align 2, 0 -_080374A0: .4byte gUnknown_202402C +_080374A0: .4byte gEnemyParty _080374A4: movs r0, 0x64 muls r0, r5 - ldr r1, _080374BC @ =gUnknown_202402C + ldr r1, _080374BC @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3165,11 +3165,11 @@ _080374A4: bl sub_804037C b _08037774 .align 2, 0 -_080374BC: .4byte gUnknown_202402C +_080374BC: .4byte gEnemyParty _080374C0: movs r0, 0x64 muls r0, r5 - ldr r1, _080374D8 @ =gUnknown_202402C + ldr r1, _080374D8 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3178,11 +3178,11 @@ _080374C0: bl sub_804037C b _08037774 .align 2, 0 -_080374D8: .4byte gUnknown_202402C +_080374D8: .4byte gEnemyParty _080374DC: movs r0, 0x64 muls r0, r5 - ldr r1, _080374F4 @ =gUnknown_202402C + ldr r1, _080374F4 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3191,11 +3191,11 @@ _080374DC: bl sub_804037C b _08037774 .align 2, 0 -_080374F4: .4byte gUnknown_202402C +_080374F4: .4byte gEnemyParty _080374F8: movs r0, 0x64 muls r0, r5 - ldr r1, _08037510 @ =gUnknown_202402C + ldr r1, _08037510 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3205,11 +3205,11 @@ _08037506: bl sub_804037C b _08037774 .align 2, 0 -_08037510: .4byte gUnknown_202402C +_08037510: .4byte gEnemyParty _08037514: movs r0, 0x64 muls r0, r5 - ldr r1, _0803752C @ =gUnknown_202402C + ldr r1, _0803752C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3218,11 +3218,11 @@ _08037514: bl sub_804037C b _08037774 .align 2, 0 -_0803752C: .4byte gUnknown_202402C +_0803752C: .4byte gEnemyParty _08037530: movs r0, 0x64 muls r0, r5 - ldr r1, _08037548 @ =gUnknown_202402C + ldr r1, _08037548 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3231,11 +3231,11 @@ _08037530: bl sub_804037C b _08037774 .align 2, 0 -_08037548: .4byte gUnknown_202402C +_08037548: .4byte gEnemyParty _0803754C: movs r0, 0x64 muls r0, r5 - ldr r1, _08037564 @ =gUnknown_202402C + ldr r1, _08037564 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3244,11 +3244,11 @@ _0803754C: bl sub_804037C b _08037774 .align 2, 0 -_08037564: .4byte gUnknown_202402C +_08037564: .4byte gEnemyParty _08037568: movs r0, 0x64 muls r0, r5 - ldr r1, _08037580 @ =gUnknown_202402C + ldr r1, _08037580 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3257,11 +3257,11 @@ _08037568: bl sub_804037C b _08037774 .align 2, 0 -_08037580: .4byte gUnknown_202402C +_08037580: .4byte gEnemyParty _08037584: movs r0, 0x64 muls r0, r5 - ldr r1, _0803759C @ =gUnknown_202402C + ldr r1, _0803759C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3270,11 +3270,11 @@ _08037584: bl sub_804037C b _08037774 .align 2, 0 -_0803759C: .4byte gUnknown_202402C +_0803759C: .4byte gEnemyParty _080375A0: movs r0, 0x64 muls r0, r5 - ldr r1, _080375B8 @ =gUnknown_202402C + ldr r1, _080375B8 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3283,11 +3283,11 @@ _080375A0: bl sub_804037C b _08037774 .align 2, 0 -_080375B8: .4byte gUnknown_202402C +_080375B8: .4byte gEnemyParty _080375BC: movs r0, 0x64 muls r0, r5 - ldr r1, _080375D4 @ =gUnknown_202402C + ldr r1, _080375D4 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3296,11 +3296,11 @@ _080375BC: bl sub_804037C b _08037774 .align 2, 0 -_080375D4: .4byte gUnknown_202402C +_080375D4: .4byte gEnemyParty _080375D8: movs r0, 0x64 muls r0, r5 - ldr r1, _080375F0 @ =gUnknown_202402C + ldr r1, _080375F0 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3309,11 +3309,11 @@ _080375D8: bl sub_804037C b _08037774 .align 2, 0 -_080375F0: .4byte gUnknown_202402C +_080375F0: .4byte gEnemyParty _080375F4: movs r0, 0x64 muls r0, r5 - ldr r1, _0803760C @ =gUnknown_202402C + ldr r1, _0803760C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3322,11 +3322,11 @@ _080375F4: bl sub_804037C b _08037774 .align 2, 0 -_0803760C: .4byte gUnknown_202402C +_0803760C: .4byte gEnemyParty _08037610: movs r0, 0x64 muls r0, r5 - ldr r1, _08037628 @ =gUnknown_202402C + ldr r1, _08037628 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3335,11 +3335,11 @@ _08037610: bl sub_804037C b _08037774 .align 2, 0 -_08037628: .4byte gUnknown_202402C +_08037628: .4byte gEnemyParty _0803762C: movs r0, 0x64 muls r0, r5 - ldr r1, _08037644 @ =gUnknown_202402C + ldr r1, _08037644 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3348,11 +3348,11 @@ _0803762C: bl sub_804037C b _08037774 .align 2, 0 -_08037644: .4byte gUnknown_202402C +_08037644: .4byte gEnemyParty _08037648: movs r0, 0x64 muls r0, r5 - ldr r1, _08037660 @ =gUnknown_202402C + ldr r1, _08037660 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3361,11 +3361,11 @@ _08037648: bl sub_804037C b _08037774 .align 2, 0 -_08037660: .4byte gUnknown_202402C +_08037660: .4byte gEnemyParty _08037664: movs r0, 0x64 muls r0, r5 - ldr r1, _0803767C @ =gUnknown_202402C + ldr r1, _0803767C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3374,11 +3374,11 @@ _08037664: bl sub_804037C b _08037774 .align 2, 0 -_0803767C: .4byte gUnknown_202402C +_0803767C: .4byte gEnemyParty _08037680: movs r0, 0x64 muls r0, r5 - ldr r1, _08037698 @ =gUnknown_202402C + ldr r1, _08037698 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3387,11 +3387,11 @@ _08037680: bl sub_804037C b _08037774 .align 2, 0 -_08037698: .4byte gUnknown_202402C +_08037698: .4byte gEnemyParty _0803769C: movs r0, 0x64 muls r0, r5 - ldr r1, _080376B4 @ =gUnknown_202402C + ldr r1, _080376B4 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3400,11 +3400,11 @@ _0803769C: bl sub_804037C b _08037774 .align 2, 0 -_080376B4: .4byte gUnknown_202402C +_080376B4: .4byte gEnemyParty _080376B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080376D0 @ =gUnknown_202402C + ldr r1, _080376D0 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3413,11 +3413,11 @@ _080376B8: bl sub_804037C b _08037774 .align 2, 0 -_080376D0: .4byte gUnknown_202402C +_080376D0: .4byte gEnemyParty _080376D4: movs r0, 0x64 muls r0, r5 - ldr r1, _080376EC @ =gUnknown_202402C + ldr r1, _080376EC @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3426,11 +3426,11 @@ _080376D4: bl sub_804037C b _08037774 .align 2, 0 -_080376EC: .4byte gUnknown_202402C +_080376EC: .4byte gEnemyParty _080376F0: movs r0, 0x64 muls r0, r5 - ldr r1, _08037708 @ =gUnknown_202402C + ldr r1, _08037708 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3439,11 +3439,11 @@ _080376F0: bl sub_804037C b _08037774 .align 2, 0 -_08037708: .4byte gUnknown_202402C +_08037708: .4byte gEnemyParty _0803770C: movs r0, 0x64 muls r0, r5 - ldr r1, _08037724 @ =gUnknown_202402C + ldr r1, _08037724 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3452,11 +3452,11 @@ _0803770C: bl sub_804037C b _08037774 .align 2, 0 -_08037724: .4byte gUnknown_202402C +_08037724: .4byte gEnemyParty _08037728: movs r0, 0x64 muls r0, r5 - ldr r1, _08037740 @ =gUnknown_202402C + ldr r1, _08037740 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3465,11 +3465,11 @@ _08037728: bl sub_804037C b _08037774 .align 2, 0 -_08037740: .4byte gUnknown_202402C +_08037740: .4byte gEnemyParty _08037744: movs r0, 0x64 muls r0, r5 - ldr r1, _0803775C @ =gUnknown_202402C + ldr r1, _0803775C @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3478,11 +3478,11 @@ _08037744: bl sub_804037C b _08037774 .align 2, 0 -_0803775C: .4byte gUnknown_202402C +_0803775C: .4byte gEnemyParty _08037760: movs r0, 0x64 muls r0, r5 - ldr r1, _08037784 @ =gUnknown_202402C + ldr r1, _08037784 @ =gEnemyParty adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -3499,14 +3499,14 @@ _08037774: pop {r0} bx r0 .align 2, 0 -_08037784: .4byte gUnknown_202402C +_08037784: .4byte gEnemyParty thumb_func_end sub_8036E68 thumb_func_start OpponentHandlecmd3 OpponentHandlecmd3: @ 8037788 push {r4-r7,lr} - ldr r1, _080377EC @ =gUnknown_2023BCE - ldr r7, _080377F0 @ =gUnknown_2023BC4 + ldr r1, _080377EC @ =gBattlerPartyIndexes + ldr r7, _080377F0 @ =gActiveBattler ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -3519,7 +3519,7 @@ OpponentHandlecmd3: @ 8037788 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _080377F8 @ =gUnknown_202402C + ldr r1, _080377F8 @ =gEnemyParty adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -3555,10 +3555,10 @@ _080377E0: pop {r0} bx r0 .align 2, 0 -_080377EC: .4byte gUnknown_2023BCE -_080377F0: .4byte gUnknown_2023BC4 +_080377EC: .4byte gBattlerPartyIndexes +_080377F0: .4byte gActiveBattler _080377F4: .4byte gUnknown_2022BC4 -_080377F8: .4byte gUnknown_202402C +_080377F8: .4byte gEnemyParty thumb_func_end OpponentHandlecmd3 thumb_func_start sub_80377FC @@ -3566,22 +3566,22 @@ sub_80377FC: @ 80377FC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _0803787C @ =gUnknown_2023BCE - ldr r4, _08037880 @ =gUnknown_2023BC4 + ldr r7, _0803787C @ =gBattlerPartyIndexes + ldr r4, _08037880 @ =gActiveBattler ldrb r0, [r4] lsls r0, 1 adds r0, r7 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r6, _08037884 @ =gUnknown_202402C + ldr r6, _08037884 @ =gEnemyParty adds r0, r6 movs r1, 0xB bl GetMonData lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _08037888 @ =gUnknown_2022B4C + ldr r0, _08037888 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 8 @@ -3624,10 +3624,10 @@ sub_80377FC: @ 80377FC strb r1, [r0, 0x1] b _080378AA .align 2, 0 -_0803787C: .4byte gUnknown_2023BCE -_08037880: .4byte gUnknown_2023BC4 -_08037884: .4byte gUnknown_202402C -_08037888: .4byte gUnknown_2022B4C +_0803787C: .4byte gBattlerPartyIndexes +_08037880: .4byte gActiveBattler +_08037884: .4byte gEnemyParty +_08037888: .4byte gBattleTypeFlags _0803788C: .4byte gUnknown_2024018 _08037890: ldrb r1, [r4] @@ -3642,7 +3642,7 @@ _08037890: lsls r0, 24 lsrs r5, r0, 24 _080378AA: - ldr r7, _0803799C @ =gUnknown_2023BC4 + ldr r7, _0803799C @ =gActiveBattler ldrb r0, [r7] bl GetBankIdentity adds r1, r0, 0 @@ -3721,7 +3721,7 @@ _080378AA: adds r2, r1 ldrb r1, [r2] bl StartSpriteAnim - ldr r0, _080379B4 @ =gUnknown_2022B4C + ldr r0, _080379B4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 8 @@ -3729,13 +3729,13 @@ _080378AA: cmp r0, 0 bne _08037986 ldrb r4, [r7] - ldr r1, _080379B8 @ =gUnknown_2023BCE + ldr r1, _080379B8 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080379BC @ =gUnknown_202402C + ldr r1, _080379BC @ =gEnemyParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -3757,15 +3757,15 @@ _08037986: pop {r0} bx r0 .align 2, 0 -_0803799C: .4byte gUnknown_2023BC4 +_0803799C: .4byte gActiveBattler _080379A0: .4byte gUnknown_20244DC _080379A4: .4byte gUnknown_2023D44 _080379A8: .4byte gSprites _080379AC: .4byte 0x0000ff10 _080379B0: .4byte gUnknown_2024024 -_080379B4: .4byte gUnknown_2022B4C -_080379B8: .4byte gUnknown_2023BCE -_080379BC: .4byte gUnknown_202402C +_080379B4: .4byte gBattleTypeFlags +_080379B8: .4byte gBattlerPartyIndexes +_080379BC: .4byte gEnemyParty _080379C0: .4byte gUnknown_3004FE0 _080379C4: .4byte sub_8035FE8 thumb_func_end sub_80377FC @@ -3773,15 +3773,15 @@ _080379C4: .4byte sub_8035FE8 thumb_func_start OpponentHandleSwitchInAnim OpponentHandleSwitchInAnim: @ 80379C8 push {r4,lr} - ldr r4, _08037A10 @ =gUnknown_2023BC4 + ldr r4, _08037A10 @ =gActiveBattler ldrb r0, [r4] - ldr r1, _08037A14 @ =gUnknown_2023FE8 + ldr r1, _08037A14 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x5C movs r1, 0x6 strb r1, [r0] - ldr r1, _08037A18 @ =gUnknown_2023BCE + ldr r1, _08037A18 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 @@ -3807,9 +3807,9 @@ OpponentHandleSwitchInAnim: @ 80379C8 pop {r0} bx r0 .align 2, 0 -_08037A10: .4byte gUnknown_2023BC4 -_08037A14: .4byte gUnknown_2023FE8 -_08037A18: .4byte gUnknown_2023BCE +_08037A10: .4byte gActiveBattler +_08037A14: .4byte gBattleStruct +_08037A18: .4byte gBattlerPartyIndexes _08037A1C: .4byte gUnknown_2022BC4 _08037A20: .4byte gUnknown_3004FE0 _08037A24: .4byte sub_8036408 @@ -3829,7 +3829,7 @@ sub_8037A28: @ 8037A28 lsrs r1, 24 adds r0, r6, 0 bl ClearTemporarySpeciesSpriteData - ldr r0, _08037B84 @ =gUnknown_2023BCE + ldr r0, _08037B84 @ =gBattlerPartyIndexes lsls r4, r6, 1 adds r4, r0 ldr r0, _08037B88 @ =gUnknown_2022BC4 @@ -3844,7 +3844,7 @@ sub_8037A28: @ 8037A28 mov r1, r9 muls r1, r0 adds r0, r1, 0 - ldr r5, _08037B8C @ =gUnknown_202402C + ldr r5, _08037B8C @ =gEnemyParty adds r0, r5 movs r1, 0xB bl GetMonData @@ -3979,9 +3979,9 @@ sub_8037A28: @ 8037A28 pop {r0} bx r0 .align 2, 0 -_08037B84: .4byte gUnknown_2023BCE +_08037B84: .4byte gBattlerPartyIndexes _08037B88: .4byte gUnknown_2022BC4 -_08037B8C: .4byte gUnknown_202402C +_08037B8C: .4byte gEnemyParty _08037B90: .4byte sub_8033E3C _08037B94: .4byte gUnknown_3004FFC _08037B98: .4byte gUnknown_20244DC @@ -3995,7 +3995,7 @@ _08037BA8: .4byte SpriteCallbackDummy sub_8037BAC: @ 8037BAC push {r4-r6,lr} ldr r1, _08037BE0 @ =gUnknown_2022BC4 - ldr r6, _08037BE4 @ =gUnknown_2023BC4 + ldr r6, _08037BE4 @ =gActiveBattler ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -4020,7 +4020,7 @@ sub_8037BAC: @ 8037BAC b _08037C30 .align 2, 0 _08037BE0: .4byte gUnknown_2022BC4 -_08037BE4: .4byte gUnknown_2023BC4 +_08037BE4: .4byte gActiveBattler _08037BE8: .4byte gUnknown_2024018 _08037BEC: .4byte gUnknown_3004FE0 _08037BF0: .4byte sub_8037C44 @@ -4065,7 +4065,7 @@ sub_8037C44: @ 8037C44 push {r4-r6,lr} ldr r6, _08037C64 @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _08037C68 @ =gUnknown_2023BC4 + ldr r5, _08037C68 @ =gActiveBattler ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -4080,7 +4080,7 @@ sub_8037C44: @ 8037C44 b _08037CC2 .align 2, 0 _08037C64: .4byte gUnknown_2024018 -_08037C68: .4byte gUnknown_2023BC4 +_08037C68: .4byte gActiveBattler _08037C6C: ldr r1, [r4] lsls r0, r2, 2 @@ -4140,7 +4140,7 @@ sub_8037CD0: @ 8037CD0 mov r6, r9 mov r5, r8 push {r5,r6} - ldr r3, _08037CEC @ =gUnknown_20386AE + ldr r3, _08037CEC @ =gTrainerBattleOpponent_A ldrh r1, [r3] movs r0, 0x80 lsls r0, 3 @@ -4149,9 +4149,9 @@ sub_8037CD0: @ 8037CD0 bl GetSecretBaseTrainerPicIndex b _08037D26 .align 2, 0 -_08037CEC: .4byte gUnknown_20386AE +_08037CEC: .4byte gTrainerBattleOpponent_A _08037CF0: - ldr r0, _08037D04 @ =gUnknown_2022B4C + ldr r0, _08037D04 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x80 lsls r0, 1 @@ -4161,7 +4161,7 @@ _08037CF0: bl sub_80E6078 b _08037D26 .align 2, 0 -_08037D04: .4byte gUnknown_2022B4C +_08037D04: .4byte gBattleTypeFlags _08037D08: movs r0, 0x80 lsls r0, 12 @@ -4182,7 +4182,7 @@ _08037D26: lsrs r0, 24 b _08037D3A _08037D2C: - ldr r2, _08037E6C @ =gUnknown_823EAC8 + ldr r2, _08037E6C @ =gTrainers ldrh r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -4191,7 +4191,7 @@ _08037D2C: ldrb r0, [r0, 0x3] _08037D3A: mov r9, r0 - ldr r0, _08037E70 @ =gUnknown_2023BC4 + ldr r0, _08037E70 @ =gActiveBattler mov r8, r0 ldrb r1, [r0] mov r0, r9 @@ -4337,8 +4337,8 @@ _08037D3A: pop {r0} bx r0 .align 2, 0 -_08037E6C: .4byte gUnknown_823EAC8 -_08037E70: .4byte gUnknown_2023BC4 +_08037E6C: .4byte gTrainers +_08037E70: .4byte gActiveBattler _08037E74: .4byte gUnknown_20244DC _08037E78: .4byte gUnknown_823932C _08037E7C: .4byte gUnknown_2023D44 @@ -4359,7 +4359,7 @@ sub_8037EA4: @ 8037EA4 mov r6, r9 mov r5, r8 push {r5,r6} - ldr r3, _08037EC0 @ =gUnknown_20386AE + ldr r3, _08037EC0 @ =gTrainerBattleOpponent_A ldrh r1, [r3] movs r0, 0x80 lsls r0, 3 @@ -4368,9 +4368,9 @@ sub_8037EA4: @ 8037EA4 bl GetSecretBaseTrainerPicIndex b _08037EFA .align 2, 0 -_08037EC0: .4byte gUnknown_20386AE +_08037EC0: .4byte gTrainerBattleOpponent_A _08037EC4: - ldr r0, _08037ED8 @ =gUnknown_2022B4C + ldr r0, _08037ED8 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x80 lsls r0, 1 @@ -4380,7 +4380,7 @@ _08037EC4: bl sub_80E6078 b _08037EFA .align 2, 0 -_08037ED8: .4byte gUnknown_2022B4C +_08037ED8: .4byte gBattleTypeFlags _08037EDC: movs r0, 0x80 lsls r0, 12 @@ -4401,7 +4401,7 @@ _08037EFA: lsrs r0, 24 b _08037F0E _08037F00: - ldr r2, _08038040 @ =gUnknown_823EAC8 + ldr r2, _08038040 @ =gTrainers ldrh r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -4410,7 +4410,7 @@ _08037F00: ldrb r0, [r0, 0x3] _08037F0E: mov r9, r0 - ldr r0, _08038044 @ =gUnknown_2023BC4 + ldr r0, _08038044 @ =gActiveBattler mov r8, r0 ldrb r1, [r0] mov r0, r9 @@ -4557,8 +4557,8 @@ _08037F0E: pop {r0} bx r0 .align 2, 0 -_08038040: .4byte gUnknown_823EAC8 -_08038044: .4byte gUnknown_2023BC4 +_08038040: .4byte gTrainers +_08038044: .4byte gActiveBattler _08038048: .4byte gUnknown_20244DC _0803804C: .4byte gUnknown_823932C _08038050: .4byte gUnknown_2023D44 @@ -4577,7 +4577,7 @@ _08038074: .4byte sub_8035B20 sub_8038078: @ 8038078 push {r4-r6,lr} ldr r6, _08038108 @ =gUnknown_2023D44 - ldr r4, _0803810C @ =gUnknown_2023BC4 + ldr r4, _0803810C @ =gActiveBattler ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -4646,7 +4646,7 @@ sub_8038078: @ 8038078 bx r0 .align 2, 0 _08038108: .4byte gUnknown_2023D44 -_0803810C: .4byte gUnknown_2023BC4 +_0803810C: .4byte gActiveBattler _08038110: .4byte gSprites _08038114: .4byte sub_8075590 _08038118: .4byte SpriteCallbackDummy @@ -4659,7 +4659,7 @@ sub_8038124: @ 8038124 push {r4-r6,lr} ldr r6, _08038170 @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _08038174 @ =gUnknown_2023BC4 + ldr r5, _08038174 @ =gActiveBattler ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -4695,7 +4695,7 @@ _08038158: b _080381B4 .align 2, 0 _08038170: .4byte gUnknown_2024018 -_08038174: .4byte gUnknown_2023BC4 +_08038174: .4byte gActiveBattler _08038178: ldrb r1, [r3] movs r0, 0x40 @@ -4773,7 +4773,7 @@ sub_80381F4: @ 80381F4 thumb_func_start sub_8038200 sub_8038200: @ 8038200 push {r4-r6,lr} - ldr r6, _080382E4 @ =gUnknown_2023BC4 + ldr r6, _080382E4 @ =gActiveBattler ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -4884,7 +4884,7 @@ _08038212: bl OpponentBufferExecCompleted b _08038326 .align 2, 0 -_080382E4: .4byte gUnknown_2023BC4 +_080382E4: .4byte gActiveBattler _080382E8: .4byte gUnknown_2022BC4 _080382EC: .4byte gUnknown_2037F16 _080382F0: .4byte gUnknown_2037EEC @@ -4927,7 +4927,7 @@ sub_8038338: @ 8038338 mov r5, r8 push {r5-r7} ldr r2, _08038384 @ =gUnknown_2022BC4 - ldr r6, _08038388 @ =gUnknown_2023BC4 + ldr r6, _08038388 @ =gActiveBattler ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -4961,7 +4961,7 @@ sub_8038338: @ 8038338 b _080384AC .align 2, 0 _08038384: .4byte gUnknown_2022BC4 -_08038388: .4byte gUnknown_2023BC4 +_08038388: .4byte gActiveBattler _0803838C: .4byte gUnknown_2024018 _08038390: cmp r2, 0x2 @@ -5057,7 +5057,7 @@ _080383FA: _08038448: ldr r0, _08038468 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _0803846C @ =gUnknown_2023BC4 + ldr r0, _0803846C @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -5071,7 +5071,7 @@ _08038448: _08038460: .4byte gUnknown_2037EDC _08038464: .4byte gUnknown_2037EE1 _08038468: .4byte gUnknown_2024018 -_0803846C: .4byte gUnknown_2023BC4 +_0803846C: .4byte gActiveBattler _08038470: ldrb r1, [r0] movs r0, 0x40 @@ -5118,7 +5118,7 @@ sub_80384BC: @ 80384BC strh r1, [r0] ldr r0, _080384F4 @ =gUnknown_2022976 strh r1, [r0] - ldr r0, _080384F8 @ =gUnknown_2023BC4 + ldr r0, _080384F8 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 ldr r1, _080384FC @ =gUnknown_2022BC6 @@ -5137,7 +5137,7 @@ sub_80384BC: @ 80384BC .align 2, 0 _080384F0: .4byte gUnknown_2022974 _080384F4: .4byte gUnknown_2022976 -_080384F8: .4byte gUnknown_2023BC4 +_080384F8: .4byte gActiveBattler _080384FC: .4byte gUnknown_2022BC6 _08038500: .4byte gUnknown_202298C _08038504: @@ -5145,7 +5145,7 @@ _08038504: movs r1, 0 bl sub_80D87BC _0803850C: - ldr r0, _08038538 @ =gUnknown_2022B4C + ldr r0, _08038538 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -5158,7 +5158,7 @@ _0803850C: cmp r1, r0 bne _08038568 ldr r1, _08038540 @ =gUnknown_3004FE0 - ldr r0, _08038544 @ =gUnknown_2023BC4 + ldr r0, _08038544 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5166,14 +5166,14 @@ _0803850C: b _08038574 .align 2, 0 _08038534: .4byte gUnknown_202298C -_08038538: .4byte gUnknown_2022B4C +_08038538: .4byte gBattleTypeFlags _0803853C: .4byte 0x0000017f _08038540: .4byte gUnknown_3004FE0 -_08038544: .4byte gUnknown_2023BC4 +_08038544: .4byte gActiveBattler _08038548: .4byte sub_80E85C0 _0803854C: ldr r1, _0803855C @ =gUnknown_3004FE0 - ldr r0, _08038560 @ =gUnknown_2023BC4 + ldr r0, _08038560 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5181,11 +5181,11 @@ _0803854C: b _08038574 .align 2, 0 _0803855C: .4byte gUnknown_3004FE0 -_08038560: .4byte gUnknown_2023BC4 +_08038560: .4byte gActiveBattler _08038564: .4byte sub_80E8598 _08038568: ldr r1, _0803857C @ =gUnknown_3004FE0 - ldr r0, _08038580 @ =gUnknown_2023BC4 + ldr r0, _08038580 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5197,7 +5197,7 @@ _08038574: bx r0 .align 2, 0 _0803857C: .4byte gUnknown_3004FE0 -_08038580: .4byte gUnknown_2023BC4 +_08038580: .4byte gActiveBattler _08038584: .4byte sub_80361E4 thumb_func_end sub_80384BC @@ -5229,20 +5229,20 @@ sub_80385A4: @ 80385A4 thumb_func_start sub_80385B0 sub_80385B0: @ 80385B0 push {r4-r6,lr} - ldr r6, _080385E4 @ =gUnknown_2023BC4 + ldr r6, _080385E4 @ =gActiveBattler ldrb r0, [r6] lsls r0, 9 ldr r1, _080385E8 @ =gUnknown_2022BC8 adds r5, r0, r1 - ldr r0, _080385EC @ =gUnknown_2022B4C + ldr r0, _080385EC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x93 lsls r1, 3 ands r0, r1 cmp r0, 0 beq _08038680 - bl sub_80C6DA0 - bl sub_80C6F44 + bl BattleAI_SetupAIData + bl BattleAI_GetAIActionToUse lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 @@ -5253,9 +5253,9 @@ sub_80385B0: @ 80385B0 movs r1, 0x4 b _080385F4 .align 2, 0 -_080385E4: .4byte gUnknown_2023BC4 +_080385E4: .4byte gActiveBattler _080385E8: .4byte gUnknown_2022BC8 -_080385EC: .4byte gUnknown_2022B4C +_080385EC: .4byte gBattleTypeFlags _080385F0: movs r0, 0x1 movs r1, 0x3 @@ -5264,7 +5264,7 @@ _080385F4: bl EmitTwoReturnValues b _08038668 _080385FC: - ldr r3, _08038670 @ =gUnknown_8250C04 + ldr r3, _08038670 @ =gBattleMoves lsls r0, r4, 1 adds r2, r5, r0 ldrh r1, [r2] @@ -5277,7 +5277,7 @@ _080385FC: ands r0, r1 cmp r0, 0 beq _0803861C - ldr r1, _08038674 @ =gUnknown_2023D6C + ldr r1, _08038674 @ =gBattlerTarget ldrb r0, [r6] strb r0, [r1] _0803861C: @@ -5293,11 +5293,11 @@ _0803861C: beq _08038656 movs r0, 0 bl GetBankByIdentity - ldr r5, _08038674 @ =gUnknown_2023D6C + ldr r5, _08038674 @ =gBattlerTarget strb r0, [r5] - ldr r0, _08038678 @ =gUnknown_2023D70 + ldr r0, _08038678 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0803867C @ =gUnknown_825E45C + ldr r2, _0803867C @ =gBitTable ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -5309,7 +5309,7 @@ _0803861C: bl GetBankByIdentity strb r0, [r5] _08038656: - ldr r0, _08038674 @ =gUnknown_2023D6C + ldr r0, _08038674 @ =gBattlerTarget ldrb r0, [r0] lsls r0, 8 orrs r4, r0 @@ -5321,10 +5321,10 @@ _08038668: bl OpponentBufferExecCompleted b _08038712 .align 2, 0 -_08038670: .4byte gUnknown_8250C04 -_08038674: .4byte gUnknown_2023D6C -_08038678: .4byte gUnknown_2023D70 -_0803867C: .4byte gUnknown_825E45C +_08038670: .4byte gBattleMoves +_08038674: .4byte gBattlerTarget +_08038678: .4byte gAbsentBattlerFlags +_0803867C: .4byte gBitTable _08038680: movs r6, 0x3 _08038682: @@ -5336,7 +5336,7 @@ _08038682: ldrh r2, [r0] cmp r2, 0 beq _08038682 - ldr r1, _080386BC @ =gUnknown_8250C04 + ldr r1, _080386BC @ =gBattleMoves lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -5346,7 +5346,7 @@ _08038682: ands r0, r1 cmp r0, 0 beq _080386C4 - ldr r0, _080386C0 @ =gUnknown_2023BC4 + ldr r0, _080386C0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 8 orrs r4, r0 @@ -5356,10 +5356,10 @@ _08038682: bl EmitTwoReturnValues b _0803870E .align 2, 0 -_080386BC: .4byte gUnknown_8250C04 -_080386C0: .4byte gUnknown_2023BC4 +_080386BC: .4byte gBattleMoves +_080386C0: .4byte gActiveBattler _080386C4: - ldr r0, _080386F4 @ =gUnknown_2022B4C + ldr r0, _080386F4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -5381,7 +5381,7 @@ _080386C4: bl EmitTwoReturnValues b _0803870E .align 2, 0 -_080386F4: .4byte gUnknown_2022B4C +_080386F4: .4byte gBattleTypeFlags _080386F8: movs r0, 0 bl GetBankByIdentity @@ -5403,10 +5403,10 @@ _08038712: thumb_func_start sub_8038718 sub_8038718: @ 8038718 push {lr} - ldr r0, _0803873C @ =gUnknown_2023BC4 + ldr r0, _0803873C @ =gActiveBattler ldrb r0, [r0] lsrs r0, 1 - ldr r1, _08038740 @ =gUnknown_2023FE8 + ldr r1, _08038740 @ =gBattleStruct ldr r1, [r1] lsls r0, 1 adds r0, r1 @@ -5418,19 +5418,19 @@ sub_8038718: @ 8038718 pop {r0} bx r0 .align 2, 0 -_0803873C: .4byte gUnknown_2023BC4 -_08038740: .4byte gUnknown_2023FE8 +_0803873C: .4byte gActiveBattler +_08038740: .4byte gBattleStruct thumb_func_end sub_8038718 thumb_func_start sub_8038744 sub_8038744: @ 8038744 push {r4-r6,lr} - ldr r6, _08038788 @ =gUnknown_2023BC4 + ldr r6, _08038788 @ =gActiveBattler ldrb r0, [r6] bl GetBankIdentity lsls r0, 24 lsrs r0, 25 - ldr r5, _0803878C @ =gUnknown_2023FE8 + ldr r5, _0803878C @ =gBattleStruct ldr r1, [r5] adds r0, r1 adds r0, 0x92 @@ -5442,7 +5442,7 @@ sub_8038744: @ 8038744 lsrs r4, r0, 24 cmp r4, 0x6 bne _0803880A - ldr r0, _08038790 @ =gUnknown_2022B4C + ldr r0, _08038790 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -5455,9 +5455,9 @@ sub_8038744: @ 8038744 adds r6, r5, 0 b _080387A8 .align 2, 0 -_08038788: .4byte gUnknown_2023BC4 -_0803878C: .4byte gUnknown_2023FE8 -_08038790: .4byte gUnknown_2022B4C +_08038788: .4byte gActiveBattler +_0803878C: .4byte gBattleStruct +_08038790: .4byte gBattleTypeFlags _08038794: movs r0, 0x1 bl GetBankByIdentity @@ -5477,13 +5477,13 @@ _080387AE: bgt _0803880A movs r0, 0x64 muls r0, r4 - ldr r1, _080387DC @ =gUnknown_202402C + ldr r1, _080387DC @ =gEnemyParty adds r0, r1 movs r1, 0x39 bl GetMonData cmp r0, 0 beq _080387AC - ldr r1, _080387E0 @ =gUnknown_2023BCE + ldr r1, _080387E0 @ =gBattlerPartyIndexes lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] @@ -5496,8 +5496,8 @@ _080387AE: beq _080387AC b _0803880A .align 2, 0 -_080387DC: .4byte gUnknown_202402C -_080387E0: .4byte gUnknown_2023BCE +_080387DC: .4byte gEnemyParty +_080387E0: .4byte gBattlerPartyIndexes _080387E4: ldrb r0, [r6] bl GetBankIdentity @@ -5517,9 +5517,9 @@ _080387E4: movs r1, 0x6 strb r1, [r0] _0803880A: - ldr r0, _08038830 @ =gUnknown_2023BC4 + ldr r0, _08038830 @ =gActiveBattler ldrb r0, [r0] - ldr r1, _08038834 @ =gUnknown_2023FE8 + ldr r1, _08038834 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x5C @@ -5534,8 +5534,8 @@ _0803880A: pop {r0} bx r0 .align 2, 0 -_08038830: .4byte gUnknown_2023BC4 -_08038834: .4byte gUnknown_2023FE8 +_08038830: .4byte gActiveBattler +_08038834: .4byte gBattleStruct thumb_func_end sub_8038744 thumb_func_start sub_8038838 @@ -5556,7 +5556,7 @@ sub_8038844: @ 8038844 movs r0, 0 bl LoadBattleBarGfx ldr r3, _080388BC @ =gUnknown_2022BC4 - ldr r0, _080388C0 @ =gUnknown_2023BC4 + ldr r0, _080388C0 @ =gActiveBattler mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -5573,13 +5573,13 @@ sub_8038844: @ 8038844 ldr r0, _080388C4 @ =0x00007fff cmp r7, r0 beq _080388D4 - ldr r6, _080388C8 @ =gUnknown_2023BCE + ldr r6, _080388C8 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _080388CC @ =gUnknown_202402C + ldr r4, _080388CC @ =gEnemyParty adds r0, r4 movs r1, 0x3A bl GetMonData @@ -5605,19 +5605,19 @@ sub_8038844: @ 8038844 b _080388FE .align 2, 0 _080388BC: .4byte gUnknown_2022BC4 -_080388C0: .4byte gUnknown_2023BC4 +_080388C0: .4byte gActiveBattler _080388C4: .4byte 0x00007fff -_080388C8: .4byte gUnknown_2023BCE -_080388CC: .4byte gUnknown_202402C +_080388C8: .4byte gBattlerPartyIndexes +_080388CC: .4byte gEnemyParty _080388D0: .4byte gUnknown_3004FF0 _080388D4: - ldr r1, _0803891C @ =gUnknown_2023BCE + ldr r1, _0803891C @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08038920 @ =gUnknown_202402C + ldr r1, _08038920 @ =gEnemyParty adds r0, r1 movs r1, 0x3A bl GetMonData @@ -5632,7 +5632,7 @@ _080388D4: bl SetBattleBarStruct _080388FE: ldr r1, _08038928 @ =gUnknown_3004FE0 - ldr r0, _0803892C @ =gUnknown_2023BC4 + ldr r0, _0803892C @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5646,11 +5646,11 @@ _080388FE: pop {r0} bx r0 .align 2, 0 -_0803891C: .4byte gUnknown_2023BCE -_08038920: .4byte gUnknown_202402C +_0803891C: .4byte gBattlerPartyIndexes +_08038920: .4byte gEnemyParty _08038924: .4byte gUnknown_3004FF0 _08038928: .4byte gUnknown_3004FE0 -_0803892C: .4byte gUnknown_2023BC4 +_0803892C: .4byte gActiveBattler _08038930: .4byte sub_80360A0 thumb_func_end sub_8038844 @@ -5665,7 +5665,7 @@ sub_8038934: @ 8038934 thumb_func_start sub_8038940 sub_8038940: @ 8038940 push {r4,lr} - ldr r4, _0803899C @ =gUnknown_2023BC4 + ldr r4, _0803899C @ =gActiveBattler ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -5675,13 +5675,13 @@ sub_8038940: @ 8038940 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _080389A4 @ =gUnknown_2023BCE + ldr r2, _080389A4 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080389A8 @ =gUnknown_202402C + ldr r2, _080389A8 @ =gEnemyParty adds r1, r2 movs r2, 0x9 bl UpdateHealthboxAttribute @@ -5709,10 +5709,10 @@ _08038994: pop {r0} bx r0 .align 2, 0 -_0803899C: .4byte gUnknown_2023BC4 +_0803899C: .4byte gActiveBattler _080389A0: .4byte gUnknown_3004FF0 -_080389A4: .4byte gUnknown_2023BCE -_080389A8: .4byte gUnknown_202402C +_080389A4: .4byte gBattlerPartyIndexes +_080389A8: .4byte gEnemyParty _080389AC: .4byte gUnknown_2024018 _080389B0: .4byte gUnknown_3004FE0 _080389B4: .4byte sub_80364D0 @@ -5721,7 +5721,7 @@ _080389B4: .4byte sub_80364D0 thumb_func_start sub_80389B8 sub_80389B8: @ 80389B8 push {r4,r5,lr} - ldr r5, _08038A10 @ =gUnknown_2023BC4 + ldr r5, _08038A10 @ =gActiveBattler ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -5763,7 +5763,7 @@ _08038A08: pop {r0} bx r0 .align 2, 0 -_08038A10: .4byte gUnknown_2023BC4 +_08038A10: .4byte gActiveBattler _08038A14: .4byte gUnknown_2022BC4 _08038A18: .4byte gUnknown_3004FE0 _08038A1C: .4byte sub_80364D0 @@ -5862,7 +5862,7 @@ OpponentHandlecmd38: @ 8038AA8 push {lr} ldr r3, _08038AD4 @ =gUnknown_2022870 ldr r1, _08038AD8 @ =gUnknown_2022BC4 - ldr r0, _08038ADC @ =gUnknown_2023BC4 + ldr r0, _08038ADC @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -5882,7 +5882,7 @@ OpponentHandlecmd38: @ 8038AA8 .align 2, 0 _08038AD4: .4byte gUnknown_2022870 _08038AD8: .4byte gUnknown_2022BC4 -_08038ADC: .4byte gUnknown_2023BC4 +_08038ADC: .4byte gActiveBattler thumb_func_end OpponentHandlecmd38 thumb_func_start OpponentHandlecmd39 @@ -5927,7 +5927,7 @@ OpponentHandleHitAnimation: @ 8038B20 push {r4,lr} ldr r3, _08038B48 @ =gSprites ldr r2, _08038B4C @ =gUnknown_2023D44 - ldr r4, _08038B50 @ =gUnknown_2023BC4 + ldr r4, _08038B50 @ =gActiveBattler ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -5945,7 +5945,7 @@ OpponentHandleHitAnimation: @ 8038B20 .align 2, 0 _08038B48: .4byte gSprites _08038B4C: .4byte gUnknown_2023D44 -_08038B50: .4byte gUnknown_2023BC4 +_08038B50: .4byte gActiveBattler _08038B54: ldr r1, _08038B84 @ =gUnknown_2024005 movs r0, 0x1 @@ -5988,7 +5988,7 @@ sub_8038B90: @ 8038B90 thumb_func_start OpponentHandleEffectivenessSound OpponentHandleEffectivenessSound: @ 8038B9C push {r4,lr} - ldr r4, _08038BD8 @ =gUnknown_2023BC4 + ldr r4, _08038BD8 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -6016,7 +6016,7 @@ _08038BB0: pop {r0} bx r0 .align 2, 0 -_08038BD8: .4byte gUnknown_2023BC4 +_08038BD8: .4byte gActiveBattler _08038BDC: .4byte gUnknown_2022BC4 thumb_func_end OpponentHandleEffectivenessSound @@ -6024,7 +6024,7 @@ _08038BDC: .4byte gUnknown_2022BC4 OpponentHandlecmd44: @ 8038BE0 push {lr} ldr r2, _08038C08 @ =gUnknown_2022BC4 - ldr r0, _08038C0C @ =gUnknown_2023BC4 + ldr r0, _08038C0C @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -6041,21 +6041,21 @@ OpponentHandlecmd44: @ 8038BE0 bx r0 .align 2, 0 _08038C08: .4byte gUnknown_2022BC4 -_08038C0C: .4byte gUnknown_2023BC4 +_08038C0C: .4byte gActiveBattler thumb_func_end OpponentHandlecmd44 thumb_func_start OpponentHandleFaintingCry OpponentHandleFaintingCry: @ 8038C10 push {lr} - ldr r1, _08038C40 @ =gUnknown_2023BCE - ldr r0, _08038C44 @ =gUnknown_2023BC4 + ldr r1, _08038C40 @ =gBattlerPartyIndexes + ldr r0, _08038C44 @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08038C48 @ =gUnknown_202402C + ldr r1, _08038C48 @ =gEnemyParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -6068,16 +6068,16 @@ OpponentHandleFaintingCry: @ 8038C10 pop {r0} bx r0 .align 2, 0 -_08038C40: .4byte gUnknown_2023BCE -_08038C44: .4byte gUnknown_2023BC4 -_08038C48: .4byte gUnknown_202402C +_08038C40: .4byte gBattlerPartyIndexes +_08038C44: .4byte gActiveBattler +_08038C48: .4byte gEnemyParty thumb_func_end OpponentHandleFaintingCry thumb_func_start OpponentHandleIntroSlide OpponentHandleIntroSlide: @ 8038C4C push {lr} ldr r1, _08038C74 @ =gUnknown_2022BC4 - ldr r0, _08038C78 @ =gUnknown_2023BC4 + ldr r0, _08038C78 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -6094,7 +6094,7 @@ OpponentHandleIntroSlide: @ 8038C4C bx r0 .align 2, 0 _08038C74: .4byte gUnknown_2022BC4 -_08038C78: .4byte gUnknown_2023BC4 +_08038C78: .4byte gActiveBattler _08038C7C: .4byte gUnknown_2023F4C thumb_func_end OpponentHandleIntroSlide @@ -6102,7 +6102,7 @@ _08038C7C: .4byte gUnknown_2023F4C sub_8038C80: @ 8038C80 push {r4-r6,lr} ldr r5, _08038D60 @ =gUnknown_2023D44 - ldr r6, _08038D64 @ =gUnknown_2023BC4 + ldr r6, _08038D64 @ =gActiveBattler ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -6212,7 +6212,7 @@ _08038D42: bx r0 .align 2, 0 _08038D60: .4byte gUnknown_2023D44 -_08038D64: .4byte gUnknown_2023BC4 +_08038D64: .4byte gActiveBattler _08038D68: .4byte gSprites _08038D6C: .4byte sub_8075590 _08038D70: .4byte sub_8038D90 @@ -6260,7 +6260,7 @@ sub_8038DC4: @ 8038DC4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, _08038E1C @ =gUnknown_2023BC4 + ldr r7, _08038E1C @ =gActiveBattler ldrb r0, [r7] mov r9, r0 ldr r1, _08038E20 @ =gUnknown_3005090 @@ -6275,7 +6275,7 @@ sub_8038DC4: @ 8038DC4 lsls r0, 24 cmp r0, 0 beq _08038DFE - ldr r0, _08038E24 @ =gUnknown_2022B4C + ldr r0, _08038E24 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -6287,7 +6287,7 @@ _08038DFE: lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _08038E2C @ =gUnknown_2023BCE + ldr r0, _08038E2C @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -6297,18 +6297,18 @@ _08038DFE: bl sub_8037A28 b _08038E70 .align 2, 0 -_08038E1C: .4byte gUnknown_2023BC4 +_08038E1C: .4byte gActiveBattler _08038E20: .4byte gUnknown_3005090 -_08038E24: .4byte gUnknown_2022B4C +_08038E24: .4byte gBattleTypeFlags _08038E28: .4byte gUnknown_2022BC4 -_08038E2C: .4byte gUnknown_2023BCE +_08038E2C: .4byte gBattlerPartyIndexes _08038E30: ldr r4, _08038E94 @ =gUnknown_2022BC4 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, _08038E98 @ =gUnknown_2023BCE + ldr r6, _08038E98 @ =gBattlerPartyIndexes lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -6335,7 +6335,7 @@ _08038E30: strb r0, [r7] _08038E70: ldr r1, _08038E9C @ =gUnknown_3004FE0 - ldr r2, _08038EA0 @ =gUnknown_2023BC4 + ldr r2, _08038EA0 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -6353,9 +6353,9 @@ _08038E70: bx r0 .align 2, 0 _08038E94: .4byte gUnknown_2022BC4 -_08038E98: .4byte gUnknown_2023BCE +_08038E98: .4byte gBattlerPartyIndexes _08038E9C: .4byte gUnknown_3004FE0 -_08038EA0: .4byte gUnknown_2023BC4 +_08038EA0: .4byte gActiveBattler _08038EA4: .4byte sub_8035DF0 thumb_func_end sub_8038DC4 @@ -6363,7 +6363,7 @@ _08038EA4: .4byte sub_8035DF0 sub_8038EA8: @ 8038EA8 push {r4-r7,lr} ldr r1, _08038ED0 @ =gUnknown_2022BC4 - ldr r0, _08038ED4 @ =gUnknown_2023BC4 + ldr r0, _08038ED4 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -6380,11 +6380,11 @@ sub_8038EA8: @ 8038EA8 b _08038FA2 .align 2, 0 _08038ED0: .4byte gUnknown_2022BC4 -_08038ED4: .4byte gUnknown_2023BC4 +_08038ED4: .4byte gActiveBattler _08038ED8: ldr r4, _08038F30 @ =gUnknown_2024018 ldr r0, [r4] - ldr r3, _08038F34 @ =gUnknown_2023BC4 + ldr r3, _08038F34 @ =gActiveBattler ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -6427,7 +6427,7 @@ _08038ED8: b _08038FA2 .align 2, 0 _08038F30: .4byte gUnknown_2024018 -_08038F34: .4byte gUnknown_2023BC4 +_08038F34: .4byte gActiveBattler _08038F38: .4byte gUnknown_2022BC4 _08038F3C: movs r0, 0x3F @@ -6499,7 +6499,7 @@ sub_8038FBC: @ 8038FBC push {r4,lr} ldr r4, _08038FFC @ =gUnknown_2024018 ldr r0, [r4] - ldr r3, _08039000 @ =gUnknown_2023BC4 + ldr r3, _08039000 @ =gActiveBattler ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -6529,7 +6529,7 @@ _08038FF4: bx r0 .align 2, 0 _08038FFC: .4byte gUnknown_2024018 -_08039000: .4byte gUnknown_2023BC4 +_08039000: .4byte gActiveBattler thumb_func_end sub_8038FBC thumb_func_start sub_8039004 @@ -6537,7 +6537,7 @@ sub_8039004: @ 8039004 push {lr} ldr r0, _08039040 @ =gUnknown_2024018 ldr r1, [r0] - ldr r0, _08039044 @ =gUnknown_2023BC4 + ldr r0, _08039044 @ =gActiveBattler ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -6565,7 +6565,7 @@ _08039036: bx r0 .align 2, 0 _08039040: .4byte gUnknown_2024018 -_08039044: .4byte gUnknown_2023BC4 +_08039044: .4byte gActiveBattler _08039048: .4byte gUnknown_3005090 _0803904C: .4byte gUnknown_2024000 _08039050: .4byte sub_80491B0 @@ -6582,7 +6582,7 @@ sub_8039054: @ 8039054 thumb_func_start sub_8039060 sub_8039060: @ 8039060 push {r4,lr} - ldr r4, _080390B0 @ =gUnknown_2023BC4 + ldr r4, _080390B0 @ =gActiveBattler ldrb r0, [r4] bl sub_8075224 lsls r0, 24 @@ -6620,7 +6620,7 @@ _080390A6: pop {r0} bx r0 .align 2, 0 -_080390B0: .4byte gUnknown_2023BC4 +_080390B0: .4byte gActiveBattler _080390B4: .4byte gSprites _080390B8: .4byte gUnknown_2023D44 _080390BC: .4byte gUnknown_2022BC4 @@ -6630,7 +6630,7 @@ _080390BC: .4byte gUnknown_2022BC4 sub_80390C0: @ 80390C0 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _08039104 @ =gUnknown_2023BC4 + ldr r6, _08039104 @ =gActiveBattler ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -6660,7 +6660,7 @@ sub_80390C0: @ 80390C0 bl OpponentBufferExecCompleted b _08039118 .align 2, 0 -_08039104: .4byte gUnknown_2023BC4 +_08039104: .4byte gActiveBattler _08039108: .4byte gUnknown_2022BC4 _0803910C: ldr r0, _08039120 @ =gUnknown_3004FE0 @@ -6698,7 +6698,7 @@ sub_8039134: @ 8039134 thumb_func_start OpponentHandleCmd55 OpponentHandleCmd55: @ 8039140 push {lr} - ldr r0, _08039174 @ =gUnknown_2022B4C + ldr r0, _08039174 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x6 ands r0, r1 @@ -6722,7 +6722,7 @@ _0803916A: pop {r0} bx r0 .align 2, 0 -_08039174: .4byte gUnknown_2022B4C +_08039174: .4byte gBattleTypeFlags _08039178: .4byte gMain _0803917C: .4byte 0x00000439 _08039180: .4byte gUnknown_3004F80 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 3c7d225f2..d1ef9e612 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -13,7 +13,7 @@ nullsub_13: @ 802E310 thumb_func_start SetBankFuncToPlayerBufferRunCommand SetBankFuncToPlayerBufferRunCommand: @ 802E314 ldr r1, _0802E32C @ =gUnknown_3004FE0 - ldr r0, _0802E330 @ =gUnknown_2023BC4 + ldr r0, _0802E330 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -25,7 +25,7 @@ SetBankFuncToPlayerBufferRunCommand: @ 802E314 bx lr .align 2, 0 _0802E32C: .4byte gUnknown_3004FE0 -_0802E330: .4byte gUnknown_2023BC4 +_0802E330: .4byte gActiveBattler _0802E334: .4byte PlayerBufferRunCommand _0802E338: .4byte gUnknown_2024005 thumb_func_end SetBankFuncToPlayerBufferRunCommand @@ -35,13 +35,13 @@ PlayerBufferExecCompleted: @ 802E33C push {r4,lr} sub sp, 0x4 ldr r1, _0802E37C @ =gUnknown_3004FE0 - ldr r4, _0802E380 @ =gUnknown_2023BC4 + ldr r4, _0802E380 @ =gActiveBattler ldrb r0, [r4] lsls r0, 2 adds r0, r1 ldr r1, _0802E384 @ =PlayerBufferRunCommand str r1, [r0] - ldr r0, _0802E388 @ =gUnknown_2022B4C + ldr r0, _0802E388 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -63,13 +63,13 @@ PlayerBufferExecCompleted: @ 802E33C b _0802E3A2 .align 2, 0 _0802E37C: .4byte gUnknown_3004FE0 -_0802E380: .4byte gUnknown_2023BC4 +_0802E380: .4byte gActiveBattler _0802E384: .4byte PlayerBufferRunCommand -_0802E388: .4byte gUnknown_2022B4C +_0802E388: .4byte gBattleTypeFlags _0802E38C: .4byte gUnknown_2022BC4 _0802E390: ldr r2, _0802E3AC @ =gUnknown_2023BC8 - ldr r1, _0802E3B0 @ =gUnknown_825E45C + ldr r1, _0802E3B0 @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -84,15 +84,15 @@ _0802E3A2: bx r0 .align 2, 0 _0802E3AC: .4byte gUnknown_2023BC8 -_0802E3B0: .4byte gUnknown_825E45C +_0802E3B0: .4byte gBitTable thumb_func_end PlayerBufferExecCompleted thumb_func_start PlayerBufferRunCommand PlayerBufferRunCommand: @ 802E3B4 push {lr} ldr r2, _0802E3E8 @ =gUnknown_2023BC8 - ldr r1, _0802E3EC @ =gUnknown_825E45C - ldr r0, _0802E3F0 @ =gUnknown_2023BC4 + ldr r1, _0802E3EC @ =gBitTable + ldr r0, _0802E3F0 @ =gActiveBattler ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -116,8 +116,8 @@ PlayerBufferRunCommand: @ 802E3B4 b _0802E400 .align 2, 0 _0802E3E8: .4byte gUnknown_2023BC8 -_0802E3EC: .4byte gUnknown_825E45C -_0802E3F0: .4byte gUnknown_2023BC4 +_0802E3EC: .4byte gBitTable +_0802E3F0: .4byte gActiveBattler _0802E3F4: .4byte gUnknown_2022BC4 _0802E3F8: .4byte gUnknown_825089C _0802E3FC: @@ -132,7 +132,7 @@ CompleteOnBankSpritePosX_0: @ 802E404 push {lr} ldr r2, _0802E42C @ =gSprites ldr r1, _0802E430 @ =gUnknown_2023D44 - ldr r0, _0802E434 @ =gUnknown_2023BC4 + ldr r0, _0802E434 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -151,7 +151,7 @@ _0802E426: .align 2, 0 _0802E42C: .4byte gSprites _0802E430: .4byte gUnknown_2023D44 -_0802E434: .4byte gUnknown_2023BC4 +_0802E434: .4byte gActiveBattler thumb_func_end CompleteOnBankSpritePosX_0 thumb_func_start sub_802E438 @@ -160,7 +160,7 @@ sub_802E438: @ 802E438 mov r7, r8 push {r7} ldr r7, _0802E498 @ =gUnknown_2022BC4 - ldr r4, _0802E49C @ =gUnknown_2023BC4 + ldr r4, _0802E49C @ =gActiveBattler ldrb r0, [r4] lsls r2, r0, 9 adds r1, r7, 0x2 @@ -202,7 +202,7 @@ sub_802E438: @ 802E438 b _0802E616 .align 2, 0 _0802E498: .4byte gUnknown_2022BC4 -_0802E49C: .4byte gUnknown_2023BC4 +_0802E49C: .4byte gActiveBattler _0802E4A0: .4byte gMain _0802E4A4: .4byte gUnknown_2023FF8 _0802E4A8: @@ -342,7 +342,7 @@ _0802E5A8: ands r0, r1 cmp r0, 0 beq _0802E628 - ldr r6, _0802E61C @ =gUnknown_2022B4C + ldr r6, _0802E61C @ =gBattleTypeFlags ldr r0, [r6] ands r0, r2 cmp r0, 0 @@ -355,9 +355,9 @@ _0802E5A8: bne _0802E634 movs r0, 0 bl GetBankByIdentity - ldr r1, _0802E620 @ =gUnknown_2023D70 + ldr r1, _0802E620 @ =gAbsentBattlerFlags ldrb r1, [r1] - ldr r2, _0802E624 @ =gUnknown_825E45C + ldr r2, _0802E624 @ =gBitTable lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -394,9 +394,9 @@ _0802E616: bl PlayerBufferExecCompleted b _0802E634 .align 2, 0 -_0802E61C: .4byte gUnknown_2022B4C -_0802E620: .4byte gUnknown_2023D70 -_0802E624: .4byte gUnknown_825E45C +_0802E61C: .4byte gBattleTypeFlags +_0802E620: .4byte gAbsentBattlerFlags +_0802E624: .4byte gBitTable _0802E628: movs r0, 0x8 ands r0, r1 @@ -414,7 +414,7 @@ _0802E634: thumb_func_start sub_802E640 sub_802E640: @ 802E640 push {r4,lr} - ldr r4, _0802E668 @ =gUnknown_2023BC4 + ldr r4, _0802E668 @ =gActiveBattler ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free @@ -431,7 +431,7 @@ sub_802E640: @ 802E640 pop {r0} bx r0 .align 2, 0 -_0802E668: .4byte gUnknown_2023BC4 +_0802E668: .4byte gActiveBattler _0802E66C: .4byte gUnknown_3004FE0 _0802E670: .4byte sub_802E674 thumb_func_end sub_802E640 @@ -493,7 +493,7 @@ _0802E6B6: ldr r1, _0802E720 @ =sub_8012098 str r1, [r0] ldr r1, _0802E724 @ =gUnknown_2023FFC - ldr r0, _0802E728 @ =gUnknown_2023BC4 + ldr r0, _0802E728 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -517,7 +517,7 @@ _0802E718: .4byte gSprites _0802E71C: .4byte gUnknown_2023D44 _0802E720: .4byte sub_8012098 _0802E724: .4byte gUnknown_2023FFC -_0802E728: .4byte gUnknown_2023BC4 +_0802E728: .4byte gActiveBattler _0802E72C: movs r0, 0x2 ands r0, r1 @@ -539,7 +539,7 @@ _0802E72C: ldr r1, _0802E790 @ =sub_8012098 str r1, [r0] ldr r1, _0802E794 @ =gUnknown_3004FE0 - ldr r4, _0802E798 @ =gUnknown_2023BC4 + ldr r4, _0802E798 @ =gActiveBattler ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -565,7 +565,7 @@ _0802E788: .4byte gUnknown_2023D44 _0802E78C: .4byte gUnknown_3004FF4 _0802E790: .4byte sub_8012098 _0802E794: .4byte gUnknown_3004FE0 -_0802E798: .4byte gUnknown_2023BC4 +_0802E798: .4byte gActiveBattler _0802E79C: .4byte sub_802EA10 _0802E7A0: movs r0, 0x60 @@ -651,26 +651,26 @@ _0802E83C: beq _0802E882 b _0802E884 _0802E846: - ldr r2, _0802E8A4 @ =gUnknown_2023BC4 + ldr r2, _0802E8A4 @ =gActiveBattler ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 bne _0802E882 - ldr r1, _0802E8A8 @ =gUnknown_2023BCE + ldr r1, _0802E8A8 @ =gBattlerPartyIndexes ldrb r2, [r2] lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802E8AC @ =gUnknown_2024284 + ldr r1, _0802E8AC @ =gPlayerParty adds r0, r1 ldr r1, _0802E8B0 @ =gUnknown_2023FFC adds r2, r1 ldrb r1, [r2] adds r1, 0xD bl GetMonData - ldr r2, _0802E8B4 @ =gUnknown_8250C04 + ldr r2, _0802E8B4 @ =gBattleMoves lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -683,9 +683,9 @@ _0802E846: _0802E882: adds r4, 0x1 _0802E884: - ldr r0, _0802E8B8 @ =gUnknown_2023D70 + ldr r0, _0802E8B8 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0802E8BC @ =gUnknown_825E45C + ldr r2, _0802E8BC @ =gBitTable ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -700,13 +700,13 @@ _0802E89C: beq _0802E7CC b _0802E9C4 .align 2, 0 -_0802E8A4: .4byte gUnknown_2023BC4 -_0802E8A8: .4byte gUnknown_2023BCE -_0802E8AC: .4byte gUnknown_2024284 +_0802E8A4: .4byte gActiveBattler +_0802E8A8: .4byte gBattlerPartyIndexes +_0802E8AC: .4byte gPlayerParty _0802E8B0: .4byte gUnknown_2023FFC -_0802E8B4: .4byte gUnknown_8250C04 -_0802E8B8: .4byte gUnknown_2023D70 -_0802E8BC: .4byte gUnknown_825E45C +_0802E8B4: .4byte gBattleMoves +_0802E8B8: .4byte gAbsentBattlerFlags +_0802E8BC: .4byte gBitTable _0802E8C0: .4byte gUnknown_3004FF4 _0802E8C4: movs r0, 0x90 @@ -792,26 +792,26 @@ _0802E960: beq _0802E9A6 b _0802E9A8 _0802E96A: - ldr r2, _0802E9E4 @ =gUnknown_2023BC4 + ldr r2, _0802E9E4 @ =gActiveBattler ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 bne _0802E9A6 - ldr r1, _0802E9E8 @ =gUnknown_2023BCE + ldr r1, _0802E9E8 @ =gBattlerPartyIndexes ldrb r2, [r2] lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802E9EC @ =gUnknown_2024284 + ldr r1, _0802E9EC @ =gPlayerParty adds r0, r1 ldr r1, _0802E9F0 @ =gUnknown_2023FFC adds r2, r1 ldrb r1, [r2] adds r1, 0xD bl GetMonData - ldr r2, _0802E9F4 @ =gUnknown_8250C04 + ldr r2, _0802E9F4 @ =gBattleMoves lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -824,9 +824,9 @@ _0802E96A: _0802E9A6: adds r4, 0x1 _0802E9A8: - ldr r0, _0802E9F8 @ =gUnknown_2023D70 + ldr r0, _0802E9F8 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0802E9FC @ =gUnknown_825E45C + ldr r2, _0802E9FC @ =gBitTable ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -858,13 +858,13 @@ _0802E9DC: pop {r0} bx r0 .align 2, 0 -_0802E9E4: .4byte gUnknown_2023BC4 -_0802E9E8: .4byte gUnknown_2023BCE -_0802E9EC: .4byte gUnknown_2024284 +_0802E9E4: .4byte gActiveBattler +_0802E9E8: .4byte gBattlerPartyIndexes +_0802E9EC: .4byte gPlayerParty _0802E9F0: .4byte gUnknown_2023FFC -_0802E9F4: .4byte gUnknown_8250C04 -_0802E9F8: .4byte gUnknown_2023D70 -_0802E9FC: .4byte gUnknown_825E45C +_0802E9F4: .4byte gBattleMoves +_0802E9F8: .4byte gAbsentBattlerFlags +_0802E9FC: .4byte gBitTable _0802EA00: .4byte gUnknown_3004FF4 _0802EA04: .4byte gSprites _0802EA08: .4byte gUnknown_2023D44 @@ -879,7 +879,7 @@ sub_802EA10: @ 802EA10 sub sp, 0x4 movs r0, 0 mov r8, r0 - ldr r6, _0802EA6C @ =gUnknown_2023BC4 + ldr r6, _0802EA6C @ =gActiveBattler ldrb r0, [r6] lsls r0, 9 ldr r1, _0802EA70 @ =gUnknown_2022BC8 @@ -919,12 +919,12 @@ _0802EA3A: ands r4, r0 b _0802EA8A .align 2, 0 -_0802EA6C: .4byte gUnknown_2023BC4 +_0802EA6C: .4byte gActiveBattler _0802EA70: .4byte gUnknown_2022BC8 _0802EA74: .4byte gMain _0802EA78: .4byte gUnknown_2023FFC _0802EA7C: - ldr r2, _0802EA9C @ =gUnknown_8250C04 + ldr r2, _0802EA9C @ =gBattleMoves ldrh r1, [r1] lsls r0, r1, 1 adds r0, r1 @@ -937,16 +937,16 @@ _0802EA8A: cmp r0, 0 beq _0802EAA8 ldr r0, _0802EAA0 @ =gUnknown_3004FF4 - ldr r1, _0802EAA4 @ =gUnknown_2023BC4 + ldr r1, _0802EAA4 @ =gActiveBattler ldrb r1, [r1] strb r1, [r0] b _0802EAC2 .align 2, 0 -_0802EA9C: .4byte gUnknown_8250C04 +_0802EA9C: .4byte gBattleMoves _0802EAA0: .4byte gUnknown_3004FF4 -_0802EAA4: .4byte gUnknown_2023BC4 +_0802EAA4: .4byte gActiveBattler _0802EAA8: - ldr r0, _0802EAEC @ =gUnknown_2023BC4 + ldr r0, _0802EAEC @ =gActiveBattler ldrb r0, [r0] bl GetBankIdentity adds r1, r0, 0 @@ -959,7 +959,7 @@ _0802EAA8: strb r0, [r1] _0802EAC2: ldr r3, _0802EAF4 @ =gUnknown_2022BC4 - ldr r5, _0802EAEC @ =gUnknown_2023BC4 + ldr r5, _0802EAEC @ =gActiveBattler ldrb r2, [r5] lsls r1, r2, 9 adds r0, r3, 0x1 @@ -980,7 +980,7 @@ _0802EAC2: add r8, r0 b _0802EB3A .align 2, 0 -_0802EAEC: .4byte gUnknown_2023BC4 +_0802EAEC: .4byte gActiveBattler _0802EAF0: .4byte gUnknown_3004FF4 _0802EAF4: .4byte gUnknown_2022BC4 _0802EAF8: @@ -1031,7 +1031,7 @@ _0802EB3A: cmp r0, 0 bne _0802EB88 ldr r1, _0802EB78 @ =gUnknown_2023FFC - ldr r0, _0802EB84 @ =gUnknown_2023BC4 + ldr r0, _0802EB84 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -1048,10 +1048,10 @@ _0802EB3A: _0802EB78: .4byte gUnknown_2023FFC _0802EB7C: .4byte gUnknown_3004FF4 _0802EB80: .4byte 0x00007fff -_0802EB84: .4byte gUnknown_2023BC4 +_0802EB84: .4byte gActiveBattler _0802EB88: ldr r1, _0802EBA4 @ =gUnknown_3004FE0 - ldr r2, _0802EBA8 @ =gUnknown_2023BC4 + ldr r2, _0802EBA8 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -1066,15 +1066,15 @@ _0802EB88: b _0802EBE4 .align 2, 0 _0802EBA4: .4byte gUnknown_3004FE0 -_0802EBA8: .4byte gUnknown_2023BC4 +_0802EBA8: .4byte gActiveBattler _0802EBAC: .4byte sub_802E674 _0802EBB0: .4byte gUnknown_3004FF4 _0802EBB4: movs r0, 0x1 bl GetBankByIdentity - ldr r1, _0802EBD4 @ =gUnknown_2023D70 + ldr r1, _0802EBD4 @ =gAbsentBattlerFlags ldrb r1, [r1] - ldr r2, _0802EBD8 @ =gUnknown_825E45C + ldr r2, _0802EBD8 @ =gBitTable lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -1085,8 +1085,8 @@ _0802EBB4: movs r0, 0x3 b _0802EBDE .align 2, 0 -_0802EBD4: .4byte gUnknown_2023D70 -_0802EBD8: .4byte gUnknown_825E45C +_0802EBD4: .4byte gAbsentBattlerFlags +_0802EBD8: .4byte gBitTable _0802EBDC: movs r0, 0x1 _0802EBDE: @@ -1273,7 +1273,7 @@ _0802ED4C: ldrb r0, [r0] cmp r0, 0x1 bls _0802EDBA - ldr r0, _0802ED88 @ =gUnknown_2022B4C + ldr r0, _0802ED88 @ =gBattleTypeFlags ldr r5, [r0] ands r5, r7 cmp r5, 0 @@ -1294,7 +1294,7 @@ _0802ED4C: b _0802ED9C .align 2, 0 _0802ED84: .4byte gUnknown_3004FF8 -_0802ED88: .4byte gUnknown_2022B4C +_0802ED88: .4byte gBattleTypeFlags _0802ED8C: .4byte gUnknown_2023FFC _0802ED90: .4byte gUnknown_3004FF4 _0802ED94: @@ -1310,7 +1310,7 @@ _0802ED9C: movs r1, 0xB bl sub_80D87BC ldr r1, _0802EDD0 @ =gUnknown_3004FE0 - ldr r0, _0802EDD4 @ =gUnknown_2023BC4 + ldr r0, _0802EDD4 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -1328,7 +1328,7 @@ _0802EDBA: _0802EDC8: .4byte gUnknown_3004FF4 _0802EDCC: .4byte gUnknown_83FE7A0 _0802EDD0: .4byte gUnknown_3004FE0 -_0802EDD4: .4byte gUnknown_2023BC4 +_0802EDD4: .4byte gActiveBattler _0802EDD8: .4byte sub_802EF58 thumb_func_end sub_802EA10 @@ -1370,7 +1370,7 @@ _0802EE18: cmp r0, 0 beq _0802EE58 ldr r5, _0802EF4C @ =gUnknown_2023FFC - ldr r4, _0802EF50 @ =gUnknown_2023BC4 + ldr r4, _0802EF50 @ =gActiveBattler ldrb r0, [r4] adds r2, r0, r5 ldrb r1, [r2] @@ -1401,7 +1401,7 @@ _0802EE58: cmp r0, 0 beq _0802EEA6 ldr r5, _0802EF4C @ =gUnknown_2023FFC - ldr r4, _0802EF50 @ =gUnknown_2023BC4 + ldr r4, _0802EF50 @ =gActiveBattler ldrb r0, [r4] adds r3, r0, r5 ldrb r2, [r3] @@ -1438,7 +1438,7 @@ _0802EEA6: cmp r0, 0 beq _0802EEE8 ldr r5, _0802EF4C @ =gUnknown_2023FFC - ldr r4, _0802EF50 @ =gUnknown_2023BC4 + ldr r4, _0802EF50 @ =gActiveBattler ldrb r0, [r4] adds r2, r0, r5 ldrb r1, [r2] @@ -1469,7 +1469,7 @@ _0802EEE8: cmp r0, 0 beq _0802EF36 ldr r5, _0802EF4C @ =gUnknown_2023FFC - ldr r4, _0802EF50 @ =gUnknown_2023BC4 + ldr r4, _0802EF50 @ =gActiveBattler ldrb r0, [r4] adds r3, r0, r5 ldrb r2, [r3] @@ -1508,7 +1508,7 @@ _0802EF40: .4byte gMain _0802EF44: .4byte gUnknown_2022974 _0802EF48: .4byte gUnknown_2022976 _0802EF4C: .4byte gUnknown_2023FFC -_0802EF50: .4byte gUnknown_2023BC4 +_0802EF50: .4byte gActiveBattler _0802EF54: .4byte gUnknown_3004FF8 thumb_func_end sub_802EDDC @@ -1532,7 +1532,7 @@ _0802EF72: bl PlaySE ldr r0, _0802F2E8 @ =gUnknown_2023FFC mov r10, r0 - ldr r1, _0802F2EC @ =gUnknown_2023BC4 + ldr r1, _0802F2EC @ =gActiveBattler mov r8, r1 ldrb r1, [r1] adds r2, r1, r0 @@ -1595,12 +1595,12 @@ _0802EF90: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r2, _0802F2F8 @ =gUnknown_2023E0C + ldr r2, _0802F2F8 @ =gDisableStructs adds r6, r0, r2 ldrb r4, [r6, 0x18] lsls r3, r4, 24 lsrs r2, r3, 28 - ldr r0, _0802F2FC @ =gUnknown_825E45C + ldr r0, _0802F2FC @ =gBitTable mov r12, r0 add r1, r10 ldrb r0, [r1] @@ -1623,7 +1623,7 @@ _0802EF90: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r3, _0802F2F8 @ =gUnknown_2023E0C + ldr r3, _0802F2F8 @ =gDisableStructs adds r1, r3 ldrb r4, [r1, 0x18] lsrs r3, r4, 4 @@ -1643,7 +1643,7 @@ _0802F04A: mov r5, sp adds r5, 0x18 str r5, [sp, 0x1C] - ldr r2, _0802F300 @ =gUnknown_2023BE4 + ldr r2, _0802F300 @ =gBattleMons mov r0, r8 ldrb r1, [r0] movs r0, 0x58 @@ -1745,7 +1745,7 @@ _0802F0F8: adds r6, 0x1 cmp r6, 0x3 ble _0802F0F8 - ldr r2, _0802F2EC @ =gUnknown_2023BC4 + ldr r2, _0802F2EC @ =gActiveBattler ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -1766,11 +1766,11 @@ _0802F13A: str r1, [sp, 0x20] add r3, sp, 0xC mov r10, r3 - ldr r5, _0802F304 @ =gUnknown_2023BCE + ldr r5, _0802F304 @ =gBattlerPartyIndexes mov r9, r5 mov r8, r2 movs r7, 0x64 - ldr r5, _0802F308 @ =gUnknown_2024284 + ldr r5, _0802F308 @ =gPlayerParty adds r4, r1, 0 _0802F152: mov r1, r8 @@ -1801,15 +1801,15 @@ _0802F152: adds r6, 0x1 cmp r6, 0x3 ble _0802F152 - ldr r1, _0802F304 @ =gUnknown_2023BCE - ldr r0, _0802F2EC @ =gUnknown_2023BC4 + ldr r1, _0802F304 @ =gBattlerPartyIndexes + ldr r0, _0802F2EC @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802F308 @ =gUnknown_2024284 + ldr r1, _0802F308 @ =gPlayerParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -1832,7 +1832,7 @@ _0802F1B2: cmp r6, 0x3 ble _0802F1B2 ldr r4, _0802F2E8 @ =gUnknown_2023FFC - ldr r3, _0802F2EC @ =gUnknown_2023BC4 + ldr r3, _0802F2EC @ =gActiveBattler ldrb r0, [r3] adds r0, r4 ldrb r1, [r0] @@ -1902,13 +1902,13 @@ _0802F23E: cmp r6, 0x3 ble _0802F23E movs r6, 0 - ldr r5, _0802F304 @ =gUnknown_2023BCE + ldr r5, _0802F304 @ =gBattlerPartyIndexes mov r10, r5 - ldr r0, _0802F2EC @ =gUnknown_2023BC4 + ldr r0, _0802F2EC @ =gActiveBattler mov r9, r0 movs r1, 0x64 mov r8, r1 - ldr r7, _0802F308 @ =gUnknown_2024284 + ldr r7, _0802F308 @ =gPlayerParty ldr r5, [sp, 0x20] adds r5, 0x8 ldr r4, [sp, 0x20] @@ -1944,28 +1944,28 @@ _0802F26A: adds r6, 0x1 cmp r6, 0x3 ble _0802F26A - ldr r1, _0802F304 @ =gUnknown_2023BCE - ldr r0, _0802F2EC @ =gUnknown_2023BC4 + ldr r1, _0802F304 @ =gBattlerPartyIndexes + ldr r0, _0802F2EC @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802F308 @ =gUnknown_2024284 + ldr r1, _0802F308 @ =gPlayerParty adds r0, r1 movs r1, 0x15 ldr r2, [sp, 0x1C] bl sub_804037C _0802F2C8: - ldr r0, _0802F30C @ =gUnknown_2022B4C + ldr r0, _0802F30C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 cmp r0, 0 beq _0802F318 ldr r1, _0802F310 @ =gUnknown_3004FE0 - ldr r2, _0802F2EC @ =gUnknown_2023BC4 + ldr r2, _0802F2EC @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -1974,20 +1974,20 @@ _0802F2C8: .align 2, 0 _0802F2E4: .4byte gMain _0802F2E8: .4byte gUnknown_2023FFC -_0802F2EC: .4byte gUnknown_2023BC4 +_0802F2EC: .4byte gActiveBattler _0802F2F0: .4byte gUnknown_3004FF4 _0802F2F4: .4byte gUnknown_2022BC8 -_0802F2F8: .4byte gUnknown_2023E0C -_0802F2FC: .4byte gUnknown_825E45C -_0802F300: .4byte gUnknown_2023BE4 -_0802F304: .4byte gUnknown_2023BCE -_0802F308: .4byte gUnknown_2024284 -_0802F30C: .4byte gUnknown_2022B4C +_0802F2F8: .4byte gDisableStructs +_0802F2FC: .4byte gBitTable +_0802F300: .4byte gBattleMons +_0802F304: .4byte gBattlerPartyIndexes +_0802F308: .4byte gPlayerParty +_0802F30C: .4byte gBattleTypeFlags _0802F310: .4byte gUnknown_3004FE0 _0802F314: .4byte sub_80E7988 _0802F318: ldr r1, _0802F390 @ =gUnknown_3004FE0 - ldr r2, _0802F394 @ =gUnknown_2023BC4 + ldr r2, _0802F394 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -2022,13 +2022,13 @@ _0802F34C: ldrb r0, [r0] bl MoveSelectionDestroyCursorAt ldr r1, _0802F39C @ =gUnknown_2023FFC - ldr r4, _0802F394 @ =gUnknown_2023BC4 + ldr r4, _0802F394 @ =gActiveBattler ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl MoveSelectionCreateCursorAt - ldr r0, _0802F3A8 @ =gUnknown_2022B4C + ldr r0, _0802F3A8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -2042,12 +2042,12 @@ _0802F34C: b _0802F3BA .align 2, 0 _0802F390: .4byte gUnknown_3004FE0 -_0802F394: .4byte gUnknown_2023BC4 +_0802F394: .4byte gActiveBattler _0802F398: .4byte sub_802EA10 _0802F39C: .4byte gUnknown_2023FFC _0802F3A0: .4byte gUnknown_3004FF4 _0802F3A4: .4byte gMain -_0802F3A8: .4byte gUnknown_2022B4C +_0802F3A8: .4byte gBattleTypeFlags _0802F3AC: .4byte sub_80E7988 _0802F3B0: ldr r0, _0802F3F8 @ =gUnknown_3004FE0 @@ -2074,7 +2074,7 @@ _0802F3C8: cmp r0, 0 beq _0802F454 ldr r0, _0802F408 @ =gUnknown_2023FFC - ldr r1, _0802F40C @ =gUnknown_2023BC4 + ldr r1, _0802F40C @ =gActiveBattler ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] @@ -2090,7 +2090,7 @@ _0802F3FC: .4byte sub_802EA10 _0802F400: .4byte gMain _0802F404: .4byte gUnknown_3004FF4 _0802F408: .4byte gUnknown_2023FFC -_0802F40C: .4byte gUnknown_2023BC4 +_0802F40C: .4byte gActiveBattler _0802F410: ldrb r0, [r3] bl MoveSelectionDestroyCursorAt @@ -2103,7 +2103,7 @@ _0802F416: movs r0, 0x5 bl PlaySE ldr r1, _0802F444 @ =gUnknown_2023FFC - ldr r0, _0802F448 @ =gUnknown_2023BC4 + ldr r0, _0802F448 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -2117,7 +2117,7 @@ _0802F416: .align 2, 0 _0802F440: .4byte gUnknown_3004FF4 _0802F444: .4byte gUnknown_2023FFC -_0802F448: .4byte gUnknown_2023BC4 +_0802F448: .4byte gActiveBattler _0802F44C: ldrb r0, [r4] movs r1, 0x1B @@ -2142,7 +2142,7 @@ _0802F454: cmp r0, r1 bcs _0802F4E8 ldr r0, _0802F49C @ =gUnknown_2023FFC - ldr r1, _0802F4A0 @ =gUnknown_2023BC4 + ldr r1, _0802F4A0 @ =gActiveBattler ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] @@ -2157,7 +2157,7 @@ _0802F490: .4byte gMain _0802F494: .4byte gUnknown_3004FF4 _0802F498: .4byte gUnknown_3004FF8 _0802F49C: .4byte gUnknown_2023FFC -_0802F4A0: .4byte gUnknown_2023BC4 +_0802F4A0: .4byte gActiveBattler _0802F4A4: ldrb r0, [r3] bl MoveSelectionDestroyCursorAt @@ -2170,7 +2170,7 @@ _0802F4AA: movs r0, 0x5 bl PlaySE ldr r1, _0802F4D8 @ =gUnknown_2023FFC - ldr r0, _0802F4DC @ =gUnknown_2023BC4 + ldr r0, _0802F4DC @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -2184,7 +2184,7 @@ _0802F4AA: .align 2, 0 _0802F4D4: .4byte gUnknown_3004FF4 _0802F4D8: .4byte gUnknown_2023FFC -_0802F4DC: .4byte gUnknown_2023BC4 +_0802F4DC: .4byte gActiveBattler _0802F4E0: ldrb r0, [r4] movs r1, 0x1B @@ -2203,7 +2203,7 @@ _0802F4E8: cmp r0, 0 beq _0802F56C ldr r0, _0802F520 @ =gUnknown_2023FFC - ldr r1, _0802F524 @ =gUnknown_2023BC4 + ldr r1, _0802F524 @ =gActiveBattler ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] @@ -2217,7 +2217,7 @@ _0802F4E8: _0802F518: .4byte gMain _0802F51C: .4byte gUnknown_3004FF4 _0802F520: .4byte gUnknown_2023FFC -_0802F524: .4byte gUnknown_2023BC4 +_0802F524: .4byte gActiveBattler _0802F528: ldrb r0, [r3] bl MoveSelectionDestroyCursorAt @@ -2230,7 +2230,7 @@ _0802F52E: movs r0, 0x5 bl PlaySE ldr r1, _0802F55C @ =gUnknown_2023FFC - ldr r0, _0802F560 @ =gUnknown_2023BC4 + ldr r0, _0802F560 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -2244,7 +2244,7 @@ _0802F52E: .align 2, 0 _0802F558: .4byte gUnknown_3004FF4 _0802F55C: .4byte gUnknown_2023FFC -_0802F560: .4byte gUnknown_2023BC4 +_0802F560: .4byte gActiveBattler _0802F564: ldrb r0, [r4] movs r1, 0x1B @@ -2269,7 +2269,7 @@ _0802F56C: cmp r0, r1 bcs _0802F600 ldr r0, _0802F5B4 @ =gUnknown_2023FFC - ldr r1, _0802F5B8 @ =gUnknown_2023BC4 + ldr r1, _0802F5B8 @ =gActiveBattler ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] @@ -2284,7 +2284,7 @@ _0802F5A8: .4byte gMain _0802F5AC: .4byte gUnknown_3004FF4 _0802F5B0: .4byte gUnknown_3004FF8 _0802F5B4: .4byte gUnknown_2023FFC -_0802F5B8: .4byte gUnknown_2023BC4 +_0802F5B8: .4byte gActiveBattler _0802F5BC: ldrb r0, [r3] bl MoveSelectionDestroyCursorAt @@ -2297,7 +2297,7 @@ _0802F5C2: movs r0, 0x5 bl PlaySE ldr r1, _0802F5F0 @ =gUnknown_2023FFC - ldr r0, _0802F5F4 @ =gUnknown_2023BC4 + ldr r0, _0802F5F4 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -2311,7 +2311,7 @@ _0802F5C2: .align 2, 0 _0802F5EC: .4byte gUnknown_3004FF4 _0802F5F0: .4byte gUnknown_2023FFC -_0802F5F4: .4byte gUnknown_2023BC4 +_0802F5F4: .4byte gActiveBattler _0802F5F8: ldrb r0, [r4] movs r1, 0x1B @@ -2402,7 +2402,7 @@ sub_802F6A8: @ 802F6A8 ands r0, r1 cmp r0, 0 bne _0802F71E - ldr r0, _0802F6D4 @ =gUnknown_2022B4C + ldr r0, _0802F6D4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -2416,13 +2416,13 @@ sub_802F6A8: @ 802F6A8 b _0802F6E0 .align 2, 0 _0802F6D0: .4byte gUnknown_2037AB8 -_0802F6D4: .4byte gUnknown_2022B4C +_0802F6D4: .4byte gBattleTypeFlags _0802F6D8: .4byte gUnknown_3003F3C _0802F6DC: bl sub_800AB9C _0802F6E0: ldr r1, _0802F6F0 @ =gUnknown_3004FE0 - ldr r0, _0802F6F4 @ =gUnknown_2023BC4 + ldr r0, _0802F6F4 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -2431,7 +2431,7 @@ _0802F6E0: b _0802F71E .align 2, 0 _0802F6F0: .4byte gUnknown_3004FE0 -_0802F6F4: .4byte gUnknown_2023BC4 +_0802F6F4: .4byte gActiveBattler _0802F6F8: .4byte sub_802F610 _0802F6FC: movs r0, 0x53 @@ -2463,7 +2463,7 @@ sub_802F730: @ 802F730 push {lr} ldr r2, _0802F758 @ =gSprites ldr r1, _0802F75C @ =gUnknown_2023D44 - ldr r0, _0802F760 @ =gUnknown_2023BC4 + ldr r0, _0802F760 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2483,7 +2483,7 @@ _0802F754: .align 2, 0 _0802F758: .4byte gSprites _0802F75C: .4byte gUnknown_2023D44 -_0802F760: .4byte gUnknown_2023BC4 +_0802F760: .4byte gActiveBattler _0802F764: .4byte SpriteCallbackDummy thumb_func_end sub_802F730 @@ -2492,7 +2492,7 @@ sub_802F768: @ 802F768 push {lr} ldr r2, _0802F790 @ =gSprites ldr r1, _0802F794 @ =gUnknown_2023D44 - ldr r0, _0802F798 @ =gUnknown_2023BC4 + ldr r0, _0802F798 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2512,7 +2512,7 @@ _0802F78C: .align 2, 0 _0802F790: .4byte gSprites _0802F794: .4byte gUnknown_2023D44 -_0802F798: .4byte gUnknown_2023BC4 +_0802F798: .4byte gActiveBattler _0802F79C: .4byte SpriteCallbackDummy thumb_func_end sub_802F768 @@ -2521,7 +2521,7 @@ sub_802F7A0: @ 802F7A0 push {r4-r6,lr} ldr r6, _0802F7FC @ =gSprites ldr r5, _0802F800 @ =gUnknown_2023D44 - ldr r4, _0802F804 @ =gUnknown_2023BC4 + ldr r4, _0802F804 @ =gActiveBattler ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -2563,7 +2563,7 @@ _0802F7F4: .align 2, 0 _0802F7FC: .4byte gSprites _0802F800: .4byte gUnknown_2023D44 -_0802F804: .4byte gUnknown_2023BC4 +_0802F804: .4byte gActiveBattler _0802F808: .4byte SpriteCallbackDummy _0802F80C: .4byte gSaveBlock2Ptr thumb_func_end sub_802F7A0 @@ -2573,7 +2573,7 @@ sub_802F810: @ 802F810 push {r4,lr} ldr r4, _0802F850 @ =gUnknown_2024018 ldr r1, [r4] - ldr r3, _0802F854 @ =gUnknown_2023BC4 + ldr r3, _0802F854 @ =gActiveBattler ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -2603,7 +2603,7 @@ _0802F848: bx r0 .align 2, 0 _0802F850: .4byte gUnknown_2024018 -_0802F854: .4byte gUnknown_2023BC4 +_0802F854: .4byte gActiveBattler thumb_func_end sub_802F810 thumb_func_start sub_802F858 @@ -2618,7 +2618,7 @@ sub_802F858: @ 802F858 lsls r0, 24 cmp r0, 0 beq _0802F8B0 - ldr r0, _0802F89C @ =gUnknown_2022B4C + ldr r0, _0802F89C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -2627,7 +2627,7 @@ sub_802F858: @ 802F858 _0802F87C: ldr r2, _0802F8A0 @ =gSprites ldr r1, _0802F8A4 @ =gUnknown_3004FF0 - ldr r0, _0802F8A8 @ =gUnknown_2023BC4 + ldr r0, _0802F8A8 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2642,15 +2642,15 @@ _0802F87C: bne _0802F8E6 b _0802F8E4 .align 2, 0 -_0802F89C: .4byte gUnknown_2022B4C +_0802F89C: .4byte gBattleTypeFlags _0802F8A0: .4byte gSprites _0802F8A4: .4byte gUnknown_3004FF0 -_0802F8A8: .4byte gUnknown_2023BC4 +_0802F8A8: .4byte gActiveBattler _0802F8AC: .4byte SpriteCallbackDummy _0802F8B0: ldr r2, _0802F9B0 @ =gSprites ldr r5, _0802F9B4 @ =gUnknown_3004FF0 - ldr r0, _0802F9B8 @ =gUnknown_2023BC4 + ldr r0, _0802F9B8 @ =gActiveBattler ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -2690,7 +2690,7 @@ _0802F8F8: ldr r0, _0802F9C0 @ =gUnknown_2024018 mov r12, r0 ldr r0, [r0] - ldr r7, _0802F9B8 @ =gUnknown_2023BC4 + ldr r7, _0802F9B8 @ =gActiveBattler ldrb r2, [r7] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -2769,7 +2769,7 @@ _0802F934: bl FreeSpriteTilesByTag adds r0, r4, 0 bl FreeSpritePaletteByTag - ldr r0, _0802F9C8 @ =gUnknown_2022B4C + ldr r0, _0802F9C8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -2781,11 +2781,11 @@ _0802F934: .align 2, 0 _0802F9B0: .4byte gSprites _0802F9B4: .4byte gUnknown_3004FF0 -_0802F9B8: .4byte gUnknown_2023BC4 +_0802F9B8: .4byte gActiveBattler _0802F9BC: .4byte SpriteCallbackDummy _0802F9C0: .4byte gUnknown_2024018 _0802F9C4: .4byte 0x000027f9 -_0802F9C8: .4byte gUnknown_2022B4C +_0802F9C8: .4byte gBattleTypeFlags _0802F9CC: .4byte gMPlay_BGM _0802F9D0: ldr r0, _0802FA38 @ =gMPlay_BGM @@ -2794,15 +2794,15 @@ _0802F9D0: lsls r2, 1 bl m4aMPlayVolumeControl _0802F9DC: - ldr r7, _0802FA40 @ =gUnknown_2023BCE - ldr r4, _0802FA44 @ =gUnknown_2023BC4 + ldr r7, _0802FA40 @ =gBattlerPartyIndexes + ldr r4, _0802FA44 @ =gActiveBattler ldrb r1, [r4] lsls r0, r1, 1 adds r0, r7 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _0802FA48 @ =gUnknown_2024284 + ldr r5, _0802FA48 @ =gPlayerParty adds r0, r5 bl HandleLowHpMusicChange bl sub_8075290 @@ -2842,9 +2842,9 @@ _0802FA32: .align 2, 0 _0802FA38: .4byte gMPlay_BGM _0802FA3C: .4byte 0x0000ffff -_0802FA40: .4byte gUnknown_2023BCE -_0802FA44: .4byte gUnknown_2023BC4 -_0802FA48: .4byte gUnknown_2024284 +_0802FA40: .4byte gBattlerPartyIndexes +_0802FA44: .4byte gActiveBattler +_0802FA48: .4byte gPlayerParty _0802FA4C: .4byte gUnknown_2024018 _0802FA50: .4byte gUnknown_3004FE0 _0802FA54: .4byte sub_802F810 @@ -2859,7 +2859,7 @@ sub_802FA58: @ 802FA58 ldr r0, _0802FBCC @ =gUnknown_2024018 mov r9, r0 ldr r0, [r0] - ldr r1, _0802FBD0 @ =gUnknown_2023BC4 + ldr r1, _0802FBD0 @ =gActiveBattler mov r8, r1 ldrb r2, [r1] ldr r3, [r0, 0x4] @@ -2894,12 +2894,12 @@ _0802FA9E: ands r0, r4 cmp r0, 0 bne _0802FABC - ldr r0, _0802FBD4 @ =gUnknown_2023BCE + ldr r0, _0802FBD4 @ =gBattlerPartyIndexes adds r0, r5, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0802FBD8 @ =gUnknown_2024284 + ldr r0, _0802FBD8 @ =gPlayerParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -2920,12 +2920,12 @@ _0802FABC: ands r0, r1 cmp r0, 0 bne _0802FAF0 - ldr r0, _0802FBD4 @ =gUnknown_2023BCE + ldr r0, _0802FBD4 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0802FBD8 @ =gUnknown_2024284 + ldr r0, _0802FBD8 @ =gPlayerParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -2934,7 +2934,7 @@ _0802FAF0: lsls r0, 24 cmp r0, 0 beq _0802FB5C - ldr r0, _0802FBDC @ =gUnknown_2022B4C + ldr r0, _0802FBDC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -2959,13 +2959,13 @@ _0802FAF0: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0802FBD4 @ =gUnknown_2023BCE + ldr r2, _0802FBD4 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0802FBD8 @ =gUnknown_2024284 + ldr r2, _0802FBD8 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -2981,7 +2981,7 @@ _0802FAF0: bl SetHealthboxSpriteVisible _0802FB5C: ldr r1, _0802FBE0 @ =gUnknown_3004FFC - ldr r4, _0802FBD0 @ =gUnknown_2023BC4 + ldr r4, _0802FBD0 @ =gActiveBattler ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -2995,13 +2995,13 @@ _0802FB5C: ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _0802FBD4 @ =gUnknown_2023BCE + ldr r2, _0802FBD4 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0802FBD8 @ =gUnknown_2024284 + ldr r2, _0802FBD8 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -3034,10 +3034,10 @@ _0802FBBE: bx r0 .align 2, 0 _0802FBCC: .4byte gUnknown_2024018 -_0802FBD0: .4byte gUnknown_2023BC4 -_0802FBD4: .4byte gUnknown_2023BCE -_0802FBD8: .4byte gUnknown_2024284 -_0802FBDC: .4byte gUnknown_2022B4C +_0802FBD0: .4byte gActiveBattler +_0802FBD4: .4byte gBattlerPartyIndexes +_0802FBD8: .4byte gPlayerParty +_0802FBDC: .4byte gBattleTypeFlags _0802FBE0: .4byte gUnknown_3004FFC _0802FBE4: .4byte gSprites _0802FBE8: .4byte gUnknown_3004FF0 @@ -3050,7 +3050,7 @@ sub_802FBF4: @ 802FBF4 push {r4-r6,lr} ldr r2, _0802FC8C @ =gSprites ldr r0, _0802FC90 @ =gUnknown_3004FF0 - ldr r6, _0802FC94 @ =gUnknown_2023BC4 + ldr r6, _0802FC94 @ =gActiveBattler ldrb r3, [r6] adds r0, r3, r0 ldrb r1, [r0] @@ -3124,7 +3124,7 @@ _0802FC84: .align 2, 0 _0802FC8C: .4byte gSprites _0802FC90: .4byte gUnknown_3004FF0 -_0802FC94: .4byte gUnknown_2023BC4 +_0802FC94: .4byte gActiveBattler _0802FC98: .4byte SpriteCallbackDummy _0802FC9C: .4byte gUnknown_2024018 _0802FCA0: .4byte 0x000027f9 @@ -3137,7 +3137,7 @@ sub_802FCAC: @ 802FCAC push {r4,lr} ldr r0, _0802FD00 @ =gUnknown_2024018 ldr r0, [r0] - ldr r4, _0802FD04 @ =gUnknown_2023BC4 + ldr r4, _0802FD04 @ =gActiveBattler ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -3158,14 +3158,14 @@ sub_802FCAC: @ 802FCAC movs r2, 0x80 lsls r2, 1 bl m4aMPlayVolumeControl - ldr r2, _0802FD10 @ =gUnknown_2023BCE + ldr r2, _0802FD10 @ =gBattlerPartyIndexes ldrb r1, [r4] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0802FD14 @ =gUnknown_2024284 + ldr r2, _0802FD14 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange bl PlayerBufferExecCompleted @@ -3175,11 +3175,11 @@ _0802FCFA: bx r0 .align 2, 0 _0802FD00: .4byte gUnknown_2024018 -_0802FD04: .4byte gUnknown_2023BC4 +_0802FD04: .4byte gActiveBattler _0802FD08: .4byte gMPlay_BGM _0802FD0C: .4byte 0x0000ffff -_0802FD10: .4byte gUnknown_2023BCE -_0802FD14: .4byte gUnknown_2024284 +_0802FD10: .4byte gBattlerPartyIndexes +_0802FD14: .4byte gPlayerParty thumb_func_end sub_802FCAC thumb_func_start sub_802FD18 @@ -3187,7 +3187,7 @@ sub_802FD18: @ 802FD18 push {r4-r6,lr} ldr r6, _0802FDCC @ =gUnknown_2024018 ldr r0, [r6] - ldr r5, _0802FDD0 @ =gUnknown_2023BC4 + ldr r5, _0802FDD0 @ =gActiveBattler ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -3199,12 +3199,12 @@ sub_802FD18: @ 802FD18 ands r0, r1 cmp r0, 0 bne _0802FD4A - ldr r0, _0802FDD4 @ =gUnknown_2023BCE + ldr r0, _0802FDD4 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0802FDD8 @ =gUnknown_2024284 + ldr r0, _0802FDD8 @ =gPlayerParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -3241,13 +3241,13 @@ _0802FD4A: ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0802FDD4 @ =gUnknown_2023BCE + ldr r2, _0802FDD4 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0802FDD8 @ =gUnknown_2024284 + ldr r2, _0802FDD8 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -3271,9 +3271,9 @@ _0802FDC4: bx r0 .align 2, 0 _0802FDCC: .4byte gUnknown_2024018 -_0802FDD0: .4byte gUnknown_2023BC4 -_0802FDD4: .4byte gUnknown_2023BCE -_0802FDD8: .4byte gUnknown_2024284 +_0802FDD0: .4byte gActiveBattler +_0802FDD4: .4byte gBattlerPartyIndexes +_0802FDD8: .4byte gPlayerParty _0802FDDC: .4byte gSprites _0802FDE0: .4byte gUnknown_3004FFC _0802FDE4: .4byte SpriteCallbackDummy @@ -3310,7 +3310,7 @@ _0802FE20: .4byte 0x0000ffff thumb_func_start CompleteOnHealthbarDone CompleteOnHealthbarDone: @ 802FE24 push {r4-r6,lr} - ldr r5, _0802FE64 @ =gUnknown_2023BC4 + ldr r5, _0802FE64 @ =gActiveBattler ldrb r0, [r5] ldr r6, _0802FE68 @ =gUnknown_3004FF0 adds r1, r0, r6 @@ -3338,17 +3338,17 @@ CompleteOnHealthbarDone: @ 802FE24 bl sub_8048440 b _0802FE86 .align 2, 0 -_0802FE64: .4byte gUnknown_2023BC4 +_0802FE64: .4byte gActiveBattler _0802FE68: .4byte gUnknown_3004FF0 _0802FE6C: - ldr r2, _0802FE8C @ =gUnknown_2023BCE + ldr r2, _0802FE8C @ =gBattlerPartyIndexes ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0802FE90 @ =gUnknown_2024284 + ldr r2, _0802FE90 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange bl PlayerBufferExecCompleted @@ -3357,8 +3357,8 @@ _0802FE86: pop {r0} bx r0 .align 2, 0 -_0802FE8C: .4byte gUnknown_2023BCE -_0802FE90: .4byte gUnknown_2024284 +_0802FE8C: .4byte gBattlerPartyIndexes +_0802FE90: .4byte gPlayerParty thumb_func_end CompleteOnHealthbarDone thumb_func_start sub_802FE94 @@ -3404,7 +3404,7 @@ sub_802FEAC: @ 802FEAC lsrs r0, 24 cmp r0, 0x1 beq _0802FEF2 - ldr r1, _0802FFB0 @ =gUnknown_2023BCE + ldr r1, _0802FFB0 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -3415,7 +3415,7 @@ _0802FEF2: movs r0, 0x64 mov r1, r10 muls r1, r0 - ldr r0, _0802FFB4 @ =gUnknown_2024284 + ldr r0, _0802FFB4 @ =gPlayerParty adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB @@ -3436,7 +3436,7 @@ _0802FEF2: ldr r3, _0802FFB8 @ =gUnknown_8253AE4 adds r4, 0x1 lsls r4, 2 - ldr r2, _0802FFBC @ =gUnknown_8254784 + ldr r2, _0802FFBC @ =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -3467,7 +3467,7 @@ _0802FEF2: subs r2, r0 ldr r0, [sp, 0xC] subs r2, r0, r2 - ldr r4, _0802FFC0 @ =gUnknown_2023BC4 + ldr r4, _0802FFC0 @ =gActiveBattler ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -3481,7 +3481,7 @@ _0802FEF2: lsrs r0, 24 cmp r0, 0x1 bne _0802FFC8 - ldr r2, _0802FFB0 @ =gUnknown_2023BCE + ldr r2, _0802FFB0 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r2 mov r1, r10 @@ -3500,11 +3500,11 @@ _0802FFA6: b _0803000A .align 2, 0 _0802FFAC: .4byte gUnknown_3005090 -_0802FFB0: .4byte gUnknown_2023BCE -_0802FFB4: .4byte gUnknown_2024284 +_0802FFB0: .4byte gBattlerPartyIndexes +_0802FFB4: .4byte gPlayerParty _0802FFB8: .4byte gUnknown_8253AE4 -_0802FFBC: .4byte gUnknown_8254784 -_0802FFC0: .4byte gUnknown_2023BC4 +_0802FFBC: .4byte gBaseStats +_0802FFC0: .4byte gActiveBattler _0802FFC4: .4byte sub_8030238 _0802FFC8: ldr r0, _0802FFD8 @ =gUnknown_3005090 @@ -3584,7 +3584,7 @@ sub_8030024: @ 8030024 movs r0, 0x64 adds r6, r1, 0 muls r6, r0 - ldr r0, _080300E0 @ =gUnknown_2024284 + ldr r0, _080300E0 @ =gPlayerParty adds r6, r0 adds r0, r6, 0 movs r1, 0x38 @@ -3604,7 +3604,7 @@ sub_8030024: @ 8030024 adds r3, r0, 0 ldr r6, _080300E4 @ =gUnknown_8253AE4 lsls r1, r4, 2 - ldr r2, _080300E8 @ =gUnknown_8254784 + ldr r2, _080300E8 @ =gBaseStats lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -3646,9 +3646,9 @@ sub_8030024: @ 8030024 bx r0 .align 2, 0 _080300DC: .4byte gUnknown_3005090 -_080300E0: .4byte gUnknown_2024284 +_080300E0: .4byte gPlayerParty _080300E4: .4byte gUnknown_8253AE4 -_080300E8: .4byte gUnknown_8254784 +_080300E8: .4byte gBaseStats _080300EC: .4byte gUnknown_3004FF0 _080300F0: .4byte sub_80300F4 thumb_func_end sub_8030024 @@ -3708,7 +3708,7 @@ _08030124: movs r0, 0x64 mov r1, r9 muls r1, r0 - ldr r0, _080301F0 @ =gUnknown_2024284 + ldr r0, _080301F0 @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x38 @@ -3728,7 +3728,7 @@ _08030124: ldr r3, _080301F4 @ =gUnknown_8253AE4 adds r4, 0x1 lsls r4, 2 - ldr r2, _080301F8 @ =gUnknown_8254784 + ldr r2, _080301F8 @ =gBaseStats lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -3759,7 +3759,7 @@ _08030124: ldrh r0, [r0] subs r2, r0 subs r2, r4, r2 - ldr r4, _080301FC @ =gUnknown_2023BC4 + ldr r4, _080301FC @ =gActiveBattler ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -3773,10 +3773,10 @@ _08030124: b _08030220 .align 2, 0 _080301EC: .4byte gUnknown_3004FF0 -_080301F0: .4byte gUnknown_2024284 +_080301F0: .4byte gPlayerParty _080301F4: .4byte gUnknown_8253AE4 -_080301F8: .4byte gUnknown_8254784 -_080301FC: .4byte gUnknown_2023BC4 +_080301F8: .4byte gBaseStats +_080301FC: .4byte gActiveBattler _08030200: .4byte sub_8030238 _08030204: str r0, [sp, 0x4] @@ -3822,7 +3822,7 @@ sub_8030238: @ 8030238 lsrs r0, 24 cmp r0, 0x1 bne _0803026C - ldr r1, _08030290 @ =gUnknown_2023BCE + ldr r1, _08030290 @ =gBattlerPartyIndexes movs r0, 0x2 adds r2, r4, 0 eors r2, r0 @@ -3850,7 +3850,7 @@ _0803026C: bx r0 .align 2, 0 _0803028C: .4byte gUnknown_3005090 -_08030290: .4byte gUnknown_2023BCE +_08030290: .4byte gBattlerPartyIndexes _08030294: .4byte sub_8030298 thumb_func_end sub_8030238 @@ -3881,7 +3881,7 @@ sub_8030298: @ 8030298 movs r0, 0x64 adds r1, r4, 0 muls r1, r0 - ldr r0, _0803030C @ =gUnknown_2024284 + ldr r0, _0803030C @ =gPlayerParty adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x38 @@ -3891,7 +3891,7 @@ sub_8030298: @ 8030298 lsrs r0, 24 cmp r0, 0x1 bne _08030318 - ldr r1, _08030310 @ =gUnknown_2023BCE + ldr r1, _08030310 @ =gBattlerPartyIndexes movs r0, 0x2 adds r2, r5, 0 eors r2, r0 @@ -3910,8 +3910,8 @@ sub_8030298: @ 8030298 .align 2, 0 _08030304: .4byte gUnknown_3005090 _08030308: .4byte gUnknown_2024018 -_0803030C: .4byte gUnknown_2024284 -_08030310: .4byte gUnknown_2023BCE +_0803030C: .4byte gPlayerParty +_08030310: .4byte gBattlerPartyIndexes _08030314: .4byte gUnknown_3004FF0 _08030318: ldr r0, _08030340 @ =gUnknown_3004FF0 @@ -3919,7 +3919,7 @@ _08030318: ldrb r0, [r0] movs r1, 0x64 muls r1, r4 - ldr r2, _08030344 @ =gUnknown_2024284 + ldr r2, _08030344 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -3937,7 +3937,7 @@ _0803033A: bx r0 .align 2, 0 _08030340: .4byte gUnknown_3004FF0 -_08030344: .4byte gUnknown_2024284 +_08030344: .4byte gPlayerParty _08030348: .4byte gUnknown_3005090 _0803034C: .4byte sub_8030350 thumb_func_end sub_8030298 @@ -4180,7 +4180,7 @@ sub_8030538: @ 8030538 push {r4-r6,lr} ldr r6, _08030590 @ =gSprites ldr r5, _08030594 @ =gUnknown_2023D44 - ldr r4, _08030598 @ =gUnknown_2023BC4 + ldr r4, _08030598 @ =gActiveBattler ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -4220,7 +4220,7 @@ _08030588: .align 2, 0 _08030590: .4byte gSprites _08030594: .4byte gUnknown_2023D44 -_08030598: .4byte gUnknown_2023BC4 +_08030598: .4byte gActiveBattler _0803059C: .4byte gUnknown_3004FF0 thumb_func_end sub_8030538 @@ -4229,7 +4229,7 @@ sub_80305A0: @ 80305A0 push {r4-r6,lr} ldr r0, _080305FC @ =gUnknown_2024018 ldr r0, [r0] - ldr r6, _08030600 @ =gUnknown_2023BC4 + ldr r6, _08030600 @ =gActiveBattler ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -4270,7 +4270,7 @@ _080305F4: bx r0 .align 2, 0 _080305FC: .4byte gUnknown_2024018 -_08030600: .4byte gUnknown_2023BC4 +_08030600: .4byte gActiveBattler _08030604: .4byte gUnknown_2023D44 _08030608: .4byte gSprites _0803060C: .4byte gUnknown_3004FF0 @@ -4300,7 +4300,7 @@ sub_8030628: @ 8030628 cmp r0, 0 bne _08030666 ldr r1, _08030670 @ =gUnknown_3004FE0 - ldr r2, _08030674 @ =gUnknown_2023BC4 + ldr r2, _08030674 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -4327,7 +4327,7 @@ _08030666: .align 2, 0 _0803066C: .4byte gUnknown_2037AB8 _08030670: .4byte gUnknown_3004FE0 -_08030674: .4byte gUnknown_2023BC4 +_08030674: .4byte gActiveBattler _08030678: .4byte sub_8030684 _0803067C: .4byte gUnknown_3005090 _08030680: .4byte gUnknown_3004FFC @@ -4371,7 +4371,7 @@ _080306CC: bl EmitChosenMonReturnValue _080306D6: ldr r1, _080306F8 @ =gUnknown_2022BC4 - ldr r0, _080306FC @ =gUnknown_2023BC4 + ldr r0, _080306FC @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4389,7 +4389,7 @@ _080306F4: bx r0 .align 2, 0 _080306F8: .4byte gUnknown_2022BC4 -_080306FC: .4byte gUnknown_2023BC4 +_080306FC: .4byte gActiveBattler thumb_func_end sub_8030684 thumb_func_start sub_8030700 @@ -4402,7 +4402,7 @@ sub_8030700: @ 8030700 cmp r0, 0 bne _08030728 ldr r1, _08030730 @ =gUnknown_3004FE0 - ldr r0, _08030734 @ =gUnknown_2023BC4 + ldr r0, _08030734 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4417,7 +4417,7 @@ _08030728: .align 2, 0 _0803072C: .4byte gUnknown_2037AB8 _08030730: .4byte gUnknown_3004FE0 -_08030734: .4byte gUnknown_2023BC4 +_08030734: .4byte gActiveBattler _08030738: .4byte CompleteWhenChoseItem thumb_func_end sub_8030700 @@ -4459,7 +4459,7 @@ CompleteOnSpecialAnimDone: @ 8030778 beq _0803079E ldr r0, _080307AC @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080307B0 @ =gUnknown_2023BC4 + ldr r0, _080307B0 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -4479,14 +4479,14 @@ _080307A2: .align 2, 0 _080307A8: .4byte gUnknown_2024005 _080307AC: .4byte gUnknown_2024018 -_080307B0: .4byte gUnknown_2023BC4 +_080307B0: .4byte gActiveBattler thumb_func_end CompleteOnSpecialAnimDone thumb_func_start DoHitAnimBlinkSpriteEffect DoHitAnimBlinkSpriteEffect: @ 80307B4 push {r4,lr} ldr r1, _080307F0 @ =gUnknown_2023D44 - ldr r0, _080307F4 @ =gUnknown_2023BC4 + ldr r0, _080307F4 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -4514,7 +4514,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4 b _0803082A .align 2, 0 _080307F0: .4byte gUnknown_2023D44 -_080307F4: .4byte gUnknown_2023BC4 +_080307F4: .4byte gActiveBattler _080307F8: .4byte gSprites _080307FC: .4byte gUnknown_2024005 _08030800: @@ -4549,7 +4549,7 @@ _0803082A: thumb_func_start sub_8030830 sub_8030830: @ 8030830 push {r4-r7,lr} - ldr r0, _08030890 @ =gUnknown_2023BC4 + ldr r0, _08030890 @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 ldr r3, _08030894 @ =gUnknown_2022BC8 @@ -4594,7 +4594,7 @@ _08030880: pop {r0} bx r0 .align 2, 0 -_08030890: .4byte gUnknown_2023BC4 +_08030890: .4byte gActiveBattler _08030894: .4byte gUnknown_2022BC8 _08030898: .4byte gUnknown_3004FF8 _0803089C: .4byte gUnknown_202298C @@ -4624,7 +4624,7 @@ _080308C8: .4byte gUnknown_83FE766 MoveSelectionDisplayPpNumber: @ 80308CC push {r4-r7,lr} ldr r5, _08030930 @ =gUnknown_2022BC4 - ldr r7, _08030934 @ =gUnknown_2023BC4 + ldr r7, _08030934 @ =gActiveBattler ldrb r0, [r7] lsls r0, 9 adds r1, r5, 0x2 @@ -4670,7 +4670,7 @@ _08030928: bx r0 .align 2, 0 _08030930: .4byte gUnknown_2022BC4 -_08030934: .4byte gUnknown_2023BC4 +_08030934: .4byte gActiveBattler _08030938: .4byte gUnknown_202298C _0803093C: .4byte gUnknown_2023FFC thumb_func_end MoveSelectionDisplayPpNumber @@ -4678,7 +4678,7 @@ _0803093C: .4byte gUnknown_2023FFC thumb_func_start MoveSelectionDisplayMoveType MoveSelectionDisplayMoveType: @ 8030940 push {r4-r6,lr} - ldr r5, _080309AC @ =gUnknown_2023BC4 + ldr r5, _080309AC @ =gActiveBattler ldrb r4, [r5] lsls r4, 9 ldr r0, _080309B0 @ =gUnknown_2022BC8 @@ -4701,7 +4701,7 @@ MoveSelectionDisplayMoveType: @ 8030940 adds r0, r3, 0 bl StringCopy adds r3, r0, 0 - ldr r2, _080309C0 @ =gUnknown_8250C04 + ldr r2, _080309C0 @ =gBattleMoves ldr r1, _080309C4 @ =gUnknown_2023FFC ldrb r0, [r5] adds r0, r1 @@ -4727,12 +4727,12 @@ MoveSelectionDisplayMoveType: @ 8030940 pop {r0} bx r0 .align 2, 0 -_080309AC: .4byte gUnknown_2023BC4 +_080309AC: .4byte gActiveBattler _080309B0: .4byte gUnknown_2022BC8 _080309B4: .4byte gUnknown_202298C _080309B8: .4byte gUnknown_83FE76A _080309BC: .4byte gUnknown_83FE770 -_080309C0: .4byte gUnknown_8250C04 +_080309C0: .4byte gBattleMoves _080309C4: .4byte gUnknown_2023FFC _080309C8: .4byte gUnknown_824F1A0 thumb_func_end MoveSelectionDisplayMoveType @@ -4908,7 +4908,7 @@ CompleteOnFinishedStatusAnimation: @ 8030AFC push {lr} ldr r0, _08030B24 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _08030B28 @ =gUnknown_2023BC4 + ldr r0, _08030B28 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -4926,7 +4926,7 @@ _08030B1E: bx r0 .align 2, 0 _08030B24: .4byte gUnknown_2024018 -_08030B28: .4byte gUnknown_2023BC4 +_08030B28: .4byte gActiveBattler thumb_func_end CompleteOnFinishedStatusAnimation thumb_func_start CompleteOnFinishedBattleAnimation @@ -4934,7 +4934,7 @@ CompleteOnFinishedBattleAnimation: @ 8030B2C push {lr} ldr r0, _08030B54 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _08030B58 @ =gUnknown_2023BC4 + ldr r0, _08030B58 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -4952,13 +4952,13 @@ _08030B4E: bx r0 .align 2, 0 _08030B54: .4byte gUnknown_2024018 -_08030B58: .4byte gUnknown_2023BC4 +_08030B58: .4byte gActiveBattler thumb_func_end CompleteOnFinishedBattleAnimation thumb_func_start PrintLinkStandbyMsg PrintLinkStandbyMsg: @ 8030B5C push {lr} - ldr r0, _08030B80 @ =gUnknown_2022B4C + ldr r0, _08030B80 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -4976,7 +4976,7 @@ _08030B7C: pop {r0} bx r0 .align 2, 0 -_08030B80: .4byte gUnknown_2022B4C +_08030B80: .4byte gBattleTypeFlags _08030B84: .4byte gUnknown_2022974 _08030B88: .4byte gUnknown_2022976 _08030B8C: .4byte gUnknown_83FE714 @@ -4988,7 +4988,7 @@ PlayerHandleGetMonData: @ 8030B90 sub sp, 0x100 movs r6, 0 ldr r1, _08030BBC @ =gUnknown_2022BC4 - ldr r0, _08030BC0 @ =gUnknown_2023BC4 + ldr r0, _08030BC0 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -4996,7 +4996,7 @@ PlayerHandleGetMonData: @ 8030B90 ldrb r0, [r1] cmp r0, 0 bne _08030BC8 - ldr r0, _08030BC4 @ =gUnknown_2023BCE + ldr r0, _08030BC4 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -5006,8 +5006,8 @@ PlayerHandleGetMonData: @ 8030B90 b _08030BEA .align 2, 0 _08030BBC: .4byte gUnknown_2022BC4 -_08030BC0: .4byte gUnknown_2023BC4 -_08030BC4: .4byte gUnknown_2023BCE +_08030BC0: .4byte gActiveBattler +_08030BC4: .4byte gBattlerPartyIndexes _08030BC8: ldrb r4, [r1] movs r5, 0 @@ -5053,7 +5053,7 @@ CopyPlayerMonData: @ 8030C04 lsrs r5, r0, 24 movs r6, 0 ldr r2, _08030C38 @ =gUnknown_2022BC4 - ldr r3, _08030C3C @ =gUnknown_2023BC4 + ldr r3, _08030C3C @ =gActiveBattler ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -5070,7 +5070,7 @@ _08030C2E: mov pc, r0 .align 2, 0 _08030C38: .4byte gUnknown_2022BC4 -_08030C3C: .4byte gUnknown_2023BC4 +_08030C3C: .4byte gActiveBattler _08030C40: .4byte _08030C44 .align 2, 0 _08030C44: @@ -5138,7 +5138,7 @@ _08030D34: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08030F48 @ =gUnknown_2024284 + ldr r0, _08030F48 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -5191,7 +5191,7 @@ _08030D80: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08030F48 @ =gUnknown_2024284 + ldr r0, _08030F48 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -5375,28 +5375,28 @@ _08030F38: bls _08030F38 b _0803139A .align 2, 0 -_08030F48: .4byte gUnknown_2024284 +_08030F48: .4byte gPlayerParty _08030F4C: .4byte 0xfffffc1f _08030F50: .4byte 0xfff07fff _08030F54: .4byte 0xfffffe0f _08030F58: movs r0, 0x64 muls r0, r5 - ldr r1, _08030F64 @ =gUnknown_2024284 + ldr r1, _08030F64 @ =gPlayerParty adds r0, r1 movs r1, 0xB b _080312D2 .align 2, 0 -_08030F64: .4byte gUnknown_2024284 +_08030F64: .4byte gPlayerParty _08030F68: movs r0, 0x64 muls r0, r5 - ldr r1, _08030F74 @ =gUnknown_2024284 + ldr r1, _08030F74 @ =gPlayerParty adds r0, r1 movs r1, 0xC b _080312D2 .align 2, 0 -_08030F74: .4byte gUnknown_2024284 +_08030F74: .4byte gPlayerParty _08030F78: movs r6, 0 add r2, sp, 0x58 @@ -5406,7 +5406,7 @@ _08030F78: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08030FDC @ =gUnknown_2024284 + ldr r0, _08030FDC @ =gPlayerParty adds r4, r1, r0 mov r8, r9 _08030F8E: @@ -5430,7 +5430,7 @@ _08030F8E: ble _08030F8E movs r0, 0x64 muls r0, r5 - ldr r1, _08030FDC @ =gUnknown_2024284 + ldr r1, _08030FDC @ =gPlayerParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -5448,11 +5448,11 @@ _08030FCC: bls _08030FCC b _0803139A .align 2, 0 -_08030FDC: .4byte gUnknown_2024284 +_08030FDC: .4byte gPlayerParty _08030FE0: movs r0, 0x64 muls r0, r5 - ldr r1, _08030FF8 @ =gUnknown_2024284 + ldr r1, _08030FF8 @ =gPlayerParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -5462,13 +5462,13 @@ _08030FE0: adds r1, 0x9 b _080312D2 .align 2, 0 -_08030FF8: .4byte gUnknown_2024284 +_08030FF8: .4byte gPlayerParty _08030FFC: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _08031034 @ =gUnknown_2024284 + ldr r2, _08031034 @ =gPlayerParty mov r8, r2 _08031008: adds r1, r6, 0 @@ -5483,7 +5483,7 @@ _08031008: ble _08031008 movs r0, 0x64 muls r0, r5 - ldr r1, _08031034 @ =gUnknown_2024284 + ldr r1, _08031034 @ =gPlayerParty adds r0, r1 movs r1, 0x15 bl GetMonData @@ -5492,11 +5492,11 @@ _08031008: adds r6, 0x1 b _0803139A .align 2, 0 -_08031034: .4byte gUnknown_2024284 +_08031034: .4byte gPlayerParty _08031038: movs r0, 0x64 muls r0, r5 - ldr r1, _08031050 @ =gUnknown_2024284 + ldr r1, _08031050 @ =gPlayerParty adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -5506,20 +5506,20 @@ _08031038: adds r1, 0x8 b _08031392 .align 2, 0 -_08031050: .4byte gUnknown_2024284 +_08031050: .4byte gPlayerParty _08031054: movs r0, 0x64 muls r0, r5 - ldr r1, _08031060 @ =gUnknown_2024284 + ldr r1, _08031060 @ =gPlayerParty adds r0, r1 movs r1, 0x1 b _0803106E .align 2, 0 -_08031060: .4byte gUnknown_2024284 +_08031060: .4byte gPlayerParty _08031064: movs r0, 0x64 muls r0, r5 - ldr r1, _08031090 @ =gUnknown_2024284 + ldr r1, _08031090 @ =gPlayerParty adds r0, r1 movs r1, 0x19 _0803106E: @@ -5539,120 +5539,120 @@ _0803106E: movs r6, 0x3 b _0803139A .align 2, 0 -_08031090: .4byte gUnknown_2024284 +_08031090: .4byte gPlayerParty _08031094: movs r0, 0x64 muls r0, r5 - ldr r1, _080310A0 @ =gUnknown_2024284 + ldr r1, _080310A0 @ =gPlayerParty adds r0, r1 movs r1, 0x1A b _08031392 .align 2, 0 -_080310A0: .4byte gUnknown_2024284 +_080310A0: .4byte gPlayerParty _080310A4: movs r0, 0x64 muls r0, r5 - ldr r1, _080310B0 @ =gUnknown_2024284 + ldr r1, _080310B0 @ =gPlayerParty adds r0, r1 movs r1, 0x1B b _08031392 .align 2, 0 -_080310B0: .4byte gUnknown_2024284 +_080310B0: .4byte gPlayerParty _080310B4: movs r0, 0x64 muls r0, r5 - ldr r1, _080310C0 @ =gUnknown_2024284 + ldr r1, _080310C0 @ =gPlayerParty adds r0, r1 movs r1, 0x1C b _08031392 .align 2, 0 -_080310C0: .4byte gUnknown_2024284 +_080310C0: .4byte gPlayerParty _080310C4: movs r0, 0x64 muls r0, r5 - ldr r1, _080310D0 @ =gUnknown_2024284 + ldr r1, _080310D0 @ =gPlayerParty adds r0, r1 movs r1, 0x1D b _08031392 .align 2, 0 -_080310D0: .4byte gUnknown_2024284 +_080310D0: .4byte gPlayerParty _080310D4: movs r0, 0x64 muls r0, r5 - ldr r1, _080310E0 @ =gUnknown_2024284 + ldr r1, _080310E0 @ =gPlayerParty adds r0, r1 movs r1, 0x1E b _08031392 .align 2, 0 -_080310E0: .4byte gUnknown_2024284 +_080310E0: .4byte gPlayerParty _080310E4: movs r0, 0x64 muls r0, r5 - ldr r1, _080310F0 @ =gUnknown_2024284 + ldr r1, _080310F0 @ =gPlayerParty adds r0, r1 movs r1, 0x1F b _08031392 .align 2, 0 -_080310F0: .4byte gUnknown_2024284 +_080310F0: .4byte gPlayerParty _080310F4: movs r0, 0x64 muls r0, r5 - ldr r1, _08031100 @ =gUnknown_2024284 + ldr r1, _08031100 @ =gPlayerParty adds r0, r1 movs r1, 0x20 b _08031392 .align 2, 0 -_08031100: .4byte gUnknown_2024284 +_08031100: .4byte gPlayerParty _08031104: movs r0, 0x64 muls r0, r5 - ldr r1, _08031110 @ =gUnknown_2024284 + ldr r1, _08031110 @ =gPlayerParty adds r0, r1 movs r1, 0x22 b _08031392 .align 2, 0 -_08031110: .4byte gUnknown_2024284 +_08031110: .4byte gPlayerParty _08031114: movs r0, 0x64 muls r0, r5 - ldr r1, _08031120 @ =gUnknown_2024284 + ldr r1, _08031120 @ =gPlayerParty adds r0, r1 movs r1, 0x23 b _08031392 .align 2, 0 -_08031120: .4byte gUnknown_2024284 +_08031120: .4byte gPlayerParty _08031124: movs r0, 0x64 muls r0, r5 - ldr r1, _08031130 @ =gUnknown_2024284 + ldr r1, _08031130 @ =gPlayerParty adds r0, r1 movs r1, 0x24 b _08031392 .align 2, 0 -_08031130: .4byte gUnknown_2024284 +_08031130: .4byte gPlayerParty _08031134: movs r0, 0x64 muls r0, r5 - ldr r1, _08031140 @ =gUnknown_2024284 + ldr r1, _08031140 @ =gPlayerParty adds r0, r1 movs r1, 0x25 b _08031392 .align 2, 0 -_08031140: .4byte gUnknown_2024284 +_08031140: .4byte gPlayerParty _08031144: movs r0, 0x64 muls r0, r5 - ldr r1, _08031150 @ =gUnknown_2024284 + ldr r1, _08031150 @ =gPlayerParty adds r0, r1 movs r1, 0x26 b _08031392 .align 2, 0 -_08031150: .4byte gUnknown_2024284 +_08031150: .4byte gPlayerParty _08031154: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080311A0 @ =gUnknown_2024284 + ldr r0, _080311A0 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -5681,83 +5681,83 @@ _08031154: movs r6, 0x6 b _0803139A .align 2, 0 -_080311A0: .4byte gUnknown_2024284 +_080311A0: .4byte gPlayerParty _080311A4: movs r0, 0x64 muls r0, r5 - ldr r1, _080311B0 @ =gUnknown_2024284 + ldr r1, _080311B0 @ =gPlayerParty adds r0, r1 movs r1, 0x27 b _08031392 .align 2, 0 -_080311B0: .4byte gUnknown_2024284 +_080311B0: .4byte gPlayerParty _080311B4: movs r0, 0x64 muls r0, r5 - ldr r1, _080311C0 @ =gUnknown_2024284 + ldr r1, _080311C0 @ =gPlayerParty adds r0, r1 movs r1, 0x28 b _08031392 .align 2, 0 -_080311C0: .4byte gUnknown_2024284 +_080311C0: .4byte gPlayerParty _080311C4: movs r0, 0x64 muls r0, r5 - ldr r1, _080311D0 @ =gUnknown_2024284 + ldr r1, _080311D0 @ =gPlayerParty adds r0, r1 movs r1, 0x29 b _08031392 .align 2, 0 -_080311D0: .4byte gUnknown_2024284 +_080311D0: .4byte gPlayerParty _080311D4: movs r0, 0x64 muls r0, r5 - ldr r1, _080311E0 @ =gUnknown_2024284 + ldr r1, _080311E0 @ =gPlayerParty adds r0, r1 movs r1, 0x2A b _08031392 .align 2, 0 -_080311E0: .4byte gUnknown_2024284 +_080311E0: .4byte gPlayerParty _080311E4: movs r0, 0x64 muls r0, r5 - ldr r1, _080311F0 @ =gUnknown_2024284 + ldr r1, _080311F0 @ =gPlayerParty adds r0, r1 movs r1, 0x2B b _08031392 .align 2, 0 -_080311F0: .4byte gUnknown_2024284 +_080311F0: .4byte gPlayerParty _080311F4: movs r0, 0x64 muls r0, r5 - ldr r1, _08031200 @ =gUnknown_2024284 + ldr r1, _08031200 @ =gPlayerParty adds r0, r1 movs r1, 0x2C b _08031392 .align 2, 0 -_08031200: .4byte gUnknown_2024284 +_08031200: .4byte gPlayerParty _08031204: movs r0, 0x64 muls r0, r5 - ldr r1, _08031210 @ =gUnknown_2024284 + ldr r1, _08031210 @ =gPlayerParty adds r0, r1 movs r1, 0 b _0803122E .align 2, 0 -_08031210: .4byte gUnknown_2024284 +_08031210: .4byte gPlayerParty _08031214: movs r0, 0x64 muls r0, r5 - ldr r1, _08031220 @ =gUnknown_2024284 + ldr r1, _08031220 @ =gPlayerParty adds r0, r1 movs r1, 0x9 b _080312D2 .align 2, 0 -_08031220: .4byte gUnknown_2024284 +_08031220: .4byte gPlayerParty _08031224: movs r0, 0x64 muls r0, r5 - ldr r1, _08031254 @ =gUnknown_2024284 + ldr r1, _08031254 @ =gPlayerParty adds r0, r1 movs r1, 0x37 _0803122E: @@ -5779,74 +5779,74 @@ _0803122E: movs r6, 0x4 b _0803139A .align 2, 0 -_08031254: .4byte gUnknown_2024284 +_08031254: .4byte gPlayerParty _08031258: movs r0, 0x64 muls r0, r5 - ldr r1, _08031264 @ =gUnknown_2024284 + ldr r1, _08031264 @ =gPlayerParty adds r0, r1 movs r1, 0x38 b _08031392 .align 2, 0 -_08031264: .4byte gUnknown_2024284 +_08031264: .4byte gPlayerParty _08031268: movs r0, 0x64 muls r0, r5 - ldr r1, _08031274 @ =gUnknown_2024284 + ldr r1, _08031274 @ =gPlayerParty adds r0, r1 movs r1, 0x39 b _080312D2 .align 2, 0 -_08031274: .4byte gUnknown_2024284 +_08031274: .4byte gPlayerParty _08031278: movs r0, 0x64 muls r0, r5 - ldr r1, _08031284 @ =gUnknown_2024284 + ldr r1, _08031284 @ =gPlayerParty adds r0, r1 movs r1, 0x3A b _080312D2 .align 2, 0 -_08031284: .4byte gUnknown_2024284 +_08031284: .4byte gPlayerParty _08031288: movs r0, 0x64 muls r0, r5 - ldr r1, _08031294 @ =gUnknown_2024284 + ldr r1, _08031294 @ =gPlayerParty adds r0, r1 movs r1, 0x3B b _080312D2 .align 2, 0 -_08031294: .4byte gUnknown_2024284 +_08031294: .4byte gPlayerParty _08031298: movs r0, 0x64 muls r0, r5 - ldr r1, _080312A4 @ =gUnknown_2024284 + ldr r1, _080312A4 @ =gPlayerParty adds r0, r1 movs r1, 0x3C b _080312D2 .align 2, 0 -_080312A4: .4byte gUnknown_2024284 +_080312A4: .4byte gPlayerParty _080312A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080312B4 @ =gUnknown_2024284 + ldr r1, _080312B4 @ =gPlayerParty adds r0, r1 movs r1, 0x3D b _080312D2 .align 2, 0 -_080312B4: .4byte gUnknown_2024284 +_080312B4: .4byte gPlayerParty _080312B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080312C4 @ =gUnknown_2024284 + ldr r1, _080312C4 @ =gPlayerParty adds r0, r1 movs r1, 0x3E b _080312D2 .align 2, 0 -_080312C4: .4byte gUnknown_2024284 +_080312C4: .4byte gPlayerParty _080312C8: movs r0, 0x64 muls r0, r5 - ldr r1, _080312E4 @ =gUnknown_2024284 + ldr r1, _080312E4 @ =gPlayerParty adds r0, r1 movs r1, 0x3F _080312D2: @@ -5859,101 +5859,101 @@ _080312D2: movs r6, 0x2 b _0803139A .align 2, 0 -_080312E4: .4byte gUnknown_2024284 +_080312E4: .4byte gPlayerParty _080312E8: movs r0, 0x64 muls r0, r5 - ldr r1, _080312F4 @ =gUnknown_2024284 + ldr r1, _080312F4 @ =gPlayerParty adds r0, r1 movs r1, 0x16 b _08031392 .align 2, 0 -_080312F4: .4byte gUnknown_2024284 +_080312F4: .4byte gPlayerParty _080312F8: movs r0, 0x64 muls r0, r5 - ldr r1, _08031304 @ =gUnknown_2024284 + ldr r1, _08031304 @ =gPlayerParty adds r0, r1 movs r1, 0x17 b _08031392 .align 2, 0 -_08031304: .4byte gUnknown_2024284 +_08031304: .4byte gPlayerParty _08031308: movs r0, 0x64 muls r0, r5 - ldr r1, _08031314 @ =gUnknown_2024284 + ldr r1, _08031314 @ =gPlayerParty adds r0, r1 movs r1, 0x18 b _08031392 .align 2, 0 -_08031314: .4byte gUnknown_2024284 +_08031314: .4byte gPlayerParty _08031318: movs r0, 0x64 muls r0, r5 - ldr r1, _08031324 @ =gUnknown_2024284 + ldr r1, _08031324 @ =gPlayerParty adds r0, r1 movs r1, 0x21 b _08031392 .align 2, 0 -_08031324: .4byte gUnknown_2024284 +_08031324: .4byte gPlayerParty _08031328: movs r0, 0x64 muls r0, r5 - ldr r1, _08031334 @ =gUnknown_2024284 + ldr r1, _08031334 @ =gPlayerParty adds r0, r1 movs r1, 0x2F b _08031392 .align 2, 0 -_08031334: .4byte gUnknown_2024284 +_08031334: .4byte gPlayerParty _08031338: movs r0, 0x64 muls r0, r5 - ldr r1, _08031344 @ =gUnknown_2024284 + ldr r1, _08031344 @ =gPlayerParty adds r0, r1 movs r1, 0x30 b _08031392 .align 2, 0 -_08031344: .4byte gUnknown_2024284 +_08031344: .4byte gPlayerParty _08031348: movs r0, 0x64 muls r0, r5 - ldr r1, _08031354 @ =gUnknown_2024284 + ldr r1, _08031354 @ =gPlayerParty adds r0, r1 movs r1, 0x32 b _08031392 .align 2, 0 -_08031354: .4byte gUnknown_2024284 +_08031354: .4byte gPlayerParty _08031358: movs r0, 0x64 muls r0, r5 - ldr r1, _08031364 @ =gUnknown_2024284 + ldr r1, _08031364 @ =gPlayerParty adds r0, r1 movs r1, 0x33 b _08031392 .align 2, 0 -_08031364: .4byte gUnknown_2024284 +_08031364: .4byte gPlayerParty _08031368: movs r0, 0x64 muls r0, r5 - ldr r1, _08031374 @ =gUnknown_2024284 + ldr r1, _08031374 @ =gPlayerParty adds r0, r1 movs r1, 0x34 b _08031392 .align 2, 0 -_08031374: .4byte gUnknown_2024284 +_08031374: .4byte gPlayerParty _08031378: movs r0, 0x64 muls r0, r5 - ldr r1, _08031384 @ =gUnknown_2024284 + ldr r1, _08031384 @ =gPlayerParty adds r0, r1 movs r1, 0x35 b _08031392 .align 2, 0 -_08031384: .4byte gUnknown_2024284 +_08031384: .4byte gPlayerParty _08031388: movs r0, 0x64 muls r0, r5 - ldr r1, _080313AC @ =gUnknown_2024284 + ldr r1, _080313AC @ =gPlayerParty adds r0, r1 movs r1, 0x36 _08031392: @@ -5971,15 +5971,15 @@ _0803139A: pop {r1} bx r1 .align 2, 0 -_080313AC: .4byte gUnknown_2024284 +_080313AC: .4byte gPlayerParty thumb_func_end CopyPlayerMonData thumb_func_start PlayerHandleGetRawMonData PlayerHandleGetRawMonData: @ 80313B0 push {r4-r7,lr} sub sp, 0x58 - ldr r2, _08031428 @ =gUnknown_2023BCE - ldr r5, _0803142C @ =gUnknown_2023BC4 + ldr r2, _08031428 @ =gBattlerPartyIndexes + ldr r5, _0803142C @ =gActiveBattler ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -5992,7 +5992,7 @@ PlayerHandleGetRawMonData: @ 80313B0 adds r0, r3, 0x1 adds r0, r1, r0 ldrb r2, [r0] - ldr r0, _08031434 @ =gUnknown_2024284 + ldr r0, _08031434 @ =gPlayerParty adds r0, r2, r0 adds r6, r4, r0 mov r0, sp @@ -6036,17 +6036,17 @@ _08031406: pop {r0} bx r0 .align 2, 0 -_08031428: .4byte gUnknown_2023BCE -_0803142C: .4byte gUnknown_2023BC4 +_08031428: .4byte gBattlerPartyIndexes +_0803142C: .4byte gActiveBattler _08031430: .4byte gUnknown_2022BC4 -_08031434: .4byte gUnknown_2024284 +_08031434: .4byte gPlayerParty thumb_func_end PlayerHandleGetRawMonData thumb_func_start PlayerHandleSetMonData PlayerHandleSetMonData: @ 8031438 push {r4,r5,lr} ldr r1, _0803145C @ =gUnknown_2022BC4 - ldr r0, _08031460 @ =gUnknown_2023BC4 + ldr r0, _08031460 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -6054,7 +6054,7 @@ PlayerHandleSetMonData: @ 8031438 ldrb r0, [r1] cmp r0, 0 bne _08031468 - ldr r0, _08031464 @ =gUnknown_2023BCE + ldr r0, _08031464 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -6062,8 +6062,8 @@ PlayerHandleSetMonData: @ 8031438 b _08031486 .align 2, 0 _0803145C: .4byte gUnknown_2022BC4 -_08031460: .4byte gUnknown_2023BC4 -_08031464: .4byte gUnknown_2023BCE +_08031460: .4byte gActiveBattler +_08031464: .4byte gBattlerPartyIndexes _08031468: ldrb r4, [r1] movs r5, 0 @@ -6098,7 +6098,7 @@ SetPlayerMonData: @ 8031490 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080314C8 @ =gUnknown_2023BC4 + ldr r0, _080314C8 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 ldr r2, _080314CC @ =gUnknown_2022BC7 @@ -6118,7 +6118,7 @@ _080314BC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080314C8: .4byte gUnknown_2023BC4 +_080314C8: .4byte gActiveBattler _080314CC: .4byte gUnknown_2022BC7 _080314D0: .4byte _080314D4 .align 2, 0 @@ -6187,7 +6187,7 @@ _080315C4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08031758 @ =gUnknown_2024284 + ldr r0, _08031758 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -6254,7 +6254,7 @@ _0803162A: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08031758 @ =gUnknown_2024284 + ldr r0, _08031758 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -6364,13 +6364,13 @@ _0803162A: bl sub_804037C b _08031E56 .align 2, 0 -_08031758: .4byte gUnknown_2024284 +_08031758: .4byte gPlayerParty _0803175C: movs r0, 0x64 muls r0, r5 - ldr r1, _08031774 @ =gUnknown_2024284 + ldr r1, _08031774 @ =gPlayerParty adds r0, r1 - ldr r1, _08031778 @ =gUnknown_2023BC4 + ldr r1, _08031778 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6378,14 +6378,14 @@ _0803175C: bl sub_804037C b _08031E56 .align 2, 0 -_08031774: .4byte gUnknown_2024284 -_08031778: .4byte gUnknown_2023BC4 +_08031774: .4byte gPlayerParty +_08031778: .4byte gActiveBattler _0803177C: movs r0, 0x64 muls r0, r5 - ldr r1, _08031794 @ =gUnknown_2024284 + ldr r1, _08031794 @ =gPlayerParty adds r0, r1 - ldr r1, _08031798 @ =gUnknown_2023BC4 + ldr r1, _08031798 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6393,8 +6393,8 @@ _0803177C: bl sub_804037C b _08031E56 .align 2, 0 -_08031794: .4byte gUnknown_2024284 -_08031798: .4byte gUnknown_2023BC4 +_08031794: .4byte gPlayerParty +_08031798: .4byte gActiveBattler _0803179C: movs r0, 0 mov r8, r0 @@ -6404,7 +6404,7 @@ _0803179C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080317F0 @ =gUnknown_2024284 + ldr r0, _080317F0 @ =gPlayerParty adds r7, r1, r0 adds r6, r3, 0 adds r6, 0x8 @@ -6429,21 +6429,21 @@ _080317B6: ble _080317B6 movs r0, 0x64 muls r0, r5 - ldr r1, _080317F0 @ =gUnknown_2024284 + ldr r1, _080317F0 @ =gPlayerParty adds r0, r1 movs r1, 0x15 mov r2, r9 bl sub_804037C b _08031E56 .align 2, 0 -_080317F0: .4byte gUnknown_2024284 +_080317F0: .4byte gPlayerParty _080317F4: movs r0, 0x64 muls r0, r5 - ldr r1, _08031810 @ =gUnknown_2024284 + ldr r1, _08031810 @ =gPlayerParty adds r0, r1 ldr r3, _08031814 @ =gUnknown_2022BC4 - ldr r1, _08031818 @ =gUnknown_2023BC4 + ldr r1, _08031818 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -6452,16 +6452,16 @@ _080317F4: adds r1, 0x9 b _08031898 .align 2, 0 -_08031810: .4byte gUnknown_2024284 +_08031810: .4byte gPlayerParty _08031814: .4byte gUnknown_2022BC4 -_08031818: .4byte gUnknown_2023BC4 +_08031818: .4byte gActiveBattler _0803181C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08031878 @ =gUnknown_2024284 + ldr r0, _08031878 @ =gPlayerParty adds r4, r0 - ldr r5, _0803187C @ =gUnknown_2023BC4 + ldr r5, _0803187C @ =gActiveBattler ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -6498,15 +6498,15 @@ _0803181C: bl sub_804037C b _08031E56 .align 2, 0 -_08031878: .4byte gUnknown_2024284 -_0803187C: .4byte gUnknown_2023BC4 +_08031878: .4byte gPlayerParty +_0803187C: .4byte gActiveBattler _08031880: movs r0, 0x64 muls r0, r5 - ldr r1, _080318A4 @ =gUnknown_2024284 + ldr r1, _080318A4 @ =gPlayerParty adds r0, r1 ldr r3, _080318A8 @ =gUnknown_2022BC4 - ldr r1, _080318AC @ =gUnknown_2023BC4 + ldr r1, _080318AC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -6519,15 +6519,15 @@ _08031898: bl sub_804037C b _08031E56 .align 2, 0 -_080318A4: .4byte gUnknown_2024284 +_080318A4: .4byte gPlayerParty _080318A8: .4byte gUnknown_2022BC4 -_080318AC: .4byte gUnknown_2023BC4 +_080318AC: .4byte gActiveBattler _080318B0: movs r0, 0x64 muls r0, r5 - ldr r1, _080318C8 @ =gUnknown_2024284 + ldr r1, _080318C8 @ =gPlayerParty adds r0, r1 - ldr r1, _080318CC @ =gUnknown_2023BC4 + ldr r1, _080318CC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6535,14 +6535,14 @@ _080318B0: bl sub_804037C b _08031E56 .align 2, 0 -_080318C8: .4byte gUnknown_2024284 -_080318CC: .4byte gUnknown_2023BC4 +_080318C8: .4byte gPlayerParty +_080318CC: .4byte gActiveBattler _080318D0: movs r0, 0x64 muls r0, r5 - ldr r1, _080318E8 @ =gUnknown_2024284 + ldr r1, _080318E8 @ =gPlayerParty adds r0, r1 - ldr r1, _080318EC @ =gUnknown_2023BC4 + ldr r1, _080318EC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6550,14 +6550,14 @@ _080318D0: bl sub_804037C b _08031E56 .align 2, 0 -_080318E8: .4byte gUnknown_2024284 -_080318EC: .4byte gUnknown_2023BC4 +_080318E8: .4byte gPlayerParty +_080318EC: .4byte gActiveBattler _080318F0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031908 @ =gUnknown_2024284 + ldr r1, _08031908 @ =gPlayerParty adds r0, r1 - ldr r1, _0803190C @ =gUnknown_2023BC4 + ldr r1, _0803190C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6565,14 +6565,14 @@ _080318F0: bl sub_804037C b _08031E56 .align 2, 0 -_08031908: .4byte gUnknown_2024284 -_0803190C: .4byte gUnknown_2023BC4 +_08031908: .4byte gPlayerParty +_0803190C: .4byte gActiveBattler _08031910: movs r0, 0x64 muls r0, r5 - ldr r1, _08031928 @ =gUnknown_2024284 + ldr r1, _08031928 @ =gPlayerParty adds r0, r1 - ldr r1, _0803192C @ =gUnknown_2023BC4 + ldr r1, _0803192C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6580,14 +6580,14 @@ _08031910: bl sub_804037C b _08031E56 .align 2, 0 -_08031928: .4byte gUnknown_2024284 -_0803192C: .4byte gUnknown_2023BC4 +_08031928: .4byte gPlayerParty +_0803192C: .4byte gActiveBattler _08031930: movs r0, 0x64 muls r0, r5 - ldr r1, _08031948 @ =gUnknown_2024284 + ldr r1, _08031948 @ =gPlayerParty adds r0, r1 - ldr r1, _0803194C @ =gUnknown_2023BC4 + ldr r1, _0803194C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6595,14 +6595,14 @@ _08031930: bl sub_804037C b _08031E56 .align 2, 0 -_08031948: .4byte gUnknown_2024284 -_0803194C: .4byte gUnknown_2023BC4 +_08031948: .4byte gPlayerParty +_0803194C: .4byte gActiveBattler _08031950: movs r0, 0x64 muls r0, r5 - ldr r1, _08031968 @ =gUnknown_2024284 + ldr r1, _08031968 @ =gPlayerParty adds r0, r1 - ldr r1, _0803196C @ =gUnknown_2023BC4 + ldr r1, _0803196C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6610,14 +6610,14 @@ _08031950: bl sub_804037C b _08031E56 .align 2, 0 -_08031968: .4byte gUnknown_2024284 -_0803196C: .4byte gUnknown_2023BC4 +_08031968: .4byte gPlayerParty +_0803196C: .4byte gActiveBattler _08031970: movs r0, 0x64 muls r0, r5 - ldr r1, _08031988 @ =gUnknown_2024284 + ldr r1, _08031988 @ =gPlayerParty adds r0, r1 - ldr r1, _0803198C @ =gUnknown_2023BC4 + ldr r1, _0803198C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6625,14 +6625,14 @@ _08031970: bl sub_804037C b _08031E56 .align 2, 0 -_08031988: .4byte gUnknown_2024284 -_0803198C: .4byte gUnknown_2023BC4 +_08031988: .4byte gPlayerParty +_0803198C: .4byte gActiveBattler _08031990: movs r0, 0x64 muls r0, r5 - ldr r1, _080319A8 @ =gUnknown_2024284 + ldr r1, _080319A8 @ =gPlayerParty adds r0, r1 - ldr r1, _080319AC @ =gUnknown_2023BC4 + ldr r1, _080319AC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6640,14 +6640,14 @@ _08031990: bl sub_804037C b _08031E56 .align 2, 0 -_080319A8: .4byte gUnknown_2024284 -_080319AC: .4byte gUnknown_2023BC4 +_080319A8: .4byte gPlayerParty +_080319AC: .4byte gActiveBattler _080319B0: movs r0, 0x64 muls r0, r5 - ldr r1, _080319C8 @ =gUnknown_2024284 + ldr r1, _080319C8 @ =gPlayerParty adds r0, r1 - ldr r1, _080319CC @ =gUnknown_2023BC4 + ldr r1, _080319CC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6655,14 +6655,14 @@ _080319B0: bl sub_804037C b _08031E56 .align 2, 0 -_080319C8: .4byte gUnknown_2024284 -_080319CC: .4byte gUnknown_2023BC4 +_080319C8: .4byte gPlayerParty +_080319CC: .4byte gActiveBattler _080319D0: movs r0, 0x64 muls r0, r5 - ldr r1, _080319E8 @ =gUnknown_2024284 + ldr r1, _080319E8 @ =gPlayerParty adds r0, r1 - ldr r1, _080319EC @ =gUnknown_2023BC4 + ldr r1, _080319EC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6670,14 +6670,14 @@ _080319D0: bl sub_804037C b _08031E56 .align 2, 0 -_080319E8: .4byte gUnknown_2024284 -_080319EC: .4byte gUnknown_2023BC4 +_080319E8: .4byte gPlayerParty +_080319EC: .4byte gActiveBattler _080319F0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031A08 @ =gUnknown_2024284 + ldr r1, _08031A08 @ =gPlayerParty adds r0, r1 - ldr r1, _08031A0C @ =gUnknown_2023BC4 + ldr r1, _08031A0C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6685,14 +6685,14 @@ _080319F0: bl sub_804037C b _08031E56 .align 2, 0 -_08031A08: .4byte gUnknown_2024284 -_08031A0C: .4byte gUnknown_2023BC4 +_08031A08: .4byte gPlayerParty +_08031A0C: .4byte gActiveBattler _08031A10: movs r0, 0x64 muls r0, r5 - ldr r1, _08031A28 @ =gUnknown_2024284 + ldr r1, _08031A28 @ =gPlayerParty adds r0, r1 - ldr r1, _08031A2C @ =gUnknown_2023BC4 + ldr r1, _08031A2C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6700,14 +6700,14 @@ _08031A10: bl sub_804037C b _08031E56 .align 2, 0 -_08031A28: .4byte gUnknown_2024284 -_08031A2C: .4byte gUnknown_2023BC4 +_08031A28: .4byte gPlayerParty +_08031A2C: .4byte gActiveBattler _08031A30: movs r0, 0x64 muls r0, r5 - ldr r1, _08031A48 @ =gUnknown_2024284 + ldr r1, _08031A48 @ =gPlayerParty adds r0, r1 - ldr r1, _08031A4C @ =gUnknown_2023BC4 + ldr r1, _08031A4C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6715,14 +6715,14 @@ _08031A30: bl sub_804037C b _08031E56 .align 2, 0 -_08031A48: .4byte gUnknown_2024284 -_08031A4C: .4byte gUnknown_2023BC4 +_08031A48: .4byte gPlayerParty +_08031A4C: .4byte gActiveBattler _08031A50: movs r0, 0x64 muls r0, r5 - ldr r1, _08031A68 @ =gUnknown_2024284 + ldr r1, _08031A68 @ =gPlayerParty adds r0, r1 - ldr r1, _08031A6C @ =gUnknown_2023BC4 + ldr r1, _08031A6C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6730,15 +6730,15 @@ _08031A50: bl sub_804037C b _08031E56 .align 2, 0 -_08031A68: .4byte gUnknown_2024284 -_08031A6C: .4byte gUnknown_2023BC4 +_08031A68: .4byte gPlayerParty +_08031A6C: .4byte gActiveBattler _08031A70: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08031AD8 @ =gUnknown_2024284 + ldr r0, _08031AD8 @ =gPlayerParty adds r4, r0 - ldr r5, _08031ADC @ =gUnknown_2023BC4 + ldr r5, _08031ADC @ =gActiveBattler ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -6780,14 +6780,14 @@ _08031A70: adds r0, r4, 0 b _08031B90 .align 2, 0 -_08031AD8: .4byte gUnknown_2024284 -_08031ADC: .4byte gUnknown_2023BC4 +_08031AD8: .4byte gPlayerParty +_08031ADC: .4byte gActiveBattler _08031AE0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031AF8 @ =gUnknown_2024284 + ldr r1, _08031AF8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031AFC @ =gUnknown_2023BC4 + ldr r1, _08031AFC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6795,14 +6795,14 @@ _08031AE0: bl sub_804037C b _08031E56 .align 2, 0 -_08031AF8: .4byte gUnknown_2024284 -_08031AFC: .4byte gUnknown_2023BC4 +_08031AF8: .4byte gPlayerParty +_08031AFC: .4byte gActiveBattler _08031B00: movs r0, 0x64 muls r0, r5 - ldr r1, _08031B18 @ =gUnknown_2024284 + ldr r1, _08031B18 @ =gPlayerParty adds r0, r1 - ldr r1, _08031B1C @ =gUnknown_2023BC4 + ldr r1, _08031B1C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6810,14 +6810,14 @@ _08031B00: bl sub_804037C b _08031E56 .align 2, 0 -_08031B18: .4byte gUnknown_2024284 -_08031B1C: .4byte gUnknown_2023BC4 +_08031B18: .4byte gPlayerParty +_08031B1C: .4byte gActiveBattler _08031B20: movs r0, 0x64 muls r0, r5 - ldr r1, _08031B38 @ =gUnknown_2024284 + ldr r1, _08031B38 @ =gPlayerParty adds r0, r1 - ldr r1, _08031B3C @ =gUnknown_2023BC4 + ldr r1, _08031B3C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6825,14 +6825,14 @@ _08031B20: bl sub_804037C b _08031E56 .align 2, 0 -_08031B38: .4byte gUnknown_2024284 -_08031B3C: .4byte gUnknown_2023BC4 +_08031B38: .4byte gPlayerParty +_08031B3C: .4byte gActiveBattler _08031B40: movs r0, 0x64 muls r0, r5 - ldr r1, _08031B58 @ =gUnknown_2024284 + ldr r1, _08031B58 @ =gPlayerParty adds r0, r1 - ldr r1, _08031B5C @ =gUnknown_2023BC4 + ldr r1, _08031B5C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6840,14 +6840,14 @@ _08031B40: bl sub_804037C b _08031E56 .align 2, 0 -_08031B58: .4byte gUnknown_2024284 -_08031B5C: .4byte gUnknown_2023BC4 +_08031B58: .4byte gPlayerParty +_08031B5C: .4byte gActiveBattler _08031B60: movs r0, 0x64 muls r0, r5 - ldr r1, _08031B78 @ =gUnknown_2024284 + ldr r1, _08031B78 @ =gPlayerParty adds r0, r1 - ldr r1, _08031B7C @ =gUnknown_2023BC4 + ldr r1, _08031B7C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6855,14 +6855,14 @@ _08031B60: bl sub_804037C b _08031E56 .align 2, 0 -_08031B78: .4byte gUnknown_2024284 -_08031B7C: .4byte gUnknown_2023BC4 +_08031B78: .4byte gPlayerParty +_08031B7C: .4byte gActiveBattler _08031B80: movs r0, 0x64 muls r0, r5 - ldr r1, _08031B98 @ =gUnknown_2024284 + ldr r1, _08031B98 @ =gPlayerParty adds r0, r1 - ldr r1, _08031B9C @ =gUnknown_2023BC4 + ldr r1, _08031B9C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6871,14 +6871,14 @@ _08031B90: bl sub_804037C b _08031E56 .align 2, 0 -_08031B98: .4byte gUnknown_2024284 -_08031B9C: .4byte gUnknown_2023BC4 +_08031B98: .4byte gPlayerParty +_08031B9C: .4byte gActiveBattler _08031BA0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031BB8 @ =gUnknown_2024284 + ldr r1, _08031BB8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031BBC @ =gUnknown_2023BC4 + ldr r1, _08031BBC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6886,14 +6886,14 @@ _08031BA0: bl sub_804037C b _08031E56 .align 2, 0 -_08031BB8: .4byte gUnknown_2024284 -_08031BBC: .4byte gUnknown_2023BC4 +_08031BB8: .4byte gPlayerParty +_08031BBC: .4byte gActiveBattler _08031BC0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031BD8 @ =gUnknown_2024284 + ldr r1, _08031BD8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031BDC @ =gUnknown_2023BC4 + ldr r1, _08031BDC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6901,14 +6901,14 @@ _08031BC0: bl sub_804037C b _08031E56 .align 2, 0 -_08031BD8: .4byte gUnknown_2024284 -_08031BDC: .4byte gUnknown_2023BC4 +_08031BD8: .4byte gPlayerParty +_08031BDC: .4byte gActiveBattler _08031BE0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031BF8 @ =gUnknown_2024284 + ldr r1, _08031BF8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031BFC @ =gUnknown_2023BC4 + ldr r1, _08031BFC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6916,14 +6916,14 @@ _08031BE0: bl sub_804037C b _08031E56 .align 2, 0 -_08031BF8: .4byte gUnknown_2024284 -_08031BFC: .4byte gUnknown_2023BC4 +_08031BF8: .4byte gPlayerParty +_08031BFC: .4byte gActiveBattler _08031C00: movs r0, 0x64 muls r0, r5 - ldr r1, _08031C18 @ =gUnknown_2024284 + ldr r1, _08031C18 @ =gPlayerParty adds r0, r1 - ldr r1, _08031C1C @ =gUnknown_2023BC4 + ldr r1, _08031C1C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6931,14 +6931,14 @@ _08031C00: bl sub_804037C b _08031E56 .align 2, 0 -_08031C18: .4byte gUnknown_2024284 -_08031C1C: .4byte gUnknown_2023BC4 +_08031C18: .4byte gPlayerParty +_08031C1C: .4byte gActiveBattler _08031C20: movs r0, 0x64 muls r0, r5 - ldr r1, _08031C38 @ =gUnknown_2024284 + ldr r1, _08031C38 @ =gPlayerParty adds r0, r1 - ldr r1, _08031C3C @ =gUnknown_2023BC4 + ldr r1, _08031C3C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6946,14 +6946,14 @@ _08031C20: bl sub_804037C b _08031E56 .align 2, 0 -_08031C38: .4byte gUnknown_2024284 -_08031C3C: .4byte gUnknown_2023BC4 +_08031C38: .4byte gPlayerParty +_08031C3C: .4byte gActiveBattler _08031C40: movs r0, 0x64 muls r0, r5 - ldr r1, _08031C58 @ =gUnknown_2024284 + ldr r1, _08031C58 @ =gPlayerParty adds r0, r1 - ldr r1, _08031C5C @ =gUnknown_2023BC4 + ldr r1, _08031C5C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6961,14 +6961,14 @@ _08031C40: bl sub_804037C b _08031E56 .align 2, 0 -_08031C58: .4byte gUnknown_2024284 -_08031C5C: .4byte gUnknown_2023BC4 +_08031C58: .4byte gPlayerParty +_08031C5C: .4byte gActiveBattler _08031C60: movs r0, 0x64 muls r0, r5 - ldr r1, _08031C78 @ =gUnknown_2024284 + ldr r1, _08031C78 @ =gPlayerParty adds r0, r1 - ldr r1, _08031C7C @ =gUnknown_2023BC4 + ldr r1, _08031C7C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6976,14 +6976,14 @@ _08031C60: bl sub_804037C b _08031E56 .align 2, 0 -_08031C78: .4byte gUnknown_2024284 -_08031C7C: .4byte gUnknown_2023BC4 +_08031C78: .4byte gPlayerParty +_08031C7C: .4byte gActiveBattler _08031C80: movs r0, 0x64 muls r0, r5 - ldr r1, _08031C98 @ =gUnknown_2024284 + ldr r1, _08031C98 @ =gPlayerParty adds r0, r1 - ldr r1, _08031C9C @ =gUnknown_2023BC4 + ldr r1, _08031C9C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -6991,14 +6991,14 @@ _08031C80: bl sub_804037C b _08031E56 .align 2, 0 -_08031C98: .4byte gUnknown_2024284 -_08031C9C: .4byte gUnknown_2023BC4 +_08031C98: .4byte gPlayerParty +_08031C9C: .4byte gActiveBattler _08031CA0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031CB8 @ =gUnknown_2024284 + ldr r1, _08031CB8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031CBC @ =gUnknown_2023BC4 + ldr r1, _08031CBC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7006,14 +7006,14 @@ _08031CA0: bl sub_804037C b _08031E56 .align 2, 0 -_08031CB8: .4byte gUnknown_2024284 -_08031CBC: .4byte gUnknown_2023BC4 +_08031CB8: .4byte gPlayerParty +_08031CBC: .4byte gActiveBattler _08031CC0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031CD8 @ =gUnknown_2024284 + ldr r1, _08031CD8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031CDC @ =gUnknown_2023BC4 + ldr r1, _08031CDC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7021,14 +7021,14 @@ _08031CC0: bl sub_804037C b _08031E56 .align 2, 0 -_08031CD8: .4byte gUnknown_2024284 -_08031CDC: .4byte gUnknown_2023BC4 +_08031CD8: .4byte gPlayerParty +_08031CDC: .4byte gActiveBattler _08031CE0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031CF8 @ =gUnknown_2024284 + ldr r1, _08031CF8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031CFC @ =gUnknown_2023BC4 + ldr r1, _08031CFC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7036,14 +7036,14 @@ _08031CE0: bl sub_804037C b _08031E56 .align 2, 0 -_08031CF8: .4byte gUnknown_2024284 -_08031CFC: .4byte gUnknown_2023BC4 +_08031CF8: .4byte gPlayerParty +_08031CFC: .4byte gActiveBattler _08031D00: movs r0, 0x64 muls r0, r5 - ldr r1, _08031D18 @ =gUnknown_2024284 + ldr r1, _08031D18 @ =gPlayerParty adds r0, r1 - ldr r1, _08031D1C @ =gUnknown_2023BC4 + ldr r1, _08031D1C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7051,14 +7051,14 @@ _08031D00: bl sub_804037C b _08031E56 .align 2, 0 -_08031D18: .4byte gUnknown_2024284 -_08031D1C: .4byte gUnknown_2023BC4 +_08031D18: .4byte gPlayerParty +_08031D1C: .4byte gActiveBattler _08031D20: movs r0, 0x64 muls r0, r5 - ldr r1, _08031D38 @ =gUnknown_2024284 + ldr r1, _08031D38 @ =gPlayerParty adds r0, r1 - ldr r1, _08031D3C @ =gUnknown_2023BC4 + ldr r1, _08031D3C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7066,14 +7066,14 @@ _08031D20: bl sub_804037C b _08031E56 .align 2, 0 -_08031D38: .4byte gUnknown_2024284 -_08031D3C: .4byte gUnknown_2023BC4 +_08031D38: .4byte gPlayerParty +_08031D3C: .4byte gActiveBattler _08031D40: movs r0, 0x64 muls r0, r5 - ldr r1, _08031D58 @ =gUnknown_2024284 + ldr r1, _08031D58 @ =gPlayerParty adds r0, r1 - ldr r1, _08031D5C @ =gUnknown_2023BC4 + ldr r1, _08031D5C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7081,14 +7081,14 @@ _08031D40: bl sub_804037C b _08031E56 .align 2, 0 -_08031D58: .4byte gUnknown_2024284 -_08031D5C: .4byte gUnknown_2023BC4 +_08031D58: .4byte gPlayerParty +_08031D5C: .4byte gActiveBattler _08031D60: movs r0, 0x64 muls r0, r5 - ldr r1, _08031D78 @ =gUnknown_2024284 + ldr r1, _08031D78 @ =gPlayerParty adds r0, r1 - ldr r1, _08031D7C @ =gUnknown_2023BC4 + ldr r1, _08031D7C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7096,14 +7096,14 @@ _08031D60: bl sub_804037C b _08031E56 .align 2, 0 -_08031D78: .4byte gUnknown_2024284 -_08031D7C: .4byte gUnknown_2023BC4 +_08031D78: .4byte gPlayerParty +_08031D7C: .4byte gActiveBattler _08031D80: movs r0, 0x64 muls r0, r5 - ldr r1, _08031D98 @ =gUnknown_2024284 + ldr r1, _08031D98 @ =gPlayerParty adds r0, r1 - ldr r1, _08031D9C @ =gUnknown_2023BC4 + ldr r1, _08031D9C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7111,14 +7111,14 @@ _08031D80: bl sub_804037C b _08031E56 .align 2, 0 -_08031D98: .4byte gUnknown_2024284 -_08031D9C: .4byte gUnknown_2023BC4 +_08031D98: .4byte gPlayerParty +_08031D9C: .4byte gActiveBattler _08031DA0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031DB8 @ =gUnknown_2024284 + ldr r1, _08031DB8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031DBC @ =gUnknown_2023BC4 + ldr r1, _08031DBC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7126,14 +7126,14 @@ _08031DA0: bl sub_804037C b _08031E56 .align 2, 0 -_08031DB8: .4byte gUnknown_2024284 -_08031DBC: .4byte gUnknown_2023BC4 +_08031DB8: .4byte gPlayerParty +_08031DBC: .4byte gActiveBattler _08031DC0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031DD8 @ =gUnknown_2024284 + ldr r1, _08031DD8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031DDC @ =gUnknown_2023BC4 + ldr r1, _08031DDC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7141,14 +7141,14 @@ _08031DC0: bl sub_804037C b _08031E56 .align 2, 0 -_08031DD8: .4byte gUnknown_2024284 -_08031DDC: .4byte gUnknown_2023BC4 +_08031DD8: .4byte gPlayerParty +_08031DDC: .4byte gActiveBattler _08031DE0: movs r0, 0x64 muls r0, r5 - ldr r1, _08031DF8 @ =gUnknown_2024284 + ldr r1, _08031DF8 @ =gPlayerParty adds r0, r1 - ldr r1, _08031DFC @ =gUnknown_2023BC4 + ldr r1, _08031DFC @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7156,14 +7156,14 @@ _08031DE0: bl sub_804037C b _08031E56 .align 2, 0 -_08031DF8: .4byte gUnknown_2024284 -_08031DFC: .4byte gUnknown_2023BC4 +_08031DF8: .4byte gPlayerParty +_08031DFC: .4byte gActiveBattler _08031E00: movs r0, 0x64 muls r0, r5 - ldr r1, _08031E18 @ =gUnknown_2024284 + ldr r1, _08031E18 @ =gPlayerParty adds r0, r1 - ldr r1, _08031E1C @ =gUnknown_2023BC4 + ldr r1, _08031E1C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7171,14 +7171,14 @@ _08031E00: bl sub_804037C b _08031E56 .align 2, 0 -_08031E18: .4byte gUnknown_2024284 -_08031E1C: .4byte gUnknown_2023BC4 +_08031E18: .4byte gPlayerParty +_08031E1C: .4byte gActiveBattler _08031E20: movs r0, 0x64 muls r0, r5 - ldr r1, _08031E38 @ =gUnknown_2024284 + ldr r1, _08031E38 @ =gPlayerParty adds r0, r1 - ldr r1, _08031E3C @ =gUnknown_2023BC4 + ldr r1, _08031E3C @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -7186,29 +7186,29 @@ _08031E20: bl sub_804037C b _08031E56 .align 2, 0 -_08031E38: .4byte gUnknown_2024284 -_08031E3C: .4byte gUnknown_2023BC4 +_08031E38: .4byte gPlayerParty +_08031E3C: .4byte gActiveBattler _08031E40: movs r0, 0x64 muls r0, r5 - ldr r1, _08031E80 @ =gUnknown_2024284 + ldr r1, _08031E80 @ =gPlayerParty adds r0, r1 - ldr r1, _08031E84 @ =gUnknown_2023BC4 + ldr r1, _08031E84 @ =gActiveBattler ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl sub_804037C _08031E56: - ldr r2, _08031E88 @ =gUnknown_2023BCE - ldr r0, _08031E84 @ =gUnknown_2023BC4 + ldr r2, _08031E88 @ =gBattlerPartyIndexes + ldr r0, _08031E84 @ =gActiveBattler ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _08031E80 @ =gUnknown_2024284 + ldr r2, _08031E80 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange add sp, 0x34 @@ -7220,16 +7220,16 @@ _08031E56: pop {r0} bx r0 .align 2, 0 -_08031E80: .4byte gUnknown_2024284 -_08031E84: .4byte gUnknown_2023BC4 -_08031E88: .4byte gUnknown_2023BCE +_08031E80: .4byte gPlayerParty +_08031E84: .4byte gActiveBattler +_08031E88: .4byte gBattlerPartyIndexes thumb_func_end SetPlayerMonData thumb_func_start PlayerHandleSetRawMonData PlayerHandleSetRawMonData: @ 8031E8C push {r4-r7,lr} - ldr r1, _08031EF0 @ =gUnknown_2023BCE - ldr r7, _08031EF4 @ =gUnknown_2023BC4 + ldr r1, _08031EF0 @ =gBattlerPartyIndexes + ldr r7, _08031EF4 @ =gActiveBattler ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -7242,7 +7242,7 @@ PlayerHandleSetRawMonData: @ 8031E8C adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _08031EFC @ =gUnknown_2024284 + ldr r1, _08031EFC @ =gPlayerParty adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -7278,24 +7278,24 @@ _08031EE4: pop {r0} bx r0 .align 2, 0 -_08031EF0: .4byte gUnknown_2023BCE -_08031EF4: .4byte gUnknown_2023BC4 +_08031EF0: .4byte gBattlerPartyIndexes +_08031EF4: .4byte gActiveBattler _08031EF8: .4byte gUnknown_2022BC4 -_08031EFC: .4byte gUnknown_2024284 +_08031EFC: .4byte gPlayerParty thumb_func_end PlayerHandleSetRawMonData thumb_func_start PlayerHandleLoadMonSprite PlayerHandleLoadMonSprite: @ 8031F00 push {r4,lr} - ldr r2, _08031F4C @ =gUnknown_2023BCE - ldr r4, _08031F50 @ =gUnknown_2023BC4 + ldr r2, _08031F4C @ =gBattlerPartyIndexes + ldr r4, _08031F50 @ =gActiveBattler ldrb r1, [r4] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _08031F54 @ =gUnknown_2024284 + ldr r2, _08031F54 @ =gPlayerParty adds r0, r2 bl sub_8034498 ldr r2, _08031F58 @ =gSprites @@ -7323,9 +7323,9 @@ PlayerHandleLoadMonSprite: @ 8031F00 pop {r0} bx r0 .align 2, 0 -_08031F4C: .4byte gUnknown_2023BCE -_08031F50: .4byte gUnknown_2023BC4 -_08031F54: .4byte gUnknown_2024284 +_08031F4C: .4byte gBattlerPartyIndexes +_08031F50: .4byte gActiveBattler +_08031F54: .4byte gPlayerParty _08031F58: .4byte gSprites _08031F5C: .4byte gUnknown_2023D44 _08031F60: .4byte gUnknown_3004FE0 @@ -7335,7 +7335,7 @@ _08031F64: .4byte CompleteOnBankSpritePosX_0 thumb_func_start PlayerHandleSwitchInAnim PlayerHandleSwitchInAnim: @ 8031F68 push {r4-r6,lr} - ldr r5, _08031FD4 @ =gUnknown_2023BC4 + ldr r5, _08031FD4 @ =gActiveBattler ldrb r0, [r5] ldr r4, _08031FD8 @ =gUnknown_2022BC4 lsls r1, r0, 9 @@ -7343,7 +7343,7 @@ PlayerHandleSwitchInAnim: @ 8031F68 adds r1, r6 ldrb r1, [r1] bl ClearTemporarySpeciesSpriteData - ldr r2, _08031FDC @ =gUnknown_2023BCE + ldr r2, _08031FDC @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -7359,7 +7359,7 @@ PlayerHandleSwitchInAnim: @ 8031F68 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _08031FE0 @ =gUnknown_2024284 + ldr r2, _08031FE0 @ =gPlayerParty adds r0, r2 bl sub_8034498 ldr r1, _08031FE4 @ =gUnknown_2023FF8 @@ -7385,10 +7385,10 @@ PlayerHandleSwitchInAnim: @ 8031F68 pop {r0} bx r0 .align 2, 0 -_08031FD4: .4byte gUnknown_2023BC4 +_08031FD4: .4byte gActiveBattler _08031FD8: .4byte gUnknown_2022BC4 -_08031FDC: .4byte gUnknown_2023BCE -_08031FE0: .4byte gUnknown_2024284 +_08031FDC: .4byte gBattlerPartyIndexes +_08031FE0: .4byte gPlayerParty _08031FE4: .4byte gUnknown_2023FF8 _08031FE8: .4byte gUnknown_2023FFC _08031FEC: .4byte gUnknown_3004FE0 @@ -7409,7 +7409,7 @@ sub_8031FF4: @ 8031FF4 lsrs r1, 24 adds r0, r6, 0 bl ClearTemporarySpeciesSpriteData - ldr r0, _08032138 @ =gUnknown_2023BCE + ldr r0, _08032138 @ =gBattlerPartyIndexes lsls r2, r6, 1 adds r2, r0 ldr r0, _0803213C @ =gUnknown_2022BC4 @@ -7421,7 +7421,7 @@ sub_8031FF4: @ 8031FF4 ldrh r1, [r2] movs r0, 0x64 muls r0, r1 - ldr r1, _08032140 @ =gUnknown_2024284 + ldr r1, _08032140 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -7549,9 +7549,9 @@ sub_8031FF4: @ 8031FF4 pop {r0} bx r0 .align 2, 0 -_08032138: .4byte gUnknown_2023BCE +_08032138: .4byte gBattlerPartyIndexes _0803213C: .4byte gUnknown_2022BC4 -_08032140: .4byte gUnknown_2024284 +_08032140: .4byte gPlayerParty _08032144: .4byte sub_8033E3C _08032148: .4byte gUnknown_3004FFC _0803214C: .4byte gUnknown_20244DC @@ -7565,7 +7565,7 @@ _0803215C: .4byte SpriteCallbackDummy PlayerHandleReturnPokeToBall: @ 8032160 push {r4-r6,lr} ldr r1, _08032194 @ =gUnknown_2022BC4 - ldr r6, _08032198 @ =gUnknown_2023BC4 + ldr r6, _08032198 @ =gActiveBattler ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -7590,7 +7590,7 @@ PlayerHandleReturnPokeToBall: @ 8032160 b _080321DE .align 2, 0 _08032194: .4byte gUnknown_2022BC4 -_08032198: .4byte gUnknown_2023BC4 +_08032198: .4byte gActiveBattler _0803219C: .4byte gUnknown_2024018 _080321A0: .4byte gUnknown_3004FE0 _080321A4: .4byte sub_80321F0 @@ -7633,7 +7633,7 @@ sub_80321F0: @ 80321F0 push {r4-r6,lr} ldr r6, _08032210 @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _08032214 @ =gUnknown_2023BC4 + ldr r5, _08032214 @ =gActiveBattler ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -7648,7 +7648,7 @@ sub_80321F0: @ 80321F0 b _0803226E .align 2, 0 _08032210: .4byte gUnknown_2024018 -_08032214: .4byte gUnknown_2023BC4 +_08032214: .4byte gActiveBattler _08032218: ldr r1, [r4] lsls r0, r2, 2 @@ -7707,13 +7707,13 @@ sub_803227C: @ 803227C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _080322A4 @ =gUnknown_2022B4C + ldr r0, _080322A4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _080322AC - ldr r0, _080322A8 @ =gUnknown_2023BC4 + ldr r0, _080322A8 @ =gActiveBattler ldrb r0, [r0] bl GetBankIdentity movs r1, 0x2 @@ -7724,12 +7724,12 @@ sub_803227C: @ 803227C movs r7, 0x5A b _080322AE .align 2, 0 -_080322A4: .4byte gUnknown_2022B4C -_080322A8: .4byte gUnknown_2023BC4 +_080322A4: .4byte gBattleTypeFlags +_080322A8: .4byte gActiveBattler _080322AC: movs r7, 0x50 _080322AE: - ldr r0, _08032320 @ =gUnknown_2022B4C + ldr r0, _08032320 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -7783,7 +7783,7 @@ _08032306: adds r4, r0, 0x2 b _08032342 .align 2, 0 -_08032320: .4byte gUnknown_2022B4C +_08032320: .4byte gBattleTypeFlags _08032324: .4byte gUnknown_202273C _08032328: bl GetMultiplayerId @@ -7800,7 +7800,7 @@ _0803233C: ldr r0, [r0] ldrb r4, [r0, 0x8] _08032342: - ldr r5, _08032404 @ =gUnknown_2023BC4 + ldr r5, _08032404 @ =gActiveBattler ldrb r1, [r5] adds r0, r4, 0 bl sub_8034750 @@ -7892,7 +7892,7 @@ _08032342: bx r0 .align 2, 0 _08032400: .4byte gSaveBlock2Ptr -_08032404: .4byte gUnknown_2023BC4 +_08032404: .4byte gActiveBattler _08032408: .4byte gUnknown_20244DC _0803240C: .4byte gUnknown_8239F8C _08032410: .4byte gUnknown_2023D44 @@ -7906,7 +7906,7 @@ _08032424: .4byte sub_802F730 thumb_func_start sub_8032428 sub_8032428: @ 8032428 push {r4-r6,lr} - ldr r0, _0803249C @ =gUnknown_2022B4C + ldr r0, _0803249C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -7960,7 +7960,7 @@ _08032482: adds r4, r0, 0x2 b _080324BE .align 2, 0 -_0803249C: .4byte gUnknown_2022B4C +_0803249C: .4byte gBattleTypeFlags _080324A0: .4byte gUnknown_202273C _080324A4: bl GetMultiplayerId @@ -7977,7 +7977,7 @@ _080324B8: ldr r0, [r0] ldrb r4, [r0, 0x8] _080324BE: - ldr r5, _0803256C @ =gUnknown_2023BC4 + ldr r5, _0803256C @ =gActiveBattler ldrb r1, [r5] adds r0, r4, 0 bl sub_8034750 @@ -8060,7 +8060,7 @@ _080324BE: bx r0 .align 2, 0 _08032568: .4byte gSaveBlock2Ptr -_0803256C: .4byte gUnknown_2023BC4 +_0803256C: .4byte gActiveBattler _08032570: .4byte gUnknown_20244DC _08032574: .4byte gUnknown_8239F8C _08032578: .4byte gUnknown_2023D44 @@ -8075,7 +8075,7 @@ _0803258C: .4byte sub_802F768 PlayerHandleTrainerSlideBack: @ 8032590 push {r4-r6,lr} ldr r5, _08032630 @ =gUnknown_2023D44 - ldr r6, _08032634 @ =gUnknown_2023BC4 + ldr r6, _08032634 @ =gActiveBattler ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -8152,7 +8152,7 @@ PlayerHandleTrainerSlideBack: @ 8032590 bx r0 .align 2, 0 _08032630: .4byte gUnknown_2023D44 -_08032634: .4byte gUnknown_2023BC4 +_08032634: .4byte gActiveBattler _08032638: .4byte gSprites _0803263C: .4byte 0x0000ffd8 _08032640: .4byte sub_8075590 @@ -8166,7 +8166,7 @@ sub_8032650: @ 8032650 push {r4-r6,lr} ldr r6, _0803269C @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _080326A0 @ =gUnknown_2023BC4 + ldr r5, _080326A0 @ =gActiveBattler ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -8202,7 +8202,7 @@ _08032684: b _0803271A .align 2, 0 _0803269C: .4byte gUnknown_2024018 -_080326A0: .4byte gUnknown_2023BC4 +_080326A0: .4byte gActiveBattler _080326A4: ldrb r1, [r3] movs r0, 0x40 @@ -8212,14 +8212,14 @@ _080326A4: cmp r4, 0 bne _0803271A strb r4, [r3, 0x4] - ldr r2, _08032720 @ =gUnknown_2023BCE + ldr r2, _08032720 @ =gBattlerPartyIndexes ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _08032724 @ =gUnknown_2024284 + ldr r2, _08032724 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange movs r1, 0x40 @@ -8266,8 +8266,8 @@ _0803271A: pop {r0} bx r0 .align 2, 0 -_08032720: .4byte gUnknown_2023BCE -_08032724: .4byte gUnknown_2024284 +_08032720: .4byte gBattlerPartyIndexes +_08032724: .4byte gPlayerParty _08032728: .4byte gSprites _0803272C: .4byte gUnknown_2023D44 _08032730: .4byte sub_8012110 @@ -8304,7 +8304,7 @@ sub_803275C: @ 803275C ldr r1, _080327A0 @ =gUnknown_2024005 movs r0, 0x1 strb r0, [r1] - ldr r5, _080327A4 @ =gUnknown_2023BC4 + ldr r5, _080327A4 @ =gActiveBattler ldrb r4, [r5] movs r0, 0x1 bl GetBankByIdentity @@ -8327,7 +8327,7 @@ sub_803275C: @ 803275C .align 2, 0 _0803279C: .4byte gUnknown_2024018 _080327A0: .4byte gUnknown_2024005 -_080327A4: .4byte gUnknown_2023BC4 +_080327A4: .4byte gActiveBattler _080327A8: .4byte gUnknown_3004FE0 _080327AC: .4byte CompleteOnSpecialAnimDone thumb_func_end sub_803275C @@ -8336,7 +8336,7 @@ _080327AC: .4byte CompleteOnSpecialAnimDone PlayerHandleBallThrowAnim: @ 80327B0 push {r4,r5,lr} ldr r1, _080327F8 @ =gUnknown_2022BC4 - ldr r5, _080327FC @ =gUnknown_2023BC4 + ldr r5, _080327FC @ =gActiveBattler ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -8370,7 +8370,7 @@ PlayerHandleBallThrowAnim: @ 80327B0 bx r0 .align 2, 0 _080327F8: .4byte gUnknown_2022BC4 -_080327FC: .4byte gUnknown_2023BC4 +_080327FC: .4byte gActiveBattler _08032800: .4byte gUnknown_2024018 _08032804: .4byte gUnknown_2024005 _08032808: .4byte gUnknown_3004FE0 @@ -8381,7 +8381,7 @@ _0803280C: .4byte CompleteOnSpecialAnimDone PlayerHandlePause: @ 8032810 push {lr} ldr r1, _08032838 @ =gUnknown_2022BC4 - ldr r0, _0803283C @ =gUnknown_2023BC4 + ldr r0, _0803283C @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -8401,13 +8401,13 @@ _0803282E: bx r0 .align 2, 0 _08032838: .4byte gUnknown_2022BC4 -_0803283C: .4byte gUnknown_2023BC4 +_0803283C: .4byte gActiveBattler thumb_func_end PlayerHandlePause thumb_func_start PlayerHandleMoveAnimation PlayerHandleMoveAnimation: @ 8032840 push {r4-r6,lr} - ldr r6, _08032924 @ =gUnknown_2023BC4 + ldr r6, _08032924 @ =gActiveBattler ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -8518,7 +8518,7 @@ _08032852: bl PlayerBufferExecCompleted b _08032966 .align 2, 0 -_08032924: .4byte gUnknown_2023BC4 +_08032924: .4byte gActiveBattler _08032928: .4byte gUnknown_2022BC4 _0803292C: .4byte gUnknown_2037F16 _08032930: .4byte gUnknown_2037EEC @@ -8561,7 +8561,7 @@ sub_8032978: @ 8032978 mov r5, r8 push {r5-r7} ldr r2, _080329C4 @ =gUnknown_2022BC4 - ldr r6, _080329C8 @ =gUnknown_2023BC4 + ldr r6, _080329C8 @ =gActiveBattler ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -8595,7 +8595,7 @@ sub_8032978: @ 8032978 b _08032AEC .align 2, 0 _080329C4: .4byte gUnknown_2022BC4 -_080329C8: .4byte gUnknown_2023BC4 +_080329C8: .4byte gActiveBattler _080329CC: .4byte gUnknown_2024018 _080329D0: cmp r2, 0x2 @@ -8691,7 +8691,7 @@ _08032A3A: _08032A88: ldr r0, _08032AA8 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _08032AAC @ =gUnknown_2023BC4 + ldr r0, _08032AAC @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -8705,7 +8705,7 @@ _08032A88: _08032AA0: .4byte gUnknown_2037EDC _08032AA4: .4byte gUnknown_2037EE1 _08032AA8: .4byte gUnknown_2024018 -_08032AAC: .4byte gUnknown_2023BC4 +_08032AAC: .4byte gActiveBattler _08032AB0: ldrb r1, [r0] movs r0, 0x40 @@ -8752,7 +8752,7 @@ sub_8032AFC: @ 8032AFC strh r1, [r0] ldr r0, _08032B34 @ =gUnknown_2022976 strh r1, [r0] - ldr r0, _08032B38 @ =gUnknown_2023BC4 + ldr r0, _08032B38 @ =gActiveBattler ldrb r4, [r0] lsls r4, 9 ldr r0, _08032B3C @ =gUnknown_2022BC6 @@ -8771,7 +8771,7 @@ sub_8032AFC: @ 8032AFC .align 2, 0 _08032B30: .4byte gUnknown_2022974 _08032B34: .4byte gUnknown_2022976 -_08032B38: .4byte gUnknown_2023BC4 +_08032B38: .4byte gActiveBattler _08032B3C: .4byte gUnknown_2022BC6 _08032B40: .4byte gUnknown_202298C _08032B44: @@ -8780,7 +8780,7 @@ _08032B44: bl sub_80D87BC _08032B4C: ldr r1, _08032B64 @ =gUnknown_3004FE0 - ldr r0, _08032B68 @ =gUnknown_2023BC4 + ldr r0, _08032B68 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -8792,14 +8792,14 @@ _08032B4C: .align 2, 0 _08032B60: .4byte gUnknown_202298C _08032B64: .4byte gUnknown_3004FE0 -_08032B68: .4byte gUnknown_2023BC4 +_08032B68: .4byte gActiveBattler _08032B6C: .4byte sub_8030610 thumb_func_end sub_8032AFC thumb_func_start sub_8032B70 sub_8032B70: @ 8032B70 push {lr} - ldr r0, _08032B88 @ =gUnknown_2023BC4 + ldr r0, _08032B88 @ =gActiveBattler ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -8808,7 +8808,7 @@ sub_8032B70: @ 8032B70 bl sub_8032AFC b _08032B90 .align 2, 0 -_08032B88: .4byte gUnknown_2023BC4 +_08032B88: .4byte gActiveBattler _08032B8C: bl PlayerBufferExecCompleted _08032B90: @@ -8830,7 +8830,7 @@ sub_8032B94: @ 8032B94 movs r0, 0xA0 strh r0, [r1] ldr r1, _08032BC8 @ =gUnknown_3004FE0 - ldr r0, _08032BCC @ =gUnknown_2023BC4 + ldr r0, _08032BCC @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -8843,7 +8843,7 @@ _08032BBA: _08032BC0: .4byte gUnknown_2022974 _08032BC4: .4byte gUnknown_2022976 _08032BC8: .4byte gUnknown_3004FE0 -_08032BCC: .4byte gUnknown_2023BC4 +_08032BCC: .4byte gActiveBattler _08032BD0: .4byte sub_802E438 thumb_func_end sub_8032B94 @@ -8851,7 +8851,7 @@ _08032BD0: .4byte sub_802E438 sub_8032BD4: @ 8032BD4 push {r4,lr} ldr r1, _08032C28 @ =gUnknown_3004FE0 - ldr r0, _08032C2C @ =gUnknown_2023BC4 + ldr r0, _08032C2C @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -8872,7 +8872,7 @@ _08032BF6: cmp r4, 0x3 ble _08032BF6 ldr r1, _08032C3C @ =gUnknown_2023FF8 - ldr r0, _08032C2C @ =gUnknown_2023BC4 + ldr r0, _08032C2C @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -8888,7 +8888,7 @@ _08032BF6: bx r0 .align 2, 0 _08032C28: .4byte gUnknown_3004FE0 -_08032C2C: .4byte gUnknown_2023BC4 +_08032C2C: .4byte gActiveBattler _08032C30: .4byte sub_8032B94 _08032C34: .4byte gUnknown_83FDA4C _08032C38: .4byte gUnknown_83FE725 @@ -8918,7 +8918,7 @@ sub_8032C4C: @ 8032C4C adds r0, r2, 0 strh r0, [r1] ldr r1, _08032C84 @ =gUnknown_3004FE0 - ldr r0, _08032C88 @ =gUnknown_2023BC4 + ldr r0, _08032C88 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -8931,7 +8931,7 @@ _08032C76: _08032C7C: .4byte gUnknown_2022974 _08032C80: .4byte gUnknown_2022976 _08032C84: .4byte gUnknown_3004FE0 -_08032C88: .4byte gUnknown_2023BC4 +_08032C88: .4byte gActiveBattler _08032C8C: .4byte sub_802EA10 thumb_func_end sub_8032C4C @@ -8940,7 +8940,7 @@ sub_8032C90: @ 8032C90 push {lr} bl sub_8032CB4 ldr r1, _08032CA8 @ =gUnknown_3004FE0 - ldr r0, _08032CAC @ =gUnknown_2023BC4 + ldr r0, _08032CAC @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -8950,7 +8950,7 @@ sub_8032C90: @ 8032C90 bx r0 .align 2, 0 _08032CA8: .4byte gUnknown_3004FE0 -_08032CAC: .4byte gUnknown_2023BC4 +_08032CAC: .4byte gActiveBattler _08032CB0: .4byte sub_8032C4C thumb_func_end sub_8032C90 @@ -8962,7 +8962,7 @@ sub_8032CB4: @ 8032CB4 movs r0, 0xFF strb r0, [r1] ldr r1, _08032CE4 @ =gUnknown_2023FFC - ldr r0, _08032CE8 @ =gUnknown_2023BC4 + ldr r0, _08032CE8 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -8976,7 +8976,7 @@ sub_8032CB4: @ 8032CB4 .align 2, 0 _08032CE0: .4byte gUnknown_3004FF4 _08032CE4: .4byte gUnknown_2023FFC -_08032CE8: .4byte gUnknown_2023BC4 +_08032CE8: .4byte gActiveBattler thumb_func_end sub_8032CB4 thumb_func_start sub_8032CEC @@ -8991,7 +8991,7 @@ sub_8032CEC: @ 8032CEC movs r3, 0x10 bl BeginNormalPaletteFade ldr r1, _08032D38 @ =gUnknown_3004FE0 - ldr r2, _08032D3C @ =gUnknown_2023BC4 + ldr r2, _08032D3C @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -9021,7 +9021,7 @@ _08032D1A: bx r0 .align 2, 0 _08032D38: .4byte gUnknown_3004FE0 -_08032D3C: .4byte gUnknown_2023BC4 +_08032D3C: .4byte gActiveBattler _08032D40: .4byte sub_8030700 _08032D44: .4byte gUnknown_2024004 _08032D48: .4byte gUnknown_203B0DC @@ -9036,7 +9036,7 @@ sub_8032D50: @ 8032D50 movs r1, 0xFF bl CreateTask ldr r3, _08032E04 @ =gUnknown_3004FFC - ldr r4, _08032E08 @ =gUnknown_2023BC4 + ldr r4, _08032E08 @ =gActiveBattler ldrb r1, [r4] adds r1, r3 strb r0, [r1] @@ -9056,7 +9056,7 @@ sub_8032D50: @ 8032D50 movs r0, 0xF ands r0, r2 strh r0, [r1, 0x8] - ldr r3, _08032E14 @ =gUnknown_2023FE8 + ldr r3, _08032E14 @ =gBattleStruct ldr r1, [r3] adds r1, 0x49 ldrb r0, [r4] @@ -9103,7 +9103,7 @@ _08032DBC: movs r3, 0x10 bl BeginNormalPaletteFade ldr r1, _08032E1C @ =gUnknown_3004FE0 - ldr r2, _08032E08 @ =gUnknown_2023BC4 + ldr r2, _08032E08 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -9119,10 +9119,10 @@ _08032DBC: .align 2, 0 _08032E00: .4byte nullsub_43 _08032E04: .4byte gUnknown_3004FFC -_08032E08: .4byte gUnknown_2023BC4 +_08032E08: .4byte gActiveBattler _08032E0C: .4byte gUnknown_3005090 _08032E10: .4byte gUnknown_2022BC4 -_08032E14: .4byte gUnknown_2023FE8 +_08032E14: .4byte gBattleStruct _08032E18: .4byte gUnknown_203B0DC _08032E1C: .4byte gUnknown_3004FE0 _08032E20: .4byte sub_8030628 @@ -9158,7 +9158,7 @@ sub_8032E4C: @ 8032E4C movs r0, 0 bl LoadBattleBarGfx ldr r3, _08032EC4 @ =gUnknown_2022BC4 - ldr r0, _08032EC8 @ =gUnknown_2023BC4 + ldr r0, _08032EC8 @ =gActiveBattler mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -9175,13 +9175,13 @@ sub_8032E4C: @ 8032E4C ldr r0, _08032ECC @ =0x00007fff cmp r7, r0 beq _08032EDC - ldr r6, _08032ED0 @ =gUnknown_2023BCE + ldr r6, _08032ED0 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _08032ED4 @ =gUnknown_2024284 + ldr r4, _08032ED4 @ =gPlayerParty adds r0, r4 movs r1, 0x3A bl GetMonData @@ -9207,19 +9207,19 @@ sub_8032E4C: @ 8032E4C b _08032F16 .align 2, 0 _08032EC4: .4byte gUnknown_2022BC4 -_08032EC8: .4byte gUnknown_2023BC4 +_08032EC8: .4byte gActiveBattler _08032ECC: .4byte 0x00007fff -_08032ED0: .4byte gUnknown_2023BCE -_08032ED4: .4byte gUnknown_2024284 +_08032ED0: .4byte gBattlerPartyIndexes +_08032ED4: .4byte gPlayerParty _08032ED8: .4byte gUnknown_3004FF0 _08032EDC: - ldr r1, _08032F34 @ =gUnknown_2023BCE + ldr r1, _08032F34 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08032F38 @ =gUnknown_2024284 + ldr r1, _08032F38 @ =gPlayerParty adds r0, r1 movs r1, 0x3A bl GetMonData @@ -9241,7 +9241,7 @@ _08032EDC: bl sub_8048440 _08032F16: ldr r1, _08032F40 @ =gUnknown_3004FE0 - ldr r0, _08032F44 @ =gUnknown_2023BC4 + ldr r0, _08032F44 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -9255,11 +9255,11 @@ _08032F16: pop {r0} bx r0 .align 2, 0 -_08032F34: .4byte gUnknown_2023BCE -_08032F38: .4byte gUnknown_2024284 +_08032F34: .4byte gBattlerPartyIndexes +_08032F38: .4byte gPlayerParty _08032F3C: .4byte gUnknown_3004FF0 _08032F40: .4byte gUnknown_3004FE0 -_08032F44: .4byte gUnknown_2023BC4 +_08032F44: .4byte gActiveBattler _08032F48: .4byte CompleteOnHealthbarDone thumb_func_end sub_8032E4C @@ -9267,7 +9267,7 @@ _08032F48: .4byte CompleteOnHealthbarDone PlayerHandleExpUpdate: @ 8032F4C push {r4-r7,lr} ldr r5, _08032F78 @ =gUnknown_2022BC4 - ldr r6, _08032F7C @ =gUnknown_2023BC4 + ldr r6, _08032F7C @ =gActiveBattler ldrb r0, [r6] lsls r0, 9 adds r1, r5, 0x1 @@ -9276,7 +9276,7 @@ PlayerHandleExpUpdate: @ 8032F4C movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08032F80 @ =gUnknown_2024284 + ldr r0, _08032F80 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x38 @@ -9287,8 +9287,8 @@ PlayerHandleExpUpdate: @ 8032F4C b _08032FD0 .align 2, 0 _08032F78: .4byte gUnknown_2022BC4 -_08032F7C: .4byte gUnknown_2023BC4 -_08032F80: .4byte gUnknown_2024284 +_08032F7C: .4byte gActiveBattler +_08032F80: .4byte gPlayerParty _08032F84: movs r0, 0x1 bl LoadBattleBarGfx @@ -9339,7 +9339,7 @@ _08032FE4: .4byte nullsub_13 thumb_func_start sub_8032FE8 sub_8032FE8: @ 8032FE8 push {r4,lr} - ldr r4, _08033044 @ =gUnknown_2023BC4 + ldr r4, _08033044 @ =gActiveBattler ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -9349,13 +9349,13 @@ sub_8032FE8: @ 8032FE8 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _0803304C @ =gUnknown_2023BCE + ldr r2, _0803304C @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08033050 @ =gUnknown_2024284 + ldr r2, _08033050 @ =gPlayerParty adds r1, r2 movs r2, 0x9 bl UpdateHealthboxAttribute @@ -9383,10 +9383,10 @@ _0803303C: pop {r0} bx r0 .align 2, 0 -_08033044: .4byte gUnknown_2023BC4 +_08033044: .4byte gActiveBattler _08033048: .4byte gUnknown_3004FF0 -_0803304C: .4byte gUnknown_2023BCE -_08033050: .4byte gUnknown_2024284 +_0803304C: .4byte gBattlerPartyIndexes +_08033050: .4byte gPlayerParty _08033054: .4byte gUnknown_2024018 _08033058: .4byte gUnknown_3004FE0 _0803305C: .4byte CompleteOnFinishedStatusAnimation @@ -9395,7 +9395,7 @@ _0803305C: .4byte CompleteOnFinishedStatusAnimation thumb_func_start sub_8033060 sub_8033060: @ 8033060 push {r4,r5,lr} - ldr r5, _080330B8 @ =gUnknown_2023BC4 + ldr r5, _080330B8 @ =gActiveBattler ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -9437,7 +9437,7 @@ _080330B0: pop {r0} bx r0 .align 2, 0 -_080330B8: .4byte gUnknown_2023BC4 +_080330B8: .4byte gActiveBattler _080330BC: .4byte gUnknown_2022BC4 _080330C0: .4byte gUnknown_3004FE0 _080330C4: .4byte CompleteOnFinishedStatusAnimation @@ -9449,16 +9449,16 @@ PlayerHandleStatusXor: @ 80330C8 mov r6, r8 push {r6} sub sp, 0x4 - ldr r0, _08033124 @ =gUnknown_2023BCE + ldr r0, _08033124 @ =gBattlerPartyIndexes mov r8, r0 - ldr r4, _08033128 @ =gUnknown_2023BC4 + ldr r4, _08033128 @ =gActiveBattler ldrb r0, [r4] lsls r0, 1 add r0, r8 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _0803312C @ =gUnknown_2024284 + ldr r5, _0803312C @ =gPlayerParty adds r0, r5 movs r1, 0x37 bl GetMonData @@ -9488,9 +9488,9 @@ PlayerHandleStatusXor: @ 80330C8 pop {r0} bx r0 .align 2, 0 -_08033124: .4byte gUnknown_2023BCE -_08033128: .4byte gUnknown_2023BC4 -_0803312C: .4byte gUnknown_2024284 +_08033124: .4byte gBattlerPartyIndexes +_08033128: .4byte gActiveBattler +_0803312C: .4byte gPlayerParty _08033130: .4byte gUnknown_2022BC4 thumb_func_end PlayerHandleStatusXor @@ -9506,7 +9506,7 @@ sub_8033134: @ 8033134 PlayerHandleDMA3Transfer: @ 8033140 push {r4,r5,lr} ldr r3, _080331A4 @ =gUnknown_2022BC4 - ldr r0, _080331A8 @ =gUnknown_2023BC4 + ldr r0, _080331A8 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 adds r0, r3, 0x1 @@ -9555,7 +9555,7 @@ PlayerHandleDMA3Transfer: @ 8033140 b _080331DC .align 2, 0 _080331A4: .4byte gUnknown_2022BC4 -_080331A8: .4byte gUnknown_2023BC4 +_080331A8: .4byte gActiveBattler _080331AC: .4byte 0x040000d4 _080331B0: ldr r3, _080331E8 @ =0x040000d4 @@ -9595,7 +9595,7 @@ _080331F0: .4byte 0xfffff000 PlayerHandlePlayBGM: @ 80331F4 push {lr} ldr r2, _0803321C @ =gUnknown_2022BC4 - ldr r0, _08033220 @ =gUnknown_2023BC4 + ldr r0, _08033220 @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -9612,7 +9612,7 @@ PlayerHandlePlayBGM: @ 80331F4 bx r0 .align 2, 0 _0803321C: .4byte gUnknown_2022BC4 -_08033220: .4byte gUnknown_2023BC4 +_08033220: .4byte gActiveBattler thumb_func_end PlayerHandlePlayBGM thumb_func_start sub_8033224 @@ -9690,7 +9690,7 @@ PlayerHandleCmd38: @ 803329C push {lr} ldr r3, _080332C8 @ =gUnknown_2022870 ldr r1, _080332CC @ =gUnknown_2022BC4 - ldr r0, _080332D0 @ =gUnknown_2023BC4 + ldr r0, _080332D0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -9710,7 +9710,7 @@ PlayerHandleCmd38: @ 803329C .align 2, 0 _080332C8: .4byte gUnknown_2022870 _080332CC: .4byte gUnknown_2022BC4 -_080332D0: .4byte gUnknown_2023BC4 +_080332D0: .4byte gActiveBattler thumb_func_end PlayerHandleCmd38 thumb_func_start PlayerHandleCmd39 @@ -9755,7 +9755,7 @@ PlayerHandleHitAnimation: @ 8033314 push {r4,lr} ldr r3, _0803333C @ =gSprites ldr r2, _08033340 @ =gUnknown_2023D44 - ldr r4, _08033344 @ =gUnknown_2023BC4 + ldr r4, _08033344 @ =gActiveBattler ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -9773,7 +9773,7 @@ PlayerHandleHitAnimation: @ 8033314 .align 2, 0 _0803333C: .4byte gSprites _08033340: .4byte gUnknown_2023D44 -_08033344: .4byte gUnknown_2023BC4 +_08033344: .4byte gActiveBattler _08033348: ldr r1, _08033378 @ =gUnknown_2024005 movs r0, 0x1 @@ -9816,7 +9816,7 @@ sub_8033384: @ 8033384 thumb_func_start PlayerHandlePlaySE PlayerHandlePlaySE: @ 8033390 push {r4,lr} - ldr r4, _080333CC @ =gUnknown_2023BC4 + ldr r4, _080333CC @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -9844,7 +9844,7 @@ _080333A4: pop {r0} bx r0 .align 2, 0 -_080333CC: .4byte gUnknown_2023BC4 +_080333CC: .4byte gActiveBattler _080333D0: .4byte gUnknown_2022BC4 thumb_func_end PlayerHandlePlaySE @@ -9852,7 +9852,7 @@ _080333D0: .4byte gUnknown_2022BC4 PlayerHandlecmd44: @ 80333D4 push {lr} ldr r2, _080333FC @ =gUnknown_2022BC4 - ldr r0, _08033400 @ =gUnknown_2023BC4 + ldr r0, _08033400 @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -9869,21 +9869,21 @@ PlayerHandlecmd44: @ 80333D4 bx r0 .align 2, 0 _080333FC: .4byte gUnknown_2022BC4 -_08033400: .4byte gUnknown_2023BC4 +_08033400: .4byte gActiveBattler thumb_func_end PlayerHandlecmd44 thumb_func_start PlayerHandleFaintingCry PlayerHandleFaintingCry: @ 8033404 push {lr} - ldr r1, _08033438 @ =gUnknown_2023BCE - ldr r0, _0803343C @ =gUnknown_2023BC4 + ldr r1, _08033438 @ =gBattlerPartyIndexes + ldr r0, _0803343C @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08033440 @ =gUnknown_2024284 + ldr r1, _08033440 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -9897,16 +9897,16 @@ PlayerHandleFaintingCry: @ 8033404 pop {r0} bx r0 .align 2, 0 -_08033438: .4byte gUnknown_2023BCE -_0803343C: .4byte gUnknown_2023BC4 -_08033440: .4byte gUnknown_2024284 +_08033438: .4byte gBattlerPartyIndexes +_0803343C: .4byte gActiveBattler +_08033440: .4byte gPlayerParty thumb_func_end PlayerHandleFaintingCry thumb_func_start PlayerHandleIntroSlide PlayerHandleIntroSlide: @ 8033444 push {lr} ldr r1, _0803346C @ =gUnknown_2022BC4 - ldr r0, _08033470 @ =gUnknown_2023BC4 + ldr r0, _08033470 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -9923,7 +9923,7 @@ PlayerHandleIntroSlide: @ 8033444 bx r0 .align 2, 0 _0803346C: .4byte gUnknown_2022BC4 -_08033470: .4byte gUnknown_2023BC4 +_08033470: .4byte gActiveBattler _08033474: .4byte gUnknown_2023F4C thumb_func_end PlayerHandleIntroSlide @@ -9931,7 +9931,7 @@ _08033474: .4byte gUnknown_2023F4C PlayerHandleIntroTrainerBallThrow: @ 8033478 push {r4-r7,lr} ldr r6, _080335B8 @ =gUnknown_2023D44 - ldr r7, _080335BC @ =gUnknown_2023BC4 + ldr r7, _080335BC @ =gActiveBattler ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] @@ -10086,7 +10086,7 @@ _0803359A: bx r0 .align 2, 0 _080335B8: .4byte gUnknown_2023D44 -_080335BC: .4byte gUnknown_2023BC4 +_080335BC: .4byte gActiveBattler _080335C0: .4byte gSprites _080335C4: .4byte 0x0000ffd8 _080335C8: .4byte sub_80755B8 @@ -10119,13 +10119,13 @@ sub_80335F8: @ 80335F8 bl FreeSpritePaletteByTag adds r0, r5, 0 bl DestroySprite - ldr r1, _08033650 @ =gUnknown_2023BCE + ldr r1, _08033650 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08033654 @ =gUnknown_2024284 + ldr r1, _08033654 @ =gPlayerParty adds r0, r1 adds r1, r4, 0 bl sub_8034498 @@ -10143,8 +10143,8 @@ sub_80335F8: @ 80335F8 pop {r0} bx r0 .align 2, 0 -_08033650: .4byte gUnknown_2023BCE -_08033654: .4byte gUnknown_2024284 +_08033650: .4byte gBattlerPartyIndexes +_08033654: .4byte gPlayerParty _08033658: .4byte gUnknown_2023D44 _0803365C: .4byte gSprites thumb_func_end sub_80335F8 @@ -10174,7 +10174,7 @@ task05_08033660: @ 8033660 .align 2, 0 _08033688: .4byte gUnknown_3005090 _0803368C: - ldr r7, _080336CC @ =gUnknown_2023BC4 + ldr r7, _080336CC @ =gActiveBattler ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -10183,7 +10183,7 @@ _0803368C: lsls r0, 24 cmp r0, 0 beq _080336AC - ldr r0, _080336D0 @ =gUnknown_2022B4C + ldr r0, _080336D0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -10195,7 +10195,7 @@ _080336AC: lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _080336D8 @ =gUnknown_2023BCE + ldr r0, _080336D8 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -10205,17 +10205,17 @@ _080336AC: bl sub_8031FF4 b _08033730 .align 2, 0 -_080336CC: .4byte gUnknown_2023BC4 -_080336D0: .4byte gUnknown_2022B4C +_080336CC: .4byte gActiveBattler +_080336D0: .4byte gBattleTypeFlags _080336D4: .4byte gUnknown_2022BC4 -_080336D8: .4byte gUnknown_2023BCE +_080336D8: .4byte gBattlerPartyIndexes _080336DC: ldr r4, _08033754 @ =gUnknown_2022BC4 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, _08033758 @ =gUnknown_2023BCE + ldr r5, _08033758 @ =gBattlerPartyIndexes lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -10240,7 +10240,7 @@ _080336DC: ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0803375C @ =gUnknown_2024284 + ldr r2, _0803375C @ =gPlayerParty adds r0, r2 bl sub_8034498 ldrb r0, [r7] @@ -10251,7 +10251,7 @@ _080336DC: strb r0, [r7] _08033730: ldr r1, _08033760 @ =gUnknown_3004FE0 - ldr r2, _08033764 @ =gUnknown_2023BC4 + ldr r2, _08033764 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -10270,10 +10270,10 @@ _08033748: bx r0 .align 2, 0 _08033754: .4byte gUnknown_2022BC4 -_08033758: .4byte gUnknown_2023BCE -_0803375C: .4byte gUnknown_2024284 +_08033758: .4byte gBattlerPartyIndexes +_0803375C: .4byte gPlayerParty _08033760: .4byte gUnknown_3004FE0 -_08033764: .4byte gUnknown_2023BC4 +_08033764: .4byte gActiveBattler _08033768: .4byte sub_802FA58 thumb_func_end task05_08033660 @@ -10281,7 +10281,7 @@ _08033768: .4byte sub_802FA58 PlayerHandleDrawPartyStatusSummary: @ 803376C push {r4-r6,lr} ldr r1, _08033794 @ =gUnknown_2022BC4 - ldr r0, _08033798 @ =gUnknown_2023BC4 + ldr r0, _08033798 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -10298,11 +10298,11 @@ PlayerHandleDrawPartyStatusSummary: @ 803376C b _08033810 .align 2, 0 _08033794: .4byte gUnknown_2022BC4 -_08033798: .4byte gUnknown_2023BC4 +_08033798: .4byte gActiveBattler _0803379C: ldr r6, _08033818 @ =gUnknown_2024018 ldr r0, [r6] - ldr r5, _0803381C @ =gUnknown_2023BC4 + ldr r5, _0803381C @ =gActiveBattler ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -10364,7 +10364,7 @@ _08033810: bx r0 .align 2, 0 _08033818: .4byte gUnknown_2024018 -_0803381C: .4byte gUnknown_2023BC4 +_0803381C: .4byte gActiveBattler _08033820: .4byte gUnknown_2022BC8 _08033824: .4byte gUnknown_2024000 _08033828: .4byte gUnknown_3004FE0 @@ -10376,7 +10376,7 @@ sub_8033830: @ 8033830 push {r4,lr} ldr r4, _08033870 @ =gUnknown_2024018 ldr r0, [r4] - ldr r3, _08033874 @ =gUnknown_2023BC4 + ldr r3, _08033874 @ =gActiveBattler ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -10406,7 +10406,7 @@ _08033868: bx r0 .align 2, 0 _08033870: .4byte gUnknown_2024018 -_08033874: .4byte gUnknown_2023BC4 +_08033874: .4byte gActiveBattler thumb_func_end sub_8033830 thumb_func_start PlayerHandleCmd49 @@ -10414,7 +10414,7 @@ PlayerHandleCmd49: @ 8033878 push {lr} ldr r0, _080338B4 @ =gUnknown_2024018 ldr r1, [r0] - ldr r0, _080338B8 @ =gUnknown_2023BC4 + ldr r0, _080338B8 @ =gActiveBattler ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -10442,7 +10442,7 @@ _080338AA: bx r0 .align 2, 0 _080338B4: .4byte gUnknown_2024018 -_080338B8: .4byte gUnknown_2023BC4 +_080338B8: .4byte gActiveBattler _080338BC: .4byte gUnknown_3005090 _080338C0: .4byte gUnknown_2024000 _080338C4: .4byte sub_80491B0 @@ -10451,7 +10451,7 @@ _080338C4: .4byte sub_80491B0 thumb_func_start sub_80338C8 sub_80338C8: @ 80338C8 push {r4,lr} - ldr r4, _080338E8 @ =gUnknown_2023BC4 + ldr r4, _080338E8 @ =gActiveBattler ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free @@ -10463,13 +10463,13 @@ sub_80338C8: @ 80338C8 pop {r0} bx r0 .align 2, 0 -_080338E8: .4byte gUnknown_2023BC4 +_080338E8: .4byte gActiveBattler thumb_func_end sub_80338C8 thumb_func_start PlayerHandleSpriteInvisibility PlayerHandleSpriteInvisibility: @ 80338EC push {r4,lr} - ldr r4, _0803393C @ =gUnknown_2023BC4 + ldr r4, _0803393C @ =gActiveBattler ldrb r0, [r4] bl sub_8075224 lsls r0, 24 @@ -10507,7 +10507,7 @@ _08033932: pop {r0} bx r0 .align 2, 0 -_0803393C: .4byte gUnknown_2023BC4 +_0803393C: .4byte gActiveBattler _08033940: .4byte gSprites _08033944: .4byte gUnknown_2023D44 _08033948: .4byte gUnknown_2022BC4 @@ -10517,7 +10517,7 @@ _08033948: .4byte gUnknown_2022BC4 PlayerHandleBattleAnimation: @ 803394C push {r4-r6,lr} sub sp, 0x4 - ldr r6, _08033990 @ =gUnknown_2023BC4 + ldr r6, _08033990 @ =gActiveBattler ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -10547,7 +10547,7 @@ PlayerHandleBattleAnimation: @ 803394C bl PlayerBufferExecCompleted b _080339A4 .align 2, 0 -_08033990: .4byte gUnknown_2023BC4 +_08033990: .4byte gActiveBattler _08033994: .4byte gUnknown_2022BC4 _08033998: ldr r0, _080339AC @ =gUnknown_3004FE0 @@ -10570,7 +10570,7 @@ _080339B0: .4byte CompleteOnFinishedBattleAnimation PlayerHandleLinkStandbyMsg: @ 80339B4 push {r4,lr} ldr r1, _080339D4 @ =gUnknown_2022BC4 - ldr r0, _080339D8 @ =gUnknown_2023BC4 + ldr r0, _080339D8 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -10585,7 +10585,7 @@ PlayerHandleLinkStandbyMsg: @ 80339B4 b _08033A04 .align 2, 0 _080339D4: .4byte gUnknown_2022BC4 -_080339D8: .4byte gUnknown_2023BC4 +_080339D8: .4byte gActiveBattler _080339DC: cmp r0, 0x2 beq _08033A00 @@ -10593,7 +10593,7 @@ _080339DC: _080339E2: bl PrintLinkStandbyMsg _080339E6: - ldr r4, _080339FC @ =gUnknown_2023BC4 + ldr r4, _080339FC @ =gActiveBattler ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free @@ -10602,7 +10602,7 @@ _080339E6: bl dp11b_obj_free b _08033A04 .align 2, 0 -_080339FC: .4byte gUnknown_2023BC4 +_080339FC: .4byte gActiveBattler _08033A00: bl PrintLinkStandbyMsg _08033A04: @@ -10616,7 +10616,7 @@ _08033A04: PlayerHandleResetActionMoveSelection: @ 8033A10 push {r4,lr} ldr r1, _08033A30 @ =gUnknown_2022BC4 - ldr r4, _08033A34 @ =gUnknown_2023BC4 + ldr r4, _08033A34 @ =gActiveBattler ldrb r3, [r4] lsls r0, r3, 9 adds r1, 0x1 @@ -10631,7 +10631,7 @@ PlayerHandleResetActionMoveSelection: @ 8033A10 b _08033A68 .align 2, 0 _08033A30: .4byte gUnknown_2022BC4 -_08033A34: .4byte gUnknown_2023BC4 +_08033A34: .4byte gActiveBattler _08033A38: cmp r2, 0x2 beq _08033A60 @@ -10673,7 +10673,7 @@ PlayerHandlecmd55: @ 8033A78 push {r4,lr} ldr r2, _08033AB0 @ =gUnknown_2023E8A ldr r1, _08033AB4 @ =gUnknown_2022BC4 - ldr r4, _08033AB8 @ =gUnknown_2023BC4 + ldr r4, _08033AB8 @ =gActiveBattler ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -10697,7 +10697,7 @@ PlayerHandlecmd55: @ 8033A78 .align 2, 0 _08033AB0: .4byte gUnknown_2023E8A _08033AB4: .4byte gUnknown_2022BC4 -_08033AB8: .4byte gUnknown_2023BC4 +_08033AB8: .4byte gActiveBattler _08033ABC: .4byte gUnknown_3004FE0 _08033AC0: .4byte sub_802F6A8 thumb_func_end PlayerHandlecmd55 @@ -10713,7 +10713,7 @@ sub_8033AC8: @ 8033AC8 sub sp, 0x4 movs r5, 0 movs r6, 0 - ldr r0, _08033B14 @ =gUnknown_2022B4C + ldr r0, _08033B14 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -10721,7 +10721,7 @@ sub_8033AC8: @ 8033AC8 bne _08033ADE b _08033DA2 _08033ADE: - ldr r3, _08033B18 @ =gUnknown_2023BC4 + ldr r3, _08033B18 @ =gActiveBattler ldrb r1, [r3] lsls r2, r1, 9 ldr r0, _08033B1C @ =gUnknown_2022BC8 @@ -10748,12 +10748,12 @@ _08033ADE: ands r1, r0 b _08033B30 .align 2, 0 -_08033B14: .4byte gUnknown_2022B4C -_08033B18: .4byte gUnknown_2023BC4 +_08033B14: .4byte gBattleTypeFlags +_08033B18: .4byte gActiveBattler _08033B1C: .4byte gUnknown_2022BC8 _08033B20: .4byte gUnknown_2023FFC _08033B24: - ldr r1, _08033B40 @ =gUnknown_8250C04 + ldr r1, _08033B40 @ =gBattleMoves lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -10770,7 +10770,7 @@ _08033B36: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08033B40: .4byte gUnknown_8250C04 +_08033B40: .4byte gBattleMoves _08033B44: .4byte _08033B48 .align 2, 0 _08033B48: @@ -10850,7 +10850,7 @@ _08033C54: adds r4, r0, 0 movs r0, 0x3 bl GetBankByIdentity - ldr r1, _08033C7C @ =gUnknown_825E45C + ldr r1, _08033C7C @ =gBitTable lsls r4, 24 lsrs r4, 22 adds r4, r1 @@ -10863,7 +10863,7 @@ _08033C54: lsls r5, r1, 16 b _08033D90 .align 2, 0 -_08033C7C: .4byte gUnknown_825E45C +_08033C7C: .4byte gBitTable _08033C80: cmp r4, 0xDB beq _08033CEA @@ -10931,7 +10931,7 @@ _08033CEA: adds r4, r0, 0 movs r0, 0x2 bl GetBankByIdentity - ldr r1, _08033D10 @ =gUnknown_825E45C + ldr r1, _08033D10 @ =gBitTable lsls r4, 24 lsrs r4, 22 adds r4, r1 @@ -10944,7 +10944,7 @@ _08033CEA: lsls r5, r1, 16 b _08033D90 .align 2, 0 -_08033D10: .4byte gUnknown_825E45C +_08033D10: .4byte gBitTable _08033D14: ldrb r0, [r3] bl GetBankIdentity @@ -10953,16 +10953,16 @@ _08033D14: lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r1, _08033D34 @ =gUnknown_825E45C + ldr r1, _08033D34 @ =gBitTable lsls r0, 24 lsrs r0, 22 adds r0, r1 ldr r0, [r0] b _08033D42 .align 2, 0 -_08033D34: .4byte gUnknown_825E45C +_08033D34: .4byte gBitTable _08033D38: - ldr r0, _08033D48 @ =gUnknown_825E45C + ldr r0, _08033D48 @ =gBitTable ldrb r1, [r3] lsls r1, 2 adds r1, r0 @@ -10971,12 +10971,12 @@ _08033D42: lsls r5, r0, 16 b _08033D90 .align 2, 0 -_08033D48: .4byte gUnknown_825E45C +_08033D48: .4byte gBitTable _08033D4C: movs r0, 0x1 bl GetBankByIdentity adds r5, r0, 0 - ldr r0, _08033DAC @ =gUnknown_2023BC4 + ldr r0, _08033DAC @ =gActiveBattler ldrb r0, [r0] bl GetBankIdentity movs r1, 0x2 @@ -10987,7 +10987,7 @@ _08033D4C: adds r4, r0, 0 movs r0, 0x3 bl GetBankByIdentity - ldr r3, _08033DB0 @ =gUnknown_825E45C + ldr r3, _08033DB0 @ =gBitTable lsls r5, 24 lsrs r5, 22 adds r5, r3 @@ -11019,8 +11019,8 @@ _08033DA2: pop {r0} bx r0 .align 2, 0 -_08033DAC: .4byte gUnknown_2023BC4 -_08033DB0: .4byte gUnknown_825E45C +_08033DAC: .4byte gActiveBattler +_08033DB0: .4byte gBitTable _08033DB4: .4byte 0x00007fff thumb_func_end sub_8033AC8 diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index ede49cd61..f114d7a05 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -13,13 +13,13 @@ nullsub_99: @ 81560A0 thumb_func_start sub_81560A4 sub_81560A4: @ 81560A4 ldr r1, _081560C8 @ =gUnknown_3004FE0 - ldr r0, _081560CC @ =gUnknown_2023BC4 + ldr r0, _081560CC @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 ldr r1, _081560D0 @ =sub_81560DC str r1, [r0] - ldr r2, _081560D4 @ =gUnknown_2023FE8 + ldr r2, _081560D4 @ =gBattleStruct ldr r0, [r2] adds r0, 0x96 ldr r1, _081560D8 @ =gUnknown_20370C0 @@ -32,9 +32,9 @@ sub_81560A4: @ 81560A4 bx lr .align 2, 0 _081560C8: .4byte gUnknown_3004FE0 -_081560CC: .4byte gUnknown_2023BC4 +_081560CC: .4byte gActiveBattler _081560D0: .4byte sub_81560DC -_081560D4: .4byte gUnknown_2023FE8 +_081560D4: .4byte gBattleStruct _081560D8: .4byte gUnknown_20370C0 thumb_func_end sub_81560A4 @@ -42,8 +42,8 @@ _081560D8: .4byte gUnknown_20370C0 sub_81560DC: @ 81560DC push {r4,r5,lr} ldr r2, _08156120 @ =gUnknown_2023BC8 - ldr r1, _08156124 @ =gUnknown_825E45C - ldr r5, _08156128 @ =gUnknown_2023BC4 + ldr r1, _08156124 @ =gBitTable + ldr r5, _08156128 @ =gActiveBattler ldrb r3, [r5] lsls r0, r3, 2 adds r0, r1 @@ -74,8 +74,8 @@ sub_81560DC: @ 81560DC b _08156138 .align 2, 0 _08156120: .4byte gUnknown_2023BC8 -_08156124: .4byte gUnknown_825E45C -_08156128: .4byte gUnknown_2023BC4 +_08156124: .4byte gBitTable +_08156128: .4byte gActiveBattler _0815612C: .4byte gUnknown_2022BC4 _08156130: .4byte gUnknown_8478F1C _08156134: @@ -99,7 +99,7 @@ sub_815614C: @ 815614C push {lr} ldr r2, _08156174 @ =gSprites ldr r1, _08156178 @ =gUnknown_2023D44 - ldr r0, _0815617C @ =gUnknown_2023BC4 + ldr r0, _0815617C @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -119,7 +119,7 @@ _08156170: .align 2, 0 _08156174: .4byte gSprites _08156178: .4byte gUnknown_2023D44 -_0815617C: .4byte gUnknown_2023BC4 +_0815617C: .4byte gActiveBattler _08156180: .4byte SpriteCallbackDummy thumb_func_end sub_815614C @@ -128,7 +128,7 @@ sub_8156184: @ 8156184 push {r4-r7,lr} ldr r2, _081561E0 @ =gSprites ldr r0, _081561E4 @ =gUnknown_2023D44 - ldr r7, _081561E8 @ =gUnknown_2023BC4 + ldr r7, _081561E8 @ =gActiveBattler ldrb r3, [r7] adds r0, r3, r0 ldrb r1, [r0] @@ -159,12 +159,12 @@ sub_8156184: @ 8156184 ands r0, r5 cmp r0, 0 bne _081561F8 - ldr r0, _081561F0 @ =gUnknown_2023BCE + ldr r0, _081561F0 @ =gBattlerPartyIndexes adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081561F4 @ =gUnknown_202402C + ldr r0, _081561F4 @ =gEnemyParty adds r1, r0 adds r0, r3, 0 bl sub_80F1720 @@ -172,10 +172,10 @@ sub_8156184: @ 8156184 .align 2, 0 _081561E0: .4byte gSprites _081561E4: .4byte gUnknown_2023D44 -_081561E8: .4byte gUnknown_2023BC4 +_081561E8: .4byte gActiveBattler _081561EC: .4byte gUnknown_2024018 -_081561F0: .4byte gUnknown_2023BCE -_081561F4: .4byte gUnknown_202402C +_081561F0: .4byte gBattlerPartyIndexes +_081561F4: .4byte gEnemyParty _081561F8: ldrb r0, [r1, 0x1] ands r2, r0 @@ -261,7 +261,7 @@ sub_8156294: @ 8156294 push {r4,lr} ldr r0, _081562DC @ =gUnknown_2024018 ldr r0, [r0] - ldr r4, _081562E0 @ =gUnknown_2023BC4 + ldr r4, _081562E0 @ =gActiveBattler ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -276,14 +276,14 @@ sub_8156294: @ 8156294 ldr r0, _081562E4 @ =c3_0802FDF4 movs r1, 0xA bl CreateTask - ldr r2, _081562E8 @ =gUnknown_2023BCE + ldr r2, _081562E8 @ =gBattlerPartyIndexes ldrb r1, [r4] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081562EC @ =gUnknown_2024284 + ldr r2, _081562EC @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange bl PlayerPartnerBufferExecCompleted @@ -293,10 +293,10 @@ _081562D4: bx r0 .align 2, 0 _081562DC: .4byte gUnknown_2024018 -_081562E0: .4byte gUnknown_2023BC4 +_081562E0: .4byte gActiveBattler _081562E4: .4byte c3_0802FDF4 -_081562E8: .4byte gUnknown_2023BCE -_081562EC: .4byte gUnknown_2024284 +_081562E8: .4byte gBattlerPartyIndexes +_081562EC: .4byte gPlayerParty thumb_func_end sub_8156294 thumb_func_start sub_81562F0 @@ -304,7 +304,7 @@ sub_81562F0: @ 81562F0 push {r4-r6,lr} ldr r2, _08156388 @ =gSprites ldr r0, _0815638C @ =gUnknown_3004FF0 - ldr r6, _08156390 @ =gUnknown_2023BC4 + ldr r6, _08156390 @ =gActiveBattler ldrb r3, [r6] adds r0, r3, r0 ldrb r1, [r0] @@ -378,7 +378,7 @@ _08156380: .align 2, 0 _08156388: .4byte gSprites _0815638C: .4byte gUnknown_3004FF0 -_08156390: .4byte gUnknown_2023BC4 +_08156390: .4byte gActiveBattler _08156394: .4byte SpriteCallbackDummy _08156398: .4byte gUnknown_2024018 _0815639C: .4byte 0x000027f9 @@ -391,7 +391,7 @@ sub_81563A8: @ 81563A8 push {r4-r6,lr} ldr r6, _0815645C @ =gUnknown_2024018 ldr r0, [r6] - ldr r5, _08156460 @ =gUnknown_2023BC4 + ldr r5, _08156460 @ =gActiveBattler ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -403,12 +403,12 @@ sub_81563A8: @ 81563A8 ands r0, r1 cmp r0, 0 bne _081563DA - ldr r0, _08156464 @ =gUnknown_2023BCE + ldr r0, _08156464 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08156468 @ =gUnknown_2024284 + ldr r0, _08156468 @ =gPlayerParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -445,13 +445,13 @@ _081563DA: ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08156464 @ =gUnknown_2023BCE + ldr r2, _08156464 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08156468 @ =gUnknown_2024284 + ldr r2, _08156468 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -475,9 +475,9 @@ _08156454: bx r0 .align 2, 0 _0815645C: .4byte gUnknown_2024018 -_08156460: .4byte gUnknown_2023BC4 -_08156464: .4byte gUnknown_2023BCE -_08156468: .4byte gUnknown_2024284 +_08156460: .4byte gActiveBattler +_08156464: .4byte gBattlerPartyIndexes +_08156468: .4byte gPlayerParty _0815646C: .4byte gSprites _08156470: .4byte gUnknown_3004FFC _08156474: .4byte SpriteCallbackDummy @@ -506,7 +506,7 @@ sub_815649C: @ 815649C push {r4,lr} ldr r4, _081564DC @ =gUnknown_2024018 ldr r1, [r4] - ldr r3, _081564E0 @ =gUnknown_2023BC4 + ldr r3, _081564E0 @ =gActiveBattler ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -536,7 +536,7 @@ _081564D4: bx r0 .align 2, 0 _081564DC: .4byte gUnknown_2024018 -_081564E0: .4byte gUnknown_2023BC4 +_081564E0: .4byte gActiveBattler thumb_func_end sub_815649C thumb_func_start sub_81564E4 @@ -557,7 +557,7 @@ sub_81564F0: @ 81564F0 cmp r0, 0 bne _08156520 ldr r1, _08156528 @ =gUnknown_3004FE0 - ldr r2, _0815652C @ =gUnknown_2023BC4 + ldr r2, _0815652C @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -576,7 +576,7 @@ _08156520: .align 2, 0 _08156524: .4byte gUnknown_2037AB8 _08156528: .4byte gUnknown_3004FE0 -_0815652C: .4byte gUnknown_2023BC4 +_0815652C: .4byte gActiveBattler _08156530: .4byte sub_8156538 _08156534: .4byte gUnknown_3004FFC thumb_func_end sub_81564F0 @@ -634,7 +634,7 @@ sub_8156594: @ 8156594 cmp r0, 0 bne _081565E2 ldr r1, _081565CC @ =gUnknown_3004FE0 - ldr r0, _081565D0 @ =gUnknown_2023BC4 + ldr r0, _081565D0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -654,7 +654,7 @@ _081565C4: .align 2, 0 _081565C8: .4byte gUnknown_2037AB8 _081565CC: .4byte gUnknown_3004FE0 -_081565D0: .4byte gUnknown_2023BC4 +_081565D0: .4byte gActiveBattler _081565D4: .4byte sub_81565E8 _081565D8: .4byte gUnknown_20370C0 _081565DC: @@ -700,7 +700,7 @@ sub_8156624: @ 8156624 push {r4-r7,lr} ldr r4, _08156788 @ =gUnknown_2024018 ldr r0, [r4] - ldr r5, _0815678C @ =gUnknown_2023BC4 + ldr r5, _0815678C @ =gActiveBattler ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -713,12 +713,12 @@ sub_8156624: @ 8156624 ands r0, r1 cmp r0, 0 bne _08156658 - ldr r0, _08156790 @ =gUnknown_2023BCE + ldr r0, _08156790 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08156794 @ =gUnknown_2024284 + ldr r0, _08156794 @ =gPlayerParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -738,12 +738,12 @@ _08156658: ands r0, r1 cmp r0, 0 bne _0815668A - ldr r0, _08156790 @ =gUnknown_2023BCE + ldr r0, _08156790 @ =gBattlerPartyIndexes adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08156794 @ =gUnknown_2024284 + ldr r0, _08156794 @ =gPlayerParty adds r1, r0 adds r0, r2, 0 bl sub_80F1720 @@ -776,7 +776,7 @@ _0815668A: lsls r0, 24 cmp r0, 0 beq _0815671E - ldr r0, _08156798 @ =gUnknown_2022B4C + ldr r0, _08156798 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -799,13 +799,13 @@ _0815668A: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08156790 @ =gUnknown_2023BCE + ldr r2, _08156790 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08156794 @ =gUnknown_2024284 + ldr r2, _08156794 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -819,7 +819,7 @@ _0815668A: bl SetHealthboxSpriteVisible _0815671E: ldr r1, _0815679C @ =gUnknown_3004FFC - ldr r4, _0815678C @ =gUnknown_2023BC4 + ldr r4, _0815678C @ =gActiveBattler ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -833,13 +833,13 @@ _0815671E: ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _08156790 @ =gUnknown_2023BCE + ldr r2, _08156790 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08156794 @ =gUnknown_2024284 + ldr r2, _08156794 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -869,10 +869,10 @@ _08156780: bx r0 .align 2, 0 _08156788: .4byte gUnknown_2024018 -_0815678C: .4byte gUnknown_2023BC4 -_08156790: .4byte gUnknown_2023BCE -_08156794: .4byte gUnknown_2024284 -_08156798: .4byte gUnknown_2022B4C +_0815678C: .4byte gActiveBattler +_08156790: .4byte gBattlerPartyIndexes +_08156794: .4byte gPlayerParty +_08156798: .4byte gBattleTypeFlags _0815679C: .4byte gUnknown_3004FFC _081567A0: .4byte gSprites _081567A4: .4byte gUnknown_3004FF0 @@ -888,7 +888,7 @@ sub_81567B0: @ 81567B0 movs r4, 0 ldr r2, _081568B0 @ =gSprites ldr r0, _081568B4 @ =gUnknown_3004FF0 - ldr r1, _081568B8 @ =gUnknown_2023BC4 + ldr r1, _081568B8 @ =gActiveBattler mov r8, r1 ldrb r3, [r1] adds r0, r3, r0 @@ -984,7 +984,7 @@ _081567DA: ldr r0, _081568C8 @ =c3_0802FDF4 movs r1, 0xA bl CreateTask - ldr r2, _081568CC @ =gUnknown_2023BCE + ldr r2, _081568CC @ =gBattlerPartyIndexes mov r0, r8 ldrb r1, [r0] lsls r0, r1, 1 @@ -992,7 +992,7 @@ _081567DA: ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081568D0 @ =gUnknown_2024284 + ldr r2, _081568D0 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange ldr r1, _081568D4 @ =gUnknown_3004FE0 @@ -1011,13 +1011,13 @@ _081568A6: .align 2, 0 _081568B0: .4byte gSprites _081568B4: .4byte gUnknown_3004FF0 -_081568B8: .4byte gUnknown_2023BC4 +_081568B8: .4byte gActiveBattler _081568BC: .4byte SpriteCallbackDummy _081568C0: .4byte gUnknown_2024018 _081568C4: .4byte 0x000027f9 _081568C8: .4byte c3_0802FDF4 -_081568CC: .4byte gUnknown_2023BCE -_081568D0: .4byte gUnknown_2024284 +_081568CC: .4byte gBattlerPartyIndexes +_081568D0: .4byte gPlayerParty _081568D4: .4byte gUnknown_3004FE0 _081568D8: .4byte sub_815649C thumb_func_end sub_81567B0 @@ -1051,7 +1051,7 @@ sub_81568DC: @ 81568DC lsrs r0, 24 cmp r0, 0x1 beq _08156922 - ldr r1, _081569E0 @ =gUnknown_2023BCE + ldr r1, _081569E0 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -1062,7 +1062,7 @@ _08156922: movs r0, 0x64 mov r1, r10 muls r1, r0 - ldr r0, _081569E4 @ =gUnknown_2024284 + ldr r0, _081569E4 @ =gPlayerParty adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB @@ -1083,7 +1083,7 @@ _08156922: ldr r3, _081569E8 @ =gUnknown_8253AE4 adds r4, 0x1 lsls r4, 2 - ldr r2, _081569EC @ =gUnknown_8254784 + ldr r2, _081569EC @ =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -1114,7 +1114,7 @@ _08156922: subs r2, r0 ldr r0, [sp, 0xC] subs r2, r0, r2 - ldr r4, _081569F0 @ =gUnknown_2023BC4 + ldr r4, _081569F0 @ =gActiveBattler ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -1128,7 +1128,7 @@ _08156922: lsrs r0, 24 cmp r0, 0x1 bne _081569F8 - ldr r2, _081569E0 @ =gUnknown_2023BCE + ldr r2, _081569E0 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r2 mov r1, r10 @@ -1147,11 +1147,11 @@ _081569D6: b _08156A3A .align 2, 0 _081569DC: .4byte gUnknown_3005090 -_081569E0: .4byte gUnknown_2023BCE -_081569E4: .4byte gUnknown_2024284 +_081569E0: .4byte gBattlerPartyIndexes +_081569E4: .4byte gPlayerParty _081569E8: .4byte gUnknown_8253AE4 -_081569EC: .4byte gUnknown_8254784 -_081569F0: .4byte gUnknown_2023BC4 +_081569EC: .4byte gBaseStats +_081569F0: .4byte gActiveBattler _081569F4: .4byte sub_8156C68 _081569F8: ldr r0, _08156A08 @ =gUnknown_3005090 @@ -1231,7 +1231,7 @@ sub_8156A54: @ 8156A54 movs r0, 0x64 adds r6, r1, 0 muls r6, r0 - ldr r0, _08156B10 @ =gUnknown_2024284 + ldr r0, _08156B10 @ =gPlayerParty adds r6, r0 adds r0, r6, 0 movs r1, 0x38 @@ -1251,7 +1251,7 @@ sub_8156A54: @ 8156A54 adds r3, r0, 0 ldr r6, _08156B14 @ =gUnknown_8253AE4 lsls r1, r4, 2 - ldr r2, _08156B18 @ =gUnknown_8254784 + ldr r2, _08156B18 @ =gBaseStats lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -1293,9 +1293,9 @@ sub_8156A54: @ 8156A54 bx r0 .align 2, 0 _08156B0C: .4byte gUnknown_3005090 -_08156B10: .4byte gUnknown_2024284 +_08156B10: .4byte gPlayerParty _08156B14: .4byte gUnknown_8253AE4 -_08156B18: .4byte gUnknown_8254784 +_08156B18: .4byte gBaseStats _08156B1C: .4byte gUnknown_3004FF0 _08156B20: .4byte sub_8156B24 thumb_func_end sub_8156A54 @@ -1355,7 +1355,7 @@ _08156B54: movs r0, 0x64 mov r1, r9 muls r1, r0 - ldr r0, _08156C20 @ =gUnknown_2024284 + ldr r0, _08156C20 @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x38 @@ -1375,7 +1375,7 @@ _08156B54: ldr r3, _08156C24 @ =gUnknown_8253AE4 adds r4, 0x1 lsls r4, 2 - ldr r2, _08156C28 @ =gUnknown_8254784 + ldr r2, _08156C28 @ =gBaseStats lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -1406,7 +1406,7 @@ _08156B54: ldrh r0, [r0] subs r2, r0 subs r2, r4, r2 - ldr r4, _08156C2C @ =gUnknown_2023BC4 + ldr r4, _08156C2C @ =gActiveBattler ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -1420,10 +1420,10 @@ _08156B54: b _08156C50 .align 2, 0 _08156C1C: .4byte gUnknown_3004FF0 -_08156C20: .4byte gUnknown_2024284 +_08156C20: .4byte gPlayerParty _08156C24: .4byte gUnknown_8253AE4 -_08156C28: .4byte gUnknown_8254784 -_08156C2C: .4byte gUnknown_2023BC4 +_08156C28: .4byte gBaseStats +_08156C2C: .4byte gActiveBattler _08156C30: .4byte sub_8156C68 _08156C34: str r0, [sp, 0x4] @@ -1469,7 +1469,7 @@ sub_8156C68: @ 8156C68 lsrs r0, 24 cmp r0, 0x1 bne _08156C9C - ldr r1, _08156CC0 @ =gUnknown_2023BCE + ldr r1, _08156CC0 @ =gBattlerPartyIndexes movs r0, 0x2 adds r2, r4, 0 eors r2, r0 @@ -1497,7 +1497,7 @@ _08156C9C: bx r0 .align 2, 0 _08156CBC: .4byte gUnknown_3005090 -_08156CC0: .4byte gUnknown_2023BCE +_08156CC0: .4byte gBattlerPartyIndexes _08156CC4: .4byte sub_8156CC8 thumb_func_end sub_8156C68 @@ -1528,7 +1528,7 @@ sub_8156CC8: @ 8156CC8 movs r0, 0x64 adds r1, r4, 0 muls r1, r0 - ldr r0, _08156D3C @ =gUnknown_2024284 + ldr r0, _08156D3C @ =gPlayerParty adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x38 @@ -1538,7 +1538,7 @@ sub_8156CC8: @ 8156CC8 lsrs r0, 24 cmp r0, 0x1 bne _08156D48 - ldr r1, _08156D40 @ =gUnknown_2023BCE + ldr r1, _08156D40 @ =gBattlerPartyIndexes movs r0, 0x2 adds r2, r5, 0 eors r2, r0 @@ -1557,8 +1557,8 @@ sub_8156CC8: @ 8156CC8 .align 2, 0 _08156D34: .4byte gUnknown_3005090 _08156D38: .4byte gUnknown_2024018 -_08156D3C: .4byte gUnknown_2024284 -_08156D40: .4byte gUnknown_2023BCE +_08156D3C: .4byte gPlayerParty +_08156D40: .4byte gBattlerPartyIndexes _08156D44: .4byte gUnknown_3004FF0 _08156D48: ldr r0, _08156D70 @ =gUnknown_3004FF0 @@ -1566,7 +1566,7 @@ _08156D48: ldrb r0, [r0] movs r1, 0x64 muls r1, r4 - ldr r2, _08156D74 @ =gUnknown_2024284 + ldr r2, _08156D74 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -1584,7 +1584,7 @@ _08156D6A: bx r0 .align 2, 0 _08156D70: .4byte gUnknown_3004FF0 -_08156D74: .4byte gUnknown_2024284 +_08156D74: .4byte gPlayerParty _08156D78: .4byte gUnknown_3005090 _08156D7C: .4byte sub_8156D80 thumb_func_end sub_8156CC8 @@ -1603,7 +1603,7 @@ sub_8156D80: @ 8156D80 ldrb r1, [r4, 0x8] movs r0, 0x64 muls r0, r1 - ldr r1, _08156DC0 @ =gUnknown_2024284 + ldr r1, _08156DC0 @ =gPlayerParty adds r0, r1 movs r1, 0x38 bl GetMonData @@ -1620,7 +1620,7 @@ sub_8156D80: @ 8156D80 bx r0 .align 2, 0 _08156DBC: .4byte gUnknown_3005090 -_08156DC0: .4byte gUnknown_2024284 +_08156DC0: .4byte gPlayerParty _08156DC4: .4byte gUnknown_3004FE0 _08156DC8: .4byte sub_8156EE8 thumb_func_end sub_8156D80 @@ -1628,7 +1628,7 @@ _08156DC8: .4byte sub_8156EE8 thumb_func_start sub_8156DCC sub_8156DCC: @ 8156DCC push {r4-r6,lr} - ldr r4, _08156E2C @ =gUnknown_2023BC4 + ldr r4, _08156E2C @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1670,7 +1670,7 @@ sub_8156DCC: @ 8156DCC bl PlayerPartnerBufferExecCompleted b _08156E66 .align 2, 0 -_08156E2C: .4byte gUnknown_2023BC4 +_08156E2C: .4byte gActiveBattler _08156E30: .4byte gSprites _08156E34: .4byte gUnknown_2023D44 _08156E38: .4byte gUnknown_3004FF0 @@ -1707,7 +1707,7 @@ _08156E74: .4byte gUnknown_3004FF0 thumb_func_start sub_8156E78 sub_8156E78: @ 8156E78 push {r4-r6,lr} - ldr r5, _08156EB8 @ =gUnknown_2023BC4 + ldr r5, _08156EB8 @ =gActiveBattler ldrb r0, [r5] ldr r6, _08156EBC @ =gUnknown_3004FF0 adds r1, r0, r6 @@ -1735,17 +1735,17 @@ sub_8156E78: @ 8156E78 bl sub_8048440 b _08156EDA .align 2, 0 -_08156EB8: .4byte gUnknown_2023BC4 +_08156EB8: .4byte gActiveBattler _08156EBC: .4byte gUnknown_3004FF0 _08156EC0: - ldr r2, _08156EE0 @ =gUnknown_2023BCE + ldr r2, _08156EE0 @ =gBattlerPartyIndexes ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _08156EE4 @ =gUnknown_2024284 + ldr r2, _08156EE4 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange bl PlayerPartnerBufferExecCompleted @@ -1754,8 +1754,8 @@ _08156EDA: pop {r0} bx r0 .align 2, 0 -_08156EE0: .4byte gUnknown_2023BCE -_08156EE4: .4byte gUnknown_2024284 +_08156EE0: .4byte gBattlerPartyIndexes +_08156EE4: .4byte gPlayerParty thumb_func_end sub_8156E78 thumb_func_start sub_8156EE8 @@ -1776,7 +1776,7 @@ _08156EFA: sub_8156F00: @ 8156F00 push {r4,lr} ldr r1, _08156F3C @ =gUnknown_2023D44 - ldr r0, _08156F40 @ =gUnknown_2023BC4 + ldr r0, _08156F40 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -1804,7 +1804,7 @@ sub_8156F00: @ 8156F00 b _08156F76 .align 2, 0 _08156F3C: .4byte gUnknown_2023D44 -_08156F40: .4byte gUnknown_2023BC4 +_08156F40: .4byte gActiveBattler _08156F44: .4byte gSprites _08156F48: .4byte gUnknown_2024005 _08156F4C: @@ -1841,7 +1841,7 @@ sub_8156F7C: @ 8156F7C push {r4-r6,lr} ldr r0, _08156FD8 @ =gUnknown_2024018 ldr r0, [r0] - ldr r6, _08156FDC @ =gUnknown_2023BC4 + ldr r6, _08156FDC @ =gActiveBattler ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -1882,7 +1882,7 @@ _08156FD0: bx r0 .align 2, 0 _08156FD8: .4byte gUnknown_2024018 -_08156FDC: .4byte gUnknown_2023BC4 +_08156FDC: .4byte gActiveBattler _08156FE0: .4byte gUnknown_2023D44 _08156FE4: .4byte gSprites _08156FE8: .4byte gUnknown_3004FF0 @@ -1893,7 +1893,7 @@ sub_8156FEC: @ 8156FEC push {lr} ldr r2, _08157014 @ =gSprites ldr r1, _08157018 @ =gUnknown_2023D44 - ldr r0, _0815701C @ =gUnknown_2023BC4 + ldr r0, _0815701C @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -1913,7 +1913,7 @@ _08157010: .align 2, 0 _08157014: .4byte gSprites _08157018: .4byte gUnknown_2023D44 -_0815701C: .4byte gUnknown_2023BC4 +_0815701C: .4byte gActiveBattler _08157020: .4byte SpriteCallbackDummy thumb_func_end sub_8156FEC @@ -1922,7 +1922,7 @@ sub_8157024: @ 8157024 push {lr} ldr r0, _0815704C @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _08157050 @ =gUnknown_2023BC4 + ldr r0, _08157050 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1940,7 +1940,7 @@ _08157046: bx r0 .align 2, 0 _0815704C: .4byte gUnknown_2024018 -_08157050: .4byte gUnknown_2023BC4 +_08157050: .4byte gActiveBattler thumb_func_end sub_8157024 thumb_func_start sub_8157054 @@ -1948,7 +1948,7 @@ sub_8157054: @ 8157054 push {lr} ldr r0, _0815707C @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _08157080 @ =gUnknown_2023BC4 + ldr r0, _08157080 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1966,7 +1966,7 @@ _08157076: bx r0 .align 2, 0 _0815707C: .4byte gUnknown_2024018 -_08157080: .4byte gUnknown_2023BC4 +_08157080: .4byte gActiveBattler thumb_func_end sub_8157054 thumb_func_start PlayerPartnerBufferExecCompleted @@ -1974,13 +1974,13 @@ PlayerPartnerBufferExecCompleted: @ 8157084 push {r4,lr} sub sp, 0x4 ldr r1, _081570C4 @ =gUnknown_3004FE0 - ldr r4, _081570C8 @ =gUnknown_2023BC4 + ldr r4, _081570C8 @ =gActiveBattler ldrb r0, [r4] lsls r0, 2 adds r0, r1 ldr r1, _081570CC @ =sub_81560DC str r1, [r0] - ldr r0, _081570D0 @ =gUnknown_2022B4C + ldr r0, _081570D0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -2002,13 +2002,13 @@ PlayerPartnerBufferExecCompleted: @ 8157084 b _081570EA .align 2, 0 _081570C4: .4byte gUnknown_3004FE0 -_081570C8: .4byte gUnknown_2023BC4 +_081570C8: .4byte gActiveBattler _081570CC: .4byte sub_81560DC -_081570D0: .4byte gUnknown_2022B4C +_081570D0: .4byte gBattleTypeFlags _081570D4: .4byte gUnknown_2022BC4 _081570D8: ldr r2, _081570F4 @ =gUnknown_2023BC8 - ldr r1, _081570F8 @ =gUnknown_825E45C + ldr r1, _081570F8 @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -2023,7 +2023,7 @@ _081570EA: bx r0 .align 2, 0 _081570F4: .4byte gUnknown_2023BC8 -_081570F8: .4byte gUnknown_825E45C +_081570F8: .4byte gBitTable thumb_func_end PlayerPartnerBufferExecCompleted thumb_func_start CompleteOnFinishedStatusAnimation_7 @@ -2031,7 +2031,7 @@ CompleteOnFinishedStatusAnimation_7: @ 81570FC push {lr} ldr r0, _08157124 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _08157128 @ =gUnknown_2023BC4 + ldr r0, _08157128 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -2049,7 +2049,7 @@ _0815711E: bx r0 .align 2, 0 _08157124: .4byte gUnknown_2024018 -_08157128: .4byte gUnknown_2023BC4 +_08157128: .4byte gActiveBattler thumb_func_end CompleteOnFinishedStatusAnimation_7 thumb_func_start sub_815712C @@ -2058,7 +2058,7 @@ sub_815712C: @ 815712C sub sp, 0x100 movs r6, 0 ldr r1, _08157158 @ =gUnknown_2022BC4 - ldr r0, _0815715C @ =gUnknown_2023BC4 + ldr r0, _0815715C @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -2066,7 +2066,7 @@ sub_815712C: @ 815712C ldrb r0, [r1] cmp r0, 0 bne _08157164 - ldr r0, _08157160 @ =gUnknown_2023BCE + ldr r0, _08157160 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -2076,8 +2076,8 @@ sub_815712C: @ 815712C b _08157186 .align 2, 0 _08157158: .4byte gUnknown_2022BC4 -_0815715C: .4byte gUnknown_2023BC4 -_08157160: .4byte gUnknown_2023BCE +_0815715C: .4byte gActiveBattler +_08157160: .4byte gBattlerPartyIndexes _08157164: ldrb r4, [r1] movs r5, 0 @@ -2122,7 +2122,7 @@ sub_81571A0: @ 81571A0 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _081571CC @ =gUnknown_2023BC4 + ldr r0, _081571CC @ =gActiveBattler ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -2131,20 +2131,20 @@ sub_81571A0: @ 81571A0 movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081571D0 @ =gUnknown_2024284 + ldr r0, _081571D0 @ =gPlayerParty b _081571DC .align 2, 0 -_081571CC: .4byte gUnknown_2023BC4 -_081571D0: .4byte gUnknown_2024284 +_081571CC: .4byte gActiveBattler +_081571D0: .4byte gPlayerParty _081571D4: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081571FC @ =gUnknown_202402C + ldr r0, _081571FC @ =gEnemyParty _081571DC: adds r6, r1, r0 ldr r3, _08157200 @ =gUnknown_2022BC4 - ldr r2, _08157204 @ =gUnknown_2023BC4 + ldr r2, _08157204 @ =gActiveBattler ldrb r0, [r2] lsls r0, 9 adds r1, r3, 0x1 @@ -2160,9 +2160,9 @@ _081571F2: ldr r0, [r0] mov pc, r0 .align 2, 0 -_081571FC: .4byte gUnknown_202402C +_081571FC: .4byte gEnemyParty _08157200: .4byte gUnknown_2022BC4 -_08157204: .4byte gUnknown_2023BC4 +_08157204: .4byte gActiveBattler _08157208: .4byte _0815720C .align 2, 0 _0815720C: @@ -2807,7 +2807,7 @@ sub_8157750: @ 8157750 sub_815775C: @ 815775C push {r4,r5,lr} ldr r1, _08157780 @ =gUnknown_2022BC4 - ldr r0, _08157784 @ =gUnknown_2023BC4 + ldr r0, _08157784 @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -2815,7 +2815,7 @@ sub_815775C: @ 815775C ldrb r0, [r1] cmp r0, 0 bne _0815778C - ldr r0, _08157788 @ =gUnknown_2023BCE + ldr r0, _08157788 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -2823,8 +2823,8 @@ sub_815775C: @ 815775C b _081577AA .align 2, 0 _08157780: .4byte gUnknown_2022BC4 -_08157784: .4byte gUnknown_2023BC4 -_08157788: .4byte gUnknown_2023BCE +_08157784: .4byte gActiveBattler +_08157788: .4byte gBattlerPartyIndexes _0815778C: ldrb r4, [r1] movs r5, 0 @@ -2859,7 +2859,7 @@ sub_81577B4: @ 81577B4 sub sp, 0x30 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081577E4 @ =gUnknown_2023BC4 + ldr r0, _081577E4 @ =gActiveBattler ldrb r0, [r0] lsls r2, r0, 9 ldr r1, _081577E8 @ =gUnknown_2022BC7 @@ -2872,21 +2872,21 @@ sub_81577B4: @ 81577B4 movs r0, 0x64 adds r1, r4, 0 muls r1, r0 - ldr r0, _081577EC @ =gUnknown_2024284 + ldr r0, _081577EC @ =gPlayerParty b _081577F8 .align 2, 0 -_081577E4: .4byte gUnknown_2023BC4 +_081577E4: .4byte gActiveBattler _081577E8: .4byte gUnknown_2022BC7 -_081577EC: .4byte gUnknown_2024284 +_081577EC: .4byte gPlayerParty _081577F0: movs r0, 0x64 adds r1, r4, 0 muls r1, r0 - ldr r0, _0815781C @ =gUnknown_202402C + ldr r0, _0815781C @ =gEnemyParty _081577F8: adds r6, r1, r0 ldr r2, _08157820 @ =gUnknown_2022BC4 - ldr r0, _08157824 @ =gUnknown_2023BC4 + ldr r0, _08157824 @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, r2, 0x1 @@ -2903,9 +2903,9 @@ _08157812: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815781C: .4byte gUnknown_202402C +_0815781C: .4byte gEnemyParty _08157820: .4byte gUnknown_2022BC4 -_08157824: .4byte gUnknown_2023BC4 +_08157824: .4byte gActiveBattler _08157828: .4byte _0815782C .align 2, 0 _0815782C: @@ -3145,7 +3145,7 @@ _0815797A: bl sub_804037C b _0815809A _08157AA4: - ldr r0, _08157AB8 @ =gUnknown_2023BC4 + ldr r0, _08157AB8 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157ABC @ =gUnknown_2022BC7 @@ -3155,10 +3155,10 @@ _08157AA4: bl sub_804037C b _0815809A .align 2, 0 -_08157AB8: .4byte gUnknown_2023BC4 +_08157AB8: .4byte gActiveBattler _08157ABC: .4byte gUnknown_2022BC7 _08157AC0: - ldr r0, _08157AD4 @ =gUnknown_2023BC4 + ldr r0, _08157AD4 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157AD8 @ =gUnknown_2022BC7 @@ -3168,7 +3168,7 @@ _08157AC0: bl sub_804037C b _0815809A .align 2, 0 -_08157AD4: .4byte gUnknown_2023BC4 +_08157AD4: .4byte gActiveBattler _08157AD8: .4byte gUnknown_2022BC7 _08157ADC: movs r4, 0 @@ -3199,7 +3199,7 @@ _08157AE8: bl sub_804037C b _0815809A _08157B16: - ldr r0, _08157B28 @ =gUnknown_2023BC4 + ldr r0, _08157B28 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 adds r0, r3, 0x1 @@ -3208,9 +3208,9 @@ _08157B16: adds r1, 0x9 b _08157B96 .align 2, 0 -_08157B28: .4byte gUnknown_2023BC4 +_08157B28: .4byte gActiveBattler _08157B2C: - ldr r5, _08157B80 @ =gUnknown_2023BC4 + ldr r5, _08157B80 @ =gActiveBattler ldrb r2, [r5] lsls r2, 9 ldr r4, _08157B84 @ =gUnknown_2022BC7 @@ -3248,10 +3248,10 @@ _08157B2C: bl sub_804037C b _0815809A .align 2, 0 -_08157B80: .4byte gUnknown_2023BC4 +_08157B80: .4byte gActiveBattler _08157B84: .4byte gUnknown_2022BC7 _08157B88: - ldr r0, _08157BA4 @ =gUnknown_2023BC4 + ldr r0, _08157BA4 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 adds r0, r3, 0x1 @@ -3265,9 +3265,9 @@ _08157B96: bl sub_804037C b _0815809A .align 2, 0 -_08157BA4: .4byte gUnknown_2023BC4 +_08157BA4: .4byte gActiveBattler _08157BA8: - ldr r0, _08157BBC @ =gUnknown_2023BC4 + ldr r0, _08157BBC @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157BC0 @ =gUnknown_2022BC7 @@ -3277,10 +3277,10 @@ _08157BA8: bl sub_804037C b _0815809A .align 2, 0 -_08157BBC: .4byte gUnknown_2023BC4 +_08157BBC: .4byte gActiveBattler _08157BC0: .4byte gUnknown_2022BC7 _08157BC4: - ldr r0, _08157BD8 @ =gUnknown_2023BC4 + ldr r0, _08157BD8 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157BDC @ =gUnknown_2022BC7 @@ -3290,10 +3290,10 @@ _08157BC4: bl sub_804037C b _0815809A .align 2, 0 -_08157BD8: .4byte gUnknown_2023BC4 +_08157BD8: .4byte gActiveBattler _08157BDC: .4byte gUnknown_2022BC7 _08157BE0: - ldr r0, _08157BF4 @ =gUnknown_2023BC4 + ldr r0, _08157BF4 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157BF8 @ =gUnknown_2022BC7 @@ -3303,10 +3303,10 @@ _08157BE0: bl sub_804037C b _0815809A .align 2, 0 -_08157BF4: .4byte gUnknown_2023BC4 +_08157BF4: .4byte gActiveBattler _08157BF8: .4byte gUnknown_2022BC7 _08157BFC: - ldr r0, _08157C10 @ =gUnknown_2023BC4 + ldr r0, _08157C10 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157C14 @ =gUnknown_2022BC7 @@ -3316,10 +3316,10 @@ _08157BFC: bl sub_804037C b _0815809A .align 2, 0 -_08157C10: .4byte gUnknown_2023BC4 +_08157C10: .4byte gActiveBattler _08157C14: .4byte gUnknown_2022BC7 _08157C18: - ldr r0, _08157C2C @ =gUnknown_2023BC4 + ldr r0, _08157C2C @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157C30 @ =gUnknown_2022BC7 @@ -3329,10 +3329,10 @@ _08157C18: bl sub_804037C b _0815809A .align 2, 0 -_08157C2C: .4byte gUnknown_2023BC4 +_08157C2C: .4byte gActiveBattler _08157C30: .4byte gUnknown_2022BC7 _08157C34: - ldr r0, _08157C48 @ =gUnknown_2023BC4 + ldr r0, _08157C48 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157C4C @ =gUnknown_2022BC7 @@ -3342,10 +3342,10 @@ _08157C34: bl sub_804037C b _0815809A .align 2, 0 -_08157C48: .4byte gUnknown_2023BC4 +_08157C48: .4byte gActiveBattler _08157C4C: .4byte gUnknown_2022BC7 _08157C50: - ldr r0, _08157C64 @ =gUnknown_2023BC4 + ldr r0, _08157C64 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157C68 @ =gUnknown_2022BC7 @@ -3355,10 +3355,10 @@ _08157C50: bl sub_804037C b _0815809A .align 2, 0 -_08157C64: .4byte gUnknown_2023BC4 +_08157C64: .4byte gActiveBattler _08157C68: .4byte gUnknown_2022BC7 _08157C6C: - ldr r0, _08157C80 @ =gUnknown_2023BC4 + ldr r0, _08157C80 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157C84 @ =gUnknown_2022BC7 @@ -3368,10 +3368,10 @@ _08157C6C: bl sub_804037C b _0815809A .align 2, 0 -_08157C80: .4byte gUnknown_2023BC4 +_08157C80: .4byte gActiveBattler _08157C84: .4byte gUnknown_2022BC7 _08157C88: - ldr r0, _08157C9C @ =gUnknown_2023BC4 + ldr r0, _08157C9C @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157CA0 @ =gUnknown_2022BC7 @@ -3381,10 +3381,10 @@ _08157C88: bl sub_804037C b _0815809A .align 2, 0 -_08157C9C: .4byte gUnknown_2023BC4 +_08157C9C: .4byte gActiveBattler _08157CA0: .4byte gUnknown_2022BC7 _08157CA4: - ldr r0, _08157CB8 @ =gUnknown_2023BC4 + ldr r0, _08157CB8 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157CBC @ =gUnknown_2022BC7 @@ -3394,10 +3394,10 @@ _08157CA4: bl sub_804037C b _0815809A .align 2, 0 -_08157CB8: .4byte gUnknown_2023BC4 +_08157CB8: .4byte gActiveBattler _08157CBC: .4byte gUnknown_2022BC7 _08157CC0: - ldr r0, _08157CD4 @ =gUnknown_2023BC4 + ldr r0, _08157CD4 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157CD8 @ =gUnknown_2022BC7 @@ -3407,10 +3407,10 @@ _08157CC0: bl sub_804037C b _0815809A .align 2, 0 -_08157CD4: .4byte gUnknown_2023BC4 +_08157CD4: .4byte gActiveBattler _08157CD8: .4byte gUnknown_2022BC7 _08157CDC: - ldr r0, _08157CF0 @ =gUnknown_2023BC4 + ldr r0, _08157CF0 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157CF4 @ =gUnknown_2022BC7 @@ -3420,10 +3420,10 @@ _08157CDC: bl sub_804037C b _0815809A .align 2, 0 -_08157CF0: .4byte gUnknown_2023BC4 +_08157CF0: .4byte gActiveBattler _08157CF4: .4byte gUnknown_2022BC7 _08157CF8: - ldr r0, _08157D0C @ =gUnknown_2023BC4 + ldr r0, _08157D0C @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157D10 @ =gUnknown_2022BC7 @@ -3433,10 +3433,10 @@ _08157CF8: bl sub_804037C b _0815809A .align 2, 0 -_08157D0C: .4byte gUnknown_2023BC4 +_08157D0C: .4byte gActiveBattler _08157D10: .4byte gUnknown_2022BC7 _08157D14: - ldr r0, _08157D28 @ =gUnknown_2023BC4 + ldr r0, _08157D28 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157D2C @ =gUnknown_2022BC7 @@ -3446,10 +3446,10 @@ _08157D14: bl sub_804037C b _0815809A .align 2, 0 -_08157D28: .4byte gUnknown_2023BC4 +_08157D28: .4byte gActiveBattler _08157D2C: .4byte gUnknown_2022BC7 _08157D30: - ldr r5, _08157D8C @ =gUnknown_2023BC4 + ldr r5, _08157D8C @ =gActiveBattler ldrb r2, [r5] lsls r2, 9 ldr r4, _08157D90 @ =gUnknown_2022BC7 @@ -3491,10 +3491,10 @@ _08157D30: adds r2, r4 b _08157E2A .align 2, 0 -_08157D8C: .4byte gUnknown_2023BC4 +_08157D8C: .4byte gActiveBattler _08157D90: .4byte gUnknown_2022BC7 _08157D94: - ldr r0, _08157DA8 @ =gUnknown_2023BC4 + ldr r0, _08157DA8 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157DAC @ =gUnknown_2022BC7 @@ -3504,10 +3504,10 @@ _08157D94: bl sub_804037C b _0815809A .align 2, 0 -_08157DA8: .4byte gUnknown_2023BC4 +_08157DA8: .4byte gActiveBattler _08157DAC: .4byte gUnknown_2022BC7 _08157DB0: - ldr r0, _08157DC4 @ =gUnknown_2023BC4 + ldr r0, _08157DC4 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157DC8 @ =gUnknown_2022BC7 @@ -3517,10 +3517,10 @@ _08157DB0: bl sub_804037C b _0815809A .align 2, 0 -_08157DC4: .4byte gUnknown_2023BC4 +_08157DC4: .4byte gActiveBattler _08157DC8: .4byte gUnknown_2022BC7 _08157DCC: - ldr r0, _08157DE0 @ =gUnknown_2023BC4 + ldr r0, _08157DE0 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157DE4 @ =gUnknown_2022BC7 @@ -3530,10 +3530,10 @@ _08157DCC: bl sub_804037C b _0815809A .align 2, 0 -_08157DE0: .4byte gUnknown_2023BC4 +_08157DE0: .4byte gActiveBattler _08157DE4: .4byte gUnknown_2022BC7 _08157DE8: - ldr r0, _08157DFC @ =gUnknown_2023BC4 + ldr r0, _08157DFC @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157E00 @ =gUnknown_2022BC7 @@ -3543,10 +3543,10 @@ _08157DE8: bl sub_804037C b _0815809A .align 2, 0 -_08157DFC: .4byte gUnknown_2023BC4 +_08157DFC: .4byte gActiveBattler _08157E00: .4byte gUnknown_2022BC7 _08157E04: - ldr r0, _08157E18 @ =gUnknown_2023BC4 + ldr r0, _08157E18 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157E1C @ =gUnknown_2022BC7 @@ -3556,10 +3556,10 @@ _08157E04: bl sub_804037C b _0815809A .align 2, 0 -_08157E18: .4byte gUnknown_2023BC4 +_08157E18: .4byte gActiveBattler _08157E1C: .4byte gUnknown_2022BC7 _08157E20: - ldr r0, _08157E34 @ =gUnknown_2023BC4 + ldr r0, _08157E34 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157E38 @ =gUnknown_2022BC7 @@ -3570,10 +3570,10 @@ _08157E2A: bl sub_804037C b _0815809A .align 2, 0 -_08157E34: .4byte gUnknown_2023BC4 +_08157E34: .4byte gActiveBattler _08157E38: .4byte gUnknown_2022BC7 _08157E3C: - ldr r0, _08157E50 @ =gUnknown_2023BC4 + ldr r0, _08157E50 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157E54 @ =gUnknown_2022BC7 @@ -3583,10 +3583,10 @@ _08157E3C: bl sub_804037C b _0815809A .align 2, 0 -_08157E50: .4byte gUnknown_2023BC4 +_08157E50: .4byte gActiveBattler _08157E54: .4byte gUnknown_2022BC7 _08157E58: - ldr r0, _08157E6C @ =gUnknown_2023BC4 + ldr r0, _08157E6C @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157E70 @ =gUnknown_2022BC7 @@ -3596,10 +3596,10 @@ _08157E58: bl sub_804037C b _0815809A .align 2, 0 -_08157E6C: .4byte gUnknown_2023BC4 +_08157E6C: .4byte gActiveBattler _08157E70: .4byte gUnknown_2022BC7 _08157E74: - ldr r0, _08157E88 @ =gUnknown_2023BC4 + ldr r0, _08157E88 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157E8C @ =gUnknown_2022BC7 @@ -3609,10 +3609,10 @@ _08157E74: bl sub_804037C b _0815809A .align 2, 0 -_08157E88: .4byte gUnknown_2023BC4 +_08157E88: .4byte gActiveBattler _08157E8C: .4byte gUnknown_2022BC7 _08157E90: - ldr r0, _08157EA4 @ =gUnknown_2023BC4 + ldr r0, _08157EA4 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157EA8 @ =gUnknown_2022BC7 @@ -3622,10 +3622,10 @@ _08157E90: bl sub_804037C b _0815809A .align 2, 0 -_08157EA4: .4byte gUnknown_2023BC4 +_08157EA4: .4byte gActiveBattler _08157EA8: .4byte gUnknown_2022BC7 _08157EAC: - ldr r0, _08157EC0 @ =gUnknown_2023BC4 + ldr r0, _08157EC0 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157EC4 @ =gUnknown_2022BC7 @@ -3635,10 +3635,10 @@ _08157EAC: bl sub_804037C b _0815809A .align 2, 0 -_08157EC0: .4byte gUnknown_2023BC4 +_08157EC0: .4byte gActiveBattler _08157EC4: .4byte gUnknown_2022BC7 _08157EC8: - ldr r0, _08157EDC @ =gUnknown_2023BC4 + ldr r0, _08157EDC @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157EE0 @ =gUnknown_2022BC7 @@ -3648,10 +3648,10 @@ _08157EC8: bl sub_804037C b _0815809A .align 2, 0 -_08157EDC: .4byte gUnknown_2023BC4 +_08157EDC: .4byte gActiveBattler _08157EE0: .4byte gUnknown_2022BC7 _08157EE4: - ldr r0, _08157EF8 @ =gUnknown_2023BC4 + ldr r0, _08157EF8 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157EFC @ =gUnknown_2022BC7 @@ -3661,10 +3661,10 @@ _08157EE4: bl sub_804037C b _0815809A .align 2, 0 -_08157EF8: .4byte gUnknown_2023BC4 +_08157EF8: .4byte gActiveBattler _08157EFC: .4byte gUnknown_2022BC7 _08157F00: - ldr r0, _08157F14 @ =gUnknown_2023BC4 + ldr r0, _08157F14 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157F18 @ =gUnknown_2022BC7 @@ -3674,10 +3674,10 @@ _08157F00: bl sub_804037C b _0815809A .align 2, 0 -_08157F14: .4byte gUnknown_2023BC4 +_08157F14: .4byte gActiveBattler _08157F18: .4byte gUnknown_2022BC7 _08157F1C: - ldr r0, _08157F30 @ =gUnknown_2023BC4 + ldr r0, _08157F30 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157F34 @ =gUnknown_2022BC7 @@ -3687,10 +3687,10 @@ _08157F1C: bl sub_804037C b _0815809A .align 2, 0 -_08157F30: .4byte gUnknown_2023BC4 +_08157F30: .4byte gActiveBattler _08157F34: .4byte gUnknown_2022BC7 _08157F38: - ldr r0, _08157F4C @ =gUnknown_2023BC4 + ldr r0, _08157F4C @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157F50 @ =gUnknown_2022BC7 @@ -3700,10 +3700,10 @@ _08157F38: bl sub_804037C b _0815809A .align 2, 0 -_08157F4C: .4byte gUnknown_2023BC4 +_08157F4C: .4byte gActiveBattler _08157F50: .4byte gUnknown_2022BC7 _08157F54: - ldr r0, _08157F68 @ =gUnknown_2023BC4 + ldr r0, _08157F68 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157F6C @ =gUnknown_2022BC7 @@ -3713,10 +3713,10 @@ _08157F54: bl sub_804037C b _0815809A .align 2, 0 -_08157F68: .4byte gUnknown_2023BC4 +_08157F68: .4byte gActiveBattler _08157F6C: .4byte gUnknown_2022BC7 _08157F70: - ldr r0, _08157F84 @ =gUnknown_2023BC4 + ldr r0, _08157F84 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157F88 @ =gUnknown_2022BC7 @@ -3726,10 +3726,10 @@ _08157F70: bl sub_804037C b _0815809A .align 2, 0 -_08157F84: .4byte gUnknown_2023BC4 +_08157F84: .4byte gActiveBattler _08157F88: .4byte gUnknown_2022BC7 _08157F8C: - ldr r0, _08157FA0 @ =gUnknown_2023BC4 + ldr r0, _08157FA0 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157FA4 @ =gUnknown_2022BC7 @@ -3739,10 +3739,10 @@ _08157F8C: bl sub_804037C b _0815809A .align 2, 0 -_08157FA0: .4byte gUnknown_2023BC4 +_08157FA0: .4byte gActiveBattler _08157FA4: .4byte gUnknown_2022BC7 _08157FA8: - ldr r0, _08157FBC @ =gUnknown_2023BC4 + ldr r0, _08157FBC @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157FC0 @ =gUnknown_2022BC7 @@ -3752,10 +3752,10 @@ _08157FA8: bl sub_804037C b _0815809A .align 2, 0 -_08157FBC: .4byte gUnknown_2023BC4 +_08157FBC: .4byte gActiveBattler _08157FC0: .4byte gUnknown_2022BC7 _08157FC4: - ldr r0, _08157FD8 @ =gUnknown_2023BC4 + ldr r0, _08157FD8 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157FDC @ =gUnknown_2022BC7 @@ -3765,10 +3765,10 @@ _08157FC4: bl sub_804037C b _0815809A .align 2, 0 -_08157FD8: .4byte gUnknown_2023BC4 +_08157FD8: .4byte gActiveBattler _08157FDC: .4byte gUnknown_2022BC7 _08157FE0: - ldr r0, _08157FF4 @ =gUnknown_2023BC4 + ldr r0, _08157FF4 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08157FF8 @ =gUnknown_2022BC7 @@ -3778,10 +3778,10 @@ _08157FE0: bl sub_804037C b _0815809A .align 2, 0 -_08157FF4: .4byte gUnknown_2023BC4 +_08157FF4: .4byte gActiveBattler _08157FF8: .4byte gUnknown_2022BC7 _08157FFC: - ldr r0, _08158010 @ =gUnknown_2023BC4 + ldr r0, _08158010 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08158014 @ =gUnknown_2022BC7 @@ -3791,10 +3791,10 @@ _08157FFC: bl sub_804037C b _0815809A .align 2, 0 -_08158010: .4byte gUnknown_2023BC4 +_08158010: .4byte gActiveBattler _08158014: .4byte gUnknown_2022BC7 _08158018: - ldr r0, _0815802C @ =gUnknown_2023BC4 + ldr r0, _0815802C @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08158030 @ =gUnknown_2022BC7 @@ -3804,10 +3804,10 @@ _08158018: bl sub_804037C b _0815809A .align 2, 0 -_0815802C: .4byte gUnknown_2023BC4 +_0815802C: .4byte gActiveBattler _08158030: .4byte gUnknown_2022BC7 _08158034: - ldr r0, _08158048 @ =gUnknown_2023BC4 + ldr r0, _08158048 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _0815804C @ =gUnknown_2022BC7 @@ -3817,10 +3817,10 @@ _08158034: bl sub_804037C b _0815809A .align 2, 0 -_08158048: .4byte gUnknown_2023BC4 +_08158048: .4byte gActiveBattler _0815804C: .4byte gUnknown_2022BC7 _08158050: - ldr r0, _08158064 @ =gUnknown_2023BC4 + ldr r0, _08158064 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08158068 @ =gUnknown_2022BC7 @@ -3830,10 +3830,10 @@ _08158050: bl sub_804037C b _0815809A .align 2, 0 -_08158064: .4byte gUnknown_2023BC4 +_08158064: .4byte gActiveBattler _08158068: .4byte gUnknown_2022BC7 _0815806C: - ldr r0, _08158080 @ =gUnknown_2023BC4 + ldr r0, _08158080 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _08158084 @ =gUnknown_2022BC7 @@ -3843,10 +3843,10 @@ _0815806C: bl sub_804037C b _0815809A .align 2, 0 -_08158080: .4byte gUnknown_2023BC4 +_08158080: .4byte gActiveBattler _08158084: .4byte gUnknown_2022BC7 _08158088: - ldr r0, _081580C4 @ =gUnknown_2023BC4 + ldr r0, _081580C4 @ =gActiveBattler ldrb r2, [r0] lsls r2, 9 ldr r0, _081580C8 @ =gUnknown_2022BC7 @@ -3855,15 +3855,15 @@ _08158088: movs r1, 0x36 bl sub_804037C _0815809A: - ldr r2, _081580CC @ =gUnknown_2023BCE - ldr r0, _081580C4 @ =gUnknown_2023BC4 + ldr r2, _081580CC @ =gBattlerPartyIndexes + ldr r0, _081580C4 @ =gActiveBattler ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081580D0 @ =gUnknown_2024284 + ldr r2, _081580D0 @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange add sp, 0x30 @@ -3875,10 +3875,10 @@ _0815809A: pop {r0} bx r0 .align 2, 0 -_081580C4: .4byte gUnknown_2023BC4 +_081580C4: .4byte gActiveBattler _081580C8: .4byte gUnknown_2022BC7 -_081580CC: .4byte gUnknown_2023BCE -_081580D0: .4byte gUnknown_2024284 +_081580CC: .4byte gBattlerPartyIndexes +_081580D0: .4byte gPlayerParty thumb_func_end sub_81577B4 thumb_func_start sub_81580D4 @@ -3896,15 +3896,15 @@ sub_81580E0: @ 81580E0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r6, _08158214 @ =gUnknown_2023BC4 + ldr r6, _08158214 @ =gActiveBattler ldrb r0, [r6] lsls r0, 1 - ldr r1, _08158218 @ =gUnknown_2023BCE + ldr r1, _08158218 @ =gBattlerPartyIndexes adds r0, r1 ldrh r0, [r0] movs r7, 0x64 muls r0, r7 - ldr r2, _0815821C @ =gUnknown_202402C + ldr r2, _0815821C @ =gEnemyParty mov r10, r2 add r0, r10 movs r1, 0xB @@ -3915,7 +3915,7 @@ sub_81580E0: @ 81580E0 mov r8, r0 ldrb r1, [r6] lsls r0, r1, 1 - ldr r2, _08158218 @ =gUnknown_2023BCE + ldr r2, _08158218 @ =gBattlerPartyIndexes adds r0, r2 ldrh r0, [r0] muls r0, r7 @@ -4007,7 +4007,7 @@ sub_81580E0: @ 81580E0 bl StartSpriteAnim ldrb r4, [r6] lsls r0, r4, 1 - ldr r2, _08158218 @ =gUnknown_2023BCE + ldr r2, _08158218 @ =gBattlerPartyIndexes adds r0, r2 ldrh r0, [r0] muls r0, r7 @@ -4034,9 +4034,9 @@ sub_81580E0: @ 81580E0 pop {r0} bx r0 .align 2, 0 -_08158214: .4byte gUnknown_2023BC4 -_08158218: .4byte gUnknown_2023BCE -_0815821C: .4byte gUnknown_202402C +_08158214: .4byte gActiveBattler +_08158218: .4byte gBattlerPartyIndexes +_0815821C: .4byte gEnemyParty _08158220: .4byte gUnknown_20244DC _08158224: .4byte gUnknown_2023D44 _08158228: .4byte gSprites @@ -4049,7 +4049,7 @@ _08158238: .4byte sub_8156184 thumb_func_start sub_815823C sub_815823C: @ 815823C push {r4,r5,lr} - ldr r5, _081582A0 @ =gUnknown_2023BC4 + ldr r5, _081582A0 @ =gActiveBattler ldrb r0, [r5] ldr r4, _081582A4 @ =gUnknown_2022BC4 lsls r1, r0, 9 @@ -4057,7 +4057,7 @@ sub_815823C: @ 815823C adds r1, r2 ldrb r1, [r1] bl ClearTemporarySpeciesSpriteData - ldr r2, _081582A8 @ =gUnknown_2023BCE + ldr r2, _081582A8 @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -4073,7 +4073,7 @@ sub_815823C: @ 815823C ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081582AC @ =gUnknown_2024284 + ldr r2, _081582AC @ =gPlayerParty adds r0, r2 bl sub_8034498 ldr r1, _081582B0 @ =gUnknown_2023FF8 @@ -4096,10 +4096,10 @@ sub_815823C: @ 815823C pop {r0} bx r0 .align 2, 0 -_081582A0: .4byte gUnknown_2023BC4 +_081582A0: .4byte gActiveBattler _081582A4: .4byte gUnknown_2022BC4 -_081582A8: .4byte gUnknown_2023BCE -_081582AC: .4byte gUnknown_2024284 +_081582A8: .4byte gBattlerPartyIndexes +_081582AC: .4byte gPlayerParty _081582B0: .4byte gUnknown_2023FF8 _081582B4: .4byte gUnknown_2023FFC _081582B8: .4byte gUnknown_3004FE0 @@ -4110,7 +4110,7 @@ _081582BC: .4byte sub_81563A8 sub_81582C0: @ 81582C0 push {r4-r6,lr} ldr r0, _081582EC @ =gUnknown_2022BC4 - ldr r6, _081582F0 @ =gUnknown_2023BC4 + ldr r6, _081582F0 @ =gActiveBattler ldrb r2, [r6] lsls r1, r2, 9 adds r0, 0x1 @@ -4131,7 +4131,7 @@ sub_81582C0: @ 81582C0 b _08158332 .align 2, 0 _081582EC: .4byte gUnknown_2022BC4 -_081582F0: .4byte gUnknown_2023BC4 +_081582F0: .4byte gActiveBattler _081582F4: .4byte gUnknown_3004FE0 _081582F8: .4byte sub_8156F7C _081582FC: @@ -4173,7 +4173,7 @@ sub_8158344: @ 8158344 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _081583D8 @ =gUnknown_2023BC4 + ldr r7, _081583D8 @ =gActiveBattler ldrb r0, [r7] bl GetBankSide lsls r0, 24 @@ -4240,7 +4240,7 @@ sub_8158344: @ 8158344 strb r0, [r1, 0x5] b _081584E2 .align 2, 0 -_081583D8: .4byte gUnknown_2023BC4 +_081583D8: .4byte gActiveBattler _081583DC: .4byte gUnknown_20244DC _081583E0: .4byte gUnknown_8239F8C _081583E4: .4byte gUnknown_2023D44 @@ -4373,7 +4373,7 @@ _081584E2: ldr r1, _08158534 @ =sub_8033EEC str r1, [r0] ldr r1, _08158538 @ =gUnknown_3004FE0 - ldr r0, _0815853C @ =gUnknown_2023BC4 + ldr r0, _0815853C @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4396,14 +4396,14 @@ _0815852C: .4byte 0x000003ff _08158530: .4byte 0xfffffc00 _08158534: .4byte sub_8033EEC _08158538: .4byte gUnknown_3004FE0 -_0815853C: .4byte gUnknown_2023BC4 +_0815853C: .4byte gActiveBattler _08158540: .4byte sub_815614C thumb_func_end sub_8158344 thumb_func_start sub_8158544 sub_8158544: @ 8158544 push {r4-r6,lr} - ldr r4, _081585EC @ =gUnknown_2023BC4 + ldr r4, _081585EC @ =gActiveBattler ldrb r1, [r4] movs r0, 0x4 bl sub_8034750 @@ -4483,7 +4483,7 @@ sub_8158544: @ 8158544 pop {r0} bx r0 .align 2, 0 -_081585EC: .4byte gUnknown_2023BC4 +_081585EC: .4byte gActiveBattler _081585F0: .4byte gUnknown_20244DC _081585F4: .4byte gUnknown_8239F8C _081585F8: .4byte gUnknown_2023D44 @@ -4507,7 +4507,7 @@ sub_815861C: @ 815861C push {r4-r6,lr} ldr r6, _08158668 @ =gUnknown_2024018 ldr r4, [r6] - ldr r5, _0815866C @ =gUnknown_2023BC4 + ldr r5, _0815866C @ =gActiveBattler ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -4543,7 +4543,7 @@ _08158650: b _0815872A .align 2, 0 _08158668: .4byte gUnknown_2024018 -_0815866C: .4byte gUnknown_2023BC4 +_0815866C: .4byte gActiveBattler _08158670: ldrb r1, [r3] movs r0, 0x40 @@ -4559,14 +4559,14 @@ _08158670: lsrs r4, r0, 24 cmp r4, 0 bne _081586FC - ldr r2, _081586E8 @ =gUnknown_2023BCE + ldr r2, _081586E8 @ =gBattlerPartyIndexes ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081586EC @ =gUnknown_2024284 + ldr r2, _081586EC @ =gPlayerParty adds r0, r2 bl HandleLowHpMusicChange movs r1, 0x40 @@ -4603,8 +4603,8 @@ _08158670: ldr r1, _081586F8 @ =sub_8012110 b _0815871A .align 2, 0 -_081586E8: .4byte gUnknown_2023BCE -_081586EC: .4byte gUnknown_2024284 +_081586E8: .4byte gBattlerPartyIndexes +_081586EC: .4byte gPlayerParty _081586F0: .4byte gSprites _081586F4: .4byte gUnknown_2023D44 _081586F8: .4byte sub_8012110 @@ -4626,7 +4626,7 @@ _081586FC: _0815871A: str r1, [r0] ldr r1, _0815873C @ =gUnknown_3004FE0 - ldr r0, _08158740 @ =gUnknown_2023BC4 + ldr r0, _08158740 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4641,7 +4641,7 @@ _08158730: .4byte gSprites _08158734: .4byte gUnknown_2023D44 _08158738: .4byte sub_8011EA0 _0815873C: .4byte gUnknown_3004FE0 -_08158740: .4byte gUnknown_2023BC4 +_08158740: .4byte gActiveBattler _08158744: .4byte sub_8156DCC thumb_func_end sub_815861C @@ -4664,7 +4664,7 @@ sub_8158754: @ 8158754 ldr r1, _08158798 @ =gUnknown_2024005 movs r0, 0x1 strb r0, [r1] - ldr r5, _0815879C @ =gUnknown_2023BC4 + ldr r5, _0815879C @ =gActiveBattler ldrb r4, [r5] movs r0, 0x1 bl GetBankByIdentity @@ -4687,7 +4687,7 @@ sub_8158754: @ 8158754 .align 2, 0 _08158794: .4byte gUnknown_2024018 _08158798: .4byte gUnknown_2024005 -_0815879C: .4byte gUnknown_2023BC4 +_0815879C: .4byte gActiveBattler _081587A0: .4byte gUnknown_3004FE0 _081587A4: .4byte sub_8156484 thumb_func_end sub_8158754 @@ -4696,7 +4696,7 @@ _081587A4: .4byte sub_8156484 sub_81587A8: @ 81587A8 push {r4,r5,lr} ldr r1, _081587F0 @ =gUnknown_2022BC4 - ldr r5, _081587F4 @ =gUnknown_2023BC4 + ldr r5, _081587F4 @ =gActiveBattler ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -4730,7 +4730,7 @@ sub_81587A8: @ 81587A8 bx r0 .align 2, 0 _081587F0: .4byte gUnknown_2022BC4 -_081587F4: .4byte gUnknown_2023BC4 +_081587F4: .4byte gActiveBattler _081587F8: .4byte gUnknown_2024018 _081587FC: .4byte gUnknown_2024005 _08158800: .4byte gUnknown_3004FE0 @@ -4750,7 +4750,7 @@ sub_8158814: @ 8158814 push {r4-r6,lr} ldr r0, _081588E8 @ =gUnknown_2022BC4 mov r12, r0 - ldr r6, _081588EC @ =gUnknown_2023BC4 + ldr r6, _081588EC @ =gActiveBattler ldrb r2, [r6] lsls r2, 9 adds r0, 0x1 @@ -4853,7 +4853,7 @@ sub_8158814: @ 8158814 b _0815892A .align 2, 0 _081588E8: .4byte gUnknown_2022BC4 -_081588EC: .4byte gUnknown_2023BC4 +_081588EC: .4byte gActiveBattler _081588F0: .4byte gUnknown_2037F16 _081588F4: .4byte gUnknown_2037EEC _081588F8: .4byte gUnknown_2037EE8 @@ -4894,7 +4894,7 @@ sub_815893C: @ 815893C mov r6, r8 push {r6,r7} ldr r2, _08158980 @ =gUnknown_2022BC4 - ldr r6, _08158984 @ =gUnknown_2023BC4 + ldr r6, _08158984 @ =gActiveBattler ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -4924,7 +4924,7 @@ sub_815893C: @ 815893C b _08158A7C .align 2, 0 _08158980: .4byte gUnknown_2022BC4 -_08158984: .4byte gUnknown_2023BC4 +_08158984: .4byte gActiveBattler _08158988: .4byte gUnknown_2024018 _0815898C: cmp r2, 0x2 @@ -5060,7 +5060,7 @@ sub_8158A88: @ 8158A88 strh r1, [r0] ldr r0, _08158AC0 @ =gUnknown_2022976 strh r1, [r0] - ldr r0, _08158AC4 @ =gUnknown_2023BC4 + ldr r0, _08158AC4 @ =gActiveBattler ldrb r4, [r0] lsls r4, 9 ldr r0, _08158AC8 @ =gUnknown_2022BC6 @@ -5079,7 +5079,7 @@ sub_8158A88: @ 8158A88 .align 2, 0 _08158ABC: .4byte gUnknown_2022974 _08158AC0: .4byte gUnknown_2022976 -_08158AC4: .4byte gUnknown_2023BC4 +_08158AC4: .4byte gActiveBattler _08158AC8: .4byte gUnknown_2022BC6 _08158ACC: .4byte gUnknown_202298C _08158AD0: @@ -5088,7 +5088,7 @@ _08158AD0: bl sub_80D87BC _08158AD8: ldr r1, _08158AF0 @ =gUnknown_3004FE0 - ldr r0, _08158AF4 @ =gUnknown_2023BC4 + ldr r0, _08158AF4 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5100,14 +5100,14 @@ _08158AD8: .align 2, 0 _08158AEC: .4byte gUnknown_202298C _08158AF0: .4byte gUnknown_3004FE0 -_08158AF4: .4byte gUnknown_2023BC4 +_08158AF4: .4byte gActiveBattler _08158AF8: .4byte sub_815623C thumb_func_end sub_8158A88 thumb_func_start sub_8158AFC sub_8158AFC: @ 8158AFC push {lr} - ldr r0, _08158B14 @ =gUnknown_2023BC4 + ldr r0, _08158B14 @ =gActiveBattler ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -5116,7 +5116,7 @@ sub_8158AFC: @ 8158AFC bl sub_8158A88 b _08158B1C .align 2, 0 -_08158B14: .4byte gUnknown_2023BC4 +_08158B14: .4byte gActiveBattler _08158B18: bl PlayerPartnerBufferExecCompleted _08158B1C: @@ -5138,7 +5138,7 @@ sub_8158B20: @ 8158B20 movs r0, 0xA0 strh r0, [r1] ldr r1, _08158B54 @ =gUnknown_3004FE0 - ldr r0, _08158B58 @ =gUnknown_2023BC4 + ldr r0, _08158B58 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5151,14 +5151,14 @@ _08158B46: _08158B4C: .4byte gUnknown_2022974 _08158B50: .4byte gUnknown_2022976 _08158B54: .4byte gUnknown_3004FE0 -_08158B58: .4byte gUnknown_2023BC4 +_08158B58: .4byte gActiveBattler _08158B5C: .4byte sub_8156140 thumb_func_end sub_8158B20 thumb_func_start sub_8158B60 sub_8158B60: @ 8158B60 push {r4,lr} - ldr r4, _08158BBC @ =gUnknown_2023BC4 + ldr r4, _08158BBC @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -5185,7 +5185,7 @@ _08158B8E: cmp r4, 0x3 ble _08158B8E ldr r1, _08158BD0 @ =gUnknown_2023FF8 - ldr r0, _08158BBC @ =gUnknown_2023BC4 + ldr r0, _08158BBC @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -5198,7 +5198,7 @@ _08158B8E: bl sub_80D87BC b _08158BE8 .align 2, 0 -_08158BBC: .4byte gUnknown_2023BC4 +_08158BBC: .4byte gActiveBattler _08158BC0: .4byte gUnknown_3004FE0 _08158BC4: .4byte sub_8158B20 _08158BC8: .4byte gUnknown_83FDA4C @@ -5246,7 +5246,7 @@ sub_8158C04: @ 8158C04 adds r0, r2, 0 strh r0, [r1] ldr r1, _08158C3C @ =gUnknown_3004FE0 - ldr r0, _08158C40 @ =gUnknown_2023BC4 + ldr r0, _08158C40 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5259,14 +5259,14 @@ _08158C2E: _08158C34: .4byte gUnknown_2022974 _08158C38: .4byte gUnknown_2022976 _08158C3C: .4byte gUnknown_3004FE0 -_08158C40: .4byte gUnknown_2023BC4 +_08158C40: .4byte gActiveBattler _08158C44: .4byte sub_81564E4 thumb_func_end sub_8158C04 thumb_func_start sub_8158C48 sub_8158C48: @ 8158C48 push {r4,lr} - ldr r4, _08158C68 @ =gUnknown_2023BC4 + ldr r4, _08158C68 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -5280,7 +5280,7 @@ sub_8158C48: @ 8158C48 ldr r0, _08158C70 @ =sub_8158C04 b _08158C7E .align 2, 0 -_08158C68: .4byte gUnknown_2023BC4 +_08158C68: .4byte gActiveBattler _08158C6C: .4byte gUnknown_3004FE0 _08158C70: .4byte sub_8158C04 _08158C74: @@ -5311,7 +5311,7 @@ sub_8158C90: @ 8158C90 movs r3, 0x10 bl BeginNormalPaletteFade ldr r1, _08158CDC @ =gUnknown_3004FE0 - ldr r2, _08158CE0 @ =gUnknown_2023BC4 + ldr r2, _08158CE0 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -5341,7 +5341,7 @@ _08158CBE: bx r0 .align 2, 0 _08158CDC: .4byte gUnknown_3004FE0 -_08158CE0: .4byte gUnknown_2023BC4 +_08158CE0: .4byte gActiveBattler _08158CE4: .4byte sub_8156594 _08158CE8: .4byte gUnknown_2024004 _08158CEC: .4byte gUnknown_203B0DC @@ -5356,7 +5356,7 @@ sub_8158CF4: @ 8158CF4 movs r1, 0xFF bl CreateTask ldr r3, _08158DA8 @ =gUnknown_3004FFC - ldr r4, _08158DAC @ =gUnknown_2023BC4 + ldr r4, _08158DAC @ =gActiveBattler ldrb r1, [r4] adds r1, r3 strb r0, [r1] @@ -5376,7 +5376,7 @@ sub_8158CF4: @ 8158CF4 movs r0, 0xF ands r0, r2 strh r0, [r1, 0x8] - ldr r3, _08158DB8 @ =gUnknown_2023FE8 + ldr r3, _08158DB8 @ =gBattleStruct ldr r1, [r3] adds r1, 0x49 ldrb r0, [r4] @@ -5423,7 +5423,7 @@ _08158D60: movs r3, 0x10 bl BeginNormalPaletteFade ldr r1, _08158DC0 @ =gUnknown_3004FE0 - ldr r2, _08158DAC @ =gUnknown_2023BC4 + ldr r2, _08158DAC @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -5439,10 +5439,10 @@ _08158D60: .align 2, 0 _08158DA4: .4byte nullsub_43 _08158DA8: .4byte gUnknown_3004FFC -_08158DAC: .4byte gUnknown_2023BC4 +_08158DAC: .4byte gActiveBattler _08158DB0: .4byte gUnknown_3005090 _08158DB4: .4byte gUnknown_2022BC4 -_08158DB8: .4byte gUnknown_2023FE8 +_08158DB8: .4byte gBattleStruct _08158DBC: .4byte gUnknown_203B0DC _08158DC0: .4byte gUnknown_3004FE0 _08158DC4: .4byte sub_81564F0 @@ -5461,40 +5461,40 @@ sub_8158DCC: @ 8158DCC sub_8158DD8: @ 8158DD8 push {r4-r7,lr} sub sp, 0x4 - ldr r4, _08158DFC @ =gUnknown_2023BC4 + ldr r4, _08158DFC @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08158E08 - ldr r1, _08158E00 @ =gUnknown_2023BCE + ldr r1, _08158E00 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08158E04 @ =gUnknown_2024284 + ldr r0, _08158E04 @ =gPlayerParty b _08158E18 .align 2, 0 -_08158DFC: .4byte gUnknown_2023BC4 -_08158E00: .4byte gUnknown_2023BCE -_08158E04: .4byte gUnknown_2024284 +_08158DFC: .4byte gActiveBattler +_08158E00: .4byte gBattlerPartyIndexes +_08158E04: .4byte gPlayerParty _08158E08: - ldr r1, _08158E68 @ =gUnknown_2023BCE + ldr r1, _08158E68 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08158E6C @ =gUnknown_202402C + ldr r0, _08158E6C @ =gEnemyParty _08158E18: adds r5, r1, r0 movs r0, 0 bl LoadBattleBarGfx ldr r3, _08158E70 @ =gUnknown_2022BC4 - ldr r7, _08158E74 @ =gUnknown_2023BC4 + ldr r7, _08158E74 @ =gActiveBattler ldrb r1, [r7] lsls r1, 9 adds r0, r3, 0x2 @@ -5527,10 +5527,10 @@ _08158E18: bl SetBattleBarStruct b _08158EA8 .align 2, 0 -_08158E68: .4byte gUnknown_2023BCE -_08158E6C: .4byte gUnknown_202402C +_08158E68: .4byte gBattlerPartyIndexes +_08158E6C: .4byte gEnemyParty _08158E70: .4byte gUnknown_2022BC4 -_08158E74: .4byte gUnknown_2023BC4 +_08158E74: .4byte gActiveBattler _08158E78: .4byte 0x00007fff _08158E7C: .4byte gUnknown_3004FF0 _08158E80: @@ -5553,7 +5553,7 @@ _08158E80: bl sub_8048440 _08158EA8: ldr r1, _08158EC4 @ =gUnknown_3004FE0 - ldr r0, _08158EC8 @ =gUnknown_2023BC4 + ldr r0, _08158EC8 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5566,7 +5566,7 @@ _08158EA8: .align 2, 0 _08158EC0: .4byte gUnknown_3004FF0 _08158EC4: .4byte gUnknown_3004FE0 -_08158EC8: .4byte gUnknown_2023BC4 +_08158EC8: .4byte gActiveBattler _08158ECC: .4byte sub_8156E78 thumb_func_end sub_8158DD8 @@ -5574,7 +5574,7 @@ _08158ECC: .4byte sub_8156E78 sub_8158ED0: @ 8158ED0 push {r4-r7,lr} ldr r5, _08158EFC @ =gUnknown_2022BC4 - ldr r6, _08158F00 @ =gUnknown_2023BC4 + ldr r6, _08158F00 @ =gActiveBattler ldrb r0, [r6] lsls r0, 9 adds r1, r5, 0x1 @@ -5583,7 +5583,7 @@ sub_8158ED0: @ 8158ED0 movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08158F04 @ =gUnknown_2024284 + ldr r0, _08158F04 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x38 @@ -5594,8 +5594,8 @@ sub_8158ED0: @ 8158ED0 b _08158F54 .align 2, 0 _08158EFC: .4byte gUnknown_2022BC4 -_08158F00: .4byte gUnknown_2023BC4 -_08158F04: .4byte gUnknown_2024284 +_08158F00: .4byte gActiveBattler +_08158F04: .4byte gPlayerParty _08158F08: movs r0, 0x1 bl LoadBattleBarGfx @@ -5646,7 +5646,7 @@ _08158F68: .4byte nullsub_99 thumb_func_start sub_8158F6C sub_8158F6C: @ 8158F6C push {r4,lr} - ldr r4, _08158F9C @ =gUnknown_2023BC4 + ldr r4, _08158F9C @ =gActiveBattler ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -5657,32 +5657,32 @@ sub_8158F6C: @ 8158F6C lsls r0, 24 cmp r0, 0 bne _08158FA8 - ldr r1, _08158FA0 @ =gUnknown_2023BCE + ldr r1, _08158FA0 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08158FA4 @ =gUnknown_2024284 + ldr r0, _08158FA4 @ =gPlayerParty b _08158FB8 .align 2, 0 -_08158F9C: .4byte gUnknown_2023BC4 -_08158FA0: .4byte gUnknown_2023BCE -_08158FA4: .4byte gUnknown_2024284 +_08158F9C: .4byte gActiveBattler +_08158FA0: .4byte gBattlerPartyIndexes +_08158FA4: .4byte gPlayerParty _08158FA8: - ldr r1, _08158FF8 @ =gUnknown_2023BCE + ldr r1, _08158FF8 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08158FFC @ =gUnknown_202402C + ldr r0, _08158FFC @ =gEnemyParty _08158FB8: adds r2, r1, r0 ldr r1, _08159000 @ =gUnknown_3004FF0 - ldr r4, _08159004 @ =gUnknown_2023BC4 + ldr r4, _08159004 @ =gActiveBattler ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -5713,10 +5713,10 @@ _08158FF2: pop {r0} bx r0 .align 2, 0 -_08158FF8: .4byte gUnknown_2023BCE -_08158FFC: .4byte gUnknown_202402C +_08158FF8: .4byte gBattlerPartyIndexes +_08158FFC: .4byte gEnemyParty _08159000: .4byte gUnknown_3004FF0 -_08159004: .4byte gUnknown_2023BC4 +_08159004: .4byte gActiveBattler _08159008: .4byte gUnknown_2024018 _0815900C: .4byte gUnknown_3004FE0 _08159010: .4byte sub_8157054 @@ -5725,7 +5725,7 @@ _08159010: .4byte sub_8157054 thumb_func_start sub_8159014 sub_8159014: @ 8159014 push {r4,r5,lr} - ldr r5, _0815906C @ =gUnknown_2023BC4 + ldr r5, _0815906C @ =gActiveBattler ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -5767,7 +5767,7 @@ _08159064: pop {r0} bx r0 .align 2, 0 -_0815906C: .4byte gUnknown_2023BC4 +_0815906C: .4byte gActiveBattler _08159070: .4byte gUnknown_2022BC4 _08159074: .4byte gUnknown_3004FE0 _08159078: .4byte sub_8157054 @@ -5777,41 +5777,41 @@ _08159078: .4byte sub_8157054 sub_815907C: @ 815907C push {r4,lr} sub sp, 0x4 - ldr r4, _081590A0 @ =gUnknown_2023BC4 + ldr r4, _081590A0 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _081590AC - ldr r1, _081590A4 @ =gUnknown_2023BCE + ldr r1, _081590A4 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081590A8 @ =gUnknown_2024284 + ldr r0, _081590A8 @ =gPlayerParty b _081590BC .align 2, 0 -_081590A0: .4byte gUnknown_2023BC4 -_081590A4: .4byte gUnknown_2023BCE -_081590A8: .4byte gUnknown_2024284 +_081590A0: .4byte gActiveBattler +_081590A4: .4byte gBattlerPartyIndexes +_081590A8: .4byte gPlayerParty _081590AC: - ldr r1, _081590F0 @ =gUnknown_2023BCE + ldr r1, _081590F0 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081590F4 @ =gUnknown_202402C + ldr r0, _081590F4 @ =gEnemyParty _081590BC: adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x37 bl GetMonData ldr r2, _081590F8 @ =gUnknown_2022BC4 - ldr r1, _081590FC @ =gUnknown_2023BC4 + ldr r1, _081590FC @ =gActiveBattler ldrb r1, [r1] lsls r1, 9 adds r2, 0x1 @@ -5830,10 +5830,10 @@ _081590BC: pop {r0} bx r0 .align 2, 0 -_081590F0: .4byte gUnknown_2023BCE -_081590F4: .4byte gUnknown_202402C +_081590F0: .4byte gBattlerPartyIndexes +_081590F4: .4byte gEnemyParty _081590F8: .4byte gUnknown_2022BC4 -_081590FC: .4byte gUnknown_2023BC4 +_081590FC: .4byte gActiveBattler thumb_func_end sub_815907C thumb_func_start sub_8159100 @@ -5937,7 +5937,7 @@ sub_8159190: @ 8159190 push {r4,lr} ldr r3, _081591B8 @ =gSprites ldr r2, _081591BC @ =gUnknown_2023D44 - ldr r4, _081591C0 @ =gUnknown_2023BC4 + ldr r4, _081591C0 @ =gActiveBattler ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -5955,7 +5955,7 @@ sub_8159190: @ 8159190 .align 2, 0 _081591B8: .4byte gSprites _081591BC: .4byte gUnknown_2023D44 -_081591C0: .4byte gUnknown_2023BC4 +_081591C0: .4byte gActiveBattler _081591C4: ldr r1, _081591F4 @ =gUnknown_2024005 movs r0, 0x1 @@ -5999,7 +5999,7 @@ sub_8159200: @ 8159200 sub_815920C: @ 815920C push {lr} ldr r2, _08159234 @ =gUnknown_2022BC4 - ldr r0, _08159238 @ =gUnknown_2023BC4 + ldr r0, _08159238 @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -6016,14 +6016,14 @@ sub_815920C: @ 815920C bx r0 .align 2, 0 _08159234: .4byte gUnknown_2022BC4 -_08159238: .4byte gUnknown_2023BC4 +_08159238: .4byte gActiveBattler thumb_func_end sub_815920C thumb_func_start sub_815923C sub_815923C: @ 815923C push {lr} ldr r2, _08159264 @ =gUnknown_2022BC4 - ldr r0, _08159268 @ =gUnknown_2023BC4 + ldr r0, _08159268 @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -6040,40 +6040,40 @@ sub_815923C: @ 815923C bx r0 .align 2, 0 _08159264: .4byte gUnknown_2022BC4 -_08159268: .4byte gUnknown_2023BC4 +_08159268: .4byte gActiveBattler thumb_func_end sub_815923C thumb_func_start sub_815926C sub_815926C: @ 815926C push {r4,lr} - ldr r4, _08159290 @ =gUnknown_2023BC4 + ldr r4, _08159290 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815929C - ldr r1, _08159294 @ =gUnknown_2023BCE + ldr r1, _08159294 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08159298 @ =gUnknown_2024284 + ldr r0, _08159298 @ =gPlayerParty b _081592AC .align 2, 0 -_08159290: .4byte gUnknown_2023BC4 -_08159294: .4byte gUnknown_2023BCE -_08159298: .4byte gUnknown_2024284 +_08159290: .4byte gActiveBattler +_08159294: .4byte gBattlerPartyIndexes +_08159298: .4byte gPlayerParty _0815929C: - ldr r1, _081592C8 @ =gUnknown_2023BCE + ldr r1, _081592C8 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081592CC @ =gUnknown_202402C + ldr r0, _081592CC @ =gEnemyParty _081592AC: adds r0, r1, r0 movs r1, 0xB @@ -6087,15 +6087,15 @@ _081592AC: pop {r0} bx r0 .align 2, 0 -_081592C8: .4byte gUnknown_2023BCE -_081592CC: .4byte gUnknown_202402C +_081592C8: .4byte gBattlerPartyIndexes +_081592CC: .4byte gEnemyParty thumb_func_end sub_815926C thumb_func_start sub_81592D0 sub_81592D0: @ 81592D0 push {lr} ldr r1, _081592F8 @ =gUnknown_2022BC4 - ldr r0, _081592FC @ =gUnknown_2023BC4 + ldr r0, _081592FC @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -6112,7 +6112,7 @@ sub_81592D0: @ 81592D0 bx r0 .align 2, 0 _081592F8: .4byte gUnknown_2022BC4 -_081592FC: .4byte gUnknown_2023BC4 +_081592FC: .4byte gActiveBattler _08159300: .4byte gUnknown_2023F4C thumb_func_end sub_81592D0 @@ -6120,7 +6120,7 @@ _08159300: .4byte gUnknown_2023F4C sub_8159304: @ 8159304 push {r4-r7,lr} ldr r6, _0815943C @ =gUnknown_2023D44 - ldr r7, _08159440 @ =gUnknown_2023BC4 + ldr r7, _08159440 @ =gActiveBattler ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] @@ -6270,7 +6270,7 @@ _0815941C: bx r0 .align 2, 0 _0815943C: .4byte gUnknown_2023D44 -_08159440: .4byte gUnknown_2023BC4 +_08159440: .4byte gActiveBattler _08159444: .4byte gSprites _08159448: .4byte 0x0000ffd8 _0815944C: .4byte sub_8075590 @@ -6303,7 +6303,7 @@ sub_8159478: @ 8159478 adds r0, r1 movs r1, 0 strh r1, [r0, 0x2] - ldr r0, _081595C4 @ =gUnknown_2023BCE + ldr r0, _081595C4 @ =gBattlerPartyIndexes lsls r2, r6, 1 adds r2, r0 ldr r0, _081595C8 @ =gUnknown_2022BC4 @@ -6315,7 +6315,7 @@ sub_8159478: @ 8159478 ldrh r1, [r2] movs r0, 0x64 muls r0, r1 - ldr r1, _081595CC @ =gUnknown_2024284 + ldr r1, _081595CC @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -6444,9 +6444,9 @@ sub_8159478: @ 8159478 bx r0 .align 2, 0 _081595C0: .4byte gUnknown_2024018 -_081595C4: .4byte gUnknown_2023BCE +_081595C4: .4byte gBattlerPartyIndexes _081595C8: .4byte gUnknown_2022BC4 -_081595CC: .4byte gUnknown_2024284 +_081595CC: .4byte gPlayerParty _081595D0: .4byte sub_8033E3C _081595D4: .4byte gUnknown_3004FFC _081595D8: .4byte gUnknown_20244DC @@ -6477,7 +6477,7 @@ sub_81595EC: @ 81595EC .align 2, 0 _0815960C: .4byte gUnknown_3005090 _08159610: - ldr r4, _0815964C @ =gUnknown_2023BC4 + ldr r4, _0815964C @ =gActiveBattler ldrb r5, [r4] ldrh r0, [r1, 0x8] strb r0, [r4] @@ -6486,7 +6486,7 @@ _08159610: lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _08159654 @ =gUnknown_2023BCE + ldr r0, _08159654 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -6507,9 +6507,9 @@ _08159646: pop {r0} bx r0 .align 2, 0 -_0815964C: .4byte gUnknown_2023BC4 +_0815964C: .4byte gActiveBattler _08159650: .4byte gUnknown_2022BC4 -_08159654: .4byte gUnknown_2023BCE +_08159654: .4byte gBattlerPartyIndexes _08159658: .4byte gUnknown_3004FE0 _0815965C: .4byte sub_8156624 thumb_func_end sub_81595EC @@ -6518,7 +6518,7 @@ _0815965C: .4byte sub_8156624 sub_8159660: @ 8159660 push {r4,r5,lr} ldr r1, _08159688 @ =gUnknown_2022BC4 - ldr r0, _0815968C @ =gUnknown_2023BC4 + ldr r0, _0815968C @ =gActiveBattler ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -6535,11 +6535,11 @@ sub_8159660: @ 8159660 b _081596CE .align 2, 0 _08159688: .4byte gUnknown_2022BC4 -_0815968C: .4byte gUnknown_2023BC4 +_0815968C: .4byte gActiveBattler _08159690: ldr r0, _081596D4 @ =gUnknown_2024018 ldr r0, [r0] - ldr r5, _081596D8 @ =gUnknown_2023BC4 + ldr r5, _081596D8 @ =gActiveBattler ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -6572,7 +6572,7 @@ _081596CE: bx r0 .align 2, 0 _081596D4: .4byte gUnknown_2024018 -_081596D8: .4byte gUnknown_2023BC4 +_081596D8: .4byte gActiveBattler _081596DC: .4byte gUnknown_2022BC8 _081596E0: .4byte gUnknown_2024000 thumb_func_end sub_8159660 @@ -6588,7 +6588,7 @@ sub_81596E4: @ 81596E4 thumb_func_start sub_81596F0 sub_81596F0: @ 81596F0 push {r4,lr} - ldr r4, _08159710 @ =gUnknown_2023BC4 + ldr r4, _08159710 @ =gActiveBattler ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free @@ -6600,7 +6600,7 @@ sub_81596F0: @ 81596F0 pop {r0} bx r0 .align 2, 0 -_08159710: .4byte gUnknown_2023BC4 +_08159710: .4byte gActiveBattler thumb_func_end sub_81596F0 thumb_func_start sub_8159714 @@ -6616,7 +6616,7 @@ sub_8159720: @ 8159720 push {r4-r6,lr} sub sp, 0x4 ldr r5, _08159758 @ =gUnknown_2022BC4 - ldr r6, _0815975C @ =gUnknown_2023BC4 + ldr r6, _0815975C @ =gActiveBattler ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -6641,7 +6641,7 @@ sub_8159720: @ 8159720 b _0815976C .align 2, 0 _08159758: .4byte gUnknown_2022BC4 -_0815975C: .4byte gUnknown_2023BC4 +_0815975C: .4byte gActiveBattler _08159760: ldr r0, _08159774 @ =gUnknown_3004FE0 ldrb r1, [r6] @@ -6663,7 +6663,7 @@ _08159778: .4byte sub_8157024 sub_815977C: @ 815977C push {r4,lr} ldr r1, _081597B0 @ =gUnknown_2022BC4 - ldr r4, _081597B4 @ =gUnknown_2023BC4 + ldr r4, _081597B4 @ =gActiveBattler ldrb r2, [r4] lsls r0, r2, 9 adds r1, 0x1 @@ -6686,7 +6686,7 @@ _081597A4: bx r0 .align 2, 0 _081597B0: .4byte gUnknown_2022BC4 -_081597B4: .4byte gUnknown_2023BC4 +_081597B4: .4byte gActiveBattler thumb_func_end sub_815977C thumb_func_start sub_81597B8 @@ -6702,7 +6702,7 @@ sub_81597C4: @ 81597C4 push {r4,lr} ldr r2, _08159808 @ =gUnknown_2023E8A ldr r1, _0815980C @ =gUnknown_2022BC4 - ldr r4, _08159810 @ =gUnknown_2023BC4 + ldr r4, _08159810 @ =gActiveBattler ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -6714,7 +6714,7 @@ sub_81597C4: @ 81597C4 movs r0, 0x3 bl BeginFastPaletteFade bl PlayerPartnerBufferExecCompleted - ldr r0, _08159814 @ =gUnknown_2022B4C + ldr r0, _08159814 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x6 ands r0, r1 @@ -6733,8 +6733,8 @@ _08159800: .align 2, 0 _08159808: .4byte gUnknown_2023E8A _0815980C: .4byte gUnknown_2022BC4 -_08159810: .4byte gUnknown_2023BC4 -_08159814: .4byte gUnknown_2022B4C +_08159810: .4byte gActiveBattler +_08159814: .4byte gBattleTypeFlags _08159818: .4byte gUnknown_3004FE0 _0815981C: .4byte sub_8156254 thumb_func_end sub_81597C4 @@ -6748,14 +6748,14 @@ nullsub_100: @ 8159820 sub_8159824: @ 8159824 push {r4-r7,lr} ldr r1, _081598B4 @ =gUnknown_8479060 - ldr r0, _081598B8 @ =gUnknown_2023FE8 + ldr r0, _081598B8 @ =gBattleStruct ldr r0, [r0] adds r0, 0x96 ldrb r0, [r0] lsls r0, 2 adds r0, r1 ldr r7, [r0] - ldr r4, _081598BC @ =gUnknown_2023BC4 + ldr r4, _081598BC @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -6817,8 +6817,8 @@ _08159888: b _081598F0 .align 2, 0 _081598B4: .4byte gUnknown_8479060 -_081598B8: .4byte gUnknown_2023FE8 -_081598BC: .4byte gUnknown_2023BC4 +_081598B8: .4byte gBattleStruct +_081598BC: .4byte gActiveBattler _081598C0: .4byte gUnknown_3005EE0 _081598C4: cmp r0, 0x2 @@ -6849,7 +6849,7 @@ _081598E6: _081598F0: bl PlayerPartnerBufferExecCompleted ldr r3, _08159924 @ =gUnknown_3005EE0 - ldr r2, _08159928 @ =gUnknown_2023BC4 + ldr r2, _08159928 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r3 @@ -6873,7 +6873,7 @@ _081598F0: b _08159984 .align 2, 0 _08159924: .4byte gUnknown_3005EE0 -_08159928: .4byte gUnknown_2023BC4 +_08159928: .4byte gActiveBattler _0815992C: ldr r5, _0815998C @ =gUnknown_2023FF8 adds r0, r2, r5 @@ -6909,7 +6909,7 @@ _0815992C: bl ActionSelectionCreateCursorAt _08159972: ldr r1, _08159990 @ =gUnknown_3005EE0 - ldr r0, _08159994 @ =gUnknown_2023BC4 + ldr r0, _08159994 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -6924,7 +6924,7 @@ _08159984: .align 2, 0 _0815998C: .4byte gUnknown_2023FF8 _08159990: .4byte gUnknown_3005EE0 -_08159994: .4byte gUnknown_2023BC4 +_08159994: .4byte gActiveBattler thumb_func_end sub_8159824 thumb_func_start sub_8159998 @@ -6933,7 +6933,7 @@ sub_8159998: @ 8159998 mov r7, r8 push {r7} ldr r1, _08159A38 @ =gUnknown_84790D8 - ldr r0, _08159A3C @ =gUnknown_2023FE8 + ldr r0, _08159A3C @ =gBattleStruct ldr r0, [r0] adds r0, 0x96 ldrb r0, [r0] @@ -6942,7 +6942,7 @@ sub_8159998: @ 8159998 ldr r7, [r0] ldr r0, _08159A40 @ =gUnknown_3005EE0 mov r8, r0 - ldr r6, _08159A44 @ =gUnknown_2023BC4 + ldr r6, _08159A44 @ =gActiveBattler ldrb r2, [r6] lsls r0, r2, 2 add r0, r8 @@ -7008,9 +7008,9 @@ _081599DE: b _08159AA0 .align 2, 0 _08159A38: .4byte gUnknown_84790D8 -_08159A3C: .4byte gUnknown_2023FE8 +_08159A3C: .4byte gBattleStruct _08159A40: .4byte gUnknown_3005EE0 -_08159A44: .4byte gUnknown_2023BC4 +_08159A44: .4byte gActiveBattler _08159A48: ldr r5, _08159AAC @ =gUnknown_2023FFC adds r1, r2, r5 @@ -7046,7 +7046,7 @@ _08159A48: bl MoveSelectionCreateCursorAt _08159A8E: ldr r1, _08159AB0 @ =gUnknown_3005EE0 - ldr r0, _08159AB4 @ =gUnknown_2023BC4 + ldr r0, _08159AB4 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -7063,14 +7063,14 @@ _08159AA0: .align 2, 0 _08159AAC: .4byte gUnknown_2023FFC _08159AB0: .4byte gUnknown_3005EE0 -_08159AB4: .4byte gUnknown_2023BC4 +_08159AB4: .4byte gActiveBattler thumb_func_end sub_8159998 thumb_func_start sub_8159AB8 sub_8159AB8: @ 8159AB8 push {r4-r7,lr} ldr r1, _08159B54 @ =gUnknown_8479198 - ldr r4, _08159B58 @ =gUnknown_2023FE8 + ldr r4, _08159B58 @ =gBattleStruct ldr r2, [r4] adds r0, r2, 0 adds r0, 0x96 @@ -7078,7 +7078,7 @@ sub_8159AB8: @ 8159AB8 lsls r0, 2 adds r0, r1 ldr r6, [r0] - ldr r3, _08159B5C @ =gUnknown_2023BC4 + ldr r3, _08159B5C @ =gActiveBattler ldrb r5, [r3] lsls r1, r5, 9 ldr r0, _08159B60 @ =gUnknown_2022BC6 @@ -7148,8 +7148,8 @@ _08159B04: b _08159B72 .align 2, 0 _08159B54: .4byte gUnknown_8479198 -_08159B58: .4byte gUnknown_2023FE8 -_08159B5C: .4byte gUnknown_2023BC4 +_08159B58: .4byte gBattleStruct +_08159B5C: .4byte gActiveBattler _08159B60: .4byte gUnknown_2022BC6 _08159B64: .4byte gUnknown_3004FE0 _08159B68: .4byte gUnknown_3005EE0 @@ -7167,7 +7167,7 @@ _08159B72: thumb_func_start sub_8159B78 sub_8159B78: @ 8159B78 ldr r1, _08159B98 @ =gUnknown_3005EE0 - ldr r2, _08159B9C @ =gUnknown_2023BC4 + ldr r2, _08159B9C @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -7183,7 +7183,7 @@ sub_8159B78: @ 8159B78 bx lr .align 2, 0 _08159B98: .4byte gUnknown_3005EE0 -_08159B9C: .4byte gUnknown_2023BC4 +_08159B9C: .4byte gActiveBattler _08159BA0: .4byte gUnknown_3004FE0 _08159BA4: .4byte sub_81560DC thumb_func_end sub_8159B78 @@ -7193,7 +7193,7 @@ sub_8159BA8: @ 8159BA8 push {r4,r5,lr} sub sp, 0x4 ldr r1, _08159BD0 @ =gUnknown_3005EE0 - ldr r2, _08159BD4 @ =gUnknown_2023BC4 + ldr r2, _08159BD4 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -7212,7 +7212,7 @@ _08159BC4: mov pc, r0 .align 2, 0 _08159BD0: .4byte gUnknown_3005EE0 -_08159BD4: .4byte gUnknown_2023BC4 +_08159BD4: .4byte gActiveBattler _08159BD8: .4byte _08159BDC .align 2, 0 _08159BDC: @@ -7299,7 +7299,7 @@ _08159C90: bl BeginNormalPaletteFade _08159C94: ldr r1, _08159CAC @ =gUnknown_3005EE0 - ldr r0, _08159CB0 @ =gUnknown_2023BC4 + ldr r0, _08159CB0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -7312,7 +7312,7 @@ _08159C9E: .align 2, 0 _08159CA8: .4byte gMain _08159CAC: .4byte gUnknown_3005EE0 -_08159CB0: .4byte gUnknown_2023BC4 +_08159CB0: .4byte gActiveBattler _08159CB4: ldr r0, _08159CF8 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -7356,7 +7356,7 @@ sub_8159D04: @ 8159D04 push {r4-r6,lr} sub sp, 0x4 ldr r1, _08159D28 @ =gUnknown_3005EE0 - ldr r2, _08159D2C @ =gUnknown_2023BC4 + ldr r2, _08159D2C @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -7374,7 +7374,7 @@ _08159D1E: mov pc, r0 .align 2, 0 _08159D28: .4byte gUnknown_3005EE0 -_08159D2C: .4byte gUnknown_2023BC4 +_08159D2C: .4byte gActiveBattler _08159D30: .4byte _08159D34 .align 2, 0 _08159D34: @@ -7396,7 +7396,7 @@ _08159D50: beq _08159D62 b _08159EDE _08159D62: - ldr r0, _08159D94 @ =gUnknown_2023FE8 + ldr r0, _08159D94 @ =gBattleStruct ldr r4, [r0] adds r5, r4, 0 adds r5, 0x95 @@ -7418,7 +7418,7 @@ _08159D62: b _08159E80 .align 2, 0 _08159D90: .4byte gUnknown_2037AB8 -_08159D94: .4byte gUnknown_2023FE8 +_08159D94: .4byte gBattleStruct _08159D98: ldr r0, _08159DD0 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -7430,8 +7430,8 @@ _08159D98: beq _08159DAA b _08159EDE _08159DAA: - ldr r2, _08159DD4 @ =gUnknown_825E45C - ldr r0, _08159DD8 @ =gUnknown_2023FE8 + ldr r2, _08159DD4 @ =gBitTable + ldr r0, _08159DD8 @ =gBattleStruct ldr r0, [r0] adds r1, r0, 0 adds r1, 0x95 @@ -7450,8 +7450,8 @@ _08159DAA: b _08159E7A .align 2, 0 _08159DD0: .4byte gUnknown_2037AB8 -_08159DD4: .4byte gUnknown_825E45C -_08159DD8: .4byte gUnknown_2023FE8 +_08159DD4: .4byte gBitTable +_08159DD8: .4byte gBattleStruct _08159DDC: ldr r0, _08159DF0 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -7489,8 +7489,8 @@ _08159E0C: beq _08159EDE movs r0, 0x5 bl PlaySE - ldr r2, _08159E5C @ =gUnknown_825E45C - ldr r0, _08159E60 @ =gUnknown_2023FE8 + ldr r2, _08159E5C @ =gBitTable + ldr r0, _08159E60 @ =gBattleStruct ldr r0, [r0] adds r1, r0, 0 adds r1, 0x95 @@ -7512,8 +7512,8 @@ _08159E0C: b _08159E80 .align 2, 0 _08159E58: .4byte gMain -_08159E5C: .4byte gUnknown_825E45C -_08159E60: .4byte gUnknown_2023FE8 +_08159E5C: .4byte gBitTable +_08159E60: .4byte gBattleStruct _08159E64: ldr r0, _08159E98 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -7534,7 +7534,7 @@ _08159E80: bl BeginNormalPaletteFade _08159E84: ldr r1, _08159E9C @ =gUnknown_3005EE0 - ldr r0, _08159EA0 @ =gUnknown_2023BC4 + ldr r0, _08159EA0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -7546,7 +7546,7 @@ _08159E84: .align 2, 0 _08159E98: .4byte gUnknown_2037AB8 _08159E9C: .4byte gUnknown_3005EE0 -_08159EA0: .4byte gUnknown_2023BC4 +_08159EA0: .4byte gActiveBattler _08159EA4: ldr r0, _08159EE8 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -7585,7 +7585,7 @@ _08159EEC: .4byte 0x00000137 thumb_func_start sub_8159EF0 sub_8159EF0: @ 8159EF0 push {lr} - ldr r0, _08159F10 @ =gUnknown_2023FE8 + ldr r0, _08159F10 @ =gBattleStruct ldr r0, [r0] adds r1, r0, 0 adds r1, 0x96 @@ -7602,7 +7602,7 @@ _08159F0C: ldr r1, _08159F14 @ =gUnknown_84791A8 b _08159F2A .align 2, 0 -_08159F10: .4byte gUnknown_2023FE8 +_08159F10: .4byte gBattleStruct _08159F14: .4byte gUnknown_84791A8 _08159F18: ldr r1, _08159F1C @ =gUnknown_84791B8 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 217dd6f4a..a4e877dcb 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -13,7 +13,7 @@ nullsub_79: @ 80DD534 thumb_func_start sub_80DD538 sub_80DD538: @ 80DD538 ldr r1, _080DD548 @ =gUnknown_3004FE0 - ldr r0, _080DD54C @ =gUnknown_2023BC4 + ldr r0, _080DD54C @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -22,7 +22,7 @@ sub_80DD538: @ 80DD538 bx lr .align 2, 0 _080DD548: .4byte gUnknown_3004FE0 -_080DD54C: .4byte gUnknown_2023BC4 +_080DD54C: .4byte gActiveBattler _080DD550: .4byte SafariBufferRunCommand thumb_func_end sub_80DD538 @@ -30,8 +30,8 @@ _080DD550: .4byte SafariBufferRunCommand SafariBufferRunCommand: @ 80DD554 push {lr} ldr r2, _080DD588 @ =gUnknown_2023BC8 - ldr r1, _080DD58C @ =gUnknown_825E45C - ldr r0, _080DD590 @ =gUnknown_2023BC4 + ldr r1, _080DD58C @ =gBitTable + ldr r0, _080DD590 @ =gActiveBattler ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -55,8 +55,8 @@ SafariBufferRunCommand: @ 80DD554 b _080DD5A0 .align 2, 0 _080DD588: .4byte gUnknown_2023BC8 -_080DD58C: .4byte gUnknown_825E45C -_080DD590: .4byte gUnknown_2023BC4 +_080DD58C: .4byte gBitTable +_080DD590: .4byte gActiveBattler _080DD594: .4byte gUnknown_2022BC4 _080DD598: .4byte gUnknown_83FED00 _080DD59C: @@ -79,7 +79,7 @@ HandleInputChooseAction_0: @ 80DD5A4 movs r0, 0x5 bl PlaySE ldr r1, _080DD5D8 @ =gUnknown_2023FF8 - ldr r0, _080DD5DC @ =gUnknown_2023BC4 + ldr r0, _080DD5DC @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -93,7 +93,7 @@ HandleInputChooseAction_0: @ 80DD5A4 .align 2, 0 _080DD5D4: .4byte gMain _080DD5D8: .4byte gUnknown_2023FF8 -_080DD5DC: .4byte gUnknown_2023BC4 +_080DD5DC: .4byte gActiveBattler _080DD5E0: cmp r0, 0x2 beq _080DD5F6 @@ -129,7 +129,7 @@ _080DD612: cmp r0, 0 beq _080DD650 ldr r5, _080DD648 @ =gUnknown_2023FF8 - ldr r4, _080DD64C @ =gUnknown_2023BC4 + ldr r4, _080DD64C @ =gActiveBattler ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -150,14 +150,14 @@ _080DD612: b _080DD6BE .align 2, 0 _080DD648: .4byte gUnknown_2023FF8 -_080DD64C: .4byte gUnknown_2023BC4 +_080DD64C: .4byte gActiveBattler _080DD650: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _080DD68C ldr r5, _080DD684 @ =gUnknown_2023FF8 - ldr r4, _080DD688 @ =gUnknown_2023BC4 + ldr r4, _080DD688 @ =gActiveBattler ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -178,14 +178,14 @@ _080DD650: b _080DD6BE .align 2, 0 _080DD684: .4byte gUnknown_2023FF8 -_080DD688: .4byte gUnknown_2023BC4 +_080DD688: .4byte gActiveBattler _080DD68C: movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _080DD6D8 ldr r5, _080DD6D0 @ =gUnknown_2023FF8 - ldr r4, _080DD6D4 @ =gUnknown_2023BC4 + ldr r4, _080DD6D4 @ =gActiveBattler ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -214,14 +214,14 @@ _080DD6BE: b _080DD71A .align 2, 0 _080DD6D0: .4byte gUnknown_2023FF8 -_080DD6D4: .4byte gUnknown_2023BC4 +_080DD6D4: .4byte gActiveBattler _080DD6D8: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080DD71A ldr r5, _080DD720 @ =gUnknown_2023FF8 - ldr r4, _080DD724 @ =gUnknown_2023BC4 + ldr r4, _080DD724 @ =gActiveBattler ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -252,7 +252,7 @@ _080DD71A: bx r0 .align 2, 0 _080DD720: .4byte gUnknown_2023FF8 -_080DD724: .4byte gUnknown_2023BC4 +_080DD724: .4byte gActiveBattler thumb_func_end HandleInputChooseAction_0 thumb_func_start sub_80DD728 @@ -260,7 +260,7 @@ sub_80DD728: @ 80DD728 push {lr} ldr r2, _080DD750 @ =gSprites ldr r1, _080DD754 @ =gUnknown_2023D44 - ldr r0, _080DD758 @ =gUnknown_2023BC4 + ldr r0, _080DD758 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -280,7 +280,7 @@ _080DD74C: .align 2, 0 _080DD750: .4byte gSprites _080DD754: .4byte gUnknown_2023D44 -_080DD758: .4byte gUnknown_2023BC4 +_080DD758: .4byte gActiveBattler _080DD75C: .4byte SpriteCallbackDummy thumb_func_end sub_80DD728 @@ -303,7 +303,7 @@ sub_80DD778: @ 80DD778 push {lr} ldr r2, _080DD7A0 @ =gSprites ldr r1, _080DD7A4 @ =gUnknown_3004FF0 - ldr r0, _080DD7A8 @ =gUnknown_2023BC4 + ldr r0, _080DD7A8 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -323,7 +323,7 @@ _080DD79C: .align 2, 0 _080DD7A0: .4byte gSprites _080DD7A4: .4byte gUnknown_3004FF0 -_080DD7A8: .4byte gUnknown_2023BC4 +_080DD7A8: .4byte gActiveBattler _080DD7AC: .4byte SpriteCallbackDummy thumb_func_end sub_80DD778 @@ -368,7 +368,7 @@ CompleteOnSpecialAnimDone_0: @ 80DD7F0 beq _080DD816 ldr r0, _080DD824 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080DD828 @ =gUnknown_2023BC4 + ldr r0, _080DD828 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -388,7 +388,7 @@ _080DD81A: .align 2, 0 _080DD820: .4byte gUnknown_2024005 _080DD824: .4byte gUnknown_2024018 -_080DD828: .4byte gUnknown_2023BC4 +_080DD828: .4byte gActiveBattler thumb_func_end CompleteOnSpecialAnimDone_0 thumb_func_start sub_80DD82C @@ -401,7 +401,7 @@ sub_80DD82C: @ 80DD82C cmp r0, 0 bne _080DD848 ldr r1, _080DD850 @ =gUnknown_3004FE0 - ldr r0, _080DD854 @ =gUnknown_2023BC4 + ldr r0, _080DD854 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -413,7 +413,7 @@ _080DD848: .align 2, 0 _080DD84C: .4byte gUnknown_2037AB8 _080DD850: .4byte gUnknown_3004FE0 -_080DD854: .4byte gUnknown_2023BC4 +_080DD854: .4byte gActiveBattler _080DD858: .4byte CompleteWhenChosePokeblock thumb_func_end sub_80DD82C @@ -451,7 +451,7 @@ CompleteOnFinishedBattleAnimation_3: @ 80DD898 push {lr} ldr r0, _080DD8C0 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080DD8C4 @ =gUnknown_2023BC4 + ldr r0, _080DD8C4 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -469,7 +469,7 @@ _080DD8BA: bx r0 .align 2, 0 _080DD8C0: .4byte gUnknown_2024018 -_080DD8C4: .4byte gUnknown_2023BC4 +_080DD8C4: .4byte gActiveBattler thumb_func_end CompleteOnFinishedBattleAnimation_3 thumb_func_start SafariBufferExecCompleted @@ -477,13 +477,13 @@ SafariBufferExecCompleted: @ 80DD8C8 push {r4,lr} sub sp, 0x4 ldr r1, _080DD908 @ =gUnknown_3004FE0 - ldr r4, _080DD90C @ =gUnknown_2023BC4 + ldr r4, _080DD90C @ =gActiveBattler ldrb r0, [r4] lsls r0, 2 adds r0, r1 ldr r1, _080DD910 @ =SafariBufferRunCommand str r1, [r0] - ldr r0, _080DD914 @ =gUnknown_2022B4C + ldr r0, _080DD914 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -505,13 +505,13 @@ SafariBufferExecCompleted: @ 80DD8C8 b _080DD92E .align 2, 0 _080DD908: .4byte gUnknown_3004FE0 -_080DD90C: .4byte gUnknown_2023BC4 +_080DD90C: .4byte gActiveBattler _080DD910: .4byte SafariBufferRunCommand -_080DD914: .4byte gUnknown_2022B4C +_080DD914: .4byte gBattleTypeFlags _080DD918: .4byte gUnknown_2022BC4 _080DD91C: ldr r2, _080DD938 @ =gUnknown_2023BC8 - ldr r1, _080DD93C @ =gUnknown_825E45C + ldr r1, _080DD93C @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -526,7 +526,7 @@ _080DD92E: bx r0 .align 2, 0 _080DD938: .4byte gUnknown_2023BC8 -_080DD93C: .4byte gUnknown_825E45C +_080DD93C: .4byte gBitTable thumb_func_end SafariBufferExecCompleted thumb_func_start CompleteOnFinishedStatusAnimation_3 @@ -534,7 +534,7 @@ CompleteOnFinishedStatusAnimation_3: @ 80DD940 push {lr} ldr r0, _080DD968 @ =gUnknown_2024018 ldr r2, [r0] - ldr r0, _080DD96C @ =gUnknown_2023BC4 + ldr r0, _080DD96C @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -552,7 +552,7 @@ _080DD962: bx r0 .align 2, 0 _080DD968: .4byte gUnknown_2024018 -_080DD96C: .4byte gUnknown_2023BC4 +_080DD96C: .4byte gActiveBattler thumb_func_end CompleteOnFinishedStatusAnimation_3 thumb_func_start sub_80DD970 @@ -617,7 +617,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4 ldr r4, _080DDA7C @ =gSaveBlock2Ptr ldr r0, [r4] ldrb r0, [r0, 0x8] - ldr r5, _080DDA80 @ =gUnknown_2023BC4 + ldr r5, _080DDA80 @ =gActiveBattler ldrb r1, [r5] bl sub_8034750 ldr r0, [r4] @@ -703,7 +703,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4 bx r0 .align 2, 0 _080DDA7C: .4byte gSaveBlock2Ptr -_080DDA80: .4byte gUnknown_2023BC4 +_080DDA80: .4byte gActiveBattler _080DDA84: .4byte gUnknown_20244DC _080DDA88: .4byte gUnknown_8239F8C _080DDA8C: .4byte gUnknown_2023D44 @@ -757,7 +757,7 @@ sub_80DDAD4: @ 80DDAD4 ldr r1, _080DDB18 @ =gUnknown_2024005 movs r0, 0x1 strb r0, [r1] - ldr r5, _080DDB1C @ =gUnknown_2023BC4 + ldr r5, _080DDB1C @ =gActiveBattler ldrb r4, [r5] movs r0, 0x1 bl GetBankByIdentity @@ -780,7 +780,7 @@ sub_80DDAD4: @ 80DDAD4 .align 2, 0 _080DDB14: .4byte gUnknown_2024018 _080DDB18: .4byte gUnknown_2024005 -_080DDB1C: .4byte gUnknown_2023BC4 +_080DDB1C: .4byte gActiveBattler _080DDB20: .4byte gUnknown_3004FE0 _080DDB24: .4byte CompleteOnSpecialAnimDone_0 thumb_func_end sub_80DDAD4 @@ -789,7 +789,7 @@ _080DDB24: .4byte CompleteOnSpecialAnimDone_0 sub_80DDB28: @ 80DDB28 push {r4,r5,lr} ldr r1, _080DDB70 @ =gUnknown_2022BC4 - ldr r5, _080DDB74 @ =gUnknown_2023BC4 + ldr r5, _080DDB74 @ =gActiveBattler ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -823,7 +823,7 @@ sub_80DDB28: @ 80DDB28 bx r0 .align 2, 0 _080DDB70: .4byte gUnknown_2022BC4 -_080DDB74: .4byte gUnknown_2023BC4 +_080DDB74: .4byte gActiveBattler _080DDB78: .4byte gUnknown_2024018 _080DDB7C: .4byte gUnknown_2024005 _080DDB80: .4byte gUnknown_3004FE0 @@ -854,7 +854,7 @@ sub_80DDBA0: @ 80DDBA0 strh r1, [r0] ldr r0, _080DDBD8 @ =gUnknown_2022976 strh r1, [r0] - ldr r0, _080DDBDC @ =gUnknown_2023BC4 + ldr r0, _080DDBDC @ =gActiveBattler ldrb r4, [r0] lsls r4, 9 ldr r0, _080DDBE0 @ =gUnknown_2022BC6 @@ -873,7 +873,7 @@ sub_80DDBA0: @ 80DDBA0 .align 2, 0 _080DDBD4: .4byte gUnknown_2022974 _080DDBD8: .4byte gUnknown_2022976 -_080DDBDC: .4byte gUnknown_2023BC4 +_080DDBDC: .4byte gActiveBattler _080DDBE0: .4byte gUnknown_2022BC6 _080DDBE4: .4byte gUnknown_202298C _080DDBE8: @@ -882,7 +882,7 @@ _080DDBE8: bl sub_80D87BC _080DDBF0: ldr r1, _080DDC08 @ =gUnknown_3004FE0 - ldr r0, _080DDC0C @ =gUnknown_2023BC4 + ldr r0, _080DDC0C @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -894,14 +894,14 @@ _080DDBF0: .align 2, 0 _080DDC04: .4byte gUnknown_202298C _080DDC08: .4byte gUnknown_3004FE0 -_080DDC0C: .4byte gUnknown_2023BC4 +_080DDC0C: .4byte gActiveBattler _080DDC10: .4byte CompleteOnInactiveTextPrinter_3 thumb_func_end sub_80DDBA0 thumb_func_start sub_80DDC14 sub_80DDC14: @ 80DDC14 push {lr} - ldr r0, _080DDC2C @ =gUnknown_2023BC4 + ldr r0, _080DDC2C @ =gActiveBattler ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -910,7 +910,7 @@ sub_80DDC14: @ 80DDC14 bl sub_80DDBA0 b _080DDC34 .align 2, 0 -_080DDC2C: .4byte gUnknown_2023BC4 +_080DDC2C: .4byte gActiveBattler _080DDC30: bl SafariBufferExecCompleted _080DDC34: @@ -932,7 +932,7 @@ sub_80DDC38: @ 80DDC38 movs r0, 0xA0 strh r0, [r1] ldr r1, _080DDC6C @ =gUnknown_3004FE0 - ldr r0, _080DDC70 @ =gUnknown_2023BC4 + ldr r0, _080DDC70 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -945,7 +945,7 @@ _080DDC5E: _080DDC64: .4byte gUnknown_2022974 _080DDC68: .4byte gUnknown_2022976 _080DDC6C: .4byte gUnknown_3004FE0 -_080DDC70: .4byte gUnknown_2023BC4 +_080DDC70: .4byte gActiveBattler _080DDC74: .4byte HandleInputChooseAction_0 thumb_func_end sub_80DDC38 @@ -953,7 +953,7 @@ _080DDC74: .4byte HandleInputChooseAction_0 sub_80DDC78: @ 80DDC78 push {r4,lr} ldr r1, _080DDCCC @ =gUnknown_3004FE0 - ldr r0, _080DDCD0 @ =gUnknown_2023BC4 + ldr r0, _080DDCD0 @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -974,7 +974,7 @@ _080DDC9A: cmp r4, 0x3 ble _080DDC9A ldr r1, _080DDCE0 @ =gUnknown_2023FF8 - ldr r0, _080DDCD0 @ =gUnknown_2023BC4 + ldr r0, _080DDCD0 @ =gActiveBattler ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -990,7 +990,7 @@ _080DDC9A: bx r0 .align 2, 0 _080DDCCC: .4byte gUnknown_3004FE0 -_080DDCD0: .4byte gUnknown_2023BC4 +_080DDCD0: .4byte gActiveBattler _080DDCD4: .4byte sub_80DDC38 _080DDCD8: .4byte gUnknown_83FDA4C _080DDCDC: .4byte gUnknown_83FE747 @@ -1027,7 +1027,7 @@ sub_80DDD04: @ 80DDD04 movs r3, 0x10 bl BeginNormalPaletteFade ldr r1, _080DDD34 @ =gUnknown_3004FE0 - ldr r2, _080DDD38 @ =gUnknown_2023BC4 + ldr r2, _080DDD38 @ =gActiveBattler ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -1041,7 +1041,7 @@ sub_80DDD04: @ 80DDD04 bx r0 .align 2, 0 _080DDD34: .4byte gUnknown_3004FE0 -_080DDD38: .4byte gUnknown_2023BC4 +_080DDD38: .4byte gActiveBattler _080DDD3C: .4byte sub_80DD82C _080DDD40: .4byte gUnknown_2024004 thumb_func_end sub_80DDD04 @@ -1082,17 +1082,17 @@ sub_80DDD68: @ 80DDD68 SafariHandleStatusIconUpdate: @ 80DDD74 push {lr} ldr r0, _080DDDA0 @ =gUnknown_3004FF0 - ldr r1, _080DDDA4 @ =gUnknown_2023BC4 + ldr r1, _080DDDA4 @ =gActiveBattler ldrb r1, [r1] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _080DDDA8 @ =gUnknown_2023BCE + ldr r2, _080DDDA8 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080DDDAC @ =gUnknown_2024284 + ldr r2, _080DDDAC @ =gPlayerParty adds r1, r2 movs r2, 0xB bl UpdateHealthboxAttribute @@ -1101,9 +1101,9 @@ SafariHandleStatusIconUpdate: @ 80DDD74 bx r0 .align 2, 0 _080DDDA0: .4byte gUnknown_3004FF0 -_080DDDA4: .4byte gUnknown_2023BC4 -_080DDDA8: .4byte gUnknown_2023BCE -_080DDDAC: .4byte gUnknown_2024284 +_080DDDA4: .4byte gActiveBattler +_080DDDA8: .4byte gBattlerPartyIndexes +_080DDDAC: .4byte gPlayerParty thumb_func_end SafariHandleStatusIconUpdate thumb_func_start sub_80DDDB0 @@ -1237,7 +1237,7 @@ sub_80DDE64: @ 80DDE64 thumb_func_start SafariHandlePlaySE SafariHandlePlaySE: @ 80DDE70 push {r4,lr} - ldr r4, _080DDEAC @ =gUnknown_2023BC4 + ldr r4, _080DDEAC @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1265,7 +1265,7 @@ _080DDE84: pop {r0} bx r0 .align 2, 0 -_080DDEAC: .4byte gUnknown_2023BC4 +_080DDEAC: .4byte gActiveBattler _080DDEB0: .4byte gUnknown_2022BC4 thumb_func_end SafariHandlePlaySE @@ -1273,7 +1273,7 @@ _080DDEB0: .4byte gUnknown_2022BC4 SafariHandlecmd44: @ 80DDEB4 push {lr} ldr r2, _080DDEDC @ =gUnknown_2022BC4 - ldr r0, _080DDEE0 @ =gUnknown_2023BC4 + ldr r0, _080DDEE0 @ =gActiveBattler ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -1290,21 +1290,21 @@ SafariHandlecmd44: @ 80DDEB4 bx r0 .align 2, 0 _080DDEDC: .4byte gUnknown_2022BC4 -_080DDEE0: .4byte gUnknown_2023BC4 +_080DDEE0: .4byte gActiveBattler thumb_func_end SafariHandlecmd44 thumb_func_start SafariHandleFaintingCry SafariHandleFaintingCry: @ 80DDEE4 push {lr} - ldr r1, _080DDF14 @ =gUnknown_2023BCE - ldr r0, _080DDF18 @ =gUnknown_2023BC4 + ldr r1, _080DDF14 @ =gBattlerPartyIndexes + ldr r0, _080DDF18 @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080DDF1C @ =gUnknown_2024284 + ldr r1, _080DDF1C @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -1316,16 +1316,16 @@ SafariHandleFaintingCry: @ 80DDEE4 pop {r0} bx r0 .align 2, 0 -_080DDF14: .4byte gUnknown_2023BCE -_080DDF18: .4byte gUnknown_2023BC4 -_080DDF1C: .4byte gUnknown_2024284 +_080DDF14: .4byte gBattlerPartyIndexes +_080DDF18: .4byte gActiveBattler +_080DDF1C: .4byte gPlayerParty thumb_func_end SafariHandleFaintingCry thumb_func_start SafariHandleIntroSlide SafariHandleIntroSlide: @ 80DDF20 push {lr} ldr r1, _080DDF48 @ =gUnknown_2022BC4 - ldr r0, _080DDF4C @ =gUnknown_2023BC4 + ldr r0, _080DDF4C @ =gActiveBattler ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -1342,7 +1342,7 @@ SafariHandleIntroSlide: @ 80DDF20 bx r0 .align 2, 0 _080DDF48: .4byte gUnknown_2022BC4 -_080DDF4C: .4byte gUnknown_2023BC4 +_080DDF4C: .4byte gActiveBattler _080DDF50: .4byte gUnknown_2023F4C thumb_func_end SafariHandleIntroSlide @@ -1350,17 +1350,17 @@ _080DDF50: .4byte gUnknown_2023F4C SafariHandleIntroTrainerBallThrow: @ 80DDF54 push {r4,r5,lr} ldr r5, _080DDF98 @ =gUnknown_3004FF0 - ldr r4, _080DDF9C @ =gUnknown_2023BC4 + ldr r4, _080DDF9C @ =gActiveBattler ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _080DDFA0 @ =gUnknown_2023BCE + ldr r2, _080DDFA0 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080DDFA4 @ =gUnknown_2024284 + ldr r2, _080DDFA4 @ =gPlayerParty adds r1, r2 movs r2, 0xA bl UpdateHealthboxAttribute @@ -1381,9 +1381,9 @@ SafariHandleIntroTrainerBallThrow: @ 80DDF54 bx r0 .align 2, 0 _080DDF98: .4byte gUnknown_3004FF0 -_080DDF9C: .4byte gUnknown_2023BC4 -_080DDFA0: .4byte gUnknown_2023BCE -_080DDFA4: .4byte gUnknown_2024284 +_080DDF9C: .4byte gActiveBattler +_080DDFA0: .4byte gBattlerPartyIndexes +_080DDFA4: .4byte gPlayerParty _080DDFA8: .4byte gUnknown_3004FE0 _080DDFAC: .4byte sub_80DD778 thumb_func_end SafariHandleIntroTrainerBallThrow @@ -1425,7 +1425,7 @@ SafariHandleBattleAnimation: @ 80DDFE0 push {r4-r6,lr} sub sp, 0x4 ldr r5, _080DE018 @ =gUnknown_2022BC4 - ldr r6, _080DE01C @ =gUnknown_2023BC4 + ldr r6, _080DE01C @ =gActiveBattler ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -1450,7 +1450,7 @@ SafariHandleBattleAnimation: @ 80DDFE0 b _080DE02C .align 2, 0 _080DE018: .4byte gUnknown_2022BC4 -_080DE01C: .4byte gUnknown_2023BC4 +_080DE01C: .4byte gActiveBattler _080DE020: ldr r0, _080DE034 @ =gUnknown_3004FE0 ldrb r1, [r6] @@ -1489,7 +1489,7 @@ SafariHandleCmd55: @ 80DE054 push {r4,lr} ldr r2, _080DE098 @ =gUnknown_2023E8A ldr r1, _080DE09C @ =gUnknown_2022BC4 - ldr r4, _080DE0A0 @ =gUnknown_2023BC4 + ldr r4, _080DE0A0 @ =gActiveBattler ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -1501,7 +1501,7 @@ SafariHandleCmd55: @ 80DE054 movs r0, 0x3 bl BeginFastPaletteFade bl SafariBufferExecCompleted - ldr r0, _080DE0A4 @ =gUnknown_2022B4C + ldr r0, _080DE0A4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x6 ands r0, r1 @@ -1520,8 +1520,8 @@ _080DE090: .align 2, 0 _080DE098: .4byte gUnknown_2023E8A _080DE09C: .4byte gUnknown_2022BC4 -_080DE0A0: .4byte gUnknown_2023BC4 -_080DE0A4: .4byte gUnknown_2022B4C +_080DE0A0: .4byte gActiveBattler +_080DE0A4: .4byte gBattleTypeFlags _080DE0A8: .4byte gUnknown_3004FE0 _080DE0AC: .4byte sub_80DD7B0 thumb_func_end SafariHandleCmd55 diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index d3be81b30..41cb46535 100644 --- a/asm/battle_controllers.s +++ b/asm/battle_controllers.s @@ -8,7 +8,7 @@ thumb_func_start sub_800D230 sub_800D230: @ 800D230 push {lr} - ldr r0, _0800D268 @ =gUnknown_2022B4C + ldr r0, _0800D268 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -34,7 +34,7 @@ _0800D262: pop {r0} bx r0 .align 2, 0 -_0800D268: .4byte gUnknown_2022B4C +_0800D268: .4byte gBattleTypeFlags _0800D26C: .4byte gUnknown_3003F3C _0800D270: .4byte gUnknown_3003F64 _0800D274: .4byte sub_8081A90 @@ -82,7 +82,7 @@ _0800D298: str r4, [r0] bl ClearBattleAnimationVars bl sub_8043FBC - bl sub_80C6D0C + bl BattleAI_HandleItemUseBeforeAISetup ldr r0, _0800D304 @ =gUnknown_2022B54 str r4, [r0] ldr r0, _0800D308 @ =gUnknown_2023DDC @@ -108,7 +108,7 @@ _0800D308: .4byte gUnknown_2023DDC thumb_func_start sub_800D30C sub_800D30C: @ 800D30C push {r4,r5,lr} - ldr r0, _0800D320 @ =gUnknown_2022B4C + ldr r0, _0800D320 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -117,12 +117,12 @@ sub_800D30C: @ 800D30C bl sub_800D494 b _0800D328 .align 2, 0 -_0800D320: .4byte gUnknown_2022B4C +_0800D320: .4byte gBattleTypeFlags _0800D324: bl sub_800D364 _0800D328: bl sub_800D768 - ldr r0, _0800D35C @ =gUnknown_2022B4C + ldr r0, _0800D35C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -148,14 +148,14 @@ _0800D356: pop {r0} bx r0 .align 2, 0 -_0800D35C: .4byte gUnknown_2022B4C +_0800D35C: .4byte gBattleTypeFlags _0800D360: .4byte gUnknown_2023BCC thumb_func_end sub_800D30C thumb_func_start sub_800D364 sub_800D364: @ 800D364 push {r4,lr} - ldr r0, _0800D398 @ =gUnknown_2022B4C + ldr r0, _0800D398 @ =gBattleTypeFlags ldr r2, [r0] movs r4, 0x1 adds r3, r2, 0 @@ -181,7 +181,7 @@ sub_800D364: @ 800D364 movs r0, 0x2 b _0800D478 .align 2, 0 -_0800D398: .4byte gUnknown_2022B4C +_0800D398: .4byte gBattleTypeFlags _0800D39C: .4byte gUnknown_3004F84 _0800D3A0: .4byte sub_80123C0 _0800D3A4: .4byte gUnknown_3004FE0 @@ -301,7 +301,7 @@ sub_800D494: @ 800D494 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _0800D4D0 @ =gUnknown_2022B4C + ldr r4, _0800D4D0 @ =gBattleTypeFlags ldr r0, [r4] movs r5, 0x1 adds r3, r0, 0 @@ -327,7 +327,7 @@ sub_800D494: @ 800D494 movs r0, 0x2 b _0800D752 .align 2, 0 -_0800D4D0: .4byte gUnknown_2022B4C +_0800D4D0: .4byte gBattleTypeFlags _0800D4D4: .4byte gUnknown_3004F84 _0800D4D8: .4byte sub_80123C0 _0800D4DC: .4byte gUnknown_3004FE0 @@ -433,7 +433,7 @@ _0800D5BC: mov r12, r1 ldr r7, _0800D5F0 @ =gUnknown_2023BD6 mov r8, r0 - ldr r6, _0800D5F4 @ =gUnknown_2023BCE + ldr r6, _0800D5F4 @ =gBattlerPartyIndexes movs r4, 0 movs r2, 0x3 mov r9, r2 @@ -453,7 +453,7 @@ _0800D5E4: .4byte gUnknown_3004F84 _0800D5E8: .4byte sub_80123C0 _0800D5EC: .4byte gUnknown_202273C _0800D5F0: .4byte gUnknown_2023BD6 -_0800D5F4: .4byte gUnknown_2023BCE +_0800D5F4: .4byte gBattlerPartyIndexes _0800D5F8: cmp r0, 0x3 bne _0800D61A @@ -662,7 +662,7 @@ sub_800D768: @ 800D768 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0800D788 @ =gUnknown_2022B4C + ldr r0, _0800D788 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -674,7 +674,7 @@ _0800D780: mov r8, r0 b _0800D892 .align 2, 0 -_0800D788: .4byte gUnknown_2022B4C +_0800D788: .4byte gBattleTypeFlags _0800D78C: movs r5, 0 movs r0, 0x1 @@ -696,13 +696,13 @@ _0800D7A0: ands r0, r1 cmp r0, 0 bne _0800D7C0 - ldr r0, _0800D7BC @ =gUnknown_2024284 + ldr r0, _0800D7BC @ =gPlayerParty b _0800D7C2 .align 2, 0 _0800D7B8: .4byte gUnknown_2023BD6 -_0800D7BC: .4byte gUnknown_2024284 +_0800D7BC: .4byte gPlayerParty _0800D7C0: - ldr r0, _0800D800 @ =gUnknown_202402C + ldr r0, _0800D800 @ =gEnemyParty _0800D7C2: adds r4, r7, r0 adds r0, r4, 0 @@ -727,13 +727,13 @@ _0800D7C2: bl GetMonData cmp r0, 0 bne _0800D888 - ldr r0, _0800D804 @ =gUnknown_2023BCE + ldr r0, _0800D804 @ =gBattlerPartyIndexes adds r0, r6, r0 strh r5, [r0] b _0800D890 .align 2, 0 -_0800D800: .4byte gUnknown_202402C -_0800D804: .4byte gUnknown_2023BCE +_0800D800: .4byte gEnemyParty +_0800D804: .4byte gBattlerPartyIndexes _0800D808: mov r0, r9 ldrb r1, [r0] @@ -741,7 +741,7 @@ _0800D808: ands r0, r1 cmp r0, 0 bne _0800D830 - ldr r0, _0800D82C @ =gUnknown_2024284 + ldr r0, _0800D82C @ =gPlayerParty adds r4, r7, r0 adds r0, r4, 0 movs r1, 0x39 @@ -752,9 +752,9 @@ _0800D808: movs r1, 0xB b _0800D844 .align 2, 0 -_0800D82C: .4byte gUnknown_2024284 +_0800D82C: .4byte gPlayerParty _0800D830: - ldr r0, _0800D880 @ =gUnknown_202402C + ldr r0, _0800D880 @ =gEnemyParty adds r4, r7, r0 adds r0, r4, 0 movs r1, 0x39 @@ -779,7 +779,7 @@ _0800D844: bl GetMonData cmp r0, 0 bne _0800D888 - ldr r1, _0800D884 @ =gUnknown_2023BCE + ldr r1, _0800D884 @ =gBattlerPartyIndexes mov r0, r8 subs r0, 0x2 lsls r0, 1 @@ -791,8 +791,8 @@ _0800D844: strh r5, [r0] b _0800D890 .align 2, 0 -_0800D880: .4byte gUnknown_202402C -_0800D884: .4byte gUnknown_2023BCE +_0800D880: .4byte gEnemyParty +_0800D884: .4byte gBattlerPartyIndexes _0800D888: adds r7, 0x64 adds r5, 0x1 @@ -827,7 +827,7 @@ PrepareBufferDataTransfer: @ 800D8B0 adds r5, r3, 0 lsls r2, 16 lsrs r2, 16 - ldr r0, _0800D8D8 @ =gUnknown_2022B4C + ldr r0, _0800D8D8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -839,7 +839,7 @@ PrepareBufferDataTransfer: @ 800D8B0 bl PrepareBufferDataTransferLink b _0800D92E .align 2, 0 -_0800D8D8: .4byte gUnknown_2022B4C +_0800D8D8: .4byte gBattleTypeFlags _0800D8DC: cmp r5, 0 beq _0800D8E6 @@ -851,7 +851,7 @@ _0800D8E6: cmp r3, r2 bge _0800D92E ldr r6, _0800D908 @ =gUnknown_2022BC4 - ldr r5, _0800D90C @ =gUnknown_2023BC4 + ldr r5, _0800D90C @ =gActiveBattler _0800D8F0: ldrb r0, [r5] lsls r0, 9 @@ -866,13 +866,13 @@ _0800D8F0: b _0800D92E .align 2, 0 _0800D908: .4byte gUnknown_2022BC4 -_0800D90C: .4byte gUnknown_2023BC4 +_0800D90C: .4byte gActiveBattler _0800D910: movs r3, 0 cmp r3, r2 bge _0800D92E ldr r6, _0800D934 @ =gUnknown_20233C4 - ldr r5, _0800D938 @ =gUnknown_2023BC4 + ldr r5, _0800D938 @ =gActiveBattler _0800D91A: ldrb r0, [r5] lsls r0, 9 @@ -890,7 +890,7 @@ _0800D92E: bx r0 .align 2, 0 _0800D934: .4byte gUnknown_20233C4 -_0800D938: .4byte gUnknown_2023BC4 +_0800D938: .4byte gActiveBattler thumb_func_end PrepareBufferDataTransfer thumb_func_start CreateTasksForSendRecvLinkBuffers @@ -1041,7 +1041,7 @@ _0800DA3E: ldrsh r1, [r0, r7] ldr r0, [r4] adds r1, r0 - ldr r0, _0800DB58 @ =gUnknown_2023BC4 + ldr r0, _0800DB58 @ =gActiveBattler ldrb r0, [r0] strb r0, [r1, 0x1] ldrb r1, [r3] @@ -1053,7 +1053,7 @@ _0800DA3E: ldrsh r1, [r0, r2] ldr r0, [r4] adds r1, r0 - ldr r0, _0800DB5C @ =gUnknown_2023D6B + ldr r0, _0800DB5C @ =sBattler_AI ldrb r0, [r0] strb r0, [r1, 0x2] ldrb r1, [r3] @@ -1065,7 +1065,7 @@ _0800DA3E: ldrsh r1, [r0, r7] ldr r0, [r4] adds r1, r0 - ldr r0, _0800DB60 @ =gUnknown_2023D6C + ldr r0, _0800DB60 @ =gBattlerTarget ldrb r0, [r0] strb r0, [r1, 0x3] ldrb r1, [r3] @@ -1103,7 +1103,7 @@ _0800DA3E: ldrsh r1, [r0, r7] ldr r0, [r4] adds r1, r0 - ldr r0, _0800DB64 @ =gUnknown_2023D70 + ldr r0, _0800DB64 @ =gAbsentBattlerFlags ldrb r0, [r0] strb r0, [r1, 0x6] ldrb r1, [r3] @@ -1162,10 +1162,10 @@ _0800DB2C: _0800DB4C: .4byte gUnknown_3005090 _0800DB50: .4byte gUnknown_202286C _0800DB54: .4byte gUnknown_2023FEC -_0800DB58: .4byte gUnknown_2023BC4 -_0800DB5C: .4byte gUnknown_2023D6B -_0800DB60: .4byte gUnknown_2023D6C -_0800DB64: .4byte gUnknown_2023D70 +_0800DB58: .4byte gActiveBattler +_0800DB5C: .4byte sBattler_AI +_0800DB60: .4byte gBattlerTarget +_0800DB64: .4byte gAbsentBattlerFlags _0800DB68: .4byte gUnknown_2023D6E thumb_func_end PrepareBufferDataTransferLink @@ -1242,7 +1242,7 @@ _0800DBF4: bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0800DC10 @ =gUnknown_2022B4C + ldr r0, _0800DC10 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -1252,7 +1252,7 @@ _0800DBF4: bgt _0800DC1A b _0800DD20 .align 2, 0 -_0800DC10: .4byte gUnknown_2022B4C +_0800DC10: .4byte gBattleTypeFlags _0800DC14: cmp r2, 0x1 bgt _0800DC1A @@ -1407,7 +1407,7 @@ sub_800DD28: @ 800DD28 ldrb r0, [r0] cmp r0, 0 beq _0800DE28 - ldr r0, _0800DD60 @ =gUnknown_2022B4C + ldr r0, _0800DD60 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x20 ands r0, r1 @@ -1425,7 +1425,7 @@ sub_800DD28: @ 800DD28 b _0800DE1C .align 2, 0 _0800DD5C: .4byte gUnknown_3003F64 -_0800DD60: .4byte gUnknown_2022B4C +_0800DD60: .4byte gBattleTypeFlags _0800DD64: .4byte gUnknown_202273C _0800DD68: .4byte 0x00002211 _0800DD6C: .4byte gUnknown_2022118 @@ -1433,7 +1433,7 @@ _0800DD70: bl GetBlockReceivedStatus lsls r0, 24 lsrs r0, 24 - ldr r2, _0800DE38 @ =gUnknown_825E45C + ldr r2, _0800DE38 @ =gBitTable lsls r1, r4, 2 adds r1, r2 ldr r1, [r1] @@ -1533,7 +1533,7 @@ _0800DE28: pop {r0} bx r0 .align 2, 0 -_0800DE38: .4byte gUnknown_825E45C +_0800DE38: .4byte gBitTable _0800DE3C: .4byte gUnknown_202211C _0800DE40: .4byte gUnknown_3005090 _0800DE44: .4byte gUnknown_202286D @@ -1604,7 +1604,7 @@ _0800DEBC: b _0800DF7A _0800DEC2: ldr r2, _0800DF2C @ =gUnknown_2023BC8 - ldr r1, _0800DF30 @ =gUnknown_825E45C + ldr r1, _0800DF30 @ =gBitTable lsls r0, r4, 2 adds r0, r1 ldr r1, [r2] @@ -1621,13 +1621,13 @@ _0800DEC2: bl memcpy adds r0, r4, 0 bl sub_8017298 - ldr r0, _0800DF38 @ =gUnknown_2022B4C + ldr r0, _0800DF38 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x4 ands r0, r1 cmp r0, 0 bne _0800DF7A - ldr r2, _0800DF3C @ =gUnknown_2023D6B + ldr r2, _0800DF3C @ =sBattler_AI movs r4, 0x26 ldrsh r0, [r5, r4] mov r3, r8 @@ -1635,13 +1635,13 @@ _0800DEC2: adds r0, r1 ldrb r0, [r0, 0x2] strb r0, [r2] - ldr r2, _0800DF40 @ =gUnknown_2023D6C + ldr r2, _0800DF40 @ =gBattlerTarget movs r4, 0x26 ldrsh r0, [r5, r4] adds r0, r1 ldrb r0, [r0, 0x3] strb r0, [r2] - ldr r2, _0800DF44 @ =gUnknown_2023D70 + ldr r2, _0800DF44 @ =gAbsentBattlerFlags movs r3, 0x26 ldrsh r0, [r5, r3] adds r0, r1 @@ -1656,12 +1656,12 @@ _0800DEC2: b _0800DF7A .align 2, 0 _0800DF2C: .4byte gUnknown_2023BC8 -_0800DF30: .4byte gUnknown_825E45C +_0800DF30: .4byte gBitTable _0800DF34: .4byte gUnknown_2022BC4 -_0800DF38: .4byte gUnknown_2022B4C -_0800DF3C: .4byte gUnknown_2023D6B -_0800DF40: .4byte gUnknown_2023D6C -_0800DF44: .4byte gUnknown_2023D70 +_0800DF38: .4byte gBattleTypeFlags +_0800DF3C: .4byte sBattler_AI +_0800DF40: .4byte gBattlerTarget +_0800DF44: .4byte gAbsentBattlerFlags _0800DF48: .4byte gUnknown_2023D6E _0800DF4C: lsls r0, r4, 9 @@ -1677,7 +1677,7 @@ _0800DF60: .4byte gUnknown_20233C4 _0800DF64: ldrb r2, [r3, 0x8] ldr r3, _0800DF98 @ =gUnknown_2023BC8 - ldr r1, _0800DF9C @ =gUnknown_825E45C + ldr r1, _0800DF9C @ =gBitTable lsls r0, r4, 2 adds r0, r1 lsls r2, 2 @@ -1705,7 +1705,7 @@ _0800DF8C: bx r0 .align 2, 0 _0800DF98: .4byte gUnknown_2023BC8 -_0800DF9C: .4byte gUnknown_825E45C +_0800DF9C: .4byte gBitTable _0800DFA0: .4byte gUnknown_3005090 thumb_func_end Task_HandleCopyReceivedLinkBuffersData @@ -2120,7 +2120,7 @@ EmitMoveAnimation: @ 800E1FC lsls r0, 24 cmp r0, 0 bne _0800E29C - ldr r0, _0800E298 @ =gUnknown_2023F1C + ldr r0, _0800E298 @ =gBattleWeather ldrh r0, [r0] strb r0, [r7, 0xC] ands r6, r0 @@ -2131,7 +2131,7 @@ EmitMoveAnimation: @ 800E1FC .align 2, 0 _0800E290: .4byte gUnknown_2022874 _0800E294: .4byte gUnknown_2023D72 -_0800E298: .4byte gUnknown_2023F1C +_0800E298: .4byte gBattleWeather _0800E29C: ldr r0, _0800E2D0 @ =gUnknown_2022874 movs r1, 0 @@ -2184,7 +2184,7 @@ EmitPrintString: @ 800E2D4 strb r1, [r2, 0x3] adds r0, r2, 0x4 mov r12, r0 - ldr r4, _0800E3BC @ =gUnknown_2023D4A + ldr r4, _0800E3BC @ =gCurrentMove ldrh r0, [r4] strh r0, [r2, 0x4] ldr r0, _0800E3C0 @ =gUnknown_2023D4C @@ -2197,10 +2197,10 @@ EmitPrintString: @ 800E2D4 ldr r0, _0800E3C8 @ =gUnknown_2023D6A ldrb r0, [r0] strb r0, [r1, 0x6] - ldr r0, _0800E3CC @ =gUnknown_2023FC4 + ldr r0, _0800E3CC @ =gBattleScripting ldrb r0, [r0, 0x17] strb r0, [r1, 0x7] - ldr r0, _0800E3D0 @ =gUnknown_2023FE8 + ldr r0, _0800E3D0 @ =gBattleStruct ldr r0, [r0] adds r1, r0, 0 adds r1, 0x52 @@ -2213,7 +2213,7 @@ EmitPrintString: @ 800E2D4 ldr r0, _0800E3D4 @ =gUnknown_2023D6F ldrb r0, [r0] strb r0, [r3, 0xA] - ldr r3, _0800E3D8 @ =gUnknown_8250C04 + ldr r3, _0800E3D8 @ =gBattleMoves ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -2227,7 +2227,7 @@ EmitPrintString: @ 800E2D4 ldr r0, _0800E3DC @ =gUnknown_2022AD8 mov r8, r0 adds r2, 0x10 - ldr r0, _0800E3E0 @ =gUnknown_2023BE4 + ldr r0, _0800E3E0 @ =gBattleMons adds r4, r0, 0 adds r4, 0x20 _0800E35A: @@ -2278,16 +2278,16 @@ _0800E378: .align 2, 0 _0800E3B4: .4byte gUnknown_2022874 _0800E3B8: .4byte gUnknown_2023E8A -_0800E3BC: .4byte gUnknown_2023D4A +_0800E3BC: .4byte gCurrentMove _0800E3C0: .4byte gUnknown_2023D4C _0800E3C4: .4byte gUnknown_2023D68 _0800E3C8: .4byte gUnknown_2023D6A -_0800E3CC: .4byte gUnknown_2023FC4 -_0800E3D0: .4byte gUnknown_2023FE8 +_0800E3CC: .4byte gBattleScripting +_0800E3D0: .4byte gBattleStruct _0800E3D4: .4byte gUnknown_2023D6F -_0800E3D8: .4byte gUnknown_8250C04 +_0800E3D8: .4byte gBattleMoves _0800E3DC: .4byte gUnknown_2022AD8 -_0800E3E0: .4byte gUnknown_2023BE4 +_0800E3E0: .4byte gBattleMons _0800E3E4: .4byte gUnknown_2022AC8 _0800E3E8: .4byte gUnknown_2022AB8 thumb_func_end EmitPrintString @@ -2313,7 +2313,7 @@ EmitPrintSelectionString: @ 800E3EC strb r1, [r2, 0x3] adds r0, r2, 0x4 mov r12, r0 - ldr r0, _0800E4AC @ =gUnknown_2023D4A + ldr r0, _0800E4AC @ =gCurrentMove ldrh r0, [r0] strh r0, [r2, 0x4] ldr r0, _0800E4B0 @ =gUnknown_2023D4C @@ -2326,10 +2326,10 @@ EmitPrintSelectionString: @ 800E3EC ldr r0, _0800E4B8 @ =gUnknown_2023D6A ldrb r0, [r0] strb r0, [r1, 0x6] - ldr r0, _0800E4BC @ =gUnknown_2023FC4 + ldr r0, _0800E4BC @ =gBattleScripting ldrb r0, [r0, 0x17] strb r0, [r1, 0x7] - ldr r0, _0800E4C0 @ =gUnknown_2023FE8 + ldr r0, _0800E4C0 @ =gBattleStruct ldr r0, [r0] adds r0, 0x52 ldrb r0, [r0] @@ -2340,7 +2340,7 @@ EmitPrintSelectionString: @ 800E3EC mov r8, r7 mov r4, r9 adds r4, 0x10 - ldr r0, _0800E4C8 @ =gUnknown_2023BE4 + ldr r0, _0800E4C8 @ =gBattleMons adds r2, r0, 0 adds r2, 0x20 _0800E44E: @@ -2390,14 +2390,14 @@ _0800E46C: bx r0 .align 2, 0 _0800E4A8: .4byte gUnknown_2022874 -_0800E4AC: .4byte gUnknown_2023D4A +_0800E4AC: .4byte gCurrentMove _0800E4B0: .4byte gUnknown_2023D4C _0800E4B4: .4byte gUnknown_2023D68 _0800E4B8: .4byte gUnknown_2023D6A -_0800E4BC: .4byte gUnknown_2023FC4 -_0800E4C0: .4byte gUnknown_2023FE8 +_0800E4BC: .4byte gBattleScripting +_0800E4C0: .4byte gBattleStruct _0800E4C4: .4byte gUnknown_2022AD8 -_0800E4C8: .4byte gUnknown_2023BE4 +_0800E4C8: .4byte gBattleMons _0800E4CC: .4byte gUnknown_2022AC8 _0800E4D0: .4byte gUnknown_2022AB8 thumb_func_end EmitPrintSelectionString diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index c73292976..aecdd3488 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -196,7 +196,7 @@ InitAndLaunchChosenStatusAnimation: @ 8033F1C lsls r0, 24 ldr r6, _08033F50 @ =gUnknown_2024018 ldr r1, [r6] - ldr r5, _08033F54 @ =gUnknown_2023BC4 + ldr r5, _08033F54 @ =gActiveBattler ldrb r2, [r5] ldr r3, [r1, 0x4] lsls r1, r2, 1 @@ -217,7 +217,7 @@ InitAndLaunchChosenStatusAnimation: @ 8033F1C b _08034016 .align 2, 0 _08033F50: .4byte gUnknown_2024018 -_08033F54: .4byte gUnknown_2023BC4 +_08033F54: .4byte gActiveBattler _08033F58: cmp r4, 0x8 beq _08033F64 @@ -666,7 +666,7 @@ mplay_80342A4: @ 80342A4 adds r1, 0x1 strb r1, [r0, 0x8] ldr r2, [r2] - ldr r0, _080342F8 @ =gUnknown_2023BC4 + ldr r0, _080342F8 @ =gActiveBattler ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -688,7 +688,7 @@ _080342F0: b _08034316 .align 2, 0 _080342F4: .4byte gUnknown_2024018 -_080342F8: .4byte gUnknown_2023BC4 +_080342F8: .4byte gActiveBattler _080342FC: .4byte gMPlay_SE1 _08034300: .4byte gMPlay_SE2 _08034304: @@ -822,7 +822,7 @@ _080343DA: movs r7, 0x80 lsls r7, 1 add r7, r9 - ldr r5, _0803447C @ =gUnknown_2023FE8 + ldr r5, _0803447C @ =gBattleStruct ldr r1, [r5] movs r4, 0x80 lsls r4, 1 @@ -871,7 +871,7 @@ _08034468: bx r0 .align 2, 0 _08034478: .4byte 0x00000181 -_0803447C: .4byte gUnknown_2023FE8 +_0803447C: .4byte gBattleStruct _08034480: .4byte gUnknown_2024024 _08034484: .4byte gUnknown_2024018 _08034488: .4byte 0x00007fff @@ -1028,7 +1028,7 @@ _0803459A: movs r7, 0x80 lsls r7, 1 add r7, r9 - ldr r5, _0803463C @ =gUnknown_2023FE8 + ldr r5, _0803463C @ =gBattleStruct ldr r1, [r5] movs r4, 0x80 lsls r4, 1 @@ -1076,7 +1076,7 @@ _08034626: bx r0 .align 2, 0 _08034638: .4byte 0x00000181 -_0803463C: .4byte gUnknown_2023FE8 +_0803463C: .4byte gBattleStruct _08034640: .4byte gUnknown_2024024 _08034644: .4byte gUnknown_2024018 _08034648: .4byte 0x00007fff @@ -1342,7 +1342,7 @@ _08034864: bne _080348CC cmp r4, 0x2 bne _0803489C - ldr r0, _08034888 @ =gUnknown_2022B4C + ldr r0, _08034888 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -1352,7 +1352,7 @@ _08034864: bl sub_800F034 b _0803495A .align 2, 0 -_08034888: .4byte gUnknown_2022B4C +_08034888: .4byte gBattleTypeFlags _0803488C: .4byte gUnknown_8260238 _08034890: ldr r0, _08034898 @ =gUnknown_8260208 @@ -1524,7 +1524,7 @@ _080349D4: strb r0, [r4] b _08034AF2 _080349DC: - ldr r0, _080349F4 @ =gUnknown_2022B4C + ldr r0, _080349F4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -1536,7 +1536,7 @@ _080349DC: bl CreateSafariPlayerHealthboxSprites b _080349FE .align 2, 0 -_080349F4: .4byte gUnknown_2022B4C +_080349F4: .4byte gBattleTypeFlags _080349F8: ldrb r0, [r4] bl CreateBankHealthboxSprites @@ -1581,7 +1581,7 @@ _08034A48: lsls r0, 24 cmp r0, 0 bne _08034A90 - ldr r0, _08034A80 @ =gUnknown_2022B4C + ldr r0, _08034A80 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -1591,34 +1591,34 @@ _08034A48: ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _08034A88 @ =gUnknown_2023BCE + ldr r2, _08034A88 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08034A8C @ =gUnknown_2024284 + ldr r2, _08034A8C @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute b _08034AAE .align 2, 0 -_08034A80: .4byte gUnknown_2022B4C +_08034A80: .4byte gBattleTypeFlags _08034A84: .4byte gUnknown_3004FF0 -_08034A88: .4byte gUnknown_2023BCE -_08034A8C: .4byte gUnknown_2024284 +_08034A88: .4byte gBattlerPartyIndexes +_08034A8C: .4byte gPlayerParty _08034A90: ldr r0, _08034AD8 @ =gUnknown_3004FF0 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _08034ADC @ =gUnknown_2023BCE + ldr r2, _08034ADC @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08034AE0 @ =gUnknown_202402C + ldr r2, _08034AE0 @ =gEnemyParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -1648,8 +1648,8 @@ _08034AD0: b _08034AF2 .align 2, 0 _08034AD8: .4byte gUnknown_3004FF0 -_08034ADC: .4byte gUnknown_2023BCE -_08034AE0: .4byte gUnknown_202402C +_08034ADC: .4byte gBattlerPartyIndexes +_08034AE0: .4byte gEnemyParty _08034AE4: .4byte gUnknown_2023BCC _08034AE8: bl LoadAndCreateEnemyShadowSprites @@ -1817,7 +1817,7 @@ _08034C16: lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _08034D58 @ =gUnknown_2023BCE + ldr r0, _08034D58 @ =gBattlerPartyIndexes mov r1, r9 lsls r1, 1 adds r0, r1, r0 @@ -1825,7 +1825,7 @@ _08034C16: ldrh r0, [r0] movs r2, 0x64 muls r0, r2 - ldr r3, _08034D5C @ =gUnknown_202402C + ldr r3, _08034D5C @ =gEnemyParty adds r0, r3 movs r1, 0xB bl GetMonData @@ -1836,7 +1836,7 @@ _08034C16: ldrh r0, [r1] movs r2, 0x64 muls r0, r2 - ldr r3, _08034D5C @ =gUnknown_202402C + ldr r3, _08034D5C @ =gEnemyParty adds r0, r3 movs r1, 0 bl GetMonData @@ -1845,7 +1845,7 @@ _08034C16: ldrh r0, [r1] movs r2, 0x64 muls r0, r2 - ldr r3, _08034D5C @ =gUnknown_202402C + ldr r3, _08034D5C @ =gEnemyParty adds r0, r3 movs r1, 0x1 bl GetMonData @@ -1935,7 +1935,7 @@ _08034C16: ldrh r0, [r2] movs r3, 0x64 muls r0, r3 - ldr r1, _08034D5C @ =gUnknown_202402C + ldr r1, _08034D5C @ =gEnemyParty adds r0, r1 movs r1, 0xB mov r2, r8 @@ -1951,7 +1951,7 @@ _08034C16: ldrh r1, [r2] movs r3, 0x64 muls r1, r3 - ldr r2, _08034D5C @ =gUnknown_202402C + ldr r2, _08034D5C @ =gEnemyParty adds r1, r2 bl sub_80496C0 ldrb r0, [r4] @@ -1959,8 +1959,8 @@ _08034C16: bl sub_804981C b _08035062 .align 2, 0 -_08034D58: .4byte gUnknown_2023BCE -_08034D5C: .4byte gUnknown_202402C +_08034D58: .4byte gBattlerPartyIndexes +_08034D5C: .4byte gEnemyParty _08034D60: .4byte gUnknown_82350AC _08034D64: .4byte gUnknown_202401C _08034D68: .4byte gSprites @@ -1995,7 +1995,7 @@ _08034D88: adds r0, r2 lsrs r0, 16 mov r10, r0 - ldr r2, _08034E34 @ =gUnknown_2023FE8 + ldr r2, _08034E34 @ =gBattleStruct ldr r0, [r4] ldr r0, [r0, 0x8] ldrh r1, [r0] @@ -2051,7 +2051,7 @@ _08034E0E: _08034E28: .4byte gUnknown_2023D44 _08034E2C: .4byte gSprites _08034E30: .4byte gUnknown_2024018 -_08034E34: .4byte gUnknown_2023FE8 +_08034E34: .4byte gBattleStruct _08034E38: .4byte gUnknown_2024024 _08034E3C: .4byte 0x00007fff _08034E40: .4byte gUnknown_20375F8 @@ -2069,27 +2069,27 @@ _08034E4C: lsrs r0, 24 cmp r0, 0x1 bne _08034E80 - ldr r1, _08034E78 @ =gUnknown_2023BCE + ldr r1, _08034E78 @ =gBattlerPartyIndexes ldr r2, [sp] lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08034E7C @ =gUnknown_202402C + ldr r1, _08034E7C @ =gEnemyParty b _08034E90 .align 2, 0 -_08034E78: .4byte gUnknown_2023BCE -_08034E7C: .4byte gUnknown_202402C +_08034E78: .4byte gBattlerPartyIndexes +_08034E7C: .4byte gEnemyParty _08034E80: - ldr r1, _08034EFC @ =gUnknown_2023BCE + ldr r1, _08034EFC @ =gBattlerPartyIndexes ldr r3, [sp] lsls r0, r3, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08034F00 @ =gUnknown_2024284 + ldr r1, _08034F00 @ =gPlayerParty _08034E90: adds r0, r1 movs r1, 0xB @@ -2102,14 +2102,14 @@ _08034E90: lsls r0, 24 cmp r0, 0 bne _08034F10 - ldr r0, _08034EFC @ =gUnknown_2023BCE + ldr r0, _08034EFC @ =gBattlerPartyIndexes mov r1, r9 lsls r4, r1, 1 adds r4, r0 ldrh r0, [r4] movs r7, 0x64 muls r0, r7 - ldr r5, _08034F00 @ =gUnknown_2024284 + ldr r5, _08034F00 @ =gPlayerParty adds r0, r5 movs r1, 0 bl GetMonData @@ -2140,20 +2140,20 @@ _08034E90: bl HandleLoadSpecialPokePic_DontHandleDeoxys b _08034F5E .align 2, 0 -_08034EFC: .4byte gUnknown_2023BCE -_08034F00: .4byte gUnknown_2024284 +_08034EFC: .4byte gBattlerPartyIndexes +_08034F00: .4byte gPlayerParty _08034F04: .4byte gUnknown_823654C _08034F08: .4byte gUnknown_202401C _08034F0C: .4byte gUnknown_2024008 _08034F10: - ldr r0, _08035074 @ =gUnknown_2023BCE + ldr r0, _08035074 @ =gBattlerPartyIndexes mov r1, r9 lsls r4, r1, 1 adds r4, r0 ldrh r0, [r4] movs r7, 0x64 muls r0, r7 - ldr r5, _08035078 @ =gUnknown_202402C + ldr r5, _08035078 @ =gEnemyParty adds r0, r5 movs r1, 0 bl GetMonData @@ -2237,7 +2237,7 @@ _08034F5E: ldr r0, _0803509C @ =0x00000181 cmp r8, r0 bne _08034FFC - ldr r5, _080350A0 @ =gUnknown_2023FE8 + ldr r5, _080350A0 @ =gBattleStruct ldr r1, [r5] movs r4, 0x80 lsls r4, 1 @@ -2313,8 +2313,8 @@ _08035062: pop {r0} bx r0 .align 2, 0 -_08035074: .4byte gUnknown_2023BCE -_08035078: .4byte gUnknown_202402C +_08035074: .4byte gBattlerPartyIndexes +_08035078: .4byte gEnemyParty _0803507C: .4byte gUnknown_82350AC _08035080: .4byte gUnknown_202401C _08035084: .4byte gUnknown_2024008 @@ -2324,7 +2324,7 @@ _08035090: .4byte 0x06010000 _08035094: .4byte 0x040000d4 _08035098: .4byte 0x84000200 _0803509C: .4byte 0x00000181 -_080350A0: .4byte gUnknown_2023FE8 +_080350A0: .4byte gBattleStruct _080350A4: .4byte gUnknown_2024024 _080350A8: .4byte 0x00007fff _080350AC: .4byte gUnknown_20375F8 @@ -2412,28 +2412,28 @@ _08035158: lsls r0, 24 cmp r0, 0 beq _08035184 - ldr r1, _0803517C @ =gUnknown_2023BCE + ldr r1, _0803517C @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08035180 @ =gUnknown_202402C + ldr r1, _08035180 @ =gEnemyParty adds r0, r1 adds r1, r4, 0 bl BattleLoadOpponentMonSpriteGfx b _0803519A .align 2, 0 -_0803517C: .4byte gUnknown_2023BCE -_08035180: .4byte gUnknown_202402C +_0803517C: .4byte gBattlerPartyIndexes +_08035180: .4byte gEnemyParty _08035184: - ldr r1, _080351A0 @ =gUnknown_2023BCE + ldr r1, _080351A0 @ =gBattlerPartyIndexes lsls r0, r6, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080351A4 @ =gUnknown_2024284 + ldr r1, _080351A4 @ =gPlayerParty adds r0, r1 adds r1, r6, 0 bl sub_8034498 @@ -2442,8 +2442,8 @@ _0803519A: pop {r0} bx r0 .align 2, 0 -_080351A0: .4byte gUnknown_2023BCE -_080351A4: .4byte gUnknown_2024284 +_080351A0: .4byte gBattlerPartyIndexes +_080351A4: .4byte gPlayerParty thumb_func_end sub_80350BC thumb_func_start LoadBattleMonGfxAndAnimate @@ -2729,7 +2729,7 @@ sub_803539C: @ 803539C lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r5, _08035448 @ =gUnknown_2023BCE + ldr r5, _08035448 @ =gBattlerPartyIndexes mov r1, r8 lsls r0, r1, 1 adds r0, r5 @@ -2748,7 +2748,7 @@ sub_803539C: @ 803539C movs r7, 0x64 adds r0, r4, 0 muls r0, r7 - ldr r6, _0803544C @ =gUnknown_2024284 + ldr r6, _0803544C @ =gPlayerParty adds r4, r0, r6 adds r0, r4, 0 movs r1, 0x39 @@ -2784,8 +2784,8 @@ _08035432: .align 2, 0 _08035440: .4byte gMain _08035444: .4byte 0x00000439 -_08035448: .4byte gUnknown_2023BCE -_0803544C: .4byte gUnknown_2024284 +_08035448: .4byte gBattlerPartyIndexes +_0803544C: .4byte gPlayerParty thumb_func_end sub_803539C thumb_func_start sub_8035450 diff --git a/asm/battle_interface.s b/asm/battle_interface.s index a38173941..06af126e2 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -1844,7 +1844,7 @@ _08048966: ldrh r4, [r0, 0x38] lsls r4, 24 lsrs r4, 24 - ldr r5, _08048A04 @ =gUnknown_2023FE8 + ldr r5, _08048A04 @ =gBattleStruct ldr r0, [r5] adds r0, 0x7C ldrb r1, [r0] @@ -1909,7 +1909,7 @@ _080489D0: _080489F8: .4byte 0x04000008 _080489FC: .4byte gSprites _08048A00: .4byte 0x06010000 -_08048A04: .4byte gUnknown_2023FE8 +_08048A04: .4byte gBattleStruct _08048A08: .4byte gUnknown_202401C _08048A0C: ldr r0, [r5] @@ -1963,7 +1963,7 @@ sub_8048A4C: @ 8048A4C _08048A66: ldr r1, _08048B7C @ =gSprites mov r10, r1 - ldr r2, _08048B80 @ =gUnknown_2023BCE + ldr r2, _08048B80 @ =gBattlerPartyIndexes mov r8, r2 _08048A6E: ldr r0, _08048B84 @ =gUnknown_3004FF0 @@ -2042,7 +2042,7 @@ _08048ABA: bne _08048B08 b _08048CE0 _08048B08: - ldr r0, _08048B90 @ =gUnknown_2022B4C + ldr r0, _08048B90 @ =gBattleTypeFlags ldr r2, [r0] movs r0, 0x80 ands r2, r0 @@ -2078,7 +2078,7 @@ _08048B16: ldrh r0, [r1] movs r2, 0x64 muls r0, r2 - ldr r1, _08048B9C @ =gUnknown_2024284 + ldr r1, _08048B9C @ =gPlayerParty adds r0, r1 movs r1, 0x39 bl GetMonData @@ -2093,19 +2093,19 @@ _08048B16: ldrh r0, [r2] movs r1, 0x64 muls r0, r1 - ldr r2, _08048B9C @ =gUnknown_2024284 + ldr r2, _08048B9C @ =gPlayerParty b _08048C6E .align 2, 0 _08048B78: .4byte gUnknown_2023BCC _08048B7C: .4byte gSprites -_08048B80: .4byte gUnknown_2023BCE +_08048B80: .4byte gBattlerPartyIndexes _08048B84: .4byte gUnknown_3004FF0 _08048B88: .4byte SpriteCallbackDummy _08048B8C: .4byte gUnknown_2024018 -_08048B90: .4byte gUnknown_2022B4C +_08048B90: .4byte gBattleTypeFlags _08048B94: .4byte 0x06010000 _08048B98: .4byte 0x05000040 -_08048B9C: .4byte gUnknown_2024284 +_08048B9C: .4byte gPlayerParty _08048BA0: ldrb r0, [r6] bl UpdateStatusIconInHealthbox @@ -2114,7 +2114,7 @@ _08048BA0: ldrh r1, [r2] movs r2, 0x64 muls r1, r2 - ldr r2, _08048BDC @ =gUnknown_2024284 + ldr r2, _08048BDC @ =gPlayerParty adds r1, r2 movs r2, 0x5 bl UpdateHealthboxAttribute @@ -2134,13 +2134,13 @@ _08048BA0: bl CpuSet b _08048CCA .align 2, 0 -_08048BDC: .4byte gUnknown_2024284 +_08048BDC: .4byte gPlayerParty _08048BE0: .4byte 0x06010680 _08048BE4: .4byte 0x04000008 _08048BE8: cmp r4, 0x1 bne _08048C94 - ldr r0, _08048C0C @ =gUnknown_2022B4C + ldr r0, _08048C0C @ =gBattleTypeFlags ldr r2, [r0] movs r0, 0x80 ands r2, r0 @@ -2151,13 +2151,13 @@ _08048BE8: ldrh r1, [r2] movs r2, 0x64 muls r1, r2 - ldr r2, _08048C10 @ =gUnknown_202402C + ldr r2, _08048C10 @ =gEnemyParty adds r1, r2 bl sub_80487F8 b _08048CCA .align 2, 0 -_08048C0C: .4byte gUnknown_2022B4C -_08048C10: .4byte gUnknown_202402C +_08048C0C: .4byte gBattleTypeFlags +_08048C10: .4byte gEnemyParty _08048C14: ldrb r1, [r6] lsls r0, r1, 4 @@ -2185,7 +2185,7 @@ _08048C14: ldrh r0, [r1] movs r2, 0x64 muls r0, r2 - ldr r1, _08048C90 @ =gUnknown_202402C + ldr r1, _08048C90 @ =gEnemyParty adds r0, r1 movs r1, 0x39 bl GetMonData @@ -2200,7 +2200,7 @@ _08048C14: ldrh r0, [r2] movs r1, 0x64 muls r0, r1 - ldr r2, _08048C90 @ =gUnknown_202402C + ldr r2, _08048C90 @ =gEnemyParty _08048C6E: adds r0, r2 movs r1, 0x3A @@ -2215,7 +2215,7 @@ _08048C6E: .align 2, 0 _08048C88: .4byte 0x06010000 _08048C8C: .4byte 0x05000040 -_08048C90: .4byte gUnknown_202402C +_08048C90: .4byte gEnemyParty _08048C94: ldrb r0, [r6] bl UpdateStatusIconInHealthbox @@ -2224,11 +2224,11 @@ _08048C94: ldrh r1, [r2] movs r5, 0x64 muls r1, r5 - ldr r4, _08048D04 @ =gUnknown_202402C + ldr r4, _08048D04 @ =gEnemyParty adds r1, r4 movs r2, 0x5 bl UpdateHealthboxAttribute - ldr r0, _08048D08 @ =gUnknown_2022B4C + ldr r0, _08048D08 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -2273,8 +2273,8 @@ _08048CF2: pop {r0} bx r0 .align 2, 0 -_08048D04: .4byte gUnknown_202402C -_08048D08: .4byte gUnknown_2022B4C +_08048D04: .4byte gEnemyParty +_08048D08: .4byte gBattleTypeFlags _08048D0C: .4byte gUnknown_3004FF0 _08048D10: .4byte gUnknown_2023BCC thumb_func_end sub_8048A4C @@ -2593,7 +2593,7 @@ _08048F86: cmp r0, 0 bne _0804906E movs r6, 0 - ldr r5, _08048FD8 @ =gUnknown_2022B4C + ldr r5, _08048FD8 @ =gBattleTypeFlags mov r10, r5 ldr r0, _08048FDC @ =0x0000ffff mov r9, r0 @@ -2628,7 +2628,7 @@ _08048FAA: b _08049056 .align 2, 0 _08048FD4: .4byte 0x0000ff88 -_08048FD8: .4byte gUnknown_2022B4C +_08048FD8: .4byte gBattleTypeFlags _08048FDC: .4byte 0x0000ffff _08048FE0: .4byte gSprites _08048FE4: .4byte 0x000003ff @@ -2706,7 +2706,7 @@ _08049062: b _08049148 _0804906E: movs r6, 0 - ldr r1, _080490B4 @ =gUnknown_2022B4C + ldr r1, _080490B4 @ =gBattleTypeFlags mov r10, r1 ldr r2, _080490B8 @ =0x0000ffff mov r9, r2 @@ -2741,7 +2741,7 @@ _08049088: adds r1, 0x3 b _08049132 .align 2, 0 -_080490B4: .4byte gUnknown_2022B4C +_080490B4: .4byte gBattleTypeFlags _080490B8: .4byte 0x0000ffff _080490BC: .4byte gSprites _080490C0: .4byte 0x000003ff @@ -3721,7 +3721,7 @@ sub_804981C: @ 804981C lsls r1, 24 lsrs r1, 24 mov r10, r1 - ldr r0, _080498DC @ =gUnknown_2022B4C + ldr r0, _080498DC @ =gBattleTypeFlags ldr r1, [r0] ldr r0, _080498E0 @ =0x00010210 ands r0, r1 @@ -3746,13 +3746,13 @@ sub_804981C: @ 804981C lsls r0, 24 cmp r0, 0 beq _0804991C - ldr r1, _080498E8 @ =gUnknown_2023BCE + ldr r1, _080498E8 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r5, r0, r1 ldrh r0, [r5] movs r7, 0x64 muls r0, r7 - ldr r6, _080498EC @ =gUnknown_202402C + ldr r6, _080498EC @ =gEnemyParty adds r0, r6 adds r1, r4, 0 bl sub_80448F8 @@ -3799,11 +3799,11 @@ sub_804981C: @ 804981C bl CpuSet b _0804991C .align 2, 0 -_080498DC: .4byte gUnknown_2022B4C +_080498DC: .4byte gBattleTypeFlags _080498E0: .4byte 0x00010210 _080498E4: .4byte gSprites -_080498E8: .4byte gUnknown_2023BCE -_080498EC: .4byte gUnknown_202402C +_080498E8: .4byte gBattlerPartyIndexes +_080498EC: .4byte gEnemyParty _080498F0: .4byte 0x06010000 _080498F4: .4byte 0x04000008 _080498F8: @@ -3866,13 +3866,13 @@ UpdateStatusIconInHealthbox: @ 8049934 lsls r0, 24 cmp r0, 0 bne _080499A4 - ldr r1, _0804999C @ =gUnknown_2023BCE + ldr r1, _0804999C @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080499A0 @ =gUnknown_2024284 + ldr r1, _080499A0 @ =gPlayerParty adds r0, r1 movs r1, 0x37 bl GetMonData @@ -3888,16 +3888,16 @@ UpdateStatusIconInHealthbox: @ 8049934 b _080499C0 .align 2, 0 _08049998: .4byte gSprites -_0804999C: .4byte gUnknown_2023BCE -_080499A0: .4byte gUnknown_2024284 +_0804999C: .4byte gBattlerPartyIndexes +_080499A0: .4byte gPlayerParty _080499A4: - ldr r1, _080499E0 @ =gUnknown_2023BCE + ldr r1, _080499E0 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080499E4 @ =gUnknown_202402C + ldr r1, _080499E4 @ =gEnemyParty adds r0, r1 movs r1, 0x37 bl GetMonData @@ -3919,8 +3919,8 @@ _080499C0: movs r0, 0x2 b _08049AF4 .align 2, 0 -_080499E0: .4byte gUnknown_2023BCE -_080499E4: .4byte gUnknown_202402C +_080499E0: .4byte gBattlerPartyIndexes +_080499E4: .4byte gEnemyParty _080499E8: movs r0, 0x88 ands r0, r4 @@ -4502,7 +4502,7 @@ _08049E96: ldr r0, _08049F48 @ =gUnknown_8253AE4 mov r12, r0 lsls r1, r4, 2 - ldr r2, _08049F4C @ =gUnknown_8254784 + ldr r2, _08049F4C @ =gBaseStats lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -4566,7 +4566,7 @@ _08049F2E: .align 2, 0 _08049F44: .4byte gSprites _08049F48: .4byte gUnknown_8253AE4 -_08049F4C: .4byte gUnknown_8254784 +_08049F4C: .4byte gBaseStats _08049F50: cmp r7, 0x3 beq _08049F58 @@ -4911,13 +4911,13 @@ _0804A1D8: movs r4, 0x8 str r4, [sp, 0x4] bl sub_804A3C4 - ldr r1, _0804A280 @ =gUnknown_2023BCE + ldr r1, _0804A280 @ =gBattlerPartyIndexes lsls r0, r6, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0804A284 @ =gUnknown_2024284 + ldr r1, _0804A284 @ =gPlayerParty adds r0, r1 movs r1, 0x38 bl GetMonData @@ -4978,8 +4978,8 @@ _0804A23A: b _0804A2CC .align 2, 0 _0804A27C: .4byte gUnknown_2024018 -_0804A280: .4byte gUnknown_2023BCE -_0804A284: .4byte gUnknown_2024284 +_0804A280: .4byte gBattlerPartyIndexes +_0804A284: .4byte gPlayerParty _0804A288: .4byte gSprites _0804A28C: .4byte 0x06010000 _0804A290: .4byte 0x04000008 diff --git a/asm/battle_message.s b/asm/battle_message.s index a799634f3..9a9ca1f2f 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -16,7 +16,7 @@ sub_80D7274: @ 80D7274 lsrs r6, r0, 16 movs r7, 0 ldr r4, _080D7330 @ =gUnknown_2039A34 - ldr r0, _080D7334 @ =gUnknown_2023BC4 + ldr r0, _080D7334 @ =gActiveBattler mov r8, r0 ldrb r1, [r0] lsls r1, 9 @@ -29,10 +29,10 @@ sub_80D7274: @ 80D7274 ldr r2, _080D7340 @ =gUnknown_2023D6A ldrb r0, [r1, 0x6] strb r0, [r2] - ldr r5, _080D7344 @ =gUnknown_2023FC4 + ldr r5, _080D7344 @ =gBattleScripting ldrb r0, [r1, 0x7] strb r0, [r5, 0x17] - ldr r3, _080D7348 @ =gUnknown_2023FE8 + ldr r3, _080D7348 @ =gBattleStruct ldr r0, [r3] adds r0, 0x52 ldrb r1, [r1, 0x8] @@ -106,12 +106,12 @@ _080D7326: mov pc, r0 .align 2, 0 _080D7330: .4byte gUnknown_2039A34 -_080D7334: .4byte gUnknown_2023BC4 +_080D7334: .4byte gActiveBattler _080D7338: .4byte gUnknown_2022BC8 _080D733C: .4byte gUnknown_2023D68 _080D7340: .4byte gUnknown_2023D6A -_080D7344: .4byte gUnknown_2023FC4 -_080D7348: .4byte gUnknown_2023FE8 +_080D7344: .4byte gBattleScripting +_080D7348: .4byte gBattleStruct _080D734C: .4byte gUnknown_2023D6F _080D7350: .4byte gUnknown_2022AB8 _080D7354: .4byte gUnknown_2039A30 @@ -127,7 +127,7 @@ _080D7364: .4byte _080D75F0 .4byte _080D7654 _080D737C: - ldr r0, _080D739C @ =gUnknown_2022B4C + ldr r0, _080D739C @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x8 ands r0, r1 @@ -144,10 +144,10 @@ _080D737C: ldr r7, _080D73A0 @ =gUnknown_83FD397 b _080D77DC .align 2, 0 -_080D739C: .4byte gUnknown_2022B4C +_080D739C: .4byte gBattleTypeFlags _080D73A0: .4byte gUnknown_83FD397 _080D73A4: - ldr r0, _080D73B8 @ =gUnknown_20386AE + ldr r0, _080D73B8 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 @@ -159,7 +159,7 @@ _080D73B4: ldr r7, _080D73C0 @ =gUnknown_83FD366 b _080D77DC .align 2, 0 -_080D73B8: .4byte gUnknown_20386AE +_080D73B8: .4byte gTrainerBattleOpponent_A _080D73BC: .4byte gUnknown_83FD383 _080D73C0: .4byte gUnknown_83FD366 _080D73C4: @@ -221,7 +221,7 @@ _080D7428: lsls r0, 24 cmp r0, 0 bne _080D7468 - ldr r0, _080D7454 @ =gUnknown_2022B4C + ldr r0, _080D7454 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x1 ands r0, r1 @@ -237,7 +237,7 @@ _080D744E: ldr r7, _080D745C @ =gUnknown_83FD4B5 b _080D77DC .align 2, 0 -_080D7454: .4byte gUnknown_2022B4C +_080D7454: .4byte gBattleTypeFlags _080D7458: .4byte gUnknown_83FD466 _080D745C: .4byte gUnknown_83FD4B5 _080D7460: @@ -246,7 +246,7 @@ _080D7460: .align 2, 0 _080D7464: .4byte gUnknown_83FD45E _080D7468: - ldr r0, _080D7480 @ =gUnknown_2022B4C + ldr r0, _080D7480 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x1 ands r0, r1 @@ -259,7 +259,7 @@ _080D7468: ldr r7, _080D7484 @ =gUnknown_83FD41E b _080D77DC .align 2, 0 -_080D7480: .4byte gUnknown_2022B4C +_080D7480: .4byte gBattleTypeFlags _080D7484: .4byte gUnknown_83FD41E _080D7488: movs r0, 0x2 @@ -279,7 +279,7 @@ _080D74A0: ands r1, r0 cmp r1, 0 beq _080D74B8 - ldr r0, _080D74BC @ =gUnknown_20386AE + ldr r0, _080D74BC @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 @@ -291,7 +291,7 @@ _080D74B8: ldr r7, _080D74C4 @ =gUnknown_83FD3B1 b _080D77DC .align 2, 0 -_080D74BC: .4byte gUnknown_20386AE +_080D74BC: .4byte gTrainerBattleOpponent_A _080D74C0: .4byte gUnknown_83FD3F7 _080D74C4: .4byte gUnknown_83FD3B1 _080D74C8: @@ -301,7 +301,7 @@ _080D74C8: lsls r0, 24 cmp r0, 0 bne _080D7520 - ldr r0, _080D74E8 @ =gUnknown_2023FE8 + ldr r0, _080D74E8 @ =gBattleStruct ldr r0, [r0] adds r0, 0xAD ldrb r2, [r0] @@ -310,12 +310,12 @@ _080D74C8: ldr r7, _080D74EC @ =gUnknown_83FD4CD b _080D77DC .align 2, 0 -_080D74E8: .4byte gUnknown_2023FE8 +_080D74E8: .4byte gBattleStruct _080D74EC: .4byte gUnknown_83FD4CD _080D74F0: cmp r2, 0x1 beq _080D7500 - ldr r0, _080D7504 @ =gUnknown_2022B4C + ldr r0, _080D7504 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -325,7 +325,7 @@ _080D7500: ldr r7, _080D7508 @ =gUnknown_83FD4EB b _080D77DC .align 2, 0 -_080D7504: .4byte gUnknown_2022B4C +_080D7504: .4byte gBattleTypeFlags _080D7508: .4byte gUnknown_83FD4EB _080D750C: ldr r7, _080D7518 @ =gUnknown_83FD50D @@ -339,13 +339,13 @@ _080D7514: _080D7518: .4byte gUnknown_83FD50D _080D751C: .4byte gUnknown_83FD4FA _080D7520: - ldr r0, _080D7540 @ =gUnknown_20386AE + ldr r0, _080D7540 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 4 cmp r1, r0 bne _080D7550 - ldr r0, _080D7544 @ =gUnknown_2022B4C + ldr r0, _080D7544 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -357,8 +357,8 @@ _080D753C: ldr r7, _080D754C @ =gUnknown_83FD545 b _080D77DC .align 2, 0 -_080D7540: .4byte gUnknown_20386AE -_080D7544: .4byte gUnknown_2022B4C +_080D7540: .4byte gTrainerBattleOpponent_A +_080D7544: .4byte gBattleTypeFlags _080D7548: .4byte gUnknown_83FD535 _080D754C: .4byte gUnknown_83FD545 _080D7550: @@ -373,13 +373,13 @@ _080D7558: lsls r0, 24 cmp r0, 0 bne _080D75B0 - ldr r0, _080D7584 @ =gUnknown_2023FE8 + ldr r0, _080D7584 @ =gBattleStruct ldr r0, [r0] adds r0, 0xAD ldrb r2, [r0] cmp r2, 0 beq _080D757E - ldr r0, _080D7588 @ =gUnknown_2022B4C + ldr r0, _080D7588 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -389,8 +389,8 @@ _080D757E: ldr r7, _080D758C @ =gUnknown_83FD475 b _080D77DC .align 2, 0 -_080D7584: .4byte gUnknown_2023FE8 -_080D7588: .4byte gUnknown_2022B4C +_080D7584: .4byte gBattleStruct +_080D7588: .4byte gBattleTypeFlags _080D758C: .4byte gUnknown_83FD475 _080D7590: cmp r2, 0x1 @@ -411,7 +411,7 @@ _080D75A4: _080D75A8: .4byte gUnknown_83FD497 _080D75AC: .4byte gUnknown_83FD488 _080D75B0: - ldr r0, _080D75C8 @ =gUnknown_2022B4C + ldr r0, _080D75C8 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x2 ands r0, r1 @@ -424,10 +424,10 @@ _080D75B0: ldr r7, _080D75CC @ =gUnknown_83FD44E b _080D77DC .align 2, 0 -_080D75C8: .4byte gUnknown_2022B4C +_080D75C8: .4byte gBattleTypeFlags _080D75CC: .4byte gUnknown_83FD44E _080D75D0: - ldr r0, _080D75E4 @ =gUnknown_20386AE + ldr r0, _080D75E4 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 @@ -439,7 +439,7 @@ _080D75E0: ldr r7, _080D75EC @ =gUnknown_83FD3E4 b _080D77DC .align 2, 0 -_080D75E4: .4byte gUnknown_20386AE +_080D75E4: .4byte gTrainerBattleOpponent_A _080D75E8: .4byte gUnknown_83FD43E _080D75EC: .4byte gUnknown_83FD3E4 _080D75F0: @@ -454,7 +454,7 @@ _080D75F0: bls _080D762C ldr r0, _080D7620 @ =gUnknown_2022AC8 ldr r2, _080D7624 @ =gUnknown_83FEA28 - ldr r1, _080D7628 @ =gUnknown_2023FE8 + ldr r1, _080D7628 @ =gBattleStruct ldr r1, [r1] adds r1, 0x8E ldrb r1, [r1] @@ -467,7 +467,7 @@ _080D75F0: _080D761C: .4byte gUnknown_2039A34 _080D7620: .4byte gUnknown_2022AC8 _080D7624: .4byte gUnknown_83FEA28 -_080D7628: .4byte gUnknown_2023FE8 +_080D7628: .4byte gBattleStruct _080D762C: ldr r0, _080D7648 @ =gUnknown_2022AC8 ldrh r2, [r2] @@ -522,7 +522,7 @@ _080D7682: _080D7694: .4byte gUnknown_2022AB8 _080D7698: .4byte gUnknown_83FCC8A _080D769C: - ldr r0, _080D76AC @ =gUnknown_2022B4C + ldr r0, _080D76AC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -531,10 +531,10 @@ _080D769C: ldr r7, _080D76B0 @ =gUnknown_83FCD9F b _080D77DC .align 2, 0 -_080D76AC: .4byte gUnknown_2022B4C +_080D76AC: .4byte gBattleTypeFlags _080D76B0: .4byte gUnknown_83FCD9F _080D76B4: - ldr r0, _080D76C8 @ =gUnknown_20386AE + ldr r0, _080D76C8 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 @@ -546,7 +546,7 @@ _080D76C4: ldr r7, _080D76D0 @ =gUnknown_83FE9D4 b _080D77DC .align 2, 0 -_080D76C8: .4byte gUnknown_20386AE +_080D76C8: .4byte gTrainerBattleOpponent_A _080D76CC: .4byte gUnknown_83FCD92 _080D76D0: .4byte gUnknown_83FE9D4 _080D76D4: @@ -564,7 +564,7 @@ _080D76D4: eors r0, r1 strb r0, [r4] _080D76F0: - ldr r0, _080D7710 @ =gUnknown_2022B4C + ldr r0, _080D7710 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -580,7 +580,7 @@ _080D76F0: beq _080D771E b _080D77DC .align 2, 0 -_080D7710: .4byte gUnknown_2022B4C +_080D7710: .4byte gBattleTypeFlags _080D7714: .4byte gUnknown_2022AB8 _080D7718: cmp r0, 0x3 @@ -602,7 +602,7 @@ _080D7730: .align 2, 0 _080D7734: .4byte gUnknown_83FCD66 _080D7738: - ldr r0, _080D7758 @ =gUnknown_20386AE + ldr r0, _080D7758 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 @@ -618,7 +618,7 @@ _080D7738: beq _080D7766 b _080D77DC .align 2, 0 -_080D7758: .4byte gUnknown_20386AE +_080D7758: .4byte gTrainerBattleOpponent_A _080D775C: .4byte gUnknown_2022AB8 _080D7760: cmp r0, 0x3 @@ -925,69 +925,69 @@ _080D79FC: .4byte gStringVar3 _080D7A00: movs r0, 0 bl GetBankByIdentity - ldr r1, _080D7A1C @ =gUnknown_2023BCE + ldr r1, _080D7A1C @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7A20 @ =gUnknown_2024284 + ldr r1, _080D7A20 @ =gPlayerParty adds r0, r1 bl _080D82AA .align 2, 0 -_080D7A1C: .4byte gUnknown_2023BCE -_080D7A20: .4byte gUnknown_2024284 +_080D7A1C: .4byte gBattlerPartyIndexes +_080D7A20: .4byte gPlayerParty _080D7A24: movs r0, 0x1 bl GetBankByIdentity - ldr r1, _080D7A40 @ =gUnknown_2023BCE + ldr r1, _080D7A40 @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7A44 @ =gUnknown_202402C + ldr r1, _080D7A44 @ =gEnemyParty adds r0, r1 bl _080D82AA .align 2, 0 -_080D7A40: .4byte gUnknown_2023BCE -_080D7A44: .4byte gUnknown_202402C +_080D7A40: .4byte gBattlerPartyIndexes +_080D7A44: .4byte gEnemyParty _080D7A48: movs r0, 0x2 bl GetBankByIdentity - ldr r1, _080D7A64 @ =gUnknown_2023BCE + ldr r1, _080D7A64 @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7A68 @ =gUnknown_2024284 + ldr r1, _080D7A68 @ =gPlayerParty adds r0, r1 bl _080D82AA .align 2, 0 -_080D7A64: .4byte gUnknown_2023BCE -_080D7A68: .4byte gUnknown_2024284 +_080D7A64: .4byte gBattlerPartyIndexes +_080D7A68: .4byte gPlayerParty _080D7A6C: movs r0, 0x3 bl GetBankByIdentity - ldr r1, _080D7A88 @ =gUnknown_2023BCE + ldr r1, _080D7A88 @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7A8C @ =gUnknown_202402C + ldr r1, _080D7A8C @ =gEnemyParty adds r0, r1 bl _080D82AA .align 2, 0 -_080D7A88: .4byte gUnknown_2023BCE -_080D7A8C: .4byte gUnknown_202402C +_080D7A88: .4byte gBattlerPartyIndexes +_080D7A8C: .4byte gEnemyParty _080D7A90: - ldr r2, _080D7AB0 @ =gUnknown_2023BCE + ldr r2, _080D7AB0 @ =gBattlerPartyIndexes ldr r1, _080D7AB4 @ =gUnknown_202273C lsls r0, r7, 3 subs r0, r7 @@ -999,15 +999,15 @@ _080D7A90: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7AB8 @ =gUnknown_2024284 + ldr r1, _080D7AB8 @ =gPlayerParty adds r0, r1 bl _080D82AA .align 2, 0 -_080D7AB0: .4byte gUnknown_2023BCE +_080D7AB0: .4byte gBattlerPartyIndexes _080D7AB4: .4byte gUnknown_202273C -_080D7AB8: .4byte gUnknown_2024284 +_080D7AB8: .4byte gPlayerParty _080D7ABC: - ldr r2, _080D7AE0 @ =gUnknown_2023BCE + ldr r2, _080D7AE0 @ =gBattlerPartyIndexes ldr r1, _080D7AE4 @ =gUnknown_202273C lsls r0, r7, 3 subs r0, r7 @@ -1021,15 +1021,15 @@ _080D7ABC: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7AE8 @ =gUnknown_202402C + ldr r1, _080D7AE8 @ =gEnemyParty adds r0, r1 bl _080D82AA .align 2, 0 -_080D7AE0: .4byte gUnknown_2023BCE +_080D7AE0: .4byte gBattlerPartyIndexes _080D7AE4: .4byte gUnknown_202273C -_080D7AE8: .4byte gUnknown_202402C +_080D7AE8: .4byte gEnemyParty _080D7AEC: - ldr r2, _080D7B10 @ =gUnknown_2023BCE + ldr r2, _080D7B10 @ =gBattlerPartyIndexes ldr r1, _080D7B14 @ =gUnknown_202273C lsls r0, r7, 3 subs r0, r7 @@ -1043,15 +1043,15 @@ _080D7AEC: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7B18 @ =gUnknown_2024284 + ldr r1, _080D7B18 @ =gPlayerParty adds r0, r1 bl _080D82AA .align 2, 0 -_080D7B10: .4byte gUnknown_2023BCE +_080D7B10: .4byte gBattlerPartyIndexes _080D7B14: .4byte gUnknown_202273C -_080D7B18: .4byte gUnknown_2024284 +_080D7B18: .4byte gPlayerParty _080D7B1C: - ldr r2, _080D7B40 @ =gUnknown_2023BCE + ldr r2, _080D7B40 @ =gBattlerPartyIndexes ldr r1, _080D7B44 @ =gUnknown_202273C lsls r0, r7, 3 subs r0, r7 @@ -1065,22 +1065,22 @@ _080D7B1C: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7B48 @ =gUnknown_202402C + ldr r1, _080D7B48 @ =gEnemyParty adds r0, r1 b _080D82AA .align 2, 0 -_080D7B40: .4byte gUnknown_2023BCE +_080D7B40: .4byte gBattlerPartyIndexes _080D7B44: .4byte gUnknown_202273C -_080D7B48: .4byte gUnknown_202402C +_080D7B48: .4byte gEnemyParty _080D7B4C: - ldr r4, _080D7B70 @ =gUnknown_2023D6B + ldr r4, _080D7B70 @ =sBattler_AI ldrb r0, [r4] bl GetBankSide lsls r0, 24 adds r2, r4, 0 cmp r0, 0 beq _080D7BC0 - ldr r0, _080D7B74 @ =gUnknown_2022B4C + ldr r0, _080D7B74 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x8 ands r1, r0 @@ -1090,8 +1090,8 @@ _080D7B4C: ldr r4, _080D7B7C @ =gUnknown_83FD55B b _080D7B8A .align 2, 0 -_080D7B70: .4byte gUnknown_2023D6B -_080D7B74: .4byte gUnknown_2022B4C +_080D7B70: .4byte sBattler_AI +_080D7B74: .4byte gBattleTypeFlags _080D7B78: .4byte gUnknown_83FD555 _080D7B7C: .4byte gUnknown_83FD55B _080D7B80: @@ -1111,19 +1111,19 @@ _080D7B8A: movs r0, 0x1 ands r0, r1 bl GetBankByIdentity - ldr r1, _080D7BB8 @ =gUnknown_2023BCE + ldr r1, _080D7BB8 @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7BBC @ =gUnknown_202402C + ldr r1, _080D7BBC @ =gEnemyParty adds r0, r1 b _080D82AA .align 2, 0 -_080D7BB8: .4byte gUnknown_2023BCE -_080D7BBC: .4byte gUnknown_202402C +_080D7BB8: .4byte gBattlerPartyIndexes +_080D7BBC: .4byte gEnemyParty _080D7BC0: ldrb r0, [r2] bl GetBankIdentity @@ -1131,16 +1131,16 @@ _080D7BC0: movs r0, 0x1 ands r0, r1 bl GetBankByIdentity - ldr r1, _080D7BDC @ =gUnknown_2023BCE + ldr r1, _080D7BDC @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] b _080D82D4 .align 2, 0 -_080D7BDC: .4byte gUnknown_2023BCE +_080D7BDC: .4byte gBattlerPartyIndexes _080D7BE0: - ldr r4, _080D7C14 @ =gUnknown_2023D6B + ldr r4, _080D7C14 @ =sBattler_AI ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -1152,7 +1152,7 @@ _080D7BE0: movs r0, 0x1 ands r0, r1 bl GetBankByIdentity - ldr r1, _080D7C18 @ =gUnknown_2023BCE + ldr r1, _080D7C18 @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, 0x4 @@ -1160,13 +1160,13 @@ _080D7BE0: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7C1C @ =gUnknown_2024284 + ldr r1, _080D7C1C @ =gPlayerParty adds r0, r1 b _080D82AA .align 2, 0 -_080D7C14: .4byte gUnknown_2023D6B -_080D7C18: .4byte gUnknown_2023BCE -_080D7C1C: .4byte gUnknown_2024284 +_080D7C14: .4byte sBattler_AI +_080D7C18: .4byte gBattlerPartyIndexes +_080D7C1C: .4byte gPlayerParty _080D7C20: ldrb r0, [r4] bl GetBankIdentity @@ -1174,7 +1174,7 @@ _080D7C20: movs r0, 0x1 ands r0, r1 bl GetBankByIdentity - ldr r1, _080D7C44 @ =gUnknown_2023BCE + ldr r1, _080D7C44 @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, 0x4 @@ -1182,19 +1182,19 @@ _080D7C20: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D7C48 @ =gUnknown_202402C + ldr r1, _080D7C48 @ =gEnemyParty b _080D82DA .align 2, 0 -_080D7C44: .4byte gUnknown_2023BCE -_080D7C48: .4byte gUnknown_202402C +_080D7C44: .4byte gBattlerPartyIndexes +_080D7C48: .4byte gEnemyParty _080D7C4C: - ldr r5, _080D7C98 @ =gUnknown_2023D6B + ldr r5, _080D7C98 @ =sBattler_AI ldrb r0, [r5] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D7CB0 - ldr r0, _080D7C9C @ =gUnknown_2022B4C + ldr r0, _080D7C9C @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x8 ands r1, r0 @@ -1205,8 +1205,8 @@ _080D7C4C: _080D7C6A: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _080D7CA8 @ =gUnknown_2023BCE - ldr r2, _080D7CAC @ =gUnknown_202402C + ldr r3, _080D7CA8 @ =gBattlerPartyIndexes + ldr r2, _080D7CAC @ =gEnemyParty mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -1228,29 +1228,29 @@ _080D7C8C: ldrh r1, [r0] b _080D82A4 .align 2, 0 -_080D7C98: .4byte gUnknown_2023D6B -_080D7C9C: .4byte gUnknown_2022B4C +_080D7C98: .4byte sBattler_AI +_080D7C9C: .4byte gBattleTypeFlags _080D7CA0: .4byte gUnknown_83FD555 _080D7CA4: .4byte gUnknown_83FD55B -_080D7CA8: .4byte gUnknown_2023BCE -_080D7CAC: .4byte gUnknown_202402C +_080D7CA8: .4byte gBattlerPartyIndexes +_080D7CAC: .4byte gEnemyParty _080D7CB0: - ldr r1, _080D7CBC @ =gUnknown_2023BCE + ldr r1, _080D7CBC @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _080D82D4 .align 2, 0 -_080D7CBC: .4byte gUnknown_2023BCE +_080D7CBC: .4byte gBattlerPartyIndexes _080D7CC0: - ldr r5, _080D7D0C @ =gUnknown_2023D6C + ldr r5, _080D7D0C @ =gBattlerTarget ldrb r0, [r5] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D7D24 - ldr r0, _080D7D10 @ =gUnknown_2022B4C + ldr r0, _080D7D10 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x8 ands r1, r0 @@ -1261,8 +1261,8 @@ _080D7CC0: _080D7CDE: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _080D7D1C @ =gUnknown_2023BCE - ldr r2, _080D7D20 @ =gUnknown_202402C + ldr r3, _080D7D1C @ =gBattlerPartyIndexes + ldr r2, _080D7D20 @ =gEnemyParty mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -1284,21 +1284,21 @@ _080D7D00: ldrh r1, [r0] b _080D82A4 .align 2, 0 -_080D7D0C: .4byte gUnknown_2023D6C -_080D7D10: .4byte gUnknown_2022B4C +_080D7D0C: .4byte gBattlerTarget +_080D7D10: .4byte gBattleTypeFlags _080D7D14: .4byte gUnknown_83FD555 _080D7D18: .4byte gUnknown_83FD55B -_080D7D1C: .4byte gUnknown_2023BCE -_080D7D20: .4byte gUnknown_202402C +_080D7D1C: .4byte gBattlerPartyIndexes +_080D7D20: .4byte gEnemyParty _080D7D24: - ldr r1, _080D7D30 @ =gUnknown_2023BCE + ldr r1, _080D7D30 @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _080D82D4 .align 2, 0 -_080D7D30: .4byte gUnknown_2023BCE +_080D7D30: .4byte gBattlerPartyIndexes _080D7D34: ldr r5, _080D7D80 @ =gUnknown_2023D6E ldrb r0, [r5] @@ -1306,7 +1306,7 @@ _080D7D34: lsls r0, 24 cmp r0, 0 beq _080D7D98 - ldr r0, _080D7D84 @ =gUnknown_2022B4C + ldr r0, _080D7D84 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x8 ands r1, r0 @@ -1317,8 +1317,8 @@ _080D7D34: _080D7D52: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _080D7D90 @ =gUnknown_2023BCE - ldr r2, _080D7D94 @ =gUnknown_202402C + ldr r3, _080D7D90 @ =gBattlerPartyIndexes + ldr r2, _080D7D94 @ =gEnemyParty mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -1341,28 +1341,28 @@ _080D7D74: b _080D82A4 .align 2, 0 _080D7D80: .4byte gUnknown_2023D6E -_080D7D84: .4byte gUnknown_2022B4C +_080D7D84: .4byte gBattleTypeFlags _080D7D88: .4byte gUnknown_83FD555 _080D7D8C: .4byte gUnknown_83FD55B -_080D7D90: .4byte gUnknown_2023BCE -_080D7D94: .4byte gUnknown_202402C +_080D7D90: .4byte gBattlerPartyIndexes +_080D7D94: .4byte gEnemyParty _080D7D98: - ldr r1, _080D7DA4 @ =gUnknown_2023BCE + ldr r1, _080D7DA4 @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _080D82D4 .align 2, 0 -_080D7DA4: .4byte gUnknown_2023BCE +_080D7DA4: .4byte gBattlerPartyIndexes _080D7DA8: - ldr r5, _080D7DF4 @ =gUnknown_2023BC4 + ldr r5, _080D7DF4 @ =gActiveBattler ldrb r0, [r5] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D7E0C - ldr r0, _080D7DF8 @ =gUnknown_2022B4C + ldr r0, _080D7DF8 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x8 ands r1, r0 @@ -1373,8 +1373,8 @@ _080D7DA8: _080D7DC6: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _080D7E04 @ =gUnknown_2023BCE - ldr r2, _080D7E08 @ =gUnknown_202402C + ldr r3, _080D7E04 @ =gBattlerPartyIndexes + ldr r2, _080D7E08 @ =gEnemyParty mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -1396,29 +1396,29 @@ _080D7DE8: ldrh r1, [r0] b _080D82A4 .align 2, 0 -_080D7DF4: .4byte gUnknown_2023BC4 -_080D7DF8: .4byte gUnknown_2022B4C +_080D7DF4: .4byte gActiveBattler +_080D7DF8: .4byte gBattleTypeFlags _080D7DFC: .4byte gUnknown_83FD555 _080D7E00: .4byte gUnknown_83FD55B -_080D7E04: .4byte gUnknown_2023BCE -_080D7E08: .4byte gUnknown_202402C +_080D7E04: .4byte gBattlerPartyIndexes +_080D7E08: .4byte gEnemyParty _080D7E0C: - ldr r1, _080D7E18 @ =gUnknown_2023BCE + ldr r1, _080D7E18 @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _080D82D4 .align 2, 0 -_080D7E18: .4byte gUnknown_2023BCE +_080D7E18: .4byte gBattlerPartyIndexes _080D7E1C: - ldr r5, _080D7E68 @ =gUnknown_2023FC4 + ldr r5, _080D7E68 @ =gBattleScripting ldrb r0, [r5, 0x17] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D7E80 - ldr r0, _080D7E6C @ =gUnknown_2022B4C + ldr r0, _080D7E6C @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x8 ands r1, r0 @@ -1429,8 +1429,8 @@ _080D7E1C: _080D7E3A: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _080D7E78 @ =gUnknown_2023BCE - ldr r2, _080D7E7C @ =gUnknown_202402C + ldr r3, _080D7E78 @ =gBattlerPartyIndexes + ldr r2, _080D7E7C @ =gEnemyParty mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -1452,21 +1452,21 @@ _080D7E5C: ldrh r1, [r0] b _080D82A4 .align 2, 0 -_080D7E68: .4byte gUnknown_2023FC4 -_080D7E6C: .4byte gUnknown_2022B4C +_080D7E68: .4byte gBattleScripting +_080D7E6C: .4byte gBattleTypeFlags _080D7E70: .4byte gUnknown_83FD555 _080D7E74: .4byte gUnknown_83FD55B -_080D7E78: .4byte gUnknown_2023BCE -_080D7E7C: .4byte gUnknown_202402C +_080D7E78: .4byte gBattlerPartyIndexes +_080D7E7C: .4byte gEnemyParty _080D7E80: - ldr r1, _080D7E8C @ =gUnknown_2023BCE + ldr r1, _080D7E8C @ =gBattlerPartyIndexes ldrb r0, [r5, 0x17] lsls r0, 1 adds r0, r1 ldrh r1, [r0] b _080D82D4 .align 2, 0 -_080D7E8C: .4byte gUnknown_2023BCE +_080D7E8C: .4byte gBattlerPartyIndexes _080D7E90: ldr r0, _080D7EA4 @ =gUnknown_2039A34 ldr r2, [r0] @@ -1488,7 +1488,7 @@ _080D7EA8: cmp r1, r0 bls _080D7ED4 _080D7EB6: - ldr r0, _080D7ECC @ =gUnknown_2023FE8 + ldr r0, _080D7ECC @ =gBattleStruct ldr r0, [r0] adds r0, 0x8E ldrb r0, [r0] @@ -1498,7 +1498,7 @@ _080D7EB6: b _080D8382 .align 2, 0 _080D7EC8: .4byte gUnknown_2039A34 -_080D7ECC: .4byte gUnknown_2023FE8 +_080D7ECC: .4byte gBattleStruct _080D7ED0: .4byte gUnknown_83FEA28 _080D7ED4: ldrh r1, [r2, 0x2] @@ -1511,7 +1511,7 @@ _080D7ED6: .align 2, 0 _080D7EE0: .4byte gUnknown_8247094 _080D7EE4: - ldr r0, _080D7F1C @ =gUnknown_2022B4C + ldr r0, _080D7F1C @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x2 ands r0, r1 @@ -1525,7 +1525,7 @@ _080D7EE4: ands r1, r0 cmp r1, 0 bne _080D7F44 - ldr r0, _080D7F24 @ =gUnknown_2023FE8 + ldr r0, _080D7F24 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r0, [r0] @@ -1539,9 +1539,9 @@ _080D7EE4: bne _080D7F38 b _080D7F90 .align 2, 0 -_080D7F1C: .4byte gUnknown_2022B4C +_080D7F1C: .4byte gBattleTypeFlags _080D7F20: .4byte gUnknown_2023D68 -_080D7F24: .4byte gUnknown_2023FE8 +_080D7F24: .4byte gBattleStruct _080D7F28: .4byte gUnknown_2023D6F _080D7F2C: ldr r2, _080D7F40 @ =gUnknown_2023D6F @@ -1559,7 +1559,7 @@ _080D7F38: _080D7F40: .4byte gUnknown_2023D6F _080D7F44: ldr r2, _080D7F7C @ =gUnknown_202273C - ldr r0, _080D7F80 @ =gUnknown_2023FE8 + ldr r0, _080D7F80 @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r1, [r0] @@ -1587,7 +1587,7 @@ _080D7F64: b _080D8382 .align 2, 0 _080D7F7C: .4byte gUnknown_202273C -_080D7F80: .4byte gUnknown_2023FE8 +_080D7F80: .4byte gBattleStruct _080D7F84: .4byte gUnknown_2023D6F _080D7F88: .4byte gUnknown_2023F54 _080D7F8C: .4byte gUnknown_83FD8AF @@ -1616,26 +1616,26 @@ _080D7FB0: _080D7FB4: .4byte gUnknown_2023D6A _080D7FB8: ldr r1, _080D7FC0 @ =gUnknown_2039A30 - ldr r0, _080D7FC4 @ =gUnknown_2023D6B + ldr r0, _080D7FC4 @ =sBattler_AI b _080D7FEC .align 2, 0 _080D7FC0: .4byte gUnknown_2039A30 -_080D7FC4: .4byte gUnknown_2023D6B +_080D7FC4: .4byte sBattler_AI _080D7FC8: ldr r1, _080D7FD0 @ =gUnknown_2039A30 - ldr r0, _080D7FD4 @ =gUnknown_2023D6C + ldr r0, _080D7FD4 @ =gBattlerTarget b _080D7FEC .align 2, 0 _080D7FD0: .4byte gUnknown_2039A30 -_080D7FD4: .4byte gUnknown_2023D6C +_080D7FD4: .4byte gBattlerTarget _080D7FD8: ldr r1, _080D7FE0 @ =gUnknown_2039A30 - ldr r0, _080D7FE4 @ =gUnknown_2023FC4 + ldr r0, _080D7FE4 @ =gBattleScripting ldrb r0, [r0, 0x17] b _080D7FEE .align 2, 0 _080D7FE0: .4byte gUnknown_2039A30 -_080D7FE4: .4byte gUnknown_2023FC4 +_080D7FE4: .4byte gBattleScripting _080D7FE8: ldr r1, _080D7FFC @ =gUnknown_2039A30 ldr r0, _080D8000 @ =gUnknown_2023D6E @@ -1655,7 +1655,7 @@ _080D7FFC: .4byte gUnknown_2039A30 _080D8000: .4byte gUnknown_2023D6E _080D8004: .4byte gUnknown_824FC40 _080D8008: - ldr r3, _080D8020 @ =gUnknown_20386AE + ldr r3, _080D8020 @ =gTrainerBattleOpponent_A ldrh r1, [r3] movs r0, 0x80 lsls r0, 3 @@ -1667,7 +1667,7 @@ _080D8008: movs r1, 0xD b _080D8094 .align 2, 0 -_080D8020: .4byte gUnknown_20386AE +_080D8020: .4byte gTrainerBattleOpponent_A _080D8024: movs r0, 0xC0 lsls r0, 4 @@ -1679,7 +1679,7 @@ _080D8024: movs r1, 0xD b _080D8094 _080D8038: - ldr r0, _080D8054 @ =gUnknown_2022B4C + ldr r0, _080D8054 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x80 lsls r0, 1 @@ -1692,7 +1692,7 @@ _080D8038: movs r1, 0xD b _080D8094 .align 2, 0 -_080D8054: .4byte gUnknown_2022B4C +_080D8054: .4byte gBattleTypeFlags _080D8058: movs r0, 0x80 lsls r0, 12 @@ -1716,7 +1716,7 @@ _080D806E: movs r1, 0xD b _080D8094 _080D8084: - ldr r2, _080D809C @ =gUnknown_823EAC8 + ldr r2, _080D809C @ =gTrainers ldrh r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -1730,10 +1730,10 @@ _080D8094: adds r4, r1, r0 b _080D8382 .align 2, 0 -_080D809C: .4byte gUnknown_823EAC8 +_080D809C: .4byte gTrainers _080D80A0: .4byte gUnknown_823E558 _080D80A4: - ldr r0, _080D80E8 @ =gUnknown_20386AE + ldr r0, _080D80E8 @ =gTrainerBattleOpponent_A ldrh r2, [r0] movs r1, 0x80 lsls r1, 3 @@ -1741,7 +1741,7 @@ _080D80A4: cmp r2, r1 bne _080D80D6 movs r2, 0 - ldr r0, _080D80EC @ =gUnknown_2023FF4 + ldr r0, _080D80EC @ =gBattleResources ldr r3, [r0] _080D80B8: mov r1, sp @@ -1770,10 +1770,10 @@ _080D80D6: eors r0, r1 b _080D81C8 .align 2, 0 -_080D80E8: .4byte gUnknown_20386AE -_080D80EC: .4byte gUnknown_2023FF4 +_080D80E8: .4byte gTrainerBattleOpponent_A +_080D80EC: .4byte gBattleResources _080D80F0: - ldr r0, _080D8108 @ =gUnknown_2022B4C + ldr r0, _080D8108 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x80 lsls r0, 1 @@ -1784,7 +1784,7 @@ _080D80F0: bl sub_80E6150 b _080D8382 .align 2, 0 -_080D8108: .4byte gUnknown_2022B4C +_080D8108: .4byte gBattleTypeFlags _080D810C: movs r0, 0x80 lsls r0, 12 @@ -1806,7 +1806,7 @@ _080D8120: mov r4, sp b _080D8382 _080D8134: - ldr r2, _080D8158 @ =gUnknown_823EAC8 + ldr r2, _080D8158 @ =gTrainers ldrh r0, [r5] lsls r1, r0, 2 adds r1, r0 @@ -1825,7 +1825,7 @@ _080D814E: adds r4, r0, 0 b _080D8382 .align 2, 0 -_080D8158: .4byte gUnknown_823EAC8 +_080D8158: .4byte gTrainers _080D815C: adds r0, r2, 0x4 adds r4, r1, r0 @@ -1881,7 +1881,7 @@ _080D81AA: .align 2, 0 _080D81BC: .4byte gUnknown_202273C _080D81C0: - ldr r0, _080D81D4 @ =gUnknown_2023FC4 + ldr r0, _080D81D4 @ =gBattleScripting ldrb r0, [r0, 0x17] bl GetBankMultiplayerId _080D81C8: @@ -1892,7 +1892,7 @@ _080D81C8: adds r4, r1, r0 b _080D8382 .align 2, 0 -_080D81D4: .4byte gUnknown_2023FC4 +_080D81D4: .4byte gBattleScripting _080D81D8: .4byte gUnknown_2022744 _080D81DC: ldr r0, _080D81E4 @ =gSaveBlock2Ptr @@ -1901,7 +1901,7 @@ _080D81DC: .align 2, 0 _080D81E4: .4byte gSaveBlock2Ptr _080D81E8: - ldr r0, _080D8204 @ =gUnknown_2022B4C + ldr r0, _080D8204 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 12 @@ -1914,14 +1914,14 @@ _080D81E8: bl sub_815DC40 b _080D8382 .align 2, 0 -_080D8204: .4byte gUnknown_2022B4C +_080D8204: .4byte gBattleTypeFlags _080D8208: .4byte gStringVar4 _080D820C: bl sub_80806EC adds r4, r0, 0 b _080D8382 _080D8214: - ldr r0, _080D8230 @ =gUnknown_2022B4C + ldr r0, _080D8230 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 12 @@ -1934,7 +1934,7 @@ _080D8214: bl sub_815DBF4 b _080D8382 .align 2, 0 -_080D8230: .4byte gUnknown_2022B4C +_080D8230: .4byte gBattleTypeFlags _080D8234: .4byte gStringVar4 _080D8238: bl sub_8080710 @@ -1957,13 +1957,13 @@ _080D8250: .align 2, 0 _080D825C: .4byte gStringVar4 _080D8260: - ldr r0, _080D82B4 @ =gUnknown_2023FC4 + ldr r0, _080D82B4 @ =gBattleScripting ldrb r0, [r0, 0x17] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D82CC - ldr r0, _080D82B8 @ =gUnknown_2022B4C + ldr r0, _080D82B8 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x8 ands r1, r0 @@ -1974,9 +1974,9 @@ _080D8260: _080D827E: ldrb r1, [r4] adds r0, r1, 0 - ldr r5, _080D82C4 @ =gUnknown_202402C + ldr r5, _080D82C4 @ =gEnemyParty mov r12, r5 - ldr r2, _080D82C8 @ =gUnknown_2023FE8 + ldr r2, _080D82C8 @ =gBattleStruct cmp r0, 0xFF beq _080D829E _080D828C: @@ -2003,21 +2003,21 @@ _080D82AA: bl GetMonData b _080D82E4 .align 2, 0 -_080D82B4: .4byte gUnknown_2023FC4 -_080D82B8: .4byte gUnknown_2022B4C +_080D82B4: .4byte gBattleScripting +_080D82B8: .4byte gBattleTypeFlags _080D82BC: .4byte gUnknown_83FD555 _080D82C0: .4byte gUnknown_83FD55B -_080D82C4: .4byte gUnknown_202402C -_080D82C8: .4byte gUnknown_2023FE8 +_080D82C4: .4byte gEnemyParty +_080D82C8: .4byte gBattleStruct _080D82CC: - ldr r0, _080D82F0 @ =gUnknown_2023FE8 + ldr r0, _080D82F0 @ =gBattleStruct ldr r0, [r0] adds r0, 0x52 ldrb r1, [r0] _080D82D4: movs r0, 0x64 muls r0, r1 - ldr r1, _080D82F4 @ =gUnknown_2024284 + ldr r1, _080D82F4 @ =gPlayerParty _080D82DA: adds r0, r1 movs r1, 0x2 @@ -2029,8 +2029,8 @@ _080D82E4: mov r4, sp b _080D8382 .align 2, 0 -_080D82F0: .4byte gUnknown_2023FE8 -_080D82F4: .4byte gUnknown_2024284 +_080D82F0: .4byte gBattleStruct +_080D82F4: .4byte gPlayerParty _080D82F8: ldr r0, _080D830C @ =0x00000834 bl FlagGet @@ -2045,12 +2045,12 @@ _080D830C: .4byte 0x00000834 _080D8310: .4byte gUnknown_83FD81A _080D8314: .4byte gUnknown_83FD824 _080D8318: - ldr r0, _080D831C @ =gUnknown_2023D6B + ldr r0, _080D831C @ =sBattler_AI b _080D8322 .align 2, 0 -_080D831C: .4byte gUnknown_2023D6B +_080D831C: .4byte sBattler_AI _080D8320: - ldr r0, _080D8334 @ =gUnknown_2023D6C + ldr r0, _080D8334 @ =gBattlerTarget _080D8322: ldrb r0, [r0] bl GetBankSide @@ -2061,16 +2061,16 @@ _080D8322: ldr r4, _080D833C @ =gUnknown_83FD56D b _080D8382 .align 2, 0 -_080D8334: .4byte gUnknown_2023D6C +_080D8334: .4byte gBattlerTarget _080D8338: .4byte gUnknown_83FD569 _080D833C: .4byte gUnknown_83FD56D _080D8340: - ldr r0, _080D8344 @ =gUnknown_2023D6B + ldr r0, _080D8344 @ =sBattler_AI b _080D834A .align 2, 0 -_080D8344: .4byte gUnknown_2023D6B +_080D8344: .4byte sBattler_AI _080D8348: - ldr r0, _080D835C @ =gUnknown_2023D6C + ldr r0, _080D835C @ =gBattlerTarget _080D834A: ldrb r0, [r0] bl GetBankSide @@ -2081,16 +2081,16 @@ _080D834A: ldr r4, _080D8364 @ =gUnknown_83FD564 b _080D8382 .align 2, 0 -_080D835C: .4byte gUnknown_2023D6C +_080D835C: .4byte gBattlerTarget _080D8360: .4byte gUnknown_83FD560 _080D8364: .4byte gUnknown_83FD564 _080D8368: - ldr r0, _080D836C @ =gUnknown_2023D6B + ldr r0, _080D836C @ =sBattler_AI b _080D8372 .align 2, 0 -_080D836C: .4byte gUnknown_2023D6B +_080D836C: .4byte sBattler_AI _080D8370: - ldr r0, _080D83D4 @ =gUnknown_2023D6C + ldr r0, _080D83D4 @ =gBattlerTarget _080D8372: ldrb r0, [r0] bl GetBankSide @@ -2144,7 +2144,7 @@ _080D83BC: adds r6, 0x1 b _080D83EC .align 2, 0 -_080D83D4: .4byte gUnknown_2023D6C +_080D83D4: .4byte gBattlerTarget _080D83D8: .4byte gUnknown_83FD572 _080D83DC: .4byte gUnknown_83FD576 _080D83E0: @@ -2317,16 +2317,16 @@ _080D8514: ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 - ldr r1, _080D8534 @ =gUnknown_2024284 + ldr r1, _080D8534 @ =gPlayerParty adds r0, r1 movs r1, 0x2 mov r2, sp bl GetMonData b _080D8574 .align 2, 0 -_080D8534: .4byte gUnknown_2024284 +_080D8534: .4byte gPlayerParty _080D8538: - ldr r0, _080D8550 @ =gUnknown_2022B4C + ldr r0, _080D8550 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x8 ands r0, r1 @@ -2337,7 +2337,7 @@ _080D8538: bl StringAppend b _080D8560 .align 2, 0 -_080D8550: .4byte gUnknown_2022B4C +_080D8550: .4byte gBattleTypeFlags _080D8554: .4byte gUnknown_83FD55B _080D8558: ldr r1, _080D8584 @ =gUnknown_83FD555 @@ -2348,7 +2348,7 @@ _080D8560: ldrb r1, [r0, 0x2] movs r0, 0x64 muls r0, r1 - ldr r1, _080D8588 @ =gUnknown_202402C + ldr r1, _080D8588 @ =gEnemyParty adds r0, r1 movs r1, 0x2 mov r2, sp @@ -2362,7 +2362,7 @@ _080D8574: b _080D86AE .align 2, 0 _080D8584: .4byte gUnknown_83FD555 -_080D8588: .4byte gUnknown_202402C +_080D8588: .4byte gEnemyParty _080D858C: ldr r1, _080D859C @ =gUnknown_83FD5D0 adds r0, r5, r7 @@ -2392,19 +2392,19 @@ _080D85B2: ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 - ldr r1, _080D85D4 @ =gUnknown_2024284 + ldr r1, _080D85D4 @ =gPlayerParty adds r0, r1 movs r1, 0x2 adds r2, r6, 0 bl GetMonData b _080D85EA .align 2, 0 -_080D85D4: .4byte gUnknown_2024284 +_080D85D4: .4byte gPlayerParty _080D85D8: ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 - ldr r1, _080D85F4 @ =gUnknown_202402C + ldr r1, _080D85F4 @ =gEnemyParty adds r0, r1 movs r1, 0x2 adds r2, r6, 0 @@ -2414,7 +2414,7 @@ _080D85EA: bl StringGetEnd10 b _080D86AE .align 2, 0 -_080D85F4: .4byte gUnknown_202402C +_080D85F4: .4byte gEnemyParty _080D85F8: ldr r1, _080D8608 @ =gUnknown_83FD63C adds r0, r5, r7 @@ -2446,7 +2446,7 @@ _080D8628: ldrb r0, [r0, 0x2] lsls r0, 8 orrs r2, r0 - ldr r0, _080D8674 @ =gUnknown_2022B4C + ldr r0, _080D8674 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -2455,7 +2455,7 @@ _080D8628: cmp r2, 0xAF bne _080D869C ldr r2, _080D8678 @ =gUnknown_202273C - ldr r0, _080D867C @ =gUnknown_2023FE8 + ldr r0, _080D867C @ =gBattleStruct ldr r0, [r0] adds r0, 0xB5 ldrb r1, [r0] @@ -2478,9 +2478,9 @@ _080D8628: ldr r1, _080D8688 @ =gUnknown_83FD8AF b _080D868E .align 2, 0 -_080D8674: .4byte gUnknown_2022B4C +_080D8674: .4byte gBattleTypeFlags _080D8678: .4byte gUnknown_202273C -_080D867C: .4byte gUnknown_2023FE8 +_080D867C: .4byte gBattleStruct _080D8680: .4byte gUnknown_2023D6F _080D8684: .4byte gUnknown_2023F54 _080D8688: .4byte gUnknown_83FD8AF @@ -2821,7 +2821,7 @@ _080D8900: _080D8908: strb r1, [r0] adds r4, r0, 0 - ldr r1, _080D8934 @ =gUnknown_2022B4C + ldr r1, _080D8934 @ =gBattleTypeFlags ldr r2, [r1] movs r0, 0x2 ands r0, r2 @@ -2842,7 +2842,7 @@ _080D8928: b _080D8940 .align 2, 0 _080D8930: .4byte gTextFlags -_080D8934: .4byte gUnknown_2022B4C +_080D8934: .4byte gBattleTypeFlags _080D8938: ldrb r1, [r4] movs r0, 0x5 @@ -2940,7 +2940,7 @@ _080D89D6: thumb_func_start SetPpNumbersPaletteInMoveSelection SetPpNumbersPaletteInMoveSelection: @ 80D89DC push {r4,r5,lr} - ldr r0, _080D8A38 @ =gUnknown_2023BC4 + ldr r0, _080D8A38 @ =gActiveBattler ldrb r2, [r0] lsls r1, r2, 9 ldr r0, _080D8A3C @ =gUnknown_2022BC8 @@ -2982,7 +2982,7 @@ SetPpNumbersPaletteInMoveSelection: @ 80D89DC pop {r0} bx r0 .align 2, 0 -_080D8A38: .4byte gUnknown_2023BC4 +_080D8A38: .4byte gActiveBattler _080D8A3C: .4byte gUnknown_2022BC8 _080D8A40: .4byte gUnknown_8D2FBB4 _080D8A44: .4byte gUnknown_2023FFC diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index f8ec68c90..130ba9b21 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -24,8 +24,8 @@ atk00_attackcanceler: @ 801D760 _0801D77C: .4byte gUnknown_2023E8A _0801D780: .4byte gUnknown_2023BE3 _0801D784: - ldr r2, _0801D7B4 @ =gUnknown_2023BE4 - ldr r0, _0801D7B8 @ =gUnknown_2023D6B + ldr r2, _0801D7B4 @ =gBattleMons + ldr r0, _0801D7B8 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -48,8 +48,8 @@ _0801D784: ldr r0, _0801D7C4 @ =gUnknown_81D694E b _0801DAFA .align 2, 0 -_0801D7B4: .4byte gUnknown_2023BE4 -_0801D7B8: .4byte gUnknown_2023D6B +_0801D7B4: .4byte gBattleMons +_0801D7B8: .4byte sBattler_AI _0801D7BC: .4byte gUnknown_2023DD0 _0801D7C0: .4byte gUnknown_2023D74 _0801D7C4: .4byte gUnknown_81D694E @@ -61,7 +61,7 @@ _0801D7C8: beq _0801D7D6 b _0801DAFC _0801D7D6: - ldr r0, _0801D844 @ =gUnknown_2023D6C + ldr r0, _0801D844 @ =gBattlerTarget ldrb r1, [r0] str r2, [sp] movs r0, 0x2 @@ -73,10 +73,10 @@ _0801D7D6: beq _0801D7EE b _0801DAFC _0801D7EE: - ldr r4, _0801D848 @ =gUnknown_2023BE4 + ldr r4, _0801D848 @ =gBattleMons ldr r0, _0801D84C @ =gUnknown_2023D48 ldrb r1, [r0] - ldr r3, _0801D850 @ =gUnknown_2023D6B + ldr r3, _0801D850 @ =sBattler_AI ldrb r2, [r3] movs r0, 0x58 muls r2, r0 @@ -88,7 +88,7 @@ _0801D7EE: ldr r5, _0801D854 @ =gUnknown_2023DD0 cmp r0, 0 bne _0801D86C - ldr r0, _0801D858 @ =gUnknown_2023D4A + ldr r0, _0801D858 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xA5 beq _0801D86C @@ -109,23 +109,23 @@ _0801D7EE: ldr r1, _0801D860 @ =gUnknown_2023D74 ldr r0, _0801D864 @ =gUnknown_81D8EA8 str r0, [r1] - ldr r2, _0801D868 @ =gUnknown_2023DCC + ldr r2, _0801D868 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] b _0801DAFC .align 2, 0 -_0801D844: .4byte gUnknown_2023D6C -_0801D848: .4byte gUnknown_2023BE4 +_0801D844: .4byte gBattlerTarget +_0801D848: .4byte gBattleMons _0801D84C: .4byte gUnknown_2023D48 -_0801D850: .4byte gUnknown_2023D6B +_0801D850: .4byte sBattler_AI _0801D854: .4byte gUnknown_2023DD0 -_0801D858: .4byte gUnknown_2023D4A +_0801D858: .4byte gCurrentMove _0801D85C: .4byte 0x00800200 _0801D860: .4byte gUnknown_2023D74 _0801D864: .4byte gUnknown_81D8EA8 -_0801D868: .4byte gUnknown_2023DCC +_0801D868: .4byte gMoveResultFlags _0801D86C: ldr r0, [r5] ldr r1, _0801D8B0 @ =0xff7fffff @@ -162,14 +162,14 @@ _0801D86C: .align 2, 0 _0801D8B0: .4byte 0xff7fffff _0801D8B4: - ldr r0, _0801D8C0 @ =gUnknown_2023DCC + ldr r0, _0801D8C0 @ =gMoveResultFlags ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] b _0801DAFC .align 2, 0 -_0801D8C0: .4byte gUnknown_2023DCC +_0801D8C0: .4byte gMoveResultFlags _0801D8C4: ldr r2, _0801D928 @ =gUnknown_2023DD0 ldr r0, [r2] @@ -178,7 +178,7 @@ _0801D8C4: orrs r0, r1 str r0, [r2] ldr r2, _0801D92C @ =gUnknown_2023E8C - ldr r1, _0801D930 @ =gUnknown_2023D6C + ldr r1, _0801D930 @ =gBattlerTarget ldrb r3, [r1] lsls r0, r3, 4 adds r0, r2 @@ -188,8 +188,8 @@ _0801D8C4: mov r9, r2 cmp r0, 0 bge _0801D94C - ldr r2, _0801D934 @ =gUnknown_8250C04 - ldr r0, _0801D938 @ =gUnknown_2023D4A + ldr r2, _0801D934 @ =gBattleMoves + ldr r0, _0801D938 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -200,7 +200,7 @@ _0801D8C4: ands r0, r1 cmp r0, 0 beq _0801D94C - ldr r0, _0801D93C @ =gUnknown_2023D6B + ldr r0, _0801D93C @ =sBattler_AI ldrb r0, [r0] ldr r2, _0801D940 @ =0x00000115 adds r1, r3, 0 @@ -221,10 +221,10 @@ _0801D8C4: .align 2, 0 _0801D928: .4byte gUnknown_2023DD0 _0801D92C: .4byte gUnknown_2023E8C -_0801D930: .4byte gUnknown_2023D6C -_0801D934: .4byte gUnknown_8250C04 -_0801D938: .4byte gUnknown_2023D4A -_0801D93C: .4byte gUnknown_2023D6B +_0801D930: .4byte gBattlerTarget +_0801D934: .4byte gBattleMoves +_0801D938: .4byte gCurrentMove +_0801D93C: .4byte sBattler_AI _0801D940: .4byte 0x00000115 _0801D944: .4byte gUnknown_2023D74 _0801D948: .4byte gUnknown_81D8FAA @@ -235,7 +235,7 @@ _0801D94C: cmp r2, r0 bge _0801D98E ldr r6, _0801D9CC @ =gUnknown_2023E8C - ldr r1, _0801D9D0 @ =gUnknown_8250C04 + ldr r1, _0801D9D0 @ =gBattleMoves mov r12, r1 adds r5, r0, 0 ldr r7, _0801D9D4 @ =gUnknown_2023BDE @@ -248,7 +248,7 @@ _0801D960: lsls r0, 26 cmp r0, 0 bge _0801D988 - ldr r0, _0801D9D8 @ =gUnknown_2023D4A + ldr r0, _0801D9D8 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -295,9 +295,9 @@ _0801D98E: .align 2, 0 _0801D9C8: .4byte gUnknown_2023BCC _0801D9CC: .4byte gUnknown_2023E8C -_0801D9D0: .4byte gUnknown_8250C04 +_0801D9D0: .4byte gBattleMoves _0801D9D4: .4byte gUnknown_2023BDE -_0801D9D8: .4byte gUnknown_2023D4A +_0801D9D8: .4byte gCurrentMove _0801D9DC: .4byte gUnknown_2023ECC _0801D9E0: .4byte gUnknown_2023D6A _0801D9E4: .4byte gUnknown_2023D74 @@ -311,8 +311,8 @@ _0801D9EC: bne _0801D9FA b _0801DAF4 _0801D9FA: - ldr r1, _0801DA90 @ =gUnknown_8250C04 - ldr r2, _0801DA94 @ =gUnknown_2023D4A + ldr r1, _0801DA90 @ =gBattleMoves + ldr r2, _0801DA94 @ =gCurrentMove ldrh r3, [r2] lsls r0, r3, 1 adds r0, r3 @@ -326,8 +326,8 @@ _0801D9FA: beq _0801DAF4 cmp r3, 0xAE bne _0801DA38 - ldr r2, _0801DA98 @ =gUnknown_2023BE4 - ldr r0, _0801DA9C @ =gUnknown_2023D6B + ldr r2, _0801DA98 @ =gBattleMons + ldr r0, _0801DA9C @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -348,8 +348,8 @@ _0801DA38: lsls r0, 24 cmp r0, 0 beq _0801DA5E - ldr r1, _0801DA98 @ =gUnknown_2023BE4 - ldr r0, _0801DA9C @ =gUnknown_2023D6B + ldr r1, _0801DA98 @ =gBattleMons + ldr r0, _0801DA9C @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -362,16 +362,16 @@ _0801DA38: cmp r0, 0 beq _0801DAF4 _0801DA5E: - ldr r0, _0801DA9C @ =gUnknown_2023D6B + ldr r0, _0801DA9C @ =sBattler_AI ldrb r0, [r0] bl CancelMultiTurnMoves - ldr r2, _0801DAA0 @ =gUnknown_2023DCC + ldr r2, _0801DAA0 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] ldr r1, _0801DAA4 @ =gUnknown_2023DA0 - ldr r3, _0801DAA8 @ =gUnknown_2023D6C + ldr r3, _0801DAA8 @ =gBattlerTarget ldrb r0, [r3] lsls r0, 1 adds r0, r1 @@ -387,17 +387,17 @@ _0801DA5E: strb r0, [r1, 0x6] b _0801DAF4 .align 2, 0 -_0801DA90: .4byte gUnknown_8250C04 -_0801DA94: .4byte gUnknown_2023D4A -_0801DA98: .4byte gUnknown_2023BE4 -_0801DA9C: .4byte gUnknown_2023D6B -_0801DAA0: .4byte gUnknown_2023DCC +_0801DA90: .4byte gBattleMoves +_0801DA94: .4byte gCurrentMove +_0801DA98: .4byte gBattleMons +_0801DA9C: .4byte sBattler_AI +_0801DAA0: .4byte gMoveResultFlags _0801DAA4: .4byte gUnknown_2023DA0 -_0801DAA8: .4byte gUnknown_2023D6C +_0801DAA8: .4byte gBattlerTarget _0801DAAC: .4byte gUnknown_2023DA8 _0801DAB0: .4byte gUnknown_2023E82 _0801DAB4: - ldr r0, _0801DAE0 @ =gUnknown_2023D6B + ldr r0, _0801DAE0 @ =sBattler_AI ldrb r0, [r0] ldr r2, _0801DAE4 @ =0x00000121 adds r1, r3, 0 @@ -410,7 +410,7 @@ _0801DAB4: negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _0801DAE8 @ =gUnknown_2023FC4 + ldr r1, _0801DAE8 @ =gBattleScripting ldrb r0, [r4] strb r0, [r1, 0x17] bl BattleScriptPushCursor @@ -418,9 +418,9 @@ _0801DAB4: ldr r0, _0801DAF0 @ =gUnknown_81D8FC2 b _0801DAFA .align 2, 0 -_0801DAE0: .4byte gUnknown_2023D6B +_0801DAE0: .4byte sBattler_AI _0801DAE4: .4byte 0x00000121 -_0801DAE8: .4byte gUnknown_2023FC4 +_0801DAE8: .4byte gBattleScripting _0801DAEC: .4byte gUnknown_2023D74 _0801DAF0: .4byte gUnknown_81D8FC2 _0801DAF4: @@ -452,14 +452,14 @@ JumpIfMoveFailed: @ 801DB10 ldr r1, _0801DB5C @ =gUnknown_2023D74 ldr r5, [r1] adds r4, r5, r0 - ldr r0, _0801DB60 @ =gUnknown_2023DCC + ldr r0, _0801DB60 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 beq _0801DB70 ldr r1, _0801DB64 @ =gUnknown_2023DA0 - ldr r3, _0801DB68 @ =gUnknown_2023D6C + ldr r3, _0801DB68 @ =gBattlerTarget ldrb r0, [r3] lsls r0, 1 adds r0, r1 @@ -483,13 +483,13 @@ JumpIfMoveFailed: @ 801DB10 b _0801DB8A .align 2, 0 _0801DB5C: .4byte gUnknown_2023D74 -_0801DB60: .4byte gUnknown_2023DCC +_0801DB60: .4byte gMoveResultFlags _0801DB64: .4byte gUnknown_2023DA0 -_0801DB68: .4byte gUnknown_2023D6C +_0801DB68: .4byte gBattlerTarget _0801DB6C: .4byte gUnknown_2023DA8 _0801DB70: bl TrySetDestinyBondToHappen - ldr r0, _0801DB98 @ =gUnknown_2023D6C + ldr r0, _0801DB98 @ =gBattlerTarget ldrb r1, [r0] str r6, [sp] movs r0, 0x3 @@ -508,7 +508,7 @@ _0801DB8E: pop {r0} bx r0 .align 2, 0 -_0801DB98: .4byte gUnknown_2023D6C +_0801DB98: .4byte gBattlerTarget _0801DB9C: .4byte gUnknown_2023D74 thumb_func_end JumpIfMoveFailed @@ -516,7 +516,7 @@ _0801DB9C: .4byte gUnknown_2023D74 atk40_jumpifaffectedbyprotect: @ 801DBA0 push {lr} ldr r1, _0801DBE8 @ =gUnknown_2023E8C - ldr r0, _0801DBEC @ =gUnknown_2023D6C + ldr r0, _0801DBEC @ =gBattlerTarget ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -524,8 +524,8 @@ atk40_jumpifaffectedbyprotect: @ 801DBA0 lsls r0, 31 cmp r0, 0 beq _0801DC00 - ldr r2, _0801DBF0 @ =gUnknown_8250C04 - ldr r0, _0801DBF4 @ =gUnknown_2023D4A + ldr r2, _0801DBF0 @ =gBattleMoves + ldr r0, _0801DBF4 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -536,7 +536,7 @@ atk40_jumpifaffectedbyprotect: @ 801DBA0 ands r0, r1 cmp r0, 0 beq _0801DC00 - ldr r2, _0801DBF8 @ =gUnknown_2023DCC + ldr r2, _0801DBF8 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -550,10 +550,10 @@ atk40_jumpifaffectedbyprotect: @ 801DBA0 b _0801DC08 .align 2, 0 _0801DBE8: .4byte gUnknown_2023E8C -_0801DBEC: .4byte gUnknown_2023D6C -_0801DBF0: .4byte gUnknown_8250C04 -_0801DBF4: .4byte gUnknown_2023D4A -_0801DBF8: .4byte gUnknown_2023DCC +_0801DBEC: .4byte gBattlerTarget +_0801DBF0: .4byte gBattleMoves +_0801DBF4: .4byte gCurrentMove +_0801DBF8: .4byte gMoveResultFlags _0801DBFC: .4byte gUnknown_2023E82 _0801DC00: ldr r1, _0801DC0C @ =gUnknown_2023D74 @@ -574,7 +574,7 @@ JumpIfMoveAffectedByProtect: @ 801DC10 lsrs r3, r0, 16 movs r4, 0 ldr r1, _0801DC64 @ =gUnknown_2023E8C - ldr r0, _0801DC68 @ =gUnknown_2023D6C + ldr r0, _0801DC68 @ =gBattlerTarget ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -582,8 +582,8 @@ JumpIfMoveAffectedByProtect: @ 801DC10 lsls r0, 31 cmp r0, 0 beq _0801DC5C - ldr r2, _0801DC6C @ =gUnknown_8250C04 - ldr r0, _0801DC70 @ =gUnknown_2023D4A + ldr r2, _0801DC6C @ =gBattleMoves + ldr r0, _0801DC70 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -594,7 +594,7 @@ JumpIfMoveAffectedByProtect: @ 801DC10 ands r0, r1 cmp r0, 0 beq _0801DC5C - ldr r2, _0801DC74 @ =gUnknown_2023DCC + ldr r2, _0801DC74 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -613,10 +613,10 @@ _0801DC5C: bx r1 .align 2, 0 _0801DC64: .4byte gUnknown_2023E8C -_0801DC68: .4byte gUnknown_2023D6C -_0801DC6C: .4byte gUnknown_8250C04 -_0801DC70: .4byte gUnknown_2023D4A -_0801DC74: .4byte gUnknown_2023DCC +_0801DC68: .4byte gBattlerTarget +_0801DC6C: .4byte gBattleMoves +_0801DC70: .4byte gCurrentMove +_0801DC74: .4byte gMoveResultFlags _0801DC78: .4byte gUnknown_2023E82 thumb_func_end JumpIfMoveAffectedByProtect @@ -626,8 +626,8 @@ AccuracyCalcHelper: @ 801DC7C sub sp, 0x4 lsls r0, 16 lsrs r5, r0, 16 - ldr r2, _0801DCDC @ =gUnknown_2023DFC - ldr r3, _0801DCE0 @ =gUnknown_2023D6C + ldr r2, _0801DCDC @ =gStatuses3 + ldr r3, _0801DCE0 @ =gBattlerTarget ldrb r4, [r3] lsls r0, r4, 2 adds r0, r2 @@ -637,12 +637,12 @@ AccuracyCalcHelper: @ 801DC7C adds r6, r2, 0 cmp r1, 0 beq _0801DCAE - ldr r1, _0801DCE4 @ =gUnknown_2023E0C + ldr r1, _0801DCE4 @ =gDisableStructs lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r1 - ldr r1, _0801DCE8 @ =gUnknown_2023D6B + ldr r1, _0801DCE8 @ =sBattler_AI ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 @@ -665,19 +665,19 @@ _0801DCAE: cmp r0, 0 beq _0801DCF4 _0801DCCE: - ldr r0, _0801DCF0 @ =gUnknown_2023DCC + ldr r0, _0801DCF0 @ =gMoveResultFlags ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] b _0801DD98 .align 2, 0 -_0801DCDC: .4byte gUnknown_2023DFC -_0801DCE0: .4byte gUnknown_2023D6C -_0801DCE4: .4byte gUnknown_2023E0C -_0801DCE8: .4byte gUnknown_2023D6B +_0801DCDC: .4byte gStatuses3 +_0801DCE0: .4byte gBattlerTarget +_0801DCE4: .4byte gDisableStructs +_0801DCE8: .4byte sBattler_AI _0801DCEC: .4byte gUnknown_2023DD0 -_0801DCF0: .4byte gUnknown_2023DCC +_0801DCF0: .4byte gMoveResultFlags _0801DCF4: ldr r0, [r2] ldr r1, _0801DDA4 @ =0xfffeffff @@ -739,13 +739,13 @@ _0801DD36: lsls r0, 24 cmp r0, 0 bne _0801DD86 - ldr r0, _0801DDB0 @ =gUnknown_2023F1C + ldr r0, _0801DDB0 @ =gBattleWeather ldrh r1, [r0] movs r0, 0x7 ands r0, r1 cmp r0, 0 beq _0801DD86 - ldr r0, _0801DDB4 @ =gUnknown_8250C04 + ldr r0, _0801DDB4 @ =gBattleMoves adds r1, r4, r5 lsls r1, 2 adds r1, r0 @@ -753,7 +753,7 @@ _0801DD36: cmp r0, 0x98 beq _0801DD98 _0801DD86: - ldr r1, _0801DDB4 @ =gUnknown_8250C04 + ldr r1, _0801DDB4 @ =gBattleMoves adds r0, r4, r5 lsls r0, 2 adds r0, r1 @@ -772,8 +772,8 @@ _0801DD98: _0801DDA4: .4byte 0xfffeffff _0801DDA8: .4byte 0xfffdffff _0801DDAC: .4byte 0xfffbffff -_0801DDB0: .4byte gUnknown_2023F1C -_0801DDB4: .4byte gUnknown_8250C04 +_0801DDB0: .4byte gBattleWeather +_0801DDB4: .4byte gBattleMoves _0801DDB8: movs r0, 0 _0801DDBA: @@ -797,7 +797,7 @@ sub_801DDC4: @ 801DDC4 ldrb r0, [r0, 0x6] lsls r0, 8 orrs r6, r0 - ldr r0, _0801DE64 @ =gUnknown_2022B4C + ldr r0, _0801DE64 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -808,7 +808,7 @@ sub_801DDC4: @ 801DDC4 lsls r0, 24 cmp r0, 0 bne _0801DE12 - ldr r0, _0801DE68 @ =gUnknown_8250C04 + ldr r0, _0801DE68 @ =gBattleMoves lsls r1, r6, 1 adds r1, r6 lsls r1, 2 @@ -816,14 +816,14 @@ sub_801DDC4: @ 801DDC4 ldrb r0, [r1, 0x1] cmp r0, 0 beq _0801DE12 - ldr r0, _0801DE6C @ =gUnknown_2023D6B + ldr r0, _0801DE6C @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0801DE56 _0801DE12: - ldr r0, _0801DE64 @ =gUnknown_2022B4C + ldr r0, _0801DE64 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -834,7 +834,7 @@ _0801DE12: lsls r0, 24 cmp r0, 0 bne _0801DE48 - ldr r0, _0801DE68 @ =gUnknown_8250C04 + ldr r0, _0801DE68 @ =gBattleMoves lsls r1, r6, 1 adds r1, r6 lsls r1, 2 @@ -842,14 +842,14 @@ _0801DE12: ldrb r0, [r1, 0x1] cmp r0, 0 bne _0801DE48 - ldr r0, _0801DE6C @ =gUnknown_2023D6B + ldr r0, _0801DE6C @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0801DE56 _0801DE48: - ldr r0, _0801DE64 @ =gUnknown_2022B4C + ldr r0, _0801DE64 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 9 @@ -863,17 +863,17 @@ _0801DE56: b _0801E1C2 .align 2, 0 _0801DE60: .4byte gUnknown_2023D74 -_0801DE64: .4byte gUnknown_2022B4C -_0801DE68: .4byte gUnknown_8250C04 -_0801DE6C: .4byte gUnknown_2023D6B +_0801DE64: .4byte gBattleTypeFlags +_0801DE68: .4byte gBattleMoves +_0801DE6C: .4byte sBattler_AI _0801DE70: adds r0, r6, 0x2 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 bhi _0801DF0C - ldr r2, _0801DED4 @ =gUnknown_2023DFC - ldr r3, _0801DED8 @ =gUnknown_2023D6C + ldr r2, _0801DED4 @ =gStatuses3 + ldr r3, _0801DED8 @ =gBattlerTarget ldrb r4, [r3] lsls r0, r4, 2 adds r0, r2 @@ -885,12 +885,12 @@ _0801DE70: ldr r0, _0801DEDC @ =0x0000ffff cmp r6, r0 bne _0801DEA8 - ldr r1, _0801DEE0 @ =gUnknown_2023E0C + ldr r1, _0801DEE0 @ =gDisableStructs lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r1 - ldr r1, _0801DEE4 @ =gUnknown_2023D6B + ldr r1, _0801DEE4 @ =sBattler_AI ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 @@ -919,11 +919,11 @@ _0801DEA8: str r1, [r3] b _0801E1C2 .align 2, 0 -_0801DED4: .4byte gUnknown_2023DFC -_0801DED8: .4byte gUnknown_2023D6C +_0801DED4: .4byte gStatuses3 +_0801DED8: .4byte gBattlerTarget _0801DEDC: .4byte 0x0000ffff -_0801DEE0: .4byte gUnknown_2023E0C -_0801DEE4: .4byte gUnknown_2023D6B +_0801DEE0: .4byte gDisableStructs +_0801DEE4: .4byte sBattler_AI _0801DEE8: .4byte 0x000400c0 _0801DEEC: .4byte gUnknown_2023D74 _0801DEF0: @@ -944,10 +944,10 @@ _0801DF08: .4byte gUnknown_2023D74 _0801DF0C: cmp r6, 0 bne _0801DF14 - ldr r0, _0801DF2C @ =gUnknown_2023D4A + ldr r0, _0801DF2C @ =gCurrentMove ldrh r6, [r0] _0801DF14: - ldr r0, _0801DF30 @ =gUnknown_2023FE8 + ldr r0, _0801DF30 @ =gBattleStruct ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -959,10 +959,10 @@ _0801DF14: mov r10, r2 b _0801DF42 .align 2, 0 -_0801DF2C: .4byte gUnknown_2023D4A -_0801DF30: .4byte gUnknown_2023FE8 +_0801DF2C: .4byte gCurrentMove +_0801DF30: .4byte gBattleStruct _0801DF34: - ldr r1, _0801DF88 @ =gUnknown_8250C04 + ldr r1, _0801DF88 @ =gBattleMoves lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -984,8 +984,8 @@ _0801DF50: beq _0801DF5E b _0801E1C2 _0801DF5E: - ldr r3, _0801DF8C @ =gUnknown_2023BE4 - ldr r0, _0801DF90 @ =gUnknown_2023D6C + ldr r3, _0801DF8C @ =gBattleMons + ldr r0, _0801DF90 @ =gBattlerTarget ldrb r0, [r0] movs r2, 0x58 adds r4, r0, 0 @@ -999,19 +999,19 @@ _0801DF5E: ands r0, r1 cmp r0, 0 beq _0801DF98 - ldr r0, _0801DF94 @ =gUnknown_2023D6B + ldr r0, _0801DF94 @ =sBattler_AI ldrb r0, [r0] muls r0, r2 adds r0, r3 ldrb r5, [r0, 0x1E] b _0801DFAE .align 2, 0 -_0801DF88: .4byte gUnknown_8250C04 -_0801DF8C: .4byte gUnknown_2023BE4 -_0801DF90: .4byte gUnknown_2023D6C -_0801DF94: .4byte gUnknown_2023D6B +_0801DF88: .4byte gBattleMoves +_0801DF8C: .4byte gBattleMons +_0801DF90: .4byte gBattlerTarget +_0801DF94: .4byte sBattler_AI _0801DF98: - ldr r0, _0801E0FC @ =gUnknown_2023D6B + ldr r0, _0801E0FC @ =sBattler_AI ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -1034,7 +1034,7 @@ _0801DFB6: ble _0801DFC0 movs r5, 0xC _0801DFC0: - ldr r1, _0801E100 @ =gUnknown_8250C04 + ldr r1, _0801E100 @ =gBattleMoves lsls r4, r6, 1 adds r0, r4, r6 lsls r0, 2 @@ -1062,7 +1062,7 @@ _0801DFC0: lsls r0, 24 cmp r0, 0 bne _0801E012 - ldr r0, _0801E104 @ =gUnknown_2023F1C + ldr r0, _0801E104 @ =gBattleWeather ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -1086,8 +1086,8 @@ _0801E012: bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 - ldr r7, _0801E10C @ =gUnknown_2023BE4 - ldr r0, _0801E0FC @ =gUnknown_2023D6B + ldr r7, _0801E10C @ =gBattleMons + ldr r0, _0801E0FC @ =sBattler_AI ldrb r0, [r0] movs r5, 0x58 muls r0, r5 @@ -1124,7 +1124,7 @@ _0801E050: lsls r0, 24 cmp r0, 0 bne _0801E0A8 - ldr r0, _0801E110 @ =gUnknown_2023D6C + ldr r0, _0801E110 @ =gBattlerTarget ldrb r0, [r0] muls r0, r5 adds r0, r7 @@ -1132,7 +1132,7 @@ _0801E050: ldrb r0, [r0] cmp r0, 0x8 bne _0801E0A8 - ldr r0, _0801E104 @ =gUnknown_2023F1C + ldr r0, _0801E104 @ =gBattleWeather ldrh r1, [r0] movs r0, 0x18 ands r0, r1 @@ -1146,8 +1146,8 @@ _0801E050: lsls r0, 16 lsrs r4, r0, 16 _0801E0A8: - ldr r2, _0801E10C @ =gUnknown_2023BE4 - ldr r0, _0801E0FC @ =gUnknown_2023D6B + ldr r2, _0801E10C @ =gBattleMons + ldr r0, _0801E0FC @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -1168,7 +1168,7 @@ _0801E0A8: lsls r0, 16 lsrs r4, r0, 16 _0801E0D4: - ldr r2, _0801E110 @ =gUnknown_2023D6C + ldr r2, _0801E110 @ =gBattlerTarget mov r8, r2 ldrb r2, [r2] movs r7, 0x58 @@ -1188,12 +1188,12 @@ _0801E0D4: ldrb r2, [r0, 0x1A] b _0801E134 .align 2, 0 -_0801E0FC: .4byte gUnknown_2023D6B -_0801E100: .4byte gUnknown_8250C04 -_0801E104: .4byte gUnknown_2023F1C +_0801E0FC: .4byte sBattler_AI +_0801E100: .4byte gBattleMoves +_0801E104: .4byte gBattleWeather _0801E108: .4byte gUnknown_82504FC -_0801E10C: .4byte gUnknown_2023BE4 -_0801E110: .4byte gUnknown_2023D6C +_0801E10C: .4byte gBattleMons +_0801E110: .4byte gBattlerTarget _0801E114: .4byte gUnknown_2023F54 _0801E118: ldrh r0, [r1, 0x2E] @@ -1210,7 +1210,7 @@ _0801E118: lsrs r2, r0, 24 _0801E134: ldr r0, _0801E198 @ =gUnknown_2023D6F - ldr r1, _0801E19C @ =gUnknown_2023D6C + ldr r1, _0801E19C @ =gBattlerTarget ldrb r1, [r1] strb r1, [r0] cmp r5, 0x16 @@ -1233,18 +1233,18 @@ _0801E150: adds r0, 0x1 cmp r0, r4 ble _0801E1BA - ldr r2, _0801E1A0 @ =gUnknown_2023DCC + ldr r2, _0801E1A0 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, _0801E1A4 @ =gUnknown_2022B4C + ldr r0, _0801E1A4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0801E1B0 - ldr r1, _0801E1A8 @ =gUnknown_8250C04 + ldr r1, _0801E1A8 @ =gBattleMoves ldr r2, [sp, 0x4] adds r0, r2, r6 lsls r0, 2 @@ -1260,10 +1260,10 @@ _0801E192: b _0801E1B4 .align 2, 0 _0801E198: .4byte gUnknown_2023D6F -_0801E19C: .4byte gUnknown_2023D6C -_0801E1A0: .4byte gUnknown_2023DCC -_0801E1A4: .4byte gUnknown_2022B4C -_0801E1A8: .4byte gUnknown_8250C04 +_0801E19C: .4byte gBattlerTarget +_0801E1A0: .4byte gMoveResultFlags +_0801E1A4: .4byte gBattleTypeFlags +_0801E1A8: .4byte gBattleMoves _0801E1AC: .4byte gUnknown_2023E82 _0801E1B0: ldr r1, _0801E1D4 @ =gUnknown_2023E82 @@ -1302,7 +1302,7 @@ atk02_attackstring: @ 801E1D8 ands r0, r1 cmp r0, 0 bne _0801E204 - ldr r0, _0801E220 @ =gUnknown_2023D6B + ldr r0, _0801E220 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x4 bl PrepareStringBattle @@ -1325,7 +1325,7 @@ _0801E210: .align 2, 0 _0801E218: .4byte gUnknown_2023BC8 _0801E21C: .4byte gUnknown_2023DD0 -_0801E220: .4byte gUnknown_2023D6B +_0801E220: .4byte sBattler_AI _0801E224: .4byte gUnknown_2023D74 _0801E228: .4byte gUnknown_2023E82 thumb_func_end atk02_attackstring @@ -1346,7 +1346,7 @@ atk03_ppreduce: @ 801E22C b _0801E3DE _0801E244: ldr r1, _0801E280 @ =gUnknown_2023ECC - ldr r2, _0801E284 @ =gUnknown_2023D6B + ldr r2, _0801E284 @ =sBattler_AI ldrb r3, [r2] lsls r0, r3, 2 adds r0, r3 @@ -1358,8 +1358,8 @@ _0801E244: mov r9, r2 cmp r4, 0 bne _0801E2E6 - ldr r2, _0801E288 @ =gUnknown_8250C04 - ldr r0, _0801E28C @ =gUnknown_2023D4A + ldr r2, _0801E288 @ =gBattleMoves + ldr r0, _0801E28C @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1376,9 +1376,9 @@ _0801E244: .align 2, 0 _0801E27C: .4byte gUnknown_2023BC8 _0801E280: .4byte gUnknown_2023ECC -_0801E284: .4byte gUnknown_2023D6B -_0801E288: .4byte gUnknown_8250C04 -_0801E28C: .4byte gUnknown_2023D4A +_0801E284: .4byte sBattler_AI +_0801E288: .4byte gBattleMoves +_0801E28C: .4byte gCurrentMove _0801E290: cmp r0, 0x40 beq _0801E2AC @@ -1408,13 +1408,13 @@ _0801E2AC: adds r6, r0 b _0801E2E6 _0801E2C6: - ldr r1, _0801E348 @ =gUnknown_2023D6C + ldr r1, _0801E348 @ =gBattlerTarget mov r2, r9 ldrb r0, [r2] ldrb r7, [r1] cmp r0, r7 beq _0801E2E6 - ldr r2, _0801E34C @ =gUnknown_2023BE4 + ldr r2, _0801E34C @ =gBattleMons ldrb r1, [r1] movs r0, 0x58 muls r0, r1 @@ -1432,9 +1432,9 @@ _0801E2E6: ands r4, r0 cmp r4, 0 bne _0801E3CC - ldr r2, _0801E34C @ =gUnknown_2023BE4 + ldr r2, _0801E34C @ =gBattleMons ldr r3, _0801E354 @ =gUnknown_2023D48 - ldr r1, _0801E358 @ =gUnknown_2023D6B + ldr r1, _0801E358 @ =sBattler_AI ldrb r5, [r1] movs r0, 0x58 mov r8, r0 @@ -1475,11 +1475,11 @@ _0801E2E6: strb r0, [r2] b _0801E362 .align 2, 0 -_0801E348: .4byte gUnknown_2023D6C -_0801E34C: .4byte gUnknown_2023BE4 +_0801E348: .4byte gBattlerTarget +_0801E34C: .4byte gBattleMons _0801E350: .4byte gUnknown_2023DD0 _0801E354: .4byte gUnknown_2023D48 -_0801E358: .4byte gUnknown_2023D6B +_0801E358: .4byte sBattler_AI _0801E35C: .4byte gUnknown_2023E8C _0801E360: strb r4, [r2] @@ -1498,14 +1498,14 @@ _0801E362: ands r0, r1 cmp r0, 0 bne _0801E3CC - ldr r1, _0801E3F0 @ =gUnknown_2023E0C + ldr r1, _0801E3F0 @ =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0801E3F4 @ =gUnknown_825E45C + ldr r2, _0801E3F4 @ =gBitTable ldrb r0, [r7] lsls r0, 2 adds r0, r2 @@ -1513,7 +1513,7 @@ _0801E362: ands r1, r0 cmp r1, 0 bne _0801E3CC - ldr r0, _0801E3F8 @ =gUnknown_2023BC4 + ldr r0, _0801E3F8 @ =gActiveBattler strb r3, [r0] ldrb r1, [r7] adds r1, 0x9 @@ -1555,9 +1555,9 @@ _0801E3DE: pop {r0} bx r0 .align 2, 0 -_0801E3F0: .4byte gUnknown_2023E0C -_0801E3F4: .4byte gUnknown_825E45C -_0801E3F8: .4byte gUnknown_2023BC4 +_0801E3F0: .4byte gDisableStructs +_0801E3F4: .4byte gBitTable +_0801E3F8: .4byte gActiveBattler _0801E3FC: .4byte gUnknown_2023DD0 _0801E400: .4byte 0xfffff7ff _0801E404: .4byte gUnknown_2023D74 @@ -1566,8 +1566,8 @@ _0801E404: .4byte gUnknown_2023D74 thumb_func_start sub_801E408 sub_801E408: @ 801E408 push {r4-r7,lr} - ldr r1, _0801E42C @ =gUnknown_2023BE4 - ldr r0, _0801E430 @ =gUnknown_2023D6B + ldr r1, _0801E42C @ =gBattleMons + ldr r0, _0801E430 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -1583,8 +1583,8 @@ sub_801E408: @ 801E408 ldrb r6, [r0, 0x7] b _0801E440 .align 2, 0 -_0801E42C: .4byte gUnknown_2023BE4 -_0801E430: .4byte gUnknown_2023D6B +_0801E42C: .4byte gBattleMons +_0801E430: .4byte sBattler_AI _0801E434: .4byte gUnknown_2023F54 _0801E438: bl ItemId_GetHoldEffect @@ -1592,10 +1592,10 @@ _0801E438: lsrs r6, r0, 24 _0801E440: ldr r1, _0801E4CC @ =gUnknown_2023D6F - ldr r3, _0801E4D0 @ =gUnknown_2023D6B + ldr r3, _0801E4D0 @ =sBattler_AI ldrb r0, [r3] strb r0, [r1] - ldr r4, _0801E4D4 @ =gUnknown_2023BE4 + ldr r4, _0801E4D4 @ =gBattleMons ldrb r1, [r3] movs r0, 0x58 adds r7, r1, 0 @@ -1611,8 +1611,8 @@ _0801E440: asrs r5, r0, 31 movs r0, 0x2 ands r5, r0 - ldr r2, _0801E4D8 @ =gUnknown_8250C04 - ldr r0, _0801E4DC @ =gUnknown_2023D4A + ldr r2, _0801E4D8 @ =gBattleMoves + ldr r0, _0801E4DC @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1669,10 +1669,10 @@ _0801E4C0: b _0801E4E2 .align 2, 0 _0801E4CC: .4byte gUnknown_2023D6F -_0801E4D0: .4byte gUnknown_2023D6B -_0801E4D4: .4byte gUnknown_2023BE4 -_0801E4D8: .4byte gUnknown_8250C04 -_0801E4DC: .4byte gUnknown_2023D4A +_0801E4D0: .4byte sBattler_AI +_0801E4D4: .4byte gBattleMons +_0801E4D8: .4byte gBattleMoves +_0801E4DC: .4byte gCurrentMove _0801E4E0: adds r0, r2, r5 _0801E4E2: @@ -1684,7 +1684,7 @@ _0801E4E2: bls _0801E4F0 movs r5, 0x4 _0801E4F0: - ldr r0, _0801E56C @ =gUnknown_2023D6C + ldr r0, _0801E56C @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -1695,7 +1695,7 @@ _0801E4F0: beq _0801E580 cmp r4, 0x4B beq _0801E580 - ldr r1, _0801E570 @ =gUnknown_2023DFC + ldr r1, _0801E570 @ =gStatuses3 mov r2, r12 ldrb r0, [r2] lsls r0, 2 @@ -1706,7 +1706,7 @@ _0801E4F0: ands r0, r1 cmp r0, 0 bne _0801E580 - ldr r4, _0801E574 @ =gUnknown_2022B4C + ldr r4, _0801E574 @ =gBattleTypeFlags ldr r0, [r4] movs r1, 0x80 lsls r1, 2 @@ -1741,17 +1741,17 @@ _0801E55A: ands r0, r1 cmp r0, 0 bne _0801E580 - ldr r1, _0801E57C @ =gUnknown_2023D71 + ldr r1, _0801E57C @ =gCritMultiplier movs r0, 0x2 b _0801E584 .align 2, 0 -_0801E56C: .4byte gUnknown_2023D6C -_0801E570: .4byte gUnknown_2023DFC -_0801E574: .4byte gUnknown_2022B4C +_0801E56C: .4byte gBattlerTarget +_0801E570: .4byte gStatuses3 +_0801E574: .4byte gBattleTypeFlags _0801E578: .4byte gUnknown_8250530 -_0801E57C: .4byte gUnknown_2023D71 +_0801E57C: .4byte gCritMultiplier _0801E580: - ldr r1, _0801E594 @ =gUnknown_2023D71 + ldr r1, _0801E594 @ =gCritMultiplier movs r0, 0x1 _0801E584: strb r0, [r1] @@ -1763,7 +1763,7 @@ _0801E584: pop {r0} bx r0 .align 2, 0 -_0801E594: .4byte gUnknown_2023D71 +_0801E594: .4byte gCritMultiplier _0801E598: .4byte gUnknown_2023D74 thumb_func_end sub_801E408 @@ -1771,8 +1771,8 @@ _0801E598: .4byte gUnknown_2023D74 atk05_damagecalc: @ 801E59C push {r4-r7,lr} sub sp, 0x10 - ldr r4, _0801E654 @ =gUnknown_2023DDE - ldr r5, _0801E658 @ =gUnknown_2023D6C + ldr r4, _0801E654 @ =gSideAffecting + ldr r5, _0801E658 @ =gBattlerTarget ldrb r0, [r5] bl GetBankIdentity movs r1, 0x1 @@ -1780,21 +1780,21 @@ atk05_damagecalc: @ 801E59C lsls r1, 1 adds r1, r4 ldrh r3, [r1] - ldr r6, _0801E65C @ =gUnknown_2023D6B + ldr r6, _0801E65C @ =sBattler_AI ldrb r0, [r6] movs r4, 0x58 muls r0, r4 - ldr r2, _0801E660 @ =gUnknown_2023BE4 + ldr r2, _0801E660 @ =gBattleMons adds r0, r2 ldrb r1, [r5] muls r1, r4 adds r1, r2 - ldr r7, _0801E664 @ =gUnknown_2023D4A + ldr r7, _0801E664 @ =gCurrentMove ldrh r2, [r7] - ldr r4, _0801E668 @ =gUnknown_2023F50 + ldr r4, _0801E668 @ =gDynamicBasePower ldrh r4, [r4] str r4, [sp] - ldr r4, _0801E66C @ =gUnknown_2023FE8 + ldr r4, _0801E66C @ =gBattleStruct ldr r4, [r4] ldrb r4, [r4, 0x13] str r4, [sp, 0x4] @@ -1803,16 +1803,16 @@ atk05_damagecalc: @ 801E59C ldrb r4, [r5] str r4, [sp, 0xC] bl sub_803ECEC - ldr r4, _0801E670 @ =gUnknown_2023D50 - ldr r1, _0801E674 @ =gUnknown_2023D71 + ldr r4, _0801E670 @ =gBattleMoveDamage + ldr r1, _0801E674 @ =gCritMultiplier ldrb r1, [r1] muls r1, r0 - ldr r0, _0801E678 @ =gUnknown_2023FC4 + ldr r0, _0801E678 @ =gBattleScripting ldrb r0, [r0, 0xE] adds r3, r1, 0 muls r3, r0 str r3, [r4] - ldr r1, _0801E67C @ =gUnknown_2023DFC + ldr r1, _0801E67C @ =gStatuses3 ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -1822,7 +1822,7 @@ atk05_damagecalc: @ 801E59C ands r0, r1 cmp r0, 0 beq _0801E620 - ldr r2, _0801E680 @ =gUnknown_8250C04 + ldr r2, _0801E680 @ =gBattleMoves ldrh r1, [r7] lsls r0, r1, 1 adds r0, r1 @@ -1835,7 +1835,7 @@ atk05_damagecalc: @ 801E59C str r0, [r4] _0801E620: ldr r1, _0801E684 @ =gUnknown_2023E8C - ldr r0, _0801E65C @ =gUnknown_2023D6B + ldr r0, _0801E65C @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -1843,7 +1843,7 @@ _0801E620: lsls r0, 28 cmp r0, 0 bge _0801E642 - ldr r4, _0801E670 @ =gUnknown_2023D50 + ldr r4, _0801E670 @ =gBattleMoveDamage ldr r1, [r4] lsls r0, r1, 4 subs r0, r1 @@ -1860,18 +1860,18 @@ _0801E642: pop {r0} bx r0 .align 2, 0 -_0801E654: .4byte gUnknown_2023DDE -_0801E658: .4byte gUnknown_2023D6C -_0801E65C: .4byte gUnknown_2023D6B -_0801E660: .4byte gUnknown_2023BE4 -_0801E664: .4byte gUnknown_2023D4A -_0801E668: .4byte gUnknown_2023F50 -_0801E66C: .4byte gUnknown_2023FE8 -_0801E670: .4byte gUnknown_2023D50 -_0801E674: .4byte gUnknown_2023D71 -_0801E678: .4byte gUnknown_2023FC4 -_0801E67C: .4byte gUnknown_2023DFC -_0801E680: .4byte gUnknown_8250C04 +_0801E654: .4byte gSideAffecting +_0801E658: .4byte gBattlerTarget +_0801E65C: .4byte sBattler_AI +_0801E660: .4byte gBattleMons +_0801E664: .4byte gCurrentMove +_0801E668: .4byte gDynamicBasePower +_0801E66C: .4byte gBattleStruct +_0801E670: .4byte gBattleMoveDamage +_0801E674: .4byte gCritMultiplier +_0801E678: .4byte gBattleScripting +_0801E67C: .4byte gStatuses3 +_0801E680: .4byte gBattleMoves _0801E684: .4byte gUnknown_2023E8C _0801E688: .4byte gUnknown_2023D74 thumb_func_end atk05_damagecalc @@ -1887,7 +1887,7 @@ AI_CalcDmg: @ 801E68C lsrs r7, r0, 24 lsls r5, 24 lsrs r5, 24 - ldr r4, _0801E744 @ =gUnknown_2023DDE + ldr r4, _0801E744 @ =gSideAffecting adds r0, r5, 0 bl GetBankIdentity movs r1, 0x1 @@ -1898,35 +1898,35 @@ AI_CalcDmg: @ 801E68C movs r1, 0x58 adds r0, r7, 0 muls r0, r1 - ldr r2, _0801E748 @ =gUnknown_2023BE4 + ldr r2, _0801E748 @ =gBattleMons adds r0, r2 muls r1, r5 adds r1, r2 - ldr r2, _0801E74C @ =gUnknown_2023D4A + ldr r2, _0801E74C @ =gCurrentMove mov r8, r2 ldrh r2, [r2] - ldr r6, _0801E750 @ =gUnknown_2023F50 + ldr r6, _0801E750 @ =gDynamicBasePower ldrh r4, [r6] str r4, [sp] - ldr r4, _0801E754 @ =gUnknown_2023FE8 + ldr r4, _0801E754 @ =gBattleStruct ldr r4, [r4] ldrb r4, [r4, 0x13] str r4, [sp, 0x4] str r7, [sp, 0x8] str r5, [sp, 0xC] bl sub_803ECEC - ldr r4, _0801E758 @ =gUnknown_2023D50 + ldr r4, _0801E758 @ =gBattleMoveDamage movs r1, 0 strh r1, [r6] - ldr r1, _0801E75C @ =gUnknown_2023D71 + ldr r1, _0801E75C @ =gCritMultiplier ldrb r1, [r1] muls r1, r0 - ldr r0, _0801E760 @ =gUnknown_2023FC4 + ldr r0, _0801E760 @ =gBattleScripting ldrb r0, [r0, 0xE] adds r3, r1, 0 muls r3, r0 str r3, [r4] - ldr r1, _0801E764 @ =gUnknown_2023DFC + ldr r1, _0801E764 @ =gStatuses3 lsls r0, r7, 2 adds r0, r1 ldr r0, [r0] @@ -1935,7 +1935,7 @@ AI_CalcDmg: @ 801E68C ands r0, r1 cmp r0, 0 beq _0801E71A - ldr r2, _0801E768 @ =gUnknown_8250C04 + ldr r2, _0801E768 @ =gBattleMoves mov r0, r8 ldrh r1, [r0] lsls r0, r1, 1 @@ -1955,7 +1955,7 @@ _0801E71A: lsls r0, 28 cmp r0, 0 bge _0801E738 - ldr r4, _0801E758 @ =gUnknown_2023D50 + ldr r4, _0801E758 @ =gBattleMoveDamage ldr r1, [r4] lsls r0, r1, 4 subs r0, r1 @@ -1970,16 +1970,16 @@ _0801E738: pop {r0} bx r0 .align 2, 0 -_0801E744: .4byte gUnknown_2023DDE -_0801E748: .4byte gUnknown_2023BE4 -_0801E74C: .4byte gUnknown_2023D4A -_0801E750: .4byte gUnknown_2023F50 -_0801E754: .4byte gUnknown_2023FE8 -_0801E758: .4byte gUnknown_2023D50 -_0801E75C: .4byte gUnknown_2023D71 -_0801E760: .4byte gUnknown_2023FC4 -_0801E764: .4byte gUnknown_2023DFC -_0801E768: .4byte gUnknown_8250C04 +_0801E744: .4byte gSideAffecting +_0801E748: .4byte gBattleMons +_0801E74C: .4byte gCurrentMove +_0801E750: .4byte gDynamicBasePower +_0801E754: .4byte gBattleStruct +_0801E758: .4byte gBattleMoveDamage +_0801E75C: .4byte gCritMultiplier +_0801E760: .4byte gBattleScripting +_0801E764: .4byte gStatuses3 +_0801E768: .4byte gBattleMoves _0801E76C: .4byte gUnknown_2023E8C thumb_func_end AI_CalcDmg @@ -1988,7 +1988,7 @@ ModulateDmgByType: @ 801E770 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _0801E7A0 @ =gUnknown_2023D50 + ldr r5, _0801E7A0 @ =gBattleMoveDamage ldr r0, [r5] muls r0, r4 movs r1, 0xA @@ -2009,13 +2009,13 @@ _0801E790: beq _0801E7AA b _0801E842 .align 2, 0 -_0801E7A0: .4byte gUnknown_2023D50 +_0801E7A0: .4byte gBattleMoveDamage _0801E7A4: cmp r4, 0x14 beq _0801E800 b _0801E842 _0801E7AA: - ldr r2, _0801E7BC @ =gUnknown_2023DCC + ldr r2, _0801E7BC @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x8 orrs r0, r1 @@ -2025,10 +2025,10 @@ _0801E7AA: ands r0, r1 b _0801E840 .align 2, 0 -_0801E7BC: .4byte gUnknown_2023DCC +_0801E7BC: .4byte gMoveResultFlags _0801E7C0: - ldr r2, _0801E7F0 @ =gUnknown_8250C04 - ldr r0, _0801E7F4 @ =gUnknown_2023D4A + ldr r2, _0801E7F0 @ =gBattleMoves + ldr r0, _0801E7F4 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -2037,7 +2037,7 @@ _0801E7C0: ldrb r0, [r0, 0x1] cmp r0, 0 beq _0801E842 - ldr r2, _0801E7F8 @ =gUnknown_2023DCC + ldr r2, _0801E7F8 @ =gMoveResultFlags ldrb r1, [r2] movs r0, 0x29 ands r0, r1 @@ -2051,15 +2051,15 @@ _0801E7C0: ands r0, r1 b _0801E840 .align 2, 0 -_0801E7F0: .4byte gUnknown_8250C04 -_0801E7F4: .4byte gUnknown_2023D4A -_0801E7F8: .4byte gUnknown_2023DCC +_0801E7F0: .4byte gBattleMoves +_0801E7F4: .4byte gCurrentMove +_0801E7F8: .4byte gMoveResultFlags _0801E7FC: movs r0, 0x4 b _0801E83E _0801E800: - ldr r2, _0801E830 @ =gUnknown_8250C04 - ldr r0, _0801E834 @ =gUnknown_2023D4A + ldr r2, _0801E830 @ =gBattleMoves + ldr r0, _0801E834 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -2068,7 +2068,7 @@ _0801E800: ldrb r0, [r0, 0x1] cmp r0, 0 beq _0801E842 - ldr r2, _0801E838 @ =gUnknown_2023DCC + ldr r2, _0801E838 @ =gMoveResultFlags ldrb r1, [r2] movs r0, 0x29 ands r0, r1 @@ -2082,9 +2082,9 @@ _0801E800: ands r0, r1 b _0801E840 .align 2, 0 -_0801E830: .4byte gUnknown_8250C04 -_0801E834: .4byte gUnknown_2023D4A -_0801E838: .4byte gUnknown_2023DCC +_0801E830: .4byte gBattleMoves +_0801E834: .4byte gCurrentMove +_0801E838: .4byte gMoveResultFlags _0801E83C: movs r0, 0x2 _0801E83E: @@ -2104,13 +2104,13 @@ atk06_typecalc: @ 801E848 push {r7} sub sp, 0x8 movs r3, 0 - ldr r1, _0801E870 @ =gUnknown_2023D4A + ldr r1, _0801E870 @ =gCurrentMove ldrh r0, [r1] cmp r0, 0xA5 bne _0801E85C b _0801EA70 _0801E85C: - ldr r0, _0801E874 @ =gUnknown_2023FE8 + ldr r0, _0801E874 @ =gBattleStruct ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -2121,10 +2121,10 @@ _0801E85C: mov r8, r1 b _0801E888 .align 2, 0 -_0801E870: .4byte gUnknown_2023D4A -_0801E874: .4byte gUnknown_2023FE8 +_0801E870: .4byte gCurrentMove +_0801E874: .4byte gBattleStruct _0801E878: - ldr r2, _0801E910 @ =gUnknown_8250C04 + ldr r2, _0801E910 @ =gBattleMoves ldrh r1, [r1] lsls r0, r1, 1 adds r0, r1 @@ -2133,8 +2133,8 @@ _0801E878: ldrb r0, [r0, 0x2] mov r8, r0 _0801E888: - ldr r2, _0801E914 @ =gUnknown_2023BE4 - ldr r0, _0801E918 @ =gUnknown_2023D6B + ldr r2, _0801E914 @ =gBattleMons + ldr r0, _0801E918 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -2151,7 +2151,7 @@ _0801E888: cmp r0, r8 bne _0801E8C0 _0801E8AA: - ldr r4, _0801E91C @ =gUnknown_2023D50 + ldr r4, _0801E91C @ =gBattleMoveDamage ldr r1, [r4] lsls r0, r1, 4 subs r0, r1 @@ -2162,7 +2162,7 @@ _0801E8AA: str r0, [r4] ldr r3, [sp, 0x4] _0801E8C0: - ldr r2, _0801E920 @ =gUnknown_2023D6C + ldr r2, _0801E920 @ =gBattlerTarget ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -2177,7 +2177,7 @@ _0801E8C0: bne _0801E938 ldr r3, _0801E924 @ =gUnknown_2023D6A strb r0, [r3] - ldr r2, _0801E928 @ =gUnknown_2023DCC + ldr r2, _0801E928 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x9 orrs r0, r1 @@ -2201,13 +2201,13 @@ _0801E8C0: bl sub_80C71D0 b _0801E9D4 .align 2, 0 -_0801E910: .4byte gUnknown_8250C04 -_0801E914: .4byte gUnknown_2023BE4 -_0801E918: .4byte gUnknown_2023D6B -_0801E91C: .4byte gUnknown_2023D50 -_0801E920: .4byte gUnknown_2023D6C +_0801E910: .4byte gBattleMoves +_0801E914: .4byte gBattleMons +_0801E918: .4byte sBattler_AI +_0801E91C: .4byte gBattleMoveDamage +_0801E920: .4byte gBattlerTarget _0801E924: .4byte gUnknown_2023D6A -_0801E928: .4byte gUnknown_2023DCC +_0801E928: .4byte gMoveResultFlags _0801E92C: .4byte gUnknown_2023DA0 _0801E930: .4byte gUnknown_2023DA8 _0801E934: .4byte gUnknown_2023E82 @@ -2230,8 +2230,8 @@ _0801E94C: bne _0801E9A8 adds r1, r3, 0x1 adds r1, r5 - ldr r2, _0801EA88 @ =gUnknown_2023BE4 - ldr r7, _0801EA8C @ =gUnknown_2023D6C + ldr r2, _0801EA88 @ =gBattleMons + ldr r7, _0801EA8C @ =gBattlerTarget ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -2270,8 +2270,8 @@ _0801E982: ldr r3, [sp, 0x4] _0801E9A8: adds r3, 0x3 - ldr r5, _0801EA88 @ =gUnknown_2023BE4 - ldr r4, _0801EA8C @ =gUnknown_2023D6C + ldr r5, _0801EA88 @ =gBattleMons + ldr r4, _0801EA8C @ =gBattlerTarget ldr r2, _0801EA84 @ =gUnknown_824F050 _0801E9B0: adds r0, r3, r2 @@ -2294,8 +2294,8 @@ _0801E9B4: cmp r0, 0 beq _0801E948 _0801E9D4: - ldr r2, _0801EA88 @ =gUnknown_2023BE4 - ldr r5, _0801EA8C @ =gUnknown_2023D6C + ldr r2, _0801EA88 @ =gBattleMons + ldr r5, _0801EA8C @ =gBattlerTarget ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -2304,16 +2304,16 @@ _0801E9D4: ldrb r6, [r0] cmp r6, 0x19 bne _0801EA52 - ldr r0, _0801EA90 @ =gUnknown_2023D6B + ldr r0, _0801EA90 @ =sBattler_AI ldrb r0, [r0] - ldr r7, _0801EA94 @ =gUnknown_2023D4A + ldr r7, _0801EA94 @ =gCurrentMove ldrh r1, [r7] bl AttacksThisTurn lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 bne _0801EA52 - ldr r1, _0801EA98 @ =gUnknown_2023DCC + ldr r1, _0801EA98 @ =gMoveResultFlags mov r8, r1 ldrb r4, [r1] ands r0, r4 @@ -2324,7 +2324,7 @@ _0801E9D4: cmp r0, 0x6 bne _0801EA52 _0801EA10: - ldr r2, _0801EA9C @ =gUnknown_8250C04 + ldr r2, _0801EA9C @ =gBattleMoves ldrh r1, [r7] lsls r0, r1, 1 adds r0, r1 @@ -2357,14 +2357,14 @@ _0801EA10: ldrb r1, [r3] bl sub_80C71D0 _0801EA52: - ldr r0, _0801EA98 @ =gUnknown_2023DCC + ldr r0, _0801EA98 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _0801EA70 ldr r2, _0801EAB0 @ =gUnknown_2023E8C - ldr r0, _0801EA90 @ =gUnknown_2023D6B + ldr r0, _0801EA90 @ =sBattler_AI ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -2385,12 +2385,12 @@ _0801EA70: bx r0 .align 2, 0 _0801EA84: .4byte gUnknown_824F050 -_0801EA88: .4byte gUnknown_2023BE4 -_0801EA8C: .4byte gUnknown_2023D6C -_0801EA90: .4byte gUnknown_2023D6B -_0801EA94: .4byte gUnknown_2023D4A -_0801EA98: .4byte gUnknown_2023DCC -_0801EA9C: .4byte gUnknown_8250C04 +_0801EA88: .4byte gBattleMons +_0801EA8C: .4byte gBattlerTarget +_0801EA90: .4byte sBattler_AI +_0801EA94: .4byte gCurrentMove +_0801EA98: .4byte gMoveResultFlags +_0801EA9C: .4byte gBattleMoves _0801EAA0: .4byte gUnknown_2023D6A _0801EAA4: .4byte gUnknown_2023DA0 _0801EAA8: .4byte gUnknown_2023DA8 @@ -2407,14 +2407,14 @@ CheckWonderGuardAndLevitate: @ 801EAB8 push {r6,r7} movs r6, 0 movs r5, 0 - ldr r0, _0801EAF8 @ =gUnknown_2023D4A + ldr r0, _0801EAF8 @ =gCurrentMove ldrh r1, [r0] mov r9, r0 cmp r1, 0xA5 bne _0801EAD0 b _0801ED18 _0801EAD0: - ldr r2, _0801EAFC @ =gUnknown_8250C04 + ldr r2, _0801EAFC @ =gBattleMoves lsls r0, r1, 1 adds r0, r1 lsls r0, 2 @@ -2424,7 +2424,7 @@ _0801EAD0: bne _0801EAE2 b _0801ED18 _0801EAE2: - ldr r0, _0801EB00 @ =gUnknown_2023FE8 + ldr r0, _0801EB00 @ =gBattleStruct ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -2436,15 +2436,15 @@ _0801EAE2: mov r12, r2 b _0801EB08 .align 2, 0 -_0801EAF8: .4byte gUnknown_2023D4A -_0801EAFC: .4byte gUnknown_8250C04 -_0801EB00: .4byte gUnknown_2023FE8 +_0801EAF8: .4byte gCurrentMove +_0801EAFC: .4byte gBattleMoves +_0801EB00: .4byte gBattleStruct _0801EB04: ldrb r1, [r1, 0x2] mov r12, r1 _0801EB08: - ldr r2, _0801EB3C @ =gUnknown_2023BE4 - ldr r3, _0801EB40 @ =gUnknown_2023D6C + ldr r2, _0801EB3C @ =gBattleMons + ldr r3, _0801EB40 @ =gBattlerTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -2468,8 +2468,8 @@ _0801EB08: bl sub_80C71D0 b _0801ED18 .align 2, 0 -_0801EB3C: .4byte gUnknown_2023BE4 -_0801EB40: .4byte gUnknown_2023D6C +_0801EB3C: .4byte gBattleMons +_0801EB40: .4byte gBattlerTarget _0801EB44: .4byte gUnknown_2023D6A _0801EB48: .4byte gUnknown_2023E82 _0801EB4C: @@ -2505,13 +2505,13 @@ _0801EB66: ldrb r0, [r0] cmp r0, 0 bne _0801EBA6 - ldr r2, _0801ED24 @ =gUnknown_2023DCC + ldr r2, _0801ED24 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x8 orrs r0, r1 strb r0, [r2] ldr r1, _0801ED28 @ =gUnknown_2023E8C - ldr r0, _0801ED2C @ =gUnknown_2023D6B + ldr r0, _0801ED2C @ =sBattler_AI ldrb r2, [r0] lsls r2, 4 adds r2, r1 @@ -2541,13 +2541,13 @@ _0801EBA6: ldrb r0, [r0] cmp r0, 0 bne _0801EBEC - ldr r2, _0801ED24 @ =gUnknown_2023DCC + ldr r2, _0801ED24 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x8 orrs r0, r1 strb r0, [r2] ldr r1, _0801ED28 @ =gUnknown_2023E8C - ldr r0, _0801ED2C @ =gUnknown_2023D6B + ldr r0, _0801ED2C @ =sBattler_AI ldrb r2, [r0] lsls r2, 4 adds r2, r1 @@ -2679,7 +2679,7 @@ _0801ECC2: ldrb r4, [r0] cmp r4, 0x19 bne _0801ED18 - ldr r0, _0801ED2C @ =gUnknown_2023D6B + ldr r0, _0801ED2C @ =sBattler_AI ldrb r0, [r0] mov r2, r9 ldrh r1, [r2] @@ -2692,7 +2692,7 @@ _0801ECC2: ands r6, r0 cmp r6, 0x1 beq _0801ED18 - ldr r2, _0801ED30 @ =gUnknown_8250C04 + ldr r2, _0801ED30 @ =gBattleMoves mov r0, r9 ldrh r1, [r0] lsls r0, r1, 1 @@ -2719,10 +2719,10 @@ _0801ED18: pop {r0} bx r0 .align 2, 0 -_0801ED24: .4byte gUnknown_2023DCC +_0801ED24: .4byte gMoveResultFlags _0801ED28: .4byte gUnknown_2023E8C -_0801ED2C: .4byte gUnknown_2023D6B -_0801ED30: .4byte gUnknown_8250C04 +_0801ED2C: .4byte sBattler_AI +_0801ED30: .4byte gBattleMoves _0801ED34: .4byte gUnknown_2023D6A _0801ED38: .4byte gUnknown_2023E82 thumb_func_end CheckWonderGuardAndLevitate @@ -2735,7 +2735,7 @@ ModulateDmgByType2: @ 801ED3C lsrs r4, r0, 24 lsls r1, 16 lsrs r5, r1, 16 - ldr r7, _0801ED70 @ =gUnknown_2023D50 + ldr r7, _0801ED70 @ =gBattleMoveDamage ldr r0, [r7] muls r0, r4 movs r1, 0xA @@ -2756,7 +2756,7 @@ _0801ED62: beq _0801ED7A b _0801EDEE .align 2, 0 -_0801ED70: .4byte gUnknown_2023D50 +_0801ED70: .4byte gBattleMoveDamage _0801ED74: cmp r4, 0x14 beq _0801EDBC @@ -2771,7 +2771,7 @@ _0801ED7A: ands r0, r1 b _0801EDEC _0801ED8A: - ldr r0, _0801EDB4 @ =gUnknown_8250C04 + ldr r0, _0801EDB4 @ =gBattleMoves lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -2792,12 +2792,12 @@ _0801ED8A: ands r0, r1 b _0801EDEC .align 2, 0 -_0801EDB4: .4byte gUnknown_8250C04 +_0801EDB4: .4byte gBattleMoves _0801EDB8: movs r0, 0x4 b _0801EDEA _0801EDBC: - ldr r0, _0801EDE4 @ =gUnknown_8250C04 + ldr r0, _0801EDE4 @ =gBattleMoves lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -2818,7 +2818,7 @@ _0801EDBC: ands r0, r1 b _0801EDEC .align 2, 0 -_0801EDE4: .4byte gUnknown_8250C04 +_0801EDE4: .4byte gBattleMoves _0801EDE8: movs r0, 0x2 _0801EDEA: @@ -2859,7 +2859,7 @@ TypeCalc: @ 801EDF4 movs r0, 0 b _0801EFAE _0801EE26: - ldr r1, _0801EE94 @ =gUnknown_8250C04 + ldr r1, _0801EE94 @ =gBattleMoves mov r3, r10 lsls r2, r3, 1 adds r0, r2, r3 @@ -2867,7 +2867,7 @@ _0801EE26: adds r0, r1 ldrb r0, [r0, 0x2] str r0, [sp, 0x8] - ldr r1, _0801EE98 @ =gUnknown_2023BE4 + ldr r1, _0801EE98 @ =gBattleMons movs r0, 0x58 ldr r3, [sp, 0x4] muls r0, r3 @@ -2886,7 +2886,7 @@ _0801EE26: cmp r0, r1 bne _0801EE6C _0801EE5A: - ldr r4, _0801EE9C @ =gUnknown_2023D50 + ldr r4, _0801EE9C @ =gBattleMoveDamage ldr r1, [r4] lsls r0, r1, 4 subs r0, r1 @@ -2915,9 +2915,9 @@ _0801EE6C: strb r0, [r1] b _0801EF50 .align 2, 0 -_0801EE94: .4byte gUnknown_8250C04 -_0801EE98: .4byte gUnknown_2023BE4 -_0801EE9C: .4byte gUnknown_2023D50 +_0801EE94: .4byte gBattleMoves +_0801EE98: .4byte gBattleMons +_0801EE9C: .4byte gBattleMoveDamage _0801EEA0: ldr r1, _0801EEBC @ =gUnknown_824F050 mov r2, r8 @@ -2949,7 +2949,7 @@ _0801EEC6: bne _0801EF20 adds r1, 0x1 adds r1, r7 - ldr r2, _0801EFC4 @ =gUnknown_2023BE4 + ldr r2, _0801EFC4 @ =gBattleMons movs r0, 0x58 mov r3, r9 muls r3, r0 @@ -2987,7 +2987,7 @@ _0801EF00: _0801EF20: movs r1, 0x3 add r8, r1 - ldr r5, _0801EFC4 @ =gUnknown_2023BE4 + ldr r5, _0801EFC4 @ =gBattleMons ldr r2, _0801EFC0 @ =gUnknown_824F050 _0801EF28: mov r3, r8 @@ -3045,7 +3045,7 @@ _0801EF50: cmp r0, 0x6 bne _0801EFAA _0801EF92: - ldr r0, _0801EFC8 @ =gUnknown_8250C04 + ldr r0, _0801EFC8 @ =gBattleMoves ldr r1, [sp, 0xC] add r1, r10 lsls r1, 2 @@ -3071,8 +3071,8 @@ _0801EFAE: bx r1 .align 2, 0 _0801EFC0: .4byte gUnknown_824F050 -_0801EFC4: .4byte gUnknown_2023BE4 -_0801EFC8: .4byte gUnknown_8250C04 +_0801EFC4: .4byte gBattleMons +_0801EFC8: .4byte gBattleMoves thumb_func_end TypeCalc thumb_func_start AI_TypeCalc @@ -3093,7 +3093,7 @@ AI_TypeCalc: @ 801EFCC movs r7, 0 mov r0, sp strb r7, [r0] - ldr r2, _0801F008 @ =gUnknown_8254784 + ldr r2, _0801F008 @ =gBaseStats lsls r0, r1, 3 subs r0, r1 lsls r0, 2 @@ -3107,9 +3107,9 @@ AI_TypeCalc: @ 801EFCC movs r0, 0 b _0801F0B0 .align 2, 0 -_0801F008: .4byte gUnknown_8254784 +_0801F008: .4byte gBaseStats _0801F00C: - ldr r2, _0801F030 @ =gUnknown_8250C04 + ldr r2, _0801F030 @ =gBattleMoves lsls r1, r6, 1 adds r0, r1, r6 lsls r0, 2 @@ -3127,7 +3127,7 @@ _0801F00C: strb r1, [r0] b _0801F07A .align 2, 0 -_0801F030: .4byte gUnknown_8250C04 +_0801F030: .4byte gBattleMoves _0801F034: ldr r0, _0801F0C0 @ =gUnknown_824F050 adds r1, r7, r0 @@ -3180,7 +3180,7 @@ _0801F07A: cmp r0, 0x6 bne _0801F0AC _0801F094: - ldr r0, _0801F0C4 @ =gUnknown_8250C04 + ldr r0, _0801F0C4 @ =gBattleMoves ldr r3, [sp, 0x8] adds r1, r3, r6 lsls r1, 2 @@ -3206,7 +3206,7 @@ _0801F0B0: bx r1 .align 2, 0 _0801F0C0: .4byte gUnknown_824F050 -_0801F0C4: .4byte gUnknown_8250C04 +_0801F0C4: .4byte gBattleMoves thumb_func_end AI_TypeCalc thumb_func_start Unused_ApplyRandomDmgMultiplier @@ -3221,7 +3221,7 @@ Unused_ApplyRandomDmgMultiplier: @ 801F0C8 subs r1, r0 lsls r1, 16 lsrs r1, 16 - ldr r4, _0801F100 @ =gUnknown_2023D50 + ldr r4, _0801F100 @ =gBattleMoveDamage ldr r0, [r4] cmp r0, 0 beq _0801F0FA @@ -3239,7 +3239,7 @@ _0801F0FA: pop {r0} bx r0 .align 2, 0 -_0801F100: .4byte gUnknown_2023D50 +_0801F100: .4byte gBattleMoveDamage thumb_func_end Unused_ApplyRandomDmgMultiplier thumb_func_start atk07_adjustnormaldamage @@ -3254,7 +3254,7 @@ atk07_adjustnormaldamage: @ 801F104 subs r1, r0 lsls r1, 16 lsrs r1, 16 - ldr r4, _0801F15C @ =gUnknown_2023D50 + ldr r4, _0801F15C @ =gBattleMoveDamage ldr r0, [r4] cmp r0, 0 beq _0801F136 @@ -3268,8 +3268,8 @@ atk07_adjustnormaldamage: @ 801F104 movs r0, 0x1 str r0, [r4] _0801F136: - ldr r7, _0801F160 @ =gUnknown_2023BE4 - ldr r6, _0801F164 @ =gUnknown_2023D6C + ldr r7, _0801F160 @ =gBattleMons + ldr r6, _0801F164 @ =gBattlerTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -3287,9 +3287,9 @@ _0801F136: ldrb r6, [r0, 0x1A] b _0801F186 .align 2, 0 -_0801F15C: .4byte gUnknown_2023D50 -_0801F160: .4byte gUnknown_2023BE4 -_0801F164: .4byte gUnknown_2023D6C +_0801F15C: .4byte gBattleMoveDamage +_0801F160: .4byte gBattleMons +_0801F164: .4byte gBattlerTarget _0801F168: .4byte gUnknown_2023F54 _0801F16C: ldrh r0, [r1, 0x2E] @@ -3305,7 +3305,7 @@ _0801F16C: lsrs r6, r0, 24 _0801F186: ldr r1, _0801F248 @ =gUnknown_2023D6F - ldr r5, _0801F24C @ =gUnknown_2023D6C + ldr r5, _0801F24C @ =gBattlerTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -3333,8 +3333,8 @@ _0801F186: orrs r1, r2 strb r1, [r0] _0801F1C4: - ldr r2, _0801F254 @ =gUnknown_2023BE4 - ldr r3, _0801F24C @ =gUnknown_2023D6C + ldr r2, _0801F254 @ =gBattleMons + ldr r3, _0801F24C @ =gBattlerTarget ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -3348,8 +3348,8 @@ _0801F1C4: adds r5, r2, 0 cmp r1, 0 bne _0801F294 - ldr r2, _0801F258 @ =gUnknown_8250C04 - ldr r0, _0801F25C @ =gUnknown_2023D4A + ldr r2, _0801F258 @ =gBattleMoves + ldr r0, _0801F25C @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3380,7 +3380,7 @@ _0801F216: muls r0, r4 adds r0, r5 ldrh r1, [r0, 0x28] - ldr r2, _0801F264 @ =gUnknown_2023D50 + ldr r2, _0801F264 @ =gBattleMoveDamage ldr r0, [r2] cmp r1, r0 bgt _0801F294 @@ -3394,7 +3394,7 @@ _0801F216: lsls r0, 30 cmp r0, 0 bge _0801F26C - ldr r0, _0801F268 @ =gUnknown_2023DCC + ldr r0, _0801F268 @ =gMoveResultFlags ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 @@ -3402,14 +3402,14 @@ _0801F216: b _0801F294 .align 2, 0 _0801F248: .4byte gUnknown_2023D6F -_0801F24C: .4byte gUnknown_2023D6C +_0801F24C: .4byte gBattlerTarget _0801F250: .4byte gUnknown_2023ECC -_0801F254: .4byte gUnknown_2023BE4 -_0801F258: .4byte gUnknown_8250C04 -_0801F25C: .4byte gUnknown_2023D4A +_0801F254: .4byte gBattleMons +_0801F258: .4byte gBattleMoves +_0801F25C: .4byte gCurrentMove _0801F260: .4byte gUnknown_2023E8C -_0801F264: .4byte gUnknown_2023D50 -_0801F268: .4byte gUnknown_2023DCC +_0801F264: .4byte gBattleMoveDamage +_0801F268: .4byte gMoveResultFlags _0801F26C: ldr r0, _0801F2A4 @ =gUnknown_2023ECC lsls r1, r3, 2 @@ -3420,7 +3420,7 @@ _0801F26C: lsrs r0, 7 cmp r0, 0 beq _0801F294 - ldr r2, _0801F2A8 @ =gUnknown_2023DCC + ldr r2, _0801F2A8 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 @@ -3441,7 +3441,7 @@ _0801F294: bx r0 .align 2, 0 _0801F2A4: .4byte gUnknown_2023ECC -_0801F2A8: .4byte gUnknown_2023DCC +_0801F2A8: .4byte gMoveResultFlags _0801F2AC: .4byte gUnknown_2023D68 _0801F2B0: .4byte gUnknown_2023D74 thumb_func_end atk07_adjustnormaldamage @@ -3458,7 +3458,7 @@ atk08_adjustnormaldamage2: @ 801F2B4 subs r1, r0 lsls r1, 16 lsrs r1, 16 - ldr r4, _0801F30C @ =gUnknown_2023D50 + ldr r4, _0801F30C @ =gBattleMoveDamage ldr r0, [r4] cmp r0, 0 beq _0801F2E6 @@ -3472,8 +3472,8 @@ atk08_adjustnormaldamage2: @ 801F2B4 movs r0, 0x1 str r0, [r4] _0801F2E6: - ldr r7, _0801F310 @ =gUnknown_2023BE4 - ldr r6, _0801F314 @ =gUnknown_2023D6C + ldr r7, _0801F310 @ =gBattleMons + ldr r6, _0801F314 @ =gBattlerTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -3491,9 +3491,9 @@ _0801F2E6: ldrb r6, [r0, 0x1A] b _0801F336 .align 2, 0 -_0801F30C: .4byte gUnknown_2023D50 -_0801F310: .4byte gUnknown_2023BE4 -_0801F314: .4byte gUnknown_2023D6C +_0801F30C: .4byte gBattleMoveDamage +_0801F310: .4byte gBattleMons +_0801F314: .4byte gBattlerTarget _0801F318: .4byte gUnknown_2023F54 _0801F31C: ldrh r0, [r1, 0x2E] @@ -3509,7 +3509,7 @@ _0801F31C: lsrs r6, r0, 24 _0801F336: ldr r1, _0801F3DC @ =gUnknown_2023D6F - ldr r5, _0801F3E0 @ =gUnknown_2023D6C + ldr r5, _0801F3E0 @ =gBattlerTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -3537,8 +3537,8 @@ _0801F336: orrs r1, r2 strb r1, [r0] _0801F374: - ldr r4, _0801F3E8 @ =gUnknown_2023BE4 - ldr r6, _0801F3E0 @ =gUnknown_2023D6C + ldr r4, _0801F3E8 @ =gBattleMons + ldr r6, _0801F3E0 @ =gBattlerTarget ldrb r2, [r6] movs r7, 0x58 adds r3, r2, 0 @@ -3571,7 +3571,7 @@ _0801F374: _0801F3B2: adds r0, r3, r4 ldrh r1, [r0, 0x28] - ldr r2, _0801F3F0 @ =gUnknown_2023D50 + ldr r2, _0801F3F0 @ =gBattleMoveDamage ldr r0, [r2] cmp r1, r0 bgt _0801F420 @@ -3584,7 +3584,7 @@ _0801F3B2: lsls r0, 30 cmp r0, 0 bge _0801F3F8 - ldr r0, _0801F3F4 @ =gUnknown_2023DCC + ldr r0, _0801F3F4 @ =gMoveResultFlags ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 @@ -3592,12 +3592,12 @@ _0801F3B2: b _0801F420 .align 2, 0 _0801F3DC: .4byte gUnknown_2023D6F -_0801F3E0: .4byte gUnknown_2023D6C +_0801F3E0: .4byte gBattlerTarget _0801F3E4: .4byte gUnknown_2023ECC -_0801F3E8: .4byte gUnknown_2023BE4 +_0801F3E8: .4byte gBattleMons _0801F3EC: .4byte gUnknown_2023E8C -_0801F3F0: .4byte gUnknown_2023D50 -_0801F3F4: .4byte gUnknown_2023DCC +_0801F3F0: .4byte gBattleMoveDamage +_0801F3F4: .4byte gMoveResultFlags _0801F3F8: ldr r0, _0801F430 @ =gUnknown_2023ECC lsls r1, r3, 2 @@ -3608,7 +3608,7 @@ _0801F3F8: lsrs r0, 7 cmp r0, 0 beq _0801F420 - ldr r2, _0801F434 @ =gUnknown_2023DCC + ldr r2, _0801F434 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 @@ -3629,7 +3629,7 @@ _0801F420: bx r0 .align 2, 0 _0801F430: .4byte gUnknown_2023ECC -_0801F434: .4byte gUnknown_2023DCC +_0801F434: .4byte gMoveResultFlags _0801F438: .4byte gUnknown_2023D68 _0801F43C: .4byte gUnknown_2023D74 thumb_func_end atk08_adjustnormaldamage2 @@ -3650,7 +3650,7 @@ _0801F452: ldr r0, [r0] movs r1, 0x80 ands r0, r1 - ldr r3, _0801F490 @ =gUnknown_2023D4A + ldr r3, _0801F490 @ =gCurrentMove cmp r0, 0 beq _0801F4A0 ldrh r0, [r3] @@ -3664,7 +3664,7 @@ _0801F452: bl BattleScriptPush ldr r0, _0801F498 @ =gUnknown_81D89F1 str r0, [r4] - ldr r1, _0801F49C @ =gUnknown_2023FC4 + ldr r1, _0801F49C @ =gBattleScripting ldrb r0, [r1, 0x18] adds r0, 0x1 strb r0, [r1, 0x18] @@ -3675,12 +3675,12 @@ _0801F452: .align 2, 0 _0801F488: .4byte gUnknown_2023BC8 _0801F48C: .4byte gUnknown_2023DD0 -_0801F490: .4byte gUnknown_2023D4A +_0801F490: .4byte gCurrentMove _0801F494: .4byte gUnknown_2023D74 _0801F498: .4byte gUnknown_81D89F1 -_0801F49C: .4byte gUnknown_2023FC4 +_0801F49C: .4byte gBattleScripting _0801F4A0: - ldr r2, _0801F53C @ =gUnknown_8250C04 + ldr r2, _0801F53C @ =gBattleMoves ldrh r1, [r3] lsls r0, r1, 1 adds r0, r1 @@ -3700,31 +3700,31 @@ _0801F4A0: cmp r0, 0 beq _0801F4CE _0801F4C6: - ldr r0, _0801F540 @ =gUnknown_2023FC4 + ldr r0, _0801F540 @ =gBattleScripting ldrb r0, [r0, 0x19] cmp r0, 0 bne _0801F530 _0801F4CE: - ldr r0, _0801F544 @ =gUnknown_2023DCC + ldr r0, _0801F544 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 bne _0801F564 - ldr r1, _0801F548 @ =gUnknown_2023BC4 - ldr r0, _0801F54C @ =gUnknown_2023D6B + ldr r1, _0801F548 @ =gActiveBattler + ldr r0, _0801F54C @ =sBattler_AI mov r8, r0 ldrb r0, [r0] strb r0, [r1] ldrh r1, [r3] - ldr r6, _0801F540 @ =gUnknown_2023FC4 + ldr r6, _0801F540 @ =gBattleScripting ldrb r2, [r6, 0x18] ldr r0, _0801F550 @ =gUnknown_2024020 ldrh r3, [r0] - ldr r0, _0801F554 @ =gUnknown_2023D50 + ldr r0, _0801F554 @ =gBattleMoveDamage ldr r0, [r0] str r0, [sp] - ldr r5, _0801F558 @ =gUnknown_2023BE4 + ldr r5, _0801F558 @ =gBattleMons mov r0, r8 ldrb r4, [r0] movs r0, 0x58 @@ -3738,7 +3738,7 @@ _0801F4CE: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r4, _0801F55C @ =gUnknown_2023E0C + ldr r4, _0801F55C @ =gDisableStructs adds r0, r4 str r0, [sp, 0x8] movs r0, 0 @@ -3759,15 +3759,15 @@ _0801F530: str r0, [r1] b _0801F572 .align 2, 0 -_0801F53C: .4byte gUnknown_8250C04 -_0801F540: .4byte gUnknown_2023FC4 -_0801F544: .4byte gUnknown_2023DCC -_0801F548: .4byte gUnknown_2023BC4 -_0801F54C: .4byte gUnknown_2023D6B +_0801F53C: .4byte gBattleMoves +_0801F540: .4byte gBattleScripting +_0801F544: .4byte gMoveResultFlags +_0801F548: .4byte gActiveBattler +_0801F54C: .4byte sBattler_AI _0801F550: .4byte gUnknown_2024020 -_0801F554: .4byte gUnknown_2023D50 -_0801F558: .4byte gUnknown_2023BE4 -_0801F55C: .4byte gUnknown_2023E0C +_0801F554: .4byte gBattleMoveDamage +_0801F558: .4byte gBattleMons +_0801F55C: .4byte gDisableStructs _0801F560: .4byte gUnknown_2023D74 _0801F564: ldr r4, _0801F580 @ =gUnknown_2023D74 @@ -3814,7 +3814,7 @@ atk0B_healthbarupdate: @ 801F5A8 ldr r0, [r0] cmp r0, 0 bne _0801F66A - ldr r0, _0801F610 @ =gUnknown_2023DCC + ldr r0, _0801F610 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -3824,9 +3824,9 @@ atk0B_healthbarupdate: @ 801F5A8 ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r2, _0801F618 @ =gUnknown_2023BC4 + ldr r2, _0801F618 @ =gActiveBattler strb r0, [r2] - ldr r1, _0801F61C @ =gUnknown_2023BE4 + ldr r1, _0801F61C @ =gBattleMons ldrb r2, [r2] movs r0, 0x58 muls r0, r2 @@ -3838,7 +3838,7 @@ atk0B_healthbarupdate: @ 801F5A8 ands r0, r1 cmp r0, 0 beq _0801F628 - ldr r0, _0801F620 @ =gUnknown_2023E0C + ldr r0, _0801F620 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -3859,14 +3859,14 @@ atk0B_healthbarupdate: @ 801F5A8 b _0801F662 .align 2, 0 _0801F60C: .4byte gUnknown_2023BC8 -_0801F610: .4byte gUnknown_2023DCC +_0801F610: .4byte gMoveResultFlags _0801F614: .4byte gUnknown_2023D74 -_0801F618: .4byte gUnknown_2023BC4 -_0801F61C: .4byte gUnknown_2023BE4 -_0801F620: .4byte gUnknown_2023E0C +_0801F618: .4byte gActiveBattler +_0801F61C: .4byte gBattleMons +_0801F620: .4byte gDisableStructs _0801F624: .4byte gUnknown_2023DD0 _0801F628: - ldr r0, _0801F670 @ =gUnknown_2023D50 + ldr r0, _0801F670 @ =gBattleMoveDamage ldr r0, [r0] ldr r1, _0801F674 @ =0x00002710 cmp r0, r1 @@ -3876,7 +3876,7 @@ _0801F628: _0801F636: movs r0, 0 bl EmitHealthBarUpdate - ldr r4, _0801F678 @ =gUnknown_2023BC4 + ldr r4, _0801F678 @ =gActiveBattler ldrb r0, [r4] bl MarkBufferBankForExecution ldrb r0, [r4] @@ -3884,11 +3884,11 @@ _0801F636: lsls r0, 24 cmp r0, 0 bne _0801F662 - ldr r0, _0801F670 @ =gUnknown_2023D50 + ldr r0, _0801F670 @ =gBattleMoveDamage ldr r0, [r0] cmp r0, 0 ble _0801F662 - ldr r0, _0801F67C @ =gUnknown_3004F90 + ldr r0, _0801F67C @ =gBattleResults ldrb r1, [r0, 0x5] movs r2, 0x1 orrs r1, r2 @@ -3903,10 +3903,10 @@ _0801F66A: pop {r0} bx r0 .align 2, 0 -_0801F670: .4byte gUnknown_2023D50 +_0801F670: .4byte gBattleMoveDamage _0801F674: .4byte 0x00002710 -_0801F678: .4byte gUnknown_2023BC4 -_0801F67C: .4byte gUnknown_3004F90 +_0801F678: .4byte gActiveBattler +_0801F67C: .4byte gBattleResults _0801F680: .4byte gUnknown_2023D74 thumb_func_end atk0B_healthbarupdate @@ -3920,7 +3920,7 @@ atk0C_datahpupdate: @ 801F684 beq _0801F692 b _0801FA62 _0801F692: - ldr r0, _0801F6B0 @ =gUnknown_2023FE8 + ldr r0, _0801F6B0 @ =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x13] cmp r1, 0 @@ -3934,10 +3934,10 @@ _0801F692: b _0801F6C4 .align 2, 0 _0801F6AC: .4byte gUnknown_2023BC8 -_0801F6B0: .4byte gUnknown_2023FE8 +_0801F6B0: .4byte gBattleStruct _0801F6B4: - ldr r2, _0801F750 @ =gUnknown_8250C04 - ldr r0, _0801F754 @ =gUnknown_2023D4A + ldr r2, _0801F750 @ =gBattleMoves + ldr r0, _0801F754 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3945,7 +3945,7 @@ _0801F6B4: adds r0, r2 ldrb r6, [r0, 0x2] _0801F6C4: - ldr r0, _0801F758 @ =gUnknown_2023DCC + ldr r0, _0801F758 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -3957,9 +3957,9 @@ _0801F6D2: ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r7, _0801F760 @ =gUnknown_2023BC4 + ldr r7, _0801F760 @ =gActiveBattler strb r0, [r7] - ldr r1, _0801F764 @ =gUnknown_2023BE4 + ldr r1, _0801F764 @ =gBattleMons ldrb r2, [r7] movs r0, 0x58 muls r0, r2 @@ -3971,7 +3971,7 @@ _0801F6D2: ands r0, r1 cmp r0, 0 beq _0801F7E8 - ldr r0, _0801F768 @ =gUnknown_2023E0C + ldr r0, _0801F768 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -3988,7 +3988,7 @@ _0801F6D2: cmp r3, 0 bne _0801F7E8 adds r5, r1, 0 - ldr r6, _0801F770 @ =gUnknown_2023D50 + ldr r6, _0801F770 @ =gBattleMoveDamage ldr r4, [r6] cmp r5, r4 blt _0801F77C @@ -4017,15 +4017,15 @@ _0801F736: str r0, [r1] b _0801F7AC .align 2, 0 -_0801F750: .4byte gUnknown_8250C04 -_0801F754: .4byte gUnknown_2023D4A -_0801F758: .4byte gUnknown_2023DCC +_0801F750: .4byte gBattleMoves +_0801F754: .4byte gCurrentMove +_0801F758: .4byte gMoveResultFlags _0801F75C: .4byte gUnknown_2023D74 -_0801F760: .4byte gUnknown_2023BC4 -_0801F764: .4byte gUnknown_2023BE4 -_0801F768: .4byte gUnknown_2023E0C +_0801F760: .4byte gActiveBattler +_0801F764: .4byte gBattleMons +_0801F768: .4byte gDisableStructs _0801F76C: .4byte gUnknown_2023DD0 -_0801F770: .4byte gUnknown_2023D50 +_0801F770: .4byte gBattleMoveDamage _0801F774: .4byte gUnknown_2023ECC _0801F778: .4byte gUnknown_2023D54 _0801F77C: @@ -4055,7 +4055,7 @@ _0801F790: add r0, r12 strb r3, [r0, 0xA] _0801F7AC: - ldr r0, _0801F7DC @ =gUnknown_2023BC4 + ldr r0, _0801F7DC @ =gActiveBattler ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -4077,7 +4077,7 @@ _0801F7C0: .align 2, 0 _0801F7D4: .4byte gUnknown_2023ECC _0801F7D8: .4byte gUnknown_2023D54 -_0801F7DC: .4byte gUnknown_2023BC4 +_0801F7DC: .4byte gActiveBattler _0801F7E0: .4byte gUnknown_2023D74 _0801F7E4: .4byte gUnknown_81D9526 _0801F7E8: @@ -4086,14 +4086,14 @@ _0801F7E8: ldr r1, _0801F82C @ =0xfffffeff ands r2, r1 str r2, [r0] - ldr r1, _0801F830 @ =gUnknown_2023D50 + ldr r1, _0801F830 @ =gBattleMoveDamage ldr r5, [r1] mov r12, r0 adds r7, r1, 0 cmp r5, 0 bge _0801F83C - ldr r4, _0801F834 @ =gUnknown_2023BE4 - ldr r2, _0801F838 @ =gUnknown_2023BC4 + ldr r4, _0801F834 @ =gBattleMons + ldr r2, _0801F838 @ =gActiveBattler ldrb r0, [r2] movs r3, 0x58 adds r1, r0, 0 @@ -4117,9 +4117,9 @@ _0801F824: .align 2, 0 _0801F828: .4byte gUnknown_2023DD0 _0801F82C: .4byte 0xfffffeff -_0801F830: .4byte gUnknown_2023D50 -_0801F834: .4byte gUnknown_2023BE4 -_0801F838: .4byte gUnknown_2023BC4 +_0801F830: .4byte gBattleMoveDamage +_0801F834: .4byte gBattleMons +_0801F838: .4byte gActiveBattler _0801F83C: movs r0, 0x20 ands r0, r2 @@ -4130,13 +4130,13 @@ _0801F83C: ands r2, r0 mov r0, r12 str r2, [r0] - ldr r5, _0801F854 @ =gUnknown_2023BC4 + ldr r5, _0801F854 @ =gActiveBattler b _0801F8A0 .align 2, 0 -_0801F854: .4byte gUnknown_2023BC4 +_0801F854: .4byte gActiveBattler _0801F858: ldr r0, _0801F880 @ =gUnknown_2023D58 - ldr r2, _0801F884 @ =gUnknown_2023BC4 + ldr r2, _0801F884 @ =gActiveBattler ldrb r1, [r2] lsls r1, 2 adds r1, r0 @@ -4152,24 +4152,24 @@ _0801F858: ldr r1, _0801F88C @ =gUnknown_2023DD8 ldrb r0, [r5] adds r0, r1 - ldr r1, _0801F890 @ =gUnknown_2023D6B + ldr r1, _0801F890 @ =sBattler_AI b _0801F89C .align 2, 0 _0801F880: .4byte gUnknown_2023D58 -_0801F884: .4byte gUnknown_2023BC4 +_0801F884: .4byte gActiveBattler _0801F888: .4byte gUnknown_2023D74 _0801F88C: .4byte gUnknown_2023DD8 -_0801F890: .4byte gUnknown_2023D6B +_0801F890: .4byte sBattler_AI _0801F894: ldr r1, _0801F8C0 @ =gUnknown_2023DD8 ldrb r0, [r5] adds r0, r1 - ldr r1, _0801F8C4 @ =gUnknown_2023D6C + ldr r1, _0801F8C4 @ =gBattlerTarget _0801F89C: ldrb r1, [r1] strb r1, [r0] _0801F8A0: - ldr r4, _0801F8C8 @ =gUnknown_2023BE4 + ldr r4, _0801F8C8 @ =gBattleMons ldrb r0, [r5] movs r3, 0x58 muls r0, r3 @@ -4186,8 +4186,8 @@ _0801F8A0: b _0801F8E0 .align 2, 0 _0801F8C0: .4byte gUnknown_2023DD8 -_0801F8C4: .4byte gUnknown_2023D6C -_0801F8C8: .4byte gUnknown_2023BE4 +_0801F8C4: .4byte gBattlerTarget +_0801F8C8: .4byte gBattleMons _0801F8CC: .4byte gUnknown_2023D54 _0801F8D0: ldr r2, _0801F954 @ =gUnknown_2023D54 @@ -4229,7 +4229,7 @@ _0801F908: ands r0, r1 cmp r0, 0 bne _0801F98C - ldr r0, _0801F95C @ =gUnknown_2023D4A + ldr r0, _0801F95C @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xDC beq _0801F98C @@ -4256,20 +4256,20 @@ _0801F908: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _0801F968 @ =gUnknown_2023D6B + ldr r2, _0801F968 @ =sBattler_AI b _0801F974 .align 2, 0 _0801F954: .4byte gUnknown_2023D54 _0801F958: .4byte gUnknown_2023ECC -_0801F95C: .4byte gUnknown_2023D4A +_0801F95C: .4byte gCurrentMove _0801F960: .4byte gUnknown_2023E8C _0801F964: .4byte gUnknown_2023D74 -_0801F968: .4byte gUnknown_2023D6B +_0801F968: .4byte sBattler_AI _0801F96C: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _0801F988 @ =gUnknown_2023D6C + ldr r2, _0801F988 @ =gBattlerTarget _0801F974: ldrb r1, [r2] strb r1, [r0, 0xC] @@ -4282,7 +4282,7 @@ _0801F974: strb r1, [r0, 0x10] b _0801F9FA .align 2, 0 -_0801F988: .4byte gUnknown_2023D6C +_0801F988: .4byte gBattlerTarget _0801F98C: cmp r6, 0x8 bls _0801F9FA @@ -4318,17 +4318,17 @@ _0801F990: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _0801F9DC @ =gUnknown_2023D6B + ldr r2, _0801F9DC @ =sBattler_AI b _0801F9E8 .align 2, 0 _0801F9D4: .4byte gUnknown_2023E8C _0801F9D8: .4byte gUnknown_2023D74 -_0801F9DC: .4byte gUnknown_2023D6B +_0801F9DC: .4byte sBattler_AI _0801F9E0: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _0801FA28 @ =gUnknown_2023D6C + ldr r2, _0801FA28 @ =gBattlerTarget _0801F9E8: ldrb r1, [r2] strb r1, [r0, 0xD] @@ -4361,7 +4361,7 @@ _0801F9FA: bl MarkBufferBankForExecution b _0801FA5A .align 2, 0 -_0801FA28: .4byte gUnknown_2023D6C +_0801FA28: .4byte gBattlerTarget _0801FA2C: .4byte 0xffefffff _0801FA30: .4byte gUnknown_2023C0C _0801FA34: @@ -4369,7 +4369,7 @@ _0801FA34: ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r1, _0801FA70 @ =gUnknown_2023BC4 + ldr r1, _0801FA70 @ =gActiveBattler strb r0, [r1] ldr r2, _0801FA74 @ =gUnknown_2023ECC ldrb r1, [r1] @@ -4395,7 +4395,7 @@ _0801FA62: bx r0 .align 2, 0 _0801FA6C: .4byte gUnknown_2023D74 -_0801FA70: .4byte gUnknown_2023BC4 +_0801FA70: .4byte gActiveBattler _0801FA74: .4byte gUnknown_2023ECC _0801FA78: .4byte 0x0000ffff thumb_func_end atk0C_datahpupdate @@ -4407,17 +4407,17 @@ atk0D_critmessage: @ 801FA7C ldr r0, [r0] cmp r0, 0 bne _0801FAB2 - ldr r0, _0801FABC @ =gUnknown_2023D71 + ldr r0, _0801FABC @ =gCritMultiplier ldrb r0, [r0] cmp r0, 0x2 bne _0801FAAA - ldr r0, _0801FAC0 @ =gUnknown_2023DCC + ldr r0, _0801FAC0 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 bne _0801FAAA - ldr r0, _0801FAC4 @ =gUnknown_2023D6B + ldr r0, _0801FAC4 @ =sBattler_AI ldrb r1, [r0] movs r0, 0xD9 bl PrepareStringBattle @@ -4434,9 +4434,9 @@ _0801FAB2: bx r0 .align 2, 0 _0801FAB8: .4byte gUnknown_2023BC8 -_0801FABC: .4byte gUnknown_2023D71 -_0801FAC0: .4byte gUnknown_2023DCC -_0801FAC4: .4byte gUnknown_2023D6B +_0801FABC: .4byte gCritMultiplier +_0801FAC0: .4byte gMoveResultFlags +_0801FAC4: .4byte sBattler_AI _0801FAC8: .4byte gUnknown_2023E82 _0801FACC: .4byte gUnknown_2023D74 thumb_func_end atk0D_critmessage @@ -4448,11 +4448,11 @@ atk0E_effectivenesssound: @ 801FAD0 ldr r0, [r0] cmp r0, 0 bne _0801FB90 - ldr r4, _0801FB0C @ =gUnknown_2023BC4 - ldr r0, _0801FB10 @ =gUnknown_2023D6C + ldr r4, _0801FB0C @ =gActiveBattler + ldr r0, _0801FB10 @ =gBattlerTarget ldrb r0, [r0] strb r0, [r4] - ldr r1, _0801FB14 @ =gUnknown_2023DCC + ldr r1, _0801FB14 @ =gMoveResultFlags ldrb r2, [r1] movs r0, 0x1 ands r0, r2 @@ -4473,9 +4473,9 @@ atk0E_effectivenesssound: @ 801FAD0 b _0801FB42 .align 2, 0 _0801FB08: .4byte gUnknown_2023BC8 -_0801FB0C: .4byte gUnknown_2023BC4 -_0801FB10: .4byte gUnknown_2023D6C -_0801FB14: .4byte gUnknown_2023DCC +_0801FB0C: .4byte gActiveBattler +_0801FB10: .4byte gBattlerTarget +_0801FB14: .4byte gMoveResultFlags _0801FB18: cmp r0, 0x8 beq _0801FB88 @@ -4518,12 +4518,12 @@ _0801FB52: movs r1, 0xC _0801FB5E: bl EmitPlaySE - ldr r0, _0801FB6C @ =gUnknown_2023BC4 + ldr r0, _0801FB6C @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution b _0801FB88 .align 2, 0 -_0801FB6C: .4byte gUnknown_2023BC4 +_0801FB6C: .4byte gActiveBattler _0801FB70: movs r0, 0x28 ands r0, r1 @@ -4532,7 +4532,7 @@ _0801FB70: movs r0, 0 movs r1, 0xD bl EmitPlaySE - ldr r0, _0801FB98 @ =gUnknown_2023BC4 + ldr r0, _0801FB98 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution _0801FB88: @@ -4545,7 +4545,7 @@ _0801FB90: pop {r0} bx r0 .align 2, 0 -_0801FB98: .4byte gUnknown_2023BC4 +_0801FB98: .4byte gActiveBattler _0801FB9C: .4byte gUnknown_2023D74 thumb_func_end atk0E_effectivenesssound @@ -4559,7 +4559,7 @@ atk0F_resultmessage: @ 801FBA0 beq _0801FBAE b _0801FD40 _0801FBAE: - ldr r1, _0801FBE0 @ =gUnknown_2023DCC + ldr r1, _0801FBE0 @ =gMoveResultFlags ldrb r2, [r1] movs r4, 0x1 adds r0, r4, 0 @@ -4585,7 +4585,7 @@ _0801FBCE: b _0801FD2A .align 2, 0 _0801FBDC: .4byte gUnknown_2023BC8 -_0801FBE0: .4byte gUnknown_2023DCC +_0801FBE0: .4byte gMoveResultFlags _0801FBE4: .4byte gUnknown_2023E82 _0801FBE8: .4byte gUnknown_83FE514 _0801FBEC: @@ -4637,8 +4637,8 @@ _0801FC34: b _0801FD2E _0801FC38: ldr r4, _0801FC60 @ =gUnknown_2023D68 - ldr r2, _0801FC64 @ =gUnknown_2023BE4 - ldr r3, _0801FC68 @ =gUnknown_2023D6C + ldr r2, _0801FC64 @ =gBattleMons + ldr r3, _0801FC68 @ =gBattlerTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -4657,8 +4657,8 @@ _0801FC38: b _0801FD3E .align 2, 0 _0801FC60: .4byte gUnknown_2023D68 -_0801FC64: .4byte gUnknown_2023BE4 -_0801FC68: .4byte gUnknown_2023D6C +_0801FC64: .4byte gBattleMons +_0801FC68: .4byte gBattlerTarget _0801FC6C: .4byte gUnknown_2023D6F _0801FC70: .4byte gUnknown_2023D74 _0801FC74: .4byte gUnknown_81D9641 @@ -4712,8 +4712,8 @@ _0801FCD0: cmp r0, 0 beq _0801FD18 ldr r4, _0801FD00 @ =gUnknown_2023D68 - ldr r2, _0801FD04 @ =gUnknown_2023BE4 - ldr r3, _0801FD08 @ =gUnknown_2023D6C + ldr r2, _0801FD04 @ =gBattleMons + ldr r3, _0801FD08 @ =gBattlerTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -4732,8 +4732,8 @@ _0801FCD0: b _0801FD3E .align 2, 0 _0801FD00: .4byte gUnknown_2023D68 -_0801FD04: .4byte gUnknown_2023BE4 -_0801FD08: .4byte gUnknown_2023D6C +_0801FD04: .4byte gBattleMons +_0801FD08: .4byte gBattlerTarget _0801FD0C: .4byte gUnknown_2023D6F _0801FD10: .4byte gUnknown_2023D74 _0801FD14: .4byte gUnknown_81D9641 @@ -4754,7 +4754,7 @@ _0801FD2A: beq _0801FD38 _0801FD2E: adds r0, r3, 0 - ldr r1, _0801FD48 @ =gUnknown_2023D6B + ldr r1, _0801FD48 @ =sBattler_AI ldrb r1, [r1] bl PrepareStringBattle _0801FD38: @@ -4768,7 +4768,7 @@ _0801FD40: pop {r0} bx r0 .align 2, 0 -_0801FD48: .4byte gUnknown_2023D6B +_0801FD48: .4byte sBattler_AI _0801FD4C: .4byte gUnknown_2023D74 thumb_func_end atk0F_resultmessage @@ -4785,7 +4785,7 @@ atk10_printstring: @ 801FD50 ldrb r1, [r1, 0x2] lsls r1, 8 orrs r0, r1 - ldr r1, _0801FD88 @ =gUnknown_2023D6B + ldr r1, _0801FD88 @ =sBattler_AI ldrb r1, [r1] bl PrepareStringBattle ldr r0, [r4] @@ -4801,15 +4801,15 @@ _0801FD7A: .align 2, 0 _0801FD80: .4byte gUnknown_2023BC8 _0801FD84: .4byte gUnknown_2023D74 -_0801FD88: .4byte gUnknown_2023D6B +_0801FD88: .4byte sBattler_AI _0801FD8C: .4byte gUnknown_2023E82 thumb_func_end atk10_printstring thumb_func_start atk11_printselectionstring atk11_printselectionstring: @ 801FD90 push {r4,r5,lr} - ldr r5, _0801FDC4 @ =gUnknown_2023BC4 - ldr r0, _0801FDC8 @ =gUnknown_2023D6B + ldr r5, _0801FDC4 @ =gActiveBattler + ldr r0, _0801FDC8 @ =sBattler_AI ldrb r0, [r0] strb r0, [r5] ldr r4, _0801FDCC @ =gUnknown_2023D74 @@ -4832,8 +4832,8 @@ atk11_printselectionstring: @ 801FD90 pop {r0} bx r0 .align 2, 0 -_0801FDC4: .4byte gUnknown_2023BC4 -_0801FDC8: .4byte gUnknown_2023D6B +_0801FDC4: .4byte gActiveBattler +_0801FDC8: .4byte sBattler_AI _0801FDCC: .4byte gUnknown_2023D74 _0801FDD0: .4byte gUnknown_2023E82 thumb_func_end atk11_printselectionstring @@ -4911,7 +4911,7 @@ atk13_printfromtable: @ 801FE30 lsls r0, 1 adds r1, r0 ldrh r0, [r1] - ldr r1, _0801FE80 @ =gUnknown_2023D6B + ldr r1, _0801FE80 @ =sBattler_AI ldrb r1, [r1] bl PrepareStringBattle ldr r0, [r4] @@ -4927,7 +4927,7 @@ _0801FE6E: _0801FE74: .4byte gUnknown_2023BC8 _0801FE78: .4byte gUnknown_2023D74 _0801FE7C: .4byte gUnknown_2023E82 -_0801FE80: .4byte gUnknown_2023D6B +_0801FE80: .4byte sBattler_AI thumb_func_end atk13_printfromtable thumb_func_start atk14_printselectionstringfromtable @@ -4953,8 +4953,8 @@ atk14_printselectionstringfromtable: @ 801FE84 ldrb r0, [r6, 0x5] lsls r0, 1 adds r1, r0 - ldr r4, _0801FEE0 @ =gUnknown_2023BC4 - ldr r0, _0801FEE4 @ =gUnknown_2023D6B + ldr r4, _0801FEE0 @ =gActiveBattler + ldr r0, _0801FEE4 @ =sBattler_AI ldrb r0, [r0] strb r0, [r4] ldrh r1, [r1] @@ -4975,8 +4975,8 @@ _0801FECE: _0801FED4: .4byte gUnknown_2023BC8 _0801FED8: .4byte gUnknown_2023D74 _0801FEDC: .4byte gUnknown_2023E82 -_0801FEE0: .4byte gUnknown_2023BC4 -_0801FEE4: .4byte gUnknown_2023D6B +_0801FEE0: .4byte gActiveBattler +_0801FEE4: .4byte sBattler_AI thumb_func_end atk14_printselectionstringfromtable thumb_func_start BankGetTurnOrder @@ -5037,34 +5037,34 @@ sub_801FF20: @ 801FF20 cmp r0, 0 beq _0801FF78 ldr r2, _0801FF68 @ =gUnknown_2023D6E - ldr r0, _0801FF6C @ =gUnknown_2023D6B + ldr r0, _0801FF6C @ =sBattler_AI ldrb r0, [r0] strb r0, [r2] movs r0, 0xBF ands r0, r3 strb r0, [r6, 0x3] movs r7, 0x40 - ldr r1, _0801FF70 @ =gUnknown_2023FC4 - ldr r0, _0801FF74 @ =gUnknown_2023D6C + ldr r1, _0801FF70 @ =gBattleScripting + ldr r0, _0801FF74 @ =gBattlerTarget b _0801FF84 .align 2, 0 _0801FF64: .4byte gUnknown_2023E82 _0801FF68: .4byte gUnknown_2023D6E -_0801FF6C: .4byte gUnknown_2023D6B -_0801FF70: .4byte gUnknown_2023FC4 -_0801FF74: .4byte gUnknown_2023D6C +_0801FF6C: .4byte sBattler_AI +_0801FF70: .4byte gBattleScripting +_0801FF74: .4byte gBattlerTarget _0801FF78: ldr r2, _08020094 @ =gUnknown_2023D6E - ldr r0, _08020098 @ =gUnknown_2023D6C + ldr r0, _08020098 @ =gBattlerTarget ldrb r0, [r0] strb r0, [r2] - ldr r1, _0802009C @ =gUnknown_2023FC4 - ldr r0, _080200A0 @ =gUnknown_2023D6B + ldr r1, _0802009C @ =gBattleScripting + ldr r0, _080200A0 @ =sBattler_AI _0801FF84: ldrb r0, [r0] strb r0, [r1, 0x17] mov r9, r2 - ldr r0, _080200A4 @ =gUnknown_2022B4C + ldr r0, _080200A4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 9 @@ -5083,7 +5083,7 @@ _0801FF84: bne _0801FFB2 bl _080210EC _0801FFB2: - ldr r3, _080200A8 @ =gUnknown_2023BE4 + ldr r3, _080200A8 @ =gBattleMons ldr r2, _08020094 @ =gUnknown_2023D6E ldrb r1, [r2] movs r0, 0x58 @@ -5112,7 +5112,7 @@ _0801FFE6: mov r3, r9 ldrb r0, [r3] bl GetBankIdentity - ldr r2, _080200B4 @ =gUnknown_2023DDE + ldr r2, _080200B4 @ =gSideAffecting movs r1, 0x1 ands r1, r0 lsls r1, 1 @@ -5137,7 +5137,7 @@ _0801FFE6: bhi _08020020 bl _080210EC _08020020: - ldr r3, _080200A8 @ =gUnknown_2023BE4 + ldr r3, _080200A8 @ =gBattleMons ldr r2, _08020094 @ =gUnknown_2023D6E ldrb r1, [r2] movs r0, 0x58 @@ -5200,14 +5200,14 @@ _08020092: b _08020570 .align 2, 0 _08020094: .4byte gUnknown_2023D6E -_08020098: .4byte gUnknown_2023D6C -_0802009C: .4byte gUnknown_2023FC4 -_080200A0: .4byte gUnknown_2023D6B -_080200A4: .4byte gUnknown_2022B4C -_080200A8: .4byte gUnknown_2023BE4 +_08020098: .4byte gBattlerTarget +_0802009C: .4byte gBattleScripting +_080200A0: .4byte sBattler_AI +_080200A4: .4byte gBattleTypeFlags +_080200A8: .4byte gBattleMons _080200AC: .4byte gUnknown_2023DD0 _080200B0: .4byte gUnknown_2023E82 -_080200B4: .4byte gUnknown_2023DDE +_080200B4: .4byte gSideAffecting _080200B8: .4byte gUnknown_825053C _080200BC: cmp r0, 0x40 @@ -5237,7 +5237,7 @@ _080200D6: ldrb r0, [r0] cmp r0, 0x2B beq _08020138 - ldr r0, _08020130 @ =gUnknown_2023BC4 + ldr r0, _08020130 @ =gActiveBattler movs r1, 0 strb r1, [r0] ldr r1, _08020134 @ =gUnknown_2023BCC @@ -5274,10 +5274,10 @@ _08020110: beq _08020110 b _08020144 .align 2, 0 -_08020130: .4byte gUnknown_2023BC4 +_08020130: .4byte gActiveBattler _08020134: .4byte gUnknown_2023BCC _08020138: - ldr r0, _08020184 @ =gUnknown_2023BC4 + ldr r0, _08020184 @ =gActiveBattler ldr r2, _08020188 @ =gUnknown_2023BCC ldrb r1, [r2] strb r1, [r0] @@ -5320,7 +5320,7 @@ _0802017C: bl CancelMultiTurnMoves b _08020560 .align 2, 0 -_08020184: .4byte gUnknown_2023BC4 +_08020184: .4byte gActiveBattler _08020188: .4byte gUnknown_2023BCC _0802018C: mov r2, r9 @@ -5575,7 +5575,7 @@ _08020346: lsls r0, 24 cmp r0, 0 bne _08020382 - ldr r0, _080203D8 @ =gUnknown_2023F1C + ldr r0, _080203D8 @ =gBattleWeather ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -5584,7 +5584,7 @@ _08020346: movs r1, 0 str r1, [sp, 0x4] _08020382: - ldr r4, _080203DC @ =gUnknown_2023BE4 + ldr r4, _080203DC @ =gBattleMons ldr r0, _080203E0 @ =gUnknown_2023D6E ldrb r3, [r0] movs r0, 0x58 @@ -5631,8 +5631,8 @@ _080203CA: mov r10, r3 b _08020570 .align 2, 0 -_080203D8: .4byte gUnknown_2023F1C -_080203DC: .4byte gUnknown_2023BE4 +_080203D8: .4byte gBattleWeather +_080203DC: .4byte gBattleMons _080203E0: .4byte gUnknown_2023D6E _080203E4: mov r0, r9 @@ -5823,7 +5823,7 @@ _08020560: mov r10, r0 b _08020570 _08020566: - ldr r0, _080205B4 @ =gUnknown_2023DCC + ldr r0, _080205B4 @ =gMoveResultFlags ldrb r1, [r0] movs r2, 0x8 orrs r1, r2 @@ -5847,7 +5847,7 @@ _08020578: cmp r3, 0x7 bne _080205CC bl Random - ldr r2, _080205C4 @ =gUnknown_2023BE4 + ldr r2, _080205C4 @ =gBattleMons ldr r1, _080205C8 @ =gUnknown_2023D6E ldrb r3, [r1] movs r1, 0x58 @@ -5862,14 +5862,14 @@ _08020578: str r0, [r3] b _080205E0 .align 2, 0 -_080205B4: .4byte gUnknown_2023DCC +_080205B4: .4byte gMoveResultFlags _080205B8: .4byte gUnknown_2023D74 _080205BC: .4byte gUnknown_825053C _080205C0: .4byte gUnknown_2023E82 -_080205C4: .4byte gUnknown_2023BE4 +_080205C4: .4byte gBattleMons _080205C8: .4byte gUnknown_2023D6E _080205CC: - ldr r2, _08020630 @ =gUnknown_2023BE4 + ldr r2, _08020630 @ =gBattleMons ldr r0, _08020634 @ =gUnknown_2023D6E ldrb r1, [r0] movs r0, 0x58 @@ -5888,7 +5888,7 @@ _080205E0: adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r4, _08020644 @ =gUnknown_2023BC4 + ldr r4, _08020644 @ =gActiveBattler ldr r1, _08020634 @ =gUnknown_2023D6E ldrb r0, [r1] strb r0, [r4] @@ -5919,12 +5919,12 @@ _080205E0: str r1, [r2] b _08020656 .align 2, 0 -_08020630: .4byte gUnknown_2023BE4 +_08020630: .4byte gBattleMons _08020634: .4byte gUnknown_2023D6E _08020638: .4byte gUnknown_2023D74 _0802063C: .4byte gUnknown_825062C _08020640: .4byte gUnknown_2023E82 -_08020644: .4byte gUnknown_2023BC4 +_08020644: .4byte gActiveBattler _08020648: .4byte gUnknown_2023C30 _0802064C: .4byte gUnknown_2023DD0 _08020650: .4byte 0xffffdfff @@ -5944,7 +5944,7 @@ _08020656: beq _08020670 bl _0802110A _08020670: - ldr r0, _0802068C @ =gUnknown_2023FE8 + ldr r0, _0802068C @ =gBattleStruct ldr r0, [r0] adds r0, 0xB4 ldrb r1, [r6, 0x3] @@ -5956,7 +5956,7 @@ _08020670: bl _08021008 .align 2, 0 _08020688: .4byte gUnknown_2023E82 -_0802068C: .4byte gUnknown_2023FE8 +_0802068C: .4byte gBattleStruct _08020690: .4byte gUnknown_2023DD0 _08020694: mov r2, r10 @@ -6192,7 +6192,7 @@ _080208D4: ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _08020924 @ =gUnknown_2023D4A + ldr r1, _08020924 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0] bl Random @@ -6221,12 +6221,12 @@ _080208D4: bl _08021108 .align 2, 0 _08020920: .4byte gUnknown_2023DB8 -_08020924: .4byte gUnknown_2023D4A +_08020924: .4byte gCurrentMove _08020928: .4byte gUnknown_2023D74 _0802092C: .4byte gUnknown_825062C _08020930: .4byte gUnknown_2023E82 _08020934: - ldr r5, _08020984 @ =gUnknown_2023D6B + ldr r5, _08020984 @ =sBattler_AI ldrb r0, [r5] bl GetBankIdentity movs r1, 0x1 @@ -6235,7 +6235,7 @@ _08020934: bne _0802096C ldr r4, _08020988 @ =gUnknown_2023E7E ldrh r3, [r4] - ldr r2, _0802098C @ =gUnknown_2023BE4 + ldr r2, _0802098C @ =gBattleMons ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -6266,9 +6266,9 @@ _0802096C: ldr r0, [r0] b _08021108 .align 2, 0 -_08020984: .4byte gUnknown_2023D6B +_08020984: .4byte sBattler_AI _08020988: .4byte gUnknown_2023E7E -_0802098C: .4byte gUnknown_2023BE4 +_0802098C: .4byte gBattleMons _08020990: .4byte 0x0000ffff _08020994: .4byte gUnknown_2023D74 _08020998: .4byte gUnknown_825062C @@ -6319,7 +6319,7 @@ _080209D8: ldrb r0, [r2] lsls r0, 1 adds r0, r1 - ldr r1, _08020A18 @ =gUnknown_2023D4A + ldr r1, _08020A18 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0] ldr r0, _08020A1C @ =gUnknown_2023E8C @@ -6333,7 +6333,7 @@ _080209D8: b _080210EC .align 2, 0 _08020A14: .4byte gUnknown_2023DB8 -_08020A18: .4byte gUnknown_2023D4A +_08020A18: .4byte gCurrentMove _08020A1C: .4byte gUnknown_2023E8C _08020A20: mov r3, r9 @@ -6366,11 +6366,11 @@ _08020A3C: str r0, [r2] mov r3, r9 ldrb r1, [r3] - ldr r2, _08020AD0 @ =gUnknown_2023FE8 + ldr r2, _08020AD0 @ =gBattleStruct ldr r0, [r2] lsls r1, 1 adds r1, r0 - ldr r6, _08020AD4 @ =gUnknown_2023D4A + ldr r6, _08020AD4 @ =gCurrentMove ldrh r0, [r6] strb r0, [r1, 0x4] ldrb r1, [r3] @@ -6383,7 +6383,7 @@ _08020A3C: ldrb r1, [r3] ldr r0, [r2] adds r1, r0 - ldr r0, _08020AD8 @ =gUnknown_2023D6B + ldr r0, _08020AD8 @ =sBattler_AI ldrb r0, [r0] strb r0, [r1, 0x14] ldr r4, _08020ADC @ =gUnknown_2023D74 @@ -6426,15 +6426,15 @@ _08020ABE: bne _08020AAE b _0802110A .align 2, 0 -_08020AD0: .4byte gUnknown_2023FE8 -_08020AD4: .4byte gUnknown_2023D4A -_08020AD8: .4byte gUnknown_2023D6B +_08020AD0: .4byte gBattleStruct +_08020AD4: .4byte gCurrentMove +_08020AD8: .4byte sBattler_AI _08020ADC: .4byte gUnknown_2023D74 _08020AE0: .4byte gUnknown_825062C _08020AE4: .4byte gUnknown_2023E82 _08020AE8: .4byte gUnknown_83FE664 _08020AEC: - ldr r1, _08020B1C @ =gUnknown_2023D50 + ldr r1, _08020B1C @ =gBattleMoveDamage ldr r0, _08020B20 @ =gUnknown_2023D54 ldr r0, [r0] cmp r0, 0 @@ -6460,7 +6460,7 @@ _08020B04: ldr r0, [r0] b _08021108 .align 2, 0 -_08020B1C: .4byte gUnknown_2023D50 +_08020B1C: .4byte gBattleMoveDamage _08020B20: .4byte gUnknown_2023D54 _08020B24: .4byte gUnknown_2023D74 _08020B28: .4byte gUnknown_825062C @@ -6480,7 +6480,7 @@ _08020B30: beq _08020B4C b _080210EC _08020B4C: - ldr r2, _08020B68 @ =gUnknown_2023FC4 + ldr r2, _08020B68 @ =gBattleScripting ldrb r1, [r6, 0x3] movs r0, 0x3F ands r0, r1 @@ -6493,7 +6493,7 @@ _08020B4C: ldr r0, _08020B70 @ =gUnknown_81D6BD1 b _08021108 .align 2, 0 -_08020B68: .4byte gUnknown_2023FC4 +_08020B68: .4byte gBattleScripting _08020B6C: .4byte gUnknown_2023D74 _08020B70: .4byte gUnknown_81D6BD1 _08020B74: @@ -6512,7 +6512,7 @@ _08020B74: beq _08020B92 b _080210EC _08020B92: - ldr r2, _08020BAC @ =gUnknown_2023FC4 + ldr r2, _08020BAC @ =gBattleScripting ldrb r1, [r6, 0x3] movs r0, 0x3F ands r0, r1 @@ -6525,7 +6525,7 @@ _08020B92: ldr r0, _08020BB4 @ =gUnknown_81D6C62 b _08021108 .align 2, 0 -_08020BAC: .4byte gUnknown_2023FC4 +_08020BAC: .4byte gBattleScripting _08020BB0: .4byte gUnknown_2023D74 _08020BB4: .4byte gUnknown_81D6C62 _08020BB8: @@ -6543,7 +6543,7 @@ _08020BB8: beq _08020BD4 b _080210EC _08020BD4: - ldr r2, _08020BF0 @ =gUnknown_2023FC4 + ldr r2, _08020BF0 @ =gBattleScripting ldrb r1, [r6, 0x3] movs r0, 0x3F ands r0, r1 @@ -6556,7 +6556,7 @@ _08020BD4: ldr r0, _08020BF8 @ =gUnknown_81D6BD1 b _08021108 .align 2, 0 -_08020BF0: .4byte gUnknown_2023FC4 +_08020BF0: .4byte gBattleScripting _08020BF4: .4byte gUnknown_2023D74 _08020BF8: .4byte gUnknown_81D6BD1 _08020BFC: @@ -6575,7 +6575,7 @@ _08020BFC: beq _08020C1A b _080210EC _08020C1A: - ldr r2, _08020C34 @ =gUnknown_2023FC4 + ldr r2, _08020C34 @ =gBattleScripting ldrb r1, [r6, 0x3] movs r0, 0x3F ands r0, r1 @@ -6588,7 +6588,7 @@ _08020C1A: ldr r0, _08020C3C @ =gUnknown_81D6C62 b _08021108 .align 2, 0 -_08020C34: .4byte gUnknown_2023FC4 +_08020C34: .4byte gBattleScripting _08020C38: .4byte gUnknown_2023D74 _08020C3C: .4byte gUnknown_81D6C62 _08020C40: @@ -6605,7 +6605,7 @@ _08020C40: lsls r1, 15 orrs r0, r1 str r0, [r2] - ldr r2, _08020C7C @ =gUnknown_2023E0C + ldr r2, _08020C7C @ =gDisableStructs mov r3, r9 ldrb r1, [r3] lsls r0, r1, 3 @@ -6618,16 +6618,16 @@ _08020C40: ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _08020C84 @ =gUnknown_2023D4A + ldr r1, _08020C84 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0] b _080210EC .align 2, 0 -_08020C7C: .4byte gUnknown_2023E0C +_08020C7C: .4byte gDisableStructs _08020C80: .4byte gUnknown_2023DB8 -_08020C84: .4byte gUnknown_2023D4A +_08020C84: .4byte gCurrentMove _08020C88: - ldr r0, _08020CA4 @ =gUnknown_2023D6B + ldr r0, _08020CA4 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 adds r2, r1, 0 @@ -6643,9 +6643,9 @@ _08020C9E: str r0, [r2] b _080210EC .align 2, 0 -_08020CA4: .4byte gUnknown_2023D6B +_08020CA4: .4byte sBattler_AI _08020CA8: - ldr r5, _08020D64 @ =gUnknown_2022B4C + ldr r5, _08020D64 @ =gBattleTypeFlags ldr r0, [r5] movs r1, 0x80 lsls r1, 12 @@ -6654,7 +6654,7 @@ _08020CA8: beq _08020CB8 b _080210EC _08020CB8: - ldr r4, _08020D68 @ =gUnknown_2023D6B + ldr r4, _08020D68 @ =sBattler_AI ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -6670,7 +6670,7 @@ _08020CB8: ands r0, r1 cmp r0, 0 bne _08020D26 - ldr r0, _08020D70 @ =gUnknown_20386AE + ldr r0, _08020D70 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -6678,13 +6678,13 @@ _08020CB8: beq _08020CEA b _080210EC _08020CEA: - ldr r0, _08020D64 @ =gUnknown_2022B4C + ldr r0, _08020D64 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _08020D6C @ =0x00000902 ands r0, r1 cmp r0, 0 bne _08020D26 - ldr r0, _08020D70 @ =gUnknown_20386AE + ldr r0, _08020D70 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -6694,9 +6694,9 @@ _08020CEA: adds r0, 0x29 adds r0, r6, r0 ldrb r1, [r0] - ldr r3, _08020D78 @ =gUnknown_825E45C - ldr r2, _08020D7C @ =gUnknown_2023BCE - ldr r0, _08020D68 @ =gUnknown_2023D6B + ldr r3, _08020D78 @ =gBitTable + ldr r2, _08020D7C @ =gBattlerPartyIndexes + ldr r0, _08020D68 @ =sBattler_AI ldrb r0, [r0] lsls r0, 1 adds r0, r2 @@ -6709,8 +6709,8 @@ _08020CEA: beq _08020D26 b _080210EC _08020D26: - ldr r2, _08020D80 @ =gUnknown_2023BE4 - ldr r1, _08020D84 @ =gUnknown_2023D6C + ldr r2, _08020D80 @ =gBattleMons + ldr r1, _08020D84 @ =gBattlerTarget ldrb r0, [r1] movs r3, 0x58 muls r0, r3 @@ -6740,20 +6740,20 @@ _08020D26: bl sub_80C71D0 b _0802110A .align 2, 0 -_08020D64: .4byte gUnknown_2022B4C -_08020D68: .4byte gUnknown_2023D6B +_08020D64: .4byte gBattleTypeFlags +_08020D68: .4byte sBattler_AI _08020D6C: .4byte 0x00000902 -_08020D70: .4byte gUnknown_20386AE +_08020D70: .4byte gTrainerBattleOpponent_A _08020D74: .4byte gUnknown_2023F20 -_08020D78: .4byte gUnknown_825E45C -_08020D7C: .4byte gUnknown_2023BCE -_08020D80: .4byte gUnknown_2023BE4 -_08020D84: .4byte gUnknown_2023D6C +_08020D78: .4byte gBitTable +_08020D7C: .4byte gBattlerPartyIndexes +_08020D80: .4byte gBattleMons +_08020D84: .4byte gBattlerTarget _08020D88: .4byte gUnknown_2023D74 _08020D8C: .4byte gUnknown_81D948E _08020D90: .4byte gUnknown_2023D6A _08020D94: - ldr r4, _08020E60 @ =gUnknown_2023D6B + ldr r4, _08020E60 @ =sBattler_AI mov r10, r4 ldrb r2, [r4] movs r0, 0x58 @@ -6789,7 +6789,7 @@ _08020DCE: bne _08020DD4 b _080210EC _08020DD4: - ldr r5, _08020E64 @ =gUnknown_2023FE8 + ldr r5, _08020E64 @ =gBattleStruct lsls r0, r2, 1 adds r0, 0xD0 ldr r1, [r5] @@ -6804,7 +6804,7 @@ _08020DD4: add r0, r8 movs r6, 0 strh r4, [r0, 0x2E] - ldr r4, _08020E6C @ =gUnknown_2023BC4 + ldr r4, _08020E6C @ =gActiveBattler mov r1, r10 ldrb r0, [r1] strb r0, [r4] @@ -6854,14 +6854,14 @@ _08020DD4: strb r6, [r0] b _0802110A .align 2, 0 -_08020E60: .4byte gUnknown_2023D6B -_08020E64: .4byte gUnknown_2023FE8 +_08020E60: .4byte sBattler_AI +_08020E64: .4byte gBattleStruct _08020E68: .4byte gUnknown_2023D68 -_08020E6C: .4byte gUnknown_2023BC4 +_08020E6C: .4byte gActiveBattler _08020E70: .4byte gUnknown_2023D74 _08020E74: .4byte gUnknown_81D9271 _08020E78: - ldr r3, _08020EA8 @ =gUnknown_2023D6C + ldr r3, _08020EA8 @ =gBattlerTarget ldrb r1, [r3] movs r0, 0x58 adds r2, r1, 0 @@ -6874,22 +6874,22 @@ _08020E78: lsls r1, 19 orrs r0, r1 str r0, [r2] - ldr r2, _08020EAC @ =gUnknown_2023E0C + ldr r2, _08020EAC @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _08020EB0 @ =gUnknown_2023D6B + ldr r1, _08020EB0 @ =sBattler_AI ldrb r1, [r1] strb r1, [r0, 0x14] b _080210EC .align 2, 0 -_08020EA8: .4byte gUnknown_2023D6C -_08020EAC: .4byte gUnknown_2023E0C -_08020EB0: .4byte gUnknown_2023D6B +_08020EA8: .4byte gBattlerTarget +_08020EAC: .4byte gDisableStructs +_08020EB0: .4byte sBattler_AI _08020EB4: - ldr r0, _08020ECC @ =gUnknown_2023D6C + ldr r0, _08020ECC @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 adds r2, r1, 0 @@ -6902,7 +6902,7 @@ _08020EB4: lsls r1, 20 b _08020C9E .align 2, 0 -_08020ECC: .4byte gUnknown_2023D6C +_08020ECC: .4byte gBattlerTarget _08020ED0: ldr r4, _08020EE0 @ =gUnknown_2023D74 ldr r0, [r4] @@ -6924,7 +6924,7 @@ _08020EE8: _08020EF8: .4byte gUnknown_2023D74 _08020EFC: .4byte gUnknown_81D8DF1 _08020F00: - ldr r6, _08020F50 @ =gUnknown_2023D6C + ldr r6, _08020F50 @ =gBattlerTarget ldrb r0, [r6] movs r2, 0x58 muls r0, r2 @@ -6942,7 +6942,7 @@ _08020F1A: negs r0, r0 ands r4, r0 str r4, [r5] - ldr r4, _08020F54 @ =gUnknown_2023BC4 + ldr r4, _08020F54 @ =gActiveBattler ldrb r0, [r6] strb r0, [r4] ldrb r0, [r4] @@ -6963,8 +6963,8 @@ _08020F1A: ldr r0, _08020F5C @ =gUnknown_81D9177 b _08021108 .align 2, 0 -_08020F50: .4byte gUnknown_2023D6C -_08020F54: .4byte gUnknown_2023BC4 +_08020F50: .4byte gBattlerTarget +_08020F54: .4byte gActiveBattler _08020F58: .4byte gUnknown_2023D74 _08020F5C: .4byte gUnknown_81D9177 _08020F60: @@ -6978,7 +6978,7 @@ _08020F60: _08020F70: .4byte gUnknown_2023D74 _08020F74: .4byte gUnknown_81D8F35 _08020F78: - ldr r4, _08020FA8 @ =gUnknown_2023D50 + ldr r4, _08020FA8 @ =gBattleMoveDamage ldr r0, _08020FAC @ =gUnknown_2023D54 ldr r0, [r0] movs r1, 0x3 @@ -7001,7 +7001,7 @@ _08020F8E: ldr r0, [r0] b _08021108 .align 2, 0 -_08020FA8: .4byte gUnknown_2023D50 +_08020FA8: .4byte gBattleMoveDamage _08020FAC: .4byte gUnknown_2023D54 _08020FB0: .4byte gUnknown_2023D74 _08020FB4: .4byte gUnknown_825062C @@ -7031,7 +7031,7 @@ _08020FD8: ldrb r0, [r2] lsls r0, 1 adds r0, r1 - ldr r1, _08021014 @ =gUnknown_2023D4A + ldr r1, _08021014 @ =gCurrentMove ldrh r1, [r1] strh r1, [r0] bl Random @@ -7051,7 +7051,7 @@ _08021008: b _0802110A .align 2, 0 _08021010: .4byte gUnknown_2023DB8 -_08021014: .4byte gUnknown_2023D4A +_08021014: .4byte gCurrentMove _08021018: mov r5, r9 ldrb r3, [r5] @@ -7105,8 +7105,8 @@ _08021058: ldr r2, _080210D4 @ =gUnknown_2023F20 adds r2, 0x29 adds r2, r6, r2 - ldr r3, _080210D8 @ =gUnknown_825E45C - ldr r1, _080210DC @ =gUnknown_2023BCE + ldr r3, _080210D8 @ =gBitTable + ldr r1, _080210DC @ =gBattlerPartyIndexes mov r4, r9 ldrb r0, [r4] lsls r0, 1 @@ -7126,7 +7126,7 @@ _08021058: str r0, [r4] mov r1, r9 ldrb r0, [r1] - ldr r2, _080210E8 @ =gUnknown_2023FE8 + ldr r2, _080210E8 @ =gBattleStruct ldr r1, [r2] lsls r0, 1 adds r0, r1 @@ -7143,11 +7143,11 @@ _08021058: .align 2, 0 _080210D0: .4byte gUnknown_2023D68 _080210D4: .4byte gUnknown_2023F20 -_080210D8: .4byte gUnknown_825E45C -_080210DC: .4byte gUnknown_2023BCE +_080210D8: .4byte gBitTable +_080210DC: .4byte gBattlerPartyIndexes _080210E0: .4byte gUnknown_2023D74 _080210E4: .4byte gUnknown_81D8F86 -_080210E8: .4byte gUnknown_2023FE8 +_080210E8: .4byte gBattleStruct _080210EC: ldr r1, _080210F8 @ =gUnknown_2023D74 ldr r0, [r1] @@ -7181,8 +7181,8 @@ _08021120: .4byte gUnknown_81D8FEB thumb_func_start atk15_seteffectwithchance atk15_seteffectwithchance: @ 8021124 push {r4,lr} - ldr r2, _08021150 @ =gUnknown_2023BE4 - ldr r0, _08021154 @ =gUnknown_2023D6B + ldr r2, _08021150 @ =gBattleMons + ldr r0, _08021154 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -7191,8 +7191,8 @@ atk15_seteffectwithchance: @ 8021124 ldrb r0, [r0] cmp r0, 0x20 bne _08021160 - ldr r2, _08021158 @ =gUnknown_8250C04 - ldr r0, _0802115C @ =gUnknown_2023D4A + ldr r2, _08021158 @ =gBattleMoves + ldr r0, _0802115C @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -7202,13 +7202,13 @@ atk15_seteffectwithchance: @ 8021124 lsls r4, r0, 1 b _08021170 .align 2, 0 -_08021150: .4byte gUnknown_2023BE4 -_08021154: .4byte gUnknown_2023D6B -_08021158: .4byte gUnknown_8250C04 -_0802115C: .4byte gUnknown_2023D4A +_08021150: .4byte gBattleMons +_08021154: .4byte sBattler_AI +_08021158: .4byte gBattleMoves +_0802115C: .4byte gCurrentMove _08021160: - ldr r2, _08021190 @ =gUnknown_8250C04 - ldr r0, _08021194 @ =gUnknown_2023D4A + ldr r2, _08021190 @ =gBattleMoves + ldr r0, _08021194 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -7222,7 +7222,7 @@ _08021170: ands r0, r2 cmp r0, 0 beq _080211A0 - ldr r0, _0802119C @ =gUnknown_2023DCC + ldr r0, _0802119C @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -7233,10 +7233,10 @@ _08021170: strb r0, [r3, 0x3] b _080211CE .align 2, 0 -_08021190: .4byte gUnknown_8250C04 -_08021194: .4byte gUnknown_2023D4A +_08021190: .4byte gBattleMoves +_08021194: .4byte gCurrentMove _08021198: .4byte gUnknown_2023E82 -_0802119C: .4byte gUnknown_2023DCC +_0802119C: .4byte gMoveResultFlags _080211A0: bl Random lsls r0, 16 @@ -7251,7 +7251,7 @@ _080211A0: ldrb r0, [r0, 0x3] cmp r0, 0 beq _080211EA - ldr r0, _080211DC @ =gUnknown_2023DCC + ldr r0, _080211DC @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -7266,7 +7266,7 @@ _080211CE: b _080211F2 .align 2, 0 _080211D8: .4byte gUnknown_2023E82 -_080211DC: .4byte gUnknown_2023DCC +_080211DC: .4byte gMoveResultFlags _080211E0: movs r0, 0 movs r1, 0 @@ -7281,7 +7281,7 @@ _080211F2: ldr r0, _08021208 @ =gUnknown_2023E82 movs r1, 0 strb r1, [r0, 0x3] - ldr r0, _0802120C @ =gUnknown_2023FC4 + ldr r0, _0802120C @ =gBattleScripting strb r1, [r0, 0x16] pop {r4} pop {r0} @@ -7289,7 +7289,7 @@ _080211F2: .align 2, 0 _08021204: .4byte gUnknown_2023D74 _08021208: .4byte gUnknown_2023E82 -_0802120C: .4byte gUnknown_2023FC4 +_0802120C: .4byte gBattleScripting thumb_func_end atk15_seteffectwithchance thumb_func_start atk16_seteffectprimary @@ -7319,13 +7319,13 @@ atk18_clearstatusfromeffect: @ 8021230 ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r2, _08021258 @ =gUnknown_2023BC4 + ldr r2, _08021258 @ =gActiveBattler strb r0, [r2] ldr r3, _0802125C @ =gUnknown_2023E82 ldrb r0, [r3, 0x3] cmp r0, 0x6 bhi _08021264 - ldr r1, _08021260 @ =gUnknown_2023BE4 + ldr r1, _08021260 @ =gBattleMons ldrb r2, [r2] movs r0, 0x58 muls r2, r0 @@ -7333,11 +7333,11 @@ atk18_clearstatusfromeffect: @ 8021230 b _0802126E .align 2, 0 _08021254: .4byte gUnknown_2023D74 -_08021258: .4byte gUnknown_2023BC4 +_08021258: .4byte gActiveBattler _0802125C: .4byte gUnknown_2023E82 -_08021260: .4byte gUnknown_2023BE4 +_08021260: .4byte gBattleMons _08021264: - ldr r1, _08021298 @ =gUnknown_2023BE4 + ldr r1, _08021298 @ =gBattleMons ldrb r2, [r2] movs r0, 0x58 muls r2, r0 @@ -7359,16 +7359,16 @@ _0802126E: ldr r0, [r1] adds r0, 0x2 str r0, [r1] - ldr r0, _080212A8 @ =gUnknown_2023FC4 + ldr r0, _080212A8 @ =gBattleScripting strb r2, [r0, 0x16] pop {r0} bx r0 .align 2, 0 -_08021298: .4byte gUnknown_2023BE4 +_08021298: .4byte gBattleMons _0802129C: .4byte gUnknown_825053C _080212A0: .4byte gUnknown_2023E82 _080212A4: .4byte gUnknown_2023D74 -_080212A8: .4byte gUnknown_2023FC4 +_080212A8: .4byte gBattleScripting thumb_func_end atk18_clearstatusfromeffect thumb_func_start atk19_tryfaintmon @@ -7386,10 +7386,10 @@ atk19_tryfaintmon: @ 80212AC beq _08021330 ldrb r0, [r2, 0x1] bl sub_8016E24 - ldr r5, _0802131C @ =gUnknown_2023BC4 + ldr r5, _0802131C @ =gActiveBattler strb r0, [r5] ldr r2, _08021320 @ =gUnknown_2023DD0 - ldr r1, _08021324 @ =gUnknown_825E45C + ldr r1, _08021324 @ =gBitTable ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -7416,7 +7416,7 @@ _080212E4: str r4, [r6] ldrb r0, [r5] bl GetBankSide - ldr r1, _08021328 @ =gUnknown_2023DDE + ldr r1, _08021328 @ =gSideAffecting lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -7427,43 +7427,43 @@ _080212E4: b _08021592 .align 2, 0 _08021318: .4byte gUnknown_2023D74 -_0802131C: .4byte gUnknown_2023BC4 +_0802131C: .4byte gActiveBattler _08021320: .4byte gUnknown_2023DD0 -_08021324: .4byte gUnknown_825E45C -_08021328: .4byte gUnknown_2023DDE +_08021324: .4byte gBitTable +_08021328: .4byte gSideAffecting _0802132C: .4byte 0x0000fdff _08021330: ldrb r0, [r2, 0x1] cmp r0, 0x1 bne _08021358 - ldr r1, _08021348 @ =gUnknown_2023BC4 - ldr r0, _0802134C @ =gUnknown_2023D6B + ldr r1, _08021348 @ =gActiveBattler + ldr r0, _0802134C @ =sBattler_AI ldrb r0, [r0] strb r0, [r1] - ldr r0, _08021350 @ =gUnknown_2023D6C + ldr r0, _08021350 @ =gBattlerTarget ldrb r0, [r0] mov r9, r0 ldr r4, _08021354 @ =gUnknown_81D8674 b _08021368 .align 2, 0 -_08021348: .4byte gUnknown_2023BC4 -_0802134C: .4byte gUnknown_2023D6B -_08021350: .4byte gUnknown_2023D6C +_08021348: .4byte gActiveBattler +_0802134C: .4byte sBattler_AI +_08021350: .4byte gBattlerTarget _08021354: .4byte gUnknown_81D8674 _08021358: - ldr r1, _080213D0 @ =gUnknown_2023BC4 - ldr r0, _080213D4 @ =gUnknown_2023D6C + ldr r1, _080213D0 @ =gActiveBattler + ldr r0, _080213D4 @ =gBattlerTarget ldrb r0, [r0] strb r0, [r1] - ldr r0, _080213D8 @ =gUnknown_2023D6B + ldr r0, _080213D8 @ =sBattler_AI ldrb r0, [r0] mov r9, r0 ldr r4, _080213DC @ =gUnknown_81D8684 _08021368: mov r8, r1 - ldr r0, _080213E0 @ =gUnknown_2023D70 + ldr r0, _080213E0 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _080213E4 @ =gUnknown_825E45C + ldr r2, _080213E4 @ =gBitTable mov r7, r8 ldrb r3, [r7] lsls r0, r3, 2 @@ -7474,7 +7474,7 @@ _08021368: beq _08021382 b _0802158C _08021382: - ldr r1, _080213E8 @ =gUnknown_2023BE4 + ldr r1, _080213E8 @ =gBattleMons movs r0, 0x58 muls r0, r3 adds r0, r1 @@ -7502,7 +7502,7 @@ _08021392: lsls r1, 15 orrs r0, r1 str r0, [r5] - ldr r1, _080213F0 @ =gUnknown_3004F90 + ldr r1, _080213F0 @ =gBattleResults ldrb r0, [r1] cmp r0, 0xFE bhi _080213C8 @@ -7513,24 +7513,24 @@ _080213C8: bl sub_802E228 b _0802142C .align 2, 0 -_080213D0: .4byte gUnknown_2023BC4 -_080213D4: .4byte gUnknown_2023D6C -_080213D8: .4byte gUnknown_2023D6B +_080213D0: .4byte gActiveBattler +_080213D4: .4byte gBattlerTarget +_080213D8: .4byte sBattler_AI _080213DC: .4byte gUnknown_81D8684 -_080213E0: .4byte gUnknown_2023D70 -_080213E4: .4byte gUnknown_825E45C -_080213E8: .4byte gUnknown_2023BE4 +_080213E0: .4byte gAbsentBattlerFlags +_080213E4: .4byte gBitTable +_080213E8: .4byte gBattleMons _080213EC: .4byte gUnknown_2023DD0 -_080213F0: .4byte gUnknown_3004F90 +_080213F0: .4byte gBattleResults _080213F4: - ldr r4, _0802154C @ =gUnknown_3004F90 + ldr r4, _0802154C @ =gBattleResults ldrb r0, [r4, 0x1] cmp r0, 0xFE bhi _08021400 adds r0, 0x1 strb r0, [r4, 0x1] _08021400: - ldr r1, _08021550 @ =gUnknown_2023BCE + ldr r1, _08021550 @ =gBattlerPartyIndexes mov r2, r8 ldrb r0, [r2] lsls r0, 1 @@ -7538,17 +7538,17 @@ _08021400: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08021554 @ =gUnknown_202402C + ldr r1, _08021554 @ =gEnemyParty adds r0, r1 movs r1, 0xB bl GetMonData strh r0, [r4, 0x20] - ldr r0, _08021558 @ =gUnknown_2023FE8 + ldr r0, _08021558 @ =gBattleStruct ldr r0, [r0] movs r3, 0xC1 lsls r3, 1 adds r1, r0, r3 - ldr r0, _0802155C @ =gUnknown_2023D6B + ldr r0, _0802155C @ =sBattler_AI ldrb r0, [r0] strb r0, [r1] _0802142C: @@ -7558,8 +7558,8 @@ _0802142C: ands r0, r1 cmp r0, 0 beq _0802146A - ldr r6, _08021564 @ =gUnknown_2023BE4 - ldr r0, _0802155C @ =gUnknown_2023D6B + ldr r6, _08021564 @ =gBattleMons + ldr r0, _0802155C @ =sBattler_AI ldrb r0, [r0] movs r5, 0x58 muls r0, r5 @@ -7574,7 +7574,7 @@ _0802142C: ldr r4, _08021568 @ =gUnknown_2023D74 ldr r0, [r4] bl BattleScriptPush - ldr r1, _0802156C @ =gUnknown_2023D50 + ldr r1, _0802156C @ =gBattleMoveDamage mov r0, r9 muls r0, r5 adds r0, r6 @@ -7583,8 +7583,8 @@ _0802142C: ldr r0, _08021570 @ =gUnknown_81D8C6C str r0, [r4] _0802146A: - ldr r1, _08021574 @ =gUnknown_2023DFC - ldr r6, _08021578 @ =gUnknown_2023D6C + ldr r1, _08021574 @ =gStatuses3 + ldr r6, _08021578 @ =gBattlerTarget ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -7605,7 +7605,7 @@ _08021482: beq _08021492 b _08021592 _08021492: - ldr r0, _0802155C @ =gUnknown_2023D6B + ldr r0, _0802155C @ =sBattler_AI mov r8, r0 ldrb r0, [r0] bl GetBankSide @@ -7616,7 +7616,7 @@ _08021492: lsls r0, 24 cmp r4, r0 beq _08021592 - ldr r1, _08021564 @ =gUnknown_2023BE4 + ldr r1, _08021564 @ =gBattleMons mov r9, r1 mov r2, r8 ldrb r1, [r2] @@ -7628,11 +7628,11 @@ _08021492: ldrh r0, [r0, 0x28] cmp r0, 0 beq _08021592 - ldr r0, _0802157C @ =gUnknown_2023D4A + ldr r0, _0802157C @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xA5 beq _08021592 - ldr r0, _08021558 @ =gUnknown_2023FE8 + ldr r0, _08021558 @ =gBattleStruct ldr r0, [r0] adds r0, r1, r0 adds r0, 0x80 @@ -7647,7 +7647,7 @@ _08021492: bl BattleScriptPush ldr r0, _08021580 @ =gUnknown_81D8FA3 str r0, [r5] - ldr r5, _08021584 @ =gUnknown_2023BC4 + ldr r5, _08021584 @ =gActiveBattler mov r1, r8 ldrb r0, [r1] strb r0, [r5] @@ -7693,21 +7693,21 @@ _08021492: strb r0, [r1, 0x4] b _08021592 .align 2, 0 -_0802154C: .4byte gUnknown_3004F90 -_08021550: .4byte gUnknown_2023BCE -_08021554: .4byte gUnknown_202402C -_08021558: .4byte gUnknown_2023FE8 -_0802155C: .4byte gUnknown_2023D6B +_0802154C: .4byte gBattleResults +_08021550: .4byte gBattlerPartyIndexes +_08021554: .4byte gEnemyParty +_08021558: .4byte gBattleStruct +_0802155C: .4byte sBattler_AI _08021560: .4byte gUnknown_2023DD0 -_08021564: .4byte gUnknown_2023BE4 +_08021564: .4byte gBattleMons _08021568: .4byte gUnknown_2023D74 -_0802156C: .4byte gUnknown_2023D50 +_0802156C: .4byte gBattleMoveDamage _08021570: .4byte gUnknown_81D8C6C -_08021574: .4byte gUnknown_2023DFC -_08021578: .4byte gUnknown_2023D6C -_0802157C: .4byte gUnknown_2023D4A +_08021574: .4byte gStatuses3 +_08021578: .4byte gBattlerTarget +_0802157C: .4byte gCurrentMove _08021580: .4byte gUnknown_81D8FA3 -_08021584: .4byte gUnknown_2023BC4 +_08021584: .4byte gActiveBattler _08021588: .4byte gUnknown_2022AB8 _0802158C: ldr r0, [r6] @@ -7734,7 +7734,7 @@ atk1A_faint_animation: @ 80215A0 ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _080215D8 @ =gUnknown_2023BC4 + ldr r4, _080215D8 @ =gActiveBattler strb r0, [r4] movs r0, 0 bl EmitFaintAnimation @@ -7750,7 +7750,7 @@ _080215CA: .align 2, 0 _080215D0: .4byte gUnknown_2023BC8 _080215D4: .4byte gUnknown_2023D74 -_080215D8: .4byte gUnknown_2023BC4 +_080215D8: .4byte gActiveBattler thumb_func_end atk1A_faint_animation thumb_func_start atk1B_faint_effects_clear @@ -7765,9 +7765,9 @@ atk1B_faint_effects_clear: @ 80215DC ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _08021638 @ =gUnknown_2023BC4 + ldr r4, _08021638 @ =gActiveBattler strb r0, [r4] - ldr r1, _0802163C @ =gUnknown_2023BE4 + ldr r1, _0802163C @ =gBattleMons ldrb r0, [r4] movs r2, 0x58 muls r0, r2 @@ -7797,8 +7797,8 @@ _08021628: .align 2, 0 _08021630: .4byte gUnknown_2023BC8 _08021634: .4byte gUnknown_2023D74 -_08021638: .4byte gUnknown_2023BC4 -_0802163C: .4byte gUnknown_2023BE4 +_08021638: .4byte gActiveBattler +_0802163C: .4byte gBattleMons thumb_func_end atk1B_faint_effects_clear thumb_func_start atk1C_jumpifstatus @@ -7831,7 +7831,7 @@ atk1C_jumpifstatus: @ 8021640 ldrb r1, [r2, 0x9] lsls r1, 24 adds r3, r1 - ldr r2, _080216A0 @ =gUnknown_2023BE4 + ldr r2, _080216A0 @ =gBattleMons movs r1, 0x58 muls r1, r0 adds r0, r2, 0 @@ -7849,7 +7849,7 @@ atk1C_jumpifstatus: @ 8021640 b _080216AC .align 2, 0 _0802169C: .4byte gUnknown_2023D74 -_080216A0: .4byte gUnknown_2023BE4 +_080216A0: .4byte gBattleMons _080216A4: ldr r1, _080216B4 @ =gUnknown_2023D74 ldr r0, [r1] @@ -7893,7 +7893,7 @@ atk1D_jumpifstatus2: @ 80216B8 ldrb r1, [r2, 0x9] lsls r1, 24 adds r3, r1 - ldr r2, _08021718 @ =gUnknown_2023BE4 + ldr r2, _08021718 @ =gBattleMons movs r1, 0x58 muls r1, r0 adds r0, r2, 0 @@ -7911,7 +7911,7 @@ atk1D_jumpifstatus2: @ 80216B8 b _08021724 .align 2, 0 _08021714: .4byte gUnknown_2023D74 -_08021718: .4byte gUnknown_2023BE4 +_08021718: .4byte gBattleMons _0802171C: ldr r1, _0802172C @ =gUnknown_2023D74 ldr r0, [r1] @@ -7948,7 +7948,7 @@ atk1E_jumpifability: @ 8021730 ldrb r0, [r2, 0x1] cmp r0, 0x8 bne _08021790 - ldr r0, _08021788 @ =gUnknown_2023D6B + ldr r0, _08021788 @ =sBattler_AI ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -7970,12 +7970,12 @@ atk1E_jumpifability: @ 8021730 b _080217EC .align 2, 0 _08021784: .4byte gUnknown_2023D74 -_08021788: .4byte gUnknown_2023D6B +_08021788: .4byte sBattler_AI _0802178C: .4byte gUnknown_2023D6A _08021790: cmp r0, 0x9 bne _080217C8 - ldr r0, _080217C0 @ =gUnknown_2023D6B + ldr r0, _080217C0 @ =sBattler_AI ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -7996,14 +7996,14 @@ _08021790: ldrb r1, [r1] b _080217EC .align 2, 0 -_080217C0: .4byte gUnknown_2023D6B +_080217C0: .4byte sBattler_AI _080217C4: .4byte gUnknown_2023D6A _080217C8: ldrb r0, [r2, 0x1] bl sub_8016E24 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080217F8 @ =gUnknown_2023BE4 + ldr r1, _080217F8 @ =gBattleMons movs r0, 0x58 muls r0, r4 adds r0, r1 @@ -8018,13 +8018,13 @@ _080217C8: adds r0, r4, 0 _080217EC: bl sub_80C71D0 - ldr r0, _08021800 @ =gUnknown_2023FC4 + ldr r0, _08021800 @ =gBattleScripting strb r4, [r0, 0x15] b _0802180A .align 2, 0 -_080217F8: .4byte gUnknown_2023BE4 +_080217F8: .4byte gBattleMons _080217FC: .4byte gUnknown_2023D6A -_08021800: .4byte gUnknown_2023FC4 +_08021800: .4byte gBattleScripting _08021804: ldr r0, [r6] adds r0, 0x7 @@ -8046,15 +8046,15 @@ atk1F_jumpifsideaffecting: @ 8021818 ldrb r4, [r0, 0x1] cmp r4, 0x1 bne _08021838 - ldr r0, _08021834 @ =gUnknown_2023D6B + ldr r0, _08021834 @ =sBattler_AI ldrb r0, [r0] bl GetBankIdentity b _08021842 .align 2, 0 _08021830: .4byte gUnknown_2023D74 -_08021834: .4byte gUnknown_2023D6B +_08021834: .4byte sBattler_AI _08021838: - ldr r0, _08021878 @ =gUnknown_2023D6C + ldr r0, _08021878 @ =gBattlerTarget ldrb r0, [r0] bl GetBankIdentity movs r4, 0x1 @@ -8076,7 +8076,7 @@ _08021842: ldrb r0, [r3, 0x7] lsls r0, 24 adds r5, r1, r0 - ldr r1, _08021880 @ =gUnknown_2023DDE + ldr r1, _08021880 @ =gSideAffecting lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -8086,9 +8086,9 @@ _08021842: str r5, [r6] b _0802188A .align 2, 0 -_08021878: .4byte gUnknown_2023D6C +_08021878: .4byte gBattlerTarget _0802187C: .4byte gUnknown_2023D74 -_08021880: .4byte gUnknown_2023DDE +_08021880: .4byte gSideAffecting _08021884: adds r0, r3, 0 adds r0, 0x8 @@ -8109,7 +8109,7 @@ atk20_jumpifstat: @ 8021890 bl sub_8016E24 lsls r0, 24 lsrs r0, 24 - ldr r2, _080218C8 @ =gUnknown_2023BE4 + ldr r2, _080218C8 @ =gBattleMons ldr r3, [r4] movs r1, 0x58 muls r0, r1 @@ -8128,7 +8128,7 @@ atk20_jumpifstat: @ 8021890 mov pc, r0 .align 2, 0 _080218C4: .4byte gUnknown_2023D74 -_080218C8: .4byte gUnknown_2023BE4 +_080218C8: .4byte gBattleMons _080218CC: .4byte _080218D0 .align 2, 0 _080218D0: @@ -8234,7 +8234,7 @@ atk21_jumpifstatus3condition: @ 8021988 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r5, _080219E0 @ =gUnknown_2023BC4 + ldr r5, _080219E0 @ =gActiveBattler strb r0, [r5] ldr r2, [r4] ldrb r1, [r2, 0x2] @@ -8260,7 +8260,7 @@ atk21_jumpifstatus3condition: @ 8021988 ldrb r0, [r2, 0x6] cmp r0, 0 beq _080219E8 - ldr r0, _080219E4 @ =gUnknown_2023DFC + ldr r0, _080219E4 @ =gStatuses3 ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -8271,10 +8271,10 @@ atk21_jumpifstatus3condition: @ 8021988 b _080219F8 .align 2, 0 _080219DC: .4byte gUnknown_2023D74 -_080219E0: .4byte gUnknown_2023BC4 -_080219E4: .4byte gUnknown_2023DFC +_080219E0: .4byte gActiveBattler +_080219E4: .4byte gStatuses3 _080219E8: - ldr r0, _080219FC @ =gUnknown_2023DFC + ldr r0, _080219FC @ =gStatuses3 ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -8286,7 +8286,7 @@ _080219F8: str r3, [r4] b _08021A06 .align 2, 0 -_080219FC: .4byte gUnknown_2023DFC +_080219FC: .4byte gStatuses3 _08021A00: adds r0, r2, 0 adds r0, 0xB @@ -8318,7 +8318,7 @@ atk22_jumpiftype: @ 8021A0C ldrb r1, [r3, 0x6] lsls r1, 24 adds r6, r2, r1 - ldr r2, _08021A58 @ =gUnknown_2023BE4 + ldr r2, _08021A58 @ =gBattleMons movs r1, 0x58 muls r0, r1 adds r1, r0, r2 @@ -8337,7 +8337,7 @@ _08021A50: b _08021A60 .align 2, 0 _08021A54: .4byte gUnknown_2023D74 -_08021A58: .4byte gUnknown_2023BE4 +_08021A58: .4byte gBattleMons _08021A5C: adds r0, r3, 0x7 str r0, [r4] @@ -8354,7 +8354,7 @@ sub_8021A68: @ 8021A68 mov r6, r8 push {r6,r7} movs r6, 0 - ldr r0, _08021AB0 @ =gUnknown_2023FE8 + ldr r0, _08021AB0 @ =gBattleStruct ldr r0, [r0] adds r0, 0x50 mov r9, r0 @@ -8372,7 +8372,7 @@ sub_8021A68: @ 8021A68 adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r0, _08021AC0 @ =gUnknown_2023FC4 + ldr r0, _08021AC0 @ =gBattleScripting ldrb r0, [r0, 0x1C] cmp r0, 0x6 bls _08021AA4 @@ -8384,11 +8384,11 @@ _08021AA4: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08021AB0: .4byte gUnknown_2023FE8 +_08021AB0: .4byte gBattleStruct _08021AB4: .4byte gUnknown_2023D74 _08021AB8: .4byte gUnknown_2023D6D _08021ABC: .4byte gUnknown_2023F4E -_08021AC0: .4byte gUnknown_2023FC4 +_08021AC0: .4byte gBattleScripting _08021AC4: .4byte _08021AC8 .align 2, 0 _08021AC8: @@ -8409,7 +8409,7 @@ _08021AE4: beq _08021AF8 bl _080223A4 _08021AF8: - ldr r0, _08021B38 @ =gUnknown_2022B4C + ldr r0, _08021B38 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _08021B3C @ =0x00080982 ands r0, r1 @@ -8417,15 +8417,15 @@ _08021AF8: beq _08021B08 bl _080223A4 _08021B08: - ldr r1, _08021B40 @ =gUnknown_2023FC4 + ldr r1, _08021B40 @ =gBattleScripting ldrb r0, [r1, 0x1C] adds r0, 0x1 strb r0, [r1, 0x1C] - ldr r0, _08021B44 @ =gUnknown_2023FE8 + ldr r0, _08021B44 @ =gBattleStruct ldr r2, [r0] adds r2, 0xDF - ldr r3, _08021B48 @ =gUnknown_825E45C - ldr r1, _08021B4C @ =gUnknown_2023BCE + ldr r3, _08021B48 @ =gBitTable + ldr r1, _08021B4C @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -8439,12 +8439,12 @@ _08021B08: bl _080223DA .align 2, 0 _08021B34: .4byte gUnknown_2023D6D -_08021B38: .4byte gUnknown_2022B4C +_08021B38: .4byte gBattleTypeFlags _08021B3C: .4byte 0x00080982 -_08021B40: .4byte gUnknown_2023FC4 -_08021B44: .4byte gUnknown_2023FE8 -_08021B48: .4byte gUnknown_825E45C -_08021B4C: .4byte gUnknown_2023BCE +_08021B40: .4byte gBattleScripting +_08021B44: .4byte gBattleStruct +_08021B48: .4byte gBitTable +_08021B4C: .4byte gBattlerPartyIndexes _08021B50: movs r5, 0 movs r7, 0 @@ -8452,7 +8452,7 @@ _08021B54: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08021BA4 @ =gUnknown_2024284 + ldr r0, _08021BA4 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -8464,7 +8464,7 @@ _08021B54: bl GetMonData cmp r0, 0 beq _08021BC2 - ldr r0, _08021BA8 @ =gUnknown_825E45C + ldr r0, _08021BA8 @ =gBitTable lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -8488,8 +8488,8 @@ _08021B88: ldrb r4, [r0] b _08021BBC .align 2, 0 -_08021BA4: .4byte gUnknown_2024284 -_08021BA8: .4byte gUnknown_825E45C +_08021BA4: .4byte gPlayerParty +_08021BA8: .4byte gBitTable _08021BAC: .4byte gSaveBlock1Ptr _08021BB0: .4byte 0x0000311a _08021BB4: @@ -8504,8 +8504,8 @@ _08021BC2: adds r7, 0x1 cmp r7, 0x5 ble _08021B54 - ldr r3, _08021C28 @ =gUnknown_8254784 - ldr r2, _08021C2C @ =gUnknown_2023BE4 + ldr r3, _08021C28 @ =gBaseStats + ldr r2, _08021C2C @ =gBattleMons ldr r0, _08021C30 @ =gUnknown_2023D6D ldrb r1, [r0] movs r0, 0x58 @@ -8550,8 +8550,8 @@ _08021C0E: strh r0, [r5] b _08021C52 .align 2, 0 -_08021C28: .4byte gUnknown_8254784 -_08021C2C: .4byte gUnknown_2023BE4 +_08021C28: .4byte gBaseStats +_08021C2C: .4byte gBattleMons _08021C30: .4byte gUnknown_2023D6D _08021C34: .4byte gUnknown_2023F52 _08021C38: @@ -8569,12 +8569,12 @@ _08021C4E: ldr r0, _08021C9C @ =gUnknown_2023F52 strh r6, [r0] _08021C52: - ldr r1, _08021CA0 @ =gUnknown_2023FC4 + ldr r1, _08021CA0 @ =gBattleScripting ldrb r0, [r1, 0x1C] adds r0, 0x1 movs r2, 0 strb r0, [r1, 0x1C] - ldr r1, _08021CA4 @ =gUnknown_2023FE8 + ldr r1, _08021CA4 @ =gBattleStruct ldr r0, [r1] strb r2, [r0, 0x10] ldr r0, [r1] @@ -8588,12 +8588,12 @@ _08021C6A: beq _08021C74 b _080223DA _08021C74: - ldr r0, _08021CA4 @ =gUnknown_2023FE8 + ldr r0, _08021CA4 @ =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _08021CAC @ =gUnknown_2024284 + ldr r1, _08021CAC @ =gPlayerParty adds r0, r1 movs r1, 0xC bl GetMonData @@ -8609,10 +8609,10 @@ _08021C74: b _08021CC0 .align 2, 0 _08021C9C: .4byte gUnknown_2023F52 -_08021CA0: .4byte gUnknown_2023FC4 -_08021CA4: .4byte gUnknown_2023FE8 +_08021CA0: .4byte gBattleScripting +_08021CA4: .4byte gBattleStruct _08021CA8: .4byte gUnknown_2023BC8 -_08021CAC: .4byte gUnknown_2024284 +_08021CAC: .4byte gPlayerParty _08021CB0: .4byte gSaveBlock1Ptr _08021CB4: .4byte 0x0000311a _08021CB8: @@ -8620,7 +8620,7 @@ _08021CB8: lsls r0, 24 lsrs r4, r0, 24 _08021CC0: - ldr r5, _08021CE0 @ =gUnknown_2023FE8 + ldr r5, _08021CE0 @ =gBattleStruct cmp r4, 0x19 beq _08021CE8 ldr r0, [r5] @@ -8633,17 +8633,17 @@ _08021CC0: bne _08021CE8 lsrs r0, 1 strb r0, [r1] - ldr r1, _08021CE4 @ =gUnknown_2023FC4 + ldr r1, _08021CE4 @ =gBattleScripting b _08021D0C .align 2, 0 -_08021CE0: .4byte gUnknown_2023FE8 -_08021CE4: .4byte gUnknown_2023FC4 +_08021CE0: .4byte gBattleStruct +_08021CE4: .4byte gBattleScripting _08021CE8: ldr r0, [r5] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _08021D18 @ =gUnknown_2024284 + ldr r1, _08021D18 @ =gPlayerParty adds r0, r1 movs r1, 0x38 bl GetMonData @@ -8654,26 +8654,26 @@ _08021CE8: ldrb r0, [r1] lsrs r0, 1 strb r0, [r1] - ldr r1, _08021D1C @ =gUnknown_2023FC4 + ldr r1, _08021D1C @ =gBattleScripting movs r2, 0 _08021D0C: movs r0, 0x5 strb r0, [r1, 0x1C] - ldr r0, _08021D20 @ =gUnknown_2023D50 + ldr r0, _08021D20 @ =gBattleMoveDamage str r2, [r0] b _080223DA .align 2, 0 -_08021D18: .4byte gUnknown_2024284 -_08021D1C: .4byte gUnknown_2023FC4 -_08021D20: .4byte gUnknown_2023D50 +_08021D18: .4byte gPlayerParty +_08021D1C: .4byte gBattleScripting +_08021D20: .4byte gBattleMoveDamage _08021D24: - ldr r0, _08021D88 @ =gUnknown_2022B4C + ldr r0, _08021D88 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _08021D8C @ =0x00010008 ands r0, r1 cmp r0, 0 bne _08021D52 - ldr r0, _08021D90 @ =gUnknown_2023BE4 + ldr r0, _08021D90 @ =gBattleMons ldrh r0, [r0, 0x28] cmp r0, 0 beq _08021D52 @@ -8689,12 +8689,12 @@ _08021D24: adds r0, 0x1 strb r0, [r1, 0x12] _08021D52: - ldr r5, _08021D98 @ =gUnknown_2023FE8 + ldr r5, _08021D98 @ =gBattleStruct ldr r0, [r5] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _08021D9C @ =gUnknown_2024284 + ldr r1, _08021D9C @ =gPlayerParty adds r0, r1 movs r1, 0x39 bl GetMonData @@ -8709,22 +8709,22 @@ _08021D6C: ands r3, r0 cmp r3, 0 beq _08021DA4 - ldr r1, _08021DA0 @ =gUnknown_2023D50 + ldr r1, _08021DA0 @ =gBattleMoveDamage mov r2, r9 ldrh r0, [r2] str r0, [r1] mov r9, r1 b _08021DAA .align 2, 0 -_08021D88: .4byte gUnknown_2022B4C +_08021D88: .4byte gBattleTypeFlags _08021D8C: .4byte 0x00010008 -_08021D90: .4byte gUnknown_2023BE4 +_08021D90: .4byte gBattleMons _08021D94: .4byte 0x00000137 -_08021D98: .4byte gUnknown_2023FE8 -_08021D9C: .4byte gUnknown_2024284 -_08021DA0: .4byte gUnknown_2023D50 +_08021D98: .4byte gBattleStruct +_08021D9C: .4byte gPlayerParty +_08021DA0: .4byte gBattleMoveDamage _08021DA4: - ldr r0, _08021E28 @ =gUnknown_2023D50 + ldr r0, _08021E28 @ =gBattleMoveDamage str r3, [r0] mov r9, r0 _08021DAA: @@ -8747,13 +8747,13 @@ _08021DBA: bl __divsi3 str r0, [r4] _08021DCE: - ldr r5, _08021E30 @ =gUnknown_2022B4C + ldr r5, _08021E30 @ =gBattleTypeFlags ldr r0, [r5] movs r1, 0x8 ands r0, r1 cmp r0, 0 beq _08021DEA - ldr r4, _08021E28 @ =gUnknown_2023D50 + ldr r4, _08021E28 @ =gBattleMoveDamage ldr r1, [r4] movs r0, 0x96 muls r0, r1 @@ -8761,12 +8761,12 @@ _08021DCE: bl __divsi3 str r0, [r4] _08021DEA: - ldr r0, _08021E34 @ =gUnknown_2023FE8 + ldr r0, _08021E34 @ =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _08021E38 @ =gUnknown_2024284 + ldr r1, _08021E38 @ =gPlayerParty adds r0, r1 bl IsTradedMon lsls r0, 24 @@ -8778,7 +8778,7 @@ _08021DEA: ands r0, r1 cmp r0, 0 bne _08021E3C - ldr r4, _08021E28 @ =gUnknown_2023D50 + ldr r4, _08021E28 @ =gBattleMoveDamage ldr r1, [r4] movs r0, 0x96 muls r0, r1 @@ -8790,29 +8790,29 @@ _08021DEA: mov r9, r4 b _08021E42 .align 2, 0 -_08021E28: .4byte gUnknown_2023D50 +_08021E28: .4byte gBattleMoveDamage _08021E2C: .4byte gUnknown_2023F52 -_08021E30: .4byte gUnknown_2022B4C -_08021E34: .4byte gUnknown_2023FE8 -_08021E38: .4byte gUnknown_2024284 +_08021E30: .4byte gBattleTypeFlags +_08021E34: .4byte gBattleStruct +_08021E38: .4byte gPlayerParty _08021E3C: ldr r7, _08021E78 @ =0x00000149 - ldr r0, _08021E7C @ =gUnknown_2023D50 + ldr r0, _08021E7C @ =gBattleMoveDamage mov r9, r0 _08021E42: - ldr r0, _08021E80 @ =gUnknown_2022B4C + ldr r0, _08021E80 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x1 ands r1, r0 cmp r1, 0 beq _08021EAE - ldr r0, _08021E84 @ =gUnknown_2023BCE - ldr r1, _08021E88 @ =gUnknown_2023FE8 + ldr r0, _08021E84 @ =gBattlerPartyIndexes + ldr r1, _08021E88 @ =gBattleStruct ldr r4, [r1] ldrh r0, [r0, 0x4] adds r5, r1, 0 - ldr r3, _08021E8C @ =gUnknown_825E45C - ldr r2, _08021E90 @ =gUnknown_2023D70 + ldr r3, _08021E8C @ =gBitTable + ldr r2, _08021E90 @ =gAbsentBattlerFlags ldrb r1, [r4, 0x10] cmp r0, r1 bne _08021E94 @@ -8828,12 +8828,12 @@ _08021E42: b _08021EB6 .align 2, 0 _08021E78: .4byte 0x00000149 -_08021E7C: .4byte gUnknown_2023D50 -_08021E80: .4byte gUnknown_2022B4C -_08021E84: .4byte gUnknown_2023BCE -_08021E88: .4byte gUnknown_2023FE8 -_08021E8C: .4byte gUnknown_825E45C -_08021E90: .4byte gUnknown_2023D70 +_08021E7C: .4byte gBattleMoveDamage +_08021E80: .4byte gBattleTypeFlags +_08021E84: .4byte gBattlerPartyIndexes +_08021E88: .4byte gBattleStruct +_08021E8C: .4byte gBitTable +_08021E90: .4byte gAbsentBattlerFlags _08021E94: ldrb r2, [r2] ldr r0, [r3] @@ -8850,7 +8850,7 @@ _08021EA6: movs r1, 0x2 b _08021EB4 _08021EAE: - ldr r0, _08021F5C @ =gUnknown_2023FE8 + ldr r0, _08021F5C @ =gBattleStruct ldr r0, [r0] adds r0, 0x8F _08021EB4: @@ -8863,7 +8863,7 @@ _08021EB6: strb r3, [r1] movs r5, 0x4 strb r5, [r1, 0x1] - ldr r6, _08021F5C @ =gUnknown_2023FE8 + ldr r6, _08021F5C @ =gBattleStruct ldr r2, [r6] movs r4, 0x8F adds r4, r2 @@ -8919,9 +8919,9 @@ _08021EB6: ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _08021F6C @ =gUnknown_2024284 + ldr r1, _08021F6C @ =gPlayerParty adds r0, r1 - ldr r3, _08021F70 @ =gUnknown_2023BE4 + ldr r3, _08021F70 @ =gBattleMons ldr r1, _08021F74 @ =gUnknown_2023D6D ldrb r2, [r1] movs r1, 0x58 @@ -8930,7 +8930,7 @@ _08021EB6: ldrh r1, [r1] bl MonGainEVs _08021F4C: - ldr r0, _08021F5C @ =gUnknown_2023FE8 + ldr r0, _08021F5C @ =gBattleStruct ldr r1, [r0] adds r1, 0x53 ldrb r0, [r1] @@ -8938,12 +8938,12 @@ _08021F4C: strb r0, [r1] b _08022052 .align 2, 0 -_08021F5C: .4byte gUnknown_2023FE8 +_08021F5C: .4byte gBattleStruct _08021F60: .4byte gUnknown_2022AB8 _08021F64: .4byte gUnknown_2022AC8 _08021F68: .4byte gUnknown_2022AD8 -_08021F6C: .4byte gUnknown_2024284 -_08021F70: .4byte gUnknown_2023BE4 +_08021F6C: .4byte gPlayerParty +_08021F70: .4byte gBattleMons _08021F74: .4byte gUnknown_2023D6D _08021F78: ldr r0, _0802205C @ =gUnknown_2023BC8 @@ -8953,7 +8953,7 @@ _08021F78: b _080223DA _08021F82: ldr r1, _08022060 @ =gUnknown_20233C4 - ldr r7, _08022064 @ =gUnknown_2023FE8 + ldr r7, _08022064 @ =gBattleStruct ldr r0, [r7] adds r0, 0x8F ldrb r0, [r0] @@ -8964,7 +8964,7 @@ _08021F82: ldrb r0, [r0, 0x10] movs r6, 0x64 muls r0, r6 - ldr r5, _08022068 @ =gUnknown_2024284 + ldr r5, _08022068 @ =gPlayerParty adds r0, r5 movs r1, 0x39 bl GetMonData @@ -8984,7 +8984,7 @@ _08021F82: adds r0, r5 movs r1, 0x3A bl GetMonData - ldr r4, _0802206C @ =gUnknown_2023FF4 + ldr r4, _0802206C @ =gBattleResources ldr r1, [r4] ldr r1, [r1, 0x10] strh r0, [r1] @@ -9033,21 +9033,21 @@ _08021F82: ldr r1, [r4] ldr r1, [r1, 0x10] strh r0, [r1, 0xA] - ldr r4, _08022070 @ =gUnknown_2023BC4 + ldr r4, _08022070 @ =gActiveBattler ldr r1, [r7] adds r0, r1, 0 adds r0, 0x8F ldrb r0, [r0] strb r0, [r4] ldrb r1, [r1, 0x10] - ldr r0, _08022074 @ =gUnknown_2023D50 + ldr r0, _08022074 @ =gBattleMoveDamage ldrh r2, [r0] movs r0, 0 bl EmitExpUpdate ldrb r0, [r4] bl MarkBufferBankForExecution _08022052: - ldr r1, _08022078 @ =gUnknown_2023FC4 + ldr r1, _08022078 @ =gBattleScripting ldrb r0, [r1, 0x1C] adds r0, 0x1 strb r0, [r1, 0x1C] @@ -9055,12 +9055,12 @@ _08022052: .align 2, 0 _0802205C: .4byte gUnknown_2023BC8 _08022060: .4byte gUnknown_20233C4 -_08022064: .4byte gUnknown_2023FE8 -_08022068: .4byte gUnknown_2024284 -_0802206C: .4byte gUnknown_2023FF4 -_08022070: .4byte gUnknown_2023BC4 -_08022074: .4byte gUnknown_2023D50 -_08022078: .4byte gUnknown_2023FC4 +_08022064: .4byte gBattleStruct +_08022068: .4byte gPlayerParty +_0802206C: .4byte gBattleResources +_08022070: .4byte gActiveBattler +_08022074: .4byte gBattleMoveDamage +_08022078: .4byte gBattleScripting _0802207C: ldr r0, _08022314 @ =gUnknown_2023BC8 ldr r0, [r0] @@ -9068,8 +9068,8 @@ _0802207C: beq _08022086 b _080223DA _08022086: - ldr r1, _08022318 @ =gUnknown_2023BC4 - ldr r0, _0802231C @ =gUnknown_2023FE8 + ldr r1, _08022318 @ =gActiveBattler + ldr r0, _0802231C @ =gBattleStruct ldr r4, [r0] adds r0, r4, 0 adds r0, 0x8F @@ -9091,13 +9091,13 @@ _080220A4: beq _080220B0 b _08022350 _080220B0: - ldr r0, _08022324 @ =gUnknown_2022B4C + ldr r0, _08022324 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 beq _080220DA - ldr r0, _08022328 @ =gUnknown_2023BCE + ldr r0, _08022328 @ =gBattlerPartyIndexes lsls r1, r2, 1 adds r1, r0 ldrh r0, [r1] @@ -9107,7 +9107,7 @@ _080220B0: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _0802232C @ =gUnknown_2024284 + ldr r1, _0802232C @ =gPlayerParty adds r0, r1 adds r1, r2, 0 bl HandleLowHpMusicChange @@ -9117,10 +9117,10 @@ _080220DA: strb r3, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r6, _08022318 @ =gUnknown_2023BC4 + ldr r6, _08022318 @ =gActiveBattler ldrb r0, [r6] strb r0, [r1, 0x2] - ldr r4, _0802231C @ =gUnknown_2023FE8 + ldr r4, _0802231C @ =gBattleStruct mov r9, r4 ldr r2, [r4] ldrb r0, [r2, 0x10] @@ -9140,7 +9140,7 @@ _080220DA: mov r2, r8 muls r2, r0 adds r0, r2, 0 - ldr r7, _0802232C @ =gUnknown_2024284 + ldr r7, _0802232C @ =gPlayerParty adds r0, r7 movs r1, 0x38 bl GetMonData @@ -9150,7 +9150,7 @@ _080220DA: strb r0, [r4, 0x5] bl BattleScriptPushCursor ldr r2, _08022338 @ =gUnknown_3004FD4 - ldr r1, _0802233C @ =gUnknown_825E45C + ldr r1, _0802233C @ =gBitTable mov r4, r9 ldr r5, [r4] ldrb r0, [r5, 0x10] @@ -9163,7 +9163,7 @@ _080220DA: ldr r1, _08022340 @ =gUnknown_2023D74 ldr r0, _08022344 @ =gUnknown_81D89F5 str r0, [r1] - ldr r4, _08022348 @ =gUnknown_2023D50 + ldr r4, _08022348 @ =gBattleMoveDamage ldr r2, _08022320 @ =gUnknown_20233C4 ldrb r1, [r6] lsls r1, 9 @@ -9183,14 +9183,14 @@ _080220DA: adds r0, r7 movs r1, 0 bl sub_80436F8 - ldr r1, _08022328 @ =gUnknown_2023BCE + ldr r1, _08022328 @ =gBattlerPartyIndexes mov r2, r9 ldr r0, [r2] ldrb r2, [r0, 0x10] ldrh r0, [r1] cmp r0, r2 bne _08022246 - ldr r4, _0802234C @ =gUnknown_2023BE4 + ldr r4, _0802234C @ =gBattleMons ldrh r0, [r4, 0x28] cmp r0, 0 beq _08022246 @@ -9283,8 +9283,8 @@ _080220DA: bl GetMonData strh r0, [r4, 0xA] _08022246: - ldr r0, _08022328 @ =gUnknown_2023BCE - ldr r7, _0802231C @ =gUnknown_2023FE8 + ldr r0, _08022328 @ =gBattlerPartyIndexes + ldr r7, _0802231C @ =gBattleStruct ldr r1, [r7] ldrb r2, [r1, 0x10] ldrh r0, [r0, 0x4] @@ -9292,14 +9292,14 @@ _08022246: beq _08022256 b _08022356 _08022256: - ldr r6, _0802234C @ =gUnknown_2023BE4 + ldr r6, _0802234C @ =gBattleMons movs r4, 0xD8 adds r4, r6 mov r8, r4 ldrh r0, [r4] cmp r0, 0 beq _08022356 - ldr r0, _08022324 @ =gUnknown_2022B4C + ldr r0, _08022324 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -9308,7 +9308,7 @@ _08022256: movs r5, 0x64 adds r0, r2, 0 muls r0, r5 - ldr r4, _0802232C @ =gUnknown_2024284 + ldr r4, _0802232C @ =gPlayerParty adds r0, r4 movs r1, 0x38 bl GetMonData @@ -9380,46 +9380,46 @@ _08022256: b _08022356 .align 2, 0 _08022314: .4byte gUnknown_2023BC8 -_08022318: .4byte gUnknown_2023BC4 -_0802231C: .4byte gUnknown_2023FE8 +_08022318: .4byte gActiveBattler +_0802231C: .4byte gBattleStruct _08022320: .4byte gUnknown_20233C4 -_08022324: .4byte gUnknown_2022B4C -_08022328: .4byte gUnknown_2023BCE -_0802232C: .4byte gUnknown_2024284 +_08022324: .4byte gBattleTypeFlags +_08022328: .4byte gBattlerPartyIndexes +_0802232C: .4byte gPlayerParty _08022330: .4byte gUnknown_2022AB8 _08022334: .4byte gUnknown_2022AC8 _08022338: .4byte gUnknown_3004FD4 -_0802233C: .4byte gUnknown_825E45C +_0802233C: .4byte gBitTable _08022340: .4byte gUnknown_2023D74 _08022344: .4byte gUnknown_81D89F5 -_08022348: .4byte gUnknown_2023D50 -_0802234C: .4byte gUnknown_2023BE4 +_08022348: .4byte gBattleMoveDamage +_0802234C: .4byte gBattleMons _08022350: - ldr r1, _08022360 @ =gUnknown_2023D50 + ldr r1, _08022360 @ =gBattleMoveDamage movs r0, 0 str r0, [r1] _08022356: - ldr r1, _08022364 @ =gUnknown_2023FC4 + ldr r1, _08022364 @ =gBattleScripting movs r0, 0x5 strb r0, [r1, 0x1C] b _080223DA .align 2, 0 -_08022360: .4byte gUnknown_2023D50 -_08022364: .4byte gUnknown_2023FC4 +_08022360: .4byte gBattleMoveDamage +_08022364: .4byte gBattleScripting _08022368: - ldr r0, _08022378 @ =gUnknown_2023D50 + ldr r0, _08022378 @ =gBattleMoveDamage ldr r0, [r0] cmp r0, 0 beq _08022380 - ldr r1, _0802237C @ =gUnknown_2023FC4 + ldr r1, _0802237C @ =gBattleScripting movs r0, 0x3 strb r0, [r1, 0x1C] b _080223DA .align 2, 0 -_08022378: .4byte gUnknown_2023D50 -_0802237C: .4byte gUnknown_2023FC4 +_08022378: .4byte gBattleMoveDamage +_0802237C: .4byte gBattleScripting _08022380: - ldr r2, _0802239C @ =gUnknown_2023FE8 + ldr r2, _0802239C @ =gBattleStruct ldr r1, [r2] ldrb r0, [r1, 0x10] adds r0, 0x1 @@ -9428,26 +9428,26 @@ _08022380: ldrb r0, [r0, 0x10] cmp r0, 0x5 bhi _080223A4 - ldr r1, _080223A0 @ =gUnknown_2023FC4 + ldr r1, _080223A0 @ =gBattleScripting movs r0, 0x2 strb r0, [r1, 0x1C] b _080223DA .align 2, 0 -_0802239C: .4byte gUnknown_2023FE8 -_080223A0: .4byte gUnknown_2023FC4 +_0802239C: .4byte gBattleStruct +_080223A0: .4byte gBattleScripting _080223A4: - ldr r1, _080223AC @ =gUnknown_2023FC4 + ldr r1, _080223AC @ =gBattleScripting movs r0, 0x6 strb r0, [r1, 0x1C] b _080223DA .align 2, 0 -_080223AC: .4byte gUnknown_2023FC4 +_080223AC: .4byte gBattleScripting _080223B0: ldr r0, _080223E8 @ =gUnknown_2023BC8 ldr r5, [r0] cmp r5, 0 bne _080223DA - ldr r4, _080223EC @ =gUnknown_2023BE4 + ldr r4, _080223EC @ =gBattleMons ldr r2, _080223F0 @ =gUnknown_2023D6D ldrb r0, [r2] movs r1, 0x58 @@ -9473,7 +9473,7 @@ _080223DA: bx r0 .align 2, 0 _080223E8: .4byte gUnknown_2023BC8 -_080223EC: .4byte gUnknown_2023BE4 +_080223EC: .4byte gBattleMons _080223F0: .4byte gUnknown_2023D6D _080223F4: .4byte gUnknown_2023D74 thumb_func_end sub_8021A68 @@ -9495,7 +9495,7 @@ _0802240C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08022538 @ =gUnknown_2024284 + ldr r0, _08022538 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -9531,7 +9531,7 @@ _08022454: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08022540 @ =gUnknown_202402C + ldr r0, _08022540 @ =gEnemyParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -9564,7 +9564,7 @@ _08022498: ldrb r0, [r2] cmp r0, 0 bne _08022582 - ldr r0, _08022544 @ =gUnknown_2022B4C + ldr r0, _08022544 @ =gBattleTypeFlags ldr r1, [r0] movs r2, 0x2 ands r1, r2 @@ -9646,10 +9646,10 @@ _0802251E: b _0802257A .align 2, 0 _08022534: .4byte gUnknown_2023BC8 -_08022538: .4byte gUnknown_2024284 +_08022538: .4byte gPlayerParty _0802253C: .4byte gUnknown_2023E8A -_08022540: .4byte gUnknown_202402C -_08022544: .4byte gUnknown_2022B4C +_08022540: .4byte gEnemyParty +_08022544: .4byte gBattleTypeFlags _08022548: .4byte gUnknown_2023BCC _0802254C: .4byte gUnknown_2023D74 _08022550: .4byte gUnknown_2023DD0 @@ -9695,14 +9695,14 @@ _08022594: .4byte gUnknown_2023D74 thumb_func_start MoveValuesCleanUp MoveValuesCleanUp: @ 8022598 - ldr r1, _080225C0 @ =gUnknown_2023DCC + ldr r1, _080225C0 @ =gMoveResultFlags movs r0, 0 strb r0, [r1] - ldr r0, _080225C4 @ =gUnknown_2023FC4 + ldr r0, _080225C4 @ =gBattleScripting movs r2, 0 movs r1, 0x1 strb r1, [r0, 0xE] - ldr r0, _080225C8 @ =gUnknown_2023D71 + ldr r0, _080225C8 @ =gCritMultiplier strb r1, [r0] ldr r0, _080225CC @ =gUnknown_2023E82 strb r2, [r0, 0x3] @@ -9716,9 +9716,9 @@ MoveValuesCleanUp: @ 8022598 str r0, [r2] bx lr .align 2, 0 -_080225C0: .4byte gUnknown_2023DCC -_080225C4: .4byte gUnknown_2023FC4 -_080225C8: .4byte gUnknown_2023D71 +_080225C0: .4byte gMoveResultFlags +_080225C4: .4byte gBattleScripting +_080225C8: .4byte gCritMultiplier _080225CC: .4byte gUnknown_2023E82 _080225D0: .4byte gUnknown_2023DD0 _080225D4: .4byte 0xffffbfff @@ -10668,24 +10668,24 @@ atk3B_healthbar_update: @ 8022C68 ldrb r0, [r0, 0x1] cmp r0, 0 bne _08022C88 - ldr r0, _08022C80 @ =gUnknown_2023BC4 - ldr r1, _08022C84 @ =gUnknown_2023D6C + ldr r0, _08022C80 @ =gActiveBattler + ldr r1, _08022C84 @ =gBattlerTarget b _08022C8C .align 2, 0 _08022C7C: .4byte gUnknown_2023D74 -_08022C80: .4byte gUnknown_2023BC4 -_08022C84: .4byte gUnknown_2023D6C +_08022C80: .4byte gActiveBattler +_08022C84: .4byte gBattlerTarget _08022C88: - ldr r0, _08022CB0 @ =gUnknown_2023BC4 - ldr r1, _08022CB4 @ =gUnknown_2023D6B + ldr r0, _08022CB0 @ =gActiveBattler + ldr r1, _08022CB4 @ =sBattler_AI _08022C8C: ldrb r1, [r1] strb r1, [r0] - ldr r0, _08022CB8 @ =gUnknown_2023D50 + ldr r0, _08022CB8 @ =gBattleMoveDamage ldrh r1, [r0] movs r0, 0 bl EmitHealthBarUpdate - ldr r0, _08022CB0 @ =gUnknown_2023BC4 + ldr r0, _08022CB0 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution ldr r1, _08022CBC @ =gUnknown_2023D74 @@ -10695,9 +10695,9 @@ _08022C8C: pop {r0} bx r0 .align 2, 0 -_08022CB0: .4byte gUnknown_2023BC4 -_08022CB4: .4byte gUnknown_2023D6B -_08022CB8: .4byte gUnknown_2023D50 +_08022CB0: .4byte gActiveBattler +_08022CB4: .4byte sBattler_AI +_08022CB8: .4byte gBattleMoveDamage _08022CBC: .4byte gUnknown_2023D74 thumb_func_end atk3B_healthbar_update @@ -10711,24 +10711,24 @@ atk3C_return: @ 8022CC0 thumb_func_start atk3D_end atk3D_end: @ 8022CCC - ldr r0, _08022CE0 @ =gUnknown_2023DCC + ldr r0, _08022CE0 @ =gMoveResultFlags movs r1, 0 strb r1, [r0] - ldr r0, _08022CE4 @ =gUnknown_2023BC4 + ldr r0, _08022CE4 @ =gActiveBattler strb r1, [r0] ldr r1, _08022CE8 @ =gUnknown_2023BE3 movs r0, 0xB strb r0, [r1] bx lr .align 2, 0 -_08022CE0: .4byte gUnknown_2023DCC -_08022CE4: .4byte gUnknown_2023BC4 +_08022CE0: .4byte gMoveResultFlags +_08022CE4: .4byte gActiveBattler _08022CE8: .4byte gUnknown_2023BE3 thumb_func_end atk3D_end thumb_func_start atk3E_end2 atk3E_end2: @ 8022CEC - ldr r1, _08022CFC @ =gUnknown_2023BC4 + ldr r1, _08022CFC @ =gActiveBattler movs r0, 0 strb r0, [r1] ldr r1, _08022D00 @ =gUnknown_2023BE3 @@ -10736,7 +10736,7 @@ atk3E_end2: @ 8022CEC strb r0, [r1] bx lr .align 2, 0 -_08022CFC: .4byte gUnknown_2023BC4 +_08022CFC: .4byte gActiveBattler _08022D00: .4byte gUnknown_2023BE3 thumb_func_end atk3E_end2 @@ -10744,7 +10744,7 @@ _08022D00: .4byte gUnknown_2023BE3 atk3F_end3: @ 8022D04 push {lr} bl BattleScriptPop - ldr r3, _08022D38 @ =gUnknown_2023FF4 + ldr r3, _08022D38 @ =gBattleResources ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0 @@ -10768,7 +10768,7 @@ _08022D1E: pop {r0} bx r0 .align 2, 0 -_08022D38: .4byte gUnknown_2023FF4 +_08022D38: .4byte gBattleResources _08022D3C: .4byte gUnknown_3004F84 thumb_func_end atk3F_end3 @@ -10808,7 +10808,7 @@ atk42_jumpiftype2: @ 8022D70 lsls r0, 24 lsrs r0, 24 ldr r3, [r4] - ldr r2, _08022DBC @ =gUnknown_2023BE4 + ldr r2, _08022DBC @ =gBattleMons movs r1, 0x58 muls r0, r1 adds r0, r2 @@ -10837,7 +10837,7 @@ _08022D9E: b _08022DC4 .align 2, 0 _08022DB8: .4byte gUnknown_2023D74 -_08022DBC: .4byte gUnknown_2023BE4 +_08022DBC: .4byte gBattleMons _08022DC0: adds r0, r3, 0x7 str r0, [r4] @@ -10891,9 +10891,9 @@ _08022E0E: thumb_func_start atk44_endselectionscript atk44_endselectionscript: @ 8022E18 - ldr r0, _08022E2C @ =gUnknown_2023D6B + ldr r0, _08022E2C @ =sBattler_AI ldrb r0, [r0] - ldr r1, _08022E30 @ =gUnknown_2023FE8 + ldr r1, _08022E30 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x54 @@ -10901,8 +10901,8 @@ atk44_endselectionscript: @ 8022E18 strb r1, [r0] bx lr .align 2, 0 -_08022E2C: .4byte gUnknown_2023D6B -_08022E30: .4byte gUnknown_2023FE8 +_08022E2C: .4byte sBattler_AI +_08022E30: .4byte gBattleStruct thumb_func_end atk44_endselectionscript thumb_func_start sub_8022E34 @@ -10912,7 +10912,7 @@ sub_8022E34: @ 8022E34 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r6, _08022E88 @ =gUnknown_2023BC4 + ldr r6, _08022E88 @ =gActiveBattler strb r0, [r6] ldr r2, [r4] ldrb r1, [r2, 0x3] @@ -10942,12 +10942,12 @@ _08022E6E: ldrh r2, [r3] movs r0, 0 bl EmitBattleAnimation - ldr r0, _08022E88 @ =gUnknown_2023BC4 + ldr r0, _08022E88 @ =gActiveBattler ldrb r0, [r0] b _08022EE4 .align 2, 0 _08022E84: .4byte gUnknown_2023D74 -_08022E88: .4byte gUnknown_2023BC4 +_08022E88: .4byte gActiveBattler _08022E8C: ldr r0, _08022EA4 @ =gUnknown_2023DD0 ldr r0, [r0] @@ -10969,7 +10969,7 @@ _08022EAC: lsrs r0, 24 cmp r0, 0x3 bls _08022ED8 - ldr r1, _08022ED0 @ =gUnknown_2023DFC + ldr r1, _08022ED0 @ =gStatuses3 ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -10981,7 +10981,7 @@ _08022EAC: adds r0, r2, 0x7 b _08022EEC .align 2, 0 -_08022ED0: .4byte gUnknown_2023DFC +_08022ED0: .4byte gStatuses3 _08022ED4: .4byte 0x000400c0 _08022ED8: ldrb r1, [r2, 0x2] @@ -11007,7 +11007,7 @@ atk46_playanimation2: @ 8022EF4 ldr r0, [r6] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r7, _08022F60 @ =gUnknown_2023BC4 + ldr r7, _08022F60 @ =gActiveBattler strb r0, [r7] ldr r2, [r6] ldrb r1, [r2, 0x2] @@ -11043,7 +11043,7 @@ _08022F3E: ldrh r2, [r4] movs r0, 0 bl EmitBattleAnimation - ldr r0, _08022F60 @ =gUnknown_2023BC4 + ldr r0, _08022F60 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution ldr r1, _08022F5C @ =gUnknown_2023D74 @@ -11053,7 +11053,7 @@ _08022F3E: b _08022FBA .align 2, 0 _08022F5C: .4byte gUnknown_2023D74 -_08022F60: .4byte gUnknown_2023BC4 +_08022F60: .4byte gActiveBattler _08022F64: ldr r0, _08022F74 @ =gUnknown_2023DD0 ldr r0, [r0] @@ -11072,7 +11072,7 @@ _08022F78: lsrs r0, 24 cmp r0, 0x3 bls _08022FA4 - ldr r1, _08022F9C @ =gUnknown_2023DFC + ldr r1, _08022F9C @ =gStatuses3 ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -11084,7 +11084,7 @@ _08022F78: adds r0, r2, 0 b _08022FB6 .align 2, 0 -_08022F9C: .4byte gUnknown_2023DFC +_08022F9C: .4byte gStatuses3 _08022FA0: .4byte 0x000400c0 _08022FA4: ldrb r1, [r3] @@ -11107,7 +11107,7 @@ _08022FBA: atk47_setgraphicalstatchangevalues: @ 8022FC0 push {r4,lr} movs r3, 0 - ldr r1, _08022FDC @ =gUnknown_2023FC4 + ldr r1, _08022FDC @ =gBattleScripting ldrb r0, [r1, 0x1A] movs r2, 0xF0 ands r2, r0 @@ -11120,7 +11120,7 @@ atk47_setgraphicalstatchangevalues: @ 8022FC0 beq _08022FEA b _08022FF8 .align 2, 0 -_08022FDC: .4byte gUnknown_2023FC4 +_08022FDC: .4byte gBattleScripting _08022FE0: cmp r2, 0x90 beq _08022FF2 @@ -11175,7 +11175,7 @@ atk48_playstatchangeanimation: @ 802301C ldrb r0, [r0, 0x1] str r3, [sp] bl sub_8016E24 - ldr r2, _08023094 @ =gUnknown_2023BC4 + ldr r2, _08023094 @ =gActiveBattler strb r0, [r2] ldr r0, [r5] ldrb r4, [r0, 0x2] @@ -11212,7 +11212,7 @@ _0802306A: ands r0, r1 cmp r0, 0 beq _0802309C - ldr r0, _08023094 @ =gUnknown_2023BC4 + ldr r0, _08023094 @ =gActiveBattler ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -11220,10 +11220,10 @@ _0802306A: b _080230E4 .align 2, 0 _08023090: .4byte gUnknown_2023D74 -_08023094: .4byte gUnknown_2023BC4 +_08023094: .4byte gActiveBattler _08023098: .4byte gUnknown_2023BFC _0802309C: - ldr r6, _08023120 @ =gUnknown_2023BC4 + ldr r6, _08023120 @ =gActiveBattler ldrb r0, [r6] str r3, [sp] bl GetBankIdentity @@ -11238,7 +11238,7 @@ _0802309C: ldr r3, [sp] cmp r0, 0 bne _080230F6 - ldr r0, _08023128 @ =gUnknown_2023BE4 + ldr r0, _08023128 @ =gBattleMons ldrb r2, [r6] movs r1, 0x58 muls r2, r1 @@ -11294,9 +11294,9 @@ _08023104: movs r0, 0x3A b _08023190 .align 2, 0 -_08023120: .4byte gUnknown_2023BC4 +_08023120: .4byte gActiveBattler _08023124: .4byte gUnknown_2023DE4 -_08023128: .4byte gUnknown_2023BE4 +_08023128: .4byte gBattleMons _0802312C: .4byte gUnknown_2023D74 _08023130: movs r0, 0x2 @@ -11371,7 +11371,7 @@ _080231AC: .4byte gUnknown_2023BFC _080231B0: cmp r3, 0 beq _080231F8 - ldr r4, _080231EC @ =gUnknown_2023FC4 + ldr r4, _080231EC @ =gBattleScripting ldrb r0, [r4, 0x1B] cmp r0, 0 bne _080231F8 @@ -11380,7 +11380,7 @@ _080231B0: mov r2, r8 str r3, [sp] bl EmitBattleAnimation - ldr r0, _080231F0 @ =gUnknown_2023BC4 + ldr r0, _080231F0 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution ldr r0, _080231F4 @ =gUnknown_2023D74 @@ -11399,8 +11399,8 @@ _080231E8: ldr r1, _080231F4 @ =gUnknown_2023D74 b _080231FA .align 2, 0 -_080231EC: .4byte gUnknown_2023FC4 -_080231F0: .4byte gUnknown_2023BC4 +_080231EC: .4byte gBattleScripting +_080231F0: .4byte gActiveBattler _080231F4: .4byte gUnknown_2023D74 _080231F8: mov r1, r9 @@ -11445,8 +11445,8 @@ _08023232: str r4, [sp, 0x10] ldrb r0, [r0, 0x2] str r0, [sp, 0x14] - ldr r1, _0802326C @ =gUnknown_2023BE4 - ldr r0, _08023270 @ =gUnknown_2023D6B + ldr r1, _0802326C @ =gBattleMons + ldr r0, _08023270 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -11465,8 +11465,8 @@ _08023232: _08023260: .4byte gUnknown_2023D4C _08023264: .4byte 0x0000ffff _08023268: .4byte gUnknown_2023D74 -_0802326C: .4byte gUnknown_2023BE4 -_08023270: .4byte gUnknown_2023D6B +_0802326C: .4byte gBattleMons +_08023270: .4byte sBattler_AI _08023274: .4byte gUnknown_2023F54 _08023278: ldrh r0, [r1, 0x2E] @@ -11475,8 +11475,8 @@ _08023278: lsrs r0, 24 _08023282: str r0, [sp, 0x8] - ldr r1, _080232A4 @ =gUnknown_2023FE8 - ldr r0, _080232A8 @ =gUnknown_2023D6B + ldr r1, _080232A4 @ =gBattleStruct + ldr r0, _080232A8 @ =sBattler_AI ldrb r0, [r0] lsls r0, 1 adds r0, 0xC8 @@ -11491,10 +11491,10 @@ _08023282: str r5, [sp, 0x4] b _08023346 .align 2, 0 -_080232A4: .4byte gUnknown_2023FE8 -_080232A8: .4byte gUnknown_2023D6B +_080232A4: .4byte gBattleStruct +_080232A8: .4byte sBattler_AI _080232AC: - ldr r4, _080232C0 @ =gUnknown_2023BC4 + ldr r4, _080232C0 @ =gActiveBattler strb r2, [r4] movs r0, 0 movs r1, 0x1 @@ -11503,9 +11503,9 @@ _080232AC: bl MarkBufferBankForExecution b _0802379E .align 2, 0 -_080232C0: .4byte gUnknown_2023BC4 +_080232C0: .4byte gActiveBattler _080232C4: - ldr r4, _080232E8 @ =gUnknown_2023BC4 + ldr r4, _080232E8 @ =gActiveBattler strb r2, [r4] movs r0, 0 movs r1, 0 @@ -11521,14 +11521,14 @@ _080232C4: str r0, [r1] b _0802379E .align 2, 0 -_080232E8: .4byte gUnknown_2023BC4 +_080232E8: .4byte gActiveBattler _080232EC: .4byte 0xfffbff3f _080232F0: strb r2, [r7] ldr r0, [r5] orrs r0, r6 str r0, [r5] - ldr r0, _08023324 @ =gUnknown_2023FC4 + ldr r0, _08023324 @ =gBattleScripting strb r4, [r0, 0x14] bl MoveValuesCleanUp ldr r2, _08023328 @ =gUnknown_81D65A8 @@ -11547,13 +11547,13 @@ _080232F0: ldr r0, _08023330 @ =gUnknown_81D96A8 bl _08023BFC .align 2, 0 -_08023324: .4byte gUnknown_2023FC4 +_08023324: .4byte gBattleScripting _08023328: .4byte gUnknown_81D65A8 _0802332C: .4byte gUnknown_2023D74 _08023330: .4byte gUnknown_81D96A8 _08023334: - ldr r2, _0802334C @ =gUnknown_8250C04 - ldr r0, _08023350 @ =gUnknown_2023D4A + ldr r2, _0802334C @ =gBattleMoves + ldr r0, _08023350 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -11562,13 +11562,13 @@ _08023334: ldrb r0, [r0, 0x2] str r0, [sp, 0x4] _08023346: - ldr r1, _08023354 @ =gUnknown_2023FC4 + ldr r1, _08023354 @ =gBattleScripting mov r12, r1 b _08023362 .align 2, 0 -_0802334C: .4byte gUnknown_8250C04 -_08023350: .4byte gUnknown_2023D4A -_08023354: .4byte gUnknown_2023FC4 +_0802334C: .4byte gBattleMoves +_08023350: .4byte gCurrentMove +_08023354: .4byte gBattleScripting _08023358: mov r2, r10 cmp r2, 0 @@ -11609,8 +11609,8 @@ _0802337C: .4byte _08023B28 .4byte _08023BB4 _080233C4: - ldr r6, _0802347C @ =gUnknown_2023BE4 - ldr r5, _08023480 @ =gUnknown_2023D6C + ldr r6, _0802347C @ =gBattleMons + ldr r5, _08023480 @ =gBattlerTarget ldrb r3, [r5] movs r7, 0x58 adds r2, r3, 0 @@ -11632,7 +11632,7 @@ _080233E4: bne _080233EE b _080237C8 _080233EE: - ldr r0, _08023484 @ =gUnknown_2023D6B + ldr r0, _08023484 @ =sBattler_AI ldrb r1, [r0] cmp r1, r3 bne _080233F8 @@ -11649,7 +11649,7 @@ _080233F8: bne _08023410 b _080237C8 _08023410: - ldr r0, _08023488 @ =gUnknown_2023DCC + ldr r0, _08023488 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -11676,8 +11676,8 @@ _0802341E: bne _08023442 b _080237C8 _08023442: - ldr r2, _08023490 @ =gUnknown_8250C04 - ldr r0, _08023494 @ =gUnknown_2023D4A + ldr r2, _08023490 @ =gBattleMoves + ldr r0, _08023494 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -11706,18 +11706,18 @@ _0802346A: str r0, [r1] b _080236FC .align 2, 0 -_0802347C: .4byte gUnknown_2023BE4 -_08023480: .4byte gUnknown_2023D6C -_08023484: .4byte gUnknown_2023D6B -_08023488: .4byte gUnknown_2023DCC +_0802347C: .4byte gBattleMons +_08023480: .4byte gBattlerTarget +_08023484: .4byte sBattler_AI +_08023488: .4byte gMoveResultFlags _0802348C: .4byte gUnknown_2023ECC -_08023490: .4byte gUnknown_8250C04 -_08023494: .4byte gUnknown_2023D4A +_08023490: .4byte gBattleMoves +_08023494: .4byte gCurrentMove _08023498: .4byte gUnknown_2023D74 _0802349C: .4byte gUnknown_81D8C48 _080234A0: - ldr r4, _0802353C @ =gUnknown_2023BE4 - ldr r6, _08023540 @ =gUnknown_2023D6C + ldr r4, _0802353C @ =gBattleMons + ldr r6, _08023540 @ =gBattlerTarget ldrb r2, [r6] movs r5, 0x58 mov r12, r5 @@ -11739,7 +11739,7 @@ _080234C0: bne _080234CA b _080237C8 _080234CA: - ldr r0, _08023544 @ =gUnknown_2023D6B + ldr r0, _08023544 @ =sBattler_AI ldrb r0, [r0] cmp r0, r2 bne _080234D4 @@ -11756,7 +11756,7 @@ _080234D4: bne _080234E8 b _080237C8 _080234E8: - ldr r0, _0802354C @ =gUnknown_2023DCC + ldr r0, _0802354C @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -11773,7 +11773,7 @@ _080234FE: negs r0, r0 ands r3, r0 str r3, [r5] - ldr r4, _08023550 @ =gUnknown_2023BC4 + ldr r4, _08023550 @ =gActiveBattler ldrb r0, [r6] strb r0, [r4] ldrb r0, [r6] @@ -11797,16 +11797,16 @@ _080234FE: mov r10, r2 b _080237C8 .align 2, 0 -_0802353C: .4byte gUnknown_2023BE4 -_08023540: .4byte gUnknown_2023D6C -_08023544: .4byte gUnknown_2023D6B +_0802353C: .4byte gBattleMons +_08023540: .4byte gBattlerTarget +_08023544: .4byte sBattler_AI _08023548: .4byte gUnknown_2023ECC -_0802354C: .4byte gUnknown_2023DCC -_08023550: .4byte gUnknown_2023BC4 +_0802354C: .4byte gMoveResultFlags +_08023550: .4byte gActiveBattler _08023554: .4byte gUnknown_2023D74 _08023558: .4byte gUnknown_81D9098 _0802355C: - ldr r0, _0802357C @ =gUnknown_2023D6C + ldr r0, _0802357C @ =gBattlerTarget ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -11823,9 +11823,9 @@ _08023576: mov r10, r3 b _080237C8 .align 2, 0 -_0802357C: .4byte gUnknown_2023D6C +_0802357C: .4byte gBattlerTarget _08023580: - ldr r0, _08023594 @ =gUnknown_2023D6C + ldr r0, _08023594 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -11835,7 +11835,7 @@ _08023580: bl sub_8019F18 b _080236F6 .align 2, 0 -_08023594: .4byte gUnknown_2023D6C +_08023594: .4byte gBattlerTarget _08023598: movs r0, 0 str r0, [sp] @@ -11851,13 +11851,13 @@ _08023598: _080235B0: movs r5, 0x1 mov r10, r5 - ldr r0, _080235BC @ =gUnknown_2023FC4 + ldr r0, _080235BC @ =gBattleScripting mov r12, r0 b _08023BB4 .align 2, 0 -_080235BC: .4byte gUnknown_2023FC4 +_080235BC: .4byte gBattleScripting _080235C0: - ldr r0, _080235E0 @ =gUnknown_2023D6B + ldr r0, _080235E0 @ =sBattler_AI ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -11874,7 +11874,7 @@ _080235DA: mov r10, r1 b _080237C8 .align 2, 0 -_080235E0: .4byte gUnknown_2023D6B +_080235E0: .4byte sBattler_AI _080235E4: ldr r0, _08023674 @ =gUnknown_2023DD0 ldr r0, [r0] @@ -11901,7 +11901,7 @@ _080235E4: _08023610: cmp r2, 0xE2 bne _08023622 - ldr r0, _08023680 @ =gUnknown_2023DCC + ldr r0, _08023680 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x20 ands r0, r1 @@ -11914,8 +11914,8 @@ _08023622: strh r0, [r1] _08023628: movs r4, 0 - ldr r2, _08023684 @ =gUnknown_2023BE4 - ldr r3, _08023688 @ =gUnknown_2023D6B + ldr r2, _08023684 @ =gBattleMons + ldr r3, _08023688 @ =sBattler_AI ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -11958,9 +11958,9 @@ _0802366A: _08023674: .4byte gUnknown_2023DD0 _08023678: .4byte gUnknown_2023D4C _0802367C: .4byte 0x0000ffff -_08023680: .4byte gUnknown_2023DCC -_08023684: .4byte gUnknown_2023BE4 -_08023688: .4byte gUnknown_2023D6B +_08023680: .4byte gMoveResultFlags +_08023684: .4byte gBattleMons +_08023688: .4byte sBattler_AI _0802368C: movs r4, 0 ldr r0, _080236C0 @ =gUnknown_2023BCC @@ -11969,11 +11969,11 @@ _0802368C: blt _08023698 b _08023846 _08023698: - ldr r7, _080236C4 @ =gUnknown_2023FE8 + ldr r7, _080236C4 @ =gBattleStruct movs r6, 0 movs r3, 0xD0 adds r5, r0, 0 - ldr r2, _080236C8 @ =gUnknown_2023BE4 + ldr r2, _080236C8 @ =gBattleMons _080236A2: ldr r0, [r7] adds r0, r3 @@ -11992,8 +11992,8 @@ _080236B0: b _08023846 .align 2, 0 _080236C0: .4byte gUnknown_2023BCC -_080236C4: .4byte gUnknown_2023FE8 -_080236C8: .4byte gUnknown_2023BE4 +_080236C4: .4byte gBattleStruct +_080236C8: .4byte gBattleMons _080236CC: movs r0, 0x3 movs r1, 0 @@ -12004,11 +12004,11 @@ _080236CC: beq _080237C8 movs r2, 0x1 mov r10, r2 - ldr r3, _080236E8 @ =gUnknown_2023FC4 + ldr r3, _080236E8 @ =gBattleScripting mov r12, r3 b _08023BB4 .align 2, 0 -_080236E8: .4byte gUnknown_2023FC4 +_080236E8: .4byte gBattleScripting _080236EC: movs r0, 0x4 movs r1, 0 @@ -12023,8 +12023,8 @@ _080236FC: mov r10, r4 b _080237C8 _08023702: - ldr r1, _08023728 @ =gUnknown_2023DFC - ldr r0, _0802372C @ =gUnknown_2023D6B + ldr r1, _08023728 @ =gStatuses3 + ldr r0, _0802372C @ =sBattler_AI ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -12045,19 +12045,19 @@ _08023718: _08023726: b _08023AFA .align 2, 0 -_08023728: .4byte gUnknown_2023DFC -_0802372C: .4byte gUnknown_2023D6B +_08023728: .4byte gStatuses3 +_0802372C: .4byte sBattler_AI _08023730: .4byte 0x000400c0 _08023734: .4byte gUnknown_2023DD0 _08023738: - ldr r0, _080237A8 @ =gUnknown_2023DCC + ldr r0, _080237A8 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 bne _08023764 - ldr r1, _080237AC @ =gUnknown_2023DFC - ldr r0, _080237B0 @ =gUnknown_2023D6B + ldr r1, _080237AC @ =gStatuses3 + ldr r0, _080237B0 @ =sBattler_AI ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -12072,8 +12072,8 @@ _08023738: cmp r0, 0 beq _080237C8 _08023764: - ldr r4, _080237B8 @ =gUnknown_2023BC4 - ldr r5, _080237B0 @ =gUnknown_2023D6B + ldr r4, _080237B8 @ =gActiveBattler + ldr r5, _080237B0 @ =sBattler_AI ldrb r0, [r5] strb r0, [r4] movs r0, 0 @@ -12081,7 +12081,7 @@ _08023764: bl EmitSpriteInvisibility ldrb r0, [r4] bl MarkBufferBankForExecution - ldr r0, _080237AC @ =gUnknown_2023DFC + ldr r0, _080237AC @ =gStatuses3 ldrb r2, [r5] lsls r2, 2 adds r2, r0 @@ -12100,32 +12100,32 @@ _08023764: orrs r1, r2 strb r1, [r0] _0802379E: - ldr r1, _080237C4 @ =gUnknown_2023FC4 + ldr r1, _080237C4 @ =gBattleScripting ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] b _08023BFE .align 2, 0 -_080237A8: .4byte gUnknown_2023DCC -_080237AC: .4byte gUnknown_2023DFC -_080237B0: .4byte gUnknown_2023D6B +_080237A8: .4byte gMoveResultFlags +_080237AC: .4byte gStatuses3 +_080237B0: .4byte sBattler_AI _080237B4: .4byte 0x000400c0 -_080237B8: .4byte gUnknown_2023BC4 +_080237B8: .4byte gActiveBattler _080237BC: .4byte 0xfffbff3f _080237C0: .4byte gUnknown_2023ECC -_080237C4: .4byte gUnknown_2023FC4 +_080237C4: .4byte gBattleScripting _080237C8: - ldr r1, _080237D4 @ =gUnknown_2023FC4 + ldr r1, _080237D4 @ =gBattleScripting ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] mov r12, r1 b _08023BB4 .align 2, 0 -_080237D4: .4byte gUnknown_2023FC4 +_080237D4: .4byte gBattleScripting _080237D8: ldr r0, _08023808 @ =gUnknown_2023ECC - ldr r6, _0802380C @ =gUnknown_2023D6C + ldr r6, _0802380C @ =gBattlerTarget ldrb r2, [r6] lsls r3, r2, 2 adds r1, r3, r2 @@ -12139,7 +12139,7 @@ _080237D8: ldrb r0, [r0] cmp r2, r0 bcs _08023846 - ldr r5, _08023814 @ =gUnknown_2023DFC + ldr r5, _08023814 @ =gStatuses3 adds r0, r3, r5 ldr r0, [r0] ldr r1, _08023818 @ =0x000400c0 @@ -12151,9 +12151,9 @@ _08023806: b _08023846 .align 2, 0 _08023808: .4byte gUnknown_2023ECC -_0802380C: .4byte gUnknown_2023D6C +_0802380C: .4byte gBattlerTarget _08023810: .4byte gUnknown_2023BCC -_08023814: .4byte gUnknown_2023DFC +_08023814: .4byte gStatuses3 _08023818: .4byte 0x000400c0 _0802381C: movs r4, 0 @@ -12161,7 +12161,7 @@ _0802381C: ldrb r2, [r0] cmp r4, r2 bge _08023846 - ldr r2, _08023854 @ =gUnknown_2023E0C + ldr r2, _08023854 @ =gDisableStructs ldr r5, _08023858 @ =0xfeffffff adds r3, r0, 0 ldr r1, _0802385C @ =gUnknown_2023C34 @@ -12187,7 +12187,7 @@ _08023846: b _08023BB4 .align 2, 0 _08023850: .4byte gUnknown_2023BCC -_08023854: .4byte gUnknown_2023E0C +_08023854: .4byte gDisableStructs _08023858: .4byte 0xfeffffff _0802385C: .4byte gUnknown_2023C34 _08023860: @@ -12196,15 +12196,15 @@ _08023860: movs r0, 0x80 lsls r0, 5 ands r0, r3 - ldr r2, _08023918 @ =gUnknown_2023D6B + ldr r2, _08023918 @ =sBattler_AI mov r9, r2 adds r5, r1, 0 cmp r0, 0 beq _0802388A - ldr r0, _0802391C @ =gUnknown_2023BC4 + ldr r0, _0802391C @ =gActiveBattler ldrb r2, [r2] strb r2, [r0] - ldr r1, _08023920 @ =gUnknown_2023D6C + ldr r1, _08023920 @ =gBattlerTarget ldrb r0, [r1] mov r4, r9 strb r0, [r4] @@ -12228,9 +12228,9 @@ _0802388A: ldrh r0, [r0] strh r0, [r1] _080238A6: - ldr r0, _08023930 @ =gUnknown_2023D70 + ldr r0, _08023930 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _08023934 @ =gUnknown_825E45C + ldr r2, _08023934 @ =gBitTable mov r3, r9 ldrb r4, [r3] lsls r0, r4, 2 @@ -12242,7 +12242,7 @@ _080238A6: beq _080238C0 b _08023A2C _080238C0: - ldr r0, _08023938 @ =gUnknown_2023FE8 + ldr r0, _08023938 @ =gBattleStruct ldr r1, [r0] adds r1, 0x91 ldrb r1, [r1] @@ -12252,7 +12252,7 @@ _080238C0: beq _080238D2 b _08023A2C _080238D2: - ldr r0, _0802393C @ =gUnknown_8250C04 + ldr r0, _0802393C @ =gBattleMoves ldr r2, [sp, 0x18] lsls r1, r2, 1 adds r1, r2 @@ -12270,7 +12270,7 @@ _080238E8: ands r0, r1 cmp r0, 0 beq _0802394C - ldr r0, _08023940 @ =gUnknown_2023D98 + ldr r0, _08023940 @ =gLastUsedMove lsls r1, r4, 1 adds r1, r0 ldr r0, _0802392C @ =gUnknown_2023D4C @@ -12281,27 +12281,27 @@ _080238E8: ldrb r1, [r3] lsls r1, 1 adds r1, r0 - ldr r0, _08023948 @ =gUnknown_2023D4A + ldr r0, _08023948 @ =gCurrentMove ldrh r0, [r0] strh r0, [r1] b _08023966 .align 2, 0 _08023914: .4byte gUnknown_2023DD0 -_08023918: .4byte gUnknown_2023D6B -_0802391C: .4byte gUnknown_2023BC4 -_08023920: .4byte gUnknown_2023D6C +_08023918: .4byte sBattler_AI +_0802391C: .4byte gActiveBattler +_08023920: .4byte gBattlerTarget _08023924: .4byte 0xffffefff _08023928: .4byte gUnknown_2023D90 _0802392C: .4byte gUnknown_2023D4C -_08023930: .4byte gUnknown_2023D70 -_08023934: .4byte gUnknown_825E45C -_08023938: .4byte gUnknown_2023FE8 -_0802393C: .4byte gUnknown_8250C04 -_08023940: .4byte gUnknown_2023D98 +_08023930: .4byte gAbsentBattlerFlags +_08023934: .4byte gBitTable +_08023938: .4byte gBattleStruct +_0802393C: .4byte gBattleMoves +_08023940: .4byte gLastUsedMove _08023944: .4byte gUnknown_2023DB0 -_08023948: .4byte gUnknown_2023D4A +_08023948: .4byte gCurrentMove _0802394C: - ldr r1, _080239B4 @ =gUnknown_2023D98 + ldr r1, _080239B4 @ =gLastUsedMove lsls r0, r4, 1 adds r0, r1 ldr r1, _080239B8 @ =0x0000ffff @@ -12315,7 +12315,7 @@ _0802394C: negs r1, r1 strh r1, [r0] _08023966: - ldr r2, _080239C0 @ =gUnknown_2023D6C + ldr r2, _080239C0 @ =gBattlerTarget ldrb r3, [r2] lsls r0, r3, 2 adds r0, r6 @@ -12337,7 +12337,7 @@ _08023984: ands r0, r1 cmp r0, 0 beq _08023A20 - ldr r0, _080239C8 @ =gUnknown_2023DCC + ldr r0, _080239C8 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -12355,12 +12355,12 @@ _08023984: strh r3, [r0] b _08023A2C .align 2, 0 -_080239B4: .4byte gUnknown_2023D98 +_080239B4: .4byte gLastUsedMove _080239B8: .4byte 0x0000ffff _080239BC: .4byte gUnknown_2023DB0 -_080239C0: .4byte gUnknown_2023D6C +_080239C0: .4byte gBattlerTarget _080239C4: .4byte gUnknown_2023DC0 -_080239C8: .4byte gUnknown_2023DCC +_080239C8: .4byte gMoveResultFlags _080239CC: .4byte gUnknown_2023D4C _080239D0: .4byte gUnknown_2023DA0 _080239D4: @@ -12368,7 +12368,7 @@ _080239D4: ldrb r1, [r2] lsls r1, 1 adds r1, r0 - ldr r4, _080239FC @ =gUnknown_2023D4A + ldr r4, _080239FC @ =gCurrentMove ldrh r0, [r4] strh r0, [r1] ldr r0, [r7] @@ -12384,7 +12384,7 @@ _080239D4: b _08023A2A .align 2, 0 _080239F8: .4byte gUnknown_2023DA0 -_080239FC: .4byte gUnknown_2023D4A +_080239FC: .4byte gCurrentMove _08023A00: .4byte gUnknown_2023DA8 _08023A04: ldr r0, _08023A1C @ =gUnknown_2023DA8 @@ -12419,10 +12419,10 @@ _08023A2C: _08023A38: .4byte gUnknown_2023DA0 _08023A3C: .4byte 0x0000ffff _08023A40: - ldr r0, _08023B04 @ =gUnknown_2023D70 + ldr r0, _08023B04 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r7, _08023B08 @ =gUnknown_825E45C - ldr r2, _08023B0C @ =gUnknown_2023D6B + ldr r7, _08023B08 @ =gBitTable + ldr r2, _08023B0C @ =sBattler_AI ldrb r3, [r2] lsls r0, r3, 2 adds r0, r7 @@ -12431,7 +12431,7 @@ _08023A40: mov r9, r2 cmp r1, 0 bne _08023AFA - ldr r6, _08023B10 @ =gUnknown_2023FE8 + ldr r6, _08023B10 @ =gBattleStruct ldr r5, [r6] adds r0, r5, 0 adds r0, 0x91 @@ -12439,7 +12439,7 @@ _08023A40: ands r0, r4 cmp r0, 0 bne _08023AFA - ldr r1, _08023B14 @ =gUnknown_8250C04 + ldr r1, _08023B14 @ =gBattleMoves ldr r2, [sp, 0x18] lsls r0, r2, 1 adds r0, r2 @@ -12457,7 +12457,7 @@ _08023A40: ands r0, r1 cmp r0, 0 beq _08023AFA - ldr r4, _08023B1C @ =gUnknown_2023D6C + ldr r4, _08023B1C @ =gBattlerTarget ldrb r0, [r4] cmp r3, r0 beq _08023AFA @@ -12469,7 +12469,7 @@ _08023A40: ands r1, r0 cmp r1, 0 bne _08023AFA - ldr r0, _08023B20 @ =gUnknown_2023DCC + ldr r0, _08023B20 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -12519,14 +12519,14 @@ _08023AFA: strb r0, [r5, 0x14] b _08023BB4 .align 2, 0 -_08023B04: .4byte gUnknown_2023D70 -_08023B08: .4byte gUnknown_825E45C -_08023B0C: .4byte gUnknown_2023D6B -_08023B10: .4byte gUnknown_2023FE8 -_08023B14: .4byte gUnknown_8250C04 +_08023B04: .4byte gAbsentBattlerFlags +_08023B08: .4byte gBitTable +_08023B0C: .4byte sBattler_AI +_08023B10: .4byte gBattleStruct +_08023B14: .4byte gBattleMoves _08023B18: .4byte gUnknown_2023DD0 -_08023B1C: .4byte gUnknown_2023D6C -_08023B20: .4byte gUnknown_2023DCC +_08023B1C: .4byte gBattlerTarget +_08023B20: .4byte gMoveResultFlags _08023B24: .4byte gUnknown_2023D4C _08023B28: ldr r5, _08023C10 @ =gUnknown_2023DD0 @@ -12536,14 +12536,14 @@ _08023B28: ands r0, r2 cmp r0, 0 bne _08023BAC - ldr r0, _08023C14 @ =gUnknown_2022B4C + ldr r0, _08023C14 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08023BAC ldr r1, _08023C18 @ =gUnknown_2023E8C - ldr r0, _08023C1C @ =gUnknown_2023D6B + ldr r0, _08023C1C @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -12551,9 +12551,9 @@ _08023B28: lsls r0, 29 cmp r0, 0 blt _08023BAC - ldr r0, _08023C20 @ =gUnknown_8250C04 + ldr r0, _08023C20 @ =gBattleMoves mov r9, r0 - ldr r1, _08023C24 @ =gUnknown_2023D4A + ldr r1, _08023C24 @ =gCurrentMove mov r8, r1 ldrh r0, [r1] lsls r1, r0, 1 @@ -12569,7 +12569,7 @@ _08023B28: ands r4, r2 cmp r4, 0 bne _08023BAC - ldr r7, _08023C28 @ =gUnknown_2023D6C + ldr r7, _08023C28 @ =gBattlerTarget ldrb r0, [r7] bl GetBankIdentity movs r1, 0x2 @@ -12579,7 +12579,7 @@ _08023B28: bl GetBankByIdentity lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08023C2C @ =gUnknown_2023BE4 + ldr r1, _08023C2C @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r0, r1 @@ -12591,7 +12591,7 @@ _08023BA2: ldr r0, [r5] orrs r0, r6 str r0, [r5] - ldr r2, _08023C30 @ =gUnknown_2023FC4 + ldr r2, _08023C30 @ =gBattleScripting mov r12, r2 _08023BAC: mov r3, r12 @@ -12650,14 +12650,14 @@ _08023BFE: bx r0 .align 2, 0 _08023C10: .4byte gUnknown_2023DD0 -_08023C14: .4byte gUnknown_2022B4C +_08023C14: .4byte gBattleTypeFlags _08023C18: .4byte gUnknown_2023E8C -_08023C1C: .4byte gUnknown_2023D6B -_08023C20: .4byte gUnknown_8250C04 -_08023C24: .4byte gUnknown_2023D4A -_08023C28: .4byte gUnknown_2023D6C -_08023C2C: .4byte gUnknown_2023BE4 -_08023C30: .4byte gUnknown_2023FC4 +_08023C1C: .4byte sBattler_AI +_08023C20: .4byte gBattleMoves +_08023C24: .4byte gCurrentMove +_08023C28: .4byte gBattlerTarget +_08023C2C: .4byte gBattleMons +_08023C30: .4byte gBattleScripting _08023C34: .4byte gUnknown_2023D74 thumb_func_end atk49_moveend @@ -12668,8 +12668,8 @@ atk4A_typecalc2: @ 8023C38 push {r7} movs r4, 0 movs r5, 0 - ldr r2, _08023C9C @ =gUnknown_8250C04 - ldr r0, _08023CA0 @ =gUnknown_2023D4A + ldr r2, _08023C9C @ =gBattleMoves + ldr r0, _08023CA0 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -12677,8 +12677,8 @@ atk4A_typecalc2: @ 8023C38 adds r0, r2 ldrb r0, [r0, 0x2] mov r8, r0 - ldr r2, _08023CA4 @ =gUnknown_2023BE4 - ldr r3, _08023CA8 @ =gUnknown_2023D6C + ldr r2, _08023CA4 @ =gBattleMons + ldr r3, _08023CA8 @ =gBattlerTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -12694,7 +12694,7 @@ atk4A_typecalc2: @ 8023C38 bne _08023CCC ldr r3, _08023CAC @ =gUnknown_2023D6A strb r0, [r3] - ldr r2, _08023CB0 @ =gUnknown_2023DCC + ldr r2, _08023CB0 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x9 orrs r0, r1 @@ -12712,23 +12712,23 @@ atk4A_typecalc2: @ 8023C38 bl sub_80C71D0 b _08023DAE .align 2, 0 -_08023C9C: .4byte gUnknown_8250C04 -_08023CA0: .4byte gUnknown_2023D4A -_08023CA4: .4byte gUnknown_2023BE4 -_08023CA8: .4byte gUnknown_2023D6C +_08023C9C: .4byte gBattleMoves +_08023CA0: .4byte gCurrentMove +_08023CA4: .4byte gBattleMons +_08023CA8: .4byte gBattlerTarget _08023CAC: .4byte gUnknown_2023D6A -_08023CB0: .4byte gUnknown_2023DCC +_08023CB0: .4byte gMoveResultFlags _08023CB4: .4byte gUnknown_2023DA0 _08023CB8: .4byte gUnknown_2023E82 _08023CBC: - ldr r0, _08023CC8 @ =gUnknown_2023DCC + ldr r0, _08023CC8 @ =gMoveResultFlags ldrb r1, [r0] movs r2, 0x8 orrs r1, r2 strb r1, [r0] b _08023DAE .align 2, 0 -_08023CC8: .4byte gUnknown_2023DCC +_08023CC8: .4byte gMoveResultFlags _08023CCC: ldr r1, _08023CD8 @ =gUnknown_824F050 adds r0, r5, r1 @@ -12850,8 +12850,8 @@ _08023D8E: cmp r0, 0 beq _08023D88 _08023DAE: - ldr r2, _08023E5C @ =gUnknown_2023BE4 - ldr r0, _08023E60 @ =gUnknown_2023D6C + ldr r2, _08023E5C @ =gBattleMons + ldr r0, _08023E60 @ =gBattlerTarget mov r8, r0 ldrb r1, [r0] movs r0, 0x58 @@ -12865,9 +12865,9 @@ _08023DAE: ands r5, r4 cmp r5, 0 bne _08023E2A - ldr r0, _08023E64 @ =gUnknown_2023D6B + ldr r0, _08023E64 @ =sBattler_AI ldrb r0, [r0] - ldr r7, _08023E68 @ =gUnknown_2023D4A + ldr r7, _08023E68 @ =gCurrentMove ldrh r1, [r7] bl AttacksThisTurn lsls r0, 24 @@ -12883,7 +12883,7 @@ _08023DAE: cmp r4, 0x6 bne _08023E2A _08023DF0: - ldr r2, _08023E6C @ =gUnknown_8250C04 + ldr r2, _08023E6C @ =gBattleMoves ldrh r1, [r7] lsls r0, r1, 1 adds r0, r1 @@ -12894,7 +12894,7 @@ _08023DF0: beq _08023E2A ldr r3, _08023E70 @ =gUnknown_2023D6A strb r6, [r3] - ldr r2, _08023E74 @ =gUnknown_2023DCC + ldr r2, _08023E74 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -12912,14 +12912,14 @@ _08023DF0: ldrb r1, [r3] bl sub_80C71D0 _08023E2A: - ldr r0, _08023E74 @ =gUnknown_2023DCC + ldr r0, _08023E74 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _08023E48 ldr r2, _08023E80 @ =gUnknown_2023E8C - ldr r0, _08023E64 @ =gUnknown_2023D6B + ldr r0, _08023E64 @ =sBattler_AI ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -12938,13 +12938,13 @@ _08023E48: pop {r0} bx r0 .align 2, 0 -_08023E5C: .4byte gUnknown_2023BE4 -_08023E60: .4byte gUnknown_2023D6C -_08023E64: .4byte gUnknown_2023D6B -_08023E68: .4byte gUnknown_2023D4A -_08023E6C: .4byte gUnknown_8250C04 +_08023E5C: .4byte gBattleMons +_08023E60: .4byte gBattlerTarget +_08023E64: .4byte sBattler_AI +_08023E68: .4byte gCurrentMove +_08023E6C: .4byte gBattleMoves _08023E70: .4byte gUnknown_2023D6A -_08023E74: .4byte gUnknown_2023DCC +_08023E74: .4byte gMoveResultFlags _08023E78: .4byte gUnknown_2023DA0 _08023E7C: .4byte gUnknown_2023E82 _08023E80: .4byte gUnknown_2023E8C @@ -12954,12 +12954,12 @@ _08023E84: .4byte gUnknown_2023D74 thumb_func_start atk4B_returnatktoball atk4B_returnatktoball: @ 8023E88 push {r4,lr} - ldr r4, _08023EC4 @ =gUnknown_2023BC4 - ldr r0, _08023EC8 @ =gUnknown_2023D6B + ldr r4, _08023EC4 @ =gActiveBattler + ldr r0, _08023EC8 @ =sBattler_AI ldrb r0, [r0] strb r0, [r4] ldr r2, _08023ECC @ =gUnknown_2023DD0 - ldr r1, _08023ED0 @ =gUnknown_825E45C + ldr r1, _08023ED0 @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -12983,10 +12983,10 @@ _08023EB6: pop {r0} bx r0 .align 2, 0 -_08023EC4: .4byte gUnknown_2023BC4 -_08023EC8: .4byte gUnknown_2023D6B +_08023EC4: .4byte gActiveBattler +_08023EC8: .4byte sBattler_AI _08023ECC: .4byte gUnknown_2023DD0 -_08023ED0: .4byte gUnknown_825E45C +_08023ED0: .4byte gBitTable _08023ED4: .4byte gUnknown_2023D74 thumb_func_end atk4B_returnatktoball @@ -13001,19 +13001,19 @@ atk4C_getswitchedmondata: @ 8023ED8 ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _08023F38 @ =gUnknown_2023BC4 + ldr r4, _08023F38 @ =gActiveBattler strb r0, [r4] - ldr r3, _08023F3C @ =gUnknown_2023BCE + ldr r3, _08023F3C @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r2, r0, 1 adds r2, r3 - ldr r1, _08023F40 @ =gUnknown_2023FE8 + ldr r1, _08023F40 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x5C ldrb r0, [r0] strh r0, [r2] - ldr r1, _08023F44 @ =gUnknown_825E45C + ldr r1, _08023F44 @ =gBitTable ldrb r0, [r4] lsls r0, 1 adds r0, r3 @@ -13036,10 +13036,10 @@ _08023F28: .align 2, 0 _08023F30: .4byte gUnknown_2023BC8 _08023F34: .4byte gUnknown_2023D74 -_08023F38: .4byte gUnknown_2023BC4 -_08023F3C: .4byte gUnknown_2023BCE -_08023F40: .4byte gUnknown_2023FE8 -_08023F44: .4byte gUnknown_825E45C +_08023F38: .4byte gActiveBattler +_08023F3C: .4byte gBattlerPartyIndexes +_08023F40: .4byte gBattleStruct +_08023F44: .4byte gBitTable thumb_func_end atk4C_getswitchedmondata thumb_func_start sub_8023F48 @@ -13056,9 +13056,9 @@ _08023F56: ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _080240A8 @ =gUnknown_2023BC4 + ldr r4, _080240A8 @ =gActiveBattler strb r0, [r4] - ldr r6, _080240AC @ =gUnknown_2023BE4 + ldr r6, _080240AC @ =gBattleMons ldrb r0, [r4] movs r5, 0x58 adds r1, r0, 0 @@ -13085,13 +13085,13 @@ _08023F84: adds r2, 0x1 cmp r2, 0x57 bls _08023F84 - ldr r4, _080240AC @ =gUnknown_2023BE4 + ldr r4, _080240AC @ =gBattleMons ldrb r0, [r7] movs r6, 0x58 adds r2, r0, 0 muls r2, r6 adds r2, r4 - ldr r3, _080240B4 @ =gUnknown_8254784 + ldr r3, _080240B4 @ =gBaseStats ldrh r1, [r2] lsls r0, r1, 3 subs r0, r1 @@ -13133,8 +13133,8 @@ _08023F84: adds r0, 0x29 adds r0, r2, r0 ldrb r1, [r0] - ldr r3, _080240BC @ =gUnknown_825E45C - ldr r2, _080240C0 @ =gUnknown_2023BCE + ldr r3, _080240BC @ =gBitTable + ldr r2, _080240C0 @ =gBattlerPartyIndexes ldrb r5, [r7] lsls r0, r5, 1 adds r0, r2 @@ -13152,8 +13152,8 @@ _08023F84: movs r1, 0 strh r1, [r0, 0x2E] _08024022: - ldr r2, _080240C4 @ =gUnknown_8250C04 - ldr r0, _080240C8 @ =gUnknown_2023D4A + ldr r2, _080240C4 @ =gBattleMoves + ldr r0, _080240C8 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -13190,8 +13190,8 @@ _08024042: str r1, [r0] _08024068: bl sub_8012760 - ldr r0, _080240CC @ =gUnknown_2023FC4 - ldr r3, _080240A8 @ =gUnknown_2023BC4 + ldr r0, _080240CC @ =gBattleScripting + ldr r3, _080240A8 @ =gActiveBattler ldrb r2, [r3] strb r2, [r0, 0x17] ldr r1, _080240D0 @ =gUnknown_2022AB8 @@ -13200,7 +13200,7 @@ _08024068: movs r0, 0x7 strb r0, [r1, 0x1] strb r2, [r1, 0x2] - ldr r2, _080240C0 @ =gUnknown_2023BCE + ldr r2, _080240C0 @ =gBattlerPartyIndexes ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -13220,16 +13220,16 @@ _08024098: .align 2, 0 _080240A0: .4byte gUnknown_2023BC8 _080240A4: .4byte gUnknown_2023D74 -_080240A8: .4byte gUnknown_2023BC4 -_080240AC: .4byte gUnknown_2023BE4 +_080240A8: .4byte gActiveBattler +_080240AC: .4byte gBattleMons _080240B0: .4byte gUnknown_20233C4 -_080240B4: .4byte gUnknown_8254784 +_080240B4: .4byte gBaseStats _080240B8: .4byte gUnknown_2023F20 -_080240BC: .4byte gUnknown_825E45C -_080240C0: .4byte gUnknown_2023BCE -_080240C4: .4byte gUnknown_8250C04 -_080240C8: .4byte gUnknown_2023D4A -_080240CC: .4byte gUnknown_2023FC4 +_080240BC: .4byte gBitTable +_080240C0: .4byte gBattlerPartyIndexes +_080240C4: .4byte gBattleMoves +_080240C8: .4byte gCurrentMove +_080240CC: .4byte gBattleScripting _080240D0: .4byte gUnknown_2022AB8 thumb_func_end sub_8023F48 @@ -13244,7 +13244,7 @@ sub_80240D4: @ 80240D4 ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r6, _08024170 @ =gUnknown_2023BC4 + ldr r6, _08024170 @ =gActiveBattler strb r0, [r6] ldrb r0, [r6] bl GetBankSide @@ -13252,13 +13252,13 @@ sub_80240D4: @ 80240D4 lsrs r0, 24 cmp r0, 0x1 bne _0802412A - ldr r0, _08024174 @ =gUnknown_2022B4C + ldr r0, _08024174 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _08024178 @ =0x0001aa02 ands r0, r1 cmp r0, 0 bne _0802412A - ldr r4, _0802417C @ =gUnknown_2023BE4 + ldr r4, _0802417C @ =gBattleMons ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -13275,9 +13275,9 @@ sub_80240D4: @ 80240D4 movs r1, 0x2 bl sub_8044898 _0802412A: - ldr r2, _08024180 @ =gUnknown_2023D70 - ldr r1, _08024184 @ =gUnknown_825E45C - ldr r5, _08024170 @ =gUnknown_2023BC4 + ldr r2, _08024180 @ =gAbsentBattlerFlags + ldr r1, _08024184 @ =gBitTable + ldr r5, _08024170 @ =gActiveBattler ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -13285,7 +13285,7 @@ _0802412A: ldrb r0, [r2] bics r0, r1 strb r0, [r2] - ldr r1, _08024188 @ =gUnknown_2023BCE + ldr r1, _08024188 @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -13307,13 +13307,13 @@ _08024160: .align 2, 0 _08024168: .4byte gUnknown_2023BC8 _0802416C: .4byte gUnknown_2023D74 -_08024170: .4byte gUnknown_2023BC4 -_08024174: .4byte gUnknown_2022B4C +_08024170: .4byte gActiveBattler +_08024174: .4byte gBattleTypeFlags _08024178: .4byte 0x0001aa02 -_0802417C: .4byte gUnknown_2023BE4 -_08024180: .4byte gUnknown_2023D70 -_08024184: .4byte gUnknown_825E45C -_08024188: .4byte gUnknown_2023BCE +_0802417C: .4byte gBattleMons +_08024180: .4byte gAbsentBattlerFlags +_08024184: .4byte gBitTable +_08024188: .4byte gBattlerPartyIndexes thumb_func_end sub_80240D4 thumb_func_start sub_802418C @@ -13327,7 +13327,7 @@ sub_802418C: @ 802418C movs r0, 0x7F ands r0, r1 bl sub_8016E24 - ldr r3, _080241F4 @ =gUnknown_2023BC4 + ldr r3, _080241F4 @ =gActiveBattler strb r0, [r3] ldr r2, [r4] ldrb r1, [r2, 0x1] @@ -13335,7 +13335,7 @@ sub_802418C: @ 802418C ands r0, r1 cmp r0, 0 bne _08024204 - ldr r1, _080241F8 @ =gUnknown_2023BE4 + ldr r1, _080241F8 @ =gBattleMons ldrb r3, [r3] movs r0, 0x58 muls r0, r3 @@ -13346,7 +13346,7 @@ sub_802418C: @ 802418C ands r0, r1 cmp r0, 0 bne _080241D8 - ldr r1, _08024200 @ =gUnknown_2023DFC + ldr r1, _08024200 @ =gStatuses3 lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] @@ -13370,27 +13370,27 @@ _080241D8: b _08024388 .align 2, 0 _080241F0: .4byte gUnknown_2023D74 -_080241F4: .4byte gUnknown_2023BC4 -_080241F8: .4byte gUnknown_2023BE4 +_080241F4: .4byte gActiveBattler +_080241F8: .4byte gBattleMons _080241FC: .4byte 0x0400e000 -_08024200: .4byte gUnknown_2023DFC +_08024200: .4byte gStatuses3 _08024204: - ldr r5, _08024290 @ =gUnknown_2022B4C + ldr r5, _08024290 @ =gBattleTypeFlags ldr r0, [r5] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _080242A4 - ldr r4, _08024294 @ =gUnknown_2023BC4 + ldr r4, _08024294 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 lsrs r0, 24 - ldr r1, _08024298 @ =gUnknown_2024284 + ldr r1, _08024298 @ =gPlayerParty mov r8, r1 cmp r0, 0x1 bne _08024228 - ldr r0, _0802429C @ =gUnknown_202402C + ldr r0, _0802429C @ =gEnemyParty mov r8, r0 _08024228: movs r5, 0 @@ -13408,7 +13408,7 @@ _08024242: adds r6, r5, 0x3 cmp r5, r6 bge _0802428A - ldr r7, _080242A0 @ =gUnknown_2023BCE + ldr r7, _080242A0 @ =gBattlerPartyIndexes _0802424A: movs r0, 0x64 muls r0, r5 @@ -13429,7 +13429,7 @@ _0802424A: bl GetMonData cmp r0, 0 beq _08024284 - ldr r0, _08024294 @ =gUnknown_2023BC4 + ldr r0, _08024294 @ =gActiveBattler ldrb r0, [r0] lsls r0, 1 adds r0, r7 @@ -13445,13 +13445,13 @@ _0802428A: beq _08024358 b _08024380 .align 2, 0 -_08024290: .4byte gUnknown_2022B4C -_08024294: .4byte gUnknown_2023BC4 -_08024298: .4byte gUnknown_2024284 -_0802429C: .4byte gUnknown_202402C -_080242A0: .4byte gUnknown_2023BCE +_08024290: .4byte gBattleTypeFlags +_08024294: .4byte gActiveBattler +_08024298: .4byte gPlayerParty +_0802429C: .4byte gEnemyParty +_080242A0: .4byte gBattlerPartyIndexes _080242A4: - ldr r0, _080242D4 @ =gUnknown_2023BC4 + ldr r0, _080242D4 @ =gActiveBattler ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -13472,15 +13472,15 @@ _080242A4: lsrs r6, r0, 24 b _080242DA .align 2, 0 -_080242D4: .4byte gUnknown_2023BC4 +_080242D4: .4byte gActiveBattler _080242D8: adds r6, r7, 0 _080242DA: - ldr r0, _080242E0 @ =gUnknown_202402C + ldr r0, _080242E0 @ =gEnemyParty mov r8, r0 b _0802430A .align 2, 0 -_080242E0: .4byte gUnknown_202402C +_080242E0: .4byte gEnemyParty _080242E4: movs r0, 0 bl GetBankByIdentity @@ -13499,7 +13499,7 @@ _080242E4: _08024304: adds r6, r7, 0 _08024306: - ldr r1, _08024374 @ =gUnknown_2024284 + ldr r1, _08024374 @ =gPlayerParty mov r8, r1 _0802430A: movs r5, 0 @@ -13523,7 +13523,7 @@ _0802430C: bl GetMonData cmp r0, 0 bne _0802434E - ldr r1, _08024378 @ =gUnknown_2023BCE + ldr r1, _08024378 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -13557,8 +13557,8 @@ _08024358: str r1, [r3] b _08024388 .align 2, 0 -_08024374: .4byte gUnknown_2024284 -_08024378: .4byte gUnknown_2023BCE +_08024374: .4byte gPlayerParty +_08024378: .4byte gBattlerPartyIndexes _0802437C: .4byte gUnknown_2023D74 _08024380: ldr r1, _08024394 @ =gUnknown_2023D74 @@ -13582,13 +13582,13 @@ sub_8024398: @ 8024398 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r4, _080243E0 @ =gUnknown_2023BC4 + ldr r4, _080243E0 @ =gActiveBattler ldrb r0, [r4] - ldr r5, _080243E4 @ =gUnknown_2023FE8 + ldr r5, _080243E4 @ =gBattleStruct ldr r1, [r5] adds r1, r0, r1 adds r1, 0x58 - ldr r3, _080243E8 @ =gUnknown_2023BCE + ldr r3, _080243E8 @ =gBattlerPartyIndexes lsls r0, 1 adds r0, r3 ldrh r0, [r0] @@ -13611,9 +13611,9 @@ sub_8024398: @ 8024398 pop {r0} bx r0 .align 2, 0 -_080243E0: .4byte gUnknown_2023BC4 -_080243E4: .4byte gUnknown_2023FE8 -_080243E8: .4byte gUnknown_2023BCE +_080243E0: .4byte gActiveBattler +_080243E4: .4byte gBattleStruct +_080243E8: .4byte gBattlerPartyIndexes thumb_func_end sub_8024398 thumb_func_start sub_80243EC @@ -13646,13 +13646,13 @@ sub_80243EC: @ 80243EC beq _08024422 b _080248B8 _08024422: - ldr r0, _0802449C @ =gUnknown_2022B4C + ldr r0, _0802449C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x41 ands r1, r0 cmp r1, 0x1 beq _08024510 - ldr r1, _080244A0 @ =gUnknown_2023BC4 + ldr r1, _080244A0 @ =gActiveBattler strb r7, [r1] ldr r0, _080244A4 @ =gUnknown_2023BCC ldrb r0, [r0] @@ -13661,9 +13661,9 @@ _08024422: b _080248A6 _0802443C: ldr r7, _080244A8 @ =gUnknown_2023DD0 - ldr r6, _080244AC @ =gUnknown_825E45C + ldr r6, _080244AC @ =gBitTable adds r4, r1, 0 - ldr r2, _080244B0 @ =gUnknown_2023D70 + ldr r2, _080244B0 @ =gAbsentBattlerFlags mov r8, r2 _08024446: ldrb r2, [r4] @@ -13706,12 +13706,12 @@ _08024446: b _080244F6 .align 2, 0 _08024498: .4byte gUnknown_2023D74 -_0802449C: .4byte gUnknown_2022B4C -_080244A0: .4byte gUnknown_2023BC4 +_0802449C: .4byte gBattleTypeFlags +_080244A0: .4byte gActiveBattler _080244A4: .4byte gUnknown_2023BCC _080244A8: .4byte gUnknown_2023DD0 -_080244AC: .4byte gUnknown_825E45C -_080244B0: .4byte gUnknown_2023D70 +_080244AC: .4byte gBitTable +_080244B0: .4byte gAbsentBattlerFlags _080244B4: ldr r5, _080244E4 @ =gUnknown_2023ECC ldrb r0, [r4] @@ -13766,12 +13766,12 @@ _08024518: mov r8, r0 ldr r0, [r0] lsrs r5, r0, 28 - ldr r6, _08024574 @ =gUnknown_825E45C + ldr r6, _08024574 @ =gBitTable ldr r0, [r6] ands r0, r5 cmp r0, 0 beq _080245CE - ldr r4, _08024578 @ =gUnknown_2023BC4 + ldr r4, _08024578 @ =gActiveBattler strb r7, [r4] movs r0, 0 movs r1, 0x6 @@ -13780,7 +13780,7 @@ _08024518: lsls r0, 24 cmp r0, 0 beq _08024580 - ldr r2, _0802457C @ =gUnknown_2023D70 + ldr r2, _0802457C @ =gAbsentBattlerFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13804,9 +13804,9 @@ _08024518: b _080245CE .align 2, 0 _08024570: .4byte gUnknown_2023DD0 -_08024574: .4byte gUnknown_825E45C -_08024578: .4byte gUnknown_2023BC4 -_0802457C: .4byte gUnknown_2023D70 +_08024574: .4byte gBitTable +_08024578: .4byte gActiveBattler +_0802457C: .4byte gAbsentBattlerFlags _08024580: ldr r6, _080245B4 @ =gUnknown_2023ECC ldrb r0, [r4] @@ -13818,7 +13818,7 @@ _08024580: lsls r0, 25 cmp r0, 0 blt _080245BC - ldr r0, _080245B8 @ =gUnknown_2023FE8 + ldr r0, _080245B8 @ =gBattleStruct ldr r0, [r0] adds r0, 0x5E ldrb r0, [r0] @@ -13835,7 +13835,7 @@ _08024580: b _080245CE .align 2, 0 _080245B4: .4byte gUnknown_2023ECC -_080245B8: .4byte gUnknown_2023FE8 +_080245B8: .4byte gBattleStruct _080245BC: movs r0, 0 movs r1, 0x2 @@ -13845,7 +13845,7 @@ _080245BC: movs r0, 0x1 mov r9, r0 _080245CE: - ldr r6, _08024628 @ =gUnknown_825E45C + ldr r6, _08024628 @ =gBitTable ldr r0, [r6, 0x8] ands r0, r5 cmp r0, 0 @@ -13854,7 +13854,7 @@ _080245CE: ands r0, r5 cmp r0, 0 bne _0802468C - ldr r4, _0802462C @ =gUnknown_2023BC4 + ldr r4, _0802462C @ =gActiveBattler movs r0, 0x2 strb r0, [r4] movs r0, 0x2 @@ -13864,7 +13864,7 @@ _080245CE: lsls r0, 24 cmp r0, 0 beq _08024638 - ldr r2, _08024630 @ =gUnknown_2023D70 + ldr r2, _08024630 @ =gAbsentBattlerFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13887,9 +13887,9 @@ _080245CE: bl MarkBufferBankForExecution b _0802468C .align 2, 0 -_08024628: .4byte gUnknown_825E45C -_0802462C: .4byte gUnknown_2023BC4 -_08024630: .4byte gUnknown_2023D70 +_08024628: .4byte gBitTable +_0802462C: .4byte gActiveBattler +_08024630: .4byte gAbsentBattlerFlags _08024634: .4byte gUnknown_2023DD0 _08024638: ldr r6, _0802466C @ =gUnknown_2023ECC @@ -13902,7 +13902,7 @@ _08024638: lsls r0, 25 cmp r0, 0 blt _08024674 - ldr r0, _08024670 @ =gUnknown_2023FE8 + ldr r0, _08024670 @ =gBattleStruct ldr r0, [r0] adds r0, 0x5C ldrb r0, [r0] @@ -13919,7 +13919,7 @@ _08024638: b _0802468C .align 2, 0 _0802466C: .4byte gUnknown_2023ECC -_08024670: .4byte gUnknown_2023FE8 +_08024670: .4byte gBattleStruct _08024674: movs r0, 0x1 mov r1, r9 @@ -13932,12 +13932,12 @@ _08024674: ldrb r0, [r4] bl MarkBufferBankForExecution _0802468C: - ldr r6, _080246DC @ =gUnknown_825E45C + ldr r6, _080246DC @ =gBitTable ldr r0, [r6, 0x4] ands r0, r5 cmp r0, 0 beq _0802473E - ldr r4, _080246E0 @ =gUnknown_2023BC4 + ldr r4, _080246E0 @ =gActiveBattler movs r0, 0x1 strb r0, [r4] movs r0, 0x1 @@ -13947,7 +13947,7 @@ _0802468C: lsls r0, 24 cmp r0, 0 beq _080246EC - ldr r2, _080246E4 @ =gUnknown_2023D70 + ldr r2, _080246E4 @ =gAbsentBattlerFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13970,9 +13970,9 @@ _0802468C: bl MarkBufferBankForExecution b _0802473E .align 2, 0 -_080246DC: .4byte gUnknown_825E45C -_080246E0: .4byte gUnknown_2023BC4 -_080246E4: .4byte gUnknown_2023D70 +_080246DC: .4byte gBitTable +_080246E0: .4byte gActiveBattler +_080246E4: .4byte gAbsentBattlerFlags _080246E8: .4byte gUnknown_2023DD0 _080246EC: ldr r6, _08024720 @ =gUnknown_2023ECC @@ -13985,7 +13985,7 @@ _080246EC: lsls r0, 25 cmp r0, 0 blt _08024728 - ldr r0, _08024724 @ =gUnknown_2023FE8 + ldr r0, _08024724 @ =gBattleStruct ldr r0, [r0] adds r0, 0x5F ldrb r0, [r0] @@ -14002,7 +14002,7 @@ _080246EC: b _0802473E .align 2, 0 _08024720: .4byte gUnknown_2023ECC -_08024724: .4byte gUnknown_2023FE8 +_08024724: .4byte gBattleStruct _08024728: movs r0, 0 movs r1, 0x2 @@ -14014,7 +14014,7 @@ _08024728: orrs r2, r0 mov r9, r2 _0802473E: - ldr r6, _08024798 @ =gUnknown_825E45C + ldr r6, _08024798 @ =gBitTable ldr r0, [r6, 0xC] ands r0, r5 cmp r0, 0 @@ -14023,7 +14023,7 @@ _0802473E: ands r0, r5 cmp r0, 0 bne _080247FC - ldr r4, _0802479C @ =gUnknown_2023BC4 + ldr r4, _0802479C @ =gActiveBattler movs r0, 0x3 strb r0, [r4] movs r0, 0x3 @@ -14033,7 +14033,7 @@ _0802473E: lsls r0, 24 cmp r0, 0 beq _080247A8 - ldr r2, _080247A0 @ =gUnknown_2023D70 + ldr r2, _080247A0 @ =gAbsentBattlerFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -14056,9 +14056,9 @@ _0802473E: bl MarkBufferBankForExecution b _080247FC .align 2, 0 -_08024798: .4byte gUnknown_825E45C -_0802479C: .4byte gUnknown_2023BC4 -_080247A0: .4byte gUnknown_2023D70 +_08024798: .4byte gBitTable +_0802479C: .4byte gActiveBattler +_080247A0: .4byte gAbsentBattlerFlags _080247A4: .4byte gUnknown_2023DD0 _080247A8: ldr r6, _080247DC @ =gUnknown_2023ECC @@ -14071,7 +14071,7 @@ _080247A8: lsls r0, 25 cmp r0, 0 blt _080247E4 - ldr r0, _080247E0 @ =gUnknown_2023FE8 + ldr r0, _080247E0 @ =gBattleStruct ldr r0, [r0] adds r0, 0x5D ldrb r0, [r0] @@ -14088,7 +14088,7 @@ _080247A8: b _080247FC .align 2, 0 _080247DC: .4byte gUnknown_2023ECC -_080247E0: .4byte gUnknown_2023FE8 +_080247E0: .4byte gBattleStruct _080247E4: movs r0, 0x2 mov r1, r9 @@ -14114,30 +14114,30 @@ _080247FC: blt _08024850 cmp r5, 0 beq _08024850 - ldr r0, _08024830 @ =gUnknown_2023D70 + ldr r0, _08024830 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r0, _08024834 @ =gUnknown_825E45C + ldr r0, _08024834 @ =gBitTable ldr r0, [r0] ands r1, r0 cmp r1, 0 beq _0802483C - ldr r1, _08024838 @ =gUnknown_2023BC4 + ldr r1, _08024838 @ =gActiveBattler movs r0, 0x2 strb r0, [r1] b _08024840 .align 2, 0 _0802482C: .4byte gUnknown_2023ECC -_08024830: .4byte gUnknown_2023D70 -_08024834: .4byte gUnknown_825E45C -_08024838: .4byte gUnknown_2023BC4 +_08024830: .4byte gAbsentBattlerFlags +_08024834: .4byte gBitTable +_08024838: .4byte gActiveBattler _0802483C: - ldr r0, _08024880 @ =gUnknown_2023BC4 + ldr r0, _08024880 @ =gActiveBattler strb r1, [r0] _08024840: movs r0, 0 movs r1, 0x2 bl EmitLinkStandbyMsg - ldr r0, _08024880 @ =gUnknown_2023BC4 + ldr r0, _08024880 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution _08024850: @@ -14154,30 +14154,30 @@ _08024850: blt _080248A6 cmp r5, 0 beq _080248A6 - ldr r0, _08024888 @ =gUnknown_2023D70 + ldr r0, _08024888 @ =gAbsentBattlerFlags ldrb r0, [r0] - ldr r1, _0802488C @ =gUnknown_825E45C + ldr r1, _0802488C @ =gBitTable ldr r1, [r1, 0x4] ands r0, r1 cmp r0, 0 beq _08024890 - ldr r1, _08024880 @ =gUnknown_2023BC4 + ldr r1, _08024880 @ =gActiveBattler movs r0, 0x3 b _08024894 .align 2, 0 -_08024880: .4byte gUnknown_2023BC4 +_08024880: .4byte gActiveBattler _08024884: .4byte gUnknown_2023ECC -_08024888: .4byte gUnknown_2023D70 -_0802488C: .4byte gUnknown_825E45C +_08024888: .4byte gAbsentBattlerFlags +_0802488C: .4byte gBitTable _08024890: - ldr r1, _080248B0 @ =gUnknown_2023BC4 + ldr r1, _080248B0 @ =gActiveBattler movs r0, 0x1 _08024894: strb r0, [r1] movs r0, 0 movs r1, 0x2 bl EmitLinkStandbyMsg - ldr r0, _080248B0 @ =gUnknown_2023BC4 + ldr r0, _080248B0 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution _080248A6: @@ -14187,14 +14187,14 @@ _080248A6: str r0, [r1] b _08024C2E .align 2, 0 -_080248B0: .4byte gUnknown_2023BC4 +_080248B0: .4byte gActiveBattler _080248B4: .4byte gUnknown_2023D74 _080248B8: cmp r0, 0x6 beq _080248BE b _08024AAC _080248BE: - ldr r0, _08024934 @ =gUnknown_2022B4C + ldr r0, _08024934 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x40 ands r0, r1 @@ -14211,7 +14211,7 @@ _080248D6: ldr r7, _08024938 @ =gUnknown_2023DD0 ldr r0, [r7] lsrs r5, r0, 28 - ldr r4, _0802493C @ =gUnknown_825E45C + ldr r4, _0802493C @ =gBitTable ldr r0, [r4, 0x8] ands r0, r5 cmp r0, 0 @@ -14220,7 +14220,7 @@ _080248D6: ands r0, r5 cmp r0, 0 beq _0802497E - ldr r6, _08024940 @ =gUnknown_2023BC4 + ldr r6, _08024940 @ =gActiveBattler movs r0, 0x2 strb r0, [r6] ldr r0, _08024944 @ =gUnknown_20233C4 @@ -14231,7 +14231,7 @@ _080248D6: lsls r0, 24 cmp r0, 0 beq _0802494C - ldr r2, _08024948 @ =gUnknown_2023D70 + ldr r2, _08024948 @ =gAbsentBattlerFlags ldrb r0, [r6] lsls r0, 2 adds r0, r4 @@ -14253,12 +14253,12 @@ _080248D6: bl MarkBufferBankForExecution b _0802497E .align 2, 0 -_08024934: .4byte gUnknown_2022B4C +_08024934: .4byte gBattleTypeFlags _08024938: .4byte gUnknown_2023DD0 -_0802493C: .4byte gUnknown_825E45C -_08024940: .4byte gUnknown_2023BC4 +_0802493C: .4byte gBitTable +_08024940: .4byte gActiveBattler _08024944: .4byte gUnknown_20233C4 -_08024948: .4byte gUnknown_2023D70 +_08024948: .4byte gAbsentBattlerFlags _0802494C: ldr r4, _080249DC @ =gUnknown_2023ECC ldrb r0, [r6] @@ -14270,7 +14270,7 @@ _0802494C: lsls r0, 25 cmp r0, 0 blt _0802497E - ldr r0, _080249E0 @ =gUnknown_2023FE8 + ldr r0, _080249E0 @ =gBattleStruct ldr r0, [r0] adds r0, 0x5C ldrb r0, [r0] @@ -14285,7 +14285,7 @@ _0802494C: orrs r1, r2 strb r1, [r0] _0802497E: - ldr r4, _080249E4 @ =gUnknown_825E45C + ldr r4, _080249E4 @ =gBitTable ldr r0, [r4, 0xC] ands r0, r5 cmp r0, 0 @@ -14294,7 +14294,7 @@ _0802497E: ands r5, r0 cmp r5, 0 beq _08024A2E - ldr r5, _080249E8 @ =gUnknown_2023BC4 + ldr r5, _080249E8 @ =gActiveBattler movs r0, 0x3 strb r0, [r5] ldr r0, _080249EC @ =gUnknown_20233C4 @@ -14307,7 +14307,7 @@ _0802497E: lsls r0, 24 cmp r0, 0 beq _080249FC - ldr r2, _080249F4 @ =gUnknown_2023D70 + ldr r2, _080249F4 @ =gAbsentBattlerFlags ldrb r0, [r5] lsls r0, 2 adds r0, r4 @@ -14331,12 +14331,12 @@ _0802497E: b _08024A2E .align 2, 0 _080249DC: .4byte gUnknown_2023ECC -_080249E0: .4byte gUnknown_2023FE8 -_080249E4: .4byte gUnknown_825E45C -_080249E8: .4byte gUnknown_2023BC4 +_080249E0: .4byte gBattleStruct +_080249E4: .4byte gBitTable +_080249E8: .4byte gActiveBattler _080249EC: .4byte gUnknown_20233C4 _080249F0: .4byte 0x00000201 -_080249F4: .4byte gUnknown_2023D70 +_080249F4: .4byte gAbsentBattlerFlags _080249F8: .4byte gUnknown_2023DD0 _080249FC: ldr r4, _08024A3C @ =gUnknown_2023ECC @@ -14349,7 +14349,7 @@ _080249FC: lsls r0, 25 cmp r0, 0 blt _08024A2E - ldr r0, _08024A40 @ =gUnknown_2023FE8 + ldr r0, _08024A40 @ =gBattleStruct ldr r0, [r0] adds r0, 0x5D ldrb r0, [r0] @@ -14372,7 +14372,7 @@ _08024A2E: b _08024A4C .align 2, 0 _08024A3C: .4byte gUnknown_2023ECC -_08024A40: .4byte gUnknown_2023FE8 +_08024A40: .4byte gBattleStruct _08024A44: .4byte gUnknown_2023D74 _08024A48: adds r0, r2, 0x6 @@ -14384,7 +14384,7 @@ _08024A4C: ldr r1, _08024AA0 @ =gUnknown_2023D6D movs r0, 0 strb r0, [r1] - ldr r4, _08024AA4 @ =gUnknown_825E45C + ldr r4, _08024AA4 @ =gBitTable ldr r2, [r4] ands r2, r5 ldr r6, _08024AA8 @ =gUnknown_2023BCC @@ -14423,7 +14423,7 @@ _08024A92: .align 2, 0 _08024A9C: .4byte gUnknown_2023DD0 _08024AA0: .4byte gUnknown_2023D6D -_08024AA4: .4byte gUnknown_825E45C +_08024AA4: .4byte gBitTable _08024AA8: .4byte gUnknown_2023BCC _08024AAC: movs r0, 0x80 @@ -14461,10 +14461,10 @@ _08024AE4: lsls r0, 24 cmp r0, 0 beq _08024B34 - ldr r2, _08024B24 @ =gUnknown_2023BC4 + ldr r2, _08024B24 @ =gActiveBattler strb r7, [r2] - ldr r3, _08024B28 @ =gUnknown_2023D70 - ldr r4, _08024B2C @ =gUnknown_825E45C + ldr r3, _08024B28 @ =gAbsentBattlerFlags + ldr r4, _08024B2C @ =gBitTable ldrb r0, [r2] lsls r0, 2 adds r0, r4 @@ -14485,19 +14485,19 @@ _08024AE4: str r0, [r6] b _08024C2E .align 2, 0 -_08024B24: .4byte gUnknown_2023BC4 -_08024B28: .4byte gUnknown_2023D70 -_08024B2C: .4byte gUnknown_825E45C +_08024B24: .4byte gActiveBattler +_08024B28: .4byte gAbsentBattlerFlags +_08024B2C: .4byte gBitTable _08024B30: .4byte gUnknown_2023DD0 _08024B34: - ldr r4, _08024BD8 @ =gUnknown_2023BC4 + ldr r4, _08024BD8 @ =gActiveBattler strb r7, [r4] ldrb r0, [r4] - ldr r3, _08024BDC @ =gUnknown_2023FE8 + ldr r3, _08024BDC @ =gBattleStruct ldr r1, [r3] adds r1, r0, r1 adds r1, 0x58 - ldr r2, _08024BE0 @ =gUnknown_2023BCE + ldr r2, _08024BE0 @ =gBattlerPartyIndexes lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -14529,20 +14529,20 @@ _08024B34: lsls r0, 24 cmp r0, 0 bne _08024B94 - ldr r1, _08024BE4 @ =gUnknown_3004F90 + ldr r1, _08024BE4 @ =gBattleResults ldrb r0, [r1, 0x2] cmp r0, 0xFE bhi _08024B94 adds r0, 0x1 strb r0, [r1, 0x2] _08024B94: - ldr r0, _08024BE8 @ =gUnknown_2022B4C + ldr r0, _08024BE8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08024BF0 - ldr r1, _08024BD8 @ =gUnknown_2023BC4 + ldr r1, _08024BD8 @ =gActiveBattler movs r0, 0 strb r0, [r1] ldr r0, _08024BEC @ =gUnknown_2023BCC @@ -14571,11 +14571,11 @@ _08024BC4: bcc _08024BB0 b _08024C2E .align 2, 0 -_08024BD8: .4byte gUnknown_2023BC4 -_08024BDC: .4byte gUnknown_2023FE8 -_08024BE0: .4byte gUnknown_2023BCE -_08024BE4: .4byte gUnknown_3004F90 -_08024BE8: .4byte gUnknown_2022B4C +_08024BD8: .4byte gActiveBattler +_08024BDC: .4byte gBattleStruct +_08024BE0: .4byte gBattlerPartyIndexes +_08024BE4: .4byte gBattleResults +_08024BE8: .4byte gBattleTypeFlags _08024BEC: .4byte gUnknown_2023BCC _08024BF0: adds r0, r7, 0 @@ -14585,11 +14585,11 @@ _08024BF0: lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r4, _08024C3C @ =gUnknown_2023BC4 + ldr r4, _08024C3C @ =gActiveBattler strb r0, [r4] - ldr r0, _08024C40 @ =gUnknown_2023D70 + ldr r0, _08024C40 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _08024C44 @ =gUnknown_825E45C + ldr r2, _08024C44 @ =gBitTable ldrb r3, [r4] lsls r0, r3, 2 adds r0, r2 @@ -14615,9 +14615,9 @@ _08024C2E: pop {r0} bx r0 .align 2, 0 -_08024C3C: .4byte gUnknown_2023BC4 -_08024C40: .4byte gUnknown_2023D70 -_08024C44: .4byte gUnknown_825E45C +_08024C3C: .4byte gActiveBattler +_08024C40: .4byte gAbsentBattlerFlags +_08024C44: .4byte gBitTable thumb_func_end sub_80243EC thumb_func_start sub_8024C48 @@ -14633,7 +14633,7 @@ _08024C54: ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r7, _08024C7C @ =gUnknown_2023BC4 + ldr r7, _08024C7C @ =gActiveBattler strb r0, [r7] ldr r0, [r4] ldrb r0, [r0, 0x2] @@ -14647,7 +14647,7 @@ _08024C54: .align 2, 0 _08024C74: .4byte gUnknown_2023BC8 _08024C78: .4byte gUnknown_2023D74 -_08024C7C: .4byte gUnknown_2023BC4 +_08024C7C: .4byte gActiveBattler _08024C80: cmp r0, 0x2 beq _08024CE0 @@ -14660,7 +14660,7 @@ _08024C86: blt _08024C92 b _08024E0E _08024C92: - ldr r6, _08024CBC @ =gUnknown_2023FE8 + ldr r6, _08024CBC @ =gBattleStruct ldr r2, _08024CC0 @ =gUnknown_20233C4 movs r5, 0x80 lsls r5, 2 @@ -14683,10 +14683,10 @@ _08024CAC: b _08024E0E .align 2, 0 _08024CB8: .4byte gUnknown_2023BCC -_08024CBC: .4byte gUnknown_2023FE8 +_08024CBC: .4byte gBattleStruct _08024CC0: .4byte gUnknown_20233C4 _08024CC4: - ldr r0, _08024CDC @ =gUnknown_2022B4C + ldr r0, _08024CDC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -14698,7 +14698,7 @@ _08024CD2: bl sub_8013F6C b _08024E0E .align 2, 0 -_08024CDC: .4byte gUnknown_2022B4C +_08024CDC: .4byte gBattleTypeFlags _08024CE0: ldr r1, _08024DAC @ =gUnknown_2023E82 ldr r4, _08024DB0 @ =gUnknown_20233C4 @@ -14709,7 +14709,7 @@ _08024CE0: ldrb r0, [r0] strb r0, [r1] ldrb r0, [r7] - ldr r6, _08024DB4 @ =gUnknown_2023FE8 + ldr r6, _08024DB4 @ =gBattleStruct ldr r1, [r6] adds r1, r0, r1 adds r1, 0x5C @@ -14717,7 +14717,7 @@ _08024CE0: adds r0, r2 ldrb r0, [r0] strb r0, [r1] - ldr r0, _08024DB8 @ =gUnknown_2022B4C + ldr r0, _08024DB8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -14805,8 +14805,8 @@ _08024CE0: .align 2, 0 _08024DAC: .4byte gUnknown_2023E82 _08024DB0: .4byte gUnknown_20233C4 -_08024DB4: .4byte gUnknown_2023FE8 -_08024DB8: .4byte gUnknown_2022B4C +_08024DB4: .4byte gBattleStruct +_08024DB8: .4byte gBattleTypeFlags _08024DBC: ldrb r0, [r7] bl sub_8013F6C @@ -14816,8 +14816,8 @@ _08024DC2: strb r5, [r1] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r4, _08024E20 @ =gUnknown_2023BE4 - ldr r3, _08024E24 @ =gUnknown_2023D6B + ldr r4, _08024E20 @ =gBattleMons + ldr r3, _08024E24 @ =sBattler_AI ldrb r0, [r3] movs r2, 0x58 muls r0, r2 @@ -14836,7 +14836,7 @@ _08024DC2: strb r5, [r2] movs r0, 0x7 strb r0, [r2, 0x1] - ldr r3, _08024E2C @ =gUnknown_2023BC4 + ldr r3, _08024E2C @ =gActiveBattler ldrb r0, [r3] strb r0, [r2, 0x2] ldr r1, _08024E30 @ =gUnknown_20233C4 @@ -14860,10 +14860,10 @@ _08024E16: bx r0 .align 2, 0 _08024E1C: .4byte gUnknown_2022AB8 -_08024E20: .4byte gUnknown_2023BE4 -_08024E24: .4byte gUnknown_2023D6B +_08024E20: .4byte gBattleMons +_08024E24: .4byte sBattler_AI _08024E28: .4byte gUnknown_2022AC8 -_08024E2C: .4byte gUnknown_2023BC4 +_08024E2C: .4byte gActiveBattler _08024E30: .4byte gUnknown_20233C4 _08024E34: .4byte gUnknown_2023D74 thumb_func_end sub_8024C48 @@ -14879,12 +14879,12 @@ sub_8024E38: @ 8024E38 ldr r0, [r6] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _08024F44 @ =gUnknown_2023BC4 + ldr r4, _08024F44 @ =gActiveBattler strb r0, [r4] ldrb r0, [r4] bl sub_80174B8 ldr r2, _08024F48 @ =gUnknown_2023DD0 - ldr r1, _08024F4C @ =gUnknown_825E45C + ldr r1, _08024F4C @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -14906,7 +14906,7 @@ sub_8024E38: @ 8024E38 strb r0, [r1] ldrb r0, [r4] bl GetBankSide - ldr r5, _08024F54 @ =gUnknown_2023DDE + ldr r5, _08024F54 @ =gSideAffecting lsls r0, 24 lsrs r0, 23 adds r0, r5 @@ -14927,7 +14927,7 @@ sub_8024E38: @ 8024E38 ands r0, r1 cmp r0, 0 beq _08024F88 - ldr r1, _08024F58 @ =gUnknown_2023BE4 + ldr r1, _08024F58 @ =gBattleMons mov r9, r1 ldrb r2, [r4] movs r7, 0x58 @@ -14972,7 +14972,7 @@ sub_8024E38: @ 8024E38 subs r1, r0 lsls r1, 25 lsrs r1, 24 - ldr r5, _08024F60 @ =gUnknown_2023D50 + ldr r5, _08024F60 @ =gBattleMoveDamage ldrb r0, [r4] muls r0, r7 add r0, r9 @@ -14984,7 +14984,7 @@ sub_8024E38: @ 8024E38 movs r0, 0x1 str r0, [r5] _08024F28: - ldr r0, _08024F64 @ =gUnknown_2023FC4 + ldr r0, _08024F64 @ =gBattleScripting ldrb r1, [r4] strb r1, [r0, 0x17] bl BattleScriptPushCursor @@ -14997,15 +14997,15 @@ _08024F28: b _080250C6 .align 2, 0 _08024F40: .4byte gUnknown_2023D74 -_08024F44: .4byte gUnknown_2023BC4 +_08024F44: .4byte gActiveBattler _08024F48: .4byte gUnknown_2023DD0 -_08024F4C: .4byte gUnknown_825E45C +_08024F4C: .4byte gBitTable _08024F50: .4byte gUnknown_2023ECC -_08024F54: .4byte gUnknown_2023DDE -_08024F58: .4byte gUnknown_2023BE4 +_08024F54: .4byte gSideAffecting +_08024F58: .4byte gBattleMons _08024F5C: .4byte gUnknown_2023DE4 -_08024F60: .4byte gUnknown_2023D50 -_08024F64: .4byte gUnknown_2023FC4 +_08024F60: .4byte gBattleMoveDamage +_08024F64: .4byte gBattleScripting _08024F68: .4byte gUnknown_81D8CBE _08024F6C: cmp r0, 0x1 @@ -15022,8 +15022,8 @@ _08024F7C: .align 2, 0 _08024F84: .4byte gUnknown_81D8CF5 _08024F88: - ldr r1, _08025064 @ =gUnknown_2023BE4 - ldr r5, _08025068 @ =gUnknown_2023BC4 + ldr r1, _08025064 @ =gBattleMons + ldr r5, _08025068 @ =gActiveBattler ldrb r2, [r5] movs r0, 0x58 muls r0, r2 @@ -15032,7 +15032,7 @@ _08024F88: ldrb r0, [r0] cmp r0, 0x36 bne _08024FAE - ldr r1, _0802506C @ =gUnknown_2023E0C + ldr r1, _0802506C @ =gDisableStructs lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -15062,7 +15062,7 @@ _08024FC4: bne _080250C6 ldrb r0, [r5] bl GetBankSide - ldr r1, _08025070 @ =gUnknown_2023DDE + ldr r1, _08025070 @ =gSideAffecting lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -15098,8 +15098,8 @@ _08025012: ldrb r0, [r0] cmp r4, r0 bge _08025046 - ldr r6, _08025084 @ =gUnknown_2023FE8 - ldr r5, _08025064 @ =gUnknown_2023BE4 + ldr r6, _08025084 @ =gBattleStruct + ldr r5, _08025064 @ =gBattleMons _08025020: lsls r0, r4, 24 lsrs r0, 24 @@ -15133,22 +15133,22 @@ _08025046: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r2, _08025094 @ =gUnknown_825E45C + ldr r2, _08025094 @ =gBitTable b _080250A6 .align 2, 0 -_08025064: .4byte gUnknown_2023BE4 -_08025068: .4byte gUnknown_2023BC4 -_0802506C: .4byte gUnknown_2023E0C -_08025070: .4byte gUnknown_2023DDE +_08025064: .4byte gBattleMons +_08025068: .4byte gActiveBattler +_0802506C: .4byte gDisableStructs +_08025070: .4byte gSideAffecting _08025074: .4byte 0x0000fdff _08025078: .4byte gUnknown_2023BCC _0802507C: .4byte gUnknown_2023BDE _08025080: .4byte gUnknown_2023BDA -_08025084: .4byte gUnknown_2023FE8 +_08025084: .4byte gBattleStruct _08025088: .4byte gUnknown_2023D74 _0802508C: .4byte gUnknown_2023DD0 _08025090: .4byte gUnknown_2023D6D -_08025094: .4byte gUnknown_825E45C +_08025094: .4byte gBitTable _08025098: ldr r0, _080250D4 @ =gUnknown_2023BCC ldrb r3, [r1] @@ -15166,7 +15166,7 @@ _080250A6: ands r0, r3 cmp r0, 0 beq _08025098 - ldr r0, _080250D8 @ =gUnknown_2023D70 + ldr r0, _080250D8 @ =gAbsentBattlerFlags ldrb r0, [r0] ands r0, r3 cmp r0, 0 @@ -15185,7 +15185,7 @@ _080250C6: bx r0 .align 2, 0 _080250D4: .4byte gUnknown_2023BCC -_080250D8: .4byte gUnknown_2023D70 +_080250D8: .4byte gAbsentBattlerFlags thumb_func_end sub_8024E38 thumb_func_start atk53_trainer_slide @@ -15204,11 +15204,11 @@ _080250F0: movs r0, 0x1 _080250F2: bl GetBankByIdentity - ldr r1, _08025114 @ =gUnknown_2023BC4 + ldr r1, _08025114 @ =gActiveBattler strb r0, [r1] movs r0, 0 bl EmitTrainerSlide - ldr r0, _08025114 @ =gUnknown_2023BC4 + ldr r0, _08025114 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution ldr r1, _08025118 @ =gUnknown_2023D74 @@ -15218,15 +15218,15 @@ _080250F2: pop {r0} bx r0 .align 2, 0 -_08025114: .4byte gUnknown_2023BC4 +_08025114: .4byte gActiveBattler _08025118: .4byte gUnknown_2023D74 thumb_func_end atk53_trainer_slide thumb_func_start atk54_playse atk54_playse: @ 802511C push {r4,r5,lr} - ldr r5, _0802514C @ =gUnknown_2023BC4 - ldr r0, _08025150 @ =gUnknown_2023D6B + ldr r5, _0802514C @ =gActiveBattler + ldr r0, _08025150 @ =sBattler_AI ldrb r0, [r0] strb r0, [r5] ldr r4, _08025154 @ =gUnknown_2023D74 @@ -15246,16 +15246,16 @@ atk54_playse: @ 802511C pop {r0} bx r0 .align 2, 0 -_0802514C: .4byte gUnknown_2023BC4 -_08025150: .4byte gUnknown_2023D6B +_0802514C: .4byte gActiveBattler +_08025150: .4byte sBattler_AI _08025154: .4byte gUnknown_2023D74 thumb_func_end atk54_playse thumb_func_start atk55_play_sound atk55_play_sound: @ 8025158 push {r4,r5,lr} - ldr r5, _08025188 @ =gUnknown_2023BC4 - ldr r0, _0802518C @ =gUnknown_2023D6B + ldr r5, _08025188 @ =gActiveBattler + ldr r0, _0802518C @ =sBattler_AI ldrb r0, [r0] strb r0, [r5] ldr r4, _08025190 @ =gUnknown_2023D74 @@ -15275,8 +15275,8 @@ atk55_play_sound: @ 8025158 pop {r0} bx r0 .align 2, 0 -_08025188: .4byte gUnknown_2023BC4 -_0802518C: .4byte gUnknown_2023D6B +_08025188: .4byte gActiveBattler +_0802518C: .4byte sBattler_AI _08025190: .4byte gUnknown_2023D74 thumb_func_end atk55_play_sound @@ -15287,7 +15287,7 @@ atk56_playfaintcry: @ 8025194 ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _080251C0 @ =gUnknown_2023BC4 + ldr r4, _080251C0 @ =gActiveBattler strb r0, [r4] movs r0, 0 bl EmitFaintingCry @@ -15301,7 +15301,7 @@ atk56_playfaintcry: @ 8025194 bx r0 .align 2, 0 _080251BC: .4byte gUnknown_2023D74 -_080251C0: .4byte gUnknown_2023BC4 +_080251C0: .4byte gActiveBattler thumb_func_end atk56_playfaintcry thumb_func_start atk57 @@ -15309,7 +15309,7 @@ atk57: @ 80251C4 push {r4,lr} movs r0, 0 bl GetBankByIdentity - ldr r4, _080251F0 @ =gUnknown_2023BC4 + ldr r4, _080251F0 @ =gActiveBattler strb r0, [r4] ldr r0, _080251F4 @ =gUnknown_2023E8A ldrb r1, [r0] @@ -15325,7 +15325,7 @@ atk57: @ 80251C4 pop {r0} bx r0 .align 2, 0 -_080251F0: .4byte gUnknown_2023BC4 +_080251F0: .4byte gActiveBattler _080251F4: .4byte gUnknown_2023E8A _080251F8: .4byte gUnknown_2023D74 thumb_func_end atk57 @@ -15337,7 +15337,7 @@ atk58_returntoball: @ 80251FC ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _0802522C @ =gUnknown_2023BC4 + ldr r4, _0802522C @ =gActiveBattler strb r0, [r4] movs r0, 0 movs r1, 0x1 @@ -15352,7 +15352,7 @@ atk58_returntoball: @ 80251FC bx r0 .align 2, 0 _08025228: .4byte gUnknown_2023D74 -_0802522C: .4byte gUnknown_2023BC4 +_0802522C: .4byte gActiveBattler thumb_func_end atk58_returntoball thumb_func_start atk59_handlelearnnewmove @@ -15380,12 +15380,12 @@ atk59_handlelearnnewmove: @ 8025230 ldrb r0, [r2, 0x8] lsls r0, 24 orrs r4, r0 - ldr r0, _080252A8 @ =gUnknown_2023FE8 + ldr r0, _080252A8 @ =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _080252AC @ =gUnknown_2024284 + ldr r1, _080252AC @ =gPlayerParty adds r0, r1 ldrb r1, [r2, 0x9] bl MonTryLearningNewMove @@ -15396,12 +15396,12 @@ atk59_handlelearnnewmove: @ 8025230 bne _0802529A adds r7, r5, 0 _0802527E: - ldr r0, _080252A8 @ =gUnknown_2023FE8 + ldr r0, _080252A8 @ =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _080252AC @ =gUnknown_2024284 + ldr r1, _080252AC @ =gPlayerParty adds r0, r1 movs r1, 0 bl MonTryLearningNewMove @@ -15417,8 +15417,8 @@ _0802529A: b _0802535C .align 2, 0 _080252A4: .4byte gUnknown_2023D74 -_080252A8: .4byte gUnknown_2023FE8 -_080252AC: .4byte gUnknown_2024284 +_080252A8: .4byte gBattleStruct +_080252AC: .4byte gPlayerParty _080252B0: .4byte 0x0000fffe _080252B4: ldr r0, _080252C4 @ =0x0000ffff @@ -15435,19 +15435,19 @@ _080252C8: .4byte gUnknown_2023D74 _080252CC: movs r0, 0 bl GetBankByIdentity - ldr r1, _08025364 @ =gUnknown_2023BC4 + ldr r1, _08025364 @ =gActiveBattler strb r0, [r1] - ldr r2, _08025368 @ =gUnknown_2023BCE + ldr r2, _08025368 @ =gBattlerPartyIndexes ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 - ldr r1, _0802536C @ =gUnknown_2023FE8 + ldr r1, _0802536C @ =gBattleStruct ldr r1, [r1] ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 bne _0802530C - ldr r4, _08025370 @ =gUnknown_2023BE4 + ldr r4, _08025370 @ =gBattleMons movs r0, 0x58 adds r2, r3, 0 muls r2, r0 @@ -15464,7 +15464,7 @@ _080252CC: adds r1, r5, 0 bl GiveMoveToBattleMon _0802530C: - ldr r0, _08025374 @ =gUnknown_2022B4C + ldr r0, _08025374 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -15472,19 +15472,19 @@ _0802530C: beq _08025358 movs r0, 0x2 bl GetBankByIdentity - ldr r1, _08025364 @ =gUnknown_2023BC4 + ldr r1, _08025364 @ =gActiveBattler strb r0, [r1] - ldr r2, _08025368 @ =gUnknown_2023BCE + ldr r2, _08025368 @ =gBattlerPartyIndexes ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 - ldr r1, _0802536C @ =gUnknown_2023FE8 + ldr r1, _0802536C @ =gBattleStruct ldr r1, [r1] ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 bne _08025358 - ldr r4, _08025370 @ =gUnknown_2023BE4 + ldr r4, _08025370 @ =gBattleMons movs r0, 0x58 adds r2, r3, 0 muls r2, r0 @@ -15508,11 +15508,11 @@ _0802535C: pop {r0} bx r0 .align 2, 0 -_08025364: .4byte gUnknown_2023BC4 -_08025368: .4byte gUnknown_2023BCE -_0802536C: .4byte gUnknown_2023FE8 -_08025370: .4byte gUnknown_2023BE4 -_08025374: .4byte gUnknown_2022B4C +_08025364: .4byte gActiveBattler +_08025368: .4byte gBattlerPartyIndexes +_0802536C: .4byte gBattleStruct +_08025370: .4byte gBattleMons +_08025374: .4byte gBattleTypeFlags _08025378: .4byte gUnknown_2023D74 thumb_func_end atk59_handlelearnnewmove @@ -15522,10 +15522,10 @@ sub_802537C: @ 802537C mov r7, r8 push {r7} sub sp, 0x4 - ldr r0, _080253A0 @ =gUnknown_2023BC4 + ldr r0, _080253A0 @ =gActiveBattler movs r1, 0 strb r1, [r0] - ldr r0, _080253A4 @ =gUnknown_2023FC4 + ldr r0, _080253A4 @ =gBattleScripting ldrb r1, [r0, 0x1F] adds r2, r0, 0 cmp r1, 0x5 @@ -15538,8 +15538,8 @@ _08025396: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080253A0: .4byte gUnknown_2023BC4 -_080253A4: .4byte gUnknown_2023FC4 +_080253A0: .4byte gActiveBattler +_080253A4: .4byte gBattleScripting _080253A8: .4byte _080253AC .align 2, 0 _080253AC: @@ -15560,7 +15560,7 @@ _080253C4: ldr r0, _080253F0 @ =gUnknown_83FE791 movs r1, 0xE bl sub_80D87BC - ldr r1, _080253F4 @ =gUnknown_2023FC4 + ldr r1, _080253F4 @ =gBattleScripting ldrb r0, [r1, 0x1F] adds r0, 0x1 strb r0, [r1, 0x1F] @@ -15570,7 +15570,7 @@ _080253C4: b _080256D0 .align 2, 0 _080253F0: .4byte gUnknown_83FE791 -_080253F4: .4byte gUnknown_2023FC4 +_080253F4: .4byte gBattleScripting _080253F8: .4byte gUnknown_2023E82 _080253FC: ldr r0, _08025484 @ =gMain @@ -15647,12 +15647,12 @@ _08025496: movs r0, 0x5 bl PlaySE _0802549C: - ldr r1, _080254A4 @ =gUnknown_2023FC4 + ldr r1, _080254A4 @ =gBattleScripting movs r0, 0x4 strb r0, [r1, 0x1F] b _080256D0 .align 2, 0 -_080254A4: .4byte gUnknown_2023FC4 +_080254A4: .4byte gBattleScripting _080254A8: ldr r0, _080254E4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -15663,8 +15663,8 @@ _080254A8: b _080256D0 _080254B6: bl FreeAllWindowBuffers - ldr r0, _080254E8 @ =gUnknown_2024284 - ldr r1, _080254EC @ =gUnknown_2023FE8 + ldr r0, _080254E8 @ =gPlayerParty + ldr r1, _080254EC @ =gBattleStruct ldr r1, [r1] ldrb r1, [r1, 0x10] ldr r2, _080254F0 @ =gUnknown_2024029 @@ -15678,19 +15678,19 @@ _080254B6: str r4, [sp] bl sub_8134738 _080254D8: - ldr r1, _080254FC @ =gUnknown_2023FC4 + ldr r1, _080254FC @ =gBattleScripting ldrb r0, [r1, 0x1F] adds r0, 0x1 strb r0, [r1, 0x1F] b _080256D0 .align 2, 0 _080254E4: .4byte gUnknown_2037AB8 -_080254E8: .4byte gUnknown_2024284 -_080254EC: .4byte gUnknown_2023FE8 +_080254E8: .4byte gPlayerParty +_080254EC: .4byte gBattleStruct _080254F0: .4byte gUnknown_2024029 _080254F4: .4byte sub_8077764 _080254F8: .4byte gUnknown_2024022 -_080254FC: .4byte gUnknown_2023FC4 +_080254FC: .4byte gBattleScripting _08025500: ldr r0, _0802552C @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -15712,16 +15712,16 @@ _0802551A: lsrs r5, r0, 24 cmp r5, 0x4 bne _0802553C - ldr r0, _08025538 @ =gUnknown_2023FC4 + ldr r0, _08025538 @ =gBattleScripting strb r5, [r0, 0x1F] b _080256D0 .align 2, 0 _0802552C: .4byte gUnknown_2037AB8 _08025530: .4byte gMain _08025534: .4byte sub_8011100 -_08025538: .4byte gUnknown_2023FC4 +_08025538: .4byte gBattleScripting _0802553C: - ldr r6, _08025578 @ =gUnknown_2023FE8 + ldr r6, _08025578 @ =gBattleStruct ldr r0, [r6] ldrb r0, [r0, 0x10] movs r1, 0x64 @@ -15729,7 +15729,7 @@ _0802553C: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r7, _0802557C @ =gUnknown_2024284 + ldr r7, _0802557C @ =gPlayerParty adds r0, r7 adds r1, r5, 0 adds r1, 0xD @@ -15741,19 +15741,19 @@ _0802553C: cmp r0, 0 beq _0802558C ldr r0, _08025580 @ =0x0000013f - ldr r1, _08025584 @ =gUnknown_2023BC4 + ldr r1, _08025584 @ =gActiveBattler ldrb r1, [r1] bl PrepareStringBattle - ldr r1, _08025588 @ =gUnknown_2023FC4 + ldr r1, _08025588 @ =gBattleScripting movs r0, 0x5 strb r0, [r1, 0x1F] b _080256D0 .align 2, 0 -_08025578: .4byte gUnknown_2023FE8 -_0802557C: .4byte gUnknown_2024284 +_08025578: .4byte gBattleStruct +_0802557C: .4byte gPlayerParty _08025580: .4byte 0x0000013f -_08025584: .4byte gUnknown_2023BC4 -_08025588: .4byte gUnknown_2023FC4 +_08025584: .4byte gActiveBattler +_08025588: .4byte gBattleScripting _0802558C: ldr r3, _08025680 @ =gUnknown_2023D74 ldr r2, [r3] @@ -15796,23 +15796,23 @@ _0802558C: ldrh r1, [r7] adds r2, r5, 0 bl SetMonMoveSlot - ldr r0, _0802568C @ =gUnknown_2023BCE + ldr r0, _0802568C @ =gBattlerPartyIndexes ldr r1, [r6] ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 bne _08025622 - ldr r4, _08025690 @ =gUnknown_2023BE4 + ldr r4, _08025690 @ =gBattleMons ldr r0, [r4, 0x50] movs r1, 0x80 lsls r1, 14 ands r0, r1 cmp r0, 0 bne _08025622 - ldr r0, _08025694 @ =gUnknown_2023E0C + ldr r0, _08025694 @ =gDisableStructs ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _08025698 @ =gUnknown_825E45C + ldr r2, _08025698 @ =gBitTable lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -15827,20 +15827,20 @@ _0802558C: adds r2, r5, 0 bl SetBattleMonMoveSlot _08025622: - ldr r0, _0802569C @ =gUnknown_2022B4C + ldr r0, _0802569C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _080256D0 - ldr r2, _0802568C @ =gUnknown_2023BCE - ldr r0, _080256A0 @ =gUnknown_2023FE8 + ldr r2, _0802568C @ =gBattlerPartyIndexes + ldr r0, _080256A0 @ =gBattleStruct ldr r1, [r0] ldrh r0, [r2, 0x4] ldrb r1, [r1, 0x10] cmp r0, r1 bne _080256D0 - ldr r4, _08025690 @ =gUnknown_2023BE4 + ldr r4, _08025690 @ =gBattleMons movs r1, 0x80 lsls r1, 1 adds r0, r4, r1 @@ -15850,11 +15850,11 @@ _08025622: ands r0, r1 cmp r0, 0 bne _080256D0 - ldr r0, _08025694 @ =gUnknown_2023E0C + ldr r0, _08025694 @ =gDisableStructs adds r0, 0x50 ldrb r1, [r0] lsrs r1, 4 - ldr r2, _08025698 @ =gUnknown_825E45C + ldr r2, _08025698 @ =gBitTable lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -15875,12 +15875,12 @@ _08025622: _08025680: .4byte gUnknown_2023D74 _08025684: .4byte gUnknown_2022AC8 _08025688: .4byte gUnknown_2024022 -_0802568C: .4byte gUnknown_2023BCE -_08025690: .4byte gUnknown_2023BE4 -_08025694: .4byte gUnknown_2023E0C -_08025698: .4byte gUnknown_825E45C -_0802569C: .4byte gUnknown_2022B4C -_080256A0: .4byte gUnknown_2023FE8 +_0802568C: .4byte gBattlerPartyIndexes +_08025690: .4byte gBattleMons +_08025694: .4byte gDisableStructs +_08025698: .4byte gBitTable +_0802569C: .4byte gBattleTypeFlags +_080256A0: .4byte gBattleStruct _080256A4: movs r0, 0x1 str r0, [sp] @@ -15918,7 +15918,7 @@ _080256DC: .4byte gUnknown_2023BC8 sub_80256E0: @ 80256E0 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080256F4 @ =gUnknown_2023FC4 + ldr r5, _080256F4 @ =gBattleScripting ldrb r4, [r5, 0x1F] cmp r4, 0 beq _080256F8 @@ -15926,7 +15926,7 @@ sub_80256E0: @ 80256E0 beq _08025728 b _0802580E .align 2, 0 -_080256F4: .4byte gUnknown_2023FC4 +_080256F4: .4byte gBattleScripting _080256F8: str r4, [sp] movs r0, 0x17 @@ -16071,9 +16071,9 @@ sub_802581C: @ 802581C ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r2, _0802588C @ =gUnknown_2023BC4 + ldr r2, _0802588C @ =gActiveBattler strb r0, [r2] - ldr r0, _08025890 @ =gUnknown_2023DCC + ldr r0, _08025890 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -16086,7 +16086,7 @@ sub_802581C: @ 802581C ands r0, r1 cmp r0, 0 beq _0802586E - ldr r1, _08025898 @ =gUnknown_2023BE4 + ldr r1, _08025898 @ =gBattleMons ldrb r2, [r2] movs r0, 0x58 muls r0, r2 @@ -16098,7 +16098,7 @@ sub_802581C: @ 802581C ands r0, r1 cmp r0, 0 beq _0802586E - ldr r0, _0802589C @ =gUnknown_2023E0C + ldr r0, _0802589C @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -16109,7 +16109,7 @@ sub_802581C: @ 802581C _0802586E: movs r0, 0 bl EmitHitAnimation - ldr r0, _0802588C @ =gUnknown_2023BC4 + ldr r0, _0802588C @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution ldr r1, _08025888 @ =gUnknown_2023D74 @@ -16119,11 +16119,11 @@ _0802586E: b _080258A6 .align 2, 0 _08025888: .4byte gUnknown_2023D74 -_0802588C: .4byte gUnknown_2023BC4 -_08025890: .4byte gUnknown_2023DCC +_0802588C: .4byte gActiveBattler +_08025890: .4byte gMoveResultFlags _08025894: .4byte gUnknown_2023DD0 -_08025898: .4byte gUnknown_2023BE4 -_0802589C: .4byte gUnknown_2023E0C +_08025898: .4byte gBattleMons +_0802589C: .4byte gDisableStructs _080258A0: ldr r0, [r4] adds r0, 0x2 @@ -16147,18 +16147,18 @@ sub_80258AC: @ 80258AC beq _080258C0 b _080259FA _080258C0: - ldr r0, _080258F4 @ =gUnknown_20386AE + ldr r0, _080258F4 @ =gTrainerBattleOpponent_A ldrh r2, [r0] movs r1, 0x80 lsls r1, 3 cmp r2, r1 bne _08025904 - ldr r0, _080258F8 @ =gUnknown_2023FF4 + ldr r0, _080258F8 @ =gBattleResources ldr r0, [r0] ldr r0, [r0] adds r0, 0x94 ldrb r2, [r0] - ldr r0, _080258FC @ =gUnknown_2023FE8 + ldr r0, _080258FC @ =gBattleStruct ldr r0, [r0] adds r0, 0x4A ldrb r1, [r0] @@ -16172,12 +16172,12 @@ _080258C0: b _080259E8 .align 2, 0 _080258F0: .4byte gUnknown_2023E8A -_080258F4: .4byte gUnknown_20386AE -_080258F8: .4byte gUnknown_2023FF4 -_080258FC: .4byte gUnknown_2023FE8 +_080258F4: .4byte gTrainerBattleOpponent_A +_080258F8: .4byte gBattleResources +_080258FC: .4byte gBattleStruct _08025900: .4byte gSaveBlock1Ptr _08025904: - ldr r2, _08025920 @ =gUnknown_823EAC8 + ldr r2, _08025920 @ =gTrainers ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -16192,7 +16192,7 @@ _08025904: beq _0802592E b _08025970 .align 2, 0 -_08025920: .4byte gUnknown_823EAC8 +_08025920: .4byte gTrainers _08025924: cmp r1, 0x2 beq _08025944 @@ -16241,16 +16241,16 @@ _08025970: lsls r1, r6, 2 adds r3, r1, r0 ldrb r1, [r3] - ldr r7, _080259D0 @ =gUnknown_2023FE8 + ldr r7, _080259D0 @ =gBattleStruct mov r12, r0 lsls r4, r5, 2 - ldr r5, _080259D4 @ =gUnknown_2022B4C + ldr r5, _080259D4 @ =gBattleTypeFlags ldr r0, _080259D8 @ =gSaveBlock1Ptr mov r8, r0 cmp r1, 0xFF beq _080259AA - ldr r2, _080259DC @ =gUnknown_823EAC8 - ldr r0, _080259E0 @ =gUnknown_20386AE + ldr r2, _080259DC @ =gTrainers + ldr r0, _080259E0 @ =gTrainerBattleOpponent_A ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -16287,11 +16287,11 @@ _080259AA: b _080259E8 .align 2, 0 _080259CC: .4byte gUnknown_824F220 -_080259D0: .4byte gUnknown_2023FE8 -_080259D4: .4byte gUnknown_2022B4C +_080259D0: .4byte gBattleStruct +_080259D4: .4byte gBattleTypeFlags _080259D8: .4byte gSaveBlock1Ptr -_080259DC: .4byte gUnknown_823EAC8 -_080259E0: .4byte gUnknown_20386AE +_080259DC: .4byte gTrainers +_080259E0: .4byte gTrainerBattleOpponent_A _080259E4: adds r4, r3, 0 muls r4, r2 @@ -16375,7 +16375,7 @@ atk5E: @ 8025A70 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r6, _08025A98 @ =gUnknown_2023BC4 + ldr r6, _08025A98 @ =gActiveBattler strb r0, [r6] ldr r5, _08025A9C @ =gUnknown_2023E82 ldrb r0, [r5] @@ -16387,7 +16387,7 @@ atk5E: @ 8025A70 b _08025B0C .align 2, 0 _08025A94: .4byte gUnknown_2023D74 -_08025A98: .4byte gUnknown_2023BC4 +_08025A98: .4byte gActiveBattler _08025A9C: .4byte gUnknown_2023E82 _08025AA0: movs r0, 0 @@ -16459,11 +16459,11 @@ _08025B20: .4byte gUnknown_2023C08 thumb_func_start atk5F atk5F: @ 8025B24 push {lr} - ldr r0, _08025B4C @ =gUnknown_2023BC4 - ldr r2, _08025B50 @ =gUnknown_2023D6B + ldr r0, _08025B4C @ =gActiveBattler + ldr r2, _08025B50 @ =sBattler_AI ldrb r3, [r2] strb r3, [r0] - ldr r1, _08025B54 @ =gUnknown_2023D6C + ldr r1, _08025B54 @ =gBattlerTarget ldrb r0, [r1] strb r0, [r2] strb r3, [r1] @@ -16479,9 +16479,9 @@ atk5F: @ 8025B24 ands r1, r0 b _08025B62 .align 2, 0 -_08025B4C: .4byte gUnknown_2023BC4 -_08025B50: .4byte gUnknown_2023D6B -_08025B54: .4byte gUnknown_2023D6C +_08025B4C: .4byte gActiveBattler +_08025B50: .4byte sBattler_AI +_08025B54: .4byte gBattlerTarget _08025B58: .4byte gUnknown_2023DD0 _08025B5C: .4byte 0xffffefff _08025B60: @@ -16501,7 +16501,7 @@ _08025B70: .4byte gUnknown_2023D74 thumb_func_start atk60_incrementgamestat atk60_incrementgamestat: @ 8025B74 push {lr} - ldr r0, _08025B9C @ =gUnknown_2023D6B + ldr r0, _08025B9C @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -16519,7 +16519,7 @@ _08025B8E: pop {r0} bx r0 .align 2, 0 -_08025B9C: .4byte gUnknown_2023D6B +_08025B9C: .4byte sBattler_AI _08025BA0: .4byte gUnknown_2023D74 thumb_func_end atk60_incrementgamestat @@ -16537,16 +16537,16 @@ atk61_drawpartystatussummary: @ 8025BA4 ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r1, _08025C10 @ =gUnknown_2023BC4 + ldr r1, _08025C10 @ =gActiveBattler strb r0, [r1] ldrb r0, [r1] bl GetBankSide lsls r0, 24 - ldr r1, _08025C14 @ =gUnknown_202402C + ldr r1, _08025C14 @ =gEnemyParty mov r8, r1 cmp r0, 0 bne _08025BD6 - ldr r0, _08025C18 @ =gUnknown_2024284 + ldr r0, _08025C18 @ =gPlayerParty mov r8, r0 _08025BD6: movs r7, 0 @@ -16577,9 +16577,9 @@ _08025C00: .align 2, 0 _08025C08: .4byte gUnknown_2023BC8 _08025C0C: .4byte gUnknown_2023D74 -_08025C10: .4byte gUnknown_2023BC4 -_08025C14: .4byte gUnknown_202402C -_08025C18: .4byte gUnknown_2024284 +_08025C10: .4byte gActiveBattler +_08025C14: .4byte gEnemyParty +_08025C18: .4byte gPlayerParty _08025C1C: .4byte 0x0000ffff _08025C20: adds r0, r4, 0 @@ -16600,7 +16600,7 @@ _08025C32: mov r1, sp movs r2, 0x1 bl EmitDrawPartyStatusSummary - ldr r0, _08025C64 @ =gUnknown_2023BC4 + ldr r0, _08025C64 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution ldr r1, _08025C68 @ =gUnknown_2023D74 @@ -16615,7 +16615,7 @@ _08025C58: pop {r0} bx r0 .align 2, 0 -_08025C64: .4byte gUnknown_2023BC4 +_08025C64: .4byte gActiveBattler _08025C68: .4byte gUnknown_2023D74 thumb_func_end atk61_drawpartystatussummary @@ -16626,7 +16626,7 @@ atk62: @ 8025C6C ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _08025C98 @ =gUnknown_2023BC4 + ldr r4, _08025C98 @ =gActiveBattler strb r0, [r4] movs r0, 0 bl EmitCmd49 @@ -16640,7 +16640,7 @@ atk62: @ 8025C6C bx r0 .align 2, 0 _08025C94: .4byte gUnknown_2023D74 -_08025C98: .4byte gUnknown_2023BC4 +_08025C98: .4byte gActiveBattler thumb_func_end atk62 thumb_func_start atk63_jumptorandomattack @@ -16652,18 +16652,18 @@ atk63_jumptorandomattack: @ 8025C9C adds r4, r0, 0 cmp r1, 0 beq _08025CC0 - ldr r0, _08025CB8 @ =gUnknown_2023D4A + ldr r0, _08025CB8 @ =gCurrentMove ldr r1, _08025CBC @ =gUnknown_2023D4E ldrh r1, [r1] strh r1, [r0] b _08025CCE .align 2, 0 _08025CB4: .4byte gUnknown_2023D74 -_08025CB8: .4byte gUnknown_2023D4A +_08025CB8: .4byte gCurrentMove _08025CBC: .4byte gUnknown_2023D4E _08025CC0: ldr r2, _08025CEC @ =gUnknown_2023D4C - ldr r1, _08025CF0 @ =gUnknown_2023D4A + ldr r1, _08025CF0 @ =gCurrentMove ldr r0, _08025CF4 @ =gUnknown_2023D4E ldrh r0, [r0] strh r0, [r1] @@ -16671,7 +16671,7 @@ _08025CC0: adds r0, r1, 0 _08025CCE: ldr r3, _08025CF8 @ =gUnknown_81D65A8 - ldr r2, _08025CFC @ =gUnknown_8250C04 + ldr r2, _08025CFC @ =gBattleMoves ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -16687,10 +16687,10 @@ _08025CCE: bx r0 .align 2, 0 _08025CEC: .4byte gUnknown_2023D4C -_08025CF0: .4byte gUnknown_2023D4A +_08025CF0: .4byte gCurrentMove _08025CF4: .4byte gUnknown_2023D4E _08025CF8: .4byte gUnknown_81D65A8 -_08025CFC: .4byte gUnknown_8250C04 +_08025CFC: .4byte gBattleMoves thumb_func_end atk63_jumptorandomattack thumb_func_start atk64_statusanimation @@ -16704,9 +16704,9 @@ atk64_statusanimation: @ 8025D00 ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _08025D78 @ =gUnknown_2023BC4 + ldr r4, _08025D78 @ =gActiveBattler strb r0, [r4] - ldr r1, _08025D7C @ =gUnknown_2023DFC + ldr r1, _08025D7C @ =gStatuses3 ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -16715,7 +16715,7 @@ atk64_statusanimation: @ 8025D00 ands r0, r1 cmp r0, 0 bne _08025D60 - ldr r0, _08025D84 @ =gUnknown_2023E0C + ldr r0, _08025D84 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -16729,7 +16729,7 @@ atk64_statusanimation: @ 8025D00 ands r0, r1 cmp r0, 0 bne _08025D60 - ldr r1, _08025D8C @ =gUnknown_2023BE4 + ldr r1, _08025D8C @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r1, 0x4C @@ -16752,12 +16752,12 @@ _08025D68: .align 2, 0 _08025D70: .4byte gUnknown_2023BC8 _08025D74: .4byte gUnknown_2023D74 -_08025D78: .4byte gUnknown_2023BC4 -_08025D7C: .4byte gUnknown_2023DFC +_08025D78: .4byte gActiveBattler +_08025D7C: .4byte gStatuses3 _08025D80: .4byte 0x000400c0 -_08025D84: .4byte gUnknown_2023E0C +_08025D84: .4byte gDisableStructs _08025D88: .4byte gUnknown_2023DD0 -_08025D8C: .4byte gUnknown_2023BE4 +_08025D8C: .4byte gBattleMons thumb_func_end atk64_statusanimation thumb_func_start atk65_status2animation @@ -16771,7 +16771,7 @@ atk65_status2animation: @ 8025D90 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r5, _08025E20 @ =gUnknown_2023BC4 + ldr r5, _08025E20 @ =gActiveBattler strb r0, [r5] ldr r1, [r4] ldrb r3, [r1, 0x2] @@ -16784,7 +16784,7 @@ atk65_status2animation: @ 8025D90 ldrb r0, [r1, 0x5] lsls r0, 24 orrs r3, r0 - ldr r1, _08025E24 @ =gUnknown_2023DFC + ldr r1, _08025E24 @ =gStatuses3 ldrb r2, [r5] lsls r0, r2, 2 adds r0, r1 @@ -16793,7 +16793,7 @@ atk65_status2animation: @ 8025D90 ands r0, r1 cmp r0, 0 bne _08025E08 - ldr r0, _08025E2C @ =gUnknown_2023E0C + ldr r0, _08025E2C @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -16807,7 +16807,7 @@ atk65_status2animation: @ 8025D90 ands r0, r1 cmp r0, 0 bne _08025E08 - ldr r1, _08025E34 @ =gUnknown_2023BE4 + ldr r1, _08025E34 @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r1, 0x50 @@ -16831,12 +16831,12 @@ _08025E10: .align 2, 0 _08025E18: .4byte gUnknown_2023BC8 _08025E1C: .4byte gUnknown_2023D74 -_08025E20: .4byte gUnknown_2023BC4 -_08025E24: .4byte gUnknown_2023DFC +_08025E20: .4byte gActiveBattler +_08025E24: .4byte gStatuses3 _08025E28: .4byte 0x000400c0 -_08025E2C: .4byte gUnknown_2023E0C +_08025E2C: .4byte gDisableStructs _08025E30: .4byte gUnknown_2023DD0 -_08025E34: .4byte gUnknown_2023BE4 +_08025E34: .4byte gBattleMons thumb_func_end atk65_status2animation thumb_func_start atk66_chosenstatusanimation @@ -16850,7 +16850,7 @@ atk66_chosenstatusanimation: @ 8025E38 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r5, _08025EB8 @ =gUnknown_2023BC4 + ldr r5, _08025EB8 @ =gActiveBattler strb r0, [r5] ldr r4, [r4] ldrb r2, [r4, 0x3] @@ -16863,7 +16863,7 @@ atk66_chosenstatusanimation: @ 8025E38 ldrb r0, [r4, 0x6] lsls r0, 24 orrs r2, r0 - ldr r1, _08025EBC @ =gUnknown_2023DFC + ldr r1, _08025EBC @ =gStatuses3 ldrb r3, [r5] lsls r0, r3, 2 adds r0, r1 @@ -16872,7 +16872,7 @@ atk66_chosenstatusanimation: @ 8025E38 ands r0, r1 cmp r0, 0 bne _08025EA2 - ldr r0, _08025EC4 @ =gUnknown_2023E0C + ldr r0, _08025EC4 @ =gDisableStructs lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -16903,10 +16903,10 @@ _08025EAA: .align 2, 0 _08025EB0: .4byte gUnknown_2023BC8 _08025EB4: .4byte gUnknown_2023D74 -_08025EB8: .4byte gUnknown_2023BC4 -_08025EBC: .4byte gUnknown_2023DFC +_08025EB8: .4byte gActiveBattler +_08025EBC: .4byte gStatuses3 _08025EC0: .4byte 0x000400c0 -_08025EC4: .4byte gUnknown_2023E0C +_08025EC4: .4byte gDisableStructs _08025EC8: .4byte gUnknown_2023DD0 thumb_func_end atk66_chosenstatusanimation @@ -17050,8 +17050,8 @@ _08025FDC: .4byte gUnknown_2023BDA thumb_func_start atk69_adjustsetdamage atk69_adjustsetdamage: @ 8025FE0 push {r4-r7,lr} - ldr r7, _08026008 @ =gUnknown_2023BE4 - ldr r6, _0802600C @ =gUnknown_2023D6C + ldr r7, _08026008 @ =gBattleMons + ldr r6, _0802600C @ =gBattlerTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -17069,8 +17069,8 @@ atk69_adjustsetdamage: @ 8025FE0 ldrb r6, [r0, 0x1A] b _0802602E .align 2, 0 -_08026008: .4byte gUnknown_2023BE4 -_0802600C: .4byte gUnknown_2023D6C +_08026008: .4byte gBattleMons +_0802600C: .4byte gBattlerTarget _08026010: .4byte gUnknown_2023F54 _08026014: ldrh r0, [r1, 0x2E] @@ -17086,7 +17086,7 @@ _08026014: lsrs r6, r0, 24 _0802602E: ldr r1, _080260F0 @ =gUnknown_2023D6F - ldr r5, _080260F4 @ =gUnknown_2023D6C + ldr r5, _080260F4 @ =gBattlerTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -17114,8 +17114,8 @@ _0802602E: orrs r1, r2 strb r1, [r0] _0802606C: - ldr r2, _080260FC @ =gUnknown_2023BE4 - ldr r3, _080260F4 @ =gUnknown_2023D6C + ldr r2, _080260FC @ =gBattleMons + ldr r3, _080260F4 @ =gBattlerTarget ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -17129,8 +17129,8 @@ _0802606C: adds r5, r2, 0 cmp r1, 0 bne _0802613C - ldr r2, _08026100 @ =gUnknown_8250C04 - ldr r0, _08026104 @ =gUnknown_2023D4A + ldr r2, _08026100 @ =gBattleMoves + ldr r0, _08026104 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -17161,7 +17161,7 @@ _080260BE: muls r0, r4 adds r0, r5 ldrh r1, [r0, 0x28] - ldr r2, _0802610C @ =gUnknown_2023D50 + ldr r2, _0802610C @ =gBattleMoveDamage ldr r0, [r2] cmp r1, r0 bgt _0802613C @@ -17175,7 +17175,7 @@ _080260BE: lsls r0, 30 cmp r0, 0 bge _08026114 - ldr r0, _08026110 @ =gUnknown_2023DCC + ldr r0, _08026110 @ =gMoveResultFlags ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 @@ -17183,14 +17183,14 @@ _080260BE: b _0802613C .align 2, 0 _080260F0: .4byte gUnknown_2023D6F -_080260F4: .4byte gUnknown_2023D6C +_080260F4: .4byte gBattlerTarget _080260F8: .4byte gUnknown_2023ECC -_080260FC: .4byte gUnknown_2023BE4 -_08026100: .4byte gUnknown_8250C04 -_08026104: .4byte gUnknown_2023D4A +_080260FC: .4byte gBattleMons +_08026100: .4byte gBattleMoves +_08026104: .4byte gCurrentMove _08026108: .4byte gUnknown_2023E8C -_0802610C: .4byte gUnknown_2023D50 -_08026110: .4byte gUnknown_2023DCC +_0802610C: .4byte gBattleMoveDamage +_08026110: .4byte gMoveResultFlags _08026114: ldr r0, _0802614C @ =gUnknown_2023ECC lsls r1, r3, 2 @@ -17201,7 +17201,7 @@ _08026114: lsrs r0, 7 cmp r0, 0 beq _0802613C - ldr r2, _08026150 @ =gUnknown_2023DCC + ldr r2, _08026150 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 @@ -17222,7 +17222,7 @@ _0802613C: bx r0 .align 2, 0 _0802614C: .4byte gUnknown_2023ECC -_08026150: .4byte gUnknown_2023DCC +_08026150: .4byte gMoveResultFlags _08026154: .4byte gUnknown_2023D68 _08026158: .4byte gUnknown_2023D74 thumb_func_end atk69_adjustsetdamage @@ -17235,15 +17235,15 @@ atk6A_removeitem: @ 802615C ldr r0, [r6] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r5, _080261C0 @ =gUnknown_2023BC4 + ldr r5, _080261C0 @ =gActiveBattler strb r0, [r5] - ldr r1, _080261C4 @ =gUnknown_2023FE8 + ldr r1, _080261C4 @ =gBattleStruct ldrb r4, [r5] lsls r0, r4, 1 adds r0, 0xB8 ldr r1, [r1] adds r1, r0 - ldr r2, _080261C8 @ =gUnknown_2023BE4 + ldr r2, _080261C8 @ =gBattleMons movs r3, 0x58 adds r0, r4, 0 muls r0, r3 @@ -17276,9 +17276,9 @@ atk6A_removeitem: @ 802615C bx r0 .align 2, 0 _080261BC: .4byte gUnknown_2023D74 -_080261C0: .4byte gUnknown_2023BC4 -_080261C4: .4byte gUnknown_2023FE8 -_080261C8: .4byte gUnknown_2023BE4 +_080261C0: .4byte gActiveBattler +_080261C4: .4byte gBattleStruct +_080261C8: .4byte gBattleMons thumb_func_end atk6A_removeitem thumb_func_start atk6B_atknameinbuff1 @@ -17288,10 +17288,10 @@ atk6B_atknameinbuff1: @ 80261CC strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] - ldr r2, _080261FC @ =gUnknown_2023D6B + ldr r2, _080261FC @ =sBattler_AI ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, _08026200 @ =gUnknown_2023BCE + ldr r3, _08026200 @ =gBattlerPartyIndexes ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -17306,8 +17306,8 @@ atk6B_atknameinbuff1: @ 80261CC bx lr .align 2, 0 _080261F8: .4byte gUnknown_2022AB8 -_080261FC: .4byte gUnknown_2023D6B -_08026200: .4byte gUnknown_2023BCE +_080261FC: .4byte sBattler_AI +_08026200: .4byte gBattlerPartyIndexes _08026204: .4byte gUnknown_2023D74 thumb_func_end atk6B_atknameinbuff1 @@ -17315,7 +17315,7 @@ _08026204: .4byte gUnknown_2023D74 atk6C_drawlvlupbox: @ 8026208 push {r4,lr} sub sp, 0x4 - ldr r0, _08026224 @ =gUnknown_2023FC4 + ldr r0, _08026224 @ =gBattleScripting ldrb r1, [r0, 0x1E] adds r4, r0, 0 cmp r1, 0 @@ -17326,7 +17326,7 @@ atk6C_drawlvlupbox: @ 8026208 movs r0, 0x3 b _0802622A .align 2, 0 -_08026224: .4byte gUnknown_2023FC4 +_08026224: .4byte gBattleScripting _08026228: movs r0, 0x1 _0802622A: @@ -17368,13 +17368,13 @@ _0802626C: movs r0, 0x2 bl ShowBg bl sub_8026480 - ldr r1, _08026294 @ =gUnknown_2023FC4 + ldr r1, _08026294 @ =gBattleScripting movs r0, 0x2 strb r0, [r1, 0x1E] b _080263F6 .align 2, 0 _08026290: .4byte gUnknown_202297E -_08026294: .4byte gUnknown_2023FC4 +_08026294: .4byte gBattleScripting _08026298: bl sub_80264D0 lsls r0, 24 @@ -17382,12 +17382,12 @@ _08026298: beq _080262A4 b _080263F6 _080262A4: - ldr r1, _080262AC @ =gUnknown_2023FC4 + ldr r1, _080262AC @ =gBattleScripting movs r0, 0x3 strb r0, [r1, 0x1E] b _080263F6 .align 2, 0 -_080262AC: .4byte gUnknown_2023FC4 +_080262AC: .4byte gBattleScripting _080262B0: ldr r1, _080262F8 @ =gUnknown_2022978 movs r0, 0 @@ -17416,14 +17416,14 @@ _080262B0: movs r2, 0x1D movs r3, 0x13 bl sub_802DB7C - ldr r1, _08026300 @ =gUnknown_2023FC4 + ldr r1, _08026300 @ =gBattleScripting movs r0, 0x4 strb r0, [r1, 0x1E] b _080263F6 .align 2, 0 _080262F8: .4byte gUnknown_2022978 _080262FC: .4byte gUnknown_202297A -_08026300: .4byte gUnknown_2023FC4 +_08026300: .4byte gBattleScripting _08026304: bl sub_8026404 movs r0, 0xC @@ -17472,14 +17472,14 @@ _08026350: movs r3, 0x13 bl sub_802DB7C _0802636E: - ldr r1, _0802637C @ =gUnknown_2023FC4 + ldr r1, _0802637C @ =gBattleScripting ldrb r0, [r1, 0x1E] adds r0, 0x1 strb r0, [r1, 0x1E] b _080263F6 .align 2, 0 _08026378: .4byte gMain -_0802637C: .4byte gUnknown_2023FC4 +_0802637C: .4byte gBattleScripting _08026380: bl sub_8026648 lsls r0, 24 @@ -17501,12 +17501,12 @@ _08026380: bl SetBgAttribute movs r0, 0x2 bl ShowBg - ldr r1, _080263C0 @ =gUnknown_2023FC4 + ldr r1, _080263C0 @ =gBattleScripting movs r0, 0xA strb r0, [r1, 0x1E] b _080263F6 .align 2, 0 -_080263C0: .4byte gUnknown_2023FC4 +_080263C0: .4byte gBattleScripting _080263C4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 @@ -17541,16 +17541,16 @@ _08026400: .4byte gUnknown_2023D74 sub_8026404: @ 8026404 push {lr} sub sp, 0x14 - ldr r0, _0802643C @ =gUnknown_2023FE8 + ldr r0, _0802643C @ =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _08026440 @ =gUnknown_2024284 + ldr r1, _08026440 @ =gPlayerParty adds r0, r1 add r1, sp, 0x8 bl sub_811D130 - ldr r0, _08026444 @ =gUnknown_2023FF4 + ldr r0, _08026444 @ =gBattleResources ldr r0, [r0] ldr r1, [r0, 0x10] movs r0, 0xD @@ -17565,21 +17565,21 @@ sub_8026404: @ 8026404 pop {r0} bx r0 .align 2, 0 -_0802643C: .4byte gUnknown_2023FE8 -_08026440: .4byte gUnknown_2024284 -_08026444: .4byte gUnknown_2023FF4 +_0802643C: .4byte gBattleStruct +_08026440: .4byte gPlayerParty +_08026444: .4byte gBattleResources thumb_func_end sub_8026404 thumb_func_start sub_8026448 sub_8026448: @ 8026448 push {lr} sub sp, 0x10 - ldr r0, _08026478 @ =gUnknown_2023FE8 + ldr r0, _08026478 @ =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0802647C @ =gUnknown_2024284 + ldr r1, _0802647C @ =gPlayerParty adds r0, r1 add r1, sp, 0x4 bl sub_811D130 @@ -17594,8 +17594,8 @@ sub_8026448: @ 8026448 pop {r0} bx r0 .align 2, 0 -_08026478: .4byte gUnknown_2023FE8 -_0802647C: .4byte gUnknown_2024284 +_08026478: .4byte gBattleStruct +_0802647C: .4byte gPlayerParty thumb_func_end sub_8026448 thumb_func_start sub_8026480 @@ -17688,12 +17688,12 @@ PutLevelAndGenderOnLvlUpBox: @ 8026524 mov r7, r8 push {r7} sub sp, 0x10 - ldr r6, _080265F8 @ =gUnknown_2023FE8 + ldr r6, _080265F8 @ =gBattleStruct ldr r0, [r6] ldrb r0, [r0, 0x10] movs r5, 0x64 muls r0, r5 - ldr r4, _080265FC @ =gUnknown_2024284 + ldr r4, _080265FC @ =gPlayerParty adds r0, r4 movs r1, 0x38 bl GetMonData @@ -17782,8 +17782,8 @@ PutLevelAndGenderOnLvlUpBox: @ 8026524 movs r0, 0xB5 b _0802661C .align 2, 0 -_080265F8: .4byte gUnknown_2023FE8 -_080265FC: .4byte gUnknown_2024284 +_080265F8: .4byte gBattleStruct +_080265FC: .4byte gPlayerParty _08026600: .4byte gStringVar4 _08026604: adds r0, r6, 0 @@ -17866,13 +17866,13 @@ PutMonIconOnLvlUpBox: @ 8026688 mov r6, r8 push {r6} sub sp, 0x10 - ldr r0, _08026730 @ =gUnknown_2023FE8 + ldr r0, _08026730 @ =gBattleStruct mov r8, r0 ldr r0, [r0] ldrb r0, [r0, 0x10] movs r6, 0x64 muls r0, r6 - ldr r5, _08026734 @ =gUnknown_2024284 + ldr r5, _08026734 @ =gPlayerParty adds r0, r5 movs r1, 0xB bl GetMonData @@ -17940,8 +17940,8 @@ PutMonIconOnLvlUpBox: @ 8026688 pop {r0} bx r0 .align 2, 0 -_08026730: .4byte gUnknown_2023FE8 -_08026734: .4byte gUnknown_2024284 +_08026730: .4byte gBattleStruct +_08026734: .4byte gPlayerParty _08026738: .4byte 0xffff0000 _0802673C: .4byte 0x0000ffff _08026740: .4byte 0xd75a0000 @@ -17991,14 +17991,14 @@ _08026798: .4byte 0x0000d75a thumb_func_start IsMonGettingExpSentOut IsMonGettingExpSentOut: @ 802679C push {lr} - ldr r3, _080267C4 @ =gUnknown_2023BCE - ldr r0, _080267C8 @ =gUnknown_2023FE8 + ldr r3, _080267C4 @ =gBattlerPartyIndexes + ldr r0, _080267C8 @ =gBattleStruct ldr r0, [r0] ldrh r1, [r3] ldrb r2, [r0, 0x10] cmp r1, r2 beq _080267BE - ldr r0, _080267CC @ =gUnknown_2022B4C + ldr r0, _080267CC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -18011,9 +18011,9 @@ _080267BE: movs r0, 0x1 b _080267D2 .align 2, 0 -_080267C4: .4byte gUnknown_2023BCE -_080267C8: .4byte gUnknown_2023FE8 -_080267CC: .4byte gUnknown_2022B4C +_080267C4: .4byte gBattlerPartyIndexes +_080267C8: .4byte gBattleStruct +_080267CC: .4byte gBattleTypeFlags _080267D0: movs r0, 0 _080267D2: @@ -18040,7 +18040,7 @@ atk6E_setatktoplayer0: @ 80267F0 push {lr} movs r0, 0 bl GetBankByIdentity - ldr r1, _08026808 @ =gUnknown_2023D6B + ldr r1, _08026808 @ =sBattler_AI strb r0, [r1] ldr r1, _0802680C @ =gUnknown_2023D74 ldr r0, [r1] @@ -18049,7 +18049,7 @@ atk6E_setatktoplayer0: @ 80267F0 pop {r0} bx r0 .align 2, 0 -_08026808: .4byte gUnknown_2023D6B +_08026808: .4byte sBattler_AI _0802680C: .4byte gUnknown_2023D74 thumb_func_end atk6E_setatktoplayer0 @@ -18060,7 +18060,7 @@ atk6F_makevisible: @ 8026810 ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _08026840 @ =gUnknown_2023BC4 + ldr r4, _08026840 @ =gActiveBattler strb r0, [r4] movs r0, 0 movs r1, 0 @@ -18075,7 +18075,7 @@ atk6F_makevisible: @ 8026810 bx r0 .align 2, 0 _0802683C: .4byte gUnknown_2023D74 -_08026840: .4byte gUnknown_2023BC4 +_08026840: .4byte gActiveBattler thumb_func_end atk6F_makevisible thumb_func_start atk70_recordlastability @@ -18085,7 +18085,7 @@ atk70_recordlastability: @ 8026844 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r1, _08026870 @ =gUnknown_2023BC4 + ldr r1, _08026870 @ =gActiveBattler strb r0, [r1] ldrb r0, [r1] ldr r1, _08026874 @ =gUnknown_2023D6A @@ -18099,7 +18099,7 @@ atk70_recordlastability: @ 8026844 bx r0 .align 2, 0 _0802686C: .4byte gUnknown_2023D74 -_08026870: .4byte gUnknown_2023BC4 +_08026870: .4byte gActiveBattler _08026874: .4byte gUnknown_2023D6A thumb_func_end atk70_recordlastability @@ -18181,7 +18181,7 @@ _080268F8: .4byte gUnknown_2023D74 thumb_func_start atk73_hpthresholds atk73_hpthresholds: @ 80268FC push {r4-r6,lr} - ldr r0, _0802694C @ =gUnknown_2022B4C + ldr r0, _0802694C @ =gBattleTypeFlags ldr r4, [r0] movs r6, 0x1 ands r4, r6 @@ -18191,13 +18191,13 @@ atk73_hpthresholds: @ 80268FC ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r1, _08026954 @ =gUnknown_2023BC4 + ldr r1, _08026954 @ =gActiveBattler strb r0, [r1] movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r2, _08026958 @ =gUnknown_2023BE4 + ldr r2, _08026958 @ =gBattleMons movs r1, 0x58 muls r1, r0 adds r1, r2 @@ -18215,39 +18215,39 @@ _0802693A: cmp r5, 0 bne _08026960 _08026942: - ldr r0, _0802695C @ =gUnknown_2023FE8 + ldr r0, _0802695C @ =gBattleStruct ldr r0, [r0] adds r0, 0xAD strb r4, [r0] b _08026992 .align 2, 0 -_0802694C: .4byte gUnknown_2022B4C +_0802694C: .4byte gBattleTypeFlags _08026950: .4byte gUnknown_2023D74 -_08026954: .4byte gUnknown_2023BC4 -_08026958: .4byte gUnknown_2023BE4 -_0802695C: .4byte gUnknown_2023FE8 +_08026954: .4byte gActiveBattler +_08026958: .4byte gBattleMons +_0802695C: .4byte gBattleStruct _08026960: cmp r0, 0x27 ble _08026974 - ldr r0, _08026970 @ =gUnknown_2023FE8 + ldr r0, _08026970 @ =gBattleStruct ldr r0, [r0] adds r0, 0xAD strb r6, [r0] b _08026992 .align 2, 0 -_08026970: .4byte gUnknown_2023FE8 +_08026970: .4byte gBattleStruct _08026974: cmp r0, 0x9 ble _08026988 - ldr r0, _08026984 @ =gUnknown_2023FE8 + ldr r0, _08026984 @ =gBattleStruct ldr r0, [r0] adds r0, 0xAD movs r1, 0x2 b _08026990 .align 2, 0 -_08026984: .4byte gUnknown_2023FE8 +_08026984: .4byte gBattleStruct _08026988: - ldr r0, _080269A0 @ =gUnknown_2023FE8 + ldr r0, _080269A0 @ =gBattleStruct ldr r0, [r0] adds r0, 0xAD movs r1, 0x3 @@ -18262,7 +18262,7 @@ _08026992: pop {r0} bx r0 .align 2, 0 -_080269A0: .4byte gUnknown_2023FE8 +_080269A0: .4byte gBattleStruct _080269A4: .4byte gUnknown_2023D74 thumb_func_end atk73_hpthresholds @@ -18271,7 +18271,7 @@ atk74_hpthresholds2: @ 80269A8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08026A0C @ =gUnknown_2022B4C + ldr r0, _08026A0C @ =gBattleTypeFlags ldr r7, [r0] movs r0, 0x1 mov r8, r0 @@ -18283,7 +18283,7 @@ atk74_hpthresholds2: @ 80269A8 ldrb r0, [r0, 0x1] bl sub_8016E24 adds r4, r0, 0 - ldr r0, _08026A14 @ =gUnknown_2023BC4 + ldr r0, _08026A14 @ =gActiveBattler strb r4, [r0] movs r0, 0x1 eors r4, r0 @@ -18292,13 +18292,13 @@ atk74_hpthresholds2: @ 80269A8 adds r0, r4, 0 bl GetBankSide lsls r0, 24 - ldr r1, _08026A18 @ =gUnknown_2023FE8 + ldr r1, _08026A18 @ =gBattleStruct ldr r6, [r1] lsrs r0, 23 adds r0, r6 adds r0, 0xA8 ldrb r5, [r0] - ldr r1, _08026A1C @ =gUnknown_2023BE4 + ldr r1, _08026A1C @ =gBattleMons movs r0, 0x58 muls r0, r4 adds r0, r1 @@ -18316,11 +18316,11 @@ atk74_hpthresholds2: @ 80269A8 strb r7, [r0] b _08026A42 .align 2, 0 -_08026A0C: .4byte gUnknown_2022B4C +_08026A0C: .4byte gBattleTypeFlags _08026A10: .4byte gUnknown_2023D74 -_08026A14: .4byte gUnknown_2023BC4 -_08026A18: .4byte gUnknown_2023FE8 -_08026A1C: .4byte gUnknown_2023BE4 +_08026A14: .4byte gActiveBattler +_08026A18: .4byte gBattleStruct +_08026A1C: .4byte gBattleMons _08026A20: cmp r0, 0x1D bgt _08026A2E @@ -18361,17 +18361,17 @@ atk75_useitemonopponent: @ 8026A58 push {lr} sub sp, 0x4 ldr r2, _08026A98 @ =gUnknown_2024004 - ldr r1, _08026A9C @ =gUnknown_2023D6B + ldr r1, _08026A9C @ =sBattler_AI ldrb r0, [r1] strb r0, [r2] - ldr r2, _08026AA0 @ =gUnknown_2023BCE + ldr r2, _08026AA0 @ =gBattlerPartyIndexes ldrb r0, [r1] lsls r0, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r1, _08026AA4 @ =gUnknown_202402C + ldr r1, _08026AA4 @ =gEnemyParty adds r0, r1 ldr r1, _08026AA8 @ =gUnknown_2023D68 ldrh r1, [r1] @@ -18390,9 +18390,9 @@ atk75_useitemonopponent: @ 8026A58 bx r0 .align 2, 0 _08026A98: .4byte gUnknown_2024004 -_08026A9C: .4byte gUnknown_2023D6B -_08026AA0: .4byte gUnknown_2023BCE -_08026AA4: .4byte gUnknown_202402C +_08026A9C: .4byte sBattler_AI +_08026AA0: .4byte gBattlerPartyIndexes +_08026AA4: .4byte gEnemyParty _08026AA8: .4byte gUnknown_2023D68 _08026AAC: .4byte gUnknown_2023D74 thumb_func_end atk75_useitemonopponent @@ -18408,7 +18408,7 @@ sub_8026AB0: @ 8026AB0 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r1, _08026AE0 @ =gUnknown_2023BC4 + ldr r1, _08026AE0 @ =gActiveBattler strb r0, [r1] ldr r0, [r4] ldrb r0, [r0, 0x2] @@ -18423,7 +18423,7 @@ _08026AD2: mov pc, r0 .align 2, 0 _08026ADC: .4byte gUnknown_2023D74 -_08026AE0: .4byte gUnknown_2023BC4 +_08026AE0: .4byte gActiveBattler _08026AE4: .4byte _08026AE8 .align 2, 0 _08026AE8: @@ -18441,15 +18441,15 @@ _08026AE8: .4byte _08026DA0 .4byte _08026F44 _08026B1C: - ldr r0, _08026B28 @ =gUnknown_2023BC4 + ldr r0, _08026B28 @ =gActiveBattler ldrb r0, [r0] bl CancelMultiTurnMoves b _08026F4E .align 2, 0 -_08026B28: .4byte gUnknown_2023BC4 +_08026B28: .4byte gActiveBattler _08026B2C: - ldr r1, _08026B68 @ =gUnknown_2023D6B - ldr r4, _08026B6C @ =gUnknown_2023D6C + ldr r1, _08026B68 @ =sBattler_AI + ldr r4, _08026B6C @ =gBattlerTarget ldrb r0, [r4] strb r0, [r1] ldrb r0, [r1] @@ -18466,7 +18466,7 @@ _08026B2C: ldrb r0, [r2, 0x8] cmp r0, 0 beq _08026B78 - ldr r1, _08026B74 @ =gUnknown_2023BE4 + ldr r1, _08026B74 @ =gBattleMons ldrb r2, [r2, 0x9] movs r0, 0x58 muls r0, r2 @@ -18477,19 +18477,19 @@ _08026B2C: strb r2, [r4] b _08026F4E .align 2, 0 -_08026B68: .4byte gUnknown_2023D6B -_08026B6C: .4byte gUnknown_2023D6C +_08026B68: .4byte sBattler_AI +_08026B6C: .4byte gBattlerTarget _08026B70: .4byte gUnknown_2023DE4 -_08026B74: .4byte gUnknown_2023BE4 +_08026B74: .4byte gBattleMons _08026B78: - ldr r0, _08026B84 @ =gUnknown_2023D6C - ldr r1, _08026B88 @ =gUnknown_2023BC4 + ldr r0, _08026B84 @ =gBattlerTarget + ldr r1, _08026B88 @ =gActiveBattler ldrb r1, [r1] strb r1, [r0] b _08026F4E .align 2, 0 -_08026B84: .4byte gUnknown_2023D6C -_08026B88: .4byte gUnknown_2023BC4 +_08026B84: .4byte gBattlerTarget +_08026B88: .4byte gActiveBattler _08026B8C: bl IsRunningFromBattleImpossible ldr r1, _08026B98 @ =gUnknown_2023E82 @@ -18498,20 +18498,20 @@ _08026B8C: .align 2, 0 _08026B98: .4byte gUnknown_2023E82 _08026B9C: - ldr r0, _08026BAC @ =gUnknown_2023D4A + ldr r0, _08026BAC @ =gCurrentMove ldrh r0, [r0] movs r1, 0 bl GetMoveTarget - ldr r1, _08026BB0 @ =gUnknown_2023D6C + ldr r1, _08026BB0 @ =gBattlerTarget strb r0, [r1] b _08026F4E .align 2, 0 -_08026BAC: .4byte gUnknown_2023D4A -_08026BB0: .4byte gUnknown_2023D6C +_08026BAC: .4byte gCurrentMove +_08026BB0: .4byte gBattlerTarget _08026BB4: ldr r2, _08026BD4 @ =gUnknown_2023DD0 - ldr r1, _08026BD8 @ =gUnknown_825E45C - ldr r0, _08026BDC @ =gUnknown_2023BC4 + ldr r1, _08026BD8 @ =gBitTable + ldr r0, _08026BDC @ =gActiveBattler ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -18527,8 +18527,8 @@ _08026BB4: b _08026F4E .align 2, 0 _08026BD4: .4byte gUnknown_2023DD0 -_08026BD8: .4byte gUnknown_825E45C -_08026BDC: .4byte gUnknown_2023BC4 +_08026BD8: .4byte gBitTable +_08026BDC: .4byte gActiveBattler _08026BE0: .4byte gUnknown_2023E82 _08026BE4: ldr r0, _08026BEC @ =gUnknown_2023E82 @@ -18538,7 +18538,7 @@ _08026BE4: _08026BEC: .4byte gUnknown_2023E82 _08026BF0: ldr r4, _08026C20 @ =gUnknown_2023ECC - ldr r3, _08026C24 @ =gUnknown_2023BC4 + ldr r3, _08026C24 @ =gActiveBattler ldrb r0, [r3] lsls r1, r0, 2 adds r1, r0 @@ -18562,10 +18562,10 @@ _08026BF0: b _08026F4E .align 2, 0 _08026C20: .4byte gUnknown_2023ECC -_08026C24: .4byte gUnknown_2023BC4 +_08026C24: .4byte gActiveBattler _08026C28: - ldr r4, _08026C4C @ =gUnknown_2023BCE - ldr r1, _08026C50 @ =gUnknown_2023FE8 + ldr r4, _08026C4C @ =gBattlerPartyIndexes + ldr r1, _08026C50 @ =gBattleStruct ldr r0, [r1] ldrh r3, [r4] ldrb r2, [r0, 0x10] @@ -18580,15 +18580,15 @@ _08026C40: cmp r3, r0 bne _08026C58 _08026C44: - ldr r1, _08026C54 @ =gUnknown_2023BC4 + ldr r1, _08026C54 @ =gActiveBattler movs r0, 0 b _08026C5C .align 2, 0 -_08026C4C: .4byte gUnknown_2023BCE -_08026C50: .4byte gUnknown_2023FE8 -_08026C54: .4byte gUnknown_2023BC4 +_08026C4C: .4byte gBattlerPartyIndexes +_08026C50: .4byte gBattleStruct +_08026C54: .4byte gActiveBattler _08026C58: - ldr r1, _08026CAC @ =gUnknown_2023BC4 + ldr r1, _08026CAC @ =gActiveBattler movs r0, 0x2 _08026C5C: strb r0, [r1] @@ -18600,7 +18600,7 @@ _08026C5C: ldr r1, [r5] adds r3, r1, r0 movs r7, 0 - ldr r1, _08026CB0 @ =gUnknown_2023BE4 + ldr r1, _08026CB0 @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r1, 0xC @@ -18634,10 +18634,10 @@ _08026CA4: strh r0, [r3] b _08026F4E .align 2, 0 -_08026CAC: .4byte gUnknown_2023BC4 -_08026CB0: .4byte gUnknown_2023BE4 +_08026CAC: .4byte gActiveBattler +_08026CB0: .4byte gBattleMons _08026CB4: - ldr r0, _08026CE4 @ =gUnknown_2022B4C + ldr r0, _08026CE4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0xB ands r0, r1 @@ -18645,7 +18645,7 @@ _08026CB4: beq _08026CC2 b _08026F4E _08026CC2: - ldr r1, _08026CE8 @ =gUnknown_2023BE4 + ldr r1, _08026CE8 @ =gBattleMons ldrh r0, [r1, 0x28] cmp r0, 0 bne _08026CCC @@ -18665,23 +18665,23 @@ _08026CD8: str r1, [r0] b _08026F4E .align 2, 0 -_08026CE4: .4byte gUnknown_2022B4C -_08026CE8: .4byte gUnknown_2023BE4 +_08026CE4: .4byte gBattleTypeFlags +_08026CE8: .4byte gBattleMons _08026CEC: .4byte gUnknown_2023DD0 _08026CF0: .4byte 0xffbfffff _08026CF4: movs r7, 0 ldr r2, _08026D3C @ =gUnknown_2023E82 strb r7, [r2, 0x5] - ldr r1, _08026D40 @ =gUnknown_2023BC4 + ldr r1, _08026D40 @ =gActiveBattler movs r0, 0x1 strb r0, [r1] mov r8, r1 ldr r0, _08026D44 @ =gUnknown_2023BCC mov r4, r8 ldrb r5, [r0] - ldr r6, _08026D48 @ =gUnknown_2023BE4 - ldr r3, _08026D4C @ =gUnknown_825E45C + ldr r6, _08026D48 @ =gBattleMons + ldr r3, _08026D4C @ =gBitTable _08026D0C: ldrb r0, [r4] cmp r0, r5 @@ -18710,20 +18710,20 @@ _08026D2A: b _08026F4E .align 2, 0 _08026D3C: .4byte gUnknown_2023E82 -_08026D40: .4byte gUnknown_2023BC4 +_08026D40: .4byte gActiveBattler _08026D44: .4byte gUnknown_2023BCC -_08026D48: .4byte gUnknown_2023BE4 -_08026D4C: .4byte gUnknown_825E45C +_08026D48: .4byte gBattleMons +_08026D4C: .4byte gBitTable _08026D50: - ldr r4, _08026D5C @ =gUnknown_2023BC4 + ldr r4, _08026D5C @ =gActiveBattler movs r0, 0x1 strb r0, [r4] - ldr r0, _08026D60 @ =gUnknown_2023BE4 + ldr r0, _08026D60 @ =gBattleMons adds r0, 0x58 b _08026D7C .align 2, 0 -_08026D5C: .4byte gUnknown_2023BC4 -_08026D60: .4byte gUnknown_2023BE4 +_08026D5C: .4byte gActiveBattler +_08026D60: .4byte gBattleMons _08026D64: ldr r0, _08026D94 @ =gUnknown_2023BCC ldrb r0, [r0] @@ -18731,10 +18731,10 @@ _08026D64: bhi _08026D6E b _08026F4E _08026D6E: - ldr r4, _08026D98 @ =gUnknown_2023BC4 + ldr r4, _08026D98 @ =gActiveBattler movs r0, 0x3 strb r0, [r4] - ldr r0, _08026D9C @ =gUnknown_2023BE4 + ldr r0, _08026D9C @ =gBattleMons movs r1, 0x84 lsls r1, 1 adds r0, r1 @@ -18752,8 +18752,8 @@ _08026D84: b _08026F4E .align 2, 0 _08026D94: .4byte gUnknown_2023BCC -_08026D98: .4byte gUnknown_2023BC4 -_08026D9C: .4byte gUnknown_2023BE4 +_08026D98: .4byte gActiveBattler +_08026D9C: .4byte gBattleMons _08026DA0: ldr r0, _08026F28 @ =gUnknown_2023E82 movs r1, 0 @@ -18765,7 +18765,7 @@ _08026DA0: ldrb r2, [r0] cmp r8, r2 bge _08026DEE - ldr r4, _08026F30 @ =gUnknown_2023BE4 + ldr r4, _08026F30 @ =gBattleMons adds r3, r4, 0 adds r3, 0x50 adds r6, r4, 0 @@ -18805,7 +18805,7 @@ _08026DF6: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 - ldr r0, _08026F38 @ =gUnknown_2024284 + ldr r0, _08026F38 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -18851,7 +18851,7 @@ _08026E4E: beq _08026E88 movs r0, 0 bl GetBankByIdentity - ldr r4, _08026F3C @ =gUnknown_2023BC4 + ldr r4, _08026F3C @ =gActiveBattler strb r0, [r4] movs r0, 0 str r0, [sp, 0x4] @@ -18880,7 +18880,7 @@ _08026E94: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 - ldr r0, _08026F40 @ =gUnknown_202402C + ldr r0, _08026F40 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -18926,7 +18926,7 @@ _08026EEC: beq _08026F4E movs r0, 0x1 bl GetBankByIdentity - ldr r4, _08026F3C @ =gUnknown_2023BC4 + ldr r4, _08026F3C @ =gActiveBattler strb r0, [r4] movs r0, 0 str r0, [sp, 0x4] @@ -18948,11 +18948,11 @@ _08026EEC: .align 2, 0 _08026F28: .4byte gUnknown_2023E82 _08026F2C: .4byte gUnknown_2023BCC -_08026F30: .4byte gUnknown_2023BE4 +_08026F30: .4byte gBattleMons _08026F34: .4byte 0xf7ffffff -_08026F38: .4byte gUnknown_2024284 -_08026F3C: .4byte gUnknown_2023BC4 -_08026F40: .4byte gUnknown_202402C +_08026F38: .4byte gPlayerParty +_08026F3C: .4byte gActiveBattler +_08026F40: .4byte gEnemyParty _08026F44: bl IsFanfareTaskInactive lsls r0, 24 @@ -18982,13 +18982,13 @@ atk77_setprotectlike: @ 8026F68 push {r7} movs r6, 0x1 ldr r2, _08027034 @ =gUnknown_2023DB0 - ldr r1, _08027038 @ =gUnknown_2023D6B + ldr r1, _08027038 @ =sBattler_AI ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 ldrh r0, [r0] mov r8, r1 - ldr r7, _0802703C @ =gUnknown_2023E0C + ldr r7, _0802703C @ =gDisableStructs cmp r0, 0xB6 beq _08026F98 cmp r0, 0xC5 @@ -19029,8 +19029,8 @@ _08026FA8: bcc _0802705C cmp r6, 0 beq _0802705C - ldr r4, _0802704C @ =gUnknown_8250C04 - ldr r3, _08027050 @ =gUnknown_2023D4A + ldr r4, _0802704C @ =gBattleMoves + ldr r3, _08027050 @ =gCurrentMove ldrh r0, [r3] lsls r1, r0, 1 adds r1, r0 @@ -19083,18 +19083,18 @@ _0802701E: b _0802707E .align 2, 0 _08027034: .4byte gUnknown_2023DB0 -_08027038: .4byte gUnknown_2023D6B -_0802703C: .4byte gUnknown_2023E0C +_08027038: .4byte sBattler_AI +_0802703C: .4byte gDisableStructs _08027040: .4byte gUnknown_2023BE2 _08027044: .4byte gUnknown_2023BCC _08027048: .4byte gUnknown_82507E0 -_0802704C: .4byte gUnknown_8250C04 -_08027050: .4byte gUnknown_2023D4A +_0802704C: .4byte gBattleMoves +_08027050: .4byte gCurrentMove _08027054: .4byte gUnknown_2023E8C _08027058: .4byte gUnknown_2023E82 _0802705C: - ldr r2, _08027090 @ =gUnknown_2023E0C - ldr r0, _08027094 @ =gUnknown_2023D6B + ldr r2, _08027090 @ =gDisableStructs + ldr r0, _08027094 @ =sBattler_AI ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -19105,7 +19105,7 @@ _0802705C: ldr r1, _08027098 @ =gUnknown_2023E82 movs r0, 0x2 strb r0, [r1, 0x5] - ldr r2, _0802709C @ =gUnknown_2023DCC + ldr r2, _0802709C @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -19121,10 +19121,10 @@ _0802707E: pop {r0} bx r0 .align 2, 0 -_08027090: .4byte gUnknown_2023E0C -_08027094: .4byte gUnknown_2023D6B +_08027090: .4byte gDisableStructs +_08027094: .4byte sBattler_AI _08027098: .4byte gUnknown_2023E82 -_0802709C: .4byte gUnknown_2023DCC +_0802709C: .4byte gMoveResultFlags _080270A0: .4byte gUnknown_2023D74 thumb_func_end atk77_setprotectlike @@ -19137,13 +19137,13 @@ atk78_faintifabilitynotdamp: @ 80270A4 ldr r2, [r0] cmp r2, 0 bne _080271A8 - ldr r1, _08027164 @ =gUnknown_2023D6C + ldr r1, _08027164 @ =gBattlerTarget strb r2, [r1] ldr r0, _08027168 @ =gUnknown_2023BCC ldrb r3, [r0] adds r5, r1, 0 mov r8, r0 - ldr r6, _0802716C @ =gUnknown_2023BE4 + ldr r6, _0802716C @ =gBattleMons cmp r2, r3 bcs _080270F0 adds r0, r6, 0 @@ -19175,11 +19175,11 @@ _080270F0: ldrb r1, [r1] cmp r0, r1 bne _0802718C - ldr r4, _08027170 @ =gUnknown_2023BC4 - ldr r7, _08027174 @ =gUnknown_2023D6B + ldr r4, _08027170 @ =gActiveBattler + ldr r7, _08027174 @ =sBattler_AI ldrb r0, [r7] strb r0, [r4] - ldr r2, _08027178 @ =gUnknown_2023D50 + ldr r2, _08027178 @ =gBattleMoveDamage ldrb r1, [r4] movs r0, 0x58 muls r0, r1 @@ -19203,9 +19203,9 @@ _080270F0: beq _080271A8 adds r3, r5, 0 ldrb r5, [r7] - ldr r7, _08027184 @ =gUnknown_825E45C + ldr r7, _08027184 @ =gBitTable adds r4, r0, 0 - ldr r6, _08027188 @ =gUnknown_2023D70 + ldr r6, _08027188 @ =gAbsentBattlerFlags _0802713C: ldrb r2, [r3] cmp r2, r5 @@ -19228,16 +19228,16 @@ _08027152: b _080271A8 .align 2, 0 _08027160: .4byte gUnknown_2023BC8 -_08027164: .4byte gUnknown_2023D6C +_08027164: .4byte gBattlerTarget _08027168: .4byte gUnknown_2023BCC -_0802716C: .4byte gUnknown_2023BE4 -_08027170: .4byte gUnknown_2023BC4 -_08027174: .4byte gUnknown_2023D6B -_08027178: .4byte gUnknown_2023D50 +_0802716C: .4byte gBattleMons +_08027170: .4byte gActiveBattler +_08027174: .4byte sBattler_AI +_08027178: .4byte gBattleMoveDamage _0802717C: .4byte 0x00007fff _08027180: .4byte gUnknown_2023D74 -_08027184: .4byte gUnknown_825E45C -_08027188: .4byte gUnknown_2023D70 +_08027184: .4byte gBitTable +_08027188: .4byte gAbsentBattlerFlags _0802718C: ldr r1, _080271B4 @ =gUnknown_2023D6A movs r0, 0x6 @@ -19272,11 +19272,11 @@ atk79_setatkhptozero: @ 80271C0 ldr r3, [r0] cmp r3, 0 bne _08027204 - ldr r4, _08027210 @ =gUnknown_2023BC4 - ldr r0, _08027214 @ =gUnknown_2023D6B + ldr r4, _08027210 @ =gActiveBattler + ldr r0, _08027214 @ =sBattler_AI ldrb r0, [r0] strb r0, [r4] - ldr r1, _08027218 @ =gUnknown_2023BE4 + ldr r1, _08027218 @ =gBattleMons ldrb r0, [r4] movs r2, 0x58 muls r0, r2 @@ -19305,9 +19305,9 @@ _08027204: bx r0 .align 2, 0 _0802720C: .4byte gUnknown_2023BC8 -_08027210: .4byte gUnknown_2023BC4 -_08027214: .4byte gUnknown_2023D6B -_08027218: .4byte gUnknown_2023BE4 +_08027210: .4byte gActiveBattler +_08027214: .4byte sBattler_AI +_08027218: .4byte gBattleMons _0802721C: .4byte gUnknown_2023D74 thumb_func_end atk79_setatkhptozero @@ -19326,23 +19326,23 @@ atk7A_jumpifnexttargetvalid: @ 8027220 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r4, r0 - ldr r0, _0802729C @ =gUnknown_2022B4C + ldr r0, _0802729C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 adds r7, r3, 0 cmp r0, 0 beq _080272B8 - ldr r0, _080272A0 @ =gUnknown_2023D6C + ldr r0, _080272A0 @ =gBattlerTarget ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r2, _080272A4 @ =gUnknown_2023D6B + ldr r2, _080272A4 @ =sBattler_AI lsls r1, 24 lsrs r1, 24 adds r3, r0, 0 - ldr r6, _080272A8 @ =gUnknown_2023D70 - ldr r5, _080272AC @ =gUnknown_825E45C + ldr r6, _080272A8 @ =gAbsentBattlerFlags + ldr r5, _080272AC @ =gBitTable ldr r0, _080272B0 @ =gUnknown_2023BCC mov r12, r0 ldrb r0, [r2] @@ -19377,11 +19377,11 @@ _08027276: b _080272BC .align 2, 0 _08027298: .4byte gUnknown_2023D74 -_0802729C: .4byte gUnknown_2022B4C -_080272A0: .4byte gUnknown_2023D6C -_080272A4: .4byte gUnknown_2023D6B -_080272A8: .4byte gUnknown_2023D70 -_080272AC: .4byte gUnknown_825E45C +_0802729C: .4byte gBattleTypeFlags +_080272A0: .4byte gBattlerTarget +_080272A4: .4byte sBattler_AI +_080272A8: .4byte gAbsentBattlerFlags +_080272AC: .4byte gBitTable _080272B0: .4byte gUnknown_2023BCC _080272B4: str r4, [r7] @@ -19411,15 +19411,15 @@ atk7B_tryhealhalfhealth: @ 80272C4 lsls r0, 24 orrs r2, r0 ldrb r0, [r1, 0x5] - ldr r3, _08027324 @ =gUnknown_2023D6C + ldr r3, _08027324 @ =gBattlerTarget cmp r0, 0x1 bne _080272EC - ldr r0, _08027328 @ =gUnknown_2023D6B + ldr r0, _08027328 @ =sBattler_AI ldrb r0, [r0] strb r0, [r3] _080272EC: - ldr r1, _0802732C @ =gUnknown_2023D50 - ldr r6, _08027330 @ =gUnknown_2023BE4 + ldr r1, _0802732C @ =gBattleMoveDamage + ldr r6, _08027330 @ =gBattleMons ldrb r0, [r3] movs r5, 0x58 muls r0, r5 @@ -19446,10 +19446,10 @@ _08027306: b _0802733A .align 2, 0 _08027320: .4byte gUnknown_2023D74 -_08027324: .4byte gUnknown_2023D6C -_08027328: .4byte gUnknown_2023D6B -_0802732C: .4byte gUnknown_2023D50 -_08027330: .4byte gUnknown_2023BE4 +_08027324: .4byte gBattlerTarget +_08027328: .4byte sBattler_AI +_0802732C: .4byte gBattleMoveDamage +_08027330: .4byte gBattleMons _08027334: ldr r0, [r4] adds r0, 0x6 @@ -19469,7 +19469,7 @@ atk7C_trymirrormove: @ 8027340 push {r5-r7} sub sp, 0x8 ldr r2, _080273E0 @ =gUnknown_2023BCC - ldr r0, _080273E4 @ =gUnknown_2023FE8 + ldr r0, _080273E4 @ =gBattleStruct mov r10, r0 movs r1, 0 add r0, sp, 0x4 @@ -19484,13 +19484,13 @@ _08027356: ldrb r1, [r2] cmp r5, r1 bge _080273AC - ldr r0, _080273E8 @ =gUnknown_2023D6B + ldr r0, _080273E8 @ =sBattler_AI ldrb r6, [r0] ldr r2, _080273EC @ =0x0000ffff mov r9, r2 lsls r4, r6, 3 mov r2, sp - ldr r0, _080273E4 @ =gUnknown_2023FE8 + ldr r0, _080273E4 @ =gBattleStruct mov r12, r0 adds r7, r1, 0 _0802737C: @@ -19520,7 +19520,7 @@ _080273A4: cmp r5, r7 blt _0802737C _080273AC: - ldr r1, _080273E8 @ =gUnknown_2023D6B + ldr r1, _080273E8 @ =sBattler_AI ldrb r0, [r1] mov r2, r10 ldr r1, [r2] @@ -19543,17 +19543,17 @@ _080273AC: ldr r1, _080273F4 @ =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, _080273F8 @ =gUnknown_2023D4A + ldr r4, _080273F8 @ =gCurrentMove strh r3, [r4] b _08027426 .align 2, 0 _080273E0: .4byte gUnknown_2023BCC -_080273E4: .4byte gUnknown_2023FE8 -_080273E8: .4byte gUnknown_2023D6B +_080273E4: .4byte gBattleStruct +_080273E8: .4byte sBattler_AI _080273EC: .4byte 0x0000ffff _080273F0: .4byte gUnknown_2023DD0 _080273F4: .4byte 0xfffffbff -_080273F8: .4byte gUnknown_2023D4A +_080273F8: .4byte gCurrentMove _080273FC: mov r0, r8 cmp r0, 0 @@ -19569,7 +19569,7 @@ _080273FC: mov r1, r8 bl __modsi3 adds r5, r0, 0 - ldr r4, _08027458 @ =gUnknown_2023D4A + ldr r4, _08027458 @ =gCurrentMove lsls r0, r5, 1 add r0, sp ldrh r0, [r0] @@ -19578,11 +19578,11 @@ _08027426: ldrh r0, [r4] movs r1, 0 bl GetMoveTarget - ldr r1, _0802745C @ =gUnknown_2023D6C + ldr r1, _0802745C @ =gBattlerTarget strb r0, [r1] ldr r5, _08027460 @ =gUnknown_2023D74 ldr r3, _08027464 @ =gUnknown_81D65A8 - ldr r2, _08027468 @ =gUnknown_8250C04 + ldr r2, _08027468 @ =gBattleMoves ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -19597,14 +19597,14 @@ _08027426: .align 2, 0 _08027450: .4byte gUnknown_2023DD0 _08027454: .4byte 0xfffffbff -_08027458: .4byte gUnknown_2023D4A -_0802745C: .4byte gUnknown_2023D6C +_08027458: .4byte gCurrentMove +_0802745C: .4byte gBattlerTarget _08027460: .4byte gUnknown_2023D74 _08027464: .4byte gUnknown_81D65A8 -_08027468: .4byte gUnknown_8250C04 +_08027468: .4byte gBattleMoves _0802746C: ldr r2, _0802749C @ =gUnknown_2023ECC - ldr r0, _080274A0 @ =gUnknown_2023D6B + ldr r0, _080274A0 @ =sBattler_AI ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -19629,20 +19629,20 @@ _0802748A: bx r0 .align 2, 0 _0802749C: .4byte gUnknown_2023ECC -_080274A0: .4byte gUnknown_2023D6B +_080274A0: .4byte sBattler_AI _080274A4: .4byte gUnknown_2023D74 thumb_func_end atk7C_trymirrormove thumb_func_start atk7D_setrain atk7D_setrain: @ 80274A8 push {lr} - ldr r2, _080274C8 @ =gUnknown_2023F1C + ldr r2, _080274C8 @ =gBattleWeather ldrh r0, [r2] movs r1, 0x7 ands r1, r0 cmp r1, 0 beq _080274D4 - ldr r2, _080274CC @ =gUnknown_2023DCC + ldr r2, _080274CC @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -19652,8 +19652,8 @@ atk7D_setrain: @ 80274A8 strb r0, [r1, 0x5] b _080274E4 .align 2, 0 -_080274C8: .4byte gUnknown_2023F1C -_080274CC: .4byte gUnknown_2023DCC +_080274C8: .4byte gBattleWeather +_080274CC: .4byte gMoveResultFlags _080274D0: .4byte gUnknown_2023E82 _080274D4: movs r0, 0x1 @@ -19680,10 +19680,10 @@ _080274F8: .4byte gUnknown_2023D74 thumb_func_start atk7E_setreflect atk7E_setreflect: @ 80274FC push {r4-r6,lr} - ldr r6, _0802752C @ =gUnknown_2023D6B + ldr r6, _0802752C @ =sBattler_AI ldrb r0, [r6] bl GetBankIdentity - ldr r4, _08027530 @ =gUnknown_2023DDE + ldr r4, _08027530 @ =gSideAffecting movs r5, 0x1 adds r1, r5, 0 ands r1, r0 @@ -19694,7 +19694,7 @@ atk7E_setreflect: @ 80274FC ands r0, r1 cmp r0, 0 beq _0802753C - ldr r2, _08027534 @ =gUnknown_2023DCC + ldr r2, _08027534 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -19703,9 +19703,9 @@ atk7E_setreflect: @ 80274FC movs r0, 0 b _080275B0 .align 2, 0 -_0802752C: .4byte gUnknown_2023D6B -_08027530: .4byte gUnknown_2023DDE -_08027534: .4byte gUnknown_2023DCC +_0802752C: .4byte sBattler_AI +_08027530: .4byte gSideAffecting +_08027534: .4byte gMoveResultFlags _08027538: .4byte gUnknown_2023E82 _0802753C: ldrb r0, [r6] @@ -19739,7 +19739,7 @@ _0802753C: adds r0, r4 ldrb r1, [r6] strb r1, [r0, 0x1] - ldr r0, _080275A4 @ =gUnknown_2022B4C + ldr r0, _080275A4 @ =gBattleTypeFlags ldr r0, [r0] ands r0, r5 cmp r0, 0 @@ -19755,7 +19755,7 @@ _0802753C: b _080275B2 .align 2, 0 _080275A0: .4byte gUnknown_2023DE4 -_080275A4: .4byte gUnknown_2022B4C +_080275A4: .4byte gBattleTypeFlags _080275A8: .4byte gUnknown_2023E82 _080275AC: ldr r1, _080275C0 @ =gUnknown_2023E82 @@ -19781,15 +19781,15 @@ atk7F_setseeded: @ 80275C8 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r7, _08027608 @ =gUnknown_2023DCC + ldr r7, _08027608 @ =gMoveResultFlags ldrb r5, [r7] movs r0, 0x29 ands r0, r5 cmp r0, 0 bne _080275FA - ldr r0, _0802760C @ =gUnknown_2023DFC + ldr r0, _0802760C @ =gStatuses3 mov r9, r0 - ldr r1, _08027610 @ =gUnknown_2023D6C + ldr r1, _08027610 @ =gBattlerTarget mov r8, r1 ldrb r4, [r1] lsls r0, r4, 2 @@ -19811,12 +19811,12 @@ _080275FA: strb r0, [r1, 0x5] b _08027668 .align 2, 0 -_08027608: .4byte gUnknown_2023DCC -_0802760C: .4byte gUnknown_2023DFC -_08027610: .4byte gUnknown_2023D6C +_08027608: .4byte gMoveResultFlags +_0802760C: .4byte gStatuses3 +_08027610: .4byte gBattlerTarget _08027614: .4byte gUnknown_2023E82 _08027618: - ldr r1, _08027644 @ =gUnknown_2023BE4 + ldr r1, _08027644 @ =gBattleMons movs r0, 0x58 muls r0, r4 adds r1, r0, r1 @@ -19839,10 +19839,10 @@ _08027634: strb r0, [r1, 0x5] b _08027668 .align 2, 0 -_08027644: .4byte gUnknown_2023BE4 +_08027644: .4byte gBattleMons _08027648: .4byte gUnknown_2023E82 _0802764C: - ldr r0, _0802767C @ =gUnknown_2023D6B + ldr r0, _0802767C @ =sBattler_AI ldrb r0, [r0] orrs r2, r0 str r2, [r6] @@ -19868,7 +19868,7 @@ _08027668: pop {r0} bx r0 .align 2, 0 -_0802767C: .4byte gUnknown_2023D6B +_0802767C: .4byte sBattler_AI _08027680: .4byte gUnknown_2023E82 _08027684: .4byte gUnknown_2023D74 thumb_func_end atk7F_setseeded @@ -19894,14 +19894,14 @@ _080276A4: beq _080276F0 b _080276F8 _080276AA: - ldr r1, _080276B4 @ =gUnknown_2023D50 + ldr r1, _080276B4 @ =gBattleMoveDamage ldr r0, [r1] negs r0, r0 b _080276F6 .align 2, 0 -_080276B4: .4byte gUnknown_2023D50 +_080276B4: .4byte gBattleMoveDamage _080276B8: - ldr r3, _080276E4 @ =gUnknown_2023D50 + ldr r3, _080276E4 @ =gBattleMoveDamage ldr r0, [r3] lsrs r1, r0, 31 adds r0, r1 @@ -19911,8 +19911,8 @@ _080276B8: bne _080276CA str r2, [r3] _080276CA: - ldr r2, _080276E8 @ =gUnknown_2023BE4 - ldr r0, _080276EC @ =gUnknown_2023D6C + ldr r2, _080276E8 @ =gBattleMons + ldr r0, _080276EC @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -19925,11 +19925,11 @@ _080276CA: str r1, [r3] b _080276F8 .align 2, 0 -_080276E4: .4byte gUnknown_2023D50 -_080276E8: .4byte gUnknown_2023BE4 -_080276EC: .4byte gUnknown_2023D6C +_080276E4: .4byte gBattleMoveDamage +_080276E8: .4byte gBattleMons +_080276EC: .4byte gBattlerTarget _080276F0: - ldr r1, _08027704 @ =gUnknown_2023D50 + ldr r1, _08027704 @ =gBattleMoveDamage ldr r0, [r1] lsls r0, 1 _080276F6: @@ -19942,7 +19942,7 @@ _080276F8: pop {r0} bx r0 .align 2, 0 -_08027704: .4byte gUnknown_2023D50 +_08027704: .4byte gBattleMoveDamage thumb_func_end atk80_manipulatedamage thumb_func_start atk81_trysetrest @@ -19962,14 +19962,14 @@ atk81_trysetrest: @ 8027708 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r6, r0 - ldr r5, _08027764 @ =gUnknown_2023BC4 - ldr r2, _08027768 @ =gUnknown_2023D6C - ldr r0, _0802776C @ =gUnknown_2023D6B + ldr r5, _08027764 @ =gActiveBattler + ldr r2, _08027768 @ =gBattlerTarget + ldr r0, _0802776C @ =sBattler_AI ldrb r0, [r0] strb r0, [r2] strb r0, [r5] - ldr r4, _08027770 @ =gUnknown_2023D50 - ldr r1, _08027774 @ =gUnknown_2023BE4 + ldr r4, _08027770 @ =gBattleMoveDamage + ldr r1, _08027774 @ =gBattleMons ldrb r0, [r2] movs r3, 0x58 muls r0, r3 @@ -19993,11 +19993,11 @@ atk81_trysetrest: @ 8027708 b _080277C8 .align 2, 0 _08027760: .4byte gUnknown_2023D74 -_08027764: .4byte gUnknown_2023BC4 -_08027768: .4byte gUnknown_2023D6C -_0802776C: .4byte gUnknown_2023D6B -_08027770: .4byte gUnknown_2023D50 -_08027774: .4byte gUnknown_2023BE4 +_08027764: .4byte gActiveBattler +_08027768: .4byte gBattlerTarget +_0802776C: .4byte sBattler_AI +_08027770: .4byte gBattleMoveDamage +_08027774: .4byte gBattleMons _08027778: adds r0, r2, 0 adds r0, 0x4C @@ -20064,8 +20064,8 @@ atk82_jumpifnotfirstturn: @ 80277D8 ldrb r0, [r4, 0x4] lsls r0, 24 orrs r3, r0 - ldr r2, _08027810 @ =gUnknown_2023E0C - ldr r0, _08027814 @ =gUnknown_2023D6B + ldr r2, _08027810 @ =gDisableStructs + ldr r0, _08027814 @ =sBattler_AI ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -20079,8 +20079,8 @@ atk82_jumpifnotfirstturn: @ 80277D8 b _0802781A .align 2, 0 _0802780C: .4byte gUnknown_2023D74 -_08027810: .4byte gUnknown_2023E0C -_08027814: .4byte gUnknown_2023D6B +_08027810: .4byte gDisableStructs +_08027814: .4byte sBattler_AI _08027818: str r3, [r5] _0802781A: @@ -20113,7 +20113,7 @@ UproarWakeUpCheck: @ 8027830 mov r8, r0 cmp r2, r1 bge _080278A4 - ldr r0, _0802788C @ =gUnknown_2023BE4 + ldr r0, _0802788C @ =gBattleMons mov r12, r0 movs r0, 0x58 muls r0, r3 @@ -20122,7 +20122,7 @@ UproarWakeUpCheck: @ 8027830 adds r5, 0x20 adds r4, r1, 0 movs r3, 0 - ldr r6, _08027890 @ =gUnknown_2023FC4 + ldr r6, _08027890 @ =gBattleScripting ldr r7, _08027894 @ =gUnknown_2023E82 _0802785C: mov r0, r12 @@ -20138,7 +20138,7 @@ _0802785C: beq _0802789C movs r3, 0 strb r2, [r6, 0x17] - ldr r1, _08027898 @ =gUnknown_2023D6C + ldr r1, _08027898 @ =gBattlerTarget ldrb r0, [r1] cmp r0, 0xFF beq _080278BC @@ -20149,10 +20149,10 @@ _0802785C: b _080278A4 .align 2, 0 _08027888: .4byte gUnknown_2023BCC -_0802788C: .4byte gUnknown_2023BE4 -_08027890: .4byte gUnknown_2023FC4 +_0802788C: .4byte gBattleMons +_08027890: .4byte gBattleScripting _08027894: .4byte gUnknown_2023E82 -_08027898: .4byte gUnknown_2023D6C +_08027898: .4byte gBattlerTarget _0802789C: adds r3, 0x58 adds r2, 0x1 @@ -20199,7 +20199,7 @@ atk84_jumpifcantmakeasleep: @ 80278CC ldrb r0, [r1, 0x4] lsls r0, 24 orrs r4, r0 - ldr r6, _080278FC @ =gUnknown_2023D6C + ldr r6, _080278FC @ =gBattlerTarget ldrb r0, [r6] bl UproarWakeUpCheck lsls r0, 24 @@ -20209,9 +20209,9 @@ atk84_jumpifcantmakeasleep: @ 80278CC b _08027942 .align 2, 0 _080278F8: .4byte gUnknown_2023D74 -_080278FC: .4byte gUnknown_2023D6C +_080278FC: .4byte gBattlerTarget _08027900: - ldr r1, _08027930 @ =gUnknown_2023BE4 + ldr r1, _08027930 @ =gBattleMons ldrb r3, [r6] movs r0, 0x58 muls r0, r3 @@ -20235,7 +20235,7 @@ _08027918: bl sub_80C71D0 b _08027942 .align 2, 0 -_08027930: .4byte gUnknown_2023BE4 +_08027930: .4byte gBattleMons _08027934: .4byte gUnknown_2023D6A _08027938: .4byte gUnknown_2023E82 _0802793C: @@ -20251,8 +20251,8 @@ _08027942: thumb_func_start atk85_stockpile atk85_stockpile: @ 8027948 push {r4,r5,lr} - ldr r5, _08027970 @ =gUnknown_2023E0C - ldr r4, _08027974 @ =gUnknown_2023D6B + ldr r5, _08027970 @ =gDisableStructs + ldr r4, _08027974 @ =sBattler_AI ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -20261,7 +20261,7 @@ atk85_stockpile: @ 8027948 ldrb r0, [r1, 0x9] cmp r0, 0x3 bne _08027980 - ldr r2, _08027978 @ =gUnknown_2023DCC + ldr r2, _08027978 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -20271,9 +20271,9 @@ atk85_stockpile: @ 8027948 strb r0, [r1, 0x5] b _080279AA .align 2, 0 -_08027970: .4byte gUnknown_2023E0C -_08027974: .4byte gUnknown_2023D6B -_08027978: .4byte gUnknown_2023DCC +_08027970: .4byte gDisableStructs +_08027974: .4byte sBattler_AI +_08027978: .4byte gMoveResultFlags _0802797C: .4byte gUnknown_2023E82 _08027980: adds r0, 0x1 @@ -20329,8 +20329,8 @@ atk86_stockpiletobasedamage: @ 80279C4 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r2, r0 - ldr r7, _08027A00 @ =gUnknown_2023E0C - ldr r6, _08027A04 @ =gUnknown_2023D6B + ldr r7, _08027A00 @ =gDisableStructs + ldr r6, _08027A04 @ =sBattler_AI ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -20343,17 +20343,17 @@ atk86_stockpiletobasedamage: @ 80279C4 b _08027AAA .align 2, 0 _080279FC: .4byte gUnknown_2023D74 -_08027A00: .4byte gUnknown_2023E0C -_08027A04: .4byte gUnknown_2023D6B +_08027A00: .4byte gDisableStructs +_08027A04: .4byte sBattler_AI _08027A08: ldr r0, _08027AB8 @ =gUnknown_2023E82 ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _08027A90 - ldr r0, _08027ABC @ =gUnknown_2023D50 + ldr r0, _08027ABC @ =gBattleMoveDamage mov r8, r0 - ldr r4, _08027AC0 @ =gUnknown_2023DDE - ldr r5, _08027AC4 @ =gUnknown_2023D6C + ldr r4, _08027AC0 @ =gSideAffecting + ldr r5, _08027AC4 @ =gBattlerTarget ldrb r0, [r5] bl GetBankIdentity movs r1, 0x1 @@ -20364,12 +20364,12 @@ _08027A08: ldrb r0, [r6] movs r4, 0x58 muls r0, r4 - ldr r2, _08027AC8 @ =gUnknown_2023BE4 + ldr r2, _08027AC8 @ =gBattleMons adds r0, r2 ldrb r1, [r5] muls r1, r4 adds r1, r2 - ldr r2, _08027ACC @ =gUnknown_2023D4A + ldr r2, _08027ACC @ =gCurrentMove ldrh r2, [r2] movs r4, 0 str r4, [sp] @@ -20389,7 +20389,7 @@ _08027A08: muls r3, r1 mov r1, r8 str r3, [r1] - ldr r2, _08027AD0 @ =gUnknown_2023FC4 + ldr r2, _08027AD0 @ =gBattleScripting ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -20412,8 +20412,8 @@ _08027A08: mov r1, r8 str r0, [r1] _08027A90: - ldr r2, _08027AD8 @ =gUnknown_2023E0C - ldr r0, _08027ADC @ =gUnknown_2023D6B + ldr r2, _08027AD8 @ =gDisableStructs + ldr r0, _08027ADC @ =sBattler_AI ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -20434,15 +20434,15 @@ _08027AAA: bx r0 .align 2, 0 _08027AB8: .4byte gUnknown_2023E82 -_08027ABC: .4byte gUnknown_2023D50 -_08027AC0: .4byte gUnknown_2023DDE -_08027AC4: .4byte gUnknown_2023D6C -_08027AC8: .4byte gUnknown_2023BE4 -_08027ACC: .4byte gUnknown_2023D4A -_08027AD0: .4byte gUnknown_2023FC4 +_08027ABC: .4byte gBattleMoveDamage +_08027AC0: .4byte gSideAffecting +_08027AC4: .4byte gBattlerTarget +_08027AC8: .4byte gBattleMons +_08027ACC: .4byte gCurrentMove +_08027AD0: .4byte gBattleScripting _08027AD4: .4byte gUnknown_2023E8C -_08027AD8: .4byte gUnknown_2023E0C -_08027ADC: .4byte gUnknown_2023D6B +_08027AD8: .4byte gDisableStructs +_08027ADC: .4byte sBattler_AI _08027AE0: .4byte gUnknown_2023D74 thumb_func_end atk86_stockpiletobasedamage @@ -20463,9 +20463,9 @@ atk87_stockpiletohpheal: @ 8027AE4 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r2, r0 - ldr r0, _08027B28 @ =gUnknown_2023E0C + ldr r0, _08027B28 @ =gDisableStructs mov r8, r0 - ldr r6, _08027B2C @ =gUnknown_2023D6B + ldr r6, _08027B2C @ =sBattler_AI ldrb r3, [r6] lsls r0, r3, 3 subs r0, r3 @@ -20481,11 +20481,11 @@ atk87_stockpiletohpheal: @ 8027AE4 b _08027BB0 .align 2, 0 _08027B24: .4byte gUnknown_2023D74 -_08027B28: .4byte gUnknown_2023E0C -_08027B2C: .4byte gUnknown_2023D6B +_08027B28: .4byte gDisableStructs +_08027B2C: .4byte sBattler_AI _08027B30: .4byte gUnknown_2023E82 _08027B34: - ldr r1, _08027B58 @ =gUnknown_2023BE4 + ldr r1, _08027B58 @ =gBattleMons movs r0, 0x58 muls r0, r3 adds r1, r0, r1 @@ -20496,7 +20496,7 @@ _08027B34: movs r0, 0 strb r0, [r4, 0x9] str r2, [r7] - ldr r1, _08027B5C @ =gUnknown_2023D6C + ldr r1, _08027B5C @ =gBattlerTarget ldrb r0, [r6] strb r0, [r1] ldr r1, _08027B60 @ =gUnknown_2023E82 @@ -20504,11 +20504,11 @@ _08027B34: strb r0, [r1, 0x5] b _08027BB0 .align 2, 0 -_08027B58: .4byte gUnknown_2023BE4 -_08027B5C: .4byte gUnknown_2023D6C +_08027B58: .4byte gBattleMons +_08027B5C: .4byte gBattlerTarget _08027B60: .4byte gUnknown_2023E82 _08027B64: - ldr r5, _08027BBC @ =gUnknown_2023D50 + ldr r5, _08027BBC @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] ldrb r1, [r4, 0x9] movs r2, 0x3 @@ -20525,7 +20525,7 @@ _08027B80: ldr r0, [r5] negs r0, r0 str r0, [r5] - ldr r3, _08027BC0 @ =gUnknown_2023FC4 + ldr r3, _08027BC0 @ =gBattleScripting ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -20543,7 +20543,7 @@ _08027B80: ldr r0, [r7] adds r0, 0x5 str r0, [r7] - ldr r1, _08027BC4 @ =gUnknown_2023D6C + ldr r1, _08027BC4 @ =gBattlerTarget ldrb r0, [r6] strb r0, [r1] _08027BB0: @@ -20553,15 +20553,15 @@ _08027BB0: pop {r0} bx r0 .align 2, 0 -_08027BBC: .4byte gUnknown_2023D50 -_08027BC0: .4byte gUnknown_2023FC4 -_08027BC4: .4byte gUnknown_2023D6C +_08027BBC: .4byte gBattleMoveDamage +_08027BC0: .4byte gBattleScripting +_08027BC4: .4byte gBattlerTarget thumb_func_end atk87_stockpiletohpheal thumb_func_start atk88_negativedamage atk88_negativedamage: @ 8027BC8 push {lr} - ldr r2, _08027BF0 @ =gUnknown_2023D50 + ldr r2, _08027BF0 @ =gBattleMoveDamage ldr r0, _08027BF4 @ =gUnknown_2023D54 ldr r0, [r0] lsrs r1, r0, 31 @@ -20582,7 +20582,7 @@ _08027BE4: pop {r0} bx r0 .align 2, 0 -_08027BF0: .4byte gUnknown_2023D50 +_08027BF0: .4byte gBattleMoveDamage _08027BF4: .4byte gUnknown_2023D54 _08027BF8: .4byte gUnknown_2023D74 thumb_func_end atk88_negativedamage @@ -20608,15 +20608,15 @@ ChangeStatBuffs: @ 8027BFC ands r0, r5 cmp r0, 0 beq _08027C30 - ldr r0, _08027C28 @ =gUnknown_2023BC4 - ldr r1, _08027C2C @ =gUnknown_2023D6B + ldr r0, _08027C28 @ =gActiveBattler + ldr r1, _08027C2C @ =sBattler_AI b _08027C34 .align 2, 0 -_08027C28: .4byte gUnknown_2023BC4 -_08027C2C: .4byte gUnknown_2023D6B +_08027C28: .4byte gActiveBattler +_08027C2C: .4byte sBattler_AI _08027C30: - ldr r0, _08027CD4 @ =gUnknown_2023BC4 - ldr r1, _08027CD8 @ =gUnknown_2023D6C + ldr r0, _08027CD4 @ =gActiveBattler + ldr r1, _08027CD8 @ =gBattlerTarget _08027C34: ldrb r1, [r1] strb r1, [r0] @@ -20664,7 +20664,7 @@ _08027C64: b _08027F6C _08027C88: ldr r4, _08027CE0 @ =gUnknown_2023DE4 - ldr r1, _08027CD4 @ =gUnknown_2023BC4 + ldr r1, _08027CD4 @ =gActiveBattler ldrb r0, [r1] bl GetBankIdentity movs r1, 0x1 @@ -20679,14 +20679,14 @@ _08027C88: mov r2, r9 cmp r2, 0 bne _08027D28 - ldr r0, _08027CE4 @ =gUnknown_2023D4A + ldr r0, _08027CE4 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xAE beq _08027D58 cmp r5, 0x1 bne _08027D48 ldr r4, _08027CE8 @ =gUnknown_2023ECC - ldr r3, _08027CD4 @ =gUnknown_2023BC4 + ldr r3, _08027CD4 @ =gActiveBattler ldrb r0, [r3] lsls r1, r0, 2 adds r1, r0 @@ -20701,18 +20701,18 @@ _08027C88: str r4, [r0] b _08027D48 .align 2, 0 -_08027CD4: .4byte gUnknown_2023BC4 -_08027CD8: .4byte gUnknown_2023D6C +_08027CD4: .4byte gActiveBattler +_08027CD8: .4byte gBattlerTarget _08027CDC: .4byte gUnknown_2022AB8 _08027CE0: .4byte gUnknown_2023DE4 -_08027CE4: .4byte gUnknown_2023D4A +_08027CE4: .4byte gCurrentMove _08027CE8: .4byte gUnknown_2023ECC _08027CEC: .4byte gUnknown_2023D74 _08027CF0: mov r0, r8 bl BattleScriptPush - ldr r1, _08027D18 @ =gUnknown_2023FC4 - ldr r6, _08027D1C @ =gUnknown_2023BC4 + ldr r1, _08027D18 @ =gBattleScripting + ldr r6, _08027D1C @ =gActiveBattler ldrb r0, [r6] strb r0, [r1, 0x17] ldr r1, _08027D20 @ =gUnknown_2023D74 @@ -20729,12 +20729,12 @@ _08027CF0: strb r1, [r0] b _08027D48 .align 2, 0 -_08027D18: .4byte gUnknown_2023FC4 -_08027D1C: .4byte gUnknown_2023BC4 +_08027D18: .4byte gBattleScripting +_08027D1C: .4byte gActiveBattler _08027D20: .4byte gUnknown_2023D74 _08027D24: .4byte gUnknown_81D8C3E _08027D28: - ldr r0, _08027D4C @ =gUnknown_2023D4A + ldr r0, _08027D4C @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xAE beq _08027D58 @@ -20753,12 +20753,12 @@ _08027D48: movs r0, 0x1 b _08028060 .align 2, 0 -_08027D4C: .4byte gUnknown_2023D4A +_08027D4C: .4byte gCurrentMove _08027D50: .4byte gUnknown_2023D74 _08027D54: .4byte gUnknown_81D7DF2 _08027D58: - ldr r2, _08027DA0 @ =gUnknown_2023BE4 - ldr r1, _08027DA4 @ =gUnknown_2023BC4 + ldr r2, _08027DA0 @ =gBattleMons + ldr r1, _08027DA4 @ =gActiveBattler ldrb r3, [r1] movs r4, 0x58 adds r0, r3, 0 @@ -20775,7 +20775,7 @@ _08027D74: mov r0, r9 cmp r0, 0 bne _08027E0C - ldr r0, _08027DA8 @ =gUnknown_2023D4A + ldr r0, _08027DA8 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xAE beq _08027E0C @@ -20795,16 +20795,16 @@ _08027D74: str r1, [r0] b _08027D48 .align 2, 0 -_08027DA0: .4byte gUnknown_2023BE4 -_08027DA4: .4byte gUnknown_2023BC4 -_08027DA8: .4byte gUnknown_2023D4A +_08027DA0: .4byte gBattleMons +_08027DA4: .4byte gActiveBattler +_08027DA8: .4byte gCurrentMove _08027DAC: .4byte gUnknown_2023ECC _08027DB0: .4byte gUnknown_2023D74 _08027DB4: mov r0, r8 bl BattleScriptPush - ldr r1, _08027DF8 @ =gUnknown_2023FC4 - ldr r2, _08027DFC @ =gUnknown_2023BC4 + ldr r1, _08027DF8 @ =gBattleScripting + ldr r2, _08027DFC @ =gActiveBattler ldrb r0, [r2] strb r0, [r1, 0x17] ldr r1, _08027E00 @ =gUnknown_2023D74 @@ -20821,7 +20821,7 @@ _08027DB4: ldrb r0, [r2] ldrb r1, [r1] bl sub_80C71D0 - ldr r6, _08027DFC @ =gUnknown_2023BC4 + ldr r6, _08027DFC @ =gActiveBattler ldrb r1, [r6] lsls r0, r1, 2 adds r0, r1 @@ -20833,13 +20833,13 @@ _08027DB4: strb r1, [r0] b _08027D48 .align 2, 0 -_08027DF8: .4byte gUnknown_2023FC4 -_08027DFC: .4byte gUnknown_2023BC4 +_08027DF8: .4byte gBattleScripting +_08027DFC: .4byte gActiveBattler _08027E00: .4byte gUnknown_2023D74 _08027E04: .4byte gUnknown_81D9416 _08027E08: .4byte gUnknown_2023D6A _08027E0C: - ldr r1, _08027E58 @ =gUnknown_2023BC4 + ldr r1, _08027E58 @ =gActiveBattler ldrb r0, [r1] movs r4, 0x58 muls r0, r4 @@ -20857,8 +20857,8 @@ _08027E0C: bne _08027D48 mov r0, r8 bl BattleScriptPush - ldr r1, _08027E5C @ =gUnknown_2023FC4 - ldr r3, _08027E58 @ =gUnknown_2023BC4 + ldr r1, _08027E5C @ =gBattleScripting + ldr r3, _08027E58 @ =gActiveBattler ldrb r0, [r3] strb r0, [r1, 0x17] ldr r1, _08027E60 @ =gUnknown_2023D74 @@ -20876,13 +20876,13 @@ _08027E0C: bl sub_80C71D0 b _08027D48 .align 2, 0 -_08027E58: .4byte gUnknown_2023BC4 -_08027E5C: .4byte gUnknown_2023FC4 +_08027E58: .4byte gActiveBattler +_08027E5C: .4byte gBattleScripting _08027E60: .4byte gUnknown_2023D74 _08027E64: .4byte gUnknown_81D947E _08027E68: .4byte gUnknown_2023D6A _08027E6C: - ldr r4, _08027EBC @ =gUnknown_2023BC4 + ldr r4, _08027EBC @ =gActiveBattler ldrb r0, [r4] movs r4, 0x58 muls r0, r4 @@ -20902,8 +20902,8 @@ _08027E6C: _08027E8E: mov r0, r8 bl BattleScriptPush - ldr r1, _08027EC0 @ =gUnknown_2023FC4 - ldr r2, _08027EBC @ =gUnknown_2023BC4 + ldr r1, _08027EC0 @ =gBattleScripting + ldr r2, _08027EBC @ =gActiveBattler ldrb r0, [r2] strb r0, [r1, 0x17] ldr r1, _08027EC4 @ =gUnknown_2023D74 @@ -20921,13 +20921,13 @@ _08027E8E: bl sub_80C71D0 b _08027D48 .align 2, 0 -_08027EBC: .4byte gUnknown_2023BC4 -_08027EC0: .4byte gUnknown_2023FC4 +_08027EBC: .4byte gActiveBattler +_08027EC0: .4byte gBattleScripting _08027EC4: .4byte gUnknown_2023D74 _08027EC8: .4byte gUnknown_81D947E _08027ECC: .4byte gUnknown_2023D6A _08027ED0: - ldr r3, _08027F5C @ =gUnknown_2023BC4 + ldr r3, _08027F5C @ =gActiveBattler ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -20975,7 +20975,7 @@ _08027F12: adds r1, r2, r3 movs r0, 0xFF strb r0, [r1] - ldr r4, _08027F5C @ =gUnknown_2023BC4 + ldr r4, _08027F5C @ =gActiveBattler ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -20989,7 +20989,7 @@ _08027F12: cmp r0, 0 beq _08027FC2 movs r1, 0 - ldr r0, _08027F64 @ =gUnknown_2023D6C + ldr r0, _08027F64 @ =gBattlerTarget ldrb r0, [r0] ldr r3, _08027F68 @ =gUnknown_2023E82 mov r8, r3 @@ -21001,9 +21001,9 @@ _08027F56: strb r1, [r4, 0x5] b _08027FF0 .align 2, 0 -_08027F5C: .4byte gUnknown_2023BC4 +_08027F5C: .4byte gActiveBattler _08027F60: .4byte gUnknown_2022AC8 -_08027F64: .4byte gUnknown_2023D6C +_08027F64: .4byte gBattlerTarget _08027F68: .4byte gUnknown_2023E82 _08027F6C: asrs r6, r0, 28 @@ -21035,8 +21035,8 @@ _08027F86: mov r2, r12 orrs r0, r2 strb r0, [r1] - ldr r2, _08027FD0 @ =gUnknown_2023BE4 - ldr r4, _08027FD4 @ =gUnknown_2023BC4 + ldr r2, _08027FD0 @ =gBattleMons + ldr r4, _08027FD4 @ =gActiveBattler ldrb r3, [r4] movs r0, 0x58 muls r0, r3 @@ -21058,12 +21058,12 @@ _08027FC2: b _08027FF0 .align 2, 0 _08027FCC: .4byte gUnknown_2022AC8 -_08027FD0: .4byte gUnknown_2023BE4 -_08027FD4: .4byte gUnknown_2023BC4 +_08027FD0: .4byte gBattleMons +_08027FD4: .4byte gActiveBattler _08027FD8: .4byte gUnknown_2023E82 _08027FDC: movs r1, 0 - ldr r0, _08028070 @ =gUnknown_2023D6C + ldr r0, _08028070 @ =gBattlerTarget ldrb r0, [r0] ldr r2, _08028074 @ =gUnknown_2023E82 mov r8, r2 @@ -21074,7 +21074,7 @@ _08027FEC: mov r3, r8 strb r1, [r3, 0x5] _08027FF0: - ldr r2, _08028078 @ =gUnknown_2023BC4 + ldr r2, _08028078 @ =gActiveBattler ldrb r0, [r2] movs r4, 0x58 adds r1, r0, 0 @@ -21099,7 +21099,7 @@ _08027FF0: movs r0, 0 strb r0, [r1] _08028020: - ldr r1, _08028078 @ =gUnknown_2023BC4 + ldr r1, _08028078 @ =gActiveBattler ldrb r0, [r1] muls r0, r4 adds r0, r7, r0 @@ -21119,7 +21119,7 @@ _08028036: ands r3, r5 cmp r3, 0 beq _08028050 - ldr r0, _0802807C @ =gUnknown_2023DCC + ldr r0, _0802807C @ =gMoveResultFlags ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 @@ -21143,10 +21143,10 @@ _08028060: pop {r1} bx r1 .align 2, 0 -_08028070: .4byte gUnknown_2023D6C +_08028070: .4byte gBattlerTarget _08028074: .4byte gUnknown_2023E82 -_08028078: .4byte gUnknown_2023BC4 -_0802807C: .4byte gUnknown_2023DCC +_08028078: .4byte gActiveBattler +_0802807C: .4byte gMoveResultFlags thumb_func_end ChangeStatBuffs thumb_func_start atk89_statbuffchange @@ -21164,7 +21164,7 @@ atk89_statbuffchange: @ 8028080 ldrb r0, [r2, 0x5] lsls r0, 24 orrs r3, r0 - ldr r0, _080280C8 @ =gUnknown_2023FC4 + ldr r0, _080280C8 @ =gBattleScripting ldrb r4, [r0, 0x1A] movs r0, 0xF0 ands r0, r4 @@ -21186,7 +21186,7 @@ _080280BC: bx r0 .align 2, 0 _080280C4: .4byte gUnknown_2023D74 -_080280C8: .4byte gUnknown_2023FC4 +_080280C8: .4byte gBattleScripting thumb_func_end atk89_statbuffchange thumb_func_start atk8A_normalisebuffs @@ -21199,7 +21199,7 @@ atk8A_normalisebuffs: @ 80280CC mov r12, r0 cmp r2, r1 bge _08028104 - ldr r0, _0802811C @ =gUnknown_2023BE4 + ldr r0, _0802811C @ =gBattleMons movs r4, 0x6 adds r5, r1, 0 movs r7, 0x58 @@ -21232,14 +21232,14 @@ _08028104: .align 2, 0 _08028114: .4byte gUnknown_2023BCC _08028118: .4byte gUnknown_2023D74 -_0802811C: .4byte gUnknown_2023BE4 +_0802811C: .4byte gBattleMons thumb_func_end atk8A_normalisebuffs thumb_func_start atk8B_setbide atk8B_setbide: @ 8028120 push {r4,r5,lr} - ldr r4, _08028178 @ =gUnknown_2023BE4 - ldr r3, _0802817C @ =gUnknown_2023D6B + ldr r4, _08028178 @ =gBattleMons + ldr r3, _0802817C @ =sBattler_AI ldrb r0, [r3] movs r5, 0x58 adds r2, r0, 0 @@ -21255,7 +21255,7 @@ atk8B_setbide: @ 8028120 ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _08028184 @ =gUnknown_2023D4A + ldr r1, _08028184 @ =gCurrentMove ldrh r1, [r1] movs r2, 0 strh r1, [r0] @@ -21281,10 +21281,10 @@ atk8B_setbide: @ 8028120 pop {r0} bx r0 .align 2, 0 -_08028178: .4byte gUnknown_2023BE4 -_0802817C: .4byte gUnknown_2023D6B +_08028178: .4byte gBattleMons +_0802817C: .4byte sBattler_AI _08028180: .4byte gUnknown_2023DB8 -_08028184: .4byte gUnknown_2023D4A +_08028184: .4byte gCurrentMove _08028188: .4byte gUnknown_2023D58 _0802818C: .4byte gUnknown_2023D74 thumb_func_end atk8B_setbide @@ -21292,8 +21292,8 @@ _0802818C: .4byte gUnknown_2023D74 thumb_func_start atk8C_confuseifrepeatingattackends atk8C_confuseifrepeatingattackends: @ 8028190 push {lr} - ldr r1, _080281C0 @ =gUnknown_2023BE4 - ldr r0, _080281C4 @ =gUnknown_2023D6B + ldr r1, _080281C0 @ =gBattleMons + ldr r0, _080281C4 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -21316,8 +21316,8 @@ _080281B2: pop {r0} bx r0 .align 2, 0 -_080281C0: .4byte gUnknown_2023BE4 -_080281C4: .4byte gUnknown_2023D6B +_080281C0: .4byte gBattleMons +_080281C4: .4byte sBattler_AI _080281C8: .4byte gUnknown_2023E82 _080281CC: .4byte gUnknown_2023D74 thumb_func_end atk8C_confuseifrepeatingattackends @@ -21364,7 +21364,7 @@ _08028218: .4byte gUnknown_2023D74 thumb_func_start atk8E_initmultihitstring atk8E_initmultihitstring: @ 802821C - ldr r1, _0802823C @ =gUnknown_2023FC4 + ldr r1, _0802823C @ =gBattleScripting movs r2, 0 movs r0, 0xFD strb r0, [r1, 0x8] @@ -21381,22 +21381,22 @@ atk8E_initmultihitstring: @ 802821C str r0, [r1] bx lr .align 2, 0 -_0802823C: .4byte gUnknown_2023FC4 +_0802823C: .4byte gBattleScripting _08028240: .4byte gUnknown_2023D74 thumb_func_end atk8E_initmultihitstring thumb_func_start TryDoForceSwitchOut TryDoForceSwitchOut: @ 8028244 push {r4-r7,lr} - ldr r6, _08028278 @ =gUnknown_2023BE4 - ldr r7, _0802827C @ =gUnknown_2023D6B + ldr r6, _08028278 @ =gBattleMons + ldr r7, _0802827C @ =sBattler_AI ldrb r0, [r7] movs r5, 0x58 adds r1, r0, 0 muls r1, r5 adds r1, r6 adds r1, 0x2A - ldr r4, _08028280 @ =gUnknown_2023D6C + ldr r4, _08028280 @ =gBattlerTarget ldrb r3, [r4] adds r0, r3, 0 muls r0, r5 @@ -21406,19 +21406,19 @@ TryDoForceSwitchOut: @ 8028244 ldrb r0, [r0] cmp r1, r0 bcc _0802828C - ldr r0, _08028284 @ =gUnknown_2023FE8 + ldr r0, _08028284 @ =gBattleStruct ldr r1, [r0] adds r1, r3, r1 adds r1, 0x58 - ldr r2, _08028288 @ =gUnknown_2023BCE + ldr r2, _08028288 @ =gBattlerPartyIndexes lsls r0, r3, 1 b _080282E8 .align 2, 0 -_08028278: .4byte gUnknown_2023BE4 -_0802827C: .4byte gUnknown_2023D6B -_08028280: .4byte gUnknown_2023D6C -_08028284: .4byte gUnknown_2023FE8 -_08028288: .4byte gUnknown_2023BCE +_08028278: .4byte gBattleMons +_0802827C: .4byte sBattler_AI +_08028280: .4byte gBattlerTarget +_08028284: .4byte gBattleStruct +_08028288: .4byte gBattlerPartyIndexes _0802828C: bl Random movs r3, 0xFF @@ -21460,11 +21460,11 @@ _0802828C: .align 2, 0 _080282D8: .4byte gUnknown_2023D74 _080282DC: - ldr r0, _080282FC @ =gUnknown_2023FE8 + ldr r0, _080282FC @ =gBattleStruct ldr r1, [r0] adds r1, r4, r1 adds r1, 0x58 - ldr r2, _08028300 @ =gUnknown_2023BCE + ldr r2, _08028300 @ =gBattlerPartyIndexes lsls r0, r4, 1 _080282E8: adds r0, r2 @@ -21479,8 +21479,8 @@ _080282F6: pop {r1} bx r1 .align 2, 0 -_080282FC: .4byte gUnknown_2023FE8 -_08028300: .4byte gUnknown_2023BCE +_080282FC: .4byte gBattleStruct +_08028300: .4byte gBattlerPartyIndexes _08028304: .4byte gUnknown_2023D74 _08028308: .4byte gUnknown_81D8C10 thumb_func_end TryDoForceSwitchOut @@ -21490,7 +21490,7 @@ sub_802830C: @ 802830C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _080283A4 @ =gUnknown_2022B4C + ldr r4, _080283A4 @ =gBattleTypeFlags ldr r0, [r4] movs r1, 0x8 ands r0, r1 @@ -21498,15 +21498,15 @@ sub_802830C: @ 802830C bne _08028320 b _080285F4 _08028320: - ldr r5, _080283A8 @ =gUnknown_2023D6C + ldr r5, _080283A8 @ =gBattlerTarget ldrb r0, [r5] bl GetBankSide lsls r0, 24 - ldr r1, _080283AC @ =gUnknown_202402C + ldr r1, _080283AC @ =gEnemyParty mov r8, r1 cmp r0, 0 bne _08028336 - ldr r0, _080283B0 @ =gUnknown_2024284 + ldr r0, _080283B0 @ =gPlayerParty mov r8, r0 _08028336: ldr r0, [r4] @@ -21563,10 +21563,10 @@ _08028396: blt _08028364 b _080283F4 .align 2, 0 -_080283A4: .4byte gUnknown_2022B4C -_080283A8: .4byte gUnknown_2023D6C -_080283AC: .4byte gUnknown_202402C -_080283B0: .4byte gUnknown_2024284 +_080283A4: .4byte gBattleTypeFlags +_080283A8: .4byte gBattlerTarget +_080283AC: .4byte gEnemyParty +_080283B0: .4byte gPlayerParty _080283B4: movs r7, 0 movs r5, 0 @@ -21602,7 +21602,7 @@ _080283EA: _080283F4: cmp r7, 0x1 bhi _08028404 - ldr r0, _08028438 @ =gUnknown_2022B4C + ldr r0, _08028438 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x41 ands r0, r1 @@ -21611,7 +21611,7 @@ _080283F4: _08028404: cmp r7, 0x2 bhi _08028440 - ldr r0, _08028438 @ =gUnknown_2022B4C + ldr r0, _08028438 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x1 ands r0, r1 @@ -21637,7 +21637,7 @@ _0802841C: str r1, [r3] b _080285F8 .align 2, 0 -_08028438: .4byte gUnknown_2022B4C +_08028438: .4byte gBattleTypeFlags _0802843C: .4byte gUnknown_2023D74 _08028440: bl TryDoForceSwitchOut @@ -21646,7 +21646,7 @@ _08028440: bne _0802844C b _080285F8 _0802844C: - ldr r0, _0802848C @ =gUnknown_2022B4C + ldr r0, _0802848C @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x40 ands r0, r1 @@ -21660,7 +21660,7 @@ _08028458: bl __umodsi3 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08028490 @ =gUnknown_2023D6C + ldr r0, _08028490 @ =gBattlerTarget ldrb r0, [r0] bl GetBankMultiplayerId lsls r0, 24 @@ -21675,13 +21675,13 @@ _08028458: lsrs r5, r0, 24 b _08028496 .align 2, 0 -_0802848C: .4byte gUnknown_2022B4C -_08028490: .4byte gUnknown_2023D6C +_0802848C: .4byte gBattleTypeFlags +_08028490: .4byte gBattlerTarget _08028494: adds r5, r6, 0 _08028496: - ldr r4, _080284E8 @ =gUnknown_2023BCE - ldr r0, _080284EC @ =gUnknown_2023D6C + ldr r4, _080284E8 @ =gBattlerPartyIndexes + ldr r0, _080284EC @ =gBattlerTarget ldrb r2, [r0] lsls r1, r2, 1 adds r1, r4 @@ -21718,14 +21718,14 @@ _08028496: beq _08028458 b _080285AE .align 2, 0 -_080284E8: .4byte gUnknown_2023BCE -_080284EC: .4byte gUnknown_2023D6C +_080284E8: .4byte gBattlerPartyIndexes +_080284EC: .4byte gBattlerTarget _080284F0: movs r0, 0x1 ands r1, r0 cmp r1, 0 beq _08028560 - ldr r6, _08028558 @ =gUnknown_2023BCE + ldr r6, _08028558 @ =gBattlerPartyIndexes _080284FA: bl Random lsls r0, 16 @@ -21734,7 +21734,7 @@ _080284FA: bl __umodsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0802855C @ =gUnknown_2023D6C + ldr r0, _0802855C @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 1 adds r0, r6 @@ -21770,10 +21770,10 @@ _080284FA: beq _080284FA b _080285AE .align 2, 0 -_08028558: .4byte gUnknown_2023BCE -_0802855C: .4byte gUnknown_2023D6C +_08028558: .4byte gBattlerPartyIndexes +_0802855C: .4byte gBattlerTarget _08028560: - ldr r6, _080285E8 @ =gUnknown_2023BCE + ldr r6, _080285E8 @ =gBattlerPartyIndexes _08028562: bl Random lsls r0, 16 @@ -21782,7 +21782,7 @@ _08028562: bl __umodsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080285EC @ =gUnknown_2023D6C + ldr r0, _080285EC @ =gBattlerTarget ldrb r0, [r0] lsls r0, 1 adds r0, r6 @@ -21809,9 +21809,9 @@ _08028562: cmp r0, 0 beq _08028562 _080285AE: - ldr r4, _080285EC @ =gUnknown_2023D6C + ldr r4, _080285EC @ =gBattlerTarget ldrb r0, [r4] - ldr r1, _080285F0 @ =gUnknown_2023FE8 + ldr r1, _080285F0 @ =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x5C @@ -21835,9 +21835,9 @@ _080285CC: bl sub_8127EC4 b _080285F8 .align 2, 0 -_080285E8: .4byte gUnknown_2023BCE -_080285EC: .4byte gUnknown_2023D6C -_080285F0: .4byte gUnknown_2023FE8 +_080285E8: .4byte gBattlerPartyIndexes +_080285EC: .4byte gBattlerTarget +_080285F0: .4byte gBattleStruct _080285F4: bl TryDoForceSwitchOut _080285F8: @@ -21856,8 +21856,8 @@ atk90_tryconversiontypechange: @ 8028604 mov r5, r8 push {r5-r7} movs r6, 0 - ldr r2, _08028698 @ =gUnknown_2023BE4 - ldr r3, _0802869C @ =gUnknown_2023D6B + ldr r2, _08028698 @ =gBattleMons + ldr r3, _0802869C @ =sBattler_AI ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -21888,11 +21888,11 @@ _08028646: movs r3, 0 cmp r3, r6 bcs _080286C8 - ldr r0, _080286A0 @ =gUnknown_8250C04 + ldr r0, _080286A0 @ =gBattleMoves mov r10, r0 - ldr r5, _08028698 @ =gUnknown_2023BE4 + ldr r5, _08028698 @ =gBattleMons mov r12, r5 - ldr r7, _0802869C @ =gUnknown_2023D6B + ldr r7, _0802869C @ =sBattler_AI ldrb r0, [r7] movs r4, 0x58 adds r5, r0, 0 @@ -21928,9 +21928,9 @@ _08028692: movs r2, 0x7 b _080286A6 .align 2, 0 -_08028698: .4byte gUnknown_2023BE4 -_0802869C: .4byte gUnknown_2023D6B -_080286A0: .4byte gUnknown_8250C04 +_08028698: .4byte gBattleMons +_0802869C: .4byte sBattler_AI +_080286A0: .4byte gBattleMoves _080286A4: movs r2, 0 _080286A6: @@ -21973,7 +21973,7 @@ _080286C8: _080286E8: .4byte gUnknown_2023D74 _080286EC: movs r7, 0x3 - ldr r5, _08028744 @ =gUnknown_8250C04 + ldr r5, _08028744 @ =gBattleMoves mov r9, r5 _080286F2: bl Random @@ -21981,9 +21981,9 @@ _080286F2: ands r3, r7 cmp r3, r6 bcs _080286F2 - ldr r4, _08028748 @ =gUnknown_2023BE4 + ldr r4, _08028748 @ =gBattleMons lsls r1, r3, 1 - ldr r3, _0802874C @ =gUnknown_2023D6B + ldr r3, _0802874C @ =sBattler_AI ldrb r2, [r3] movs r0, 0x58 adds r5, r2, 0 @@ -22018,9 +22018,9 @@ _08028740: movs r2, 0x7 b _08028752 .align 2, 0 -_08028744: .4byte gUnknown_8250C04 -_08028748: .4byte gUnknown_2023BE4 -_0802874C: .4byte gUnknown_2023D6B +_08028744: .4byte gBattleMoves +_08028748: .4byte gBattleMons +_0802874C: .4byte sBattler_AI _08028750: movs r2, 0 _08028752: @@ -22071,7 +22071,7 @@ _080287A4: .4byte gUnknown_2023D74 thumb_func_start atk91_givepaydaymoney atk91_givepaydaymoney: @ 80287A8 push {r4,r5,lr} - ldr r0, _0802880C @ =gUnknown_2022B4C + ldr r0, _0802880C @ =gBattleTypeFlags ldr r0, [r0] movs r5, 0x2 ands r0, r5 @@ -22082,7 +22082,7 @@ atk91_givepaydaymoney: @ 80287A8 cmp r0, 0 beq _08028828 adds r1, r0, 0 - ldr r0, _08028814 @ =gUnknown_2023FE8 + ldr r0, _08028814 @ =gBattleStruct ldr r0, [r0] adds r0, 0x4A ldrb r0, [r0] @@ -22119,9 +22119,9 @@ atk91_givepaydaymoney: @ 80287A8 str r0, [r4] b _08028830 .align 2, 0 -_0802880C: .4byte gUnknown_2022B4C +_0802880C: .4byte gBattleTypeFlags _08028810: .4byte gUnknown_2023E7E -_08028814: .4byte gUnknown_2023FE8 +_08028814: .4byte gBattleStruct _08028818: .4byte gSaveBlock1Ptr _0802881C: .4byte gUnknown_2022AB8 _08028820: .4byte gUnknown_2023D74 @@ -22142,10 +22142,10 @@ _08028838: .4byte gUnknown_2023D74 thumb_func_start atk92_setlightscreen atk92_setlightscreen: @ 802883C push {r4-r6,lr} - ldr r5, _0802886C @ =gUnknown_2023D6B + ldr r5, _0802886C @ =sBattler_AI ldrb r0, [r5] bl GetBankIdentity - ldr r4, _08028870 @ =gUnknown_2023DDE + ldr r4, _08028870 @ =gSideAffecting movs r6, 0x1 adds r1, r6, 0 ands r1, r0 @@ -22156,7 +22156,7 @@ atk92_setlightscreen: @ 802883C ands r0, r1 cmp r0, 0 beq _0802887C - ldr r2, _08028874 @ =gUnknown_2023DCC + ldr r2, _08028874 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -22165,9 +22165,9 @@ atk92_setlightscreen: @ 802883C movs r0, 0 b _080288F0 .align 2, 0 -_0802886C: .4byte gUnknown_2023D6B -_08028870: .4byte gUnknown_2023DDE -_08028874: .4byte gUnknown_2023DCC +_0802886C: .4byte sBattler_AI +_08028870: .4byte gSideAffecting +_08028874: .4byte gMoveResultFlags _08028878: .4byte gUnknown_2023E82 _0802887C: ldrb r0, [r5] @@ -22201,7 +22201,7 @@ _0802887C: adds r0, r4 ldrb r1, [r5] strb r1, [r0, 0x3] - ldr r0, _080288E4 @ =gUnknown_2022B4C + ldr r0, _080288E4 @ =gBattleTypeFlags ldr r0, [r0] ands r0, r6 cmp r0, 0 @@ -22217,7 +22217,7 @@ _0802887C: b _080288F0 .align 2, 0 _080288E0: .4byte gUnknown_2023DE4 -_080288E4: .4byte gUnknown_2022B4C +_080288E4: .4byte gBattleTypeFlags _080288E8: .4byte gUnknown_2023E82 _080288EC: ldr r1, _08028900 @ =gUnknown_2023E82 @@ -22242,8 +22242,8 @@ atk93_tryKO: @ 8028908 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r7, _08028934 @ =gUnknown_2023BE4 - ldr r6, _08028938 @ =gUnknown_2023D6C + ldr r7, _08028934 @ =gBattleMons + ldr r6, _08028938 @ =gBattlerTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -22261,8 +22261,8 @@ atk93_tryKO: @ 8028908 ldrb r6, [r0, 0x1A] b _0802895A .align 2, 0 -_08028934: .4byte gUnknown_2023BE4 -_08028938: .4byte gUnknown_2023D6C +_08028934: .4byte gBattleMons +_08028938: .4byte gBattlerTarget _0802893C: .4byte gUnknown_2023F54 _08028940: ldrh r0, [r1, 0x2E] @@ -22278,7 +22278,7 @@ _08028940: lsrs r6, r0, 24 _0802895A: ldr r1, _080289D4 @ =gUnknown_2023D6F - ldr r5, _080289D8 @ =gUnknown_2023D6C + ldr r5, _080289D8 @ =gBattlerTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -22306,8 +22306,8 @@ _0802895A: orrs r1, r2 strb r1, [r0] _08028998: - ldr r1, _080289E0 @ =gUnknown_2023BE4 - ldr r2, _080289D8 @ =gUnknown_2023D6C + ldr r1, _080289E0 @ =gBattleMons + ldr r2, _080289D8 @ =gBattlerTarget ldrb r3, [r2] movs r6, 0x58 adds r0, r3, 0 @@ -22320,7 +22320,7 @@ _08028998: mov r9, r2 cmp r4, 0x5 bne _080289F4 - ldr r2, _080289E4 @ =gUnknown_2023DCC + ldr r2, _080289E4 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -22337,15 +22337,15 @@ _08028998: b _08028C48 .align 2, 0 _080289D4: .4byte gUnknown_2023D6F -_080289D8: .4byte gUnknown_2023D6C +_080289D8: .4byte gBattlerTarget _080289DC: .4byte gUnknown_2023ECC -_080289E0: .4byte gUnknown_2023BE4 -_080289E4: .4byte gUnknown_2023DCC +_080289E0: .4byte gBattleMons +_080289E4: .4byte gMoveResultFlags _080289E8: .4byte gUnknown_2023D6A _080289EC: .4byte gUnknown_2023D74 _080289F0: .4byte gUnknown_81D93A1 _080289F4: - ldr r1, _08028A68 @ =gUnknown_2023DFC + ldr r1, _08028A68 @ =gStatuses3 lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] @@ -22353,14 +22353,14 @@ _080289F4: ands r0, r1 cmp r0, 0 bne _08028A78 - ldr r1, _08028A6C @ =gUnknown_8250C04 - ldr r0, _08028A70 @ =gUnknown_2023D4A + ldr r1, _08028A6C @ =gBattleMoves + ldr r0, _08028A70 @ =gCurrentMove ldrh r0, [r0] lsls r2, r0, 1 adds r2, r0 lsls r2, 2 adds r2, r1 - ldr r7, _08028A74 @ =gUnknown_2023D6B + ldr r7, _08028A74 @ =sBattler_AI ldrb r0, [r7] muls r0, r6 add r0, r8 @@ -22403,17 +22403,17 @@ _08028A48: bcs _08028B0E b _08028BE0 .align 2, 0 -_08028A68: .4byte gUnknown_2023DFC -_08028A6C: .4byte gUnknown_8250C04 -_08028A70: .4byte gUnknown_2023D4A -_08028A74: .4byte gUnknown_2023D6B +_08028A68: .4byte gStatuses3 +_08028A6C: .4byte gBattleMoves +_08028A70: .4byte gCurrentMove +_08028A74: .4byte sBattler_AI _08028A78: - ldr r1, _08028B44 @ =gUnknown_2023E0C + ldr r1, _08028B44 @ =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r0, r1 - ldr r1, _08028B48 @ =gUnknown_2023D6B + ldr r1, _08028B48 @ =sBattler_AI ldrb r0, [r0, 0x15] adds r7, r1, 0 ldrb r3, [r7] @@ -22430,21 +22430,21 @@ _08028A78: cmp r0, r1 bcs _08028B1A _08028AA2: - ldr r1, _08028B4C @ =gUnknown_8250C04 - ldr r0, _08028B50 @ =gUnknown_2023D4A + ldr r1, _08028B4C @ =gBattleMoves + ldr r0, _08028B50 @ =gCurrentMove ldrh r0, [r0] lsls r2, r0, 1 adds r2, r0 lsls r2, 2 adds r2, r1 - ldr r6, _08028B54 @ =gUnknown_2023BE4 + ldr r6, _08028B54 @ =gBattleMons ldrb r0, [r7] movs r5, 0x58 muls r0, r5 adds r0, r6 adds r0, 0x2A ldrb r1, [r0] - ldr r0, _08028B58 @ =gUnknown_2023D6C + ldr r0, _08028B58 @ =gBattlerTarget mov r8, r0 ldrb r0, [r0] muls r0, r5 @@ -22484,9 +22484,9 @@ _08028AA2: _08028B0C: movs r4, 0 _08028B0E: - ldr r3, _08028B54 @ =gUnknown_2023BE4 + ldr r3, _08028B54 @ =gBattleMons mov r8, r3 - ldr r0, _08028B58 @ =gUnknown_2023D6C + ldr r0, _08028B58 @ =gBattlerTarget mov r9, r0 cmp r4, 0 beq _08028BE0 @@ -22500,27 +22500,27 @@ _08028B1A: lsls r0, 30 cmp r0, 0 bge _08028B68 - ldr r1, _08028B60 @ =gUnknown_2023D50 + ldr r1, _08028B60 @ =gBattleMoveDamage movs r0, 0x58 muls r0, r2 add r0, r8 ldrh r0, [r0, 0x28] subs r0, 0x1 str r0, [r1] - ldr r2, _08028B64 @ =gUnknown_2023DCC + ldr r2, _08028B64 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x40 b _08028BC6 .align 2, 0 -_08028B44: .4byte gUnknown_2023E0C -_08028B48: .4byte gUnknown_2023D6B -_08028B4C: .4byte gUnknown_8250C04 -_08028B50: .4byte gUnknown_2023D4A -_08028B54: .4byte gUnknown_2023BE4 -_08028B58: .4byte gUnknown_2023D6C +_08028B44: .4byte gDisableStructs +_08028B48: .4byte sBattler_AI +_08028B4C: .4byte gBattleMoves +_08028B50: .4byte gCurrentMove +_08028B54: .4byte gBattleMons +_08028B58: .4byte gBattlerTarget _08028B5C: .4byte gUnknown_2023E8C -_08028B60: .4byte gUnknown_2023D50 -_08028B64: .4byte gUnknown_2023DCC +_08028B60: .4byte gBattleMoveDamage +_08028B64: .4byte gMoveResultFlags _08028B68: ldr r0, _08028BA4 @ =gUnknown_2023ECC lsls r1, r2, 2 @@ -22531,7 +22531,7 @@ _08028B68: lsrs r0, 7 cmp r0, 0 beq _08028BB4 - ldr r1, _08028BA8 @ =gUnknown_2023D50 + ldr r1, _08028BA8 @ =gBattleMoveDamage movs r3, 0x58 adds r0, r2, 0 muls r0, r3 @@ -22539,7 +22539,7 @@ _08028B68: ldrh r0, [r0, 0x28] subs r0, 0x1 str r0, [r1] - ldr r2, _08028BAC @ =gUnknown_2023DCC + ldr r2, _08028BAC @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 @@ -22554,17 +22554,17 @@ _08028B68: b _08028BCA .align 2, 0 _08028BA4: .4byte gUnknown_2023ECC -_08028BA8: .4byte gUnknown_2023D50 -_08028BAC: .4byte gUnknown_2023DCC +_08028BA8: .4byte gBattleMoveDamage +_08028BAC: .4byte gMoveResultFlags _08028BB0: .4byte gUnknown_2023D68 _08028BB4: - ldr r1, _08028BD4 @ =gUnknown_2023D50 + ldr r1, _08028BD4 @ =gBattleMoveDamage movs r0, 0x58 muls r0, r2 add r0, r8 ldrh r0, [r0, 0x28] str r0, [r1] - ldr r2, _08028BD8 @ =gUnknown_2023DCC + ldr r2, _08028BD8 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x10 _08028BC6: @@ -22577,24 +22577,24 @@ _08028BCA: str r0, [r1] b _08028C48 .align 2, 0 -_08028BD4: .4byte gUnknown_2023D50 -_08028BD8: .4byte gUnknown_2023DCC +_08028BD4: .4byte gBattleMoveDamage +_08028BD8: .4byte gMoveResultFlags _08028BDC: .4byte gUnknown_2023D74 _08028BE0: - ldr r2, _08028C14 @ =gUnknown_2023DCC + ldr r2, _08028C14 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r3, _08028C18 @ =gUnknown_2023BE4 - ldr r0, _08028C1C @ =gUnknown_2023D6B + ldr r3, _08028C18 @ =gBattleMons + ldr r0, _08028C1C @ =sBattler_AI ldrb r0, [r0] movs r2, 0x58 adds r1, r0, 0 muls r1, r2 adds r1, r3 adds r1, 0x2A - ldr r0, _08028C20 @ =gUnknown_2023D6C + ldr r0, _08028C20 @ =gBattlerTarget ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -22607,10 +22607,10 @@ _08028BE0: movs r0, 0 b _08028C2C .align 2, 0 -_08028C14: .4byte gUnknown_2023DCC -_08028C18: .4byte gUnknown_2023BE4 -_08028C1C: .4byte gUnknown_2023D6B -_08028C20: .4byte gUnknown_2023D6C +_08028C14: .4byte gMoveResultFlags +_08028C18: .4byte gBattleMons +_08028C1C: .4byte sBattler_AI +_08028C20: .4byte gBattlerTarget _08028C24: .4byte gUnknown_2023E82 _08028C28: ldr r1, _08028C54 @ =gUnknown_2023E82 @@ -22645,9 +22645,9 @@ _08028C58: .4byte gUnknown_2023D74 thumb_func_start atk94_damagetohalftargethp atk94_damagetohalftargethp: @ 8028C5C push {lr} - ldr r3, _08028C88 @ =gUnknown_2023D50 - ldr r2, _08028C8C @ =gUnknown_2023BE4 - ldr r0, _08028C90 @ =gUnknown_2023D6C + ldr r3, _08028C88 @ =gBattleMoveDamage + ldr r2, _08028C8C @ =gBattleMons + ldr r0, _08028C90 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -22667,22 +22667,22 @@ _08028C7A: pop {r0} bx r0 .align 2, 0 -_08028C88: .4byte gUnknown_2023D50 -_08028C8C: .4byte gUnknown_2023BE4 -_08028C90: .4byte gUnknown_2023D6C +_08028C88: .4byte gBattleMoveDamage +_08028C8C: .4byte gBattleMons +_08028C90: .4byte gBattlerTarget _08028C94: .4byte gUnknown_2023D74 thumb_func_end atk94_damagetohalftargethp thumb_func_start atk95_setsandstorm atk95_setsandstorm: @ 8028C98 push {lr} - ldr r2, _08028CB8 @ =gUnknown_2023F1C + ldr r2, _08028CB8 @ =gBattleWeather ldrh r1, [r2] movs r0, 0x18 ands r0, r1 cmp r0, 0 beq _08028CC4 - ldr r2, _08028CBC @ =gUnknown_2023DCC + ldr r2, _08028CBC @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -22692,8 +22692,8 @@ atk95_setsandstorm: @ 8028C98 strb r0, [r1, 0x5] b _08028CD6 .align 2, 0 -_08028CB8: .4byte gUnknown_2023F1C -_08028CBC: .4byte gUnknown_2023DCC +_08028CB8: .4byte gBattleWeather +_08028CBC: .4byte gMoveResultFlags _08028CC0: .4byte gUnknown_2023E82 _08028CC4: movs r0, 0x8 @@ -22722,7 +22722,7 @@ _08028CEC: .4byte gUnknown_2023D74 sub_8028CF0: @ 8028CF0 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _08028DBC @ =gUnknown_2022B4C + ldr r0, _08028DBC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0xA0 lsls r1, 8 @@ -22731,7 +22731,7 @@ sub_8028CF0: @ 8028CF0 lsls r1, 8 cmp r0, r1 bne _08028D18 - ldr r0, _08028DC0 @ =gUnknown_2023D6B + ldr r0, _08028DC0 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -22764,15 +22764,15 @@ _08028D32: beq _08028D48 b _08028E48 _08028D48: - ldr r2, _08028DC4 @ =gUnknown_2023F1C + ldr r2, _08028DC4 @ =gBattleWeather ldrh r1, [r2] movs r0, 0x18 ands r0, r1 - ldr r5, _08028DC0 @ =gUnknown_2023D6B + ldr r5, _08028DC0 @ =sBattler_AI adds r4, r2, 0 cmp r0, 0 beq _08028DDA - ldr r0, _08028DC8 @ =gUnknown_2023BE4 + ldr r0, _08028DC8 @ =gBattleMons ldrb r2, [r5] movs r1, 0x58 muls r1, r2 @@ -22800,7 +22800,7 @@ _08028D48: ldrb r0, [r0] cmp r0, 0x8 beq _08028DD4 - ldr r0, _08028DCC @ =gUnknown_2023DFC + ldr r0, _08028DCC @ =gStatuses3 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -22813,7 +22813,7 @@ _08028D48: ands r1, r0 cmp r1, 0 bne _08028DD4 - ldr r1, _08028DD0 @ =gUnknown_2023D50 + ldr r1, _08028DD0 @ =gBattleMoveDamage ldrh r0, [r3, 0x2C] lsrs r0, 4 str r0, [r1] @@ -22822,14 +22822,14 @@ _08028D48: movs r0, 0x1 b _08028DD8 .align 2, 0 -_08028DBC: .4byte gUnknown_2022B4C -_08028DC0: .4byte gUnknown_2023D6B -_08028DC4: .4byte gUnknown_2023F1C -_08028DC8: .4byte gUnknown_2023BE4 -_08028DCC: .4byte gUnknown_2023DFC -_08028DD0: .4byte gUnknown_2023D50 +_08028DBC: .4byte gBattleTypeFlags +_08028DC0: .4byte sBattler_AI +_08028DC4: .4byte gBattleWeather +_08028DC8: .4byte gBattleMons +_08028DCC: .4byte gStatuses3 +_08028DD0: .4byte gBattleMoveDamage _08028DD4: - ldr r1, _08028E30 @ =gUnknown_2023D50 + ldr r1, _08028E30 @ =gBattleMoveDamage movs r0, 0 _08028DD8: str r0, [r1] @@ -22840,7 +22840,7 @@ _08028DDA: ands r0, r1 cmp r0, 0 beq _08028E50 - ldr r1, _08028E34 @ =gUnknown_2023BE4 + ldr r1, _08028E34 @ =gBattleMons ldrb r3, [r5] movs r0, 0x58 muls r0, r3 @@ -22855,7 +22855,7 @@ _08028DDA: ldrb r0, [r0] cmp r0, 0xF beq _08028E3C - ldr r0, _08028E38 @ =gUnknown_2023DFC + ldr r0, _08028E38 @ =gStatuses3 lsls r1, r3, 2 adds r1, r0 ldr r1, [r1] @@ -22868,7 +22868,7 @@ _08028DDA: ands r1, r0 cmp r1, 0 bne _08028E3C - ldr r1, _08028E30 @ =gUnknown_2023D50 + ldr r1, _08028E30 @ =gBattleMoveDamage ldrh r0, [r2, 0x2C] lsrs r0, 4 str r0, [r1] @@ -22878,25 +22878,25 @@ _08028DDA: str r0, [r1] b _08028E50 .align 2, 0 -_08028E30: .4byte gUnknown_2023D50 -_08028E34: .4byte gUnknown_2023BE4 -_08028E38: .4byte gUnknown_2023DFC +_08028E30: .4byte gBattleMoveDamage +_08028E34: .4byte gBattleMons +_08028E38: .4byte gStatuses3 _08028E3C: - ldr r1, _08028E44 @ =gUnknown_2023D50 + ldr r1, _08028E44 @ =gBattleMoveDamage movs r0, 0 str r0, [r1] b _08028E50 .align 2, 0 -_08028E44: .4byte gUnknown_2023D50 +_08028E44: .4byte gBattleMoveDamage _08028E48: - ldr r1, _08028E7C @ =gUnknown_2023D50 + ldr r1, _08028E7C @ =gBattleMoveDamage movs r0, 0 str r0, [r1] - ldr r5, _08028E80 @ =gUnknown_2023D6B + ldr r5, _08028E80 @ =sBattler_AI _08028E50: - ldr r0, _08028E84 @ =gUnknown_2023D70 + ldr r0, _08028E84 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _08028E88 @ =gUnknown_825E45C + ldr r2, _08028E88 @ =gBitTable ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -22905,7 +22905,7 @@ _08028E50: cmp r1, 0 beq _08028E6A _08028E64: - ldr r1, _08028E7C @ =gUnknown_2023D50 + ldr r1, _08028E7C @ =gBattleMoveDamage movs r0, 0 str r0, [r1] _08028E6A: @@ -22918,10 +22918,10 @@ _08028E6A: pop {r0} bx r0 .align 2, 0 -_08028E7C: .4byte gUnknown_2023D50 -_08028E80: .4byte gUnknown_2023D6B -_08028E84: .4byte gUnknown_2023D70 -_08028E88: .4byte gUnknown_825E45C +_08028E7C: .4byte gBattleMoveDamage +_08028E80: .4byte sBattler_AI +_08028E84: .4byte gAbsentBattlerFlags +_08028E88: .4byte gBitTable _08028E8C: .4byte gUnknown_2023D74 thumb_func_end sub_8028CF0 @@ -22932,65 +22932,65 @@ sub_8028E90: @ 8028E90 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _08028EBC @ =gUnknown_2023D6B + ldr r4, _08028EBC @ =sBattler_AI ldrb r0, [r4] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08028EC8 - ldr r1, _08028EC0 @ =gUnknown_2023BCE + ldr r1, _08028EC0 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08028EC4 @ =gUnknown_2024284 + ldr r0, _08028EC4 @ =gPlayerParty b _08028ED8 .align 2, 0 -_08028EBC: .4byte gUnknown_2023D6B -_08028EC0: .4byte gUnknown_2023BCE -_08028EC4: .4byte gUnknown_2024284 +_08028EBC: .4byte sBattler_AI +_08028EC0: .4byte gBattlerPartyIndexes +_08028EC4: .4byte gPlayerParty _08028EC8: - ldr r1, _08028EFC @ =gUnknown_2023BCE + ldr r1, _08028EFC @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08028F00 @ =gUnknown_202402C + ldr r0, _08028F00 @ =gEnemyParty _08028ED8: adds r5, r1, r0 - ldr r4, _08028F04 @ =gUnknown_2023D6C + ldr r4, _08028F04 @ =gBattlerTarget ldrb r0, [r4] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08028F0C - ldr r1, _08028EFC @ =gUnknown_2023BCE + ldr r1, _08028EFC @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08028F08 @ =gUnknown_2024284 + ldr r0, _08028F08 @ =gPlayerParty b _08028F1C .align 2, 0 -_08028EFC: .4byte gUnknown_2023BCE -_08028F00: .4byte gUnknown_202402C -_08028F04: .4byte gUnknown_2023D6C -_08028F08: .4byte gUnknown_2024284 +_08028EFC: .4byte gBattlerPartyIndexes +_08028F00: .4byte gEnemyParty +_08028F04: .4byte gBattlerTarget +_08028F08: .4byte gPlayerParty _08028F0C: - ldr r1, _08028F78 @ =gUnknown_2023BCE + ldr r1, _08028F78 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08028F7C @ =gUnknown_202402C + ldr r0, _08028F7C @ =gEnemyParty _08028F1C: adds r4, r1, r0 adds r0, r5, 0 @@ -23013,11 +23013,11 @@ _08028F1C: movs r1, 0 bl GetMonData adds r7, r0, 0 - ldr r5, _08028F80 @ =gUnknown_2023D6C + ldr r5, _08028F80 @ =gBattlerTarget ldrb r0, [r5] movs r6, 0x58 muls r0, r6 - ldr r1, _08028F84 @ =gUnknown_2023BE4 + ldr r1, _08028F84 @ =gBattleMons adds r0, r1 adds r0, 0x20 ldrb r2, [r0] @@ -23033,10 +23033,10 @@ _08028F1C: bl sub_80C71D0 b _0802902C .align 2, 0 -_08028F78: .4byte gUnknown_2023BCE -_08028F7C: .4byte gUnknown_202402C -_08028F80: .4byte gUnknown_2023D6C -_08028F84: .4byte gUnknown_2023BE4 +_08028F78: .4byte gBattlerPartyIndexes +_08028F7C: .4byte gEnemyParty +_08028F80: .4byte gBattlerTarget +_08028F84: .4byte gBattleMons _08028F88: .4byte gUnknown_2023D74 _08028F8C: .4byte gUnknown_81D9444 _08028F90: .4byte gUnknown_2023D6A @@ -23054,7 +23054,7 @@ _08028F94: beq _08028FE4 ldrb r0, [r5] muls r0, r6 - ldr r4, _08029000 @ =gUnknown_2023BE4 + ldr r4, _08029000 @ =gBattleMons adds r4, 0x50 adds r0, r4 ldr r0, [r0] @@ -23093,15 +23093,15 @@ _08028FE4: str r1, [r3] b _0802902C .align 2, 0 -_08029000: .4byte gUnknown_2023BE4 +_08029000: .4byte gBattleMons _08029004: .4byte gUnknown_2023D74 _08029008: ldrb r0, [r5] adds r2, r0, 0 muls r2, r6 adds r2, r4 - ldr r1, _0802903C @ =gUnknown_825E45C - ldr r0, _08029040 @ =gUnknown_2023D6B + ldr r1, _0802903C @ =gBitTable + ldr r0, _08029040 @ =sBattler_AI ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -23123,8 +23123,8 @@ _0802902C: pop {r0} bx r0 .align 2, 0 -_0802903C: .4byte gUnknown_825E45C -_08029040: .4byte gUnknown_2023D6B +_0802903C: .4byte gBitTable +_08029040: .4byte sBattler_AI _08029044: .4byte gUnknown_2023D74 thumb_func_end sub_8028E90 @@ -23142,19 +23142,19 @@ _08029054: ldrb r0, [r2, 0x1] cmp r0, 0xD bne _080290D4 - ldr r2, _080290C0 @ =gUnknown_2023BC4 + ldr r2, _080290C0 @ =gActiveBattler strb r1, [r2] ldr r0, _080290C4 @ =gUnknown_2023BCC ldrb r0, [r0] cmp r1, r0 bcs _08029164 - ldr r7, _080290C8 @ =gUnknown_825E45C + ldr r7, _080290C8 @ =gBitTable adds r4, r2, 0 - ldr r5, _080290CC @ =gUnknown_2023BE4 + ldr r5, _080290CC @ =gBattleMons adds r6, r5, 0 adds r6, 0x50 _08029074: - ldr r0, _080290D0 @ =gUnknown_2023D70 + ldr r0, _080290D0 @ =gAbsentBattlerFlags ldrb r1, [r0] ldrb r2, [r4] lsls r0, r2, 2 @@ -23189,21 +23189,21 @@ _080290A2: .align 2, 0 _080290B8: .4byte gUnknown_2023BC8 _080290BC: .4byte gUnknown_2023D74 -_080290C0: .4byte gUnknown_2023BC4 +_080290C0: .4byte gActiveBattler _080290C4: .4byte gUnknown_2023BCC -_080290C8: .4byte gUnknown_825E45C -_080290CC: .4byte gUnknown_2023BE4 -_080290D0: .4byte gUnknown_2023D70 +_080290C8: .4byte gBitTable +_080290CC: .4byte gBattleMons +_080290D0: .4byte gAbsentBattlerFlags _080290D4: cmp r0, 0x4 bne _0802918C - ldr r4, _08029170 @ =gUnknown_2023BC4 - ldr r5, _08029174 @ =gUnknown_2023D6B + ldr r4, _08029170 @ =gActiveBattler + ldr r5, _08029174 @ =sBattler_AI ldrb r0, [r5] strb r0, [r4] - ldr r6, _08029178 @ =gUnknown_2023D70 + ldr r6, _08029178 @ =gAbsentBattlerFlags ldrb r1, [r6] - ldr r7, _0802917C @ =gUnknown_825E45C + ldr r7, _0802917C @ =gBitTable ldrb r2, [r4] lsls r0, r2, 2 adds r0, r7 @@ -23211,7 +23211,7 @@ _080290D4: ands r1, r0 cmp r1, 0 bne _08029114 - ldr r3, _08029180 @ =gUnknown_2023BE4 + ldr r3, _08029180 @ =gBattleMons movs r0, 0x58 muls r2, r0 adds r0, r3, 0 @@ -23226,7 +23226,7 @@ _080290D4: ldrb r0, [r4] bl MarkBufferBankForExecution _08029114: - ldr r0, _08029184 @ =gUnknown_2022B4C + ldr r0, _08029184 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -23248,7 +23248,7 @@ _08029114: ands r1, r0 cmp r1, 0 bne _08029164 - ldr r3, _08029180 @ =gUnknown_2023BE4 + ldr r3, _08029180 @ =gBattleMons movs r0, 0x58 muls r2, r0 adds r0, r3, 0 @@ -23269,19 +23269,19 @@ _08029164: str r0, [r1] b _080291C0 .align 2, 0 -_08029170: .4byte gUnknown_2023BC4 -_08029174: .4byte gUnknown_2023D6B -_08029178: .4byte gUnknown_2023D70 -_0802917C: .4byte gUnknown_825E45C -_08029180: .4byte gUnknown_2023BE4 -_08029184: .4byte gUnknown_2022B4C +_08029170: .4byte gActiveBattler +_08029174: .4byte sBattler_AI +_08029178: .4byte gAbsentBattlerFlags +_0802917C: .4byte gBitTable +_08029180: .4byte gBattleMons +_08029184: .4byte gBattleTypeFlags _08029188: .4byte gUnknown_2023D74 _0802918C: ldrb r0, [r2, 0x1] bl sub_8016E24 - ldr r4, _080291C8 @ =gUnknown_2023BC4 + ldr r4, _080291C8 @ =gActiveBattler strb r0, [r4] - ldr r3, _080291CC @ =gUnknown_2023BE4 + ldr r3, _080291CC @ =gBattleMons ldrb r1, [r4] movs r0, 0x58 adds r2, r1, 0 @@ -23305,15 +23305,15 @@ _080291C0: pop {r0} bx r0 .align 2, 0 -_080291C8: .4byte gUnknown_2023BC4 -_080291CC: .4byte gUnknown_2023BE4 +_080291C8: .4byte gActiveBattler +_080291CC: .4byte gBattleMons thumb_func_end sub_8029048 thumb_func_start atk99_setmist atk99_setmist: @ 80291D0 push {r4-r6,lr} ldr r6, _08029200 @ =gUnknown_2023DE4 - ldr r4, _08029204 @ =gUnknown_2023D6B + ldr r4, _08029204 @ =sBattler_AI ldrb r0, [r4] bl GetBankIdentity movs r5, 0x1 @@ -23326,7 +23326,7 @@ atk99_setmist: @ 80291D0 ldrb r0, [r0, 0x4] cmp r0, 0 beq _08029210 - ldr r2, _08029208 @ =gUnknown_2023DCC + ldr r2, _08029208 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x20 orrs r0, r1 @@ -23336,8 +23336,8 @@ atk99_setmist: @ 80291D0 b _0802925E .align 2, 0 _08029200: .4byte gUnknown_2023DE4 -_08029204: .4byte gUnknown_2023D6B -_08029208: .4byte gUnknown_2023DCC +_08029204: .4byte sBattler_AI +_08029208: .4byte gMoveResultFlags _0802920C: .4byte gUnknown_2023E82 _08029210: ldrb r0, [r4] @@ -23362,7 +23362,7 @@ _08029210: strb r1, [r0, 0x5] ldrb r0, [r4] bl GetBankIdentity - ldr r2, _0802926C @ =gUnknown_2023DDE + ldr r2, _0802926C @ =gSideAffecting adds r1, r5, 0 ands r1, r0 lsls r1, 1 @@ -23385,7 +23385,7 @@ _0802925E: pop {r0} bx r0 .align 2, 0 -_0802926C: .4byte gUnknown_2023DDE +_0802926C: .4byte gSideAffecting _08029270: .4byte gUnknown_2023E82 _08029274: .4byte gUnknown_2023D74 thumb_func_end atk99_setmist @@ -23393,8 +23393,8 @@ _08029274: .4byte gUnknown_2023D74 thumb_func_start atk9A_setfocusenergy atk9A_setfocusenergy: @ 8029278 push {lr} - ldr r1, _080292A8 @ =gUnknown_2023BE4 - ldr r0, _080292AC @ =gUnknown_2023D6B + ldr r1, _080292A8 @ =gBattleMons + ldr r0, _080292AC @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -23407,7 +23407,7 @@ atk9A_setfocusenergy: @ 8029278 ands r2, r3 cmp r2, 0 beq _080292B8 - ldr r2, _080292B0 @ =gUnknown_2023DCC + ldr r2, _080292B0 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x20 orrs r0, r1 @@ -23417,9 +23417,9 @@ atk9A_setfocusenergy: @ 8029278 strb r0, [r1, 0x5] b _080292C0 .align 2, 0 -_080292A8: .4byte gUnknown_2023BE4 -_080292AC: .4byte gUnknown_2023D6B -_080292B0: .4byte gUnknown_2023DCC +_080292A8: .4byte gBattleMons +_080292AC: .4byte sBattler_AI +_080292B0: .4byte gMoveResultFlags _080292B4: .4byte gUnknown_2023E82 _080292B8: orrs r1, r3 @@ -23451,8 +23451,8 @@ atk9B_transformdataexecution: @ 80292D4 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r7, _08029338 @ =gUnknown_2023BE4 - ldr r0, _0802933C @ =gUnknown_2023D6C + ldr r7, _08029338 @ =gBattleMons + ldr r0, _0802933C @ =gBattlerTarget mov r12, r0 ldrb r1, [r0] movs r6, 0x58 @@ -23467,7 +23467,7 @@ atk9B_transformdataexecution: @ 80292D4 ands r0, r4 cmp r0, 0 bne _0802931A - ldr r0, _08029340 @ =gUnknown_2023DFC + ldr r0, _08029340 @ =gStatuses3 lsls r1, 2 adds r1, r0 ldr r2, [r1] @@ -23476,7 +23476,7 @@ atk9B_transformdataexecution: @ 80292D4 cmp r2, 0 beq _08029350 _0802931A: - ldr r2, _08029348 @ =gUnknown_2023DCC + ldr r2, _08029348 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x20 orrs r0, r1 @@ -23488,14 +23488,14 @@ _0802931A: _0802932C: .4byte gUnknown_2023D4C _08029330: .4byte 0x0000ffff _08029334: .4byte gUnknown_2023D74 -_08029338: .4byte gUnknown_2023BE4 -_0802933C: .4byte gUnknown_2023D6C -_08029340: .4byte gUnknown_2023DFC +_08029338: .4byte gBattleMons +_0802933C: .4byte gBattlerTarget +_08029340: .4byte gStatuses3 _08029344: .4byte 0x000400c0 -_08029348: .4byte gUnknown_2023DCC +_08029348: .4byte gMoveResultFlags _0802934C: .4byte gUnknown_2023E82 _08029350: - ldr r3, _08029424 @ =gUnknown_2023D6B + ldr r3, _08029424 @ =sBattler_AI ldrb r0, [r3] adds r1, r0, 0 muls r1, r6 @@ -23503,7 +23503,7 @@ _08029350: ldr r0, [r1] orrs r0, r4 str r0, [r1] - ldr r4, _08029428 @ =gUnknown_2023E0C + ldr r4, _08029428 @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -23569,7 +23569,7 @@ _08029350: adds r2, r0, r7 movs r4, 0 adds r6, r3, 0 - ldr r0, _08029430 @ =gUnknown_2023BC4 + ldr r0, _08029430 @ =gActiveBattler mov r8, r0 _080293E8: adds r0, r5, r4 @@ -23580,7 +23580,7 @@ _080293E8: cmp r4, 0x23 bls _080293E8 movs r4, 0 - ldr r7, _08029434 @ =gUnknown_8250C04 + ldr r7, _08029434 @ =gBattleMoves ldr r3, _08029438 @ =gUnknown_2023BF0 adds r5, r3, 0 adds r5, 0x18 @@ -23603,11 +23603,11 @@ _08029400: adds r0, r5 b _08029442 .align 2, 0 -_08029424: .4byte gUnknown_2023D6B -_08029428: .4byte gUnknown_2023E0C +_08029424: .4byte sBattler_AI +_08029428: .4byte gDisableStructs _0802942C: .4byte gUnknown_2022AB8 -_08029430: .4byte gUnknown_2023BC4 -_08029434: .4byte gUnknown_8250C04 +_08029430: .4byte gActiveBattler +_08029434: .4byte gBattleMoves _08029438: .4byte gUnknown_2023BF0 _0802943C: adds r0, r4, r2 @@ -23643,8 +23643,8 @@ _08029470: .4byte gUnknown_2023E82 thumb_func_start atk9C_setsubstitute atk9C_setsubstitute: @ 8029474 push {r4-r7,lr} - ldr r7, _080294A4 @ =gUnknown_2023BE4 - ldr r6, _080294A8 @ =gUnknown_2023D6B + ldr r7, _080294A4 @ =gBattleMons + ldr r6, _080294A8 @ =sBattler_AI ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -23659,7 +23659,7 @@ _0802948E: ldrh r0, [r3, 0x28] cmp r0, r2 bhi _080294B4 - ldr r1, _080294AC @ =gUnknown_2023D50 + ldr r1, _080294AC @ =gBattleMoveDamage movs r0, 0 str r0, [r1] ldr r1, _080294B0 @ =gUnknown_2023E82 @@ -23667,12 +23667,12 @@ _0802948E: strb r0, [r1, 0x5] b _08029508 .align 2, 0 -_080294A4: .4byte gUnknown_2023BE4 -_080294A8: .4byte gUnknown_2023D6B -_080294AC: .4byte gUnknown_2023D50 +_080294A4: .4byte gBattleMons +_080294A8: .4byte sBattler_AI +_080294AC: .4byte gBattleMoveDamage _080294B0: .4byte gUnknown_2023E82 _080294B4: - ldr r4, _08029518 @ =gUnknown_2023D50 + ldr r4, _08029518 @ =gBattleMoveDamage str r1, [r4] cmp r1, 0 bne _080294C0 @@ -23698,7 +23698,7 @@ _080294C0: ldr r2, _0802951C @ =0xffff1fff ands r0, r2 str r0, [r1] - ldr r2, _08029520 @ =gUnknown_2023E0C + ldr r2, _08029520 @ =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -23724,9 +23724,9 @@ _08029508: pop {r0} bx r0 .align 2, 0 -_08029518: .4byte gUnknown_2023D50 +_08029518: .4byte gBattleMoveDamage _0802951C: .4byte 0xffff1fff -_08029520: .4byte gUnknown_2023E0C +_08029520: .4byte gDisableStructs _08029524: .4byte gUnknown_2023E82 _08029528: .4byte gUnknown_2023DD0 _0802952C: .4byte gUnknown_2023D74 @@ -23783,8 +23783,8 @@ atk9D_mimicattackcopy: @ 8029578 ldr r1, _080295F4 @ =0x0000ffff adds r7, r1, 0 strh r7, [r0] - ldr r5, _080295F8 @ =gUnknown_2023D98 - ldr r6, _080295FC @ =gUnknown_2023D6C + ldr r5, _080295F8 @ =gLastUsedMove + ldr r6, _080295FC @ =gBattlerTarget ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -23793,8 +23793,8 @@ atk9D_mimicattackcopy: @ 8029578 lsls r0, 24 cmp r0, 0 bne _080295D2 - ldr r3, _08029600 @ =gUnknown_2023BE4 - ldr r2, _08029604 @ =gUnknown_2023D6B + ldr r3, _08029600 @ =gBattleMons + ldr r2, _08029604 @ =sBattler_AI ldrb r1, [r2] movs r0, 0x58 adds r4, r1, 0 @@ -23836,10 +23836,10 @@ _080295D2: .align 2, 0 _080295F0: .4byte gUnknown_2023D4C _080295F4: .4byte 0x0000ffff -_080295F8: .4byte gUnknown_2023D98 -_080295FC: .4byte gUnknown_2023D6C -_08029600: .4byte gUnknown_2023BE4 -_08029604: .4byte gUnknown_2023D6B +_080295F8: .4byte gLastUsedMove +_080295FC: .4byte gBattlerTarget +_08029600: .4byte gBattleMons +_08029604: .4byte sBattler_AI _08029608: .4byte gUnknown_2023D74 _0802960C: movs r2, 0 @@ -23886,14 +23886,14 @@ _08029646: mov r0, r12 adds r0, 0xC adds r1, r0 - ldr r2, _080296A4 @ =gUnknown_2023D98 - ldr r3, _080296A8 @ =gUnknown_2023D6C + ldr r2, _080296A4 @ =gLastUsedMove + ldr r3, _080296A8 @ =gBattlerTarget ldrb r0, [r3] lsls r0, 1 adds r0, r2 ldrh r0, [r0] strh r0, [r1] - ldr r4, _080296AC @ =gUnknown_8250C04 + ldr r4, _080296AC @ =gBattleMoves ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -23918,9 +23918,9 @@ _08029646: .align 2, 0 _0802969C: .4byte gUnknown_2023D74 _080296A0: .4byte gUnknown_2023D48 -_080296A4: .4byte gUnknown_2023D98 -_080296A8: .4byte gUnknown_2023D6C -_080296AC: .4byte gUnknown_8250C04 +_080296A4: .4byte gLastUsedMove +_080296A8: .4byte gBattlerTarget +_080296AC: .4byte gBattleMoves _080296B0: mov r4, r9 ldrb r0, [r4] @@ -23951,7 +23951,7 @@ _080296C4: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08029720 @ =gUnknown_2023E0C + ldr r1, _08029720 @ =gDisableStructs mov r2, r9 ldrb r0, [r2] lsls r2, r0, 3 @@ -23960,7 +23960,7 @@ _080296C4: adds r2, r1 ldrb r4, [r2, 0x18] lsrs r3, r4, 4 - ldr r1, _08029724 @ =gUnknown_825E45C + ldr r1, _08029724 @ =gBitTable ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -23978,8 +23978,8 @@ _080296C4: b _08029744 .align 2, 0 _0802971C: .4byte gUnknown_2022AB8 -_08029720: .4byte gUnknown_2023E0C -_08029724: .4byte gUnknown_825E45C +_08029720: .4byte gDisableStructs +_08029724: .4byte gBitTable _08029728: mov r0, r10 ldr r2, [r0] @@ -24010,7 +24010,7 @@ atk9E_metronome: @ 8029754 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _080297D4 @ =gUnknown_2023D4A + ldr r7, _080297D4 @ =gCurrentMove movs r6, 0xB1 lsls r6, 1 ldr r5, _080297D8 @ =gUnknown_82507E8 @@ -24030,7 +24030,7 @@ _0802977A: subs r0, 0x1 cmp r0, 0 bge _0802977A - ldr r4, _080297D4 @ =gUnknown_2023D4A + ldr r4, _080297D4 @ =gCurrentMove ldrh r2, [r4] ldr r3, _080297E4 @ =0x0000ffff subs r0, r5, 0x2 @@ -24051,7 +24051,7 @@ _08029794: ands r0, r1 str r0, [r2] ldr r3, _080297F0 @ =gUnknown_81D65A8 - ldr r2, _080297F4 @ =gUnknown_8250C04 + ldr r2, _080297F4 @ =gBattleMoves ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -24066,7 +24066,7 @@ _08029794: ldrh r0, [r4] movs r1, 0 bl GetMoveTarget - ldr r1, _080297F8 @ =gUnknown_2023D6C + ldr r1, _080297F8 @ =gBattlerTarget strb r0, [r1] pop {r3} mov r8, r3 @@ -24074,7 +24074,7 @@ _08029794: pop {r0} bx r0 .align 2, 0 -_080297D4: .4byte gUnknown_2023D4A +_080297D4: .4byte gCurrentMove _080297D8: .4byte gUnknown_82507E8 _080297DC: .4byte gUnknown_2023D74 _080297E0: .4byte 0x000001ff @@ -24082,15 +24082,15 @@ _080297E4: .4byte 0x0000ffff _080297E8: .4byte gUnknown_2023DD0 _080297EC: .4byte 0xfffffbff _080297F0: .4byte gUnknown_81D65A8 -_080297F4: .4byte gUnknown_8250C04 -_080297F8: .4byte gUnknown_2023D6C +_080297F4: .4byte gBattleMoves +_080297F8: .4byte gBattlerTarget thumb_func_end atk9E_metronome thumb_func_start atk9F_dmgtolevel atk9F_dmgtolevel: @ 80297FC - ldr r3, _0802981C @ =gUnknown_2023D50 - ldr r2, _08029820 @ =gUnknown_2023BE4 - ldr r0, _08029824 @ =gUnknown_2023D6B + ldr r3, _0802981C @ =gBattleMoveDamage + ldr r2, _08029820 @ =gBattleMons + ldr r0, _08029824 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -24104,9 +24104,9 @@ atk9F_dmgtolevel: @ 80297FC str r0, [r1] bx lr .align 2, 0 -_0802981C: .4byte gUnknown_2023D50 -_08029820: .4byte gUnknown_2023BE4 -_08029824: .4byte gUnknown_2023D6B +_0802981C: .4byte gBattleMoveDamage +_08029820: .4byte gBattleMons +_08029824: .4byte sBattler_AI _08029828: .4byte gUnknown_2023D74 thumb_func_end atk9F_dmgtolevel @@ -24123,9 +24123,9 @@ _08029830: lsls r0, r3, 2 adds r0, r3 lsls r3, r0, 1 - ldr r4, _08029870 @ =gUnknown_2023D50 - ldr r2, _08029874 @ =gUnknown_2023BE4 - ldr r0, _08029878 @ =gUnknown_2023D6B + ldr r4, _08029870 @ =gBattleMoveDamage + ldr r2, _08029874 @ =gBattleMons + ldr r0, _08029878 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -24146,16 +24146,16 @@ _08029830: pop {r0} bx r0 .align 2, 0 -_08029870: .4byte gUnknown_2023D50 -_08029874: .4byte gUnknown_2023BE4 -_08029878: .4byte gUnknown_2023D6B +_08029870: .4byte gBattleMoveDamage +_08029874: .4byte gBattleMons +_08029878: .4byte sBattler_AI _0802987C: .4byte gUnknown_2023D74 thumb_func_end atkA0_psywavedamageeffect thumb_func_start atkA1_counterdamagecalculator atkA1_counterdamagecalculator: @ 8029880 push {r4-r6,lr} - ldr r4, _080298F0 @ =gUnknown_2023D6B + ldr r4, _080298F0 @ =sBattler_AI ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -24177,7 +24177,7 @@ atkA1_counterdamagecalculator: @ 8029880 beq _08029934 cmp r6, r2 beq _08029934 - ldr r6, _080298F8 @ =gUnknown_2023BE4 + ldr r6, _080298F8 @ =gBattleMons adds r0, r1, r5 ldrb r0, [r0, 0xC] movs r4, 0x58 @@ -24186,7 +24186,7 @@ atkA1_counterdamagecalculator: @ 8029880 ldrh r0, [r0, 0x28] cmp r0, 0 beq _08029934 - ldr r1, _080298FC @ =gUnknown_2023D50 + ldr r1, _080298FC @ =gBattleMoveDamage lsls r0, r3, 1 str r0, [r1] ldr r1, _08029900 @ =gUnknown_2023DE4 @@ -24204,20 +24204,20 @@ atkA1_counterdamagecalculator: @ 8029880 ldrh r0, [r0, 0x28] cmp r0, 0 beq _08029908 - ldr r0, _08029904 @ =gUnknown_2023D6C + ldr r0, _08029904 @ =gBattlerTarget strb r1, [r0] b _08029918 .align 2, 0 -_080298F0: .4byte gUnknown_2023D6B +_080298F0: .4byte sBattler_AI _080298F4: .4byte gUnknown_2023E8C -_080298F8: .4byte gUnknown_2023BE4 -_080298FC: .4byte gUnknown_2023D50 +_080298F8: .4byte gBattleMons +_080298FC: .4byte gBattleMoveDamage _08029900: .4byte gUnknown_2023DE4 -_08029904: .4byte gUnknown_2023D6C +_08029904: .4byte gBattlerTarget _08029908: - ldr r2, _08029924 @ =gUnknown_2023D6C + ldr r2, _08029924 @ =gBattlerTarget ldr r1, _08029928 @ =gUnknown_2023E8C - ldr r0, _0802992C @ =gUnknown_2023D6B + ldr r0, _0802992C @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -24230,13 +24230,13 @@ _08029918: str r0, [r1] b _08029964 .align 2, 0 -_08029924: .4byte gUnknown_2023D6C +_08029924: .4byte gBattlerTarget _08029928: .4byte gUnknown_2023E8C -_0802992C: .4byte gUnknown_2023D6B +_0802992C: .4byte sBattler_AI _08029930: .4byte gUnknown_2023D74 _08029934: ldr r2, _0802996C @ =gUnknown_2023ECC - ldr r0, _08029970 @ =gUnknown_2023D6B + ldr r0, _08029970 @ =sBattler_AI ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -24265,14 +24265,14 @@ _08029964: bx r0 .align 2, 0 _0802996C: .4byte gUnknown_2023ECC -_08029970: .4byte gUnknown_2023D6B +_08029970: .4byte sBattler_AI _08029974: .4byte gUnknown_2023D74 thumb_func_end atkA1_counterdamagecalculator thumb_func_start atkA2_mirrorcoatdamagecalculator atkA2_mirrorcoatdamagecalculator: @ 8029978 push {r4-r6,lr} - ldr r4, _080299E8 @ =gUnknown_2023D6B + ldr r4, _080299E8 @ =sBattler_AI ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -24295,7 +24295,7 @@ atkA2_mirrorcoatdamagecalculator: @ 8029978 beq _08029A2C cmp r6, r2 beq _08029A2C - ldr r6, _080299F0 @ =gUnknown_2023BE4 + ldr r6, _080299F0 @ =gBattleMons adds r0, r1, r5 ldrb r0, [r0, 0xD] movs r4, 0x58 @@ -24304,7 +24304,7 @@ atkA2_mirrorcoatdamagecalculator: @ 8029978 ldrh r0, [r0, 0x28] cmp r0, 0 beq _08029A2C - ldr r1, _080299F4 @ =gUnknown_2023D50 + ldr r1, _080299F4 @ =gBattleMoveDamage lsls r0, r3, 1 str r0, [r1] ldr r1, _080299F8 @ =gUnknown_2023DE4 @@ -24322,20 +24322,20 @@ atkA2_mirrorcoatdamagecalculator: @ 8029978 ldrh r0, [r0, 0x28] cmp r0, 0 beq _08029A00 - ldr r0, _080299FC @ =gUnknown_2023D6C + ldr r0, _080299FC @ =gBattlerTarget strb r1, [r0] b _08029A10 .align 2, 0 -_080299E8: .4byte gUnknown_2023D6B +_080299E8: .4byte sBattler_AI _080299EC: .4byte gUnknown_2023E8C -_080299F0: .4byte gUnknown_2023BE4 -_080299F4: .4byte gUnknown_2023D50 +_080299F0: .4byte gBattleMons +_080299F4: .4byte gBattleMoveDamage _080299F8: .4byte gUnknown_2023DE4 -_080299FC: .4byte gUnknown_2023D6C +_080299FC: .4byte gBattlerTarget _08029A00: - ldr r2, _08029A1C @ =gUnknown_2023D6C + ldr r2, _08029A1C @ =gBattlerTarget ldr r1, _08029A20 @ =gUnknown_2023E8C - ldr r0, _08029A24 @ =gUnknown_2023D6B + ldr r0, _08029A24 @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -24348,13 +24348,13 @@ _08029A10: str r0, [r1] b _08029A5C .align 2, 0 -_08029A1C: .4byte gUnknown_2023D6C +_08029A1C: .4byte gBattlerTarget _08029A20: .4byte gUnknown_2023E8C -_08029A24: .4byte gUnknown_2023D6B +_08029A24: .4byte sBattler_AI _08029A28: .4byte gUnknown_2023D74 _08029A2C: ldr r2, _08029A64 @ =gUnknown_2023ECC - ldr r0, _08029A68 @ =gUnknown_2023D6B + ldr r0, _08029A68 @ =sBattler_AI ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -24383,7 +24383,7 @@ _08029A5C: bx r0 .align 2, 0 _08029A64: .4byte gUnknown_2023ECC -_08029A68: .4byte gUnknown_2023D6B +_08029A68: .4byte sBattler_AI _08029A6C: .4byte gUnknown_2023D74 thumb_func_end atkA2_mirrorcoatdamagecalculator @@ -24394,21 +24394,21 @@ atkA3_disablelastusedattack: @ 8029A70 mov r6, r8 push {r6,r7} movs r4, 0 - ldr r2, _08029B70 @ =gUnknown_2023BE4 - ldr r3, _08029B74 @ =gUnknown_2023D6C + ldr r2, _08029B70 @ =gBattleMons + ldr r3, _08029B74 @ =gBattlerTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 adds r7, r2, 0 adds r7, 0xC adds r0, r7 - ldr r5, _08029B78 @ =gUnknown_2023D98 + ldr r5, _08029B78 @ =gLastUsedMove lsls r1, 1 adds r1, r5 ldrh r0, [r0] mov r9, r2 adds r6, r3, 0 - ldr r2, _08029B7C @ =gUnknown_2023E0C + ldr r2, _08029B7C @ =gDisableStructs mov r8, r2 ldrh r1, [r1] cmp r0, r1 @@ -24519,10 +24519,10 @@ _08029AC4: str r0, [r1] b _08029BA2 .align 2, 0 -_08029B70: .4byte gUnknown_2023BE4 -_08029B74: .4byte gUnknown_2023D6C -_08029B78: .4byte gUnknown_2023D98 -_08029B7C: .4byte gUnknown_2023E0C +_08029B70: .4byte gBattleMons +_08029B74: .4byte gBattlerTarget +_08029B78: .4byte gLastUsedMove +_08029B7C: .4byte gDisableStructs _08029B80: .4byte gUnknown_2022AB8 _08029B84: .4byte gUnknown_2023D74 _08029B88: @@ -24558,21 +24558,21 @@ atkA4_trysetencore: @ 8029BB4 mov r5, r8 push {r5-r7} movs r5, 0 - ldr r3, _08029CA8 @ =gUnknown_2023BE4 - ldr r4, _08029CAC @ =gUnknown_2023D6C + ldr r3, _08029CA8 @ =gBattleMons + ldr r4, _08029CAC @ =gBattlerTarget ldrb r1, [r4] movs r0, 0x58 muls r0, r1 adds r6, r3, 0 adds r6, 0xC adds r0, r6 - ldr r2, _08029CB0 @ =gUnknown_2023D98 + ldr r2, _08029CB0 @ =gLastUsedMove lsls r1, 1 adds r1, r2 ldrh r0, [r0] mov r10, r3 mov r8, r2 - ldr r2, _08029CB4 @ =gUnknown_2023E0C + ldr r2, _08029CB4 @ =gDisableStructs mov r9, r2 ldrh r1, [r1] cmp r0, r1 @@ -24678,10 +24678,10 @@ _08029C24: str r0, [r1] b _08029CD6 .align 2, 0 -_08029CA8: .4byte gUnknown_2023BE4 -_08029CAC: .4byte gUnknown_2023D6C -_08029CB0: .4byte gUnknown_2023D98 -_08029CB4: .4byte gUnknown_2023E0C +_08029CA8: .4byte gBattleMons +_08029CAC: .4byte gBattlerTarget +_08029CB0: .4byte gLastUsedMove +_08029CB4: .4byte gDisableStructs _08029CB8: .4byte gUnknown_2023D74 _08029CBC: ldr r3, _08029CE4 @ =gUnknown_2023D74 @@ -24712,8 +24712,8 @@ _08029CE4: .4byte gUnknown_2023D74 thumb_func_start atkA5_painsplitdmgcalc atkA5_painsplitdmgcalc: @ 8029CE8 push {r4-r7,lr} - ldr r6, _08029D68 @ =gUnknown_2023BE4 - ldr r0, _08029D6C @ =gUnknown_2023D6C + ldr r6, _08029D68 @ =gBattleMons + ldr r0, _08029D6C @ =gBattlerTarget mov r12, r0 ldrb r0, [r0] movs r7, 0x58 @@ -24728,7 +24728,7 @@ atkA5_painsplitdmgcalc: @ 8029CE8 ands r0, r1 cmp r0, 0 bne _08029D88 - ldr r5, _08029D70 @ =gUnknown_2023D6B + ldr r5, _08029D70 @ =sBattler_AI ldrb r0, [r5] muls r0, r7 adds r0, r6 @@ -24737,10 +24737,10 @@ atkA5_painsplitdmgcalc: @ 8029CE8 ldrh r1, [r0, 0x28] adds r3, r1 asrs r3, 1 - ldr r4, _08029D74 @ =gUnknown_2023D50 + ldr r4, _08029D74 @ =gBattleMoveDamage subs r1, r3 str r1, [r4] - ldr r2, _08029D78 @ =gUnknown_2023FC4 + ldr r2, _08029D78 @ =gBattleScripting strb r1, [r2] movs r0, 0xFF lsls r0, 8 @@ -24776,11 +24776,11 @@ atkA5_painsplitdmgcalc: @ 8029CE8 str r0, [r1] b _08029DA2 .align 2, 0 -_08029D68: .4byte gUnknown_2023BE4 -_08029D6C: .4byte gUnknown_2023D6C -_08029D70: .4byte gUnknown_2023D6B -_08029D74: .4byte gUnknown_2023D50 -_08029D78: .4byte gUnknown_2023FC4 +_08029D68: .4byte gBattleMons +_08029D6C: .4byte gBattlerTarget +_08029D70: .4byte sBattler_AI +_08029D74: .4byte gBattleMoveDamage +_08029D78: .4byte gBattleScripting _08029D7C: .4byte gUnknown_2023ECC _08029D80: .4byte 0x0000ffff _08029D84: .4byte gUnknown_2023D74 @@ -24814,7 +24814,7 @@ atkA6_settypetorandomresistance: @ 8029DAC mov r5, r8 push {r5-r7} ldr r1, _08029E14 @ =gUnknown_2023DA0 - ldr r4, _08029E18 @ =gUnknown_2023D6B + ldr r4, _08029E18 @ =sBattler_AI ldrb r0, [r4] lsls r0, 1 adds r2, r0, r1 @@ -24829,7 +24829,7 @@ atkA6_settypetorandomresistance: @ 8029DAC lsls r0, 24 cmp r0, 0 beq _08029E94 - ldr r1, _08029E20 @ =gUnknown_2023BE4 + ldr r1, _08029E20 @ =gBattleMons ldr r2, _08029E24 @ =gUnknown_2023DC0 ldrb r0, [r4] adds r0, r2 @@ -24861,9 +24861,9 @@ _08029DF6: b _08029F80 .align 2, 0 _08029E14: .4byte gUnknown_2023DA0 -_08029E18: .4byte gUnknown_2023D6B +_08029E18: .4byte sBattler_AI _08029E1C: .4byte 0x0000ffff -_08029E20: .4byte gUnknown_2023BE4 +_08029E20: .4byte gBattleMons _08029E24: .4byte gUnknown_2023DC0 _08029E28: .4byte gUnknown_2023D74 _08029E2C: @@ -24897,7 +24897,7 @@ _08029E58: mov r4, r10 ldrb r0, [r4] muls r0, r6 - ldr r7, _08029E8C @ =gUnknown_2023BE4 + ldr r7, _08029E8C @ =gBattleMons adds r0, r7 adds r0, 0x22 strb r2, [r0] @@ -24916,7 +24916,7 @@ _08029E82: str r0, [r1] b _08029F80 .align 2, 0 -_08029E8C: .4byte gUnknown_2023BE4 +_08029E8C: .4byte gBattleMons _08029E90: .4byte gUnknown_2022AB8 _08029E94: movs r4, 0 @@ -24934,7 +24934,7 @@ _08029E9C: ldr r6, _08029F90 @ =gUnknown_824F050 adds r3, r4, r6 ldr r1, _08029F94 @ =gUnknown_2023DA8 - ldr r2, _08029F98 @ =gUnknown_2023D6B + ldr r2, _08029F98 @ =sBattler_AI ldrb r5, [r2] lsls r0, r5, 1 adds r0, r1 @@ -24948,7 +24948,7 @@ _08029E9C: ldrb r0, [r0] cmp r0, 0x5 bhi _08029EF8 - ldr r7, _08029F9C @ =gUnknown_2023BE4 + ldr r7, _08029F9C @ =gBattleMons movs r2, 0x58 adds r0, r5, 0 muls r0, r2 @@ -25005,7 +25005,7 @@ _08029F1E: movs r6, 0x58 adds r0, r2, 0 muls r0, r6 - ldr r1, _08029F9C @ =gUnknown_2023BE4 + ldr r1, _08029F9C @ =gBattleMons adds r2, r0, r1 adds r4, r2, 0 adds r4, 0x21 @@ -25052,8 +25052,8 @@ _08029F80: .align 2, 0 _08029F90: .4byte gUnknown_824F050 _08029F94: .4byte gUnknown_2023DA8 -_08029F98: .4byte gUnknown_2023D6B -_08029F9C: .4byte gUnknown_2023BE4 +_08029F98: .4byte sBattler_AI +_08029F9C: .4byte gBattleMons _08029FA0: .4byte 0x000003e7 _08029FA4: .4byte gUnknown_2023D74 _08029FA8: .4byte 0x0000014f @@ -25062,8 +25062,8 @@ _08029FA8: .4byte 0x0000014f thumb_func_start atkA7_setalwayshitflag atkA7_setalwayshitflag: @ 8029FAC push {r4,lr} - ldr r4, _08029FF0 @ =gUnknown_2023DFC - ldr r3, _08029FF4 @ =gUnknown_2023D6C + ldr r4, _08029FF0 @ =gStatuses3 + ldr r3, _08029FF4 @ =gBattlerTarget ldrb r1, [r3] lsls r1, 2 adds r1, r4 @@ -25079,13 +25079,13 @@ atkA7_setalwayshitflag: @ 8029FAC movs r2, 0x10 orrs r0, r2 str r0, [r1] - ldr r2, _08029FF8 @ =gUnknown_2023E0C + ldr r2, _08029FF8 @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _08029FFC @ =gUnknown_2023D6B + ldr r1, _08029FFC @ =sBattler_AI ldrb r1, [r1] strb r1, [r0, 0x15] ldr r1, _0802A000 @ =gUnknown_2023D74 @@ -25096,10 +25096,10 @@ atkA7_setalwayshitflag: @ 8029FAC pop {r0} bx r0 .align 2, 0 -_08029FF0: .4byte gUnknown_2023DFC -_08029FF4: .4byte gUnknown_2023D6C -_08029FF8: .4byte gUnknown_2023E0C -_08029FFC: .4byte gUnknown_2023D6B +_08029FF0: .4byte gStatuses3 +_08029FF4: .4byte gBattlerTarget +_08029FF8: .4byte gDisableStructs +_08029FFC: .4byte sBattler_AI _0802A000: .4byte gUnknown_2023D74 thumb_func_end atkA7_setalwayshitflag @@ -25115,8 +25115,8 @@ atkA8_copymovepermanently: @ 802A004 ldr r1, _0802A168 @ =0x0000ffff adds r5, r1, 0 strh r5, [r0] - ldr r3, _0802A16C @ =gUnknown_2023BE4 - ldr r2, _0802A170 @ =gUnknown_2023D6B + ldr r3, _0802A16C @ =gBattleMons + ldr r2, _0802A170 @ =sBattler_AI ldrb r1, [r2] movs r0, 0x58 adds r4, r1, 0 @@ -25135,7 +25135,7 @@ atkA8_copymovepermanently: @ 802A004 b _0802A190 _0802A03C: ldr r0, _0802A174 @ =gUnknown_2023D90 - ldr r2, _0802A178 @ =gUnknown_2023D6C + ldr r2, _0802A178 @ =gBattlerTarget ldrb r1, [r2] lsls r1, 1 adds r1, r0 @@ -25210,7 +25210,7 @@ _0802A090: mov r5, r12 adds r5, 0x24 adds r2, r5 - ldr r4, _0802A180 @ =gUnknown_8250C04 + ldr r4, _0802A180 @ =gBattleMoves mov r1, r8 ldrb r0, [r1] lsls r0, 1 @@ -25222,7 +25222,7 @@ _0802A090: adds r0, r4 ldrb r0, [r0, 0x4] strb r0, [r2] - ldr r1, _0802A184 @ =gUnknown_2023BC4 + ldr r1, _0802A184 @ =gActiveBattler mov r2, r10 ldrb r0, [r2] strb r0, [r1] @@ -25261,7 +25261,7 @@ _0802A0F2: movs r2, 0 movs r3, 0x10 bl EmitSetMonData - ldr r0, _0802A184 @ =gUnknown_2023BC4 + ldr r0, _0802A184 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution ldr r1, _0802A188 @ =gUnknown_2022AB8 @@ -25270,7 +25270,7 @@ _0802A0F2: movs r0, 0x2 strb r0, [r1, 0x1] ldr r3, _0802A174 @ =gUnknown_2023D90 - ldr r2, _0802A178 @ =gUnknown_2023D6C + ldr r2, _0802A178 @ =gBattlerTarget ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -25292,13 +25292,13 @@ _0802A0F2: .align 2, 0 _0802A164: .4byte gUnknown_2023D4C _0802A168: .4byte 0x0000ffff -_0802A16C: .4byte gUnknown_2023BE4 -_0802A170: .4byte gUnknown_2023D6B +_0802A16C: .4byte gBattleMons +_0802A170: .4byte sBattler_AI _0802A174: .4byte gUnknown_2023D90 -_0802A178: .4byte gUnknown_2023D6C +_0802A178: .4byte gBattlerTarget _0802A17C: .4byte gUnknown_2023D48 -_0802A180: .4byte gUnknown_8250C04 -_0802A184: .4byte gUnknown_2023BC4 +_0802A180: .4byte gBattleMoves +_0802A184: .4byte gActiveBattler _0802A188: .4byte gUnknown_2022AB8 _0802A18C: .4byte gUnknown_2023D74 _0802A190: @@ -25333,7 +25333,7 @@ IsTwoTurnsMove: @ 802A1C0 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _0802A1F0 @ =gUnknown_8250C04 + ldr r2, _0802A1F0 @ =gBattleMoves lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -25355,7 +25355,7 @@ _0802A1EA: movs r0, 0x1 b _0802A1F6 .align 2, 0 -_0802A1F0: .4byte gUnknown_8250C04 +_0802A1F0: .4byte gBattleMoves _0802A1F4: movs r0, 0 _0802A1F6: @@ -25395,7 +25395,7 @@ AttacksThisTurn: @ 802A224 push {lr} lsls r1, 16 lsrs r2, r1, 16 - ldr r1, _0802A27C @ =gUnknown_8250C04 + ldr r1, _0802A27C @ =gBattleMoves lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -25404,7 +25404,7 @@ AttacksThisTurn: @ 802A224 adds r3, r1, 0 cmp r0, 0x97 bne _0802A248 - ldr r0, _0802A280 @ =gUnknown_2023F1C + ldr r0, _0802A280 @ =gBattleWeather ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -25439,8 +25439,8 @@ _0802A26A: movs r0, 0x1 b _0802A28A .align 2, 0 -_0802A27C: .4byte gUnknown_8250C04 -_0802A280: .4byte gUnknown_2023F1C +_0802A27C: .4byte gBattleMoves +_0802A280: .4byte gBattleWeather _0802A284: .4byte gUnknown_2023DD0 _0802A288: movs r0, 0x2 @@ -25458,7 +25458,7 @@ atkA9_trychoosesleeptalkmove: @ 802A290 push {r5-r7} movs r6, 0 movs r5, 0 - ldr r0, _0802A320 @ =gUnknown_2023D6B + ldr r0, _0802A320 @ =sBattler_AI mov r9, r0 movs r1, 0x58 mov r8, r1 @@ -25498,7 +25498,7 @@ _0802A2AE: cmp r0, 0 beq _0802A2FC _0802A2EE: - ldr r1, _0802A328 @ =gUnknown_825E45C + ldr r1, _0802A328 @ =gBitTable lsls r0, r5, 2 adds r0, r1 ldr r0, [r0] @@ -25509,11 +25509,11 @@ _0802A2FC: adds r5, 0x1 cmp r5, 0x3 ble _0802A2AE - ldr r0, _0802A320 @ =gUnknown_2023D6B + ldr r0, _0802A320 @ =sBattler_AI ldrb r0, [r0] adds r1, r6, 0 movs r2, 0xFD - bl sub_801779C + bl CheckMoveLimitations lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xF @@ -25524,13 +25524,13 @@ _0802A2FC: str r0, [r1] b _0802A394 .align 2, 0 -_0802A320: .4byte gUnknown_2023D6B +_0802A320: .4byte sBattler_AI _0802A324: .4byte gUnknown_2023BF0 -_0802A328: .4byte gUnknown_825E45C +_0802A328: .4byte gBitTable _0802A32C: .4byte gUnknown_2023D74 _0802A330: movs r7, 0x3 - ldr r4, _0802A3A4 @ =gUnknown_825E45C + ldr r4, _0802A3A4 @ =gBitTable _0802A334: bl Random adds r5, r7, 0 @@ -25542,9 +25542,9 @@ _0802A334: cmp r0, 0 bne _0802A334 ldr r4, _0802A3A8 @ =gUnknown_2023D4E - ldr r2, _0802A3AC @ =gUnknown_2023BE4 + ldr r2, _0802A3AC @ =gBattleMons lsls r1, r5, 1 - ldr r0, _0802A3B0 @ =gUnknown_2023D6B + ldr r0, _0802A3B0 @ =sBattler_AI ldrb r3, [r0] movs r0, 0x58 muls r0, r3 @@ -25563,7 +25563,7 @@ _0802A334: ldrh r0, [r4] movs r1, 0 bl GetMoveTarget - ldr r1, _0802A3C0 @ =gUnknown_2023D6C + ldr r1, _0802A3C0 @ =gBattlerTarget strb r0, [r1] ldr r3, _0802A3C4 @ =gUnknown_2023D74 ldr r2, [r3] @@ -25587,21 +25587,21 @@ _0802A394: pop {r0} bx r0 .align 2, 0 -_0802A3A4: .4byte gUnknown_825E45C +_0802A3A4: .4byte gBitTable _0802A3A8: .4byte gUnknown_2023D4E -_0802A3AC: .4byte gUnknown_2023BE4 -_0802A3B0: .4byte gUnknown_2023D6B +_0802A3AC: .4byte gBattleMons +_0802A3B0: .4byte sBattler_AI _0802A3B4: .4byte gUnknown_2023D48 _0802A3B8: .4byte gUnknown_2023DD0 _0802A3BC: .4byte 0xfffffbff -_0802A3C0: .4byte gUnknown_2023D6C +_0802A3C0: .4byte gBattlerTarget _0802A3C4: .4byte gUnknown_2023D74 thumb_func_end atkA9_trychoosesleeptalkmove thumb_func_start atkAA_setdestinybond atkAA_setdestinybond: @ 802A3C8 - ldr r1, _0802A3EC @ =gUnknown_2023BE4 - ldr r0, _0802A3F0 @ =gUnknown_2023D6B + ldr r1, _0802A3EC @ =gBattleMons + ldr r0, _0802A3F0 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -25618,25 +25618,25 @@ atkAA_setdestinybond: @ 802A3C8 str r0, [r1] bx lr .align 2, 0 -_0802A3EC: .4byte gUnknown_2023BE4 -_0802A3F0: .4byte gUnknown_2023D6B +_0802A3EC: .4byte gBattleMons +_0802A3F0: .4byte sBattler_AI _0802A3F4: .4byte gUnknown_2023D74 thumb_func_end atkAA_setdestinybond thumb_func_start TrySetDestinyBondToHappen TrySetDestinyBondToHappen: @ 802A3F8 push {r4,r5,lr} - ldr r0, _0802A448 @ =gUnknown_2023D6B + ldr r0, _0802A448 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _0802A44C @ =gUnknown_2023D6C + ldr r4, _0802A44C @ =gBattlerTarget ldrb r0, [r4] bl GetBankSide lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _0802A450 @ =gUnknown_2023BE4 + ldr r1, _0802A450 @ =gBattleMons ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -25665,9 +25665,9 @@ _0802A442: pop {r0} bx r0 .align 2, 0 -_0802A448: .4byte gUnknown_2023D6B -_0802A44C: .4byte gUnknown_2023D6C -_0802A450: .4byte gUnknown_2023BE4 +_0802A448: .4byte sBattler_AI +_0802A44C: .4byte gBattlerTarget +_0802A450: .4byte gBattleMons _0802A454: .4byte gUnknown_2023DD0 thumb_func_end TrySetDestinyBondToHappen @@ -25688,8 +25688,8 @@ _0802A46C: .4byte gUnknown_2023D74 thumb_func_start atkAC_remaininghptopower atkAC_remaininghptopower: @ 802A470 push {lr} - ldr r2, _0802A4C4 @ =gUnknown_2023BE4 - ldr r0, _0802A4C8 @ =gUnknown_2023D6B + ldr r2, _0802A4C4 @ =gBattleMons + ldr r0, _0802A4C8 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -25717,7 +25717,7 @@ _0802A49C: cmp r1, r0 bgt _0802A49C _0802A4AA: - ldr r2, _0802A4D0 @ =gUnknown_2023F50 + ldr r2, _0802A4D0 @ =gDynamicBasePower ldr r1, _0802A4CC @ =gUnknown_8250810 adds r0, r3, 0x1 adds r0, r1 @@ -25730,10 +25730,10 @@ _0802A4AA: pop {r0} bx r0 .align 2, 0 -_0802A4C4: .4byte gUnknown_2023BE4 -_0802A4C8: .4byte gUnknown_2023D6B +_0802A4C4: .4byte gBattleMons +_0802A4C8: .4byte sBattler_AI _0802A4CC: .4byte gUnknown_8250810 -_0802A4D0: .4byte gUnknown_2023F50 +_0802A4D0: .4byte gDynamicBasePower _0802A4D4: .4byte gUnknown_2023D74 thumb_func_end atkAC_remaininghptopower @@ -25745,8 +25745,8 @@ atkAD_tryspiteppreduce: @ 802A4D8 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r4, _0802A658 @ =gUnknown_2023D98 - ldr r1, _0802A65C @ =gUnknown_2023D6C + ldr r4, _0802A658 @ =gLastUsedMove + ldr r1, _0802A65C @ =gBattlerTarget ldrb r3, [r1] lsls r0, r3, 1 adds r0, r4 @@ -25762,7 +25762,7 @@ _0802A4F8: b _0802A680 _0802A500: movs r7, 0 - ldr r0, _0802A664 @ =gUnknown_2023BE4 + ldr r0, _0802A664 @ =gBattleMons movs r1, 0x58 muls r1, r3 adds r3, r0, 0 @@ -25803,7 +25803,7 @@ _0802A53E: muls r3, r0 adds r0, r3, 0 adds r0, r7, r0 - ldr r1, _0802A664 @ =gUnknown_2023BE4 + ldr r1, _0802A664 @ =gBattleMons adds r1, 0x24 mov r10, r1 add r0, r10 @@ -25832,7 +25832,7 @@ _0802A57C: strb r5, [r1] movs r0, 0x2 strb r0, [r1, 0x1] - ldr r2, _0802A658 @ =gUnknown_2023D98 + ldr r2, _0802A658 @ =gLastUsedMove mov r3, r8 ldrb r0, [r3] lsls r0, 1 @@ -25870,11 +25870,11 @@ _0802A57C: ldrb r0, [r1] subs r0, r6 strb r0, [r1] - ldr r4, _0802A670 @ =gUnknown_2023BC4 + ldr r4, _0802A670 @ =gActiveBattler mov r3, r8 ldrb r0, [r3] strb r0, [r4] - ldr r1, _0802A674 @ =gUnknown_2023E0C + ldr r1, _0802A674 @ =gDisableStructs ldrb r3, [r4] lsls r0, r3, 3 subs r0, r3 @@ -25882,7 +25882,7 @@ _0802A57C: adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0802A678 @ =gUnknown_825E45C + ldr r2, _0802A678 @ =gBitTable lsls r0, r7, 2 adds r0, r2 ldr r0, [r0] @@ -25891,7 +25891,7 @@ _0802A57C: bne _0802A630 mov r2, r9 muls r2, r3 - ldr r0, _0802A664 @ =gUnknown_2023BE4 + ldr r0, _0802A664 @ =gBattleMons adds r0, 0x50 adds r0, r2, r0 ldr r0, [r0] @@ -25919,8 +25919,8 @@ _0802A630: ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r1, _0802A664 @ =gUnknown_2023BE4 - ldr r0, _0802A65C @ =gUnknown_2023D6C + ldr r1, _0802A664 @ =gBattleMons + ldr r0, _0802A65C @ =gBattlerTarget ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -25934,15 +25934,15 @@ _0802A630: bl CancelMultiTurnMoves b _0802A69A .align 2, 0 -_0802A658: .4byte gUnknown_2023D98 -_0802A65C: .4byte gUnknown_2023D6C +_0802A658: .4byte gLastUsedMove +_0802A65C: .4byte gBattlerTarget _0802A660: .4byte 0x0000ffff -_0802A664: .4byte gUnknown_2023BE4 +_0802A664: .4byte gBattleMons _0802A668: .4byte gUnknown_2022AB8 _0802A66C: .4byte gUnknown_2022AC8 -_0802A670: .4byte gUnknown_2023BC4 -_0802A674: .4byte gUnknown_2023E0C -_0802A678: .4byte gUnknown_825E45C +_0802A670: .4byte gActiveBattler +_0802A674: .4byte gDisableStructs +_0802A678: .4byte gBitTable _0802A67C: .4byte gUnknown_2023D74 _0802A680: ldr r3, _0802A6AC @ =gUnknown_2023D74 @@ -25982,7 +25982,7 @@ atkAE_healpartystatus: @ 802A6B0 movs r4, 0 str r4, [sp, 0x4] mov r8, r4 - ldr r0, _0802A720 @ =gUnknown_2023D4A + ldr r0, _0802A720 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xD7 beq _0802A6CC @@ -25991,18 +25991,18 @@ _0802A6CC: ldr r6, _0802A724 @ =gUnknown_2023E82 mov r0, r8 strb r0, [r6, 0x5] - ldr r5, _0802A728 @ =gUnknown_2023D6B + ldr r5, _0802A728 @ =sBattler_AI ldrb r0, [r5] bl GetBankSide lsls r0, 24 - ldr r1, _0802A72C @ =gUnknown_202402C + ldr r1, _0802A72C @ =gEnemyParty mov r10, r1 cmp r0, 0 bne _0802A6E8 - ldr r2, _0802A730 @ =gUnknown_2024284 + ldr r2, _0802A730 @ =gPlayerParty mov r10, r2 _0802A6E8: - ldr r4, _0802A734 @ =gUnknown_2023BE4 + ldr r4, _0802A734 @ =gBattleMons ldrb r3, [r5] movs r7, 0x58 adds r2, r3, 0 @@ -26030,12 +26030,12 @@ _0802A6E8: str r0, [r2] b _0802A74C .align 2, 0 -_0802A720: .4byte gUnknown_2023D4A +_0802A720: .4byte gCurrentMove _0802A724: .4byte gUnknown_2023E82 -_0802A728: .4byte gUnknown_2023D6B -_0802A72C: .4byte gUnknown_202402C -_0802A730: .4byte gUnknown_2024284 -_0802A734: .4byte gUnknown_2023BE4 +_0802A728: .4byte sBattler_AI +_0802A72C: .4byte gEnemyParty +_0802A730: .4byte gPlayerParty +_0802A734: .4byte gBattleMons _0802A738: .4byte 0xf7ffffff _0802A73C: ldrb r1, [r1] @@ -26046,8 +26046,8 @@ _0802A73C: orrs r0, r1 strb r0, [r6, 0x5] _0802A74C: - ldr r7, _0802A7C0 @ =gUnknown_2023BC4 - ldr r0, _0802A7C4 @ =gUnknown_2023D6B + ldr r7, _0802A7C0 @ =gActiveBattler + ldr r0, _0802A7C4 @ =sBattler_AI ldrb r0, [r0] bl GetBankIdentity movs r2, 0x2 @@ -26057,18 +26057,18 @@ _0802A74C: lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r1, _0802A7C8 @ =gUnknown_2023FC4 + ldr r1, _0802A7C8 @ =gBattleScripting strb r0, [r1, 0x17] strb r0, [r7] - ldr r0, _0802A7CC @ =gUnknown_2022B4C + ldr r0, _0802A7CC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0802A7F2 - ldr r0, _0802A7D0 @ =gUnknown_2023D70 + ldr r0, _0802A7D0 @ =gAbsentBattlerFlags ldrb r2, [r0] - ldr r1, _0802A7D4 @ =gUnknown_825E45C + ldr r1, _0802A7D4 @ =gBitTable ldrb r3, [r7] lsls r0, r3, 2 adds r0, r1 @@ -26076,7 +26076,7 @@ _0802A74C: ands r2, r0 cmp r2, 0 bne _0802A7F2 - ldr r5, _0802A7D8 @ =gUnknown_2023BE4 + ldr r5, _0802A7D8 @ =gBattleMons movs r6, 0x58 adds r4, r3, 0 muls r4, r6 @@ -26102,13 +26102,13 @@ _0802A74C: str r0, [r2] b _0802A7F2 .align 2, 0 -_0802A7C0: .4byte gUnknown_2023BC4 -_0802A7C4: .4byte gUnknown_2023D6B -_0802A7C8: .4byte gUnknown_2023FC4 -_0802A7CC: .4byte gUnknown_2022B4C -_0802A7D0: .4byte gUnknown_2023D70 -_0802A7D4: .4byte gUnknown_825E45C -_0802A7D8: .4byte gUnknown_2023BE4 +_0802A7C0: .4byte gActiveBattler +_0802A7C4: .4byte sBattler_AI +_0802A7C8: .4byte gBattleScripting +_0802A7CC: .4byte gBattleTypeFlags +_0802A7D0: .4byte gAbsentBattlerFlags +_0802A7D4: .4byte gBitTable +_0802A7D8: .4byte gBattleMons _0802A7DC: .4byte 0xf7ffffff _0802A7E0: ldrb r1, [r1] @@ -26121,7 +26121,7 @@ _0802A7E0: strb r0, [r1, 0x5] _0802A7F2: movs r6, 0 - ldr r7, _0802A83C @ =gUnknown_2023BE4 + ldr r7, _0802A83C @ =gBattleMons _0802A7F6: movs r0, 0x64 adds r4, r6, 0 @@ -26143,8 +26143,8 @@ _0802A7F6: lsls r0, 1 cmp r5, r0 beq _0802A8AE - ldr r2, _0802A840 @ =gUnknown_2023BCE - ldr r0, _0802A844 @ =gUnknown_2023D6B + ldr r2, _0802A840 @ =gBattlerPartyIndexes + ldr r0, _0802A844 @ =sBattler_AI ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -26156,26 +26156,26 @@ _0802A7F6: b _0802A878 .align 2, 0 _0802A838: .4byte gUnknown_2023E82 -_0802A83C: .4byte gUnknown_2023BE4 -_0802A840: .4byte gUnknown_2023BCE -_0802A844: .4byte gUnknown_2023D6B +_0802A83C: .4byte gBattleMons +_0802A840: .4byte gBattlerPartyIndexes +_0802A844: .4byte sBattler_AI _0802A848: - ldr r0, _0802A880 @ =gUnknown_2022B4C + ldr r0, _0802A880 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0802A890 - ldr r0, _0802A884 @ =gUnknown_2023BC4 + ldr r0, _0802A884 @ =gActiveBattler ldrb r3, [r0] lsls r0, r3, 1 adds r0, r2 ldrh r0, [r0] cmp r0, r6 bne _0802A890 - ldr r0, _0802A888 @ =gUnknown_2023D70 + ldr r0, _0802A888 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0802A88C @ =gUnknown_825E45C + ldr r2, _0802A88C @ =gBitTable lsls r0, r3, 2 adds r0, r2 ldr r0, [r0] @@ -26190,10 +26190,10 @@ _0802A878: ldrb r0, [r0] b _0802A89C .align 2, 0 -_0802A880: .4byte gUnknown_2022B4C -_0802A884: .4byte gUnknown_2023BC4 -_0802A888: .4byte gUnknown_2023D70 -_0802A88C: .4byte gUnknown_825E45C +_0802A880: .4byte gBattleTypeFlags +_0802A884: .4byte gActiveBattler +_0802A888: .4byte gAbsentBattlerFlags +_0802A88C: .4byte gBitTable _0802A890: adds r0, r5, 0 adds r1, r4, 0 @@ -26221,8 +26221,8 @@ _0802A8B6: strb r0, [r1, 0x5] movs r2, 0x3F mov r8, r2 - ldr r3, _0802A974 @ =gUnknown_2023BE4 - ldr r2, _0802A978 @ =gUnknown_2023D6B + ldr r3, _0802A974 @ =gBattleMons + ldr r2, _0802A978 @ =sBattler_AI ldrb r0, [r2] movs r5, 0x58 muls r0, r5 @@ -26248,17 +26248,17 @@ _0802A8B6: lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r4, _0802A980 @ =gUnknown_2023BC4 + ldr r4, _0802A980 @ =gActiveBattler strb r0, [r4] - ldr r0, _0802A984 @ =gUnknown_2022B4C + ldr r0, _0802A984 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0802A934 - ldr r0, _0802A988 @ =gUnknown_2023D70 + ldr r0, _0802A988 @ =gAbsentBattlerFlags ldrb r2, [r0] - ldr r1, _0802A98C @ =gUnknown_825E45C + ldr r1, _0802A98C @ =gBitTable ldrb r3, [r4] lsls r0, r3, 2 adds r0, r1 @@ -26281,8 +26281,8 @@ _0802A934: mov r2, r8 cmp r2, 0 beq _0802A956 - ldr r4, _0802A980 @ =gUnknown_2023BC4 - ldr r0, _0802A978 @ =gUnknown_2023D6B + ldr r4, _0802A980 @ =gActiveBattler + ldr r0, _0802A978 @ =sBattler_AI ldrb r0, [r0] strb r0, [r4] add r0, sp, 0x4 @@ -26308,21 +26308,21 @@ _0802A956: bx r0 .align 2, 0 _0802A970: .4byte gUnknown_2023E82 -_0802A974: .4byte gUnknown_2023BE4 -_0802A978: .4byte gUnknown_2023D6B +_0802A974: .4byte gBattleMons +_0802A978: .4byte sBattler_AI _0802A97C: .4byte 0xf7ffffff -_0802A980: .4byte gUnknown_2023BC4 -_0802A984: .4byte gUnknown_2022B4C -_0802A988: .4byte gUnknown_2023D70 -_0802A98C: .4byte gUnknown_825E45C +_0802A980: .4byte gActiveBattler +_0802A984: .4byte gBattleTypeFlags +_0802A988: .4byte gAbsentBattlerFlags +_0802A98C: .4byte gBitTable _0802A990: .4byte gUnknown_2023D74 thumb_func_end atkAE_healpartystatus thumb_func_start atkAF_cursetarget atkAF_cursetarget: @ 802A994 push {r4,r5,lr} - ldr r5, _0802A9D4 @ =gUnknown_2023BE4 - ldr r0, _0802A9D8 @ =gUnknown_2023D6C + ldr r5, _0802A9D4 @ =gBattleMons + ldr r0, _0802A9D8 @ =gBattlerTarget ldrb r0, [r0] movs r4, 0x58 adds r1, r0, 0 @@ -26352,14 +26352,14 @@ atkAF_cursetarget: @ 802A994 str r1, [r3] b _0802AA04 .align 2, 0 -_0802A9D4: .4byte gUnknown_2023BE4 -_0802A9D8: .4byte gUnknown_2023D6C +_0802A9D4: .4byte gBattleMons +_0802A9D8: .4byte gBattlerTarget _0802A9DC: .4byte gUnknown_2023D74 _0802A9E0: orrs r2, r3 str r2, [r1] - ldr r1, _0802AA0C @ =gUnknown_2023D50 - ldr r0, _0802AA10 @ =gUnknown_2023D6B + ldr r1, _0802AA0C @ =gBattleMoveDamage + ldr r0, _0802AA10 @ =sBattler_AI ldrb r0, [r0] muls r0, r4 adds r0, r5 @@ -26380,15 +26380,15 @@ _0802AA04: pop {r0} bx r0 .align 2, 0 -_0802AA0C: .4byte gUnknown_2023D50 -_0802AA10: .4byte gUnknown_2023D6B +_0802AA0C: .4byte gBattleMoveDamage +_0802AA10: .4byte sBattler_AI _0802AA14: .4byte gUnknown_2023D74 thumb_func_end atkAF_cursetarget thumb_func_start atkB0_trysetspikes atkB0_trysetspikes: @ 802AA18 push {r4,lr} - ldr r4, _0802AA6C @ =gUnknown_2023D6B + ldr r4, _0802AA6C @ =sBattler_AI ldrb r0, [r4] bl GetBankSide movs r1, 0x1 @@ -26428,12 +26428,12 @@ atkB0_trysetspikes: @ 802AA18 str r1, [r3] b _0802AA96 .align 2, 0 -_0802AA6C: .4byte gUnknown_2023D6B +_0802AA6C: .4byte sBattler_AI _0802AA70: .4byte gUnknown_2023DE4 _0802AA74: .4byte gUnknown_2023ECC _0802AA78: .4byte gUnknown_2023D74 _0802AA7C: - ldr r1, _0802AA9C @ =gUnknown_2023DDE + ldr r1, _0802AA9C @ =gSideAffecting adds r1, r2, r1 ldrh r2, [r1] movs r0, 0x10 @@ -26451,14 +26451,14 @@ _0802AA96: pop {r0} bx r0 .align 2, 0 -_0802AA9C: .4byte gUnknown_2023DDE +_0802AA9C: .4byte gSideAffecting _0802AAA0: .4byte gUnknown_2023D74 thumb_func_end atkB0_trysetspikes thumb_func_start atkB1_setforesight atkB1_setforesight: @ 802AAA4 - ldr r1, _0802AAC8 @ =gUnknown_2023BE4 - ldr r0, _0802AACC @ =gUnknown_2023D6C + ldr r1, _0802AAC8 @ =gBattleMons + ldr r0, _0802AACC @ =gBattlerTarget ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -26475,8 +26475,8 @@ atkB1_setforesight: @ 802AAA4 str r0, [r1] bx lr .align 2, 0 -_0802AAC8: .4byte gUnknown_2023BE4 -_0802AACC: .4byte gUnknown_2023D6C +_0802AAC8: .4byte gBattleMons +_0802AACC: .4byte gBattlerTarget _0802AAD0: .4byte gUnknown_2023D74 thumb_func_end atkB1_setforesight @@ -26490,18 +26490,18 @@ atkB2_trysetperishsong: @ 802AAD4 movs r3, 0 ldr r0, _0802AB18 @ =gUnknown_2023BCC adds r7, r0, 0 - ldr r0, _0802AB1C @ =gUnknown_2023D6B + ldr r0, _0802AB1C @ =sBattler_AI mov r8, r0 ldrb r1, [r7] cmp r6, r1 bge _0802AB40 movs r5, 0x20 - ldr r0, _0802AB20 @ =gUnknown_2023BE4 + ldr r0, _0802AB20 @ =gBattleMons mov r12, r0 - ldr r0, _0802AB24 @ =gUnknown_2023E0C + ldr r0, _0802AB24 @ =gDisableStructs adds r4, r0, 0 adds r4, 0xF - ldr r2, _0802AB28 @ =gUnknown_2023DFC + ldr r2, _0802AB28 @ =gStatuses3 _0802AAFC: ldr r1, [r2] adds r0, r1, 0 @@ -26520,10 +26520,10 @@ _0802AB14: b _0802AB34 .align 2, 0 _0802AB18: .4byte gUnknown_2023BCC -_0802AB1C: .4byte gUnknown_2023D6B -_0802AB20: .4byte gUnknown_2023BE4 -_0802AB24: .4byte gUnknown_2023E0C -_0802AB28: .4byte gUnknown_2023DFC +_0802AB1C: .4byte sBattler_AI +_0802AB20: .4byte gBattleMons +_0802AB24: .4byte gDisableStructs +_0802AB28: .4byte gStatuses3 _0802AB2C: orrs r1, r5 str r1, [r2] @@ -26583,13 +26583,13 @@ atkB3_rolloutdamagecalculation: @ 802AB8C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0802ABB0 @ =gUnknown_2023DCC + ldr r0, _0802ABB0 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 beq _0802ABC0 - ldr r0, _0802ABB4 @ =gUnknown_2023D6B + ldr r0, _0802ABB4 @ =sBattler_AI ldrb r0, [r0] bl CancelMultiTurnMoves ldr r1, _0802ABB8 @ =gUnknown_2023D74 @@ -26597,13 +26597,13 @@ atkB3_rolloutdamagecalculation: @ 802AB8C str r0, [r1] b _0802ACD8 .align 2, 0 -_0802ABB0: .4byte gUnknown_2023DCC -_0802ABB4: .4byte gUnknown_2023D6B +_0802ABB0: .4byte gMoveResultFlags +_0802ABB4: .4byte sBattler_AI _0802ABB8: .4byte gUnknown_2023D74 _0802ABBC: .4byte gUnknown_81D6960 _0802ABC0: - ldr r2, _0802ACE4 @ =gUnknown_2023BE4 - ldr r1, _0802ACE8 @ =gUnknown_2023D6B + ldr r2, _0802ACE4 @ =gBattleMons + ldr r1, _0802ACE8 @ =sBattler_AI ldrb r3, [r1] movs r5, 0x58 adds r0, r3, 0 @@ -26617,9 +26617,9 @@ _0802ABC0: ands r0, r7 adds r6, r1, 0 mov r9, r2 - ldr r1, _0802ACEC @ =gUnknown_2023E0C + ldr r1, _0802ACEC @ =gDisableStructs mov r12, r1 - ldr r2, _0802ACF0 @ =gUnknown_2023D4A + ldr r2, _0802ACF0 @ =gCurrentMove mov r8, r2 cmp r0, 0 bne _0802AC32 @@ -26687,8 +26687,8 @@ _0802AC32: ands r0, r2 str r0, [r1] _0802AC66: - ldr r3, _0802ACFC @ =gUnknown_2023F50 - ldr r2, _0802AD00 @ =gUnknown_8250C04 + ldr r3, _0802ACFC @ =gDynamicBasePower + ldr r2, _0802AD00 @ =gBattleMoves mov r0, r8 ldrh r1, [r0] lsls r0, r1, 1 @@ -26755,22 +26755,22 @@ _0802ACD8: pop {r0} bx r0 .align 2, 0 -_0802ACE4: .4byte gUnknown_2023BE4 -_0802ACE8: .4byte gUnknown_2023D6B -_0802ACEC: .4byte gUnknown_2023E0C -_0802ACF0: .4byte gUnknown_2023D4A +_0802ACE4: .4byte gBattleMons +_0802ACE8: .4byte sBattler_AI +_0802ACEC: .4byte gDisableStructs +_0802ACF0: .4byte gCurrentMove _0802ACF4: .4byte gUnknown_2023DB8 _0802ACF8: .4byte 0xffffefff -_0802ACFC: .4byte gUnknown_2023F50 -_0802AD00: .4byte gUnknown_8250C04 +_0802ACFC: .4byte gDynamicBasePower +_0802AD00: .4byte gBattleMoves _0802AD04: .4byte gUnknown_2023D74 thumb_func_end atkB3_rolloutdamagecalculation thumb_func_start atkB4_jumpifconfusedandstatmaxed atkB4_jumpifconfusedandstatmaxed: @ 802AD08 push {r4,r5,lr} - ldr r5, _0802AD58 @ =gUnknown_2023BE4 - ldr r0, _0802AD5C @ =gUnknown_2023D6C + ldr r5, _0802AD58 @ =gBattleMons + ldr r0, _0802AD5C @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 adds r3, r1, 0 @@ -26808,8 +26808,8 @@ atkB4_jumpifconfusedandstatmaxed: @ 802AD08 str r1, [r4] b _0802AD6A .align 2, 0 -_0802AD58: .4byte gUnknown_2023BE4 -_0802AD5C: .4byte gUnknown_2023D6C +_0802AD58: .4byte gBattleMons +_0802AD5C: .4byte gBattlerTarget _0802AD60: .4byte gUnknown_2023D74 _0802AD64: ldr r0, [r4] @@ -26824,14 +26824,14 @@ _0802AD6A: thumb_func_start atkB5_furycuttercalc atkB5_furycuttercalc: @ 802AD70 push {r4,r5,lr} - ldr r0, _0802AD98 @ =gUnknown_2023DCC + ldr r0, _0802AD98 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 beq _0802ADAC - ldr r2, _0802AD9C @ =gUnknown_2023E0C - ldr r0, _0802ADA0 @ =gUnknown_2023D6B + ldr r2, _0802AD9C @ =gDisableStructs + ldr r0, _0802ADA0 @ =sBattler_AI ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -26844,14 +26844,14 @@ atkB5_furycuttercalc: @ 802AD70 str r0, [r1] b _0802AE04 .align 2, 0 -_0802AD98: .4byte gUnknown_2023DCC -_0802AD9C: .4byte gUnknown_2023E0C -_0802ADA0: .4byte gUnknown_2023D6B +_0802AD98: .4byte gMoveResultFlags +_0802AD9C: .4byte gDisableStructs +_0802ADA0: .4byte sBattler_AI _0802ADA4: .4byte gUnknown_2023D74 _0802ADA8: .4byte gUnknown_81D6960 _0802ADAC: - ldr r5, _0802AE0C @ =gUnknown_2023E0C - ldr r4, _0802AE10 @ =gUnknown_2023D6B + ldr r5, _0802AE0C @ =gDisableStructs + ldr r4, _0802AE10 @ =sBattler_AI ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -26863,9 +26863,9 @@ _0802ADAC: adds r0, 0x1 strb r0, [r1, 0x10] _0802ADC4: - ldr r3, _0802AE14 @ =gUnknown_2023F50 - ldr r2, _0802AE18 @ =gUnknown_8250C04 - ldr r0, _0802AE1C @ =gUnknown_2023D4A + ldr r3, _0802AE14 @ =gDynamicBasePower + ldr r2, _0802AE18 @ =gBattleMoves + ldr r0, _0802AE1C @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -26902,19 +26902,19 @@ _0802AE04: pop {r0} bx r0 .align 2, 0 -_0802AE0C: .4byte gUnknown_2023E0C -_0802AE10: .4byte gUnknown_2023D6B -_0802AE14: .4byte gUnknown_2023F50 -_0802AE18: .4byte gUnknown_8250C04 -_0802AE1C: .4byte gUnknown_2023D4A +_0802AE0C: .4byte gDisableStructs +_0802AE10: .4byte sBattler_AI +_0802AE14: .4byte gDynamicBasePower +_0802AE18: .4byte gBattleMoves +_0802AE1C: .4byte gCurrentMove _0802AE20: .4byte gUnknown_2023D74 thumb_func_end atkB5_furycuttercalc thumb_func_start atkB6_happinesstodamagecalculation atkB6_happinesstodamagecalculation: @ 802AE24 push {r4,lr} - ldr r2, _0802AE50 @ =gUnknown_8250C04 - ldr r0, _0802AE54 @ =gUnknown_2023D4A + ldr r2, _0802AE50 @ =gBattleMoves + ldr r0, _0802AE54 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -26923,9 +26923,9 @@ atkB6_happinesstodamagecalculation: @ 802AE24 ldrb r0, [r0] cmp r0, 0x79 bne _0802AE64 - ldr r4, _0802AE58 @ =gUnknown_2023F50 - ldr r2, _0802AE5C @ =gUnknown_2023BE4 - ldr r0, _0802AE60 @ =gUnknown_2023D6B + ldr r4, _0802AE58 @ =gDynamicBasePower + ldr r2, _0802AE5C @ =gBattleMons + ldr r0, _0802AE60 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -26934,15 +26934,15 @@ atkB6_happinesstodamagecalculation: @ 802AE24 ldrb r1, [r0] b _0802AE7A .align 2, 0 -_0802AE50: .4byte gUnknown_8250C04 -_0802AE54: .4byte gUnknown_2023D4A -_0802AE58: .4byte gUnknown_2023F50 -_0802AE5C: .4byte gUnknown_2023BE4 -_0802AE60: .4byte gUnknown_2023D6B +_0802AE50: .4byte gBattleMoves +_0802AE54: .4byte gCurrentMove +_0802AE58: .4byte gDynamicBasePower +_0802AE5C: .4byte gBattleMons +_0802AE60: .4byte sBattler_AI _0802AE64: - ldr r4, _0802AE98 @ =gUnknown_2023F50 - ldr r2, _0802AE9C @ =gUnknown_2023BE4 - ldr r0, _0802AEA0 @ =gUnknown_2023D6B + ldr r4, _0802AE98 @ =gDynamicBasePower + ldr r2, _0802AE9C @ =gBattleMons + ldr r0, _0802AEA0 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -26966,9 +26966,9 @@ _0802AE7A: pop {r0} bx r0 .align 2, 0 -_0802AE98: .4byte gUnknown_2023F50 -_0802AE9C: .4byte gUnknown_2023BE4 -_0802AEA0: .4byte gUnknown_2023D6B +_0802AE98: .4byte gDynamicBasePower +_0802AE9C: .4byte gBattleMons +_0802AEA0: .4byte sBattler_AI _0802AEA4: .4byte gUnknown_2023D74 thumb_func_end atkB6_happinesstodamagecalculation @@ -26980,34 +26980,34 @@ atkB7_presentdamagecalculation: @ 802AEA8 ands r4, r0 cmp r4, 0x65 bgt _0802AEC4 - ldr r1, _0802AEC0 @ =gUnknown_2023F50 + ldr r1, _0802AEC0 @ =gDynamicBasePower movs r0, 0x28 strh r0, [r1] b _0802AF06 .align 2, 0 -_0802AEC0: .4byte gUnknown_2023F50 +_0802AEC0: .4byte gDynamicBasePower _0802AEC4: cmp r4, 0xB1 bgt _0802AED4 - ldr r1, _0802AED0 @ =gUnknown_2023F50 + ldr r1, _0802AED0 @ =gDynamicBasePower movs r0, 0x50 strh r0, [r1] b _0802AF06 .align 2, 0 -_0802AED0: .4byte gUnknown_2023F50 +_0802AED0: .4byte gDynamicBasePower _0802AED4: cmp r4, 0xCB bgt _0802AEE4 - ldr r1, _0802AEE0 @ =gUnknown_2023F50 + ldr r1, _0802AEE0 @ =gDynamicBasePower movs r0, 0x78 strh r0, [r1] b _0802AF06 .align 2, 0 -_0802AEE0: .4byte gUnknown_2023F50 +_0802AEE0: .4byte gDynamicBasePower _0802AEE4: - ldr r3, _0802AF10 @ =gUnknown_2023D50 - ldr r2, _0802AF14 @ =gUnknown_2023BE4 - ldr r0, _0802AF18 @ =gUnknown_2023D6C + ldr r3, _0802AF10 @ =gBattleMoveDamage + ldr r2, _0802AF14 @ =gBattleMons + ldr r0, _0802AF18 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -27030,14 +27030,14 @@ _0802AF06: ldr r0, _0802AF20 @ =gUnknown_81D6930 b _0802AF5E .align 2, 0 -_0802AF10: .4byte gUnknown_2023D50 -_0802AF14: .4byte gUnknown_2023BE4 -_0802AF18: .4byte gUnknown_2023D6C +_0802AF10: .4byte gBattleMoveDamage +_0802AF14: .4byte gBattleMons +_0802AF18: .4byte gBattlerTarget _0802AF1C: .4byte gUnknown_2023D74 _0802AF20: .4byte gUnknown_81D6930 _0802AF24: - ldr r2, _0802AF40 @ =gUnknown_2023BE4 - ldr r0, _0802AF44 @ =gUnknown_2023D6C + ldr r2, _0802AF40 @ =gBattleMons + ldr r0, _0802AF44 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -27050,12 +27050,12 @@ _0802AF24: ldr r0, _0802AF4C @ =gUnknown_81D7DD1 b _0802AF5E .align 2, 0 -_0802AF40: .4byte gUnknown_2023BE4 -_0802AF44: .4byte gUnknown_2023D6C +_0802AF40: .4byte gBattleMons +_0802AF44: .4byte gBattlerTarget _0802AF48: .4byte gUnknown_2023D74 _0802AF4C: .4byte gUnknown_81D7DD1 _0802AF50: - ldr r2, _0802AF68 @ =gUnknown_2023DCC + ldr r2, _0802AF68 @ =gMoveResultFlags ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -27068,7 +27068,7 @@ _0802AF5E: pop {r0} bx r0 .align 2, 0 -_0802AF68: .4byte gUnknown_2023DCC +_0802AF68: .4byte gMoveResultFlags _0802AF6C: .4byte gUnknown_2023D74 _0802AF70: .4byte gUnknown_81D7DB7 thumb_func_end atkB7_presentdamagecalculation @@ -27076,10 +27076,10 @@ _0802AF70: .4byte gUnknown_81D7DB7 thumb_func_start atkB8_setsafeguard atkB8_setsafeguard: @ 802AF74 push {r4-r7,lr} - ldr r7, _0802AFA8 @ =gUnknown_2023D6B + ldr r7, _0802AFA8 @ =sBattler_AI ldrb r0, [r7] bl GetBankIdentity - ldr r4, _0802AFAC @ =gUnknown_2023DDE + ldr r4, _0802AFAC @ =gSideAffecting movs r6, 0x1 adds r1, r6, 0 ands r1, r0 @@ -27090,7 +27090,7 @@ atkB8_setsafeguard: @ 802AF74 ands r0, r1 cmp r0, 0 beq _0802AFB8 - ldr r2, _0802AFB0 @ =gUnknown_2023DCC + ldr r2, _0802AFB0 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -27100,9 +27100,9 @@ atkB8_setsafeguard: @ 802AF74 strb r0, [r1, 0x5] b _0802B000 .align 2, 0 -_0802AFA8: .4byte gUnknown_2023D6B -_0802AFAC: .4byte gUnknown_2023DDE -_0802AFB0: .4byte gUnknown_2023DCC +_0802AFA8: .4byte sBattler_AI +_0802AFAC: .4byte gSideAffecting +_0802AFB0: .4byte gMoveResultFlags _0802AFB4: .4byte gUnknown_2023E82 _0802AFB8: ldrb r0, [r7] @@ -27166,65 +27166,65 @@ atkB9_magnitudedamagecalculation: @ 802B01C lsrs r3, r0, 16 cmp r3, 0x4 bgt _0802B048 - ldr r1, _0802B044 @ =gUnknown_2023F50 + ldr r1, _0802B044 @ =gDynamicBasePower movs r0, 0xA strh r0, [r1] movs r3, 0x4 b _0802B0B4 .align 2, 0 -_0802B044: .4byte gUnknown_2023F50 +_0802B044: .4byte gDynamicBasePower _0802B048: cmp r3, 0xE bgt _0802B05C - ldr r1, _0802B058 @ =gUnknown_2023F50 + ldr r1, _0802B058 @ =gDynamicBasePower movs r0, 0x1E strh r0, [r1] movs r3, 0x5 b _0802B0B4 .align 2, 0 -_0802B058: .4byte gUnknown_2023F50 +_0802B058: .4byte gDynamicBasePower _0802B05C: cmp r3, 0x22 bgt _0802B070 - ldr r1, _0802B06C @ =gUnknown_2023F50 + ldr r1, _0802B06C @ =gDynamicBasePower movs r0, 0x32 strh r0, [r1] movs r3, 0x6 b _0802B0B4 .align 2, 0 -_0802B06C: .4byte gUnknown_2023F50 +_0802B06C: .4byte gDynamicBasePower _0802B070: cmp r3, 0x40 bgt _0802B084 - ldr r1, _0802B080 @ =gUnknown_2023F50 + ldr r1, _0802B080 @ =gDynamicBasePower movs r0, 0x46 strh r0, [r1] movs r3, 0x7 b _0802B0B4 .align 2, 0 -_0802B080: .4byte gUnknown_2023F50 +_0802B080: .4byte gDynamicBasePower _0802B084: cmp r3, 0x54 bgt _0802B098 - ldr r1, _0802B094 @ =gUnknown_2023F50 + ldr r1, _0802B094 @ =gDynamicBasePower movs r0, 0x5A strh r0, [r1] movs r3, 0x8 b _0802B0B4 .align 2, 0 -_0802B094: .4byte gUnknown_2023F50 +_0802B094: .4byte gDynamicBasePower _0802B098: cmp r3, 0x5E bgt _0802B0AC - ldr r1, _0802B0A8 @ =gUnknown_2023F50 + ldr r1, _0802B0A8 @ =gDynamicBasePower movs r0, 0x6E strh r0, [r1] movs r3, 0x9 b _0802B0B4 .align 2, 0 -_0802B0A8: .4byte gUnknown_2023F50 +_0802B0A8: .4byte gDynamicBasePower _0802B0AC: - ldr r1, _0802B120 @ =gUnknown_2023F50 + ldr r1, _0802B120 @ =gDynamicBasePower movs r0, 0x96 strh r0, [r1] movs r3, 0xA @@ -27241,7 +27241,7 @@ _0802B0B4: strb r3, [r1, 0x4] movs r0, 0xFF strb r0, [r1, 0x5] - ldr r1, _0802B128 @ =gUnknown_2023D6C + ldr r1, _0802B128 @ =gBattlerTarget strb r2, [r1] ldr r0, _0802B12C @ =gUnknown_2023BCC ldrb r3, [r0] @@ -27251,11 +27251,11 @@ _0802B0B4: cmp r2, r3 bcs _0802B10C adds r4, r6, 0 - ldr r0, _0802B134 @ =gUnknown_2023D6B + ldr r0, _0802B134 @ =sBattler_AI ldrb r5, [r0] - ldr r1, _0802B138 @ =gUnknown_825E45C + ldr r1, _0802B138 @ =gBitTable mov r12, r1 - ldr r7, _0802B13C @ =gUnknown_2023D70 + ldr r7, _0802B13C @ =gAbsentBattlerFlags _0802B0EA: ldrb r2, [r4] cmp r2, r5 @@ -27286,14 +27286,14 @@ _0802B10C: pop {r0} bx r0 .align 2, 0 -_0802B120: .4byte gUnknown_2023F50 +_0802B120: .4byte gDynamicBasePower _0802B124: .4byte gUnknown_2022AB8 -_0802B128: .4byte gUnknown_2023D6C +_0802B128: .4byte gBattlerTarget _0802B12C: .4byte gUnknown_2023BCC _0802B130: .4byte gUnknown_2023D74 -_0802B134: .4byte gUnknown_2023D6B -_0802B138: .4byte gUnknown_825E45C -_0802B13C: .4byte gUnknown_2023D70 +_0802B134: .4byte sBattler_AI +_0802B138: .4byte gBitTable +_0802B13C: .4byte gAbsentBattlerFlags thumb_func_end atkB9_magnitudedamagecalculation thumb_func_start atkBA_jumpifnopursuitswitchdmg @@ -27307,7 +27307,7 @@ atkBA_jumpifnopursuitswitchdmg: @ 802B140 ldrb r0, [r0] cmp r0, 0x1 bne _0802B170 - ldr r0, _0802B168 @ =gUnknown_2023D6B + ldr r0, _0802B168 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -27317,12 +27317,12 @@ atkBA_jumpifnopursuitswitchdmg: @ 802B140 b _0802B18A .align 2, 0 _0802B164: .4byte gUnknown_2023D72 -_0802B168: .4byte gUnknown_2023D6B +_0802B168: .4byte sBattler_AI _0802B16C: movs r0, 0 b _0802B18A _0802B170: - ldr r0, _0802B184 @ =gUnknown_2023D6B + ldr r0, _0802B184 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -27331,15 +27331,15 @@ _0802B170: movs r0, 0x3 b _0802B18A .align 2, 0 -_0802B184: .4byte gUnknown_2023D6B +_0802B184: .4byte sBattler_AI _0802B188: movs r0, 0x2 _0802B18A: bl GetBankByIdentity - ldr r1, _0802B264 @ =gUnknown_2023D6C + ldr r1, _0802B264 @ =gBattlerTarget strb r0, [r1] ldr r0, _0802B268 @ =gUnknown_2023D7C - ldr r1, _0802B264 @ =gUnknown_2023D6C + ldr r1, _0802B264 @ =gBattlerTarget ldrb r3, [r1] adds r0, r3, r0 ldrb r0, [r0] @@ -27347,15 +27347,15 @@ _0802B18A: beq _0802B1A2 b _0802B2A8 _0802B1A2: - ldr r5, _0802B26C @ =gUnknown_2023D6B - ldr r0, _0802B270 @ =gUnknown_2023FE8 + ldr r5, _0802B26C @ =sBattler_AI + ldr r0, _0802B270 @ =gBattleStruct ldr r1, [r0] adds r1, r3, r1 ldrb r2, [r5] ldrb r1, [r1, 0xC] cmp r2, r1 bne _0802B2A8 - ldr r4, _0802B274 @ =gUnknown_2023BE4 + ldr r4, _0802B274 @ =gBattleMons movs r2, 0x58 adds r0, r3, 0 muls r0, r2 @@ -27373,7 +27373,7 @@ _0802B1A2: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0802B2A8 - ldr r0, _0802B278 @ =gUnknown_2023E0C + ldr r0, _0802B278 @ =gDisableStructs lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -27390,7 +27390,7 @@ _0802B1A2: bne _0802B2A8 movs r1, 0 ldr r0, _0802B280 @ =gUnknown_2023BCC - ldr r2, _0802B284 @ =gUnknown_2023D4A + ldr r2, _0802B284 @ =gCurrentMove mov r8, r2 ldr r7, _0802B288 @ =gUnknown_2023D48 mov r10, r7 @@ -27402,7 +27402,7 @@ _0802B1A2: cmp r1, r2 bge _0802B22E ldr r6, _0802B294 @ =gUnknown_2023BDE - ldr r5, _0802B264 @ =gUnknown_2023D6C + ldr r5, _0802B264 @ =gBattlerTarget ldr r4, _0802B298 @ =gUnknown_2023BDA movs r3, 0xB adds r2, r0, 0 @@ -27423,9 +27423,9 @@ _0802B22E: movs r0, 0xE4 mov r1, r8 strh r0, [r1] - ldr r2, _0802B264 @ =gUnknown_2023D6C + ldr r2, _0802B264 @ =gBattlerTarget ldrb r0, [r2] - ldr r7, _0802B270 @ =gUnknown_2023FE8 + ldr r7, _0802B270 @ =gBattleStruct ldr r1, [r7] adds r0, r1 adds r0, 0x80 @@ -27439,7 +27439,7 @@ _0802B22E: adds r0, 0x5 str r0, [r7] movs r0, 0x1 - ldr r1, _0802B2A0 @ =gUnknown_2023FC4 + ldr r1, _0802B2A0 @ =gBattleScripting strb r0, [r1, 0x18] mov r2, r12 ldr r0, [r2] @@ -27448,22 +27448,22 @@ _0802B22E: str r0, [r2] b _0802B2C2 .align 2, 0 -_0802B264: .4byte gUnknown_2023D6C +_0802B264: .4byte gBattlerTarget _0802B268: .4byte gUnknown_2023D7C -_0802B26C: .4byte gUnknown_2023D6B -_0802B270: .4byte gUnknown_2023FE8 -_0802B274: .4byte gUnknown_2023BE4 -_0802B278: .4byte gUnknown_2023E0C +_0802B26C: .4byte sBattler_AI +_0802B270: .4byte gBattleStruct +_0802B274: .4byte gBattleMons +_0802B278: .4byte gDisableStructs _0802B27C: .4byte gUnknown_2023DC4 _0802B280: .4byte gUnknown_2023BCC -_0802B284: .4byte gUnknown_2023D4A +_0802B284: .4byte gCurrentMove _0802B288: .4byte gUnknown_2023D48 _0802B28C: .4byte gUnknown_2023D49 _0802B290: .4byte gUnknown_2023DD0 _0802B294: .4byte gUnknown_2023BDE _0802B298: .4byte gUnknown_2023BDA _0802B29C: .4byte gUnknown_2023D74 -_0802B2A0: .4byte gUnknown_2023FC4 +_0802B2A0: .4byte gBattleScripting _0802B2A4: .4byte 0xfffffbff _0802B2A8: ldr r3, _0802B2D0 @ =gUnknown_2023D74 @@ -27494,13 +27494,13 @@ _0802B2D0: .4byte gUnknown_2023D74 thumb_func_start atkBB_setsunny atkBB_setsunny: @ 802B2D4 push {lr} - ldr r2, _0802B2F4 @ =gUnknown_2023F1C + ldr r2, _0802B2F4 @ =gBattleWeather ldrh r1, [r2] movs r0, 0x60 ands r0, r1 cmp r0, 0 beq _0802B300 - ldr r2, _0802B2F8 @ =gUnknown_2023DCC + ldr r2, _0802B2F8 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -27510,8 +27510,8 @@ atkBB_setsunny: @ 802B2D4 strb r0, [r1, 0x5] b _0802B312 .align 2, 0 -_0802B2F4: .4byte gUnknown_2023F1C -_0802B2F8: .4byte gUnknown_2023DCC +_0802B2F4: .4byte gBattleWeather +_0802B2F8: .4byte gMoveResultFlags _0802B2FC: .4byte gUnknown_2023E82 _0802B300: movs r0, 0x20 @@ -27539,8 +27539,8 @@ _0802B328: .4byte gUnknown_2023D74 thumb_func_start atkBC_maxattackhalvehp atkBC_maxattackhalvehp: @ 802B32C push {r4,r5,lr} - ldr r5, _0802B378 @ =gUnknown_2023BE4 - ldr r4, _0802B37C @ =gUnknown_2023D6B + ldr r5, _0802B378 @ =gBattleMons + ldr r4, _0802B37C @ =sBattler_AI ldrb r0, [r4] movs r3, 0x58 muls r0, r3 @@ -27560,7 +27560,7 @@ _0802B344: bls _0802B388 movs r0, 0xC strb r0, [r2, 0x19] - ldr r1, _0802B380 @ =gUnknown_2023D50 + ldr r1, _0802B380 @ =gBattleMoveDamage ldrb r0, [r4] muls r0, r3 adds r0, r5 @@ -27578,9 +27578,9 @@ _0802B36C: str r0, [r1] b _0802B3A2 .align 2, 0 -_0802B378: .4byte gUnknown_2023BE4 -_0802B37C: .4byte gUnknown_2023D6B -_0802B380: .4byte gUnknown_2023D50 +_0802B378: .4byte gBattleMons +_0802B37C: .4byte sBattler_AI +_0802B380: .4byte gBattleMoveDamage _0802B384: .4byte gUnknown_2023D74 _0802B388: ldr r3, _0802B3A8 @ =gUnknown_2023D74 @@ -27609,10 +27609,10 @@ atkBD_copyfoestats: @ 802B3AC push {r4-r7,lr} movs r2, 0 ldr r7, _0802B3E4 @ =gUnknown_2023D74 - ldr r6, _0802B3E8 @ =gUnknown_2023D6B + ldr r6, _0802B3E8 @ =sBattler_AI movs r4, 0x58 ldr r3, _0802B3EC @ =gUnknown_2023BFC - ldr r5, _0802B3F0 @ =gUnknown_2023D6C + ldr r5, _0802B3F0 @ =gBattlerTarget _0802B3BA: ldrb r0, [r6] adds r1, r0, 0 @@ -27636,16 +27636,16 @@ _0802B3BA: bx r0 .align 2, 0 _0802B3E4: .4byte gUnknown_2023D74 -_0802B3E8: .4byte gUnknown_2023D6B +_0802B3E8: .4byte sBattler_AI _0802B3EC: .4byte gUnknown_2023BFC -_0802B3F0: .4byte gUnknown_2023D6C +_0802B3F0: .4byte gBattlerTarget thumb_func_end atkBD_copyfoestats thumb_func_start atkBE_rapidspinfree atkBE_rapidspinfree: @ 802B3F4 push {r4-r6,lr} - ldr r1, _0802B464 @ =gUnknown_2023BE4 - ldr r5, _0802B468 @ =gUnknown_2023D6B + ldr r1, _0802B464 @ =gBattleMons + ldr r5, _0802B468 @ =sBattler_AI ldrb r2, [r5] movs r6, 0x58 adds r0, r2, 0 @@ -27659,8 +27659,8 @@ atkBE_rapidspinfree: @ 802B3F4 ands r0, r1 cmp r0, 0 beq _0802B488 - ldr r1, _0802B46C @ =gUnknown_2023FC4 - ldr r3, _0802B470 @ =gUnknown_2023D6C + ldr r1, _0802B46C @ =gBattleScripting + ldr r3, _0802B470 @ =gBattlerTarget ldrb r0, [r3] strb r0, [r1, 0x17] ldrb r0, [r5] @@ -27672,7 +27672,7 @@ atkBE_rapidspinfree: @ 802B3F4 ands r0, r2 str r0, [r1] ldrb r0, [r5] - ldr r1, _0802B478 @ =gUnknown_2023FE8 + ldr r1, _0802B478 @ =gBattleStruct ldr r2, [r1] adds r0, r2 ldrb r0, [r0, 0x14] @@ -27699,17 +27699,17 @@ atkBE_rapidspinfree: @ 802B3F4 ldr r0, _0802B484 @ =gUnknown_81D8DF3 b _0802B532 .align 2, 0 -_0802B464: .4byte gUnknown_2023BE4 -_0802B468: .4byte gUnknown_2023D6B -_0802B46C: .4byte gUnknown_2023FC4 -_0802B470: .4byte gUnknown_2023D6C +_0802B464: .4byte gBattleMons +_0802B468: .4byte sBattler_AI +_0802B46C: .4byte gBattleScripting +_0802B470: .4byte gBattlerTarget _0802B474: .4byte 0xffff1fff -_0802B478: .4byte gUnknown_2023FE8 +_0802B478: .4byte gBattleStruct _0802B47C: .4byte gUnknown_2022AB8 _0802B480: .4byte gUnknown_2023D74 _0802B484: .4byte gUnknown_81D8DF3 _0802B488: - ldr r4, _0802B4BC @ =gUnknown_2023DFC + ldr r4, _0802B4BC @ =gStatuses3 lsls r0, r2, 2 adds r3, r0, r4 ldr r1, [r3] @@ -27734,13 +27734,13 @@ _0802B488: ldr r0, _0802B4C4 @ =gUnknown_81D8E04 b _0802B532 .align 2, 0 -_0802B4BC: .4byte gUnknown_2023DFC +_0802B4BC: .4byte gStatuses3 _0802B4C0: .4byte gUnknown_2023D74 _0802B4C4: .4byte gUnknown_81D8E04 _0802B4C8: adds r0, r2, 0 bl GetBankSide - ldr r4, _0802B518 @ =gUnknown_2023DDE + ldr r4, _0802B518 @ =gSideAffecting lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -27774,7 +27774,7 @@ _0802B4C8: ldr r0, _0802B528 @ =gUnknown_81D8E0B b _0802B532 .align 2, 0 -_0802B518: .4byte gUnknown_2023DDE +_0802B518: .4byte gSideAffecting _0802B51C: .4byte 0x0000ffef _0802B520: .4byte gUnknown_2023DE4 _0802B524: .4byte gUnknown_2023D74 @@ -27794,8 +27794,8 @@ _0802B53C: .4byte gUnknown_2023D74 thumb_func_start atkBF_setdefensecurlbit atkBF_setdefensecurlbit: @ 802B540 - ldr r1, _0802B564 @ =gUnknown_2023BE4 - ldr r0, _0802B568 @ =gUnknown_2023D6B + ldr r1, _0802B564 @ =gBattleMons + ldr r0, _0802B568 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -27812,8 +27812,8 @@ atkBF_setdefensecurlbit: @ 802B540 str r0, [r1] bx lr .align 2, 0 -_0802B564: .4byte gUnknown_2023BE4 -_0802B568: .4byte gUnknown_2023D6B +_0802B564: .4byte gBattleMons +_0802B568: .4byte sBattler_AI _0802B56C: .4byte gUnknown_2023D74 thumb_func_end atkBF_setdefensecurlbit @@ -27821,11 +27821,11 @@ _0802B56C: .4byte gUnknown_2023D74 atkC0_recoverbasedonsunlight: @ 802B570 push {r4-r7,lr} sub sp, 0x4 - ldr r1, _0802B5DC @ =gUnknown_2023D6C - ldr r5, _0802B5E0 @ =gUnknown_2023D6B + ldr r1, _0802B5DC @ =gBattlerTarget + ldr r5, _0802B5E0 @ =sBattler_AI ldrb r0, [r5] strb r0, [r1] - ldr r7, _0802B5E4 @ =gUnknown_2023BE4 + ldr r7, _0802B5E4 @ =gBattleMons ldrb r0, [r5] movs r6, 0x58 muls r0, r6 @@ -27834,7 +27834,7 @@ atkC0_recoverbasedonsunlight: @ 802B570 ldrh r0, [r0, 0x2C] cmp r1, r0 beq _0802B650 - ldr r4, _0802B5E8 @ =gUnknown_2023F1C + ldr r4, _0802B5E8 @ =gBattleWeather ldrh r0, [r4] cmp r0, 0 beq _0802B5C2 @@ -27859,9 +27859,9 @@ atkC0_recoverbasedonsunlight: @ 802B570 cmp r0, 0 beq _0802B5F0 _0802B5C2: - ldr r3, _0802B5EC @ =gUnknown_2023D50 - ldr r2, _0802B5E4 @ =gUnknown_2023BE4 - ldr r0, _0802B5E0 @ =gUnknown_2023D6B + ldr r3, _0802B5EC @ =gBattleMoveDamage + ldr r2, _0802B5E4 @ =gBattleMons + ldr r0, _0802B5E0 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -27872,18 +27872,18 @@ _0802B5C2: adds r1, r3, 0 b _0802B62A .align 2, 0 -_0802B5DC: .4byte gUnknown_2023D6C -_0802B5E0: .4byte gUnknown_2023D6B -_0802B5E4: .4byte gUnknown_2023BE4 -_0802B5E8: .4byte gUnknown_2023F1C -_0802B5EC: .4byte gUnknown_2023D50 +_0802B5DC: .4byte gBattlerTarget +_0802B5E0: .4byte sBattler_AI +_0802B5E4: .4byte gBattleMons +_0802B5E8: .4byte gBattleWeather +_0802B5EC: .4byte gBattleMoveDamage _0802B5F0: ldrh r1, [r4] movs r0, 0x60 ands r0, r1 cmp r0, 0 beq _0802B61C - ldr r4, _0802B618 @ =gUnknown_2023D50 + ldr r4, _0802B618 @ =gBattleMoveDamage ldrb r0, [r5] muls r0, r6 adds r0, r7 @@ -27897,9 +27897,9 @@ _0802B5F0: adds r1, r4, 0 b _0802B62A .align 2, 0 -_0802B618: .4byte gUnknown_2023D50 +_0802B618: .4byte gBattleMoveDamage _0802B61C: - ldr r1, _0802B648 @ =gUnknown_2023D50 + ldr r1, _0802B648 @ =gBattleMoveDamage ldrb r0, [r5] muls r0, r6 adds r0, r7 @@ -27923,7 +27923,7 @@ _0802B636: str r0, [r1] b _0802B66A .align 2, 0 -_0802B648: .4byte gUnknown_2023D50 +_0802B648: .4byte gBattleMoveDamage _0802B64C: .4byte gUnknown_2023D74 _0802B650: ldr r3, _0802B674 @ =gUnknown_2023D74 @@ -27954,8 +27954,8 @@ sub_802B678: @ 802B678 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r2, _0802B760 @ =gUnknown_2023BE4 - ldr r0, _0802B764 @ =gUnknown_2023D6B + ldr r2, _0802B760 @ =gBattleMons + ldr r0, _0802B764 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -28027,7 +28027,7 @@ sub_802B678: @ 802B678 ands r1, r0 lsls r1, 5 orrs r4, r1 - ldr r5, _0802B768 @ =gUnknown_2023F50 + ldr r5, _0802B768 @ =gDynamicBasePower lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -28035,7 +28035,7 @@ sub_802B678: @ 802B678 bl __divsi3 adds r0, 0x1E strh r0, [r5] - ldr r6, _0802B76C @ =gUnknown_2023FE8 + ldr r6, _0802B76C @ =gBattleStruct ldr r5, [r6] lsls r0, r4, 4 subs r0, r4 @@ -28066,10 +28066,10 @@ _0802B742: pop {r0} bx r0 .align 2, 0 -_0802B760: .4byte gUnknown_2023BE4 -_0802B764: .4byte gUnknown_2023D6B -_0802B768: .4byte gUnknown_2023F50 -_0802B76C: .4byte gUnknown_2023FE8 +_0802B760: .4byte gBattleMons +_0802B764: .4byte sBattler_AI +_0802B768: .4byte gDynamicBasePower +_0802B76C: .4byte gBattleStruct _0802B770: .4byte gUnknown_2023D74 thumb_func_end sub_802B678 @@ -28078,7 +28078,7 @@ atkC2_selectfirstvalidtarget: @ 802B774 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0802B7D0 @ =gUnknown_2023D6C + ldr r0, _0802B7D0 @ =gBattlerTarget movs r1, 0 strb r1, [r0] ldr r1, _0802B7D4 @ =gUnknown_2023BCC @@ -28089,12 +28089,12 @@ atkC2_selectfirstvalidtarget: @ 802B774 cmp r1, 0 beq _0802B7BE adds r3, r6, 0 - ldr r0, _0802B7DC @ =gUnknown_2023D6B + ldr r0, _0802B7DC @ =sBattler_AI ldrb r5, [r0] - ldr r0, _0802B7E0 @ =gUnknown_825E45C + ldr r0, _0802B7E0 @ =gBitTable mov r12, r0 adds r4, r1, 0 - ldr r7, _0802B7E4 @ =gUnknown_2023D70 + ldr r7, _0802B7E4 @ =gAbsentBattlerFlags _0802B79C: ldrb r2, [r3] cmp r2, r5 @@ -28125,12 +28125,12 @@ _0802B7BE: pop {r0} bx r0 .align 2, 0 -_0802B7D0: .4byte gUnknown_2023D6C +_0802B7D0: .4byte gBattlerTarget _0802B7D4: .4byte gUnknown_2023BCC _0802B7D8: .4byte gUnknown_2023D74 -_0802B7DC: .4byte gUnknown_2023D6B -_0802B7E0: .4byte gUnknown_825E45C -_0802B7E4: .4byte gUnknown_2023D70 +_0802B7DC: .4byte sBattler_AI +_0802B7E0: .4byte gBitTable +_0802B7E4: .4byte gAbsentBattlerFlags thumb_func_end atkC2_selectfirstvalidtarget thumb_func_start atkC3_trysetfutureattack @@ -28143,7 +28143,7 @@ atkC3_trysetfutureattack: @ 802B7E8 sub sp, 0x10 ldr r0, _0802B820 @ =gUnknown_2023F20 mov r8, r0 - ldr r7, _0802B824 @ =gUnknown_2023D6C + ldr r7, _0802B824 @ =gBattlerTarget ldrb r1, [r7] adds r0, r1, r0 ldrb r6, [r0] @@ -28165,14 +28165,14 @@ atkC3_trysetfutureattack: @ 802B7E8 b _0802B8F6 .align 2, 0 _0802B820: .4byte gUnknown_2023F20 -_0802B824: .4byte gUnknown_2023D6C +_0802B824: .4byte gBattlerTarget _0802B828: .4byte gUnknown_2023D74 _0802B82C: lsls r1, 1 mov r0, r8 adds r0, 0x18 adds r1, r0 - ldr r2, _0802B8CC @ =gUnknown_2023D4A + ldr r2, _0802B8CC @ =gCurrentMove mov r9, r2 ldrh r0, [r2] strh r0, [r1] @@ -28180,14 +28180,14 @@ _0802B82C: adds r0, 0x4 ldrb r4, [r7] adds r0, r4 - ldr r5, _0802B8D0 @ =gUnknown_2023D6B + ldr r5, _0802B8D0 @ =sBattler_AI ldrb r1, [r5] strb r1, [r0] ldrb r0, [r7] add r0, r8 movs r1, 0x3 strb r1, [r0] - ldr r4, _0802B8D4 @ =gUnknown_2023DDE + ldr r4, _0802B8D4 @ =gSideAffecting ldrb r0, [r7] bl GetBankIdentity movs r1, 0x1 @@ -28199,7 +28199,7 @@ _0802B82C: ldrb r0, [r5] movs r4, 0x58 muls r0, r4 - ldr r2, _0802B8D8 @ =gUnknown_2023BE4 + ldr r2, _0802B8D8 @ =gBattleMons adds r0, r2 ldrb r1, [r7] muls r1, r4 @@ -28247,10 +28247,10 @@ _0802B8BA: strb r1, [r0, 0x5] b _0802B8EE .align 2, 0 -_0802B8CC: .4byte gUnknown_2023D4A -_0802B8D0: .4byte gUnknown_2023D6B -_0802B8D4: .4byte gUnknown_2023DDE -_0802B8D8: .4byte gUnknown_2023BE4 +_0802B8CC: .4byte gCurrentMove +_0802B8D0: .4byte sBattler_AI +_0802B8D4: .4byte gSideAffecting +_0802B8D8: .4byte gBattleMons _0802B8DC: .4byte gUnknown_2023E8C _0802B8E0: .4byte 0x00000161 _0802B8E4: .4byte gUnknown_2023E82 @@ -28283,17 +28283,17 @@ atkC4_trydobeatup: @ 802B910 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0802B954 @ =gUnknown_2023D6B + ldr r0, _0802B954 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 - ldr r7, _0802B958 @ =gUnknown_202402C + ldr r7, _0802B958 @ =gEnemyParty cmp r0, 0 bne _0802B92A - ldr r7, _0802B95C @ =gUnknown_2024284 + ldr r7, _0802B95C @ =gPlayerParty _0802B92A: - ldr r2, _0802B960 @ =gUnknown_2023BE4 - ldr r0, _0802B964 @ =gUnknown_2023D6C + ldr r2, _0802B960 @ =gBattleMons + ldr r0, _0802B964 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -28313,11 +28313,11 @@ _0802B92A: ldrb r0, [r2, 0x4] b _0802BB08 .align 2, 0 -_0802B954: .4byte gUnknown_2023D6B -_0802B958: .4byte gUnknown_202402C -_0802B95C: .4byte gUnknown_2024284 -_0802B960: .4byte gUnknown_2023BE4 -_0802B964: .4byte gUnknown_2023D6C +_0802B954: .4byte sBattler_AI +_0802B958: .4byte gEnemyParty +_0802B95C: .4byte gPlayerParty +_0802B960: .4byte gBattleMons +_0802B964: .4byte gBattlerTarget _0802B968: .4byte gUnknown_2023D74 _0802B96C: ldr r6, _0802BAA8 @ =gUnknown_2023E82 @@ -28380,7 +28380,7 @@ _0802B9D0: strb r0, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r6, _0802BAB0 @ =gUnknown_2023D6B + ldr r6, _0802BAB0 @ =sBattler_AI ldrb r0, [r6] strb r0, [r1, 0x2] strb r2, [r1, 0x3] @@ -28390,9 +28390,9 @@ _0802B9D0: ldr r0, [r1] adds r0, 0x9 str r0, [r1] - ldr r2, _0802BAB8 @ =gUnknown_2023D50 + ldr r2, _0802BAB8 @ =gBattleMoveDamage mov r8, r2 - ldr r5, _0802BABC @ =gUnknown_8254784 + ldr r5, _0802BABC @ =gBaseStats mov r1, r9 ldrb r0, [r1] movs r4, 0x64 @@ -28407,8 +28407,8 @@ _0802B9D0: ldrb r3, [r1, 0x1] mov r2, r8 str r3, [r2] - ldr r2, _0802BAC0 @ =gUnknown_8250C04 - ldr r0, _0802BAC4 @ =gUnknown_2023D4A + ldr r2, _0802BAC0 @ =gBattleMoves + ldr r0, _0802BAC4 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -28432,8 +28432,8 @@ _0802B9D0: ldr r1, [r2] muls r0, r1 str r0, [r2] - ldr r3, _0802BAC8 @ =gUnknown_2023BE4 - ldr r1, _0802BACC @ =gUnknown_2023D6C + ldr r3, _0802BAC8 @ =gBattleMons + ldr r1, _0802BACC @ =gBattlerTarget ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -28475,14 +28475,14 @@ _0802BA9C: .align 2, 0 _0802BAA8: .4byte gUnknown_2023E82 _0802BAAC: .4byte gUnknown_2022AB8 -_0802BAB0: .4byte gUnknown_2023D6B +_0802BAB0: .4byte sBattler_AI _0802BAB4: .4byte gUnknown_2023D74 -_0802BAB8: .4byte gUnknown_2023D50 -_0802BABC: .4byte gUnknown_8254784 -_0802BAC0: .4byte gUnknown_8250C04 -_0802BAC4: .4byte gUnknown_2023D4A -_0802BAC8: .4byte gUnknown_2023BE4 -_0802BACC: .4byte gUnknown_2023D6C +_0802BAB8: .4byte gBattleMoveDamage +_0802BABC: .4byte gBaseStats +_0802BAC0: .4byte gBattleMoves +_0802BAC4: .4byte gCurrentMove +_0802BAC8: .4byte gBattleMons +_0802BACC: .4byte gBattlerTarget _0802BAD0: .4byte gUnknown_2023E8C _0802BAD4: mov r0, r8 @@ -28530,7 +28530,7 @@ _0802BB1C: .4byte gUnknown_2023D74 thumb_func_start atkC5_setsemiinvulnerablebit atkC5_setsemiinvulnerablebit: @ 802BB20 push {lr} - ldr r0, _0802BB34 @ =gUnknown_2023D4A + ldr r0, _0802BB34 @ =gCurrentMove ldrh r1, [r0] cmp r1, 0x5B beq _0802BB60 @@ -28540,7 +28540,7 @@ atkC5_setsemiinvulnerablebit: @ 802BB20 beq _0802BB44 b _0802BB8C .align 2, 0 -_0802BB34: .4byte gUnknown_2023D4A +_0802BB34: .4byte gCurrentMove _0802BB38: ldr r0, _0802BB54 @ =0x00000123 cmp r1, r0 @@ -28549,8 +28549,8 @@ _0802BB38: cmp r1, r0 bne _0802BB8C _0802BB44: - ldr r2, _0802BB58 @ =gUnknown_2023DFC - ldr r0, _0802BB5C @ =gUnknown_2023D6B + ldr r2, _0802BB58 @ =gStatuses3 + ldr r0, _0802BB5C @ =sBattler_AI ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28559,11 +28559,11 @@ _0802BB44: b _0802BB88 .align 2, 0 _0802BB54: .4byte 0x00000123 -_0802BB58: .4byte gUnknown_2023DFC -_0802BB5C: .4byte gUnknown_2023D6B +_0802BB58: .4byte gStatuses3 +_0802BB5C: .4byte sBattler_AI _0802BB60: - ldr r2, _0802BB70 @ =gUnknown_2023DFC - ldr r0, _0802BB74 @ =gUnknown_2023D6B + ldr r2, _0802BB70 @ =gStatuses3 + ldr r0, _0802BB74 @ =sBattler_AI ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28571,11 +28571,11 @@ _0802BB60: movs r2, 0x80 b _0802BB88 .align 2, 0 -_0802BB70: .4byte gUnknown_2023DFC -_0802BB74: .4byte gUnknown_2023D6B +_0802BB70: .4byte gStatuses3 +_0802BB74: .4byte sBattler_AI _0802BB78: - ldr r2, _0802BB98 @ =gUnknown_2023DFC - ldr r0, _0802BB9C @ =gUnknown_2023D6B + ldr r2, _0802BB98 @ =gStatuses3 + ldr r0, _0802BB9C @ =sBattler_AI ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28593,15 +28593,15 @@ _0802BB8C: pop {r0} bx r0 .align 2, 0 -_0802BB98: .4byte gUnknown_2023DFC -_0802BB9C: .4byte gUnknown_2023D6B +_0802BB98: .4byte gStatuses3 +_0802BB9C: .4byte sBattler_AI _0802BBA0: .4byte gUnknown_2023D74 thumb_func_end atkC5_setsemiinvulnerablebit thumb_func_start atkC6_clearsemiinvulnerablebit atkC6_clearsemiinvulnerablebit: @ 802BBA4 push {lr} - ldr r0, _0802BBB8 @ =gUnknown_2023D4A + ldr r0, _0802BBB8 @ =gCurrentMove ldrh r1, [r0] cmp r1, 0x5B beq _0802BBE8 @@ -28611,7 +28611,7 @@ atkC6_clearsemiinvulnerablebit: @ 802BBA4 beq _0802BBC8 b _0802BC16 .align 2, 0 -_0802BBB8: .4byte gUnknown_2023D4A +_0802BBB8: .4byte gCurrentMove _0802BBBC: ldr r0, _0802BBDC @ =0x00000123 cmp r1, r0 @@ -28620,8 +28620,8 @@ _0802BBBC: cmp r1, r0 bne _0802BC16 _0802BBC8: - ldr r2, _0802BBE0 @ =gUnknown_2023DFC - ldr r0, _0802BBE4 @ =gUnknown_2023D6B + ldr r2, _0802BBE0 @ =gStatuses3 + ldr r0, _0802BBE4 @ =sBattler_AI ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28631,11 +28631,11 @@ _0802BBC8: b _0802BC12 .align 2, 0 _0802BBDC: .4byte 0x00000123 -_0802BBE0: .4byte gUnknown_2023DFC -_0802BBE4: .4byte gUnknown_2023D6B +_0802BBE0: .4byte gStatuses3 +_0802BBE4: .4byte sBattler_AI _0802BBE8: - ldr r2, _0802BBFC @ =gUnknown_2023DFC - ldr r0, _0802BC00 @ =gUnknown_2023D6B + ldr r2, _0802BBFC @ =gStatuses3 + ldr r0, _0802BC00 @ =sBattler_AI ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28644,11 +28644,11 @@ _0802BBE8: negs r2, r2 b _0802BC12 .align 2, 0 -_0802BBFC: .4byte gUnknown_2023DFC -_0802BC00: .4byte gUnknown_2023D6B +_0802BBFC: .4byte gStatuses3 +_0802BC00: .4byte sBattler_AI _0802BC04: - ldr r2, _0802BC24 @ =gUnknown_2023DFC - ldr r0, _0802BC28 @ =gUnknown_2023D6B + ldr r2, _0802BC24 @ =gStatuses3 + ldr r0, _0802BC28 @ =sBattler_AI ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28665,8 +28665,8 @@ _0802BC16: pop {r0} bx r0 .align 2, 0 -_0802BC24: .4byte gUnknown_2023DFC -_0802BC28: .4byte gUnknown_2023D6B +_0802BC24: .4byte gStatuses3 +_0802BC28: .4byte sBattler_AI _0802BC2C: .4byte 0xfffbffff _0802BC30: .4byte gUnknown_2023D74 thumb_func_end atkC6_clearsemiinvulnerablebit @@ -28681,8 +28681,8 @@ atkC7_setminimize: @ 802BC34 ands r0, r1 cmp r0, 0 beq _0802BC58 - ldr r2, _0802BC68 @ =gUnknown_2023DFC - ldr r0, _0802BC6C @ =gUnknown_2023D6B + ldr r2, _0802BC68 @ =gStatuses3 + ldr r0, _0802BC6C @ =sBattler_AI ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -28700,22 +28700,22 @@ _0802BC58: bx r0 .align 2, 0 _0802BC64: .4byte gUnknown_2023DD0 -_0802BC68: .4byte gUnknown_2023DFC -_0802BC6C: .4byte gUnknown_2023D6B +_0802BC68: .4byte gStatuses3 +_0802BC6C: .4byte sBattler_AI _0802BC70: .4byte gUnknown_2023D74 thumb_func_end atkC7_setminimize thumb_func_start atkC8_sethail atkC8_sethail: @ 802BC74 push {lr} - ldr r3, _0802BC98 @ =gUnknown_2023F1C + ldr r3, _0802BC98 @ =gBattleWeather ldrh r1, [r3] movs r2, 0x80 adds r0, r2, 0 ands r0, r1 cmp r0, 0 beq _0802BCA4 - ldr r2, _0802BC9C @ =gUnknown_2023DCC + ldr r2, _0802BC9C @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -28725,8 +28725,8 @@ atkC8_sethail: @ 802BC74 strb r0, [r1, 0x5] b _0802BCB2 .align 2, 0 -_0802BC98: .4byte gUnknown_2023F1C -_0802BC9C: .4byte gUnknown_2023DCC +_0802BC98: .4byte gBattleWeather +_0802BC9C: .4byte gMoveResultFlags _0802BCA0: .4byte gUnknown_2023E82 _0802BCA4: strh r2, [r3] @@ -28752,8 +28752,8 @@ _0802BCC8: .4byte gUnknown_2023D74 thumb_func_start atkC9_jumpifattackandspecialattackcannotfall atkC9_jumpifattackandspecialattackcannotfall: @ 802BCCC push {r4,lr} - ldr r2, _0802BD10 @ =gUnknown_2023BE4 - ldr r0, _0802BD14 @ =gUnknown_2023D6C + ldr r2, _0802BD10 @ =gBattleMons + ldr r0, _0802BD14 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -28786,16 +28786,16 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 802BCCC str r1, [r3] b _0802BD4C .align 2, 0 -_0802BD10: .4byte gUnknown_2023BE4 -_0802BD14: .4byte gUnknown_2023D6C +_0802BD10: .4byte gBattleMons +_0802BD14: .4byte gBattlerTarget _0802BD18: .4byte gUnknown_2023E82 _0802BD1C: .4byte gUnknown_2023D74 _0802BD20: - ldr r4, _0802BD54 @ =gUnknown_2023BC4 - ldr r0, _0802BD58 @ =gUnknown_2023D6B + ldr r4, _0802BD54 @ =gActiveBattler + ldr r0, _0802BD58 @ =sBattler_AI ldrb r0, [r0] strb r0, [r4] - ldr r2, _0802BD5C @ =gUnknown_2023D50 + ldr r2, _0802BD5C @ =gBattleMoveDamage ldrb r1, [r4] movs r0, 0x58 muls r0, r1 @@ -28816,9 +28816,9 @@ _0802BD4C: pop {r0} bx r0 .align 2, 0 -_0802BD54: .4byte gUnknown_2023BC4 -_0802BD58: .4byte gUnknown_2023D6B -_0802BD5C: .4byte gUnknown_2023D50 +_0802BD54: .4byte gActiveBattler +_0802BD58: .4byte sBattler_AI +_0802BD5C: .4byte gBattleMoveDamage _0802BD60: .4byte 0x00007fff _0802BD64: .4byte gUnknown_2023D74 thumb_func_end atkC9_jumpifattackandspecialattackcannotfall @@ -28826,7 +28826,7 @@ _0802BD64: .4byte gUnknown_2023D74 thumb_func_start atkCA_setforcedtarget atkCA_setforcedtarget: @ 802BD68 push {r4,r5,lr} - ldr r4, _0802BDA8 @ =gUnknown_2023D6B + ldr r4, _0802BDA8 @ =sBattler_AI ldrb r0, [r4] bl GetBankSide ldr r5, _0802BDAC @ =gUnknown_2023DE4 @@ -28856,7 +28856,7 @@ atkCA_setforcedtarget: @ 802BD68 pop {r0} bx r0 .align 2, 0 -_0802BDA8: .4byte gUnknown_2023D6B +_0802BDA8: .4byte sBattler_AI _0802BDAC: .4byte gUnknown_2023DE4 _0802BDB0: .4byte gUnknown_2023D74 thumb_func_end atkCA_setforcedtarget @@ -28864,8 +28864,8 @@ _0802BDB0: .4byte gUnknown_2023D74 thumb_func_start atkCB_setcharge atkCB_setcharge: @ 802BDB4 push {r4,lr} - ldr r0, _0802BE08 @ =gUnknown_2023DFC - ldr r3, _0802BE0C @ =gUnknown_2023D6B + ldr r0, _0802BE08 @ =gStatuses3 + ldr r3, _0802BE0C @ =sBattler_AI ldrb r1, [r3] lsls r1, 2 adds r1, r0 @@ -28874,7 +28874,7 @@ atkCB_setcharge: @ 802BDB4 lsls r2, 2 orrs r0, r2 str r0, [r1] - ldr r4, _0802BE10 @ =gUnknown_2023E0C + ldr r4, _0802BE10 @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -28906,9 +28906,9 @@ atkCB_setcharge: @ 802BDB4 pop {r0} bx r0 .align 2, 0 -_0802BE08: .4byte gUnknown_2023DFC -_0802BE0C: .4byte gUnknown_2023D6B -_0802BE10: .4byte gUnknown_2023E0C +_0802BE08: .4byte gStatuses3 +_0802BE0C: .4byte sBattler_AI +_0802BE10: .4byte gDisableStructs _0802BE14: .4byte gUnknown_2023D74 thumb_func_end atkCB_setcharge @@ -28920,7 +28920,7 @@ atkCC_callterrainattack: @ 802BE18 ldr r1, _0802BE6C @ =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, _0802BE70 @ =gUnknown_2023D4A + ldr r4, _0802BE70 @ =gCurrentMove ldr r1, _0802BE74 @ =gUnknown_825081C ldr r0, _0802BE78 @ =gUnknown_2022B50 ldrb r0, [r0] @@ -28931,10 +28931,10 @@ atkCC_callterrainattack: @ 802BE18 ldrh r0, [r4] movs r1, 0 bl GetMoveTarget - ldr r1, _0802BE7C @ =gUnknown_2023D6C + ldr r1, _0802BE7C @ =gBattlerTarget strb r0, [r1] ldr r3, _0802BE80 @ =gUnknown_81D65A8 - ldr r2, _0802BE84 @ =gUnknown_8250C04 + ldr r2, _0802BE84 @ =gBattleMoves ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -28955,12 +28955,12 @@ atkCC_callterrainattack: @ 802BE18 .align 2, 0 _0802BE68: .4byte gUnknown_2023DD0 _0802BE6C: .4byte 0xfffffbff -_0802BE70: .4byte gUnknown_2023D4A +_0802BE70: .4byte gCurrentMove _0802BE74: .4byte gUnknown_825081C _0802BE78: .4byte gUnknown_2022B50 -_0802BE7C: .4byte gUnknown_2023D6C +_0802BE7C: .4byte gBattlerTarget _0802BE80: .4byte gUnknown_81D65A8 -_0802BE84: .4byte gUnknown_8250C04 +_0802BE84: .4byte gBattleMoves _0802BE88: .4byte gUnknown_2023D74 thumb_func_end atkCC_callterrainattack @@ -28968,8 +28968,8 @@ _0802BE88: .4byte gUnknown_2023D74 atkCD_cureifburnedparalysedorpoisoned: @ 802BE8C push {r4-r6,lr} sub sp, 0x4 - ldr r1, _0802BED8 @ =gUnknown_2023BE4 - ldr r3, _0802BEDC @ =gUnknown_2023D6B + ldr r1, _0802BED8 @ =gBattleMons + ldr r3, _0802BEDC @ =sBattler_AI ldrb r0, [r3] movs r6, 0x58 muls r0, r6 @@ -28987,7 +28987,7 @@ atkCD_cureifburnedparalysedorpoisoned: @ 802BE8C ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r4, _0802BEE4 @ =gUnknown_2023BC4 + ldr r4, _0802BEE4 @ =gActiveBattler ldrb r0, [r3] strb r0, [r4] ldrb r0, [r4] @@ -29003,10 +29003,10 @@ atkCD_cureifburnedparalysedorpoisoned: @ 802BE8C bl MarkBufferBankForExecution b _0802BF02 .align 2, 0 -_0802BED8: .4byte gUnknown_2023BE4 -_0802BEDC: .4byte gUnknown_2023D6B +_0802BED8: .4byte gBattleMons +_0802BEDC: .4byte sBattler_AI _0802BEE0: .4byte gUnknown_2023D74 -_0802BEE4: .4byte gUnknown_2023BC4 +_0802BEE4: .4byte gActiveBattler _0802BEE8: ldr r3, _0802BF0C @ =gUnknown_2023D74 ldr r2, [r3] @@ -29033,8 +29033,8 @@ _0802BF0C: .4byte gUnknown_2023D74 thumb_func_start atkCE_settorment atkCE_settorment: @ 802BF10 push {lr} - ldr r1, _0802BF48 @ =gUnknown_2023BE4 - ldr r0, _0802BF4C @ =gUnknown_2023D6C + ldr r1, _0802BF48 @ =gBattleMons + ldr r0, _0802BF4C @ =gBattlerTarget ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -29060,8 +29060,8 @@ atkCE_settorment: @ 802BF10 str r1, [r3] b _0802BF60 .align 2, 0 -_0802BF48: .4byte gUnknown_2023BE4 -_0802BF4C: .4byte gUnknown_2023D6C +_0802BF48: .4byte gBattleMons +_0802BF4C: .4byte gBattlerTarget _0802BF50: .4byte gUnknown_2023D74 _0802BF54: orrs r1, r2 @@ -29081,7 +29081,7 @@ _0802BF64: .4byte gUnknown_2023D74 atkCF_jumpifnodamage: @ 802BF68 push {lr} ldr r2, _0802BF94 @ =gUnknown_2023E8C - ldr r0, _0802BF98 @ =gUnknown_2023D6B + ldr r0, _0802BF98 @ =sBattler_AI ldrb r0, [r0] lsls r1, r0, 4 adds r0, r2, 0x4 @@ -29103,7 +29103,7 @@ _0802BF88: b _0802BFBA .align 2, 0 _0802BF94: .4byte gUnknown_2023E8C -_0802BF98: .4byte gUnknown_2023D6B +_0802BF98: .4byte sBattler_AI _0802BF9C: .4byte gUnknown_2023D74 _0802BFA0: ldr r3, _0802BFC0 @ =gUnknown_2023D74 @@ -29129,8 +29129,8 @@ _0802BFC0: .4byte gUnknown_2023D74 thumb_func_start atkD0_settaunt atkD0_settaunt: @ 802BFC4 push {r4,lr} - ldr r4, _0802C008 @ =gUnknown_2023E0C - ldr r3, _0802C00C @ =gUnknown_2023D6C + ldr r4, _0802C008 @ =gDisableStructs + ldr r3, _0802C00C @ =gBattlerTarget ldrb r0, [r3] lsls r1, r0, 3 subs r1, r0 @@ -29163,8 +29163,8 @@ atkD0_settaunt: @ 802BFC4 str r0, [r1] b _0802C02E .align 2, 0 -_0802C008: .4byte gUnknown_2023E0C -_0802C00C: .4byte gUnknown_2023D6C +_0802C008: .4byte gDisableStructs +_0802C00C: .4byte gBattlerTarget _0802C010: .4byte gUnknown_2023D74 _0802C014: ldr r3, _0802C034 @ =gUnknown_2023D74 @@ -29191,7 +29191,7 @@ _0802C034: .4byte gUnknown_2023D74 thumb_func_start atkD1_trysethelpinghand atkD1_trysethelpinghand: @ 802C038 push {r4,lr} - ldr r4, _0802C0A0 @ =gUnknown_2023D6B + ldr r4, _0802C0A0 @ =sBattler_AI ldrb r0, [r4] bl GetBankIdentity movs r1, 0x2 @@ -29199,17 +29199,17 @@ atkD1_trysethelpinghand: @ 802C038 lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r3, _0802C0A4 @ =gUnknown_2023D6C + ldr r3, _0802C0A4 @ =gBattlerTarget strb r0, [r3] - ldr r0, _0802C0A8 @ =gUnknown_2022B4C + ldr r0, _0802C0A8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0802C0BC - ldr r0, _0802C0AC @ =gUnknown_2023D70 + ldr r0, _0802C0AC @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0802C0B0 @ =gUnknown_825E45C + ldr r2, _0802C0B0 @ =gBitTable ldrb r3, [r3] lsls r0, r3, 2 adds r0, r2 @@ -29240,11 +29240,11 @@ atkD1_trysethelpinghand: @ 802C038 str r0, [r1] b _0802C0D6 .align 2, 0 -_0802C0A0: .4byte gUnknown_2023D6B -_0802C0A4: .4byte gUnknown_2023D6C -_0802C0A8: .4byte gUnknown_2022B4C -_0802C0AC: .4byte gUnknown_2023D70 -_0802C0B0: .4byte gUnknown_825E45C +_0802C0A0: .4byte sBattler_AI +_0802C0A4: .4byte gBattlerTarget +_0802C0A8: .4byte gBattleTypeFlags +_0802C0AC: .4byte gAbsentBattlerFlags +_0802C0B0: .4byte gBitTable _0802C0B4: .4byte gUnknown_2023E8C _0802C0B8: .4byte gUnknown_2023D74 _0802C0BC: @@ -29277,14 +29277,14 @@ sub_802C0E0: @ 802C0E0 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r4, _0802C1FC @ =gUnknown_2022B4C + ldr r4, _0802C1FC @ =gBattleTypeFlags ldr r0, [r4] movs r1, 0x80 lsls r1, 12 ands r0, r1 cmp r0, 0 bne _0802C1DE - ldr r0, _0802C200 @ =gUnknown_2023D6B + ldr r0, _0802C200 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -29296,30 +29296,30 @@ sub_802C0E0: @ 802C0E0 ands r0, r1 cmp r0, 0 bne _0802C120 - ldr r0, _0802C208 @ =gUnknown_20386AE + ldr r0, _0802C208 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 cmp r1, r0 bne _0802C1DE _0802C120: - ldr r6, _0802C200 @ =gUnknown_2023D6B + ldr r6, _0802C200 @ =sBattler_AI ldrb r0, [r6] bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 - ldr r7, _0802C20C @ =gUnknown_2023D6C + ldr r7, _0802C20C @ =gBattlerTarget ldrb r0, [r7] bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0802C1FC @ =gUnknown_2022B4C + ldr r0, _0802C1FC @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _0802C204 @ =0x00000902 ands r0, r1 cmp r0, 0 bne _0802C18A - ldr r0, _0802C208 @ =gUnknown_20386AE + ldr r0, _0802C208 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -29330,8 +29330,8 @@ _0802C120: adds r2, 0x29 adds r0, r4, r2 ldrb r1, [r0] - ldr r4, _0802C214 @ =gUnknown_825E45C - ldr r3, _0802C218 @ =gUnknown_2023BCE + ldr r4, _0802C214 @ =gBitTable + ldr r3, _0802C218 @ =gBattlerPartyIndexes ldrb r0, [r6] lsls r0, 1 adds r0, r3 @@ -29355,9 +29355,9 @@ _0802C120: cmp r1, 0 bne _0802C1DE _0802C18A: - ldr r0, _0802C21C @ =gUnknown_2023BE4 + ldr r0, _0802C21C @ =gBattleMons mov r8, r0 - ldr r1, _0802C200 @ =gUnknown_2023D6B + ldr r1, _0802C200 @ =sBattler_AI ldrb r4, [r1] movs r5, 0x58 adds r0, r4, 0 @@ -29368,7 +29368,7 @@ _0802C18A: adds r1, r3, 0 cmp r1, 0 bne _0802C1B2 - ldr r0, _0802C20C @ =gUnknown_2023D6C + ldr r0, _0802C20C @ =gBattlerTarget ldrb r0, [r0] muls r0, r5 add r0, r8 @@ -29378,7 +29378,7 @@ _0802C18A: _0802C1B2: cmp r1, 0xAF beq _0802C1DE - ldr r7, _0802C20C @ =gUnknown_2023D6C + ldr r7, _0802C20C @ =gBattlerTarget ldrb r0, [r7] muls r0, r5 mov r2, r8 @@ -29414,15 +29414,15 @@ _0802C1DE: str r1, [r3] b _0802C37A .align 2, 0 -_0802C1FC: .4byte gUnknown_2022B4C -_0802C200: .4byte gUnknown_2023D6B +_0802C1FC: .4byte gBattleTypeFlags +_0802C200: .4byte sBattler_AI _0802C204: .4byte 0x00000902 -_0802C208: .4byte gUnknown_20386AE -_0802C20C: .4byte gUnknown_2023D6C +_0802C208: .4byte gTrainerBattleOpponent_A +_0802C20C: .4byte gBattlerTarget _0802C210: .4byte gUnknown_2023F20 -_0802C214: .4byte gUnknown_825E45C -_0802C218: .4byte gUnknown_2023BCE -_0802C21C: .4byte gUnknown_2023BE4 +_0802C214: .4byte gBitTable +_0802C218: .4byte gBattlerPartyIndexes +_0802C21C: .4byte gBattleMons _0802C220: .4byte gUnknown_2023D74 _0802C224: adds r0, r1, 0 @@ -29449,7 +29449,7 @@ _0802C24C: .4byte gUnknown_2023D74 _0802C250: .4byte gUnknown_81D948E _0802C254: .4byte gUnknown_2023D6A _0802C258: - ldr r3, _0802C344 @ =gUnknown_2023FE8 + ldr r3, _0802C344 @ =gBattleStruct mov r10, r3 lsls r0, r4, 1 adds r0, 0xD0 @@ -29459,7 +29459,7 @@ _0802C258: ldrh r0, [r0, 0x2E] mov r9, r0 strh r2, [r6] - ldr r1, _0802C348 @ =gUnknown_2023D6B + ldr r1, _0802C348 @ =sBattler_AI ldrb r0, [r1] muls r0, r5 add r0, r8 @@ -29470,8 +29470,8 @@ _0802C258: add r0, r8 mov r2, r9 strh r2, [r0, 0x2E] - ldr r4, _0802C34C @ =gUnknown_2023BC4 - ldr r3, _0802C348 @ =gUnknown_2023D6B + ldr r4, _0802C34C @ =gActiveBattler + ldr r3, _0802C348 @ =sBattler_AI ldrb r0, [r3] strb r0, [r4] str r6, [sp] @@ -29480,7 +29480,7 @@ _0802C258: movs r2, 0 movs r3, 0x2 bl EmitSetMonData - ldr r1, _0802C348 @ =gUnknown_2023D6B + ldr r1, _0802C348 @ =sBattler_AI ldrb r0, [r1] bl MarkBufferBankForExecution ldrb r0, [r7] @@ -29512,14 +29512,14 @@ _0802C258: adds r0, r1 adds r0, 0xC9 strb r3, [r0] - ldr r1, _0802C348 @ =gUnknown_2023D6B + ldr r1, _0802C348 @ =sBattler_AI ldrb r0, [r1] ldr r1, [r2] lsls r0, 1 adds r0, r1 adds r0, 0xC8 strb r3, [r0] - ldr r2, _0802C348 @ =gUnknown_2023D6B + ldr r2, _0802C348 @ =sBattler_AI ldrb r0, [r2] mov r3, r10 ldr r1, [r3] @@ -29564,9 +29564,9 @@ _0802C258: movs r0, 0x2 b _0802C378 .align 2, 0 -_0802C344: .4byte gUnknown_2023FE8 -_0802C348: .4byte gUnknown_2023D6B -_0802C34C: .4byte gUnknown_2023BC4 +_0802C344: .4byte gBattleStruct +_0802C348: .4byte sBattler_AI +_0802C34C: .4byte gActiveBattler _0802C350: .4byte gUnknown_2023D74 _0802C354: .4byte gUnknown_2022AB8 _0802C358: .4byte gUnknown_2022AC8 @@ -29602,8 +29602,8 @@ _0802C38C: .4byte gUnknown_2023E82 thumb_func_start atkD3_trycopyability atkD3_trycopyability: @ 802C390 push {r4,lr} - ldr r3, _0802C3D0 @ =gUnknown_2023BE4 - ldr r4, _0802C3D4 @ =gUnknown_2023D6C + ldr r3, _0802C3D0 @ =gBattleMons + ldr r4, _0802C3D4 @ =gBattlerTarget ldrb r0, [r4] movs r2, 0x58 muls r0, r2 @@ -29615,7 +29615,7 @@ atkD3_trycopyability: @ 802C390 beq _0802C3E4 cmp r0, 0x19 beq _0802C3E4 - ldr r0, _0802C3D8 @ =gUnknown_2023D6B + ldr r0, _0802C3D8 @ =sBattler_AI ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -29634,9 +29634,9 @@ atkD3_trycopyability: @ 802C390 str r0, [r1] b _0802C3FE .align 2, 0 -_0802C3D0: .4byte gUnknown_2023BE4 -_0802C3D4: .4byte gUnknown_2023D6C -_0802C3D8: .4byte gUnknown_2023D6B +_0802C3D0: .4byte gBattleMons +_0802C3D4: .4byte gBattlerTarget +_0802C3D8: .4byte sBattler_AI _0802C3DC: .4byte gUnknown_2023D6A _0802C3E0: .4byte gUnknown_2023D74 _0802C3E4: @@ -29676,7 +29676,7 @@ atkD4_trywish: @ 802C408 _0802C41C: .4byte gUnknown_2023D74 _0802C420: ldr r1, _0802C44C @ =gUnknown_2023F20 - ldr r4, _0802C450 @ =gUnknown_2023D6B + ldr r4, _0802C450 @ =sBattler_AI adds r0, r1, 0 adds r0, 0x20 ldrb r5, [r4] @@ -29689,7 +29689,7 @@ _0802C420: ldrb r0, [r4] adds r1, 0x24 adds r1, r0, r1 - ldr r2, _0802C454 @ =gUnknown_2023BCE + ldr r2, _0802C454 @ =gBattlerPartyIndexes lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -29699,15 +29699,15 @@ _0802C420: b _0802C4D2 .align 2, 0 _0802C44C: .4byte gUnknown_2023F20 -_0802C450: .4byte gUnknown_2023D6B -_0802C454: .4byte gUnknown_2023BCE +_0802C450: .4byte sBattler_AI +_0802C454: .4byte gBattlerPartyIndexes _0802C458: ldr r1, _0802C4BC @ =gUnknown_2022AB8 movs r0, 0xFD strb r0, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r4, _0802C4C0 @ =gUnknown_2023D6C + ldr r4, _0802C4C0 @ =gBattlerTarget ldrb r0, [r4] strb r0, [r1, 0x2] ldr r0, _0802C4C4 @ =gUnknown_2023F20 @@ -29718,8 +29718,8 @@ _0802C458: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0802C4C8 @ =gUnknown_2023D50 - ldr r6, _0802C4CC @ =gUnknown_2023BE4 + ldr r1, _0802C4C8 @ =gBattleMoveDamage + ldr r6, _0802C4CC @ =gBattleMons ldrb r0, [r4] movs r5, 0x58 muls r0, r5 @@ -29756,10 +29756,10 @@ _0802C4A4: b _0802C4D4 .align 2, 0 _0802C4BC: .4byte gUnknown_2022AB8 -_0802C4C0: .4byte gUnknown_2023D6C +_0802C4C0: .4byte gBattlerTarget _0802C4C4: .4byte gUnknown_2023F20 -_0802C4C8: .4byte gUnknown_2023D50 -_0802C4CC: .4byte gUnknown_2023BE4 +_0802C4C8: .4byte gBattleMoveDamage +_0802C4CC: .4byte gBattleMons _0802C4D0: adds r0, r2, 0x6 _0802C4D2: @@ -29773,8 +29773,8 @@ _0802C4D4: thumb_func_start atkD5_trysetroots atkD5_trysetroots: @ 802C4DC push {lr} - ldr r1, _0802C514 @ =gUnknown_2023DFC - ldr r0, _0802C518 @ =gUnknown_2023D6B + ldr r1, _0802C514 @ =gStatuses3 + ldr r0, _0802C518 @ =sBattler_AI ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -29800,8 +29800,8 @@ atkD5_trysetroots: @ 802C4DC str r1, [r3] b _0802C52C .align 2, 0 -_0802C514: .4byte gUnknown_2023DFC -_0802C518: .4byte gUnknown_2023D6B +_0802C514: .4byte gStatuses3 +_0802C518: .4byte sBattler_AI _0802C51C: .4byte gUnknown_2023D74 _0802C520: orrs r1, r3 @@ -29821,7 +29821,7 @@ _0802C530: .4byte gUnknown_2023D74 atkD6_doubledamagedealtifdamaged: @ 802C534 push {lr} ldr r3, _0802C580 @ =gUnknown_2023E8C - ldr r0, _0802C584 @ =gUnknown_2023D6B + ldr r0, _0802C584 @ =sBattler_AI ldrb r0, [r0] lsls r2, r0, 4 adds r0, r3, 0x4 @@ -29830,7 +29830,7 @@ atkD6_doubledamagedealtifdamaged: @ 802C534 cmp r0, 0 beq _0802C554 adds r0, r2, r3 - ldr r1, _0802C588 @ =gUnknown_2023D6C + ldr r1, _0802C588 @ =gBattlerTarget ldrb r0, [r0, 0xC] ldrb r1, [r1] cmp r0, r1 @@ -29843,13 +29843,13 @@ _0802C554: cmp r0, 0 beq _0802C572 adds r0, r2, r3 - ldr r1, _0802C588 @ =gUnknown_2023D6C + ldr r1, _0802C588 @ =gBattlerTarget ldrb r0, [r0, 0xD] ldrb r1, [r1] cmp r0, r1 bne _0802C572 _0802C56C: - ldr r1, _0802C58C @ =gUnknown_2023FC4 + ldr r1, _0802C58C @ =gBattleScripting movs r0, 0x2 strb r0, [r1, 0xE] _0802C572: @@ -29861,17 +29861,17 @@ _0802C572: bx r0 .align 2, 0 _0802C580: .4byte gUnknown_2023E8C -_0802C584: .4byte gUnknown_2023D6B -_0802C588: .4byte gUnknown_2023D6C -_0802C58C: .4byte gUnknown_2023FC4 +_0802C584: .4byte sBattler_AI +_0802C588: .4byte gBattlerTarget +_0802C58C: .4byte gBattleScripting _0802C590: .4byte gUnknown_2023D74 thumb_func_end atkD6_doubledamagedealtifdamaged thumb_func_start atkD7_setyawn atkD7_setyawn: @ 802C594 push {r4,lr} - ldr r1, _0802C5D8 @ =gUnknown_2023DFC - ldr r0, _0802C5DC @ =gUnknown_2023D6C + ldr r1, _0802C5D8 @ =gStatuses3 + ldr r0, _0802C5DC @ =gBattlerTarget ldrb r3, [r0] lsls r0, r3, 2 adds r4, r0, r1 @@ -29881,7 +29881,7 @@ atkD7_setyawn: @ 802C594 ands r0, r2 cmp r0, 0 bne _0802C5BC - ldr r1, _0802C5E0 @ =gUnknown_2023BE4 + ldr r1, _0802C5E0 @ =gBattleMons movs r0, 0x58 muls r0, r3 adds r1, 0x4C @@ -29905,9 +29905,9 @@ _0802C5BC: str r1, [r3] b _0802C5F8 .align 2, 0 -_0802C5D8: .4byte gUnknown_2023DFC -_0802C5DC: .4byte gUnknown_2023D6C -_0802C5E0: .4byte gUnknown_2023BE4 +_0802C5D8: .4byte gStatuses3 +_0802C5DC: .4byte gBattlerTarget +_0802C5E0: .4byte gBattleMons _0802C5E4: .4byte gUnknown_2023D74 _0802C5E8: movs r0, 0x80 @@ -29929,13 +29929,13 @@ _0802C600: .4byte gUnknown_2023D74 thumb_func_start atkD8_setdamagetohealthdifference atkD8_setdamagetohealthdifference: @ 802C604 push {lr} - ldr r2, _0802C640 @ =gUnknown_2023BE4 - ldr r0, _0802C644 @ =gUnknown_2023D6C + ldr r2, _0802C640 @ =gBattleMons + ldr r0, _0802C644 @ =gBattlerTarget ldrb r0, [r0] movs r1, 0x58 muls r0, r1 adds r3, r0, r2 - ldr r0, _0802C648 @ =gUnknown_2023D6B + ldr r0, _0802C648 @ =sBattler_AI ldrb r0, [r0] muls r0, r1 adds r1, r0, r2 @@ -29958,12 +29958,12 @@ atkD8_setdamagetohealthdifference: @ 802C604 str r1, [r3] b _0802C662 .align 2, 0 -_0802C640: .4byte gUnknown_2023BE4 -_0802C644: .4byte gUnknown_2023D6C -_0802C648: .4byte gUnknown_2023D6B +_0802C640: .4byte gBattleMons +_0802C644: .4byte gBattlerTarget +_0802C648: .4byte sBattler_AI _0802C64C: .4byte gUnknown_2023D74 _0802C650: - ldr r2, _0802C668 @ =gUnknown_2023D50 + ldr r2, _0802C668 @ =gBattleMoveDamage ldrh r0, [r3, 0x28] ldrh r1, [r1, 0x28] subs r0, r1 @@ -29976,27 +29976,27 @@ _0802C662: pop {r0} bx r0 .align 2, 0 -_0802C668: .4byte gUnknown_2023D50 +_0802C668: .4byte gBattleMoveDamage _0802C66C: .4byte gUnknown_2023D74 thumb_func_end atkD8_setdamagetohealthdifference thumb_func_start atkD9_scaledamagebyhealthratio atkD9_scaledamagebyhealthratio: @ 802C670 push {r4,lr} - ldr r4, _0802C6BC @ =gUnknown_2023F50 + ldr r4, _0802C6BC @ =gDynamicBasePower ldrh r0, [r4] cmp r0, 0 bne _0802C6AC - ldr r2, _0802C6C0 @ =gUnknown_8250C04 - ldr r0, _0802C6C4 @ =gUnknown_2023D4A + ldr r2, _0802C6C0 @ =gBattleMoves + ldr r0, _0802C6C4 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 lsls r0, 2 adds r0, r2 ldrb r3, [r0, 0x1] - ldr r2, _0802C6C8 @ =gUnknown_2023BE4 - ldr r0, _0802C6CC @ =gUnknown_2023D6B + ldr r2, _0802C6C8 @ =gBattleMons + ldr r0, _0802C6CC @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -30020,19 +30020,19 @@ _0802C6AC: pop {r0} bx r0 .align 2, 0 -_0802C6BC: .4byte gUnknown_2023F50 -_0802C6C0: .4byte gUnknown_8250C04 -_0802C6C4: .4byte gUnknown_2023D4A -_0802C6C8: .4byte gUnknown_2023BE4 -_0802C6CC: .4byte gUnknown_2023D6B +_0802C6BC: .4byte gDynamicBasePower +_0802C6C0: .4byte gBattleMoves +_0802C6C4: .4byte gCurrentMove +_0802C6C8: .4byte gBattleMons +_0802C6CC: .4byte sBattler_AI _0802C6D0: .4byte gUnknown_2023D74 thumb_func_end atkD9_scaledamagebyhealthratio thumb_func_start atkDA_tryswapabilities atkDA_tryswapabilities: @ 802C6D4 push {r4-r6,lr} - ldr r5, _0802C738 @ =gUnknown_2023BE4 - ldr r0, _0802C73C @ =gUnknown_2023D6B + ldr r5, _0802C738 @ =gBattleMons + ldr r0, _0802C73C @ =sBattler_AI ldrb r0, [r0] movs r4, 0x58 muls r0, r4 @@ -30042,7 +30042,7 @@ atkDA_tryswapabilities: @ 802C6D4 ldrb r1, [r2] cmp r1, 0 bne _0802C6FC - ldr r0, _0802C740 @ =gUnknown_2023D6C + ldr r0, _0802C740 @ =gBattlerTarget ldrb r0, [r0] muls r0, r4 adds r0, r5 @@ -30053,7 +30053,7 @@ atkDA_tryswapabilities: @ 802C6D4 _0802C6FC: cmp r1, 0x19 beq _0802C71C - ldr r6, _0802C740 @ =gUnknown_2023D6C + ldr r6, _0802C740 @ =gBattlerTarget ldrb r0, [r6] muls r0, r4 adds r0, r5 @@ -30061,7 +30061,7 @@ _0802C6FC: ldrb r3, [r0] cmp r3, 0x19 beq _0802C71C - ldr r0, _0802C744 @ =gUnknown_2023DCC + ldr r0, _0802C744 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -30083,10 +30083,10 @@ _0802C71C: str r1, [r3] b _0802C762 .align 2, 0 -_0802C738: .4byte gUnknown_2023BE4 -_0802C73C: .4byte gUnknown_2023D6B -_0802C740: .4byte gUnknown_2023D6C -_0802C744: .4byte gUnknown_2023DCC +_0802C738: .4byte gBattleMons +_0802C73C: .4byte sBattler_AI +_0802C740: .4byte gBattlerTarget +_0802C744: .4byte gMoveResultFlags _0802C748: .4byte gUnknown_2023D74 _0802C74C: ldrb r1, [r2] @@ -30114,8 +30114,8 @@ atkDB_tryimprision: @ 802C76C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r1, _0802C78C @ =gUnknown_2023DFC - ldr r4, _0802C790 @ =gUnknown_2023D6B + ldr r1, _0802C78C @ =gStatuses3 + ldr r4, _0802C790 @ =sBattler_AI ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -30127,10 +30127,10 @@ atkDB_tryimprision: @ 802C76C beq _0802C7BC b _0802C83E .align 2, 0 -_0802C78C: .4byte gUnknown_2023DFC -_0802C790: .4byte gUnknown_2023D6B +_0802C78C: .4byte gStatuses3 +_0802C790: .4byte sBattler_AI _0802C794: - ldr r0, _0802C7B4 @ =gUnknown_2023DFC + ldr r0, _0802C7B4 @ =gStatuses3 mov r2, r9 ldrb r1, [r2] lsls r1, 2 @@ -30146,7 +30146,7 @@ _0802C794: str r0, [r1] b _0802C836 .align 2, 0 -_0802C7B4: .4byte gUnknown_2023DFC +_0802C7B4: .4byte gStatuses3 _0802C7B8: .4byte gUnknown_2023D74 _0802C7BC: adds r0, r2, 0 @@ -30166,9 +30166,9 @@ _0802C7D2: cmp r8, r0 beq _0802C828 movs r4, 0 - ldr r7, _0802C864 @ =gUnknown_2023D6B + ldr r7, _0802C864 @ =sBattler_AI mov r9, r7 - ldr r0, _0802C868 @ =gUnknown_2023BE4 + ldr r0, _0802C868 @ =gBattleMons mov r12, r0 mov r1, r9 ldrb r0, [r1] @@ -30242,8 +30242,8 @@ _0802C858: pop {r0} bx r0 .align 2, 0 -_0802C864: .4byte gUnknown_2023D6B -_0802C868: .4byte gUnknown_2023BE4 +_0802C864: .4byte sBattler_AI +_0802C868: .4byte gBattleMons _0802C86C: .4byte gUnknown_2023BCC _0802C870: .4byte gUnknown_2023D74 thumb_func_end atkDB_tryimprision @@ -30251,8 +30251,8 @@ _0802C870: .4byte gUnknown_2023D74 thumb_func_start atkDC_trysetgrudge atkDC_trysetgrudge: @ 802C874 push {lr} - ldr r1, _0802C8AC @ =gUnknown_2023DFC - ldr r0, _0802C8B0 @ =gUnknown_2023D6B + ldr r1, _0802C8AC @ =gStatuses3 + ldr r0, _0802C8B0 @ =sBattler_AI ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -30278,8 +30278,8 @@ atkDC_trysetgrudge: @ 802C874 str r1, [r3] b _0802C8C4 .align 2, 0 -_0802C8AC: .4byte gUnknown_2023DFC -_0802C8B0: .4byte gUnknown_2023D6B +_0802C8AC: .4byte gStatuses3 +_0802C8B0: .4byte sBattler_AI _0802C8B4: .4byte gUnknown_2023D74 _0802C8B8: orrs r1, r3 @@ -30307,12 +30307,12 @@ atkDD_weightdamagecalculation: @ 802C8CC cmp r0, r1 beq _0802C944 adds r6, r2, 0 - ldr r0, _0802C938 @ =gUnknown_2023BE4 + ldr r0, _0802C938 @ =gBattleMons mov r8, r0 adds r7, r1, 0 adds r4, r6, 0 _0802C8E8: - ldr r0, _0802C93C @ =gUnknown_2023D6C + ldr r0, _0802C93C @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -30340,7 +30340,7 @@ _0802C916: ldr r0, _0802C934 @ =0x0000ffff cmp r1, r0 beq _0802C944 - ldr r0, _0802C940 @ =gUnknown_2023F50 + ldr r0, _0802C940 @ =gDynamicBasePower adds r1, r5, 0x1 lsls r1, 1 adds r1, r6 @@ -30350,11 +30350,11 @@ _0802C916: .align 2, 0 _0802C930: .4byte gUnknown_8250830 _0802C934: .4byte 0x0000ffff -_0802C938: .4byte gUnknown_2023BE4 -_0802C93C: .4byte gUnknown_2023D6C -_0802C940: .4byte gUnknown_2023F50 +_0802C938: .4byte gBattleMons +_0802C93C: .4byte gBattlerTarget +_0802C940: .4byte gDynamicBasePower _0802C944: - ldr r1, _0802C95C @ =gUnknown_2023F50 + ldr r1, _0802C95C @ =gDynamicBasePower movs r0, 0x78 strh r0, [r1] _0802C94A: @@ -30368,7 +30368,7 @@ _0802C94A: pop {r0} bx r0 .align 2, 0 -_0802C95C: .4byte gUnknown_2023F50 +_0802C95C: .4byte gDynamicBasePower _0802C960: .4byte gUnknown_2023D74 thumb_func_end atkDD_weightdamagecalculation @@ -30382,26 +30382,26 @@ atkDE_asistattackselect: @ 802C964 sub sp, 0xC movs r0, 0 mov r10, r0 - ldr r0, _0802CA84 @ =gUnknown_2023FE8 + ldr r0, _0802CA84 @ =gBattleStruct ldr r0, [r0] adds r0, 0x18 str r0, [sp, 0x4] - ldr r0, _0802CA88 @ =gUnknown_2023D6B + ldr r0, _0802CA88 @ =sBattler_AI ldrb r0, [r0] bl GetBankIdentity movs r1, 0x1 ands r1, r0 - ldr r0, _0802CA8C @ =gUnknown_2024284 + ldr r0, _0802CA8C @ =gPlayerParty str r0, [sp] cmp r1, 0 beq _0802C994 - ldr r1, _0802CA90 @ =gUnknown_202402C + ldr r1, _0802CA90 @ =gEnemyParty str r1, [sp] _0802C994: movs r2, 0 _0802C996: - ldr r1, _0802CA94 @ =gUnknown_2023BCE - ldr r0, _0802CA88 @ =gUnknown_2023D6B + ldr r1, _0802CA94 @ =gBattlerPartyIndexes + ldr r0, _0802CA88 @ =sBattler_AI ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -30511,7 +30511,7 @@ _0802CA3C: ldrh r0, [r4] movs r1, 0 bl GetMoveTarget - ldr r1, _0802CAAC @ =gUnknown_2023D6C + ldr r1, _0802CAAC @ =gBattlerTarget strb r0, [r1] ldr r1, _0802CAB0 @ =gUnknown_2023D74 ldr r0, [r1] @@ -30519,17 +30519,17 @@ _0802CA3C: str r0, [r1] b _0802CACE .align 2, 0 -_0802CA84: .4byte gUnknown_2023FE8 -_0802CA88: .4byte gUnknown_2023D6B -_0802CA8C: .4byte gUnknown_2024284 -_0802CA90: .4byte gUnknown_202402C -_0802CA94: .4byte gUnknown_2023BCE +_0802CA84: .4byte gBattleStruct +_0802CA88: .4byte sBattler_AI +_0802CA8C: .4byte gPlayerParty +_0802CA90: .4byte gEnemyParty +_0802CA94: .4byte gBattlerPartyIndexes _0802CA98: .4byte 0x0000ffff _0802CA9C: .4byte gUnknown_82507E8 _0802CAA0: .4byte gUnknown_2023DD0 _0802CAA4: .4byte 0xfffffbff _0802CAA8: .4byte gUnknown_2023D4E -_0802CAAC: .4byte gUnknown_2023D6C +_0802CAAC: .4byte gBattlerTarget _0802CAB0: .4byte gUnknown_2023D74 _0802CAB4: ldr r3, _0802CAE0 @ =gUnknown_2023D74 @@ -30561,8 +30561,8 @@ _0802CAE0: .4byte gUnknown_2023D74 thumb_func_start atkDF_trysetmagiccoat atkDF_trysetmagiccoat: @ 802CAE4 push {lr} - ldr r1, _0802CB2C @ =gUnknown_2023D6C - ldr r3, _0802CB30 @ =gUnknown_2023D6B + ldr r1, _0802CB2C @ =gBattlerTarget + ldr r3, _0802CB30 @ =sBattler_AI ldrb r0, [r3] strb r0, [r1] ldr r2, _0802CB34 @ =gUnknown_2023ECC @@ -30597,8 +30597,8 @@ atkDF_trysetmagiccoat: @ 802CAE4 str r1, [r3] b _0802CB5C .align 2, 0 -_0802CB2C: .4byte gUnknown_2023D6C -_0802CB30: .4byte gUnknown_2023D6B +_0802CB2C: .4byte gBattlerTarget +_0802CB30: .4byte sBattler_AI _0802CB34: .4byte gUnknown_2023ECC _0802CB38: .4byte gUnknown_2023BE2 _0802CB3C: .4byte gUnknown_2023BCC @@ -30628,7 +30628,7 @@ _0802CB64: .4byte gUnknown_2023D74 atkE0_trysetsnatch: @ 802CB68 push {lr} ldr r2, _0802CBAC @ =gUnknown_2023ECC - ldr r3, _0802CBB0 @ =gUnknown_2023D6B + ldr r3, _0802CBB0 @ =sBattler_AI ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -30661,7 +30661,7 @@ atkE0_trysetsnatch: @ 802CB68 b _0802CBD6 .align 2, 0 _0802CBAC: .4byte gUnknown_2023ECC -_0802CBB0: .4byte gUnknown_2023D6B +_0802CBB0: .4byte sBattler_AI _0802CBB4: .4byte gUnknown_2023BE2 _0802CBB8: .4byte gUnknown_2023BCC _0802CBBC: .4byte gUnknown_2023D74 @@ -30688,8 +30688,8 @@ _0802CBE0: .4byte gUnknown_2023D74 thumb_func_start atkE1_trygetintimidatetarget atkE1_trygetintimidatetarget: @ 802CBE4 push {r4-r6,lr} - ldr r4, _0802CC88 @ =gUnknown_2023FC4 - ldr r0, _0802CC8C @ =gUnknown_2023FE8 + ldr r4, _0802CC88 @ =gBattleScripting + ldr r0, _0802CC8C @ =gBattleStruct ldr r0, [r0] adds r0, 0xD8 ldrb r0, [r0] @@ -30703,7 +30703,7 @@ atkE1_trygetintimidatetarget: @ 802CBE4 strb r0, [r2] movs r0, 0x9 strb r0, [r2, 0x1] - ldr r3, _0802CC94 @ =gUnknown_2023BE4 + ldr r3, _0802CC94 @ =gBattleMons ldrb r1, [r4, 0x17] movs r0, 0x58 muls r0, r1 @@ -30713,14 +30713,14 @@ atkE1_trygetintimidatetarget: @ 802CBE4 strb r0, [r2, 0x2] movs r0, 0xFF strb r0, [r2, 0x3] - ldr r2, _0802CC98 @ =gUnknown_2023D6C + ldr r2, _0802CC98 @ =gBattlerTarget ldr r1, _0802CC9C @ =gUnknown_2023BCC ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 bcs _0802CC6A adds r4, r2, 0 - ldr r6, _0802CCA0 @ =gUnknown_825E45C + ldr r6, _0802CCA0 @ =gBitTable _0802CC2A: ldrb r0, [r4] bl GetBankSide @@ -30728,7 +30728,7 @@ _0802CC2A: lsrs r0, 24 cmp r0, r5 beq _0802CC4C - ldr r0, _0802CCA4 @ =gUnknown_2023D70 + ldr r0, _0802CCA4 @ =gAbsentBattlerFlags ldrb r1, [r0] ldrb r0, [r4] lsls r0, 2 @@ -30750,7 +30750,7 @@ _0802CC4C: cmp r0, r1 bcc _0802CC2A _0802CC60: - ldr r0, _0802CC98 @ =gUnknown_2023D6C + ldr r0, _0802CC98 @ =gBattlerTarget ldrb r0, [r0] ldrb r2, [r2] cmp r0, r2 @@ -30771,14 +30771,14 @@ _0802CC6A: str r1, [r3] b _0802CCB4 .align 2, 0 -_0802CC88: .4byte gUnknown_2023FC4 -_0802CC8C: .4byte gUnknown_2023FE8 +_0802CC88: .4byte gBattleScripting +_0802CC8C: .4byte gBattleStruct _0802CC90: .4byte gUnknown_2022AB8 -_0802CC94: .4byte gUnknown_2023BE4 -_0802CC98: .4byte gUnknown_2023D6C +_0802CC94: .4byte gBattleMons +_0802CC98: .4byte gBattlerTarget _0802CC9C: .4byte gUnknown_2023BCC -_0802CCA0: .4byte gUnknown_825E45C -_0802CCA4: .4byte gUnknown_2023D70 +_0802CCA0: .4byte gBitTable +_0802CCA4: .4byte gAbsentBattlerFlags _0802CCA8: .4byte gUnknown_2023D74 _0802CCAC: ldr r1, _0802CCBC @ =gUnknown_2023D74 @@ -30801,9 +30801,9 @@ atkE2_switchoutabilities: @ 802CCC0 ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r4, _0802CD2C @ =gUnknown_2023BC4 + ldr r4, _0802CD2C @ =gActiveBattler strb r0, [r4] - ldr r3, _0802CD30 @ =gUnknown_2023BE4 + ldr r3, _0802CD30 @ =gBattleMons ldrb r0, [r4] movs r6, 0x58 adds r1, r0, 0 @@ -30817,9 +30817,9 @@ atkE2_switchoutabilities: @ 802CCC0 adds r1, r3 movs r0, 0 str r0, [r1] - ldr r2, _0802CD34 @ =gUnknown_825E45C + ldr r2, _0802CD34 @ =gBitTable ldrb r1, [r4] - ldr r0, _0802CD38 @ =gUnknown_2023FE8 + ldr r0, _0802CD38 @ =gBattleStruct ldr r0, [r0] adds r0, r1, r0 adds r0, 0x58 @@ -30847,10 +30847,10 @@ _0802CD1A: bx r0 .align 2, 0 _0802CD28: .4byte gUnknown_2023D74 -_0802CD2C: .4byte gUnknown_2023BC4 -_0802CD30: .4byte gUnknown_2023BE4 -_0802CD34: .4byte gUnknown_825E45C -_0802CD38: .4byte gUnknown_2023FE8 +_0802CD2C: .4byte gActiveBattler +_0802CD30: .4byte gBattleMons +_0802CD34: .4byte gBitTable +_0802CD38: .4byte gBattleStruct thumb_func_end atkE2_switchoutabilities thumb_func_start atkE3_jumpifhasnohp @@ -30860,9 +30860,9 @@ atkE3_jumpifhasnohp: @ 802CD3C ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8016E24 - ldr r1, _0802CD7C @ =gUnknown_2023BC4 + ldr r1, _0802CD7C @ =gActiveBattler strb r0, [r1] - ldr r2, _0802CD80 @ =gUnknown_2023BE4 + ldr r2, _0802CD80 @ =gBattleMons ldrb r1, [r1] movs r0, 0x58 muls r0, r1 @@ -30885,8 +30885,8 @@ atkE3_jumpifhasnohp: @ 802CD3C b _0802CD8A .align 2, 0 _0802CD78: .4byte gUnknown_2023D74 -_0802CD7C: .4byte gUnknown_2023BC4 -_0802CD80: .4byte gUnknown_2023BE4 +_0802CD7C: .4byte gActiveBattler +_0802CD80: .4byte gBattleMons _0802CD84: ldr r0, [r4] adds r0, 0x6 @@ -30992,13 +30992,13 @@ sub_802CE48: @ 802CE48 mov r7, r8 push {r7} movs r7, 0 - ldr r0, _0802CE90 @ =gUnknown_8254784 + ldr r0, _0802CE90 @ =gBaseStats mov r8, r0 _0802CE54: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 - ldr r0, _0802CE94 @ =gUnknown_2024284 + ldr r0, _0802CE94 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -31022,8 +31022,8 @@ _0802CE54: ldrb r0, [r0, 0x17] b _0802CEA2 .align 2, 0 -_0802CE90: .4byte gUnknown_8254784 -_0802CE94: .4byte gUnknown_2024284 +_0802CE90: .4byte gBaseStats +_0802CE94: .4byte gPlayerParty _0802CE98: lsls r0, r5, 3 subs r0, r5 @@ -31074,7 +31074,7 @@ _0802CEF0: _0802CEF6: movs r0, 0x64 muls r0, r7 - ldr r1, _0802CF24 @ =gUnknown_2024284 + ldr r1, _0802CF24 @ =gPlayerParty adds r0, r1 lsls r2, 2 ldr r1, _0802CF28 @ =gUnknown_8250848 @@ -31095,7 +31095,7 @@ _0802CF0A: pop {r0} bx r0 .align 2, 0 -_0802CF24: .4byte gUnknown_2024284 +_0802CF24: .4byte gPlayerParty _0802CF28: .4byte gUnknown_8250848 _0802CF2C: .4byte gUnknown_2023D74 thumb_func_end sub_802CE48 @@ -31103,11 +31103,11 @@ _0802CF2C: .4byte gUnknown_2023D74 thumb_func_start atkE6_docastformchangeanimation atkE6_docastformchangeanimation: @ 802CF30 push {r4,lr} - ldr r4, _0802CF84 @ =gUnknown_2023BC4 - ldr r0, _0802CF88 @ =gUnknown_2023FC4 + ldr r4, _0802CF84 @ =gActiveBattler + ldr r0, _0802CF88 @ =gBattleScripting ldrb r0, [r0, 0x17] strb r0, [r4] - ldr r1, _0802CF8C @ =gUnknown_2023BE4 + ldr r1, _0802CF8C @ =gBattleMons ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -31117,7 +31117,7 @@ atkE6_docastformchangeanimation: @ 802CF30 movs r1, 0x80 lsls r1, 17 ands r0, r1 - ldr r3, _0802CF90 @ =gUnknown_2023FE8 + ldr r3, _0802CF90 @ =gBattleStruct cmp r0, 0 beq _0802CF60 ldr r0, [r3] @@ -31143,10 +31143,10 @@ _0802CF60: pop {r0} bx r0 .align 2, 0 -_0802CF84: .4byte gUnknown_2023BC4 -_0802CF88: .4byte gUnknown_2023FC4 -_0802CF8C: .4byte gUnknown_2023BE4 -_0802CF90: .4byte gUnknown_2023FE8 +_0802CF84: .4byte gActiveBattler +_0802CF88: .4byte gBattleScripting +_0802CF8C: .4byte gBattleMons +_0802CF90: .4byte gBattleStruct _0802CF94: .4byte gUnknown_2023D74 thumb_func_end atkE6_docastformchangeanimation @@ -31157,7 +31157,7 @@ atkE7_trycastformdatachange: @ 802CF98 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r0, _0802CFCC @ =gUnknown_2023FC4 + ldr r0, _0802CFCC @ =gBattleScripting ldrb r0, [r0, 0x17] bl sub_8019DAC lsls r0, 24 @@ -31166,7 +31166,7 @@ atkE7_trycastformdatachange: @ 802CF98 beq _0802CFC2 ldr r0, _0802CFD0 @ =gUnknown_81D92F8 bl BattleScriptPushCursorAndCallback - ldr r0, _0802CFD4 @ =gUnknown_2023FE8 + ldr r0, _0802CFD4 @ =gBattleStruct ldr r0, [r0] adds r0, 0x7F subs r1, r4, 0x1 @@ -31177,17 +31177,17 @@ _0802CFC2: bx r0 .align 2, 0 _0802CFC8: .4byte gUnknown_2023D74 -_0802CFCC: .4byte gUnknown_2023FC4 +_0802CFCC: .4byte gBattleScripting _0802CFD0: .4byte gUnknown_81D92F8 -_0802CFD4: .4byte gUnknown_2023FE8 +_0802CFD4: .4byte gBattleStruct thumb_func_end atkE7_trycastformdatachange thumb_func_start atkE8_settypebasedhalvers atkE8_settypebasedhalvers: @ 802CFD8 push {r4,lr} movs r4, 0 - ldr r2, _0802D014 @ =gUnknown_8250C04 - ldr r0, _0802D018 @ =gUnknown_2023D4A + ldr r2, _0802D014 @ =gBattleMoves + ldr r0, _0802D018 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -31196,8 +31196,8 @@ atkE8_settypebasedhalvers: @ 802CFD8 ldrb r0, [r0] cmp r0, 0xC9 bne _0802D028 - ldr r1, _0802D01C @ =gUnknown_2023DFC - ldr r0, _0802D020 @ =gUnknown_2023D6B + ldr r1, _0802D01C @ =gStatuses3 + ldr r0, _0802D020 @ =sBattler_AI ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -31214,14 +31214,14 @@ atkE8_settypebasedhalvers: @ 802CFD8 strb r4, [r0, 0x5] b _0802D050 .align 2, 0 -_0802D014: .4byte gUnknown_8250C04 -_0802D018: .4byte gUnknown_2023D4A -_0802D01C: .4byte gUnknown_2023DFC -_0802D020: .4byte gUnknown_2023D6B +_0802D014: .4byte gBattleMoves +_0802D018: .4byte gCurrentMove +_0802D01C: .4byte gStatuses3 +_0802D020: .4byte sBattler_AI _0802D024: .4byte gUnknown_2023E82 _0802D028: - ldr r1, _0802D05C @ =gUnknown_2023DFC - ldr r0, _0802D060 @ =gUnknown_2023D6B + ldr r1, _0802D05C @ =gStatuses3 + ldr r0, _0802D060 @ =sBattler_AI ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -31248,8 +31248,8 @@ _0802D050: str r0, [r1] b _0802D086 .align 2, 0 -_0802D05C: .4byte gUnknown_2023DFC -_0802D060: .4byte gUnknown_2023D6B +_0802D05C: .4byte gStatuses3 +_0802D060: .4byte sBattler_AI _0802D064: .4byte gUnknown_2023E82 _0802D068: .4byte gUnknown_2023D74 _0802D06C: @@ -31298,11 +31298,11 @@ atkE9_setweatherballtype: @ 802D090 lsls r0, 24 cmp r0, 0 bne _0802D130 - ldr r2, _0802D0E0 @ =gUnknown_2023F1C + ldr r2, _0802D0E0 @ =gBattleWeather ldrb r0, [r2] cmp r0, 0 beq _0802D0CE - ldr r1, _0802D0E4 @ =gUnknown_2023FC4 + ldr r1, _0802D0E4 @ =gBattleScripting movs r0, 0x2 strb r0, [r1, 0xE] _0802D0CE: @@ -31311,49 +31311,49 @@ _0802D0CE: ands r0, r1 cmp r0, 0 beq _0802D0EC - ldr r0, _0802D0E8 @ =gUnknown_2023FE8 + ldr r0, _0802D0E8 @ =gBattleStruct ldr r1, [r0] movs r0, 0x8B b _0802D12E .align 2, 0 -_0802D0E0: .4byte gUnknown_2023F1C -_0802D0E4: .4byte gUnknown_2023FC4 -_0802D0E8: .4byte gUnknown_2023FE8 +_0802D0E0: .4byte gBattleWeather +_0802D0E4: .4byte gBattleScripting +_0802D0E8: .4byte gBattleStruct _0802D0EC: movs r0, 0x18 ands r0, r1 cmp r0, 0 beq _0802D100 - ldr r0, _0802D0FC @ =gUnknown_2023FE8 + ldr r0, _0802D0FC @ =gBattleStruct ldr r1, [r0] movs r0, 0x85 b _0802D12E .align 2, 0 -_0802D0FC: .4byte gUnknown_2023FE8 +_0802D0FC: .4byte gBattleStruct _0802D100: movs r0, 0x60 ands r0, r1 cmp r0, 0 beq _0802D114 - ldr r0, _0802D110 @ =gUnknown_2023FE8 + ldr r0, _0802D110 @ =gBattleStruct ldr r1, [r0] movs r0, 0x8A b _0802D12E .align 2, 0 -_0802D110: .4byte gUnknown_2023FE8 +_0802D110: .4byte gBattleStruct _0802D114: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0802D128 - ldr r0, _0802D124 @ =gUnknown_2023FE8 + ldr r0, _0802D124 @ =gBattleStruct ldr r1, [r0] movs r0, 0x8F b _0802D12E .align 2, 0 -_0802D124: .4byte gUnknown_2023FE8 +_0802D124: .4byte gBattleStruct _0802D128: - ldr r0, _0802D140 @ =gUnknown_2023FE8 + ldr r0, _0802D140 @ =gBattleStruct ldr r1, [r0] movs r0, 0x80 _0802D12E: @@ -31367,7 +31367,7 @@ _0802D130: pop {r0} bx r0 .align 2, 0 -_0802D140: .4byte gUnknown_2023FE8 +_0802D140: .4byte gBattleStruct _0802D144: .4byte gUnknown_2023D74 thumb_func_end atkE9_setweatherballtype @@ -31375,11 +31375,11 @@ _0802D144: .4byte gUnknown_2023D74 atkEA_tryrecycleitem: @ 802D148 push {r4-r7,lr} sub sp, 0x4 - ldr r7, _0802D1B0 @ =gUnknown_2023BC4 - ldr r0, _0802D1B4 @ =gUnknown_2023D6B + ldr r7, _0802D1B0 @ =gActiveBattler + ldr r0, _0802D1B4 @ =sBattler_AI ldrb r0, [r0] strb r0, [r7] - ldr r1, _0802D1B8 @ =gUnknown_2023FE8 + ldr r1, _0802D1B8 @ =gBattleStruct ldrb r2, [r7] lsls r0, r2, 1 adds r0, 0xB8 @@ -31388,7 +31388,7 @@ atkEA_tryrecycleitem: @ 802D148 ldrh r5, [r6] cmp r5, 0 beq _0802D1C8 - ldr r4, _0802D1BC @ =gUnknown_2023BE4 + ldr r4, _0802D1BC @ =gBattleMons movs r3, 0x58 adds r0, r2, 0 muls r0, r3 @@ -31423,10 +31423,10 @@ atkEA_tryrecycleitem: @ 802D148 str r0, [r1] b _0802D1E2 .align 2, 0 -_0802D1B0: .4byte gUnknown_2023BC4 -_0802D1B4: .4byte gUnknown_2023D6B -_0802D1B8: .4byte gUnknown_2023FE8 -_0802D1BC: .4byte gUnknown_2023BE4 +_0802D1B0: .4byte gActiveBattler +_0802D1B4: .4byte sBattler_AI +_0802D1B8: .4byte gBattleStruct +_0802D1BC: .4byte gBattleMons _0802D1C0: .4byte gUnknown_2023D68 _0802D1C4: .4byte gUnknown_2023D74 _0802D1C8: @@ -31457,9 +31457,9 @@ atkEB_settypetoterrain: @ 802D1F0 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0802D260 @ =gUnknown_2023BE4 + ldr r0, _0802D260 @ =gBattleMons mov r8, r0 - ldr r7, _0802D264 @ =gUnknown_2023D6B + ldr r7, _0802D264 @ =sBattler_AI ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -31511,8 +31511,8 @@ atkEB_settypetoterrain: @ 802D1F0 str r0, [r1] b _0802D292 .align 2, 0 -_0802D260: .4byte gUnknown_2023BE4 -_0802D264: .4byte gUnknown_2023D6B +_0802D260: .4byte gBattleMons +_0802D264: .4byte sBattler_AI _0802D268: .4byte gUnknown_8250888 _0802D26C: .4byte gUnknown_2022B50 _0802D270: .4byte gUnknown_2022AB8 @@ -31544,7 +31544,7 @@ _0802D29C: .4byte gUnknown_2023D74 thumb_func_start atkEC_pursuitrelated atkEC_pursuitrelated: @ 802D2A0 push {r4-r6,lr} - ldr r5, _0802D314 @ =gUnknown_2023D6B + ldr r5, _0802D314 @ =sBattler_AI ldrb r0, [r5] bl GetBankIdentity movs r1, 0x2 @@ -31552,17 +31552,17 @@ atkEC_pursuitrelated: @ 802D2A0 lsls r0, 24 lsrs r0, 24 bl GetBankByIdentity - ldr r4, _0802D318 @ =gUnknown_2023BC4 + ldr r4, _0802D318 @ =gActiveBattler strb r0, [r4] - ldr r0, _0802D31C @ =gUnknown_2022B4C + ldr r0, _0802D31C @ =gBattleTypeFlags ldr r0, [r0] movs r6, 0x1 ands r0, r6 cmp r0, 0 beq _0802D340 - ldr r0, _0802D320 @ =gUnknown_2023D70 + ldr r0, _0802D320 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0802D324 @ =gUnknown_825E45C + ldr r2, _0802D324 @ =gBitTable ldrb r3, [r4] lsls r0, r3, 2 adds r0, r2 @@ -31585,13 +31585,13 @@ atkEC_pursuitrelated: @ 802D2A0 adds r0, r3, r0 movs r1, 0xB strb r1, [r0] - ldr r0, _0802D334 @ =gUnknown_2023D4A + ldr r0, _0802D334 @ =gCurrentMove strh r2, [r0] ldr r1, _0802D338 @ =gUnknown_2023D74 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r0, _0802D33C @ =gUnknown_2023FC4 + ldr r0, _0802D33C @ =gBattleScripting strb r6, [r0, 0x18] ldrb r1, [r5] adds r0, 0x20 @@ -31600,17 +31600,17 @@ atkEC_pursuitrelated: @ 802D2A0 strb r0, [r5] b _0802D35A .align 2, 0 -_0802D314: .4byte gUnknown_2023D6B -_0802D318: .4byte gUnknown_2023BC4 -_0802D31C: .4byte gUnknown_2022B4C -_0802D320: .4byte gUnknown_2023D70 -_0802D324: .4byte gUnknown_825E45C +_0802D314: .4byte sBattler_AI +_0802D318: .4byte gActiveBattler +_0802D31C: .4byte gBattleTypeFlags +_0802D320: .4byte gAbsentBattlerFlags +_0802D324: .4byte gBitTable _0802D328: .4byte gUnknown_2023D7C _0802D32C: .4byte gUnknown_2023DC4 _0802D330: .4byte gUnknown_2023BDA -_0802D334: .4byte gUnknown_2023D4A +_0802D334: .4byte gCurrentMove _0802D338: .4byte gUnknown_2023D74 -_0802D33C: .4byte gUnknown_2023FC4 +_0802D33C: .4byte gBattleScripting _0802D340: ldr r3, _0802D360 @ =gUnknown_2023D74 ldr r2, [r3] @@ -31637,28 +31637,28 @@ _0802D360: .4byte gUnknown_2023D74 atkEF_snatchsetbanks: @ 802D364 push {r4,lr} ldr r1, _0802D388 @ =gUnknown_2023D6E - ldr r3, _0802D38C @ =gUnknown_2023D6B + ldr r3, _0802D38C @ =sBattler_AI ldrb r0, [r3] strb r0, [r1] - ldr r2, _0802D390 @ =gUnknown_2023D6C + ldr r2, _0802D390 @ =gBattlerTarget lsls r0, 24 lsrs r0, 24 adds r4, r1, 0 ldrb r1, [r2] cmp r0, r1 bne _0802D398 - ldr r1, _0802D394 @ =gUnknown_2023FC4 + ldr r1, _0802D394 @ =gBattleScripting ldrb r0, [r1, 0x17] strb r0, [r2] strb r0, [r3] b _0802D39E .align 2, 0 _0802D388: .4byte gUnknown_2023D6E -_0802D38C: .4byte gUnknown_2023D6B -_0802D390: .4byte gUnknown_2023D6C -_0802D394: .4byte gUnknown_2023FC4 +_0802D38C: .4byte sBattler_AI +_0802D390: .4byte gBattlerTarget +_0802D394: .4byte gBattleScripting _0802D398: - ldr r1, _0802D3B0 @ =gUnknown_2023FC4 + ldr r1, _0802D3B0 @ =gBattleScripting ldrb r0, [r1, 0x17] strb r0, [r2] _0802D39E: @@ -31672,14 +31672,14 @@ _0802D39E: pop {r0} bx r0 .align 2, 0 -_0802D3B0: .4byte gUnknown_2023FC4 +_0802D3B0: .4byte gBattleScripting _0802D3B4: .4byte gUnknown_2023D74 thumb_func_end atkEF_snatchsetbanks thumb_func_start atkEE_removelightscreenreflect atkEE_removelightscreenreflect: @ 802D3B8 push {r4,lr} - ldr r0, _0802D400 @ =gUnknown_2023D6B + ldr r0, _0802D400 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide movs r1, 0x1 @@ -31698,7 +31698,7 @@ atkEE_removelightscreenreflect: @ 802D3B8 cmp r1, 0 beq _0802D418 _0802D3E0: - ldr r2, _0802D408 @ =gUnknown_2023DDE + ldr r2, _0802D408 @ =gSideAffecting adds r2, r3, r2 ldrh r1, [r2] ldr r0, _0802D40C @ =0x0000fffe @@ -31709,20 +31709,20 @@ _0802D3E0: strh r0, [r2] strb r3, [r4] strb r3, [r4, 0x2] - ldr r1, _0802D414 @ =gUnknown_2023FC4 + ldr r1, _0802D414 @ =gBattleScripting movs r0, 0x1 strb r0, [r1, 0x18] strb r0, [r1, 0x19] b _0802D41E .align 2, 0 -_0802D400: .4byte gUnknown_2023D6B +_0802D400: .4byte sBattler_AI _0802D404: .4byte gUnknown_2023DE4 -_0802D408: .4byte gUnknown_2023DDE +_0802D408: .4byte gSideAffecting _0802D40C: .4byte 0x0000fffe _0802D410: .4byte 0x0000fffd -_0802D414: .4byte gUnknown_2023FC4 +_0802D414: .4byte gBattleScripting _0802D418: - ldr r0, _0802D42C @ =gUnknown_2023FC4 + ldr r0, _0802D42C @ =gBattleScripting strb r1, [r0, 0x18] strb r1, [r0, 0x19] _0802D41E: @@ -31734,7 +31734,7 @@ _0802D41E: pop {r0} bx r0 .align 2, 0 -_0802D42C: .4byte gUnknown_2023FC4 +_0802D42C: .4byte gBattleScripting _0802D430: .4byte gUnknown_2023D74 thumb_func_end atkEE_removelightscreenreflect @@ -31748,15 +31748,15 @@ sub_802D434: @ 802D434 beq _0802D442 b _0802D7EE _0802D442: - ldr r5, _0802D478 @ =gUnknown_2023BC4 - ldr r0, _0802D47C @ =gUnknown_2023D6B + ldr r5, _0802D478 @ =gActiveBattler + ldr r0, _0802D47C @ =sBattler_AI ldrb r0, [r0] strb r0, [r5] - ldr r6, _0802D480 @ =gUnknown_2023D6C + ldr r6, _0802D480 @ =gBattlerTarget movs r1, 0x1 eors r0, r1 strb r0, [r6] - ldr r0, _0802D484 @ =gUnknown_2022B4C + ldr r0, _0802D484 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x80 lsls r0, 8 @@ -31773,10 +31773,10 @@ _0802D442: b _0802D7EC .align 2, 0 _0802D474: .4byte gUnknown_2023BC8 -_0802D478: .4byte gUnknown_2023BC4 -_0802D47C: .4byte gUnknown_2023D6B -_0802D480: .4byte gUnknown_2023D6C -_0802D484: .4byte gUnknown_2022B4C +_0802D478: .4byte gActiveBattler +_0802D47C: .4byte sBattler_AI +_0802D480: .4byte gBattlerTarget +_0802D484: .4byte gBattleTypeFlags _0802D488: .4byte gUnknown_2023D74 _0802D48C: .4byte gUnknown_81D9AD1 _0802D490: @@ -31817,7 +31817,7 @@ _0802D4DC: ldrh r0, [r0] cmp r0, 0x5 bne _0802D508 - ldr r0, _0802D504 @ =gUnknown_2023FE8 + ldr r0, _0802D504 @ =gBattleStruct ldr r0, [r0] adds r0, 0x7C ldrb r0, [r0] @@ -31832,10 +31832,10 @@ _0802D4DC: b _0802D520 .align 2, 0 _0802D500: .4byte gUnknown_2023D68 -_0802D504: .4byte gUnknown_2023FE8 +_0802D504: .4byte gBattleStruct _0802D508: - ldr r3, _0802D53C @ =gUnknown_8254784 - ldr r2, _0802D540 @ =gUnknown_2023BE4 + ldr r3, _0802D53C @ =gBaseStats + ldr r2, _0802D540 @ =gBattleMons ldrb r1, [r6] movs r0, 0x58 muls r0, r1 @@ -31864,8 +31864,8 @@ _0802D532: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802D53C: .4byte gUnknown_8254784 -_0802D540: .4byte gUnknown_2023BE4 +_0802D53C: .4byte gBaseStats +_0802D540: .4byte gBattleMons _0802D544: .4byte gUnknown_2023D68 _0802D548: .4byte _0802D54C .align 2, 0 @@ -31878,8 +31878,8 @@ _0802D54C: .4byte _0802D5CA .4byte _0802D5CA _0802D568: - ldr r2, _0802D590 @ =gUnknown_2023BE4 - ldr r0, _0802D594 @ =gUnknown_2023D6C + ldr r2, _0802D590 @ =gBattleMons + ldr r0, _0802D594 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -31899,8 +31899,8 @@ _0802D568: beq _0802D5FC b _0802D5CA .align 2, 0 -_0802D590: .4byte gUnknown_2023BE4 -_0802D594: .4byte gUnknown_2023D6C +_0802D590: .4byte gBattleMons +_0802D594: .4byte gBattlerTarget _0802D598: bl sav1_map_get_light_level lsls r0, 24 @@ -31911,8 +31911,8 @@ _0802D598: movs r4, 0x23 b _0802D62A _0802D5AA: - ldr r2, _0802D5D0 @ =gUnknown_2023BE4 - ldr r0, _0802D5D4 @ =gUnknown_2023D6C + ldr r2, _0802D5D0 @ =gBattleMons + ldr r0, _0802D5D4 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -31931,11 +31931,11 @@ _0802D5CA: movs r4, 0xA b _0802D62A .align 2, 0 -_0802D5D0: .4byte gUnknown_2023BE4 -_0802D5D4: .4byte gUnknown_2023D6C +_0802D5D0: .4byte gBattleMons +_0802D5D4: .4byte gBattlerTarget _0802D5D8: - ldr r2, _0802D600 @ =gUnknown_2023BE4 - ldr r0, _0802D604 @ =gUnknown_2023D6C + ldr r2, _0802D600 @ =gBattleMons + ldr r0, _0802D604 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -31954,10 +31954,10 @@ _0802D5FC: movs r4, 0x1E b _0802D62A .align 2, 0 -_0802D600: .4byte gUnknown_2023BE4 -_0802D604: .4byte gUnknown_2023D6C +_0802D600: .4byte gBattleMons +_0802D604: .4byte gBattlerTarget _0802D608: - ldr r0, _0802D61C @ =gUnknown_3004F90 + ldr r0, _0802D61C @ =gBattleResults ldrb r0, [r0, 0x13] adds r0, 0xA lsls r0, 24 @@ -31967,7 +31967,7 @@ _0802D608: movs r4, 0x28 b _0802D62A .align 2, 0 -_0802D61C: .4byte gUnknown_3004F90 +_0802D61C: .4byte gBattleResults _0802D620: ldr r1, _0802D694 @ =gUnknown_8250892 ldrh r0, [r2] @@ -31979,8 +31979,8 @@ _0802D62A: muls r0, r4 movs r1, 0xA bl __divsi3 - ldr r5, _0802D698 @ =gUnknown_2023BE4 - ldr r1, _0802D69C @ =gUnknown_2023D6C + ldr r5, _0802D698 @ =gBattleMons + ldr r1, _0802D69C @ =gBattlerTarget ldrb r2, [r1] movs r1, 0x58 adds r4, r2, 0 @@ -32020,7 +32020,7 @@ _0802D67A: beq _0802D6BC cmp r0, 0x1 bne _0802D6A8 - ldr r0, _0802D6A4 @ =gUnknown_3004F90 + ldr r0, _0802D6A4 @ =gBattleResults ldrb r1, [r0, 0x5] movs r2, 0x2 orrs r1, r2 @@ -32028,12 +32028,12 @@ _0802D67A: b _0802D6BC .align 2, 0 _0802D694: .4byte gUnknown_8250892 -_0802D698: .4byte gUnknown_2023BE4 -_0802D69C: .4byte gUnknown_2023D6C +_0802D698: .4byte gBattleMons +_0802D69C: .4byte gBattlerTarget _0802D6A0: .4byte gUnknown_2023D68 -_0802D6A4: .4byte gUnknown_3004F90 +_0802D6A4: .4byte gBattleResults _0802D6A8: - ldr r0, _0802D700 @ =gUnknown_3004F90 + ldr r0, _0802D700 @ =gBattleResults ldrh r1, [r1] adds r0, r1 adds r1, r0, 0 @@ -32049,21 +32049,21 @@ _0802D6BC: movs r0, 0 movs r1, 0x4 bl EmitBallThrowAnim - ldr r0, _0802D704 @ =gUnknown_2023BC4 + ldr r0, _0802D704 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution ldr r1, _0802D708 @ =gUnknown_2023D74 ldr r0, _0802D70C @ =gUnknown_81D9A42 str r0, [r1] - ldr r1, _0802D710 @ =gUnknown_2023BCE - ldr r0, _0802D714 @ =gUnknown_2023D6C + ldr r1, _0802D710 @ =gBattlerPartyIndexes + ldr r0, _0802D714 @ =gBattlerTarget ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802D718 @ =gUnknown_202402C + ldr r1, _0802D718 @ =gEnemyParty adds r0, r1 ldr r2, _0802D71C @ =gUnknown_2023D68 movs r1, 0x26 @@ -32075,13 +32075,13 @@ _0802D6BC: beq _0802D7AE b _0802D7D8 .align 2, 0 -_0802D700: .4byte gUnknown_3004F90 -_0802D704: .4byte gUnknown_2023BC4 +_0802D700: .4byte gBattleResults +_0802D704: .4byte gActiveBattler _0802D708: .4byte gUnknown_2023D74 _0802D70C: .4byte gUnknown_81D9A42 -_0802D710: .4byte gUnknown_2023BCE -_0802D714: .4byte gUnknown_2023D6C -_0802D718: .4byte gUnknown_202402C +_0802D710: .4byte gBattlerPartyIndexes +_0802D714: .4byte gBattlerTarget +_0802D718: .4byte gEnemyParty _0802D71C: .4byte gUnknown_2023D68 _0802D720: movs r0, 0xFF @@ -32124,7 +32124,7 @@ _0802D76C: movs r0, 0 adds r1, r4, 0 bl EmitBallThrowAnim - ldr r0, _0802D7BC @ =gUnknown_2023BC4 + ldr r0, _0802D7BC @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution cmp r4, 0x4 @@ -32132,15 +32132,15 @@ _0802D76C: ldr r1, _0802D7C0 @ =gUnknown_2023D74 ldr r0, _0802D7C4 @ =gUnknown_81D9A42 str r0, [r1] - ldr r1, _0802D7C8 @ =gUnknown_2023BCE - ldr r0, _0802D7CC @ =gUnknown_2023D6C + ldr r1, _0802D7C8 @ =gBattlerPartyIndexes + ldr r0, _0802D7CC @ =gBattlerTarget ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802D7D0 @ =gUnknown_202402C + ldr r1, _0802D7D0 @ =gEnemyParty adds r0, r1 movs r1, 0x26 adds r2, r5, 0 @@ -32157,12 +32157,12 @@ _0802D7AE: b _0802D7EE .align 2, 0 _0802D7B8: .4byte gUnknown_2023D68 -_0802D7BC: .4byte gUnknown_2023BC4 +_0802D7BC: .4byte gActiveBattler _0802D7C0: .4byte gUnknown_2023D74 _0802D7C4: .4byte gUnknown_81D9A42 -_0802D7C8: .4byte gUnknown_2023BCE -_0802D7CC: .4byte gUnknown_2023D6C -_0802D7D0: .4byte gUnknown_202402C +_0802D7C8: .4byte gBattlerPartyIndexes +_0802D7CC: .4byte gBattlerTarget +_0802D7D0: .4byte gEnemyParty _0802D7D4: .4byte gUnknown_2023E82 _0802D7D8: ldr r1, _0802D7E0 @ =gUnknown_2023E82 @@ -32194,9 +32194,9 @@ sub_802D800: @ 802D800 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0802D870 @ =gUnknown_2023BCE + ldr r0, _0802D870 @ =gBattlerPartyIndexes mov r9, r0 - ldr r5, _0802D874 @ =gUnknown_2023D6B + ldr r5, _0802D874 @ =sBattler_AI ldrb r0, [r5] movs r6, 0x1 eors r0, r6 @@ -32205,7 +32205,7 @@ sub_802D800: @ 802D800 ldrh r0, [r0] movs r7, 0x64 muls r0, r7 - ldr r1, _0802D878 @ =gUnknown_202402C + ldr r1, _0802D878 @ =gEnemyParty mov r8, r1 add r0, r8 bl GiveMonToPlayer @@ -32240,9 +32240,9 @@ sub_802D800: @ 802D800 bl GetMonData b _0802D8D6 .align 2, 0 -_0802D870: .4byte gUnknown_2023BCE -_0802D874: .4byte gUnknown_2023D6B -_0802D878: .4byte gUnknown_202402C +_0802D870: .4byte gBattlerPartyIndexes +_0802D874: .4byte sBattler_AI +_0802D878: .4byte gEnemyParty _0802D87C: .4byte gUnknown_2023E82 _0802D880: .4byte gStringVar1 _0802D884: .4byte 0x00004037 @@ -32289,9 +32289,9 @@ _0802D8D6: adds r0, 0x1 strb r0, [r1, 0x5] _0802D8EA: - ldr r2, _0802D944 @ =gUnknown_3004F90 - ldr r3, _0802D948 @ =gUnknown_2023BE4 - ldr r0, _0802D94C @ =gUnknown_2023D6B + ldr r2, _0802D944 @ =gBattleResults + ldr r3, _0802D948 @ =gBattleMons + ldr r0, _0802D94C @ =sBattler_AI ldrb r0, [r0] movs r1, 0x1 eors r1, r0 @@ -32300,13 +32300,13 @@ _0802D8EA: adds r0, r3 ldrh r0, [r0] strh r0, [r2, 0x28] - ldr r0, _0802D950 @ =gUnknown_2023BCE + ldr r0, _0802D950 @ =gBattlerPartyIndexes lsls r1, 1 adds r1, r0 ldrh r1, [r1] movs r0, 0x64 muls r0, r1 - ldr r1, _0802D954 @ =gUnknown_202402C + ldr r1, _0802D954 @ =gEnemyParty adds r0, r1 adds r2, 0x2A movs r1, 0x2 @@ -32328,18 +32328,18 @@ _0802D934: .4byte gStringVar2 _0802D938: .4byte gStringVar3 _0802D93C: .4byte gUnknown_2023E82 _0802D940: .4byte 0x00000834 -_0802D944: .4byte gUnknown_3004F90 -_0802D948: .4byte gUnknown_2023BE4 -_0802D94C: .4byte gUnknown_2023D6B -_0802D950: .4byte gUnknown_2023BCE -_0802D954: .4byte gUnknown_202402C +_0802D944: .4byte gBattleResults +_0802D948: .4byte gBattleMons +_0802D94C: .4byte sBattler_AI +_0802D950: .4byte gBattlerPartyIndexes +_0802D954: .4byte gEnemyParty _0802D958: .4byte gUnknown_2023D74 thumb_func_end sub_802D800 thumb_func_start sub_802D95C sub_802D95C: @ 802D95C push {r4,r5,lr} - ldr r4, _0802D9AC @ =gUnknown_202402C + ldr r4, _0802D9AC @ =gEnemyParty adds r0, r4, 0 movs r1, 0xB movs r2, 0 @@ -32375,7 +32375,7 @@ sub_802D95C: @ 802D95C str r1, [r3] b _0802D9CE .align 2, 0 -_0802D9AC: .4byte gUnknown_202402C +_0802D9AC: .4byte gEnemyParty _0802D9B0: .4byte gUnknown_2023D74 _0802D9B4: adds r0, r5, 0 @@ -32401,7 +32401,7 @@ _0802D9D4: .4byte gUnknown_2023D74 sub_802D9D8: @ 802D9D8 push {r4,r5,lr} sub sp, 0x18 - ldr r0, _0802DA00 @ =gUnknown_202402C + ldr r0, _0802DA00 @ =gEnemyParty movs r1, 0xB movs r2, 0 bl GetMonData @@ -32419,7 +32419,7 @@ _0802D9F4: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802DA00: .4byte gUnknown_202402C +_0802DA00: .4byte gEnemyParty _0802DA04: .4byte gUnknown_2023E82 _0802DA08: .4byte _0802DA0C .align 2, 0 @@ -32521,7 +32521,7 @@ _0802DAE0: lsrs r4, r0, 24 cmp r4, 0 bne _0802DB6C - ldr r0, _0802DB40 @ =gUnknown_2023BE4 + ldr r0, _0802DB40 @ =gBattleMons adds r1, r0, 0 adds r1, 0xAC ldr r1, [r1] @@ -32560,7 +32560,7 @@ _0802DB36: strb r0, [r1] b _0802DB6C .align 2, 0 -_0802DB40: .4byte gUnknown_2023BE4 +_0802DB40: .4byte gBattleMons _0802DB44: .4byte 0x0000ffff _0802DB48: .4byte gUnknown_20375F8 _0802DB4C: .4byte 0x05000080 @@ -32954,8 +32954,8 @@ _0802DE40: beq _0802DE4E b _0802DFA6 _0802DE4E: - ldr r7, _0802DF00 @ =gUnknown_2023BCE - ldr r0, _0802DF04 @ =gUnknown_2023D6B + ldr r7, _0802DF00 @ =gBattlerPartyIndexes + ldr r0, _0802DF04 @ =sBattler_AI mov r10, r0 ldrb r0, [r0] movs r4, 0x1 @@ -32968,10 +32968,10 @@ _0802DE4E: mov r2, r9 muls r2, r0 adds r0, r2, 0 - ldr r1, _0802DF08 @ =gUnknown_202402C + ldr r1, _0802DF08 @ =gEnemyParty mov r8, r1 add r0, r8 - ldr r1, _0802DF0C @ =gUnknown_2023FE8 + ldr r1, _0802DF0C @ =gBattleStruct ldr r2, [r1] adds r2, 0x6D movs r1, 0x2 @@ -33019,7 +33019,7 @@ _0802DE4E: movs r1, 0 movs r2, 0 bl GetMonData - ldr r2, _0802DF0C @ =gUnknown_2023FE8 + ldr r2, _0802DF0C @ =gBattleStruct ldr r1, [r2] adds r1, 0x6D str r0, [sp] @@ -33036,10 +33036,10 @@ _0802DE4E: b _0802DFA6 .align 2, 0 _0802DEFC: .4byte gUnknown_2037AB8 -_0802DF00: .4byte gUnknown_2023BCE -_0802DF04: .4byte gUnknown_2023D6B -_0802DF08: .4byte gUnknown_202402C -_0802DF0C: .4byte gUnknown_2023FE8 +_0802DF00: .4byte gBattlerPartyIndexes +_0802DF04: .4byte sBattler_AI +_0802DF08: .4byte gEnemyParty +_0802DF0C: .4byte gBattleStruct _0802DF10: .4byte sub_8011100 _0802DF14: .4byte gUnknown_2023E82 _0802DF18: @@ -33054,8 +33054,8 @@ _0802DF18: ands r0, r1 cmp r0, 0 bne _0802DFA6 - ldr r2, _0802DF60 @ =gUnknown_2023BCE - ldr r0, _0802DF64 @ =gUnknown_2023D6B + ldr r2, _0802DF60 @ =gBattlerPartyIndexes + ldr r0, _0802DF64 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x1 eors r0, r1 @@ -33064,9 +33064,9 @@ _0802DF18: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802DF68 @ =gUnknown_202402C + ldr r1, _0802DF68 @ =gEnemyParty adds r0, r1 - ldr r1, _0802DF6C @ =gUnknown_2023FE8 + ldr r1, _0802DF6C @ =gBattleStruct ldr r2, [r1] adds r2, 0x6D movs r1, 0x2 @@ -33076,10 +33076,10 @@ _0802DF18: _0802DF54: .4byte gMain _0802DF58: .4byte sub_8011100 _0802DF5C: .4byte gUnknown_2037AB8 -_0802DF60: .4byte gUnknown_2023BCE -_0802DF64: .4byte gUnknown_2023D6B -_0802DF68: .4byte gUnknown_202402C -_0802DF6C: .4byte gUnknown_2023FE8 +_0802DF60: .4byte gBattlerPartyIndexes +_0802DF64: .4byte sBattler_AI +_0802DF68: .4byte gEnemyParty +_0802DF6C: .4byte gBattleStruct _0802DF70: bl CalculatePlayerPartyCount lsls r0, 24 @@ -33122,13 +33122,13 @@ _0802DFB8: .4byte gUnknown_2023D74 thumb_func_start atkF4_subattackerhpbydmg atkF4_subattackerhpbydmg: @ 802DFBC - ldr r2, _0802DFDC @ =gUnknown_2023BE4 - ldr r0, _0802DFE0 @ =gUnknown_2023D6B + ldr r2, _0802DFDC @ =gBattleMons + ldr r0, _0802DFE0 @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r1, r0 adds r1, r2 - ldr r0, _0802DFE4 @ =gUnknown_2023D50 + ldr r0, _0802DFE4 @ =gBattleMoveDamage ldr r2, [r0] ldrh r0, [r1, 0x28] subs r0, r2 @@ -33139,16 +33139,16 @@ atkF4_subattackerhpbydmg: @ 802DFBC str r0, [r1] bx lr .align 2, 0 -_0802DFDC: .4byte gUnknown_2023BE4 -_0802DFE0: .4byte gUnknown_2023D6B -_0802DFE4: .4byte gUnknown_2023D50 +_0802DFDC: .4byte gBattleMons +_0802DFE0: .4byte sBattler_AI +_0802DFE4: .4byte gBattleMoveDamage _0802DFE8: .4byte gUnknown_2023D74 thumb_func_end atkF4_subattackerhpbydmg thumb_func_start atkF5_removeattackerstatus1 atkF5_removeattackerstatus1: @ 802DFEC - ldr r1, _0802E008 @ =gUnknown_2023BE4 - ldr r0, _0802E00C @ =gUnknown_2023D6B + ldr r1, _0802E008 @ =gBattleMons + ldr r0, _0802E00C @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -33162,8 +33162,8 @@ atkF5_removeattackerstatus1: @ 802DFEC str r0, [r1] bx lr .align 2, 0 -_0802E008: .4byte gUnknown_2023BE4 -_0802E00C: .4byte gUnknown_2023D6B +_0802E008: .4byte gBattleMons +_0802E00C: .4byte sBattler_AI _0802E010: .4byte gUnknown_2023D74 thumb_func_end atkF5_removeattackerstatus1 diff --git a/asm/battle_setup.s b/asm/battle_setup.s index a7d13e747..8fe6196f6 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -163,7 +163,7 @@ sub_807F748: @ 807F748 ldr r1, _0807F780 @ =gMain ldr r0, _0807F784 @ =sub_807FB40 str r0, [r1, 0x8] - ldr r1, _0807F788 @ =gUnknown_2022B4C + ldr r1, _0807F788 @ =gBattleTypeFlags movs r0, 0 str r0, [r1] bl GetWildBattleTransition @@ -180,7 +180,7 @@ sub_807F748: @ 807F748 .align 2, 0 _0807F780: .4byte gMain _0807F784: .4byte sub_807FB40 -_0807F788: .4byte gUnknown_2022B4C +_0807F788: .4byte gBattleTypeFlags thumb_func_end sub_807F748 thumb_func_start sub_807F78C @@ -192,7 +192,7 @@ sub_807F78C: @ 807F78C ldr r1, _0807F7C8 @ =gMain ldr r0, _0807F7CC @ =sub_807FB40 str r0, [r1, 0x8] - ldr r1, _0807F7D0 @ =gUnknown_2022B4C + ldr r1, _0807F7D0 @ =gBattleTypeFlags movs r0, 0x80 lsls r0, 3 str r0, [r1] @@ -210,7 +210,7 @@ sub_807F78C: @ 807F78C .align 2, 0 _0807F7C8: .4byte gMain _0807F7CC: .4byte sub_807FB40 -_0807F7D0: .4byte gUnknown_2022B4C +_0807F7D0: .4byte gBattleTypeFlags _0807F7D4: .4byte 0x00000155 thumb_func_end sub_807F78C @@ -223,7 +223,7 @@ sub_807F7D8: @ 807F7D8 ldr r1, _0807F804 @ =gMain ldr r0, _0807F808 @ =sub_80A0F4C str r0, [r1, 0x8] - ldr r1, _0807F80C @ =gUnknown_2022B4C + ldr r1, _0807F80C @ =gBattleTypeFlags movs r0, 0x80 str r0, [r1] bl GetWildBattleTransition @@ -236,7 +236,7 @@ sub_807F7D8: @ 807F7D8 .align 2, 0 _0807F804: .4byte gMain _0807F808: .4byte sub_80A0F4C -_0807F80C: .4byte gUnknown_2022B4C +_0807F80C: .4byte gBattleTypeFlags thumb_func_end sub_807F7D8 thumb_func_start sub_807F810 @@ -248,7 +248,7 @@ sub_807F810: @ 807F810 ldr r1, _0807F854 @ =gMain ldr r0, _0807F858 @ =sub_807FB40 str r0, [r1, 0x8] - ldr r1, _0807F85C @ =gUnknown_2022B4C + ldr r1, _0807F85C @ =gBattleTypeFlags movs r0, 0x80 lsls r0, 8 str r0, [r1] @@ -257,7 +257,7 @@ sub_807F810: @ 807F810 lsrs r0, 24 movs r1, 0 bl sub_807F690 - ldr r0, _0807F860 @ =gUnknown_202402C + ldr r0, _0807F860 @ =gEnemyParty ldr r2, _0807F864 @ =gUnknown_841D148 movs r1, 0x2 bl sub_804037C @@ -270,8 +270,8 @@ sub_807F810: @ 807F810 .align 2, 0 _0807F854: .4byte gMain _0807F858: .4byte sub_807FB40 -_0807F85C: .4byte gUnknown_2022B4C -_0807F860: .4byte gUnknown_202402C +_0807F85C: .4byte gBattleTypeFlags +_0807F860: .4byte gEnemyParty _0807F864: .4byte gUnknown_841D148 thumb_func_end sub_807F810 @@ -294,7 +294,7 @@ sub_807F868: @ 807F868 thumb_func_start sub_807F888 sub_807F888: @ 807F888 push {lr} - ldr r0, _0807F8B4 @ =gUnknown_202402C + ldr r0, _0807F8B4 @ =gEnemyParty movs r1, 0xD movs r2, 0x5 bl CreateMaleMon @@ -302,7 +302,7 @@ sub_807F888: @ 807F888 ldr r1, _0807F8B8 @ =gMain ldr r0, _0807F8BC @ =c2_exit_to_overworld_1_continue_scripts_restart_music str r0, [r1, 0x8] - ldr r1, _0807F8C0 @ =gUnknown_2022B4C + ldr r1, _0807F8C0 @ =gBattleTypeFlags movs r0, 0x80 lsls r0, 2 str r0, [r1] @@ -312,10 +312,10 @@ sub_807F888: @ 807F888 pop {r0} bx r0 .align 2, 0 -_0807F8B4: .4byte gUnknown_202402C +_0807F8B4: .4byte gEnemyParty _0807F8B8: .4byte gMain _0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music -_0807F8C0: .4byte gUnknown_2022B4C +_0807F8C0: .4byte gBattleTypeFlags thumb_func_end sub_807F888 thumb_func_start sub_807F8C4 @@ -325,7 +325,7 @@ sub_807F8C4: @ 807F8C4 ldr r1, _0807F8F8 @ =gMain ldr r0, _0807F8FC @ =sub_807FBA0 str r0, [r1, 0x8] - ldr r1, _0807F900 @ =gUnknown_2022B4C + ldr r1, _0807F900 @ =gBattleTypeFlags movs r0, 0x80 lsls r0, 10 str r0, [r1] @@ -343,7 +343,7 @@ sub_807F8C4: @ 807F8C4 .align 2, 0 _0807F8F8: .4byte gMain _0807F8FC: .4byte sub_807FBA0 -_0807F900: .4byte gUnknown_2022B4C +_0807F900: .4byte gBattleTypeFlags thumb_func_end sub_807F8C4 thumb_func_start sub_807F904 @@ -360,11 +360,11 @@ sub_807F904: @ 807F904 lsls r0, 24 cmp r0, 0 beq _0807F958 - ldr r1, _0807F950 @ =gUnknown_2022B4C + ldr r1, _0807F950 @ =gBattleTypeFlags movs r0, 0xA0 lsls r0, 8 str r0, [r1] - ldr r0, _0807F954 @ =gUnknown_202402C + ldr r0, _0807F954 @ =gEnemyParty movs r1, 0xFE str r1, [sp] movs r1, 0xC @@ -380,10 +380,10 @@ sub_807F904: @ 807F904 _0807F944: .4byte gMain _0807F948: .4byte sub_807FBF0 _0807F94C: .4byte 0x00000167 -_0807F950: .4byte gUnknown_2022B4C -_0807F954: .4byte gUnknown_202402C +_0807F950: .4byte gBattleTypeFlags +_0807F954: .4byte gEnemyParty _0807F958: - ldr r1, _0807F98C @ =gUnknown_2022B4C + ldr r1, _0807F98C @ =gBattleTypeFlags movs r0, 0x80 lsls r0, 8 str r0, [r1] @@ -393,7 +393,7 @@ _0807F960: lsrs r0, 24 movs r1, 0 bl sub_807F690 - ldr r0, _0807F990 @ =gUnknown_202402C + ldr r0, _0807F990 @ =gEnemyParty ldr r2, _0807F994 @ =gUnknown_841D148 movs r1, 0x2 bl sub_804037C @@ -405,8 +405,8 @@ _0807F960: pop {r0} bx r0 .align 2, 0 -_0807F98C: .4byte gUnknown_2022B4C -_0807F990: .4byte gUnknown_202402C +_0807F98C: .4byte gBattleTypeFlags +_0807F990: .4byte gEnemyParty _0807F994: .4byte gUnknown_841D148 thumb_func_end sub_807F904 @@ -417,7 +417,7 @@ sub_807F998: @ 807F998 ldr r1, _0807F9CC @ =gMain ldr r0, _0807F9D0 @ =sub_807FBA0 str r0, [r1, 0x8] - ldr r1, _0807F9D4 @ =gUnknown_2022B4C + ldr r1, _0807F9D4 @ =gBattleTypeFlags movs r0, 0x80 lsls r0, 6 str r0, [r1] @@ -435,7 +435,7 @@ sub_807F998: @ 807F998 .align 2, 0 _0807F9CC: .4byte gMain _0807F9D0: .4byte sub_807FBA0 -_0807F9D4: .4byte gUnknown_2022B4C +_0807F9D4: .4byte gBattleTypeFlags thumb_func_end sub_807F998 thumb_func_start sub_807F9D8 @@ -445,11 +445,11 @@ sub_807F9D8: @ 807F9D8 ldr r1, _0807FA0C @ =gMain ldr r0, _0807FA10 @ =sub_807FBA0 str r0, [r1, 0x8] - ldr r1, _0807FA14 @ =gUnknown_2022B4C + ldr r1, _0807FA14 @ =gBattleTypeFlags movs r0, 0x84 lsls r0, 11 str r0, [r1] - ldr r0, _0807FA18 @ =gUnknown_202402C + ldr r0, _0807FA18 @ =gEnemyParty movs r1, 0xB bl GetMonData lsls r0, 16 @@ -467,8 +467,8 @@ sub_807F9D8: @ 807F9D8 .align 2, 0 _0807FA0C: .4byte gMain _0807FA10: .4byte sub_807FBA0 -_0807FA14: .4byte gUnknown_2022B4C -_0807FA18: .4byte gUnknown_202402C +_0807FA14: .4byte gBattleTypeFlags +_0807FA18: .4byte gEnemyParty _0807FA1C: cmp r1, 0xF9 blt _0807FA4C @@ -517,7 +517,7 @@ sub_807FA68: @ 807FA68 ldr r1, _0807FA90 @ =gMain ldr r0, _0807FA94 @ =sub_807FBA0 str r0, [r1, 0x8] - ldr r1, _0807FA98 @ =gUnknown_2022B4C + ldr r1, _0807FA98 @ =gBattleTypeFlags movs r0, 0xC0 lsls r0, 6 str r0, [r1] @@ -533,7 +533,7 @@ sub_807FA68: @ 807FA68 .align 2, 0 _0807FA90: .4byte gMain _0807FA94: .4byte sub_807FBA0 -_0807FA98: .4byte gUnknown_2022B4C +_0807FA98: .4byte gBattleTypeFlags _0807FA9C: .4byte gGameVersion _0807FAA0: movs r1, 0x85 @@ -556,7 +556,7 @@ sub_807FABC: @ 807FABC ldr r1, _0807FAEC @ =gMain ldr r0, _0807FAF0 @ =sub_807FBA0 str r0, [r1, 0x8] - ldr r1, _0807FAF4 @ =gUnknown_2022B4C + ldr r1, _0807FAF4 @ =gBattleTypeFlags movs r0, 0xC0 lsls r0, 7 str r0, [r1] @@ -573,7 +573,7 @@ sub_807FABC: @ 807FABC .align 2, 0 _0807FAEC: .4byte gMain _0807FAF0: .4byte sub_807FBA0 -_0807FAF4: .4byte gUnknown_2022B4C +_0807FAF4: .4byte gBattleTypeFlags thumb_func_end sub_807FABC thumb_func_start sub_807FAF8 @@ -956,7 +956,7 @@ _0807FDFE: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _0807FE50 @ =gUnknown_2024284 + ldr r0, _0807FE50 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -994,7 +994,7 @@ _0807FE48: pop {r1} bx r1 .align 2, 0 -_0807FE50: .4byte gUnknown_2024284 +_0807FE50: .4byte gPlayerParty thumb_func_end GetSumOfPlayerPartyLevel thumb_func_start reads_trainer_data_byte0 @@ -1004,7 +1004,7 @@ reads_trainer_data_byte0: @ 807FE54 lsrs r0, 16 lsls r1, 24 lsrs r4, r1, 24 - ldr r5, _0807FE88 @ =gUnknown_823EAC8 + ldr r5, _0807FE88 @ =gTrainers lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1026,7 +1026,7 @@ _0807FE74: beq _0807FE96 b _0807FF2C .align 2, 0 -_0807FE88: .4byte gUnknown_823EAC8 +_0807FE88: .4byte gTrainers _0807FE8C: cmp r0, 0x2 beq _0807FEE2 @@ -1129,7 +1129,7 @@ GetWildBattleTransition: @ 807FF34 bl GetBattleTransitionTypeByMap lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0807FF64 @ =gUnknown_202402C + ldr r0, _0807FF64 @ =gEnemyParty movs r1, 0x38 bl GetMonData adds r4, r0, 0 @@ -1146,7 +1146,7 @@ GetWildBattleTransition: @ 807FF34 adds r0, 0x1 b _0807FF70 .align 2, 0 -_0807FF64: .4byte gUnknown_202402C +_0807FF64: .4byte gEnemyParty _0807FF68: .4byte gUnknown_83C68F0 _0807FF6C: ldr r0, _0807FF7C @ =gUnknown_83C68F0 @@ -1164,13 +1164,13 @@ _0807FF7C: .4byte gUnknown_83C68F0 thumb_func_start sub_807FF80 sub_807FF80: @ 807FF80 push {r4-r6,lr} - ldr r4, _0807FFB4 @ =gUnknown_20386AE + ldr r4, _0807FFB4 @ =gTrainerBattleOpponent_A ldrh r1, [r4] movs r0, 0x80 lsls r0, 3 cmp r1, r0 beq _0808000C - ldr r1, _0807FFB8 @ =gUnknown_823EAC8 + ldr r1, _0807FFB8 @ =gTrainers ldrh r2, [r4] lsls r0, r2, 2 adds r0, r2 @@ -1191,8 +1191,8 @@ _0807FFB0: movs r0, 0xC b _08080054 .align 2, 0 -_0807FFB4: .4byte gUnknown_20386AE -_0807FFB8: .4byte gUnknown_823EAC8 +_0807FFB4: .4byte gTrainerBattleOpponent_A +_0807FFB8: .4byte gTrainers _0807FFBC: .4byte 0x000002df _0807FFC0: ldr r0, _0807FFD4 @ =0x0000019b @@ -1284,7 +1284,7 @@ _0808005C: .4byte gUnknown_83C68F8 thumb_func_start sub_8080060 sub_8080060: @ 8080060 push {r4,lr} - ldr r0, _08080084 @ =gUnknown_202402C + ldr r0, _08080084 @ =gEnemyParty movs r1, 0x38 bl GetMonData adds r4, r0, 0 @@ -1299,7 +1299,7 @@ sub_8080060: @ 8080060 movs r0, 0x3 b _0808008A .align 2, 0 -_08080084: .4byte gUnknown_202402C +_08080084: .4byte gEnemyParty _08080088: movs r0, 0x4 _0808008A: @@ -1342,7 +1342,7 @@ TrainerBattleLoadArg8: @ 80800B4 thumb_func_start trainerflag_opponent trainerflag_opponent: @ 80800B8 - ldr r1, _080800CC @ =gUnknown_20386AE + ldr r1, _080800CC @ =gTrainerBattleOpponent_A movs r2, 0xA0 lsls r2, 3 adds r0, r2, 0 @@ -1352,7 +1352,7 @@ trainerflag_opponent: @ 80800B8 lsrs r0, 16 bx lr .align 2, 0 -_080800CC: .4byte gUnknown_20386AE +_080800CC: .4byte gTrainerBattleOpponent_A thumb_func_end trainerflag_opponent thumb_func_start IsPlayerDefeated @@ -1392,7 +1392,7 @@ sub_8080110: @ 8080110 ldr r0, _08080140 @ =gUnknown_20386AC movs r1, 0 strh r1, [r0] - ldr r0, _08080144 @ =gUnknown_20386AE + ldr r0, _08080144 @ =gTrainerBattleOpponent_A strh r1, [r0] ldr r0, _08080148 @ =gUnknown_20386B0 strh r1, [r0] @@ -1414,7 +1414,7 @@ sub_8080110: @ 8080110 bx lr .align 2, 0 _08080140: .4byte gUnknown_20386AC -_08080144: .4byte gUnknown_20386AE +_08080144: .4byte gTrainerBattleOpponent_A _08080148: .4byte gUnknown_20386B0 _0808014C: .4byte gUnknown_20386B4 _08080150: .4byte gUnknown_20386B8 @@ -1590,7 +1590,7 @@ _080802AC: adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 - ldr r4, _080802D0 @ =gUnknown_20386AE + ldr r4, _080802D0 @ =gTrainerBattleOpponent_A ldrh r0, [r4] bl sub_810CE64 strh r0, [r4] @@ -1598,7 +1598,7 @@ _080802AC: b _08080326 .align 2, 0 _080802CC: .4byte gUnknown_83C6990 -_080802D0: .4byte gUnknown_20386AE +_080802D0: .4byte gTrainerBattleOpponent_A _080802D4: .4byte gUnknown_81A4F73 _080802D8: bl sub_811231C @@ -1606,7 +1606,7 @@ _080802D8: adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 - ldr r4, _080802FC @ =gUnknown_20386AE + ldr r4, _080802FC @ =gTrainerBattleOpponent_A ldrh r0, [r4] bl sub_810CE64 strh r0, [r4] @@ -1614,7 +1614,7 @@ _080802D8: b _08080326 .align 2, 0 _080802F8: .4byte gUnknown_83C6900 -_080802FC: .4byte gUnknown_20386AE +_080802FC: .4byte gTrainerBattleOpponent_A _08080300: .4byte gUnknown_81A4F3E _08080304: ldr r0, _08080310 @ =gUnknown_83C6A20 @@ -1814,7 +1814,7 @@ trainer_flag_clear: @ 8080450 thumb_func_start sub_8080464 sub_8080464: @ 8080464 push {r4,lr} - ldr r4, _080804A0 @ =gUnknown_2022B4C + ldr r4, _080804A0 @ =gBattleTypeFlags movs r0, 0x8 str r0, [r4] bl sub_80803CC @@ -1841,7 +1841,7 @@ _0808048C: pop {r0} bx r0 .align 2, 0 -_080804A0: .4byte gUnknown_2022B4C +_080804A0: .4byte gBattleTypeFlags _080804A4: .4byte gMain _080804A8: .4byte sub_80804AC thumb_func_end sub_8080464 @@ -1887,7 +1887,7 @@ _080804EE: _08080500: .4byte gUnknown_20370D0 _08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080508: - ldr r0, _0808051C @ =gUnknown_20386AE + ldr r0, _0808051C @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -1897,7 +1897,7 @@ _08080508: bl SetMainCallback2 b _0808054E .align 2, 0 -_0808051C: .4byte gUnknown_20386AE +_0808051C: .4byte gTrainerBattleOpponent_A _08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080524: ldr r0, _08080538 @ =gUnknown_2023E8A @@ -1927,7 +1927,7 @@ _08080554: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_start sub_8080558 sub_8080558: @ 8080558 push {lr} - ldr r0, _08080570 @ =gUnknown_20386AE + ldr r0, _08080570 @ =gTrainerBattleOpponent_A ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -1937,7 +1937,7 @@ sub_8080558: @ 8080558 bl SetMainCallback2 b _080805A6 .align 2, 0 -_08080570: .4byte gUnknown_20386AE +_08080570: .4byte gTrainerBattleOpponent_A _08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music _08080578: ldr r0, _0808058C @ =gUnknown_2023E8A @@ -1967,7 +1967,7 @@ _080805AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_start sub_80805B0 sub_80805B0: @ 80805B0 push {lr} - ldr r1, _080805CC @ =gUnknown_2022B4C + ldr r1, _080805CC @ =gBattleTypeFlags movs r0, 0x8 str r0, [r1] ldr r1, _080805D0 @ =gMain @@ -1978,7 +1978,7 @@ sub_80805B0: @ 80805B0 pop {r0} bx r0 .align 2, 0 -_080805CC: .4byte gUnknown_2022B4C +_080805CC: .4byte gBattleTypeFlags _080805D0: .4byte gMain _080805D4: .4byte sub_8080558 thumb_func_end sub_80805B0 @@ -2049,7 +2049,7 @@ sub_8080628: @ 8080628 beq _080806BE cmp r0, 0x8 beq _080806BE - ldr r0, _08080668 @ =gUnknown_20386AE + ldr r0, _08080668 @ =gTrainerBattleOpponent_A ldrh r0, [r0] bl sub_804367C lsls r0, 24 @@ -2064,7 +2064,7 @@ sub_8080628: @ 8080628 .align 2, 0 _08080660: .4byte gUnknown_203ADFA _08080664: .4byte gUnknown_20386AC -_08080668: .4byte gUnknown_20386AE +_08080668: .4byte gTrainerBattleOpponent_A _0808066C: .4byte _08080670 .align 2, 0 _08080670: diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 0d00cf89c..45107fad1 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -1213,7 +1213,7 @@ _080E627E: _080E6286: movs r0, 0x64 muls r0, r6 - ldr r1, _080E62A8 @ =gUnknown_202402C + ldr r1, _080E62A8 @ =gEnemyParty adds r0, r1 movs r1, 0x2C adds r2, r6, 0 @@ -1228,14 +1228,14 @@ _080E6286: ble _080E6286 b _080E64A6 .align 2, 0 -_080E62A8: .4byte gUnknown_202402C +_080E62A8: .4byte gEnemyParty _080E62AC: .4byte 0x000004d4 _080E62B0: movs r6, 0 _080E62B2: movs r0, 0x64 muls r0, r6 - ldr r1, _080E62E4 @ =gUnknown_202402C + ldr r1, _080E62E4 @ =gEnemyParty adds r0, r1 ldr r1, _080E62E8 @ =gSaveBlock2Ptr ldr r1, [r1] @@ -1257,7 +1257,7 @@ _080E62B2: ble _080E62B2 b _080E64A6 .align 2, 0 -_080E62E4: .4byte gUnknown_202402C +_080E62E4: .4byte gEnemyParty _080E62E8: .4byte gSaveBlock2Ptr _080E62EC: .4byte 0x0000056c _080E62F0: .4byte 0xffffc144 @@ -1337,7 +1337,7 @@ _080E6384: _080E6388: cmp r5, r6 bge _080E63A2 - ldr r1, _080E64B8 @ =gUnknown_202402C + ldr r1, _080E64B8 @ =gEnemyParty adds r0, r4, r1 movs r1, 0xB movs r2, 0 @@ -1360,7 +1360,7 @@ _080E63A2: mov r8, r0 movs r3, 0 _080E63B8: - ldr r0, _080E64B8 @ =gUnknown_202402C + ldr r0, _080E64B8 @ =gEnemyParty adds r4, r3, r0 adds r0, r4, 0 movs r1, 0xC @@ -1416,7 +1416,7 @@ _080E6412: movs r3, 0x64 adds r0, r6, 0 muls r0, r3 - ldr r1, _080E64B8 @ =gUnknown_202402C + ldr r1, _080E64B8 @ =gEnemyParty adds r0, r1 lsls r4, r7, 4 mov r3, r10 @@ -1437,7 +1437,7 @@ _080E6412: mov r0, r10 adds r0, 0x4 adds r4, r0 - ldr r3, _080E64B8 @ =gUnknown_202402C + ldr r3, _080E64B8 @ =gEnemyParty _080E6452: ldrh r1, [r4] lsls r2, r5, 24 @@ -1460,7 +1460,7 @@ _080E646E: movs r2, 0x64 adds r4, r6, 0 muls r4, r2 - ldr r3, _080E64B8 @ =gUnknown_202402C + ldr r3, _080E64B8 @ =gEnemyParty adds r4, r3 adds r0, r4, 0 movs r1, 0x20 @@ -1490,7 +1490,7 @@ _080E64A6: pop {r0} bx r0 .align 2, 0 -_080E64B8: .4byte gUnknown_202402C +_080E64B8: .4byte gEnemyParty _080E64BC: .4byte gUnknown_83FFAC4 thumb_func_end sub_80E61DC @@ -1719,7 +1719,7 @@ _080E6662: movs r0, 0x64 adds r5, r7, 0 muls r5, r0 - ldr r0, _080E6724 @ =gUnknown_2024284 + ldr r0, _080E6724 @ =gPlayerParty adds r5, r0 adds r0, r5, 0 movs r1, 0x41 @@ -1809,7 +1809,7 @@ _080E6704: ldr r1, _080E673C @ =gUnknown_83FE860 b _080E6742 .align 2, 0 -_080E6724: .4byte gUnknown_2024284 +_080E6724: .4byte gPlayerParty _080E6728: .4byte gUnknown_20370D0 _080E672C: .4byte gStringVar1 _080E6730: .4byte gUnknown_20370C0 @@ -1994,7 +1994,7 @@ _080E6874: bl GetMonData mov r1, sp strh r0, [r1] - ldr r0, _080E68A8 @ =gUnknown_2024284 + ldr r0, _080E68A8 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xC @@ -2006,7 +2006,7 @@ _080E6874: b _080E68B0 .align 2, 0 _080E68A4: .4byte gSaveBlock1Ptr -_080E68A8: .4byte gUnknown_2024284 +_080E68A8: .4byte gPlayerParty _080E68AC: bl sub_80E7550 _080E68B0: @@ -2072,17 +2072,17 @@ _080E6924: beq _080E6998 b _080E69E6 _080E692A: - ldr r1, _080E693C @ =gUnknown_2022B4C + ldr r1, _080E693C @ =gBattleTypeFlags movs r0, 0x84 lsls r0, 1 str r0, [r1] - ldr r0, _080E6940 @ =gUnknown_20386AE + ldr r0, _080E6940 @ =gTrainerBattleOpponent_A strh r2, [r0] bl sub_80E61DC b _080E6970 .align 2, 0 -_080E693C: .4byte gUnknown_2022B4C -_080E6940: .4byte gUnknown_20386AE +_080E693C: .4byte gBattleTypeFlags +_080E6940: .4byte gTrainerBattleOpponent_A _080E6944: movs r5, 0 ldr r6, _080E698C @ =gSaveBlock1Ptr @@ -2090,7 +2090,7 @@ _080E6948: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080E6990 @ =gUnknown_2024284 + ldr r0, _080E6990 @ =gPlayerParty adds r0, r4, r0 movs r1, 0xC bl GetMonData @@ -2118,7 +2118,7 @@ _080E6970: b _080E69E6 .align 2, 0 _080E698C: .4byte gSaveBlock1Ptr -_080E6990: .4byte gUnknown_2024284 +_080E6990: .4byte gPlayerParty _080E6994: .4byte sub_80E68C4 _080E6998: bl ZeroEnemyPartyMons @@ -2127,7 +2127,7 @@ _080E6998: _080E69A0: movs r0, 0x64 muls r0, r5 - ldr r1, _080E69F4 @ =gUnknown_202402C + ldr r1, _080E69F4 @ =gEnemyParty adds r0, r1 movs r1, 0x2C adds r2, r5, 0 @@ -2140,10 +2140,10 @@ _080E69A0: adds r5, 0x1 cmp r5, 0x2 ble _080E69A0 - ldr r1, _080E69FC @ =gUnknown_2022B4C + ldr r1, _080E69FC @ =gBattleTypeFlags ldr r0, _080E6A00 @ =0x00000808 str r0, [r1] - ldr r1, _080E6A04 @ =gUnknown_20386AE + ldr r1, _080E6A04 @ =gTrainerBattleOpponent_A movs r0, 0 strh r0, [r1] ldr r0, _080E6A08 @ =sub_80E68C4 @@ -2162,11 +2162,11 @@ _080E69E6: bx r0 .align 2, 0 _080E69F0: .4byte gSaveBlock2Ptr -_080E69F4: .4byte gUnknown_202402C +_080E69F4: .4byte gEnemyParty _080E69F8: .4byte 0x000004d4 -_080E69FC: .4byte gUnknown_2022B4C +_080E69FC: .4byte gBattleTypeFlags _080E6A00: .4byte 0x00000808 -_080E6A04: .4byte gUnknown_20386AE +_080E6A04: .4byte gTrainerBattleOpponent_A _080E6A08: .4byte sub_80E68C4 thumb_func_end sub_80E6900 @@ -2215,7 +2215,7 @@ _080E6A44: .4byte _080E6C4C .4byte _080E6C6C _080E6A80: - ldr r0, _080E6AA0 @ =gUnknown_2023FE8 + ldr r0, _080E6AA0 @ =gBattleStruct ldr r1, [r0] adds r1, 0xDA ldr r0, [r6] @@ -2232,7 +2232,7 @@ _080E6A80: strb r1, [r0] b _080E6C80 .align 2, 0 -_080E6AA0: .4byte gUnknown_2023FE8 +_080E6AA0: .4byte gBattleStruct _080E6AA4: .4byte 0x0000055e _080E6AA8: .4byte gUnknown_20370C2 _080E6AAC: @@ -2429,14 +2429,14 @@ _080E6C30: ldr r0, _080E6C44 @ =0x0000055e adds r1, r0 adds r1, r5 - ldr r0, _080E6C48 @ =gUnknown_2023FE8 + ldr r0, _080E6C48 @ =gBattleStruct ldr r0, [r0] adds r0, 0xDA ldrb r0, [r0] b _080E6C7E .align 2, 0 _080E6C44: .4byte 0x0000055e -_080E6C48: .4byte gUnknown_2023FE8 +_080E6C48: .4byte gBattleStruct _080E6C4C: adds r0, r5, 0 bl sub_80E7188 @@ -2612,14 +2612,14 @@ _080E6DB8: ldr r2, _080E6DCC @ =0x0000055e adds r1, r2 adds r1, r4 - ldr r0, _080E6DD0 @ =gUnknown_2023FE8 + ldr r0, _080E6DD0 @ =gBattleStruct ldr r0, [r0] adds r0, 0xDA ldrb r0, [r0] b _080E6E06 .align 2, 0 _080E6DCC: .4byte 0x0000055e -_080E6DD0: .4byte gUnknown_2023FE8 +_080E6DD0: .4byte gBattleStruct _080E6DD4: adds r0, r4, 0 bl sub_80E7188 @@ -3067,7 +3067,7 @@ sub_80E712C: @ 80E712C adds r0, r1 bl sub_80E6150 ldr r1, [r4] - ldr r3, _080E717C @ =gUnknown_2023BE4 + ldr r3, _080E717C @ =gBattleMons adds r0, r3, 0 adds r0, 0x58 ldrh r2, [r0] @@ -3099,7 +3099,7 @@ _080E715C: .align 2, 0 _080E7174: .4byte gSaveBlock2Ptr _080E7178: .4byte 0x0000048c -_080E717C: .4byte gUnknown_2023BE4 +_080E717C: .4byte gBattleMons _080E7180: .4byte 0x0000048a _080E7184: .4byte 0x00000494 thumb_func_end sub_80E712C @@ -3294,7 +3294,7 @@ _080E72EA: subs r0, 0x1 movs r1, 0x64 muls r1, r0 - ldr r0, _080E7344 @ =gUnknown_2024284 + ldr r0, _080E7344 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 adds r1, r7, 0 @@ -3327,7 +3327,7 @@ _080E7334: .4byte gSaveBlock2Ptr _080E7338: .4byte 0x0000055c _080E733C: .4byte gUnknown_20370D0 _080E7340: .4byte 0x0000056d -_080E7344: .4byte gUnknown_2024284 +_080E7344: .4byte gPlayerParty thumb_func_end sub_80E72B8 thumb_func_start sub_80E7348 @@ -3410,7 +3410,7 @@ _080E73BC: _080E73E2: movs r0, 0x64 muls r0, r4 - ldr r1, _080E741C @ =gUnknown_2024284 + ldr r1, _080E741C @ =gPlayerParty adds r0, r1 movs r1, 0x2C muls r1, r4 @@ -3432,7 +3432,7 @@ _080E73E2: _080E7410: .4byte gUnknown_84020C4 _080E7414: .4byte gSaveBlock1Ptr _080E7418: .4byte 0x00002cac -_080E741C: .4byte gUnknown_2024284 +_080E741C: .4byte gPlayerParty thumb_func_end sub_80E7348 thumb_func_start GetEreaderTrainerFrontSpriteId diff --git a/asm/battle_util.s b/asm/battle_util.s index 36ae56be3..1c180978d 100644 --- a/asm/battle_util.s +++ b/asm/battle_util.s @@ -36,17 +36,17 @@ _08016E40: .4byte _08016EB4 .4byte _08016EB8 _08016E74: - ldr r0, _08016E7C @ =gUnknown_2023D6C + ldr r0, _08016E7C @ =gBattlerTarget ldrb r2, [r0] b _08016EC2 .align 2, 0 -_08016E7C: .4byte gUnknown_2023D6C +_08016E7C: .4byte gBattlerTarget _08016E80: - ldr r0, _08016E88 @ =gUnknown_2023D6B + ldr r0, _08016E88 @ =sBattler_AI ldrb r2, [r0] b _08016EC2 .align 2, 0 -_08016E88: .4byte gUnknown_2023D6B +_08016E88: .4byte sBattler_AI _08016E8C: ldr r0, _08016E94 @ =gUnknown_2023D6E ldrb r2, [r0] @@ -57,11 +57,11 @@ _08016E98: movs r2, 0 b _08016EC2 _08016E9C: - ldr r0, _08016EA4 @ =gUnknown_2023FC4 + ldr r0, _08016EA4 @ =gBattleScripting ldrb r2, [r0, 0x17] b _08016EC2 .align 2, 0 -_08016EA4: .4byte gUnknown_2023FC4 +_08016EA4: .4byte gBattleScripting _08016EA8: ldr r0, _08016EB0 @ =gUnknown_2023D6D ldrb r2, [r0] @@ -93,7 +93,7 @@ PressurePPLose: @ 8016EC8 lsrs r5, r1, 24 lsls r2, 16 lsrs r2, 16 - ldr r1, _08016EF8 @ =gUnknown_2023BE4 + ldr r1, _08016EF8 @ =gBattleMons movs r4, 0x58 muls r0, r4 adds r0, r1 @@ -109,7 +109,7 @@ PressurePPLose: @ 8016EC8 adds r1, r0, r1 b _08016F04 .align 2, 0 -_08016EF8: .4byte gUnknown_2023BE4 +_08016EF8: .4byte gBattleMons _08016EFC: adds r1, 0x2 adds r3, 0x1 @@ -144,21 +144,21 @@ _08016F26: ands r0, r1 cmp r0, 0 bne _08016F7A - ldr r1, _08016F84 @ =gUnknown_2023E0C + ldr r1, _08016F84 @ =gDisableStructs lsls r0, r5, 3 subs r0, r5 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _08016F88 @ =gUnknown_825E45C + ldr r2, _08016F88 @ =gBitTable lsls r0, r3, 2 adds r0, r2 ldr r0, [r0] ands r1, r0 cmp r1, 0 bne _08016F7A - ldr r4, _08016F8C @ =gUnknown_2023BC4 + ldr r4, _08016F8C @ =gActiveBattler strb r5, [r4] adds r1, r3, 0 adds r1, 0x9 @@ -181,9 +181,9 @@ _08016F7A: pop {r0} bx r0 .align 2, 0 -_08016F84: .4byte gUnknown_2023E0C -_08016F88: .4byte gUnknown_825E45C -_08016F8C: .4byte gUnknown_2023BC4 +_08016F84: .4byte gDisableStructs +_08016F88: .4byte gBitTable +_08016F8C: .4byte gActiveBattler thumb_func_end PressurePPLose thumb_func_start PressurePPLoseOnUsingImprision @@ -208,7 +208,7 @@ PressurePPLoseOnUsingImprision: @ 8016F90 ldrb r0, [r0] cmp r4, r0 bge _08017038 - ldr r1, _080170B4 @ =gUnknown_2023BE4 + ldr r1, _080170B4 @ =gBattleMons movs r0, 0x58 adds r7, r5, 0 muls r7, r0 @@ -223,7 +223,7 @@ _08016FC6: adds r6, r4, 0x1 cmp r9, r0 beq _0801702E - ldr r0, _080170B4 @ =gUnknown_2023BE4 + ldr r0, _080170B4 @ =gBattleMons movs r3, 0x58 adds r1, r4, 0 muls r1, r3 @@ -278,7 +278,7 @@ _08017038: mov r1, r8 cmp r1, 0x4 beq _080170A0 - ldr r6, _080170B4 @ =gUnknown_2023BE4 + ldr r6, _080170B4 @ =gBattleMons movs r3, 0x58 adds r0, r5, 0 muls r0, r3 @@ -291,14 +291,14 @@ _08017038: ands r0, r1 cmp r0, 0 bne _080170A0 - ldr r1, _080170B8 @ =gUnknown_2023E0C + ldr r1, _080170B8 @ =gDisableStructs lsls r0, r5, 3 subs r0, r5 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _080170BC @ =gUnknown_825E45C + ldr r2, _080170BC @ =gBitTable mov r4, r8 lsls r0, r4, 2 adds r0, r2 @@ -306,7 +306,7 @@ _08017038: ands r1, r0 cmp r1, 0 bne _080170A0 - ldr r4, _080170C0 @ =gUnknown_2023BC4 + ldr r4, _080170C0 @ =gActiveBattler strb r5, [r4] mov r1, r8 adds r1, 0x9 @@ -336,10 +336,10 @@ _080170A0: bx r0 .align 2, 0 _080170B0: .4byte gUnknown_2023BCC -_080170B4: .4byte gUnknown_2023BE4 -_080170B8: .4byte gUnknown_2023E0C -_080170BC: .4byte gUnknown_825E45C -_080170C0: .4byte gUnknown_2023BC4 +_080170B4: .4byte gBattleMons +_080170B8: .4byte gDisableStructs +_080170BC: .4byte gBitTable +_080170C0: .4byte gActiveBattler thumb_func_end PressurePPLoseOnUsingImprision thumb_func_start PressurePPLoseOnUsingPerishSong @@ -359,7 +359,7 @@ PressurePPLoseOnUsingPerishSong: @ 80170C4 ldrb r0, [r0] cmp r1, r0 bge _08017146 - ldr r7, _080171C0 @ =gUnknown_2023BE4 + ldr r7, _080171C0 @ =gBattleMons movs r2, 0x58 mov r12, r2 mov r5, r12 @@ -416,7 +416,7 @@ _0801713C: _08017146: cmp r6, 0x4 beq _080171AA - ldr r7, _080171C0 @ =gUnknown_2023BE4 + ldr r7, _080171C0 @ =gBattleMons movs r5, 0x58 adds r0, r3, 0 muls r0, r5 @@ -429,21 +429,21 @@ _08017146: ands r0, r1 cmp r0, 0 bne _080171AA - ldr r1, _080171CC @ =gUnknown_2023E0C + ldr r1, _080171CC @ =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _080171D0 @ =gUnknown_825E45C + ldr r2, _080171D0 @ =gBitTable lsls r0, r6, 2 adds r0, r2 ldr r0, [r0] ands r1, r0 cmp r1, 0 bne _080171AA - ldr r4, _080171D4 @ =gUnknown_2023BC4 + ldr r4, _080171D4 @ =gActiveBattler strb r3, [r4] adds r1, r6, 0 adds r1, 0x9 @@ -473,18 +473,18 @@ _080171AA: bx r0 .align 2, 0 _080171BC: .4byte gUnknown_2023BCC -_080171C0: .4byte gUnknown_2023BE4 +_080171C0: .4byte gBattleMons _080171C4: .4byte gUnknown_2023BF0 _080171C8: .4byte gUnknown_2023C08 -_080171CC: .4byte gUnknown_2023E0C -_080171D0: .4byte gUnknown_825E45C -_080171D4: .4byte gUnknown_2023BC4 +_080171CC: .4byte gDisableStructs +_080171D0: .4byte gBitTable +_080171D4: .4byte gActiveBattler thumb_func_end PressurePPLoseOnUsingPerishSong thumb_func_start MarkAllBufferBanksForExecution MarkAllBufferBanksForExecution: @ 80171D8 push {r4,r5,lr} - ldr r0, _08017208 @ =gUnknown_2022B4C + ldr r0, _08017208 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -496,7 +496,7 @@ MarkAllBufferBanksForExecution: @ 80171D8 cmp r2, r0 bge _08017236 ldr r3, _08017210 @ =gUnknown_2023BC8 - ldr r5, _08017214 @ =gUnknown_825E45C + ldr r5, _08017214 @ =gBitTable _080171F4: ldm r5!, {r1} lsls r1, 28 @@ -509,10 +509,10 @@ _080171F4: blt _080171F4 b _08017236 .align 2, 0 -_08017208: .4byte gUnknown_2022B4C +_08017208: .4byte gBattleTypeFlags _0801720C: .4byte gUnknown_2023BCC _08017210: .4byte gUnknown_2023BC8 -_08017214: .4byte gUnknown_825E45C +_08017214: .4byte gBitTable _08017218: movs r2, 0 ldr r4, _0801723C @ =gUnknown_2023BCC @@ -520,7 +520,7 @@ _08017218: cmp r2, r0 bge _08017236 ldr r3, _08017240 @ =gUnknown_2023BC8 - ldr r5, _08017244 @ =gUnknown_825E45C + ldr r5, _08017244 @ =gBitTable _08017226: ldr r0, [r3] ldm r5!, {r1} @@ -537,7 +537,7 @@ _08017236: .align 2, 0 _0801723C: .4byte gUnknown_2023BCC _08017240: .4byte gUnknown_2023BC8 -_08017244: .4byte gUnknown_825E45C +_08017244: .4byte gBitTable thumb_func_end MarkAllBufferBanksForExecution thumb_func_start MarkBufferBankForExecution @@ -545,14 +545,14 @@ MarkBufferBankForExecution: @ 8017248 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _08017270 @ =gUnknown_2022B4C + ldr r0, _08017270 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _0801727C ldr r2, _08017274 @ =gUnknown_2023BC8 - ldr r1, _08017278 @ =gUnknown_825E45C + ldr r1, _08017278 @ =gBitTable lsls r0, r3, 2 adds r0, r1 ldr r1, [r0] @@ -562,12 +562,12 @@ MarkBufferBankForExecution: @ 8017248 str r0, [r2] b _0801728C .align 2, 0 -_08017270: .4byte gUnknown_2022B4C +_08017270: .4byte gBattleTypeFlags _08017274: .4byte gUnknown_2023BC8 -_08017278: .4byte gUnknown_825E45C +_08017278: .4byte gBitTable _0801727C: ldr r2, _08017290 @ =gUnknown_2023BC8 - ldr r1, _08017294 @ =gUnknown_825E45C + ldr r1, _08017294 @ =gBitTable lsls r0, r3, 2 adds r0, r1 ldr r1, [r2] @@ -579,7 +579,7 @@ _0801728C: bx r0 .align 2, 0 _08017290: .4byte gUnknown_2023BC8 -_08017294: .4byte gUnknown_825E45C +_08017294: .4byte gBitTable thumb_func_end MarkBufferBankForExecution thumb_func_start sub_8017298 @@ -589,13 +589,13 @@ sub_8017298: @ 8017298 lsrs r7, r0, 24 movs r4, 0 ldr r5, _080172AC @ =gUnknown_2023BC8 - ldr r1, _080172B0 @ =gUnknown_825E45C + ldr r1, _080172B0 @ =gBitTable lsls r0, r7, 2 adds r6, r0, r1 b _080172C2 .align 2, 0 _080172AC: .4byte gUnknown_2023BC8 -_080172B0: .4byte gUnknown_825E45C +_080172B0: .4byte gBitTable _080172B4: lsls r0, r4, 2 ldr r1, [r6] @@ -628,7 +628,7 @@ _080172E4: .4byte gUnknown_2023BC8 CancelMultiTurnMoves: @ 80172E8 lsls r0, 24 lsrs r0, 24 - ldr r1, _08017338 @ =gUnknown_2023BE4 + ldr r1, _08017338 @ =gBattleMons movs r2, 0x58 adds r3, r0, 0 muls r3, r2 @@ -645,14 +645,14 @@ CancelMultiTurnMoves: @ 80172E8 ldr r2, _08017344 @ =0xfffffcff ands r1, r2 str r1, [r3] - ldr r1, _08017348 @ =gUnknown_2023DFC + ldr r1, _08017348 @ =gStatuses3 lsls r2, r0, 2 adds r2, r1 ldr r1, [r2] ldr r3, _0801734C @ =0xfffbff3f ands r1, r3 str r1, [r2] - ldr r2, _08017350 @ =gUnknown_2023E0C + ldr r2, _08017350 @ =gDisableStructs lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -666,13 +666,13 @@ CancelMultiTurnMoves: @ 80172E8 strb r0, [r1, 0x10] bx lr .align 2, 0 -_08017338: .4byte gUnknown_2023BE4 +_08017338: .4byte gBattleMons _0801733C: .4byte 0xffffefff _08017340: .4byte 0xfffff3ff _08017344: .4byte 0xfffffcff -_08017348: .4byte gUnknown_2023DFC +_08017348: .4byte gStatuses3 _0801734C: .4byte 0xfffbff3f -_08017350: .4byte gUnknown_2023E0C +_08017350: .4byte gDisableStructs thumb_func_end CancelMultiTurnMoves thumb_func_start WasUnableToUseMove @@ -730,7 +730,7 @@ PrepareStringBattle: @ 80173AC adds r2, r0, 0 lsls r2, 16 lsrs r2, 16 - ldr r4, _080173CC @ =gUnknown_2023BC4 + ldr r4, _080173CC @ =gActiveBattler strb r1, [r4] movs r0, 0 adds r1, r2, 0 @@ -741,7 +741,7 @@ PrepareStringBattle: @ 80173AC pop {r0} bx r0 .align 2, 0 -_080173CC: .4byte gUnknown_2023BC4 +_080173CC: .4byte gActiveBattler thumb_func_end PrepareStringBattle thumb_func_start ResetSentPokesToOpponentValue @@ -757,9 +757,9 @@ ResetSentPokesToOpponentValue: @ 80173D0 adds r6, r0, 0 cmp r1, r2 bge _080173FE - ldr r5, _0801742C @ =gUnknown_825E45C + ldr r5, _0801742C @ =gBitTable adds r4, r2, 0 - ldr r2, _08017430 @ =gUnknown_2023BCE + ldr r2, _08017430 @ =gBattlerPartyIndexes _080173EC: ldrh r0, [r2] lsls r0, 2 @@ -795,8 +795,8 @@ _0801741E: .align 2, 0 _08017424: .4byte gUnknown_2023F4E _08017428: .4byte gUnknown_2023BCC -_0801742C: .4byte gUnknown_825E45C -_08017430: .4byte gUnknown_2023BCE +_0801742C: .4byte gBitTable +_08017430: .4byte gBattlerPartyIndexes thumb_func_end ResetSentPokesToOpponentValue thumb_func_start sub_8017434 @@ -827,11 +827,11 @@ sub_8017434: @ 8017434 mov r8, r1 cmp r4, r2 bge _08017492 - ldr r0, _080174AC @ =gUnknown_2023D70 + ldr r0, _080174AC @ =gAbsentBattlerFlags ldrb r7, [r0] - ldr r1, _080174B0 @ =gUnknown_825E45C + ldr r1, _080174B0 @ =gBitTable adds r6, r2, 0 - ldr r3, _080174B4 @ =gUnknown_2023BCE + ldr r3, _080174B4 @ =gBattlerPartyIndexes adds r2, r1, 0 _08017476: ldr r0, [r2] @@ -862,9 +862,9 @@ _08017498: .align 2, 0 _080174A4: .4byte gUnknown_2023F4E _080174A8: .4byte gUnknown_2023BCC -_080174AC: .4byte gUnknown_2023D70 -_080174B0: .4byte gUnknown_825E45C -_080174B4: .4byte gUnknown_2023BCE +_080174AC: .4byte gAbsentBattlerFlags +_080174B0: .4byte gBitTable +_080174B4: .4byte gBattlerPartyIndexes thumb_func_end sub_8017434 thumb_func_start sub_80174B8 @@ -890,8 +890,8 @@ _080174D4: ldr r0, _08017514 @ =gUnknown_2023F4E mov r12, r0 movs r7, 0x2 - ldr r6, _08017518 @ =gUnknown_825E45C - ldr r1, _0801751C @ =gUnknown_2023BCE + ldr r6, _08017518 @ =gBitTable + ldr r1, _0801751C @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r4, r0, r1 _080174EC: @@ -917,14 +917,14 @@ _0801750A: .align 2, 0 _08017510: .4byte gUnknown_2023BCC _08017514: .4byte gUnknown_2023F4E -_08017518: .4byte gUnknown_825E45C -_0801751C: .4byte gUnknown_2023BCE +_08017518: .4byte gBitTable +_0801751C: .4byte gBattlerPartyIndexes thumb_func_end sub_80174B8 thumb_func_start BattleScriptPush BattleScriptPush: @ 8017520 push {r4,lr} - ldr r1, _08017540 @ =gUnknown_2023FF4 + ldr r1, _08017540 @ =gBattleResources ldr r1, [r1] ldr r3, [r1, 0x8] adds r4, r3, 0 @@ -940,12 +940,12 @@ BattleScriptPush: @ 8017520 pop {r0} bx r0 .align 2, 0 -_08017540: .4byte gUnknown_2023FF4 +_08017540: .4byte gBattleResources thumb_func_end BattleScriptPush thumb_func_start BattleScriptPushCursor BattleScriptPushCursor: @ 8017544 - ldr r0, _08017564 @ =gUnknown_2023FF4 + ldr r0, _08017564 @ =gBattleResources ldr r0, [r0] ldr r2, [r0, 0x8] adds r3, r2, 0 @@ -961,14 +961,14 @@ BattleScriptPushCursor: @ 8017544 str r0, [r2] bx lr .align 2, 0 -_08017564: .4byte gUnknown_2023FF4 +_08017564: .4byte gBattleResources _08017568: .4byte gUnknown_2023D74 thumb_func_end BattleScriptPushCursor thumb_func_start BattleScriptPop BattleScriptPop: @ 801756C ldr r3, _0801758C @ =gUnknown_2023D74 - ldr r0, _08017590 @ =gUnknown_2023FF4 + ldr r0, _08017590 @ =gBattleResources ldr r0, [r0] ldr r1, [r0, 0x8] adds r2, r1, 0 @@ -984,7 +984,7 @@ BattleScriptPop: @ 801756C bx lr .align 2, 0 _0801758C: .4byte gUnknown_2023D74 -_08017590: .4byte gUnknown_2023FF4 +_08017590: .4byte gBattleResources thumb_func_end BattleScriptPop thumb_func_start sub_8017594 @@ -993,9 +993,9 @@ sub_8017594: @ 8017594 mov r7, r8 push {r7} movs r6, 0 - ldr r2, _080176AC @ =gUnknown_2023BE4 + ldr r2, _080176AC @ =gBattleMons ldr r1, _080176B0 @ =gUnknown_20233C4 - ldr r5, _080176B4 @ =gUnknown_2023BC4 + ldr r5, _080176B4 @ =gActiveBattler ldrb r3, [r5] lsls r0, r3, 9 adds r1, 0x2 @@ -1008,13 +1008,13 @@ sub_8017594: @ 8017594 adds r2, 0xC adds r0, r2 ldrh r4, [r0] - ldr r1, _080176B8 @ =gUnknown_2023FE8 + ldr r1, _080176B8 @ =gBattleStruct lsls r0, r3, 1 adds r0, 0xC8 ldr r1, [r1] adds r1, r0 mov r8, r1 - ldr r1, _080176BC @ =gUnknown_2023E0C + ldr r1, _080176BC @ =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -1024,9 +1024,9 @@ sub_8017594: @ 8017594 bne _080175F0 cmp r4, 0 beq _080175F0 - ldr r0, _080176C0 @ =gUnknown_2023FC4 + ldr r0, _080176C0 @ =gBattleScripting strb r3, [r0, 0x17] - ldr r0, _080176C4 @ =gUnknown_2023D4A + ldr r0, _080176C4 @ =gCurrentMove strh r4, [r0] ldr r1, _080176C8 @ =gUnknown_2023D80 ldrb r0, [r5] @@ -1036,8 +1036,8 @@ sub_8017594: @ 8017594 str r1, [r0] movs r6, 0x1 _080175F0: - ldr r1, _080176D0 @ =gUnknown_2023D98 - ldr r5, _080176B4 @ =gUnknown_2023BC4 + ldr r1, _080176D0 @ =gLastUsedMove + ldr r5, _080176B4 @ =gActiveBattler ldrb r2, [r5] lsls r0, r2, 1 adds r0, r1 @@ -1046,7 +1046,7 @@ _080175F0: bne _0801762C cmp r4, 0xA5 beq _0801762C - ldr r1, _080176AC @ =gUnknown_2023BE4 + ldr r1, _080176AC @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r1, 0x50 @@ -1066,8 +1066,8 @@ _080175F0: lsls r0, 24 lsrs r6, r0, 24 _0801762C: - ldr r2, _080176BC @ =gUnknown_2023E0C - ldr r3, _080176B4 @ =gUnknown_2023BC4 + ldr r2, _080176BC @ =gDisableStructs + ldr r3, _080176B4 @ =gActiveBattler ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -1077,7 +1077,7 @@ _0801762C: lsls r0, 28 cmp r0, 0 beq _08017668 - ldr r0, _080176D8 @ =gUnknown_8250C04 + ldr r0, _080176D8 @ =gBattleMoves lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -1085,7 +1085,7 @@ _0801762C: ldrb r0, [r1, 0x1] cmp r0, 0 bne _08017668 - ldr r0, _080176C4 @ =gUnknown_2023D4A + ldr r0, _080176C4 @ =gCurrentMove strh r4, [r0] ldr r1, _080176C8 @ =gUnknown_2023D80 ldrb r0, [r3] @@ -1097,14 +1097,14 @@ _0801762C: lsls r0, 24 lsrs r6, r0, 24 _08017668: - ldr r5, _080176B4 @ =gUnknown_2023BC4 + ldr r5, _080176B4 @ =gActiveBattler ldrb r0, [r5] adds r1, r4, 0 bl GetImprisonedMovesCount lsls r0, 24 cmp r0, 0 beq _0801768E - ldr r0, _080176C4 @ =gUnknown_2023D4A + ldr r0, _080176C4 @ =gCurrentMove strh r4, [r0] ldr r1, _080176C8 @ =gUnknown_2023D80 ldrb r0, [r5] @@ -1116,7 +1116,7 @@ _08017668: lsls r0, 24 lsrs r6, r0, 24 _0801768E: - ldr r1, _080176AC @ =gUnknown_2023BE4 + ldr r1, _080176AC @ =gBattleMons ldrb r2, [r5] movs r0, 0x58 muls r0, r2 @@ -1132,18 +1132,18 @@ _0801768E: ldrb r3, [r0, 0x7] b _080176F2 .align 2, 0 -_080176AC: .4byte gUnknown_2023BE4 +_080176AC: .4byte gBattleMons _080176B0: .4byte gUnknown_20233C4 -_080176B4: .4byte gUnknown_2023BC4 -_080176B8: .4byte gUnknown_2023FE8 -_080176BC: .4byte gUnknown_2023E0C -_080176C0: .4byte gUnknown_2023FC4 -_080176C4: .4byte gUnknown_2023D4A +_080176B4: .4byte gActiveBattler +_080176B8: .4byte gBattleStruct +_080176BC: .4byte gDisableStructs +_080176C0: .4byte gBattleScripting +_080176C4: .4byte gCurrentMove _080176C8: .4byte gUnknown_2023D80 _080176CC: .4byte gUnknown_81D8C5A -_080176D0: .4byte gUnknown_2023D98 +_080176D0: .4byte gLastUsedMove _080176D4: .4byte gUnknown_81D8EB7 -_080176D8: .4byte gUnknown_8250C04 +_080176D8: .4byte gBattleMoves _080176DC: .4byte gUnknown_81D8EC6 _080176E0: .4byte gUnknown_81D8F9F _080176E4: .4byte gUnknown_2023F54 @@ -1154,10 +1154,10 @@ _080176E8: lsrs r3, r0, 24 _080176F2: ldr r2, _08017774 @ =gUnknown_2023D6F - ldr r1, _08017778 @ =gUnknown_2023BC4 + ldr r1, _08017778 @ =gActiveBattler ldrb r0, [r1] strb r0, [r2] - ldr r7, _0801777C @ =gUnknown_2023BE4 + ldr r7, _0801777C @ =gBattleMons adds r5, r1, 0 cmp r3, 0x1D bne _0801773A @@ -1171,7 +1171,7 @@ _080176F2: beq _0801773A cmp r2, r4 beq _0801773A - ldr r0, _08017784 @ =gUnknown_2023D4A + ldr r0, _08017784 @ =gCurrentMove strh r1, [r0] ldr r2, _08017788 @ =gUnknown_2023D68 ldrb r1, [r5] @@ -1222,10 +1222,10 @@ _08017768: bx r1 .align 2, 0 _08017774: .4byte gUnknown_2023D6F -_08017778: .4byte gUnknown_2023BC4 -_0801777C: .4byte gUnknown_2023BE4 +_08017778: .4byte gActiveBattler +_0801777C: .4byte gBattleMons _08017780: .4byte 0x0000ffff -_08017784: .4byte gUnknown_2023D4A +_08017784: .4byte gCurrentMove _08017788: .4byte gUnknown_2023D68 _0801778C: .4byte gUnknown_2023D80 _08017790: .4byte gUnknown_81D963D @@ -1233,8 +1233,8 @@ _08017794: .4byte gUnknown_20233C4 _08017798: .4byte gUnknown_81D8EA4 thumb_func_end sub_8017594 - thumb_func_start sub_801779C -sub_801779C: @ 801779C + thumb_func_start CheckMoveLimitations +CheckMoveLimitations: @ 801779C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1247,13 +1247,13 @@ sub_801779C: @ 801779C lsrs r4, r1, 24 lsls r2, 24 lsrs r3, r2, 24 - ldr r1, _080177E0 @ =gUnknown_2023FE8 + ldr r1, _080177E0 @ =gBattleStruct lsls r0, r7, 1 adds r0, 0xC8 ldr r1, [r1] adds r1, r0 str r1, [sp, 0x4] - ldr r1, _080177E4 @ =gUnknown_2023BE4 + ldr r1, _080177E4 @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r1, r0, r1 @@ -1269,8 +1269,8 @@ sub_801779C: @ 801779C str r0, [sp] b _080177FE .align 2, 0 -_080177E0: .4byte gUnknown_2023FE8 -_080177E4: .4byte gUnknown_2023BE4 +_080177E0: .4byte gBattleStruct +_080177E4: .4byte gBattleMons _080177E8: .4byte gUnknown_2023F54 _080177EC: ldrh r0, [r1, 0x2E] @@ -1288,9 +1288,9 @@ _080177FE: mov r9, r0 lsls r2, r7, 1 str r2, [sp, 0xC] - ldr r5, _0801797C @ =gUnknown_2023E0C + ldr r5, _0801797C @ =gDisableStructs mov r12, r5 - ldr r0, _08017980 @ =gUnknown_2023BE4 + ldr r0, _08017980 @ =gBattleMons movs r2, 0x58 adds r6, r7, 0 muls r6, r2 @@ -1303,7 +1303,7 @@ _080177FE: subs r0, r1, r7 lsls r0, 2 mov r8, r0 - ldr r6, _08017988 @ =gUnknown_825E45C + ldr r6, _08017988 @ =gBitTable _0801782A: ldrh r0, [r5] cmp r0, 0 @@ -1357,7 +1357,7 @@ _0801787C: ldr r1, _08017984 @ =gUnknown_2023BF0 adds r0, r1 mov r12, r0 - ldr r1, _0801798C @ =gUnknown_2023D98 + ldr r1, _0801798C @ =gLastUsedMove ldr r0, [sp, 0xC] adds r1, r0, r1 str r1, [sp, 0x18] @@ -1383,7 +1383,7 @@ _0801787C: lsls r0, r4, 24 lsrs r4, r0, 24 _080178BE: - ldr r0, _0801797C @ =gUnknown_2023E0C + ldr r0, _0801797C @ =gDisableStructs add r0, r8 ldrb r0, [r0, 0x13] lsls r0, 28 @@ -1393,7 +1393,7 @@ _080178BE: ands r0, r3 cmp r0, 0 beq _080178EC - ldr r2, _08017990 @ =gUnknown_8250C04 + ldr r2, _08017990 @ =gBattleMoves ldrh r1, [r5] lsls r0, r1, 1 adds r0, r1 @@ -1424,7 +1424,7 @@ _080178EC: lsls r0, r4, 24 lsrs r4, r0, 24 _0801790E: - ldr r1, _0801797C @ =gUnknown_2023E0C + ldr r1, _0801797C @ =gDisableStructs mov r0, r8 adds r2, r0, r1 ldrb r0, [r2, 0xE] @@ -1482,23 +1482,23 @@ _08017966: bx r1 .align 2, 0 _08017978: .4byte gUnknown_2023D6F -_0801797C: .4byte gUnknown_2023E0C -_08017980: .4byte gUnknown_2023BE4 +_0801797C: .4byte gDisableStructs +_08017980: .4byte gBattleMons _08017984: .4byte gUnknown_2023BF0 -_08017988: .4byte gUnknown_825E45C -_0801798C: .4byte gUnknown_2023D98 -_08017990: .4byte gUnknown_8250C04 +_08017988: .4byte gBitTable +_0801798C: .4byte gLastUsedMove +_08017990: .4byte gBattleMoves _08017994: .4byte 0x0000ffff - thumb_func_end sub_801779C + thumb_func_end CheckMoveLimitations thumb_func_start sub_8017998 sub_8017998: @ 8017998 push {r4-r6,lr} - ldr r5, _08017A04 @ =gUnknown_2023BC4 + ldr r5, _08017A04 @ =gActiveBattler ldrb r0, [r5] movs r1, 0 movs r2, 0xFF - bl sub_801779C + bl CheckMoveLimitations lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0xF @@ -1517,7 +1517,7 @@ sub_8017998: @ 8017998 adds r0, r1 ldr r1, _08017A10 @ =gUnknown_81D8EA0 str r1, [r0] - ldr r0, _08017A14 @ =gUnknown_2022B4C + ldr r0, _08017A14 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -1543,11 +1543,11 @@ sub_8017998: @ 8017998 adds r1, r2 b _08017A50 .align 2, 0 -_08017A04: .4byte gUnknown_2023BC4 +_08017A04: .4byte gActiveBattler _08017A08: .4byte gUnknown_2023E8C _08017A0C: .4byte gUnknown_2023D80 _08017A10: .4byte gUnknown_81D8EA0 -_08017A14: .4byte gUnknown_2022B4C +_08017A14: .4byte gBattleTypeFlags _08017A18: .4byte gUnknown_20233C4 _08017A1C: ldrb r0, [r5] @@ -1619,7 +1619,7 @@ _08017A8E: adds r3, r4, 0x1 cmp r9, r0 beq _08017ADE - ldr r1, _08017B00 @ =gUnknown_2023DFC + ldr r1, _08017B00 @ =gStatuses3 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -1669,7 +1669,7 @@ _08017AE8: .align 2, 0 _08017AF8: .4byte gUnknown_2023BCC _08017AFC: .4byte gUnknown_2023BF0 -_08017B00: .4byte gUnknown_2023DFC +_08017B00: .4byte gStatuses3 thumb_func_end GetImprisonedMovesCount thumb_func_start UpdateTurnCounters @@ -1681,21 +1681,21 @@ UpdateTurnCounters: @ 8017B04 push {r5-r7} movs r0, 0 mov r9, r0 - ldr r1, _08017BA8 @ =gUnknown_2023D6B + ldr r1, _08017BA8 @ =sBattler_AI mov r2, r9 strb r2, [r1] ldr r0, _08017BAC @ =gUnknown_2023BCC ldrb r4, [r0] adds r6, r1, 0 mov r10, r0 - ldr r7, _08017BB0 @ =gUnknown_2023D6C - ldr r3, _08017BB4 @ =gUnknown_2023FE8 + ldr r7, _08017BB0 @ =gBattlerTarget + ldr r3, _08017BB4 @ =gBattleStruct mov r12, r3 cmp r9, r4 bcs _08017B58 - ldr r2, _08017BB8 @ =gUnknown_2023D70 + ldr r2, _08017BB8 @ =gAbsentBattlerFlags ldrb r1, [r2] - ldr r5, _08017BBC @ =gUnknown_825E45C + ldr r5, _08017BBC @ =gBitTable ldr r0, [r5] ands r1, r0 cmp r1, 0 @@ -1724,9 +1724,9 @@ _08017B58: ldrb r4, [r0] cmp r4, 0 beq _08017B92 - ldr r2, _08017BB8 @ =gUnknown_2023D70 + ldr r2, _08017BB8 @ =gAbsentBattlerFlags ldrb r1, [r2] - ldr r5, _08017BBC @ =gUnknown_825E45C + ldr r5, _08017BBC @ =gBitTable ldr r0, [r5] ands r1, r0 cmp r1, 0 @@ -1762,12 +1762,12 @@ _08017B9E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08017BA8: .4byte gUnknown_2023D6B +_08017BA8: .4byte sBattler_AI _08017BAC: .4byte gUnknown_2023BCC -_08017BB0: .4byte gUnknown_2023D6C -_08017BB4: .4byte gUnknown_2023FE8 -_08017BB8: .4byte gUnknown_2023D70 -_08017BBC: .4byte gUnknown_825E45C +_08017BB0: .4byte gBattlerTarget +_08017BB4: .4byte gBattleStruct +_08017BB8: .4byte gAbsentBattlerFlags +_08017BBC: .4byte gBitTable _08017BC0: .4byte _08017BC4 .align 2, 0 _08017BC4: @@ -1843,7 +1843,7 @@ _08017C58: subs r0, 0x1 cmp r5, r0 blt _08017C18 - ldr r2, _08017D1C @ =gUnknown_2023FE8 + ldr r2, _08017D1C @ =gBattleStruct ldr r1, [r2] ldrb r0, [r1, 0x3] adds r0, 0x1 @@ -1862,10 +1862,10 @@ _08017C76: bls _08017C84 b _08017F60 _08017C84: - ldr r3, _08017D20 @ =gUnknown_2023BC4 + ldr r3, _08017D20 @ =gActiveBattler mov r8, r3 movs r7, 0 - ldr r6, _08017D24 @ =gUnknown_2023D6B + ldr r6, _08017D24 @ =sBattler_AI ldr r5, _08017D28 @ =gUnknown_2022AB8 _08017C8E: ldr r0, [r1] @@ -1880,7 +1880,7 @@ _08017C8E: strb r0, [r6] mov r3, r8 strb r0, [r3] - ldr r0, _08017D30 @ =gUnknown_2023DDE + ldr r0, _08017D30 @ =gSideAffecting adds r3, r1, r0 ldrh r1, [r3] movs r0, 0x1 @@ -1917,7 +1917,7 @@ _08017C8E: lsrs r0, 24 mov r9, r0 _08017CF0: - ldr r2, _08017D1C @ =gUnknown_2023FE8 + ldr r2, _08017D1C @ =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -1939,12 +1939,12 @@ _08017D06: .align 2, 0 _08017D14: .4byte gUnknown_2023BDE _08017D18: .4byte gUnknown_2023BCC -_08017D1C: .4byte gUnknown_2023FE8 -_08017D20: .4byte gUnknown_2023BC4 -_08017D24: .4byte gUnknown_2023D6B +_08017D1C: .4byte gBattleStruct +_08017D20: .4byte gActiveBattler +_08017D24: .4byte sBattler_AI _08017D28: .4byte gUnknown_2022AB8 _08017D2C: .4byte gUnknown_2023DE4 -_08017D30: .4byte gUnknown_2023DDE +_08017D30: .4byte gSideAffecting _08017D34: .4byte 0x0000fffe _08017D38: .4byte gUnknown_81D8B32 _08017D3C: @@ -1960,7 +1960,7 @@ _08017D4A: mov r10, r0 movs r2, 0 mov r8, r2 - ldr r7, _08017DE4 @ =gUnknown_2023D6B + ldr r7, _08017DE4 @ =sBattler_AI ldr r5, _08017DE8 @ =gUnknown_2022AB8 _08017D56: ldr r0, [r1] @@ -1973,9 +1973,9 @@ _08017D56: adds r2, r0, r2 ldrb r0, [r2, 0x3] strb r0, [r7] - ldr r3, _08017DF0 @ =gUnknown_2023BC4 + ldr r3, _08017DF0 @ =gActiveBattler strb r0, [r3] - ldr r0, _08017DF4 @ =gUnknown_2023DDE + ldr r0, _08017DF4 @ =gSideAffecting adds r3, r1, r0 ldrh r1, [r3] movs r0, 0x2 @@ -2015,7 +2015,7 @@ _08017D56: lsrs r0, 24 mov r9, r0 _08017DBE: - ldr r2, _08017E04 @ =gUnknown_2023FE8 + ldr r2, _08017E04 @ =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -2035,15 +2035,15 @@ _08017DD4: bls _08017D56 b _08017EA4 .align 2, 0 -_08017DE4: .4byte gUnknown_2023D6B +_08017DE4: .4byte sBattler_AI _08017DE8: .4byte gUnknown_2022AB8 _08017DEC: .4byte gUnknown_2023DE4 -_08017DF0: .4byte gUnknown_2023BC4 -_08017DF4: .4byte gUnknown_2023DDE +_08017DF0: .4byte gActiveBattler +_08017DF4: .4byte gSideAffecting _08017DF8: .4byte 0x0000fffd _08017DFC: .4byte gUnknown_81D8B32 _08017E00: .4byte gUnknown_2023E82 -_08017E04: .4byte gUnknown_2023FE8 +_08017E04: .4byte gBattleStruct _08017E08: mov r1, r12 ldr r0, [r1] @@ -2051,11 +2051,11 @@ _08017E08: ldrb r0, [r0] cmp r0, 0x1 bhi _08017EA4 - ldr r0, _08017EC0 @ =gUnknown_2023BC4 + ldr r0, _08017EC0 @ =gActiveBattler mov r10, r0 movs r2, 0 mov r8, r2 - ldr r7, _08017EC4 @ =gUnknown_2023D6B + ldr r7, _08017EC4 @ =sBattler_AI ldr r5, _08017EC8 @ =gUnknown_2022AB8 _08017E20: ldr r0, [r1] @@ -2079,7 +2079,7 @@ _08017E20: lsls r0, 24 cmp r0, 0 bne _08017E82 - ldr r2, _08017ED0 @ =gUnknown_2023DDE + ldr r2, _08017ED0 @ =gSideAffecting adds r2, r3, r2 ldrh r0, [r2] ldr r3, _08017ED4 @ =0x0000feff @@ -2107,7 +2107,7 @@ _08017E20: lsrs r0, 24 mov r9, r0 _08017E82: - ldr r2, _08017EE0 @ =gUnknown_2023FE8 + ldr r2, _08017EE0 @ =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -2141,15 +2141,15 @@ _08017EAC: strb r2, [r0] b _0801822A .align 2, 0 -_08017EC0: .4byte gUnknown_2023BC4 -_08017EC4: .4byte gUnknown_2023D6B +_08017EC0: .4byte gActiveBattler +_08017EC4: .4byte sBattler_AI _08017EC8: .4byte gUnknown_2022AB8 _08017ECC: .4byte gUnknown_2023DE4 -_08017ED0: .4byte gUnknown_2023DDE +_08017ED0: .4byte gSideAffecting _08017ED4: .4byte 0x0000feff _08017ED8: .4byte gUnknown_81D8B32 _08017EDC: .4byte gUnknown_2023E82 -_08017EE0: .4byte gUnknown_2023FE8 +_08017EE0: .4byte gBattleStruct _08017EE4: mov r1, r12 ldr r0, [r1] @@ -2157,8 +2157,8 @@ _08017EE4: ldrb r0, [r0] cmp r0, 0x1 bhi _08017F60 - ldr r6, _08017F80 @ =gUnknown_2023BC4 - ldr r5, _08017F84 @ =gUnknown_2023D6B + ldr r6, _08017F80 @ =gActiveBattler + ldr r5, _08017F84 @ =sBattler_AI _08017EF4: ldr r0, [r1] adds r0, 0xDB @@ -2171,7 +2171,7 @@ _08017EF4: ldrb r0, [r2, 0x7] strb r0, [r5] strb r0, [r6] - ldr r0, _08017F8C @ =gUnknown_2023DDE + ldr r0, _08017F8C @ =gSideAffecting adds r3, r1, r0 ldrh r1, [r3] movs r0, 0x20 @@ -2197,7 +2197,7 @@ _08017EF4: lsrs r0, 24 mov r9, r0 _08017F3E: - ldr r2, _08017F98 @ =gUnknown_2023FE8 + ldr r2, _08017F98 @ =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -2233,13 +2233,13 @@ _08017F68: strb r3, [r0] b _0801822A .align 2, 0 -_08017F80: .4byte gUnknown_2023BC4 -_08017F84: .4byte gUnknown_2023D6B +_08017F80: .4byte gActiveBattler +_08017F84: .4byte sBattler_AI _08017F88: .4byte gUnknown_2023DE4 -_08017F8C: .4byte gUnknown_2023DDE +_08017F8C: .4byte gSideAffecting _08017F90: .4byte 0x0000ffdf _08017F94: .4byte gUnknown_81D8B43 -_08017F98: .4byte gUnknown_2023FE8 +_08017F98: .4byte gBattleStruct _08017F9C: mov r2, r12 ldr r0, [r2] @@ -2249,7 +2249,7 @@ _08017F9C: ldrb r1, [r1] cmp r0, r1 bcs _0801801C - ldr r4, _08018034 @ =gUnknown_2023BC4 + ldr r4, _08018034 @ =gActiveBattler ldr r5, _08018038 @ =gUnknown_2023BDE _08017FB0: ldr r0, [r2] @@ -2270,7 +2270,7 @@ _08017FB0: lsls r0, 24 cmp r0, 0 bne _08017FF8 - ldr r1, _08018040 @ =gUnknown_2023BE4 + ldr r1, _08018040 @ =gBattleMons ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -2278,7 +2278,7 @@ _08017FB0: ldrh r0, [r0, 0x28] cmp r0, 0 beq _08017FF8 - ldr r0, _08018044 @ =gUnknown_2023D6C + ldr r0, _08018044 @ =gBattlerTarget strb r2, [r0] ldr r0, _08018048 @ =gUnknown_81D8ED5 bl BattleScriptExecute @@ -2288,7 +2288,7 @@ _08017FB0: lsrs r0, 24 mov r9, r0 _08017FF8: - ldr r2, _0801804C @ =gUnknown_2023FE8 + ldr r2, _0801804C @ =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -2321,15 +2321,15 @@ _08018024: b _0801822A .align 2, 0 _08018030: .4byte gUnknown_2023BCC -_08018034: .4byte gUnknown_2023BC4 +_08018034: .4byte gActiveBattler _08018038: .4byte gUnknown_2023BDE _0801803C: .4byte gUnknown_2023F20 -_08018040: .4byte gUnknown_2023BE4 -_08018044: .4byte gUnknown_2023D6C +_08018040: .4byte gBattleMons +_08018044: .4byte gBattlerTarget _08018048: .4byte gUnknown_81D8ED5 -_0801804C: .4byte gUnknown_2023FE8 +_0801804C: .4byte gBattleStruct _08018050: - ldr r3, _08018088 @ =gUnknown_2023F1C + ldr r3, _08018088 @ =gBattleWeather ldrh r2, [r3] movs r0, 0x7 ands r0, r2 @@ -2359,7 +2359,7 @@ _0801805E: strb r0, [r1, 0x5] b _080180C8 .align 2, 0 -_08018088: .4byte gUnknown_2023F1C +_08018088: .4byte gBattleWeather _0801808C: .4byte gUnknown_2023F20 _08018090: .4byte 0x0000fffe _08018094: .4byte 0x0000fffd @@ -2396,7 +2396,7 @@ _080180C8: _080180CC: .4byte gUnknown_2023E82 _080180D0: .4byte gUnknown_81D8A64 _080180D4: - ldr r3, _08018108 @ =gUnknown_2023F1C + ldr r3, _08018108 @ =gBattleWeather ldrh r2, [r3] movs r0, 0x18 ands r0, r2 @@ -2423,7 +2423,7 @@ _080180E2: ldr r0, _08018118 @ =gUnknown_81D8B01 b _08018120 .align 2, 0 -_08018108: .4byte gUnknown_2023F1C +_08018108: .4byte gBattleWeather _0801810C: .4byte gUnknown_2023F20 _08018110: .4byte 0x0000fff7 _08018114: .4byte gUnknown_2023D74 @@ -2434,7 +2434,7 @@ _0801811C: _08018120: str r0, [r1] adds r3, r1, 0 - ldr r1, _0801813C @ =gUnknown_2023FC4 + ldr r1, _0801813C @ =gBattleScripting movs r2, 0 movs r0, 0xC strb r0, [r1, 0x10] @@ -2444,10 +2444,10 @@ _08018120: .align 2, 0 _08018134: .4byte gUnknown_2023D74 _08018138: .4byte gUnknown_81D8A7F -_0801813C: .4byte gUnknown_2023FC4 +_0801813C: .4byte gBattleScripting _08018140: .4byte gUnknown_2023E82 _08018144: - ldr r3, _08018174 @ =gUnknown_2023F1C + ldr r3, _08018174 @ =gBattleWeather ldrh r2, [r3] movs r0, 0x60 ands r0, r2 @@ -2472,7 +2472,7 @@ _08018144: ldr r0, _08018184 @ =gUnknown_81D8B18 b _0801818C .align 2, 0 -_08018174: .4byte gUnknown_2023F1C +_08018174: .4byte gBattleWeather _08018178: .4byte gUnknown_2023F20 _0801817C: .4byte 0x0000ffdf _08018180: .4byte gUnknown_2023D74 @@ -2488,7 +2488,7 @@ _0801818C: _08018194: .4byte gUnknown_2023D74 _08018198: .4byte gUnknown_81D8B0A _0801819C: - ldr r3, _080181C4 @ =gUnknown_2023F1C + ldr r3, _080181C4 @ =gBattleWeather ldrh r2, [r3] movs r0, 0x80 ands r0, r2 @@ -2509,7 +2509,7 @@ _0801819C: ldr r0, _080181D4 @ =gUnknown_81D8B01 b _080181DC .align 2, 0 -_080181C4: .4byte gUnknown_2023F1C +_080181C4: .4byte gBattleWeather _080181C8: .4byte gUnknown_2023F20 _080181CC: .4byte 0x0000ff7f _080181D0: .4byte gUnknown_2023D74 @@ -2520,7 +2520,7 @@ _080181D8: _080181DC: str r0, [r1] adds r3, r1, 0 - ldr r1, _08018214 @ =gUnknown_2023FC4 + ldr r1, _08018214 @ =gBattleScripting movs r0, 0xD strb r0, [r1, 0x10] ldr r1, _08018218 @ =gUnknown_2023E82 @@ -2536,7 +2536,7 @@ _080181EE: lsrs r0, 24 mov r9, r0 _080181FC: - ldr r2, _0801821C @ =gUnknown_2023FE8 + ldr r2, _0801821C @ =gBattleStruct ldr r1, [r2] ldrb r0, [r1, 0x3] adds r0, 0x1 @@ -2546,9 +2546,9 @@ _080181FC: .align 2, 0 _0801820C: .4byte gUnknown_2023D74 _08018210: .4byte gUnknown_81D8A7F -_08018214: .4byte gUnknown_2023FC4 +_08018214: .4byte gBattleScripting _08018218: .4byte gUnknown_2023E82 -_0801821C: .4byte gUnknown_2023FE8 +_0801821C: .4byte gBattleStruct _08018220: mov r0, r9 adds r0, 0x1 @@ -2595,7 +2595,7 @@ TurnBasedEffects: @ 8018258 ldr r1, _08018290 @ =0x01000020 orrs r0, r1 str r0, [r2] - ldr r5, _08018294 @ =gUnknown_2023FE8 + ldr r5, _08018294 @ =gBattleStruct ldr r2, [r5] ldr r0, _08018298 @ =gUnknown_2023BCC ldrb r1, [r2, 0x1] @@ -2610,11 +2610,11 @@ _08018288: .align 2, 0 _0801828C: .4byte gUnknown_2023DD0 _08018290: .4byte 0x01000020 -_08018294: .4byte gUnknown_2023FE8 +_08018294: .4byte gBattleStruct _08018298: .4byte gUnknown_2023BCC _0801829C: - ldr r3, _080182D0 @ =gUnknown_2023BC4 - ldr r4, _080182D4 @ =gUnknown_2023D6B + ldr r3, _080182D0 @ =gActiveBattler + ldr r4, _080182D4 @ =sBattler_AI ldr r1, _080182D8 @ =gUnknown_2023BDE ldr r5, [r5] ldrb r0, [r5, 0x1] @@ -2622,9 +2622,9 @@ _0801829C: ldrb r0, [r0] strb r0, [r4] strb r0, [r3] - ldr r0, _080182DC @ =gUnknown_2023D70 + ldr r0, _080182DC @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _080182E0 @ =gUnknown_825E45C + ldr r2, _080182E0 @ =gBitTable ldrb r0, [r3] lsls r0, 2 adds r0, r2 @@ -2638,11 +2638,11 @@ _0801829C: strb r0, [r5, 0x1] bl _08018C50 .align 2, 0 -_080182D0: .4byte gUnknown_2023BC4 -_080182D4: .4byte gUnknown_2023D6B +_080182D0: .4byte gActiveBattler +_080182D4: .4byte sBattler_AI _080182D8: .4byte gUnknown_2023BDE -_080182DC: .4byte gUnknown_2023D70 -_080182E0: .4byte gUnknown_825E45C +_080182DC: .4byte gAbsentBattlerFlags +_080182E0: .4byte gBitTable _080182E4: ldrb r0, [r5] cmp r0, 0x13 @@ -2679,7 +2679,7 @@ _080182FC: .4byte _080183E2 .4byte _08018C38 _0801834C: - ldr r1, _0801839C @ =gUnknown_2023DFC + ldr r1, _0801839C @ =gStatuses3 ldrb r3, [r6] lsls r0, r3, 2 adds r0, r1 @@ -2691,7 +2691,7 @@ _0801834C: bne _08018364 bl _08018C12 _08018364: - ldr r0, _080183A0 @ =gUnknown_2023BE4 + ldr r0, _080183A0 @ =gBattleMons movs r1, 0x58 muls r1, r3 adds r0, r1, r0 @@ -2705,7 +2705,7 @@ _08018378: bne _08018380 bl _08018C12 _08018380: - ldr r1, _080183A4 @ =gUnknown_2023D50 + ldr r1, _080183A4 @ =gBattleMoveDamage ldrh r0, [r0, 0x2C] lsrs r0, 4 str r0, [r1] @@ -2720,9 +2720,9 @@ _08018390: ldr r0, _080183A8 @ =gUnknown_81D8F0C bl _08018C04 .align 2, 0 -_0801839C: .4byte gUnknown_2023DFC -_080183A0: .4byte gUnknown_2023BE4 -_080183A4: .4byte gUnknown_2023D50 +_0801839C: .4byte gStatuses3 +_080183A0: .4byte gBattleMons +_080183A4: .4byte gBattleMoveDamage _080183A8: .4byte gUnknown_81D8F0C _080183AC: ldrb r1, [r6] @@ -2761,7 +2761,7 @@ _080183E2: _080183F6: bl _08018C08 _080183FA: - ldr r0, _08018460 @ =gUnknown_2023DFC + ldr r0, _08018460 @ =gStatuses3 ldrb r2, [r6] lsls r1, r2, 2 adds r1, r0 @@ -2772,7 +2772,7 @@ _080183FA: bne _08018410 bl _08018C12 _08018410: - ldr r3, _08018464 @ =gUnknown_2023BE4 + ldr r3, _08018464 @ =gBattleMons movs r5, 0x3 ands r5, r1 movs r1, 0x58 @@ -2792,9 +2792,9 @@ _08018428: bne _08018438 bl _08018C12 _08018438: - ldr r0, _08018468 @ =gUnknown_2023D6C + ldr r0, _08018468 @ =gBattlerTarget strb r5, [r0] - ldr r2, _0801846C @ =gUnknown_2023D50 + ldr r2, _0801846C @ =gBattleMoveDamage ldrb r0, [r6] muls r0, r1 adds r0, r3 @@ -2806,21 +2806,21 @@ _08018438: movs r0, 0x1 str r0, [r2] _08018452: - ldr r1, _08018470 @ =gUnknown_2023FC4 + ldr r1, _08018470 @ =gBattleScripting strb r5, [r1, 0x10] ldrb r0, [r4] strb r0, [r1, 0x11] ldr r0, _08018474 @ =gUnknown_81D8B4D b _08018C04 .align 2, 0 -_08018460: .4byte gUnknown_2023DFC -_08018464: .4byte gUnknown_2023BE4 -_08018468: .4byte gUnknown_2023D6C -_0801846C: .4byte gUnknown_2023D50 -_08018470: .4byte gUnknown_2023FC4 +_08018460: .4byte gStatuses3 +_08018464: .4byte gBattleMons +_08018468: .4byte gBattlerTarget +_0801846C: .4byte gBattleMoveDamage +_08018470: .4byte gBattleScripting _08018474: .4byte gUnknown_81D8B4D _08018478: - ldr r2, _080184B4 @ =gUnknown_2023BE4 + ldr r2, _080184B4 @ =gBattleMons ldrb r1, [r6] movs r0, 0x58 adds r3, r1, 0 @@ -2841,7 +2841,7 @@ _08018494: bne _0801849E b _08018C12 _0801849E: - ldr r2, _080184B8 @ =gUnknown_2023D50 + ldr r2, _080184B8 @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] lsrs r0, 3 str r0, [r2] @@ -2853,11 +2853,11 @@ _080184AE: ldr r0, _080184BC @ =gUnknown_81D9053 b _08018C04 .align 2, 0 -_080184B4: .4byte gUnknown_2023BE4 -_080184B8: .4byte gUnknown_2023D50 +_080184B4: .4byte gBattleMons +_080184B8: .4byte gBattleMoveDamage _080184BC: .4byte gUnknown_81D9053 _080184C0: - ldr r4, _08018534 @ =gUnknown_2023BE4 + ldr r4, _08018534 @ =gBattleMons ldrb r0, [r6] movs r7, 0x58 mov r8, r7 @@ -2879,7 +2879,7 @@ _080184DE: bne _080184E8 b _08018C12 _080184E8: - ldr r5, _08018538 @ =gUnknown_2023D50 + ldr r5, _08018538 @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] lsrs r0, 4 str r0, [r5] @@ -2919,11 +2919,11 @@ _08018518: ldr r0, _0801853C @ =gUnknown_81D9053 b _08018C04 .align 2, 0 -_08018534: .4byte gUnknown_2023BE4 -_08018538: .4byte gUnknown_2023D50 +_08018534: .4byte gBattleMons +_08018538: .4byte gBattleMoveDamage _0801853C: .4byte gUnknown_81D9053 _08018540: - ldr r2, _0801857C @ =gUnknown_2023BE4 + ldr r2, _0801857C @ =gBattleMons ldrb r1, [r6] movs r0, 0x58 adds r3, r1, 0 @@ -2944,7 +2944,7 @@ _0801855C: bne _08018566 b _08018C12 _08018566: - ldr r2, _08018580 @ =gUnknown_2023D50 + ldr r2, _08018580 @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] lsrs r0, 3 str r0, [r2] @@ -2956,11 +2956,11 @@ _08018576: ldr r0, _08018584 @ =gUnknown_81D9075 b _08018C04 .align 2, 0 -_0801857C: .4byte gUnknown_2023BE4 -_08018580: .4byte gUnknown_2023D50 +_0801857C: .4byte gBattleMons +_08018580: .4byte gBattleMoveDamage _08018584: .4byte gUnknown_81D9075 _08018588: - ldr r4, _080185D4 @ =gUnknown_2023BE4 + ldr r4, _080185D4 @ =gBattleMons ldrb r1, [r6] movs r0, 0x58 muls r1, r0 @@ -2989,7 +2989,7 @@ _080185AE: ands r0, r1 cmp r0, 0 beq _080185E0 - ldr r1, _080185D8 @ =gUnknown_2023D50 + ldr r1, _080185D8 @ =gBattleMoveDamage ldrh r0, [r3, 0x2C] lsrs r0, 2 str r0, [r1] @@ -3001,8 +3001,8 @@ _080185CE: ldr r0, _080185DC @ =gUnknown_81D9155 b _08018C04 .align 2, 0 -_080185D4: .4byte gUnknown_2023BE4 -_080185D8: .4byte gUnknown_2023D50 +_080185D4: .4byte gBattleMons +_080185D8: .4byte gBattleMoveDamage _080185DC: .4byte gUnknown_81D9155 _080185E0: ldr r0, _080185E8 @ =0xf7ffffff @@ -3012,7 +3012,7 @@ _080185E0: .align 2, 0 _080185E8: .4byte 0xf7ffffff _080185EC: - ldr r2, _08018628 @ =gUnknown_2023BE4 + ldr r2, _08018628 @ =gBattleMons ldrb r1, [r6] movs r0, 0x58 adds r3, r1, 0 @@ -3034,7 +3034,7 @@ _0801860A: bne _08018614 b _08018C12 _08018614: - ldr r2, _0801862C @ =gUnknown_2023D50 + ldr r2, _0801862C @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] lsrs r0, 2 str r0, [r2] @@ -3046,11 +3046,11 @@ _08018624: ldr r0, _08018630 @ =gUnknown_81D9166 b _08018C04 .align 2, 0 -_08018628: .4byte gUnknown_2023BE4 -_0801862C: .4byte gUnknown_2023D50 +_08018628: .4byte gBattleMons +_0801862C: .4byte gBattleMoveDamage _08018630: .4byte gUnknown_81D9166 _08018634: - ldr r3, _080186D4 @ =gUnknown_2023BE4 + ldr r3, _080186D4 @ =gBattleMons mov r8, r3 ldrb r0, [r6] movs r3, 0x58 @@ -3087,8 +3087,8 @@ _08018664: ands r0, r5 cmp r0, 0 beq _080186F4 - ldr r1, _080186DC @ =gUnknown_2023FC4 - ldr r0, _080186E0 @ =gUnknown_2023FE8 + ldr r1, _080186DC @ =gBattleScripting + ldr r0, _080186E0 @ =gBattleStruct ldr r2, [r0] lsls r0, r4, 1 adds r0, r2 @@ -3119,7 +3119,7 @@ _08018664: ldr r1, _080186E8 @ =gUnknown_2023D74 ldr r0, _080186EC @ =gUnknown_81D9124 str r0, [r1] - ldr r2, _080186F0 @ =gUnknown_2023D50 + ldr r2, _080186F0 @ =gBattleMoveDamage ldrb r0, [r6] muls r0, r3 add r0, r8 @@ -3132,14 +3132,14 @@ _08018664: str r0, [r2] b _08018720 .align 2, 0 -_080186D4: .4byte gUnknown_2023BE4 +_080186D4: .4byte gBattleMons _080186D8: .4byte 0xffffe000 -_080186DC: .4byte gUnknown_2023FC4 -_080186E0: .4byte gUnknown_2023FE8 +_080186DC: .4byte gBattleScripting +_080186E0: .4byte gBattleStruct _080186E4: .4byte gUnknown_2022AB8 _080186E8: .4byte gUnknown_2023D74 _080186EC: .4byte gUnknown_81D9124 -_080186F0: .4byte gUnknown_2023D50 +_080186F0: .4byte gBattleMoveDamage _080186F4: ldr r2, _08018724 @ =gUnknown_2022AB8 movs r0, 0xFD @@ -3147,7 +3147,7 @@ _080186F4: movs r0, 0x2 strb r0, [r2, 0x1] ldrb r1, [r6] - ldr r0, _08018728 @ =gUnknown_2023FE8 + ldr r0, _08018728 @ =gBattleStruct ldr r3, [r0] lsls r1, 1 adds r1, r3 @@ -3168,7 +3168,7 @@ _08018720: b _08018C04 .align 2, 0 _08018724: .4byte gUnknown_2022AB8 -_08018728: .4byte gUnknown_2023FE8 +_08018728: .4byte gBattleStruct _0801872C: .4byte gUnknown_2023D74 _08018730: .4byte gUnknown_81D9136 _08018734: @@ -3191,7 +3191,7 @@ _08018734: strb r0, [r1, 0x5] ldr r0, _0801878C @ =gUnknown_81D904A bl BattleScriptExecute - ldr r4, _08018790 @ =gUnknown_2023BC4 + ldr r4, _08018790 @ =gActiveBattler ldrb r0, [r6] strb r0, [r4] ldrb r0, [r4] @@ -3212,9 +3212,9 @@ _08018734: _08018784: .4byte 0xf7ffffff _08018788: .4byte gUnknown_2023E82 _0801878C: .4byte gUnknown_81D904A -_08018790: .4byte gUnknown_2023BC4 +_08018790: .4byte gActiveBattler _08018794: - ldr r2, _08018810 @ =gUnknown_2023BE4 + ldr r2, _08018810 @ =gBattleMons ldrb r1, [r6] movs r0, 0x58 muls r0, r1 @@ -3269,7 +3269,7 @@ _080187EE: cmp r0, r1 bcc _080187CE _080187FC: - ldr r2, _08018814 @ =gUnknown_2023D6B + ldr r2, _08018814 @ =sBattler_AI ldr r1, _08018818 @ =gUnknown_2023BCC ldrb r0, [r2] ldrb r1, [r1] @@ -3279,14 +3279,14 @@ _080187FC: mov r9, r3 b _08018C4C .align 2, 0 -_08018810: .4byte gUnknown_2023BE4 -_08018814: .4byte gUnknown_2023D6B +_08018810: .4byte gBattleMons +_08018814: .4byte sBattler_AI _08018818: .4byte gUnknown_2023BCC _0801881C: - ldr r5, _08018854 @ =gUnknown_2023BC4 + ldr r5, _08018854 @ =gActiveBattler ldrb r0, [r5] strb r0, [r2] - ldr r2, _08018858 @ =gUnknown_2023BE4 + ldr r2, _08018858 @ =gBattleMons ldrb r0, [r5] movs r7, 0x58 adds r1, r0, 0 @@ -3310,8 +3310,8 @@ _0801881C: strb r0, [r1, 0x5] b _08018894 .align 2, 0 -_08018854: .4byte gUnknown_2023BC4 -_08018858: .4byte gUnknown_2023BE4 +_08018854: .4byte gActiveBattler +_08018858: .4byte gBattleMons _0801885C: .4byte gUnknown_2023E82 _08018860: ldrb r3, [r5] @@ -3355,7 +3355,7 @@ _080188A6: _080188A8: .4byte gUnknown_2023E82 _080188AC: .4byte gUnknown_81D90BC _080188B0: - ldr r1, _080188E8 @ =gUnknown_2023BE4 + ldr r1, _080188E8 @ =gBattleMons ldrb r0, [r6] movs r7, 0x58 muls r0, r7 @@ -3383,7 +3383,7 @@ _080188CE: bl CancelMultiTurnMoves b _08018C12 .align 2, 0 -_080188E8: .4byte gUnknown_2023BE4 +_080188E8: .4byte gBattleMons _080188EC: .4byte 0xfffffc00 _080188F0: ldrb r0, [r6] @@ -3439,7 +3439,7 @@ _0801894C: .4byte 0xffffefff _08018950: .4byte gUnknown_2023E82 _08018954: .4byte gUnknown_81D90C5 _08018958: - ldr r0, _080189D8 @ =gUnknown_2023E0C + ldr r0, _080189D8 @ =gDisableStructs ldrb r3, [r6] lsls r1, r3, 3 subs r1, r3 @@ -3453,7 +3453,7 @@ _08018958: b _08018C12 _08018970: movs r4, 0 - ldr r2, _080189DC @ =gUnknown_2023BE4 + ldr r2, _080189DC @ =gBattleMons movs r0, 0x58 adds r1, r3, 0 muls r1, r0 @@ -3506,8 +3506,8 @@ _080189AE: strb r0, [r1, 0xB] b _08018C12 .align 2, 0 -_080189D8: .4byte gUnknown_2023E0C -_080189DC: .4byte gUnknown_2023BE4 +_080189D8: .4byte gDisableStructs +_080189DC: .4byte gBattleMons _080189E0: ldrb r0, [r6] lsls r2, r0, 3 @@ -3541,7 +3541,7 @@ _08018A08: .align 2, 0 _08018A18: .4byte gUnknown_81D8C5E _08018A1C: - ldr r3, _08018A68 @ =gUnknown_2023E0C + ldr r3, _08018A68 @ =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -3553,7 +3553,7 @@ _08018A1C: bne _08018A32 b _08018C12 _08018A32: - ldr r7, _08018A6C @ =gUnknown_2023BE4 + ldr r7, _08018A6C @ =gBattleMons mov r8, r7 ldrb r0, [r2, 0xC] lsls r0, 1 @@ -3581,8 +3581,8 @@ _08018A32: strb r0, [r1, 0xE] b _08018C12 .align 2, 0 -_08018A68: .4byte gUnknown_2023E0C -_08018A6C: .4byte gUnknown_2023BE4 +_08018A68: .4byte gDisableStructs +_08018A6C: .4byte gBattleMons _08018A70: lsrs r1, r4, 28 subs r1, 0x1 @@ -3633,7 +3633,7 @@ _08018AA6: .align 2, 0 _08018ACC: .4byte gUnknown_81D8C65 _08018AD0: - ldr r0, _08018AEC @ =gUnknown_2023DFC + ldr r0, _08018AEC @ =gStatuses3 ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -3649,9 +3649,9 @@ _08018AE8: ldr r1, [r7] b _08018C16 .align 2, 0 -_08018AEC: .4byte gUnknown_2023DFC +_08018AEC: .4byte gStatuses3 _08018AF0: - ldr r2, _08018B30 @ =gUnknown_2023E0C + ldr r2, _08018B30 @ =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -3672,7 +3672,7 @@ _08018AF0: strb r0, [r3, 0x12] cmp r1, 0 bne _08018B2A - ldr r0, _08018B34 @ =gUnknown_2023DFC + ldr r0, _08018B34 @ =gStatuses3 ldrb r2, [r6] lsls r2, 2 adds r2, r0 @@ -3684,11 +3684,11 @@ _08018B2A: ldr r1, [r7] b _08018C16 .align 2, 0 -_08018B30: .4byte gUnknown_2023E0C -_08018B34: .4byte gUnknown_2023DFC +_08018B30: .4byte gDisableStructs +_08018B34: .4byte gStatuses3 _08018B38: .4byte 0xfffffdff _08018B3C: - ldr r2, _08018B68 @ =gUnknown_2023E0C + ldr r2, _08018B68 @ =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -3711,9 +3711,9 @@ _08018B62: ldr r1, [r7] b _08018C16 .align 2, 0 -_08018B68: .4byte gUnknown_2023E0C +_08018B68: .4byte gDisableStructs _08018B6C: - ldr r4, _08018C20 @ =gUnknown_2023DFC + ldr r4, _08018C20 @ =gStatuses3 ldrb r0, [r6] lsls r0, 2 adds r2, r0, r4 @@ -3734,7 +3734,7 @@ _08018B6C: ands r0, r3 cmp r0, 0 bne _08018C12 - ldr r3, _08018C28 @ =gUnknown_2023BE4 + ldr r3, _08018C28 @ =gBattleMons movs r5, 0x58 adds r1, r2, 0 muls r1, r5 @@ -3793,7 +3793,7 @@ _08018C08: lsrs r0, 24 mov r9, r0 _08018C12: - ldr r0, _08018C34 @ =gUnknown_2023FE8 + ldr r0, _08018C34 @ =gBattleStruct ldr r1, [r0] _08018C16: ldrb r0, [r1] @@ -3801,12 +3801,12 @@ _08018C16: strb r0, [r1] b _08018C46 .align 2, 0 -_08018C20: .4byte gUnknown_2023DFC +_08018C20: .4byte gStatuses3 _08018C24: .4byte 0xfffff800 -_08018C28: .4byte gUnknown_2023BE4 +_08018C28: .4byte gBattleMons _08018C2C: .4byte gUnknown_2023D6E _08018C30: .4byte gUnknown_81D91C7 -_08018C34: .4byte gUnknown_2023FE8 +_08018C34: .4byte gBattleStruct _08018C38: ldr r1, [r7] movs r0, 0 @@ -3823,7 +3823,7 @@ _08018C4C: mov r0, r9 b _08018C78 _08018C50: - ldr r5, _08018C88 @ =gUnknown_2023FE8 + ldr r5, _08018C88 @ =gBattleStruct ldr r2, [r5] ldr r0, _08018C8C @ =gUnknown_2023BCC ldrb r1, [r2, 0x1] @@ -3854,7 +3854,7 @@ _08018C78: pop {r1} bx r1 .align 2, 0 -_08018C88: .4byte gUnknown_2023FE8 +_08018C88: .4byte gBattleStruct _08018C8C: .4byte gUnknown_2023BCC _08018C90: .4byte gUnknown_2023DD0 _08018C94: .4byte 0xfeffffdf @@ -3872,7 +3872,7 @@ sub_8018C98: @ 8018C98 ldr r1, _08018CCC @ =0x01000020 orrs r0, r1 str r0, [r2] - ldr r1, _08018CD0 @ =gUnknown_2023FE8 + ldr r1, _08018CD0 @ =gBattleStruct ldr r3, [r1] movs r4, 0xC0 lsls r4, 1 @@ -3889,7 +3889,7 @@ _08018CC4: .align 2, 0 _08018CC8: .4byte gUnknown_2023DD0 _08018CCC: .4byte 0x01000020 -_08018CD0: .4byte gUnknown_2023FE8 +_08018CD0: .4byte gBattleStruct _08018CD4: ldr r2, _08018D20 @ =0x00000181 adds r0, r3, r2 @@ -3901,7 +3901,7 @@ _08018CD4: bcc _08018CE6 b _08018E16 _08018CE6: - ldr r4, _08018D28 @ =gUnknown_2023BC4 + ldr r4, _08018D28 @ =gActiveBattler ldr r5, _08018D2C @ =gUnknown_2022AB8 ldr r6, _08018D30 @ =gUnknown_2023F20 movs r0, 0x8 @@ -3910,16 +3910,16 @@ _08018CE6: movs r1, 0x18 adds r1, r6 mov r12, r1 - ldr r3, _08018D34 @ =gUnknown_2023D6C + ldr r3, _08018D34 @ =gBattlerTarget mov r9, r3 _08018CFC: ldr r0, [r7] adds r3, r0, r2 ldrb r0, [r3] strb r0, [r4] - ldr r0, _08018D38 @ =gUnknown_2023D70 + ldr r0, _08018D38 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _08018D3C @ =gUnknown_825E45C + ldr r2, _08018D3C @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r2 @@ -3934,12 +3934,12 @@ _08018CFC: .align 2, 0 _08018D20: .4byte 0x00000181 _08018D24: .4byte gUnknown_2023BCC -_08018D28: .4byte gUnknown_2023BC4 +_08018D28: .4byte gActiveBattler _08018D2C: .4byte gUnknown_2022AB8 _08018D30: .4byte gUnknown_2023F20 -_08018D34: .4byte gUnknown_2023D6C -_08018D38: .4byte gUnknown_2023D70 -_08018D3C: .4byte gUnknown_825E45C +_08018D34: .4byte gBattlerTarget +_08018D38: .4byte gAbsentBattlerFlags +_08018D3C: .4byte gBitTable _08018D40: ldrb r0, [r3] adds r0, 0x1 @@ -3956,7 +3956,7 @@ _08018D40: lsrs r3, r0, 24 cmp r3, 0 bne _08018E04 - ldr r1, _08018D84 @ =gUnknown_2023BE4 + ldr r1, _08018D84 @ =gBattleMons ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -3974,7 +3974,7 @@ _08018D40: b _08018D92 .align 2, 0 _08018D80: .4byte gUnknown_2023F20 -_08018D84: .4byte gUnknown_2023BE4 +_08018D84: .4byte gBattleMons _08018D88: .4byte gUnknown_2023E82 _08018D8C: ldr r1, _08018DEC @ =gUnknown_2023E82 @@ -4001,13 +4001,13 @@ _08018D92: ldrb r0, [r4] mov r1, r9 strb r0, [r1] - ldr r1, _08018DF0 @ =gUnknown_2023D6B + ldr r1, _08018DF0 @ =sBattler_AI adds r0, r6, 0x4 ldrb r2, [r4] adds r0, r2 ldrb r0, [r0] strb r0, [r1] - ldr r1, _08018DF4 @ =gUnknown_2023D50 + ldr r1, _08018DF4 @ =gBattleMoveDamage ldrb r0, [r4] lsls r0, 2 add r0, r10 @@ -4027,8 +4027,8 @@ _08018D92: b _08018F44 .align 2, 0 _08018DEC: .4byte gUnknown_2023E82 -_08018DF0: .4byte gUnknown_2023D6B -_08018DF4: .4byte gUnknown_2023D50 +_08018DF0: .4byte sBattler_AI +_08018DF4: .4byte gBattleMoveDamage _08018DF8: .4byte gUnknown_2023ECC _08018DFC: .4byte 0x0000ffff _08018E00: .4byte gUnknown_81D8E12 @@ -4067,11 +4067,11 @@ _08018E2C: bcc _08018E42 b _08018F68 _08018E42: - ldr r5, _08018E84 @ =gUnknown_2023BC4 + ldr r5, _08018E84 @ =gActiveBattler ldr r4, _08018E88 @ =gUnknown_2022AB8 - ldr r6, _08018E8C @ =gUnknown_2023E0C + ldr r6, _08018E8C @ =gDisableStructs mov r12, r6 - ldr r0, _08018E90 @ =gUnknown_2023D6B + ldr r0, _08018E90 @ =sBattler_AI mov r9, r0 _08018E4E: ldr r1, _08018E94 @ =gUnknown_2023BDE @@ -4083,9 +4083,9 @@ _08018E4E: mov r1, r9 strb r0, [r1] strb r0, [r5] - ldr r0, _08018E98 @ =gUnknown_2023D70 + ldr r0, _08018E98 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _08018E9C @ =gUnknown_825E45C + ldr r2, _08018E9C @ =gBitTable ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -4100,18 +4100,18 @@ _08018E4E: .align 2, 0 _08018E7C: .4byte 0x00000181 _08018E80: .4byte gUnknown_2023BCC -_08018E84: .4byte gUnknown_2023BC4 +_08018E84: .4byte gActiveBattler _08018E88: .4byte gUnknown_2022AB8 -_08018E8C: .4byte gUnknown_2023E0C -_08018E90: .4byte gUnknown_2023D6B +_08018E8C: .4byte gDisableStructs +_08018E90: .4byte sBattler_AI _08018E94: .4byte gUnknown_2023BDE -_08018E98: .4byte gUnknown_2023D70 -_08018E9C: .4byte gUnknown_825E45C +_08018E98: .4byte gAbsentBattlerFlags +_08018E9C: .4byte gBitTable _08018EA0: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] - ldr r6, _08018F14 @ =gUnknown_2023DFC + ldr r6, _08018F14 @ =gStatuses3 ldrb r0, [r5] lsls r0, 2 adds r0, r6 @@ -4154,8 +4154,8 @@ _08018EA0: negs r1, r1 ands r0, r1 str r0, [r2] - ldr r3, _08018F18 @ =gUnknown_2023D50 - ldr r2, _08018F1C @ =gUnknown_2023BE4 + ldr r3, _08018F18 @ =gBattleMoveDamage + ldr r2, _08018F1C @ =gBattleMons ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -4166,9 +4166,9 @@ _08018EA0: ldr r0, _08018F24 @ =gUnknown_81D8D33 b _08018F40 .align 2, 0 -_08018F14: .4byte gUnknown_2023DFC -_08018F18: .4byte gUnknown_2023D50 -_08018F1C: .4byte gUnknown_2023BE4 +_08018F14: .4byte gStatuses3 +_08018F18: .4byte gBattleMoveDamage +_08018F1C: .4byte gBattleMons _08018F20: .4byte gUnknown_2023D74 _08018F24: .4byte gUnknown_81D8D33 _08018F28: @@ -4232,7 +4232,7 @@ HandleFaintedMonActions: @ 8018F90 mov r7, r8 push {r7} sub sp, 0x4 - ldr r0, _08018FA8 @ =gUnknown_2022B4C + ldr r0, _08018FA8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -4240,7 +4240,7 @@ HandleFaintedMonActions: @ 8018F90 beq _08018FD8 b _08019272 .align 2, 0 -_08018FA8: .4byte gUnknown_2022B4C +_08018FA8: .4byte gBattleTypeFlags _08018FAC: ldr r0, _08018FBC @ =gUnknown_81D8694 bl BattleScriptExecute @@ -4264,7 +4264,7 @@ _08018FCE: .align 2, 0 _08018FD4: .4byte gUnknown_81D869D _08018FD8: - ldr r0, _08018FF4 @ =gUnknown_2023FE8 + ldr r0, _08018FF4 @ =gBattleStruct mov r8, r0 _08018FDC: mov r1, r8 @@ -4281,7 +4281,7 @@ _08018FEA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08018FF4: .4byte gUnknown_2023FE8 +_08018FF4: .4byte gBattleStruct _08018FF8: .4byte _08018FFC .align 2, 0 _08018FFC: @@ -4309,10 +4309,10 @@ _0801901C: ldrb r0, [r0] cmp r5, r0 bge _0801906E - ldr r6, _080190EC @ =gUnknown_2023D70 + ldr r6, _080190EC @ =gAbsentBattlerFlags _0801903C: ldrb r0, [r6] - ldr r2, _080190F0 @ =gUnknown_825E45C + ldr r2, _080190F0 @ =gBitTable lsls r1, r5, 2 adds r1, r2 ldr r4, [r1] @@ -4337,14 +4337,14 @@ _08019064: cmp r5, r0 blt _0801903C _0801906E: - ldr r0, _080190F4 @ =gUnknown_2023FE8 + ldr r0, _080190F4 @ =gBattleStruct mov r8, r0 ldr r1, _080190F8 @ =gUnknown_2023D6D mov r12, r1 - ldr r2, _080190FC @ =gUnknown_2023D6C + ldr r2, _080190FC @ =gBattlerTarget mov r5, r8 - ldr r7, _08019100 @ =gUnknown_2023BE4 - ldr r6, _08019104 @ =gUnknown_2023BCE + ldr r7, _08019100 @ =gBattleMons + ldr r6, _08019104 @ =gBattlerPartyIndexes _0801907E: ldr r3, [r5] adds r1, r3, 0 @@ -4363,7 +4363,7 @@ _0801907E: adds r0, r3, 0 adds r0, 0xDF ldrb r1, [r0] - ldr r3, _080190F0 @ =gUnknown_825E45C + ldr r3, _080190F0 @ =gBitTable lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -4373,7 +4373,7 @@ _0801907E: ands r1, r0 cmp r1, 0 bne _080190C6 - ldr r0, _080190EC @ =gUnknown_2023D70 + ldr r0, _080190EC @ =gAbsentBattlerFlags ldrb r1, [r0] lsls r0, r4, 2 adds r0, r3 @@ -4402,18 +4402,18 @@ _080190C6: b _08019264 .align 2, 0 _080190E8: .4byte gUnknown_2023BCC -_080190EC: .4byte gUnknown_2023D70 -_080190F0: .4byte gUnknown_825E45C -_080190F4: .4byte gUnknown_2023FE8 +_080190EC: .4byte gAbsentBattlerFlags +_080190F0: .4byte gBitTable +_080190F4: .4byte gBattleStruct _080190F8: .4byte gUnknown_2023D6D -_080190FC: .4byte gUnknown_2023D6C -_08019100: .4byte gUnknown_2023BE4 -_08019104: .4byte gUnknown_2023BCE +_080190FC: .4byte gBattlerTarget +_08019100: .4byte gBattleMons +_08019104: .4byte gBattlerPartyIndexes _08019108: ldr r0, _08019134 @ =gUnknown_2023D6D ldrb r0, [r0] bl sub_8017434 - ldr r2, _08019138 @ =gUnknown_2023FE8 + ldr r2, _08019138 @ =gBattleStruct ldr r1, [r2] adds r1, 0x4E ldrb r0, [r1] @@ -4432,7 +4432,7 @@ _08019108: b _08019262 .align 2, 0 _08019134: .4byte gUnknown_2023D6D -_08019138: .4byte gUnknown_2023FE8 +_08019138: .4byte gBattleStruct _0801913C: .4byte gUnknown_2023BCC _08019140: ldr r0, [r2] @@ -4454,10 +4454,10 @@ _0801914A: _0801915E: ldr r0, _080191AC @ =gUnknown_2023D6D mov r12, r0 - ldr r7, _080191B0 @ =gUnknown_2023D6C - ldr r5, _080191B4 @ =gUnknown_2023FE8 - ldr r2, _080191B8 @ =gUnknown_2023BE4 - ldr r6, _080191BC @ =gUnknown_825E45C + ldr r7, _080191B0 @ =gBattlerTarget + ldr r5, _080191B4 @ =gBattleStruct + ldr r2, _080191B8 @ =gBattleMons + ldr r6, _080191BC @ =gBitTable _0801916A: ldr r0, [r5] adds r4, r0, 0 @@ -4473,7 +4473,7 @@ _0801916A: ldrh r0, [r0, 0x28] cmp r0, 0 bne _08019198 - ldr r0, _080191C0 @ =gUnknown_2023D70 + ldr r0, _080191C0 @ =gAbsentBattlerFlags ldrb r1, [r0] lsls r0, r3, 2 adds r0, r6 @@ -4494,11 +4494,11 @@ _08019198: b _080191E0 .align 2, 0 _080191AC: .4byte gUnknown_2023D6D -_080191B0: .4byte gUnknown_2023D6C -_080191B4: .4byte gUnknown_2023FE8 -_080191B8: .4byte gUnknown_2023BE4 -_080191BC: .4byte gUnknown_825E45C -_080191C0: .4byte gUnknown_2023D70 +_080191B0: .4byte gBattlerTarget +_080191B4: .4byte gBattleStruct +_080191B8: .4byte gBattleMons +_080191BC: .4byte gBitTable +_080191C0: .4byte gAbsentBattlerFlags _080191C4: .4byte gUnknown_2023BCC _080191C8: mov r1, r8 @@ -4575,7 +4575,7 @@ _08019240: beq _08019256 b _08018FCE _08019256: - ldr r2, _08019280 @ =gUnknown_2023FE8 + ldr r2, _08019280 @ =gBattleStruct ldr r1, [r2] adds r1, 0x4D ldrb r0, [r1] @@ -4601,7 +4601,7 @@ _08019274: pop {r1} bx r1 .align 2, 0 -_08019280: .4byte gUnknown_2023FE8 +_08019280: .4byte gBattleStruct thumb_func_end HandleFaintedMonActions thumb_func_start TryClearRageStatuses @@ -4659,12 +4659,12 @@ sub_80192D4: @ 80192D4 mov r9, r0 ldr r1, _080192F0 @ =gUnknown_2023FC8 mov r10, r1 - ldr r2, _080192F4 @ =gUnknown_2023FE8 + ldr r2, _080192F4 @ =gBattleStruct mov r8, r2 b _08019302 .align 2, 0 _080192F0: .4byte gUnknown_2023FC8 -_080192F4: .4byte gUnknown_2023FE8 +_080192F4: .4byte gBattleStruct _080192F8: mov r4, r9 cmp r4, 0 @@ -4705,8 +4705,8 @@ _08019320: .4byte _08019B40 .4byte _08019B98 _08019360: - ldr r1, _08019390 @ =gUnknown_2023BE4 - ldr r3, _08019394 @ =gUnknown_2023D6B + ldr r1, _08019390 @ =gBattleMons + ldr r3, _08019394 @ =sBattler_AI ldrb r2, [r3] movs r0, 0x58 muls r2, r0 @@ -4716,7 +4716,7 @@ _08019360: ldr r1, _08019398 @ =0xfdffffff ands r0, r1 str r0, [r2] - ldr r0, _0801939C @ =gUnknown_2023DFC + ldr r0, _0801939C @ =gStatuses3 ldrb r2, [r3] lsls r2, 2 adds r2, r0 @@ -4728,14 +4728,14 @@ _08019360: ldr r1, [r0] bl _08019B90 .align 2, 0 -_08019390: .4byte gUnknown_2023BE4 -_08019394: .4byte gUnknown_2023D6B +_08019390: .4byte gBattleMons +_08019394: .4byte sBattler_AI _08019398: .4byte 0xfdffffff -_0801939C: .4byte gUnknown_2023DFC +_0801939C: .4byte gStatuses3 _080193A0: .4byte 0xffffbfff _080193A4: - ldr r7, _0801940C @ =gUnknown_2023BE4 - ldr r4, _08019410 @ =gUnknown_2023D6B + ldr r7, _0801940C @ =gBattleMons + ldr r4, _08019410 @ =sBattler_AI ldrb r1, [r4] movs r5, 0x58 adds r0, r1, 0 @@ -4786,8 +4786,8 @@ _080193C4: mov r9, r4 b _08019946 .align 2, 0 -_0801940C: .4byte gUnknown_2023BE4 -_08019410: .4byte gUnknown_2023D6B +_0801940C: .4byte gBattleMons +_08019410: .4byte sBattler_AI _08019414: .4byte 0xf7ffffff _08019418: .4byte gUnknown_2023E82 _0801941C: .4byte gUnknown_2023D74 @@ -4820,8 +4820,8 @@ _08019450: subs r0, r1, r3 str r0, [r2] _08019454: - ldr r2, _08019498 @ =gUnknown_2023BE4 - ldr r0, _0801949C @ =gUnknown_2023D6B + ldr r2, _08019498 @ =gBattleMons + ldr r0, _0801949C @ =sBattler_AI ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -4833,7 +4833,7 @@ _08019454: ands r4, r0 cmp r4, 0 beq _080194B0 - ldr r0, _080194A0 @ =gUnknown_2023D4A + ldr r0, _080194A0 @ =gCurrentMove ldrh r0, [r0] cmp r0, 0xAD bne _08019478 @@ -4856,9 +4856,9 @@ _0801947E: mov r9, r0 b _08019946 .align 2, 0 -_08019498: .4byte gUnknown_2023BE4 -_0801949C: .4byte gUnknown_2023D6B -_080194A0: .4byte gUnknown_2023D4A +_08019498: .4byte gBattleMons +_0801949C: .4byte sBattler_AI +_080194A0: .4byte gCurrentMove _080194A4: .4byte gUnknown_2023D74 _080194A8: .4byte gUnknown_81D9029 _080194AC: .4byte gUnknown_2023DD0 @@ -4884,8 +4884,8 @@ _080194D4: .4byte gUnknown_2023E82 _080194D8: .4byte gUnknown_2023D74 _080194DC: .4byte gUnknown_81D9036 _080194E0: - ldr r1, _0801953C @ =gUnknown_2023BE4 - ldr r7, _08019540 @ =gUnknown_2023D6B + ldr r1, _0801953C @ =gBattleMons + ldr r7, _08019540 @ =sBattler_AI ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -4906,8 +4906,8 @@ _080194E0: lsrs r4, r0, 16 cmp r4, 0 beq _08019558 - ldr r2, _08019544 @ =gUnknown_8250C04 - ldr r0, _08019548 @ =gUnknown_2023D4A + ldr r2, _08019544 @ =gBattleMoves + ldr r0, _08019548 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4929,10 +4929,10 @@ _08019526: str r0, [r2] b _08019578 .align 2, 0 -_0801953C: .4byte gUnknown_2023BE4 -_08019540: .4byte gUnknown_2023D6B -_08019544: .4byte gUnknown_8250C04 -_08019548: .4byte gUnknown_2023D4A +_0801953C: .4byte gBattleMons +_08019540: .4byte sBattler_AI +_08019544: .4byte gBattleMoves +_08019548: .4byte gCurrentMove _0801954C: .4byte gUnknown_2023D74 _08019550: .4byte gUnknown_81D9080 _08019554: .4byte gUnknown_2023DD0 @@ -4955,7 +4955,7 @@ _08019558: _08019578: movs r2, 0x2 mov r9, r2 - ldr r4, _08019594 @ =gUnknown_2023FE8 + ldr r4, _08019594 @ =gBattleStruct mov r8, r4 _08019580: mov r7, r8 @@ -4965,10 +4965,10 @@ _08019580: _08019588: .4byte gUnknown_2023D74 _0801958C: .4byte gUnknown_81D908D _08019590: .4byte gUnknown_2023E82 -_08019594: .4byte gUnknown_2023FE8 +_08019594: .4byte gBattleStruct _08019598: - ldr r1, _080195EC @ =gUnknown_2023BE4 - ldr r0, _080195F0 @ =gUnknown_2023D6B + ldr r1, _080195EC @ =gBattleMons + ldr r0, _080195F0 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -4979,7 +4979,7 @@ _08019598: beq _080195AE b _08019946 _080195AE: - ldr r0, _080195F4 @ =gUnknown_2023E0C + ldr r0, _080195F4 @ =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -5004,24 +5004,24 @@ _080195C2: ldr r1, _08019600 @ =gUnknown_2023D74 ldr r0, _08019604 @ =gUnknown_81D94F2 str r0, [r1] - ldr r2, _08019608 @ =gUnknown_2023DCC + ldr r2, _08019608 @ =gMoveResultFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] b _080197F4 .align 2, 0 -_080195EC: .4byte gUnknown_2023BE4 -_080195F0: .4byte gUnknown_2023D6B -_080195F4: .4byte gUnknown_2023E0C +_080195EC: .4byte gBattleMons +_080195F0: .4byte sBattler_AI +_080195F4: .4byte gDisableStructs _080195F8: .4byte gUnknown_2023DD0 _080195FC: .4byte gUnknown_2023E82 _08019600: .4byte gUnknown_2023D74 _08019604: .4byte gUnknown_81D94F2 -_08019608: .4byte gUnknown_2023DCC +_08019608: .4byte gMoveResultFlags _0801960C: - ldr r1, _0801965C @ =gUnknown_2023BE4 - ldr r3, _08019660 @ =gUnknown_2023D6B + ldr r1, _0801965C @ =gBattleMons + ldr r3, _08019660 @ =sBattler_AI ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -5038,7 +5038,7 @@ _08019628: ldr r0, _08019664 @ =0xffbfffff ands r1, r0 str r1, [r2] - ldr r2, _08019668 @ =gUnknown_2023E0C + ldr r2, _08019668 @ =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -5061,16 +5061,16 @@ _08019628: mov r9, r1 b _08019946 .align 2, 0 -_0801965C: .4byte gUnknown_2023BE4 -_08019660: .4byte gUnknown_2023D6B +_0801965C: .4byte gBattleMons +_08019660: .4byte sBattler_AI _08019664: .4byte 0xffbfffff -_08019668: .4byte gUnknown_2023E0C +_08019668: .4byte gDisableStructs _0801966C: .4byte gUnknown_2023D74 _08019670: .4byte gUnknown_81D7342 _08019674: .4byte gUnknown_2023DD0 _08019678: - ldr r1, _080196C8 @ =gUnknown_2023BE4 - ldr r3, _080196CC @ =gUnknown_2023D6B + ldr r1, _080196C8 @ =gBattleMons + ldr r3, _080196CC @ =sBattler_AI ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -5110,21 +5110,21 @@ _08019692: mov r9, r2 b _08019946 .align 2, 0 -_080196C8: .4byte gUnknown_2023BE4 -_080196CC: .4byte gUnknown_2023D6B +_080196C8: .4byte gBattleMons +_080196CC: .4byte sBattler_AI _080196D0: .4byte gUnknown_2023E8C _080196D4: .4byte gUnknown_2023D74 _080196D8: .4byte gUnknown_81D90B1 _080196DC: .4byte gUnknown_2023DD0 _080196E0: - ldr r0, _08019734 @ =gUnknown_2023E0C - ldr r3, _08019738 @ =gUnknown_2023D6B + ldr r0, _08019734 @ =gDisableStructs + ldr r3, _08019738 @ =sBattler_AI ldrb r2, [r3] lsls r1, r2, 3 subs r1, r2 lsls r1, 2 adds r1, r0 - ldr r0, _0801973C @ =gUnknown_2023D4A + ldr r0, _0801973C @ =gCurrentMove ldrh r1, [r1, 0x4] ldrh r0, [r0] cmp r1, r0 @@ -5142,7 +5142,7 @@ _08019700: movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x1] - ldr r1, _08019744 @ =gUnknown_2023FC4 + ldr r1, _08019744 @ =gBattleScripting ldrb r0, [r3] strb r0, [r1, 0x17] ldrb r0, [r3] @@ -5160,17 +5160,17 @@ _08019700: mov r9, r4 b _08019946 .align 2, 0 -_08019734: .4byte gUnknown_2023E0C -_08019738: .4byte gUnknown_2023D6B -_0801973C: .4byte gUnknown_2023D4A +_08019734: .4byte gDisableStructs +_08019738: .4byte sBattler_AI +_0801973C: .4byte gCurrentMove _08019740: .4byte gUnknown_2023E8C -_08019744: .4byte gUnknown_2023FC4 +_08019744: .4byte gBattleScripting _08019748: .4byte gUnknown_2023D74 _0801974C: .4byte gUnknown_81D8C4F _08019750: .4byte gUnknown_2023DD0 _08019754: - ldr r0, _0801979C @ =gUnknown_2023E0C - ldr r4, _080197A0 @ =gUnknown_2023D6B + ldr r0, _0801979C @ =gDisableStructs + ldr r4, _080197A0 @ =sBattler_AI ldrb r3, [r4] lsls r1, r3, 3 subs r1, r3 @@ -5182,8 +5182,8 @@ _08019754: bne _0801976C b _08019946 _0801976C: - ldr r2, _080197A4 @ =gUnknown_8250C04 - ldr r0, _080197A8 @ =gUnknown_2023D4A + ldr r2, _080197A4 @ =gBattleMoves + ldr r0, _080197A8 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -5207,17 +5207,17 @@ _08019782: ldr r0, _080197B4 @ =gUnknown_81D8ECA b _08019934 .align 2, 0 -_0801979C: .4byte gUnknown_2023E0C -_080197A0: .4byte gUnknown_2023D6B -_080197A4: .4byte gUnknown_8250C04 -_080197A8: .4byte gUnknown_2023D4A +_0801979C: .4byte gDisableStructs +_080197A0: .4byte sBattler_AI +_080197A4: .4byte gBattleMoves +_080197A8: .4byte gCurrentMove _080197AC: .4byte gUnknown_2023E8C _080197B0: .4byte gUnknown_2023D74 _080197B4: .4byte gUnknown_81D8ECA _080197B8: - ldr r4, _080197FC @ =gUnknown_2023D6B + ldr r4, _080197FC @ =sBattler_AI ldrb r0, [r4] - ldr r1, _08019800 @ =gUnknown_2023D4A + ldr r1, _08019800 @ =gCurrentMove ldrh r1, [r1] bl GetImprisonedMovesCount lsls r0, 24 @@ -5249,15 +5249,15 @@ _080197F4: mov r9, r0 b _08019946 .align 2, 0 -_080197FC: .4byte gUnknown_2023D6B -_08019800: .4byte gUnknown_2023D4A +_080197FC: .4byte sBattler_AI +_08019800: .4byte gCurrentMove _08019804: .4byte gUnknown_2023E8C _08019808: .4byte gUnknown_2023D74 _0801980C: .4byte gUnknown_81D8F94 _08019810: .4byte gUnknown_2023DD0 _08019814: - ldr r7, _0801985C @ =gUnknown_2023BE4 - ldr r5, _08019860 @ =gUnknown_2023D6B + ldr r7, _0801985C @ =gBattleMons + ldr r5, _08019860 @ =sBattler_AI ldrb r0, [r5] movs r6, 0x58 muls r0, r6 @@ -5291,14 +5291,14 @@ _08019814: bl BattleScriptPushCursor b _080198B2 .align 2, 0 -_0801985C: .4byte gUnknown_2023BE4 -_08019860: .4byte gUnknown_2023D6B +_0801985C: .4byte gBattleMons +_08019860: .4byte sBattler_AI _08019864: .4byte gUnknown_2023E82 _08019868: ldr r0, _080198B8 @ =gUnknown_2023E82 movs r4, 0x1 strb r1, [r0, 0x5] - ldr r1, _080198BC @ =gUnknown_2023D6C + ldr r1, _080198BC @ =gBattlerTarget ldrb r0, [r5] strb r0, [r1] ldrb r0, [r5] @@ -5316,7 +5316,7 @@ _08019868: movs r2, 0x1 movs r3, 0 bl sub_803ECEC - ldr r1, _080198C0 @ =gUnknown_2023D50 + ldr r1, _080198C0 @ =gBattleMoveDamage str r0, [r1] ldr r0, _080198C4 @ =gUnknown_2023E8C ldrb r1, [r5] @@ -5337,8 +5337,8 @@ _080198B2: b _080198DC .align 2, 0 _080198B8: .4byte gUnknown_2023E82 -_080198BC: .4byte gUnknown_2023D6C -_080198C0: .4byte gUnknown_2023D50 +_080198BC: .4byte gBattlerTarget +_080198C0: .4byte gBattleMoveDamage _080198C4: .4byte gUnknown_2023E8C _080198C8: .4byte gUnknown_2023DD0 _080198CC: .4byte gUnknown_2023D74 @@ -5351,7 +5351,7 @@ _080198DC: str r0, [r1] movs r1, 0x1 mov r9, r1 - ldr r2, _080198F4 @ =gUnknown_2023FE8 + ldr r2, _080198F4 @ =gBattleStruct mov r8, r2 _080198E6: mov r4, r8 @@ -5360,10 +5360,10 @@ _080198E6: .align 2, 0 _080198EC: .4byte gUnknown_2023D74 _080198F0: .4byte gUnknown_81D9116 -_080198F4: .4byte gUnknown_2023FE8 +_080198F4: .4byte gBattleStruct _080198F8: - ldr r1, _08019958 @ =gUnknown_2023BE4 - ldr r4, _0801995C @ =gUnknown_2023D6B + ldr r1, _08019958 @ =gBattleMons + ldr r4, _0801995C @ =sBattler_AI ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -5402,7 +5402,7 @@ _08019934: movs r7, 0x1 mov r9, r7 _08019946: - ldr r2, _08019970 @ =gUnknown_2023FE8 + ldr r2, _08019970 @ =gBattleStruct ldr r1, [r2] adds r1, 0xB7 ldrb r0, [r1] @@ -5411,15 +5411,15 @@ _08019946: mov r8, r2 b _08019B98 .align 2, 0 -_08019958: .4byte gUnknown_2023BE4 -_0801995C: .4byte gUnknown_2023D6B +_08019958: .4byte gBattleMons +_0801995C: .4byte sBattler_AI _08019960: .4byte gUnknown_2023E8C _08019964: .4byte gUnknown_2023D74 _08019968: .4byte gUnknown_81D90A1 _0801996C: .4byte gUnknown_2023DD0 -_08019970: .4byte gUnknown_2023FE8 +_08019970: .4byte gBattleStruct _08019974: - ldr r0, _0801999C @ =gUnknown_2022B4C + ldr r0, _0801999C @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0xA0 lsls r0, 8 @@ -5430,7 +5430,7 @@ _08019974: beq _08019988 b _08019B8C _08019988: - ldr r0, _080199A0 @ =gUnknown_2023D6B + ldr r0, _080199A0 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -5440,8 +5440,8 @@ _08019988: ldr r0, _080199A8 @ =gUnknown_81D9180 b _080199B0 .align 2, 0 -_0801999C: .4byte gUnknown_2022B4C -_080199A0: .4byte gUnknown_2023D6B +_0801999C: .4byte gBattleTypeFlags +_080199A0: .4byte sBattler_AI _080199A4: .4byte gUnknown_2023D74 _080199A8: .4byte gUnknown_81D9180 _080199AC: @@ -5459,8 +5459,8 @@ _080199BC: .4byte gUnknown_2023D74 _080199C0: .4byte gUnknown_81D9192 _080199C4: .4byte gUnknown_2023E82 _080199C8: - ldr r1, _08019A00 @ =gUnknown_2023BE4 - ldr r4, _08019A04 @ =gUnknown_2023D6B + ldr r1, _08019A00 @ =gBattleMons + ldr r4, _08019A04 @ =sBattler_AI ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -5474,7 +5474,7 @@ _080199C8: beq _08019A42 lsrs r0, r1, 16 bl CountTrailingZeroBits - ldr r1, _08019A08 @ =gUnknown_2023FC4 + ldr r1, _08019A08 @ =gBattleScripting strb r0, [r1, 0x17] bl Random movs r1, 0x1 @@ -5484,9 +5484,9 @@ _080199C8: bl BattleScriptPushCursor b _08019A34 .align 2, 0 -_08019A00: .4byte gUnknown_2023BE4 -_08019A04: .4byte gUnknown_2023D6B -_08019A08: .4byte gUnknown_2023FC4 +_08019A00: .4byte gBattleMons +_08019A04: .4byte sBattler_AI +_08019A08: .4byte gBattleScripting _08019A0C: ldr r0, _08019A48 @ =gUnknown_81D914A bl BattleScriptPush @@ -5512,7 +5512,7 @@ _08019A34: str r0, [r1] movs r4, 0x1 mov r9, r4 - ldr r7, _08019A5C @ =gUnknown_2023FE8 + ldr r7, _08019A5C @ =gBattleStruct mov r8, r7 _08019A42: mov r0, r8 @@ -5524,10 +5524,10 @@ _08019A4C: .4byte gUnknown_2023DD0 _08019A50: .4byte gUnknown_2023E8C _08019A54: .4byte gUnknown_2023D74 _08019A58: .4byte gUnknown_81D913D -_08019A5C: .4byte gUnknown_2023FE8 +_08019A5C: .4byte gBattleStruct _08019A60: - ldr r1, _08019A98 @ =gUnknown_2023BE4 - ldr r6, _08019A9C @ =gUnknown_2023D6B + ldr r1, _08019A98 @ =gBattleMons + ldr r6, _08019A9C @ =sBattler_AI ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -5555,8 +5555,8 @@ _08019A60: ldr r0, _08019AA8 @ =gUnknown_81D8BA9 b _08019B2C .align 2, 0 -_08019A98: .4byte gUnknown_2023BE4 -_08019A9C: .4byte gUnknown_2023D6B +_08019A98: .4byte gBattleMons +_08019A9C: .4byte sBattler_AI _08019AA0: .4byte 0xffffff00 _08019AA4: .4byte gUnknown_2023D74 _08019AA8: .4byte gUnknown_81D8BA9 @@ -5567,7 +5567,7 @@ _08019AAC: ldr r0, [r0] cmp r0, 0 beq _08019B28 - ldr r1, _08019B08 @ =gUnknown_2023D4A + ldr r1, _08019B08 @ =gCurrentMove movs r0, 0x75 strh r0, [r1] ldrb r0, [r6] @@ -5577,15 +5577,15 @@ _08019AAC: lsls r0, 1 mov r1, r10 str r0, [r1] - ldr r4, _08019B0C @ =gUnknown_2023D6C + ldr r4, _08019B0C @ =gBattlerTarget ldr r1, _08019B10 @ =gUnknown_2023DD8 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] strb r0, [r4] - ldr r0, _08019B14 @ =gUnknown_2023D70 + ldr r0, _08019B14 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _08019B18 @ =gUnknown_825E45C + ldr r2, _08019B18 @ =gBitTable ldrb r0, [r4] lsls r0, 2 adds r0, r2 @@ -5601,19 +5601,19 @@ _08019AF6: ldr r1, _08019B1C @ =gUnknown_2023D74 ldr r0, _08019B20 @ =gUnknown_81D8BB4 str r0, [r1] - ldr r2, _08019B24 @ =gUnknown_2023FE8 + ldr r2, _08019B24 @ =gBattleStruct mov r8, r2 b _08019B2E .align 2, 0 _08019B04: .4byte gUnknown_2023D58 -_08019B08: .4byte gUnknown_2023D4A -_08019B0C: .4byte gUnknown_2023D6C +_08019B08: .4byte gCurrentMove +_08019B0C: .4byte gBattlerTarget _08019B10: .4byte gUnknown_2023DD8 -_08019B14: .4byte gUnknown_2023D70 -_08019B18: .4byte gUnknown_825E45C +_08019B14: .4byte gAbsentBattlerFlags +_08019B18: .4byte gBitTable _08019B1C: .4byte gUnknown_2023D74 _08019B20: .4byte gUnknown_81D8BB4 -_08019B24: .4byte gUnknown_2023FE8 +_08019B24: .4byte gBattleStruct _08019B28: ldr r1, _08019B38 @ =gUnknown_2023D74 ldr r0, _08019B3C @ =gUnknown_81D8BFC @@ -5630,8 +5630,8 @@ _08019B32: _08019B38: .4byte gUnknown_2023D74 _08019B3C: .4byte gUnknown_81D8BFC _08019B40: - ldr r1, _08019BE8 @ =gUnknown_2023BE4 - ldr r0, _08019BEC @ =gUnknown_2023D6B + ldr r1, _08019BE8 @ =gBattleMons + ldr r0, _08019BEC @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -5642,8 +5642,8 @@ _08019B40: ands r0, r3 cmp r0, 0 beq _08019B8C - ldr r2, _08019BF0 @ =gUnknown_8250C04 - ldr r0, _08019BF4 @ =gUnknown_2023D4A + ldr r2, _08019BF0 @ =gBattleMoves + ldr r0, _08019BF4 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -5667,7 +5667,7 @@ _08019B84: movs r0, 0x2 _08019B86: mov r9, r0 - ldr r1, _08019C04 @ =gUnknown_2023FE8 + ldr r1, _08019C04 @ =gBattleStruct mov r8, r1 _08019B8C: mov r2, r8 @@ -5689,8 +5689,8 @@ _08019BA8: mov r7, r9 cmp r7, 0x2 bne _08019BD4 - ldr r4, _08019C08 @ =gUnknown_2023BC4 - ldr r0, _08019BEC @ =gUnknown_2023D6B + ldr r4, _08019C08 @ =gActiveBattler + ldr r0, _08019BEC @ =sBattler_AI ldrb r0, [r0] strb r0, [r4] ldrb r1, [r4] @@ -5717,15 +5717,15 @@ _08019BD4: pop {r1} bx r1 .align 2, 0 -_08019BE8: .4byte gUnknown_2023BE4 -_08019BEC: .4byte gUnknown_2023D6B -_08019BF0: .4byte gUnknown_8250C04 -_08019BF4: .4byte gUnknown_2023D4A +_08019BE8: .4byte gBattleMons +_08019BEC: .4byte sBattler_AI +_08019BF0: .4byte gBattleMoves +_08019BF4: .4byte gCurrentMove _08019BF8: .4byte gUnknown_2023D74 _08019BFC: .4byte gUnknown_81D908D _08019C00: .4byte gUnknown_2023E82 -_08019C04: .4byte gUnknown_2023FE8 -_08019C08: .4byte gUnknown_2023BC4 +_08019C04: .4byte gBattleStruct +_08019C08: .4byte gActiveBattler _08019C0C: .4byte gUnknown_2023C30 thumb_func_end sub_80192D4 @@ -5745,7 +5745,7 @@ sub_8019C10: @ 8019C10 lsls r2, 24 lsrs r2, 24 mov r9, r2 - ldr r0, _08019C3C @ =gUnknown_2022B4C + ldr r0, _08019C3C @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x1 ands r0, r1 @@ -5754,7 +5754,7 @@ sub_8019C10: @ 8019C10 movs r0, 0 b _08019D90 .align 2, 0 -_08019C3C: .4byte gUnknown_2022B4C +_08019C3C: .4byte gBattleTypeFlags _08019C40: movs r0, 0x40 ands r1, r0 @@ -5767,11 +5767,11 @@ _08019C40: adds r0, r4, 0 bl GetBankSide lsls r0, 24 - ldr r1, _08019CC4 @ =gUnknown_202402C + ldr r1, _08019CC4 @ =gEnemyParty mov r8, r1 cmp r0, 0 bne _08019C66 - ldr r0, _08019CC8 @ =gUnknown_2024284 + ldr r0, _08019CC8 @ =gPlayerParty mov r8, r0 _08019C66: adds r0, r7, 0 @@ -5822,8 +5822,8 @@ _08019CC0: adds r0, r1, 0 b _08019D90 .align 2, 0 -_08019CC4: .4byte gUnknown_202402C -_08019CC8: .4byte gUnknown_2024284 +_08019CC4: .4byte gEnemyParty +_08019CC8: .4byte gPlayerParty _08019CCC: adds r0, r3, 0 bl GetBankSide @@ -5839,11 +5839,11 @@ _08019CCC: bl GetBankByIdentity lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08019CF4 @ =gUnknown_202402C + ldr r0, _08019CF4 @ =gEnemyParty mov r8, r0 b _08019D10 .align 2, 0 -_08019CF4: .4byte gUnknown_202402C +_08019CF4: .4byte gEnemyParty _08019CF8: movs r0, 0 bl GetBankByIdentity @@ -5853,13 +5853,13 @@ _08019CF8: bl GetBankByIdentity lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08019DA0 @ =gUnknown_2024284 + ldr r1, _08019DA0 @ =gPlayerParty mov r8, r1 _08019D10: mov r0, r10 cmp r0, 0x6 bne _08019D20 - ldr r1, _08019DA4 @ =gUnknown_2023BCE + ldr r1, _08019DA4 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrb r0, [r0] @@ -5868,7 +5868,7 @@ _08019D20: mov r1, r9 cmp r1, 0x6 bne _08019D30 - ldr r1, _08019DA4 @ =gUnknown_2023BCE + ldr r1, _08019DA4 @ =gBattlerPartyIndexes lsls r0, r6, 1 adds r0, r1 ldrb r0, [r0] @@ -5901,7 +5901,7 @@ _08019D32: beq _08019D82 cmp r5, r9 beq _08019D82 - ldr r0, _08019DA8 @ =gUnknown_2023FE8 + ldr r0, _08019DA8 @ =gBattleStruct ldr r1, [r0] adds r0, r7, r1 adds r0, 0x5C @@ -5931,9 +5931,9 @@ _08019D90: pop {r1} bx r1 .align 2, 0 -_08019DA0: .4byte gUnknown_2024284 -_08019DA4: .4byte gUnknown_2023BCE -_08019DA8: .4byte gUnknown_2023FE8 +_08019DA0: .4byte gPlayerParty +_08019DA4: .4byte gBattlerPartyIndexes +_08019DA8: .4byte gBattleStruct thumb_func_end sub_8019C10 thumb_func_start sub_8019DAC @@ -5943,7 +5943,7 @@ sub_8019DAC: @ 8019DAC lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r1, _08019E1C @ =gUnknown_2023BE4 + ldr r1, _08019E1C @ =gBattleMons movs r0, 0x58 muls r0, r6 adds r4, r0, r1 @@ -5993,7 +5993,7 @@ _08019DFE: movs r0, 0x1 b _08019F08 .align 2, 0 -_08019E1C: .4byte gUnknown_2023BE4 +_08019E1C: .4byte gBattleMons _08019E20: .4byte 0x00000181 _08019E24: movs r0, 0 @@ -6020,14 +6020,14 @@ _08019E50: movs r0, 0 b _08019F08 _08019E54: - ldr r1, _08019F10 @ =gUnknown_2023F1C + ldr r1, _08019F10 @ =gBattleWeather ldrh r0, [r1] movs r2, 0xE7 ands r2, r0 adds r4, r1, 0 cmp r2, 0 bne _08019E82 - ldr r1, _08019F14 @ =gUnknown_2023BE4 + ldr r1, _08019F14 @ =gBattleMons movs r0, 0x58 muls r0, r6 adds r1, r0, r1 @@ -6049,7 +6049,7 @@ _08019E82: ands r0, r1 cmp r0, 0 beq _08019EAE - ldr r1, _08019F14 @ =gUnknown_2023BE4 + ldr r1, _08019F14 @ =gBattleMons movs r0, 0x58 muls r0, r6 adds r1, r0, r1 @@ -6072,7 +6072,7 @@ _08019EAE: ands r0, r1 cmp r0, 0 beq _08019EDA - ldr r1, _08019F14 @ =gUnknown_2023BE4 + ldr r1, _08019F14 @ =gBattleMons movs r0, 0x58 muls r0, r6 adds r1, r0, r1 @@ -6095,7 +6095,7 @@ _08019EDA: ands r0, r1 cmp r0, 0 beq _08019F06 - ldr r1, _08019F14 @ =gUnknown_2023BE4 + ldr r1, _08019F14 @ =gBattleMons movs r0, 0x58 muls r0, r6 adds r1, r0, r1 @@ -6120,8 +6120,8 @@ _08019F08: pop {r1} bx r1 .align 2, 0 -_08019F10: .4byte gUnknown_2023F1C -_08019F14: .4byte gUnknown_2023BE4 +_08019F10: .4byte gBattleWeather +_08019F14: .4byte gBattleMons thumb_func_end sub_8019DAC thumb_func_start sub_8019F18 @@ -6148,7 +6148,7 @@ sub_8019F18: @ 8019F18 lsrs r4, 16 movs r0, 0 mov r9, r0 - ldr r5, _08019F74 @ =gUnknown_2023D6B + ldr r5, _08019F74 @ =sBattler_AI ldr r1, _08019F78 @ =gUnknown_2023BCC ldrb r0, [r5] ldrb r1, [r1] @@ -6162,32 +6162,32 @@ _08019F54: lsls r0, 24 cmp r0, 0 bne _08019F84 - ldr r1, _08019F7C @ =gUnknown_2023BCE + ldr r1, _08019F7C @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08019F80 @ =gUnknown_2024284 + ldr r0, _08019F80 @ =gPlayerParty b _08019F94 .align 2, 0 -_08019F74: .4byte gUnknown_2023D6B +_08019F74: .4byte sBattler_AI _08019F78: .4byte gUnknown_2023BCC -_08019F7C: .4byte gUnknown_2023BCE -_08019F80: .4byte gUnknown_2024284 +_08019F7C: .4byte gBattlerPartyIndexes +_08019F80: .4byte gPlayerParty _08019F84: - ldr r1, _08019FC4 @ =gUnknown_2023BCE + ldr r1, _08019FC4 @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08019FC8 @ =gUnknown_202402C + ldr r0, _08019FC8 @ =gEnemyParty _08019F94: adds r6, r1, r0 - ldr r5, _08019FCC @ =gUnknown_2023D6C + ldr r5, _08019FCC @ =gBattlerTarget ldr r1, _08019FD0 @ =gUnknown_2023BCC ldrb r0, [r5] ldrb r1, [r1] @@ -6201,30 +6201,30 @@ _08019FA6: lsls r0, 24 cmp r0, 0 bne _08019FD8 - ldr r1, _08019FC4 @ =gUnknown_2023BCE + ldr r1, _08019FC4 @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08019FD4 @ =gUnknown_2024284 + ldr r0, _08019FD4 @ =gPlayerParty b _08019FE8 .align 2, 0 -_08019FC4: .4byte gUnknown_2023BCE -_08019FC8: .4byte gUnknown_202402C -_08019FCC: .4byte gUnknown_2023D6C +_08019FC4: .4byte gBattlerPartyIndexes +_08019FC8: .4byte gEnemyParty +_08019FCC: .4byte gBattlerTarget _08019FD0: .4byte gUnknown_2023BCC -_08019FD4: .4byte gUnknown_2024284 +_08019FD4: .4byte gPlayerParty _08019FD8: - ldr r1, _0801A038 @ =gUnknown_2023BCE + ldr r1, _0801A038 @ =gBattlerPartyIndexes ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0801A03C @ =gUnknown_202402C + ldr r0, _0801A03C @ =gEnemyParty _08019FE8: adds r5, r1, r0 adds r0, r6, 0 @@ -6247,7 +6247,7 @@ _08019FE8: movs r1, 0 bl GetMonData str r0, [sp, 0x14] - ldr r0, _0801A040 @ =gUnknown_2022B4C + ldr r0, _0801A040 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -6263,13 +6263,13 @@ _0801A02A: mov r8, r0 b _0801A05E .align 2, 0 -_0801A038: .4byte gUnknown_2023BCE -_0801A03C: .4byte gUnknown_202402C -_0801A040: .4byte gUnknown_2022B4C +_0801A038: .4byte gBattlerPartyIndexes +_0801A03C: .4byte gEnemyParty +_0801A040: .4byte gBattleTypeFlags _0801A044: .4byte gUnknown_2023D6A _0801A048: ldr r2, _0801A078 @ =gUnknown_2023D6A - ldr r1, _0801A07C @ =gUnknown_2023BE4 + ldr r1, _0801A07C @ =gBattleMons movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -6282,10 +6282,10 @@ _0801A048: _0801A05E: cmp r4, 0 bne _0801A066 - ldr r0, _0801A080 @ =gUnknown_2023D4A + ldr r0, _0801A080 @ =gCurrentMove ldrh r4, [r0] _0801A066: - ldr r1, _0801A084 @ =gUnknown_2023FE8 + ldr r1, _0801A084 @ =gBattleStruct ldr r0, [r1] ldrb r0, [r0, 0x13] adds r6, r1, 0 @@ -6296,18 +6296,18 @@ _0801A066: b _0801A094 .align 2, 0 _0801A078: .4byte gUnknown_2023D6A -_0801A07C: .4byte gUnknown_2023BE4 -_0801A080: .4byte gUnknown_2023D4A -_0801A084: .4byte gUnknown_2023FE8 +_0801A07C: .4byte gBattleMons +_0801A080: .4byte gCurrentMove +_0801A084: .4byte gBattleStruct _0801A088: - ldr r1, _0801A0D0 @ =gUnknown_8250C04 + ldr r1, _0801A0D0 @ =gBattleMoves lsls r0, r4, 1 adds r0, r4 lsls r0, 2 adds r0, r1 ldrb r5, [r0, 0x2] _0801A094: - ldr r0, _0801A0D4 @ =gUnknown_2022B4C + ldr r0, _0801A0D4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0xA0 lsls r1, 8 @@ -6337,8 +6337,8 @@ _0801A0C4: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801A0D0: .4byte gUnknown_8250C04 -_0801A0D4: .4byte gUnknown_2022B4C +_0801A0D0: .4byte gBattleMoves +_0801A0D4: .4byte gBattleTypeFlags _0801A0D8: .4byte _0801A0DC .align 2, 0 _0801A0DC: @@ -6363,7 +6363,7 @@ _0801A0DC: .4byte _0801BB78 .4byte _0801B8B4 _0801A12C: - ldr r2, _0801A160 @ =gUnknown_2023D6B + ldr r2, _0801A160 @ =sBattler_AI ldr r0, _0801A164 @ =gUnknown_2023BCC ldrb r1, [r2] adds r3, r0, 0 @@ -6393,7 +6393,7 @@ _0801A152: _0801A15C: bl _0801BBAA .align 2, 0 -_0801A160: .4byte gUnknown_2023D6B +_0801A160: .4byte sBattler_AI _0801A164: .4byte gUnknown_2023BCC _0801A168: cmp r0, 0x16 @@ -6453,7 +6453,7 @@ _0801A1B8: .4byte _0801A22C .4byte _0801A1E4 _0801A1E4: - ldr r2, _0801A200 @ =gUnknown_2023F1C + ldr r2, _0801A200 @ =gBattleWeather ldrh r1, [r2] movs r0, 0x7 ands r0, r1 @@ -6461,17 +6461,17 @@ _0801A1E4: bne _0801A250 movs r0, 0x5 strh r0, [r2] - ldr r1, _0801A204 @ =gUnknown_2023FC4 + ldr r1, _0801A204 @ =gBattleScripting movs r0, 0xA strb r0, [r1, 0x10] mov r2, r10 strb r2, [r1, 0x17] b _0801A246 .align 2, 0 -_0801A200: .4byte gUnknown_2023F1C -_0801A204: .4byte gUnknown_2023FC4 +_0801A200: .4byte gBattleWeather +_0801A204: .4byte gBattleScripting _0801A208: - ldr r3, _0801A224 @ =gUnknown_2023F1C + ldr r3, _0801A224 @ =gBattleWeather ldrh r1, [r3] movs r2, 0x18 adds r0, r2, 0 @@ -6479,17 +6479,17 @@ _0801A208: cmp r0, 0 bne _0801A250 strh r2, [r3] - ldr r1, _0801A228 @ =gUnknown_2023FC4 + ldr r1, _0801A228 @ =gBattleScripting movs r0, 0xC strb r0, [r1, 0x10] mov r3, r10 strb r3, [r1, 0x17] b _0801A246 .align 2, 0 -_0801A224: .4byte gUnknown_2023F1C -_0801A228: .4byte gUnknown_2023FC4 +_0801A224: .4byte gBattleWeather +_0801A228: .4byte gBattleScripting _0801A22C: - ldr r3, _0801A26C @ =gUnknown_2023F1C + ldr r3, _0801A26C @ =gBattleWeather ldrh r1, [r3] movs r2, 0x60 adds r0, r2, 0 @@ -6497,7 +6497,7 @@ _0801A22C: cmp r0, 0 bne _0801A250 strh r2, [r3] - ldr r1, _0801A270 @ =gUnknown_2023FC4 + ldr r1, _0801A270 @ =gBattleScripting movs r0, 0xB strb r0, [r1, 0x10] mov r4, r10 @@ -6521,12 +6521,12 @@ _0801A25A: bl BattleScriptPushCursorAndCallback bl _0801BBAA .align 2, 0 -_0801A26C: .4byte gUnknown_2023F1C -_0801A270: .4byte gUnknown_2023FC4 +_0801A26C: .4byte gBattleWeather +_0801A270: .4byte gBattleScripting _0801A274: .4byte gUnknown_2023E82 _0801A278: .4byte gUnknown_81D8B1F _0801A27C: - ldr r2, _0801A2A0 @ =gUnknown_2023F1C + ldr r2, _0801A2A0 @ =gBattleWeather ldrh r1, [r2] movs r0, 0x4 ands r0, r1 @@ -6538,16 +6538,16 @@ _0801A28C: strh r0, [r2] ldr r0, _0801A2A4 @ =gUnknown_81D927F bl BattleScriptPushCursorAndCallback - ldr r0, _0801A2A8 @ =gUnknown_2023FC4 + ldr r0, _0801A2A8 @ =gBattleScripting mov r1, r10 strb r1, [r0, 0x17] bl _0801BB5A .align 2, 0 -_0801A2A0: .4byte gUnknown_2023F1C +_0801A2A0: .4byte gBattleWeather _0801A2A4: .4byte gUnknown_81D927F -_0801A2A8: .4byte gUnknown_2023FC4 +_0801A2A8: .4byte gBattleScripting _0801A2AC: - ldr r2, _0801A2D0 @ =gUnknown_2023F1C + ldr r2, _0801A2D0 @ =gBattleWeather ldrh r1, [r2] movs r0, 0x10 ands r0, r1 @@ -6559,16 +6559,16 @@ _0801A2BC: strh r0, [r2] ldr r0, _0801A2D4 @ =gUnknown_81D92BF bl BattleScriptPushCursorAndCallback - ldr r0, _0801A2D8 @ =gUnknown_2023FC4 + ldr r0, _0801A2D8 @ =gBattleScripting mov r2, r10 strb r2, [r0, 0x17] bl _0801BB5A .align 2, 0 -_0801A2D0: .4byte gUnknown_2023F1C +_0801A2D0: .4byte gBattleWeather _0801A2D4: .4byte gUnknown_81D92BF -_0801A2D8: .4byte gUnknown_2023FC4 +_0801A2D8: .4byte gBattleScripting _0801A2DC: - ldr r2, _0801A300 @ =gUnknown_2023F1C + ldr r2, _0801A300 @ =gBattleWeather ldrh r1, [r2] movs r0, 0x40 ands r0, r1 @@ -6580,14 +6580,14 @@ _0801A2EC: strh r0, [r2] ldr r0, _0801A304 @ =gUnknown_81D9379 bl BattleScriptPushCursorAndCallback - ldr r0, _0801A308 @ =gUnknown_2023FC4 + ldr r0, _0801A308 @ =gBattleScripting mov r3, r10 strb r3, [r0, 0x17] bl _0801BB5A .align 2, 0 -_0801A300: .4byte gUnknown_2023F1C +_0801A300: .4byte gBattleWeather _0801A304: .4byte gUnknown_81D9379 -_0801A308: .4byte gUnknown_2023FC4 +_0801A308: .4byte gBattleScripting _0801A30C: ldr r0, _0801A338 @ =gUnknown_2023ECC mov r4, r10 @@ -6601,7 +6601,7 @@ _0801A30C: bge _0801A324 bl _0801BBAA _0801A324: - ldr r1, _0801A33C @ =gUnknown_2023DFC + ldr r1, _0801A33C @ =gStatuses3 adds r1, r2, r1 ldr r0, [r1] movs r2, 0x80 @@ -6613,7 +6613,7 @@ _0801A324: b _0801A396 .align 2, 0 _0801A338: .4byte gUnknown_2023ECC -_0801A33C: .4byte gUnknown_2023DFC +_0801A33C: .4byte gStatuses3 _0801A340: mov r0, r10 bl sub_8019DAC @@ -6626,13 +6626,13 @@ _0801A340: _0801A354: ldr r0, _0801A364 @ =gUnknown_81D92F8 bl BattleScriptPushCursorAndCallback - ldr r0, _0801A368 @ =gUnknown_2023FC4 + ldr r0, _0801A368 @ =gBattleScripting mov r1, r10 strb r1, [r0, 0x17] bl _0801BA6A .align 2, 0 _0801A364: .4byte gUnknown_81D92F8 -_0801A368: .4byte gUnknown_2023FC4 +_0801A368: .4byte gBattleScripting _0801A36C: ldr r0, _0801A3A0 @ =gUnknown_2023ECC mov r3, r10 @@ -6646,7 +6646,7 @@ _0801A36C: bge _0801A384 bl _0801BBAA _0801A384: - ldr r1, _0801A3A4 @ =gUnknown_2023DFC + ldr r1, _0801A3A4 @ =gStatuses3 adds r1, r2, r1 ldr r0, [r1] movs r2, 0x80 @@ -6661,7 +6661,7 @@ _0801A396: bl _0801BBAA .align 2, 0 _0801A3A0: .4byte gUnknown_2023ECC -_0801A3A4: .4byte gUnknown_2023DFC +_0801A3A4: .4byte gStatuses3 _0801A3A8: movs r4, 0 ldrb r3, [r3] @@ -6689,7 +6689,7 @@ _0801A3C8: .align 2, 0 _0801A3DC: .4byte gUnknown_2023BCC _0801A3E0: - ldr r7, _0801A410 @ =gUnknown_2023BE4 + ldr r7, _0801A410 @ =gBattleMons movs r0, 0x58 mov r6, r10 muls r6, r0 @@ -6699,7 +6699,7 @@ _0801A3E0: bne _0801A3F4 bl _0801BBAA _0801A3F4: - ldr r0, _0801A414 @ =gUnknown_2023D6B + ldr r0, _0801A414 @ =sBattler_AI mov r1, r10 strb r1, [r0] mov r2, r8 @@ -6714,8 +6714,8 @@ _0801A3F4: _0801A40C: bl _0801BBAA .align 2, 0 -_0801A410: .4byte gUnknown_2023BE4 -_0801A414: .4byte gUnknown_2023D6B +_0801A410: .4byte gBattleMons +_0801A414: .4byte sBattler_AI _0801A418: cmp r5, 0x36 bne _0801A41E @@ -6749,7 +6749,7 @@ _0801A442: beq _0801A45A bl _0801BBAA _0801A45A: - ldr r0, _0801A49C @ =gUnknown_2023F1C + ldr r0, _0801A49C @ =gBattleWeather ldrh r1, [r0] movs r0, 0x7 ands r0, r1 @@ -6767,7 +6767,7 @@ _0801A476: strb r5, [r0] ldr r0, _0801A4A0 @ =gUnknown_81D92AB bl BattleScriptPushCursorAndCallback - ldr r1, _0801A4A4 @ =gUnknown_2023D50 + ldr r1, _0801A4A4 @ =gBattleMoveDamage ldrh r0, [r4, 0x2C] lsrs r0, 4 str r0, [r1] @@ -6781,9 +6781,9 @@ _0801A490: str r0, [r1] bl _0801BB5A .align 2, 0 -_0801A49C: .4byte gUnknown_2023F1C +_0801A49C: .4byte gBattleWeather _0801A4A0: .4byte gUnknown_81D92AB -_0801A4A4: .4byte gUnknown_2023D50 +_0801A4A4: .4byte gBattleMoveDamage _0801A4A8: adds r0, r7, 0 adds r0, 0x4C @@ -6857,8 +6857,8 @@ _0801A52C: ldr r2, _0801A57C @ =0xf7ffffff ands r0, r2 str r0, [r1] - ldr r0, _0801A580 @ =gUnknown_2023FC4 - ldr r4, _0801A584 @ =gUnknown_2023BC4 + ldr r0, _0801A580 @ =gBattleScripting + ldr r4, _0801A584 @ =gActiveBattler mov r1, r10 strb r1, [r4] strb r1, [r0, 0x17] @@ -6881,8 +6881,8 @@ _0801A570: .4byte gUnknown_82500A4 _0801A574: .4byte gUnknown_82500AC _0801A578: .4byte gUnknown_82500B4 _0801A57C: .4byte 0xf7ffffff -_0801A580: .4byte gUnknown_2023FC4 -_0801A584: .4byte gUnknown_2023BC4 +_0801A580: .4byte gBattleScripting +_0801A584: .4byte gActiveBattler _0801A588: .4byte gUnknown_81D92D3 _0801A58C: ldrb r2, [r4, 0x1B] @@ -6892,7 +6892,7 @@ _0801A58C: ble _0801A59A bl _0801BBAA _0801A59A: - ldr r0, _0801A5CC @ =gUnknown_2023E0C + ldr r0, _0801A5CC @ =gDisableStructs mov r3, r10 lsls r1, r3, 3 subs r1, r3 @@ -6906,7 +6906,7 @@ _0801A5B0: adds r0, r2, 0x1 movs r1, 0 strb r0, [r4, 0x1B] - ldr r4, _0801A5D0 @ =gUnknown_2023FC4 + ldr r4, _0801A5D0 @ =gBattleScripting movs r0, 0x11 strb r0, [r4, 0x10] strb r1, [r4, 0x11] @@ -6916,11 +6916,11 @@ _0801A5B0: strb r0, [r4, 0x17] bl _0801BB5A .align 2, 0 -_0801A5CC: .4byte gUnknown_2023E0C -_0801A5D0: .4byte gUnknown_2023FC4 +_0801A5CC: .4byte gDisableStructs +_0801A5D0: .4byte gBattleScripting _0801A5D4: .4byte gUnknown_81D9293 _0801A5D8: - ldr r2, _0801A5FC @ =gUnknown_2023E0C + ldr r2, _0801A5FC @ =gDisableStructs ldrb r0, [r0] lsls r1, r0, 3 subs r1, r0 @@ -6938,7 +6938,7 @@ _0801A5D8: strb r0, [r1, 0x18] bl _0801BBAA .align 2, 0 -_0801A5FC: .4byte gUnknown_2023E0C +_0801A5FC: .4byte gDisableStructs _0801A600: mov r1, r8 ldrb r0, [r1] @@ -6977,8 +6977,8 @@ _0801A636: bne _0801A646 bl _0801BBAA _0801A646: - ldr r1, _0801A684 @ =gUnknown_2023BE4 - ldr r0, _0801A688 @ =gUnknown_2023D6B + ldr r1, _0801A684 @ =gBattleMons + ldr r0, _0801A688 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -7006,8 +7006,8 @@ _0801A66C: .align 2, 0 _0801A67C: .4byte gUnknown_8250104 _0801A680: .4byte 0x0000ffff -_0801A684: .4byte gUnknown_2023BE4 -_0801A688: .4byte gUnknown_2023D6B +_0801A684: .4byte gBattleMons +_0801A688: .4byte sBattler_AI _0801A68C: .4byte gUnknown_2023DD0 _0801A690: .4byte gUnknown_2023D74 _0801A694: .4byte gUnknown_81D946E @@ -7034,7 +7034,7 @@ _0801A6B8: beq _0801A6BE b _0801A832 _0801A6BE: - ldr r0, _0801A6E8 @ =gUnknown_8250C04 + ldr r0, _0801A6E8 @ =gBattleMoves lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -7045,7 +7045,7 @@ _0801A6BE: b _0801A832 _0801A6D0: ldr r1, _0801A6EC @ =gUnknown_2023E8C - ldr r0, _0801A6F0 @ =gUnknown_2023D6B + ldr r0, _0801A6F0 @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -7057,9 +7057,9 @@ _0801A6D0: ldr r0, _0801A6F8 @ =gUnknown_81D93BE b _0801A700 .align 2, 0 -_0801A6E8: .4byte gUnknown_8250C04 +_0801A6E8: .4byte gBattleMoves _0801A6EC: .4byte gUnknown_2023E8C -_0801A6F0: .4byte gUnknown_2023D6B +_0801A6F0: .4byte sBattler_AI _0801A6F4: .4byte gUnknown_2023D74 _0801A6F8: .4byte gUnknown_81D93BE _0801A6FC: @@ -7078,7 +7078,7 @@ _0801A710: beq _0801A716 b _0801A832 _0801A716: - ldr r0, _0801A740 @ =gUnknown_8250C04 + ldr r0, _0801A740 @ =gBattleMoves lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -7089,7 +7089,7 @@ _0801A716: b _0801A832 _0801A728: ldr r1, _0801A744 @ =gUnknown_2023E8C - ldr r0, _0801A748 @ =gUnknown_2023D6B + ldr r0, _0801A748 @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -7101,9 +7101,9 @@ _0801A728: ldr r0, _0801A750 @ =gUnknown_81D93BE b _0801A758 .align 2, 0 -_0801A740: .4byte gUnknown_8250C04 +_0801A740: .4byte gBattleMoves _0801A744: .4byte gUnknown_2023E8C -_0801A748: .4byte gUnknown_2023D6B +_0801A748: .4byte sBattler_AI _0801A74C: .4byte gUnknown_2023D74 _0801A750: .4byte gUnknown_81D93BE _0801A754: @@ -7119,7 +7119,7 @@ _0801A764: .4byte gUnknown_81D93BD _0801A768: cmp r5, 0xA bne _0801A832 - ldr r1, _0801A7B8 @ =gUnknown_2023BE4 + ldr r1, _0801A7B8 @ =gBattleMons movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -7131,7 +7131,7 @@ _0801A768: ands r0, r1 cmp r0, 0 bne _0801A832 - ldr r2, _0801A7BC @ =gUnknown_2023FF4 + ldr r2, _0801A7BC @ =gBattleResources ldr r0, [r2] ldr r0, [r0, 0x4] mov r3, r10 @@ -7146,7 +7146,7 @@ _0801A768: ldr r0, _0801A7C0 @ =gUnknown_2023E82 strb r3, [r0, 0x5] ldr r1, _0801A7C4 @ =gUnknown_2023E8C - ldr r0, _0801A7C8 @ =gUnknown_2023D6B + ldr r0, _0801A7C8 @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -7158,11 +7158,11 @@ _0801A768: ldr r0, _0801A7D0 @ =gUnknown_81D93F7 b _0801A7D8 .align 2, 0 -_0801A7B8: .4byte gUnknown_2023BE4 -_0801A7BC: .4byte gUnknown_2023FF4 +_0801A7B8: .4byte gBattleMons +_0801A7BC: .4byte gBattleResources _0801A7C0: .4byte gUnknown_2023E82 _0801A7C4: .4byte gUnknown_2023E8C -_0801A7C8: .4byte gUnknown_2023D6B +_0801A7C8: .4byte sBattler_AI _0801A7CC: .4byte gUnknown_2023D74 _0801A7D0: .4byte gUnknown_81D93F7 _0801A7D4: @@ -7187,7 +7187,7 @@ _0801A7F8: ldr r0, _0801A814 @ =gUnknown_2023E82 strb r4, [r0, 0x5] ldr r1, _0801A818 @ =gUnknown_2023E8C - ldr r0, _0801A81C @ =gUnknown_2023D6B + ldr r0, _0801A81C @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -7201,7 +7201,7 @@ _0801A7F8: .align 2, 0 _0801A814: .4byte gUnknown_2023E82 _0801A818: .4byte gUnknown_2023E8C -_0801A81C: .4byte gUnknown_2023D6B +_0801A81C: .4byte sBattler_AI _0801A820: .4byte gUnknown_2023D74 _0801A824: .4byte gUnknown_81D93F7 _0801A828: @@ -7218,7 +7218,7 @@ _0801A832: beq _0801A83C bl _0801BBAA _0801A83C: - ldr r1, _0801A874 @ =gUnknown_2023BE4 + ldr r1, _0801A874 @ =gBattleMons movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -7229,7 +7229,7 @@ _0801A83C: cmp r0, r3 bne _0801A898 ldr r1, _0801A878 @ =gUnknown_2023E8C - ldr r0, _0801A87C @ =gUnknown_2023D6B + ldr r0, _0801A87C @ =sBattler_AI ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -7244,9 +7244,9 @@ _0801A83C: .align 2, 0 _0801A86C: .4byte gUnknown_2023D74 _0801A870: .4byte gUnknown_81D93F6 -_0801A874: .4byte gUnknown_2023BE4 +_0801A874: .4byte gBattleMons _0801A878: .4byte gUnknown_2023E8C -_0801A87C: .4byte gUnknown_2023D6B +_0801A87C: .4byte sBattler_AI _0801A880: .4byte gUnknown_81D93E1 _0801A884: ldr r1, _0801A890 @ =gUnknown_2023D74 @@ -7257,7 +7257,7 @@ _0801A884: _0801A890: .4byte gUnknown_2023D74 _0801A894: .4byte gUnknown_81D93E0 _0801A898: - ldr r2, _0801A8B4 @ =gUnknown_2023D50 + ldr r2, _0801A8B4 @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] lsrs r0, 2 str r0, [r2] @@ -7271,7 +7271,7 @@ _0801A8A8: str r0, [r2] bl _0801BBAA .align 2, 0 -_0801A8B4: .4byte gUnknown_2023D50 +_0801A8B4: .4byte gBattleMoveDamage _0801A8B8: mov r1, r8 ldrb r0, [r1] @@ -7338,7 +7338,7 @@ _0801A8D4: .4byte _0801BBAA .4byte _0801AEA8 _0801A994: - ldr r0, _0801AA3C @ =gUnknown_2023DCC + ldr r0, _0801AA3C @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -7350,7 +7350,7 @@ _0801A9A4: bne _0801A9AC bl _0801BBAA _0801A9AC: - ldr r0, _0801AA40 @ =gUnknown_8250C04 + ldr r0, _0801AA40 @ =gBattleMoves lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -7361,7 +7361,7 @@ _0801A9AC: bl _0801BBAA _0801A9C0: ldr r2, _0801AA44 @ =gUnknown_2023ECC - ldr r0, _0801AA48 @ =gUnknown_2023D6C + ldr r0, _0801AA48 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -7380,7 +7380,7 @@ _0801A9C0: bne _0801A9E8 bl _0801BBAA _0801A9E8: - ldr r1, _0801AA4C @ =gUnknown_2023BE4 + ldr r1, _0801AA4C @ =gBattleMons movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -7421,16 +7421,16 @@ _0801AA1A: str r0, [r1] bl _0801BB5A .align 2, 0 -_0801AA3C: .4byte gUnknown_2023DCC -_0801AA40: .4byte gUnknown_8250C04 +_0801AA3C: .4byte gMoveResultFlags +_0801AA40: .4byte gBattleMoves _0801AA44: .4byte gUnknown_2023ECC -_0801AA48: .4byte gUnknown_2023D6C -_0801AA4C: .4byte gUnknown_2023BE4 +_0801AA48: .4byte gBattlerTarget +_0801AA4C: .4byte gBattleMons _0801AA50: .4byte gUnknown_2022AB8 _0801AA54: .4byte gUnknown_2023D74 _0801AA58: .4byte gUnknown_81D949C _0801AA5C: - ldr r0, _0801AAF4 @ =gUnknown_2023DCC + ldr r0, _0801AAF4 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -7438,8 +7438,8 @@ _0801AA5C: beq _0801AA6C bl _0801BBAA _0801AA6C: - ldr r1, _0801AAF8 @ =gUnknown_2023BE4 - ldr r0, _0801AAFC @ =gUnknown_2023D6B + ldr r1, _0801AAF8 @ =gBattleMons + ldr r0, _0801AAFC @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -7459,7 +7459,7 @@ _0801AA82: bl _0801BBAA _0801AA94: ldr r2, _0801AB04 @ =gUnknown_2023ECC - ldr r0, _0801AB08 @ =gUnknown_2023D6C + ldr r0, _0801AB08 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -7478,7 +7478,7 @@ _0801AA94: bne _0801AABC bl _0801BBAA _0801AABC: - ldr r1, _0801AB0C @ =gUnknown_8250C04 + ldr r1, _0801AB0C @ =gBattleMoves lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -7491,7 +7491,7 @@ _0801AABC: bne _0801AAD6 bl _0801BBAA _0801AAD6: - ldr r1, _0801AB10 @ =gUnknown_2023D50 + ldr r1, _0801AB10 @ =gBattleMoveDamage ldrh r0, [r3, 0x2C] lsrs r0, 4 str r0, [r1] @@ -7505,18 +7505,18 @@ _0801AAE4: str r0, [r1] bl _0801BB5A .align 2, 0 -_0801AAF4: .4byte gUnknown_2023DCC -_0801AAF8: .4byte gUnknown_2023BE4 -_0801AAFC: .4byte gUnknown_2023D6B +_0801AAF4: .4byte gMoveResultFlags +_0801AAF8: .4byte gBattleMons +_0801AAFC: .4byte sBattler_AI _0801AB00: .4byte gUnknown_2023E8C _0801AB04: .4byte gUnknown_2023ECC -_0801AB08: .4byte gUnknown_2023D6C -_0801AB0C: .4byte gUnknown_8250C04 -_0801AB10: .4byte gUnknown_2023D50 +_0801AB08: .4byte gBattlerTarget +_0801AB0C: .4byte gBattleMoves +_0801AB10: .4byte gBattleMoveDamage _0801AB14: .4byte gUnknown_2023D74 _0801AB18: .4byte gUnknown_81D94A3 _0801AB1C: - ldr r0, _0801ABE8 @ =gUnknown_2023DCC + ldr r0, _0801ABE8 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -7524,8 +7524,8 @@ _0801AB1C: beq _0801AB2C bl _0801BBAA _0801AB2C: - ldr r1, _0801ABEC @ =gUnknown_2023BE4 - ldr r0, _0801ABF0 @ =gUnknown_2023D6B + ldr r1, _0801ABEC @ =gBattleMons + ldr r0, _0801ABF0 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -7545,7 +7545,7 @@ _0801AB42: bl _0801BBAA _0801AB54: ldr r2, _0801ABF8 @ =gUnknown_2023ECC - ldr r0, _0801ABFC @ =gUnknown_2023D6C + ldr r0, _0801ABFC @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -7564,7 +7564,7 @@ _0801AB54: bne _0801AB7C bl _0801BBAA _0801AB7C: - ldr r1, _0801AC00 @ =gUnknown_8250C04 + ldr r1, _0801AC00 @ =gBattleMoves lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -7616,19 +7616,19 @@ _0801ABC8: str r0, [r2] bl _0801BB5A .align 2, 0 -_0801ABE8: .4byte gUnknown_2023DCC -_0801ABEC: .4byte gUnknown_2023BE4 -_0801ABF0: .4byte gUnknown_2023D6B +_0801ABE8: .4byte gMoveResultFlags +_0801ABEC: .4byte gBattleMons +_0801ABF0: .4byte sBattler_AI _0801ABF4: .4byte gUnknown_2023E8C _0801ABF8: .4byte gUnknown_2023ECC -_0801ABFC: .4byte gUnknown_2023D6C -_0801AC00: .4byte gUnknown_8250C04 +_0801ABFC: .4byte gBattlerTarget +_0801AC00: .4byte gBattleMoves _0801AC04: .4byte gUnknown_2023E82 _0801AC08: .4byte gUnknown_2023D74 _0801AC0C: .4byte gUnknown_81D94CB _0801AC10: .4byte gUnknown_2023DD0 _0801AC14: - ldr r0, _0801ACC4 @ =gUnknown_2023DCC + ldr r0, _0801ACC4 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -7636,8 +7636,8 @@ _0801AC14: beq _0801AC24 bl _0801BBAA _0801AC24: - ldr r1, _0801ACC8 @ =gUnknown_2023BE4 - ldr r0, _0801ACCC @ =gUnknown_2023D6B + ldr r1, _0801ACC8 @ =gBattleMons + ldr r0, _0801ACCC @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -7657,7 +7657,7 @@ _0801AC3A: bl _0801BBAA _0801AC4C: ldr r2, _0801ACD4 @ =gUnknown_2023ECC - ldr r0, _0801ACD8 @ =gUnknown_2023D6C + ldr r0, _0801ACD8 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -7676,7 +7676,7 @@ _0801AC4C: bne _0801AC74 bl _0801BBAA _0801AC74: - ldr r1, _0801ACDC @ =gUnknown_8250C04 + ldr r1, _0801ACDC @ =gBattleMoves lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -7713,19 +7713,19 @@ _0801ACA4: str r0, [r2] bl _0801BB5A .align 2, 0 -_0801ACC4: .4byte gUnknown_2023DCC -_0801ACC8: .4byte gUnknown_2023BE4 -_0801ACCC: .4byte gUnknown_2023D6B +_0801ACC4: .4byte gMoveResultFlags +_0801ACC8: .4byte gBattleMons +_0801ACCC: .4byte sBattler_AI _0801ACD0: .4byte gUnknown_2023E8C _0801ACD4: .4byte gUnknown_2023ECC -_0801ACD8: .4byte gUnknown_2023D6C -_0801ACDC: .4byte gUnknown_8250C04 +_0801ACD8: .4byte gBattlerTarget +_0801ACDC: .4byte gBattleMoves _0801ACE0: .4byte gUnknown_2023E82 _0801ACE4: .4byte gUnknown_2023D74 _0801ACE8: .4byte gUnknown_81D94CB _0801ACEC: .4byte gUnknown_2023DD0 _0801ACF0: - ldr r0, _0801ADA0 @ =gUnknown_2023DCC + ldr r0, _0801ADA0 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -7733,8 +7733,8 @@ _0801ACF0: beq _0801AD00 bl _0801BBAA _0801AD00: - ldr r1, _0801ADA4 @ =gUnknown_2023BE4 - ldr r0, _0801ADA8 @ =gUnknown_2023D6B + ldr r1, _0801ADA4 @ =gBattleMons + ldr r0, _0801ADA8 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -7754,7 +7754,7 @@ _0801AD16: bl _0801BBAA _0801AD28: ldr r2, _0801ADB0 @ =gUnknown_2023ECC - ldr r0, _0801ADB4 @ =gUnknown_2023D6C + ldr r0, _0801ADB4 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -7773,7 +7773,7 @@ _0801AD28: bne _0801AD50 bl _0801BBAA _0801AD50: - ldr r1, _0801ADB8 @ =gUnknown_8250C04 + ldr r1, _0801ADB8 @ =gBattleMoves lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -7810,19 +7810,19 @@ _0801AD80: str r0, [r2] bl _0801BB5A .align 2, 0 -_0801ADA0: .4byte gUnknown_2023DCC -_0801ADA4: .4byte gUnknown_2023BE4 -_0801ADA8: .4byte gUnknown_2023D6B +_0801ADA0: .4byte gMoveResultFlags +_0801ADA4: .4byte gBattleMons +_0801ADA8: .4byte sBattler_AI _0801ADAC: .4byte gUnknown_2023E8C _0801ADB0: .4byte gUnknown_2023ECC -_0801ADB4: .4byte gUnknown_2023D6C -_0801ADB8: .4byte gUnknown_8250C04 +_0801ADB4: .4byte gBattlerTarget +_0801ADB8: .4byte gBattleMoves _0801ADBC: .4byte gUnknown_2023E82 _0801ADC0: .4byte gUnknown_2023D74 _0801ADC4: .4byte gUnknown_81D94CB _0801ADC8: .4byte gUnknown_2023DD0 _0801ADCC: - ldr r0, _0801AE7C @ =gUnknown_2023DCC + ldr r0, _0801AE7C @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -7830,8 +7830,8 @@ _0801ADCC: beq _0801ADDC bl _0801BBAA _0801ADDC: - ldr r1, _0801AE80 @ =gUnknown_2023BE4 - ldr r0, _0801AE84 @ =gUnknown_2023D6B + ldr r1, _0801AE80 @ =gBattleMons + ldr r0, _0801AE84 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -7850,7 +7850,7 @@ _0801ADF2: beq _0801AE04 bl _0801BBAA _0801AE04: - ldr r1, _0801AE8C @ =gUnknown_8250C04 + ldr r1, _0801AE8C @ =gBattleMoves lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -7863,7 +7863,7 @@ _0801AE04: bl _0801BBAA _0801AE1C: ldr r2, _0801AE90 @ =gUnknown_2023ECC - ldr r0, _0801AE94 @ =gUnknown_2023D6C + ldr r0, _0801AE94 @ =gBattlerTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -7907,19 +7907,19 @@ _0801AE5C: str r0, [r2] bl _0801BB5A .align 2, 0 -_0801AE7C: .4byte gUnknown_2023DCC -_0801AE80: .4byte gUnknown_2023BE4 -_0801AE84: .4byte gUnknown_2023D6B +_0801AE7C: .4byte gMoveResultFlags +_0801AE80: .4byte gBattleMons +_0801AE84: .4byte sBattler_AI _0801AE88: .4byte gUnknown_2023E8C -_0801AE8C: .4byte gUnknown_8250C04 +_0801AE8C: .4byte gBattleMoves _0801AE90: .4byte gUnknown_2023ECC -_0801AE94: .4byte gUnknown_2023D6C +_0801AE94: .4byte gBattlerTarget _0801AE98: .4byte gUnknown_2023E82 _0801AE9C: .4byte gUnknown_2023D74 _0801AEA0: .4byte gUnknown_81D94CB _0801AEA4: .4byte gUnknown_2023DD0 _0801AEA8: - ldr r0, _0801AFE8 @ =gUnknown_2023DCC + ldr r0, _0801AFE8 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -7927,8 +7927,8 @@ _0801AEA8: beq _0801AEB8 bl _0801BBAA _0801AEB8: - ldr r5, _0801AFEC @ =gUnknown_2023BE4 - ldr r7, _0801AFF0 @ =gUnknown_2023D6B + ldr r5, _0801AFEC @ =gBattleMons + ldr r7, _0801AFF0 @ =sBattler_AI ldrb r1, [r7] movs r6, 0x58 adds r0, r1, 0 @@ -7948,7 +7948,7 @@ _0801AED0: beq _0801AEE2 bl _0801BBAA _0801AEE2: - ldr r1, _0801AFF8 @ =gUnknown_8250C04 + ldr r1, _0801AFF8 @ =gBattleMoves lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -7961,7 +7961,7 @@ _0801AEE2: bl _0801BBAA _0801AEFA: ldr r3, _0801AFFC @ =gUnknown_2023ECC - ldr r4, _0801B000 @ =gUnknown_2023D6C + ldr r4, _0801B000 @ =gBattlerTarget mov r8, r4 ldrb r1, [r4] lsls r0, r1, 2 @@ -8056,7 +8056,7 @@ _0801AFBE: adds r2, r0, 0 muls r2, r6 adds r2, r4 - ldr r1, _0801B004 @ =gUnknown_825E45C + ldr r1, _0801B004 @ =gBitTable mov r3, r8 ldrb r0, [r3] lsls r0, 2 @@ -8072,14 +8072,14 @@ _0801AFBE: str r0, [r1] bl _0801BB5A .align 2, 0 -_0801AFE8: .4byte gUnknown_2023DCC -_0801AFEC: .4byte gUnknown_2023BE4 -_0801AFF0: .4byte gUnknown_2023D6B +_0801AFE8: .4byte gMoveResultFlags +_0801AFEC: .4byte gBattleMons +_0801AFF0: .4byte sBattler_AI _0801AFF4: .4byte gUnknown_2023E8C -_0801AFF8: .4byte gUnknown_8250C04 +_0801AFF8: .4byte gBattleMoves _0801AFFC: .4byte gUnknown_2023ECC -_0801B000: .4byte gUnknown_2023D6C -_0801B004: .4byte gUnknown_825E45C +_0801B000: .4byte gBattlerTarget +_0801B004: .4byte gBitTable _0801B008: .4byte gUnknown_2023D74 _0801B00C: .4byte gUnknown_81D94BE _0801B010: @@ -8091,7 +8091,7 @@ _0801B010: bcc _0801B020 bl _0801BBAA _0801B020: - ldr r1, _0801B048 @ =gUnknown_2023BE4 + ldr r1, _0801B048 @ =gBattleMons movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -8112,7 +8112,7 @@ _0801B03A: mov pc, r0 .align 2, 0 _0801B044: .4byte gUnknown_2023BCC -_0801B048: .4byte gUnknown_2023BE4 +_0801B048: .4byte gBattleMons _0801B04C: .4byte _0801B050 .align 2, 0 _0801B050: @@ -8361,7 +8361,7 @@ _0801B2BC: beq _0801B2F0 b _0801B304 _0801B2C4: - ldr r1, _0801B2D4 @ =gUnknown_2023BE4 + ldr r1, _0801B2D4 @ =gBattleMons movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -8370,9 +8370,9 @@ _0801B2C4: movs r0, 0 b _0801B302 .align 2, 0 -_0801B2D4: .4byte gUnknown_2023BE4 +_0801B2D4: .4byte gBattleMons _0801B2D8: - ldr r1, _0801B2EC @ =gUnknown_2023BE4 + ldr r1, _0801B2EC @ =gBattleMons movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -8383,9 +8383,9 @@ _0801B2D8: negs r1, r1 b _0801B300 .align 2, 0 -_0801B2EC: .4byte gUnknown_2023BE4 +_0801B2EC: .4byte gBattleMons _0801B2F0: - ldr r1, _0801B33C @ =gUnknown_2023BE4 + ldr r1, _0801B33C @ =gBattleMons movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -8402,10 +8402,10 @@ _0801B304: ldr r1, _0801B344 @ =gUnknown_2023D74 ldr r0, _0801B348 @ =gUnknown_81D94D1 str r0, [r1] - ldr r0, _0801B34C @ =gUnknown_2023FC4 + ldr r0, _0801B34C @ =gBattleScripting mov r1, r10 strb r1, [r0, 0x17] - ldr r4, _0801B350 @ =gUnknown_2023BC4 + ldr r4, _0801B350 @ =gActiveBattler strb r1, [r4] ldrb r1, [r4] movs r0, 0x58 @@ -8422,12 +8422,12 @@ _0801B304: bl MarkBufferBankForExecution bl _0801BBC6 .align 2, 0 -_0801B33C: .4byte gUnknown_2023BE4 +_0801B33C: .4byte gBattleMons _0801B340: .4byte 0xfff0ffff _0801B344: .4byte gUnknown_2023D74 _0801B348: .4byte gUnknown_81D94D1 -_0801B34C: .4byte gUnknown_2023FC4 -_0801B350: .4byte gUnknown_2023BC4 +_0801B34C: .4byte gBattleScripting +_0801B350: .4byte gActiveBattler _0801B354: .4byte gUnknown_2023C30 _0801B358: mov r0, r10 @@ -8453,7 +8453,7 @@ _0801B374: bcc _0801B384 bl _0801BBAA _0801B384: - ldr r4, _0801B3C4 @ =gUnknown_2023BE4 + ldr r4, _0801B3C4 @ =gBattleMons _0801B386: movs r0, 0x58 mov r3, r10 @@ -8485,7 +8485,7 @@ _0801B3AA: bl _0801BBAA .align 2, 0 _0801B3C0: .4byte gUnknown_2023BCC -_0801B3C4: .4byte gUnknown_2023BE4 +_0801B3C4: .4byte gBattleMons _0801B3C8: mov r4, r8 ldrb r0, [r4] @@ -8526,8 +8526,8 @@ _0801B408: ldrb r0, [r0] adds r0, 0x40 strb r0, [r1, 0x3] - ldr r1, _0801B440 @ =gUnknown_2023FC4 - ldr r0, _0801B444 @ =gUnknown_2023D6C + ldr r1, _0801B440 @ =gBattleScripting + ldr r0, _0801B444 @ =gBattlerTarget ldrb r0, [r0] strb r0, [r1, 0x17] bl BattleScriptPushCursor @@ -8544,8 +8544,8 @@ _0801B408: _0801B434: .4byte gUnknown_2023DD0 _0801B438: .4byte 0xffffbfff _0801B43C: .4byte gUnknown_2023E82 -_0801B440: .4byte gUnknown_2023FC4 -_0801B444: .4byte gUnknown_2023D6C +_0801B440: .4byte gBattleScripting +_0801B444: .4byte gBattlerTarget _0801B448: .4byte gUnknown_2023D74 _0801B44C: .4byte gUnknown_81D94CE _0801B450: @@ -8588,8 +8588,8 @@ _0801B48E: adds r0, 0xB4 ldrb r0, [r0] strb r0, [r1, 0x3] - ldr r1, _0801B4C4 @ =gUnknown_2023FC4 - ldr r0, _0801B4C8 @ =gUnknown_2023D6B + ldr r1, _0801B4C4 @ =gBattleScripting + ldr r0, _0801B4C8 @ =sBattler_AI ldrb r0, [r0] strb r0, [r1, 0x17] bl BattleScriptPushCursor @@ -8606,8 +8606,8 @@ _0801B48E: _0801B4B8: .4byte gUnknown_2023DD0 _0801B4BC: .4byte 0xffffbfff _0801B4C0: .4byte gUnknown_2023E82 -_0801B4C4: .4byte gUnknown_2023FC4 -_0801B4C8: .4byte gUnknown_2023D6B +_0801B4C4: .4byte gBattleScripting +_0801B4C8: .4byte sBattler_AI _0801B4CC: .4byte gUnknown_2023D74 _0801B4D0: .4byte gUnknown_81D94CE _0801B4D4: @@ -8618,9 +8618,9 @@ _0801B4D4: blt _0801B4E0 b _0801BBAA _0801B4E0: - ldr r0, _0801B510 @ =gUnknown_2023BE4 + ldr r0, _0801B510 @ =gBattleMons adds r4, r1, 0 - ldr r2, _0801B514 @ =gUnknown_2023DFC + ldr r2, _0801B514 @ =gStatuses3 adds r3, r0, 0 adds r3, 0x20 movs r6, 0x80 @@ -8643,8 +8643,8 @@ _0801B4FE: b _0801BBAA .align 2, 0 _0801B50C: .4byte gUnknown_2023BCC -_0801B510: .4byte gUnknown_2023BE4 -_0801B514: .4byte gUnknown_2023DFC +_0801B510: .4byte gBattleMons +_0801B514: .4byte gStatuses3 _0801B518: movs r5, 0 ldr r0, _0801B5F4 @ =gUnknown_2023BCC @@ -8653,9 +8653,9 @@ _0801B518: blt _0801B524 b _0801BBAA _0801B524: - ldr r2, _0801B5F8 @ =gUnknown_2023BC4 + ldr r2, _0801B5F8 @ =gActiveBattler mov r8, r2 - ldr r3, _0801B5FC @ =gUnknown_2023BE4 + ldr r3, _0801B5FC @ =gBattleMons adds r3, 0x20 str r3, [sp, 0x1C] movs r4, 0 @@ -8667,7 +8667,7 @@ _0801B532: beq _0801B53C b _0801B6D6 _0801B53C: - ldr r0, _0801B600 @ =gUnknown_2023DFC + ldr r0, _0801B600 @ =gStatuses3 ldr r2, [sp, 0x20] adds r0, r2, r0 ldr r1, [r0] @@ -8694,7 +8694,7 @@ _0801B552: bl GetBankByIdentity lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0801B604 @ =gUnknown_2022B4C + ldr r0, _0801B604 @ =gBattleTypeFlags ldr r0, [r0] movs r2, 0x1 ands r0, r2 @@ -8705,7 +8705,7 @@ _0801B584: movs r3, 0x58 adds r0, r4, 0 muls r0, r3 - ldr r3, _0801B5FC @ =gUnknown_2023BE4 + ldr r3, _0801B5FC @ =gBattleMons adds r1, r0, r3 adds r0, r1, 0 adds r0, 0x20 @@ -8741,7 +8741,7 @@ _0801B584: ldrb r0, [r2] movs r3, 0x58 muls r0, r3 - ldr r4, _0801B5FC @ =gUnknown_2023BE4 + ldr r4, _0801B5FC @ =gBattleMons adds r0, r4 adds r0, 0x20 ldrb r0, [r0] @@ -8757,13 +8757,13 @@ _0801B584: b _0801B6C4 .align 2, 0 _0801B5F4: .4byte gUnknown_2023BCC -_0801B5F8: .4byte gUnknown_2023BC4 -_0801B5FC: .4byte gUnknown_2023BE4 -_0801B600: .4byte gUnknown_2023DFC -_0801B604: .4byte gUnknown_2022B4C +_0801B5F8: .4byte gActiveBattler +_0801B5FC: .4byte gBattleMons +_0801B600: .4byte gStatuses3 +_0801B604: .4byte gBattleTypeFlags _0801B608: .4byte gUnknown_2023D6A _0801B60C: - ldr r3, _0801B650 @ =gUnknown_2023BE4 + ldr r3, _0801B650 @ =gBattleMons movs r2, 0x58 adds r0, r4, 0 muls r0, r2 @@ -8798,10 +8798,10 @@ _0801B60C: strb r0, [r2] b _0801B6C4 .align 2, 0 -_0801B650: .4byte gUnknown_2023BE4 +_0801B650: .4byte gBattleMons _0801B654: .4byte gUnknown_2023D6A _0801B658: - ldr r3, _0801B698 @ =gUnknown_2023BE4 + ldr r3, _0801B698 @ =gBattleMons movs r2, 0x58 adds r0, r7, 0 muls r0, r2 @@ -8833,14 +8833,14 @@ _0801B658: ldrb r0, [r0] b _0801B6C0 .align 2, 0 -_0801B698: .4byte gUnknown_2023BE4 +_0801B698: .4byte gBattleMons _0801B69C: mov r2, r8 strb r4, [r2] movs r3, 0x58 adds r0, r4, 0 muls r0, r3 - ldr r4, _0801B6F0 @ =gUnknown_2023BE4 + ldr r4, _0801B6F0 @ =gBattleMons adds r0, r4 adds r2, r0, 0 adds r2, 0x20 @@ -8883,7 +8883,7 @@ _0801B6D6: _0801B6EE: b _0801BBAA .align 2, 0 -_0801B6F0: .4byte gUnknown_2023BE4 +_0801B6F0: .4byte gBattleMons _0801B6F4: .4byte gUnknown_2023D6A _0801B6F8: .4byte gUnknown_2023BCC _0801B6FC: @@ -8894,9 +8894,9 @@ _0801B6FC: blt _0801B708 b _0801BBAA _0801B708: - ldr r0, _0801B738 @ =gUnknown_2023BE4 + ldr r0, _0801B738 @ =gBattleMons adds r4, r1, 0 - ldr r2, _0801B73C @ =gUnknown_2023DFC + ldr r2, _0801B73C @ =gStatuses3 adds r3, r0, 0 adds r3, 0x20 movs r6, 0x80 @@ -8919,8 +8919,8 @@ _0801B726: b _0801BBAA .align 2, 0 _0801B734: .4byte gUnknown_2023BCC -_0801B738: .4byte gUnknown_2023BE4 -_0801B73C: .4byte gUnknown_2023DFC +_0801B738: .4byte gBattleMons +_0801B73C: .4byte gStatuses3 _0801B740: mov r0, r10 bl GetBankSide @@ -8933,7 +8933,7 @@ _0801B740: blt _0801B756 b _0801BBAA _0801B756: - ldr r0, _0801B794 @ =gUnknown_2023BE4 + ldr r0, _0801B794 @ =gBattleMons mov r8, r0 _0801B75A: lsls r0, r5, 24 @@ -8965,7 +8965,7 @@ _0801B784: b _0801BBAA .align 2, 0 _0801B790: .4byte gUnknown_2023BCC -_0801B794: .4byte gUnknown_2023BE4 +_0801B794: .4byte gBattleMons _0801B798: .4byte gUnknown_2023D6A _0801B79C: mov r0, r10 @@ -8979,7 +8979,7 @@ _0801B79C: blt _0801B7B2 b _0801BBAA _0801B7B2: - ldr r1, _0801B7F0 @ =gUnknown_2023BE4 + ldr r1, _0801B7F0 @ =gBattleMons mov r8, r1 _0801B7B6: lsls r0, r5, 24 @@ -9011,7 +9011,7 @@ _0801B7E0: b _0801BBAA .align 2, 0 _0801B7EC: .4byte gUnknown_2023BCC -_0801B7F0: .4byte gUnknown_2023BE4 +_0801B7F0: .4byte gBattleMons _0801B7F4: .4byte gUnknown_2023D6A _0801B7F8: mov r2, r8 @@ -9028,11 +9028,11 @@ _0801B7F8: blt _0801B812 b _0801BBAA _0801B812: - ldr r2, _0801B81C @ =gUnknown_2023BE4 + ldr r2, _0801B81C @ =gBattleMons b _0801B890 .align 2, 0 _0801B818: .4byte gUnknown_2023BCC -_0801B81C: .4byte gUnknown_2023BE4 +_0801B81C: .4byte gBattleMons _0801B820: movs r5, 0 ldr r0, _0801B850 @ =gUnknown_2023BCC @@ -9041,7 +9041,7 @@ _0801B820: blt _0801B82C b _0801BBAA _0801B82C: - ldr r3, _0801B854 @ =gUnknown_2023DFC + ldr r3, _0801B854 @ =gStatuses3 movs r2, 0x80 lsls r2, 9 adds r1, r0, 0 @@ -9063,7 +9063,7 @@ _0801B848: b _0801BBAA .align 2, 0 _0801B850: .4byte gUnknown_2023BCC -_0801B854: .4byte gUnknown_2023DFC +_0801B854: .4byte gStatuses3 _0801B858: movs r5, 0 ldr r0, _0801B888 @ =gUnknown_2023BCC @@ -9072,7 +9072,7 @@ _0801B858: blt _0801B864 b _0801BBAA _0801B864: - ldr r3, _0801B88C @ =gUnknown_2023DFC + ldr r3, _0801B88C @ =gStatuses3 movs r2, 0x80 lsls r2, 10 adds r1, r0, 0 @@ -9094,7 +9094,7 @@ _0801B880: b _0801BBAA .align 2, 0 _0801B888: .4byte gUnknown_2023BCC -_0801B88C: .4byte gUnknown_2023DFC +_0801B88C: .4byte gStatuses3 _0801B890: movs r0, 0x58 muls r0, r5 @@ -9123,7 +9123,7 @@ _0801B8B4: blt _0801B8C0 b _0801BBAA _0801B8C0: - ldr r6, _0801B8F4 @ =gUnknown_2023BE4 + ldr r6, _0801B8F4 @ =gBattleMons adds r2, r0, 0 movs r3, 0x58 _0801B8C6: @@ -9151,7 +9151,7 @@ _0801B8E8: b _0801BBAA .align 2, 0 _0801B8F0: .4byte gUnknown_2023BCC -_0801B8F4: .4byte gUnknown_2023BE4 +_0801B8F4: .4byte gBattleMons _0801B8F8: ldr r0, _0801B908 @ =gUnknown_2023D6A strb r7, [r0] @@ -9172,7 +9172,7 @@ _0801B90C: ldrb r0, [r0] cmp r5, r0 bge _0801B94A - ldr r4, _0801B9A0 @ =gUnknown_2023BE4 + ldr r4, _0801B9A0 @ =gBattleMons _0801B922: lsls r0, r5, 24 lsrs r0, 24 @@ -9207,7 +9207,7 @@ _0801B952: blt _0801B95E b _0801BBAA _0801B95E: - ldr r2, _0801B9A0 @ =gUnknown_2023BE4 + ldr r2, _0801B9A0 @ =gBattleMons mov r8, r2 _0801B962: movs r0, 0x58 @@ -9241,7 +9241,7 @@ _0801B990: b _0801BBAA .align 2, 0 _0801B99C: .4byte gUnknown_2023BCC -_0801B9A0: .4byte gUnknown_2023BE4 +_0801B9A0: .4byte gBattleMons _0801B9A4: .4byte gUnknown_2023D6A _0801B9A8: mov r0, r10 @@ -9255,7 +9255,7 @@ _0801B9A8: blt _0801B9BE b _0801BBAA _0801B9BE: - ldr r4, _0801B9FC @ =gUnknown_2023BE4 + ldr r4, _0801B9FC @ =gBattleMons _0801B9C0: lsls r0, r5, 24 lsrs r0, 24 @@ -9287,7 +9287,7 @@ _0801B9EC: b _0801BBAA .align 2, 0 _0801B9F8: .4byte gUnknown_2023BCC -_0801B9FC: .4byte gUnknown_2023BE4 +_0801B9FC: .4byte gBattleMons _0801BA00: .4byte gUnknown_2023D6A _0801BA04: mov r0, r10 @@ -9301,7 +9301,7 @@ _0801BA04: blt _0801BA1A b _0801BBAA _0801BA1A: - ldr r4, _0801BA58 @ =gUnknown_2023BE4 + ldr r4, _0801BA58 @ =gBattleMons _0801BA1C: lsls r0, r5, 24 lsrs r0, 24 @@ -9333,15 +9333,15 @@ _0801BA48: b _0801BBAA .align 2, 0 _0801BA54: .4byte gUnknown_2023BCC -_0801BA58: .4byte gUnknown_2023BE4 +_0801BA58: .4byte gBattleMons _0801BA5C: .4byte gUnknown_2023D6A _0801BA60: ldr r0, _0801BA78 @ =gUnknown_81D92F8 bl BattleScriptPushCursorAndCallback - ldr r0, _0801BA7C @ =gUnknown_2023FC4 + ldr r0, _0801BA7C @ =gBattleScripting strb r4, [r0, 0x17] _0801BA6A: - ldr r0, _0801BA80 @ =gUnknown_2023FE8 + ldr r0, _0801BA80 @ =gBattleStruct ldr r0, [r0] adds r0, 0x7F mov r1, r9 @@ -9350,15 +9350,15 @@ _0801BA6A: b _0801BBAA .align 2, 0 _0801BA78: .4byte gUnknown_81D92F8 -_0801BA7C: .4byte gUnknown_2023FC4 -_0801BA80: .4byte gUnknown_2023FE8 +_0801BA7C: .4byte gBattleScripting +_0801BA80: .4byte gBattleStruct _0801BA84: ldr r0, _0801BAA0 @ =gUnknown_81D92F8 bl BattleScriptPushCursorAndCallback - ldr r0, _0801BAA4 @ =gUnknown_2023FC4 + ldr r0, _0801BAA4 @ =gBattleScripting mov r3, r10 strb r3, [r0, 0x17] - ldr r0, _0801BAA8 @ =gUnknown_2023FE8 + ldr r0, _0801BAA8 @ =gBattleStruct ldr r0, [r0] adds r0, 0x7F mov r1, r9 @@ -9367,8 +9367,8 @@ _0801BA84: b _0801BBC6 .align 2, 0 _0801BAA0: .4byte gUnknown_81D92F8 -_0801BAA4: .4byte gUnknown_2023FC4 -_0801BAA8: .4byte gUnknown_2023FE8 +_0801BAA4: .4byte gBattleScripting +_0801BAA8: .4byte gBattleStruct _0801BAAC: mov r4, r8 strb r1, [r4] @@ -9385,24 +9385,24 @@ _0801BAC4: .4byte gUnknown_81D9307 _0801BAC8: ldr r0, _0801BB18 @ =gUnknown_81D92A1 bl BattleScriptPushCursorAndCallback - ldr r1, _0801BB1C @ =gUnknown_2023DFC + ldr r1, _0801BB1C @ =gStatuses3 ldr r0, [sp, 0x18] adds r1, r0, r1 ldr r0, [r1] ldr r2, _0801BB20 @ =0xffefffff ands r0, r2 str r0, [r1] - ldr r0, _0801BB24 @ =gUnknown_2023FC4 + ldr r0, _0801BB24 @ =gBattleScripting strb r5, [r0, 0x17] ldr r1, _0801BB28 @ =gUnknown_2022AB8 movs r4, 0xFD strb r4, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r2, _0801BB2C @ =gUnknown_2023BC4 + ldr r2, _0801BB2C @ =gActiveBattler ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, _0801BB30 @ =gUnknown_2023BCE + ldr r3, _0801BB30 @ =gBattlerPartyIndexes ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -9423,12 +9423,12 @@ _0801BAC8: b _0801BBAA .align 2, 0 _0801BB18: .4byte gUnknown_81D92A1 -_0801BB1C: .4byte gUnknown_2023DFC +_0801BB1C: .4byte gStatuses3 _0801BB20: .4byte 0xffefffff -_0801BB24: .4byte gUnknown_2023FC4 +_0801BB24: .4byte gBattleScripting _0801BB28: .4byte gUnknown_2022AB8 -_0801BB2C: .4byte gUnknown_2023BC4 -_0801BB30: .4byte gUnknown_2023BCE +_0801BB2C: .4byte gActiveBattler +_0801BB30: .4byte gBattlerPartyIndexes _0801BB34: .4byte gUnknown_2022AC8 _0801BB38: .4byte gUnknown_2023D6A _0801BB3C: @@ -9443,7 +9443,7 @@ _0801BB3C: ldr r0, _0801BB70 @ =gUnknown_81D9310 str r0, [r1] _0801BB52: - ldr r0, _0801BB74 @ =gUnknown_2023FE8 + ldr r0, _0801BB74 @ =gBattleStruct ldr r0, [r0] adds r0, 0xD8 strb r5, [r0] @@ -9458,14 +9458,14 @@ _0801BB5A: _0801BB68: .4byte 0xfff7ffff _0801BB6C: .4byte gUnknown_2023D74 _0801BB70: .4byte gUnknown_81D9310 -_0801BB74: .4byte gUnknown_2023FE8 +_0801BB74: .4byte gBattleStruct _0801BB78: movs r5, 0 ldr r0, _0801BBD8 @ =gUnknown_2023BCC ldrb r1, [r0] cmp r5, r1 bge _0801BBAA - ldr r0, _0801BBDC @ =gUnknown_2023BE4 + ldr r0, _0801BBDC @ =gBattleMons adds r2, r1, 0 adds r1, r0, 0 adds r1, 0x20 @@ -9514,7 +9514,7 @@ _0801BBC6: bx r1 .align 2, 0 _0801BBD8: .4byte gUnknown_2023BCC -_0801BBDC: .4byte gUnknown_2023BE4 +_0801BBDC: .4byte gBattleMons _0801BBE0: .4byte gUnknown_2023D6A thumb_func_end sub_8019F18 @@ -9522,7 +9522,7 @@ _0801BBE0: .4byte gUnknown_2023D6A BattleScriptExecute: @ 801BBE4 ldr r1, _0801BC10 @ =gUnknown_2023D74 str r0, [r1] - ldr r0, _0801BC14 @ =gUnknown_2023FF4 + ldr r0, _0801BC14 @ =gBattleResources ldr r0, [r0] ldr r2, [r0, 0xC] adds r3, r2, 0 @@ -9544,7 +9544,7 @@ BattleScriptExecute: @ 801BBE4 bx lr .align 2, 0 _0801BC10: .4byte gUnknown_2023D74 -_0801BC14: .4byte gUnknown_2023FF4 +_0801BC14: .4byte gBattleResources _0801BC18: .4byte gUnknown_3004F84 _0801BC1C: .4byte RunBattleScriptCommands_PopCallbacksStack _0801BC20: .4byte gUnknown_2023BE3 @@ -9557,7 +9557,7 @@ BattleScriptPushCursorAndCallback: @ 801BC24 bl BattleScriptPushCursor ldr r0, _0801BC58 @ =gUnknown_2023D74 str r4, [r0] - ldr r0, _0801BC5C @ =gUnknown_2023FF4 + ldr r0, _0801BC5C @ =gBattleResources ldr r0, [r0] ldr r2, [r0, 0xC] adds r3, r2, 0 @@ -9578,7 +9578,7 @@ BattleScriptPushCursorAndCallback: @ 801BC24 bx r0 .align 2, 0 _0801BC58: .4byte gUnknown_2023D74 -_0801BC5C: .4byte gUnknown_2023FF4 +_0801BC5C: .4byte gBattleResources _0801BC60: .4byte gUnknown_3004F84 _0801BC64: .4byte sub_8015C74 thumb_func_end BattleScriptPushCursorAndCallback @@ -9605,7 +9605,7 @@ sub_801BC68: @ 801BC68 add r0, sp, 0x4 strb r1, [r0] ldr r4, _0801BCB4 @ =gUnknown_2023D68 - ldr r1, _0801BCB8 @ =gUnknown_2023BE4 + ldr r1, _0801BCB8 @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r0, r1 @@ -9625,7 +9625,7 @@ sub_801BC68: @ 801BC68 b _0801BCD4 .align 2, 0 _0801BCB4: .4byte gUnknown_2023D68 -_0801BCB8: .4byte gUnknown_2023BE4 +_0801BCB8: .4byte gBattleMons _0801BCBC: .4byte gUnknown_2023F54 _0801BCC0: ldrh r0, [r4] @@ -9638,8 +9638,8 @@ _0801BCC0: lsrs r0, 24 _0801BCD4: mov r9, r0 - ldr r1, _0801BCFC @ =gUnknown_2023BE4 - ldr r0, _0801BD00 @ =gUnknown_2023D6B + ldr r1, _0801BCFC @ =gBattleMons + ldr r0, _0801BD00 @ =sBattler_AI ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -9658,8 +9658,8 @@ _0801BCD4: ldrb r0, [r0, 0x1A] b _0801BD1E .align 2, 0 -_0801BCFC: .4byte gUnknown_2023BE4 -_0801BD00: .4byte gUnknown_2023D6B +_0801BCFC: .4byte gBattleMons +_0801BD00: .4byte sBattler_AI _0801BD04: .4byte gUnknown_2023F54 _0801BD08: ldr r0, [sp, 0x14] @@ -9673,8 +9673,8 @@ _0801BD08: lsrs r0, 24 _0801BD1E: str r0, [sp, 0x10] - ldr r2, _0801BD54 @ =gUnknown_2023BE4 - ldr r0, _0801BD58 @ =gUnknown_2023D6C + ldr r2, _0801BD54 @ =gBattleMons + ldr r0, _0801BD58 @ =gBattlerTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -9698,8 +9698,8 @@ _0801BD48: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801BD54: .4byte gUnknown_2023BE4 -_0801BD58: .4byte gUnknown_2023D6C +_0801BD54: .4byte gBattleMons +_0801BD58: .4byte gBattlerTarget _0801BD5C: .4byte _0801BD60 .align 2, 0 _0801BD60: @@ -9715,16 +9715,16 @@ _0801BD74: beq _0801BD80 bl _0801CFA6 _0801BD80: - ldr r0, _0801BD90 @ =gUnknown_2023FE8 + ldr r0, _0801BD90 @ =gBattleStruct ldr r0, [r0] adds r0, 0x4A movs r1, 0x2 strb r1, [r0] bl _0801CFA6 .align 2, 0 -_0801BD90: .4byte gUnknown_2023FE8 +_0801BD90: .4byte gBattleStruct _0801BD94: - ldr r1, _0801BDEC @ =gUnknown_2023BE4 + ldr r1, _0801BDEC @ =gBattleMons mov r8, r1 movs r0, 0x58 adds r1, r7, 0 @@ -9756,26 +9756,26 @@ _0801BDB8: bne _0801BDD0 bl _0801CFA6 _0801BDD0: - ldr r0, _0801BDF0 @ =gUnknown_2023FC4 + ldr r0, _0801BDF0 @ =gBattleScripting strb r7, [r0, 0x17] ldr r0, _0801BDF4 @ =gUnknown_2023D6F strb r7, [r0] - ldr r1, _0801BDF8 @ =gUnknown_2023BC4 - ldr r0, _0801BDFC @ =gUnknown_2023D6B + ldr r1, _0801BDF8 @ =gActiveBattler + ldr r0, _0801BDFC @ =sBattler_AI strb r7, [r0] strb r7, [r1] ldr r0, _0801BE00 @ =gUnknown_81D95D9 bl BattleScriptExecute bl _0801CFA6 .align 2, 0 -_0801BDEC: .4byte gUnknown_2023BE4 -_0801BDF0: .4byte gUnknown_2023FC4 +_0801BDEC: .4byte gBattleMons +_0801BDF0: .4byte gBattleScripting _0801BDF4: .4byte gUnknown_2023D6F -_0801BDF8: .4byte gUnknown_2023BC4 -_0801BDFC: .4byte gUnknown_2023D6B +_0801BDF8: .4byte gActiveBattler +_0801BDFC: .4byte sBattler_AI _0801BE00: .4byte gUnknown_81D95D9 _0801BE04: - ldr r1, _0801BE2C @ =gUnknown_2023BE4 + ldr r1, _0801BE2C @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r0, r1 @@ -9796,7 +9796,7 @@ _0801BE22: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801BE2C: .4byte gUnknown_2023BE4 +_0801BE2C: .4byte gBattleMons _0801BE30: .4byte _0801BE34 .align 2, 0 _0801BE34: @@ -9859,7 +9859,7 @@ _0801BEF6: beq _0801BEFE bl _0801C952 _0801BEFE: - ldr r4, _0801BF24 @ =gUnknown_2023D50 + ldr r4, _0801BF24 @ =gBattleMoveDamage mov r3, r9 str r3, [r4] ldrh r3, [r2, 0x28] @@ -9878,7 +9878,7 @@ _0801BF14: bl BattleScriptExecute b _0801C27E .align 2, 0 -_0801BF24: .4byte gUnknown_2023D50 +_0801BF24: .4byte gBattleMoveDamage _0801BF28: .4byte gUnknown_81D95EF _0801BF2C: cmp r6, 0 @@ -9890,25 +9890,25 @@ _0801BF34: lsls r0, 24 cmp r0, 0 bne _0801BF58 - ldr r1, _0801BF50 @ =gUnknown_2023BCE + ldr r1, _0801BF50 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0801BF54 @ =gUnknown_2024284 + ldr r0, _0801BF54 @ =gPlayerParty b _0801BF66 .align 2, 0 -_0801BF50: .4byte gUnknown_2023BCE -_0801BF54: .4byte gUnknown_2024284 +_0801BF50: .4byte gBattlerPartyIndexes +_0801BF54: .4byte gPlayerParty _0801BF58: - ldr r1, _0801BFD4 @ =gUnknown_2023BCE + ldr r1, _0801BFD4 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0801BFD8 @ =gUnknown_202402C + ldr r0, _0801BFD8 @ =gEnemyParty _0801BF66: adds r4, r1, r0 movs r1, 0 @@ -9964,8 +9964,8 @@ _0801BFB2: strb r2, [r0] b _0801BFE0 .align 2, 0 -_0801BFD4: .4byte gUnknown_2023BCE -_0801BFD8: .4byte gUnknown_202402C +_0801BFD4: .4byte gBattlerPartyIndexes +_0801BFD8: .4byte gEnemyParty _0801BFDC: add r0, sp, 0x4 strb r1, [r0] @@ -9992,7 +9992,7 @@ _0801BFE0: movs r2, 0 movs r3, 0x1 bl EmitSetMonData - ldr r0, _0801C028 @ =gUnknown_2023BC4 + ldr r0, _0801C028 @ =gActiveBattler ldrb r0, [r0] bl MarkBufferBankForExecution movs r0, 0x3 @@ -10001,9 +10001,9 @@ _0801BFE0: .align 2, 0 _0801C020: .4byte gUnknown_2022AB8 _0801C024: .4byte gUnknown_81D960C -_0801C028: .4byte gUnknown_2023BC4 +_0801C028: .4byte gActiveBattler _0801C02C: - ldr r0, _0801C080 @ =gUnknown_2023BE4 + ldr r0, _0801C080 @ =gBattleMons movs r1, 0x58 muls r1, r7 adds r0, 0x18 @@ -10034,23 +10034,23 @@ _0801C04A: bne _0801C066 bl _0801CFA6 _0801C066: - ldr r0, _0801C084 @ =gUnknown_2023FC4 + ldr r0, _0801C084 @ =gBattleScripting strb r7, [r0, 0x17] ldr r0, _0801C088 @ =gUnknown_2023D6F strb r7, [r0] - ldr r1, _0801C08C @ =gUnknown_2023BC4 - ldr r0, _0801C090 @ =gUnknown_2023D6B + ldr r1, _0801C08C @ =gActiveBattler + ldr r0, _0801C090 @ =sBattler_AI strb r7, [r0] strb r7, [r1] ldr r0, _0801C094 @ =gUnknown_81D95D9 bl BattleScriptExecute bl _0801C952 .align 2, 0 -_0801C080: .4byte gUnknown_2023BE4 -_0801C084: .4byte gUnknown_2023FC4 +_0801C080: .4byte gBattleMons +_0801C084: .4byte gBattleScripting _0801C088: .4byte gUnknown_2023D6F -_0801C08C: .4byte gUnknown_2023BC4 -_0801C090: .4byte gUnknown_2023D6B +_0801C08C: .4byte gActiveBattler +_0801C090: .4byte sBattler_AI _0801C094: .4byte gUnknown_81D95D9 _0801C098: movs r0, 0x58 @@ -10067,7 +10067,7 @@ _0801C0AC: beq _0801C0B4 bl _0801C952 _0801C0B4: - ldr r3, _0801C0F0 @ =gUnknown_2023D50 + ldr r3, _0801C0F0 @ =gBattleMoveDamage ldrh r0, [r1, 0x2C] lsrs r0, 4 str r0, [r3] @@ -10097,7 +10097,7 @@ _0801C0D4: bl sub_80C7208 bl _0801C952 .align 2, 0 -_0801C0F0: .4byte gUnknown_2023D50 +_0801C0F0: .4byte gBattleMoveDamage _0801C0F4: .4byte gUnknown_81D961C _0801C0F8: movs r0, 0x58 @@ -10125,7 +10125,7 @@ _0801C11A: strb r6, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r5, _0801C174 @ =gUnknown_2023D50 + ldr r5, _0801C174 @ =gBattleMoveDamage ldrh r0, [r4, 0x2C] mov r1, r9 bl __divsi3 @@ -10162,7 +10162,7 @@ _0801C16C: b _0801C30C .align 2, 0 _0801C170: .4byte gUnknown_2022AB8 -_0801C174: .4byte gUnknown_2023D50 +_0801C174: .4byte gBattleMoveDamage _0801C178: movs r0, 0x58 adds r5, r7, 0 @@ -10189,7 +10189,7 @@ _0801C198: strb r6, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r4, _0801C1F0 @ =gUnknown_2023D50 + ldr r4, _0801C1F0 @ =gBattleMoveDamage ldrh r0, [r5, 0x2C] mov r1, r9 bl __divsi3 @@ -10225,7 +10225,7 @@ _0801C1EA: b _0801C3A0 .align 2, 0 _0801C1EC: .4byte gUnknown_2022AB8 -_0801C1F0: .4byte gUnknown_2023D50 +_0801C1F0: .4byte gBattleMoveDamage _0801C1F4: movs r0, 0x58 adds r3, r7, 0 @@ -10253,7 +10253,7 @@ _0801C212: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r4, _0801C270 @ =gUnknown_2023D50 + ldr r4, _0801C270 @ =gBattleMoveDamage ldrh r0, [r5, 0x2C] mov r1, r9 bl __divsi3 @@ -10290,7 +10290,7 @@ _0801C248: b _0801C27E .align 2, 0 _0801C26C: .4byte gUnknown_2022AB8 -_0801C270: .4byte gUnknown_2023D50 +_0801C270: .4byte gBattleMoveDamage _0801C274: .4byte gUnknown_81D964F _0801C278: ldr r0, _0801C284 @ =gUnknown_81D95EF @@ -10328,7 +10328,7 @@ _0801C2A6: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r4, _0801C304 @ =gUnknown_2023D50 + ldr r4, _0801C304 @ =gBattleMoveDamage ldrh r0, [r5, 0x2C] mov r1, r9 bl __divsi3 @@ -10366,7 +10366,7 @@ _0801C2F8: b _0801C312 .align 2, 0 _0801C300: .4byte gUnknown_2022AB8 -_0801C304: .4byte gUnknown_2023D50 +_0801C304: .4byte gBattleMoveDamage _0801C308: .4byte gUnknown_81D964F _0801C30C: ldr r0, _0801C318 @ =gUnknown_81D95EF @@ -10403,7 +10403,7 @@ _0801C338: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r4, _0801C398 @ =gUnknown_2023D50 + ldr r4, _0801C398 @ =gBattleMoveDamage ldrh r0, [r5, 0x2C] mov r1, r9 bl __divsi3 @@ -10441,7 +10441,7 @@ _0801C38A: b _0801C3A6 .align 2, 0 _0801C394: .4byte gUnknown_2022AB8 -_0801C398: .4byte gUnknown_2023D50 +_0801C398: .4byte gBattleMoveDamage _0801C39C: .4byte gUnknown_81D964F _0801C3A0: ldr r0, _0801C3AC @ =gUnknown_81D95EF @@ -10494,7 +10494,7 @@ _0801C3D8: strb r0, [r1, 0x4] ldr r0, _0801C410 @ =gUnknown_2023D6E strb r7, [r0] - ldr r1, _0801C414 @ =gUnknown_2023FC4 + ldr r1, _0801C414 @ =gBattleScripting movs r0, 0x11 strb r0, [r1, 0x1A] movs r0, 0xF @@ -10503,7 +10503,7 @@ _0801C3D8: _0801C408: .4byte gUnknown_2022AB8 _0801C40C: .4byte gUnknown_2022AC8 _0801C410: .4byte gUnknown_2023D6E -_0801C414: .4byte gUnknown_2023FC4 +_0801C414: .4byte gBattleScripting _0801C418: movs r0, 0x58 muls r0, r7 @@ -10538,7 +10538,7 @@ _0801C440: strb r0, [r1, 0x3] ldr r0, _0801C464 @ =gUnknown_2023D6E strb r7, [r0] - ldr r1, _0801C468 @ =gUnknown_2023FC4 + ldr r1, _0801C468 @ =gBattleScripting movs r0, 0x12 strb r0, [r1, 0x1A] movs r0, 0x10 @@ -10546,7 +10546,7 @@ _0801C440: .align 2, 0 _0801C460: .4byte gUnknown_2022AB8 _0801C464: .4byte gUnknown_2023D6E -_0801C468: .4byte gUnknown_2023FC4 +_0801C468: .4byte gBattleScripting _0801C46C: movs r0, 0x58 muls r0, r7 @@ -10581,7 +10581,7 @@ _0801C494: strb r0, [r1, 0x3] ldr r0, _0801C4B8 @ =gUnknown_2023D6E strb r7, [r0] - ldr r1, _0801C4BC @ =gUnknown_2023FC4 + ldr r1, _0801C4BC @ =gBattleScripting movs r0, 0x13 strb r0, [r1, 0x1A] movs r0, 0x11 @@ -10589,7 +10589,7 @@ _0801C494: .align 2, 0 _0801C4B4: .4byte gUnknown_2022AB8 _0801C4B8: .4byte gUnknown_2023D6E -_0801C4BC: .4byte gUnknown_2023FC4 +_0801C4BC: .4byte gBattleScripting _0801C4C0: movs r0, 0x58 muls r0, r7 @@ -10624,7 +10624,7 @@ _0801C4E8: strb r0, [r1, 0x3] ldr r0, _0801C51C @ =gUnknown_2023D6E strb r7, [r0] - ldr r1, _0801C520 @ =gUnknown_2023FC4 + ldr r1, _0801C520 @ =gBattleScripting movs r0, 0x14 strb r0, [r1, 0x1A] movs r0, 0x12 @@ -10639,7 +10639,7 @@ _0801C506: .align 2, 0 _0801C518: .4byte gUnknown_2022AB8 _0801C51C: .4byte gUnknown_2023D6E -_0801C520: .4byte gUnknown_2023FC4 +_0801C520: .4byte gBattleScripting _0801C524: .4byte gUnknown_81D9679 _0801C528: movs r0, 0x58 @@ -10674,7 +10674,7 @@ _0801C550: strb r0, [r1, 0x3] ldr r0, _0801C580 @ =gUnknown_2023D6E strb r7, [r0] - ldr r1, _0801C584 @ =gUnknown_2023FC4 + ldr r1, _0801C584 @ =gBattleScripting movs r0, 0x15 strb r0, [r1, 0x1A] movs r0, 0x13 @@ -10689,7 +10689,7 @@ _0801C56C: .align 2, 0 _0801C57C: .4byte gUnknown_2022AB8 _0801C580: .4byte gUnknown_2023D6E -_0801C584: .4byte gUnknown_2023FC4 +_0801C584: .4byte gBattleScripting _0801C588: .4byte gUnknown_81D9679 _0801C58C: movs r0, 0x58 @@ -10824,7 +10824,7 @@ _0801C638: strb r1, [r0, 0x7] ldr r0, _0801C6B4 @ =gUnknown_2023D6E strb r7, [r0] - ldr r1, _0801C6B8 @ =gUnknown_2023FC4 + ldr r1, _0801C6B8 @ =gBattleScripting mov r0, r10 adds r0, 0x21 strb r0, [r1, 0x1A] @@ -10841,7 +10841,7 @@ _0801C6A8: .4byte gUnknown_2023BFC _0801C6AC: .4byte gUnknown_2022AB8 _0801C6B0: .4byte gUnknown_2022AC8 _0801C6B4: .4byte gUnknown_2023D6E -_0801C6B8: .4byte gUnknown_2023FC4 +_0801C6B8: .4byte gBattleScripting _0801C6BC: .4byte gUnknown_81D9679 _0801C6C0: movs r0, 0x58 @@ -11116,7 +11116,7 @@ _0801C8E0: movs r0, 0x1 _0801C8E4: strb r0, [r1, 0x5] - ldr r2, _0801C914 @ =gUnknown_2023BE4 + ldr r2, _0801C914 @ =gBattleMons movs r0, 0x58 adds r3, r7, 0 muls r3, r0 @@ -11139,7 +11139,7 @@ _0801C906: b _0801C95A .align 2, 0 _0801C910: .4byte gUnknown_2023E82 -_0801C914: .4byte gUnknown_2023BE4 +_0801C914: .4byte gBattleMons _0801C918: .4byte gUnknown_81D95BF _0801C91C: movs r0, 0x58 @@ -11173,12 +11173,12 @@ _0801C952: bne _0801C95A b _0801CFA6 _0801C95A: - ldr r0, _0801C98C @ =gUnknown_2023FC4 + ldr r0, _0801C98C @ =gBattleScripting strb r7, [r0, 0x17] ldr r0, _0801C990 @ =gUnknown_2023D6F strb r7, [r0] - ldr r4, _0801C994 @ =gUnknown_2023BC4 - ldr r0, _0801C998 @ =gUnknown_2023D6B + ldr r4, _0801C994 @ =gActiveBattler + ldr r0, _0801C998 @ =sBattler_AI strb r7, [r0] strb r7, [r4] ldr r3, [sp, 0xC] @@ -11193,16 +11193,16 @@ _0801C97C: .4byte gUnknown_2022AB8 _0801C980: .4byte gUnknown_82500C4 _0801C984: .4byte gUnknown_81D95BF _0801C988: .4byte gUnknown_2023E82 -_0801C98C: .4byte gUnknown_2023FC4 +_0801C98C: .4byte gBattleScripting _0801C990: .4byte gUnknown_2023D6F -_0801C994: .4byte gUnknown_2023BC4 -_0801C998: .4byte gUnknown_2023D6B +_0801C994: .4byte gActiveBattler +_0801C998: .4byte sBattler_AI _0801C99C: movs r0, 0x58 muls r0, r7 b _0801CE08 _0801C9A2: - ldr r4, _0801C9F0 @ =gUnknown_2023BE4 + ldr r4, _0801C9F0 @ =gBattleMons movs r0, 0x58 adds r3, r7, 0 muls r3, r0 @@ -11217,14 +11217,14 @@ _0801C9A2: beq _0801C9BE b _0801CFA6 _0801C9BE: - ldr r1, _0801C9F4 @ =gUnknown_2023E0C + ldr r1, _0801C9F4 @ =gDisableStructs lsls r0, r7, 3 subs r0, r7 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0801C9F8 @ =gUnknown_825E45C + ldr r2, _0801C9F8 @ =gBitTable mov r5, r10 lsls r0, r5, 2 adds r0, r2 @@ -11243,9 +11243,9 @@ _0801C9DE: strb r0, [r1] b _0801CFA6 .align 2, 0 -_0801C9F0: .4byte gUnknown_2023BE4 -_0801C9F4: .4byte gUnknown_2023E0C -_0801C9F8: .4byte gUnknown_825E45C +_0801C9F0: .4byte gBattleMons +_0801C9F4: .4byte gDisableStructs +_0801C9F8: .4byte gBitTable _0801C9FC: movs r7, 0 ldr r0, _0801CA2C @ =gUnknown_2023BCC @@ -11255,7 +11255,7 @@ _0801C9FC: b _0801CFA6 _0801CA08: ldr r4, _0801CA30 @ =gUnknown_2023D68 - ldr r1, _0801CA34 @ =gUnknown_2023BE4 + ldr r1, _0801CA34 @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r0, r1 @@ -11275,7 +11275,7 @@ _0801CA08: .align 2, 0 _0801CA2C: .4byte gUnknown_2023BCC _0801CA30: .4byte gUnknown_2023D68 -_0801CA34: .4byte gUnknown_2023BE4 +_0801CA34: .4byte gBattleMons _0801CA38: .4byte gUnknown_2023F54 _0801CA3C: ldrh r0, [r4] @@ -11327,7 +11327,7 @@ _0801CA64: .4byte _0801CDF0 .4byte _0801CC44 _0801CAD0: - ldr r1, _0801CB00 @ =gUnknown_2023BE4 + ldr r1, _0801CB00 @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r1, 0x4C @@ -11351,11 +11351,11 @@ _0801CAE6: str r0, [sp, 0xC] b _0801CDF6 .align 2, 0 -_0801CB00: .4byte gUnknown_2023BE4 +_0801CB00: .4byte gBattleMons _0801CB04: .4byte gUnknown_2023D74 _0801CB08: .4byte gUnknown_81D9537 _0801CB0C: - ldr r1, _0801CB38 @ =gUnknown_2023BE4 + ldr r1, _0801CB38 @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r1, 0x4C @@ -11378,12 +11378,12 @@ _0801CB22: str r1, [sp, 0xC] b _0801CDF6 .align 2, 0 -_0801CB38: .4byte gUnknown_2023BE4 +_0801CB38: .4byte gBattleMons _0801CB3C: .4byte 0xfffff077 _0801CB40: .4byte gUnknown_2023D74 _0801CB44: .4byte gUnknown_81D954F _0801CB48: - ldr r1, _0801CB78 @ =gUnknown_2023BE4 + ldr r1, _0801CB78 @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r1, 0x4C @@ -11407,11 +11407,11 @@ _0801CB5E: str r2, [sp, 0xC] b _0801CDF6 .align 2, 0 -_0801CB78: .4byte gUnknown_2023BE4 +_0801CB78: .4byte gBattleMons _0801CB7C: .4byte gUnknown_2023D74 _0801CB80: .4byte gUnknown_81D9567 _0801CB84: - ldr r1, _0801CBB4 @ =gUnknown_2023BE4 + ldr r1, _0801CBB4 @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r1, 0x4C @@ -11435,11 +11435,11 @@ _0801CB9A: str r3, [sp, 0xC] b _0801CDF6 .align 2, 0 -_0801CBB4: .4byte gUnknown_2023BE4 +_0801CBB4: .4byte gBattleMons _0801CBB8: .4byte gUnknown_2023D74 _0801CBBC: .4byte gUnknown_81D957F _0801CBC0: - ldr r2, _0801CBF8 @ =gUnknown_2023BE4 + ldr r2, _0801CBF8 @ =gBattleMons movs r0, 0x58 adds r4, r7, 0 muls r4, r0 @@ -11468,12 +11468,12 @@ _0801CBDA: ldr r0, _0801CC04 @ =gUnknown_81D9597 b _0801CD58 .align 2, 0 -_0801CBF8: .4byte gUnknown_2023BE4 +_0801CBF8: .4byte gBattleMons _0801CBFC: .4byte 0xf7ffffff _0801CC00: .4byte gUnknown_2023D74 _0801CC04: .4byte gUnknown_81D9597 _0801CC08: - ldr r1, _0801CC38 @ =gUnknown_2023BE4 + ldr r1, _0801CC38 @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r1, 0x50 @@ -11497,11 +11497,11 @@ _0801CC1E: str r0, [sp, 0xC] b _0801CDF6 .align 2, 0 -_0801CC38: .4byte gUnknown_2023BE4 +_0801CC38: .4byte gBattleMons _0801CC3C: .4byte gUnknown_2023D74 _0801CC40: .4byte gUnknown_81D95AF _0801CC44: - ldr r1, _0801CC80 @ =gUnknown_2023BE4 + ldr r1, _0801CC80 @ =gBattleMons movs r0, 0x58 muls r0, r7 adds r1, 0x50 @@ -11531,7 +11531,7 @@ _0801CC5C: str r1, [sp, 0xC] b _0801CDF6 .align 2, 0 -_0801CC80: .4byte gUnknown_2023BE4 +_0801CC80: .4byte gBattleMons _0801CC84: .4byte 0xfff0ffff _0801CC88: .4byte gUnknown_2022AB8 _0801CC8C: .4byte gUnknown_82500C4 @@ -11539,7 +11539,7 @@ _0801CC90: .4byte gUnknown_2023E82 _0801CC94: .4byte gUnknown_2023D74 _0801CC98: .4byte gUnknown_81D95C5 _0801CC9C: - ldr r4, _0801CD60 @ =gUnknown_2023BE4 + ldr r4, _0801CD60 @ =gBattleMons movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -11639,7 +11639,7 @@ _0801CD58: str r5, [sp, 0xC] b _0801CDF6 .align 2, 0 -_0801CD60: .4byte gUnknown_2023BE4 +_0801CD60: .4byte gBattleMons _0801CD64: .4byte gUnknown_2022AB8 _0801CD68: .4byte gUnknown_8250094 _0801CD6C: .4byte 0xf7ffffff @@ -11652,7 +11652,7 @@ _0801CD84: .4byte gUnknown_2023E82 _0801CD88: .4byte gUnknown_2023D74 _0801CD8C: .4byte gUnknown_81D95C5 _0801CD90: - ldr r0, _0801CDDC @ =gUnknown_2023BE4 + ldr r0, _0801CDDC @ =gBattleMons mov r8, r0 movs r0, 0x58 adds r1, r7, 0 @@ -11682,7 +11682,7 @@ _0801CDB4: ldr r5, [sp, 0xC] cmp r5, 0 beq _0801CE34 - ldr r0, _0801CDE0 @ =gUnknown_2023FC4 + ldr r0, _0801CDE0 @ =gBattleScripting strb r7, [r0, 0x17] ldr r0, _0801CDE4 @ =gUnknown_2023D6F strb r7, [r0] @@ -11692,8 +11692,8 @@ _0801CDB4: str r0, [r1] b _0801CFA6 .align 2, 0 -_0801CDDC: .4byte gUnknown_2023BE4 -_0801CDE0: .4byte gUnknown_2023FC4 +_0801CDDC: .4byte gBattleMons +_0801CDE0: .4byte gBattleScripting _0801CDE4: .4byte gUnknown_2023D6F _0801CDE8: .4byte gUnknown_2023D74 _0801CDEC: .4byte gUnknown_81D95DF @@ -11702,11 +11702,11 @@ _0801CDF0: cmp r0, 0 beq _0801CE34 _0801CDF6: - ldr r0, _0801CE24 @ =gUnknown_2023FC4 + ldr r0, _0801CE24 @ =gBattleScripting strb r7, [r0, 0x17] ldr r0, _0801CE28 @ =gUnknown_2023D6F strb r7, [r0] - ldr r4, _0801CE2C @ =gUnknown_2023BC4 + ldr r4, _0801CE2C @ =gActiveBattler strb r7, [r4] ldrb r1, [r4] movs r0, 0x58 @@ -11724,9 +11724,9 @@ _0801CE08: bl MarkBufferBankForExecution b _0801CFA6 .align 2, 0 -_0801CE24: .4byte gUnknown_2023FC4 +_0801CE24: .4byte gBattleScripting _0801CE28: .4byte gUnknown_2023D6F -_0801CE2C: .4byte gUnknown_2023BC4 +_0801CE2C: .4byte gActiveBattler _0801CE30: .4byte gUnknown_2023C30 _0801CE34: adds r0, r7, 0x1 @@ -11742,7 +11742,7 @@ _0801CE44: .align 2, 0 _0801CE48: .4byte gUnknown_2023BCC _0801CE4C: - ldr r7, _0801CE64 @ =gUnknown_2023D50 + ldr r7, _0801CE64 @ =gBattleMoveDamage ldr r0, [r7] cmp r0, 0 bne _0801CE56 @@ -11755,9 +11755,9 @@ _0801CE56: beq _0801CF10 b _0801CFA6 .align 2, 0 -_0801CE64: .4byte gUnknown_2023D50 +_0801CE64: .4byte gBattleMoveDamage _0801CE68: - ldr r0, _0801CEF4 @ =gUnknown_2023DCC + ldr r0, _0801CEF4 @ =gMoveResultFlags ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -11766,7 +11766,7 @@ _0801CE68: b _0801CFA6 _0801CE76: ldr r2, _0801CEF8 @ =gUnknown_2023ECC - ldr r4, _0801CEFC @ =gUnknown_2023D6C + ldr r4, _0801CEFC @ =gBattlerTarget ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -11794,8 +11794,8 @@ _0801CE9C: lsrs r0, 16 cmp r0, r9 bcs _0801CFA6 - ldr r2, _0801CF00 @ =gUnknown_8250C04 - ldr r0, _0801CF04 @ =gUnknown_2023D4A + ldr r2, _0801CF00 @ =gBattleMoves + ldr r0, _0801CF04 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -11806,7 +11806,7 @@ _0801CE9C: ands r0, r1 cmp r0, 0 beq _0801CFA6 - ldr r2, _0801CF08 @ =gUnknown_2023BE4 + ldr r2, _0801CF08 @ =gBattleMons ldrb r1, [r4] movs r0, 0x58 muls r0, r1 @@ -11824,22 +11824,22 @@ _0801CE9C: bl BattleScriptPop b _0801CFA6 .align 2, 0 -_0801CEF4: .4byte gUnknown_2023DCC +_0801CEF4: .4byte gMoveResultFlags _0801CEF8: .4byte gUnknown_2023ECC -_0801CEFC: .4byte gUnknown_2023D6C -_0801CF00: .4byte gUnknown_8250C04 -_0801CF04: .4byte gUnknown_2023D4A -_0801CF08: .4byte gUnknown_2023BE4 +_0801CEFC: .4byte gBattlerTarget +_0801CF00: .4byte gBattleMoves +_0801CF04: .4byte gCurrentMove +_0801CF08: .4byte gBattleMons _0801CF0C: .4byte gUnknown_2023E82 _0801CF10: - ldr r0, _0801CFB8 @ =gUnknown_2023DCC + ldr r0, _0801CFB8 @ =gMoveResultFlags ldrb r0, [r0] movs r5, 0x29 ands r5, r0 cmp r5, 0 bne _0801CFA6 ldr r1, _0801CFBC @ =gUnknown_2023ECC - ldr r4, _0801CFC0 @ =gUnknown_2023D6C + ldr r4, _0801CFC0 @ =gBattlerTarget ldrb r2, [r4] lsls r0, r2, 2 adds r0, r2 @@ -11852,11 +11852,11 @@ _0801CF10: ldr r0, _0801CFC4 @ =0x0000ffff cmp r1, r0 beq _0801CFA6 - ldr r0, _0801CFC8 @ =gUnknown_2023D6B + ldr r0, _0801CFC8 @ =sBattler_AI ldrb r3, [r0] cmp r3, r2 beq _0801CFA6 - ldr r2, _0801CFCC @ =gUnknown_2023BE4 + ldr r2, _0801CFCC @ =gBattleMons ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -11873,7 +11873,7 @@ _0801CF10: strh r2, [r0] ldr r0, _0801CFD4 @ =gUnknown_2023D6F strb r3, [r0] - ldr r0, _0801CFD8 @ =gUnknown_2023FC4 + ldr r0, _0801CFD8 @ =gBattleScripting strb r3, [r0, 0x17] ldrb r1, [r4] lsls r0, r1, 2 @@ -11917,15 +11917,15 @@ _0801CFA6: pop {r1} bx r1 .align 2, 0 -_0801CFB8: .4byte gUnknown_2023DCC +_0801CFB8: .4byte gMoveResultFlags _0801CFBC: .4byte gUnknown_2023ECC -_0801CFC0: .4byte gUnknown_2023D6C +_0801CFC0: .4byte gBattlerTarget _0801CFC4: .4byte 0x0000ffff -_0801CFC8: .4byte gUnknown_2023D6B -_0801CFCC: .4byte gUnknown_2023BE4 +_0801CFC8: .4byte sBattler_AI +_0801CFCC: .4byte gBattleMons _0801CFD0: .4byte gUnknown_2023D68 _0801CFD4: .4byte gUnknown_2023D6F -_0801CFD8: .4byte gUnknown_2023FC4 +_0801CFD8: .4byte gBattleScripting _0801CFDC: .4byte gUnknown_2023D74 _0801CFE0: .4byte gUnknown_81D9622 thumb_func_end sub_801BC68 @@ -11934,14 +11934,14 @@ _0801CFE0: .4byte gUnknown_81D9622 ClearFuryCutterDestinyBondGrudge: @ 801CFE4 lsls r0, 24 lsrs r0, 24 - ldr r2, _0801D01C @ =gUnknown_2023E0C + ldr r2, _0801D01C @ =gDisableStructs lsls r1, r0, 3 subs r1, r0 lsls r1, 2 adds r1, r2 movs r2, 0 strb r2, [r1, 0x10] - ldr r1, _0801D020 @ =gUnknown_2023BE4 + ldr r1, _0801D020 @ =gBattleMons movs r2, 0x58 adds r3, r0, 0 muls r3, r2 @@ -11951,7 +11951,7 @@ ClearFuryCutterDestinyBondGrudge: @ 801CFE4 ldr r2, _0801D024 @ =0xfdffffff ands r1, r2 str r1, [r3] - ldr r1, _0801D028 @ =gUnknown_2023DFC + ldr r1, _0801D028 @ =gStatuses3 lsls r0, 2 adds r0, r1 ldr r1, [r0] @@ -11960,10 +11960,10 @@ ClearFuryCutterDestinyBondGrudge: @ 801CFE4 str r1, [r0] bx lr .align 2, 0 -_0801D01C: .4byte gUnknown_2023E0C -_0801D020: .4byte gUnknown_2023BE4 +_0801D01C: .4byte gDisableStructs +_0801D020: .4byte gBattleMons _0801D024: .4byte 0xfdffffff -_0801D028: .4byte gUnknown_2023DFC +_0801D028: .4byte gStatuses3 _0801D02C: .4byte 0xffffbfff thumb_func_end ClearFuryCutterDestinyBondGrudge @@ -12009,7 +12009,7 @@ GetMoveTarget: @ 801D05C lsrs r6, r0, 24 b _0801D086 _0801D07A: - ldr r1, _0801D098 @ =gUnknown_8250C04 + ldr r1, _0801D098 @ =gBattleMoves lsls r0, r7, 1 adds r0, r7 lsls r0, 2 @@ -12026,7 +12026,7 @@ _0801D08C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801D098: .4byte gUnknown_8250C04 +_0801D098: .4byte gBattleMoves _0801D09C: .4byte _0801D0A0 .align 2, 0 _0801D0A0: @@ -12096,7 +12096,7 @@ _0801D0A0: .4byte _0801D39C .4byte _0801D2A4 _0801D1A4: - ldr r0, _0801D284 @ =gUnknown_2023D6B + ldr r0, _0801D284 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide movs r1, 0x1 @@ -12111,7 +12111,7 @@ _0801D1A4: ldrb r0, [r2, 0x8] cmp r0, 0 beq _0801D1D6 - ldr r1, _0801D28C @ =gUnknown_2023BE4 + ldr r1, _0801D28C @ =gBattleMons ldrb r4, [r2, 0x9] movs r0, 0x58 muls r0, r4 @@ -12121,7 +12121,7 @@ _0801D1A4: beq _0801D1D6 b _0801D2EC _0801D1D6: - ldr r0, _0801D284 @ =gUnknown_2023D6B + ldr r0, _0801D284 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12137,7 +12137,7 @@ _0801D1E6: bl __modsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0801D284 @ =gUnknown_2023D6B + ldr r6, _0801D284 @ =sBattler_AI ldrb r3, [r6] cmp r5, r3 beq _0801D1E6 @@ -12147,16 +12147,16 @@ _0801D1E6: lsrs r0, 24 cmp r4, r0 beq _0801D1E6 - ldr r0, _0801D294 @ =gUnknown_2023D70 + ldr r0, _0801D294 @ =gAbsentBattlerFlags ldrb r2, [r0] - ldr r1, _0801D298 @ =gUnknown_825E45C + ldr r1, _0801D298 @ =gBitTable lsls r0, r5, 2 adds r0, r1 ldr r0, [r0] ands r2, r0 cmp r2, 0 bne _0801D1E6 - ldr r0, _0801D29C @ =gUnknown_8250C04 + ldr r0, _0801D29C @ =gBattleMoves mov r3, r8 adds r1, r3, r7 lsls r1, 2 @@ -12177,7 +12177,7 @@ _0801D234: bne _0801D24A b _0801D39C _0801D24A: - ldr r2, _0801D28C @ =gUnknown_2023BE4 + ldr r2, _0801D28C @ =gBattleMons movs r1, 0x58 adds r0, r5, 0 muls r0, r1 @@ -12207,16 +12207,16 @@ _0801D25E: strb r1, [r0] b _0801D39C .align 2, 0 -_0801D284: .4byte gUnknown_2023D6B +_0801D284: .4byte sBattler_AI _0801D288: .4byte gUnknown_2023DE4 -_0801D28C: .4byte gUnknown_2023BE4 +_0801D28C: .4byte gBattleMons _0801D290: .4byte gUnknown_2023BCC -_0801D294: .4byte gUnknown_2023D70 -_0801D298: .4byte gUnknown_825E45C -_0801D29C: .4byte gUnknown_8250C04 +_0801D294: .4byte gAbsentBattlerFlags +_0801D298: .4byte gBitTable +_0801D29C: .4byte gBattleMoves _0801D2A0: .4byte gUnknown_2023ECC _0801D2A4: - ldr r0, _0801D2B8 @ =gUnknown_2023D6B + ldr r0, _0801D2B8 @ =sBattler_AI ldrb r0, [r0] bl GetBankIdentity adds r1, r0, 0 @@ -12226,9 +12226,9 @@ _0801D2A4: eors r0, r2 b _0801D34E .align 2, 0 -_0801D2B8: .4byte gUnknown_2023D6B +_0801D2B8: .4byte sBattler_AI _0801D2BC: - ldr r0, _0801D2F0 @ =gUnknown_2023D6B + ldr r0, _0801D2F0 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide movs r1, 0x1 @@ -12243,7 +12243,7 @@ _0801D2BC: ldrb r0, [r2, 0x8] cmp r0, 0 beq _0801D2FC - ldr r1, _0801D2F8 @ =gUnknown_2023BE4 + ldr r1, _0801D2F8 @ =gBattleMons ldrb r4, [r2, 0x9] movs r0, 0x58 muls r0, r4 @@ -12255,11 +12255,11 @@ _0801D2EC: adds r5, r4, 0 b _0801D39C .align 2, 0 -_0801D2F0: .4byte gUnknown_2023D6B +_0801D2F0: .4byte sBattler_AI _0801D2F4: .4byte gUnknown_2023DE4 -_0801D2F8: .4byte gUnknown_2023BE4 +_0801D2F8: .4byte gBattleMons _0801D2FC: - ldr r0, _0801D330 @ =gUnknown_2022B4C + ldr r0, _0801D330 @ =gBattleTypeFlags ldr r0, [r0] movs r4, 0x1 ands r0, r4 @@ -12269,7 +12269,7 @@ _0801D2FC: ands r6, r0 cmp r6, 0 beq _0801D378 - ldr r0, _0801D334 @ =gUnknown_2023D6B + ldr r0, _0801D334 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -12283,8 +12283,8 @@ _0801D2FC: movs r0, 0x1 b _0801D34E .align 2, 0 -_0801D330: .4byte gUnknown_2022B4C -_0801D334: .4byte gUnknown_2023D6B +_0801D330: .4byte gBattleTypeFlags +_0801D334: .4byte sBattler_AI _0801D338: movs r0, 0x3 b _0801D34E @@ -12302,9 +12302,9 @@ _0801D34E: bl GetBankByIdentity lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0801D370 @ =gUnknown_2023D70 + ldr r0, _0801D370 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0801D374 @ =gUnknown_825E45C + ldr r2, _0801D374 @ =gBitTable lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -12315,10 +12315,10 @@ _0801D34E: eors r5, r0 b _0801D39C .align 2, 0 -_0801D370: .4byte gUnknown_2023D70 -_0801D374: .4byte gUnknown_825E45C +_0801D370: .4byte gAbsentBattlerFlags +_0801D374: .4byte gBitTable _0801D378: - ldr r0, _0801D394 @ =gUnknown_2023D6B + ldr r0, _0801D394 @ =sBattler_AI ldrb r0, [r0] bl GetBankIdentity adds r1, r0, 0 @@ -12331,14 +12331,14 @@ _0801D378: lsrs r5, r0, 24 b _0801D39C .align 2, 0 -_0801D394: .4byte gUnknown_2023D6B +_0801D394: .4byte sBattler_AI _0801D398: - ldr r0, _0801D3B8 @ =gUnknown_2023D6B + ldr r0, _0801D3B8 @ =sBattler_AI ldrb r5, [r0] _0801D39C: - ldr r0, _0801D3B8 @ =gUnknown_2023D6B + ldr r0, _0801D3B8 @ =sBattler_AI ldrb r0, [r0] - ldr r1, _0801D3BC @ =gUnknown_2023FE8 + ldr r1, _0801D3BC @ =gBattleStruct ldr r1, [r1] adds r0, r1 strb r5, [r0, 0xC] @@ -12350,8 +12350,8 @@ _0801D39C: pop {r1} bx r1 .align 2, 0 -_0801D3B8: .4byte gUnknown_2023D6B -_0801D3BC: .4byte gUnknown_2023FE8 +_0801D3B8: .4byte sBattler_AI +_0801D3BC: .4byte gBattleStruct thumb_func_end GetMoveTarget thumb_func_start HasObedientBitSet @@ -12365,13 +12365,13 @@ HasObedientBitSet: @ 801D3C0 lsrs r0, 24 cmp r0, 0x1 beq _0801D406 - ldr r0, _0801D40C @ =gUnknown_2023BCE + ldr r0, _0801D40C @ =gBattlerPartyIndexes lsls r4, 1 adds r5, r4, r0 ldrh r0, [r5] movs r7, 0x64 muls r0, r7 - ldr r6, _0801D410 @ =gUnknown_2024284 + ldr r6, _0801D410 @ =gPlayerParty adds r0, r6 movs r1, 0xB movs r2, 0 @@ -12392,15 +12392,15 @@ _0801D406: movs r0, 0x1 b _0801D42A .align 2, 0 -_0801D40C: .4byte gUnknown_2023BCE -_0801D410: .4byte gUnknown_2024284 +_0801D40C: .4byte gBattlerPartyIndexes +_0801D410: .4byte gPlayerParty _0801D414: - ldr r0, _0801D430 @ =gUnknown_2023BCE + ldr r0, _0801D430 @ =gBattlerPartyIndexes adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0801D434 @ =gUnknown_2024284 + ldr r1, _0801D434 @ =gPlayerParty adds r0, r1 movs r1, 0x50 movs r2, 0 @@ -12410,8 +12410,8 @@ _0801D42A: pop {r1} bx r1 .align 2, 0 -_0801D430: .4byte gUnknown_2023BCE -_0801D434: .4byte gUnknown_2024284 +_0801D430: .4byte gBattlerPartyIndexes +_0801D434: .4byte gPlayerParty thumb_func_end HasObedientBitSet thumb_func_start sub_801D438 @@ -12421,13 +12421,13 @@ sub_801D438: @ 801D438 push {r7} sub sp, 0x10 movs r6, 0 - ldr r0, _0801D4F8 @ =gUnknown_2022B4C + ldr r0, _0801D4F8 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _0801D4FC @ =0x00010002 ands r0, r1 cmp r0, 0 bne _0801D4F4 - ldr r4, _0801D500 @ =gUnknown_2023D6B + ldr r4, _0801D500 @ =sBattler_AI ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -12438,7 +12438,7 @@ sub_801D438: @ 801D438 bl HasObedientBitSet cmp r0, 0 beq _0801D4BE - ldr r2, _0801D504 @ =gUnknown_2023BE4 + ldr r2, _0801D504 @ =gBattleMons ldrb r1, [r4] movs r0, 0x58 muls r1, r0 @@ -12479,8 +12479,8 @@ _0801D4B0: beq _0801D4BE movs r6, 0x46 _0801D4BE: - ldr r5, _0801D504 @ =gUnknown_2023BE4 - ldr r0, _0801D500 @ =gUnknown_2023D6B + ldr r5, _0801D504 @ =gBattleMons + ldr r0, _0801D500 @ =sBattler_AI mov r8, r0 ldrb r0, [r0] movs r7, 0x58 @@ -12509,16 +12509,16 @@ _0801D4F4: movs r0, 0 b _0801D738 .align 2, 0 -_0801D4F8: .4byte gUnknown_2022B4C +_0801D4F8: .4byte gBattleTypeFlags _0801D4FC: .4byte 0x00010002 -_0801D500: .4byte gUnknown_2023D6B -_0801D504: .4byte gUnknown_2023BE4 +_0801D500: .4byte sBattler_AI +_0801D504: .4byte gBattleMons _0801D508: .4byte 0x00000827 _0801D50C: .4byte 0x00000821 _0801D510: .4byte 0x00000823 _0801D514: .4byte 0x00000825 _0801D518: - ldr r3, _0801D554 @ =gUnknown_2023D4A + ldr r3, _0801D554 @ =gCurrentMove ldrh r0, [r3] cmp r0, 0x63 bne _0801D52E @@ -12551,7 +12551,7 @@ _0801D54E: ldr r0, _0801D560 @ =gUnknown_81D94DA b _0801D6E2 .align 2, 0 -_0801D554: .4byte gUnknown_2023D4A +_0801D554: .4byte gCurrentMove _0801D558: .4byte 0xff7fffff _0801D55C: .4byte gUnknown_2023D74 _0801D560: .4byte gUnknown_81D94DA @@ -12559,8 +12559,8 @@ _0801D564: bl Random movs r1, 0xFF ands r1, r0 - ldr r2, _0801D608 @ =gUnknown_2023BE4 - ldr r0, _0801D60C @ =gUnknown_2023D6B + ldr r2, _0801D608 @ =gBattleMons + ldr r0, _0801D60C @ =sBattler_AI ldrb r3, [r0] movs r0, 0x58 muls r0, r3 @@ -12572,13 +12572,13 @@ _0801D564: asrs r4, r0, 8 cmp r4, r6 bge _0801D634 - ldr r0, _0801D610 @ =gUnknown_2023D4A + ldr r0, _0801D610 @ =gCurrentMove ldrh r1, [r0] movs r0, 0x84 lsls r0, 1 cmp r1, r0 beq _0801D634 - ldr r6, _0801D614 @ =gUnknown_825E45C + ldr r6, _0801D614 @ =gBitTable ldr r5, _0801D618 @ =gUnknown_2023D48 ldrb r0, [r5] lsls r0, 2 @@ -12586,7 +12586,7 @@ _0801D564: ldrb r1, [r0] adds r0, r3, 0 movs r2, 0xFF - bl sub_801779C + bl CheckMoveLimitations lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF @@ -12610,11 +12610,11 @@ _0801D5B6: cmp r0, 0 bne _0801D5B6 ldr r4, _0801D620 @ =gUnknown_2023D4E - ldr r3, _0801D608 @ =gUnknown_2023BE4 + ldr r3, _0801D608 @ =gBattleMons ldr r0, _0801D618 @ =gUnknown_2023D48 ldrb r0, [r0] lsls r0, 1 - ldr r1, _0801D60C @ =gUnknown_2023D6B + ldr r1, _0801D60C @ =sBattler_AI ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -12629,7 +12629,7 @@ _0801D5B6: ldrh r0, [r4] movs r1, 0 bl GetMoveTarget - ldr r1, _0801D62C @ =gUnknown_2023D6C + ldr r1, _0801D62C @ =gBattlerTarget strb r0, [r1] ldr r2, _0801D630 @ =gUnknown_2023DD0 ldr r0, [r2] @@ -12637,20 +12637,20 @@ _0801D5B6: lsls r1, 14 b _0801D732 .align 2, 0 -_0801D608: .4byte gUnknown_2023BE4 -_0801D60C: .4byte gUnknown_2023D6B -_0801D610: .4byte gUnknown_2023D4A -_0801D614: .4byte gUnknown_825E45C +_0801D608: .4byte gBattleMons +_0801D60C: .4byte sBattler_AI +_0801D610: .4byte gCurrentMove +_0801D614: .4byte gBitTable _0801D618: .4byte gUnknown_2023D48 _0801D61C: .4byte gUnknown_2023D49 _0801D620: .4byte gUnknown_2023D4E _0801D624: .4byte gUnknown_2023D74 _0801D628: .4byte gUnknown_81D94EA -_0801D62C: .4byte gUnknown_2023D6C +_0801D62C: .4byte gBattlerTarget _0801D630: .4byte gUnknown_2023DD0 _0801D634: - ldr r5, _0801D6B8 @ =gUnknown_2023BE4 - ldr r2, _0801D6BC @ =gUnknown_2023D6B + ldr r5, _0801D6B8 @ =gBattleMons + ldr r2, _0801D6BC @ =sBattler_AI mov r8, r2 ldrb r0, [r2] movs r7, 0x58 @@ -12716,8 +12716,8 @@ _0801D6AA: ldr r0, _0801D6C8 @ =gUnknown_81D9504 b _0801D6E2 .align 2, 0 -_0801D6B8: .4byte gUnknown_2023BE4 -_0801D6BC: .4byte gUnknown_2023D6B +_0801D6B8: .4byte gBattleMons +_0801D6BC: .4byte sBattler_AI _0801D6C0: .4byte gUnknown_2023BCC _0801D6C4: .4byte gUnknown_2023D74 _0801D6C8: .4byte gUnknown_81D9504 @@ -12742,11 +12742,11 @@ _0801D6E8: .4byte gUnknown_2023E82 _0801D6EC: .4byte gUnknown_2023D74 _0801D6F0: .4byte gUnknown_81D94F2 _0801D6F4: - ldr r4, _0801D744 @ =gUnknown_2023D6B + ldr r4, _0801D744 @ =sBattler_AI ldrb r1, [r4] movs r0, 0x58 muls r1, r0 - ldr r0, _0801D748 @ =gUnknown_2023BE4 + ldr r0, _0801D748 @ =gBattleMons adds r1, r0 movs r0, 0x28 str r0, [sp] @@ -12760,9 +12760,9 @@ _0801D6F4: movs r2, 0x1 movs r3, 0 bl sub_803ECEC - ldr r1, _0801D74C @ =gUnknown_2023D50 + ldr r1, _0801D74C @ =gBattleMoveDamage str r0, [r1] - ldr r1, _0801D750 @ =gUnknown_2023D6C + ldr r1, _0801D750 @ =gBattlerTarget ldrb r0, [r4] strb r0, [r1] ldr r1, _0801D754 @ =gUnknown_2023D74 @@ -12784,10 +12784,10 @@ _0801D738: pop {r1} bx r1 .align 2, 0 -_0801D744: .4byte gUnknown_2023D6B -_0801D748: .4byte gUnknown_2023BE4 -_0801D74C: .4byte gUnknown_2023D50 -_0801D750: .4byte gUnknown_2023D6C +_0801D744: .4byte sBattler_AI +_0801D748: .4byte gBattleMons +_0801D74C: .4byte gBattleMoveDamage +_0801D750: .4byte gBattlerTarget _0801D754: .4byte gUnknown_2023D74 _0801D758: .4byte gUnknown_81D951B _0801D75C: .4byte gUnknown_2023DD0 diff --git a/asm/battle_util2.s b/asm/battle_util2.s index d1b755d4c..d83b79202 100644 --- a/asm/battle_util2.s +++ b/asm/battle_util2.s @@ -8,7 +8,7 @@ thumb_func_start sub_802E03C sub_802E03C: @ 802E03C push {r4,r5,lr} - ldr r4, _0802E118 @ =gUnknown_2022B4C + ldr r4, _0802E118 @ =gBattleTypeFlags ldr r0, [r4] movs r1, 0x80 lsls r1, 12 @@ -33,12 +33,12 @@ _0802E060: cmp r4, 0 bge _0802E060 _0802E06E: - ldr r4, _0802E120 @ =gUnknown_2023FE8 + ldr r4, _0802E120 @ =gBattleStruct movs r0, 0x80 lsls r0, 2 bl AllocZeroed str r0, [r4] - ldr r4, _0802E124 @ =gUnknown_2023FF4 + ldr r4, _0802E124 @ =gBattleResources movs r0, 0x20 bl AllocZeroed str r0, [r4] @@ -103,10 +103,10 @@ _0802E06E: pop {r0} bx r0 .align 2, 0 -_0802E118: .4byte gUnknown_2022B4C +_0802E118: .4byte gBattleTypeFlags _0802E11C: .4byte gUnknown_3005EE0 -_0802E120: .4byte gUnknown_2023FE8 -_0802E124: .4byte gUnknown_2023FF4 +_0802E120: .4byte gBattleStruct +_0802E124: .4byte gBattleResources _0802E128: .4byte gUnknown_2023FEC _0802E12C: .4byte gUnknown_2023FF0 _0802E130: .4byte gUnknown_2022BB8 @@ -116,7 +116,7 @@ _0802E134: .4byte gUnknown_2022BBC thumb_func_start sub_802E138 sub_802E138: @ 802E138 push {r4-r6,lr} - ldr r4, _0802E208 @ =gUnknown_2022B4C + ldr r4, _0802E208 @ =gBattleTypeFlags ldr r0, [r4] movs r1, 0x80 lsls r1, 12 @@ -142,11 +142,11 @@ _0802E15E: cmp r4, 0 bge _0802E15E _0802E16C: - ldr r6, _0802E210 @ =gUnknown_2023FF4 + ldr r6, _0802E210 @ =gBattleResources ldr r0, [r6] cmp r0, 0 beq _0802E200 - ldr r4, _0802E214 @ =gUnknown_2023FE8 + ldr r4, _0802E214 @ =gBattleStruct ldr r0, [r4] bl Free movs r5, 0 @@ -207,10 +207,10 @@ _0802E200: pop {r0} bx r0 .align 2, 0 -_0802E208: .4byte gUnknown_2022B4C +_0802E208: .4byte gBattleTypeFlags _0802E20C: .4byte gUnknown_3005EE0 -_0802E210: .4byte gUnknown_2023FF4 -_0802E214: .4byte gUnknown_2023FE8 +_0802E210: .4byte gBattleResources +_0802E214: .4byte gBattleStruct _0802E218: .4byte gUnknown_2023FEC _0802E21C: .4byte gUnknown_2023FF0 _0802E220: .4byte gUnknown_2022BB8 @@ -222,7 +222,7 @@ sub_802E228: @ 802E228 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0802E26C @ =gUnknown_2022B4C + ldr r0, _0802E26C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -236,7 +236,7 @@ sub_802E228: @ 802E228 bl GetBankByIdentity lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _0802E270 @ =gUnknown_2023BE4 + ldr r2, _0802E270 @ =gBattleMons movs r0, 0x58 adds r1, r3, 0 muls r1, r0 @@ -252,15 +252,15 @@ sub_802E228: @ 802E228 adds r4, r3, 0 b _0802E27E .align 2, 0 -_0802E26C: .4byte gUnknown_2022B4C -_0802E270: .4byte gUnknown_2023BE4 +_0802E26C: .4byte gBattleTypeFlags +_0802E270: .4byte gBattleMons _0802E274: movs r0, 0x1 bl GetBankByIdentity lsls r0, 24 lsrs r4, r0, 24 _0802E27E: - ldr r2, _0802E2C0 @ =gUnknown_2023BE4 + ldr r2, _0802E2C0 @ =gBattleMons movs r1, 0x58 adds r0, r4, 0 muls r0, r1 @@ -280,44 +280,44 @@ _0802E27E: subs r0, r1 cmp r0, 0x1D ble _0802E2CC - ldr r1, _0802E2C4 @ =gUnknown_2023BCE + ldr r1, _0802E2C4 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802E2C8 @ =gUnknown_2024284 + ldr r1, _0802E2C8 @ =gPlayerParty adds r0, r1 movs r1, 0x9 bl sub_80436F8 b _0802E302 .align 2, 0 -_0802E2C0: .4byte gUnknown_2023BE4 -_0802E2C4: .4byte gUnknown_2023BCE -_0802E2C8: .4byte gUnknown_2024284 +_0802E2C0: .4byte gBattleMons +_0802E2C4: .4byte gBattlerPartyIndexes +_0802E2C8: .4byte gPlayerParty _0802E2CC: - ldr r1, _0802E2E4 @ =gUnknown_2023BCE + ldr r1, _0802E2E4 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802E2E8 @ =gUnknown_2024284 + ldr r1, _0802E2E8 @ =gPlayerParty adds r0, r1 movs r1, 0x7 bl sub_80436F8 b _0802E302 .align 2, 0 -_0802E2E4: .4byte gUnknown_2023BCE -_0802E2E8: .4byte gUnknown_2024284 +_0802E2E4: .4byte gBattlerPartyIndexes +_0802E2E8: .4byte gPlayerParty _0802E2EC: - ldr r1, _0802E308 @ =gUnknown_2023BCE + ldr r1, _0802E308 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0802E30C @ =gUnknown_2024284 + ldr r1, _0802E30C @ =gPlayerParty adds r0, r1 movs r1, 0x7 bl sub_80436F8 @@ -326,8 +326,8 @@ _0802E302: pop {r0} bx r0 .align 2, 0 -_0802E308: .4byte gUnknown_2023BCE -_0802E30C: .4byte gUnknown_2024284 +_0802E308: .4byte gBattlerPartyIndexes +_0802E30C: .4byte gPlayerParty thumb_func_end sub_802E228 .align 2, 0 @ Don't pad with nop. diff --git a/asm/cable_club.s b/asm/cable_club.s index ab312a92f..d4d6d58d2 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -1211,7 +1211,7 @@ sub_80810CC: @ 80810CC ldr r2, _080810EC @ =0x00001133 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080810F0 @ =gUnknown_2022B4C + ldr r1, _080810F0 @ =gBattleTypeFlags movs r0, 0 str r0, [r1] movs r0, 0x2 @@ -1222,7 +1222,7 @@ sub_80810CC: @ 80810CC .align 2, 0 _080810E8: .4byte gUnknown_202271A _080810EC: .4byte 0x00001133 -_080810F0: .4byte gUnknown_2022B4C +_080810F0: .4byte gBattleTypeFlags thumb_func_end sub_80810CC thumb_func_start sub_80810F4 @@ -1235,7 +1235,7 @@ sub_80810F4: @ 80810F4 ldr r2, _08081120 @ =0x00003311 adds r0, r2, 0 strh r0, [r1] - ldr r1, _08081124 @ =gUnknown_2022B4C + ldr r1, _08081124 @ =gBattleTypeFlags movs r0, 0 str r0, [r1] movs r0, 0x2 @@ -1247,7 +1247,7 @@ sub_80810F4: @ 80810F4 _08081118: .4byte gUnknown_20370D0 _0808111C: .4byte gUnknown_202271A _08081120: .4byte 0x00003311 -_08081124: .4byte gUnknown_2022B4C +_08081124: .4byte gBattleTypeFlags thumb_func_end sub_80810F4 thumb_func_start sub_8081128 @@ -1257,7 +1257,7 @@ sub_8081128: @ 8081128 ldr r2, _08081148 @ =0x00006601 adds r0, r2, 0 strh r0, [r1] - ldr r1, _0808114C @ =gUnknown_2022B4C + ldr r1, _0808114C @ =gBattleTypeFlags movs r0, 0 str r0, [r1] movs r0, 0x4 @@ -1268,7 +1268,7 @@ sub_8081128: @ 8081128 .align 2, 0 _08081144: .4byte gUnknown_202271A _08081148: .4byte 0x00006601 -_0808114C: .4byte gUnknown_2022B4C +_0808114C: .4byte gBattleTypeFlags thumb_func_end sub_8081128 thumb_func_start sub_8081150 @@ -1613,26 +1613,26 @@ _080813F4: beq _08081410 b _0808141A _080813FA: - ldr r1, _08081400 @ =gUnknown_2022B4C + ldr r1, _08081400 @ =gBattleTypeFlags movs r0, 0xA b _08081418 .align 2, 0 -_08081400: .4byte gUnknown_2022B4C +_08081400: .4byte gBattleTypeFlags _08081404: - ldr r1, _0808140C @ =gUnknown_2022B4C + ldr r1, _0808140C @ =gBattleTypeFlags movs r0, 0xB b _08081418 .align 2, 0 -_0808140C: .4byte gUnknown_2022B4C +_0808140C: .4byte gBattleTypeFlags _08081410: bl sub_80A03D8 - ldr r1, _08081440 @ =gUnknown_2022B4C + ldr r1, _08081440 @ =gBattleTypeFlags movs r0, 0x4B _08081418: str r0, [r1] _0808141A: bl sub_80563F0 - ldr r1, _08081444 @ =gUnknown_20386AE + ldr r1, _08081444 @ =gTrainerBattleOpponent_A movs r2, 0x80 lsls r2, 4 adds r0, r2, 0 @@ -1649,8 +1649,8 @@ _0808143A: pop {r0} bx r0 .align 2, 0 -_08081440: .4byte gUnknown_2022B4C -_08081444: .4byte gUnknown_20386AE +_08081440: .4byte gBattleTypeFlags +_08081444: .4byte gTrainerBattleOpponent_A _08081448: .4byte sub_800FD9C _0808144C: .4byte gMain _08081450: .4byte sub_8081668 @@ -1836,26 +1836,26 @@ _080815C4: beq _080815E0 b _080815EA _080815CA: - ldr r1, _080815D0 @ =gUnknown_2022B4C + ldr r1, _080815D0 @ =gBattleTypeFlags movs r0, 0xA b _080815E8 .align 2, 0 -_080815D0: .4byte gUnknown_2022B4C +_080815D0: .4byte gBattleTypeFlags _080815D4: - ldr r1, _080815DC @ =gUnknown_2022B4C + ldr r1, _080815DC @ =gBattleTypeFlags movs r0, 0xB b _080815E8 .align 2, 0 -_080815DC: .4byte gUnknown_2022B4C +_080815DC: .4byte gBattleTypeFlags _080815E0: bl sub_80A03D8 - ldr r1, _08081610 @ =gUnknown_2022B4C + ldr r1, _08081610 @ =gBattleTypeFlags movs r0, 0x4B _080815E8: str r0, [r1] _080815EA: bl sub_80563F0 - ldr r1, _08081614 @ =gUnknown_20386AE + ldr r1, _08081614 @ =gTrainerBattleOpponent_A movs r3, 0x80 lsls r3, 4 adds r0, r3, 0 @@ -1872,8 +1872,8 @@ _0808160A: pop {r0} bx r0 .align 2, 0 -_08081610: .4byte gUnknown_2022B4C -_08081614: .4byte gUnknown_20386AE +_08081610: .4byte gBattleTypeFlags +_08081614: .4byte gTrainerBattleOpponent_A _08081618: .4byte sub_800FD9C _0808161C: .4byte gMain _08081620: .4byte sub_8081668 @@ -1918,7 +1918,7 @@ _08081664: .4byte c2_exit_to_overworld_2_switch thumb_func_start sub_8081668 sub_8081668: @ 8081668 push {r4,r5,lr} - ldr r2, _080816B0 @ =gUnknown_2022B4C + ldr r2, _080816B0 @ =gBattleTypeFlags ldr r0, [r2] ldr r1, _080816B4 @ =0x0000ffdf ands r0, r1 @@ -1948,7 +1948,7 @@ sub_8081668: @ 8081668 beq _080816EC b _0808170A .align 2, 0 -_080816B0: .4byte gUnknown_2022B4C +_080816B0: .4byte gBattleTypeFlags _080816B4: .4byte 0x0000ffdf _080816B8: .4byte gUnknown_20370C0 _080816BC: .4byte gUnknown_300502C diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s index aaf44314c..b474a1249 100644 --- a/asm/calculate_base_damage.s +++ b/asm/calculate_base_damage.s @@ -36,7 +36,7 @@ sub_803ECEC: @ 803ECEC cmp r3, 0 bne _0803ED40 ldr r2, _0803ED38 @ =gUnknown_2024020 - ldr r1, _0803ED3C @ =gUnknown_8250C04 + ldr r1, _0803ED3C @ =gBattleMoves ldr r3, [sp, 0x8] lsls r0, r3, 1 adds r0, r3 @@ -47,14 +47,14 @@ sub_803ECEC: @ 803ECEC b _0803ED44 .align 2, 0 _0803ED38: .4byte gUnknown_2024020 -_0803ED3C: .4byte gUnknown_8250C04 +_0803ED3C: .4byte gBattleMoves _0803ED40: ldr r0, _0803ED5C @ =gUnknown_2024020 strh r3, [r0] _0803ED44: cmp r7, 0 bne _0803ED64 - ldr r1, _0803ED60 @ =gUnknown_8250C04 + ldr r1, _0803ED60 @ =gBattleMoves ldr r7, [sp, 0x8] lsls r0, r7, 1 adds r0, r7 @@ -65,7 +65,7 @@ _0803ED44: b _0803ED6E .align 2, 0 _0803ED5C: .4byte gUnknown_2024020 -_0803ED60: .4byte gUnknown_8250C04 +_0803ED60: .4byte gBattleMoves _0803ED64: movs r0, 0x3F mov r9, r0 @@ -155,7 +155,7 @@ _0803EE0C: lsls r0, r7, 17 lsrs r7, r0, 16 _0803EE10: - ldr r0, _0803EF28 @ =gUnknown_2022B4C + ldr r0, _0803EF28 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _0803EF2C @ =0x00000802 ands r0, r1 @@ -179,7 +179,7 @@ _0803EE10: lsls r0, 16 lsrs r7, r0, 16 _0803EE44: - ldr r0, _0803EF28 @ =gUnknown_2022B4C + ldr r0, _0803EF28 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _0803EF2C @ =0x00000802 ands r0, r1 @@ -204,7 +204,7 @@ _0803EE44: lsrs r0, 16 str r0, [sp, 0x14] _0803EE7A: - ldr r0, _0803EF28 @ =gUnknown_2022B4C + ldr r0, _0803EF28 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _0803EF2C @ =0x00000802 ands r0, r1 @@ -230,7 +230,7 @@ _0803EE7A: lsrs r0, 16 mov r8, r0 _0803EEB2: - ldr r0, _0803EF28 @ =gUnknown_2022B4C + ldr r0, _0803EF28 @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _0803EF2C @ =0x00000802 ands r0, r1 @@ -288,7 +288,7 @@ _0803EF0E: mov r8, r0 b _0803EF44 .align 2, 0 -_0803EF28: .4byte gUnknown_2022B4C +_0803EF28: .4byte gBattleTypeFlags _0803EF2C: .4byte 0x00000802 _0803EF30: .4byte 0x00000824 _0803EF34: .4byte 0x00000826 @@ -312,7 +312,7 @@ _0803EF58: mov r0, r10 cmp r0, 0x22 bne _0803EF90 - ldr r0, _0803F244 @ =gUnknown_2022B4C + ldr r0, _0803F244 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -340,7 +340,7 @@ _0803EF90: ldr r0, [sp, 0x1C] cmp r0, 0x22 bne _0803EFC8 - ldr r0, _0803F244 @ =gUnknown_2022B4C + ldr r0, _0803F244 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -655,8 +655,8 @@ _0803F1DA: bl __divsi3 strh r0, [r4] _0803F20A: - ldr r2, _0803F254 @ =gUnknown_8250C04 - ldr r0, _0803F258 @ =gUnknown_2023D4A + ldr r2, _0803F254 @ =gBattleMoves + ldr r0, _0803F258 @ =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -674,7 +674,7 @@ _0803F224: bls _0803F22C b _0803F38A _0803F22C: - ldr r0, _0803F25C @ =gUnknown_2023D71 + ldr r0, _0803F25C @ =gCritMultiplier ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 @@ -686,13 +686,13 @@ _0803F22C: ldr r2, _0803F260 @ =gUnknown_825DEAD b _0803F26E .align 2, 0 -_0803F244: .4byte gUnknown_2022B4C +_0803F244: .4byte gBattleTypeFlags _0803F248: .4byte 0xfffffe69 _0803F24C: .4byte 0x00000175 _0803F250: .4byte gUnknown_2024020 -_0803F254: .4byte gUnknown_8250C04 -_0803F258: .4byte gUnknown_2023D4A -_0803F25C: .4byte gUnknown_2023D71 +_0803F254: .4byte gBattleMoves +_0803F258: .4byte gCurrentMove +_0803F25C: .4byte gCritMultiplier _0803F260: .4byte gUnknown_825DEAD _0803F264: adds r5, r7, 0 @@ -791,7 +791,7 @@ _0803F310: ldrb r1, [r4] cmp r1, 0x1 bne _0803F352 - ldr r0, _0803F348 @ =gUnknown_2022B4C + ldr r0, _0803F348 @ =gBattleTypeFlags ldr r0, [r0] ands r0, r1 cmp r0, 0 @@ -809,19 +809,19 @@ _0803F310: b _0803F352 .align 2, 0 _0803F344: .4byte gUnknown_825DEAD -_0803F348: .4byte gUnknown_2022B4C +_0803F348: .4byte gBattleTypeFlags _0803F34C: lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 _0803F352: - ldr r0, _0803F3B0 @ =gUnknown_2022B4C + ldr r0, _0803F3B0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0803F384 - ldr r0, _0803F3B4 @ =gUnknown_8250C04 + ldr r0, _0803F3B4 @ =gBattleMoves ldr r3, [sp, 0x8] lsls r1, r3, 1 adds r1, r3 @@ -854,7 +854,7 @@ _0803F392: bhi _0803F39A b _0803F59C _0803F39A: - ldr r0, _0803F3B8 @ =gUnknown_2023D71 + ldr r0, _0803F3B8 @ =gCritMultiplier ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 @@ -866,9 +866,9 @@ _0803F39A: ldr r2, _0803F3BC @ =gUnknown_825DEAD b _0803F3CA .align 2, 0 -_0803F3B0: .4byte gUnknown_2022B4C -_0803F3B4: .4byte gUnknown_8250C04 -_0803F3B8: .4byte gUnknown_2023D71 +_0803F3B0: .4byte gBattleTypeFlags +_0803F3B4: .4byte gBattleMoves +_0803F3B8: .4byte gCritMultiplier _0803F3BC: .4byte gUnknown_825DEAD _0803F3C0: mov r5, r8 @@ -951,7 +951,7 @@ _0803F43E: ldrb r1, [r4] cmp r1, 0x1 bne _0803F492 - ldr r0, _0803F488 @ =gUnknown_2022B4C + ldr r0, _0803F488 @ =gBattleTypeFlags ldr r0, [r0] ands r0, r1 cmp r0, 0 @@ -969,19 +969,19 @@ _0803F43E: b _0803F492 .align 2, 0 _0803F484: .4byte gUnknown_825DEAD -_0803F488: .4byte gUnknown_2022B4C +_0803F488: .4byte gBattleTypeFlags _0803F48C: lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 _0803F492: - ldr r0, _0803F50C @ =gUnknown_2022B4C + ldr r0, _0803F50C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0803F4C4 - ldr r0, _0803F510 @ =gUnknown_8250C04 + ldr r0, _0803F510 @ =gBattleMoves ldr r2, [sp, 0x8] lsls r1, r2, 1 adds r1, r2 @@ -1020,7 +1020,7 @@ _0803F4C4: lsls r0, 24 cmp r0, 0 bne _0803F574 - ldr r2, _0803F514 @ =gUnknown_2023F1C + ldr r2, _0803F514 @ =gBattleWeather ldrh r1, [r2] movs r0, 0x1 ands r0, r1 @@ -1034,9 +1034,9 @@ _0803F4C4: beq _0803F520 b _0803F52C .align 2, 0 -_0803F50C: .4byte gUnknown_2022B4C -_0803F510: .4byte gUnknown_8250C04 -_0803F514: .4byte gUnknown_2023F1C +_0803F50C: .4byte gBattleTypeFlags +_0803F510: .4byte gBattleMoves +_0803F514: .4byte gBattleWeather _0803F518: lsrs r0, r5, 31 adds r0, r5, r0 @@ -1054,7 +1054,7 @@ _0803F52C: ands r0, r1 cmp r0, 0 beq _0803F544 - ldr r0, _0803F55C @ =gUnknown_2023D4A + ldr r0, _0803F55C @ =gCurrentMove ldrh r0, [r0] cmp r0, 0x4C bne _0803F544 @@ -1074,7 +1074,7 @@ _0803F544: beq _0803F56E b _0803F574 .align 2, 0 -_0803F55C: .4byte gUnknown_2023D4A +_0803F55C: .4byte gCurrentMove _0803F560: lsls r0, r5, 4 subs r0, r5 @@ -1087,7 +1087,7 @@ _0803F56E: adds r0, r5, r0 asrs r5, r0, 1 _0803F574: - ldr r0, _0803F5B0 @ =gUnknown_2023FF4 + ldr r0, _0803F5B0 @ =gBattleResources ldr r0, [r0] ldr r0, [r0, 0x4] ldr r7, [sp, 0x10] @@ -1117,7 +1117,7 @@ _0803F59C: pop {r1} bx r1 .align 2, 0 -_0803F5B0: .4byte gUnknown_2023FF4 +_0803F5B0: .4byte gBattleResources thumb_func_end sub_803ECEC .align 2, 0 @ Don't pad with nop. diff --git a/asm/daycare.s b/asm/daycare.s index 7d49d555a..d89a828a5 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -250,7 +250,7 @@ StoreSelectedPokemonInDaycare: @ 8045580 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080455A4 @ =gUnknown_2024284 + ldr r1, _080455A4 @ =gPlayerParty adds r0, r1 ldr r1, _080455A8 @ =gSaveBlock1Ptr ldr r1, [r1] @@ -261,7 +261,7 @@ StoreSelectedPokemonInDaycare: @ 8045580 pop {r0} bx r0 .align 2, 0 -_080455A4: .4byte gUnknown_2024284 +_080455A4: .4byte gPlayerParty _080455A8: .4byte gSaveBlock1Ptr thumb_func_end StoreSelectedPokemonInDaycare @@ -390,7 +390,7 @@ TakeSelectedPokemonFromDaycare: @ 804565C mov r0, sp bl ApplyDaycareExperience _080456AA: - ldr r0, _080456FC @ =gUnknown_2024284 + ldr r0, _080456FC @ =gPlayerParty movs r1, 0xFA lsls r1, 1 adds r6, r0, r1 @@ -426,7 +426,7 @@ _080456D8: bx r1 .align 2, 0 _080456F8: .4byte gStringVar1 -_080456FC: .4byte gUnknown_2024284 +_080456FC: .4byte gPlayerParty thumb_func_end TakeSelectedPokemonFromDaycare thumb_func_start TakeSelectedPokemonMonFromDaycareShiftSlots @@ -1784,7 +1784,7 @@ sub_80460D4: @ 80460D4 mov r0, sp movs r1, 0x2D bl sub_804037C - ldr r0, _0804614C @ =gUnknown_2024284 + ldr r0, _0804614C @ =gPlayerParty movs r1, 0xFA lsls r1, 1 adds r0, r1 @@ -1800,7 +1800,7 @@ sub_80460D4: @ 80460D4 pop {r0} bx r0 .align 2, 0 -_0804614C: .4byte gUnknown_2024284 +_0804614C: .4byte gPlayerParty thumb_func_end sub_80460D4 thumb_func_start CreateEgg @@ -2058,7 +2058,7 @@ _08046350: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08046388 @ =gUnknown_2024284 + ldr r0, _08046388 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x2D @@ -2081,7 +2081,7 @@ _08046350: movs r0, 0x1 b _080463AA .align 2, 0 -_08046388: .4byte gUnknown_2024284 +_08046388: .4byte gPlayerParty _0804638C: .4byte gUnknown_20370C0 _08046390: subs r0, 0x1 @@ -2202,7 +2202,7 @@ GetSelectedMonNickAndSpecies: @ 8046460 lsrs r0, 24 movs r5, 0x64 muls r0, r5 - ldr r4, _08046494 @ =gUnknown_2024284 + ldr r4, _08046494 @ =gPlayerParty adds r0, r4 ldr r1, _08046498 @ =gStringVar1 bl GetBoxMonNick @@ -2219,7 +2219,7 @@ GetSelectedMonNickAndSpecies: @ 8046460 pop {r1} bx r1 .align 2, 0 -_08046494: .4byte gUnknown_2024284 +_08046494: .4byte gPlayerParty _08046498: .4byte gStringVar1 thumb_func_end GetSelectedMonNickAndSpecies @@ -2348,7 +2348,7 @@ GetDaycareCompatibilityScore: @ 804654C adds r2, 0x14 str r2, [sp, 0x24] subs r0, 0x6 - ldr r1, _08046600 @ =gUnknown_8254784 + ldr r1, _08046600 @ =gBaseStats mov r10, r1 ldr r5, [sp, 0x20] mov r8, r0 @@ -2420,7 +2420,7 @@ _080465FC: movs r0, 0 b _0804665C .align 2, 0 -_08046600: .4byte gUnknown_8254784 +_08046600: .4byte gBaseStats _08046604: cmp r0, 0xD bne _08046614 @@ -3123,7 +3123,7 @@ sub_8046B40: @ 8046B40 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _08046B64 @ =gUnknown_2024284 + ldr r1, _08046B64 @ =gPlayerParty adds r0, r1 ldr r1, _08046B68 @ =gSaveBlock1Ptr ldr r1, [r1] @@ -3133,7 +3133,7 @@ sub_8046B40: @ 8046B40 pop {r0} bx r0 .align 2, 0 -_08046B64: .4byte gUnknown_2024284 +_08046B64: .4byte gPlayerParty _08046B68: .4byte gSaveBlock1Ptr _08046B6C: .4byte 0x00003c98 thumb_func_end sub_8046B40 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 02a47548e..5bbbe17e4 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -185,9 +185,9 @@ AddHatchedMonToParty: @ 8046D60 movs r1, 0x64 adds r5, r0, 0 muls r5, r1 - ldr r0, _08046E14 @ =gUnknown_2024284 + ldr r0, _08046E14 @ =gPlayerParty adds r5, r0 - ldr r1, _08046E18 @ =gUnknown_202402C + ldr r1, _08046E18 @ =gEnemyParty adds r0, r5, 0 bl sub_8046BFC adds r0, r5, 0 @@ -250,8 +250,8 @@ AddHatchedMonToParty: @ 8046D60 pop {r0} bx r0 .align 2, 0 -_08046E14: .4byte gUnknown_2024284 -_08046E18: .4byte gUnknown_202402C +_08046E14: .4byte gPlayerParty +_08046E18: .4byte gEnemyParty _08046E1C: .4byte gStringVar1 thumb_func_end AddHatchedMonToParty @@ -366,7 +366,7 @@ sub_8046ED0: @ 8046ED0 bne _08046EFE movs r0, 0x64 muls r1, r0 - ldr r0, _08046F18 @ =gUnknown_2024284 + ldr r0, _08046F18 @ =gPlayerParty adds r5, r1, r0 movs r4, 0x1 _08046EFE: @@ -375,7 +375,7 @@ _08046EFE: movs r0, 0x64 adds r1, r2, 0 muls r1, r0 - ldr r0, _08046F18 @ =gUnknown_2024284 + ldr r0, _08046F18 @ =gPlayerParty adds r5, r1, r0 movs r4, 0x3 _08046F0E: @@ -385,7 +385,7 @@ _08046F0E: beq _08046F6C b _08046FA6 .align 2, 0 -_08046F18: .4byte gUnknown_2024284 +_08046F18: .4byte gPlayerParty _08046F1C: adds r0, r5, 0 movs r1, 0xB @@ -774,7 +774,7 @@ EggHatchSetMonNickname: @ 80472A0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080472D4 @ =gUnknown_2024284 + ldr r1, _080472D4 @ =gPlayerParty adds r0, r1 ldr r2, _080472D8 @ =gStringVar3 movs r1, 0x2 @@ -790,7 +790,7 @@ EggHatchSetMonNickname: @ 80472A0 bx r0 .align 2, 0 _080472D0: .4byte gUnknown_20370C0 -_080472D4: .4byte gUnknown_2024284 +_080472D4: .4byte gPlayerParty _080472D8: .4byte gStringVar3 _080472DC: .4byte gUnknown_3000E74 _080472E0: .4byte c2_exit_to_overworld_2_switch @@ -997,7 +997,7 @@ _08047482: ldrb r1, [r0, 0x4] movs r0, 0x64 muls r0, r1 - ldr r1, _080474D4 @ =gUnknown_2024284 + ldr r1, _080474D4 @ =gPlayerParty adds r0, r1 ldr r1, _080474D8 @ =gStringVar1 bl GetMonNick @@ -1028,7 +1028,7 @@ _08047482: bl CopyWindowToVram b _08047684 .align 2, 0 -_080474D4: .4byte gUnknown_2024284 +_080474D4: .4byte gPlayerParty _080474D8: .4byte gStringVar1 _080474DC: .4byte gStringVar4 _080474E0: .4byte gUnknown_841B6FD @@ -1054,7 +1054,7 @@ _08047504: ldrb r1, [r0, 0x4] movs r0, 0x64 muls r0, r1 - ldr r1, _08047538 @ =gUnknown_2024284 + ldr r1, _08047538 @ =gPlayerParty adds r0, r1 ldr r1, _0804753C @ =gStringVar1 bl GetMonNick @@ -1073,7 +1073,7 @@ _08047504: ldr r1, [r5] b _08047648 .align 2, 0 -_08047538: .4byte gUnknown_2024284 +_08047538: .4byte gPlayerParty _0804753C: .4byte gStringVar1 _08047540: .4byte gStringVar4 _08047544: .4byte gUnknown_841B716 @@ -1134,7 +1134,7 @@ _080475A8: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r6, _08047628 @ =gUnknown_2024284 + ldr r6, _08047628 @ =gPlayerParty adds r0, r6 ldr r1, _0804762C @ =gStringVar3 mov r10, r1 @@ -1183,7 +1183,7 @@ _080475A8: b _08047684 .align 2, 0 _08047624: .4byte gUnknown_3000E74 -_08047628: .4byte gUnknown_2024284 +_08047628: .4byte gPlayerParty _0804762C: .4byte gStringVar3 _08047630: .4byte EggHatchSetMonNickname _08047634: @@ -1366,7 +1366,7 @@ SpriteCB_Egg_2: @ 804776C ldrb r1, [r0, 0x4] movs r0, 0x64 muls r0, r1 - ldr r1, _080477D8 @ =gUnknown_2024284 + ldr r1, _080477D8 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -1393,7 +1393,7 @@ SpriteCB_Egg_2: @ 804776C .align 2, 0 _080477D0: .4byte SpriteCB_Egg_3 _080477D4: .4byte gUnknown_3000E74 -_080477D8: .4byte gUnknown_2024284 +_080477D8: .4byte gPlayerParty _080477DC: .4byte gSprites _080477E0: .4byte gUnknown_82349CC _080477E4: diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 4c55acef7..e253b6c98 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -58,7 +58,7 @@ _080CDD68: ldrsh r1, [r6, r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080CDDA4 @ =gUnknown_2024284 + ldr r0, _080CDDA4 @ =gPlayerParty adds r7, r1, r0 ldrh r4, [r6, 0xC] ldrb r5, [r6, 0xE] @@ -77,7 +77,7 @@ _080CDD98: bx r0 .align 2, 0 _080CDDA0: .4byte gUnknown_2037AB8 -_080CDDA4: .4byte gUnknown_2024284 +_080CDDA4: .4byte gPlayerParty thumb_func_end Task_BeginEvolutionScene thumb_func_start BeginEvolutionScene @@ -450,7 +450,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8 movs r1, 0x64 adds r4, r2, 0 muls r4, r1 - ldr r1, _080CE288 @ =gUnknown_2024284 + ldr r1, _080CE288 @ =gPlayerParty adds r4, r1 ldrh r5, [r0, 0xC] adds r0, r4, 0 @@ -606,7 +606,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8 .align 2, 0 _080CE280: .4byte gUnknown_3005090 _080CE284: .4byte gUnknown_2039A20 -_080CE288: .4byte gUnknown_2024284 +_080CE288: .4byte gPlayerParty _080CE28C: .4byte 0x05006000 _080CE290: .4byte gUnknown_2022974 _080CE294: .4byte gUnknown_2022976 @@ -645,7 +645,7 @@ CB2_TradeEvolutionSceneLoadGraphics: @ 80CE2DC ldrsh r2, [r0, r1] movs r1, 0x64 muls r2, r1 - ldr r1, _080CE320 @ =gUnknown_2024284 + ldr r1, _080CE320 @ =gPlayerParty adds r4, r2, r1 ldrh r6, [r0, 0xC] ldr r0, _080CE324 @ =gMain @@ -665,7 +665,7 @@ _080CE30E: .align 2, 0 _080CE318: .4byte gUnknown_3005090 _080CE31C: .4byte gUnknown_2039A20 -_080CE320: .4byte gUnknown_2024284 +_080CE320: .4byte gPlayerParty _080CE324: .4byte gMain _080CE328: .4byte _080CE32C .align 2, 0 @@ -1149,7 +1149,7 @@ _080CE778: _080CE782: movs r5, 0x64 muls r0, r5 - ldr r4, _080CE8CC @ =gUnknown_2024284 + ldr r4, _080CE8CC @ =gPlayerParty adds r0, r4 mov r9, r0 ldr r1, [sp, 0x4] @@ -1200,7 +1200,7 @@ _080CE7F0: ldrb r1, [r5] movs r0, 0x64 muls r0, r1 - ldr r1, _080CE8CC @ =gUnknown_2024284 + ldr r1, _080CE8CC @ =gPlayerParty adds r0, r1 adds r1, r4, 0 mov r2, sp @@ -1214,7 +1214,7 @@ _080CE80C: ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _080CE8CC @ =gUnknown_2024284 + ldr r5, _080CE8CC @ =gPlayerParty adds r0, r5 adds r1, r4, 0 mov r2, sp @@ -1293,7 +1293,7 @@ _080CE8B2: .align 2, 0 _080CE8C4: .4byte gUnknown_8259754 _080CE8C8: .4byte gUnknown_2024029 -_080CE8CC: .4byte gUnknown_2024284 +_080CE8CC: .4byte gPlayerParty _080CE8D0: .4byte gUnknown_8245EE0 _080CE8D4: .4byte 0x0000012f _080CE8D8: .4byte gUnknown_83F8440 @@ -1318,7 +1318,7 @@ sub_80CE8DC: @ 80CE8DC ldrsh r1, [r5, r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080CE940 @ =gUnknown_2024284 + ldr r0, _080CE940 @ =gPlayerParty adds r1, r0 mov r9, r1 bl sub_806E25C @@ -1348,7 +1348,7 @@ sub_80CE8DC: @ 80CE8DC bl _080CF528 .align 2, 0 _080CE93C: .4byte gUnknown_3005090 -_080CE940: .4byte gUnknown_2024284 +_080CE940: .4byte gPlayerParty _080CE944: .4byte gUnknown_2023E82 _080CE948: ldr r0, _080CE9A0 @ =gMain @@ -2433,7 +2433,7 @@ _080CF2B4: b _080CF528 _080CF2C2: bl FreeAllWindowBuffers - ldr r0, _080CF2F8 @ =gUnknown_2024284 + ldr r0, _080CF2F8 @ =gPlayerParty ldr r1, _080CF2FC @ =gUnknown_3005090 mov r3, r8 adds r5, r3, r7 @@ -2456,7 +2456,7 @@ _080CF2C2: b _080CF528 .align 2, 0 _080CF2F4: .4byte gUnknown_2037AB8 -_080CF2F8: .4byte gUnknown_2024284 +_080CF2F8: .4byte gPlayerParty _080CF2FC: .4byte gUnknown_3005090 _080CF300: .4byte gUnknown_2024029 _080CF304: .4byte CB2_EvolutionSceneLoadGraphics @@ -2733,7 +2733,7 @@ sub_80CF53C: @ 80CF53C ldrsh r1, [r4, r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080CF5C0 @ =gUnknown_2024284 + ldr r0, _080CF5C0 @ =gPlayerParty adds r1, r0 mov r8, r1 bl sub_806E25C @@ -2783,7 +2783,7 @@ _080CF5B2: mov pc, r0 .align 2, 0 _080CF5BC: .4byte gUnknown_3005090 -_080CF5C0: .4byte gUnknown_2024284 +_080CF5C0: .4byte gPlayerParty _080CF5C4: .4byte gUnknown_2023E82 _080CF5C8: .4byte _080CF5CC .align 2, 0 @@ -3703,7 +3703,7 @@ _080CFDC6: bl GetBgTilemapBuffer bl Free bl FreeAllWindowBuffers - ldr r0, _080CFE1C @ =gUnknown_2024284 + ldr r0, _080CFE1C @ =gPlayerParty ldr r1, _080CFE20 @ =gUnknown_3005090 adds r5, r7, r6 lsls r5, 3 @@ -3726,7 +3726,7 @@ _080CFDC6: .align 2, 0 _080CFE14: .4byte gUnknown_2037AB8 _080CFE18: .4byte gUnknown_3003F3C -_080CFE1C: .4byte gUnknown_2024284 +_080CFE1C: .4byte gPlayerParty _080CFE20: .4byte gUnknown_3005090 _080CFE24: .4byte gUnknown_2024029 _080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 8c61b2644..3e0139313 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -3434,7 +3434,7 @@ _0812DF00: lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0812DF5C @ =gUnknown_823EACC + ldr r1, _0812DF5C @ =gTrainers+0x4 adds r0, r1 str r0, [r2] str r4, [r2, 0x4] @@ -3446,7 +3446,7 @@ _0812DF4C: .4byte gSaveBlock1Ptr _0812DF50: .4byte 0x00003a54 _0812DF54: .4byte gUnknown_845F5EA _0812DF58: .4byte gUnknown_203B100 -_0812DF5C: .4byte gUnknown_823EACC +_0812DF5C: .4byte gTrainers+0x4 _0812DF60: ldr r0, _0812DFC0 @ =gUnknown_203B100 ldr r0, [r0] diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 8c4e2fe98..f20b43995 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1882,7 +1882,7 @@ AdjustFriendship_step: @ 806D74C strh r1, [r0] cmp r1, 0 bne _0806D77A - ldr r5, _0806D784 @ =gUnknown_2024284 + ldr r5, _0806D784 @ =gPlayerParty movs r4, 0x5 _0806D76A: adds r0, r5, 0 @@ -1898,7 +1898,7 @@ _0806D77A: bx r0 .align 2, 0 _0806D780: .4byte 0x00004021 -_0806D784: .4byte gUnknown_2024284 +_0806D784: .4byte gPlayerParty thumb_func_end AdjustFriendship_step thumb_func_start overworld_poison_timer_set diff --git a/asm/field_effect.s b/asm/field_effect.s index 4bf2ebf48..4392c05f4 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -5813,7 +5813,7 @@ FldEff_FieldMoveShowMonInit: @ 8086084 movs r1, 0x64 adds r4, r0, 0 muls r4, r1 - ldr r0, _080860DC @ =gUnknown_2024284 + ldr r0, _080860DC @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -5840,7 +5840,7 @@ FldEff_FieldMoveShowMonInit: @ 8086084 bx r1 .align 2, 0 _080860D8: .4byte gUnknown_20386E0 -_080860DC: .4byte gUnknown_2024284 +_080860DC: .4byte gPlayerParty thumb_func_end FldEff_FieldMoveShowMonInit thumb_func_start sub_80860E0 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index ddb704c20..927a8881a 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -2834,7 +2834,7 @@ _0805C866: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0805C888 @ =gUnknown_2024284 + ldr r0, _0805C888 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -2848,7 +2848,7 @@ _0805C882: pop {r1} bx r1 .align 2, 0 -_0805C888: .4byte gUnknown_2024284 +_0805C888: .4byte gPlayerParty thumb_func_end PartyHasMonWithSurf thumb_func_start IsPlayerSurfingNorth diff --git a/asm/field_poison.s b/asm/field_poison.s index 8847b7cd5..b3fb6132d 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -31,7 +31,7 @@ _080A047E: thumb_func_start AllMonsFainted AllMonsFainted: @ 80A0484 push {r4,r5,lr} - ldr r4, _080A04A4 @ =gUnknown_2024284 + ldr r4, _080A04A4 @ =gPlayerParty movs r5, 0 _080A048A: adds r0, r4, 0 @@ -46,7 +46,7 @@ _080A048A: movs r0, 0 b _080A04B2 .align 2, 0 -_080A04A4: .4byte gUnknown_2024284 +_080A04A4: .4byte gPlayerParty _080A04A8: adds r5, 0x1 adds r4, 0x64 @@ -68,7 +68,7 @@ MonFaintFromPoisonOnField: @ 80A04B8 movs r1, 0x64 adds r4, r0, 0 muls r4, r1 - ldr r0, _080A04FC @ =gUnknown_2024284 + ldr r0, _080A04FC @ =gPlayerParty adds r4, r0 movs r0, 0 str r0, [sp] @@ -91,7 +91,7 @@ MonFaintFromPoisonOnField: @ 80A04B8 pop {r0} bx r0 .align 2, 0 -_080A04FC: .4byte gUnknown_2024284 +_080A04FC: .4byte gPlayerParty _080A0500: .4byte gStringVar1 thumb_func_end MonFaintFromPoisonOnField @@ -102,7 +102,7 @@ CheckMonFaintedFromPoison: @ 80A0504 lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _080A0540 @ =gUnknown_2024284 + ldr r0, _080A0540 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 bl CheckMonIsValid @@ -124,7 +124,7 @@ CheckMonFaintedFromPoison: @ 80A0504 movs r0, 0x1 b _080A0546 .align 2, 0 -_080A0540: .4byte gUnknown_2024284 +_080A0540: .4byte gPlayerParty _080A0544: movs r0, 0 _080A0546: @@ -245,7 +245,7 @@ _080A0614: .4byte Task_WhiteOut overworld_poison: @ 80A0618 push {r4-r7,lr} sub sp, 0x4 - ldr r4, _080A0684 @ =gUnknown_2024284 + ldr r4, _080A0684 @ =gPlayerParty movs r7, 0 movs r6, 0 movs r5, 0x5 @@ -298,7 +298,7 @@ _080A067C: movs r0, 0x2 b _080A0692 .align 2, 0 -_080A0684: .4byte gUnknown_2024284 +_080A0684: .4byte gPlayerParty _080A0688: cmp r7, 0 bne _080A0690 diff --git a/asm/field_specials.s b/asm/field_specials.s index 760bd5bc5..6ab1b38c8 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -205,7 +205,7 @@ sub_80CA76C: @ 80CA76C lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _080CA790 @ =gUnknown_2024284 + ldr r0, _080CA790 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x20 @@ -215,7 +215,7 @@ sub_80CA76C: @ 80CA76C movs r0, 0x6 b _080CA7E6 .align 2, 0 -_080CA790: .4byte gUnknown_2024284 +_080CA790: .4byte gPlayerParty _080CA794: adds r0, r4, 0 movs r1, 0x20 @@ -281,12 +281,12 @@ _080CA800: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music sub_80CA804: @ 80CA804 push {r4-r6,lr} movs r5, 0 - ldr r6, _080CA850 @ =gUnknown_8254784 + ldr r6, _080CA850 @ =gBaseStats _080CA80A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080CA854 @ =gUnknown_2024284 + ldr r0, _080CA854 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -317,8 +317,8 @@ _080CA84C: movs r0, 0x1 b _080CA864 .align 2, 0 -_080CA850: .4byte gUnknown_8254784 -_080CA854: .4byte gUnknown_2024284 +_080CA850: .4byte gBaseStats +_080CA854: .4byte gPlayerParty _080CA858: adds r0, r5, 0x1 lsls r0, 24 @@ -680,7 +680,7 @@ LeadMonHasEffortRibbon: @ 80CAAE0 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080CAB04 @ =gUnknown_2024284 + ldr r1, _080CAB04 @ =gPlayerParty adds r0, r1 movs r1, 0x47 movs r2, 0 @@ -690,7 +690,7 @@ LeadMonHasEffortRibbon: @ 80CAAE0 pop {r1} bx r1 .align 2, 0 -_080CAB04: .4byte gUnknown_2024284 +_080CAB04: .4byte gPlayerParty thumb_func_end LeadMonHasEffortRibbon thumb_func_start GivLeadMonEffortRibbon @@ -709,7 +709,7 @@ GivLeadMonEffortRibbon: @ 80CAB08 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080CAB40 @ =gUnknown_2024284 + ldr r1, _080CAB40 @ =gPlayerParty adds r0, r1 movs r1, 0x47 mov r2, sp @@ -719,7 +719,7 @@ GivLeadMonEffortRibbon: @ 80CAB08 bx r0 .align 2, 0 _080CAB3C: .4byte 0x0000083b -_080CAB40: .4byte gUnknown_2024284 +_080CAB40: .4byte gPlayerParty thumb_func_end GivLeadMonEffortRibbon thumb_func_start ScrSpecial_AreLeadMonEVsMaxedOut @@ -730,7 +730,7 @@ ScrSpecial_AreLeadMonEVsMaxedOut: @ 80CAB44 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080CAB68 @ =gUnknown_2024284 + ldr r1, _080CAB68 @ =gPlayerParty adds r0, r1 bl GetMonEVCount lsls r0, 16 @@ -740,7 +740,7 @@ ScrSpecial_AreLeadMonEVsMaxedOut: @ 80CAB44 movs r0, 0 b _080CAB72 .align 2, 0 -_080CAB68: .4byte gUnknown_2024284 +_080CAB68: .4byte gPlayerParty _080CAB6C: .4byte 0x01fd0000 _080CAB70: movs r0, 0x1 @@ -768,7 +768,7 @@ sub_80CAB78: @ 80CAB78 _080CAB9A: movs r0, 0x64 muls r0, r4 - ldr r1, _080CABB8 @ =gUnknown_2024284 + ldr r1, _080CABB8 @ =gPlayerParty adds r0, r1 movs r1, 0x41 movs r2, 0 @@ -779,7 +779,7 @@ _080CAB9A: b _080CABC8 .align 2, 0 _080CABB4: .4byte 0x00004031 -_080CABB8: .4byte gUnknown_2024284 +_080CABB8: .4byte gPlayerParty _080CABBC: adds r0, r4, 0x1 lsls r0, 24 @@ -832,7 +832,7 @@ _080CAC02: thumb_func_start sub_80CAC08 sub_80CAC08: @ 80CAC08 push {lr} - ldr r0, _080CAC1C @ =gUnknown_2024284 + ldr r0, _080CAC1C @ =gPlayerParty movs r1, 0x3F bl CheckPartyPokerus lsls r0, 24 @@ -841,7 +841,7 @@ sub_80CAC08: @ 80CAC08 movs r0, 0x1 b _080CAC22 .align 2, 0 -_080CAC1C: .4byte gUnknown_2024284 +_080CAC1C: .4byte gPlayerParty _080CAC20: movs r0, 0 _080CAC22: @@ -965,7 +965,7 @@ _080CAD0C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080CAD3C @ =gUnknown_2024284 + ldr r0, _080CAD3C @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -984,7 +984,7 @@ _080CAD0C: adds r0, r5, 0 b _080CAD4C .align 2, 0 -_080CAD3C: .4byte gUnknown_2024284 +_080CAD3C: .4byte gPlayerParty _080CAD40: adds r0, r5, 0x1 lsls r0, 24 @@ -1006,7 +1006,7 @@ sub_80CAD54: @ 80CAD54 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CAD78 @ =gUnknown_2024284 + ldr r1, _080CAD78 @ =gPlayerParty adds r0, r1 movs r1, 0x41 movs r2, 0 @@ -1017,7 +1017,7 @@ sub_80CAD54: @ 80CAD54 bx r1 .align 2, 0 _080CAD74: .4byte gUnknown_20370C0 -_080CAD78: .4byte gUnknown_2024284 +_080CAD78: .4byte gPlayerParty thumb_func_end sub_80CAD54 thumb_func_start sub_80CAD7C @@ -1027,7 +1027,7 @@ sub_80CAD7C: @ 80CAD7C ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CADAC @ =gUnknown_2024284 + ldr r1, _080CADAC @ =gPlayerParty adds r0, r1 ldr r4, _080CADB0 @ =gStringVar1 movs r1, 0x7 @@ -1043,7 +1043,7 @@ sub_80CAD7C: @ 80CAD7C b _080CADBA .align 2, 0 _080CADA8: .4byte gUnknown_20370C0 -_080CADAC: .4byte gUnknown_2024284 +_080CADAC: .4byte gPlayerParty _080CADB0: .4byte gStringVar1 _080CADB4: .4byte gSaveBlock2Ptr _080CADB8: @@ -3202,7 +3202,7 @@ sub_80CBE50: @ 80CBE50 lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _080CBEA4 @ =gUnknown_2024284 + ldr r0, _080CBEA4 @ =gPlayerParty adds r5, r1, r0 ldr r6, _080CBEA8 @ =gStringVar1 adds r0, r5, 0 @@ -3234,7 +3234,7 @@ sub_80CBE50: @ 80CBE50 movs r0, 0 b _080CBEB2 .align 2, 0 -_080CBEA4: .4byte gUnknown_2024284 +_080CBEA4: .4byte gPlayerParty _080CBEA8: .4byte gStringVar1 _080CBEAC: .4byte gUnknown_8245EE0 _080CBEB0: @@ -3375,7 +3375,7 @@ sub_80CBFA0: @ 80CBFA0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CBFCC @ =gUnknown_2024284 + ldr r1, _080CBFCC @ =gPlayerParty adds r0, r1 ldr r4, _080CBFD0 @ =gStringVar1 movs r1, 0x2 @@ -3390,7 +3390,7 @@ sub_80CBFA0: @ 80CBFA0 b _080CBFDA .align 2, 0 _080CBFC8: .4byte gUnknown_20370C0 -_080CBFCC: .4byte gUnknown_2024284 +_080CBFCC: .4byte gPlayerParty _080CBFD0: .4byte gStringVar1 _080CBFD4: .4byte gStringVar3 _080CBFD8: @@ -3494,7 +3494,7 @@ ChangePokemonNickname: @ 80CC088 mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r6, _080CC134 @ =gUnknown_2024284 + ldr r6, _080CC134 @ =gPlayerParty adds r0, r6 ldr r2, _080CC138 @ =gStringVar3 movs r1, 0x2 @@ -3559,7 +3559,7 @@ ChangePokemonNickname: @ 80CC088 bx r0 .align 2, 0 _080CC130: .4byte gUnknown_20370C0 -_080CC134: .4byte gUnknown_2024284 +_080CC134: .4byte gPlayerParty _080CC138: .4byte gStringVar3 _080CC13C: .4byte gStringVar2 _080CC140: .4byte ChangePokemonNickname_CB @@ -3572,7 +3572,7 @@ ChangePokemonNickname_CB: @ 80CC144 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CC168 @ =gUnknown_2024284 + ldr r1, _080CC168 @ =gPlayerParty adds r0, r1 ldr r2, _080CC16C @ =gStringVar2 movs r1, 0x2 @@ -3582,7 +3582,7 @@ ChangePokemonNickname_CB: @ 80CC144 bx r0 .align 2, 0 _080CC164: .4byte gUnknown_20370C0 -_080CC168: .4byte gUnknown_2024284 +_080CC168: .4byte gPlayerParty _080CC16C: .4byte gStringVar2 thumb_func_end ChangePokemonNickname_CB @@ -3593,7 +3593,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CC198 @ =gUnknown_2024284 + ldr r1, _080CC198 @ =gPlayerParty adds r0, r1 ldr r4, _080CC19C @ =gStringVar1 movs r1, 0x2 @@ -3606,7 +3606,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 bx r0 .align 2, 0 _080CC194: .4byte gUnknown_20370C0 -_080CC198: .4byte gUnknown_2024284 +_080CC198: .4byte gPlayerParty _080CC19C: .4byte gStringVar1 thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated @@ -3619,7 +3619,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CC1CC @ =gUnknown_2024284 + ldr r1, _080CC1CC @ =gPlayerParty adds r0, r1 movs r1, 0x1 movs r2, 0 @@ -3631,7 +3631,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0 b _080CC1D8 .align 2, 0 _080CC1C8: .4byte gUnknown_20370C0 -_080CC1CC: .4byte gUnknown_2024284 +_080CC1CC: .4byte gPlayerParty _080CC1D0: .4byte gUnknown_20370D0 _080CC1D4: ldr r1, _080CC1E0 @ =gUnknown_20370D0 @@ -3780,7 +3780,7 @@ _080CC2E4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080CC3BC @ =gUnknown_2024284 + ldr r0, _080CC3BC @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -3871,7 +3871,7 @@ _080CC318: pop {r0} bx r0 .align 2, 0 -_080CC3BC: .4byte gUnknown_2024284 +_080CC3BC: .4byte gPlayerParty _080CC3C0: .4byte 0x00004043 _080CC3C4: .4byte 0x00004042 _080CC3C8: .4byte gUnknown_20370C0 @@ -3994,7 +3994,7 @@ sub_80CC48C: @ 80CC48C _080CC49C: movs r0, 0x64 muls r0, r4 - ldr r1, _080CC4B8 @ =gUnknown_2024284 + ldr r1, _080CC4B8 @ =gPlayerParty adds r0, r1 movs r1, 0x41 movs r2, 0 @@ -4006,7 +4006,7 @@ _080CC49C: movs r0, 0x1 b _080CC4CC .align 2, 0 -_080CC4B8: .4byte gUnknown_2024284 +_080CC4B8: .4byte gPlayerParty _080CC4BC: .4byte gUnknown_20370C0 _080CC4C0: adds r0, r4, 0x1 @@ -4616,7 +4616,7 @@ sub_80CC948: @ 80CC948 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CC96C @ =gUnknown_2024284 + ldr r1, _080CC96C @ =gPlayerParty adds r0, r1 movs r1, 0x6 bl sub_80436F8 @@ -4627,7 +4627,7 @@ sub_80CC948: @ 80CC948 bx r0 .align 2, 0 _080CC968: .4byte gUnknown_20370C0 -_080CC96C: .4byte gUnknown_2024284 +_080CC96C: .4byte gPlayerParty _080CC970: .4byte 0x00004025 thumb_func_end sub_80CC948 @@ -4911,12 +4911,12 @@ sub_80CCB94: @ 80CCB94 movs r0, 0x64 mov r5, r8 muls r5, r0 - ldr r0, _080CCBC4 @ =gUnknown_2024284 + ldr r0, _080CCBC4 @ =gPlayerParty mov r9, r0 b _080CCBCE .align 2, 0 _080CCBC0: .4byte gUnknown_20370C6 -_080CCBC4: .4byte gUnknown_2024284 +_080CCBC4: .4byte gPlayerParty _080CCBC8: adds r0, r4, 0x1 lsls r0, 24 @@ -4942,7 +4942,7 @@ _080CCBEA: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r1, _080CCC20 @ =gUnknown_2024284 + ldr r1, _080CCC20 @ =gPlayerParty adds r0, r1 movs r1, 0x20 bl GetMonData @@ -4960,7 +4960,7 @@ _080CCBEA: b _080CCC6E .align 2, 0 _080CCC1C: .4byte gUnknown_83F6203 -_080CCC20: .4byte gUnknown_2024284 +_080CCC20: .4byte gPlayerParty _080CCC24: .4byte gStringVar2 _080CCC28: .4byte gUnknown_82481BE _080CCC2C: .4byte gUnknown_20370C2 @@ -5007,7 +5007,7 @@ _080CCC8C: movs r0, 0x64 mov r1, r8 muls r1, r0 - ldr r0, _080CCCF0 @ =gUnknown_2024284 + ldr r0, _080CCCF0 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xD @@ -5056,7 +5056,7 @@ _080CCCE4: pop {r1} bx r1 .align 2, 0 -_080CCCF0: .4byte gUnknown_2024284 +_080CCCF0: .4byte gPlayerParty _080CCCF4: .4byte gUnknown_20370C4 thumb_func_end sub_80CCB94 @@ -5475,7 +5475,7 @@ sub_80CD034: @ 80CD034 _080CD044: movs r0, 0x64 muls r0, r4 - ldr r1, _080CD05C @ =gUnknown_2024284 + ldr r1, _080CD05C @ =gPlayerParty adds r0, r1 movs r1, 0x4 bl GetMonData @@ -5484,7 +5484,7 @@ _080CD044: movs r0, 0x1 b _080CD06C .align 2, 0 -_080CD05C: .4byte gUnknown_2024284 +_080CD05C: .4byte gPlayerParty _080CD060: adds r0, r4, 0x1 lsls r0, 24 @@ -5577,7 +5577,7 @@ _080CD104: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _080CD138 @ =gUnknown_2024284 + ldr r0, _080CD138 @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x41 @@ -5598,7 +5598,7 @@ _080CD104: movs r0, 0x1 b _080CD14C .align 2, 0 -_080CD138: .4byte gUnknown_2024284 +_080CD138: .4byte gPlayerParty _080CD13C: .4byte gUnknown_20370C0 _080CD140: adds r0, r6, 0x1 diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s index 112659afd..e310222ab 100644 --- a/asm/fldeff_softboiled.s +++ b/asm/fldeff_softboiled.s @@ -13,7 +13,7 @@ hm_prepare_dive_probably: @ 80E5684 lsrs r0, 24 movs r6, 0x64 muls r0, r6 - ldr r4, _080E56D0 @ =gUnknown_2024284 + ldr r4, _080E56D0 @ =gPlayerParty adds r0, r4 movs r1, 0x3A bl GetMonData @@ -40,7 +40,7 @@ hm_prepare_dive_probably: @ 80E5684 movs r0, 0 b _080E56D6 .align 2, 0 -_080E56D0: .4byte gUnknown_2024284 +_080E56D0: .4byte gPlayerParty _080E56D4: movs r0, 0x1 _080E56D6: @@ -121,7 +121,7 @@ _080E5768: mov r10, r0 mov r0, r10 muls r0, r5 - ldr r1, _080E57A0 @ =gUnknown_2024284 + ldr r1, _080E57A0 @ =gPlayerParty mov r9, r1 adds r6, r0, r1 adds r0, r6, 0 @@ -143,7 +143,7 @@ _080E5796: bl sub_80E5934 b _080E57D4 .align 2, 0 -_080E57A0: .4byte gUnknown_2024284 +_080E57A0: .4byte gPlayerParty _080E57A4: movs r0, 0x1 bl PlaySE @@ -192,7 +192,7 @@ sub_80E57E8: @ 80E57E8 ldrsb r1, [r5, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _080E5834 @ =gUnknown_2024284 + ldr r1, _080E5834 @ =gPlayerParty adds r0, r1 movs r1, 0x3A bl GetMonData @@ -213,7 +213,7 @@ sub_80E57E8: @ 80E57E8 bx r0 .align 2, 0 _080E5830: .4byte gUnknown_203B0A0 -_080E5834: .4byte gUnknown_2024284 +_080E5834: .4byte gPlayerParty _080E5838: .4byte sub_80E583C thumb_func_end sub_80E57E8 @@ -228,7 +228,7 @@ sub_80E583C: @ 80E583C ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _080E5888 @ =gUnknown_2024284 + ldr r1, _080E5888 @ =gPlayerParty adds r0, r1 ldr r1, _080E588C @ =gStringVar1 bl GetMonNickname @@ -253,7 +253,7 @@ sub_80E583C: @ 80E583C bx r0 .align 2, 0 _080E5884: .4byte gUnknown_203B0A0 -_080E5888: .4byte gUnknown_2024284 +_080E5888: .4byte gPlayerParty _080E588C: .4byte gStringVar1 _080E5890: .4byte gStringVar4 _080E5894: .4byte gUnknown_8416F27 diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index 6deadcd61..0ebc38112 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -83,7 +83,7 @@ sub_80D0860: @ 80D0860 ldr r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080D08A0 @ =gUnknown_2024284 + ldr r1, _080D08A0 @ =gPlayerParty adds r0, r1 ldr r1, _080D08A4 @ =gStringVar1 bl GetMonNickname @@ -94,7 +94,7 @@ sub_80D0860: @ 80D0860 _080D0894: .4byte gUnknown_3005090 _080D0898: .4byte sub_80D08A8 _080D089C: .4byte gUnknown_20386E0 -_080D08A0: .4byte gUnknown_2024284 +_080D08A0: .4byte gPlayerParty _080D08A4: .4byte gStringVar1 thumb_func_end sub_80D0860 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 3991404e9..879061aaa 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -239,7 +239,7 @@ _080F1F98: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _080F2058 @ =gUnknown_2024284 + ldr r0, _080F2058 @ =gPlayerParty adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB @@ -325,7 +325,7 @@ _080F2022: .align 2, 0 _080F2050: .4byte gUnknown_3005090 _080F2054: .4byte gUnknown_203AB38 -_080F2058: .4byte gUnknown_2024284 +_080F2058: .4byte gPlayerParty _080F205C: .4byte 0x000001ff _080F2060: .4byte 0xfffffe00 _080F2064: diff --git a/asm/item_use.s b/asm/item_use.s index fa31bbe78..393e96f19 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -738,7 +738,7 @@ sub_80A156C: @ 80A156C _080A1578: movs r0, 0x64 muls r0, r4 - ldr r1, _080A15D0 @ =gUnknown_2024284 + ldr r1, _080A15D0 @ =gPlayerParty adds r0, r1 movs r1, 0x11 adds r2, r4, 0 @@ -779,7 +779,7 @@ _080A1598: ldr r3, _080A15E4 @ =sub_80A1648 b _080A1616 .align 2, 0 -_080A15D0: .4byte gUnknown_2024284 +_080A15D0: .4byte gPlayerParty _080A15D4: .4byte gUnknown_203AD30 _080A15D8: .4byte 0x0000ffff _080A15DC: .4byte gUnknown_3005090 @@ -1885,7 +1885,7 @@ sub_80A1E7C: @ 80A1E7C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A1EBC @ =gUnknown_2023BCE + ldr r1, _080A1EBC @ =gBattlerPartyIndexes ldr r0, _080A1EC0 @ =gUnknown_2024004 ldrb r0, [r0] lsls r0, 1 @@ -1893,7 +1893,7 @@ sub_80A1E7C: @ 80A1E7C ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r1, _080A1EC4 @ =gUnknown_2024284 + ldr r1, _080A1EC4 @ =gPlayerParty adds r0, r1 ldr r1, _080A1EC8 @ =gUnknown_203AD30 ldrh r1, [r1] @@ -1912,9 +1912,9 @@ sub_80A1E7C: @ 80A1E7C bl sub_8108E70 b _080A1EE4 .align 2, 0 -_080A1EBC: .4byte gUnknown_2023BCE +_080A1EBC: .4byte gBattlerPartyIndexes _080A1EC0: .4byte gUnknown_2024004 -_080A1EC4: .4byte gUnknown_2024284 +_080A1EC4: .4byte gPlayerParty _080A1EC8: .4byte gUnknown_203AD30 _080A1ECC: .4byte gUnknown_84169DC _080A1ED0: .4byte sub_810A1F8 @@ -2090,7 +2090,7 @@ sub_80A2010: @ 80A2010 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A2044 @ =gUnknown_2022B4C + ldr r0, _080A2044 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x8 ands r0, r1 @@ -2110,7 +2110,7 @@ sub_80A2010: @ 80A2010 bl sub_8108E70 b _080A2060 .align 2, 0 -_080A2044: .4byte gUnknown_2022B4C +_080A2044: .4byte gBattleTypeFlags _080A2048: .4byte gUnknown_203AD30 _080A204C: .4byte 0x0000ffff _080A2050: .4byte gStringVar4 diff --git a/asm/learn_move.s b/asm/learn_move.s index 5838d7d9a..eba23b712 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -489,7 +489,7 @@ _080E4A88: ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080E4ACC @ =gUnknown_2024284 + ldr r1, _080E4ACC @ =gPlayerParty adds r0, r1 ldr r3, _080E4AD0 @ =0x00000a67 adds r1, r2, r3 @@ -513,7 +513,7 @@ _080E4A88: b _080E4ED8 .align 2, 0 _080E4AC8: .4byte gUnknown_203AAB4 -_080E4ACC: .4byte gUnknown_2024284 +_080E4ACC: .4byte gPlayerParty _080E4AD0: .4byte 0x00000a67 _080E4AD4: .4byte 0xffff0000 _080E4AD8: .4byte gUnknown_841E405 @@ -738,7 +738,7 @@ _080E4C7E: adds r2, r6 bl get_coro_args_x18_x1A bl FreeAllWindowBuffers - ldr r0, _080E4CD8 @ =gUnknown_2024284 + ldr r0, _080E4CD8 @ =gPlayerParty ldr r5, [r7] movs r2, 0x98 lsls r2, 2 @@ -767,7 +767,7 @@ _080E4CC8: .4byte gUnknown_2037AB8 _080E4CCC: .4byte 0x00000263 _080E4CD0: .4byte 0x00000a68 _080E4CD4: .4byte 0x00000a6a -_080E4CD8: .4byte gUnknown_2024284 +_080E4CD8: .4byte gPlayerParty _080E4CDC: .4byte gUnknown_2024029 _080E4CE0: .4byte sub_80E4800 _080E4CE4: @@ -870,7 +870,7 @@ _080E4DB4: ldrb r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080E4E50 @ =gUnknown_2024284 + ldr r5, _080E4E50 @ =gPlayerParty adds r0, r5 ldrb r1, [r2] adds r1, 0xD @@ -936,7 +936,7 @@ _080E4DB4: strh r0, [r1] b _080E4EDA .align 2, 0 -_080E4E50: .4byte gUnknown_2024284 +_080E4E50: .4byte gPlayerParty _080E4E54: .4byte gStringVar3 _080E4E58: .4byte gUnknown_8247094 _080E4E5C: .4byte 0x00000261 @@ -1264,7 +1264,7 @@ sub_80E50CC: @ 80E50CC ldrb r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080E51EC @ =gUnknown_2024284 + ldr r5, _080E51EC @ =gPlayerParty adds r0, r5 adds r1, 0xE8 bl GetMoveRelearnerMoves @@ -1315,7 +1315,7 @@ _080E513C: ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080E51EC @ =gUnknown_2024284 + ldr r1, _080E51EC @ =gPlayerParty adds r0, r1 movs r1, 0x2 mov r2, sp @@ -1393,7 +1393,7 @@ _080E51AA: bx r0 .align 2, 0 _080E51E8: .4byte gUnknown_203AAB4 -_080E51EC: .4byte gUnknown_2024284 +_080E51EC: .4byte gPlayerParty _080E51F0: .4byte gUnknown_8247094 _080E51F4: .4byte gStringVar1 _080E51F8: .4byte gUnknown_84161C1 @@ -1556,7 +1556,7 @@ sub_80E5340: @ 80E5340 sub sp, 0x3C lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080E5380 @ =gUnknown_8250C04 + ldr r1, _080E5380 @ =gBattleMoves lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -1582,7 +1582,7 @@ sub_80E5340: @ 80E5340 bl sub_80E559C b _080E53A6 .align 2, 0 -_080E5380: .4byte gUnknown_8250C04 +_080E5380: .4byte gBattleMoves _080E5384: .4byte gUnknown_8416213 _080E5388: ldrb r1, [r4, 0x1] @@ -1599,7 +1599,7 @@ _080E5388: movs r3, 0x4 bl sub_80E559C _080E53A6: - ldr r2, _080E53CC @ =gUnknown_8250C04 + ldr r2, _080E53CC @ =gBattleMoves lsls r1, r5, 1 adds r0, r1, r5 lsls r0, 2 @@ -1618,7 +1618,7 @@ _080E53A6: bl sub_80E559C b _080E53F4 .align 2, 0 -_080E53CC: .4byte gUnknown_8250C04 +_080E53CC: .4byte gBattleMoves _080E53D0: .4byte gUnknown_8416213 _080E53D4: ldrb r1, [r0, 0x3] @@ -1636,7 +1636,7 @@ _080E53D4: movs r3, 0x12 bl sub_80E559C _080E53F4: - ldr r1, _080E543C @ =gUnknown_8250C04 + ldr r1, _080E543C @ =gBattleMoves adds r0, r4, r5 lsls r0, 2 adds r0, r1 @@ -1669,7 +1669,7 @@ _080E53F4: pop {r0} bx r0 .align 2, 0 -_080E543C: .4byte gUnknown_8250C04 +_080E543C: .4byte gBattleMoves _080E5440: .4byte gUnknown_84886E8 thumb_func_end sub_80E5340 diff --git a/asm/link.s b/asm/link.s index 378b1a2e8..c8f1093fc 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3037,7 +3037,7 @@ _0800AB56: _0800AB5C: cmp r3, r2 bne _0800AB7E - ldr r2, _0800AB88 @ =gUnknown_2022B4C + ldr r2, _0800AB88 @ =gBattleTypeFlags ldr r0, [r2] ldr r1, _0800AB8C @ =0x0000ffdf ands r0, r1 @@ -3057,7 +3057,7 @@ _0800AB7E: bx r0 .align 2, 0 _0800AB84: .4byte gUnknown_3003F30 -_0800AB88: .4byte gUnknown_2022B4C +_0800AB88: .4byte gBattleTypeFlags _0800AB8C: .4byte 0x0000ffdf _0800AB90: .4byte gLinkVSyncDisabled _0800AB94: .4byte gUnknown_3003F80 diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index 037b31fe4..ba75c7f15 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -3591,7 +3591,7 @@ _080FA1DE: ble _080FA1D4 cmp r2, r5 bne _080FA218 - ldr r2, _080FA20C @ =gUnknown_2022B4C + ldr r2, _080FA20C @ =gBattleTypeFlags ldr r0, [r2] ldr r1, _080FA210 @ =0x0000ffdf ands r0, r1 @@ -3608,7 +3608,7 @@ _080FA1DE: b _080FA218 .align 2, 0 _080FA208: .4byte gUnknown_3005450 -_080FA20C: .4byte gUnknown_2022B4C +_080FA20C: .4byte gBattleTypeFlags _080FA210: .4byte 0x0000ffdf _080FA214: ldr r0, _080FA220 @ =sub_80FA160 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 39c7e1a0b..7f8862156 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -3007,14 +3007,14 @@ _0811717E: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08117198 @ =gUnknown_2024284 + ldr r0, _08117198 @ =gPlayerParty adds r1, r0 movs r0, 0 movs r2, 0x64 bl SendBlock b _0811725C .align 2, 0 -_08117198: .4byte gUnknown_2024284 +_08117198: .4byte gPlayerParty _0811719C: bl GetBlockReceivedStatus lsls r0, 24 @@ -3023,7 +3023,7 @@ _0811719C: bne _0811725C bl GetMultiplayerId adds r1, r0, 0 - ldr r0, _081171D0 @ =gUnknown_202402C + ldr r0, _081171D0 @ =gEnemyParty movs r2, 0x1 eors r1, r2 lsls r1, 24 @@ -3037,7 +3037,7 @@ _0811719C: bl ResetBlockReceivedFlags b _081171FA .align 2, 0 -_081171D0: .4byte gUnknown_202402C +_081171D0: .4byte gEnemyParty _081171D4: .4byte gUnknown_2022118 _081171D8: ldr r4, _08117204 @ =gUnknown_2022618 @@ -3308,7 +3308,7 @@ sub_81173C0: @ 81173C0 ldr r1, _08117434 @ =gMain ldr r0, _08117438 @ =sub_8081668 str r0, [r1, 0x8] - ldr r0, _0811743C @ =gUnknown_2022B4C + ldr r0, _0811743C @ =gBattleTypeFlags str r6, [r0] bl PlayBattleBGM pop {r4-r6} @@ -3319,7 +3319,7 @@ _0811742C: .4byte gUnknown_202273C _08117430: .4byte 0x00002211 _08117434: .4byte gMain _08117438: .4byte sub_8081668 -_0811743C: .4byte gUnknown_2022B4C +_0811743C: .4byte gBattleTypeFlags thumb_func_end sub_81173C0 thumb_func_start sub_8117440 @@ -10216,7 +10216,7 @@ sub_811ADD0: @ 811ADD0 _0811ADE0: movs r0, 0x64 muls r0, r4 - ldr r1, _0811AE08 @ =gUnknown_2024284 + ldr r1, _0811AE08 @ =gPlayerParty adds r0, r1 movs r1, 0x41 bl GetMonData @@ -10234,7 +10234,7 @@ _0811ADFA: movs r0, 0x2 b _0811AE5C .align 2, 0 -_0811AE08: .4byte gUnknown_2024284 +_0811AE08: .4byte gPlayerParty _0811AE0C: .4byte gUnknown_2024029 _0811AE10: movs r4, 0 @@ -10242,11 +10242,11 @@ _0811AE10: ldrb r0, [r0] cmp r4, r0 bge _0811AE5A - ldr r6, _0811AE48 @ =gUnknown_8254784 + ldr r6, _0811AE48 @ =gBaseStats _0811AE1C: movs r0, 0x64 muls r0, r4 - ldr r1, _0811AE4C @ =gUnknown_2024284 + ldr r1, _0811AE4C @ =gPlayerParty adds r0, r1 movs r1, 0x41 bl GetMonData @@ -10266,8 +10266,8 @@ _0811AE40: b _0811AE5C .align 2, 0 _0811AE44: .4byte gUnknown_2024029 -_0811AE48: .4byte gUnknown_8254784 -_0811AE4C: .4byte gUnknown_2024284 +_0811AE48: .4byte gBaseStats +_0811AE4C: .4byte gPlayerParty _0811AE50: adds r4, 0x1 ldr r0, _0811AE64 @ =gUnknown_2024029 @@ -10634,7 +10634,7 @@ _0811B0FE: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0811B13C @ =gUnknown_2024284 + ldr r0, _0811B13C @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x38 @@ -10662,7 +10662,7 @@ _0811B130: b _0811B142 .align 2, 0 _0811B138: .4byte gUnknown_2024029 -_0811B13C: .4byte gUnknown_2024284 +_0811B13C: .4byte gPlayerParty _0811B140: movs r0, 0x1 _0811B142: @@ -10703,7 +10703,7 @@ sub_811B16C: @ 811B16C movs r1, 0x64 adds r4, r0, 0 muls r4, r1 - ldr r0, _0811B1A8 @ =gUnknown_2024284 + ldr r0, _0811B1A8 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -10725,7 +10725,7 @@ sub_811B16C: @ 811B16C movs r0, 0 b _0811B1AE .align 2, 0 -_0811B1A8: .4byte gUnknown_2024284 +_0811B1A8: .4byte gPlayerParty _0811B1AC: movs r0, 0x1 _0811B1AE: @@ -10741,7 +10741,7 @@ sub_811B1B4: @ 811B1B4 movs r1, 0x64 adds r4, r0, 0 muls r4, r1 - ldr r0, _0811B1E8 @ =gUnknown_2024284 + ldr r0, _0811B1E8 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -10759,7 +10759,7 @@ sub_811B1B4: @ 811B1B4 pop {r0} bx r0 .align 2, 0 -_0811B1E8: .4byte gUnknown_2024284 +_0811B1E8: .4byte gPlayerParty thumb_func_end sub_811B1B4 thumb_func_start sub_811B1EC @@ -10790,7 +10790,7 @@ _0811B212: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0811B250 @ =gUnknown_2024284 + ldr r0, _0811B250 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0 @@ -10819,7 +10819,7 @@ _0811B242: pop {r1} bx r1 .align 2, 0 -_0811B250: .4byte gUnknown_2024284 +_0811B250: .4byte gPlayerParty _0811B254: .4byte gUnknown_2024029 thumb_func_end sub_811B1EC @@ -12660,8 +12660,8 @@ sub_811C04C: @ 811C04C bl sub_81173C0 movs r4, 0 movs r7, 0x64 - ldr r6, _0811C0CC @ =gUnknown_2024284 - ldr r5, _0811C0D0 @ =gUnknown_202402C + ldr r6, _0811C0CC @ =gPlayerParty + ldr r5, _0811C0D0 @ =gEnemyParty _0811C05C: ldr r0, _0811C0D4 @ =gUnknown_203B0D4 adds r0, r4, r0 @@ -12677,7 +12677,7 @@ _0811C05C: adds r4, 0x1 cmp r4, 0x1 ble _0811C05C - ldr r4, _0811C0CC @ =gUnknown_2024284 + ldr r4, _0811C0CC @ =gPlayerParty movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 @@ -12687,12 +12687,12 @@ _0811C082: adds r4, 0x64 cmp r4, r5 ble _0811C082 - ldr r4, _0811C0CC @ =gUnknown_2024284 + ldr r4, _0811C0CC @ =gPlayerParty movs r5, 0 adds r6, r4, 0 adds r6, 0x64 _0811C096: - ldr r1, _0811C0D0 @ =gUnknown_202402C + ldr r1, _0811C0D0 @ =gEnemyParty adds r1, r5, r1 adds r0, r4, 0 movs r2, 0x64 @@ -12704,7 +12704,7 @@ _0811C096: movs r0, 0x32 bl IncrementGameStat bl CalculatePlayerPartyCount - ldr r0, _0811C0D8 @ =gUnknown_20386AE + ldr r0, _0811C0D8 @ =gTrainerBattleOpponent_A movs r2, 0xC0 lsls r2, 4 adds r1, r2, 0 @@ -12715,10 +12715,10 @@ _0811C096: pop {r0} bx r0 .align 2, 0 -_0811C0CC: .4byte gUnknown_2024284 -_0811C0D0: .4byte gUnknown_202402C +_0811C0CC: .4byte gPlayerParty +_0811C0D0: .4byte gEnemyParty _0811C0D4: .4byte gUnknown_203B0D4 -_0811C0D8: .4byte gUnknown_20386AE +_0811C0D8: .4byte gTrainerBattleOpponent_A _0811C0DC: .4byte sub_800FD9C thumb_func_end sub_811C04C diff --git a/asm/load_save.s b/asm/load_save.s index bb98ca619..f18414c41 100644 --- a/asm/load_save.s +++ b/asm/load_save.s @@ -284,7 +284,7 @@ _0804C200: movs r1, 0x64 muls r1, r4 adds r0, r1 - ldr r2, _0804C22C @ =gUnknown_2024284 + ldr r2, _0804C22C @ =gPlayerParty adds r1, r2 adds r0, 0x38 movs r2, 0x64 @@ -298,7 +298,7 @@ _0804C200: .align 2, 0 _0804C224: .4byte gSaveBlock1Ptr _0804C228: .4byte gUnknown_2024029 -_0804C22C: .4byte gUnknown_2024284 +_0804C22C: .4byte gPlayerParty thumb_func_end copy_player_party_to_sav1 thumb_func_start sub_804C230 @@ -311,7 +311,7 @@ sub_804C230: @ 804C230 ldrb r0, [r0] strb r0, [r1] movs r4, 0 - ldr r5, _0804C26C @ =gUnknown_2024284 + ldr r5, _0804C26C @ =gPlayerParty _0804C242: movs r0, 0x64 adds r2, r4, 0 @@ -332,7 +332,7 @@ _0804C242: .align 2, 0 _0804C264: .4byte gUnknown_2024029 _0804C268: .4byte gSaveBlock1Ptr -_0804C26C: .4byte gUnknown_2024284 +_0804C26C: .4byte gPlayerParty thumb_func_end sub_804C230 thumb_func_start save_serialize_npcs diff --git a/asm/party_menu.s b/asm/party_menu.s index 93aa6a6e9..c1c1f64b3 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -147,7 +147,7 @@ _0811EB2C: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _0811EB94 @ =gUnknown_2024284 + ldr r1, _0811EB94 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -178,7 +178,7 @@ _0811EB80: bx r0 .align 2, 0 _0811EB90: .4byte gUnknown_203B09C -_0811EB94: .4byte gUnknown_2024284 +_0811EB94: .4byte gPlayerParty _0811EB98: .4byte gTextFlags _0811EB9C: .4byte sub_811EBD0 thumb_func_end sub_811EA44 @@ -891,7 +891,7 @@ _0811F170: .4byte gUnknown_203B0B4 _0811F174: movs r0, 0x64 muls r0, r4 - ldr r1, _0811F1A4 @ =gUnknown_2024284 + ldr r1, _0811F1A4 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -910,7 +910,7 @@ _0811F174: bl CopyWindowToVram b _0811F218 .align 2, 0 -_0811F1A4: .4byte gUnknown_2024284 +_0811F1A4: .4byte gPlayerParty _0811F1A8: .4byte gUnknown_203B0B4 _0811F1AC: ldr r0, _0811F1C0 @ =gUnknown_203B0A0 @@ -991,7 +991,7 @@ sub_811F234: @ 811F234 movs r0, 0x64 adds r1, r4, 0 muls r1, r0 - ldr r0, _0811F284 @ =gUnknown_2024284 + ldr r0, _0811F284 @ =gPlayerParty adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x2D @@ -1021,7 +1021,7 @@ sub_811F234: @ 811F234 bl sub_8121738 b _0811F2EE .align 2, 0 -_0811F284: .4byte gUnknown_2024284 +_0811F284: .4byte gPlayerParty _0811F288: .4byte gUnknown_203B0B4 _0811F28C: ldr r5, _0811F2F8 @ =gUnknown_203B0B4 @@ -1089,7 +1089,7 @@ sub_811F2FC: @ 811F2FC movs r1, 0x64 adds r2, r0, 0 muls r2, r1 - ldr r1, _0811F380 @ =gUnknown_2024284 + ldr r1, _0811F380 @ =gPlayerParty adds r6, r2, r1 ldr r7, _0811F384 @ =gUnknown_203B0B4 ldr r1, [r7] @@ -1139,7 +1139,7 @@ _0811F368: pop {r0} bx r0 .align 2, 0 -_0811F380: .4byte gUnknown_2024284 +_0811F380: .4byte gPlayerParty _0811F384: .4byte gUnknown_203B0B4 thumb_func_end sub_811F2FC @@ -1150,7 +1150,7 @@ sub_811F388: @ 811F388 lsrs r4, r0, 24 movs r0, 0x64 muls r0, r4 - ldr r1, _0811F3AC @ =gUnknown_2024284 + ldr r1, _0811F3AC @ =gPlayerParty adds r0, r1 ldr r5, _0811F3B0 @ =gUnknown_203B0D4 bl sub_8127550 @@ -1162,7 +1162,7 @@ sub_811F388: @ 811F388 bl sub_811F2FC b _0811F3F8 .align 2, 0 -_0811F3AC: .4byte gUnknown_2024284 +_0811F3AC: .4byte gPlayerParty _0811F3B0: .4byte gUnknown_203B0D4 _0811F3B4: adds r1, 0x2 @@ -1243,7 +1243,7 @@ sub_811F430: @ 811F430 movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0811F468 @ =gUnknown_2024284 + ldr r0, _0811F468 @ =gPlayerParty adds r6, r1, r0 ldr r0, _0811F46C @ =gUnknown_203AD30 ldrh r4, [r0] @@ -1265,7 +1265,7 @@ sub_811F430: @ 811F430 bl sub_811F4D0 b _0811F4C6 .align 2, 0 -_0811F468: .4byte gUnknown_2024284 +_0811F468: .4byte gPlayerParty _0811F46C: .4byte gUnknown_203AD30 _0811F470: .4byte gUnknown_203B0A0 _0811F474: .4byte gUnknown_20370D0 @@ -1326,7 +1326,7 @@ sub_811F4D0: @ 811F4D0 lsrs r2, 24 movs r0, 0x64 muls r0, r4 - ldr r3, _0811F4FC @ =gUnknown_2024284 + ldr r3, _0811F4FC @ =gPlayerParty adds r0, r3 bl sub_8120B20 lsls r0, 24 @@ -1339,7 +1339,7 @@ sub_811F4D0: @ 811F4D0 beq _0811F504 b _0811F518 .align 2, 0 -_0811F4FC: .4byte gUnknown_2024284 +_0811F4FC: .4byte gPlayerParty _0811F500: cmp r0, 0x3 bne _0811F518 @@ -1586,7 +1586,7 @@ _0811F6E4: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0811F738 @ =gUnknown_2024284 + ldr r0, _0811F738 @ =gPlayerParty adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB @@ -1622,7 +1622,7 @@ _0811F728: pop {r0} bx r0 .align 2, 0 -_0811F738: .4byte gUnknown_2024284 +_0811F738: .4byte gPlayerParty _0811F73C: .4byte gUnknown_203B0B4 thumb_func_end party_menu_add_per_mon_objects_internal @@ -1756,7 +1756,7 @@ sub_811F818: @ 811F818 beq _0811F8C0 movs r0, 0x64 muls r0, r7 - ldr r1, _0811F87C @ =gUnknown_2024284 + ldr r1, _0811F87C @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -1786,7 +1786,7 @@ sub_811F818: @ 811F818 bl sub_81227B8 b _0811F934 .align 2, 0 -_0811F87C: .4byte gUnknown_2024284 +_0811F87C: .4byte gPlayerParty _0811F880: .4byte gUnknown_203B0B4 _0811F884: mov r0, r8 @@ -1904,7 +1904,7 @@ sub_811F944: @ 811F944 _0811F956: movs r0, 0x64 muls r0, r5 - ldr r1, _0811F9D4 @ =gUnknown_2024284 + ldr r1, _0811F9D4 @ =gPlayerParty adds r0, r1 movs r1, 0x39 bl GetMonData @@ -1972,7 +1972,7 @@ _0811F9CC: pop {r1} bx r1 .align 2, 0 -_0811F9D4: .4byte gUnknown_2024284 +_0811F9D4: .4byte gPlayerParty _0811F9D8: .4byte gUnknown_203B0A0 thumb_func_end sub_811F944 @@ -2013,7 +2013,7 @@ _0811FA1C: .4byte gUnknown_8459FE0 thumb_func_start sub_811FA20 sub_811FA20: @ 811FA20 push {lr} - ldr r0, _0811FA34 @ =gUnknown_2022B4C + ldr r0, _0811FA34 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x4B ands r0, r1 @@ -2022,7 +2022,7 @@ sub_811FA20: @ 811FA20 movs r0, 0 b _0811FA3A .align 2, 0 -_0811FA34: .4byte gUnknown_2022B4C +_0811FA34: .4byte gBattleTypeFlags _0811FA38: movs r0, 0x1 _0811FA3A: @@ -2379,7 +2379,7 @@ _0811FCE8: ldrsb r1, [r5, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _0811FD30 @ =gUnknown_2024284 + ldr r1, _0811FD30 @ =gPlayerParty adds r0, r1 bl GetNumberOfRelearnableMoves lsls r0, 24 @@ -2393,7 +2393,7 @@ _0811FD1A: _0811FD24: .4byte gUnknown_20370C0 _0811FD28: .4byte gUnknown_203B0A0 _0811FD2C: .4byte gUnknown_20370C2 -_0811FD30: .4byte gUnknown_2024284 +_0811FD30: .4byte gPlayerParty _0811FD34: adds r0, r5, 0 bl sub_811FD5C @@ -2421,7 +2421,7 @@ sub_811FD5C: @ 811FD5C ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0811FD78 @ =gUnknown_2024284 + ldr r1, _0811FD78 @ =gPlayerParty adds r0, r1 movs r1, 0x2D bl GetMonData @@ -2430,7 +2430,7 @@ sub_811FD5C: @ 811FD5C movs r0, 0x1 b _0811FD84 .align 2, 0 -_0811FD78: .4byte gUnknown_2024284 +_0811FD78: .4byte gPlayerParty _0811FD7C: movs r0, 0x1A bl PlaySE @@ -3153,7 +3153,7 @@ _081202A6: asrs r4, r1, 24 movs r0, 0x64 muls r0, r4 - ldr r1, _081202D0 @ =gUnknown_2024284 + ldr r1, _081202D0 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -3162,7 +3162,7 @@ _081202A6: adds r0, r4, 0 b _081202D8 .align 2, 0 -_081202D0: .4byte gUnknown_2024284 +_081202D0: .4byte gPlayerParty _081202D4: movs r0, 0x1 negs r0, r0 @@ -3495,7 +3495,7 @@ sub_8120558: @ 8120558 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081205B4 @ =gUnknown_2024284 + ldr r1, _081205B4 @ =gPlayerParty adds r0, r1 adds r1, r5, 0 adds r2, r4, 0 @@ -3520,7 +3520,7 @@ sub_8120558: @ 8120558 bx r0 .align 2, 0 _081205B0: .4byte gUnknown_203B0A0 -_081205B4: .4byte gUnknown_2024284 +_081205B4: .4byte gPlayerParty _081205B8: .4byte gStringVar1 _081205BC: .4byte gStringVar2 _081205C0: .4byte gStringVar4 @@ -3668,7 +3668,7 @@ sub_81206A8: @ 81206A8 ldrsh r0, [r7, r2] movs r5, 0x64 muls r0, r5 - ldr r4, _08120754 @ =gUnknown_2024284 + ldr r4, _08120754 @ =gPlayerParty adds r0, r4 movs r1, 0x39 adds r2, r7, 0 @@ -3730,7 +3730,7 @@ _08120746: bx r0 .align 2, 0 _08120750: .4byte gUnknown_3005098 -_08120754: .4byte gUnknown_2024284 +_08120754: .4byte gPlayerParty _08120758: .4byte gUnknown_203B0B4 _0812075C: .4byte gStringVar2 thumb_func_end sub_81206A8 @@ -3763,7 +3763,7 @@ sub_8120760: @ 8120760 movs r0, 0x64 mov r6, r9 muls r6, r0 - ldr r0, _081207E4 @ =gUnknown_2024284 + ldr r0, _081207E4 @ =gPlayerParty adds r6, r0 mov r0, r8 lsls r4, r0, 2 @@ -3800,7 +3800,7 @@ sub_8120760: @ 8120760 pop {r0} bx r0 .align 2, 0 -_081207E4: .4byte gUnknown_2024284 +_081207E4: .4byte gPlayerParty _081207E8: .4byte gUnknown_3005098 _081207EC: .4byte sub_81206A8 thumb_func_end sub_8120760 @@ -3968,7 +3968,7 @@ sub_81208E4: @ 81208E4 _0812090C: movs r0, 0x64 muls r0, r4 - ldr r1, _08120940 @ =gUnknown_2024284 + ldr r1, _08120940 @ =gPlayerParty adds r0, r1 bl sub_812097C lsls r0, 16 @@ -3989,14 +3989,14 @@ _0812090C: _08120934: .4byte gUnknown_203B0A0 _08120938: .4byte gUnknown_20370C2 _0812093C: .4byte gUnknown_2024029 -_08120940: .4byte gUnknown_2024284 +_08120940: .4byte gPlayerParty _08120944: movs r4, 0 b _08120966 _08120948: movs r0, 0x64 muls r0, r4 - ldr r1, _08120974 @ =gUnknown_2024284 + ldr r1, _08120974 @ =gPlayerParty adds r0, r1 bl sub_81209AC lsls r0, 16 @@ -4018,7 +4018,7 @@ _0812096E: pop {r0} bx r0 .align 2, 0 -_08120974: .4byte gUnknown_2024284 +_08120974: .4byte gPlayerParty _08120978: .4byte gUnknown_2024029 thumb_func_end sub_81208E4 @@ -6641,7 +6641,7 @@ _08121DF4: .4byte gUnknown_845A2E8 thumb_func_start sub_8121DF8 sub_8121DF8: @ 8121DF8 push {r4-r7,lr} - ldr r7, _08121E0C @ =gUnknown_2024284 + ldr r7, _08121E0C @ =gPlayerParty movs r6, 0 ldr r0, _08121E10 @ =gUnknown_203B0A0 ldrb r0, [r0, 0xB] @@ -6651,7 +6651,7 @@ _08121E06: movs r0, 0x1 b _08121E56 .align 2, 0 -_08121E0C: .4byte gUnknown_2024284 +_08121E0C: .4byte gPlayerParty _08121E10: .4byte gUnknown_203B0A0 _08121E14: movs r5, 0 @@ -7632,7 +7632,7 @@ _08122580: _08122588: movs r0, 0x64 muls r0, r5 - ldr r1, _081225C4 @ =gUnknown_2024284 + ldr r1, _081225C4 @ =gPlayerParty adds r0, r1 movs r1, 0xC bl GetMonData @@ -7658,14 +7658,14 @@ _081225B4: bcc _08122588 b _08122604 .align 2, 0 -_081225C4: .4byte gUnknown_2024284 +_081225C4: .4byte gPlayerParty _081225C8: movs r5, 0 b _081225FE _081225CC: movs r0, 0x64 muls r0, r5 - ldr r1, _0812260C @ =gUnknown_202402C + ldr r1, _0812260C @ =gEnemyParty adds r0, r1 movs r1, 0xC bl GetMonData @@ -7695,7 +7695,7 @@ _08122604: pop {r0} bx r0 .align 2, 0 -_0812260C: .4byte gUnknown_202402C +_0812260C: .4byte gEnemyParty thumb_func_end sub_812256C thumb_func_start sub_8122610 @@ -8468,7 +8468,7 @@ sub_8122BD4: @ 8122BD4 movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r6, _08122C24 @ =gUnknown_2024284 + ldr r6, _08122C24 @ =gPlayerParty adds r4, r6 ldr r1, _08122C28 @ =gStringVar1 adds r0, r4, 0 @@ -8495,7 +8495,7 @@ sub_8122BD4: @ 8122BD4 bx r0 .align 2, 0 _08122C20: .4byte gUnknown_203B0A0 -_08122C24: .4byte gUnknown_2024284 +_08122C24: .4byte gPlayerParty _08122C28: .4byte gStringVar1 _08122C2C: .4byte gUnknown_203B09C thumb_func_end sub_8122BD4 @@ -8671,7 +8671,7 @@ sub_8122D78: @ 8122D78 bne _08122D8C bl pokemon_change_order _08122D8C: - ldr r0, _08122DB0 @ =gUnknown_2024284 + ldr r0, _08122DB0 @ =gPlayerParty ldrb r1, [r4, 0x9] ldr r2, _08122DB4 @ =gUnknown_2024029 ldrb r2, [r2] @@ -8688,7 +8688,7 @@ _08122D8C: bx r0 .align 2, 0 _08122DAC: .4byte gUnknown_203B0A0 -_08122DB0: .4byte gUnknown_2024284 +_08122DB0: .4byte gPlayerParty _08122DB4: .4byte gUnknown_2024029 _08122DB8: .4byte sub_8122DBC thumb_func_end sub_8122D78 @@ -9614,7 +9614,7 @@ swap_pokemon_and_oams: @ 81234EC movs r1, 0x64 adds r4, r3, 0 muls r4, r1 - ldr r0, _08123588 @ =gUnknown_2024284 + ldr r0, _08123588 @ =gPlayerParty adds r4, r0 adds r5, r2, 0 muls r5, r1 @@ -9662,7 +9662,7 @@ swap_pokemon_and_oams: @ 81234EC .align 2, 0 _08123580: .4byte gUnknown_203B0B4 _08123584: .4byte gUnknown_203B0A0 -_08123588: .4byte gUnknown_2024284 +_08123588: .4byte gPlayerParty thumb_func_end swap_pokemon_and_oams thumb_func_start sub_812358C @@ -9680,7 +9680,7 @@ sub_812358C: @ 812358C asrs r0, 24 movs r6, 0x64 muls r0, r6 - ldr r5, _081235E4 @ =gUnknown_2024284 + ldr r5, _081235E4 @ =gPlayerParty adds r0, r5 movs r1, 0x41 bl GetMonData @@ -9705,7 +9705,7 @@ sub_812358C: @ 812358C bx r0 .align 2, 0 _081235E0: .4byte gUnknown_203B0A0 -_081235E4: .4byte gUnknown_2024284 +_081235E4: .4byte gPlayerParty thumb_func_end sub_812358C thumb_func_start sub_81235E8 @@ -9808,7 +9808,7 @@ sub_81236A0: @ 81236A0 ldr r0, [r4] adds r0, 0xD bl sub_8121CE4 - ldr r0, _081236F4 @ =gUnknown_2024284 + ldr r0, _081236F4 @ =gPlayerParty ldr r1, _081236F8 @ =gUnknown_203B0A0 ldrb r1, [r1, 0x9] movs r2, 0x8 @@ -9831,7 +9831,7 @@ sub_81236A0: @ 81236A0 bx r0 .align 2, 0 _081236F0: .4byte gUnknown_203B09C -_081236F4: .4byte gUnknown_2024284 +_081236F4: .4byte gPlayerParty _081236F8: .4byte gUnknown_203B0A0 _081236FC: .4byte gUnknown_3005090 _08123700: .4byte sub_8122C5C @@ -9907,7 +9907,7 @@ _08123778: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r7, _081237C4 @ =gUnknown_2024284 + ldr r7, _081237C4 @ =gPlayerParty adds r0, r7 movs r1, 0xC bl GetMonData @@ -9933,7 +9933,7 @@ _081237AE: .align 2, 0 _081237BC: .4byte gUnknown_203B0D8 _081237C0: .4byte gUnknown_203B0A0 -_081237C4: .4byte gUnknown_2024284 +_081237C4: .4byte gPlayerParty _081237C8: .4byte sub_81238A4 _081237CC: ldrh r0, [r6] @@ -10001,7 +10001,7 @@ sub_8123824: @ 8123824 asrs r0, 24 movs r6, 0x64 muls r0, r6 - ldr r5, _08123898 @ =gUnknown_2024284 + ldr r5, _08123898 @ =gPlayerParty adds r0, r5 adds r1, r4, 0 movs r2, 0 @@ -10034,7 +10034,7 @@ _08123880: _0812388C: .4byte gUnknown_2037AB8 _08123890: .4byte gUnknown_203AD30 _08123894: .4byte gUnknown_203B0A0 -_08123898: .4byte gUnknown_2024284 +_08123898: .4byte gPlayerParty _0812389C: .4byte gUnknown_3005090 _081238A0: .4byte sub_8123BF0 thumb_func_end sub_8123824 @@ -10055,7 +10055,7 @@ sub_81238A4: @ 81238A4 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081238EC @ =gUnknown_2024284 + ldr r1, _081238EC @ =gPlayerParty adds r0, r1 ldr r1, _081238F0 @ =gUnknown_203B0D8 ldrh r1, [r1] @@ -10075,7 +10075,7 @@ _081238DC: .align 2, 0 _081238E4: .4byte gUnknown_2037AB8 _081238E8: .4byte gUnknown_203B0A0 -_081238EC: .4byte gUnknown_2024284 +_081238EC: .4byte gPlayerParty _081238F0: .4byte gUnknown_203B0D8 _081238F4: .4byte gUnknown_3005090 _081238F8: .4byte sub_81238FC @@ -10174,7 +10174,7 @@ _081239AC: ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081239E0 @ =gUnknown_2024284 + ldr r1, _081239E0 @ =gPlayerParty adds r0, r1 ldrh r1, [r5] bl sub_81205C8 @@ -10188,7 +10188,7 @@ _081239AC: b _08123A40 .align 2, 0 _081239DC: .4byte gUnknown_203B0A0 -_081239E0: .4byte gUnknown_2024284 +_081239E0: .4byte gPlayerParty _081239E4: .4byte gUnknown_3005090 _081239E8: .4byte sub_8123A50 _081239EC: @@ -10197,7 +10197,7 @@ _081239EC: ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08123A20 @ =gUnknown_2024284 + ldr r1, _08123A20 @ =gPlayerParty adds r0, r1 ldrh r1, [r5] bl sub_81205C8 @@ -10215,7 +10215,7 @@ _081239EC: b _08123A40 .align 2, 0 _08123A1C: .4byte gUnknown_203B0A0 -_08123A20: .4byte gUnknown_2024284 +_08123A20: .4byte gPlayerParty _08123A24: .4byte gUnknown_3005090 _08123A28: .4byte sub_8123BF0 _08123A2C: @@ -10271,7 +10271,7 @@ sub_8123A80: @ 8123A80 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08123ABC @ =gUnknown_2024284 + ldr r1, _08123ABC @ =gPlayerParty adds r0, r1 movs r1, 0x40 bl GetMonData @@ -10292,7 +10292,7 @@ sub_8123A80: @ 8123A80 bx r0 .align 2, 0 _08123AB8: .4byte gUnknown_203B0A0 -_08123ABC: .4byte gUnknown_2024284 +_08123ABC: .4byte gPlayerParty _08123AC0: .4byte gSaveBlock1Ptr _08123AC4: .4byte 0x00002cd0 _08123AC8: .4byte sub_8123ACC @@ -10309,7 +10309,7 @@ sub_8123ACC: @ 8123ACC ldrsb r1, [r6, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08123B3C @ =gUnknown_2024284 + ldr r0, _08123B3C @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0xC @@ -10349,7 +10349,7 @@ sub_8123ACC: @ 8123ACC b _08123B68 .align 2, 0 _08123B38: .4byte gUnknown_203B0A0 -_08123B3C: .4byte gUnknown_2024284 +_08123B3C: .4byte gPlayerParty _08123B40: .4byte gUnknown_20370D0 _08123B44: .4byte gUnknown_203B0D8 _08123B48: .4byte sub_8122C30 @@ -10398,7 +10398,7 @@ sub_8123B78: @ 8123B78 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08123BBC @ =gUnknown_2024284 + ldr r1, _08123BBC @ =gPlayerParty adds r0, r1 ldr r1, _08123BC0 @ =gUnknown_203AD30 ldrh r1, [r1] @@ -10410,7 +10410,7 @@ sub_8123B78: @ 8123B78 _08123BB0: .4byte gUnknown_2037AB8 _08123BB4: .4byte gUnknown_203B0D8 _08123BB8: .4byte gUnknown_203B0A0 -_08123BBC: .4byte gUnknown_2024284 +_08123BBC: .4byte gPlayerParty _08123BC0: .4byte gUnknown_203AD30 _08123BC4: ldr r0, _08123BE4 @ =gUnknown_203AD30 @@ -10452,7 +10452,7 @@ sub_8123BF0: @ 8123BF0 asrs r2, 24 movs r0, 0x64 muls r0, r2 - ldr r1, _08123C30 @ =gUnknown_2024284 + ldr r1, _08123C30 @ =gPlayerParty adds r0, r1 ldr r1, _08123C34 @ =gUnknown_203B0B4 lsls r2, 4 @@ -10467,7 +10467,7 @@ _08123C24: bx r0 .align 2, 0 _08123C2C: .4byte gUnknown_203B0A0 -_08123C30: .4byte gUnknown_2024284 +_08123C30: .4byte gPlayerParty _08123C34: .4byte gUnknown_203B0B4 thumb_func_end sub_8123BF0 @@ -10481,7 +10481,7 @@ sub_8123C38: @ 8123C38 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08123C94 @ =gUnknown_2024284 + ldr r0, _08123C94 @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0xC @@ -10512,7 +10512,7 @@ sub_8123C38: @ 8123C38 b _08123CCE .align 2, 0 _08123C90: .4byte gUnknown_203B0A0 -_08123C94: .4byte gUnknown_2024284 +_08123C94: .4byte gPlayerParty _08123C98: .4byte gUnknown_203B09C _08123C9C: ldr r1, _08123CB4 @ =gStringVar1 @@ -10569,7 +10569,7 @@ sub_8123CF4: @ 8123CF4 ldr r0, [r4] adds r0, 0xD bl sub_8121CE4 - ldr r0, _08123D48 @ =gUnknown_2024284 + ldr r0, _08123D48 @ =gPlayerParty ldr r1, _08123D4C @ =gUnknown_203B0A0 ldrb r1, [r1, 0x9] movs r2, 0x9 @@ -10592,7 +10592,7 @@ sub_8123CF4: @ 8123CF4 bx r0 .align 2, 0 _08123D44: .4byte gUnknown_203B09C -_08123D48: .4byte gUnknown_2024284 +_08123D48: .4byte gPlayerParty _08123D4C: .4byte gUnknown_203B0A0 _08123D50: .4byte gUnknown_3005090 _08123D54: .4byte sub_8122C5C @@ -10628,7 +10628,7 @@ sub_8123D84: @ 8123D84 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08123DBC @ =gUnknown_2024284 + ldr r1, _08123DBC @ =gPlayerParty adds r0, r1 movs r1, 0x40 bl GetMonData @@ -10647,7 +10647,7 @@ sub_8123D84: @ 8123D84 bx r0 .align 2, 0 _08123DB8: .4byte gUnknown_203B0A0 -_08123DBC: .4byte gUnknown_2024284 +_08123DBC: .4byte gPlayerParty _08123DC0: .4byte gSaveBlock1Ptr _08123DC4: .4byte 0x00002cd0 _08123DC8: .4byte sub_8123DCC @@ -10774,7 +10774,7 @@ _08123EB2: ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08123EE8 @ =gUnknown_2024284 + ldr r1, _08123EE8 @ =gPlayerParty adds r0, r1 bl sub_809803C lsls r0, 24 @@ -10793,7 +10793,7 @@ _08123EB2: b _08123F36 .align 2, 0 _08123EE4: .4byte gUnknown_203B0A0 -_08123EE8: .4byte gUnknown_2024284 +_08123EE8: .4byte gPlayerParty _08123EEC: .4byte gUnknown_8416B86 _08123EF0: .4byte gUnknown_3005090 _08123EF4: .4byte sub_8123BF0 @@ -10895,7 +10895,7 @@ _08123FAA: asrs r0, 24 movs r7, 0x64 muls r0, r7 - ldr r6, _08124000 @ =gUnknown_2024284 + ldr r6, _08124000 @ =gPlayerParty adds r0, r6 movs r1, 0xC bl GetMonData @@ -10927,7 +10927,7 @@ _08123FAA: b _08124050 .align 2, 0 _08123FFC: .4byte gUnknown_203B0A0 -_08124000: .4byte gUnknown_2024284 +_08124000: .4byte gPlayerParty _08124004: .4byte gUnknown_8416CC7 _08124008: .4byte gUnknown_3005090 _0812400C: .4byte sub_8123BF0 @@ -10987,7 +10987,7 @@ sub_8124064: @ 8124064 movs r0, 0x64 adds r5, r1, 0 muls r5, r0 - ldr r0, _081240E4 @ =gUnknown_2024284 + ldr r0, _081240E4 @ =gPlayerParty mov r9, r0 add r5, r9 movs r0, 0x5 @@ -11030,7 +11030,7 @@ sub_8124064: @ 8124064 bx r0 .align 2, 0 _081240E0: .4byte gUnknown_203B0A0 -_081240E4: .4byte gUnknown_2024284 +_081240E4: .4byte gPlayerParty _081240E8: .4byte gUnknown_203B09C _081240EC: .4byte gUnknown_3005090 _081240F0: .4byte sub_8122C5C @@ -11371,7 +11371,7 @@ sub_8124384: @ 8124384 mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r4, _08124414 @ =gUnknown_2024284 + ldr r4, _08124414 @ =gPlayerParty adds r0, r4 movs r1, 0x41 bl GetMonData @@ -11419,7 +11419,7 @@ sub_8124384: @ 8124384 b _0812446C .align 2, 0 _08124410: .4byte gUnknown_203B0A0 -_08124414: .4byte gUnknown_2024284 +_08124414: .4byte gPlayerParty _08124418: ldr r0, _08124424 @ =gStringVar4 ldr r1, _08124428 @ =gUnknown_84170BC @@ -11488,7 +11488,7 @@ brm_trade_1: @ 8124490 asrs r0, 24 movs r6, 0x64 muls r0, r6 - ldr r4, _0812455C @ =gUnknown_2024284 + ldr r4, _0812455C @ =gPlayerParty adds r0, r4 movs r1, 0x41 bl GetMonData @@ -11565,7 +11565,7 @@ brm_trade_1: @ 8124490 b _08124590 .align 2, 0 _08124558: .4byte gUnknown_203B0A0 -_0812455C: .4byte gUnknown_2024284 +_0812455C: .4byte gPlayerParty _08124560: .4byte gUnknown_203B064 _08124564: .4byte gUnknown_203B068 _08124568: .4byte gUnknown_203B06A @@ -11797,7 +11797,7 @@ _0812475C: lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _08124788 @ =gUnknown_2024284 + ldr r1, _08124788 @ =gPlayerParty adds r0, r1 adds r1, r4, 0 bl sub_8124BB0 @@ -11808,7 +11808,7 @@ _08124778: .align 2, 0 _08124780: .4byte gUnknown_203B0A0 _08124784: .4byte c2_exit_to_overworld_2_switch -_08124788: .4byte gUnknown_2024284 +_08124788: .4byte gPlayerParty _0812478C: cmp r4, 0 beq _0812479A @@ -11922,7 +11922,7 @@ _0812484E: lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _08124884 @ =gUnknown_2024284 + ldr r1, _08124884 @ =gPlayerParty adds r0, r1 ldr r1, _08124888 @ =gUnknown_203B09C ldr r1, [r1] @@ -11937,7 +11937,7 @@ _0812484E: .align 2, 0 _0812487C: .4byte gUnknown_203B0A0 _08124880: .4byte c2_exit_to_overworld_2_switch -_08124884: .4byte gUnknown_2024284 +_08124884: .4byte gPlayerParty _08124888: .4byte gUnknown_203B09C _0812488C: movs r0, 0x5 @@ -12010,7 +12010,7 @@ brm_get_selected_species: @ 8124904 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08124928 @ =gUnknown_2024284 + ldr r1, _08124928 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -12020,7 +12020,7 @@ brm_get_selected_species: @ 8124904 bx r1 .align 2, 0 _08124924: .4byte gUnknown_203B0A0 -_08124928: .4byte gUnknown_2024284 +_08124928: .4byte gPlayerParty thumb_func_end brm_get_selected_species thumb_func_start task_brm_cancel_1_on_keypad_a_or_b @@ -12438,7 +12438,7 @@ sub_8124C1C: @ 8124C1C lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _08124C88 @ =gUnknown_2024284 + ldr r1, _08124C88 @ =gPlayerParty adds r0, r1 movs r1, 0x41 bl GetMonData @@ -12456,7 +12456,7 @@ sub_8124C1C: @ 8124C1C pop {r0} bx r0 .align 2, 0 -_08124C88: .4byte gUnknown_2024284 +_08124C88: .4byte gPlayerParty thumb_func_end sub_8124C1C thumb_func_start sub_8124C8C @@ -12510,7 +12510,7 @@ _08124CEA: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08124D38 @ =gUnknown_2024284 + ldr r0, _08124D38 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -12544,7 +12544,7 @@ _08124D28: .align 2, 0 _08124D30: .4byte gUnknown_203AD30 _08124D34: .4byte gUnknown_203B0A0 -_08124D38: .4byte gUnknown_2024284 +_08124D38: .4byte gPlayerParty _08124D3C: .4byte sub_8124DB0 _08124D40: .4byte sub_8124FC8 _08124D44: @@ -12712,7 +12712,7 @@ sub_8124E48: @ 8124E48 movs r6, 0x64 adds r4, r0, 0 muls r4, r6 - ldr r5, _08124EC4 @ =gUnknown_2024284 + ldr r5, _08124EC4 @ =gPlayerParty adds r4, r5 ldrh r0, [r7] bl ItemIdToBattleMoveId @@ -12744,7 +12744,7 @@ _08124EB0: .align 2, 0 _08124EBC: .4byte gUnknown_203AD30 _08124EC0: .4byte gUnknown_203B0A0 -_08124EC4: .4byte gUnknown_2024284 +_08124EC4: .4byte gPlayerParty _08124EC8: ldr r2, _08124EF4 @ =gUnknown_203B0A0 ldrb r0, [r2, 0x8] @@ -12788,7 +12788,7 @@ sub_8124EFC: @ 8124EFC movs r0, 0x64 adds r5, r1, 0 muls r5, r0 - ldr r0, _08124F8C @ =gUnknown_2024284 + ldr r0, _08124F8C @ =gPlayerParty adds r5, r0 bl sub_8138B2C adds r4, r0, 0 @@ -12836,7 +12836,7 @@ _08124F7C: b _08124FB2 .align 2, 0 _08124F88: .4byte gUnknown_203B0A0 -_08124F8C: .4byte gUnknown_2024284 +_08124F8C: .4byte gPlayerParty _08124F90: .4byte gUnknown_203AD30 _08124F94: ldr r4, _08124FC0 @ =gUnknown_203B0A0 @@ -13193,7 +13193,7 @@ ExecuteTableBasedItemEffect__: @ 8125268 bne _081252A0 movs r0, 0x64 muls r0, r3 - ldr r1, _0812529C @ =gUnknown_2024284 + ldr r1, _0812529C @ =gPlayerParty adds r0, r1 adds r1, r5, 0 adds r2, r3, 0 @@ -13201,12 +13201,12 @@ ExecuteTableBasedItemEffect__: @ 8125268 .align 2, 0 _08125294: .4byte gMain _08125298: .4byte 0x00000439 -_0812529C: .4byte gUnknown_2024284 +_0812529C: .4byte gPlayerParty _081252A0: movs r0, 0x64 adds r4, r3, 0 muls r4, r0 - ldr r0, _081252CC @ =gUnknown_2024284 + ldr r0, _081252CC @ =gPlayerParty adds r4, r0 adds r0, r3, 0 bl sub_8127F7C @@ -13224,7 +13224,7 @@ _081252BA: pop {r1} bx r1 .align 2, 0 -_081252CC: .4byte gUnknown_2024284 +_081252CC: .4byte gPlayerParty thumb_func_end ExecuteTableBasedItemEffect__ thumb_func_start sub_81252D0 @@ -13240,7 +13240,7 @@ sub_81252D0: @ 81252D0 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08125304 @ =gUnknown_2024284 + ldr r0, _08125304 @ =gPlayerParty adds r5, r1, r0 ldr r0, _08125308 @ =gUnknown_203AD30 ldrh r6, [r0] @@ -13254,7 +13254,7 @@ sub_81252D0: @ 81252D0 b _08125342 .align 2, 0 _08125300: .4byte gUnknown_203B0A0 -_08125304: .4byte gUnknown_2024284 +_08125304: .4byte gPlayerParty _08125308: .4byte gUnknown_203AD30 _0812530C: adds r0, r6, 0 @@ -13349,7 +13349,7 @@ ItemUseCB_Medicine: @ 81253B0 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _0812543C @ =gUnknown_2024284 + ldr r0, _0812543C @ =gPlayerParty adds r5, r1, r0 ldr r0, _08125440 @ =gUnknown_203AD30 ldrh r6, [r0] @@ -13398,7 +13398,7 @@ _08125428: b _0812551C .align 2, 0 _08125438: .4byte gUnknown_203B0A0 -_0812543C: .4byte gUnknown_2024284 +_0812543C: .4byte gPlayerParty _08125440: .4byte gUnknown_203AD30 _08125444: .4byte gUnknown_203B0C0 _08125448: .4byte gUnknown_84169DC @@ -13536,7 +13536,7 @@ sub_8125554: @ 8125554 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081255A4 @ =gUnknown_2024284 + ldr r1, _081255A4 @ =gPlayerParty adds r0, r1 ldr r1, _081255A8 @ =gStringVar1 bl GetMonNickname @@ -13562,7 +13562,7 @@ sub_8125554: @ 8125554 bx r0 .align 2, 0 _081255A0: .4byte gUnknown_203B0A0 -_081255A4: .4byte gUnknown_2024284 +_081255A4: .4byte gPlayerParty _081255A8: .4byte gStringVar1 _081255AC: .4byte gStringVar4 _081255B0: .4byte gUnknown_8416F27 @@ -13625,7 +13625,7 @@ sub_81255F0: @ 81255F0 muls r2, r0 str r2, [sp, 0xC] _08125620: - ldr r0, _081256B8 @ =gUnknown_2024284 + ldr r0, _081256B8 @ =gPlayerParty adds r1, r6, 0 adds r1, 0xD ldr r2, [sp, 0xC] @@ -13696,7 +13696,7 @@ _08125680: pop {r0} bx r0 .align 2, 0 -_081256B8: .4byte gUnknown_2024284 +_081256B8: .4byte gPlayerParty _081256BC: .4byte gUnknown_8247094 thumb_func_end sub_81255F0 @@ -13876,7 +13876,7 @@ sub_812580C: @ 812580C ldrsb r1, [r3, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08125864 @ =gUnknown_2024284 + ldr r1, _08125864 @ =gPlayerParty adds r0, r1 ldr r1, _08125868 @ =gUnknown_203AD30 ldrh r1, [r1] @@ -13908,7 +13908,7 @@ sub_812580C: @ 812580C b _08125888 .align 2, 0 _08125860: .4byte gUnknown_203B0A0 -_08125864: .4byte gUnknown_2024284 +_08125864: .4byte gPlayerParty _08125868: .4byte gUnknown_203AD30 _0812586C: .4byte gUnknown_203B0C0 _08125870: .4byte gUnknown_84169DC @@ -13944,7 +13944,7 @@ sub_8125898: @ 8125898 movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _08125934 @ =gUnknown_2024284 + ldr r0, _08125934 @ =gPlayerParty adds r4, r0 ldrb r0, [r5, 0x9] ldr r6, _08125938 @ =gUnknown_203AD30 @@ -14000,7 +14000,7 @@ sub_8125898: @ 8125898 bx r0 .align 2, 0 _08125930: .4byte gUnknown_203B0A0 -_08125934: .4byte gUnknown_2024284 +_08125934: .4byte gPlayerParty _08125938: .4byte gUnknown_203AD30 _0812593C: .4byte gUnknown_203B0C0 _08125940: .4byte 0x0000ffff @@ -14054,7 +14054,7 @@ _081259A0: movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _08125A20 @ =gUnknown_2024284 + ldr r0, _08125A20 @ =gPlayerParty adds r4, r0 ldr r3, _08125A24 @ =0x0000ffff movs r0, 0x4 @@ -14101,7 +14101,7 @@ _081259F6: bx r0 .align 2, 0 _08125A1C: .4byte gUnknown_203B0C0 -_08125A20: .4byte gUnknown_2024284 +_08125A20: .4byte gPlayerParty _08125A24: .4byte 0x0000ffff _08125A28: .4byte gStringVar1 _08125A2C: .4byte gUnknown_8247094 @@ -14270,7 +14270,7 @@ sub_8125B40: @ 8125B40 ldrsb r1, [r7, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08125BD4 @ =gUnknown_2024284 + ldr r0, _08125BD4 @ =gPlayerParty adds r4, r1, r0 movs r0, 0xE adds r0, r7 @@ -14324,7 +14324,7 @@ sub_8125B40: @ 8125B40 b _08125C20 .align 2, 0 _08125BD0: .4byte gUnknown_203B0A0 -_08125BD4: .4byte gUnknown_2024284 +_08125BD4: .4byte gPlayerParty _08125BD8: .4byte gUnknown_203AD30 _08125BDC: .4byte gStringVar1 _08125BE0: .4byte gStringVar2 @@ -14387,7 +14387,7 @@ sub_8125C48: @ 8125C48 ldrsb r1, [r2, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08125CD0 @ =gUnknown_2024284 + ldr r0, _08125CD0 @ =gPlayerParty adds r5, r1, r0 adds r6, r2, 0 adds r6, 0xE @@ -14440,7 +14440,7 @@ _08125C84: bx r0 .align 2, 0 _08125CCC: .4byte gUnknown_203B0A0 -_08125CD0: .4byte gUnknown_2024284 +_08125CD0: .4byte gPlayerParty _08125CD4: .4byte gUnknown_203AD30 _08125CD8: .4byte gStringVar1 _08125CDC: .4byte gStringVar2 @@ -14634,7 +14634,7 @@ _08125E48: .4byte sub_8125E4C sub_8125E4C: @ 8125E4C push {r4,lr} sub sp, 0x4 - ldr r0, _08125E74 @ =gUnknown_2024284 + ldr r0, _08125E74 @ =gPlayerParty ldr r4, _08125E78 @ =gUnknown_203B0A0 ldrb r1, [r4, 0x9] ldr r2, _08125E7C @ =gUnknown_2024029 @@ -14651,7 +14651,7 @@ sub_8125E4C: @ 8125E4C pop {r0} bx r0 .align 2, 0 -_08125E74: .4byte gUnknown_2024284 +_08125E74: .4byte gPlayerParty _08125E78: .4byte gUnknown_203B0A0 _08125E7C: .4byte gUnknown_2024029 _08125E80: .4byte sub_8125E84 @@ -14675,7 +14675,7 @@ sub_8125E84: @ 8125E84 ldrsb r1, [r4, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08125ED4 @ =gUnknown_2024284 + ldr r1, _08125ED4 @ =gPlayerParty adds r0, r1 adds r1, r2, 0 adds r1, 0xD @@ -14695,7 +14695,7 @@ sub_8125E84: @ 8125E84 b _08125F02 .align 2, 0 _08125ED0: .4byte gUnknown_203B0A0 -_08125ED4: .4byte gUnknown_2024284 +_08125ED4: .4byte gPlayerParty _08125ED8: .4byte gUnknown_203AD30 _08125EDC: .4byte sub_8124EFC _08125EE0: .4byte gUnknown_3005E98 @@ -14781,7 +14781,7 @@ sub_8125F5C: @ 8125F5C movs r0, 0x64 adds r6, r1, 0 muls r6, r0 - ldr r0, _08125FE8 @ =gUnknown_2024284 + ldr r0, _08125FE8 @ =gPlayerParty adds r6, r0 bl sub_8138B2C adds r5, r0, 0 @@ -14827,7 +14827,7 @@ sub_8125F5C: @ 8125F5C bx r0 .align 2, 0 _08125FE4: .4byte gUnknown_203B0A0 -_08125FE8: .4byte gUnknown_2024284 +_08125FE8: .4byte gPlayerParty _08125FEC: .4byte gUnknown_203AD30 _08125FF0: .4byte gStringVar1 _08125FF4: .4byte gStringVar2 @@ -14846,7 +14846,7 @@ sub_8125FFC: @ 8125FFC movs r0, 0x64 adds r5, r1, 0 muls r5, r0 - ldr r0, _08126060 @ =gUnknown_2024284 + ldr r0, _08126060 @ =gPlayerParty adds r5, r0 bl sub_8138B2C adds r1, r0, 0 @@ -14881,7 +14881,7 @@ sub_8125FFC: @ 8125FFC bx r0 .align 2, 0 _0812605C: .4byte gUnknown_203B0A0 -_08126060: .4byte gUnknown_2024284 +_08126060: .4byte gPlayerParty _08126064: .4byte gStringVar1 _08126068: .4byte gStringVar2 _0812606C: .4byte gUnknown_8247094 @@ -14906,7 +14906,7 @@ sub_812607C: @ 812607C movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _081260D4 @ =gUnknown_2024284 + ldr r0, _081260D4 @ =gPlayerParty adds r4, r0 bl sub_8138B2C adds r1, r0, 0 @@ -14930,7 +14930,7 @@ _081260C8: bx r0 .align 2, 0 _081260D0: .4byte gUnknown_203B0A0 -_081260D4: .4byte gUnknown_2024284 +_081260D4: .4byte gPlayerParty thumb_func_end sub_812607C thumb_func_start sub_81260D8 @@ -15014,7 +15014,7 @@ sub_8126170: @ 8126170 ldrsb r1, [r7, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081261A4 @ =gUnknown_2024284 + ldr r0, _081261A4 @ =gPlayerParty adds r4, r1, r0 bl ProcessMenuInputNoWrap_ lsls r0, 24 @@ -15030,7 +15030,7 @@ sub_8126170: @ 8126170 b _0812626A .align 2, 0 _081261A0: .4byte gUnknown_203B0A0 -_081261A4: .4byte gUnknown_2024284 +_081261A4: .4byte gPlayerParty _081261A8: cmp r5, 0x1 beq _0812623A @@ -15162,7 +15162,7 @@ dp05_rare_candy: @ 81262AC ldrsb r1, [r7, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081262EC @ =gUnknown_2024284 + ldr r0, _081262EC @ =gPlayerParty adds r4, r1, r0 ldr r0, _081262F0 @ =gUnknown_203AD30 ldrh r5, [r0] @@ -15181,7 +15181,7 @@ dp05_rare_candy: @ 81262AC b _081262F6 .align 2, 0 _081262E8: .4byte gUnknown_203B0A0 -_081262EC: .4byte gUnknown_2024284 +_081262EC: .4byte gPlayerParty _081262F0: .4byte gUnknown_203AD30 _081262F4: movs r4, 0x1 @@ -15242,7 +15242,7 @@ sub_8126350: @ 8126350 movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _08126414 @ =gUnknown_2024284 + ldr r0, _08126414 @ =gPlayerParty adds r4, r0 ldr r0, _08126418 @ =gUnknown_203B09C ldr r7, [r0] @@ -15314,7 +15314,7 @@ sub_8126350: @ 8126350 bx r0 .align 2, 0 _08126410: .4byte gUnknown_203B0A0 -_08126414: .4byte gUnknown_2024284 +_08126414: .4byte gPlayerParty _08126418: .4byte gUnknown_203B09C _0812641C: .4byte gUnknown_203AD30 _08126420: .4byte gUnknown_203B0C0 @@ -15570,7 +15570,7 @@ _08126620: ldrsb r1, [r4, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08126658 @ =gUnknown_2024284 + ldr r1, _08126658 @ =gPlayerParty adds r0, r1 movs r1, 0x1 bl MonTryLearningNewMove @@ -15588,7 +15588,7 @@ _08126620: .align 2, 0 _08126650: .4byte gMain _08126654: .4byte gUnknown_203B0A0 -_08126658: .4byte gUnknown_2024284 +_08126658: .4byte gPlayerParty _0812665C: .4byte 0x0000fffe _08126660: ldr r0, _08126668 @ =0x0000ffff @@ -15636,7 +15636,7 @@ sub_81266A0: @ 81266A0 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081266D4 @ =gUnknown_2024284 + ldr r1, _081266D4 @ =gPlayerParty adds r0, r1 movs r1, 0 bl MonTryLearningNewMove @@ -15652,7 +15652,7 @@ sub_81266A0: @ 81266A0 b _081266F8 .align 2, 0 _081266D0: .4byte gUnknown_203B0A0 -_081266D4: .4byte gUnknown_2024284 +_081266D4: .4byte gPlayerParty _081266D8: .4byte 0x0000fffe _081266DC: ldr r0, _081266E4 @ =0x0000ffff @@ -15688,7 +15688,7 @@ sub_8126704: @ 8126704 ldrsb r1, [r6, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _0812674C @ =gUnknown_2024284 + ldr r0, _0812674C @ =gPlayerParty adds r7, r1, r0 adds r0, r7, 0 movs r1, 0 @@ -15712,7 +15712,7 @@ sub_8126704: @ 8126704 b _08126762 .align 2, 0 _08126748: .4byte gUnknown_203B0A0 -_0812674C: .4byte gUnknown_2024284 +_0812674C: .4byte gPlayerParty _08126750: .4byte gUnknown_300537C _08126754: ldr r0, _08126768 @ =gUnknown_3005090 @@ -15745,7 +15745,7 @@ sub_8126770: @ 8126770 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081267E0 @ =gUnknown_2024284 + ldr r1, _081267E0 @ =gPlayerParty adds r0, r1 ldr r1, _081267E4 @ =gStringVar1 bl GetMonNickname @@ -15783,7 +15783,7 @@ sub_8126770: @ 8126770 bx r0 .align 2, 0 _081267DC: .4byte gUnknown_203B0A0 -_081267E0: .4byte gUnknown_2024284 +_081267E0: .4byte gPlayerParty _081267E4: .4byte gStringVar1 _081267E8: .4byte gStringVar2 _081267EC: .4byte gUnknown_2024022 @@ -15811,7 +15811,7 @@ sub_8126804: @ 8126804 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08126874 @ =gUnknown_2024284 + ldr r1, _08126874 @ =gPlayerParty adds r0, r1 ldr r1, _08126878 @ =gStringVar1 bl GetMonNickname @@ -15846,7 +15846,7 @@ sub_8126804: @ 8126804 bx r0 .align 2, 0 _08126870: .4byte gUnknown_203B0A0 -_08126874: .4byte gUnknown_2024284 +_08126874: .4byte gPlayerParty _08126878: .4byte gStringVar1 _0812687C: .4byte gStringVar2 _08126880: .4byte gUnknown_8247094 @@ -15905,7 +15905,7 @@ sub_81268D4: @ 81268D4 ldrsb r1, [r6, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08126934 @ =gUnknown_2024284 + ldr r0, _08126934 @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0xB @@ -15937,7 +15937,7 @@ _08126920: b _081269EE .align 2, 0 _08126930: .4byte gUnknown_203B0A0 -_08126934: .4byte gUnknown_2024284 +_08126934: .4byte gPlayerParty _08126938: .4byte gUnknown_203AD30 _0812693C: .4byte gUnknown_3005090 _08126940: .4byte sub_8126A18 @@ -16158,7 +16158,7 @@ sub_8126AFC: @ 8126AFC ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08126B48 @ =gUnknown_2024284 + ldr r1, _08126B48 @ =gPlayerParty adds r0, r1 ldr r1, _08126B4C @ =gStringVar1 bl GetMonNickname @@ -16183,7 +16183,7 @@ sub_8126AFC: @ 8126AFC bx r0 .align 2, 0 _08126B44: .4byte gUnknown_203B0A0 -_08126B48: .4byte gUnknown_2024284 +_08126B48: .4byte gPlayerParty _08126B4C: .4byte gStringVar1 _08126B50: .4byte gStringVar4 _08126B54: .4byte gUnknown_8416F27 @@ -16204,7 +16204,7 @@ sub_8126B60: @ 8126B60 ldrsb r1, [r2, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08126BB4 @ =gUnknown_2024284 + ldr r1, _08126BB4 @ =gPlayerParty adds r0, r1 ldr r1, _08126BB8 @ =gUnknown_203AD30 ldrh r1, [r1] @@ -16231,7 +16231,7 @@ sub_8126B60: @ 8126B60 b _08126BCE .align 2, 0 _08126BB0: .4byte gUnknown_203B0A0 -_08126BB4: .4byte gUnknown_2024284 +_08126BB4: .4byte gPlayerParty _08126BB8: .4byte gUnknown_203AD30 _08126BBC: .4byte gUnknown_203B0C0 _08126BC0: .4byte gUnknown_84169DC @@ -16261,7 +16261,7 @@ sub_8126BD4: @ 8126BD4 ldrsb r1, [r4, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08126C1C @ =gUnknown_2024284 + ldr r0, _08126C1C @ =gPlayerParty adds r1, r0 ldrh r2, [r5] ldr r3, _08126C20 @ =0x0000ffff @@ -16277,7 +16277,7 @@ sub_8126BD4: @ 8126BD4 _08126C10: .4byte gUnknown_300537C _08126C14: .4byte gUnknown_203B0A0 _08126C18: .4byte gUnknown_203AD30 -_08126C1C: .4byte gUnknown_2024284 +_08126C1C: .4byte gPlayerParty _08126C20: .4byte 0x0000ffff thumb_func_end sub_8126BD4 @@ -16292,7 +16292,7 @@ sub_8126C24: @ 8126C24 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08126C58 @ =gUnknown_2024284 + ldr r1, _08126C58 @ =gPlayerParty adds r0, r1 ldr r1, _08126C5C @ =gUnknown_203AD30 ldrh r2, [r1] @@ -16306,7 +16306,7 @@ sub_8126C24: @ 8126C24 b _08126C62 .align 2, 0 _08126C54: .4byte gUnknown_203B0A0 -_08126C58: .4byte gUnknown_2024284 +_08126C58: .4byte gPlayerParty _08126C5C: .4byte gUnknown_203AD30 _08126C60: movs r0, 0x1 @@ -16539,7 +16539,7 @@ sub_8126DC8: @ 8126DC8 ldrsb r1, [r7, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08126E54 @ =gUnknown_2024284 + ldr r0, _08126E54 @ =gPlayerParty adds r5, r1, r0 movs r0, 0xE adds r0, r7 @@ -16585,7 +16585,7 @@ sub_8126DC8: @ 8126DC8 .align 2, 0 _08126E4C: .4byte gUnknown_2037AB8 _08126E50: .4byte gUnknown_203B0A0 -_08126E54: .4byte gUnknown_2024284 +_08126E54: .4byte gPlayerParty _08126E58: .4byte gStringVar1 _08126E5C: .4byte gUnknown_20370C2 _08126E60: .4byte gStringVar2 @@ -16719,7 +16719,7 @@ sub_8126F40: @ 8126F40 mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r7, _08126F88 @ =gUnknown_2024284 + ldr r7, _08126F88 @ =gPlayerParty adds r0, r7 movs r1, 0xC bl GetMonData @@ -16733,7 +16733,7 @@ sub_8126F40: @ 8126F40 .align 2, 0 _08126F80: .4byte gUnknown_203B0D8 _08126F84: .4byte gUnknown_203B0A0 -_08126F88: .4byte gUnknown_2024284 +_08126F88: .4byte gPlayerParty _08126F8C: ldrh r0, [r5] bl itemid_is_mail @@ -16828,7 +16828,7 @@ sub_812701C: @ 812701C mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r6, _0812708C @ =gUnknown_2024284 + ldr r6, _0812708C @ =gPlayerParty adds r0, r6 adds r1, r5, 0 movs r2, 0 @@ -16860,7 +16860,7 @@ _08127078: .align 2, 0 _08127084: .4byte gUnknown_2037AB8 _08127088: .4byte gUnknown_203B0A0 -_0812708C: .4byte gUnknown_2024284 +_0812708C: .4byte gPlayerParty _08127090: .4byte gUnknown_3005090 _08127094: .4byte sub_8127098 thumb_func_end sub_812701C @@ -16881,7 +16881,7 @@ sub_8127098: @ 8127098 asrs r2, 24 movs r0, 0x64 muls r0, r2 - ldr r1, _081270D8 @ =gUnknown_2024284 + ldr r1, _081270D8 @ =gPlayerParty adds r0, r1 ldr r1, _081270DC @ =gUnknown_203B0B4 lsls r2, 4 @@ -16896,7 +16896,7 @@ _081270CC: bx r0 .align 2, 0 _081270D4: .4byte gUnknown_203B0A0 -_081270D8: .4byte gUnknown_2024284 +_081270D8: .4byte gPlayerParty _081270DC: .4byte gUnknown_203B0B4 thumb_func_end sub_8127098 @@ -16908,7 +16908,7 @@ sub_81270E0: @ 81270E0 ldrsb r0, [r4, r0] movs r6, 0x64 muls r0, r6 - ldr r5, _0812712C @ =gUnknown_2024284 + ldr r5, _0812712C @ =gPlayerParty adds r0, r5 ldrh r1, [r4, 0xC] bl sub_81205C8 @@ -16936,7 +16936,7 @@ sub_81270E0: @ 81270E0 bx r0 .align 2, 0 _08127128: .4byte gUnknown_203B0A0 -_0812712C: .4byte gUnknown_2024284 +_0812712C: .4byte gPlayerParty _08127130: .4byte gSaveBlock1Ptr _08127134: .4byte 0x00002cd0 _08127138: .4byte sub_812713C @@ -16951,7 +16951,7 @@ sub_812713C: @ 812713C ldrsb r1, [r6, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08127190 @ =gUnknown_2024284 + ldr r0, _08127190 @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0xC @@ -16979,7 +16979,7 @@ sub_812713C: @ 812713C b _081271B8 .align 2, 0 _0812718C: .4byte gUnknown_203B0A0 -_08127190: .4byte gUnknown_2024284 +_08127190: .4byte gPlayerParty _08127194: .4byte gUnknown_20370D0 _08127198: .4byte gUnknown_203B0D8 _0812719C: @@ -17036,7 +17036,7 @@ _081271F8: ldrsb r1, [r2, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08127228 @ =gUnknown_2024284 + ldr r1, _08127228 @ =gPlayerParty adds r0, r1 ldrh r1, [r2, 0xC] movs r2, 0 @@ -17056,7 +17056,7 @@ _0812721E: bx r0 .align 2, 0 _08127224: .4byte gUnknown_203B0A0 -_08127228: .4byte gUnknown_2024284 +_08127228: .4byte gPlayerParty _0812722C: .4byte gUnknown_3005090 _08127230: .4byte sub_8127098 thumb_func_end sub_81271C4 @@ -17154,7 +17154,7 @@ _081272F0: ldrsb r1, [r7, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _0812731C @ =gUnknown_2024284 + ldr r1, _0812731C @ =gPlayerParty adds r0, r1 adds r1, r4, 0 bl sub_81205C8 @@ -17172,7 +17172,7 @@ _0812730C: str r1, [r0] b _0812733C .align 2, 0 -_0812731C: .4byte gUnknown_2024284 +_0812731C: .4byte gPlayerParty _08127320: .4byte gUnknown_3005090 _08127324: .4byte sub_8127098 _08127328: @@ -17305,7 +17305,7 @@ sub_8127404: @ 8127404 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _08127454 @ =gUnknown_2024284 + ldr r0, _08127454 @ =gPlayerParty adds r5, r1, r0 ldr r1, _08127458 @ =gUnknown_203B0C0 movs r0, 0 @@ -17334,7 +17334,7 @@ sub_8127404: @ 8127404 b _08127482 .align 2, 0 _08127450: .4byte gUnknown_203B0A0 -_08127454: .4byte gUnknown_2024284 +_08127454: .4byte gPlayerParty _08127458: .4byte gUnknown_203B0C0 _0812745C: .4byte gSaveBlock1Ptr _08127460: .4byte gUnknown_203AAC4 @@ -17428,7 +17428,7 @@ sub_8127510: @ 8127510 asrs r4, r0, 24 movs r0, 0x64 muls r0, r4 - ldr r1, _0812752C @ =gUnknown_2024284 + ldr r1, _0812752C @ =gPlayerParty adds r0, r1 bl sub_8127550 lsls r0, 24 @@ -17437,7 +17437,7 @@ sub_8127510: @ 8127510 movs r0, 0x2 b _08127548 .align 2, 0 -_0812752C: .4byte gUnknown_2024284 +_0812752C: .4byte gPlayerParty _08127530: adds r0, r4, 0x1 lsls r0, 24 @@ -17550,7 +17550,7 @@ sub_81275F8: @ 81275F8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08127618 @ =gUnknown_2024284 + ldr r0, _08127618 @ =gPlayerParty mov r10, r0 ldr r0, _0812761C @ =gUnknown_203B0A0 ldrb r0, [r0, 0x8] @@ -17561,7 +17561,7 @@ sub_81275F8: @ 81275F8 beq _081276E8 b _08127700 .align 2, 0 -_08127618: .4byte gUnknown_2024284 +_08127618: .4byte gPlayerParty _0812761C: .4byte gUnknown_203B0A0 _08127620: ldr r1, _0812762C @ =gUnknown_203B0D4 @@ -17941,7 +17941,7 @@ sub_81278DC: @ 81278DC lsls r0, 24 cmp r0, 0 bne _08127930 - ldr r0, _08127924 @ =gUnknown_2022B4C + ldr r0, _08127924 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -17965,7 +17965,7 @@ sub_81278DC: @ 81278DC bl sub_80EB2F4 b _08127950 .align 2, 0 -_08127924: .4byte gUnknown_2022B4C +_08127924: .4byte gBattleTypeFlags _08127928: .4byte sub_8120C3C _0812792C: .4byte sub_8030ADC _08127930: @@ -18060,7 +18060,7 @@ sub_81279E0: @ 81279E0 lsls r0, 24 cmp r0, 0 bne _08127A30 - ldr r0, _08127A24 @ =gUnknown_2022B4C + ldr r0, _08127A24 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -18084,7 +18084,7 @@ sub_81279E0: @ 81279E0 bl sub_80EB2F4 b _08127A62 .align 2, 0 -_08127A24: .4byte gUnknown_2022B4C +_08127A24: .4byte gBattleTypeFlags _08127A28: .4byte sub_8120C3C _08127A2C: .4byte sub_8107ECC _08127A30: @@ -18197,7 +18197,7 @@ _08127B08: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08127B2C @ =gUnknown_2024284 + ldr r0, _08127B2C @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x39 @@ -18211,7 +18211,7 @@ _08127B08: ldr r1, _08127B38 @ =gUnknown_8416A75 b _08127C86 .align 2, 0 -_08127B2C: .4byte gUnknown_2024284 +_08127B2C: .4byte gPlayerParty _08127B30: .4byte gStringVar1 _08127B34: .4byte gStringVar4 _08127B38: .4byte gUnknown_8416A75 @@ -18227,7 +18227,7 @@ _08127B40: adds r0, r5, 0 bl sub_8127F7C lsls r0, 24 - ldr r2, _08127B90 @ =gUnknown_2023BCE + ldr r2, _08127B90 @ =gBattlerPartyIndexes lsls r1, r4, 1 adds r1, r2 lsrs r0, 24 @@ -18246,7 +18246,7 @@ _08127B68: movs r7, 0x64 adds r0, r5, 0 muls r0, r7 - ldr r1, _08127B98 @ =gUnknown_2024284 + ldr r1, _08127B98 @ =gPlayerParty mov r8, r1 adds r6, r0, r1 adds r0, r6, 0 @@ -18258,15 +18258,15 @@ _08127B68: ldr r1, _08127BA0 @ =gUnknown_8416ACB b _08127C86 .align 2, 0 -_08127B90: .4byte gUnknown_2023BCE +_08127B90: .4byte gBattlerPartyIndexes _08127B94: .4byte gUnknown_2023BCC -_08127B98: .4byte gUnknown_2024284 +_08127B98: .4byte gPlayerParty _08127B9C: .4byte gStringVar4 _08127BA0: .4byte gUnknown_8416ACB _08127BA4: adds r0, r5, 0 bl sub_8127F7C - ldr r1, _08127BC8 @ =gUnknown_2023FE8 + ldr r1, _08127BC8 @ =gBattleStruct ldr r1, [r1] adds r1, 0x8B lsls r0, 24 @@ -18281,7 +18281,7 @@ _08127BA4: ldr r1, _08127BD4 @ =gUnknown_8416A55 b _08127C86 .align 2, 0 -_08127BC8: .4byte gUnknown_2023FE8 +_08127BC8: .4byte gBattleStruct _08127BCC: .4byte gStringVar1 _08127BD0: .4byte gStringVar4 _08127BD4: .4byte gUnknown_8416A55 @@ -18304,7 +18304,7 @@ _08127BEC: ldr r1, _08127C34 @ =gUnknown_203B0C0 movs r0, 0x1 strb r0, [r1] - ldr r1, _08127C38 @ =gUnknown_2023BCE + ldr r1, _08127C38 @ =gBattlerPartyIndexes ldr r0, _08127C3C @ =gUnknown_2024004 ldrb r0, [r0] lsls r0, 1 @@ -18327,12 +18327,12 @@ _08127BEC: .align 2, 0 _08127C30: .4byte gUnknown_203B0C1 _08127C34: .4byte gUnknown_203B0C0 -_08127C38: .4byte gUnknown_2023BCE +_08127C38: .4byte gBattlerPartyIndexes _08127C3C: .4byte gUnknown_2024004 _08127C40: movs r0, 0x64 muls r0, r5 - ldr r1, _08127C54 @ =gUnknown_2024284 + ldr r1, _08127C54 @ =gPlayerParty adds r0, r1 ldr r1, _08127C58 @ =gStringVar1 bl GetMonNickname @@ -18340,14 +18340,14 @@ _08127C40: ldr r1, _08127C60 @ =gUnknown_8416A3A b _08127C86 .align 2, 0 -_08127C54: .4byte gUnknown_2024284 +_08127C54: .4byte gPlayerParty _08127C58: .4byte gStringVar1 _08127C5C: .4byte gStringVar4 _08127C60: .4byte gUnknown_8416A3A _08127C64: ldr r0, _08127C98 @ =gUnknown_2024004 ldrb r0, [r0] - ldr r1, _08127C9C @ =gUnknown_2023BCE + ldr r1, _08127C9C @ =gBattlerPartyIndexes lsls r0, 1 adds r0, r1 ldrb r0, [r0] @@ -18372,7 +18372,7 @@ _08127C8C: bx r1 .align 2, 0 _08127C98: .4byte gUnknown_2024004 -_08127C9C: .4byte gUnknown_2023BCE +_08127C9C: .4byte gBattlerPartyIndexes _08127CA0: .4byte gStringVar1 _08127CA4: .4byte gStringVar4 _08127CA8: .4byte gUnknown_8416A1E @@ -18433,7 +18433,7 @@ _08127D02: movs r0, 0 bl GetBankByIdentity mov r2, sp - ldr r1, _08127D3C @ =gUnknown_2023BCE + ldr r1, _08127D3C @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -18455,13 +18455,13 @@ _08127D34: ble _08127D26 b _08127D84 .align 2, 0 -_08127D3C: .4byte gUnknown_2023BCE +_08127D3C: .4byte gBattlerPartyIndexes _08127D40: movs r5, 0x2 movs r0, 0 bl GetBankByIdentity mov r1, sp - ldr r4, _08127DA4 @ =gUnknown_2023BCE + ldr r4, _08127DA4 @ =gBattlerPartyIndexes lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -18511,7 +18511,7 @@ _08127D9C: pop {r0} bx r0 .align 2, 0 -_08127DA4: .4byte gUnknown_2023BCE +_08127DA4: .4byte gBattlerPartyIndexes thumb_func_end sub_8127CCC thumb_func_start sub_8127DA8 @@ -18522,7 +18522,7 @@ sub_8127DA8: @ 8127DA8 lsrs r2, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, _08127DC8 @ =gUnknown_2023FE8 + ldr r0, _08127DC8 @ =gBattleStruct lsls r3, r2, 1 adds r3, r2 adds r3, 0x60 @@ -18532,7 +18532,7 @@ sub_8127DA8: @ 8127DA8 pop {r0} bx r0 .align 2, 0 -_08127DC8: .4byte gUnknown_2023FE8 +_08127DC8: .4byte gBattleStruct thumb_func_end sub_8127DA8 thumb_func_start sub_8127DCC @@ -18594,7 +18594,7 @@ _08127E34: bne _08127E6C movs r3, 0x1 mov r2, sp - ldr r1, _08127E68 @ =gUnknown_2023BCE + ldr r1, _08127E68 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -18615,11 +18615,11 @@ _08127E5E: ble _08127E50 b _08127E9E .align 2, 0 -_08127E68: .4byte gUnknown_2023BCE +_08127E68: .4byte gBattlerPartyIndexes _08127E6C: movs r3, 0x2 mov r1, sp - ldr r2, _08127EC0 @ =gUnknown_2023BCE + ldr r2, _08127EC0 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r2 ldrh r0, [r0] @@ -18664,7 +18664,7 @@ _08127EB6: pop {r0} bx r0 .align 2, 0 -_08127EC0: .4byte gUnknown_2023BCE +_08127EC0: .4byte gBattlerPartyIndexes thumb_func_end sub_8127DCC thumb_func_start sub_8127EC4 @@ -18682,7 +18682,7 @@ sub_8127EC4: @ 8127EC4 lsls r0, 24 cmp r0, 0 beq _08127F72 - ldr r0, _08127F28 @ =gUnknown_2023FE8 + ldr r0, _08127F28 @ =gBattleStruct lsls r1, r4, 1 adds r1, r4 adds r1, 0x60 @@ -18719,7 +18719,7 @@ _08127EF6: strb r3, [r0] b _08127F40 .align 2, 0 -_08127F28: .4byte gUnknown_2023FE8 +_08127F28: .4byte gBattleStruct _08127F2C: adds r2, 0x1 cmp r2, 0x5 @@ -18913,7 +18913,7 @@ pokemon_change_order: @ 8128074 adds r0, r4, 0 bl Alloc adds r5, r0, 0 - ldr r1, _081280C0 @ =gUnknown_2024284 + ldr r1, _081280C0 @ =gPlayerParty adds r2, r4, 0 bl memcpy movs r4, 0 @@ -18924,7 +18924,7 @@ _0812808E: lsls r0, 24 lsrs r0, 24 muls r0, r6 - ldr r1, _081280C0 @ =gUnknown_2024284 + ldr r1, _081280C0 @ =gPlayerParty adds r0, r1 adds r1, r4, 0 muls r1, r6 @@ -18942,7 +18942,7 @@ _0812808E: pop {r0} bx r0 .align 2, 0 -_081280C0: .4byte gUnknown_2024284 +_081280C0: .4byte gPlayerParty thumb_func_end pokemon_change_order thumb_func_start sub_81280C4 @@ -18953,7 +18953,7 @@ sub_81280C4: @ 81280C4 adds r0, r4, 0 bl Alloc adds r5, r0, 0 - ldr r1, _08128110 @ =gUnknown_2024284 + ldr r1, _08128110 @ =gPlayerParty adds r2, r4, 0 bl memcpy movs r4, 0 @@ -18964,7 +18964,7 @@ _081280DE: lsls r0, 24 lsrs r0, 24 muls r0, r6 - ldr r1, _08128110 @ =gUnknown_2024284 + ldr r1, _08128110 @ =gPlayerParty adds r0, r1 adds r1, r4, 0 muls r1, r6 @@ -18982,7 +18982,7 @@ _081280DE: pop {r0} bx r0 .align 2, 0 -_08128110: .4byte gUnknown_2024284 +_08128110: .4byte gPlayerParty thumb_func_end sub_81280C4 thumb_func_start sub_8128114 @@ -18992,7 +18992,7 @@ sub_8128114: @ 8128114 push {r7} movs r6, 0x1 movs r7, 0x64 - ldr r0, _0812816C @ =gUnknown_2024284 + ldr r0, _0812816C @ =gPlayerParty mov r8, r0 _08128122: adds r0, r6, 0 @@ -19027,7 +19027,7 @@ _08128122: bl sub_811FA40 b _0812817A .align 2, 0 -_0812816C: .4byte gUnknown_2024284 +_0812816C: .4byte gPlayerParty _08128170: adds r0, r6, 0x1 lsls r0, 24 diff --git a/asm/pokeball.s b/asm/pokeball.s index a16edcd66..0e2351b4d 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -19,7 +19,7 @@ DoPokeballSendOutAnimation: @ 804A938 strb r0, [r1] ldr r0, _0804A990 @ =gUnknown_2024018 ldr r0, [r0] - ldr r6, _0804A994 @ =gUnknown_2023BC4 + ldr r6, _0804A994 @ =gActiveBattler ldrb r1, [r6] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -51,7 +51,7 @@ DoPokeballSendOutAnimation: @ 804A938 .align 2, 0 _0804A98C: .4byte gUnknown_2024005 _0804A990: .4byte gUnknown_2024018 -_0804A994: .4byte gUnknown_2023BC4 +_0804A994: .4byte gActiveBattler _0804A998: .4byte sub_804A9A0 _0804A99C: .4byte gUnknown_3005090 thumb_func_end DoPokeballSendOutAnimation @@ -94,25 +94,25 @@ _0804A9D8: lsls r0, 24 cmp r0, 0 beq _0804AA04 - ldr r1, _0804A9FC @ =gUnknown_2023BCE + ldr r1, _0804A9FC @ =gBattlerPartyIndexes lsls r0, r6, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0804AA00 @ =gUnknown_202402C + ldr r1, _0804AA00 @ =gEnemyParty b _0804AA12 .align 2, 0 -_0804A9FC: .4byte gUnknown_2023BCE -_0804AA00: .4byte gUnknown_202402C +_0804A9FC: .4byte gBattlerPartyIndexes +_0804AA00: .4byte gEnemyParty _0804AA04: - ldr r1, _0804AA50 @ =gUnknown_2023BCE + ldr r1, _0804AA50 @ =gBattlerPartyIndexes lsls r0, r6, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0804AA54 @ =gUnknown_2024284 + ldr r1, _0804AA54 @ =gPlayerParty _0804AA12: adds r0, r1 movs r1, 0x26 @@ -124,7 +124,7 @@ _0804AA12: lsrs r5, r0, 24 adds r0, r5, 0 bl LoadBallGfx - ldr r0, _0804AA58 @ =gUnknown_2022B4C + ldr r0, _0804AA58 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -141,9 +141,9 @@ _0804AA12: mov r10, r1 b _0804AA68 .align 2, 0 -_0804AA50: .4byte gUnknown_2023BCE -_0804AA54: .4byte gUnknown_2024284 -_0804AA58: .4byte gUnknown_2022B4C +_0804AA50: .4byte gBattlerPartyIndexes +_0804AA54: .4byte gPlayerParty +_0804AA58: .4byte gBattleTypeFlags _0804AA5C: .4byte gUnknown_202273C _0804AA60: ldr r0, _0804AAB8 @ =gSaveBlock2Ptr @@ -179,7 +179,7 @@ _0804AA68: beq _0804AAF8 cmp r3, 0xFF bne _0804AB38 - ldr r0, _0804AAC4 @ =gUnknown_2022B4C + ldr r0, _0804AAC4 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 9 @@ -193,13 +193,13 @@ _0804AA68: _0804AAB8: .4byte gSaveBlock2Ptr _0804AABC: .4byte gUnknown_82606F4 _0804AAC0: .4byte gSprites -_0804AAC4: .4byte gUnknown_2022B4C +_0804AAC4: .4byte gBattleTypeFlags _0804AAC8: mov r0, r10 movs r5, 0x30 movs r4, 0x46 _0804AACE: - ldr r0, _0804AAEC @ =gUnknown_2023D6C + ldr r0, _0804AAEC @ =gBattlerTarget strb r6, [r0] ldr r2, _0804AAF0 @ =gSprites lsls r3, r7, 4 @@ -214,7 +214,7 @@ _0804AACE: str r0, [r1] b _0804AB48 .align 2, 0 -_0804AAEC: .4byte gUnknown_2023D6C +_0804AAEC: .4byte gBattlerTarget _0804AAF0: .4byte gSprites _0804AAF4: .4byte SpriteCB_PlayerMonSendOut_1 _0804AAF8: @@ -231,7 +231,7 @@ _0804AAF8: lsrs r0, 24 adds r0, 0x18 strh r0, [r4, 0x22] - ldr r0, _0804AB2C @ =gUnknown_2023D6C + ldr r0, _0804AB2C @ =gBattlerTarget strb r6, [r0] movs r1, 0 strh r1, [r4, 0x2E] @@ -242,13 +242,13 @@ _0804AAF8: str r1, [r0] b _0804AB46 .align 2, 0 -_0804AB2C: .4byte gUnknown_2023D6C +_0804AB2C: .4byte gBattlerTarget _0804AB30: .4byte gSprites _0804AB34: .4byte SpriteCB_OpponentMonSendOut _0804AB38: movs r0, 0x1 bl GetBankByIdentity - ldr r1, _0804AB64 @ =gUnknown_2023D6C + ldr r1, _0804AB64 @ =gBattlerTarget strb r0, [r1] movs r2, 0x1 str r2, [sp, 0x4] @@ -259,7 +259,7 @@ _0804AB48: adds r1, r3, r7 lsls r1, 2 adds r4, r1, r0 - ldr r5, _0804AB64 @ =gUnknown_2023D6C + ldr r5, _0804AB64 @ =gBattlerTarget ldrb r0, [r5] strh r0, [r4, 0x3A] ldr r3, [sp, 0x4] @@ -269,7 +269,7 @@ _0804AB48: bl DestroyTask b _0804ABB8 .align 2, 0 -_0804AB64: .4byte gUnknown_2023D6C +_0804AB64: .4byte gBattlerTarget _0804AB68: .4byte gSprites _0804AB6C: movs r0, 0x22 @@ -1217,13 +1217,13 @@ _0804B2DA: lsls r0, 24 cmp r0, 0 beq _0804B310 - ldr r1, _0804B308 @ =gUnknown_2023BCE + ldr r1, _0804B308 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0804B30C @ =gUnknown_202402C + ldr r0, _0804B30C @ =gEnemyParty adds r7, r1, r0 movs r3, 0x19 mov r9, r3 @@ -1232,16 +1232,16 @@ _0804B2DA: _0804B2FC: .4byte HandleBallAnimEnd _0804B300: .4byte gMain _0804B304: .4byte 0x00000439 -_0804B308: .4byte gUnknown_2023BCE -_0804B30C: .4byte gUnknown_202402C +_0804B308: .4byte gBattlerPartyIndexes +_0804B30C: .4byte gEnemyParty _0804B310: - ldr r1, _0804B388 @ =gUnknown_2023BCE + ldr r1, _0804B388 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0804B38C @ =gUnknown_2024284 + ldr r0, _0804B38C @ =gPlayerParty adds r7, r1, r0 movs r0, 0xE7 mov r9, r0 @@ -1277,7 +1277,7 @@ _0804B34E: ands r0, r1 cmp r0, 0 beq _0804B3A6 - ldr r0, _0804B394 @ =gUnknown_2022B4C + ldr r0, _0804B394 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -1291,10 +1291,10 @@ _0804B34E: bl m4aMPlayStop b _0804B3A6 .align 2, 0 -_0804B388: .4byte gUnknown_2023BCE -_0804B38C: .4byte gUnknown_2024284 +_0804B388: .4byte gBattlerPartyIndexes +_0804B38C: .4byte gPlayerParty _0804B390: .4byte gUnknown_2024018 -_0804B394: .4byte gUnknown_2022B4C +_0804B394: .4byte gBattleTypeFlags _0804B398: .4byte gMPlay_BGM _0804B39C: ldr r0, _0804B3C4 @ =gMPlay_BGM @@ -2860,25 +2860,25 @@ GetBankPokeballItemId: @ 804BF90 lsls r0, 24 cmp r0, 0 beq _0804BFBC - ldr r1, _0804BFB4 @ =gUnknown_2023BCE + ldr r1, _0804BFB4 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0804BFB8 @ =gUnknown_202402C + ldr r1, _0804BFB8 @ =gEnemyParty b _0804BFCA .align 2, 0 -_0804BFB4: .4byte gUnknown_2023BCE -_0804BFB8: .4byte gUnknown_202402C +_0804BFB4: .4byte gBattlerPartyIndexes +_0804BFB8: .4byte gEnemyParty _0804BFBC: - ldr r1, _0804BFDC @ =gUnknown_2023BCE + ldr r1, _0804BFDC @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0804BFE0 @ =gUnknown_2024284 + ldr r1, _0804BFE0 @ =gPlayerParty _0804BFCA: adds r0, r1 movs r1, 0x26 @@ -2889,8 +2889,8 @@ _0804BFCA: pop {r1} bx r1 .align 2, 0 -_0804BFDC: .4byte gUnknown_2023BCE -_0804BFE0: .4byte gUnknown_2024284 +_0804BFDC: .4byte gBattlerPartyIndexes +_0804BFE0: .4byte gPlayerParty thumb_func_end GetBankPokeballItemId .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index b63437702..09f527137 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -2573,7 +2573,7 @@ sub_8103A40: @ 8103A40 movs r2, 0x28 adds r3, r6, 0 bl sub_8107D68 - ldr r0, _08103AC4 @ =gUnknown_8254784 + ldr r0, _08103AC4 @ =gBaseStats lsls r4, r5, 3 subs r4, r5 lsls r4, 2 @@ -2607,7 +2607,7 @@ _08103AB6: bx r0 .align 2, 0 _08103AC0: .4byte gUnknown_203ACF0 -_08103AC4: .4byte gUnknown_8254784 +_08103AC4: .4byte gBaseStats thumb_func_end sub_8103A40 thumb_func_start sub_8103AC8 @@ -7741,7 +7741,7 @@ _08106478: ldr r0, [r7] adds r0, 0x56 ldrb r0, [r0] - ldr r1, _081066B4 @ =gUnknown_8254784 + ldr r1, _081066B4 @ =gBaseStats ldr r2, [sp, 0x1C] lsls r4, r2, 3 subs r4, r2 @@ -7974,7 +7974,7 @@ _08106534: b _081066E2 .align 2, 0 _081066B0: .4byte gUnknown_8245EE0 -_081066B4: .4byte gUnknown_8254784 +_081066B4: .4byte gBaseStats _081066B8: .4byte gUnknown_203ACF0 _081066BC: .4byte gUnknown_8452368 _081066C0: .4byte 0x0000ffff diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s index 7b1894339..5a1bd568a 100644 --- a/asm/pokemon_1.s +++ b/asm/pokemon_1.s @@ -80,7 +80,7 @@ ZeroMonData: @ 803D994 thumb_func_start ZeroPlayerPartyMons ZeroPlayerPartyMons: @ 803DA14 push {r4,r5,lr} - ldr r4, _0803DA30 @ =gUnknown_2024284 + ldr r4, _0803DA30 @ =gPlayerParty movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 @@ -94,13 +94,13 @@ _0803DA1E: pop {r0} bx r0 .align 2, 0 -_0803DA30: .4byte gUnknown_2024284 +_0803DA30: .4byte gPlayerParty thumb_func_end ZeroPlayerPartyMons thumb_func_start ZeroEnemyPartyMons ZeroEnemyPartyMons: @ 803DA34 push {r4,r5,lr} - ldr r4, _0803DA50 @ =gUnknown_202402C + ldr r4, _0803DA50 @ =gEnemyParty movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 @@ -114,7 +114,7 @@ _0803DA3E: pop {r0} bx r0 .align 2, 0 -_0803DA50: .4byte gUnknown_202402C +_0803DA50: .4byte gEnemyParty thumb_func_end ZeroEnemyPartyMons thumb_func_start CreateMon @@ -310,7 +310,7 @@ _0803DB92: mov r2, sp adds r2, 0xE bl sub_80404D0 - ldr r4, _0803DCC4 @ =gUnknown_8254784 + ldr r4, _0803DCC4 @ =gBaseStats mov r2, sp ldrh r1, [r2, 0xE] lsls r0, r1, 3 @@ -405,7 +405,7 @@ _0803DB92: .align 2, 0 _0803DCBC: .4byte gSaveBlock2Ptr _0803DCC0: .4byte gGameLanguage -_0803DCC4: .4byte gUnknown_8254784 +_0803DCC4: .4byte gBaseStats _0803DCC8: .4byte gUnknown_8253AE4 _0803DCCC: .4byte gGameVersion _0803DCD0: @@ -470,7 +470,7 @@ _0803DCD0: adds r2, r4, 0 bl sub_80404D0 _0803DD58: - ldr r2, _0803DD94 @ =gUnknown_8254784 + ldr r2, _0803DD94 @ =gBaseStats mov r3, sp ldrh r1, [r3, 0xE] lsls r0, r1, 3 @@ -500,7 +500,7 @@ _0803DD7E: pop {r0} bx r0 .align 2, 0 -_0803DD94: .4byte gUnknown_8254784 +_0803DD94: .4byte gBaseStats thumb_func_end CreateBoxMon thumb_func_start CreateMonWithNature @@ -1451,7 +1451,7 @@ CalculateMonStats: @ 803E47C .align 2, 0 _0803E564: .4byte 0x0000012f _0803E568: - ldr r1, _0803E734 @ =gUnknown_8254784 + ldr r1, _0803E734 @ =gBaseStats lsls r2, r7, 3 subs r0, r2, r7 lsls r0, 2 @@ -1475,7 +1475,7 @@ _0803E582: adds r0, 0xA str r0, [sp, 0x4] _0803E596: - ldr r1, _0803E738 @ =gUnknown_2023FC4 + ldr r1, _0803E738 @ =gBattleScripting add r2, sp, 0x4 ldrb r0, [r2] mov r3, r8 @@ -1491,7 +1491,7 @@ _0803E5AE: adds r0, r5, 0 movs r1, 0x3A bl sub_804037C - ldr r0, _0803E734 @ =gUnknown_8254784 + ldr r0, _0803E734 @ =gBaseStats subs r1, r6, r7 lsls r1, 2 adds r6, r1, r0 @@ -1668,8 +1668,8 @@ _0803E72E: movs r0, 0x1 b _0803E758 .align 2, 0 -_0803E734: .4byte gUnknown_8254784 -_0803E738: .4byte gUnknown_2023FC4 +_0803E734: .4byte gBaseStats +_0803E738: .4byte gBattleScripting _0803E73C: .4byte 0x0000012f _0803E740: ldr r1, [sp, 0x1C] @@ -1757,7 +1757,7 @@ GetLevelFromMonExp: @ 803E7C4 adds r3, r0, 0 movs r2, 0x1 ldr r6, _0803E828 @ =gUnknown_8253AE4 - ldr r1, _0803E82C @ =gUnknown_8254784 + ldr r1, _0803E82C @ =gBaseStats lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -1793,7 +1793,7 @@ _0803E81A: bx r1 .align 2, 0 _0803E828: .4byte gUnknown_8253AE4 -_0803E82C: .4byte gUnknown_8254784 +_0803E82C: .4byte gBaseStats thumb_func_end GetLevelFromMonExp thumb_func_start GetLevelFromBoxMonExp @@ -1813,7 +1813,7 @@ GetLevelFromBoxMonExp: @ 803E830 adds r3, r0, 0 movs r2, 0x1 ldr r6, _0803E894 @ =gUnknown_8253AE4 - ldr r1, _0803E898 @ =gUnknown_8254784 + ldr r1, _0803E898 @ =gBaseStats lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -1849,7 +1849,7 @@ _0803E886: bx r1 .align 2, 0 _0803E894: .4byte gUnknown_8253AE4 -_0803E898: .4byte gUnknown_8254784 +_0803E898: .4byte gBaseStats thumb_func_end GetLevelFromBoxMonExp thumb_func_start GiveMoveToMon @@ -1932,7 +1932,7 @@ GiveMoveToBattleMon: @ 803E920 movs r3, 0 adds r5, r0, 0 adds r5, 0x24 - ldr r2, _0803E94C @ =gUnknown_8250C04 + ldr r2, _0803E94C @ =gBattleMoves lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -1950,7 +1950,7 @@ _0803E93A: adds r0, r4, 0 b _0803E95A .align 2, 0 -_0803E94C: .4byte gUnknown_8250C04 +_0803E94C: .4byte gBattleMoves _0803E950: adds r1, 0x2 adds r3, 0x1 @@ -2013,7 +2013,7 @@ SetBattleMonMoveSlot: @ 803E9A4 strh r1, [r3] adds r0, 0x24 adds r0, r2 - ldr r3, _0803E9D0 @ =gUnknown_8250C04 + ldr r3, _0803E9D0 @ =gBattleMoves lsls r2, r1, 1 adds r2, r1 lsls r2, 2 @@ -2024,7 +2024,7 @@ SetBattleMonMoveSlot: @ 803E9A4 pop {r0} bx r0 .align 2, 0 -_0803E9D0: .4byte gUnknown_8250C04 +_0803E9D0: .4byte gBattleMoves thumb_func_end SetBattleMonMoveSlot thumb_func_start GiveMonInitialMoveset @@ -2302,7 +2302,7 @@ _0803EBB0: mov r0, sp mov r2, r8 strh r2, [r0, 0x6] - ldr r1, _0803EC3C @ =gUnknown_8250C04 + ldr r1, _0803EC3C @ =gBattleMoves mov r2, r8 lsls r0, r2, 1 add r0, r8 @@ -2339,7 +2339,7 @@ _0803EC04: pop {r0} bx r0 .align 2, 0 -_0803EC3C: .4byte gUnknown_8250C04 +_0803EC3C: .4byte gBattleMoves thumb_func_end DeleteFirstMoveAndGiveMoveToMon thumb_func_start DeleteFirstMoveAndGiveMoveToBoxMon @@ -2388,7 +2388,7 @@ _0803EC5C: mov r0, sp mov r2, r8 strh r2, [r0, 0x6] - ldr r1, _0803ECE8 @ =gUnknown_8250C04 + ldr r1, _0803ECE8 @ =gBattleMoves mov r2, r8 lsls r0, r2, 1 add r0, r8 @@ -2425,7 +2425,7 @@ _0803ECB0: pop {r0} bx r0 .align 2, 0 -_0803ECE8: .4byte gUnknown_8250C04 +_0803ECE8: .4byte gBattleMoves thumb_func_end DeleteFirstMoveAndGiveMoveToBoxMon .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s index e18dca3bc..22246bf87 100644 --- a/asm/pokemon_2.s +++ b/asm/pokemon_2.s @@ -25,10 +25,10 @@ _0803F5CC: b _0803F68A _0803F5D2: movs r5, 0 - ldr r0, _0803F5FC @ =gUnknown_2023BC4 + ldr r0, _0803F5FC @ =gActiveBattler ldrb r3, [r0] - ldr r4, _0803F600 @ =gUnknown_2023D70 - ldr r2, _0803F604 @ =gUnknown_825E45C + ldr r4, _0803F600 @ =gAbsentBattlerFlags + ldr r2, _0803F604 @ =gBitTable _0803F5DC: cmp r5, r3 beq _0803F5F0 @@ -47,9 +47,9 @@ _0803F5F0: ble _0803F5DC b _0803F68A .align 2, 0 -_0803F5FC: .4byte gUnknown_2023BC4 -_0803F600: .4byte gUnknown_2023D70 -_0803F604: .4byte gUnknown_825E45C +_0803F5FC: .4byte gActiveBattler +_0803F600: .4byte gAbsentBattlerFlags +_0803F604: .4byte gBitTable _0803F608: movs r5, 0 _0803F60A: @@ -57,16 +57,16 @@ _0803F60A: lsrs r0, 24 bl GetBankSide adds r4, r0, 0 - ldr r0, _0803F644 @ =gUnknown_2023D6B + ldr r0, _0803F644 @ =sBattler_AI ldrb r0, [r0] bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _0803F63C - ldr r0, _0803F648 @ =gUnknown_2023D70 + ldr r0, _0803F648 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0803F64C @ =gUnknown_825E45C + ldr r2, _0803F64C @ =gBitTable lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -82,9 +82,9 @@ _0803F63C: ble _0803F60A b _0803F68A .align 2, 0 -_0803F644: .4byte gUnknown_2023D6B -_0803F648: .4byte gUnknown_2023D70 -_0803F64C: .4byte gUnknown_825E45C +_0803F644: .4byte sBattler_AI +_0803F648: .4byte gAbsentBattlerFlags +_0803F64C: .4byte gBitTable _0803F650: movs r5, 0 _0803F652: @@ -92,16 +92,16 @@ _0803F652: lsrs r0, 24 bl GetBankSide adds r4, r0, 0 - ldr r0, _0803F694 @ =gUnknown_2023D6C + ldr r0, _0803F694 @ =gBattlerTarget ldrb r0, [r0] bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _0803F684 - ldr r0, _0803F698 @ =gUnknown_2023D70 + ldr r0, _0803F698 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0803F69C @ =gUnknown_825E45C + ldr r2, _0803F69C @ =gBitTable lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -121,9 +121,9 @@ _0803F68A: pop {r1} bx r1 .align 2, 0 -_0803F694: .4byte gUnknown_2023D6C -_0803F698: .4byte gUnknown_2023D70 -_0803F69C: .4byte gUnknown_825E45C +_0803F694: .4byte gBattlerTarget +_0803F698: .4byte gAbsentBattlerFlags +_0803F69C: .4byte gBitTable thumb_func_end sub_803F5B4 thumb_func_start GetDefaultMoveTarget @@ -138,7 +138,7 @@ GetDefaultMoveTarget: @ 803F6A0 ands r4, r0 eors r4, r1 adds r5, r4, 0 - ldr r0, _0803F6C4 @ =gUnknown_2022B4C + ldr r0, _0803F6C4 @ =gBattleTypeFlags ldr r0, [r0] ands r0, r6 cmp r0, 0 @@ -146,7 +146,7 @@ GetDefaultMoveTarget: @ 803F6A0 adds r0, r4, 0 b _0803F712 .align 2, 0 -_0803F6C4: .4byte gUnknown_2022B4C +_0803F6C4: .4byte gBattleTypeFlags _0803F6C8: movs r0, 0 bl sub_803F5B4 @@ -166,9 +166,9 @@ _0803F6E8: adds r0, r4, 0 b _0803F712 _0803F6EC: - ldr r0, _0803F704 @ =gUnknown_2023D70 + ldr r0, _0803F704 @ =gAbsentBattlerFlags ldrb r1, [r0] - ldr r2, _0803F708 @ =gUnknown_825E45C + ldr r2, _0803F708 @ =gBitTable lsls r0, r4, 2 adds r0, r2 ldr r0, [r0] @@ -178,8 +178,8 @@ _0803F6EC: adds r0, r4, 0 b _0803F712 .align 2, 0 -_0803F704: .4byte gUnknown_2023D70 -_0803F708: .4byte gUnknown_825E45C +_0803F704: .4byte gAbsentBattlerFlags +_0803F708: .4byte gBitTable _0803F70C: movs r0, 0x2 eors r5, r0 @@ -217,7 +217,7 @@ GetBoxMonGender: @ 803F730 movs r2, 0 bl GetBoxMonData adds r2, r0, 0 - ldr r1, _0803F780 @ =gUnknown_8254784 + ldr r1, _0803F780 @ =gBaseStats lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -232,7 +232,7 @@ GetBoxMonGender: @ 803F730 cmp r0, 0xFE bge _0803F786 _0803F768: - ldr r1, _0803F780 @ =gUnknown_8254784 + ldr r1, _0803F780 @ =gBaseStats lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -245,7 +245,7 @@ _0803F768: movs r0, 0 b _0803F786 .align 2, 0 -_0803F780: .4byte gUnknown_8254784 +_0803F780: .4byte gBaseStats _0803F784: movs r0, 0xFE _0803F786: @@ -260,7 +260,7 @@ GetGenderFromSpeciesAndPersonality: @ 803F78C adds r3, r1, 0 lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _0803F7C8 @ =gUnknown_8254784 + ldr r1, _0803F7C8 @ =gBaseStats lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -287,7 +287,7 @@ _0803F7B0: movs r0, 0 b _0803F7CE .align 2, 0 -_0803F7C8: .4byte gUnknown_8254784 +_0803F7C8: .4byte gBaseStats _0803F7CC: movs r0, 0xFE _0803F7CE: @@ -1655,7 +1655,7 @@ _08040204: ldrh r5, [r2] adds r7, r1, 0 adds r2, r6, 0 - ldr r1, _0804023C @ =gUnknown_825E45C + ldr r1, _0804023C @ =gBitTable _0804020E: ldrh r3, [r2] cmp r5, r3 @@ -1682,7 +1682,7 @@ _0804022C: b _0804035C .align 2, 0 _08040238: .4byte 0x00000163 -_0804023C: .4byte gUnknown_825E45C +_0804023C: .4byte gBitTable _08040240: movs r4, 0 mov r1, r9 @@ -2823,7 +2823,7 @@ _08040B46: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08040B78 @ =gUnknown_2024284 + ldr r0, _08040B78 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -2841,7 +2841,7 @@ _08040B46: movs r0, 0 b _08040B8A .align 2, 0 -_08040B78: .4byte gUnknown_2024284 +_08040B78: .4byte gPlayerParty _08040B7C: .4byte gUnknown_2024029 _08040B80: adds r0, r6, 0 @@ -2956,7 +2956,7 @@ _08040C54: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _08040C7C @ =gUnknown_2024284 + ldr r1, _08040C7C @ =gPlayerParty adds r0, r1 movs r1, 0xB movs r2, 0 @@ -2969,7 +2969,7 @@ _08040C72: pop {r1} bx r1 .align 2, 0 -_08040C7C: .4byte gUnknown_2024284 +_08040C7C: .4byte gPlayerParty thumb_func_end CalculatePlayerPartyCount thumb_func_start CalculateEnemyPartyCount @@ -2994,7 +2994,7 @@ _08040C98: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _08040CC0 @ =gUnknown_202402C + ldr r1, _08040CC0 @ =gEnemyParty adds r0, r1 movs r1, 0xB movs r2, 0 @@ -3007,7 +3007,7 @@ _08040CB6: pop {r1} bx r1 .align 2, 0 -_08040CC0: .4byte gUnknown_202402C +_08040CC0: .4byte gEnemyParty thumb_func_end CalculateEnemyPartyCount thumb_func_start GetMonsStateToDoubles @@ -3027,7 +3027,7 @@ _08040CDC: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08040D34 @ =gUnknown_2024284 + ldr r0, _08040D34 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x39 @@ -3067,7 +3067,7 @@ _08040D28: bx r1 .align 2, 0 _08040D30: .4byte gUnknown_2024029 -_08040D34: .4byte gUnknown_2024284 +_08040D34: .4byte gPlayerParty thumb_func_end GetMonsStateToDoubles thumb_func_start GetAbilityBySpecies @@ -3079,7 +3079,7 @@ GetAbilityBySpecies: @ 8040D38 cmp r1, 0 beq _08040D5C ldr r2, _08040D54 @ =gUnknown_2023D6A - ldr r1, _08040D58 @ =gUnknown_8254784 + ldr r1, _08040D58 @ =gBaseStats lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -3088,10 +3088,10 @@ GetAbilityBySpecies: @ 8040D38 b _08040D6A .align 2, 0 _08040D54: .4byte gUnknown_2023D6A -_08040D58: .4byte gUnknown_8254784 +_08040D58: .4byte gBaseStats _08040D5C: ldr r2, _08040D74 @ =gUnknown_2023D6A - ldr r1, _08040D78 @ =gUnknown_8254784 + ldr r1, _08040D78 @ =gBaseStats lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -3104,7 +3104,7 @@ _08040D6A: bx r1 .align 2, 0 _08040D74: .4byte gUnknown_2023D6A -_08040D78: .4byte gUnknown_8254784 +_08040D78: .4byte gBaseStats thumb_func_end GetAbilityBySpecies thumb_func_start GetMonAbility @@ -3143,7 +3143,7 @@ CreateSecretBaseEnemyParty: @ 8040DB0 sub sp, 0x14 adds r5, r0, 0 bl ZeroEnemyPartyMons - ldr r4, _08040ED8 @ =gUnknown_2023FF4 + ldr r4, _08040ED8 @ =gBattleResources ldr r0, [r4] ldr r0, [r0] adds r1, r5, 0 @@ -3152,7 +3152,7 @@ CreateSecretBaseEnemyParty: @ 8040DB0 movs r0, 0 mov r9, r0 _08040DD4: - ldr r1, _08040ED8 @ =gUnknown_2023FF4 + ldr r1, _08040ED8 @ =gBattleResources ldr r3, [r1] ldr r2, [r3] mov r4, r9 @@ -3168,7 +3168,7 @@ _08040DD4: movs r0, 0x64 mov r6, r9 muls r6, r0 - ldr r4, _08040EDC @ =gUnknown_202402C + ldr r4, _08040EDC @ =gEnemyParty mov r8, r4 adds r5, r6, r4 ldrh r1, [r1] @@ -3192,7 +3192,7 @@ _08040DD4: adds r0, r5, 0 movs r3, 0xF bl CreateMon - ldr r1, _08040ED8 @ =gUnknown_2023FF4 + ldr r1, _08040ED8 @ =gBattleResources ldr r0, [r1] adds r1, r7, 0 adds r1, 0x88 @@ -3209,7 +3209,7 @@ _08040DD4: _08040E44: adds r1, r5, 0 adds r1, 0x1A - ldr r2, _08040ED8 @ =gUnknown_2023FF4 + ldr r2, _08040ED8 @ =gBattleResources ldr r0, [r2] ldr r2, [r0] adds r2, r7 @@ -3222,7 +3222,7 @@ _08040E44: movs r3, 0x64 mov r0, r9 muls r0, r3 - ldr r1, _08040EDC @ =gUnknown_202402C + ldr r1, _08040EDC @ =gEnemyParty adds r7, r0, r1 mov r4, r10 lsls r0, r4, 1 @@ -3232,7 +3232,7 @@ _08040E44: _08040E72: adds r1, r5, 0 adds r1, 0xD - ldr r2, _08040ED8 @ =gUnknown_2023FF4 + ldr r2, _08040ED8 @ =gBattleResources ldr r0, [r2] ldr r2, [r0] adds r2, r6 @@ -3240,7 +3240,7 @@ _08040E72: bl sub_804037C adds r1, r5, 0 adds r1, 0x11 - ldr r3, _08040ED8 @ =gUnknown_2023FF4 + ldr r3, _08040ED8 @ =gBattleResources ldr r0, [r3] ldr r0, [r0] adds r0, 0x4C @@ -3263,10 +3263,10 @@ _08040EAE: mov r9, r4 cmp r4, 0x5 ble _08040DD4 - ldr r1, _08040EE4 @ =gUnknown_2022B4C + ldr r1, _08040EE4 @ =gBattleTypeFlags movs r0, 0x8 str r0, [r1] - ldr r1, _08040EE8 @ =gUnknown_20386AE + ldr r1, _08040EE8 @ =gTrainerBattleOpponent_A movs r2, 0x80 lsls r2, 3 adds r0, r2, 0 @@ -3280,18 +3280,18 @@ _08040EAE: pop {r0} bx r0 .align 2, 0 -_08040ED8: .4byte gUnknown_2023FF4 -_08040EDC: .4byte gUnknown_202402C +_08040ED8: .4byte gBattleResources +_08040EDC: .4byte gEnemyParty _08040EE0: .4byte gUnknown_8250C08 -_08040EE4: .4byte gUnknown_2022B4C -_08040EE8: .4byte gUnknown_20386AE +_08040EE4: .4byte gBattleTypeFlags +_08040EE8: .4byte gTrainerBattleOpponent_A thumb_func_end CreateSecretBaseEnemyParty thumb_func_start GetSecretBaseTrainerPicIndex GetSecretBaseTrainerPicIndex: @ 8040EEC push {r4,r5,lr} ldr r5, _08040F20 @ =gUnknown_825DFE0 - ldr r0, _08040F24 @ =gUnknown_2023FF4 + ldr r0, _08040F24 @ =gBattleResources ldr r0, [r0] ldr r4, [r0] ldrb r0, [r4, 0x9] @@ -3315,7 +3315,7 @@ GetSecretBaseTrainerPicIndex: @ 8040EEC bx r1 .align 2, 0 _08040F20: .4byte gUnknown_825DFE0 -_08040F24: .4byte gUnknown_2023FF4 +_08040F24: .4byte gBattleResources _08040F28: .4byte gUnknown_82538A8 thumb_func_end GetSecretBaseTrainerPicIndex @@ -3323,7 +3323,7 @@ _08040F28: .4byte gUnknown_82538A8 GetSecretBaseTrainerNameIndex: @ 8040F2C push {r4,r5,lr} ldr r5, _08040F60 @ =gUnknown_825DFE0 - ldr r0, _08040F64 @ =gUnknown_2023FF4 + ldr r0, _08040F64 @ =gBattleResources ldr r0, [r0] ldr r4, [r0] ldrb r0, [r4, 0x9] @@ -3347,7 +3347,7 @@ GetSecretBaseTrainerNameIndex: @ 8040F2C bx r1 .align 2, 0 _08040F60: .4byte gUnknown_825DFE0 -_08040F64: .4byte gUnknown_2023FF4 +_08040F64: .4byte gBattleResources _08040F68: .4byte gUnknown_825393E thumb_func_end GetSecretBaseTrainerNameIndex @@ -3358,7 +3358,7 @@ IsPlayerPartyAndPokemonStorageFull: @ 8040F6C _08040F70: movs r0, 0x64 muls r0, r4 - ldr r1, _08040F88 @ =gUnknown_2024284 + ldr r1, _08040F88 @ =gPlayerParty adds r0, r1 movs r1, 0xB movs r2, 0 @@ -3368,7 +3368,7 @@ _08040F70: movs r0, 0 b _08040F9A .align 2, 0 -_08040F88: .4byte gUnknown_2024284 +_08040F88: .4byte gPlayerParty _08040F8C: adds r4, 0x1 cmp r4, 0x5 @@ -3466,7 +3466,7 @@ CalculatePPWithBonus: @ 804101C lsrs r0, 16 lsls r2, 24 lsrs r2, 24 - ldr r4, _0804105C @ =gUnknown_8250C04 + ldr r4, _0804105C @ =gBattleMoves lsls r3, r0, 1 adds r3, r0 lsls r3, 2 @@ -3492,7 +3492,7 @@ CalculatePPWithBonus: @ 804101C pop {r1} bx r1 .align 2, 0 -_0804105C: .4byte gUnknown_8250C04 +_0804105C: .4byte gBattleMoves _08041060: .4byte gUnknown_825DEA1 thumb_func_end CalculatePPWithBonus @@ -3561,13 +3561,13 @@ CopyPlayerPartyMonToBattleData: @ 80410B8 movs r0, 0x64 mov r5, r9 muls r5, r0 - ldr r0, _080413A4 @ =gUnknown_2024284 + ldr r0, _080413A4 @ =gPlayerParty adds r5, r0 adds r0, r5, 0 movs r1, 0xB movs r2, 0 bl GetMonData - ldr r1, _080413A8 @ =gUnknown_2023BE4 + ldr r1, _080413A8 @ =gBattleMons mov r8, r1 movs r1, 0x58 ldr r2, [sp, 0x14] @@ -3610,7 +3610,7 @@ _0804110A: movs r0, 0x64 mov r4, r9 muls r4, r0 - ldr r0, _080413A4 @ =gUnknown_2024284 + ldr r0, _080413A4 @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -3806,7 +3806,7 @@ _0804110A: adds r1, 0x48 adds r1, r5, r1 str r0, [r1] - ldr r2, _080413B8 @ =gUnknown_8254784 + ldr r2, _080413B8 @ =gBaseStats ldrh r1, [r7] lsls r0, r1, 3 subs r0, r1 @@ -3849,7 +3849,7 @@ _0804110A: bl GetMonData ldr r0, [sp, 0x14] bl GetBankSide - ldr r1, _080413BC @ =gUnknown_2023FE8 + ldr r1, _080413BC @ =gBattleStruct lsls r0, 24 lsrs r0, 23 adds r0, 0xA8 @@ -3890,13 +3890,13 @@ _0804136E: pop {r0} bx r0 .align 2, 0 -_080413A4: .4byte gUnknown_2024284 -_080413A8: .4byte gUnknown_2023BE4 +_080413A4: .4byte gPlayerParty +_080413A8: .4byte gBattleMons _080413AC: .4byte 0xfffffc1f _080413B0: .4byte 0xfff07fff _080413B4: .4byte 0xfffffe0f -_080413B8: .4byte gUnknown_8254784 -_080413BC: .4byte gUnknown_2023FE8 +_080413B8: .4byte gBaseStats +_080413BC: .4byte gBattleStruct thumb_func_end CopyPlayerPartyMonToBattleData .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index 33bfdcaea..b8fc0356d 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -38,7 +38,7 @@ sub_80423A4: @ 80423A4 beq _080423F6 cmp r6, 0x4 beq _080423F6 - ldr r0, _08042404 @ =gUnknown_2023BE4 + ldr r0, _08042404 @ =gBattleMons movs r1, 0x58 muls r1, r6 adds r0, 0x4C @@ -52,7 +52,7 @@ _080423F6: .align 2, 0 _080423FC: .4byte gMain _08042400: .4byte 0x00000439 -_08042404: .4byte gUnknown_2023BE4 +_08042404: .4byte gBattleMons _08042408: movs r0, 0x1 _0804240A: @@ -111,7 +111,7 @@ _08042458: lsrs r1, r0, 24 cmp r1, 0 beq _080424F8 - ldr r0, _080424C0 @ =gUnknown_2023BC4 + ldr r0, _080424C0 @ =gActiveBattler strb r2, [r0] ldrb r0, [r0] bl GetBankSide @@ -127,7 +127,7 @@ _08042458: ldrb r0, [r0] cmp r1, r0 bge _08042504 - ldr r2, _080424C8 @ =gUnknown_2023BCE + ldr r2, _080424C8 @ =gBattlerPartyIndexes lsls r0, r1, 1 adds r0, r2 ldrh r3, [r0] @@ -145,9 +145,9 @@ _080424B0: .4byte gUnknown_2023D6F _080424B4: .4byte gUnknown_2024004 _080424B8: .4byte gMain _080424BC: .4byte 0x00000439 -_080424C0: .4byte gUnknown_2023BC4 +_080424C0: .4byte gActiveBattler _080424C4: .4byte gUnknown_2023BCC -_080424C8: .4byte gUnknown_2023BCE +_080424C8: .4byte gBattlerPartyIndexes _080424CC: ldr r0, [sp, 0xC] adds r0, 0x2 @@ -171,7 +171,7 @@ _080424CC: .align 2, 0 _080424F4: .4byte gUnknown_2023BCC _080424F8: - ldr r0, _08042520 @ =gUnknown_2023BC4 + ldr r0, _08042520 @ =gActiveBattler strb r1, [r0] movs r0, 0x4 str r0, [sp, 0x1C] @@ -193,7 +193,7 @@ _08042504: beq _0804252E b _08042578 .align 2, 0 -_08042520: .4byte gUnknown_2023BC4 +_08042520: .4byte gActiveBattler _08042524: .4byte gUnknown_82528BC _08042528: ldr r2, [sp] @@ -208,7 +208,7 @@ _0804252E: ands r0, r1 cmp r0, 0 beq _08042560 - ldr r0, _08042558 @ =gUnknown_2023BC4 + ldr r0, _08042558 @ =gActiveBattler ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -219,7 +219,7 @@ _0804252E: .align 2, 0 _08042550: .4byte gMain _08042554: .4byte 0x00000439 -_08042558: .4byte gUnknown_2023BC4 +_08042558: .4byte gActiveBattler _0804255C: .4byte gUnknown_2023F5C _08042560: ldr r0, _0804256C @ =gSaveBlock1Ptr @@ -284,7 +284,7 @@ _080425B0: ldr r0, [sp, 0x1C] cmp r0, 0x4 beq _080425F4 - ldr r1, _08042644 @ =gUnknown_2023BE4 + ldr r1, _08042644 @ =gBattleMons movs r0, 0x58 ldr r2, [sp, 0x1C] muls r0, r2 @@ -304,8 +304,8 @@ _080425F4: ands r0, r1 cmp r0, 0 beq _0804261C - ldr r1, _08042644 @ =gUnknown_2023BE4 - ldr r0, _08042648 @ =gUnknown_2023BC4 + ldr r1, _08042644 @ =gBattleMons + ldr r0, _08042648 @ =gActiveBattler ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -327,8 +327,8 @@ _0804261C: bne _08042628 b _08042BCA _08042628: - ldr r2, _08042644 @ =gUnknown_2023BE4 - ldr r0, _08042648 @ =gUnknown_2023BC4 + ldr r2, _08042644 @ =gBattleMons + ldr r0, _08042648 @ =gActiveBattler ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -340,8 +340,8 @@ _08042628: .align 2, 0 _0804263C: .4byte gMain _08042640: .4byte 0x00000439 -_08042644: .4byte gUnknown_2023BE4 -_08042648: .4byte gUnknown_2023BC4 +_08042644: .4byte gBattleMons +_08042648: .4byte gActiveBattler _0804264C: ldr r0, [sp, 0x14] ldr r1, [sp, 0xC] @@ -352,8 +352,8 @@ _0804264C: adds r5, r2, 0 cmp r0, 0 beq _08042678 - ldr r2, _080426A0 @ =gUnknown_2023BE4 - ldr r0, _080426A4 @ =gUnknown_2023BC4 + ldr r2, _080426A0 @ =gBattleMons + ldr r0, _080426A4 @ =gActiveBattler ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -373,8 +373,8 @@ _08042678: bne _08042684 b _08042BCA _08042684: - ldr r2, _080426A0 @ =gUnknown_2023BE4 - ldr r0, _080426A4 @ =gUnknown_2023BC4 + ldr r2, _080426A0 @ =gBattleMons + ldr r0, _080426A4 @ =gActiveBattler ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -388,8 +388,8 @@ _08042684: _0804269C: b _08042832 .align 2, 0 -_080426A0: .4byte gUnknown_2023BE4 -_080426A4: .4byte gUnknown_2023BC4 +_080426A0: .4byte gBattleMons +_080426A4: .4byte gActiveBattler _080426A8: ldr r1, [sp, 0x14] ldr r0, [sp, 0xC] @@ -400,8 +400,8 @@ _080426A8: adds r5, r2, 0 cmp r0, 0 beq _080426D4 - ldr r2, _08042700 @ =gUnknown_2023BE4 - ldr r0, _08042704 @ =gUnknown_2023BC4 + ldr r2, _08042700 @ =gBattleMons + ldr r0, _08042704 @ =gActiveBattler ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -421,8 +421,8 @@ _080426D4: bne _080426E0 b _08042BCA _080426E0: - ldr r2, _08042700 @ =gUnknown_2023BE4 - ldr r0, _08042704 @ =gUnknown_2023BC4 + ldr r2, _08042700 @ =gBattleMons + ldr r0, _08042704 @ =gActiveBattler ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -439,8 +439,8 @@ _080426F8: str r2, [sp, 0x10] b _08042BCA .align 2, 0 -_08042700: .4byte gUnknown_2023BE4 -_08042704: .4byte gUnknown_2023BC4 +_08042700: .4byte gBattleMons +_08042704: .4byte gActiveBattler _08042708: ldr r0, [sp, 0x14] ldr r1, [sp, 0xC] @@ -452,7 +452,7 @@ _08042708: cmp r0, 0 beq _0804273A ldr r4, _08042838 @ =gUnknown_2023DE4 - ldr r0, _0804283C @ =gUnknown_2023BC4 + ldr r0, _0804283C @ =gActiveBattler ldrb r0, [r0] bl GetBankSide lsls r0, 24 @@ -583,7 +583,7 @@ _08042814: bne _0804281C b _08042BCA _0804281C: - ldr r1, _0804284C @ =gUnknown_2023BE4 + ldr r1, _0804284C @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r1, 0x50 @@ -600,11 +600,11 @@ _08042832: b _08042BCA .align 2, 0 _08042838: .4byte gUnknown_2023DE4 -_0804283C: .4byte gUnknown_2023BC4 +_0804283C: .4byte gActiveBattler _08042840: .4byte 0x00000f88 _08042844: .4byte gMain _08042848: .4byte 0x00000439 -_0804284C: .4byte gUnknown_2023BE4 +_0804284C: .4byte gBattleMons _08042850: ldr r1, [sp, 0x14] ldr r2, [sp, 0xC] @@ -1108,7 +1108,7 @@ _08042C34: cmp r3, 0xAF bne _08042C46 _08042C38: - ldr r0, _08042C58 @ =gUnknown_2023BC4 + ldr r0, _08042C58 @ =gActiveBattler ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -1127,7 +1127,7 @@ _08042C4A: beq _08042CF4 b _08042D3E .align 2, 0 -_08042C58: .4byte gUnknown_2023BC4 +_08042C58: .4byte gActiveBattler _08042C5C: .4byte gUnknown_2023F5C _08042C60: cmp r2, 0 @@ -1265,7 +1265,7 @@ _08042D48: thumb_func_start sub_8042D50 sub_8042D50: @ 8042D50 push {lr} - ldr r2, _08042D84 @ =gUnknown_2023D6C + ldr r2, _08042D84 @ =gBattlerTarget ldr r1, _08042D88 @ =gUnknown_2024004 ldrb r1, [r1] strb r1, [r2] @@ -1287,7 +1287,7 @@ sub_8042D50: @ 8042D50 pop {r0} bx r0 .align 2, 0 -_08042D84: .4byte gUnknown_2023D6C +_08042D84: .4byte gBattlerTarget _08042D88: .4byte gUnknown_2024004 _08042D8C: .4byte gUnknown_2022AB8 _08042D90: .4byte gUnknown_83FD5D0 @@ -1349,7 +1349,7 @@ _08042E04: ldrb r0, [r2] strb r0, [r1] movs r5, 0 - ldr r0, _08042E48 @ =gUnknown_2023D6B + ldr r0, _08042E48 @ =sBattler_AI mov r8, r0 movs r6, 0 _08042E12: @@ -1376,7 +1376,7 @@ _08042E24: _08042E3C: .4byte gUnknown_82528BC _08042E40: .4byte gUnknown_2024004 _08042E44: .4byte gUnknown_2023D6F -_08042E48: .4byte gUnknown_2023D6B +_08042E48: .4byte sBattler_AI _08042E4C: ldr r0, _08042E88 @ =gUnknown_2024004 ldrb r0, [r0] @@ -1394,7 +1394,7 @@ _08042E5A: ands r0, r1 cmp r0, 0 beq _08042E7A - ldr r1, _08042E90 @ =gUnknown_2023D6B + ldr r1, _08042E90 @ =sBattler_AI ldr r0, _08042E88 @ =gUnknown_2024004 ldrb r0, [r0] strb r0, [r1] @@ -1410,7 +1410,7 @@ _08042E7A: .align 2, 0 _08042E88: .4byte gUnknown_2024004 _08042E8C: .4byte gUnknown_83FBBE9 -_08042E90: .4byte gUnknown_2023D6B +_08042E90: .4byte sBattler_AI _08042E94: .4byte gUnknown_83FBBB4 _08042E98: .4byte gUnknown_202298C thumb_func_end sub_8042DA4 @@ -2509,7 +2509,7 @@ _08043676: sub_804367C: @ 804367C lsls r0, 16 lsrs r0, 16 - ldr r2, _08043694 @ =gUnknown_823EAC8 + ldr r2, _08043694 @ =gTrainers lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2519,7 +2519,7 @@ sub_804367C: @ 804367C ands r0, r1 bx lr .align 2, 0 -_08043694: .4byte gUnknown_823EAC8 +_08043694: .4byte gTrainers thumb_func_end sub_804367C thumb_func_start nature_stat_mod @@ -2669,14 +2669,14 @@ _08043798: _080437A8: cmp r5, 0x3 bne _080437D4 - ldr r0, _08043880 @ =gUnknown_2022B4C + ldr r0, _08043880 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 beq _08043876 - ldr r2, _08043884 @ =gUnknown_823EAC8 - ldr r0, _08043888 @ =gUnknown_20386AE + ldr r2, _08043884 @ =gTrainers + ldr r0, _08043888 @ =gTrainerBattleOpponent_A ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -2777,9 +2777,9 @@ _08043876: pop {r0} bx r0 .align 2, 0 -_08043880: .4byte gUnknown_2022B4C -_08043884: .4byte gUnknown_823EAC8 -_08043888: .4byte gUnknown_20386AE +_08043880: .4byte gBattleTypeFlags +_08043884: .4byte gTrainers +_08043888: .4byte gTrainerBattleOpponent_A _0804388C: .4byte gUnknown_825DFF6 thumb_func_end sub_80436F8 @@ -2841,7 +2841,7 @@ _080438EC: .4byte _08043954 .4byte _08043968 _08043904: - ldr r0, _08043914 @ =gUnknown_8254784 + ldr r0, _08043914 @ =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -2850,9 +2850,9 @@ _08043904: lsls r0, 30 b _08043976 .align 2, 0 -_08043914: .4byte gUnknown_8254784 +_08043914: .4byte gBaseStats _08043918: - ldr r0, _08043928 @ =gUnknown_8254784 + ldr r0, _08043928 @ =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -2860,9 +2860,9 @@ _08043918: ldrb r0, [r1, 0xA] b _08043974 .align 2, 0 -_08043928: .4byte gUnknown_8254784 +_08043928: .4byte gBaseStats _0804392C: - ldr r0, _0804393C @ =gUnknown_8254784 + ldr r0, _0804393C @ =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -2871,9 +2871,9 @@ _0804392C: lsls r0, 26 b _08043976 .align 2, 0 -_0804393C: .4byte gUnknown_8254784 +_0804393C: .4byte gBaseStats _08043940: - ldr r0, _08043950 @ =gUnknown_8254784 + ldr r0, _08043950 @ =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -2882,9 +2882,9 @@ _08043940: lsrs r0, 6 b _08043978 .align 2, 0 -_08043950: .4byte gUnknown_8254784 +_08043950: .4byte gBaseStats _08043954: - ldr r0, _08043964 @ =gUnknown_8254784 + ldr r0, _08043964 @ =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -2893,9 +2893,9 @@ _08043954: lsls r0, 30 b _08043976 .align 2, 0 -_08043964: .4byte gUnknown_8254784 +_08043964: .4byte gBaseStats _08043968: - ldr r0, _080439A4 @ =gUnknown_8254784 + ldr r0, _080439A4 @ =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -2929,7 +2929,7 @@ _0804397C: ldrb r0, [r0, 0x7] b _080439D0 .align 2, 0 -_080439A4: .4byte gUnknown_8254784 +_080439A4: .4byte gBaseStats _080439A8: .4byte gMain _080439AC: .4byte 0x00000439 _080439B0: .4byte gUnknown_2023F54 @@ -3171,7 +3171,7 @@ sub_8043B48: @ 8043B48 adds r4, r0, 0 str r3, [sp] ldr r2, _08043B88 @ =gUnknown_8253AE4 - ldr r3, _08043B8C @ =gUnknown_8254784 + ldr r3, _08043B8C @ =gBaseStats lsls r0, r1, 3 subs r0, r1 lsls r0, 2 @@ -3200,7 +3200,7 @@ _08043B80: bx r0 .align 2, 0 _08043B88: .4byte gUnknown_8253AE4 -_08043B8C: .4byte gUnknown_8254784 +_08043B8C: .4byte gBaseStats thumb_func_end sub_8043B48 thumb_func_start sub_8043B90 @@ -3236,7 +3236,7 @@ sub_8043B90: @ 8043B90 mov r0, sp ldrb r1, [r0] lsls r1, 2 - ldr r2, _08043C10 @ =gUnknown_8254784 + ldr r2, _08043C10 @ =gBaseStats lsls r0, r6, 3 subs r0, r6 lsls r0, 2 @@ -3264,7 +3264,7 @@ sub_8043B90: @ 8043B90 b _08043C22 .align 2, 0 _08043C0C: .4byte gUnknown_8253AE4 -_08043C10: .4byte gUnknown_8254784 +_08043C10: .4byte gBaseStats _08043C14: adds r0, r4, 0 adds r1, r6, 0 @@ -3783,7 +3783,7 @@ _08043FD0: .4byte gUnknown_2024024 thumb_func_start sub_8043FD4 sub_8043FD4: @ 8043FD4 push {lr} - ldr r0, _08043FFC @ =gUnknown_2022B4C + ldr r0, _08043FFC @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x80 lsls r0, 5 @@ -3804,14 +3804,14 @@ _08043FF6: lsls r0, 1 b _08044070 .align 2, 0 -_08043FFC: .4byte gUnknown_2022B4C +_08043FFC: .4byte gBattleTypeFlags _08044000: movs r0, 0x8 ands r1, r0 cmp r1, 0 beq _0804406C - ldr r2, _08044028 @ =gUnknown_823EAC8 - ldr r0, _0804402C @ =gUnknown_20386AE + ldr r2, _08044028 @ =gTrainers + ldr r0, _0804402C @ =gTrainerBattleOpponent_A ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -3827,8 +3827,8 @@ _08044000: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08044028: .4byte gUnknown_823EAC8 -_0804402C: .4byte gUnknown_20386AE +_08044028: .4byte gTrainers +_0804402C: .4byte gTrainerBattleOpponent_A _08044030: .4byte _08044034 .align 2, 0 _08044034: @@ -4073,7 +4073,7 @@ _080441EC: IsPokeSpriteNotFlipped: @ 80441F4 lsls r0, 16 lsrs r0, 16 - ldr r2, _08044208 @ =gUnknown_8254784 + ldr r2, _08044208 @ =gBaseStats lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -4082,7 +4082,7 @@ IsPokeSpriteNotFlipped: @ 80441F4 lsrs r0, 7 bx lr .align 2, 0 -_08044208: .4byte gUnknown_8254784 +_08044208: .4byte gBaseStats thumb_func_end IsPokeSpriteNotFlipped thumb_func_start GetMonFlavorRelation @@ -4260,7 +4260,7 @@ _08044338: sub_8044348: @ 8044348 push {r4,r5,lr} ldr r2, _0804438C @ =gUnknown_2023D6A - ldr r5, _08044390 @ =gUnknown_2023FE8 + ldr r5, _08044390 @ =gBattleStruct ldr r1, [r5] adds r0, r1, 0 adds r0, 0xAC @@ -4281,7 +4281,7 @@ sub_8044348: @ 8044348 lsls r0, 24 cmp r0, 0 bne _0804439C - ldr r1, _08044398 @ =gUnknown_2023BCE + ldr r1, _08044398 @ =gBattlerPartyIndexes ldr r0, [r5] adds r0, 0x49 ldrb r0, [r0] @@ -4292,11 +4292,11 @@ sub_8044348: @ 8044348 b _080443AA .align 2, 0 _0804438C: .4byte gUnknown_2023D6A -_08044390: .4byte gUnknown_2023FE8 +_08044390: .4byte gBattleStruct _08044394: .4byte gUnknown_2022AB8 -_08044398: .4byte gUnknown_2023BCE +_08044398: .4byte gBattlerPartyIndexes _0804439C: - ldr r1, _080443E0 @ =gUnknown_2023BCE + ldr r1, _080443E0 @ =gBattlerPartyIndexes ldr r0, [r5] adds r0, 0x49 ldrb r0, [r0] @@ -4313,7 +4313,7 @@ _080443AA: ldr r1, _080443E8 @ =gUnknown_2024004 ldrb r0, [r1] strb r0, [r4, 0x2] - ldr r2, _080443E0 @ =gUnknown_2023BCE + ldr r2, _080443E0 @ =gBattlerPartyIndexes ldrb r0, [r1] lsls r0, 1 adds r0, r2 @@ -4329,7 +4329,7 @@ _080443AA: pop {r0} bx r0 .align 2, 0 -_080443E0: .4byte gUnknown_2023BCE +_080443E0: .4byte gBattlerPartyIndexes _080443E4: .4byte gUnknown_2022AC8 _080443E8: .4byte gUnknown_2024004 _080443EC: .4byte gUnknown_83FCA2C @@ -4339,7 +4339,7 @@ _080443F0: .4byte gStringVar4 thumb_func_start SetWildMonHeldItem SetWildMonHeldItem: @ 80443F4 push {r4,r5,lr} - ldr r0, _0804444C @ =gUnknown_2022B4C + ldr r0, _0804444C @ =gBattleTypeFlags ldr r0, [r0] ldr r1, _08044450 @ =0x00012008 ands r0, r1 @@ -4352,14 +4352,14 @@ SetWildMonHeldItem: @ 80443F4 bl __umodsi3 lsls r0, 16 lsrs r5, r0, 16 - ldr r4, _08044454 @ =gUnknown_202402C + ldr r4, _08044454 @ =gEnemyParty adds r0, r4, 0 movs r1, 0xB movs r2, 0 bl GetMonData lsls r0, 16 lsrs r0, 16 - ldr r2, _08044458 @ =gUnknown_8254784 + ldr r2, _08044458 @ =gBaseStats lsls r1, r0, 3 subs r1, r0 lsls r3, r1, 2 @@ -4380,10 +4380,10 @@ _0804443E: bl sub_804037C b _08044468 .align 2, 0 -_0804444C: .4byte gUnknown_2022B4C +_0804444C: .4byte gBattleTypeFlags _08044450: .4byte 0x00012008 -_08044454: .4byte gUnknown_202402C -_08044458: .4byte gUnknown_8254784 +_08044454: .4byte gEnemyParty +_08044458: .4byte gBaseStats _0804445C: adds r2, 0xE adds r2, r3, r2 @@ -4479,7 +4479,7 @@ _080444FE: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08044548 @ =gUnknown_2024284 + ldr r0, _08044548 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -4511,7 +4511,7 @@ _08044538: pop {r1} bx r1 .align 2, 0 -_08044548: .4byte gUnknown_2024284 +_08044548: .4byte gPlayerParty thumb_func_end sub_80444F8 thumb_func_start sub_804454C @@ -4551,7 +4551,7 @@ _08044578: .4byte _08044664 .4byte _080445F4 _08044590: - ldr r0, _080445B0 @ =gUnknown_2022B4C + ldr r0, _080445B0 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -4567,11 +4567,11 @@ _08044590: beq _08044632 b _0804461A .align 2, 0 -_080445B0: .4byte gUnknown_2022B4C +_080445B0: .4byte gBattleTypeFlags _080445B4: .4byte gMain _080445B8: .4byte 0x00000439 _080445BC: - ldr r0, _080445E8 @ =gUnknown_2022B4C + ldr r0, _080445E8 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -4593,11 +4593,11 @@ _080445BC: beq _08044664 b _08044632 .align 2, 0 -_080445E8: .4byte gUnknown_2022B4C +_080445E8: .4byte gBattleTypeFlags _080445EC: .4byte gMain _080445F0: .4byte 0x00000439 _080445F4: - ldr r0, _08044638 @ =gUnknown_2022B4C + ldr r0, _08044638 @ =gBattleTypeFlags ldr r2, [r0] movs r3, 0x2 adds r0, r2, 0 @@ -4632,7 +4632,7 @@ _08044632: movs r0, 0 b _08044666 .align 2, 0 -_08044638: .4byte gUnknown_2022B4C +_08044638: .4byte gBattleTypeFlags _0804463C: .4byte gMain _08044640: .4byte 0x00000439 _08044644: .4byte gUnknown_202273C @@ -4667,7 +4667,7 @@ GetDeoxysStat: @ 8044674 push {r4-r6,lr} adds r5, r0, 0 adds r6, r1, 0 - ldr r0, _0804469C @ =gUnknown_2022B4C + ldr r0, _0804469C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x20 ands r0, r1 @@ -4685,7 +4685,7 @@ _08044698: movs r0, 0 b _080446FE .align 2, 0 -_0804469C: .4byte gUnknown_2022B4C +_0804469C: .4byte gBattleTypeFlags _080446A0: adds r1, r6, 0 adds r1, 0x27 @@ -4747,7 +4747,7 @@ _0804470E: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080447A8 @ =gUnknown_2024284 + ldr r0, _080447A8 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -4811,7 +4811,7 @@ _08044798: pop {r0} bx r0 .align 2, 0 -_080447A8: .4byte gUnknown_2024284 +_080447A8: .4byte gPlayerParty thumb_func_end sub_8044708 thumb_func_start sub_80447AC @@ -4896,7 +4896,7 @@ sub_8044838: @ 8044838 ldr r0, _08044890 @ =gUnknown_20370C4 ldrh r6, [r0] bl ZeroEnemyPartyMons - ldr r7, _08044894 @ =gUnknown_202402C + ldr r7, _08044894 @ =gEnemyParty lsls r4, 24 lsrs r4, 24 movs r0, 0 @@ -4929,7 +4929,7 @@ _08044880: _08044888: .4byte gUnknown_20370C0 _0804488C: .4byte gUnknown_20370C2 _08044890: .4byte gUnknown_20370C4 -_08044894: .4byte gUnknown_202402C +_08044894: .4byte gEnemyParty thumb_func_end sub_8044838 thumb_func_start sub_8044898 @@ -4989,7 +4989,7 @@ sub_80448F8: @ 80448F8 adds r4, r0, 0 lsls r1, 24 lsrs r2, r1, 24 - ldr r0, _0804493C @ =gUnknown_2022B4C + ldr r0, _0804493C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 lsls r1, 8 @@ -5015,7 +5015,7 @@ sub_80448F8: @ 80448F8 movs r0, 0x1 b _08044946 .align 2, 0 -_0804493C: .4byte gUnknown_2022B4C +_0804493C: .4byte gBattleTypeFlags _08044940: .4byte gUnknown_841D148 _08044944: movs r0, 0 diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s index 235c46f8c..09be52894 100644 --- a/asm/pokemon_item_effect.s +++ b/asm/pokemon_item_effect.s @@ -115,7 +115,7 @@ _0804147C: lsrs r1, r0, 24 cmp r1, 0 beq _0804151C - ldr r0, _080414E8 @ =gUnknown_2023BC4 + ldr r0, _080414E8 @ =gActiveBattler strb r2, [r0] ldrb r0, [r0] bl GetBankSide @@ -131,7 +131,7 @@ _0804147C: ldrb r0, [r0] cmp r1, r0 bge _08041528 - ldr r2, _080414F0 @ =gUnknown_2023BCE + ldr r2, _080414F0 @ =gBattlerPartyIndexes lsls r0, r1, 1 adds r0, r2 ldrh r3, [r0] @@ -149,9 +149,9 @@ _080414D8: .4byte gUnknown_2023D6F _080414DC: .4byte gUnknown_2024004 _080414E0: .4byte gMain _080414E4: .4byte 0x00000439 -_080414E8: .4byte gUnknown_2023BC4 +_080414E8: .4byte gActiveBattler _080414EC: .4byte gUnknown_2023BCC -_080414F0: .4byte gUnknown_2023BCE +_080414F0: .4byte gBattlerPartyIndexes _080414F4: ldr r1, [sp, 0x18] adds r1, 0x2 @@ -174,7 +174,7 @@ _080414F4: .align 2, 0 _08041518: .4byte gUnknown_2023BCC _0804151C: - ldr r0, _08041544 @ =gUnknown_2023BC4 + ldr r0, _08041544 @ =gActiveBattler strb r1, [r0] movs r3, 0x4 str r3, [sp, 0x34] @@ -196,7 +196,7 @@ _08041528: beq _08041552 b _080415A8 .align 2, 0 -_08041544: .4byte gUnknown_2023BC4 +_08041544: .4byte gActiveBattler _08041548: .4byte gUnknown_82528BC _0804154C: ldr r5, [sp, 0x8] @@ -211,7 +211,7 @@ _08041552: ands r0, r1 cmp r0, 0 beq _08041584 - ldr r0, _0804157C @ =gUnknown_2023BC4 + ldr r0, _0804157C @ =gActiveBattler ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -222,7 +222,7 @@ _08041552: .align 2, 0 _08041574: .4byte gMain _08041578: .4byte 0x00000439 -_0804157C: .4byte gUnknown_2023BC4 +_0804157C: .4byte gActiveBattler _08041580: .4byte gUnknown_2023F5C _08041584: ldr r0, _08041590 @ =gSaveBlock1Ptr @@ -291,7 +291,7 @@ _080415E4: ldr r2, [sp, 0x34] cmp r2, 0x4 beq _0804162C - ldr r1, _080416A4 @ =gUnknown_2023BE4 + ldr r1, _080416A4 @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r1, 0x50 @@ -313,8 +313,8 @@ _0804162C: ands r0, r1 cmp r0, 0 beq _0804165A - ldr r1, _080416A4 @ =gUnknown_2023BE4 - ldr r0, _080416AC @ =gUnknown_2023BC4 + ldr r1, _080416A4 @ =gBattleMons + ldr r0, _080416AC @ =gActiveBattler ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -339,8 +339,8 @@ _0804165A: bne _08041668 bl _08042384 _08041668: - ldr r6, _080416A4 @ =gUnknown_2023BE4 - ldr r5, _080416AC @ =gUnknown_2023BC4 + ldr r6, _080416A4 @ =gBattleMons + ldr r5, _080416AC @ =gActiveBattler ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -369,9 +369,9 @@ _08041696: .align 2, 0 _0804169C: .4byte gMain _080416A0: .4byte 0x00000439 -_080416A4: .4byte gUnknown_2023BE4 +_080416A4: .4byte gBattleMons _080416A8: .4byte 0xfff0ffff -_080416AC: .4byte gUnknown_2023BC4 +_080416AC: .4byte gActiveBattler _080416B0: ldr r0, [sp, 0x20] ldr r1, [sp, 0x18] @@ -383,8 +383,8 @@ _080416B0: adds r6, r2, 0 cmp r3, 0 beq _080416F6 - ldr r7, _0804173C @ =gUnknown_2023BE4 - ldr r5, _08041740 @ =gUnknown_2023BC4 + ldr r7, _0804173C @ =gBattleMons + ldr r5, _08041740 @ =gActiveBattler ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -417,8 +417,8 @@ _080416F6: bne _08041704 bl _08042384 _08041704: - ldr r6, _0804173C @ =gUnknown_2023BE4 - ldr r5, _08041740 @ =gUnknown_2023BC4 + ldr r6, _0804173C @ =gBattleMons + ldr r5, _08041740 @ =gActiveBattler ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -446,8 +446,8 @@ _08041734: str r3, [sp, 0x1C] bl _08042384 .align 2, 0 -_0804173C: .4byte gUnknown_2023BE4 -_08041740: .4byte gUnknown_2023BC4 +_0804173C: .4byte gBattleMons +_08041740: .4byte gActiveBattler _08041744: ldr r4, [sp, 0x20] ldr r5, [sp, 0x18] @@ -459,8 +459,8 @@ _08041744: adds r6, r2, 0 cmp r3, 0 beq _0804178A - ldr r7, _080417D0 @ =gUnknown_2023BE4 - ldr r5, _080417D4 @ =gUnknown_2023BC4 + ldr r7, _080417D0 @ =gBattleMons + ldr r5, _080417D4 @ =gActiveBattler ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -493,8 +493,8 @@ _0804178A: bne _08041798 bl _08042384 _08041798: - ldr r6, _080417D0 @ =gUnknown_2023BE4 - ldr r5, _080417D4 @ =gUnknown_2023BC4 + ldr r6, _080417D0 @ =gBattleMons + ldr r5, _080417D4 @ =gActiveBattler ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -522,8 +522,8 @@ _080417C8: str r1, [sp, 0x1C] bl _08042384 .align 2, 0 -_080417D0: .4byte gUnknown_2023BE4 -_080417D4: .4byte gUnknown_2023BC4 +_080417D0: .4byte gBattleMons +_080417D4: .4byte gActiveBattler _080417D8: ldr r3, [sp, 0x20] ldr r4, [sp, 0x18] @@ -535,7 +535,7 @@ _080417D8: cmp r0, 0 beq _08041820 ldr r5, _08041994 @ =gUnknown_2023DE4 - ldr r4, _08041998 @ =gUnknown_2023BC4 + ldr r4, _08041998 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 @@ -583,7 +583,7 @@ _08041820: bl GetMonData adds r4, 0x1 lsls r4, 2 - ldr r2, _080419A0 @ =gUnknown_8254784 + ldr r2, _080419A0 @ =gBaseStats lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -621,7 +621,7 @@ _08041882: ldr r1, [sp, 0x34] cmp r1, 0x4 beq _080418BA - ldr r1, _080419A4 @ =gUnknown_2023BE4 + ldr r1, _080419A4 @ =gBattleMons movs r0, 0x58 ldr r3, [sp, 0x34] adds r2, r3, 0 @@ -722,7 +722,7 @@ _08041960: bne _0804196A bl _08042384 _0804196A: - ldr r1, _080419A4 @ =gUnknown_2023BE4 + ldr r1, _080419A4 @ =gBattleMons movs r0, 0x58 muls r0, r4 adds r1, 0x50 @@ -744,10 +744,10 @@ _0804198A: bl _08042384 .align 2, 0 _08041994: .4byte gUnknown_2023DE4 -_08041998: .4byte gUnknown_2023BC4 +_08041998: .4byte gActiveBattler _0804199C: .4byte gUnknown_8253AE4 -_080419A0: .4byte gUnknown_8254784 -_080419A4: .4byte gUnknown_2023BE4 +_080419A0: .4byte gBaseStats +_080419A4: .4byte gBattleMons _080419A8: .4byte 0xf7ffffff _080419AC: .4byte 0x00000f88 _080419B0: .4byte gMain @@ -988,8 +988,8 @@ _08041B90: ldr r2, [sp, 0x34] cmp r2, 0x4 beq _08041BF0 - ldr r2, _08041BE0 @ =gUnknown_2023D70 - ldr r1, _08041BE4 @ =gUnknown_825E45C + ldr r2, _08041BE0 @ =gAbsentBattlerFlags + ldr r1, _08041BE4 @ =gBitTable ldr r3, [sp, 0x34] lsls r0, r3, 2 adds r0, r1 @@ -997,7 +997,7 @@ _08041B90: ldrb r0, [r2] bics r0, r1 strb r0, [r2] - ldr r1, _08041BE8 @ =gUnknown_2023BCE + ldr r1, _08041BE8 @ =gBattlerPartyIndexes lsls r0, r3, 1 adds r0, r1 ldrb r0, [r0] @@ -1007,20 +1007,20 @@ _08041B90: lsrs r1, 24 ldr r0, [sp, 0x34] bl CopyPlayerPartyMonToBattleData - ldr r0, _08041BEC @ =gUnknown_2023BC4 + ldr r0, _08041BEC @ =gActiveBattler ldrb r0, [r0] b _08041C08 .align 2, 0 _08041BD8: .4byte gMain _08041BDC: .4byte 0x00000439 -_08041BE0: .4byte gUnknown_2023D70 -_08041BE4: .4byte gUnknown_825E45C -_08041BE8: .4byte gUnknown_2023BCE -_08041BEC: .4byte gUnknown_2023BC4 +_08041BE0: .4byte gAbsentBattlerFlags +_08041BE4: .4byte gBitTable +_08041BE8: .4byte gBattlerPartyIndexes +_08041BEC: .4byte gActiveBattler _08041BF0: - ldr r3, _08041C20 @ =gUnknown_2023D70 - ldr r1, _08041C24 @ =gUnknown_825E45C - ldr r2, _08041C28 @ =gUnknown_2023BC4 + ldr r3, _08041C20 @ =gAbsentBattlerFlags + ldr r1, _08041C24 @ =gBitTable + ldr r2, _08041C28 @ =gActiveBattler ldrb r0, [r2] eors r0, r4 lsls r0, 2 @@ -1035,7 +1035,7 @@ _08041C08: lsls r0, 24 cmp r0, 0 bne _08041C46 - ldr r1, _08041C2C @ =gUnknown_3004F90 + ldr r1, _08041C2C @ =gBattleResults ldrb r0, [r1, 0x4] cmp r0, 0xFE bhi _08041C46 @@ -1043,10 +1043,10 @@ _08041C08: strb r0, [r1, 0x4] b _08041C46 .align 2, 0 -_08041C20: .4byte gUnknown_2023D70 -_08041C24: .4byte gUnknown_825E45C -_08041C28: .4byte gUnknown_2023BC4 -_08041C2C: .4byte gUnknown_3004F90 +_08041C20: .4byte gAbsentBattlerFlags +_08041C24: .4byte gBitTable +_08041C28: .4byte gActiveBattler +_08041C2C: .4byte gBattleResults _08041C30: mov r0, r8 movs r1, 0x39 @@ -1103,7 +1103,7 @@ _08041C88: movs r0, 0x1 b _08041CA4 _08041C9E: - ldr r0, _08041D60 @ =gUnknown_2023FC4 + ldr r0, _08041D60 @ =gBattleScripting adds r0, 0x23 ldrb r0, [r0] _08041CA4: @@ -1158,7 +1158,7 @@ _08041CF2: ldr r2, [sp, 0x34] cmp r2, 0x4 beq _08041D80 - ldr r1, _08041D6C @ =gUnknown_2023BE4 + ldr r1, _08041D6C @ =gBattleMons movs r0, 0x58 muls r0, r2 adds r0, r1 @@ -1169,13 +1169,13 @@ _08041CF2: ands r0, r3 cmp r0, 0 bne _08041D80 - ldr r4, _08041D70 @ =gUnknown_2023BC4 + ldr r4, _08041D70 @ =gActiveBattler ldrb r0, [r4] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08041D80 - ldr r1, _08041D74 @ =gUnknown_3004F90 + ldr r1, _08041D74 @ =gBattleResults ldrb r0, [r1, 0x3] cmp r0, 0xFE bhi _08041D42 @@ -1195,14 +1195,14 @@ _08041D42: strb r5, [r4] b _08041D80 .align 2, 0 -_08041D60: .4byte gUnknown_2023FC4 +_08041D60: .4byte gBattleScripting _08041D64: .4byte gMain _08041D68: .4byte 0x00000439 -_08041D6C: .4byte gUnknown_2023BE4 -_08041D70: .4byte gUnknown_2023BC4 -_08041D74: .4byte gUnknown_3004F90 +_08041D6C: .4byte gBattleMons +_08041D70: .4byte gActiveBattler +_08041D74: .4byte gBattleResults _08041D78: - ldr r1, _08041D90 @ =gUnknown_2023D50 + ldr r1, _08041D90 @ =gBattleMoveDamage ldr r0, [sp] negs r0, r0 str r0, [r1] @@ -1216,7 +1216,7 @@ _08041D84: mov r10, r2 b _08042042 .align 2, 0 -_08041D90: .4byte gUnknown_2023D50 +_08041D90: .4byte gBattleMoveDamage _08041D94: movs r7, 0x2 mov r0, r10 @@ -1328,7 +1328,7 @@ _08041E60: ldr r0, [sp, 0x34] cmp r0, 0x4 beq _08041EC6 - ldr r4, _08041EE4 @ =gUnknown_2023BE4 + ldr r4, _08041EE4 @ =gBattleMons movs r0, 0x58 ldr r1, [sp, 0x34] adds r3, r1, 0 @@ -1342,7 +1342,7 @@ _08041E60: ands r1, r0 cmp r1, 0 bne _08041EC6 - ldr r1, _08041EE8 @ =gUnknown_2023E0C + ldr r1, _08041EE8 @ =gDisableStructs ldr r2, [sp, 0x34] lsls r0, r2, 3 subs r0, r2 @@ -1350,7 +1350,7 @@ _08041E60: adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _08041EEC @ =gUnknown_825E45C + ldr r2, _08041EEC @ =gBitTable lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -1381,9 +1381,9 @@ _08041ED6: .align 2, 0 _08041EDC: .4byte gMain _08041EE0: .4byte 0x00000439 -_08041EE4: .4byte gUnknown_2023BE4 -_08041EE8: .4byte gUnknown_2023E0C -_08041EEC: .4byte gUnknown_825E45C +_08041EE4: .4byte gBattleMons +_08041EE8: .4byte gDisableStructs +_08041EEC: .4byte gBitTable _08041EF0: ldr r6, [sp, 0x10] adds r6, 0x11 @@ -1486,7 +1486,7 @@ _08041FAC: ldr r2, [sp, 0x34] cmp r2, 0x4 beq _08042010 - ldr r4, _08042020 @ =gUnknown_2023BE4 + ldr r4, _08042020 @ =gBattleMons movs r0, 0x58 adds r3, r2, 0 muls r3, r0 @@ -1499,14 +1499,14 @@ _08041FAC: ands r0, r1 cmp r0, 0 bne _08042010 - ldr r1, _08042024 @ =gUnknown_2023E0C + ldr r1, _08042024 @ =gDisableStructs lsls r0, r2, 3 subs r0, r2 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _08042028 @ =gUnknown_825E45C + ldr r2, _08042028 @ =gBitTable ldr r5, [sp, 0x10] lsls r0, r5, 2 adds r0, r2 @@ -1527,9 +1527,9 @@ _08042010: .align 2, 0 _08042018: .4byte gMain _0804201C: .4byte 0x00000439 -_08042020: .4byte gUnknown_2023BE4 -_08042024: .4byte gUnknown_2023E0C -_08042028: .4byte gUnknown_825E45C +_08042020: .4byte gBattleMons +_08042024: .4byte gDisableStructs +_08042028: .4byte gBitTable _0804202C: mov r0, r8 movs r1, 0x2 diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s index 5c10eb282..be196e54e 100644 --- a/asm/pokemon_size_record.s +++ b/asm/pokemon_size_record.s @@ -223,7 +223,7 @@ _080A0848: ldrh r1, [r1] movs r0, 0x64 muls r1, r0 - ldr r0, _080A0870 @ =gUnknown_2024284 + ldr r0, _080A0870 @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x2D @@ -239,7 +239,7 @@ _080A086A: movs r0, 0x1 b _080A08C4 .align 2, 0 -_080A0870: .4byte gUnknown_2024284 +_080A0870: .4byte gPlayerParty _080A0874: mov r4, sp adds r0, r5, 0 @@ -437,7 +437,7 @@ _080A09E6: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080A0A40 @ =gUnknown_2024284 + ldr r0, _080A0A40 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -475,7 +475,7 @@ _080A0A28: _080A0A34: .4byte gUnknown_83E27AC _080A0A38: .4byte gSaveBlock1Ptr _080A0A3C: .4byte 0x0000309c -_080A0A40: .4byte gUnknown_2024284 +_080A0A40: .4byte gPlayerParty _080A0A44: .4byte 0x0000083b thumb_func_end GiveGiftRibbonToParty diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index e7b41b23e..f07f73c1b 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -126,7 +126,7 @@ _0811C628: movs r0, 0x64 mov r4, r8 muls r4, r0 - ldr r0, _0811C6E0 @ =gUnknown_2024284 + ldr r0, _0811C6E0 @ =gPlayerParty adds r4, r0 adds r0, r7, 0 adds r0, 0x92 @@ -208,7 +208,7 @@ _0811C6D2: pop {r1} bx r1 .align 2, 0 -_0811C6E0: .4byte gUnknown_2024284 +_0811C6E0: .4byte gPlayerParty _0811C6E4: .4byte gUnknown_8247094 thumb_func_end sub_811C5D4 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 9cd38991c..a1073d77d 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1058,7 +1058,7 @@ _0808C142: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0808C180 @ =gUnknown_2024284 + ldr r0, _0808C180 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -1085,7 +1085,7 @@ _0808C16A: pop {r1} bx r1 .align 2, 0 -_0808C180: .4byte gUnknown_2024284 +_0808C180: .4byte gPlayerParty thumb_func_end CountPartyNonEggMons thumb_func_start CountPartyAliveNonEggMonsExcept @@ -1101,7 +1101,7 @@ _0808C18E: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0808C1DC @ =gUnknown_2024284 + ldr r0, _0808C1DC @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -1133,7 +1133,7 @@ _0808C1C6: pop {r1} bx r1 .align 2, 0 -_0808C1DC: .4byte gUnknown_2024284 +_0808C1DC: .4byte gPlayerParty thumb_func_end CountPartyAliveNonEggMonsExcept thumb_func_start CountPartyAliveNonEggMons_IgnoreVar0x8004Slot @@ -1158,7 +1158,7 @@ CountPartyMons: @ 808C1F8 _0808C1FE: movs r0, 0x64 muls r0, r4 - ldr r1, _0808C22C @ =gUnknown_2024284 + ldr r1, _0808C22C @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -1179,7 +1179,7 @@ _0808C216: pop {r1} bx r1 .align 2, 0 -_0808C22C: .4byte gUnknown_2024284 +_0808C22C: .4byte gPlayerParty thumb_func_end CountPartyMons thumb_func_start StringCopyAndFillWithSpaces @@ -6624,7 +6624,7 @@ sub_808EF0C: @ 808EF0C beq _0808EF4C movs r0, 0x64 muls r0, r1 - ldr r1, _0808EF48 @ =gUnknown_2024284 + ldr r1, _0808EF48 @ =gPlayerParty adds r0, r1 movs r1, 0xC mov r2, sp @@ -6633,7 +6633,7 @@ sub_808EF0C: @ 808EF0C .align 2, 0 _0808EF40: .4byte gUnknown_203AD30 _0808EF44: .4byte gUnknown_20397B4 -_0808EF48: .4byte gUnknown_2024284 +_0808EF48: .4byte gPlayerParty _0808EF4C: adds r0, r1, 0 movs r1, 0xC @@ -7968,7 +7968,7 @@ sub_808F9FC: @ 808F9FC _0808FA00: movs r0, 0x64 muls r0, r4 - ldr r1, _0808FA2C @ =gUnknown_2024284 + ldr r1, _0808FA2C @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -7986,7 +7986,7 @@ _0808FA00: pop {r0} bx r0 .align 2, 0 -_0808FA2C: .4byte gUnknown_2024284 +_0808FA2C: .4byte gPlayerParty thumb_func_end sub_808F9FC thumb_func_start sub_808FA30 @@ -8528,7 +8528,7 @@ sub_808FE54: @ 808FE54 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _0808FE98 @ =gUnknown_2024284 + ldr r1, _0808FE98 @ =gPlayerParty adds r0, r1 movs r1, 0x41 bl GetMonData @@ -8536,7 +8536,7 @@ sub_808FE54: @ 808FE54 .align 2, 0 _0808FE90: .4byte gUnknown_20397B0 _0808FE94: .4byte gUnknown_20397B4 -_0808FE98: .4byte gUnknown_2024284 +_0808FE98: .4byte gPlayerParty _0808FE9C: bl StorageGetCurrentBox lsls r0, 24 @@ -9854,7 +9854,7 @@ sub_809088C: @ 809088C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _0809092C @ =gUnknown_2024284 + ldr r4, _0809092C @ =gPlayerParty adds r0, r4, 0 movs r1, 0x41 bl GetMonData @@ -9883,7 +9883,7 @@ _080908D2: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _0809092C @ =gUnknown_2024284 + ldr r0, _0809092C @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -9923,7 +9923,7 @@ _080908D2: lsrs r7, r0, 16 b _08090946 .align 2, 0 -_0809092C: .4byte gUnknown_2024284 +_0809092C: .4byte gPlayerParty _08090930: .4byte gUnknown_20397B0 _08090934: .4byte 0x00000a6c _08090938: @@ -9988,7 +9988,7 @@ _08090998: beq _080909D0 movs r0, 0x64 muls r0, r6 - ldr r1, _080909F0 @ =gUnknown_2024284 + ldr r1, _080909F0 @ =gPlayerParty adds r0, r1 movs r1, 0xC bl GetMonData @@ -10022,7 +10022,7 @@ _080909DA: .align 2, 0 _080909E8: .4byte gUnknown_20397B0 _080909EC: .4byte 0x00000a6c -_080909F0: .4byte gUnknown_2024284 +_080909F0: .4byte gPlayerParty thumb_func_end sub_809088C thumb_func_start sub_80909F4 @@ -13489,7 +13489,7 @@ sub_8092458: @ 8092458 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _08092488 @ =gUnknown_2024284 + ldr r1, _08092488 @ =gPlayerParty adds r0, r1 movs r1, 0xB bl GetMonData @@ -13497,7 +13497,7 @@ sub_8092458: @ 8092458 .align 2, 0 _08092480: .4byte gUnknown_2039820 _08092484: .4byte gUnknown_2039821 -_08092488: .4byte gUnknown_2024284 +_08092488: .4byte gPlayerParty _0809248C: ldr r0, _0809249C @ =gUnknown_2039821 ldrb r0, [r0] @@ -14922,7 +14922,7 @@ sub_8092F60: @ 8092F60 ldr r0, [r0] ldr r1, _08092F90 @ =0x000020a0 adds r0, r1 - ldr r3, _08092F94 @ =gUnknown_2024284 + ldr r3, _08092F94 @ =gPlayerParty ldr r1, _08092F98 @ =gUnknown_2039821 movs r2, 0 ldrsb r2, [r1, r2] @@ -14935,7 +14935,7 @@ sub_8092F60: @ 8092F60 .align 2, 0 _08092F8C: .4byte gUnknown_20397B0 _08092F90: .4byte 0x000020a0 -_08092F94: .4byte gUnknown_2024284 +_08092F94: .4byte gPlayerParty _08092F98: .4byte gUnknown_2039821 _08092F9C: ldr r0, _08092FC4 @ =gUnknown_20397B0 @@ -14972,7 +14972,7 @@ diegohint2: @ 8092FD4 lsrs r7, r1, 24 cmp r6, 0xE bne _08093008 - ldr r1, _08092FFC @ =gUnknown_2024284 + ldr r1, _08092FFC @ =gPlayerParty movs r0, 0x64 muls r0, r7 adds r0, r1 @@ -14984,7 +14984,7 @@ diegohint2: @ 8092FD4 bl memcpy b _08093020 .align 2, 0 -_08092FFC: .4byte gUnknown_2024284 +_08092FFC: .4byte gPlayerParty _08093000: .4byte gUnknown_20397B0 _08093004: .4byte 0x000020a0 _08093008: @@ -15018,12 +15018,12 @@ sub_8093030: @ 8093030 bne _08093050 movs r0, 0x64 muls r0, r1 - ldr r1, _0809304C @ =gUnknown_2024284 + ldr r1, _0809304C @ =gPlayerParty adds r0, r1 bl ZeroMonData b _08093054 .align 2, 0 -_0809304C: .4byte gUnknown_2024284 +_0809304C: .4byte gPlayerParty _08093050: bl sub_808BCB4 _08093054: @@ -15044,7 +15044,7 @@ diegohint1: @ 8093058 ldr r0, [r0] ldr r1, _08093084 @ =0x00002104 adds r0, r1 - ldr r2, _08093088 @ =gUnknown_2024284 + ldr r2, _08093088 @ =gPlayerParty movs r1, 0x64 muls r1, r7 adds r1, r2 @@ -15054,7 +15054,7 @@ diegohint1: @ 8093058 .align 2, 0 _08093080: .4byte gUnknown_20397B0 _08093084: .4byte 0x00002104 -_08093088: .4byte gUnknown_2024284 +_08093088: .4byte gPlayerParty _0809308C: ldr r0, _080930D0 @ =gUnknown_20397B0 ldr r2, [r0] @@ -15357,7 +15357,7 @@ _080932D8: ldr r0, [r4] ldr r3, _08093314 @ =0x00002104 adds r0, r3 - ldr r3, _08093318 @ =gUnknown_2024284 + ldr r3, _08093318 @ =gPlayerParty ldr r1, _0809331C @ =gUnknown_2039821 movs r2, 0 ldrsb r2, [r1, r2] @@ -15376,7 +15376,7 @@ _080932D8: _0809330C: .4byte gUnknown_2039820 _08093310: .4byte gUnknown_20397B0 _08093314: .4byte 0x00002104 -_08093318: .4byte gUnknown_2024284 +_08093318: .4byte gPlayerParty _0809331C: .4byte gUnknown_2039821 _08093320: .4byte 0x0000216e _08093324: @@ -15550,7 +15550,7 @@ _0809346A: _08093488: movs r0, 0x64 muls r0, r6 - ldr r1, _08093504 @ =gUnknown_2024284 + ldr r1, _08093504 @ =gPlayerParty adds r0, r1 ldr r1, _08093508 @ =0x00002172 adds r2, r1 @@ -15611,7 +15611,7 @@ _080934DC: b _08093600 .align 2, 0 _08093500: .4byte 0x0000216e -_08093504: .4byte gUnknown_2024284 +_08093504: .4byte gPlayerParty _08093508: .4byte 0x00002172 _0809350C: .4byte 0x0000216a _08093510: .4byte gUnknown_20397B0 @@ -15869,7 +15869,7 @@ _08093708: ldr r1, [r4] ldr r0, _0809374C @ =0x0000217c adds r2, r1, r0 - ldr r0, _08093750 @ =gUnknown_2024284 + ldr r0, _08093750 @ =gPlayerParty str r0, [r2] ldr r0, _08093754 @ =gUnknown_2039821 ldrb r0, [r0] @@ -15891,7 +15891,7 @@ _08093708: _08093744: .4byte gUnknown_2039820 _08093748: .4byte gUnknown_20397B0 _0809374C: .4byte 0x0000217c -_08093750: .4byte gUnknown_2024284 +_08093750: .4byte gPlayerParty _08093754: .4byte gUnknown_2039821 _08093758: .4byte 0x00002179 _0809375C: .4byte 0x00002178 @@ -15969,7 +15969,7 @@ CompactPartySlots: @ 80937DC movs r5, 0 movs r0, 0x64 mov r9, r0 - ldr r1, _0809382C @ =gUnknown_2024284 + ldr r1, _0809382C @ =gPlayerParty mov r8, r1 subs r0, 0x65 mov r10, r0 @@ -15999,7 +15999,7 @@ _08093820: b _0809383A .align 2, 0 _08093828: .4byte 0x0000ffff -_0809382C: .4byte gUnknown_2024284 +_0809382C: .4byte gPlayerParty _08093830: lsls r0, r7, 16 asrs r0, 16 @@ -16016,7 +16016,7 @@ _0809383A: cmp r5, 0x5 bhi _08093862 movs r6, 0x64 - ldr r4, _08093874 @ =gUnknown_2024284 + ldr r4, _08093874 @ =gPlayerParty _0809384E: adds r0, r5, 0 muls r0, r6 @@ -16037,7 +16037,7 @@ _08093862: pop {r1} bx r1 .align 2, 0 -_08093874: .4byte gUnknown_2024284 +_08093874: .4byte gPlayerParty thumb_func_end CompactPartySlots thumb_func_start sub_8093878 @@ -16080,7 +16080,7 @@ _080938B8: ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _080938FC @ =gUnknown_2024284 + ldr r1, _080938FC @ =gPlayerParty adds r0, r1 movs r1, 0x8 mov r2, sp @@ -16103,7 +16103,7 @@ _080938EC: .align 2, 0 _080938F4: .4byte gUnknown_2039820 _080938F8: .4byte gUnknown_2039821 -_080938FC: .4byte gUnknown_2024284 +_080938FC: .4byte gPlayerParty thumb_func_end sub_8093878 thumb_func_start sub_8093900 @@ -16307,14 +16307,14 @@ _08093A5A: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _08093A7C @ =gUnknown_2024284 + ldr r1, _08093A7C @ =gPlayerParty adds r0, r1 movs r1, 0 bl sub_8093AD0 b _08093AA0 .align 2, 0 _08093A78: .4byte gUnknown_2039821 -_08093A7C: .4byte gUnknown_2024284 +_08093A7C: .4byte gPlayerParty _08093A80: movs r0, 0 movs r1, 0x2 @@ -20749,7 +20749,7 @@ _08095CD2: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08095D40 @ =gUnknown_2024284 + ldr r0, _08095D40 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -20795,7 +20795,7 @@ _08095D36: pop {r0} bx r0 .align 2, 0 -_08095D40: .4byte gUnknown_2024284 +_08095D40: .4byte gPlayerParty thumb_func_end sub_8095C84 thumb_func_start sub_8095D44 @@ -20882,7 +20882,7 @@ _08095DE8: .4byte gUnknown_20397B0 _08095DEC: movs r0, 0x64 muls r0, r7 - ldr r1, _08095E1C @ =gUnknown_2024284 + ldr r1, _08095E1C @ =gPlayerParty adds r0, r1 movs r1, 0xC mov r2, sp @@ -20905,7 +20905,7 @@ _08095E14: pop {r0} bx r0 .align 2, 0 -_08095E1C: .4byte gUnknown_2024284 +_08095E1C: .4byte gPlayerParty _08095E20: .4byte gUnknown_20397B0 _08095E24: .4byte 0x00000ce2 _08095E28: .4byte 0x00002224 @@ -21019,7 +21019,7 @@ _08095F10: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 - ldr r0, _08095F6C @ =gUnknown_2024284 + ldr r0, _08095F6C @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0xC @@ -21059,7 +21059,7 @@ _08095F5E: pop {r0} bx r0 .align 2, 0 -_08095F6C: .4byte gUnknown_2024284 +_08095F6C: .4byte gPlayerParty _08095F70: .4byte 0x00002224 thumb_func_end sub_8095EA0 @@ -21112,7 +21112,7 @@ _08095FD4: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r1, _08096000 @ =gUnknown_2024284 + ldr r1, _08096000 @ =gPlayerParty adds r0, r1 ldr r2, [r6] ldr r1, _08096004 @ =0x00002224 @@ -21129,7 +21129,7 @@ _08095FF4: pop {r0} bx r0 .align 2, 0 -_08096000: .4byte gUnknown_2024284 +_08096000: .4byte gPlayerParty _08096004: .4byte 0x00002224 thumb_func_end sub_8095F74 @@ -21179,7 +21179,7 @@ _08096060: .4byte gUnknown_20397B0 _08096064: movs r0, 0x64 muls r0, r7 - ldr r1, _08096084 @ =gUnknown_2024284 + ldr r1, _08096084 @ =gPlayerParty adds r0, r1 movs r1, 0xC mov r2, sp @@ -21193,7 +21193,7 @@ _0809607C: pop {r0} bx r0 .align 2, 0 -_08096084: .4byte gUnknown_2024284 +_08096084: .4byte gPlayerParty thumb_func_end sub_8096008 thumb_func_start sub_8096088 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index cb450cd94..67d402992 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -56,7 +56,7 @@ _08134548: adds r0, r5, r2 mov r3, r8 str r3, [r0] - ldr r0, _08134588 @ =gUnknown_202402C + ldr r0, _08134588 @ =gEnemyParty cmp r8, r0 bne _08134590 ldr r0, _0813458C @ =0x00003024 @@ -69,7 +69,7 @@ _08134578: .4byte gUnknown_203B16D _0813457C: .4byte gUnknown_203B16E _08134580: .4byte 0x000032f8 _08134584: .4byte 0x000032f4 -_08134588: .4byte gUnknown_202402C +_08134588: .4byte gEnemyParty _0813458C: .4byte 0x00003024 _08134590: ldr r2, _081345C0 @ =0x00003024 @@ -3404,7 +3404,7 @@ _08136168: adds r1, r4, 0 bl GetSpeciesName ldr r1, [r6] - ldr r2, _081361F8 @ =gUnknown_8254784 + ldr r2, _081361F8 @ =gBaseStats lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -3454,7 +3454,7 @@ _08136168: .align 2, 0 _081361F0: .4byte 0x00003290 _081361F4: .4byte 0x00003028 -_081361F8: .4byte gUnknown_8254784 +_081361F8: .4byte gBaseStats _081361FC: .4byte 0x00003220 _08136200: .4byte 0x00003221 _08136204: .4byte 0x00003034 @@ -3976,7 +3976,7 @@ _08136630: ldr r4, _08136790 @ =gUnknown_8253AE4 adds r2, r5, 0x1 lsls r2, 2 - ldr r3, _08136794 @ =gUnknown_8254784 + ldr r3, _08136794 @ =gBaseStats lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -4085,7 +4085,7 @@ _08136784: .4byte 0x0000309c _08136788: .4byte gUnknown_203B144 _0813678C: .4byte 0x000031a4 _08136790: .4byte gUnknown_8253AE4 -_08136794: .4byte gUnknown_8254784 +_08136794: .4byte gBaseStats _08136798: .4byte 0x000031b0 _0813679C: .4byte 0x000031bc _081367A0: .4byte gUnknown_824FC40 @@ -4222,7 +4222,7 @@ _081368B0: ldr r1, _0813694C @ =0x0000324e adds r4, r0, r1 add r4, r9 - ldr r5, _08136950 @ =gUnknown_8250C04 + ldr r5, _08136950 @ =gBattleMoves ldr r2, _08136954 @ =0x00003258 adds r3, r0, r2 add r3, r9 @@ -4289,7 +4289,7 @@ _081368B0: .align 2, 0 _08136948: .4byte 0x00003264 _0813694C: .4byte 0x0000324e -_08136950: .4byte gUnknown_8250C04 +_08136950: .4byte gBattleMoves _08136954: .4byte 0x00003258 _08136958: .4byte 0x00003128 _0813695C: .4byte gUnknown_8247094 @@ -4381,7 +4381,7 @@ _081369D0: lsls r1, 1 subs r4, r1 strh r4, [r2] - ldr r2, _08136A64 @ =gUnknown_8250C04 + ldr r2, _08136A64 @ =gBattleMoves ldr r6, [r6] ldr r3, _08136A5C @ =0x00003258 adds r0, r6, r3 @@ -4409,7 +4409,7 @@ _08136A54: .4byte 0x00003290 _08136A58: .4byte 0x000030f0 _08136A5C: .4byte 0x00003258 _08136A60: .4byte gUnknown_203B144 -_08136A64: .4byte gUnknown_8250C04 +_08136A64: .4byte gBattleMoves _08136A68: .4byte 0x0000316c _08136A6C: .4byte gUnknown_8416213 _08136A70: @@ -4423,7 +4423,7 @@ _08136A70: movs r3, 0x3 bl ConvertIntToDecimalStringN _08136A84: - ldr r2, _08136AB4 @ =gUnknown_8250C04 + ldr r2, _08136AB4 @ =gBattleMoves ldr r0, _08136AB8 @ =gUnknown_203B140 ldr r3, [r0] ldr r1, _08136ABC @ =0x00003258 @@ -4446,7 +4446,7 @@ _08136A84: b _08136ADA .align 2, 0 _08136AB0: .4byte 0x0000316c -_08136AB4: .4byte gUnknown_8250C04 +_08136AB4: .4byte gBattleMoves _08136AB8: .4byte gUnknown_203B140 _08136ABC: .4byte 0x00003258 _08136AC0: .4byte 0x00003188 @@ -6230,7 +6230,7 @@ sub_8137970: @ 8137970 ldr r1, _081379CC @ =0x000032f4 adds r0, r2, r1 ldr r1, [r0] - ldr r0, _081379D0 @ =gUnknown_202402C + ldr r0, _081379D0 @ =gEnemyParty cmp r1, r0 beq _081379E4 cmp r4, 0xFF @@ -6257,7 +6257,7 @@ sub_8137970: @ 8137970 _081379C4: .4byte gUnknown_203B140 _081379C8: .4byte 0x00003290 _081379CC: .4byte 0x000032f4 -_081379D0: .4byte gUnknown_202402C +_081379D0: .4byte gEnemyParty _081379D4: cmp r4, 0xFD bne _081379DA @@ -7623,7 +7623,7 @@ sub_813847C: @ 813847C ldr r1, _081384C0 @ =0x000032f4 adds r0, r1 ldr r1, [r0] - ldr r0, _081384C4 @ =gUnknown_202402C + ldr r0, _081384C4 @ =gEnemyParty cmp r1, r0 bne _081384D0 bl GetMultiplayerId @@ -7648,7 +7648,7 @@ sub_813847C: @ 813847C .align 2, 0 _081384BC: .4byte gUnknown_203B140 _081384C0: .4byte 0x000032f4 -_081384C4: .4byte gUnknown_202402C +_081384C4: .4byte gEnemyParty _081384C8: .4byte gUnknown_202273C _081384CC: .4byte 0x0000304c _081384D0: @@ -12273,7 +12273,7 @@ _0813A9E2: ldr r3, _0813AADC @ =gUnknown_8253AE4 adds r1, r5, 0x1 lsls r1, 2 - ldr r2, _0813AAE0 @ =gUnknown_8254784 + ldr r2, _0813AAE0 @ =gBaseStats lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -12396,7 +12396,7 @@ _0813AAB8: _0813AAD4: .4byte gUnknown_203B140 _0813AAD8: .4byte 0x00003290 _0813AADC: .4byte gUnknown_8253AE4 -_0813AAE0: .4byte gUnknown_8254784 +_0813AAE0: .4byte gBaseStats _0813AAE4: .4byte gUnknown_203B160 _0813AAE8: movs r6, 0x2 @@ -13439,7 +13439,7 @@ _0813B30A: ldrb r1, [r5] movs r0, 0x64 muls r0, r1 - ldr r1, _0813B338 @ =gUnknown_2024284 + ldr r1, _0813B338 @ =gPlayerParty adds r0, r1 bl sub_813B2C8 lsls r0, 24 @@ -13451,7 +13451,7 @@ _0813B30A: b _0813B340 .align 2, 0 _0813B334: .4byte gUnknown_8463FB8 -_0813B338: .4byte gUnknown_2024284 +_0813B338: .4byte gPlayerParty _0813B33C: movs r0, 0x1 negs r0, r0 @@ -13477,7 +13477,7 @@ _0813B34E: ldrb r1, [r5] movs r0, 0x64 muls r0, r1 - ldr r1, _0813B37C @ =gUnknown_2024284 + ldr r1, _0813B37C @ =gPlayerParty adds r0, r1 bl sub_813B2C8 lsls r0, 24 @@ -13489,7 +13489,7 @@ _0813B34E: b _0813B384 .align 2, 0 _0813B378: .4byte gUnknown_8463FB8 -_0813B37C: .4byte gUnknown_2024284 +_0813B37C: .4byte gPlayerParty _0813B380: movs r0, 0x1 negs r0, r0 diff --git a/asm/post_battle_event_funcs.s b/asm/post_battle_event_funcs.s index a55c727c6..c3a732184 100644 --- a/asm/post_battle_event_funcs.s +++ b/asm/post_battle_event_funcs.s @@ -56,7 +56,7 @@ _080CA34A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080CA3B8 @ =gUnknown_2024284 + ldr r0, _080CA3B8 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -101,7 +101,7 @@ _080CA39E: .align 2, 0 _080CA3B0: .4byte gUnknown_203AB44 _080CA3B4: .4byte gSaveBlock2Ptr -_080CA3B8: .4byte gUnknown_2024284 +_080CA3B8: .4byte gPlayerParty _080CA3BC: .4byte 0x0000083b _080CA3C0: .4byte CB2_DoHallOfFameScreen thumb_func_end sub_80CA2E4 diff --git a/asm/quest_log.s b/asm/quest_log.s index 7769f2811..fc167d660 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -1580,7 +1580,7 @@ _08111492: subs r0, r3 movs r1, 0x64 muls r0, r1 - ldr r1, _081114C0 @ =gUnknown_2024284 + ldr r1, _081114C0 @ =gPlayerParty adds r0, r1 str r3, [sp, 0x10] bl ZeroMonData @@ -1597,7 +1597,7 @@ _08111492: b _0811150E .align 2, 0 _081114BC: .4byte 0x00004027 -_081114C0: .4byte gUnknown_2024284 +_081114C0: .4byte gPlayerParty _081114C4: mov r8, r4 cmp r5, r0 @@ -1623,7 +1623,7 @@ _081114CE: _081114EE: movs r0, 0x64 muls r0, r3 - ldr r1, _08111574 @ =gUnknown_2024284 + ldr r1, _08111574 @ =gPlayerParty adds r0, r1 mov r1, r9 movs r2, 0x64 @@ -1688,7 +1688,7 @@ _08111554: bls _08111520 b _081115D2 .align 2, 0 -_08111574: .4byte gUnknown_2024284 +_08111574: .4byte gPlayerParty _08111578: cmp r5, r0 bcs _081115D2 @@ -1779,7 +1779,7 @@ sub_8111618: @ 8111618 _0811161E: movs r0, 0x64 muls r0, r4 - ldr r1, _08111648 @ =gUnknown_2024284 + ldr r1, _08111648 @ =gPlayerParty adds r0, r1 movs r1, 0x5 bl GetMonData @@ -1799,7 +1799,7 @@ _08111636: pop {r1} bx r1 .align 2, 0 -_08111648: .4byte gUnknown_2024284 +_08111648: .4byte gPlayerParty thumb_func_end sub_8111618 thumb_func_start sub_811164C @@ -6179,7 +6179,7 @@ sub_81137E4: @ 81137E4 lsrs r0, 16 cmp r0, 0x22 bne _08113814 - ldr r2, _08113810 @ =gUnknown_823EAC8 + ldr r2, _08113810 @ =gTrainers ldrh r1, [r1] lsls r0, r1, 2 adds r0, r1 @@ -6197,7 +6197,7 @@ sub_81137E4: @ 81137E4 movs r0, 0x1 b _08113816 .align 2, 0 -_08113810: .4byte gUnknown_823EAC8 +_08113810: .4byte gTrainers _08113814: movs r0, 0 _08113816: @@ -9006,7 +9006,7 @@ sub_8114D68: @ 8114D68 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08114DD8 @ =gUnknown_823EACC + ldr r0, _08114DD8 @ =gTrainers+0x4 adds r1, r0 movs r0, 0x1 bl UnkTextUtil_SetPtrI @@ -9035,7 +9035,7 @@ sub_8114D68: @ 8114D68 bx r1 .align 2, 0 _08114DD4: .4byte gStringVar1 -_08114DD8: .4byte gUnknown_823EACC +_08114DD8: .4byte gTrainers+0x4 _08114DDC: .4byte gUnknown_8456ACC _08114DE0: .4byte gStringVar4 _08114DE4: .4byte gUnknown_841AF0C @@ -9325,7 +9325,7 @@ sub_811500C: @ 811500C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08115068 @ =gUnknown_823EACC + ldr r0, _08115068 @ =gTrainers+0x4 adds r1, r0 movs r0, 0 bl UnkTextUtil_SetPtrI @@ -9353,7 +9353,7 @@ sub_811500C: @ 811500C pop {r1} bx r1 .align 2, 0 -_08115068: .4byte gUnknown_823EACC +_08115068: .4byte gTrainers+0x4 _0811506C: .4byte gUnknown_8456ACC _08115070: .4byte gStringVar4 _08115074: .4byte gUnknown_841AF3E @@ -9544,7 +9544,7 @@ sub_81151DC: @ 81151DC movs r0, 0 adds r1, r4, 0 bl UnkTextUtil_SetPtrI - ldr r3, _08115230 @ =gUnknown_823EAC8 + ldr r3, _08115230 @ =gTrainers ldrh r1, [r5, 0x4] lsls r0, r1, 2 adds r0, r1 @@ -9566,7 +9566,7 @@ _0811521A: b _0811523E .align 2, 0 _0811522C: .4byte gStringVar1 -_08115230: .4byte gUnknown_823EAC8 +_08115230: .4byte gTrainers _08115234: adds r1, r3, 0x4 adds r1, r2, r1 diff --git a/asm/quest_log_battle.s b/asm/quest_log_battle.s index 6a608d0ef..19703e014 100644 --- a/asm/quest_log_battle.s +++ b/asm/quest_log_battle.s @@ -12,7 +12,7 @@ sub_812BFDC: @ 812BFDC mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _0812C03C @ =gUnknown_2022B4C + ldr r4, _0812C03C @ =gBattleTypeFlags ldr r0, [r4] ldr r1, _0812C040 @ =0x00010202 ands r0, r1 @@ -41,8 +41,8 @@ _0812C002: bne _0812C01E b _0812C1CC _0812C01E: - ldr r3, _0812C048 @ =gUnknown_823EAC8 - ldr r2, _0812C04C @ =gUnknown_20386AE + ldr r3, _0812C048 @ =gTrainers + ldr r2, _0812C04C @ =gTrainerBattleOpponent_A ldrh r1, [r2] lsls r0, r1, 2 adds r0, r1 @@ -57,11 +57,11 @@ _0812C01E: beq _0812C056 b _0812C066 .align 2, 0 -_0812C03C: .4byte gUnknown_2022B4C +_0812C03C: .4byte gBattleTypeFlags _0812C040: .4byte 0x00010202 _0812C044: .4byte gUnknown_2023E8A -_0812C048: .4byte gUnknown_823EAC8 -_0812C04C: .4byte gUnknown_20386AE +_0812C048: .4byte gTrainers +_0812C04C: .4byte gTrainerBattleOpponent_A _0812C050: cmp r1, 0x5A beq _0812C05C @@ -84,16 +84,16 @@ _0812C068: _0812C06A: ldrh r0, [r2] strh r0, [r7] - ldr r0, _0812C0AC @ =gUnknown_2022B4C + ldr r0, _0812C0AC @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0812C150 - ldr r0, _0812C0B0 @ =gUnknown_3004F90 + ldr r0, _0812C0B0 @ =gBattleResults ldrh r0, [r0, 0x20] strh r0, [r7, 0x2] - ldr r4, _0812C0B4 @ =gUnknown_2023FE8 + ldr r4, _0812C0B4 @ =gBattleStruct ldr r0, [r4] movs r1, 0xC1 lsls r1, 1 @@ -103,7 +103,7 @@ _0812C06A: lsls r0, 24 cmp r0, 0 bne _0812C0BC - ldr r2, _0812C0B8 @ =gUnknown_2023BE4 + ldr r2, _0812C0B8 @ =gBattleMons ldr r0, [r4] movs r1, 0xC1 lsls r1, 1 @@ -114,12 +114,12 @@ _0812C06A: adds r0, r2 b _0812C0EA .align 2, 0 -_0812C0AC: .4byte gUnknown_2022B4C -_0812C0B0: .4byte gUnknown_3004F90 -_0812C0B4: .4byte gUnknown_2023FE8 -_0812C0B8: .4byte gUnknown_2023BE4 +_0812C0AC: .4byte gBattleTypeFlags +_0812C0B0: .4byte gBattleResults +_0812C0B4: .4byte gBattleStruct +_0812C0B8: .4byte gBattleMons _0812C0BC: - ldr r5, _0812C0D8 @ =gUnknown_2023BE4 + ldr r5, _0812C0D8 @ =gBattleMons movs r0, 0 bl GetBankByIdentity lsls r0, 24 @@ -133,7 +133,7 @@ _0812C0BC: movs r0, 0 b _0812C0DE .align 2, 0 -_0812C0D8: .4byte gUnknown_2023BE4 +_0812C0D8: .4byte gBattleMons _0812C0DC: movs r0, 0x2 _0812C0DE: @@ -150,7 +150,7 @@ _0812C0EA: adds r4, r0, 0 movs r0, 0x2 bl GetBankByIdentity - ldr r6, _0812C14C @ =gUnknown_2023BE4 + ldr r6, _0812C14C @ =gBattleMons lsls r4, 24 lsrs r4, 24 movs r5, 0x58 @@ -188,14 +188,14 @@ _0812C0EA: lsrs r4, r0, 16 b _0812C18E .align 2, 0 -_0812C14C: .4byte gUnknown_2023BE4 +_0812C14C: .4byte gBattleMons _0812C150: - ldr r0, _0812C1C4 @ =gUnknown_3004F90 + ldr r0, _0812C1C4 @ =gBattleResults ldrh r0, [r0, 0x20] strh r0, [r7, 0x2] movs r0, 0 bl GetBankByIdentity - ldr r5, _0812C1C8 @ =gUnknown_2023BE4 + ldr r5, _0812C1C8 @ =gBattleMons lsls r0, 24 lsrs r0, 24 movs r4, 0x58 @@ -245,13 +245,13 @@ _0812C1B8: bl sub_8113550 b _0812C206 .align 2, 0 -_0812C1C4: .4byte gUnknown_3004F90 -_0812C1C8: .4byte gUnknown_2023BE4 +_0812C1C4: .4byte gBattleResults +_0812C1C8: .4byte gBattleMons _0812C1CC: ldrb r0, [r5] cmp r0, 0x1 bne _0812C1E8 - ldr r0, _0812C1E4 @ =gUnknown_202402C + ldr r0, _0812C1E4 @ =gEnemyParty movs r1, 0xB bl GetMonData mov r1, r9 @@ -259,11 +259,11 @@ _0812C1CC: strh r4, [r1, 0x2] b _0812C1F8 .align 2, 0 -_0812C1E4: .4byte gUnknown_202402C +_0812C1E4: .4byte gEnemyParty _0812C1E8: mov r0, r9 strh r4, [r0] - ldr r0, _0812C220 @ =gUnknown_202402C + ldr r0, _0812C220 @ =gEnemyParty movs r1, 0xB bl GetMonData mov r1, r9 @@ -288,7 +288,7 @@ _0812C212: pop {r0} bx r0 .align 2, 0 -_0812C220: .4byte gUnknown_202402C +_0812C220: .4byte gEnemyParty thumb_func_end sub_812BFDC thumb_func_start sub_812C224 @@ -298,7 +298,7 @@ sub_812C224: @ 812C224 mov r6, r8 push {r6,r7} sub sp, 0xC - ldr r4, _0812C2B8 @ =gUnknown_2022B4C + ldr r4, _0812C2B8 @ =gBattleTypeFlags ldr r0, [r4] movs r1, 0x2 ands r0, r1 @@ -366,7 +366,7 @@ _0812C274: ble _0812C274 b _0812C30E .align 2, 0 -_0812C2B8: .4byte gUnknown_2022B4C +_0812C2B8: .4byte gBattleTypeFlags _0812C2BC: .4byte gUnknown_2023E8A _0812C2C0: .4byte gUnknown_2022744 _0812C2C4: @@ -390,7 +390,7 @@ _0812C2E2: adds r4, r5, 0x1 ldr r1, _0812C32C @ =gUnknown_2022744 mov r12, r1 - ldr r7, _0812C330 @ =gUnknown_2023FE8 + ldr r7, _0812C330 @ =gBattleStruct movs r6, 0x1 _0812C2EE: adds r2, r4, r3 @@ -425,7 +425,7 @@ _0812C31C: bx r0 .align 2, 0 _0812C32C: .4byte gUnknown_2022744 -_0812C330: .4byte gUnknown_2023FE8 +_0812C330: .4byte gBattleStruct thumb_func_end sub_812C224 thumb_func_start sub_812C334 @@ -433,7 +433,7 @@ sub_812C334: @ 812C334 push {r4-r6,lr} adds r6, r0, 0 ldr r3, _0812C35C @ =gUnknown_202273C - ldr r4, _0812C360 @ =gUnknown_2023FE8 + ldr r4, _0812C360 @ =gBattleStruct ldr r0, [r4] adds r0, 0xB5 ldrb r2, [r0] @@ -453,7 +453,7 @@ _0812C352: b _0812C370 .align 2, 0 _0812C35C: .4byte gUnknown_202273C -_0812C360: .4byte gUnknown_2023FE8 +_0812C360: .4byte gBattleStruct _0812C364: ldr r0, [r4] adds r0, 0xB5 diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s index ac2b2a64a..5538afcff 100644 --- a/asm/reshow_battle_screen.s +++ b/asm/reshow_battle_screen.s @@ -23,14 +23,14 @@ sub_8077764: @ 8077764 movs r0, 0x4C movs r1, 0 bl SetGpuReg - ldr r0, _080777B4 @ =gUnknown_2023FC4 + ldr r0, _080777B4 @ =gBattleScripting adds r2, r0, 0 adds r2, 0x21 movs r1, 0 strb r1, [r2] adds r0, 0x22 strb r1, [r0] - ldr r0, _080777B8 @ =gUnknown_2022B4C + ldr r0, _080777B8 @ =gBattleTypeFlags ldr r1, [r0] movs r0, 0x2 ands r0, r1 @@ -49,8 +49,8 @@ sub_8077764: @ 8077764 b _080777DA .align 2, 0 _080777B0: .4byte gUnknown_2037AB8 -_080777B4: .4byte gUnknown_2023FC4 -_080777B8: .4byte gUnknown_2022B4C +_080777B4: .4byte gBattleScripting +_080777B8: .4byte gBattleTypeFlags _080777BC: movs r0, 0x18 bl sub_812B1F0 @@ -79,7 +79,7 @@ _080777E4: .4byte sub_80777E8 sub_80777E8: @ 80777E8 push {r4-r7,lr} sub sp, 0x8 - ldr r0, _08077804 @ =gUnknown_2023FC4 + ldr r0, _08077804 @ =gBattleScripting adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x14 @@ -92,7 +92,7 @@ _080777F8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08077804: .4byte gUnknown_2023FC4 +_08077804: .4byte gBattleScripting _08077808: .4byte _0807780C .align 2, 0 _0807780C: @@ -195,7 +195,7 @@ _08077918: bl ClearSpritesHealthboxAnimData b _08077A8A _0807791E: - ldr r5, _08077938 @ =gUnknown_2023FC4 + ldr r5, _08077938 @ =gBattleScripting adds r4, r5, 0 adds r4, 0x22 ldrb r0, [r4] @@ -207,7 +207,7 @@ _0807791E: strb r0, [r4] b _08077A8A .align 2, 0 -_08077938: .4byte gUnknown_2023FC4 +_08077938: .4byte gBattleScripting _0807793C: ldrb r0, [r4] adds r0, 0x1 @@ -232,7 +232,7 @@ _08077954: beq _08077960 b _08077A8A _08077960: - ldr r1, _0807796C @ =gUnknown_2023FC4 + ldr r1, _0807796C @ =gBattleScripting _08077962: adds r1, 0x21 ldrb r0, [r1] @@ -240,7 +240,7 @@ _08077962: strb r0, [r1] b _08077A8A .align 2, 0 -_0807796C: .4byte gUnknown_2023FC4 +_0807796C: .4byte gBattleScripting _08077970: movs r0, 0 bl sub_8077C38 @@ -280,13 +280,13 @@ _080779B0: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r7, _08077A44 @ =gUnknown_2023BCE + ldr r7, _08077A44 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r7 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _08077A48 @ =gUnknown_202402C + ldr r5, _08077A48 @ =gEnemyParty adds r0, r5 movs r1, 0xB bl GetMonData @@ -338,8 +338,8 @@ _08077A14: bl sub_80FCD74 b _08077A8A .align 2, 0 -_08077A44: .4byte gUnknown_2023BCE -_08077A48: .4byte gUnknown_202402C +_08077A44: .4byte gBattlerPartyIndexes +_08077A48: .4byte gEnemyParty _08077A4C: .4byte gUnknown_2023FF8 _08077A50: .4byte gUnknown_2024004 _08077A54: .4byte gUnknown_3003F3C @@ -364,7 +364,7 @@ _08077A5C: bl SetMainCallback2 bl sub_80357C8 _08077A8A: - ldr r1, _08077AA8 @ =gUnknown_2023FC4 + ldr r1, _08077AA8 @ =gBattleScripting adds r1, 0x21 ldrb r0, [r1] adds r0, 0x1 @@ -377,7 +377,7 @@ _08077A8A: _08077A9C: .4byte sub_80116F4 _08077AA0: .4byte gUnknown_2037AB8 _08077AA4: .4byte sub_8011100 -_08077AA8: .4byte gUnknown_2023FC4 +_08077AA8: .4byte gBattleScripting thumb_func_end sub_80777E8 thumb_func_start sub_8077AAC @@ -437,7 +437,7 @@ _08077B1C: lsls r0, 24 cmp r0, 0 beq _08077BA6 - ldr r0, _08077B58 @ =gUnknown_2022B4C + ldr r0, _08077B58 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0xA0 lsls r1, 8 @@ -446,22 +446,22 @@ _08077B1C: lsls r1, 8 cmp r0, r1 bne _08077B64 - ldr r1, _08077B5C @ =gUnknown_2023BCE + ldr r1, _08077B5C @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08077B60 @ =gUnknown_202402C + ldr r1, _08077B60 @ =gEnemyParty adds r0, r1 adds r1, r4, 0 bl sub_8034658 b _08077C24 .align 2, 0 _08077B54: .4byte gUnknown_2023BCC -_08077B58: .4byte gUnknown_2022B4C -_08077B5C: .4byte gUnknown_2023BCE -_08077B60: .4byte gUnknown_202402C +_08077B58: .4byte gBattleTypeFlags +_08077B5C: .4byte gBattlerPartyIndexes +_08077B60: .4byte gEnemyParty _08077B64: ldr r0, _08077B90 @ =gUnknown_2024018 ldr r0, [r0] @@ -473,28 +473,28 @@ _08077B64: ands r0, r1 cmp r0, 0 bne _08077B9C - ldr r1, _08077B94 @ =gUnknown_2023BCE + ldr r1, _08077B94 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08077B98 @ =gUnknown_202402C + ldr r1, _08077B98 @ =gEnemyParty adds r0, r1 adds r1, r4, 0 bl BattleLoadOpponentMonSpriteGfx b _08077C24 .align 2, 0 _08077B90: .4byte gUnknown_2024018 -_08077B94: .4byte gUnknown_2023BCE -_08077B98: .4byte gUnknown_202402C +_08077B94: .4byte gBattlerPartyIndexes +_08077B98: .4byte gEnemyParty _08077B9C: adds r0, r4, 0 movs r1, 0 bl sub_80350BC b _08077C24 _08077BA6: - ldr r0, _08077BC0 @ =gUnknown_2022B4C + ldr r0, _08077BC0 @ =gBattleTypeFlags ldr r1, [r0] movs r2, 0x80 ands r1, r2 @@ -507,7 +507,7 @@ _08077BA6: ldrb r0, [r0, 0x8] b _08077BDA .align 2, 0 -_08077BC0: .4byte gUnknown_2022B4C +_08077BC0: .4byte gBattleTypeFlags _08077BC4: .4byte gSaveBlock2Ptr _08077BC8: ldr r0, [r0] @@ -534,27 +534,27 @@ _08077BE2: ands r0, r1 cmp r0, 0 bne _08077C1C - ldr r1, _08077C14 @ =gUnknown_2023BCE + ldr r1, _08077C14 @ =gBattlerPartyIndexes lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08077C18 @ =gUnknown_2024284 + ldr r1, _08077C18 @ =gPlayerParty adds r0, r1 adds r1, r4, 0 bl sub_8034498 b _08077C24 .align 2, 0 _08077C10: .4byte gUnknown_2024018 -_08077C14: .4byte gUnknown_2023BCE -_08077C18: .4byte gUnknown_2024284 +_08077C14: .4byte gBattlerPartyIndexes +_08077C18: .4byte gPlayerParty _08077C1C: adds r0, r4, 0 movs r1, 0 bl sub_80350BC _08077C24: - ldr r0, _08077C34 @ =gUnknown_2023FC4 + ldr r0, _08077C34 @ =gBattleScripting adds r0, 0x22 movs r1, 0 strb r1, [r0] @@ -564,7 +564,7 @@ _08077C2C: pop {r1} bx r1 .align 2, 0 -_08077C34: .4byte gUnknown_2023FC4 +_08077C34: .4byte gBattleScripting thumb_func_end sub_8077B0C thumb_func_start sub_8077C38 @@ -582,7 +582,7 @@ sub_8077C38: @ 8077C38 bcc _08077C50 b _08077FB4 _08077C50: - ldr r0, _08077C70 @ =gUnknown_2022B4C + ldr r0, _08077C70 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0xA0 lsls r1, 8 @@ -596,7 +596,7 @@ _08077C50: b _08077C9A .align 2, 0 _08077C6C: .4byte gUnknown_2023BCC -_08077C70: .4byte gUnknown_2022B4C +_08077C70: .4byte gBattleTypeFlags _08077C74: ldr r0, _08077C90 @ =gUnknown_2024018 ldr r0, [r0] @@ -627,7 +627,7 @@ _08077C9A: bne _08077CAE b _08077DAC _08077CAE: - ldr r1, _08077D90 @ =gUnknown_2023BCE + ldr r1, _08077D90 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r6, r0, r1 ldrh r0, [r6] @@ -636,7 +636,7 @@ _08077CAE: mov r1, r10 muls r1, r0 adds r0, r1, 0 - ldr r1, _08077D94 @ =gUnknown_202402C + ldr r1, _08077D94 @ =gEnemyParty mov r9, r1 add r0, r9 movs r1, 0x39 @@ -732,15 +732,15 @@ _08077CD2: bl StartSpriteAnim b _08077F84 .align 2, 0 -_08077D90: .4byte gUnknown_2023BCE -_08077D94: .4byte gUnknown_202402C +_08077D90: .4byte gBattlerPartyIndexes +_08077D94: .4byte gEnemyParty _08077D98: .4byte gUnknown_20244DC _08077D9C: .4byte gUnknown_2023D44 _08077DA0: .4byte gSprites _08077DA4: .4byte SpriteCallbackDummy _08077DA8: .4byte gUnknown_2024024 _08077DAC: - ldr r0, _08077E00 @ =gUnknown_2022B4C + ldr r0, _08077E00 @ =gBattleTypeFlags ldr r1, [r0] movs r2, 0x80 ands r1, r2 @@ -780,7 +780,7 @@ _08077DAC: adds r0, r6, 0 b _08077E54 .align 2, 0 -_08077E00: .4byte gUnknown_2022B4C +_08077E00: .4byte gBattleTypeFlags _08077E04: .4byte gSaveBlock2Ptr _08077E08: .4byte gUnknown_20244DC _08077E0C: .4byte gUnknown_8239F8C @@ -855,7 +855,7 @@ _08077E9C: .4byte gUnknown_2023D44 _08077EA0: .4byte gSprites _08077EA4: .4byte SpriteCallbackDummy _08077EA8: - ldr r1, _08077FC4 @ =gUnknown_2023BCE + ldr r1, _08077FC4 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r6, r0, r1 ldrh r0, [r6] @@ -864,7 +864,7 @@ _08077EA8: mov r1, r10 muls r1, r0 adds r0, r1, 0 - ldr r1, _08077FC8 @ =gUnknown_2024284 + ldr r1, _08077FC8 @ =gPlayerParty mov r9, r1 add r0, r9 movs r1, 0x39 @@ -990,8 +990,8 @@ _08077FB4: pop {r0} bx r0 .align 2, 0 -_08077FC4: .4byte gUnknown_2023BCE -_08077FC8: .4byte gUnknown_2024284 +_08077FC4: .4byte gBattlerPartyIndexes +_08077FC8: .4byte gPlayerParty _08077FCC: .4byte gUnknown_20244DC _08077FD0: .4byte gUnknown_2023D44 _08077FD4: .4byte gSprites @@ -1011,7 +1011,7 @@ CreateHealthboxSprite: @ 8077FE4 bcc _08077FF4 b _08078166 _08077FF4: - ldr r0, _08078010 @ =gUnknown_2022B4C + ldr r0, _08078010 @ =gBattleTypeFlags ldr r1, [r0] movs r2, 0x80 ands r1, r2 @@ -1023,7 +1023,7 @@ _08077FF4: b _0807802C .align 2, 0 _0807800C: .4byte gUnknown_2023BCC -_08078010: .4byte gUnknown_2022B4C +_08078010: .4byte gBattleTypeFlags _08078014: ldr r0, [r0] movs r1, 0x80 @@ -1053,53 +1053,53 @@ _0807802C: cmp r0, 0 beq _08078074 ldrb r0, [r4] - ldr r1, _0807806C @ =gUnknown_2023BCE + ldr r1, _0807806C @ =gBattlerPartyIndexes lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08078070 @ =gUnknown_202402C + ldr r2, _08078070 @ =gEnemyParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute b _080780C0 .align 2, 0 _08078068: .4byte gUnknown_3004FF0 -_0807806C: .4byte gUnknown_2023BCE -_08078070: .4byte gUnknown_202402C +_0807806C: .4byte gBattlerPartyIndexes +_08078070: .4byte gEnemyParty _08078074: - ldr r0, _0807809C @ =gUnknown_2022B4C + ldr r0, _0807809C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 beq _080780A8 ldrb r0, [r4] - ldr r1, _080780A0 @ =gUnknown_2023BCE + ldr r1, _080780A0 @ =gBattlerPartyIndexes lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080780A4 @ =gUnknown_2024284 + ldr r2, _080780A4 @ =gPlayerParty adds r1, r2 movs r2, 0xA bl UpdateHealthboxAttribute b _080780C0 .align 2, 0 -_0807809C: .4byte gUnknown_2022B4C -_080780A0: .4byte gUnknown_2023BCE -_080780A4: .4byte gUnknown_2024284 +_0807809C: .4byte gBattleTypeFlags +_080780A0: .4byte gBattlerPartyIndexes +_080780A4: .4byte gPlayerParty _080780A8: ldrb r0, [r4] - ldr r1, _080780EC @ =gUnknown_2023BCE + ldr r1, _080780EC @ =gBattlerPartyIndexes lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080780F0 @ =gUnknown_2024284 + ldr r2, _080780F0 @ =gPlayerParty adds r1, r2 movs r2, 0 bl UpdateHealthboxAttribute @@ -1124,8 +1124,8 @@ _080780DC: bl nullsub_21 b _08078104 .align 2, 0 -_080780EC: .4byte gUnknown_2023BCE -_080780F0: .4byte gUnknown_2024284 +_080780EC: .4byte gBattlerPartyIndexes +_080780F0: .4byte gPlayerParty _080780F4: .4byte gUnknown_3004FF0 _080780F8: ldr r0, _08078130 @ =gUnknown_3004FF0 @@ -1139,12 +1139,12 @@ _08078104: lsls r0, 24 cmp r0, 0 beq _0807813C - ldr r0, _08078134 @ =gUnknown_2023BCE + ldr r0, _08078134 @ =gBattlerPartyIndexes adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08078138 @ =gUnknown_202402C + ldr r1, _08078138 @ =gEnemyParty adds r0, r1 movs r1, 0x39 bl GetMonData @@ -1155,21 +1155,21 @@ _08078104: b _08078166 .align 2, 0 _08078130: .4byte gUnknown_3004FF0 -_08078134: .4byte gUnknown_2023BCE -_08078138: .4byte gUnknown_202402C +_08078134: .4byte gBattlerPartyIndexes +_08078138: .4byte gEnemyParty _0807813C: - ldr r0, _0807816C @ =gUnknown_2022B4C + ldr r0, _0807816C @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 bne _08078166 - ldr r0, _08078170 @ =gUnknown_2023BCE + ldr r0, _08078170 @ =gBattlerPartyIndexes adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08078174 @ =gUnknown_2024284 + ldr r1, _08078174 @ =gPlayerParty adds r0, r1 movs r1, 0x39 bl GetMonData @@ -1182,9 +1182,9 @@ _08078166: pop {r0} bx r0 .align 2, 0 -_0807816C: .4byte gUnknown_2022B4C -_08078170: .4byte gUnknown_2023BCE -_08078174: .4byte gUnknown_2024284 +_0807816C: .4byte gBattleTypeFlags +_08078170: .4byte gBattlerPartyIndexes +_08078174: .4byte gPlayerParty thumb_func_end CreateHealthboxSprite .align 2, 0 @ Don't pad with nop. diff --git a/asm/roamer.s b/asm/roamer.s index 6e4d2f32e..d44c91a55 100644 --- a/asm/roamer.s +++ b/asm/roamer.s @@ -42,7 +42,7 @@ _08141C90: .4byte gUnknown_203F3A8 sub_8141C94: @ 8141C94 push {r4-r7,lr} sub sp, 0x10 - ldr r7, _08141CB0 @ =gUnknown_202402C + ldr r7, _08141CB0 @ =gEnemyParty bl sub_80CBDB0 lsls r0, 16 lsrs r0, 16 @@ -53,7 +53,7 @@ sub_8141C94: @ 8141C94 movs r6, 0xF3 b _08141CBA .align 2, 0 -_08141CB0: .4byte gUnknown_202402C +_08141CB0: .4byte gEnemyParty _08141CB4: movs r6, 0xF4 b _08141CBA @@ -346,7 +346,7 @@ _08141EF2: CreateRoamerMonInstance: @ 8141EF8 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _08141F84 @ =gUnknown_202402C + ldr r5, _08141F84 @ =gEnemyParty bl ZeroEnemyPartyMons ldr r4, _08141F88 @ =gSaveBlock1Ptr ldr r0, [r4] @@ -406,7 +406,7 @@ CreateRoamerMonInstance: @ 8141EF8 pop {r0} bx r0 .align 2, 0 -_08141F84: .4byte gUnknown_202402C +_08141F84: .4byte gEnemyParty _08141F88: .4byte gSaveBlock1Ptr _08141F8C: .4byte 0x000030d0 _08141F90: .4byte 0x000030dd diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 04fe63501..23d2bdc54 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -4051,7 +4051,7 @@ ScrCmd_bufferleadmonspeciesname: @ 806BCC8 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _0806BD0C @ =gUnknown_2024284 + ldr r1, _0806BD0C @ =gPlayerParty adds r0, r1 movs r1, 0xB movs r2, 0 @@ -4068,7 +4068,7 @@ ScrCmd_bufferleadmonspeciesname: @ 806BCC8 bx r1 .align 2, 0 _0806BD08: .4byte gUnknown_83A7294 -_0806BD0C: .4byte gUnknown_2024284 +_0806BD0C: .4byte gPlayerParty _0806BD10: .4byte gUnknown_8245EE0 thumb_func_end ScrCmd_bufferleadmonspeciesname @@ -4087,7 +4087,7 @@ ScrCmd_bufferpartymonnick: @ 806BD14 lsrs r0, 16 movs r1, 0x64 muls r0, r1 - ldr r1, _0806BD54 @ =gUnknown_2024284 + ldr r1, _0806BD54 @ =gPlayerParty adds r0, r1 ldr r1, _0806BD58 @ =gUnknown_83A7294 lsls r4, 2 @@ -4103,7 +4103,7 @@ ScrCmd_bufferpartymonnick: @ 806BD14 pop {r1} bx r1 .align 2, 0 -_0806BD54: .4byte gUnknown_2024284 +_0806BD54: .4byte gPlayerParty _0806BD58: .4byte gUnknown_83A7294 thumb_func_end ScrCmd_bufferpartymonnick @@ -4565,7 +4565,7 @@ _0806C0F6: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _0806C120 @ =gUnknown_2024284 + ldr r0, _0806C120 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -4581,7 +4581,7 @@ _0806C116: pop {r1} bx r1 .align 2, 0 -_0806C120: .4byte gUnknown_2024284 +_0806C120: .4byte gPlayerParty thumb_func_end ScrCmd_checkpartymove thumb_func_start ScrCmd_givemoney @@ -5533,7 +5533,7 @@ ScrCmd_setmonobedient: @ 806C7D4 lsrs r0, 16 movs r1, 0x64 muls r0, r1 - ldr r1, _0806C808 @ =gUnknown_2024284 + ldr r1, _0806C808 @ =gPlayerParty adds r0, r1 movs r1, 0x50 mov r2, sp @@ -5543,7 +5543,7 @@ ScrCmd_setmonobedient: @ 806C7D4 pop {r1} bx r1 .align 2, 0 -_0806C808: .4byte gUnknown_2024284 +_0806C808: .4byte gPlayerParty thumb_func_end ScrCmd_setmonobedient thumb_func_start ScrCmd_checkmonobedience @@ -5558,7 +5558,7 @@ ScrCmd_checkmonobedience: @ 806C80C ldr r4, _0806C83C @ =gUnknown_20370D0 movs r1, 0x64 muls r0, r1 - ldr r1, _0806C840 @ =gUnknown_2024284 + ldr r1, _0806C840 @ =gPlayerParty adds r0, r1 movs r1, 0x50 movs r2, 0 @@ -5570,7 +5570,7 @@ ScrCmd_checkmonobedience: @ 806C80C bx r1 .align 2, 0 _0806C83C: .4byte gUnknown_20370D0 -_0806C840: .4byte gUnknown_2024284 +_0806C840: .4byte gPlayerParty thumb_func_end ScrCmd_checkmonobedience thumb_func_start sub_806C844 @@ -5594,7 +5594,7 @@ sub_806C844: @ 806C844 bhi _0806C87A movs r0, 0x64 muls r0, r3 - ldr r1, _0806C884 @ =gUnknown_2024284 + ldr r1, _0806C884 @ =gPlayerParty adds r0, r1 movs r1, 0x23 mov r2, sp @@ -5606,7 +5606,7 @@ _0806C87A: pop {r1} bx r1 .align 2, 0 -_0806C884: .4byte gUnknown_2024284 +_0806C884: .4byte gPlayerParty thumb_func_end sub_806C844 .align 2, 0 @ Don't pad with nop. diff --git a/asm/script_movement.s b/asm/script_movement.s index 5ee414498..1554055b4 100644 --- a/asm/script_movement.s +++ b/asm/script_movement.s @@ -329,7 +329,7 @@ sub_8097678: @ 8097678 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r2, _080976A0 @ =gUnknown_825E45C + ldr r2, _080976A0 @ =gBitTable lsrs r1, 22 adds r1, r2 ldr r2, [r1] @@ -346,7 +346,7 @@ sub_8097678: @ 8097678 strh r2, [r1, 0x8] bx lr .align 2, 0 -_080976A0: .4byte gUnknown_825E45C +_080976A0: .4byte gBitTable _080976A4: .4byte gUnknown_3005090 thumb_func_end sub_8097678 @@ -360,7 +360,7 @@ sub_80976A8: @ 80976A8 adds r2, r0 lsls r2, 3 adds r2, r3 - ldr r0, _080976CC @ =gUnknown_825E45C + ldr r0, _080976CC @ =gBitTable lsrs r1, 22 adds r1, r0 ldr r0, [r1] @@ -370,7 +370,7 @@ sub_80976A8: @ 80976A8 bx lr .align 2, 0 _080976C8: .4byte gUnknown_3005090 -_080976CC: .4byte gUnknown_825E45C +_080976CC: .4byte gBitTable thumb_func_end sub_80976A8 thumb_func_start sub_80976D0 @@ -384,7 +384,7 @@ sub_80976D0: @ 80976D0 adds r2, r0 lsls r2, 3 adds r2, r3 - ldr r0, _080976FC @ =gUnknown_825E45C + ldr r0, _080976FC @ =gBitTable lsrs r1, 22 adds r1, r0 ldr r0, [r1] @@ -396,7 +396,7 @@ sub_80976D0: @ 80976D0 b _08097702 .align 2, 0 _080976F8: .4byte gUnknown_3005090 -_080976FC: .4byte gUnknown_825E45C +_080976FC: .4byte gBitTable _08097700: movs r0, 0x1 _08097702: diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 78aecb3c0..2c8a3af2a 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -19,7 +19,7 @@ sp000_heal_pokemon: @ 80A0058 ldrb r0, [r0] cmp r8, r0 bcs _080A0104 - ldr r1, _080A0118 @ =gUnknown_2024284 + ldr r1, _080A0118 @ =gPlayerParty mov r10, r1 mov r6, sp _080A0076: @@ -99,7 +99,7 @@ _080A0104: bx r0 .align 2, 0 _080A0114: .4byte gUnknown_2024029 -_080A0118: .4byte gUnknown_2024284 +_080A0118: .4byte gPlayerParty thumb_func_end sp000_heal_pokemon thumb_func_start ScriptGiveMon @@ -242,7 +242,7 @@ _080A0228: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080A0258 @ =gUnknown_2024284 + ldr r0, _080A0258 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -261,7 +261,7 @@ _080A0228: movs r0, 0x1 b _080A0264 .align 2, 0 -_080A0258: .4byte gUnknown_2024284 +_080A0258: .4byte gPlayerParty _080A025C: adds r5, 0x1 cmp r5, 0x5 @@ -313,7 +313,7 @@ CreateScriptedWildMon: @ 80A029C lsls r7, r2, 16 lsrs r6, r7, 16 bl ZeroEnemyPartyMons - ldr r0, _080A02F8 @ =gUnknown_202402C + ldr r0, _080A02F8 @ =gEnemyParty mov r8, r0 movs r0, 0 str r0, [sp] @@ -344,7 +344,7 @@ _080A02EA: pop {r0} bx r0 .align 2, 0 -_080A02F8: .4byte gUnknown_202402C +_080A02F8: .4byte gEnemyParty thumb_func_end CreateScriptedWildMon thumb_func_start ScriptSetMonMoveSlot @@ -366,7 +366,7 @@ ScriptSetMonMoveSlot: @ 80A02FC _080A0318: movs r0, 0x64 muls r0, r3 - ldr r1, _080A0330 @ =gUnknown_2024284 + ldr r1, _080A0330 @ =gPlayerParty adds r0, r1 adds r1, r4, 0 bl SetMonMoveSlot @@ -375,7 +375,7 @@ _080A0318: bx r0 .align 2, 0 _080A032C: .4byte gUnknown_2024029 -_080A0330: .4byte gUnknown_2024284 +_080A0330: .4byte gPlayerParty thumb_func_end ScriptSetMonMoveSlot thumb_func_start sub_80A0334 @@ -478,7 +478,7 @@ sub_80A03D8: @ 80A03D8 movs r5, 0 movs r0, 0x64 mov r8, r0 - ldr r6, _080A0454 @ =gUnknown_2024284 + ldr r6, _080A0454 @ =gPlayerParty adds r4, r7, 0 _080A03F4: ldr r0, _080A0458 @ =gUnknown_203B0D4 @@ -500,7 +500,7 @@ _080A040E: ble _080A03F4 movs r0, 0 str r0, [sp] - ldr r4, _080A0454 @ =gUnknown_2024284 + ldr r4, _080A0454 @ =gPlayerParty ldr r2, _080A045C @ =0x05000096 mov r0, sp adds r1, r4, 0 @@ -527,7 +527,7 @@ _080A042C: pop {r0} bx r0 .align 2, 0 -_080A0454: .4byte gUnknown_2024284 +_080A0454: .4byte gPlayerParty _080A0458: .4byte gUnknown_203B0D4 _080A045C: .4byte 0x05000096 thumb_func_end sub_80A03D8 diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 4a35815e0..3b4fac8d2 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -104,7 +104,7 @@ _080BF9B8: .4byte gUnknown_3005090 sub_80BF9BC: @ 80BF9BC push {r4,lr} sub sp, 0x4 - ldr r0, _080BF9F0 @ =gUnknown_2024284 + ldr r0, _080BF9F0 @ =gPlayerParty ldr r1, _080BF9F4 @ =gUnknown_20370C0 ldrb r1, [r1] ldr r2, _080BF9F8 @ =gUnknown_2024029 @@ -126,7 +126,7 @@ sub_80BF9BC: @ 80BF9BC pop {r0} bx r0 .align 2, 0 -_080BF9F0: .4byte gUnknown_2024284 +_080BF9F0: .4byte gPlayerParty _080BF9F4: .4byte gUnknown_20370C0 _080BF9F8: .4byte gUnknown_2024029 _080BF9FC: .4byte c2_exit_to_overworld_2_switch @@ -147,7 +147,7 @@ _080BFA14: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080BFA4C @ =gUnknown_2024284 + ldr r1, _080BFA4C @ =gPlayerParty adds r0, r1 adds r1, r4, 0 adds r1, 0xD @@ -169,7 +169,7 @@ _080BFA32: .align 2, 0 _080BFA44: .4byte gUnknown_20370D0 _080BFA48: .4byte gUnknown_20370C0 -_080BFA4C: .4byte gUnknown_2024284 +_080BFA4C: .4byte gPlayerParty thumb_func_end ScrSpecial_CountPokemonMoves thumb_func_start ScrSpecial_GetPokemonNicknameAndMoveName @@ -180,7 +180,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 movs r0, 0x64 adds r5, r1, 0 muls r5, r0 - ldr r0, _080BFA94 @ =gUnknown_2024284 + ldr r0, _080BFA94 @ =gPlayerParty adds r5, r0 ldr r0, _080BFA98 @ =gUnknown_20370C2 ldrh r1, [r0] @@ -204,7 +204,7 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 bx r0 .align 2, 0 _080BFA90: .4byte gUnknown_20370C0 -_080BFA94: .4byte gUnknown_2024284 +_080BFA94: .4byte gPlayerParty _080BFA98: .4byte gUnknown_20370C2 _080BFA9C: .4byte gStringVar1 _080BFAA0: .4byte gStringVar2 @@ -343,7 +343,7 @@ sub_80BFBA8: @ 80BFBA8 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080BFC0C @ =gUnknown_2024284 + ldr r5, _080BFC0C @ =gPlayerParty adds r0, r5 ldr r4, _080BFC10 @ =gUnknown_20370C2 ldrb r2, [r4] @@ -363,7 +363,7 @@ _080BFBDA: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080BFC0C @ =gUnknown_2024284 + ldr r1, _080BFC0C @ =gPlayerParty adds r0, r1 lsls r1, r4, 24 lsrs r1, 24 @@ -383,7 +383,7 @@ _080BFBFC: bx r0 .align 2, 0 _080BFC08: .4byte gUnknown_20370C0 -_080BFC0C: .4byte gUnknown_2024284 +_080BFC0C: .4byte gPlayerParty _080BFC10: .4byte gUnknown_20370C2 thumb_func_end sub_80BFBA8 @@ -394,7 +394,7 @@ sub_80BFC14: @ 80BFC14 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080BFC3C @ =gUnknown_2024284 + ldr r1, _080BFC3C @ =gPlayerParty adds r0, r1 movs r1, 0x2D bl GetMonData @@ -407,7 +407,7 @@ sub_80BFC14: @ 80BFC14 b _080BFC48 .align 2, 0 _080BFC38: .4byte gUnknown_20370C0 -_080BFC3C: .4byte gUnknown_2024284 +_080BFC3C: .4byte gPlayerParty _080BFC40: .4byte gUnknown_20370D0 _080BFC44: ldr r0, _080BFC4C @ =gUnknown_20370D0 diff --git a/asm/sound.s b/asm/sound.s index 3fc955b3a..2c2c1b379 100644 --- a/asm/sound.s +++ b/asm/sound.s @@ -765,7 +765,7 @@ PlayCry4: @ 8071EC0 bl sub_8071F78 b _08071F10 _08071EEA: - ldr r0, _08071F18 @ =gUnknown_2022B4C + ldr r0, _08071F18 @ =gBattleTypeFlags ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -789,7 +789,7 @@ _08071F10: pop {r0} bx r0 .align 2, 0 -_08071F18: .4byte gUnknown_2022B4C +_08071F18: .4byte gBattleTypeFlags _08071F1C: .4byte gMPlay_BGM _08071F20: .4byte 0x0000ffff thumb_func_end PlayCry4 diff --git a/asm/tm_case.s b/asm/tm_case.s index 8883ebe63..ce72101c4 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -3431,7 +3431,7 @@ _081334A8: bl ItemIdToBattleMoveId lsls r0, 16 lsrs r7, r0, 16 - ldr r1, _081334D8 @ =gUnknown_8250C04 + ldr r1, _081334D8 @ =gBattleMoves lsls r0, r7, 1 adds r0, r7 lsls r0, 2 @@ -3450,7 +3450,7 @@ _081334A8: ldr r2, _081334DC @ =gUnknown_8416213 b _081334F0 .align 2, 0 -_081334D8: .4byte gUnknown_8250C04 +_081334D8: .4byte gBattleMoves _081334DC: .4byte gUnknown_8416213 _081334E0: ldr r4, _08133524 @ =gStringVar1 @@ -3474,7 +3474,7 @@ _081334F0: movs r1, 0x3 movs r3, 0x7 bl sub_81332EC - ldr r2, _08133528 @ =gUnknown_8250C04 + ldr r2, _08133528 @ =gBattleMoves lsls r1, r7, 1 adds r0, r1, r7 lsls r0, 2 @@ -3487,7 +3487,7 @@ _081334F0: b _08133540 .align 2, 0 _08133524: .4byte gStringVar1 -_08133528: .4byte gUnknown_8250C04 +_08133528: .4byte gBattleMoves _0813352C: .4byte gUnknown_8416213 _08133530: ldr r4, _081335A8 @ =gStringVar1 @@ -3514,7 +3514,7 @@ _08133540: movs r3, 0x7 bl sub_81332EC ldr r5, _081335A8 @ =gStringVar1 - ldr r1, _081335AC @ =gUnknown_8250C04 + ldr r1, _081335AC @ =gBattleMoves adds r0, r6, r7 lsls r0, 2 adds r0, r1 @@ -3549,7 +3549,7 @@ _0813359A: bx r0 .align 2, 0 _081335A8: .4byte gStringVar1 -_081335AC: .4byte gUnknown_8250C04 +_081335AC: .4byte gBattleMoves thumb_func_end sub_8133444 thumb_func_start sub_81335B0 @@ -3699,7 +3699,7 @@ sub_813368C: @ 813368C adds r0, r4, 0 adds r1, r5, 0 bl sub_8133714 - ldr r0, _081336F0 @ =gUnknown_8250C04 + ldr r0, _081336F0 @ =gBattleMoves mov r8, r0 adds r0, r6, 0 bl ItemIdToBattleMoveId @@ -3717,7 +3717,7 @@ sub_813368C: @ 813368C .align 2, 0 _081336E8: .4byte gUnknown_8463220 _081336EC: .4byte gSprites -_081336F0: .4byte gUnknown_8250C04 +_081336F0: .4byte gBattleMoves _081336F4: lsls r0, r7, 4 adds r0, r7 @@ -3898,7 +3898,7 @@ _08133822: ldrh r0, [r5, 0x30] adds r0, 0x1 strh r0, [r5, 0x30] - ldr r4, _08133878 @ =gUnknown_8250C04 + ldr r4, _08133878 @ =gBattleMoves ldrh r0, [r5, 0x2E] bl ItemIdToBattleMoveId lsls r0, 16 @@ -3925,7 +3925,7 @@ _08133822: bl sub_8133790 b _081338A2 .align 2, 0 -_08133878: .4byte gUnknown_8250C04 +_08133878: .4byte gBattleMoves _0813387C: .4byte 0xfffffedf _08133880: adds r0, r1, 0 diff --git a/asm/trade.s b/asm/trade.s index 0cfac7187..cbcf57400 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -229,7 +229,7 @@ _0804C7FC: _0804C80A: movs r0, 0x64 muls r0, r6 - ldr r1, _0804C868 @ =gUnknown_202402C + ldr r1, _0804C868 @ =gEnemyParty adds r0, r1 str r4, [sp] str r4, [sp, 0x4] @@ -268,7 +268,7 @@ _0804C80A: b _0804C892 .align 2, 0 _0804C864: .4byte gUnknown_2037AB8 -_0804C868: .4byte gUnknown_202402C +_0804C868: .4byte gEnemyParty _0804C86C: .4byte gUnknown_3003F64 _0804C870: .4byte gUnknown_202271A _0804C874: .4byte 0x00001122 @@ -494,7 +494,7 @@ _0804CA4A: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _0804CB3C @ =gUnknown_2024284 + ldr r0, _0804CB3C @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -551,7 +551,7 @@ _0804CABE: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _0804CB48 @ =gUnknown_202402C + ldr r0, _0804CB48 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -605,10 +605,10 @@ _0804CB2C: .4byte gUnknown_2031DA8 _0804CB30: .4byte gUnknown_2024029 _0804CB34: .4byte gUnknown_202402A _0804CB38: .4byte gUnknown_8261E40 -_0804CB3C: .4byte gUnknown_2024284 +_0804CB3C: .4byte gPlayerParty _0804CB40: .4byte 0xfff40000 _0804CB44: .4byte sub_809718C -_0804CB48: .4byte gUnknown_202402C +_0804CB48: .4byte gEnemyParty _0804CB4C: .4byte gMain _0804CB50: bl sub_8122550 @@ -1183,7 +1183,7 @@ _0804D048: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _0804D13C @ =gUnknown_2024284 + ldr r0, _0804D13C @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -1241,7 +1241,7 @@ _0804D0BE: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _0804D148 @ =gUnknown_202402C + ldr r0, _0804D148 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -1295,10 +1295,10 @@ _0804D12C: .4byte gUnknown_2031DA8 _0804D130: .4byte gUnknown_2024029 _0804D134: .4byte gUnknown_202402A _0804D138: .4byte gUnknown_8261E40 -_0804D13C: .4byte gUnknown_2024284 +_0804D13C: .4byte gPlayerParty _0804D140: .4byte 0xfff40000 _0804D144: .4byte sub_809718C -_0804D148: .4byte gUnknown_202402C +_0804D148: .4byte gEnemyParty _0804D14C: .4byte gMain _0804D150: bl sub_8122550 @@ -2182,7 +2182,7 @@ _0804D860: .4byte _0804DB14 _0804D8B8: ldr r0, _0804D8D8 @ =gUnknown_2022618 - ldr r1, _0804D8DC @ =gUnknown_2024284 + ldr r1, _0804D8DC @ =gPlayerParty movs r2, 0xC8 bl sub_804D814 ldr r3, _0804D8E0 @ =gUnknown_2031DA8 @@ -2198,7 +2198,7 @@ _0804D8B8: b _0804DB9E .align 2, 0 _0804D8D8: .4byte gUnknown_2022618 -_0804D8DC: .4byte gUnknown_2024284 +_0804D8DC: .4byte gPlayerParty _0804D8E0: .4byte gUnknown_2031DA8 _0804D8E4: bl sub_800A4BC @@ -2242,7 +2242,7 @@ _0804D928: beq _0804D936 b _0804DB9E _0804D936: - ldr r0, _0804D954 @ =gUnknown_202402C + ldr r0, _0804D954 @ =gEnemyParty movs r2, 0x1 adds r1, r5, 0 eors r1, r2 @@ -2256,7 +2256,7 @@ _0804D936: ldr r1, [r0] b _0804DB96 .align 2, 0 -_0804D954: .4byte gUnknown_202402C +_0804D954: .4byte gEnemyParty _0804D958: .4byte gUnknown_2022118 _0804D95C: .4byte gUnknown_2031DA8 _0804D960: @@ -2458,7 +2458,7 @@ _0804DAE0: _0804DB0C: .4byte gUnknown_2031DA8 _0804DB10: .4byte gUnknown_2022118 _0804DB14: - ldr r4, _0804DB68 @ =gUnknown_202402C + ldr r4, _0804DB68 @ =gEnemyParty ldr r6, _0804DB6C @ =0x0000012f movs r5, 0x5 _0804DB1A: @@ -2497,7 +2497,7 @@ _0804DB5A: movs r0, 0x1 b _0804DBA0 .align 2, 0 -_0804DB68: .4byte gUnknown_202402C +_0804DB68: .4byte gEnemyParty _0804DB6C: .4byte 0x0000012f _0804DB70: .4byte gUnknown_8262034 _0804DB74: .4byte gUnknown_8246BE5 @@ -3567,7 +3567,7 @@ _0804E3B6: .align 2, 0 _0804E3D0: .4byte gUnknown_2031DA8 _0804E3D4: - ldr r0, _0804E3F4 @ =gUnknown_2024284 + ldr r0, _0804E3F4 @ =gPlayerParty ldr r1, _0804E3F8 @ =gUnknown_2024029 ldrb r1, [r1] ldr r2, _0804E3FC @ =gUnknown_2031DA8 @@ -3583,7 +3583,7 @@ _0804E3D4: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804E3F4: .4byte gUnknown_2024284 +_0804E3F4: .4byte gPlayerParty _0804E3F8: .4byte gUnknown_2024029 _0804E3FC: .4byte gUnknown_2031DA8 _0804E400: .4byte _0804E404 @@ -3682,7 +3682,7 @@ sub_804E494: @ 804E494 ldrb r1, [r3] cmp r1, 0x5 bhi _0804E4DC - ldr r0, _0804E4D4 @ =gUnknown_2024284 + ldr r0, _0804E4D4 @ =gPlayerParty ldrb r1, [r3] adds r2, 0x36 ldrb r2, [r2] @@ -3697,10 +3697,10 @@ sub_804E494: @ 804E494 .align 2, 0 _0804E4CC: .4byte gUnknown_2037AB8 _0804E4D0: .4byte gUnknown_2031DA8 -_0804E4D4: .4byte gUnknown_2024284 +_0804E4D4: .4byte gPlayerParty _0804E4D8: .4byte sub_804CF14 _0804E4DC: - ldr r0, _0804E504 @ =gUnknown_202402C + ldr r0, _0804E504 @ =gEnemyParty subs r1, 0x6 lsls r1, 24 lsrs r1, 24 @@ -3721,7 +3721,7 @@ _0804E4FC: pop {r0} bx r0 .align 2, 0 -_0804E504: .4byte gUnknown_202402C +_0804E504: .4byte gEnemyParty _0804E508: .4byte sub_804CF14 thumb_func_end sub_804E494 @@ -3736,7 +3736,7 @@ sub_804E50C: @ 804E50C movs r4, 0 movs r3, 0 ldr r6, _0804E588 @ =gUnknown_2031DA8 - ldr r7, _0804E58C @ =gUnknown_202402C + ldr r7, _0804E58C @ =gEnemyParty cmp r4, r1 bge _0804E538 _0804E524: @@ -3790,7 +3790,7 @@ _0804E564: b _0804E598 .align 2, 0 _0804E588: .4byte gUnknown_2031DA8 -_0804E58C: .4byte gUnknown_202402C +_0804E58C: .4byte gEnemyParty _0804E590: cmp r4, 0 beq _0804E596 @@ -4922,18 +4922,18 @@ sub_804EE6C: @ 804EE6C bne _0804EE94 movs r0, 0x64 muls r0, r2 - ldr r1, _0804EE90 @ =gUnknown_2024284 + ldr r1, _0804EE90 @ =gPlayerParty adds r0, r1 movs r1, 0x2 mov r2, sp bl GetMonData b _0804EEA4 .align 2, 0 -_0804EE90: .4byte gUnknown_2024284 +_0804EE90: .4byte gPlayerParty _0804EE94: movs r0, 0x64 muls r0, r2 - ldr r1, _0804EED0 @ =gUnknown_202402C + ldr r1, _0804EED0 @ =gEnemyParty adds r0, r1 movs r1, 0x2 mov r2, sp @@ -4958,7 +4958,7 @@ _0804EEA4: pop {r1} bx r1 .align 2, 0 -_0804EED0: .4byte gUnknown_202402C +_0804EED0: .4byte gEnemyParty thumb_func_end sub_804EE6C thumb_func_start sub_804EED4 @@ -4988,9 +4988,9 @@ sub_804EED4: @ 804EED4 movs r0, 0x64 adds r5, r2, 0 muls r5, r0 - ldr r0, _0804EF20 @ =gUnknown_2024284 + ldr r0, _0804EF20 @ =gPlayerParty mov r9, r0 - ldr r2, _0804EF24 @ =gUnknown_202402C + ldr r2, _0804EF24 @ =gEnemyParty mov r8, r2 _0804EF0E: cmp r7, 0 @@ -5001,8 +5001,8 @@ _0804EF0E: b _0804EF2E .align 2, 0 _0804EF1C: .4byte gUnknown_2031DA8 -_0804EF20: .4byte gUnknown_2024284 -_0804EF24: .4byte gUnknown_202402C +_0804EF20: .4byte gPlayerParty +_0804EF24: .4byte gEnemyParty _0804EF28: adds r1, r4, 0 adds r1, 0xD @@ -5130,10 +5130,10 @@ sub_804F020: @ 804F020 sub sp, 0x34 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _0804F080 @ =gUnknown_202402C + ldr r7, _0804F080 @ =gEnemyParty cmp r6, 0 bne _0804F030 - ldr r7, _0804F084 @ =gUnknown_2024284 + ldr r7, _0804F084 @ =gPlayerParty _0804F030: movs r4, 0 ldr r0, _0804F088 @ =gUnknown_2031DA8 @@ -5174,8 +5174,8 @@ _0804F076: pop {r0} bx r0 .align 2, 0 -_0804F080: .4byte gUnknown_202402C -_0804F084: .4byte gUnknown_2024284 +_0804F080: .4byte gEnemyParty +_0804F084: .4byte gPlayerParty _0804F088: .4byte gUnknown_2031DA8 thumb_func_end sub_804F020 @@ -5222,15 +5222,15 @@ sub_804F08C: @ 804F08C bne _0804F0F0 movs r0, 0x64 muls r0, r7 - ldr r1, _0804F0EC @ =gUnknown_2024284 + ldr r1, _0804F0EC @ =gPlayerParty b _0804F0F6 .align 2, 0 _0804F0E8: .4byte gUnknown_8E9F1FC -_0804F0EC: .4byte gUnknown_2024284 +_0804F0EC: .4byte gPlayerParty _0804F0F0: movs r0, 0x64 muls r0, r7 - ldr r1, _0804F16C @ =gUnknown_202402C + ldr r1, _0804F16C @ =gEnemyParty _0804F0F6: adds r0, r1 movs r1, 0x38 @@ -5290,7 +5290,7 @@ _0804F148: strh r0, [r4] b _0804F1B2 .align 2, 0 -_0804F16C: .4byte gUnknown_202402C +_0804F16C: .4byte gEnemyParty _0804F170: .4byte gUnknown_2031DA8 _0804F174: mov r1, r10 @@ -5348,7 +5348,7 @@ _0804F1D4: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 - ldr r0, _0804F1FC @ =gUnknown_2024284 + ldr r0, _0804F1FC @ =gPlayerParty adds r4, r0 adds r0, r4, 0 bl GetMonGender @@ -5360,12 +5360,12 @@ _0804F1D4: bl GetMonData b _0804F21E .align 2, 0 -_0804F1FC: .4byte gUnknown_2024284 +_0804F1FC: .4byte gPlayerParty _0804F200: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 - ldr r0, _0804F22C @ =gUnknown_202402C + ldr r0, _0804F22C @ =gEnemyParty adds r4, r0 adds r0, r4, 0 bl GetMonGender @@ -5383,7 +5383,7 @@ _0804F21E: movs r2, 0x83 b _0804F256 .align 2, 0 -_0804F22C: .4byte gUnknown_202402C +_0804F22C: .4byte gEnemyParty _0804F230: add r0, sp, 0xC movs r1, 0 @@ -6069,7 +6069,7 @@ _0804F776: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0804F7A4 @ =gUnknown_2024284 + ldr r0, _0804F7A4 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x2D @@ -6088,7 +6088,7 @@ _0804F776: b _0804F7D8 .align 2, 0 _0804F7A0: .4byte gUnknown_2031DA8 -_0804F7A4: .4byte gUnknown_2024284 +_0804F7A4: .4byte gPlayerParty _0804F7A8: adds r0, r4, 0 movs r1, 0x39 @@ -6144,7 +6144,7 @@ _0804F80A: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0804F838 @ =gUnknown_202402C + ldr r0, _0804F838 @ =gEnemyParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x2D @@ -6163,7 +6163,7 @@ _0804F80A: b _0804F86C .align 2, 0 _0804F834: .4byte gUnknown_2031DA8 -_0804F838: .4byte gUnknown_202402C +_0804F838: .4byte gEnemyParty _0804F83C: adds r0, r4, 0 movs r1, 0x39 @@ -6234,7 +6234,7 @@ _0804F8B0: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _0804F8FC @ =gUnknown_2024284 + ldr r0, _0804F8FC @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x39 @@ -6265,7 +6265,7 @@ _0804F8B0: b _0804F954 .align 2, 0 _0804F8F8: .4byte gUnknown_2031DA8 -_0804F8FC: .4byte gUnknown_2024284 +_0804F8FC: .4byte gPlayerParty _0804F900: movs r6, 0 ldr r1, _0804F95C @ =gUnknown_2031DA8 @@ -6279,7 +6279,7 @@ _0804F910: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _0804F960 @ =gUnknown_202402C + ldr r0, _0804F960 @ =gEnemyParty adds r4, r0 adds r0, r4, 0 movs r1, 0x39 @@ -6313,7 +6313,7 @@ _0804F954: bx r0 .align 2, 0 _0804F95C: .4byte gUnknown_2031DA8 -_0804F960: .4byte gUnknown_202402C +_0804F960: .4byte gEnemyParty thumb_func_end sub_804F890 thumb_func_start sub_804F964 @@ -6742,7 +6742,7 @@ _0804FC4E: movs r0, 0x2 b _0804FCCE _0804FC6E: - ldr r0, _0804FC88 @ =gUnknown_8254784 + ldr r0, _0804FC88 @ =gBaseStats lsls r1, r7, 3 subs r1, r7 lsls r1, 2 @@ -6756,7 +6756,7 @@ _0804FC6E: movs r0, 0x1 b _0804FCCE .align 2, 0 -_0804FC88: .4byte gUnknown_8254784 +_0804FC88: .4byte gBaseStats _0804FC8C: movs r0, 0xCE lsls r0, 1 @@ -7243,7 +7243,7 @@ sub_804FFE4: @ 804FFE4 ldrb r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08050038 @ =gUnknown_2024284 + ldr r0, _08050038 @ =gPlayerParty adds r1, r0 mov r8, r1 movs r4, 0x1 @@ -7258,7 +7258,7 @@ _0805000A: lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _0805003C @ =gUnknown_202402C + ldr r0, _0805003C @ =gEnemyParty adds r1, r0 mov r8, r1 movs r4, 0x3 @@ -7270,8 +7270,8 @@ _08050028: b _0805011E .align 2, 0 _08050034: .4byte gUnknown_2031DA4 -_08050038: .4byte gUnknown_2024284 -_0805003C: .4byte gUnknown_202402C +_08050038: .4byte gPlayerParty +_0805003C: .4byte gEnemyParty _08050040: mov r0, r8 movs r1, 0x41 @@ -7675,7 +7675,7 @@ _0805039C: ldrb r0, [r4] movs r6, 0x64 muls r0, r6 - ldr r1, _0805041C @ =gUnknown_2024284 + ldr r1, _0805041C @ =gPlayerParty adds r0, r1 movs r1, 0x41 bl GetMonData @@ -7689,7 +7689,7 @@ _0805039C: lsls r0, 24 lsrs r0, 24 muls r0, r6 - ldr r1, _08050424 @ =gUnknown_202402C + ldr r1, _08050424 @ =gEnemyParty adds r0, r1 movs r1, 0x41 bl GetMonData @@ -7718,9 +7718,9 @@ _0805039C: b _08050440 .align 2, 0 _08050418: .4byte gUnknown_2031DA4 -_0805041C: .4byte gUnknown_2024284 +_0805041C: .4byte gPlayerParty _08050420: .4byte gUnknown_2031DAC -_08050424: .4byte gUnknown_202402C +_08050424: .4byte gEnemyParty _08050428: .4byte gUnknown_2022744 _0805042C: .4byte gMain _08050430: @@ -7952,7 +7952,7 @@ _08050628: ldr r1, [r0] adds r0, r4, 0 bl StringCopy - ldr r0, _080506DC @ =gUnknown_202402C + ldr r0, _080506DC @ =gEnemyParty movs r1, 0x7 mov r2, sp bl GetMonData @@ -8016,7 +8016,7 @@ _080506CC: .4byte gUnknown_2031DA4 _080506D0: .4byte gUnknown_20370C2 _080506D4: .4byte gUnknown_2022744 _080506D8: .4byte gSaveBlock2Ptr -_080506DC: .4byte gUnknown_202402C +_080506DC: .4byte gEnemyParty _080506E0: .4byte gUnknown_2031DAC _080506E4: .4byte sub_804FF0C _080506E8: .4byte gMain @@ -8105,7 +8105,7 @@ sub_80507A0: @ 80507A0 lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _080507FC @ =gUnknown_2024284 + ldr r0, _080507FC @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x2D @@ -8141,7 +8141,7 @@ _080507F4: pop {r0} bx r0 .align 2, 0 -_080507FC: .4byte gUnknown_2024284 +_080507FC: .4byte gPlayerParty thumb_func_end sub_80507A0 thumb_func_start sub_8050800 @@ -8168,7 +8168,7 @@ sub_805080C: @ 805080C movs r5, 0x64 mov r1, r9 muls r1, r5 - ldr r0, _080508D8 @ =gUnknown_2024284 + ldr r0, _080508D8 @ =gPlayerParty adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x40 @@ -8177,7 +8177,7 @@ sub_805080C: @ 805080C lsrs r6, r0, 16 adds r1, r4, 0 muls r1, r5 - ldr r0, _080508DC @ =gUnknown_202402C + ldr r0, _080508DC @ =gEnemyParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x40 @@ -8250,8 +8250,8 @@ _080508CA: pop {r0} bx r0 .align 2, 0 -_080508D8: .4byte gUnknown_2024284 -_080508DC: .4byte gUnknown_202402C +_080508D8: .4byte gPlayerParty +_080508DC: .4byte gEnemyParty _080508E0: .4byte gSaveBlock1Ptr _080508E4: .4byte 0x00002cd0 _080508E8: .4byte gUnknown_2031DAC @@ -8883,7 +8883,7 @@ sub_8050E24: @ 8050E24 lsrs r0, 24 movs r4, 0x64 muls r0, r4 - ldr r1, _08050EA4 @ =gUnknown_202402C + ldr r1, _08050EA4 @ =gEnemyParty adds r0, r1 movs r1, 0x2 mov r2, sp @@ -8893,7 +8893,7 @@ sub_8050E24: @ 8050E24 bl StringCopy10 ldrb r0, [r5] muls r0, r4 - ldr r1, _08050EAC @ =gUnknown_2024284 + ldr r1, _08050EAC @ =gPlayerParty adds r0, r1 movs r1, 0x2 mov r2, sp @@ -8907,9 +8907,9 @@ _08050E94: .4byte gUnknown_2031DAC _08050E98: .4byte gStringVar1 _08050E9C: .4byte gUnknown_2022744 _08050EA0: .4byte gUnknown_2031DA4 -_08050EA4: .4byte gUnknown_202402C +_08050EA4: .4byte gEnemyParty _08050EA8: .4byte gStringVar3 -_08050EAC: .4byte gUnknown_2024284 +_08050EAC: .4byte gPlayerParty _08050EB0: .4byte gStringVar2 _08050EB4: ldr r0, _08050EF8 @ =gUnknown_20370C0 @@ -8930,7 +8930,7 @@ _08050EB4: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08050F0C @ =gUnknown_2024284 + ldr r1, _08050F0C @ =gPlayerParty adds r0, r1 movs r1, 0x2 mov r2, sp @@ -8949,7 +8949,7 @@ _08050EFC: .4byte gUnknown_826CF8C _08050F00: .4byte gStringVar1 _08050F04: .4byte gStringVar3 _08050F08: .4byte gUnknown_20370C2 -_08050F0C: .4byte gUnknown_2024284 +_08050F0C: .4byte gPlayerParty _08050F10: .4byte gStringVar2 thumb_func_end sub_8050E24 @@ -11059,7 +11059,7 @@ _0805223C: ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _08052290 @ =gUnknown_2024284 + ldr r5, _08052290 @ =gPlayerParty adds r0, r5 movs r1, 0x1 movs r2, 0 @@ -11084,7 +11084,7 @@ _08052280: .4byte gUnknown_20370C2 _08052284: .4byte gUnknown_300537C _08052288: .4byte sub_8050948 _0805228C: .4byte gUnknown_2031DA4 -_08052290: .4byte gUnknown_2024284 +_08052290: .4byte gPlayerParty _08052294: .4byte gUnknown_2031DAC _08052298: movs r0, 0x1 @@ -13284,7 +13284,7 @@ _08053698: ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _080536EC @ =gUnknown_2024284 + ldr r5, _080536EC @ =gPlayerParty adds r0, r5 movs r1, 0x1 movs r2, 0 @@ -13309,7 +13309,7 @@ _080536DC: .4byte gUnknown_20370C2 _080536E0: .4byte gUnknown_300537C _080536E4: .4byte sub_8050948 _080536E8: .4byte gUnknown_2031DA4 -_080536EC: .4byte gUnknown_2024284 +_080536EC: .4byte gPlayerParty _080536F0: .4byte gUnknown_2031DAC _080536F4: movs r0, 0x1 @@ -13412,7 +13412,7 @@ _080537B8: ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _08053800 @ =gUnknown_2024284 + ldr r5, _08053800 @ =gPlayerParty adds r0, r5 movs r1, 0x1 movs r2, 0 @@ -13436,7 +13436,7 @@ _080537B8: _080537F4: .4byte gUnknown_300537C _080537F8: .4byte sub_8053E8C _080537FC: .4byte gUnknown_2031DA4 -_08053800: .4byte gUnknown_2024284 +_08053800: .4byte gPlayerParty _08053804: .4byte gUnknown_2031DAC _08053808: mov r0, r8 @@ -13828,7 +13828,7 @@ sub_8053AE4: @ 8053AE4 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08053B38 @ =gUnknown_2024284 + ldr r1, _08053B38 @ =gPlayerParty adds r0, r1 movs r1, 0x2 mov r2, sp @@ -13851,7 +13851,7 @@ sub_8053AE4: @ 8053AE4 _08053B2C: .4byte gUnknown_20370C0 _08053B30: .4byte gUnknown_826CF8C _08053B34: .4byte gUnknown_20370C2 -_08053B38: .4byte gUnknown_2024284 +_08053B38: .4byte gPlayerParty _08053B3C: .4byte gStringVar1 _08053B40: .4byte gStringVar2 _08053B44: .4byte gUnknown_8245EE0 @@ -13872,7 +13872,7 @@ sub_8053B48: @ 8053B48 adds r5, r2, r1 movs r1, 0x64 muls r0, r1 - ldr r1, _08053CA8 @ =gUnknown_2024284 + ldr r1, _08053CA8 @ =gPlayerParty adds r0, r1 movs r1, 0x38 bl GetMonData @@ -13882,7 +13882,7 @@ sub_8053B48: @ 8053B48 add r4, sp, 0x34 movs r0, 0xFE strb r0, [r4] - ldr r6, _08053CAC @ =gUnknown_202402C + ldr r6, _08053CAC @ =gEnemyParty ldrh r1, [r5, 0xC] movs r3, 0x1 str r3, [sp] @@ -14011,8 +14011,8 @@ sub_8053B48: @ 8053B48 b _08053CC0 .align 2, 0 _08053CA4: .4byte gUnknown_826CF8C -_08053CA8: .4byte gUnknown_2024284 -_08053CAC: .4byte gUnknown_202402C +_08053CA8: .4byte gPlayerParty +_08053CAC: .4byte gEnemyParty _08053CB0: .4byte gUnknown_2031CCC _08053CB4: adds r2, r5, 0 @@ -14021,14 +14021,14 @@ _08053CB4: movs r1, 0xC bl sub_804037C _08053CC0: - ldr r0, _08053CD0 @ =gUnknown_202402C + ldr r0, _08053CD0 @ =gEnemyParty bl CalculateMonStats add sp, 0x38 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08053CD0: .4byte gUnknown_202402C +_08053CD0: .4byte gEnemyParty thumb_func_end sub_8053B48 thumb_func_start sub_8053CD4 @@ -14085,7 +14085,7 @@ sub_8053D2C: @ 8053D2C ldrh r0, [r6] movs r5, 0x64 muls r0, r5 - ldr r4, _08053D5C @ =gUnknown_2024284 + ldr r4, _08053D5C @ =gPlayerParty adds r0, r4 movs r1, 0x2D bl GetMonData @@ -14101,7 +14101,7 @@ sub_8053D2C: @ 8053D2C b _08053D62 .align 2, 0 _08053D58: .4byte gUnknown_20370C2 -_08053D5C: .4byte gUnknown_2024284 +_08053D5C: .4byte gPlayerParty _08053D60: movs r0, 0 _08053D62: @@ -14905,7 +14905,7 @@ _080544B2: lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080544F4 @ =gUnknown_202402C + ldr r1, _080544F4 @ =gEnemyParty adds r0, r1 adds r1, r4, 0 adds r1, 0x43 @@ -14928,7 +14928,7 @@ _080544EA: bx r0 .align 2, 0 _080544F0: .4byte gUnknown_2031DA4 -_080544F4: .4byte gUnknown_202402C +_080544F4: .4byte gEnemyParty _080544F8: .4byte 0x0000083b thumb_func_end sub_80544AC diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s index 3382cc7cc..dd5ad2c0c 100644 --- a/asm/trainer_tower.s +++ b/asm/trainer_tower.s @@ -1288,7 +1288,7 @@ _0815E15C: .4byte sub_800FD9C thumb_func_start sub_815E160 sub_815E160: @ 815E160 push {r4,lr} - ldr r4, _0815E1AC @ =gUnknown_2022B4C + ldr r4, _0815E1AC @ =gBattleTypeFlags ldr r3, _0815E1B0 @ =0x00080008 str r3, [r4] ldr r0, _0815E1B4 @ =gUnknown_203F458 @@ -1304,7 +1304,7 @@ sub_815E160: @ 815E160 orrs r0, r3 str r0, [r4] _0815E180: - ldr r1, _0815E1B8 @ =gUnknown_20386AE + ldr r1, _0815E1B8 @ =gTrainerBattleOpponent_A movs r0, 0 strh r0, [r1] bl sub_815E9FC @@ -1321,10 +1321,10 @@ _0815E180: pop {r0} bx r0 .align 2, 0 -_0815E1AC: .4byte gUnknown_2022B4C +_0815E1AC: .4byte gBattleTypeFlags _0815E1B0: .4byte 0x00080008 _0815E1B4: .4byte gUnknown_203F458 -_0815E1B8: .4byte gUnknown_20386AE +_0815E1B8: .4byte gTrainerBattleOpponent_A _0815E1BC: .4byte sub_815E124 thumb_func_end sub_815E160 @@ -2434,7 +2434,7 @@ _0815EA6C: strb r0, [r3] movs r0, 0x64 muls r0, r6 - ldr r1, _0815EAD0 @ =gUnknown_202402C + ldr r1, _0815EAD0 @ =gEnemyParty adds r0, r1 ldr r1, [r5] ldrb r3, [r1] @@ -2457,7 +2457,7 @@ _0815EAC0: .4byte gSaveBlock1Ptr _0815EAC4: .4byte 0x00003d34 _0815EAC8: .4byte gUnknown_203F458 _0815EACC: .4byte gUnknown_847A2EE -_0815EAD0: .4byte gUnknown_202402C +_0815EAD0: .4byte gEnemyParty _0815EAD4: ldr r4, _0815EB50 @ =gUnknown_847A2FE lsls r5, 1 @@ -2472,7 +2472,7 @@ _0815EAD4: adds r0, 0x5C mov r2, r9 strb r2, [r0] - ldr r6, _0815EB54 @ =gUnknown_202402C + ldr r6, _0815EB54 @ =gEnemyParty mov r0, r10 ldr r1, [r0] ldrb r2, [r1] @@ -2521,7 +2521,7 @@ _0815EAD4: b _0815EB9E .align 2, 0 _0815EB50: .4byte gUnknown_847A2FE -_0815EB54: .4byte gUnknown_202402C +_0815EB54: .4byte gEnemyParty _0815EB58: ldr r1, _0815EBB0 @ =gUnknown_847A30E lsls r0, r5, 1 @@ -2543,7 +2543,7 @@ _0815EB58: adds r0, 0x5C mov r1, r9 strb r1, [r0] - ldr r0, _0815EBB4 @ =gUnknown_202402C + ldr r0, _0815EBB4 @ =gEnemyParty mov r2, r10 ldr r1, [r2] ldrb r4, [r1] @@ -2568,7 +2568,7 @@ _0815EB9E: bx r0 .align 2, 0 _0815EBB0: .4byte gUnknown_847A30E -_0815EBB4: .4byte gUnknown_202402C +_0815EBB4: .4byte gEnemyParty thumb_func_end sub_815E9FC thumb_func_start sub_815EBB8 @@ -2580,7 +2580,7 @@ _0815EBBE: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0815EC08 @ =gUnknown_2024284 + ldr r0, _0815EC08 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -2612,7 +2612,7 @@ _0815EBF8: pop {r1} bx r1 .align 2, 0 -_0815EC08: .4byte gUnknown_2024284 +_0815EC08: .4byte gPlayerParty thumb_func_end sub_815EBB8 thumb_func_start sub_815EC0C diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index 1352e3223..9ec376b6f 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -46,7 +46,7 @@ sub_8147AA8: @ 8147AA8 adds r0, r1 movs r1, 0x64 muls r1, r7 - ldr r2, _08147B34 @ =gUnknown_2024284 + ldr r2, _08147B34 @ =gPlayerParty adds r1, r2 bl sub_8147D2C ldr r0, [r5] @@ -64,7 +64,7 @@ _08147B24: .4byte gUnknown_203F3D4 _08147B28: .4byte 0x000083b0 _08147B2C: .4byte sub_8147DA0 _08147B30: .4byte 0x000082a8 -_08147B34: .4byte gUnknown_2024284 +_08147B34: .4byte gPlayerParty _08147B38: .4byte sub_8147D6C _08147B3C: adds r0, r6, 0 @@ -4252,7 +4252,7 @@ _08149A1C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08149A4C @ =gUnknown_2024284 + ldr r0, _08149A4C @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -4271,7 +4271,7 @@ _08149A1C: movs r0, 0x1 b _08149A5E .align 2, 0 -_08149A4C: .4byte gUnknown_2024284 +_08149A4C: .4byte gPlayerParty _08149A50: .4byte gUnknown_20370D0 _08149A54: adds r5, 0x1 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 931236d08..48658e337 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -57,7 +57,7 @@ sub_81507FC: @ 81507FC adds r0, r1 movs r1, 0x64 muls r1, r6 - ldr r2, _081508C0 @ =gUnknown_2024284 + ldr r2, _081508C0 @ =gPlayerParty adds r1, r2 bl sub_8152048 ldr r0, _081508C4 @ =sub_8150A84 @@ -87,7 +87,7 @@ _081508B0: .4byte 0x00003330 _081508B4: .4byte 0x000032cc _081508B8: .4byte 0x000031a0 _081508BC: .4byte 0x0000318c -_081508C0: .4byte gUnknown_2024284 +_081508C0: .4byte gPlayerParty _081508C4: .4byte sub_8150A84 _081508C8: .4byte sub_815201C _081508CC: @@ -6315,7 +6315,7 @@ _081537C6: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081537F4 @ =gUnknown_2024284 + ldr r0, _081537F4 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -6332,7 +6332,7 @@ _081537C6: b _08153804 .align 2, 0 _081537F0: .4byte gUnknown_20370D0 -_081537F4: .4byte gUnknown_2024284 +_081537F4: .4byte gPlayerParty _081537F8: adds r5, 0x1 cmp r5, 0x5 diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s index 3cd82f5fe..d84290a08 100644 --- a/asm/unk_8159F40.s +++ b/asm/unk_8159F40.s @@ -16,7 +16,7 @@ sub_8159F40: @ 8159F40 movs r0, 0 mov r10, r0 mov r9, r0 - ldr r1, _08159F90 @ =gUnknown_2022B4C + ldr r1, _08159F90 @ =gBattleTypeFlags movs r0, 0x80 lsls r0, 9 str r0, [r1] @@ -41,21 +41,21 @@ _08159F72: movs r0, 0x64 mov r1, r10 muls r1, r0 - ldr r0, _08159F9C @ =gUnknown_2024284 + ldr r0, _08159F9C @ =gPlayerParty adds r6, r1, r0 movs r0, 0x1 add r10, r0 b _08159FAE .align 2, 0 -_08159F90: .4byte gUnknown_2022B4C +_08159F90: .4byte gBattleTypeFlags _08159F94: .4byte gUnknown_84792D0 _08159F98: .4byte gUnknown_20370C0 -_08159F9C: .4byte gUnknown_2024284 +_08159F9C: .4byte gPlayerParty _08159FA0: movs r0, 0x64 mov r1, r9 muls r1, r0 - ldr r0, _0815A004 @ =gUnknown_202402C + ldr r0, _0815A004 @ =gEnemyParty adds r6, r1, r0 movs r2, 0x1 add r9, r2 @@ -102,7 +102,7 @@ _08159FD4: pop {r0} bx r0 .align 2, 0 -_0815A004: .4byte gUnknown_202402C +_0815A004: .4byte gEnemyParty thumb_func_end sub_8159F40 thumb_func_start sub_815A008 diff --git a/asm/vs_seeker.s b/asm/vs_seeker.s index 0bf4faebf..9e9ecb341 100644 --- a/asm/vs_seeker.s +++ b/asm/vs_seeker.s @@ -660,7 +660,7 @@ sub_810CB90: @ 810CB90 lsls r1, 4 adds r4, r0, r1 ldr r0, _0810CC58 @ =gUnknown_845318C - ldr r1, _0810CC5C @ =gUnknown_20386AE + ldr r1, _0810CC5C @ =gTrainerBattleOpponent_A ldrh r1, [r1] bl sub_810CE10 mov r9, r0 @@ -741,7 +741,7 @@ _0810CBDE: .align 2, 0 _0810CC54: .4byte gSaveBlock1Ptr _0810CC58: .4byte gUnknown_845318C -_0810CC5C: .4byte gUnknown_20386AE +_0810CC5C: .4byte gTrainerBattleOpponent_A _0810CC60: .4byte gUnknown_2036DFC _0810CC64: .4byte gUnknown_2036E38 _0810CC68: .4byte gUnknown_8453F67 @@ -875,7 +875,7 @@ _0810CD48: sub_810CD4C: @ 810CD4C push {r4,r5,lr} ldr r5, _0810CD70 @ =gUnknown_845318C - ldr r4, _0810CD74 @ =gUnknown_20386AE + ldr r4, _0810CD74 @ =gTrainerBattleOpponent_A ldrh r1, [r4] adds r0, r5, 0 bl sub_810CD80 @@ -890,7 +890,7 @@ sub_810CD4C: @ 810CD4C b _0810CD7A .align 2, 0 _0810CD70: .4byte gUnknown_845318C -_0810CD74: .4byte gUnknown_20386AE +_0810CD74: .4byte gTrainerBattleOpponent_A _0810CD78: movs r0, 0x1 _0810CD7A: @@ -1074,7 +1074,7 @@ _0810CEAA: sub_810CEB4: @ 810CEB4 push {lr} ldr r0, _0810CEC8 @ =gUnknown_845318C - ldr r1, _0810CECC @ =gUnknown_20386AE + ldr r1, _0810CECC @ =gTrainerBattleOpponent_A ldrh r1, [r1] bl sub_810CED0 lsls r0, 24 @@ -1083,7 +1083,7 @@ sub_810CEB4: @ 810CEB4 bx r1 .align 2, 0 _0810CEC8: .4byte gUnknown_845318C -_0810CECC: .4byte gUnknown_20386AE +_0810CECC: .4byte gTrainerBattleOpponent_A thumb_func_end sub_810CEB4 thumb_func_start sub_810CED0 diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index 08f86c10a..45fdc3612 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -420,7 +420,7 @@ sub_80829FC: @ 80829FC bl __umodsi3 lsls r0, 24 lsrs r0, 24 - ldr r1, _08082A38 @ =gUnknown_202402C + ldr r1, _08082A38 @ =gEnemyParty str r0, [sp] adds r0, r1, 0 adds r1, r4, 0 @@ -429,7 +429,7 @@ sub_80829FC: @ 80829FC bl CreateMonWithNature b _08082A74 .align 2, 0 -_08082A38: .4byte gUnknown_202402C +_08082A38: .4byte gEnemyParty _08082A3C: ldr r0, _08082A7C @ =gSaveBlock1Ptr ldr r0, [r0] @@ -445,7 +445,7 @@ _08082A3C: adds r0, r2 ldrb r0, [r0] bl sub_8082A88 - ldr r2, _08082A84 @ =gUnknown_202402C + ldr r2, _08082A84 @ =gEnemyParty movs r1, 0x1 str r1, [sp] str r0, [sp, 0x4] @@ -465,7 +465,7 @@ _08082A74: .align 2, 0 _08082A7C: .4byte gSaveBlock1Ptr _08082A80: .4byte gUnknown_83CA71C -_08082A84: .4byte gUnknown_202402C +_08082A84: .4byte gEnemyParty thumb_func_end sub_80829FC thumb_func_start sub_8082A88 @@ -722,7 +722,7 @@ sub_8082C58: @ 8082C58 ldr r5, _08082C90 @ =gUnknown_20386D0 movs r0, 0 strb r0, [r5, 0x9] - ldr r4, _08082C94 @ =gUnknown_2024284 + ldr r4, _08082C94 @ =gPlayerParty adds r0, r4, 0 movs r1, 0x6 bl GetMonData @@ -747,7 +747,7 @@ _08082C84: bx r1 .align 2, 0 _08082C90: .4byte gUnknown_20386D0 -_08082C94: .4byte gUnknown_2024284 +_08082C94: .4byte gPlayerParty thumb_func_end sub_8082C58 thumb_func_start sub_8082C98 @@ -1333,7 +1333,7 @@ _08083120: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0808315C @ =gUnknown_2024284 + ldr r0, _0808315C @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x39 @@ -1357,7 +1357,7 @@ _08083152: b _0808316C .align 2, 0 _08083158: .4byte 0x00004020 -_0808315C: .4byte gUnknown_2024284 +_0808315C: .4byte gPlayerParty _08083160: adds r0, r5, 0x1 lsls r0, 24 @@ -1624,7 +1624,7 @@ _08083326: lsls r4, 1 lsrs r5, 1 _0808332A: - ldr r0, _08083368 @ =gUnknown_2024284 + ldr r0, _08083368 @ =gPlayerParty movs r1, 0xC bl GetMonData ldr r1, _0808336C @ =gUnknown_20386D0 @@ -1652,7 +1652,7 @@ _08083356: beq _08083376 b _0808337A .align 2, 0 -_08083368: .4byte gUnknown_2024284 +_08083368: .4byte gPlayerParty _0808336C: .4byte gUnknown_20386D0 _08083370: lsls r4, 1 diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 1ac2380d2..bb0c1883c 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -1,4 +1,4 @@ .section script_data, "aw", %progbits -gUnknown_81D9BF4:: @ 81D9BF4 +BattleAIs:: @ 81D9BF4 .incbin "baserom.gba", 0x1D9BF4, 0x20FC diff --git a/data/data.s b/data/data.s index e36981474..5860a2874 100644 --- a/data/data.s +++ b/data/data.s @@ -118,14 +118,8 @@ gUnknown_823A004:: @ 823A004 gUnknown_823E558:: @ 823E558 .incbin "baserom.gba", 0x23E558, 0x570 -gUnknown_823EAC8:: @ 823EAC8 - .incbin "baserom.gba", 0x23EAC8, 0x4 - -gUnknown_823EACC:: @ 823EACC - .incbin "baserom.gba", 0x23EACC, 0xC - -gUnknown_823EAD8:: @ 823EAD8 - .incbin "baserom.gba", 0x23EAD8, 0x7408 +gTrainers:: @ 823EAD8 + .incbin "baserom.gba", 0x23EAC8, 0x7418 gUnknown_8245EE0:: @ 8245EE0 .incbin "baserom.gba", 0x245EE0, 0xD05 @@ -301,7 +295,7 @@ gUnknown_8250A34:: @ 8250A34 gUnknown_8250B20:: @ 8250B20 .incbin "baserom.gba", 0x250B20, 0xE4 -gUnknown_8250C04:: @ 8250C04 +gBattleMoves:: @ 8250C04 .incbin "baserom.gba", 0x250C04, 0x4 gUnknown_8250C08:: @ 8250C08 @@ -343,7 +337,7 @@ gUnknown_82539D4:: @ 82539D4 gUnknown_8253AE4:: @ 8253AE4 .incbin "baserom.gba", 0x253AE4, 0xCA0 -gUnknown_8254784:: @ 8254784 +gBaseStats:: @ 8254784 .incbin "baserom.gba", 0x254784, 0x11 gUnknown_8254795:: @ 8254795 @@ -409,7 +403,7 @@ gUnknown_825E074:: @ 825E074 gUnknown_825E2F4:: @ 825E2F4 .incbin "baserom.gba", 0x25E2F4, 0x168 -gUnknown_825E45C:: @ 825E45C +gBitTable:: @ 825E45C .incbin "baserom.gba", 0x25E45C, 0x80 gUnknown_825E4DC:: @ 825E4DC @@ -3026,7 +3020,7 @@ gUnknown_83F2EE0:: @ 83F2EE0 gUnknown_83F3024:: @ 83F3024 .incbin "baserom.gba", 0x3F3024, 0x2580 -gUnknown_83F55A4:: @ 83F55A4 +sBattleAICmdTable:: @ 83F55A4 .incbin "baserom.gba", 0x3F55A4, 0x178 gUnknown_83F571C:: @ 83F571C diff --git a/include/battle.h b/include/battle.h index 7c8c81f52..f98b2231a 100644 --- a/include/battle.h +++ b/include/battle.h @@ -2,6 +2,7 @@ #define GUARD_BATTLE_H // should they be included here or included individually by every file? +#include "constants/battle.h" #include "battle_util.h" #include "battle_script_commands.h" #include "battle_2.h" @@ -26,9 +27,6 @@ #define SIDE_PLAYER 0x0 #define SIDE_OPPONENT 0x1 -#define BIT_SIDE 0x1 -#define BIT_MON 0x2 - #define GET_BANK_IDENTITY(bank)((gBanksByIdentity[bank])) #define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & BIT_SIDE)) #define GET_BANK_SIDE2(bank)((GET_BANK_IDENTITY(bank) & BIT_SIDE)) @@ -72,9 +70,6 @@ #define STEVEN_PARTNER_ID 0xC03 #define SECRET_BASE_OPPONENT 0x400 -#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID) -#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000) - #define BATTLE_WON 0x1 #define BATTLE_LOST 0x2 #define BATTLE_DREW 0x3 @@ -100,76 +95,6 @@ #define STATUS_PSN_ANY ((STATUS_POISON | STATUS_TOXIC_POISON)) #define STATUS_ANY ((STATUS_SLEEP | STATUS_POISON | STATUS_BURN | STATUS_FREEZE | STATUS_PARALYSIS | STATUS_TOXIC_POISON)) -#define STATUS2_CONFUSION 0x00000007 -#define STATUS2_FLINCHED 0x00000008 -#define STATUS2_UPROAR 0x00000070 -#define STATUS2_BIDE 0x00000300 // two bits 0x100, 0x200 -#define STATUS2_LOCK_CONFUSE 0x00000C00 -#define STATUS2_MULTIPLETURNS 0x00001000 -#define STATUS2_WRAPPED 0x0000E000 -#define STATUS2_INFATUATION 0x000F0000 // 4 bits, one for every bank -#define STATUS2_INFATUATED_WITH(bank)((gBitTable[bank] << 16)) -#define STATUS2_FOCUS_ENERGY 0x00100000 -#define STATUS2_TRANSFORMED 0x00200000 -#define STATUS2_RECHARGE 0x00400000 -#define STATUS2_RAGE 0x00800000 -#define STATUS2_SUBSTITUTE 0x01000000 -#define STATUS2_DESTINY_BOND 0x02000000 -#define STATUS2_ESCAPE_PREVENTION 0x04000000 -#define STATUS2_NIGHTMARE 0x08000000 -#define STATUS2_CURSED 0x10000000 -#define STATUS2_FORESIGHT 0x20000000 -#define STATUS2_DEFENSE_CURL 0x40000000 -#define STATUS2_TORMENT 0x80000000 - -#define STATUS3_LEECHSEED_BANK 0x3 -#define STATUS3_LEECHSEED 0x4 -#define STATUS3_ALWAYS_HITS 0x18 // two bits -#define STATUS3_PERISH_SONG 0x20 -#define STATUS3_ON_AIR 0x40 -#define STATUS3_UNDERGROUND 0x80 -#define STATUS3_MINIMIZED 0x100 -#define STATUS3_ROOTED 0x400 -#define STATUS3_CHARGED_UP 0x200 -#define STATUS3_YAWN 0x1800 // two bits -#define STATUS3_IMPRISONED_OTHERS 0x2000 -#define STATUS3_GRUDGE 0x4000 -#define STATUS3_CANT_SCORE_A_CRIT 0x8000 -#define STATUS3_MUDSPORT 0x10000 -#define STATUS3_WATERSPORT 0x20000 -#define STATUS3_UNDERWATER 0x40000 -#define STATUS3_INTIMIDATE_POKES 0x80000 -#define STATUS3_TRACE 0x100000 - -#define STATUS3_SEMI_INVULNERABLE ((STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER)) - -#define HITMARKER_x10 0x00000010 -#define HITMARKER_x20 0x00000020 -#define HITMARKER_DESTINYBOND 0x00000040 -#define HITMARKER_NO_ANIMATIONS 0x00000080 -#define HITMARKER_IGNORE_SUBSTITUTE 0x00000100 -#define HITMARKER_NO_ATTACKSTRING 0x00000200 -#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400 -#define HITMARKER_NO_PPDEDUCT 0x00000800 -#define HITMARKER_PURSUIT_TRAP 0x00001000 -#define HITMARKER_IGNORE_SAFEGUARD 0x00002000 -#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000 -#define HITMARKER_RUN 0x00008000 -#define HITMARKER_IGNORE_ON_AIR 0x00010000 -#define HITMARKER_IGNORE_UNDERGROUND 0x00020000 -#define HITMARKER_IGNORE_UNDERWATER 0x00040000 -#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000 -#define HITMARKER_x100000 0x00100000 -#define HITMARKER_x200000 0x00200000 -#define HITMARKER_x400000 0x00400000 -#define HITMARKER_x800000 0x00800000 -#define HITMARKER_GRUDGE 0x01000000 -#define HITMARKER_OBEYS 0x02000000 -#define HITMARKER_x4000000 0x04000000 -#define HITMARKER_x8000000 0x08000000 -#define HITMARKER_FAINTED(bank) ((gBitTable[bank] << 0x1C)) -#define HITMARKER_UNK(bank) ((0x10000000 << bank)) - #define SIDE_STATUS_REFLECT (1 << 0) #define SIDE_STATUS_LIGHTSCREEN (1 << 1) #define SIDE_STATUS_X4 (1 << 2) @@ -209,20 +134,6 @@ #define MAX_TRAINER_ITEMS 4 #define MAX_MON_MOVES 4 -#define WEATHER_RAIN_TEMPORARY (1 << 0) -#define WEATHER_RAIN_DOWNPOUR (1 << 1) -#define WEATHER_RAIN_PERMANENT (1 << 2) -#define WEATHER_RAIN_ANY ((WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT)) -#define WEATHER_SANDSTORM_TEMPORARY (1 << 3) -#define WEATHER_SANDSTORM_PERMANENT (1 << 4) -#define WEATHER_SANDSTORM_ANY ((WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)) -#define WEATHER_SUN_TEMPORARY (1 << 5) -#define WEATHER_SUN_PERMANENT (1 << 6) -#define WEATHER_SUN_ANY ((WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)) -#define WEATHER_HAIL (1 << 7) -#define WEATHER_HAIL_ANY ((WEATHER_HAIL)) -#define WEATHER_ANY ((WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)) - #define BATTLE_TERRAIN_GRASS 0 #define BATTLE_TERRAIN_LONG_GRASS 1 #define BATTLE_TERRAIN_SAND 2 @@ -507,19 +418,39 @@ struct AI_ThinkingStruct u8 simulatedRNG[4]; }; -struct UsedMoves -{ - u16 moves[BATTLE_BANKS_COUNT]; - u16 unknown[BATTLE_BANKS_COUNT]; -}; +extern u8 gActiveBattler; +extern u8 gBattlerTarget; +extern u8 gAbsentBattlerFlags; + +// TODO: move these to constants/battle.h +#define MAX_BATTLERS_COUNT 4 +#define BIT_FLANK 2 + +// script's table id to bit +#define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0) +#define AI_SCRIPT_TRY_TO_FAINT (1 << 1) +#define AI_SCRIPT_CHECK_VIABILITY (1 << 2) +#define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3) +#define AI_SCRIPT_RISKY (1 << 4) +#define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5) +#define AI_SCRIPT_PREFER_BATON_PASS (1 << 6) +#define AI_SCRIPT_DOUBLE_BATTLE (1 << 7) +#define AI_SCRIPT_HP_AWARE (1 << 8) +#define AI_SCRIPT_UNKNOWN (1 << 9) +// 10 - 28 are not used +#define AI_SCRIPT_ROAMING (1 << 29) +#define AI_SCRIPT_SAFARI (1 << 30) +#define AI_SCRIPT_FIRST_BATTLE (1 << 31) + +extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT]; struct BattleHistory { - struct UsedMoves usedMoves[BATTLE_BANKS_COUNT]; - u8 abilities[BATTLE_BANKS_COUNT]; - u8 itemEffects[BATTLE_BANKS_COUNT]; - u16 trainerItems[BATTLE_BANKS_COUNT]; - u8 itemsNo; + /*0x00*/ u16 usedMoves[2][8]; // 0xFFFF means move not used (confuse self hit, etc) + /*0x20*/ u8 abilities[MAX_BATTLERS_COUNT / 2]; + /*0x22*/ u8 itemEffects[MAX_BATTLERS_COUNT / 2]; + /*0x24*/ u16 trainerItems[MAX_BATTLERS_COUNT]; + /*0x2C*/ u8 itemsNo; }; struct BattleScriptsStack @@ -631,10 +562,10 @@ struct BattleStruct u8 runTries; u8 caughtMonNick[11]; u8 field_78; - u8 field_79; - u8 field_7A; - u8 field_7B; - u8 field_7C; + u8 safariGoNearCounter; + u8 safariPkblThrowCounter; + u8 safariEscapeFactor; + u8 safariCatchFactor; u8 field_7D; u8 field_7E; u8 formToChangeInto; @@ -835,6 +766,32 @@ extern struct BattleStruct* gBattleStruct; #define SET_STATCHANGER(statId, stage, goesDown)(gBattleScripting.statChanger = (statId) + (stage << 4) + (goesDown << 7)) +// used in many battle files, it seems as though Hisashi Sogabe wrote +// some sort of macro to replace the use of actually calling memset. +// Perhaps it was thought calling memset was much slower? + +// The compiler wont allow us to locally declare ptr in this macro; some +// functions that invoke this macro will not match without this egregeous +// assumption about the variable names, so in order to avoid this assumption, +// we opt to pass the variables themselves, even though it is likely that +// Sogabe assumed the variables were named src and dest. Trust me: I tried to +// avoid assuming variable names, but the ROM just will not match without the +// assumptions. Therefore, these macros are bad practice, but I'm putting them +// here anyway. +#define MEMSET_ALT(data, c, size, var, dest) \ +{ \ + dest = (u8 *)data; \ + for(var = 0; var < (u32)size; var++) \ + dest[var] = c; \ +} \ + +#define MEMCPY_ALT(data, dest, size, var, src) \ +{ \ + src = (u8 *)data; \ + for(var = 0; var < (u32)size; var++) \ + dest[var] = src[var]; \ +} \ + struct BattleScripting { s32 painSplitHp; diff --git a/include/constants/battle.h b/include/constants/battle.h new file mode 100644 index 000000000..25544ba3d --- /dev/null +++ b/include/constants/battle.h @@ -0,0 +1,284 @@ +#ifndef GUARD_CONSTANTS_BATTLE_H +#define GUARD_CONSTANTS_BATTLE_H + +/* + * A battler may be in one of four positions on the field. The first bit determines + * what side the battler is on, either the player's side or the opponent's side. + * The second bit determines what flank the battler is on, either the left or right. + * Note that the opponent's flanks are drawn corresponding to their perspective, so + * their right mon appears on the left, and their left mon appears on the right. + * The battler ID is usually the same as the position, except in the case of link battles. + * + * + ------------------------- + + * | Opponent's side | + * | Right Left | + * | 3 1 | + * | | + * | Player's side | + * | Left Right | + * | 0 2 | + * ----------------------------+ + * | | + * | | + * +---------------------------+ + */ + +#define MAX_BATTLERS_COUNT 4 + +#define B_POSITION_PLAYER_LEFT 0 +#define B_POSITION_OPPONENT_LEFT 1 +#define B_POSITION_PLAYER_RIGHT 2 +#define B_POSITION_OPPONENT_RIGHT 3 + +// These macros can be used with either battler ID or positions to get the partner or the opposite mon +#define BATTLE_OPPOSITE(id) ((id) ^ 1) +#define BATTLE_PARTNER(id) ((id) ^ 2) + +#define B_SIDE_PLAYER 0 +#define B_SIDE_OPPONENT 1 + +#define B_FLANK_LEFT 0 +#define B_FLANK_RIGHT 1 + +#define BIT_SIDE 1 +#define BIT_FLANK 2 + +// Battle Type Flags +#define BATTLE_TYPE_DOUBLE 0x0001 +#define BATTLE_TYPE_LINK 0x0002 +#define BATTLE_TYPE_IS_MASTER 0x0004 // In not-link battles, it's always set. +#define BATTLE_TYPE_TRAINER 0x0008 +#define BATTLE_TYPE_FIRST_BATTLE 0x0010 +#define BATTLE_TYPE_20 0x0020 +#define BATTLE_TYPE_MULTI 0x0040 +#define BATTLE_TYPE_SAFARI 0x0080 +#define BATTLE_TYPE_BATTLE_TOWER 0x0100 +#define BATTLE_TYPE_WALLY_TUTORIAL 0x0200 +#define BATTLE_TYPE_ROAMER 0x0400 +#define BATTLE_TYPE_EREADER_TRAINER 0x0800 +#define BATTLE_TYPE_KYOGRE_GROUDON 0x1000 +#define BATTLE_TYPE_LEGENDARY 0x2000 +#define BATTLE_TYPE_REGI 0x4000 +#define BATTLE_TYPE_TWO_OPPONENTS 0x8000 +#define BATTLE_TYPE_DOME 0x10000 +#define BATTLE_TYPE_PALACE 0x20000 +#define BATTLE_TYPE_ARENA 0x40000 +#define BATTLE_TYPE_FACTORY 0x80000 +#define BATTLE_TYPE_PIKE 0x100000 +#define BATTLE_TYPE_PYRAMID 0x200000 +#define BATTLE_TYPE_INGAME_PARTNER 0x400000 +#define BATTLE_TYPE_x800000 0x800000 +#define BATTLE_TYPE_RECORDED 0x1000000 +#define BATTLE_TYPE_x2000000 0x2000000 +#define BATTLE_TYPE_TRAINER_HILL 0x4000000 +#define BATTLE_TYPE_SECRET_BASE 0x8000000 +#define BATTLE_TYPE_GROUDON 0x10000000 +#define BATTLE_TYPE_KYOGRE 0x20000000 +#define BATTLE_TYPE_RAYQUAZA 0x40000000 +#define BATTLE_TYPE_x80000000 0x80000000 +#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID) +#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE) + +// Battle Outcome defines +#define B_OUTCOME_WON 0x1 +#define B_OUTCOME_LOST 0x2 +#define B_OUTCOME_DREW 0x3 +#define B_OUTCOME_RAN 0x4 +#define B_OUTCOME_PLAYER_TELEPORTED 0x5 +#define B_OUTCOME_MON_FLED 0x6 +#define B_OUTCOME_CAUGHT 0x7 +#define B_OUTCOME_NO_SAFARI_BALLS 0x8 +#define B_OUTCOME_FORFEITED 0x9 +#define B_OUTCOME_MON_TELEPORTED 0xA +#define B_OUTCOME_LINK_BATTLE_RAN 0x80 + +// Non-volatile status conditions +// These persist remain outside of battle and after switching out +#define STATUS1_NONE 0x0 +#define STATUS1_SLEEP 0x7 +#define STATUS1_POISON 0x8 +#define STATUS1_BURN 0x10 +#define STATUS1_FREEZE 0x20 +#define STATUS1_PARALYSIS 0x40 +#define STATUS1_TOXIC_POISON 0x80 +#define STATUS1_TOXIC_COUNTER 0xF00 +#define STATUS1_PSN_ANY (STATUS1_POISON | STATUS1_TOXIC_POISON) +#define STATUS1_ANY (STATUS1_SLEEP | STATUS1_POISON | STATUS1_BURN | STATUS1_FREEZE | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON) + +// Volatile status ailments +// These are removed after exiting the battle or switching out +#define STATUS2_CONFUSION 0x00000007 +#define STATUS2_FLINCHED 0x00000008 +#define STATUS2_UPROAR 0x00000070 +#define STATUS2_BIDE 0x00000300 // two bits 0x100, 0x200 +#define STATUS2_LOCK_CONFUSE 0x00000C00 +#define STATUS2_MULTIPLETURNS 0x00001000 +#define STATUS2_WRAPPED 0x0000E000 +#define STATUS2_INFATUATION 0x000F0000 // 4 bits, one for every battler +#define STATUS2_INFATUATED_WITH(battler) (gBitTable[battler] << 16) +#define STATUS2_FOCUS_ENERGY 0x00100000 +#define STATUS2_TRANSFORMED 0x00200000 +#define STATUS2_RECHARGE 0x00400000 +#define STATUS2_RAGE 0x00800000 +#define STATUS2_SUBSTITUTE 0x01000000 +#define STATUS2_DESTINY_BOND 0x02000000 +#define STATUS2_ESCAPE_PREVENTION 0x04000000 +#define STATUS2_NIGHTMARE 0x08000000 +#define STATUS2_CURSED 0x10000000 +#define STATUS2_FORESIGHT 0x20000000 +#define STATUS2_DEFENSE_CURL 0x40000000 +#define STATUS2_TORMENT 0x80000000 + +// Seems like per-battler statuses. Not quite sure how to categorize these +#define STATUS3_LEECHSEED_BATTLER 0x3 +#define STATUS3_LEECHSEED 0x4 +#define STATUS3_ALWAYS_HITS 0x18 // two bits +#define STATUS3_PERISH_SONG 0x20 +#define STATUS3_ON_AIR 0x40 +#define STATUS3_UNDERGROUND 0x80 +#define STATUS3_MINIMIZED 0x100 +#define STATUS3_ROOTED 0x400 +#define STATUS3_CHARGED_UP 0x200 +#define STATUS3_YAWN 0x1800 // two bits +#define STATUS3_IMPRISONED_OTHERS 0x2000 +#define STATUS3_GRUDGE 0x4000 +#define STATUS3_CANT_SCORE_A_CRIT 0x8000 +#define STATUS3_MUDSPORT 0x10000 +#define STATUS3_WATERSPORT 0x20000 +#define STATUS3_UNDERWATER 0x40000 +#define STATUS3_INTIMIDATE_POKES 0x80000 +#define STATUS3_TRACE 0x100000 +#define STATUS3_SEMI_INVULNERABLE (STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER) + +// Not really sure what a "hitmarker" is. +#define HITMARKER_x10 0x00000010 +#define HITMARKER_x20 0x00000020 +#define HITMARKER_DESTINYBOND 0x00000040 +#define HITMARKER_NO_ANIMATIONS 0x00000080 +#define HITMARKER_IGNORE_SUBSTITUTE 0x00000100 +#define HITMARKER_NO_ATTACKSTRING 0x00000200 +#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400 +#define HITMARKER_NO_PPDEDUCT 0x00000800 +#define HITMARKER_SWAP_ATTACKER_TARGET 0x00001000 +#define HITMARKER_IGNORE_SAFEGUARD 0x00002000 +#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000 +#define HITMARKER_RUN 0x00008000 +#define HITMARKER_IGNORE_ON_AIR 0x00010000 +#define HITMARKER_IGNORE_UNDERGROUND 0x00020000 +#define HITMARKER_IGNORE_UNDERWATER 0x00040000 +#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000 +#define HITMARKER_x100000 0x00100000 +#define HITMARKER_x200000 0x00200000 +#define HITMARKER_x400000 0x00400000 +#define HITMARKER_x800000 0x00800000 +#define HITMARKER_GRUDGE 0x01000000 +#define HITMARKER_OBEYS 0x02000000 +#define HITMARKER_x4000000 0x04000000 +#define HITMARKER_x8000000 0x08000000 +#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C) +#define HITMARKER_UNK(battler) (0x10000000 << battler) + +// Per-side statuses that affect an entire party +#define SIDE_STATUS_REFLECT (1 << 0) +#define SIDE_STATUS_LIGHTSCREEN (1 << 1) +#define SIDE_STATUS_X4 (1 << 2) +#define SIDE_STATUS_SPIKES (1 << 4) +#define SIDE_STATUS_SAFEGUARD (1 << 5) +#define SIDE_STATUS_FUTUREATTACK (1 << 6) +#define SIDE_STATUS_MIST (1 << 8) +#define SIDE_STATUS_SPIKES_DAMAGED (1 << 9) + +// Flags describing move's result +#define MOVE_RESULT_MISSED (1 << 0) +#define MOVE_RESULT_SUPER_EFFECTIVE (1 << 1) +#define MOVE_RESULT_NOT_VERY_EFFECTIVE (1 << 2) +#define MOVE_RESULT_DOESNT_AFFECT_FOE (1 << 3) +#define MOVE_RESULT_ONE_HIT_KO (1 << 4) +#define MOVE_RESULT_FAILED (1 << 5) +#define MOVE_RESULT_FOE_ENDURED (1 << 6) +#define MOVE_RESULT_FOE_HUNG_ON (1 << 7) +#define MOVE_RESULT_NO_EFFECT (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED) + +// Battle Weather flags +#define WEATHER_RAIN_TEMPORARY (1 << 0) +#define WEATHER_RAIN_DOWNPOUR (1 << 1) // unused +#define WEATHER_RAIN_PERMANENT (1 << 2) +#define WEATHER_RAIN_ANY (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT) +#define WEATHER_SANDSTORM_TEMPORARY (1 << 3) +#define WEATHER_SANDSTORM_PERMANENT (1 << 4) +#define WEATHER_SANDSTORM_ANY (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT) +#define WEATHER_SUN_TEMPORARY (1 << 5) +#define WEATHER_SUN_PERMANENT (1 << 6) +#define WEATHER_SUN_ANY (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT) +#define WEATHER_HAIL (1 << 7) +#define WEATHER_HAIL_ANY (WEATHER_HAIL) +#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY) + +// Move Effects +#define MOVE_EFFECT_SLEEP 0x1 +#define MOVE_EFFECT_POISON 0x2 +#define MOVE_EFFECT_BURN 0x3 +#define MOVE_EFFECT_FREEZE 0x4 +#define MOVE_EFFECT_PARALYSIS 0x5 +#define MOVE_EFFECT_TOXIC 0x6 +#define MOVE_EFFECT_CONFUSION 0x7 +#define MOVE_EFFECT_FLINCH 0x8 +#define MOVE_EFFECT_TRI_ATTACK 0x9 +#define MOVE_EFFECT_UPROAR 0xA +#define MOVE_EFFECT_PAYDAY 0xB +#define MOVE_EFFECT_CHARGING 0xC +#define MOVE_EFFECT_WRAP 0xD +#define MOVE_EFFECT_RECOIL_25 0xE +#define MOVE_EFFECT_ATK_PLUS_1 0xF +#define MOVE_EFFECT_DEF_PLUS_1 0x10 +#define MOVE_EFFECT_SPD_PLUS_1 0x11 +#define MOVE_EFFECT_SP_ATK_PLUS_1 0x12 +#define MOVE_EFFECT_SP_DEF_PLUS_1 0x13 +#define MOVE_EFFECT_ACC_PLUS_1 0x14 +#define MOVE_EFFECT_EVS_PLUS_1 0x15 +#define MOVE_EFFECT_ATK_MINUS_1 0x16 +#define MOVE_EFFECT_DEF_MINUS_1 0x17 +#define MOVE_EFFECT_SPD_MINUS_1 0x18 +#define MOVE_EFFECT_SP_ATK_MINUS_1 0x19 +#define MOVE_EFFECT_SP_DEF_MINUS_1 0x1A +#define MOVE_EFFECT_ACC_MINUS_1 0x1B +#define MOVE_EFFECT_EVS_MINUS_1 0x1C +#define MOVE_EFFECT_RECHARGE 0x1D +#define MOVE_EFFECT_RAGE 0x1E +#define MOVE_EFFECT_STEAL_ITEM 0x1F +#define MOVE_EFFECT_PREVENT_ESCAPE 0x20 +#define MOVE_EFFECT_NIGHTMARE 0x21 +#define MOVE_EFFECT_ALL_STATS_UP 0x22 +#define MOVE_EFFECT_RAPIDSPIN 0x23 +#define MOVE_EFFECT_REMOVE_PARALYSIS 0x24 +#define MOVE_EFFECT_ATK_DEF_DOWN 0x25 +#define MOVE_EFFECT_RECOIL_33 0x26 +#define MOVE_EFFECT_ATK_PLUS_2 0x27 +#define MOVE_EFFECT_DEF_PLUS_2 0x28 +#define MOVE_EFFECT_SPD_PLUS_2 0x29 +#define MOVE_EFFECT_SP_ATK_PLUS_2 0x2A +#define MOVE_EFFECT_SP_DEF_PLUS_2 0x2B +#define MOVE_EFFECT_ACC_PLUS_2 0x2C +#define MOVE_EFFECT_EVS_PLUS_2 0x2D +#define MOVE_EFFECT_ATK_MINUS_2 0x2E +#define MOVE_EFFECT_DEF_MINUS_2 0x2F +#define MOVE_EFFECT_SPD_MINUS_2 0x30 +#define MOVE_EFFECT_SP_ATK_MINUS_2 0x31 +#define MOVE_EFFECT_SP_DEF_MINUS_2 0x32 +#define MOVE_EFFECT_ACC_MINUS_2 0x33 +#define MOVE_EFFECT_EVS_MINUS_2 0x34 +#define MOVE_EFFECT_THRASH 0x35 +#define MOVE_EFFECT_KNOCK_OFF 0x36 +#define MOVE_EFFECT_NOTHING_37 0x37 +#define MOVE_EFFECT_NOTHING_38 0x38 +#define MOVE_EFFECT_NOTHING_39 0x39 +#define MOVE_EFFECT_NOTHING_3A 0x3A +#define MOVE_EFFECT_SP_ATK_TWO_DOWN 0x3B +#define MOVE_EFFECT_NOTHING_3C 0x3C +#define MOVE_EFFECT_NOTHING_3D 0x3D +#define MOVE_EFFECT_NOTHING_3E 0x3E +#define MOVE_EFFECT_NOTHING_3F 0x3F +#define MOVE_EFFECT_AFFECTS_USER 0x40 +#define MOVE_EFFECT_CERTAIN 0x80 + +#endif // GUARD_CONSTANTS_BATTLE_H diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h new file mode 100644 index 000000000..4c3a45dc6 --- /dev/null +++ b/include/constants/battle_ai.h @@ -0,0 +1,52 @@ +#ifndef GUARD_CONSTANTS_BATTLE_AI_H +#define GUARD_CONSTANTS_BATTLE_AI_H + +// battlers +#define AI_TARGET 0 +#define AI_USER 1 +#define AI_TARGET_PARTNER 2 +#define AI_USER_PARTNER 3 + +// get_type command +#define AI_TYPE1_TARGET 0 +#define AI_TYPE1_USER 1 +#define AI_TYPE2_TARGET 2 +#define AI_TYPE2_USER 3 +#define AI_TYPE_MOVE 4 + +// type effectiveness +#define AI_EFFECTIVENESS_x4 160 +#define AI_EFFECTIVENESS_x2 80 +#define AI_EFFECTIVENESS_x1 40 +#define AI_EFFECTIVENESS_x0_5 20 +#define AI_EFFECTIVENESS_x0_25 10 +#define AI_EFFECTIVENESS_x0 0 + +// ai weather +#define AI_WEATHER_SUN 0 +#define AI_WEATHER_RAIN 1 +#define AI_WEATHER_SANDSTORM 2 +#define AI_WEATHER_HAIL 3 + +// get_how_powerful_move_is +#define MOVE_POWER_DISCOURAGED 0 +#define MOVE_NOT_MOST_POWERFUL 1 +#define MOVE_MOST_POWERFUL 2 + +// script's table id to bit +#define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0) +#define AI_SCRIPT_TRY_TO_FAINT (1 << 1) +#define AI_SCRIPT_CHECK_VIABILITY (1 << 2) +#define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3) +#define AI_SCRIPT_RISKY (1 << 4) +#define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5) +#define AI_SCRIPT_PREFER_BATON_PASS (1 << 6) +#define AI_SCRIPT_DOUBLE_BATTLE (1 << 7) +#define AI_SCRIPT_HP_AWARE (1 << 8) +#define AI_SCRIPT_UNKNOWN (1 << 9) +// 10 - 28 are not used +#define AI_SCRIPT_ROAMING (1 << 29) +#define AI_SCRIPT_SAFARI (1 << 30) +#define AI_SCRIPT_FIRST_BATTLE (1 << 31) + +#endif // GUARD_CONSTANTS_BATTLE_AI_H diff --git a/include/gba/defines.h b/include/gba/defines.h index b3fce2bfc..fe81770e3 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -68,4 +68,6 @@ #define WIN_RANGE(a, b) (((a) << 8) | (b)) +#define NAKED __attribute__((naked)) + #endif // GUARD_GBA_DEFINES diff --git a/include/global.h b/include/global.h index dd466678d..e5c463c6e 100644 --- a/include/global.h +++ b/include/global.h @@ -31,6 +31,24 @@ char* strcpy(char *dst0, const char *src0); #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 +// There are many quirks in the source code which have overarching behavioral differences from +// a number of other files. For example, diploma.c seems to declare rodata before each use while +// other files declare out of order and must be at the beginning. There are also a number of +// macros which differ from one file to the next due to the method of obtaining the result, such +// as these below. Because of this, there is a theory (Two Team Theory) that states that these +// programming projects had more than 1 "programming team" which utilized different macros for +// each of the files that were worked on. +#define T1_READ_8(ptr) ((ptr)[0]) +#define T1_READ_16(ptr) ((ptr)[0] | ((ptr)[1] << 8)) +#define T1_READ_32(ptr) ((ptr)[0] | ((ptr)[1] << 8) | ((ptr)[2] << 16) | ((ptr)[3] << 24)) +#define T1_READ_PTR(ptr) (u8*) T1_READ_32(ptr) + +// T2_READ_8 is a duplicate to remain consistent with each group. +#define T2_READ_8(ptr) ((ptr)[0]) +#define T2_READ_16(ptr) ((ptr)[0] + ((ptr)[1] << 8)) +#define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) +#define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) + extern u8 gStringVar1[]; extern u8 gStringVar2[]; extern u8 gStringVar3[]; diff --git a/ld_script.txt b/ld_script.txt index dea16b57c..4bc6ed9f1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -168,7 +168,7 @@ SECTIONS { asm/script_pokemon_util_80BF8FC.o(.text); asm/heal_location.o(.text); asm/region_map.o(.text); - asm/battle_ai_script_commands.o(.text); + src/battle_ai_script_commands.o(.text); asm/rom6.o(.text); asm/fldeff_flash.o(.text); asm/post_battle_event_funcs.o(.text); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c new file mode 100644 index 000000000..0ce6b6c35 --- /dev/null +++ b/src/battle_ai_script_commands.c @@ -0,0 +1,2022 @@ +#include "global.h" +#include "battle.h" +#include "item.h" +#include "pokemon.h" +#include "constants/species.h" +#include "constants/abilities.h" +#include "constants/battle_ai.h" + +extern u16 Random(void); +extern void sub_80C7164(void); + +#define AI_ACTION_DONE 0x0001 +#define AI_ACTION_FLEE 0x0002 +#define AI_ACTION_WATCH 0x0004 +#define AI_ACTION_DO_NOT_ATTACK 0x0008 +#define AI_ACTION_UNK5 0x0010 +#define AI_ACTION_UNK6 0x0020 +#define AI_ACTION_UNK7 0x0040 +#define AI_ACTION_UNK8 0x0080 + +#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gBattleResources->ai)) +#define BATTLE_HISTORY ((struct BattleHistory *)(gBattleResources->battleHistory)) + +// AI states +enum +{ + AIState_SettingUp, + AIState_Processing, + AIState_FinishedProcessing, + AIState_DoNotProcess +}; + +extern const u8 *gAIScriptPtr; +extern u8 *BattleAIs[]; +extern u16 gLastUsedMove[]; + +typedef void (*BattleAICmdFunc)(void); + +extern const BattleAICmdFunc sBattleAICmdTable[]; + +// TODO: move these +extern u8 sBattler_AI; +extern const u32 gBitTable[]; // util.h +extern u32 gStatuses3[]; // battle_2.h +extern u16 gSideAffecting[2]; +extern const struct BattleMove gBattleMoves[]; +extern u16 gBattlerPartyIndexes[]; +extern u16 gDynamicBasePower; +extern u8 gMoveResultFlags; +extern u8 gCritMultiplier; +extern u16 gCurrentMove; +extern s32 gBattleMoveDamage; + +void BattleAI_SetupAIData(void); +void BattleAI_DoAIProcessing(void); +void AIStackPushVar(const u8 *ptr); +bool8 AIStackPop(void); + +void BattleAI_HandleItemUseBeforeAISetup(void) +{ + s32 i; + u8 *data = (u8 *)BATTLE_HISTORY; + + for (i = 0; i < sizeof(struct BattleHistory); i++) + data[i] = 0; + + // Items are allowed to use in ONLY trainer battles. + // TODO: Use proper flags + if ((gBattleTypeFlags & 0x8) + && (gTrainerBattleOpponent_A != 0x400) + && !(gBattleTypeFlags & 0x80982) + ) + { + for (i = 0; i < 4; i++) + { + if (gTrainers[gTrainerBattleOpponent_A].items[i] != 0) + { + BATTLE_HISTORY->trainerItems[BATTLE_HISTORY->itemsNo] = gTrainers[gTrainerBattleOpponent_A].items[i]; + BATTLE_HISTORY->itemsNo++; + } + } + } + + BattleAI_SetupAIData(); +} + +void BattleAI_SetupAIData(void) +{ + s32 i; + u8 *data = (u8 *)AI_THINKING_STRUCT; + u8 moveLimitations; + + // Clear AI data. + for (i = 0; i < sizeof(struct AI_ThinkingStruct); i++) + data[i] = 0; + + for (i = 0; i < 4; i++) + AI_THINKING_STRUCT->score[i] = 100; + + moveLimitations = CheckMoveLimitations(gActiveBattler, 0, 0xFF); + + // Ignore moves that aren't possible to use. + for (i = 0; i < 4; i++) + { + if (gBitTable[i] & moveLimitations) + AI_THINKING_STRUCT->score[i] = 0; + + AI_THINKING_STRUCT->simulatedRNG[i] = 100 - (Random() % 16); + } + + gBattleResources->AI_ScriptsStack->size = 0; + sBattler_AI = gActiveBattler; + + // Decide a random target battlerId in doubles. + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + { + gBattlerTarget = (Random() & BIT_FLANK); + + if (gAbsentBattlerFlags & gBitTable[gBattlerTarget]) + gBattlerTarget ^= BIT_FLANK; + } + // There's only one choice in single battles. + else + { + gBattlerTarget = sBattler_AI ^ BIT_SIDE; + } + + // Choose proper trainer ai scripts. + // Fire Red, why all the returns?!? + if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) // _080C6E84 + { + AI_THINKING_STRUCT->aiFlags = AI_SCRIPT_SAFARI; + return; + } + else if (gBattleTypeFlags & BATTLE_TYPE_ROAMER) // _080C6EAC + { + AI_THINKING_STRUCT->aiFlags = AI_SCRIPT_ROAMING; + return; + } + else if (!(gBattleTypeFlags & (0x80900)) && (gTrainerBattleOpponent_A != 0x400)) // _080C6ECC + { + if(gBattleTypeFlags & (0x80 << 10)) + { + AI_THINKING_STRUCT->aiFlags = 1; + return; + } + else if(gBattleTypeFlags & (0x80 << 11)) + { + AI_THINKING_STRUCT->aiFlags = 7; + return; + } + } + else + { + AI_THINKING_STRUCT->aiFlags = 7; + return; + } + AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent_A].aiFlags; +} + +u8 BattleAI_GetAIActionToUse(void) +{ + u8 currentMoveArray[MAX_MON_MOVES]; + u8 consideredMoveArray[MAX_MON_MOVES]; + u8 numOfBestMoves; + s32 i; + + sub_80C7164(); + while (AI_THINKING_STRUCT->aiFlags != 0) + { + if (AI_THINKING_STRUCT->aiFlags & 1) + { + AI_THINKING_STRUCT->aiState = AIState_SettingUp; + BattleAI_DoAIProcessing(); + } + AI_THINKING_STRUCT->aiFlags >>= 1; + AI_THINKING_STRUCT->aiLogicId++; + AI_THINKING_STRUCT->movesetIndex = 0; + } + + // special flee or watch cases for safari. + if (AI_THINKING_STRUCT->aiAction & (AI_ACTION_FLEE)) // flee + return 4; + if (AI_THINKING_STRUCT->aiAction & (AI_ACTION_WATCH)) // watch + return 5; + + numOfBestMoves = 1; + currentMoveArray[0] = AI_THINKING_STRUCT->score[0]; + consideredMoveArray[0] = 0; + + for (i = 1; i < MAX_MON_MOVES; i++) + { + if (currentMoveArray[0] < AI_THINKING_STRUCT->score[i]) + { + numOfBestMoves = 1; + currentMoveArray[0] = AI_THINKING_STRUCT->score[i]; + consideredMoveArray[0] = i; + } + if (currentMoveArray[0] == AI_THINKING_STRUCT->score[i]) + { + currentMoveArray[numOfBestMoves] = AI_THINKING_STRUCT->score[i]; + consideredMoveArray[numOfBestMoves++] = i; + } + } + + return consideredMoveArray[Random() % numOfBestMoves]; // break any ties that exist. +} + +void BattleAI_DoAIProcessing(void) +{ + while (AI_THINKING_STRUCT->aiState != AIState_FinishedProcessing) + { + switch (AI_THINKING_STRUCT->aiState) + { + case AIState_DoNotProcess: //Needed to match. + break; + case AIState_SettingUp: + gAIScriptPtr = BattleAIs[AI_THINKING_STRUCT->aiLogicId]; // set the AI ptr. + if (gBattleMons[sBattler_AI].pp[AI_THINKING_STRUCT->movesetIndex] == 0) + { + AI_THINKING_STRUCT->moveConsidered = 0; // don't consider a move you have 0 PP for, idiot. + } + else + { + AI_THINKING_STRUCT->moveConsidered = gBattleMons[sBattler_AI].moves[AI_THINKING_STRUCT->movesetIndex]; + } + AI_THINKING_STRUCT->aiState++; + break; + case AIState_Processing: + if (AI_THINKING_STRUCT->moveConsidered != 0) + sBattleAICmdTable[*gAIScriptPtr](); // run AI command. + else + { + AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] = 0; // definitely do not consider any move that has 0 PP. + AI_THINKING_STRUCT->aiAction |= AI_ACTION_DONE; + } + if (AI_THINKING_STRUCT->aiAction & AI_ACTION_DONE) + { + AI_THINKING_STRUCT->movesetIndex++; + if (AI_THINKING_STRUCT->movesetIndex < MAX_MON_MOVES && (AI_THINKING_STRUCT->aiAction & AI_ACTION_DO_NOT_ATTACK) == 0) + AI_THINKING_STRUCT->aiState = AIState_SettingUp; // as long as their are more moves to process, keep setting this to setup state. + else + AI_THINKING_STRUCT->aiState++; // done processing. + AI_THINKING_STRUCT->aiAction &= (AI_ACTION_FLEE | AI_ACTION_WATCH | AI_ACTION_DO_NOT_ATTACK | + AI_ACTION_UNK5 | AI_ACTION_UNK6 | AI_ACTION_UNK7 | AI_ACTION_UNK8); // disable AI_ACTION_DONE. + } + break; + } + } +} + +void sub_80C7164(void) +{ + s32 i; + + for (i = 0; i < 8; i++) + { + if (BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] == 0) + { + BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] = gLastUsedMove[gBattlerTarget]; + return; + } + } +} + +void sub_80C71A8(u8 a) +{ + s32 i; + + for (i = 0; i < 8; i++) + BATTLE_HISTORY->usedMoves[a / 2][i] = 0; +} + +void sub_80C71D0(u8 a, u8 b) +{ + if (GetBankSide(a) == 0) + BATTLE_HISTORY->abilities[GetBankIdentity(a) & 1] = b; +} + +void sub_80C7208(u8 a, u8 b) +{ + if (GetBankSide(a) == 0) + BATTLE_HISTORY->itemEffects[GetBankIdentity(a) & 1] = b; +} + +static void BattleAICmd_if_random_less_than(void) +{ + if (Random() % 256 < gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_random_greater_than(void) +{ + if (Random() % 256 > gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_random_equal(void) +{ + if (Random() % 256 == gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_random_not_equal(void) +{ + if (Random() % 256 != gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_score(void) +{ + AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] += gAIScriptPtr[1]; // add the result to the array of the move consider's score. + + if (AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] < 0) // if the score is negative, flatten it to 0. + AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] = 0; + + gAIScriptPtr += 2; // AI return. +} + +enum { + TARGET, + USER +}; + +static void BattleAICmd_if_hp_less_than(void) +{ + u16 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) < gAIScriptPtr[2]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +static void BattleAICmd_if_hp_more_than(void) +{ + u16 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) > gAIScriptPtr[2]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +static void BattleAICmd_if_hp_equal(void) +{ + u16 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) == gAIScriptPtr[2]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +static void BattleAICmd_if_hp_not_equal(void) +{ + u16 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) != gAIScriptPtr[2]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +static void BattleAICmd_if_status(void) +{ + u16 index; + u32 arg; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + arg = T1_READ_32(gAIScriptPtr + 2); + + if ((gBattleMons[index].status1 & arg) != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); + else + gAIScriptPtr += 10; +} + +static void BattleAICmd_if_not_status(void) +{ + u16 index; + u32 arg; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + arg = T1_READ_32(gAIScriptPtr + 2); + + if ((gBattleMons[index].status1 & arg) == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); + else + gAIScriptPtr += 10; +} + +static void BattleAICmd_if_status2(void) +{ + u16 index; + u32 arg; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + arg = T1_READ_32(gAIScriptPtr + 2); + + if ((gBattleMons[index].status2 & arg) != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); + else + gAIScriptPtr += 10; +} + +static void BattleAICmd_if_not_status2(void) +{ + u16 index; + u32 arg; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + arg = T1_READ_32(gAIScriptPtr + 2); + + if ((gBattleMons[index].status2 & arg) == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); + else + gAIScriptPtr += 10; +} + +static void BattleAICmd_if_status3(void) +{ + u16 index; + u32 arg; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + arg = T1_READ_32(gAIScriptPtr + 2); + + if ((gStatuses3[index] & arg) != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); + else + gAIScriptPtr += 10; +} + +static void BattleAICmd_if_not_status3(void) +{ + u16 index; + u32 arg; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + arg = T1_READ_32(gAIScriptPtr + 2); + + if ((gStatuses3[index] & arg) == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); + else + gAIScriptPtr += 10; +} + +static void BattleAICmd_if_status4(void) +{ + u16 index; + u32 arg1, arg2; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + arg1 = GetBankIdentity(index) & 1; + arg2 = T1_READ_32(gAIScriptPtr + 2); + + if ((gSideAffecting[arg1] & arg2) != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); + else + gAIScriptPtr += 10; +} + +static void BattleAICmd_if_not_status4(void) +{ + u16 index; + u32 arg1, arg2; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + arg1 = GetBankIdentity(index) & 1; + arg2 = T1_READ_32(gAIScriptPtr + 2); + + if ((gSideAffecting[arg1] & arg2) == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); + else + gAIScriptPtr += 10; +} + +static void BattleAICmd_if_less_than(void) +{ + if (AI_THINKING_STRUCT->funcResult < gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_more_than(void) +{ + if (AI_THINKING_STRUCT->funcResult > gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_equal(void) +{ + if (AI_THINKING_STRUCT->funcResult == gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_not_equal(void) +{ + if (AI_THINKING_STRUCT->funcResult != gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_less_than_32(void) +{ + u8 *temp = T1_READ_PTR(gAIScriptPtr + 1); + + if (AI_THINKING_STRUCT->funcResult < *temp) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5); + else + gAIScriptPtr += 9; +} + +static void BattleAICmd_if_more_than_32(void) +{ + u8 *temp = T1_READ_PTR(gAIScriptPtr + 1); + + if (AI_THINKING_STRUCT->funcResult > *temp) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5); + else + gAIScriptPtr += 9; +} + +static void BattleAICmd_if_equal_32(void) +{ + u8 *temp = T1_READ_PTR(gAIScriptPtr + 1); + + if (AI_THINKING_STRUCT->funcResult == *temp) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5); + else + gAIScriptPtr += 9; +} + +static void BattleAICmd_if_not_equal_32(void) +{ + u8 *temp = T1_READ_PTR(gAIScriptPtr + 1); + + if (AI_THINKING_STRUCT->funcResult != *temp) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5); + else + gAIScriptPtr += 9; +} + +static void BattleAICmd_if_move(void) +{ + u16 move = T1_READ_16(gAIScriptPtr + 1); + + if (AI_THINKING_STRUCT->moveConsidered == move) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +static void BattleAICmd_if_not_move(void) +{ + u16 move = T1_READ_16(gAIScriptPtr + 1); + + if (AI_THINKING_STRUCT->moveConsidered != move) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +static void BattleAICmd_if_in_bytes(void) +{ + u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); + + while (*ptr != 0xFF) + { + if (AI_THINKING_STRUCT->funcResult == *ptr) + { + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5); + return; + } + ptr++; + } + gAIScriptPtr += 9; +} + +static void BattleAICmd_if_not_in_bytes(void) +{ + u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1); + + while (*ptr != 0xFF) + { + if (AI_THINKING_STRUCT->funcResult == *ptr) + { + gAIScriptPtr += 9; + return; + } + ptr++; + } + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5); +} + +static void BattleAICmd_if_in_words(void) +{ + u16 *ptr = (u16 *)T1_READ_PTR(gAIScriptPtr + 1); + + while (*ptr != 0xFFFF) + { + if (AI_THINKING_STRUCT->funcResult == *ptr) + { + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5); + return; + } + ptr++; + } + gAIScriptPtr += 9; +} + +static void BattleAICmd_if_not_in_words(void) +{ + u16 *ptr = (u16 *)T1_READ_PTR(gAIScriptPtr + 1); + + while (*ptr != 0xFFFF) + { + if (AI_THINKING_STRUCT->funcResult == *ptr) + { + gAIScriptPtr += 9; + return; + } + ptr++; + } + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5); +} + +static void BattleAICmd_if_user_can_damage(void) +{ + s32 i; + + for (i = 0; i < MAX_MON_MOVES; i++) + { + if (gBattleMons[sBattler_AI].moves[i] != 0 + && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0) + break; + } + if (i == MAX_MON_MOVES) + gAIScriptPtr += 5; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); +} + +static void BattleAICmd_if_user_cant_damage(void) +{ + s32 i; + + for (i = 0; i < MAX_MON_MOVES; i++) + { + if (gBattleMons[sBattler_AI].moves[i] != 0 + && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].power != 0) + break; + } + if (i != MAX_MON_MOVES) + gAIScriptPtr += 5; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); +} + +static void BattleAICmd_get_turn_count(void) +{ + AI_THINKING_STRUCT->funcResult = gBattleResults.battleTurnCounter; + gAIScriptPtr += 1; +} + +static void BattleAICmd_get_type(void) +{ + switch (gAIScriptPtr[1]) + { + case 1: // player primary type + AI_THINKING_STRUCT->funcResult = gBattleMons[sBattler_AI].type1; + break; + case 0: // enemy primary type + AI_THINKING_STRUCT->funcResult = gBattleMons[gBattlerTarget].type1; + break; + case 3: // player secondary type + AI_THINKING_STRUCT->funcResult = gBattleMons[sBattler_AI].type2; + break; + case 2: // enemy secondary type + AI_THINKING_STRUCT->funcResult = gBattleMons[gBattlerTarget].type2; + break; + case 4: // type of move being pointed to + AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].type; + break; + } + gAIScriptPtr += 2; +} + +static void BattleAICmd_get_move_power(void) +{ + AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power; + gAIScriptPtr += 1; +} + +// still a nonmatching +#ifdef NONMATCHING +void BattleAICmd_is_most_powerful_move(void) +{ + int i, j; + s32 damages[MAX_MON_MOVES]; + + for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++) + if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == sDiscouragedPowerfulMoveEffects[i]) + break; + + if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power > 1 + && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF) + { + gDynamicBasePower = 0; + eDynamicMoveType = 0; + eDmgMultiplier = 1; + gMoveResultFlags = 0; + gCritMultiplier = 1; + + for (i = 0; i < MAX_MON_MOVES; i++) + { + for (j = 0; sDiscouragedPowerfulMoveEffects[j] != 0xFFFF; j++) + { // _08108276 + if (gBattleMoves[gBattleMons[gBankAttacker].moves[i]].effect == sDiscouragedPowerfulMoveEffects[j]) + break; + } + + // _081082BA + if (gBattleMons[gBankAttacker].moves[i] + && sDiscouragedPowerfulMoveEffects[j] == 0xFFFF + && gBattleMoves[gBattleMons[gBankAttacker].moves[i]].power > 1) + { + gCurrentMove = gBattleMons[gBankAttacker].moves[i]; + AI_CalcDmg(gBankAttacker, gBankTarget); + TypeCalc(gCurrentMove, gBankAttacker, gBankTarget); + damages[i] = (gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[i]) / 100; + + if (damages[i] == 0) // moves always do at least 1 damage. + damages[i] = 1; + } + else + { + damages[i] = 0; + } + } + + for (i = 0; i < MAX_MON_MOVES; i++) + if (damages[i] > damages[AI_THINKING_STRUCT->movesetIndex]) + break; + + if (i == MAX_MON_MOVES) + AI_THINKING_STRUCT->funcResult = 2; + else + AI_THINKING_STRUCT->funcResult = 1; + } + else + { + AI_THINKING_STRUCT->funcResult = 0; + } + + gAIScriptPtr += 1; +} +#else +NAKED +void BattleAICmd_is_most_powerful_move(void) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x14\n\ + movs r3, 0\n\ + ldr r0, _080C80A4 @ =gUnknown_83F571C\n\ + ldrh r1, [r0]\n\ + ldr r5, _080C80A8 @ =0x0000ffff\n\ + ldr r6, _080C80AC @ =gBattleMoves\n\ + ldr r2, _080C80B0 @ =gBattleResources\n\ + cmp r1, r5\n\ + beq _080C7FA2\n\ + ldr r0, [r2]\n\ + ldr r0, [r0, 0x14]\n\ + ldrh r1, [r0, 0x2]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + adds r0, r6\n\ + ldrb r4, [r0]\n\ + ldr r1, _080C80A4 @ =gUnknown_83F571C\n\ +_080C7F92:\n\ + ldrh r0, [r1]\n\ + cmp r4, r0\n\ + beq _080C7FA2\n\ + adds r1, 0x2\n\ + adds r3, 0x1\n\ + ldrh r0, [r1]\n\ + cmp r0, r5\n\ + bne _080C7F92\n\ +_080C7FA2:\n\ + ldr r0, [r2]\n\ + ldr r0, [r0, 0x14]\n\ + ldrh r1, [r0, 0x2]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + adds r0, r6\n\ + ldrb r0, [r0, 0x1]\n\ + cmp r0, 0x1\n\ + bhi _080C7FB8\n\ + b _080C8142\n\ +_080C7FB8:\n\ + lsls r0, r3, 1\n\ + ldr r1, _080C80A4 @ =gUnknown_83F571C\n\ + adds r0, r1\n\ + ldrh r3, [r0]\n\ + ldr r0, _080C80A8 @ =0x0000ffff\n\ + cmp r3, r0\n\ + beq _080C7FC8\n\ + b _080C8142\n\ +_080C7FC8:\n\ + ldr r0, _080C80B4 @ =gDynamicBasePower\n\ + movs r1, 0\n\ + strh r1, [r0]\n\ + ldr r0, _080C80B8 @ =gBattleStruct\n\ + ldr r0, [r0]\n\ + strb r1, [r0, 0x13]\n\ + ldr r0, _080C80BC @ =gBattleScripting\n\ + movs r2, 0x1\n\ + strb r2, [r0, 0xE]\n\ + ldr r0, _080C80C0 @ =gMoveResultFlags\n\ + strb r1, [r0]\n\ + ldr r0, _080C80C4 @ =gCritMultiplier\n\ + strb r2, [r0]\n\ + movs r6, 0\n\ + mov r9, r3\n\ + ldr r2, _080C80A4 @ =gUnknown_83F571C\n\ + ldrh r2, [r2]\n\ + str r2, [sp, 0x10]\n\ +_080C7FEC:\n\ + movs r3, 0\n\ + ldr r5, _080C80C8 @ =gBattleMons\n\ + lsls r4, r6, 1\n\ + ldr r7, _080C80CC @ =sBattler_AI\n\ + lsls r0, r6, 2\n\ + mov r8, r0\n\ + adds r1, r6, 0x1\n\ + mov r10, r1\n\ + ldr r2, [sp, 0x10]\n\ + cmp r2, r9\n\ + beq _080C8030\n\ + ldr r2, _080C80AC @ =gBattleMoves\n\ + ldrb r1, [r7]\n\ + movs r0, 0x58\n\ + muls r0, r1\n\ + adds r0, r4, r0\n\ + adds r1, r5, 0\n\ + adds r1, 0xC\n\ + adds r0, r1\n\ + ldrh r1, [r0]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + adds r0, r2\n\ + ldrb r2, [r0]\n\ + ldr r1, _080C80A4 @ =gUnknown_83F571C\n\ +_080C8020:\n\ + ldrh r0, [r1]\n\ + cmp r2, r0\n\ + beq _080C8030\n\ + adds r1, 0x2\n\ + adds r3, 0x1\n\ + ldrh r0, [r1]\n\ + cmp r0, r9\n\ + bne _080C8020\n\ +_080C8030:\n\ + ldrb r1, [r7]\n\ + movs r0, 0x58\n\ + muls r0, r1\n\ + adds r0, r4, r0\n\ + adds r1, r5, 0\n\ + adds r1, 0xC\n\ + adds r1, r0, r1\n\ + ldrh r0, [r1]\n\ + cmp r0, 0\n\ + beq _080C80DC\n\ + lsls r0, r3, 1\n\ + ldr r2, _080C80A4 @ =gUnknown_83F571C\n\ + adds r0, r2\n\ + ldrh r0, [r0]\n\ + cmp r0, r9\n\ + bne _080C80DC\n\ + ldr r0, _080C80AC @ =gBattleMoves\n\ + ldrh r2, [r1]\n\ + lsls r1, r2, 1\n\ + adds r1, r2\n\ + lsls r1, 2\n\ + adds r1, r0\n\ + ldrb r0, [r1, 0x1]\n\ + cmp r0, 0x1\n\ + bls _080C80DC\n\ + ldr r5, _080C80D0 @ =gCurrentMove\n\ + strh r2, [r5]\n\ + ldrb r0, [r7]\n\ + ldr r4, _080C80D4 @ =gBattlerTarget\n\ + ldrb r1, [r4]\n\ + bl AI_CalcDmg\n\ + ldrh r0, [r5]\n\ + ldrb r1, [r7]\n\ + ldrb r2, [r4]\n\ + bl TypeCalc\n\ + mov r4, sp\n\ + add r4, r8\n\ + ldr r2, _080C80D8 @ =gBattleMoveDamage\n\ + ldr r0, _080C80B0 @ =gBattleResources\n\ + ldr r0, [r0]\n\ + ldr r0, [r0, 0x14]\n\ + adds r0, 0x18\n\ + adds r0, r6\n\ + ldrb r1, [r0]\n\ + ldr r0, [r2]\n\ + muls r0, r1\n\ + movs r1, 0x64\n\ + bl __divsi3\n\ + str r0, [r4]\n\ + cmp r0, 0\n\ + bne _080C80E4\n\ + movs r0, 0x1\n\ + str r0, [r4]\n\ + b _080C80E4\n\ + .align 2, 0\n\ +_080C80A4: .4byte gUnknown_83F571C\n\ +_080C80A8: .4byte 0x0000ffff\n\ +_080C80AC: .4byte gBattleMoves\n\ +_080C80B0: .4byte gBattleResources\n\ +_080C80B4: .4byte gDynamicBasePower\n\ +_080C80B8: .4byte gBattleStruct\n\ +_080C80BC: .4byte gBattleScripting\n\ +_080C80C0: .4byte gMoveResultFlags\n\ +_080C80C4: .4byte gCritMultiplier\n\ +_080C80C8: .4byte gBattleMons\n\ +_080C80CC: .4byte sBattler_AI\n\ +_080C80D0: .4byte gCurrentMove\n\ +_080C80D4: .4byte gBattlerTarget\n\ +_080C80D8: .4byte gBattleMoveDamage\n\ +_080C80DC:\n\ + mov r1, sp\n\ + add r1, r8\n\ + movs r0, 0\n\ + str r0, [r1]\n\ +_080C80E4:\n\ + mov r6, r10\n\ + cmp r6, 0x3\n\ + bgt _080C80EC\n\ + b _080C7FEC\n\ +_080C80EC:\n\ + movs r6, 0\n\ + ldr r2, _080C8130 @ =gBattleResources\n\ + ldr r0, [r2]\n\ + ldr r0, [r0, 0x14]\n\ + ldrb r0, [r0, 0x1]\n\ + lsls r0, 2\n\ + add r0, sp\n\ + ldr r1, [sp]\n\ + ldr r0, [r0]\n\ + ldr r5, _080C8134 @ =gAIScriptPtr\n\ + cmp r1, r0\n\ + bgt _080C8122\n\ + adds r4, r2, 0\n\ + mov r3, sp\n\ +_080C8108:\n\ + adds r3, 0x4\n\ + adds r6, 0x1\n\ + cmp r6, 0x3\n\ + bgt _080C8122\n\ + ldr r0, [r4]\n\ + ldr r0, [r0, 0x14]\n\ + ldrb r0, [r0, 0x1]\n\ + lsls r0, 2\n\ + add r0, sp\n\ + ldr r1, [r3]\n\ + ldr r0, [r0]\n\ + cmp r1, r0\n\ + ble _080C8108\n\ +_080C8122:\n\ + cmp r6, 0x4\n\ + bne _080C8138\n\ + ldr r0, [r2]\n\ + ldr r1, [r0, 0x14]\n\ + movs r0, 0x2\n\ + str r0, [r1, 0x8]\n\ + b _080C814C\n\ + .align 2, 0\n\ +_080C8130: .4byte gBattleResources\n\ +_080C8134: .4byte gAIScriptPtr\n\ +_080C8138:\n\ + ldr r0, [r2]\n\ + ldr r1, [r0, 0x14]\n\ + movs r0, 0x1\n\ + str r0, [r1, 0x8]\n\ + b _080C814C\n\ +_080C8142:\n\ + ldr r0, [r2]\n\ + ldr r1, [r0, 0x14]\n\ + movs r0, 0\n\ + str r0, [r1, 0x8]\n\ + ldr r5, _080C8164 @ =gAIScriptPtr\n\ +_080C814C:\n\ + ldr r0, [r5]\n\ + adds r0, 0x1\n\ + str r0, [r5]\n\ + add sp, 0x14\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080C8164: .4byte gAIScriptPtr\n\ + .syntax divided\n"); +} +#endif + +static void BattleAICmd_get_move(void) +{ + if (gAIScriptPtr[1] == USER) + AI_THINKING_STRUCT->funcResult = gLastUsedMove[sBattler_AI]; + else + AI_THINKING_STRUCT->funcResult = gLastUsedMove[gBattlerTarget]; + + gAIScriptPtr += 2; +} + +static void BattleAICmd_if_arg_equal(void) +{ + if (gAIScriptPtr[1] == AI_THINKING_STRUCT->funcResult) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_arg_not_equal(void) +{ + if (gAIScriptPtr[1] != AI_THINKING_STRUCT->funcResult) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_would_go_first(void) +{ + if (GetWhoStrikesFirst(sBattler_AI, gBattlerTarget, TRUE) == gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_would_not_go_first(void) +{ + if (GetWhoStrikesFirst(sBattler_AI, gBattlerTarget, TRUE) != gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_nullsub_2A(void) +{ +} + +static void BattleAICmd_nullsub_2B(void) +{ +} + +static void BattleAICmd_count_alive_pokemon(void) +{ + struct Pokemon *party; + int i; + u8 index; + u8 var, var2; + + AI_THINKING_STRUCT->funcResult = 0; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + if (GetBankSide(index) == 0) + party = gPlayerParty; + else + party = gEnemyParty; + + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + { + u32 status; + var = gBattlerPartyIndexes[index]; + status = GetBankIdentity(index) ^ 2; + var2 = gBattlerPartyIndexes[GetBankByIdentity(status)]; + } + else + { + var = gBattlerPartyIndexes[index]; + var2 = gBattlerPartyIndexes[index]; + } + + for (i = 0; i < 6; i++) + { + if (i != var && i != var2 + && GetMonData(&party[i], MON_DATA_HP) != 0 + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_NONE + && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) + { + AI_THINKING_STRUCT->funcResult++; + } + } + + gAIScriptPtr += 2; +} + +static void BattleAICmd_get_considered_move(void) +{ + AI_THINKING_STRUCT->funcResult = AI_THINKING_STRUCT->moveConsidered; + gAIScriptPtr += 1; +} + +static void BattleAICmd_get_considered_move_effect(void) +{ + AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect; + gAIScriptPtr += 1; +} + +static void BattleAICmd_get_ability(void) +{ + u8 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + if (GetBankSide(index) == TARGET) + { + u16 side = GetBankIdentity(index) & 1; + + if (BATTLE_HISTORY->abilities[side] != 0) + { + AI_THINKING_STRUCT->funcResult = BATTLE_HISTORY->abilities[side]; + gAIScriptPtr += 2; + return; + } + + // abilities that prevent fleeing. + if (gBattleMons[index].ability == ABILITY_SHADOW_TAG + || gBattleMons[index].ability == ABILITY_MAGNET_PULL + || gBattleMons[index].ability == ABILITY_ARENA_TRAP) + { + AI_THINKING_STRUCT->funcResult = gBattleMons[index].ability; + gAIScriptPtr += 2; + return; + } + + if (gBaseStats[gBattleMons[index].species].ability1 != ABILITY_NONE) + { + if (gBaseStats[gBattleMons[index].species].ability2 != ABILITY_NONE) + { + // AI has no knowledge of opponent, so it guesses which ability. + if (Random() % 2) + { + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[index].species].ability1; + } + else + { + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[index].species].ability2; + } + } + else + { + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[index].species].ability1; // it's definitely ability 1. + } + } + else + { + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[index].species].ability2; // AI cant actually reach this part since every mon has at least 1 ability. + } + } + else + { + // The AI knows its own ability. + AI_THINKING_STRUCT->funcResult = gBattleMons[index].ability; + } + gAIScriptPtr += 2; +} + +static void BattleAICmd_get_highest_type_effectiveness(void) +{ + s32 i; + u8 *dynamicMoveType; + + gDynamicBasePower = 0; + dynamicMoveType = &gBattleStruct->dynamicMoveType; + *dynamicMoveType = 0; + gBattleScripting.dmgMultiplier = 1; + gMoveResultFlags = 0; + gCritMultiplier = 1; + AI_THINKING_STRUCT->funcResult = 0; + + for (i = 0; i < 4; i++) + { + gBattleMoveDamage = 40; + gCurrentMove = gBattleMons[sBattler_AI].moves[i]; + + if (gCurrentMove != 0) + { + TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget); + + if (gBattleMoveDamage == 120) // Super effective STAB. + gBattleMoveDamage = AI_EFFECTIVENESS_x2; + if (gBattleMoveDamage == 240) + gBattleMoveDamage = AI_EFFECTIVENESS_x4; + if (gBattleMoveDamage == 30) // Not very effective STAB. + gBattleMoveDamage = AI_EFFECTIVENESS_x0_5; + if (gBattleMoveDamage == 15) + gBattleMoveDamage = AI_EFFECTIVENESS_x0_25; + + if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) + gBattleMoveDamage = AI_EFFECTIVENESS_x0; + + if (AI_THINKING_STRUCT->funcResult < gBattleMoveDamage) + AI_THINKING_STRUCT->funcResult = gBattleMoveDamage; + } + } + + gAIScriptPtr += 1; +} + +static void BattleAICmd_if_type_effectiveness(void) +{ + u8 damageVar; + + gDynamicBasePower = 0; + gBattleStruct->dynamicMoveType = 0; + gBattleScripting.dmgMultiplier = 1; + gMoveResultFlags = 0; + gCritMultiplier = 1; + + gBattleMoveDamage = AI_EFFECTIVENESS_x1; + gCurrentMove = AI_THINKING_STRUCT->moveConsidered; + + TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget); + + if (gBattleMoveDamage == 120) // Super effective STAB. + gBattleMoveDamage = AI_EFFECTIVENESS_x2; + if (gBattleMoveDamage == 240) + gBattleMoveDamage = AI_EFFECTIVENESS_x4; + if (gBattleMoveDamage == 30) // Not very effective STAB. + gBattleMoveDamage = AI_EFFECTIVENESS_x0_5; + if (gBattleMoveDamage == 15) + gBattleMoveDamage = AI_EFFECTIVENESS_x0_25; + + if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) + gBattleMoveDamage = AI_EFFECTIVENESS_x0; + + // Store gBattleMoveDamage in a u8 variable because gAIScriptPtr[1] is a u8. + damageVar = gBattleMoveDamage; + + if (damageVar == gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_nullsub_32(void) +{ +} + +static void BattleAICmd_nullsub_33(void) +{ +} + +static void BattleAICmd_if_status_in_party(void) +{ + struct Pokemon *party; + struct Pokemon *partyPtr; + int i; + u32 statusToCompareTo; + + // for whatever reason, game freak put the party pointer into 2 variables instead of 1. it's possible at some point the switch encompassed the whole function and used each respective variable creating largely duplicate code. + switch (gAIScriptPtr[1]) + { + case 1: + party = partyPtr = gEnemyParty; + break; + default: + party = partyPtr = gPlayerParty; + break; + } + + statusToCompareTo = T1_READ_32(gAIScriptPtr + 2); + + for (i = 0; i < 6; i++) + { + u16 species = GetMonData(&party[i], MON_DATA_SPECIES); + u16 hp = GetMonData(&party[i], MON_DATA_HP); + u32 status = GetMonData(&party[i], MON_DATA_STATUS); + + if (species != SPECIES_NONE && species != SPECIES_EGG && hp != 0 && status == statusToCompareTo) + { + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); // WHAT. why is this being merged into the above switch + return; + } + } + + gAIScriptPtr += 10; +} + +// bugged, doesnt return properly. also unused +static void BattleAICmd_if_status_not_in_party(void) +{ + struct Pokemon *party; + struct Pokemon *partyPtr; + int i; + u32 statusToCompareTo; + + switch (gAIScriptPtr[1]) + { + case 1: + party = partyPtr = gEnemyParty; + break; + default: + party = partyPtr = gPlayerParty; + break; + } + + statusToCompareTo = T1_READ_32(gAIScriptPtr + 2); + + for (i = 0; i < 6; i++) + { + u16 species = GetMonData(&party[i], MON_DATA_SPECIES); + u16 hp = GetMonData(&party[i], MON_DATA_HP); + u32 status = GetMonData(&party[i], MON_DATA_STATUS); + + // everytime the status is found, the AI's logic jumps further and further past its intended destination. this results in a broken AI macro and is probably why it is unused. + if (species != SPECIES_NONE && species != SPECIES_EGG && hp != 0 && status == statusToCompareTo) + gAIScriptPtr += 10; // doesnt return? + } + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); +} + +enum +{ + WEATHER_TYPE_SUN, + WEATHER_TYPE_RAIN, + WEATHER_TYPE_SANDSTORM, + WEATHER_TYPE_HAIL, +}; + +extern u16 gBattleWeather; + +static void BattleAICmd_get_weather(void) +{ + if (gBattleWeather & WEATHER_RAIN_ANY) + AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_RAIN; + if (gBattleWeather & WEATHER_SANDSTORM_ANY) + AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SANDSTORM; + if (gBattleWeather & WEATHER_SUN_ANY) + AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SUN; + if (gBattleWeather & WEATHER_HAIL) + AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_HAIL; + + gAIScriptPtr += 1; +} + +static void BattleAICmd_if_effect(void) +{ + if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_not_effect(void) +{ + if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect != gAIScriptPtr[1]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +static void BattleAICmd_if_stat_level_less_than(void) +{ + u32 party; + + if (gAIScriptPtr[1] == USER) + party = sBattler_AI; + else + party = gBattlerTarget; + + if (gBattleMons[party].statStages[gAIScriptPtr[2]] < gAIScriptPtr[3]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + else + gAIScriptPtr += 8; +} + +static void BattleAICmd_if_stat_level_more_than(void) +{ + u32 party; + + if (gAIScriptPtr[1] == USER) + party = sBattler_AI; + else + party = gBattlerTarget; + + if (gBattleMons[party].statStages[gAIScriptPtr[2]] > gAIScriptPtr[3]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + else + gAIScriptPtr += 8; +} + +static void BattleAICmd_if_stat_level_equal(void) +{ + u32 party; + + if (gAIScriptPtr[1] == USER) + party = sBattler_AI; + else + party = gBattlerTarget; + + if (gBattleMons[party].statStages[gAIScriptPtr[2]] == gAIScriptPtr[3]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + else + gAIScriptPtr += 8; +} + +static void BattleAICmd_if_stat_level_not_equal(void) +{ + u32 party; + + if (gAIScriptPtr[1] == USER) + party = sBattler_AI; + else + party = gBattlerTarget; + + if (gBattleMons[party].statStages[gAIScriptPtr[2]] != gAIScriptPtr[3]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + else + gAIScriptPtr += 8; +} + +static void BattleAICmd_if_can_faint(void) +{ + if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power < 2) + { + gAIScriptPtr += 5; + return; + } + + gDynamicBasePower = 0; + gBattleStruct->dynamicMoveType = 0; + gBattleScripting.dmgMultiplier = 1; + gMoveResultFlags = 0; + gCritMultiplier = 1; + gCurrentMove = AI_THINKING_STRUCT->moveConsidered; + AI_CalcDmg(sBattler_AI, gBattlerTarget); + TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget); + + gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100; + + // Moves always do at least 1 damage. + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + + if (gBattleMons[gBattlerTarget].hp <= gBattleMoveDamage) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +static void BattleAICmd_if_cant_faint(void) +{ + if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power < 2) + { + gAIScriptPtr += 5; + return; + } + + gDynamicBasePower = 0; + gBattleStruct->dynamicMoveType = 0; + gBattleScripting.dmgMultiplier = 1; + gMoveResultFlags = 0; + gCritMultiplier = 1; + gCurrentMove = AI_THINKING_STRUCT->moveConsidered; + AI_CalcDmg(sBattler_AI, gBattlerTarget); + TypeCalc(gCurrentMove, sBattler_AI, gBattlerTarget); + + gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->simulatedRNG[AI_THINKING_STRUCT->movesetIndex] / 100; + + // This macro is missing the damage 0 = 1 assumption. + + if (gBattleMons[gBattlerTarget].hp > gBattleMoveDamage) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +static void BattleAICmd_if_has_move(void) +{ + int i; + u16 *temp_ptr = (u16 *)(gAIScriptPtr + 2); + + switch (gAIScriptPtr[1]) + { + case 1: + case 3: + for (i = 0; i < MAX_MON_MOVES; i++) + { + if (gBattleMons[sBattler_AI].moves[i] == *temp_ptr) + break; + } + if (i == MAX_MON_MOVES) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + case 0: + case 2: + for (i = 0; i < 8; i++) + { + if (BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] == *temp_ptr) + break; + } + if (i == 8) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + } +} + +static void BattleAICmd_if_dont_have_move(void) +{ + int i; + u16 *temp_ptr = (u16 *)(gAIScriptPtr + 2); + + switch (gAIScriptPtr[1]) + { + case 1: + case 3: + for (i = 0; i < MAX_MON_MOVES; i++) + { + if (gBattleMons[sBattler_AI].moves[i] == *temp_ptr) + break; + } + if (i != MAX_MON_MOVES) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + case 0: + case 2: + for (i = 0; i < 8; i++) + { + if (BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] == *temp_ptr) + break; + } + if (i != 8) + gAIScriptPtr += 8; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + break; + } +} + +static void BattleAICmd_if_move_effect(void) +{ + int i; + + switch (gAIScriptPtr[1]) + { + case 1: + case 3: + for (i = 0; i < MAX_MON_MOVES; i++) + { + if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].effect == gAIScriptPtr[2]) + break; + } + if (i != MAX_MON_MOVES) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; + break; + case 0: + case 2: + for (i = 0; i < 8; i++) + { + if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i]].effect == gAIScriptPtr[2]) + break; + } + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + } +} + +static void BattleAICmd_if_not_move_effect(void) +{ + int i; + + switch (gAIScriptPtr[1]) + { + case 1: + case 3: + for (i = 0; i < MAX_MON_MOVES; i++) + { + if (gBattleMons[sBattler_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBattler_AI].moves[i]].effect == gAIScriptPtr[2]) + break; + } + if (i != MAX_MON_MOVES) + gAIScriptPtr += 7; + else + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + break; + case 0: + case 2: + for (i = 0; i < 8; i++) + { + if (BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i]].effect == gAIScriptPtr[2]) + break; + } + gAIScriptPtr += 7; + } +} + +static void BattleAICmd_if_last_move_did_damage(void) +{ + u8 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + if (gAIScriptPtr[2] == 0) + { + if (gDisableStructs[index].disabledMove == 0) + { + gAIScriptPtr += 7; + return; + } + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + return; + } + else if (gAIScriptPtr[2] != 1) // ignore the macro if its not 0 or 1. + { + gAIScriptPtr += 7; + return; + } + else if (gDisableStructs[index].encoredMove != 0) + { + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + return; + } + gAIScriptPtr += 7; +} + +static void BattleAICmd_if_encored(void) +{ + switch (gAIScriptPtr[1]) + { + case 0: // _08109348 + if (gDisableStructs[gActiveBattler].disabledMove == AI_THINKING_STRUCT->moveConsidered) + { + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + return; + } + gAIScriptPtr += 6; + return; + case 1: // _08109370 + if (gDisableStructs[gActiveBattler].encoredMove == AI_THINKING_STRUCT->moveConsidered) + { + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + return; + } + gAIScriptPtr += 6; + return; + default: + gAIScriptPtr += 6; + return; + } +} + +static void BattleAICmd_flee(void) +{ + AI_THINKING_STRUCT->aiAction |= (AI_ACTION_DONE | AI_ACTION_FLEE | AI_ACTION_DO_NOT_ATTACK); // what matters is AI_ACTION_FLEE being enabled. +} + +// FRLG safari command +static void BattleAICmd_frlg_safari(void) +{ + u8 var; + + if(gBattleStruct->safariGoNearCounter) + { + var = gBattleStruct->safariEscapeFactor * 2; + if(var > 20) + var = 20; + } + else if(gBattleStruct->safariPkblThrowCounter != 0) // _080C91DC + { + var = gBattleStruct->safariEscapeFactor / 4; + if(var == 0) + var = 1; + } + else + var = gBattleStruct->safariEscapeFactor; + var *= 5; + if((u8)(Random() % 100) < var) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +static void BattleAICmd_watch(void) +{ + AI_THINKING_STRUCT->aiAction |= (AI_ACTION_DONE | AI_ACTION_WATCH | AI_ACTION_DO_NOT_ATTACK); // what matters is AI_ACTION_WATCH being enabled. +} + +static void BattleAICmd_get_hold_effect(void) +{ + u8 index; + u16 side; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + if (GetBankSide(index) == 0) + { + side = (GetBankIdentity(index) & 1); + AI_THINKING_STRUCT->funcResult = BATTLE_HISTORY->itemEffects[side]; + } + else + AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(gBattleMons[index].item); + + gAIScriptPtr += 2; +} + +static void BattleAICmd_get_gender(void) +{ + u8 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + AI_THINKING_STRUCT->funcResult = GetGenderFromSpeciesAndPersonality(gBattleMons[index].species, gBattleMons[index].personality); + + gAIScriptPtr += 2; +} + +static void BattleAICmd_is_first_turn(void) +{ + u8 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + AI_THINKING_STRUCT->funcResult = gDisableStructs[index].isFirstTurn; + + gAIScriptPtr += 2; +} + +static void BattleAICmd_get_stockpile_count(void) +{ + u8 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + AI_THINKING_STRUCT->funcResult = gDisableStructs[index].stockpileCounter; + + gAIScriptPtr += 2; +} + +static void BattleAICmd_is_double_battle(void) +{ + AI_THINKING_STRUCT->funcResult = gBattleTypeFlags & BATTLE_TYPE_DOUBLE; + + gAIScriptPtr += 1; +} + +static void BattleAICmd_get_used_held_item(void) +{ + u8 battlerId; + + if (gAIScriptPtr[1] == AI_USER) + battlerId = sBattler_AI; + else + battlerId = gBattlerTarget; + + // This is likely a leftover from Ruby's code and its ugly ewram access. + #ifdef NONMATCHING + AI_THINKING_STRUCT->funcResult = gBattleStruct->usedHeldItems[battlerId]; + #else + AI_THINKING_STRUCT->funcResult = *(u8*)((u8*)(gBattleStruct) + offsetof(struct BattleStruct, usedHeldItems) + (battlerId * 2)); + #endif // NONMATCHING + + gAIScriptPtr += 2; +} + +static void BattleAICmd_get_move_type_from_result(void) +{ + AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].type; + + gAIScriptPtr += 1; +} + +static void BattleAICmd_get_move_power_from_result(void) +{ + AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].power; + + gAIScriptPtr += 1; +} + +static void BattleAICmd_get_move_effect_from_result(void) +{ + AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].effect; + + gAIScriptPtr += 1; +} + +static void BattleAICmd_get_protect_count(void) +{ + u8 index; + + if (gAIScriptPtr[1] == USER) + index = sBattler_AI; + else + index = gBattlerTarget; + + AI_THINKING_STRUCT->funcResult = gDisableStructs[index].protectUses; + + gAIScriptPtr += 2; +} + +static void BattleAICmd_nullsub_52(void) +{ +} + +static void BattleAICmd_nullsub_53(void) +{ +} + +static void BattleAICmd_nullsub_54(void) +{ +} + +static void BattleAICmd_nullsub_55(void) +{ +} + +static void BattleAICmd_nullsub_56(void) +{ +} + +static void BattleAICmd_nullsub_57(void) +{ +} + +static void BattleAICmd_call(void) +{ + AIStackPushVar(gAIScriptPtr + 5); + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); +} + +static void BattleAICmd_jump(void) +{ + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); +} + +static void BattleAICmd_end(void) +{ + if (AIStackPop() == FALSE) + AI_THINKING_STRUCT->aiAction |= AI_ACTION_DONE; +} + +static void BattleAICmd_if_level_compare(void) +{ + switch (gAIScriptPtr[1]) + { + case 0: // greater than + if (gBattleMons[sBattler_AI].level > gBattleMons[gBattlerTarget].level) + { + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + return; + } + gAIScriptPtr += 6; + return; + case 1: // less than + if (gBattleMons[sBattler_AI].level < gBattleMons[gBattlerTarget].level) + { + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + return; + } + gAIScriptPtr += 6; + return; + case 2: // equal + if (gBattleMons[sBattler_AI].level == gBattleMons[gBattlerTarget].level) + { + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + return; + } + gAIScriptPtr += 6; + return; + } +} + +static void BattleAICmd_if_taunted(void) +{ + if (gDisableStructs[gBattlerTarget].tauntTimer1 != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +static void BattleAICmd_if_not_taunted(void) +{ + if (gDisableStructs[gBattlerTarget].tauntTimer1 == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void AIStackPushVar(const u8 *var) +{ + gBattleResources->AI_ScriptsStack->ptr[gBattleResources->AI_ScriptsStack->size++] = var; +} + +// unused +void AIStackPushVar_cursor(void) +{ + gBattleResources->AI_ScriptsStack->ptr[gBattleResources->AI_ScriptsStack->size++] = gAIScriptPtr; +} + +bool8 AIStackPop(void) +{ + if (gBattleResources->AI_ScriptsStack->size != 0) + { + --gBattleResources->AI_ScriptsStack->size; + gAIScriptPtr = gBattleResources->AI_ScriptsStack->ptr[gBattleResources->AI_ScriptsStack->size]; + return TRUE; + } + else + return FALSE; +} diff --git a/sym_common.txt b/sym_common.txt index f3a44cf03..28c32662a 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -111,7 +111,7 @@ gUnknown_3004F80: @ 3004F80 gUnknown_3004F84: @ 3004F84 .space 0xC -gUnknown_3004F90: @ 3004F90 +gBattleResults: @ 3004F90 .space 0x44 gUnknown_3004FD4: @ 3004FD4 diff --git a/sym_ewram.txt b/sym_ewram.txt index b2c7f2642..deff62526 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -167,7 +167,7 @@ gUnknown_2022AD8: @ 2022AD8 gUnknown_2022AE8: @ 2022AE8 .space 0x64 -gUnknown_2022B4C: @ 2022B4C +gBattleTypeFlags: @ 2022B4C .space 0x4 gUnknown_2022B50: @ 2022B50 @@ -206,7 +206,7 @@ gUnknown_20233C4: @ 20233C4 gUnknown_20233C8: @ 20233C8 .space 0x7FC -gUnknown_2023BC4: @ 2023BC4 +gActiveBattler: @ 2023BC4 .space 0x4 gUnknown_2023BC8: @ 2023BC8 @@ -215,7 +215,7 @@ gUnknown_2023BC8: @ 2023BC8 gUnknown_2023BCC: @ 2023BCC .space 0x2 -gUnknown_2023BCE: @ 2023BCE +gBattlerPartyIndexes: @ 2023BCE .space 0x8 gUnknown_2023BD6: @ 2023BD6 @@ -233,7 +233,7 @@ gUnknown_2023BE2: @ 2023BE2 gUnknown_2023BE3: @ 2023BE3 .space 0x1 -gUnknown_2023BE4: @ 2023BE4 +gBattleMons: @ 2023BE4 .space 0xC gUnknown_2023BF0: @ 2023BF0 @@ -263,7 +263,7 @@ gUnknown_2023D48: @ 2023D48 gUnknown_2023D49: @ 2023D49 .space 0x1 -gUnknown_2023D4A: @ 2023D4A +gCurrentMove: @ 2023D4A .space 0x2 gUnknown_2023D4C: @ 2023D4C @@ -272,7 +272,7 @@ gUnknown_2023D4C: @ 2023D4C gUnknown_2023D4E: @ 2023D4E .space 0x2 -gUnknown_2023D50: @ 2023D50 +gBattleMoveDamage: @ 2023D50 .space 0x4 gUnknown_2023D54: @ 2023D54 @@ -287,10 +287,10 @@ gUnknown_2023D68: @ 2023D68 gUnknown_2023D6A: @ 2023D6A .space 0x1 -gUnknown_2023D6B: @ 2023D6B +sBattler_AI: @ 2023D6B .space 0x1 -gUnknown_2023D6C: @ 2023D6C +gBattlerTarget: @ 2023D6C .space 0x1 gUnknown_2023D6D: @ 2023D6D @@ -302,10 +302,10 @@ gUnknown_2023D6E: @ 2023D6E gUnknown_2023D6F: @ 2023D6F .space 0x1 -gUnknown_2023D70: @ 2023D70 +gAbsentBattlerFlags: @ 2023D70 .space 0x1 -gUnknown_2023D71: @ 2023D71 +gCritMultiplier: @ 2023D71 .space 0x1 gUnknown_2023D72: @ 2023D72 @@ -323,7 +323,7 @@ gUnknown_2023D80: @ 2023D80 gUnknown_2023D90: @ 2023D90 .space 0x8 -gUnknown_2023D98: @ 2023D98 +gLastUsedMove: @ 2023D98 .space 0x8 gUnknown_2023DA0: @ 2023DA0 @@ -344,7 +344,7 @@ gUnknown_2023DC0: @ 2023DC0 gUnknown_2023DC4: @ 2023DC4 .space 0x8 -gUnknown_2023DCC: @ 2023DCC +gMoveResultFlags: @ 2023DCC .space 0x4 gUnknown_2023DD0: @ 2023DD0 @@ -359,16 +359,16 @@ gUnknown_2023DD8: @ 2023DD8 gUnknown_2023DDC: @ 2023DDC .space 0x2 -gUnknown_2023DDE: @ 2023DDE +gSideAffecting: @ 2023DDE .space 0x6 gUnknown_2023DE4: @ 2023DE4 .space 0x18 -gUnknown_2023DFC: @ 2023DFC +gStatuses3: @ 2023DFC .space 0x10 -gUnknown_2023E0C: @ 2023E0C +gDisableStructs: @ 2023E0C .space 0x70 gUnknown_2023E7C: @ 2023E7C @@ -395,7 +395,7 @@ gUnknown_2023E8C: @ 2023E8C gUnknown_2023ECC: @ 2023ECC .space 0x50 -gUnknown_2023F1C: @ 2023F1C +gBattleWeather: @ 2023F1C .space 0x4 gUnknown_2023F20: @ 2023F20 @@ -407,7 +407,7 @@ gUnknown_2023F4C: @ 2023F4C gUnknown_2023F4E: @ 2023F4E .space 0x2 -gUnknown_2023F50: @ 2023F50 +gDynamicBasePower: @ 2023F50 .space 0x2 gUnknown_2023F52: @ 2023F52 @@ -419,13 +419,13 @@ gUnknown_2023F54: @ 2023F54 gUnknown_2023F5C: @ 2023F5C .space 0x68 -gUnknown_2023FC4: @ 2023FC4 +gBattleScripting: @ 2023FC4 .space 0x4 gUnknown_2023FC8: @ 2023FC8 .space 0x20 -gUnknown_2023FE8: @ 2023FE8 +gBattleStruct: @ 2023FE8 .space 0x4 gUnknown_2023FEC: @ 2023FEC @@ -434,7 +434,7 @@ gUnknown_2023FEC: @ 2023FEC gUnknown_2023FF0: @ 2023FF0 .space 0x4 -gUnknown_2023FF4: @ 2023FF4 +gBattleResources: @ 2023FF4 .space 0x4 gUnknown_2023FF8: @ 2023FF8 @@ -479,7 +479,7 @@ gUnknown_2024029: @ 2024029 gUnknown_202402A: @ 202402A .space 0x2 -gUnknown_202402C: @ 202402C +gEnemyParty: @ 202402C .space 0xC8 gUnknown_20240F4: @ 20240F4 @@ -494,7 +494,7 @@ gUnknown_20241BC: @ 20241BC gUnknown_2024220: @ 2024220 .space 0x64 -gUnknown_2024284: @ 2024284 +gPlayerParty: @ 2024284 .space 0x64 gUnknown_20242E8: @ 20242E8 @@ -920,7 +920,7 @@ gUnknown_20386A8: @ 20386A8 gUnknown_20386AC: @ 20386AC .space 0x2 -gUnknown_20386AE: @ 20386AE +gTrainerBattleOpponent_A: @ 20386AE .space 0x2 gUnknown_20386B0: @ 20386B0 @@ -1205,7 +1205,7 @@ gUnknown_20399F0: @ 20399F0 gUnknown_20399FC: @ 20399FC .space 0x4 -gUnknown_2039A00: @ 2039A00 +gAIScriptPtr: @ 2039A00 .space 0x4 gUnknown_2039A04: @ 2039A04 |