diff options
103 files changed, 15767 insertions, 15344 deletions
diff --git a/asm/battle_3.s b/asm/battle_3.s index 4519fe816..b0cc747b5 100644 --- a/asm/battle_3.s +++ b/asm/battle_3.s @@ -8,7 +8,7 @@ thumb_func_start b_movescr_stack_push b_movescr_stack_push: @ 803FAD8 push {r4,lr} - ldr r1, =gUnknown_020244A8 + ldr r1, =gBattleResources ldr r1, [r1] ldr r3, [r1, 0x8] adds r4, r3, 0 @@ -28,7 +28,7 @@ b_movescr_stack_push: @ 803FAD8 thumb_func_start b_movescr_stack_push_cursor b_movescr_stack_push_cursor: @ 803FAFC - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r2, [r0, 0x8] adds r3, r2, 0 @@ -39,7 +39,7 @@ b_movescr_stack_push_cursor: @ 803FAFC lsls r0, 24 lsrs r0, 22 adds r2, r0 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] str r0, [r2] bx lr @@ -48,8 +48,8 @@ b_movescr_stack_push_cursor: @ 803FAFC thumb_func_start b_movescr_stack_pop_cursor b_movescr_stack_pop_cursor: @ 803FB24 - ldr r3, =gUnknown_02024214 - ldr r0, =gUnknown_020244A8 + ldr r3, =gBattlescriptCurrInstr + ldr r0, =gBattleResources ldr r0, [r0] ldr r1, [r0, 0x8] adds r2, r1, 0 @@ -73,8 +73,8 @@ sub_803FB4C: @ 803FB4C push {r7} movs r6, 0 ldr r2, =gBattleMons - ldr r1, =gUnknown_02023864 - ldr r3, =gUnknown_02024064 + ldr r1, =gBattleBufferB + ldr r3, =gActiveBank ldrb r4, [r3] lsls r0, r4, 9 adds r1, 0x2 @@ -87,13 +87,13 @@ sub_803FB4C: @ 803FB4C adds r2, 0xC adds r0, r2 ldrh r5, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct lsls r0, r4, 1 adds r0, 0xC8 ldr r1, [r1] adds r1, r0 mov r8, r1 - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -105,9 +105,9 @@ sub_803FB4C: @ 803FB4C bne _0803FC06 cmp r5, 0 beq _0803FC06 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r4, [r0, 0x17] - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove strh r5, [r0] ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -122,7 +122,7 @@ sub_803FB4C: @ 803FB4C adds r0, r1 ldr r1, =gUnknown_082DAE2A str r1, [r0] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r7] lsls r1, 4 adds r1, r0 @@ -159,7 +159,7 @@ _0803FC06: cmp r0, 0 bge _0803FC90 adds r0, r2, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves ldr r0, =gBattleTypeFlags ldr r0, [r0] movs r1, 0x80 @@ -173,7 +173,7 @@ _0803FC06: adds r0, r1 ldr r1, =gUnknown_082DB098 str r1, [r0] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r7] lsls r1, 4 adds r1, r0 @@ -194,7 +194,7 @@ _0803FC7C: lsls r0, 24 lsrs r6, r0, 24 _0803FC8E: - ldr r3, =gUnknown_020242BC + ldr r3, =gDisableStructs _0803FC90: ldrb r0, [r7] lsls r1, r0, 3 @@ -213,7 +213,7 @@ _0803FC90: ldrb r0, [r1, 0x1] cmp r0, 0 bne _0803FD1A - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove strh r5, [r0] ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -228,7 +228,7 @@ _0803FC90: adds r0, r1 ldr r1, =gUnknown_082DB0AF str r1, [r0] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r7] lsls r1, 4 adds r1, r0 @@ -249,14 +249,14 @@ _0803FD08: lsls r0, 24 lsrs r6, r0, 24 _0803FD1A: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r1, r5, 0 bl sub_8040130 lsls r0, 24 cmp r0, 0 beq _0803FD8E - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove strh r5, [r0] ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -271,7 +271,7 @@ _0803FD1A: adds r0, r1 ldr r1, =gUnknown_082DB185 str r1, [r0] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r4] lsls r1, 4 adds r1, r0 @@ -293,7 +293,7 @@ _0803FD7C: lsrs r6, r0, 24 _0803FD8E: ldr r1, =gBattleMons - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -301,7 +301,7 @@ _0803FD8E: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0803FDC4 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -311,12 +311,12 @@ _0803FD8E: .pool _0803FDC4: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 _0803FDCE: ldr r2, =gUnknown_0202420F - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r0, [r1] strb r0, [r2] ldr r0, =gBattleMons @@ -334,7 +334,7 @@ _0803FDCE: beq _0803FE58 cmp r2, r5 beq _0803FE58 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove strh r1, [r0] ldr r2, =gUnknown_02024208 ldrb r1, [r7] @@ -351,7 +351,7 @@ _0803FDCE: ldrb r2, [r7] cmp r1, 0 beq _0803FE48 - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x2] @@ -370,7 +370,7 @@ _0803FE48: lsls r0, 24 lsrs r6, r0, 24 _0803FE58: - ldr r0, =gUnknown_02023864 + ldr r0, =gBattleBufferB ldrb r3, [r7] lsls r1, r3, 9 adds r0, 0x2 @@ -392,7 +392,7 @@ _0803FE58: ands r0, r1 cmp r0, 0 beq _0803FEA8 - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1, 0x2] @@ -434,7 +434,7 @@ sub_803FECC: @ 803FECC lsrs r4, r1, 24 lsls r2, 24 lsrs r3, r2, 24 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct lsls r0, r7, 1 adds r0, 0xC8 ldr r1, [r1] @@ -447,7 +447,7 @@ sub_803FECC: @ 803FECC ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0803FF1C - ldr r2, =gUnknown_02024404 + ldr r2, =gEnigmaBerries lsls r1, r7, 3 subs r0, r1, r7 lsls r0, 2 @@ -459,7 +459,7 @@ sub_803FECC: @ 803FECC _0803FF1C: ldrh r0, [r1, 0x2E] str r3, [sp, 0x14] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 str r0, [sp] @@ -472,7 +472,7 @@ _0803FF2E: mov r9, r0 lsls r2, r7, 1 str r2, [sp, 0xC] - ldr r5, =gUnknown_020242BC + ldr r5, =gDisableStructs mov r12, r5 ldr r0, =gBattleMons movs r2, 0x58 @@ -567,7 +567,7 @@ _0803FFAC: lsls r0, r4, 24 lsrs r4, r0, 24 _0803FFEE: - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs add r0, r8 ldrb r0, [r0, 0x13] lsls r0, 28 @@ -608,7 +608,7 @@ _0804001C: lsls r0, r4, 24 lsrs r4, r0, 24 _0804003E: - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs mov r0, r8 adds r2, r0, r1 ldrb r0, [r2, 0xE] @@ -670,7 +670,7 @@ _08040096: thumb_func_start sub_80400C8 sub_80400C8: @ 80400C8 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] movs r1, 0 movs r2, 0xFF @@ -679,7 +679,7 @@ sub_80400C8: @ 80400C8 lsrs r3, r0, 24 cmp r3, 0xF bne _0804010C - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r4] lsls r1, 4 adds r1, r0 @@ -696,7 +696,7 @@ sub_80400C8: @ 80400C8 b _0804011E .pool _0804010C: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r4] lsls r1, 4 adds r1, r0 @@ -728,12 +728,12 @@ sub_8040130: @ 8040130 lsls r1, 16 lsrs r5, r1, 16 movs r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 mov r9, r0 movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bge _080401B4 @@ -742,13 +742,13 @@ sub_8040130: @ 8040130 _0804015A: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 adds r3, r4, 0x1 cmp r9, r0 beq _080401AA - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -783,7 +783,7 @@ _080401A0: lsrs r6, r0, 24 _080401AA: adds r4, r3, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0804015A @@ -807,19 +807,19 @@ sub_80401D0: @ 80401D0 push {r5-r7} movs r0, 0 mov r9, r0 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker mov r2, r9 strb r2, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r4, [r0] adds r6, r1, 0 mov r10, r0 - ldr r7, =gEnemyMonIndex - ldr r3, =gUnknown_0202449C + ldr r7, =gBankTarget + ldr r3, =gBattleStruct mov r12, r3 cmp r9, r4 bcs _08040224 - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldrb r1, [r2] ldr r5, =gBitTable ldr r0, [r5] @@ -850,7 +850,7 @@ _08040224: ldrb r4, [r0] cmp r4, 0 beq _0804025E - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldrb r1, [r2] ldr r5, =gBitTable ldr r0, [r5] @@ -903,12 +903,12 @@ _08040290: .4byte _080408EC _080402BC: movs r5, 0 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks mov r10, r1 ldrb r2, [r1] cmp r5, r2 bge _080402D6 - ldr r2, =gUnknown_0202407E + ldr r2, =gTurnOrder _080402CA: adds r0, r5, r2 strb r5, [r0] @@ -926,8 +926,8 @@ _080402E4: ldrb r1, [r1] cmp r6, r1 bge _08040322 - ldr r7, =gUnknown_0202407E - ldr r0, =gUnknown_0202406C + ldr r7, =gTurnOrder + ldr r0, =gNoOfAllBanks mov r10, r0 lsls r1, r5, 24 mov r8, r1 @@ -948,7 +948,7 @@ _080402F8: bl sub_803CEDC _08040318: adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _080402F8 @@ -960,7 +960,7 @@ _08040324: subs r0, 0x1 cmp r5, r0 blt _080402E4 - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] ldrb r0, [r1, 0x3] adds r0, 0x1 @@ -979,16 +979,16 @@ _08040342: bls _08040350 b _0804062C _08040350: - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank mov r8, r3 movs r7, 0 - ldr r6, =gUnknown_0202420B - ldr r5, =gUnknown_02022F58 + ldr r6, =gBankAttacker + ldr r5, =gBattleTextBuff1 _0804035A: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] - ldr r2, =gUnknown_02024294 + ldr r2, =gSideTimers lsls r1, r4, 1 adds r0, r1, r4 lsls r0, 2 @@ -1034,7 +1034,7 @@ _0804035A: lsrs r0, 24 mov r9, r0 _080403BC: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -1067,20 +1067,20 @@ _08040416: mov r10, r0 movs r2, 0 mov r8, r2 - ldr r7, =gUnknown_0202420B - ldr r5, =gUnknown_02022F58 + ldr r7, =gBankAttacker + ldr r5, =gBattleTextBuff1 _08040422: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] - ldr r2, =gUnknown_02024294 + ldr r2, =gSideTimers lsls r1, r4, 1 adds r0, r1, r4 lsls r0, 2 adds r2, r0, r2 ldrb r0, [r2, 0x3] strb r0, [r7] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank strb r0, [r3] ldr r0, =gUnknown_0202428E adds r3, r1, r0 @@ -1103,7 +1103,7 @@ _08040422: strh r0, [r3] ldr r0, =gUnknown_082DACFA bl b_call_bc_move_exec - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] movs r0, 0xFD strb r0, [r5] @@ -1122,7 +1122,7 @@ _08040422: lsrs r0, 24 mov r9, r0 _0804048A: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -1149,17 +1149,17 @@ _080404D4: ldrb r0, [r0] cmp r0, 0x1 bhi _08040570 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank mov r10, r0 movs r2, 0 mov r8, r2 - ldr r7, =gUnknown_0202420B - ldr r5, =gUnknown_02022F58 + ldr r7, =gBankAttacker + ldr r5, =gBattleTextBuff1 _080404EC: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers lsls r3, r4, 1 adds r0, r3, r4 lsls r0, 2 @@ -1186,7 +1186,7 @@ _080404EC: strh r0, [r2] ldr r0, =gUnknown_082DACFA bl b_call_bc_move_exec - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] movs r0, 0xFD strb r0, [r5] @@ -1205,7 +1205,7 @@ _080404EC: lsrs r0, 24 mov r9, r0 _0804054E: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -1246,13 +1246,13 @@ _080405B0: ldrb r0, [r0] cmp r0, 0x1 bhi _0804062C - ldr r6, =gUnknown_02024064 - ldr r5, =gUnknown_0202420B + ldr r6, =gActiveBank + ldr r5, =gBankAttacker _080405C0: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] - ldr r2, =gUnknown_02024294 + ldr r2, =gSideTimers lsls r1, r4, 1 adds r0, r1, r4 lsls r0, 2 @@ -1286,7 +1286,7 @@ _080405C0: lsrs r0, 24 mov r9, r0 _0804060A: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -1326,13 +1326,13 @@ _08040668: mov r2, r12 ldr r0, [r2] adds r0, 0xDB - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 bcs _080406E8 - ldr r4, =gUnknown_02024064 - ldr r5, =gUnknown_0202407E + ldr r4, =gActiveBank + ldr r5, =gTurnOrder _0804067C: ldr r0, [r2] adds r0, 0xDB @@ -1360,7 +1360,7 @@ _0804067C: ldrh r0, [r0, 0x28] cmp r0, 0 beq _080406C4 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget strb r2, [r0] ldr r0, =gUnknown_082DB0B7 bl b_call_bc_move_exec @@ -1370,7 +1370,7 @@ _0804067C: lsrs r0, 24 mov r9, r0 _080406C4: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -1384,7 +1384,7 @@ _080406C4: _080406DA: ldr r0, [r2] adds r0, 0xDB - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -1428,7 +1428,7 @@ _0804072A: ldr r1, =0x0000fffd ands r0, r1 strh r0, [r3] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08040794 @@ -1449,13 +1449,13 @@ _08040776: cmp r1, 0 beq _08040790 _08040782: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08040794 .pool _08040790: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r1, [r0, 0x5] _08040794: ldr r0, =gUnknown_082DAC2C @@ -1485,21 +1485,21 @@ _080407AE: ldr r0, =0x0000fff7 ands r0, r2 strh r0, [r3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DACC9 b _080407EC .pool _080407E8: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAC47 _080407EC: str r0, [r1] adds r3, r1, 0 - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r2, 0 movs r0, 0xC strb r0, [r1, 0x10] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r2, [r0, 0x5] b _080408B8 .pool @@ -1525,12 +1525,12 @@ _08040810: ldr r0, =0x0000ffdf ands r0, r2 strh r0, [r3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DACE0 b _08040858 .pool _08040854: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DACD2 _08040858: str r0, [r1] @@ -1555,20 +1555,20 @@ _08040868: ldr r0, =0x0000ff7f ands r0, r2 strh r0, [r3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DACC9 b _080408A8 .pool _080408A4: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAC47 _080408A8: str r0, [r1] adds r3, r1, 0 - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0xD strb r0, [r1, 0x10] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _080408B8: @@ -1581,7 +1581,7 @@ _080408BA: lsrs r0, 24 mov r9, r0 _080408C8: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] ldrb r0, [r1, 0x3] adds r0, 0x1 @@ -1628,14 +1628,14 @@ sub_8040924: @ 8040924 sub sp, 0x8 movs r0, 0 mov r9, r0 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0x01000020 orrs r0, r1 str r0, [r2] - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r2, [r5] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r2, 0x1] adds r7, r5, 0 mov r8, r0 @@ -1647,16 +1647,16 @@ _08040954: bl _0804132E .pool _08040968: - ldr r3, =gUnknown_02024064 - ldr r4, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r3, =gActiveBank + ldr r4, =gBankAttacker + ldr r1, =gTurnOrder ldr r5, [r5] ldrb r0, [r5, 0x1] adds r0, r1 ldrb r0, [r0] strb r0, [r4] strb r0, [r3] - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r0, [r3] @@ -1707,7 +1707,7 @@ _080409C8: .4byte _08040AAE .4byte _08041304 _08040A18: - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 ldrb r3, [r6] lsls r0, r3, 2 adds r0, r1 @@ -1755,7 +1755,7 @@ _08040A78: movs r0, 0x1 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08040A92 @@ -1785,7 +1785,7 @@ _08040AAE: _08040AC2: bl _080412D4 _08040AC6: - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 ldrb r2, [r6] lsls r1, r2, 2 adds r1, r0 @@ -1816,7 +1816,7 @@ _08040AF4: bne _08040B04 bl _080412DE _08040B04: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget strb r5, [r0] ldr r2, =gBattleMoveDamage ldrb r0, [r6] @@ -1830,7 +1830,7 @@ _08040B04: movs r0, 0x1 str r0, [r2] _08040B1E: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting strb r5, [r1, 0x10] ldrb r0, [r4] strb r0, [r1, 0x11] @@ -2089,8 +2089,8 @@ _08040D30: ands r0, r5 cmp r0, 0 beq _08040DC0 - ldr r1, =gUnknown_02024474 - ldr r0, =gUnknown_0202449C + ldr r1, =gBattleScripting + ldr r0, =gBattleStruct ldr r2, [r0] lsls r0, r4, 1 adds r0, r2 @@ -2101,7 +2101,7 @@ _08040D30: adds r0, r2 ldrb r0, [r0, 0x5] strb r0, [r1, 0x11] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -2118,7 +2118,7 @@ _08040D30: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB30E str r0, [r1] ldr r2, =gBattleMoveDamage @@ -2135,13 +2135,13 @@ _08040D30: b _08040DEC .pool _08040DC0: - ldr r2, =gUnknown_02022F58 + ldr r2, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r2] movs r0, 0x2 strb r0, [r2, 0x1] ldrb r1, [r6] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r3, [r0] lsls r1, 1 adds r1, r3 @@ -2154,7 +2154,7 @@ _08040DC0: strb r0, [r2, 0x3] movs r0, 0xFF strb r0, [r2, 0x4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB320 str r0, [r1] _08040DEC: @@ -2176,12 +2176,12 @@ _08040E00: ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] ldr r0, =gUnknown_082DB234 bl b_call_bc_move_exec - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r6] strb r0, [r4] ldrb r0, [r4] @@ -2255,8 +2255,8 @@ _08040EBA: cmp r0, r1 bcc _08040E9A _08040EC8: - ldr r2, =gUnknown_0202420B - ldr r1, =gUnknown_0202406C + ldr r2, =gBankAttacker + ldr r1, =gNoOfAllBanks ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 @@ -2266,7 +2266,7 @@ _08040EC8: b _08041318 .pool _08040EE8: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] strb r0, [r2] ldr r2, =gBattleMons @@ -2287,8 +2287,8 @@ _08040EE8: cmp r4, 0 beq _08040F2C ldrb r0, [r5] - bl b_cancel_multi_turn_move_maybe - ldr r1, =gUnknown_02024332 + bl CancelMultiTurnMoves + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08040F60 @@ -2303,7 +2303,7 @@ _08040F2C: ands r0, r1 cmp r0, 0 beq _08040F54 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] ldr r0, [r2] movs r1, 0x80 @@ -2313,11 +2313,11 @@ _08040F2C: b _08040F60 .pool _08040F54: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] adds r0, r3, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves _08040F60: ldr r0, =gUnknown_082DB2A6 bl b_call_bc_move_exec @@ -2357,7 +2357,7 @@ _08040F9A: cmp r0, 0 beq _08040FBC ldrb r0, [r6] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves b _080412DE .pool _08040FBC: @@ -2391,7 +2391,7 @@ _08040FDA: beq _08040FF2 b _080412DE _08040FF2: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x47 strb r0, [r1, 0x3] movs r0, 0x1 @@ -2411,7 +2411,7 @@ _08041010: b _080412D4 .pool _08041024: - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs ldrb r3, [r6] lsls r1, r3, 3 subs r1, r3 @@ -2510,7 +2510,7 @@ _080410D4: b _080412D0 .pool _080410E8: - ldr r3, =gUnknown_020242BC + ldr r3, =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -2599,7 +2599,7 @@ _08041172: b _080412D0 .pool _0804119C: - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -2616,7 +2616,7 @@ _080411B4: b _080412E2 .pool _080411BC: - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -2637,7 +2637,7 @@ _080411BC: strb r0, [r3, 0x12] cmp r1, 0 bne _080411F6 - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 ldrb r2, [r6] lsls r2, 2 adds r2, r0 @@ -2650,7 +2650,7 @@ _080411F6: b _080412E2 .pool _08041208: - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -2674,7 +2674,7 @@ _0804122E: b _080412E2 .pool _08041238: - ldr r4, =gUnknown_020242AC + ldr r4, =gStatuses3 ldrb r0, [r6] lsls r0, 2 adds r2, r0, r4 @@ -2718,7 +2718,7 @@ _08041238: cmp r0, 0 bne _080412DE ldrb r0, [r6] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves bl Random ldrb r1, [r6] adds r2, r1, 0 @@ -2754,7 +2754,7 @@ _080412D4: lsrs r0, 24 mov r9, r0 _080412DE: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] _080412E2: ldrb r0, [r1] @@ -2778,9 +2778,9 @@ _08041318: mov r0, r9 b _08041344 _0804131C: - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r2, [r5] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r2, 0x1] adds r7, r5, 0 mov r8, r0 @@ -2793,7 +2793,7 @@ _0804132E: bhi _08041338 bl _08040968 _08041338: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r1, [r0] ldr r2, =0xfeffffdf ands r1, r2 @@ -2818,12 +2818,12 @@ sub_8041364: @ 8041364 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0x01000020 orrs r0, r1 str r0, [r2] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r3, [r1] movs r4, 0xD0 lsls r4, 1 @@ -2850,7 +2850,7 @@ _080413AA: _080413AC: ldr r2, =0x000001a1 adds r0, r3, r2 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r0] mov r8, r1 ldrb r7, [r1] @@ -2858,8 +2858,8 @@ _080413AC: bcc _080413BE b _08041532 _080413BE: - ldr r4, =gUnknown_02024064 - ldr r5, =gUnknown_02022F58 + ldr r4, =gActiveBank + ldr r5, =gBattleTextBuff1 ldr r7, =gUnknown_020243D0 movs r0, 0x18 adds r0, r7 @@ -2869,7 +2869,7 @@ _080413CA: adds r3, r0, r2 ldrb r0, [r3] strb r0, [r4] - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r0, [r4] @@ -2916,12 +2916,12 @@ _08041422: ldrh r0, [r0] cmp r0, 0xF8 bne _0804145C - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r3, [r0, 0x5] b _08041462 .pool _0804145C: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _08041462: @@ -2943,10 +2943,10 @@ _08041462: strb r0, [r5, 0x3] movs r0, 0xFF strb r0, [r5, 0x4] - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r4] strb r0, [r5] - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker adds r0, r7, 0x4 ldrb r2, [r4] adds r0, r2 @@ -2960,7 +2960,7 @@ _08041462: adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -2987,7 +2987,7 @@ _080414CC: b _08041664 _080414DA: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity ldr r2, =gUnknown_0202428E lsls r0, 24 lsrs r0, 24 @@ -3029,7 +3029,7 @@ _08041548: ldr r0, [r6] ldr r2, =0x000001a1 adds r0, r2 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r0] mov r8, r1 ldrb r4, [r1] @@ -3037,14 +3037,14 @@ _08041548: bcc _0804155E b _08041684 _0804155E: - ldr r5, =gUnknown_02024064 - ldr r4, =gUnknown_02022F58 - ldr r7, =gUnknown_020242BC + ldr r5, =gActiveBank + ldr r4, =gBattleTextBuff1 + ldr r7, =gDisableStructs mov r12, r7 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker mov r9, r0 _0804156A: - ldr r1, =gUnknown_0202407E + ldr r1, =gTurnOrder ldr r0, [r3] adds r3, r0, r2 ldrb r0, [r3] @@ -3053,7 +3053,7 @@ _0804156A: mov r1, r9 strb r0, [r1] strb r0, [r5] - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r0, [r5] @@ -3072,7 +3072,7 @@ _080415BC: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] - ldr r7, =gUnknown_020242AC + ldr r7, =gStatuses3 ldrb r0, [r5] lsls r0, 2 adds r0, r7 @@ -3123,7 +3123,7 @@ _080415BC: adds r0, r2 ldrh r0, [r0, 0x28] str r0, [r3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAF05 b _0804165C .pool @@ -3138,7 +3138,7 @@ _08041644: ands r0, r3 orrs r0, r1 strb r0, [r4, 0xF] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAF20 _0804165C: str r0, [r1] @@ -3197,15 +3197,15 @@ _0804169A: _080416C6: lsls r0, r4, 24 lsrs r0, 24 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves adds r4, 0x1 cmp r4, 0x1 ble _080416C6 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB8F3 str r0, [r1] bl b_call_bc_move_exec - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] movs r4, 0xD0 lsls r4, 1 @@ -3268,7 +3268,7 @@ _08041766: b _08041A0C .pool _08041770: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct mov r8, r0 _08041774: mov r1, r8 @@ -3307,11 +3307,11 @@ _080417B4: adds r0, 0x1 strb r0, [r1] movs r5, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 bge _08041806 - ldr r6, =gUnknown_02024210 + ldr r6, =gAbsentBankFlags _080417D4: ldrb r0, [r6] ldr r2, =gBitTable @@ -3334,19 +3334,19 @@ _080417D4: strb r0, [r6] _080417FC: adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _080417D4 _08041806: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct mov r8, r0 ldr r1, =gUnknown_0202420D mov r12, r1 - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget mov r5, r8 ldr r7, =gBattleMons - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID _08041816: ldr r3, [r5] adds r1, r3, 0 @@ -3375,7 +3375,7 @@ _08041816: ands r1, r0 cmp r1, 0 bne _0804185E - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] lsls r0, r4, 2 adds r0, r3 @@ -3390,7 +3390,7 @@ _0804185E: ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks lsls r1, 24 lsrs r1, 24 ldrb r0, [r0] @@ -3407,13 +3407,13 @@ _080418A0: ldr r0, =gUnknown_0202420D ldrb r0, [r0] bl sub_803F9EC - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r1, 0x4E ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -3445,8 +3445,8 @@ _080418E2: _080418F6: ldr r0, =gUnknown_0202420D mov r12, r0 - ldr r7, =gEnemyMonIndex - ldr r5, =gUnknown_0202449C + ldr r7, =gBankTarget + ldr r5, =gBattleStruct ldr r2, =gBattleMons ldr r6, =gBitTable _08041902: @@ -3464,7 +3464,7 @@ _08041902: ldrh r0, [r0, 0x28] cmp r0, 0 bne _08041930 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] lsls r0, r3, 2 adds r0, r6 @@ -3476,7 +3476,7 @@ _08041902: _08041930: adds r0, r3, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -3491,7 +3491,7 @@ _08041960: ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks lsls r1, 24 lsrs r1, 24 ldrb r0, [r0] @@ -3519,7 +3519,7 @@ _08041994: movs r1, 0 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -3531,7 +3531,7 @@ _080419AE: movs r1, 0 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080419C4 @@ -3552,13 +3552,13 @@ _080419D8: movs r1, 0 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080419EE b _08041766 _080419EE: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r1, 0x4D ldrb r0, [r1] @@ -3590,7 +3590,7 @@ _08041A0C: b_clear_atk_up_if_hit_flag_unless_enraged: @ 8041A1C push {r4-r6,lr} movs r3, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks adds r5, r0, 0 ldrb r0, [r5] cmp r3, r0 @@ -3637,7 +3637,7 @@ sub_8041A6C: @ 8041A6C mov r9, r0 ldr r1, =gUnknown_02024478 mov r10, r1 - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct mov r8, r2 b _08041A9A .pool @@ -3681,7 +3681,7 @@ _08041AC0: .4byte _08042376 _08041AFC: ldr r1, =gBattleMons - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r2, [r3] movs r0, 0x58 muls r2, r0 @@ -3691,7 +3691,7 @@ _08041AFC: ldr r1, =0xfdffffff ands r0, r1 str r0, [r2] - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 ldrb r2, [r3] lsls r2, 2 adds r2, r0 @@ -3707,7 +3707,7 @@ _08041AFC: .pool _08041B48: ldr r7, =gBattleMons - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r1, [r4] movs r5, 0x58 adds r0, r1, 0 @@ -3748,10 +3748,10 @@ _08041B68: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB220 str r0, [r1] movs r4, 0x2 @@ -3787,7 +3787,7 @@ _08041BF4: str r0, [r2] _08041BF8: ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -3799,16 +3799,16 @@ _08041BF8: ands r4, r0 cmp r4, 0 beq _08041C50 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] cmp r0, 0xAD beq _08041C6E cmp r0, 0xD6 beq _08041C6E - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB213 str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -3826,15 +3826,15 @@ _08041C50: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB220 str r0, [r1] movs r1, 0x2 mov r9, r1 _08041C6E: - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] ldr r3, =0x000001a3 adds r2, r0, r3 @@ -3842,7 +3842,7 @@ _08041C6E: .pool _08041C90: ldr r1, =gBattleMons - ldr r7, =gUnknown_0202420B + ldr r7, =gBankAttacker ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -3864,7 +3864,7 @@ _08041C90: cmp r4, 0 beq _08041D08 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3875,10 +3875,10 @@ _08041C90: bne _08041CD6 b _08042162 _08041CD6: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB26A str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 2 @@ -3897,15 +3897,15 @@ _08041D08: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB277 str r0, [r1] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] _08041D28: movs r7, 0x2 mov r9, r7 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct mov r8, r0 _08041D30: mov r1, r8 @@ -3916,7 +3916,7 @@ _08041D30: .pool _08041D50: ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -3927,7 +3927,7 @@ _08041D50: beq _08041D66 b _08042162 _08041D66: - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -3939,17 +3939,17 @@ _08041D66: b _08042162 _08041D7A: adds r0, r2, 0 - bl b_cancel_multi_turn_move_maybe - ldr r2, =gUnknown_02024280 + bl CancelMultiTurnMoves + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB6AD str r0, [r1] ldr r2, =gBattleMoveFlags @@ -3961,7 +3961,7 @@ _08041D7A: .pool _08041DC4: ldr r1, =gBattleMons - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -3976,7 +3976,7 @@ _08041DC4: ldr r0, =0xffbfffff ands r1, r0 str r1, [r2] - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -3985,11 +3985,11 @@ _08041DC4: movs r1, 0 strb r1, [r0, 0x19] ldrb r0, [r3] - bl b_cancel_multi_turn_move_maybe - ldr r1, =gUnknown_02024214 + bl CancelMultiTurnMoves + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082D9462 str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -3998,7 +3998,7 @@ _08041DC4: movs r7, 0x1 mov r9, r7 _08041E10: - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] ldr r3, =0x000001a3 adds r2, r0, r3 @@ -4006,7 +4006,7 @@ _08041E10: .pool _08041E40: ldr r1, =gBattleMons - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -4021,7 +4021,7 @@ _08041E40: negs r0, r0 ands r1, r0 str r1, [r2] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r2, [r3] lsls r2, 4 adds r2, r0 @@ -4030,11 +4030,11 @@ _08041E40: orrs r0, r1 strb r0, [r2, 0x2] ldrb r0, [r3] - bl b_cancel_multi_turn_move_maybe - ldr r1, =gUnknown_02024214 + bl CancelMultiTurnMoves + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB29B str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4043,43 +4043,43 @@ _08041E40: movs r4, 0x1 mov r9, r4 _08041E8C: - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] ldr r7, =0x000001a3 adds r2, r0, r7 b _0804216A .pool _08041EB8: - ldr r0, =gUnknown_020242BC - ldr r3, =gUnknown_0202420B + ldr r0, =gDisableStructs + ldr r3, =gBankAttacker ldrb r2, [r3] lsls r1, r2, 3 subs r1, r2 lsls r1, 2 adds r1, r0 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r1, 0x4] ldrh r0, [r0] cmp r1, r0 bne _08041F04 cmp r1, 0 beq _08041F04 - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r2, 4 adds r2, r0 ldrb r0, [r2, 0x1] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x1] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r3] strb r0, [r1, 0x17] ldrb r0, [r3] - bl b_cancel_multi_turn_move_maybe - ldr r1, =gUnknown_02024214 + bl CancelMultiTurnMoves + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAE14 str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4088,15 +4088,15 @@ _08041EB8: movs r0, 0x1 mov r9, r0 _08041F04: - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] ldr r3, =0x000001a3 adds r2, r0, r3 b _0804216A .pool _08041F38: - ldr r0, =gUnknown_020242BC - ldr r4, =gUnknown_0202420B + ldr r0, =gDisableStructs + ldr r4, =gBankAttacker ldrb r3, [r4] lsls r1, r3, 3 subs r1, r3 @@ -4107,7 +4107,7 @@ _08041F38: cmp r0, 0 beq _08041F8C ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4116,7 +4116,7 @@ _08041F38: ldrb r0, [r0, 0x1] cmp r0, 0 bne _08041F8C - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r2, r3, 4 adds r2, r0 ldrb r0, [r2, 0x2] @@ -4124,11 +4124,11 @@ _08041F38: orrs r0, r1 strb r0, [r2, 0x2] ldrb r0, [r4] - bl b_cancel_multi_turn_move_maybe - ldr r1, =gUnknown_02024214 + bl CancelMultiTurnMoves + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB0A4 str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4137,22 +4137,22 @@ _08041F38: movs r4, 0x1 mov r9, r4 _08041F8C: - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] ldr r7, =0x000001a3 adds r2, r0, r7 b _0804216A .pool _08041FC0: - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r1, [r1] bl sub_8040130 lsls r0, 24 cmp r0, 0 beq _08041FFE - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -4161,11 +4161,11 @@ _08041FC0: orrs r0, r1 strb r0, [r2, 0x1] ldrb r0, [r4] - bl b_cancel_multi_turn_move_maybe - ldr r1, =gUnknown_02024214 + bl CancelMultiTurnMoves + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB176 str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4174,7 +4174,7 @@ _08041FC0: movs r0, 0x1 mov r9, r0 _08041FFE: - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] ldr r3, =0x000001a3 adds r2, r0, r3 @@ -4182,7 +4182,7 @@ _08041FFE: .pool _08042028: ldr r7, =gBattleMons - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r0, [r5] movs r6, 0x58 muls r0, r6 @@ -4210,17 +4210,17 @@ _08042028: ands r2, r0 cmp r2, 0 beq _0804207C - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] bl b_movescr_stack_push_cursor b _080420C6 .pool _0804207C: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication movs r4, 0x1 strb r1, [r0, 0x5] - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r5] strb r0, [r1] ldrb r0, [r5] @@ -4240,33 +4240,33 @@ _0804207C: bl sub_806957C ldr r1, =gBattleMoveDamage str r0, [r1] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 ldrb r0, [r1, 0x1] orrs r0, r4 strb r0, [r1, 0x1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] _080420C6: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB2BD b _080420F0 .pool _080420E8: bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB300 _080420F0: str r0, [r1] movs r4, 0x1 mov r9, r4 - ldr r7, =gUnknown_0202449C + ldr r7, =gBattleStruct mov r8, r7 _080420FA: mov r1, r8 @@ -4277,7 +4277,7 @@ _080420FA: .pool _08042114: ldr r1, =gBattleMons - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -4295,7 +4295,7 @@ _08042114: ands r1, r0 cmp r1, 0 bne _08042162 - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -4303,10 +4303,10 @@ _08042114: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB28B str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -4316,7 +4316,7 @@ _0804215E: movs r3, 0x1 mov r9, r3 _08042162: - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] ldr r4, =0x000001a3 adds r2, r0, r4 @@ -4329,7 +4329,7 @@ _0804216A: .pool _08042194: ldr r1, =gBattleMons - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -4343,7 +4343,7 @@ _08042194: beq _0804220E lsrs r0, r1, 16 bl CountTrailingZeroBits - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting strb r0, [r1, 0x17] bl Random movs r1, 0x1 @@ -4356,13 +4356,13 @@ _08042194: _080421D8: ldr r0, =gUnknown_082DB334 bl b_movescr_stack_push - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -4371,14 +4371,14 @@ _080421D8: orrs r0, r1 strb r0, [r2, 0x1] ldrb r0, [r4] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves _08042200: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB327 str r0, [r1] movs r7, 0x1 mov r9, r7 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct mov r8, r0 _0804220E: mov r1, r8 @@ -4389,7 +4389,7 @@ _0804220E: .pool _08042234: ldr r1, =gBattleMons - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -4413,7 +4413,7 @@ _08042234: ands r0, r4 cmp r0, 0 beq _08042280 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAD71 b _08042300 .pool @@ -4424,7 +4424,7 @@ _08042280: ldr r0, [r0] cmp r0, 0 beq _080422FC - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove movs r0, 0x75 strh r0, [r1] ldrb r0, [r6] @@ -4434,13 +4434,13 @@ _08042280: lsls r0, 1 mov r1, r10 str r0, [r1] - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldr r1, =gUnknown_02024288 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] strb r0, [r4] - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r0, [r4] @@ -4452,18 +4452,18 @@ _08042280: beq _080422CA movs r0, 0x75 movs r1, 0x1 - bl sub_80458E0 + bl GetMoveTarget strb r0, [r4] _080422CA: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAD7C str r0, [r1] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct mov r8, r2 b _08042302 .pool _080422FC: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DADC4 _08042300: str r0, [r1] @@ -4479,7 +4479,7 @@ _08042306: .pool _0804231C: ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -4491,7 +4491,7 @@ _0804231C: cmp r0, 0 beq _08042368 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -4505,16 +4505,16 @@ _0804231C: ands r3, r0 str r3, [r4] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB277 str r0, [r1] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _08042360: movs r0, 0x2 mov r9, r0 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct mov r8, r1 _08042368: mov r2, r8 @@ -4538,8 +4538,8 @@ _08042388: mov r0, r9 cmp r0, 0x2 bne _080423B4 - ldr r4, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r4] ldrb r1, [r4] @@ -4599,7 +4599,7 @@ _08042424: cmp r0, 0 beq _0804249C adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty mov r8, r1 @@ -4661,7 +4661,7 @@ _0804249C: cmp r1, 0 beq _080424E4 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080424D0 @@ -4689,7 +4689,7 @@ _080424E4: lsls r0, 24 lsrs r7, r0, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty mov r8, r1 @@ -4756,7 +4756,7 @@ _0804256C: cmp r1, 0 beq _080425DA adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4805,17 +4805,17 @@ _080425D2: b _0804269E _080425DA: adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08042608 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 ldr r2, =gEnemyParty @@ -4824,11 +4824,11 @@ _080425DA: .pool _08042608: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 ldr r0, =gPlayerParty @@ -4837,7 +4837,7 @@ _08042620: mov r1, r10 cmp r1, 0x6 bne _08042630 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrb r0, [r0] @@ -4846,7 +4846,7 @@ _08042630: mov r2, r9 cmp r2, 0x6 bne _08042640 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r6, 1 adds r0, r1 ldrb r0, [r0] @@ -4879,7 +4879,7 @@ _08042642: beq _08042692 cmp r4, r9 beq _08042692 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r0, r7, r1 adds r0, 0x5C @@ -4940,7 +4940,7 @@ castform_switch: @ 80426BC movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0804270E @@ -4949,7 +4949,7 @@ castform_switch: @ 80426BC movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08042734 @@ -4976,7 +4976,7 @@ _08042734: movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -4986,7 +4986,7 @@ _08042734: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08042764 @@ -5096,8 +5096,8 @@ _08042818: .pool thumb_func_end castform_switch - thumb_func_start ability_something -ability_something: @ 8042828 + thumb_func_start AbilityBattleEffects +AbilityBattleEffects: @ 8042828 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -5120,8 +5120,8 @@ ability_something: @ 8042828 lsrs r4, 16 movs r0, 0 mov r9, r0 - ldr r5, =gUnknown_0202420B - ldr r1, =gUnknown_0202406C + ldr r5, =gBankAttacker + ldr r1, =gNoOfAllBanks ldrb r0, [r5] ldrb r1, [r1] cmp r0, r1 @@ -5130,11 +5130,11 @@ ability_something: @ 8042828 strb r1, [r5] _08042864: ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08042894 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -5145,7 +5145,7 @@ _08042864: b _080428A4 .pool _08042894: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -5155,8 +5155,8 @@ _08042894: ldr r0, =gEnemyParty _080428A4: adds r7, r1, r0 - ldr r5, =gEnemyMonIndex - ldr r1, =gUnknown_0202406C + ldr r5, =gBankTarget + ldr r1, =gNoOfAllBanks ldrb r0, [r5] ldrb r1, [r1] cmp r0, r1 @@ -5165,11 +5165,11 @@ _080428A4: strb r2, [r5] _080428B6: ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080428E8 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -5180,7 +5180,7 @@ _080428B6: b _080428F8 .pool _080428E8: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -5221,13 +5221,13 @@ _0804293A: mov r3, r8 cmp r3, 0 beq _08042958 - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r3, [r0] adds r7, r0, 0 b _0804296E .pool _08042958: - ldr r2, =gUnknown_0202420A + ldr r2, =gLastUsedAbility ldr r1, =gBattleMons movs r0, 0x58 mov r5, r10 @@ -5245,10 +5245,10 @@ _0804296E: b _08042984 .pool _08042980: - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r5, [r0] _08042984: - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] ldrb r0, [r0, 0x13] mov r8, r1 @@ -5300,8 +5300,8 @@ _080429C8: .4byte _080443EC .4byte _08044196 _08042A18: - ldr r2, =gUnknown_0202420B - ldr r0, =gUnknown_0202406C + ldr r2, =gBankAttacker + ldr r0, =gNoOfAllBanks ldrb r1, [r2] adds r5, r0, 0 ldrb r3, [r5] @@ -5401,7 +5401,7 @@ _08042AE0: bne _08042B4C movs r0, 0x5 strh r0, [r2] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0xA strb r0, [r1, 0x10] mov r2, r10 @@ -5417,7 +5417,7 @@ _08042B04: cmp r0, 0 bne _08042B4C strh r2, [r3] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0xC strb r0, [r1, 0x10] mov r3, r10 @@ -5433,7 +5433,7 @@ _08042B28: cmp r0, 0 bne _08042B4C strh r2, [r3] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0xB strb r0, [r1, 0x10] mov r5, r10 @@ -5451,7 +5451,7 @@ _08042B4C: bl _0804443A _08042B56: bl weather_get_current - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication strb r0, [r1, 0x5] ldr r0, =gUnknown_082DACE7 bl b_push_move_exec @@ -5470,7 +5470,7 @@ _08042B88: strh r0, [r2] ldr r0, =gUnknown_082DB430 bl b_push_move_exec - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting mov r1, r10 strb r1, [r0, 0x17] bl _080443D0 @@ -5488,7 +5488,7 @@ _08042BB8: strh r0, [r2] ldr r0, =gUnknown_082DB470 bl b_push_move_exec - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting mov r2, r10 strb r2, [r0, 0x17] bl _080443D0 @@ -5506,13 +5506,13 @@ _08042BE8: strh r0, [r2] ldr r0, =gUnknown_082DB52A bl b_push_move_exec - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting mov r3, r10 strb r3, [r0, 0x17] bl _080443D0 .pool _08042C08: - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses mov r5, r10 lsls r2, r5, 2 adds r1, r2, r5 @@ -5524,7 +5524,7 @@ _08042C08: bge _08042C20 bl _0804441E _08042C20: - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 adds r1, r2, r1 ldr r0, [r1] movs r2, 0x80 @@ -5547,13 +5547,13 @@ _08042C3C: _08042C50: ldr r0, =gUnknown_082DB4A9 bl b_push_move_exec - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting mov r1, r10 strb r1, [r0, 0x17] bl _080442E2 .pool _08042C68: - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses mov r3, r10 lsls r2, r3, 2 adds r1, r2, r3 @@ -5565,7 +5565,7 @@ _08042C68: bge _08042C80 bl _0804441E _08042C80: - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 adds r1, r2, r1 ldr r0, [r1] movs r2, 0x80 @@ -5598,7 +5598,7 @@ _08042CC4: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bcc _08042CB0 @@ -5616,7 +5616,7 @@ _08042CDC: bne _08042CF2 bl _0804441E _08042CF2: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker mov r1, r10 strb r1, [r0] ldrb r5, [r7] @@ -5645,7 +5645,7 @@ _08042D22: movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5657,7 +5657,7 @@ _08042D3E: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08042D56 @@ -5719,7 +5719,7 @@ _08042DCA: ands r0, r1 cmp r0, 0 beq _08042DDC - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC70 bl StringCopy _08042DDC: @@ -5728,7 +5728,7 @@ _08042DDC: ands r0, r1 cmp r0, 0 beq _08042DEE - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC78 bl StringCopy _08042DEE: @@ -5737,7 +5737,7 @@ _08042DEE: ands r0, r1 cmp r0, 0 beq _08042E00 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC80 bl StringCopy _08042E00: @@ -5746,7 +5746,7 @@ _08042E00: ands r0, r1 cmp r0, 0 beq _08042E12 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC88 bl StringCopy _08042E12: @@ -5755,7 +5755,7 @@ _08042E12: ands r0, r1 cmp r0, 0 beq _08042E24 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC90 bl StringCopy _08042E24: @@ -5767,8 +5767,8 @@ _08042E24: ldr r2, =0xf7ffffff ands r0, r2 str r0, [r1] - ldr r0, =gUnknown_02024474 - ldr r4, =gUnknown_02024064 + ldr r0, =gBattleScripting + ldr r4, =gActiveBank mov r3, r10 strb r3, [r4] strb r3, [r0, 0x17] @@ -5792,7 +5792,7 @@ _08042E84: ble _08042E92 bl _0804441E _08042E92: - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs mov r5, r10 lsls r1, r5, 3 subs r1, r5 @@ -5806,7 +5806,7 @@ _08042EA8: adds r0, r2, 0x1 movs r1, 0 strb r0, [r4, 0x1B] - ldr r4, =gUnknown_02024474 + ldr r4, =gBattleScripting movs r0, 0x11 strb r0, [r4, 0x10] strb r1, [r4, 0x11] @@ -5816,7 +5816,7 @@ _08042EA8: bl _080443D0 .pool _08042ED0: - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r0, [r0] lsls r1, r0, 3 subs r1, r0 @@ -5872,7 +5872,7 @@ _08042F2C: bl _0804441E _08042F3C: ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -5884,14 +5884,14 @@ _08042F3C: ands r0, r1 cmp r0, 0 beq _08042F62 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r1, [r0] movs r2, 0x80 lsls r2, 4 orrs r1, r2 str r1, [r0] _08042F62: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB61F str r0, [r1] movs r0, 0x1 @@ -5930,8 +5930,8 @@ _08042FB0: bne _08042FC2 b _08043126 _08042FC2: - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -5939,12 +5939,12 @@ _08042FC2: lsls r0, 28 cmp r0, 0 bge _08042FF0 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB56F b _08042FF4 .pool _08042FF0: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB56E _08042FF4: str r0, [r1] @@ -5966,8 +5966,8 @@ _0804300A: bne _0804301C b _08043126 _0804301C: - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -5975,12 +5975,12 @@ _0804301C: lsls r0, 28 cmp r0, 0 bge _08043048 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB56F b _0804304C .pool _08043048: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB56E _0804304C: str r0, [r1] @@ -6003,7 +6003,7 @@ _0804305C: ands r0, r1 cmp r0, 0 bne _08043126 - ldr r2, =gUnknown_020244A8 + ldr r2, =gBattleResources ldr r0, [r2] ldr r0, [r0, 0x4] mov r5, r10 @@ -6015,10 +6015,10 @@ _0804305C: adds r5, r1, 0 cmp r3, 0 bne _080430EC - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r3, [r0, 0x5] - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -6026,12 +6026,12 @@ _0804305C: lsls r0, 28 cmp r0, 0 bge _080430C8 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB5A8 b _080430CC .pool _080430C8: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB5A7 _080430CC: str r0, [r1] @@ -6047,10 +6047,10 @@ _080430CC: b _08043126 .pool _080430EC: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -6058,12 +6058,12 @@ _080430EC: lsls r0, 28 cmp r0, 0 bge _0804311C - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB5A8 b _08043120 .pool _0804311C: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB5A7 _08043120: str r0, [r1] @@ -6086,8 +6086,8 @@ _08043130: ldrh r5, [r1, 0x28] cmp r0, r5 bne _0804318C - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -6095,13 +6095,13 @@ _08043130: lsls r0, 28 cmp r0, 0 bge _08043178 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB592 str r0, [r1] bl _0804441E .pool _08043178: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB591 str r0, [r1] bl _0804441E @@ -6207,8 +6207,8 @@ _080432A0: bne _080432B4 bl _0804441E _080432B4: - ldr r2, =gUnknown_0202437C - ldr r0, =gEnemyMonIndex + ldr r2, =gSpecialStatuses + ldr r0, =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6254,7 +6254,7 @@ _08043304: _0804330E: strb r3, [r4] strb r3, [r2] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -6263,7 +6263,7 @@ _0804330E: movs r0, 0xFF strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB64D str r0, [r1] bl _080443D0 @@ -6278,7 +6278,7 @@ _08043350: bl _0804441E _08043360: ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6288,7 +6288,7 @@ _08043360: bne _08043376 bl _0804441E _08043376: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6297,8 +6297,8 @@ _08043376: beq _08043388 bl _0804441E _08043388: - ldr r2, =gUnknown_0202437C - ldr r0, =gEnemyMonIndex + ldr r2, =gSpecialStatuses + ldr r0, =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6339,7 +6339,7 @@ _080433CA: str r2, [r1] _080433D8: bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB654 str r0, [r1] bl _080443D0 @@ -6354,7 +6354,7 @@ _08043410: bl _0804441E _08043420: ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6364,7 +6364,7 @@ _08043420: bne _08043436 bl _0804441E _08043436: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6373,8 +6373,8 @@ _08043436: beq _08043448 bl _0804441E _08043448: - ldr r2, =gUnknown_0202437C - ldr r0, =gEnemyMonIndex + ldr r2, =gSpecialStatuses + ldr r0, =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6415,7 +6415,7 @@ _08043488: beq _080434A0 bl _0804441E _080434A0: - ldr r5, =gUnknown_02024332 + ldr r5, =gBattleCommunication movs r4, 0x3 _080434A4: bl Random @@ -6423,7 +6423,7 @@ _080434A4: strb r0, [r5, 0x3] cmp r0, 0 beq _080434A4 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1, 0x3] cmp r0, 0x3 bne _080434BC @@ -6434,10 +6434,10 @@ _080434BC: adds r0, 0x40 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB67C str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -6455,7 +6455,7 @@ _08043508: bl _0804441E _08043518: ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6465,7 +6465,7 @@ _08043518: bne _0804352E bl _0804441E _0804352E: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6474,8 +6474,8 @@ _0804352E: beq _08043540 bl _0804441E _08043540: - ldr r2, =gUnknown_0202437C - ldr r0, =gEnemyMonIndex + ldr r2, =gSpecialStatuses + ldr r0, =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6516,14 +6516,14 @@ _08043580: beq _08043598 bl _0804441E _08043598: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x42 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB67C str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -6541,7 +6541,7 @@ _080435E4: bl _0804441E _080435F4: ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6551,7 +6551,7 @@ _080435F4: bne _0804360A bl _0804441E _0804360A: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6560,8 +6560,8 @@ _0804360A: beq _0804361C bl _0804441E _0804361C: - ldr r2, =gUnknown_0202437C - ldr r0, =gEnemyMonIndex + ldr r2, =gSpecialStatuses + ldr r0, =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6602,14 +6602,14 @@ _0804365C: beq _08043674 bl _0804441E _08043674: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x45 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB67C str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -6627,7 +6627,7 @@ _080436C0: bl _0804441E _080436D0: ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -6637,7 +6637,7 @@ _080436D0: bne _080436E6 bl _0804441E _080436E6: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6658,8 +6658,8 @@ _080436F8: bne _08043710 bl _0804441E _08043710: - ldr r2, =gUnknown_0202437C - ldr r0, =gEnemyMonIndex + ldr r2, =gSpecialStatuses + ldr r0, =gBankTarget ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -6688,14 +6688,14 @@ _08043738: beq _08043750 bl _0804441E _08043750: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x43 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB67C str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -6713,7 +6713,7 @@ _0804379C: bl _0804441E _080437AC: ldr r6, =gBattleMons - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker mov r8, r3 ldrb r1, [r3] movs r7, 0x58 @@ -6725,7 +6725,7 @@ _080437AC: bne _080437C6 bl _0804441E _080437C6: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -6746,8 +6746,8 @@ _080437D8: bne _080437F0 bl _0804441E _080437F0: - ldr r3, =gUnknown_0202437C - ldr r5, =gEnemyMonIndex + ldr r3, =gSpecialStatuses + ldr r5, =gBankTarget ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -6854,7 +6854,7 @@ _080438B6: orrs r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB66F str r0, [r1] bl _080443D0 @@ -6862,7 +6862,7 @@ _080438B6: _08043908: movs r5, 0 mov r10, r5 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r10, r0 bcc _08043918 @@ -6971,7 +6971,7 @@ _08043A50: bne _08043A6A b _08043B96 _08043A6A: - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC70 b _08043B5C .pool @@ -6990,7 +6990,7 @@ _08043A7C: bne _08043A96 b _08043B96 _08043A96: - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC98 bl StringCopy movs r2, 0x2 @@ -7010,7 +7010,7 @@ _08043AAC: ands r0, r1 cmp r0, 0 beq _08043B96 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC80 b _08043B5C .pool @@ -7032,7 +7032,7 @@ _08043AD4: ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC78 bl StringCopy movs r0, 0x1 @@ -7052,7 +7052,7 @@ _08043B10: ands r0, r1 cmp r0, 0 beq _08043B96 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC88 bl StringCopy movs r2, 0x1 @@ -7072,7 +7072,7 @@ _08043B40: ands r0, r1 cmp r0, 0 beq _08043B96 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC90 _08043B5C: bl StringCopy @@ -7094,7 +7094,7 @@ _08043B70: ands r0, r1 cmp r0, 0 beq _08043B96 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BCA0 bl StringCopy movs r2, 0x3 @@ -7155,13 +7155,13 @@ _08043BFA: str r0, [r2] _08043BFC: bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB68C str r0, [r1] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting mov r1, r10 strb r1, [r0, 0x17] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r1, [r4] ldrb r1, [r4] movs r0, 0x58 @@ -7184,7 +7184,7 @@ _08043C50: lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r10, r0 bcs _08043C64 @@ -7195,7 +7195,7 @@ _08043C64: _08043C6C: movs r2, 0 mov r10, r2 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r10, r0 bcc _08043C7A @@ -7226,7 +7226,7 @@ _08043CA0: lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r10, r0 bcc _08043C7C @@ -7238,7 +7238,7 @@ _08043CBC: beq _08043CC4 b _0804441E _08043CC4: - ldr r4, =gUnknown_02024280 + ldr r4, =gHitMarker ldr r1, [r4] movs r0, 0x80 lsls r0, 7 @@ -7266,19 +7266,19 @@ _08043CD4: movs r0, 0x2 strb r0, [r1] _08043CF8: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication mov r2, r8 ldr r0, [r2] adds r0, 0xB2 ldrb r0, [r0] adds r0, 0x40 strb r0, [r1, 0x3] - ldr r1, =gUnknown_02024474 - ldr r0, =gEnemyMonIndex + ldr r1, =gBattleScripting + ldr r0, =gBankTarget ldrb r0, [r0] strb r0, [r1, 0x17] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB67F str r0, [r1] ldr r0, [r4] @@ -7294,7 +7294,7 @@ _08043D40: beq _08043D48 b _0804441E _08043D48: - ldr r4, =gUnknown_02024280 + ldr r4, =gHitMarker ldr r1, [r4] movs r0, 0x80 lsls r0, 7 @@ -7322,18 +7322,18 @@ _08043D58: movs r0, 0x2 strb r0, [r1] _08043D7C: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication mov r3, r8 ldr r0, [r3] adds r0, 0xB2 ldrb r0, [r0] strb r0, [r1, 0x3] - ldr r1, =gUnknown_02024474 - ldr r0, =gUnknown_0202420B + ldr r1, =gBattleScripting + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r1, 0x17] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB67F str r0, [r1] ldr r0, [r4] @@ -7345,7 +7345,7 @@ _08043D7C: .pool _08043DC4: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] cmp r4, r1 blt _08043DD0 @@ -7353,7 +7353,7 @@ _08043DC4: _08043DD0: ldr r0, =gBattleMons adds r5, r1, 0 - ldr r2, =gUnknown_020242AC + ldr r2, =gStatuses3 adds r3, r0, 0 adds r3, 0x20 movs r6, 0x80 @@ -7377,13 +7377,13 @@ _08043DEE: .pool _08043E08: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08043E14 b _0804441E _08043E14: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank mov r8, r5 ldr r0, =gBattleMons adds r0, 0x20 @@ -7397,7 +7397,7 @@ _08043E22: beq _08043E2C b _08043FBE _08043E2C: - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 ldr r3, [sp, 0x20] adds r0, r3, r0 ldr r1, [r0] @@ -7411,17 +7411,17 @@ _08043E2C: _08043E42: lsls r0, r4, 24 lsrs r0, 24 - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 adds r5, r0, 0 eors r5, r1 ands r5, r1 adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 adds r0, r5, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 ldr r0, =gBattleTypeFlags @@ -7465,7 +7465,7 @@ _08043E74: lsls r1, 1 orrs r5, r1 adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI mov r2, r8 strb r0, [r2] ldrb r0, [r2] @@ -7482,7 +7482,7 @@ _08043E74: adds r0, r5 adds r0, 0x20 ldrb r0, [r0] - ldr r2, =gUnknown_0202420A + ldr r2, =gLastUsedAbility strb r0, [r2] b _08043FAC .pool @@ -7572,7 +7572,7 @@ _08043F84: strb r1, [r0] ldrb r0, [r2] _08043FA8: - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility strb r0, [r1] _08043FAC: mov r0, r9 @@ -7593,7 +7593,7 @@ _08043FBE: adds r5, 0x4 str r5, [sp, 0x20] adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bge _08043FD6 @@ -7603,7 +7603,7 @@ _08043FD6: .pool _08043FE4: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] cmp r4, r1 blt _08043FF0 @@ -7611,7 +7611,7 @@ _08043FE4: _08043FF0: ldr r0, =gBattleMons adds r5, r1, 0 - ldr r2, =gUnknown_020242AC + ldr r2, =gStatuses3 adds r3, r0, 0 adds r3, 0x20 movs r6, 0x80 @@ -7635,11 +7635,11 @@ _0804400E: .pool _08044028: mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0804403E @@ -7649,7 +7649,7 @@ _0804403E: _08044040: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 adds r3, r4, 0x1 @@ -7662,14 +7662,14 @@ _08044040: ldrb r0, [r0] cmp r0, r6 bne _0804406A - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r6, [r0] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 _0804406A: adds r4, r3, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08044040 @@ -7677,11 +7677,11 @@ _0804406A: .pool _08044084: mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0804409A @@ -7691,7 +7691,7 @@ _0804409A: _0804409C: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 adds r3, r4, 0x1 @@ -7704,14 +7704,14 @@ _0804409C: ldrb r0, [r0] cmp r0, r6 bne _080440C6 - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r6, [r0] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 _080440C6: adds r4, r3, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0804409C @@ -7724,7 +7724,7 @@ _080440E0: cmp r0, 0xFE beq _0804413C movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks adds r5, r0, 0 ldrb r0, [r5] cmp r4, r0 @@ -7736,13 +7736,13 @@ _080440F8: .pool _08044104: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08044110 b _0804441E _08044110: - ldr r5, =gUnknown_020242AC + ldr r5, =gStatuses3 movs r2, 0x80 lsls r2, 9 adds r1, r0, 0 @@ -7765,13 +7765,13 @@ _0804412C: .pool _0804413C: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08044148 b _0804441E _08044148: - ldr r5, =gUnknown_020242AC + ldr r5, =gStatuses3 movs r2, 0x80 lsls r2, 10 adds r1, r0, 0 @@ -7813,7 +7813,7 @@ _0804418C: b _0804441E _08044196: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _080441A2 @@ -7849,7 +7849,7 @@ _080441CC: .pool _080441DC: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _080441E8 @@ -7858,7 +7858,7 @@ _080441E8: ldr r7, =gBattleMons adds r1, r0, 0 movs r5, 0x58 - ldr r2, =gUnknown_0202420A + ldr r2, =gLastUsedAbility _080441F0: adds r0, r4, 0 muls r0, r5 @@ -7882,11 +7882,11 @@ _0804420C: .pool _08044220: mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08044236 @@ -7896,7 +7896,7 @@ _08044236: _08044238: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, r5 @@ -7908,7 +7908,7 @@ _08044238: ldrb r0, [r0] cmp r0, r6 bne _08044264 - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r6, [r0] mov r0, r9 adds r0, 0x1 @@ -7917,7 +7917,7 @@ _08044238: mov r9, r0 _08044264: adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08044238 @@ -7925,11 +7925,11 @@ _08044264: .pool _0804427C: mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08044292 @@ -7939,7 +7939,7 @@ _08044292: _08044294: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, r5 @@ -7951,7 +7951,7 @@ _08044294: ldrb r0, [r0] cmp r0, r6 bne _080442C0 - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r6, [r0] mov r0, r9 adds r0, 0x1 @@ -7960,7 +7960,7 @@ _08044294: mov r9, r0 _080442C0: adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _08044294 @@ -7969,10 +7969,10 @@ _080442C0: _080442D8: ldr r0, =gUnknown_082DB4A9 bl b_push_move_exec - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r6, [r0, 0x17] _080442E2: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x7F mov r1, r9 @@ -7983,10 +7983,10 @@ _080442E2: _080442FC: ldr r0, =gUnknown_082DB4A9 bl b_push_move_exec - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting mov r5, r10 strb r5, [r0, 0x17] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x7F mov r1, r9 @@ -8007,24 +8007,24 @@ _08044324: _08044340: ldr r0, =gUnknown_082DB452 bl b_push_move_exec - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 ldr r0, [sp, 0x18] adds r1, r0, r1 ldr r0, [r1] ldr r2, =0xffefffff ands r0, r2 str r0, [r1] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r4, [r0, 0x17] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r4, 0xFD strb r4, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -8032,11 +8032,11 @@ _08044340: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 strb r4, [r1] movs r0, 0x9 strb r0, [r1, 0x1] - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility ldrb r0, [r0] strb r0, [r1, 0x2] movs r0, 0x1 @@ -8051,11 +8051,11 @@ _080443B4: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB4C1 str r0, [r1] _080443C8: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xD8 strb r4, [r0] @@ -8069,7 +8069,7 @@ _080443D0: .pool _080443EC: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] cmp r4, r1 bge _0804441E @@ -8077,7 +8077,7 @@ _080443EC: adds r2, r1, 0 adds r1, r0, 0 adds r1, 0x20 - ldr r3, =gUnknown_0202420A + ldr r3, =gLastUsedAbility _08044400: ldrb r0, [r1] cmp r0, r6 @@ -8103,13 +8103,13 @@ _08044424: ldr r2, [sp, 0x4] cmp r2, 0xB bhi _0804443A - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r0, [r1] cmp r0, 0xFF beq _0804443A adds r1, r0, 0 mov r0, r10 - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle _0804443A: mov r0, r9 add sp, 0x28 @@ -8121,13 +8121,13 @@ _0804443A: pop {r1} bx r1 .pool - thumb_func_end ability_something + thumb_func_end AbilityBattleEffects thumb_func_start b_call_bc_move_exec b_call_bc_move_exec: @ 8044458 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr str r0, [r1] - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r2, [r0, 0xC] adds r3, r2, 0 @@ -8143,7 +8143,7 @@ b_call_bc_move_exec: @ 8044458 str r0, [r2] ldr r0, =bc_move_exec_returning str r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0 strb r0, [r1] bx lr @@ -8155,9 +8155,9 @@ b_push_move_exec: @ 8044498 push {r4,lr} adds r4, r0, 0 bl b_movescr_stack_push_cursor - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr str r4, [r0] - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r2, [r0, 0xC] adds r3, r2, 0 @@ -8211,7 +8211,7 @@ berry_effects_maybe: @ 80444DC lsrs r0, 16 cmp r0, 0xAF bne _08044534 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -8222,17 +8222,17 @@ berry_effects_maybe: @ 80444DC .pool _08044534: ldrh r0, [r4] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r0, 24 _08044548: mov r9, r0 ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -8241,7 +8241,7 @@ _08044548: str r0, [sp, 0x14] cmp r0, 0xAF bne _0804457C - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -8253,18 +8253,18 @@ _08044548: .pool _0804457C: ldr r0, [sp, 0x14] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 mov r8, r0 ldr r0, [sp, 0x14] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r0, 24 _08044592: str r0, [sp, 0x10] ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -8273,9 +8273,9 @@ _08044592: cmp r4, 0xAF beq _080445B2 adds r0, r4, 0 - bl itemid_get_x12 + bl ItemId_GetHoldEffect adds r0, r4, 0 - bl itemid_get_quality + bl ItemId_GetHoldEffectParam _080445B2: ldr r0, [sp, 0x8] cmp r0, 0x4 @@ -8303,13 +8303,13 @@ _080445E8: bl _0804582A _080445F4: adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08044604 bl _0804582A _08044604: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x4A movs r1, 0x2 @@ -8349,12 +8349,12 @@ _0804463C: bne _08044654 bl _0804582A _08044654: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r7, [r0, 0x17] ldr r0, =gUnknown_0202420F strb r7, [r0] - ldr r1, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r1, =gActiveBank + ldr r0, =gBankAttacker strb r7, [r0] strb r7, [r1] ldr r0, =gUnknown_082DB7AE @@ -8469,11 +8469,11 @@ _080447B0: bl _080451D6 _080447B8: adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080447DC - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -8483,7 +8483,7 @@ _080447B8: b _080447EA .pool _080447DC: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -8549,7 +8549,7 @@ _08044860: add r0, sp, 0x4 strb r1, [r0] _08044864: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -8571,7 +8571,7 @@ _08044864: movs r2, 0 movs r3, 0x1 bl dp01_build_cmdbuf_x02_a_b_varargs - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution movs r0, 0x3 @@ -8610,12 +8610,12 @@ _080448CE: bne _080448EA bl _0804582A _080448EA: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r7, [r0, 0x17] ldr r0, =gUnknown_0202420F strb r7, [r0] - ldr r1, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r1, =gActiveBank + ldr r0, =gBankAttacker strb r7, [r0] strb r7, [r1] ldr r0, =gUnknown_082DB7AE @@ -8685,7 +8685,7 @@ _08044996: beq _0804499E bl _080451D6 _0804499E: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -8746,7 +8746,7 @@ _08044A14: beq _08044A1C bl _080451D6 _08044A1C: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -8808,7 +8808,7 @@ _08044A90: beq _08044A96 b _080451D6 _08044A96: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -8879,7 +8879,7 @@ _08044B24: beq _08044B2A b _080451D6 _08044B2A: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -8950,7 +8950,7 @@ _08044BB6: beq _08044BBC b _080451D6 _08044BBC: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -9027,7 +9027,7 @@ _08044C52: ble _08044C5C b _080451D6 _08044C5C: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r2, 0xFD strb r2, [r1] movs r0, 0x5 @@ -9036,7 +9036,7 @@ _08044C5C: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 strb r2, [r1] strb r6, [r1, 0x1] movs r0, 0xD2 @@ -9046,7 +9046,7 @@ _08044C5C: strb r0, [r1, 0x4] ldr r0, =gUnknown_0202420E strb r7, [r0] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x11 strb r0, [r1, 0x1A] movs r0, 0xF @@ -9075,7 +9075,7 @@ _08044CBA: ble _08044CC4 b _080451D6 _08044CC4: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -9086,7 +9086,7 @@ _08044CC4: strb r0, [r1, 0x3] ldr r0, =gUnknown_0202420E strb r7, [r0] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x12 strb r0, [r1, 0x1A] movs r0, 0x10 @@ -9115,7 +9115,7 @@ _08044D0E: ble _08044D18 b _080451D6 _08044D18: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -9126,7 +9126,7 @@ _08044D18: strb r0, [r1, 0x3] ldr r0, =gUnknown_0202420E strb r7, [r0] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x13 strb r0, [r1, 0x1A] movs r0, 0x11 @@ -9155,7 +9155,7 @@ _08044D62: ble _08044D6C b _080451D6 _08044D6C: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -9166,7 +9166,7 @@ _08044D6C: strb r0, [r1, 0x3] ldr r0, =gUnknown_0202420E strb r7, [r0] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x14 strb r0, [r1, 0x1A] movs r0, 0x12 @@ -9202,7 +9202,7 @@ _08044DCA: ble _08044DD4 b _080451D6 _08044DD4: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -9212,7 +9212,7 @@ _08044DD4: strb r0, [r1, 0x3] ldr r0, =gUnknown_0202420E strb r7, [r0] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x15 strb r0, [r1, 0x1A] movs r0, 0x13 @@ -9332,7 +9332,7 @@ _08044EBC: asrs r0, 24 cmp r0, 0xC beq _08044EBC - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r2, 0 movs r3, 0xFD strb r3, [r1] @@ -9343,7 +9343,7 @@ _08044EBC: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, =gUnknown_02022F68 + ldr r0, =gBattleTextBuff2 strb r3, [r0] strb r2, [r0, 0x1] movs r1, 0xD1 @@ -9357,7 +9357,7 @@ _08044EBC: strb r1, [r0, 0x7] ldr r0, =gUnknown_0202420E strb r7, [r0] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting mov r0, r10 adds r0, 0x21 strb r0, [r1, 0x1A] @@ -9544,7 +9544,7 @@ _0804509A: ands r2, r0 cmp r2, 0 beq _080450B2 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC70 bl StringCopy movs r0, 0x1 @@ -9563,7 +9563,7 @@ _080450B2: ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC78 bl StringCopy movs r2, 0x1 @@ -9574,7 +9574,7 @@ _080450D8: ands r0, r1 cmp r0, 0 beq _080450EE - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC80 bl StringCopy movs r3, 0x1 @@ -9585,7 +9585,7 @@ _080450EE: ands r0, r1 cmp r0, 0 beq _08045104 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC88 bl StringCopy movs r0, 0x1 @@ -9596,7 +9596,7 @@ _08045104: ands r0, r1 cmp r0, 0 beq _0804511A - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC90 bl StringCopy movs r1, 0x1 @@ -9608,7 +9608,7 @@ _0804511A: ands r0, r2 cmp r0, 0 beq _08045132 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC98 bl StringCopy movs r3, 0x1 @@ -9617,12 +9617,12 @@ _08045132: mov r5, r10 cmp r5, 0x1 bgt _08045164 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 b _08045168 .pool _08045164: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 _08045168: strb r0, [r1, 0x5] @@ -9664,12 +9664,12 @@ _080451A0: ldr r0, =0xfff0ffff ands r2, r0 str r2, [r1] - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BCA0 bl StringCopy ldr r0, =gUnknown_082DB794 bl b_call_bc_move_exec - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] movs r1, 0x2 @@ -9680,12 +9680,12 @@ _080451D6: bne _080451DE b _0804582A _080451DE: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r7, [r0, 0x17] ldr r0, =gUnknown_0202420F strb r7, [r0] - ldr r4, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r0, =gBankAttacker strb r7, [r0] strb r7, [r4] ldr r3, [sp, 0xC] @@ -9715,7 +9715,7 @@ _08045226: beq _08045242 b _0804582A _08045242: - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -9743,7 +9743,7 @@ _08045262: .pool _08045280: movs r7, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r7, r0 bcc _0804528C @@ -9760,7 +9760,7 @@ _0804528C: lsrs r0, 16 cmp r0, 0xAF bne _080452C0 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -9770,11 +9770,11 @@ _0804528C: .pool _080452C0: ldrh r0, [r4] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam _080452D0: subs r0, r5, 0x2 cmp r0, 0x1A @@ -9834,7 +9834,7 @@ _0804536A: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB70C str r0, [r1] movs r0, 0x1 @@ -9858,7 +9858,7 @@ _080453A6: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB724 str r0, [r1] movs r1, 0x1 @@ -9883,7 +9883,7 @@ _080453E2: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB73C str r0, [r1] movs r2, 0x1 @@ -9908,7 +9908,7 @@ _0804541E: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB754 str r0, [r1] movs r3, 0x1 @@ -9941,7 +9941,7 @@ _0804545E: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB76C b _080455DC .pool @@ -9963,7 +9963,7 @@ _080454A2: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB784 str r0, [r1] movs r0, 0x2 @@ -9987,14 +9987,14 @@ _080454E0: ldr r0, =0xfff0ffff ands r1, r0 str r1, [r2] - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BCA0 bl StringCopy bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB79A str r0, [r1] movs r1, 0x2 @@ -10027,7 +10027,7 @@ _08045548: ands r2, r0 cmp r2, 0 beq _08045558 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC70 bl StringCopy _08045558: @@ -10043,7 +10043,7 @@ _08045558: ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC78 bl StringCopy _08045578: @@ -10052,7 +10052,7 @@ _08045578: ands r0, r1 cmp r0, 0 beq _0804558A - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC80 bl StringCopy _0804558A: @@ -10061,7 +10061,7 @@ _0804558A: ands r0, r1 cmp r0, 0 beq _0804559C - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC88 bl StringCopy _0804559C: @@ -10070,7 +10070,7 @@ _0804559C: ands r0, r1 cmp r0, 0 beq _080455AE - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC90 bl StringCopy _080455AE: @@ -10080,7 +10080,7 @@ _080455AE: ands r0, r3 cmp r0, 0 beq _080455C2 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r1, =gUnknown_0831BC98 bl StringCopy _080455C2: @@ -10092,9 +10092,9 @@ _080455C2: ands r0, r1 str r0, [r5] bl b_movescr_stack_push_cursor - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB79A _080455DC: str r0, [r1] @@ -10133,12 +10133,12 @@ _08045638: ldr r5, [sp, 0xC] cmp r5, 0 beq _080456B8 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r7, [r0, 0x17] ldr r0, =gUnknown_0202420F strb r7, [r0] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB7B4 str r0, [r1] b _0804582A @@ -10148,11 +10148,11 @@ _08045674: cmp r0, 0 beq _080456B8 _0804567A: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r7, [r0, 0x17] ldr r0, =gUnknown_0202420F strb r7, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r7, [r4] ldrb r1, [r4] movs r0, 0x58 @@ -10174,7 +10174,7 @@ _080456B8: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r7, r0 bcs _080456C8 @@ -10205,8 +10205,8 @@ _080456EC: beq _080456FA b _0804582A _080456FA: - ldr r2, =gUnknown_0202437C - ldr r4, =gEnemyMonIndex + ldr r2, =gSpecialStatuses + ldr r4, =gBankTarget ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -10236,7 +10236,7 @@ _08045720: cmp r0, r2 bcs _0804582A ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -10255,7 +10255,7 @@ _08045720: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0804582A - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x8 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor @@ -10272,8 +10272,8 @@ _08045794: ands r5, r0 cmp r5, 0 bne _0804582A - ldr r1, =gUnknown_0202437C - ldr r4, =gEnemyMonIndex + ldr r1, =gSpecialStatuses + ldr r4, =gBankTarget ldrb r2, [r4] lsls r0, r2, 2 adds r0, r2 @@ -10286,7 +10286,7 @@ _08045794: ldr r0, =0x0000ffff cmp r1, r0 beq _0804582A - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r3, [r0] cmp r3, r2 beq _0804582A @@ -10307,7 +10307,7 @@ _08045794: strh r1, [r0] ldr r0, =gUnknown_0202420F strb r3, [r0] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r3, [r0, 0x17] ldrb r1, [r4] lsls r0, r1, 2 @@ -10332,7 +10332,7 @@ _0804580C: adds r0, r6 str r5, [r0] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB7F7 str r0, [r1] ldr r0, [sp, 0xC] @@ -10357,7 +10357,7 @@ _0804582A: sub_8045868: @ 8045868 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -10374,7 +10374,7 @@ sub_8045868: @ 8045868 ldr r2, =0xfdffffff ands r1, r2 str r1, [r3] - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 lsls r0, 2 adds r0, r1 ldr r1, [r0] @@ -10388,12 +10388,12 @@ sub_8045868: @ 8045868 thumb_func_start sub_80458B4 sub_80458B4: @ 80458B4 push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _080458D0 ldr r1, =gUnknown_0831BD10 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -10406,8 +10406,8 @@ _080458D0: .pool thumb_func_end sub_80458B4 - thumb_func_start sub_80458E0 -sub_80458E0: @ 80458E0 + thumb_func_start GetMoveTarget +GetMoveTarget: @ 80458E0 push {r4-r7,lr} mov r7, r8 push {r7} @@ -10509,14 +10509,14 @@ _08045924: .4byte _08045C20 .4byte _08045B28 _08045A28: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -10534,9 +10534,9 @@ _08045A28: beq _08045A5A b _08045B70 _08045A5A: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 lsls r0, r7, 1 @@ -10545,22 +10545,22 @@ _08045A6A: bl Random lsls r0, 16 lsrs r0, 16 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r1, [r1] bl __modsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r3, [r6] cmp r5, r3 beq _08045A6A adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _08045A6A - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r2, [r0] ldr r1, =gBitTable lsls r0, r5, 2 @@ -10584,7 +10584,7 @@ _08045AB8: movs r0, 0x10 movs r2, 0x1F movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08045ACE @@ -10609,8 +10609,8 @@ _08045AE2: adds r0, 0x20 ldrb r1, [r0] adds r0, r5, 0 - bl b_history__record_ability_usage_of_player - ldr r1, =gUnknown_0202437C + bl RecordAbilityBattle + ldr r1, =gSpecialStatuses lsls r0, r5, 2 adds r0, r5 lsls r0, 2 @@ -10621,9 +10621,9 @@ _08045AE2: b _08045C20 .pool _08045B28: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r2, 0x1 movs r0, 0x1 @@ -10632,14 +10632,14 @@ _08045B28: b _08045BD2 .pool _08045B40: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -10670,9 +10670,9 @@ _08045B80: ands r6, r0 cmp r6, 0 beq _08045BFC - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08045BC0 @@ -10698,10 +10698,10 @@ _08045BC0: _08045BD0: movs r0, 0x2 _08045BD2: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable lsls r0, r5, 2 @@ -10715,26 +10715,26 @@ _08045BD2: b _08045C20 .pool _08045BFC: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r2, 0x1 movs r0, 0x1 ands r0, r1 eors r0, r2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 b _08045C20 .pool _08045C1C: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r5, [r0] _08045C20: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 strb r5, [r0, 0xC] @@ -10746,7 +10746,7 @@ _08045C20: pop {r1} bx r1 .pool - thumb_func_end sub_80458E0 + thumb_func_end GetMoveTarget thumb_func_start sub_8045C44 sub_8045C44: @ 8045C44 @@ -10754,12 +10754,12 @@ sub_8045C44: @ 8045C44 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08045C8A - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r4, 1 adds r5, r4, r0 ldrh r0, [r5] @@ -10787,7 +10787,7 @@ _08045C8A: b _08045CAE .pool _08045C98: - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 @@ -10818,9 +10818,9 @@ sub_8045CBC: @ 8045CBC ands r0, r1 cmp r0, 0 bne _08045DAC - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -10836,7 +10836,7 @@ sub_8045CBC: @ 8045CBC cmp r0, 0 beq _08045D08 ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -10854,7 +10854,7 @@ _08045D08: cmp r1, 0 bne _08045DAC ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -10896,7 +10896,7 @@ _08045D68: movs r6, 0x46 _08045D76: ldr r5, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker mov r8, r0 ldrb r0, [r0] movs r7, 0x58 @@ -10926,7 +10926,7 @@ _08045DAC: b _08045FD0 .pool _08045DD4: - ldr r3, =gUnknown_020241EA + ldr r3, =gCurrentMove ldrh r0, [r3] cmp r0, 0x63 bne _08045DEA @@ -10955,7 +10955,7 @@ _08045DEA: cmp r0, 0xD6 bne _08045E20 _08045E0A: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB695 b _08045F7A .pool @@ -10965,7 +10965,7 @@ _08045E20: adds r1, r5, 0 ands r1, r0 ldr r7, =gBattleMons - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker mov r9, r2 ldrb r3, [r2] movs r0, 0x58 @@ -10981,7 +10981,7 @@ _08045E20: cmp r4, r6 bge _08045EE8 ldr r6, =gBitTable - ldr r5, =gUnknown_020241E8 + ldr r5, =gCurrMovePos ldrb r0, [r5] lsls r0, 2 adds r0, r6 @@ -11011,12 +11011,12 @@ _08045E6E: ands r0, r4 cmp r0, 0 bne _08045E6E - ldr r4, =gUnknown_020241EE + ldr r4, =gRandomMove ldr r3, =gBattleMons - ldr r0, =gUnknown_020241E8 + ldr r0, =gCurrMovePos ldrb r0, [r0] lsls r0, 1 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -11025,15 +11025,15 @@ _08045E6E: adds r0, r3 ldrh r0, [r0] strh r0, [r4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB6A5 str r0, [r1] ldrh r0, [r4] movs r1, 0 - bl sub_80458E0 - ldr r1, =gEnemyMonIndex + bl GetMoveTarget + ldr r1, =gBankTarget strb r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 14 @@ -11067,7 +11067,7 @@ _08045EE8: cmp r0, 0xF beq _08045F64 movs r2, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r3, [r0] mov r8, r0 cmp r2, r3 @@ -11094,7 +11094,7 @@ _08045F4A: ldrb r0, [r0] cmp r2, r0 bne _08045F64 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB6D9 b _08045F7A .pool @@ -11104,11 +11104,11 @@ _08045F64: blt _08045F8C _08045F6A: bl Random - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication movs r1, 0x3 ands r1, r0 strb r1, [r2, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB6AD _08045F7A: str r0, [r1] @@ -11116,7 +11116,7 @@ _08045F7A: b _08045FD0 .pool _08045F8C: - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r1, [r4] movs r0, 0x58 muls r1, r0 @@ -11136,13 +11136,13 @@ _08045F8C: bl sub_806957C ldr r1, =gBattleMoveDamage str r0, [r1] - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r4] strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB6F0 str r0, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 12 diff --git a/asm/battle_814AEAC.s b/asm/battle_814AEAC.s index 67f8052b5..a6065697a 100644 --- a/asm/battle_814AEAC.s +++ b/asm/battle_814AEAC.s @@ -12,8 +12,8 @@ nullsub_112: @ 814AEAC thumb_func_start sub_814AEB0 sub_814AEB0: @ 814AEB0 - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -26,9 +26,9 @@ sub_814AEB0: @ 814AEB0 thumb_func_start bx_exec_buffer_A_ch0_tbl4 bx_exec_buffer_A_ch0_tbl4: @ 814AECC push {lr} - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -37,7 +37,7 @@ bx_exec_buffer_A_ch0_tbl4: @ 814AECC ands r1, r0 cmp r1, 0 beq _0814AF18 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] @@ -61,9 +61,9 @@ _0814AF18: thumb_func_start sub_814AF1C sub_814AF1C: @ 814AF1C push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -86,9 +86,9 @@ _0814AF40: thumb_func_start sub_814AF54 sub_814AF54: @ 814AF54 push {r4-r6,lr} - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -133,7 +133,7 @@ sub_814AFBC: @ 814AFBC push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r1, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -183,9 +183,9 @@ sub_814B004: @ 814B004 cmp r0, 0 beq _0814B05C _0814B028: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gUnknown_03005D70 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -201,9 +201,9 @@ _0814B028: b _0814B092 .pool _0814B05C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r5, =gUnknown_03005D70 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -241,7 +241,7 @@ _0814B0A0: beq _0814B0C6 ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -250,7 +250,7 @@ _0814B0A0: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r3] lsls r0, 2 adds r0, r1 @@ -273,7 +273,7 @@ sub_814B0E8: @ 814B0E8 ldr r0, =gUnknown_020244D0 mov r12, r0 ldr r0, [r0] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r2, [r7] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -306,7 +306,7 @@ _0814B114: beq _0814B136 b _0814B252 _0814B136: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r10, r1 ldr r0, =gUnknown_03005D7C mov r9, r0 @@ -322,7 +322,7 @@ _0814B136: ldr r0, =DummyObjectCallback cmp r3, r0 bne _0814B252 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -374,7 +374,7 @@ _0814B136: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -396,21 +396,21 @@ _0814B136: bl sub_80729D0 _0814B1F0: ldr r1, =gUnknown_03005D7C - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldr r5, =gUnknown_03005D70 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -434,7 +434,7 @@ _0814B1F0: negs r0, r0 ands r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -454,9 +454,9 @@ _0814B252: thumb_func_start sub_814B290 sub_814B290: @ 814B290 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -484,7 +484,7 @@ _0814B2BE: thumb_func_start bx_t4_healthbar_update bx_t4_healthbar_update: @ 814B2D0 push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] ldr r6, =gUnknown_03005D70 adds r1, r0, r6 @@ -513,7 +513,7 @@ bx_t4_healthbar_update: @ 814B2D0 b _0814B332 .pool _0814B318: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -534,9 +534,9 @@ _0814B332: thumb_func_start sub_814B340 sub_814B340: @ 814B340 push {r4-r6,lr} - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r2, [r4] adds r0, r2, r5 ldrb r1, [r0] @@ -551,7 +551,7 @@ sub_814B340: @ 814B340 adds r1, r0 cmp r1, 0xA0 ble _0814B3BC - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] @@ -601,7 +601,7 @@ sub_814B3DC: @ 814B3DC push {r4-r6,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -613,13 +613,13 @@ sub_814B3DC: @ 814B3DC ands r0, r1 cmp r0, 0 bne _0814B430 - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -660,12 +660,12 @@ _0814B45E: thumb_func_start dp01t_0F_4_move_anim dp01t_0F_4_move_anim: @ 814B464 push {r4,lr} - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -683,7 +683,7 @@ dp01t_0F_4_move_anim: @ 814B464 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r3, [r0] bl dp01_tbl4_exec_completed b _0814B4DA @@ -720,9 +720,9 @@ _0814B4DA: thumb_func_start sub_814B4E0 sub_814B4E0: @ 814B4E0 push {r4,lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -753,7 +753,7 @@ sub_814B4E0: @ 814B4E0 movs r3, 0x6 bl move_anim_start_t4 _0814B526: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -771,7 +771,7 @@ sub_814B554: @ 814B554 push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -783,8 +783,8 @@ sub_814B554: @ 814B554 ands r0, r1 cmp r0, 0 bne _0814B590 - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -810,7 +810,7 @@ sub_814B5A8: @ 814B5A8 push {r7} ldr r3, =gUnknown_020244D0 ldr r0, [r3] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r1, [r7] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -846,7 +846,7 @@ sub_814B5A8: @ 814B5A8 ldr r0, =c3_0802FDF4 movs r1, 0xA bl CreateTask - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r8, r0 ldrb r1, [r7] lsls r0, r1, 1 @@ -857,14 +857,14 @@ sub_814B5A8: @ 814B5A8 ldr r5, =gPlayerParty adds r0, r5 bl sub_805E990 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldrb r0, [r7] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectImageAnim @@ -885,7 +885,7 @@ sub_814B5A8: @ 814B5A8 adds r0, r4 ldrb r0, [r0] bl sub_80729D0 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -905,7 +905,7 @@ sub_814B69C: @ 814B69C push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -917,7 +917,7 @@ sub_814B69C: @ 814B69C ands r0, r1 cmp r0, 0 bne _0814B6CE - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -927,7 +927,7 @@ sub_814B69C: @ 814B69C adds r0, r2, 0 bl sub_8172EF0 _0814B6CE: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gUnknown_03005D7C ldrb r2, [r4] adds r0, r2, r0 @@ -955,7 +955,7 @@ _0814B6CE: bne _0814B714 adds r0, r3, r5 bl RemoveObjectAndFreeTiles - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -972,8 +972,8 @@ _0814B714: dp01_tbl4_exec_completed: @ 814B740 push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -991,8 +991,8 @@ dp01_tbl4_exec_completed: @ 814B740 movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably - ldr r1, =gUnknown_02023064 + bl PrepareBufferDataTransferLink + ldr r1, =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -1001,7 +1001,7 @@ dp01_tbl4_exec_completed: @ 814B740 b _0814B7A6 .pool _0814B794: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -1023,7 +1023,7 @@ sub_814B7B8: @ 814B7B8 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1047,7 +1047,7 @@ sub_814B7E8: @ 814B7E8 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1071,8 +1071,8 @@ dp01t_00_4_getattr: @ 814B818 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -1080,7 +1080,7 @@ dp01t_00_4_getattr: @ 814B818 ldrb r0, [r1] cmp r0, 0 bne _0814B850 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -1133,8 +1133,8 @@ dp01_getattr_by_ch1_for_player_pokemon__: @ 814B88C lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, =gUnknown_02023064 - ldr r3, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -2010,8 +2010,8 @@ sub_814C038: @ 814C038 thumb_func_start sub_814C044 sub_814C044: @ 814C044 push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -2019,7 +2019,7 @@ sub_814C044: @ 814C044 ldrb r0, [r1] cmp r0, 0 bne _0814C074 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -2060,7 +2060,7 @@ sub_814C09C: @ 814C09C sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r2, =gUnknown_02023067 @@ -2151,12 +2151,12 @@ _0814C1D0: adds r0, r4, 0 movs r1, 0xB adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x2E adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r0, 0 mov r8, r0 movs r0, 0x3B @@ -2197,12 +2197,12 @@ _0814C236: adds r1, 0xD mov r0, r9 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 mov r0, r9 adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData adds r7, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -2218,15 +2218,15 @@ _0814C236: adds r0, r4, 0 movs r1, 0x15 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x20] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x19 ldr r2, [sp, 0x28] - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x14] lsls r0, 27 lsrs r0, 27 @@ -2235,7 +2235,7 @@ _0814C236: adds r0, r4, 0 movs r1, 0x27 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x14] lsls r0, 22 @@ -2244,7 +2244,7 @@ _0814C236: adds r0, r4, 0 movs r1, 0x28 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x15] lsls r0, 25 @@ -2253,7 +2253,7 @@ _0814C236: adds r0, r4, 0 movs r1, 0x29 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldr r0, [r6, 0x14] lsls r0, 12 @@ -2262,7 +2262,7 @@ _0814C236: adds r0, r4, 0 movs r1, 0x2A mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x16] lsls r0, 23 @@ -2271,7 +2271,7 @@ _0814C236: adds r0, r4, 0 movs r1, 0x2B mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x17] lsls r0, 26 @@ -2280,47 +2280,47 @@ _0814C236: adds r0, r4, 0 movs r1, 0x2C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0 ldr r2, [sp, 0x2C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x37 ldr r2, [sp, 0x30] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 ldr r2, [sp, 0x18] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A ldr r2, [sp, 0x24] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3B ldr r2, [sp, 0x4] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C ldr r2, [sp, 0x8] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D ldr r2, [sp, 0xC] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E ldr r2, [sp, 0x10] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F ldr r2, [sp, 0x14] - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C368: @@ -2328,12 +2328,12 @@ _0814C368: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xB - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C388: @@ -2341,12 +2341,12 @@ _0814C388: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C3A8: @@ -2368,12 +2368,12 @@ _0814C3C2: adds r1, 0xD adds r0, r7, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 adds r0, r7, 0 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -2387,7 +2387,7 @@ _0814C3C2: adds r0, r1 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C400: @@ -2395,8 +2395,8 @@ _0814C400: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -2411,41 +2411,41 @@ _0814C428: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x11 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x12 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x13 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x14 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x15 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C48C: @@ -2453,8 +2453,8 @@ _0814C48C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -2464,7 +2464,7 @@ _0814C48C: _0814C4A4: adds r3, 0x3 adds r2, r3 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C4BC: @@ -2472,12 +2472,12 @@ _0814C4BC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C4DC: @@ -2485,12 +2485,12 @@ _0814C4DC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C4FC: @@ -2498,12 +2498,12 @@ _0814C4FC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1A - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C51C: @@ -2511,12 +2511,12 @@ _0814C51C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1B - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C53C: @@ -2524,12 +2524,12 @@ _0814C53C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1C - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C55C: @@ -2537,12 +2537,12 @@ _0814C55C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1D - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C57C: @@ -2550,12 +2550,12 @@ _0814C57C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1E - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C59C: @@ -2563,12 +2563,12 @@ _0814C59C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1F - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C5BC: @@ -2576,12 +2576,12 @@ _0814C5BC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C5DC: @@ -2589,12 +2589,12 @@ _0814C5DC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x22 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C5FC: @@ -2602,12 +2602,12 @@ _0814C5FC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C61C: @@ -2615,12 +2615,12 @@ _0814C61C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x24 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C63C: @@ -2628,12 +2628,12 @@ _0814C63C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x25 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C65C: @@ -2641,12 +2641,12 @@ _0814C65C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C67C: @@ -2655,41 +2655,41 @@ _0814C67C: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x5 @@ -2702,12 +2702,12 @@ _0814C6EC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C70C: @@ -2715,12 +2715,12 @@ _0814C70C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C72C: @@ -2728,12 +2728,12 @@ _0814C72C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C74C: @@ -2741,12 +2741,12 @@ _0814C74C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C76C: @@ -2754,12 +2754,12 @@ _0814C76C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C78C: @@ -2767,13 +2767,13 @@ _0814C78C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 _0814C79C: movs r1, 0x2C - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C7AC: @@ -2781,12 +2781,12 @@ _0814C7AC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C7CC: @@ -2794,12 +2794,12 @@ _0814C7CC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x9 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C7EC: @@ -2807,12 +2807,12 @@ _0814C7EC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x37 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C80C: @@ -2820,12 +2820,12 @@ _0814C80C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x38 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C82C: @@ -2833,12 +2833,12 @@ _0814C82C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C84C: @@ -2846,12 +2846,12 @@ _0814C84C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3A - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C86C: @@ -2859,12 +2859,12 @@ _0814C86C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3B - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C88C: @@ -2872,12 +2872,12 @@ _0814C88C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3C - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C8AC: @@ -2885,12 +2885,12 @@ _0814C8AC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3D - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C8CC: @@ -2898,12 +2898,12 @@ _0814C8CC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3E - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C8EC: @@ -2911,12 +2911,12 @@ _0814C8EC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3F - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C90C: @@ -2924,12 +2924,12 @@ _0814C90C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C92C: @@ -2937,12 +2937,12 @@ _0814C92C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C94C: @@ -2950,12 +2950,12 @@ _0814C94C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C96C: @@ -2963,12 +2963,12 @@ _0814C96C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C98C: @@ -2976,12 +2976,12 @@ _0814C98C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C9AC: @@ -2989,12 +2989,12 @@ _0814C9AC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x30 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C9CC: @@ -3002,12 +3002,12 @@ _0814C9CC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x32 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814C9EC: @@ -3015,12 +3015,12 @@ _0814C9EC: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x33 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814CA0C: @@ -3028,12 +3028,12 @@ _0814CA0C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x34 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814CA2C: @@ -3041,12 +3041,12 @@ _0814CA2C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x35 - bl pokemon_setattr + bl SetMonData b _0814CA62 .pool _0814CA4C: @@ -3054,15 +3054,15 @@ _0814CA4C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 - bl pokemon_setattr + bl SetMonData _0814CA62: - ldr r2, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r2, =gBattlePartyID + ldr r0, =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -3086,8 +3086,8 @@ _0814CA62: thumb_func_start sub_814CA98 sub_814CA98: @ 814CA98 push {r4-r7,lr} - ldr r1, =gUnknown_0202406E - ldr r7, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r7, =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -3095,7 +3095,7 @@ sub_814CA98: @ 814CA98 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -3143,9 +3143,9 @@ sub_814CB0C: @ 814CB0C push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r8, r0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] lsls r0, r1, 1 add r0, r8 @@ -3167,7 +3167,7 @@ sub_814CB0C: @ 814CB0C lsls r4, 16 lsrs r4, 16 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3195,11 +3195,11 @@ sub_814CB0C: @ 814CB0C adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -3241,7 +3241,7 @@ sub_814CB0C: @ 814CB0C adds r2, r1 ldrb r1, [r2] bl StartObjectImageAnim - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -3258,15 +3258,15 @@ sub_814CB0C: @ 814CB0C thumb_func_start sub_814CC28 sub_814CC28: @ 814CC28 push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r1, r0, 9 adds r6, r4, 0x2 adds r1, r6 ldrb r1, [r1] bl sub_805EF84 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -3289,7 +3289,7 @@ sub_814CC28: @ 814CC28 adds r1, r6 ldrb r1, [r1] bl sub_814CC98 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3315,10 +3315,10 @@ sub_814CC98: @ 814CC98 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r2, r6, 1 adds r2, r0 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -3343,7 +3343,7 @@ sub_814CC98: @ 814CC98 mov r1, r9 strb r0, [r1] adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3371,10 +3371,10 @@ sub_814CC98: @ 814CC98 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds adds r4, r6, r4 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -3467,8 +3467,8 @@ sub_814CC98: @ 814CC98 thumb_func_start sub_814CE14 sub_814CE14: @ 814CE14 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -3484,7 +3484,7 @@ sub_814CE14: @ 814CE14 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -3493,13 +3493,13 @@ sub_814CE14: @ 814CE14 b _0814CE92 .pool _0814CE5C: - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -3528,7 +3528,7 @@ sub_814CEA4: @ 814CEA4 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -3580,7 +3580,7 @@ _0814CEFA: adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3604,9 +3604,9 @@ sub_814CF30: @ 814CF30 ands r0, r1 cmp r0, 0 beq _0814CF60 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 ands r1, r0 movs r7, 0x20 @@ -3618,7 +3618,7 @@ sub_814CF30: @ 814CF30 _0814CF60: movs r7, 0x50 _0814CF62: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl sub_806D864 ldr r6, =gUnknown_020229E8 @@ -3693,12 +3693,12 @@ _0814CFF2: adds r1, r6 ldrb r4, [r1, 0x13] _0814D002: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3726,11 +3726,11 @@ _0814D002: mov r1, r8 adds r2, r4, 0 bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -3772,7 +3772,7 @@ _0814D002: adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3797,15 +3797,15 @@ sub_814D0E4: @ 814D0E4 thumb_func_start sub_814D0F0 sub_814D0F0: @ 814D0F0 push {r4-r6,lr} - ldr r6, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -3855,7 +3855,7 @@ sub_814D0F0: @ 814D0F0 adds r0, r5 ldr r1, =DummyObjectCallback bl oamt_set_x3A_32 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3872,7 +3872,7 @@ sub_814D19C: @ 814D19C push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -3916,7 +3916,7 @@ _0814D1F0: cmp r4, 0 bne _0814D266 strb r4, [r3, 0x4] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -3930,8 +3930,8 @@ _0814D1F0: negs r1, r1 movs r0, 0x10 bl audio_play_and_stuff - ldr r2, =gUnknown_02020630 - ldr r3, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r3, =gBankSpriteIds ldrb r0, [r5] adds r0, r3 ldrb r1, [r0] @@ -3959,7 +3959,7 @@ _0814D1F0: adds r0, r2 ldr r1, =sub_8039C00 str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4009,7 +4009,7 @@ sub_814D2B8: @ 814D2B8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -4017,7 +4017,7 @@ sub_814D2B8: @ 814D2B8 beq _0814D2CE b _0814D3F4 _0814D2CE: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA mov r12, r0 ldrb r1, [r5] lsls r1, 9 @@ -4134,7 +4134,7 @@ _0814D3CC: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4160,8 +4160,8 @@ bx_move_anim_4: @ 814D40C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r6, =gActiveBank ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -4288,7 +4288,7 @@ _0814D4CE: _0814D51C: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -4345,7 +4345,7 @@ sub_814D590: @ 814D590 strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r4, [r5] lsls r4, 9 ldr r0, =gUnknown_02023066 @@ -4355,7 +4355,7 @@ sub_814D590: @ 814D590 ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4434,8 +4434,8 @@ sub_814D63C: @ 814D63C sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r0, =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -4452,7 +4452,7 @@ sub_814D63C: @ 814D63C ldr r0, =0x00007fff cmp r7, r0 beq _0814D6CC - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -4484,7 +4484,7 @@ sub_814D63C: @ 814D63C b _0814D6F6 .pool _0814D6CC: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -4504,8 +4504,8 @@ _0814D6CC: movs r3, 0 bl sub_807294C _0814D6F6: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4532,7 +4532,7 @@ sub_814D72C: @ 814D72C thumb_func_start sub_814D738 sub_814D738: @ 814D738 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -4542,7 +4542,7 @@ sub_814D738: @ 814D738 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -4565,7 +4565,7 @@ sub_814D738: @ 814D738 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4581,13 +4581,13 @@ _0814D78C: thumb_func_start sub_814D7B0 sub_814D7B0: @ 814D7B0 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0814D800 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -4612,7 +4612,7 @@ sub_814D7B0: @ 814D7B0 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4716,8 +4716,8 @@ sub_814D884: @ 814D884 sub_814D8A0: @ 814D8A0 push {lr} ldr r3, =gUnknown_02022D0C - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4775,9 +4775,9 @@ sub_814D8F0: @ 814D8F0 thumb_func_start dp01t_29_4_blink dp01t_29_4_blink: @ 814D918 push {r4,lr} - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -4794,7 +4794,7 @@ dp01t_29_4_blink: @ 814D918 b _0814D976 .pool _0814D94C: - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -4808,7 +4808,7 @@ _0814D94C: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4832,16 +4832,16 @@ sub_814D988: @ 814D988 thumb_func_start sub_814D994 sub_814D994: @ 814D994 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _0814D9A8 movs r3, 0xC0 _0814D9A8: - ldr r2, =gUnknown_02023064 + ldr r2, =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -4865,8 +4865,8 @@ _0814D9A8: thumb_func_start sub_814D9D8 sub_814D9D8: @ 814D9D8 push {r4,r5,lr} - ldr r4, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -4908,8 +4908,8 @@ _0814DA28: thumb_func_start sub_814DA34 sub_814DA34: @ 814DA34 push {lr} - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -4935,8 +4935,8 @@ sub_814DA34: @ 814DA34 thumb_func_start dp01t_2E_4_battle_intro dp01t_2E_4_battle_intro: @ 814DA74 push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -4957,15 +4957,15 @@ dp01t_2E_4_battle_intro: @ 814DA74 thumb_func_start sub_814DAA8 sub_814DAA8: @ 814DAA8 push {r4-r7,lr} - ldr r5, =gUnknown_020241E4 - ldr r6, =gUnknown_02024064 + ldr r5, =gBankSpriteIds + ldr r6, =gActiveBank ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -5120,9 +5120,9 @@ _0814DC06: adds r1, r4, r2 movs r2, 0x20 bl LoadCompressedPalette - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r5, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r5, =gActiveBank ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -5176,7 +5176,7 @@ _0814DC80: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -5212,7 +5212,7 @@ sub_814DCCC: @ 814DCCC b _0814DDB4 .pool _0814DCF8: - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -5228,12 +5228,12 @@ _0814DCF8: cmp r0, 0 beq _0814DD48 _0814DD18: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -5244,12 +5244,12 @@ _0814DD18: b _0814DD9C .pool _0814DD48: - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -5284,8 +5284,8 @@ _0814DD48: eors r0, r6 strb r0, [r7] _0814DD9C: - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -5308,8 +5308,8 @@ _0814DDB4: thumb_func_start sub_814DDD8 sub_814DDD8: @ 814DDD8 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -5318,7 +5318,7 @@ sub_814DDD8: @ 814DDD8 cmp r0, 0 beq _0814DE08 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0814DE08 @@ -5328,7 +5328,7 @@ sub_814DDD8: @ 814DDD8 _0814DE08: ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -5378,7 +5378,7 @@ _0814DE08: movs r1, 0x5D strb r1, [r0, 0x5] _0814DE70: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -5396,7 +5396,7 @@ sub_814DE9C: @ 814DE9C push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -5432,7 +5432,7 @@ sub_814DEE4: @ 814DEE4 push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -5472,14 +5472,14 @@ sub_814DF34: @ 814DF34 thumb_func_start sub_814DF40 sub_814DF40: @ 814DF40 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _0814DF86 - ldr r3, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r0, =gBankSpriteIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -5487,7 +5487,7 @@ sub_814DF40: @ 814DF40 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -5516,13 +5516,13 @@ _0814DF86: sub_814DFA0: @ 814DFA0 push {r4-r6,lr} sub sp, 0x4 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0814E002 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r2, [r5] lsls r1, r2, 9 adds r0, r4, 0x1 @@ -5548,7 +5548,7 @@ sub_814DFA0: @ 814DFA0 b _0814DFFC .pool _0814DFF0: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -5568,7 +5568,7 @@ _0814E002: thumb_func_start sub_814E014 sub_814E014: @ 814E014 push {lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r1, =gUnknown_02023066 @@ -5591,13 +5591,13 @@ sub_814E034: @ 814E034 thumb_func_start sub_814E040 sub_814E040: @ 814E040 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 9 ldr r4, =gUnknown_02023068 adds r0, r4 bl sub_81851A8 - ldr r2, =gUnknown_0202433A + ldr r2, =gBattleOutcome ldrb r0, [r5] lsls r0, 9 subs r1, r4, 0x3 @@ -5627,7 +5627,7 @@ sub_814E040: @ 814E040 movs r0, 0x3 bl BeginFastPaletteFade bl dp01_tbl4_exec_completed - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index f7dfc1ed0..c83e666f5 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -93,11 +93,11 @@ move_anim_start_t1: @ 80A3A10 lsls r1, 16 lsrs r1, 16 ldr r2, =gUnknown_02038436 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r2] ldr r2, =gUnknown_02038437 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] strb r0, [r2] ldr r0, =gUnknown_082C8D6C @@ -134,13 +134,13 @@ move_something: @ 80A3A48 mov r0, r8 lsls r0, 2 mov r10, r0 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID movs r7, 0x64 ldr r5, =gUnknown_02038438 _080A3A84: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A3AA8 @@ -900,12 +900,12 @@ sub_80A40F4: @ 80A40F4 ldr r1, =gTasks + 0x8 mov r8, r1 adds r6, r0, r1 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds movs r2, 0 ldrsh r0, [r6, r2] adds r0, r1 ldrb r5, [r0] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -1013,7 +1013,7 @@ _080A41FA: cmp r0, 0 beq _080A4266 adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 movs r1, 0xFF lsls r1, 24 @@ -1065,7 +1065,7 @@ _080A4266: cmp r0, 0 beq _080A42D8 adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 movs r1, 0xFF lsls r1, 24 @@ -1160,8 +1160,8 @@ _080A4330: ands r0, r1 cmp r0, 0 beq _080A4374 - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r5, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -1263,11 +1263,11 @@ _080A43F8: movs r1, 0x1 movs r2, 0 bl lcd_bg_operations - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r6, r0 ldrb r4, [r0] ldr r5, =gUnknown_02022E18 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1295,7 +1295,7 @@ _080A43F8: strh r0, [r5] _080A447A: ldr r5, =gUnknown_02022E1A - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1309,7 +1309,7 @@ _080A447A: mov r0, r9 cmp r0, 0 beq _080A44B0 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r6, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -1356,7 +1356,7 @@ _080A44B0: .pool _080A4524: adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r3, r0, 24 _080A452E: @@ -1428,11 +1428,11 @@ _080A455E: movs r1, 0x1 movs r2, 0 bl lcd_bg_operations - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r2, r5, r0 ldrb r4, [r2] ldr r5, =gUnknown_02022E1C - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1482,7 +1482,7 @@ _080A460E: adds r0, r4, 0 bl CpuSet adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 @@ -1691,7 +1691,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8 ldrb r6, [r5, 0x14] mov r0, sp bl sub_80A6B30 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1801,8 +1801,8 @@ _080A48E2: ldrb r0, [r3] cmp r0, 0xFF beq _080A4908 - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r5, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -1821,8 +1821,8 @@ _080A4908: ldrb r0, [r3, 0x1] cmp r0, 0xFF beq _080A4948 - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds movs r1, 0x2 adds r0, r5, 0 eors r0, r1 @@ -1883,7 +1883,7 @@ sub_80A4980: @ 80A4980 cmp r0, 0x1 beq _080A4A0A ldrb r0, [r1, 0xC] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 movs r1, 0xFF lsls r1, 24 @@ -1977,7 +1977,7 @@ _080A4A4A: cmp r0, 0 beq _080A4A8A adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 movs r1, 0xFF lsls r1, 24 @@ -2010,7 +2010,7 @@ _080A4A8A: cmp r0, 0 beq _080A4ACA adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 movs r1, 0xFF lsls r1, 24 @@ -2078,8 +2078,8 @@ _080A4B0E: lsls r0, 24 cmp r0, 0 beq _080A4B38 - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r6, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -2103,8 +2103,8 @@ _080A4B38: lsls r0, 24 cmp r0, 0 beq _080A4B78 - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -2163,7 +2163,7 @@ sub_80A4BB0: @ 80A4BB0 beq _080A4C3E ldrb r4, [r1, 0xC] adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 movs r1, 0xFF lsls r1, 24 @@ -2528,7 +2528,7 @@ sub_80A4E5C: @ 80A4E5C _080A4EA8: ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A4ECC @@ -2879,7 +2879,7 @@ sub_80A5178: @ 80A5178 cmp r0, 0 beq _080A51C0 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r4, 0xC0 cmp r0, 0 @@ -2907,13 +2907,13 @@ _080A51C0: _080A51E8: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A5226 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A5252 @@ -2935,7 +2935,7 @@ _080A5218: _080A5226: ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3001,7 +3001,7 @@ sub_80A5278: @ 80A5278 cmp r0, 0 beq _080A52C0 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r4, 0xC0 cmp r0, 0 @@ -3012,7 +3012,7 @@ sub_80A5278: @ 80A5278 _080A52C0: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A52D8 @@ -3867,7 +3867,7 @@ _080A59A0: ldr r0, =gUnknown_02038436 _080A59A2: ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r4, r0, 24 bl sub_80A4DF0 @@ -3929,11 +3929,11 @@ sub_80A5A0C: @ 80A5A0C str r0, [r1] ldr r7, =gUnknown_02038436 ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r5, =gUnknown_02038437 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -3946,7 +3946,7 @@ sub_80A5A0C: @ 80A5A0C _080A5A48: ldrb r0, [r7] _080A5A4A: - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r4, r0, 24 bl sub_80A4DF0 @@ -3983,7 +3983,7 @@ ma2B_make_side_invisible: @ 80A5A80 lsrs r2, r0, 24 cmp r2, 0xFF beq _080A5AA8 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -4014,7 +4014,7 @@ ma2C_make_side_visible: @ 80A5ABC lsrs r2, r0, 24 cmp r2, 0xFF beq _080A5AE6 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -4053,11 +4053,11 @@ sub_80A5AFC: @ 80A5AFC beq _080A5BA6 ldr r6, =gUnknown_02038436 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r5, =gUnknown_02038437 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -4065,7 +4065,7 @@ sub_80A5AFC: @ 80A5AFC cmp r7, 0 bne _080A5B54 ldrb r0, [r6] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r4, r0, 24 movs r0, 0 @@ -4073,7 +4073,7 @@ sub_80A5AFC: @ 80A5AFC .pool _080A5B54: ldrb r0, [r5] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x1 @@ -4083,7 +4083,7 @@ _080A5B60: lsrs r2, r0, 24 cmp r2, 0xFF beq _080A5BA6 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -4135,11 +4135,11 @@ sub_80A5BAC: @ 80A5BAC beq _080A5C38 ldr r6, =gUnknown_02038436 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r5, =gUnknown_02038437 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -4147,7 +4147,7 @@ sub_80A5BAC: @ 80A5BAC cmp r7, 0 bne _080A5C04 ldrb r0, [r6] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r4, r0, 24 movs r0, 0 @@ -4155,7 +4155,7 @@ sub_80A5BAC: @ 80A5BAC .pool _080A5C04: ldrb r0, [r5] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x1 @@ -4167,7 +4167,7 @@ _080A5C10: beq _080A5C38 cmp r4, 0x2 bne _080A5C38 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index d4662b497..2c80c2d3b 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -24,7 +24,7 @@ sub_80FE840: @ 80FE840 strh r0, [r4, 0x30] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080FE87C @@ -388,7 +388,7 @@ sub_80FEB44: @ 80FEB44 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080FEB90 @@ -496,7 +496,7 @@ sub_80FEC48: @ 80FEC48 bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080FEC68 @@ -732,7 +732,7 @@ _080FEE36: _080FEE3E: ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1028,7 +1028,7 @@ sub_80FF090: @ 80FF090 adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080FF0B4 @@ -1082,7 +1082,7 @@ sub_80FF0F4: @ 80FF0F4 bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080FF114 @@ -1141,11 +1141,11 @@ _080FF174: bl sub_80A68D4 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -1520,7 +1520,7 @@ sub_80FF458: @ 80FF458 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r1, r0, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r10, r0 lsls r0, r1, 4 adds r0, r1 @@ -1631,7 +1631,7 @@ sub_80FF53C: @ 80FF53C ldrh r0, [r4, 0x1C] adds r1, r0 strh r1, [r4, 0x1C] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -1641,7 +1641,7 @@ sub_80FF53C: @ 80FF53C strh r1, [r5, 0x24] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080FF586 @@ -1704,7 +1704,7 @@ sub_80FF5CC: @ 80FF5CC lsrs r4, 24 adds r0, r4, 0 bl sub_80A7344 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1787,7 +1787,7 @@ sub_80FF698: @ 80FF698 _080FF6AA: ldr r6, =gUnknown_02038437 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080FF6C2 @@ -2460,7 +2460,7 @@ sub_80FFBF4: @ 80FFBF4 lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -2982,7 +2982,7 @@ sub_80FFFC0: @ 80FFFC0 bl sub_80A861C strh r0, [r5, 0x1E] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 movs r2, 0x1 @@ -3019,7 +3019,7 @@ _08100028: adds r0, r6, 0 bl move_anim_task_del _08100060: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r0, 0xC ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -3124,7 +3124,7 @@ sub_8100128: @ 8100128 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 movs r1, 0x8 ldrsh r5, [r6, r1] @@ -3638,7 +3638,7 @@ sub_8100524: @ 8100524 ble _081005BA movs r0, 0 strh r0, [r6, 0x24] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 movs r2, 0xC ldrsh r1, [r6, r2] @@ -3780,7 +3780,7 @@ _0810065C: _0810065E: ldrb r6, [r0] adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08100688 @@ -3903,7 +3903,7 @@ sub_810074C: @ 810074C strh r0, [r4, 0x3C] movs r1, 0x30 ldrsh r2, [r4, r1] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r5, 0x2E ldrsh r0, [r4, r5] lsls r0, 1 @@ -4239,7 +4239,7 @@ sub_81009F8: @ 81009F8 adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08100A20 @@ -4279,7 +4279,7 @@ sub_8100A50: @ 8100A50 adds r5, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08100A6A @@ -4357,7 +4357,7 @@ sub_8100AE0: @ 8100AE0 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08100B14 @@ -4511,7 +4511,7 @@ _08100C3E: strh r4, [r6, 0x22] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08100C56 @@ -4655,7 +4655,7 @@ sub_8100D38: @ 8100D38 adds r0, r2, 0 ands r0, r1 strb r0, [r3] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -4686,7 +4686,7 @@ _08100D94: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -4728,7 +4728,7 @@ _08100DE0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles movs r0, 0x30 @@ -4756,7 +4756,7 @@ sub_8100E1C: @ 8100E1C strh r0, [r5, 0x2E] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08100E44 @@ -4885,7 +4885,7 @@ _08100F06: adds r0, r4 strh r0, [r5, 0x22] ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08100F44 @@ -5525,7 +5525,7 @@ sub_8101440: @ 8101440 bl sub_80A6838 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08101474 @@ -5613,7 +5613,7 @@ sub_81014F4: @ 81014F4 bl sub_80A6838 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810152C @@ -6201,7 +6201,7 @@ sub_8101998: @ 8101998 strh r0, [r4, 0x2E] ldr r5, =gUnknown_02038436 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x2 negs r2, r2 @@ -6213,7 +6213,7 @@ _081019B6: strh r1, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -6237,7 +6237,7 @@ sub_81019E8: @ 81019E8 ldrsh r6, [r5, r0] cmp r6, 0 bne _08101A24 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r4, =gUnknown_02038436 ldrb r0, [r4] adds r0, r1 @@ -6246,7 +6246,7 @@ sub_81019E8: @ 81019E8 movs r1, 0 bl sub_80A7270 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x3A] @@ -6303,7 +6303,7 @@ sub_8101A74: @ 8101A74 strh r0, [r4, 0x2E] ldr r5, =gUnknown_02038436 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0x3 cmp r0, 0 @@ -6315,7 +6315,7 @@ _08101A92: strh r1, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -6360,19 +6360,19 @@ sub_8101AE8: @ 8101AE8 ldrsh r0, [r5, r1] cmp r0, 0 bne _08101B38 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r4, =gUnknown_02038436 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] strh r0, [r5, 0x34] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x3A] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08101B2C @@ -6465,14 +6465,14 @@ _08101BB6: b _08101C8E _08101BBC: strh r5, [r4, 0x30] - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r2, =gUnknown_02038436 ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] strh r0, [r4, 0x32] ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x34] @@ -6575,7 +6575,7 @@ sub_8101C94: @ 8101C94 adds r0, r6 lsls r0, 3 adds r5, r0, r1 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r2, =gUnknown_02038436 ldrb r0, [r2] adds r0, r1 @@ -6583,7 +6583,7 @@ sub_8101C94: @ 8101C94 movs r4, 0 strh r0, [r5, 0x8] ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 strh r2, [r5, 0xA] @@ -6716,7 +6716,7 @@ _08101D9E: _08101DC4: movs r0, 0x8 strh r0, [r4, 0xE] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x8 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -6758,7 +6758,7 @@ _08101E12: ands r0, r2 cmp r0, 0 beq _08101E34 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6771,7 +6771,7 @@ _08101E12: b _08101E48 .pool _08101E34: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x8 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -6788,7 +6788,7 @@ _08101E48: b _08101ED4 .pool _08101E54: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6813,7 +6813,7 @@ _08101E70: _08101E80: movs r0, 0x3 strh r0, [r4, 0xE] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x8 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -6848,7 +6848,7 @@ _08101EB4: adds r2, r0 _08101EC2: strh r2, [r4, 0x10] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -7539,7 +7539,7 @@ sub_8102434: @ 8102434 lsls r0, 24 lsrs r7, r0, 24 movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bcs _08102490 @@ -7551,7 +7551,7 @@ _08102448: cmp r0, 0x1 bne _08102464 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08102464 @@ -7564,7 +7564,7 @@ _08102464: cmp r0, 0x1 bne _08102482 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -7576,7 +7576,7 @@ _08102482: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bcc _08102448 @@ -7605,7 +7605,7 @@ _081024B2: lsls r0, 24 lsrs r4, r0, 24 _081024C2: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bcc _081024B2 @@ -7969,7 +7969,7 @@ _08102794: cmp r0, 0 bne _08102832 movs r2, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r5, 0x14 adds r5, r3 mov r12, r5 @@ -8115,7 +8115,7 @@ _08102862: _081028D4: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810291C @@ -8253,7 +8253,7 @@ sub_81029B4: @ 81029B4 lsls r1, 17 adds r0, r1 lsrs r3, r0, 16 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r6, r0] lsls r0, r1, 4 @@ -8288,7 +8288,7 @@ _08102A0C: movs r0, 0 strh r0, [r6, 0xE] movs r5, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r1, 0x1C adds r1, r7 mov r9, r1 @@ -8335,7 +8335,7 @@ _08102A9A: str r0, [r6] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8376,7 +8376,7 @@ sub_8102AE0: @ 8102AE0 bne _08102B32 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8440,7 +8440,7 @@ _08102B58: b _08102BC2 .pool _08102B80: - ldr r4, =gUnknown_08329F40 + ldr r4, =gSineTable movs r1, 0x2E ldrsh r0, [r5, r1] lsls r0, 1 @@ -8857,7 +8857,7 @@ sub_8102EB0: @ 8102EB0 adds r6, r0, 0 ldr r7, =gUnknown_02038436 ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -9149,7 +9149,7 @@ sub_810310C: @ 810310C lsls r0, 24 lsrs r5, r0, 24 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810312C @@ -9208,7 +9208,7 @@ _08103182: adds r1, r5, 0 bl sub_810310C adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 negs r1, r0 @@ -9437,7 +9437,7 @@ _08103362: adds r1, 0x43 strb r0, [r1] _08103372: - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r3, 0x30 ldrsh r0, [r2, r3] lsls r0, 1 @@ -9474,7 +9474,7 @@ _081033AE: adds r1, r5, 0 bl sub_810310C adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _081033D4 @@ -9674,7 +9674,7 @@ _08103538: sub_810353C: @ 810353C push {r4,lr} adds r4, r0, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -9729,13 +9729,13 @@ sub_810358C: @ 810358C lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038437 ldrb r0, [r0] adds r0, r1 ldrb r6, [r0] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _081035E4 @@ -9846,7 +9846,7 @@ sub_81036A0: @ 81036A0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 @@ -9871,12 +9871,12 @@ sub_81036DC: @ 81036DC push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r1, r0, r1 ldrb r4, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08103718 @@ -9917,7 +9917,7 @@ _08103726: ldrh r0, [r1, 0x8] adds r0, 0xB0 strh r0, [r1, 0x8] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -9942,7 +9942,7 @@ _08103776: ldrh r0, [r1, 0x8] subs r0, 0xB0 strh r0, [r1, 0x8] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -9994,7 +9994,7 @@ sub_81037D8: @ 81037D8 bl sub_80A6838 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08103804 @@ -10020,7 +10020,7 @@ _08103810: strh r0, [r4, 0x22] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810384C @@ -10119,7 +10119,7 @@ sub_81038C8: @ 81038C8 _081038EC: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810390E @@ -10547,7 +10547,7 @@ sub_8103C0C: @ 8103C0C lsls r0, 4 add r0, r12 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r6, r0, r1 movs r1, 0x10 ldrsh r0, [r5, r1] @@ -10676,7 +10676,7 @@ _08103D54: strh r0, [r3, 0x4] b _08103DB6 _08103D5C: - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide ldr r0, =gUnknown_02038437 ldrb r0, [r0] adds r0, r1 @@ -11068,7 +11068,7 @@ sub_8104088: @ 8104088 lsrs r7, r0, 16 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _081040CC @@ -11147,7 +11147,7 @@ sub_8104154: @ 8104154 strh r0, [r4, 0x24] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08104178 @@ -11354,7 +11354,7 @@ sub_8104304: @ 8104304 bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08104322 @@ -11690,7 +11690,7 @@ sub_81045B0: @ 81045B0 movs r2, 0xD0 movs r3, 0 bl obj_id_set_rotscale - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -11741,7 +11741,7 @@ sub_8104614: @ 8104614 lsrs r4, 24 adds r0, r4, 0 bl sub_80A7344 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -11936,7 +11936,7 @@ _081047D0: _081047D8: ldrb r0, [r4, 0x8] bl sub_80A7344 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -11981,13 +11981,13 @@ sub_8104800: @ 8104800 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl obj_delete_but_dont_free_vram b _081048DA .pool _08104844: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r3, r4, 4 adds r3, r4 lsls r3, 2 @@ -12184,7 +12184,7 @@ _081049CA: ldrh r2, [r4, 0x10] adds r2, 0x3 strh r2, [r4, 0x10] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12207,7 +12207,7 @@ _081049CA: _08104A00: adds r0, r4, 0 bl sub_80A7D34 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12234,7 +12234,7 @@ _08104A34: ldrsh r0, [r4, r1] cmp r0, 0 beq _08104A5C - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12267,7 +12267,7 @@ _08104A64: lsls r0, 16 cmp r0, 0 bne _08104A9C - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12347,7 +12347,7 @@ sub_8104B1C: @ 8104B1C adds r4, r0, 0 ldr r5, =gUnknown_02038436 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08104B50 @@ -12419,7 +12419,7 @@ _08104BC8: _08104BCA: ldrb r5, [r0] adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12540,7 +12540,7 @@ sub_8104CA4: @ 8104CA4 strh r0, [r4, 0xE] movs r0, 0x3 strh r0, [r4, 0x10] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12561,7 +12561,7 @@ sub_8104CA4: @ 8104CA4 strh r0, [r4, 0x1A] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12605,7 +12605,7 @@ sub_8104D28: @ 8104D28 ands r0, r1 cmp r0, 0 beq _08104D78 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -12618,7 +12618,7 @@ sub_8104D28: @ 8104D28 b _08104D8C .pool _08104D78: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r5, 0x8 ldrsh r1, [r3, r5] lsls r0, r1, 4 @@ -12646,7 +12646,7 @@ _08104DA4: beq _08104E0C b _08104E6C _08104DAA: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r5, 0x8 ldrsh r1, [r3, r5] lsls r0, r1, 4 @@ -12670,7 +12670,7 @@ _08104DAA: b _08104E6C .pool _08104DDC: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r5, 0x8 ldrsh r1, [r3, r5] lsls r0, r1, 4 @@ -12694,7 +12694,7 @@ _08104DDC: b _08104E6C .pool _08104E0C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -12777,7 +12777,7 @@ sub_8104E74: @ 8104E74 bl sub_80A861C strh r0, [r5, 0x26] ldrb r0, [r4] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13235,7 +13235,7 @@ _08105234: lsls r0, 24 lsrs r4, r0, 24 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08105260 @@ -13335,7 +13335,7 @@ _08105308: str r3, [sp, 0x4] _08105310: adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810536C @@ -13358,14 +13358,14 @@ _08105310: lsls r0, 24 cmp r0, 0 beq _0810535C - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r4, r0 b _081053EA .pool _0810535C: - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds add r0, r8 b _081053EA .pool @@ -13393,8 +13393,8 @@ _0810536C: lsls r0, 24 cmp r0, 0 beq _081053E4 - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds adds r0, r7, r2 ldrb r1, [r0] lsls r0, r1, 4 @@ -13423,8 +13423,8 @@ _081053E0: adds r0, r6, 0 b _081053F4 _081053E4: - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r7, r0 _081053EA: ldrb r1, [r0] @@ -13486,7 +13486,7 @@ _0810544C: strh r0, [r2, 0x2] _0810546C: mov r0, r8 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08105490 @@ -13583,7 +13583,7 @@ sub_8105538: @ 8105538 bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0xA0 cmp r0, 0 @@ -13624,7 +13624,7 @@ sub_810557C: @ 810557C strh r2, [r4, 0x2E] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0xA0 cmp r0, 0 @@ -13905,7 +13905,7 @@ sub_81057B8: @ 81057B8 lsrs r3, r0, 24 cmp r3, 0 bne _08105802 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -13952,7 +13952,7 @@ sub_8105810: @ 8105810 strh r0, [r4, 0x20] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08105850 @@ -14007,7 +14007,7 @@ _081058A0: beq _08105962 b _08105992 _081058AA: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -14040,7 +14040,7 @@ _081058CC: lsls r0, 16 cmp r0, 0 beq _08105904 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r4, 0x26 ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -14052,7 +14052,7 @@ _081058CC: b _08105916 .pool _08105904: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -14102,7 +14102,7 @@ _0810595A: strh r0, [r3, 0x8] b _08105992 _08105962: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r4, 0x26 ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -14197,7 +14197,7 @@ sub_81059E0: @ 81059E0 ands r0, r1 cmp r0, 0 beq _08105A3C - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r6, 0x26 ldrsh r1, [r4, r6] lsls r0, r1, 4 @@ -14212,7 +14212,7 @@ sub_81059E0: @ 81059E0 b _08105A52 .pool _08105A3C: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -14414,7 +14414,7 @@ _08105B9E: lsrs r2, r0, 24 cmp r2, 0x40 beq _08105C42 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -14686,7 +14686,7 @@ sub_8105DE8: @ 8105DE8 bl sub_80A69CC ldr r6, =gUnknown_02038436 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08105E08 @@ -14962,7 +14962,7 @@ sub_8106020: @ 8106020 ldr r2, =gUnknown_08593988 adds r0, r5, 0 bl sub_80A7CFC - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -14972,7 +14972,7 @@ sub_8106020: @ 8106020 b _081060A4 .pool _0810607C: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -15027,7 +15027,7 @@ sub_81060B0: @ 81060B0 ldr r2, =gUnknown_08593988 adds r0, r5, 0 bl sub_80A7CFC - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -15037,7 +15037,7 @@ sub_81060B0: @ 81060B0 b _08106134 .pool _0810610C: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -15563,7 +15563,7 @@ _0810653A: _08106578: ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -16653,7 +16653,7 @@ _08106E1C: _08106E1E: ldrb r6, [r0] adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -17198,7 +17198,7 @@ sub_8107260: @ 8107260 adds r6, r0, 0 ldr r5, =gUnknown_02038436 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08107290 @@ -17239,7 +17239,7 @@ _081072A2: strb r0, [r2] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _081072D8 @@ -17290,7 +17290,7 @@ _081072D8: ldrh r1, [r6, 0x22] subs r1, r0 strh r1, [r6, 0x22] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -17326,7 +17326,7 @@ sub_8107380: @ 8107380 ldrh r1, [r5, 0x38] lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -17424,7 +17424,7 @@ sub_810744C: @ 810744C bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810747C @@ -17797,7 +17797,7 @@ sub_8107730: @ 8107730 cmp r0, 0 bne _0810778A ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08107784 @@ -17848,11 +17848,11 @@ sub_81077C0: @ 81077C0 adds r6, r0, 0 ldr r5, =gUnknown_02038436 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -17863,12 +17863,12 @@ sub_81077C0: @ 81077C0 negs r0, r0 strh r0, [r4] ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 beq _08107802 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -17900,7 +17900,7 @@ _08107828: bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08107842 @@ -18071,7 +18071,7 @@ sub_8107954: @ 8107954 bl lcd_bg_operations ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -18176,7 +18176,7 @@ _08107A32: _08107AB4: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 @@ -18967,7 +18967,7 @@ sub_81080E4: @ 81080E4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19062,7 +19062,7 @@ _081081B6: ands r0, r1 cmp r0, 0 beq _08108200 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19083,7 +19083,7 @@ _081081B6: b _08108212 .pool _08108200: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19105,7 +19105,7 @@ _08108222: lsls r0, 24 lsrs r0, 24 bl sub_80A7E6C - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19178,7 +19178,7 @@ _081082A0: ands r0, r1 cmp r0, 0 beq _081082D8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19190,7 +19190,7 @@ _081082A0: b _081082EA .pool _081082D8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19225,7 +19225,7 @@ _081082EA: b _0810835E .pool _08108320: - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19280,11 +19280,11 @@ sub_8108384: @ 8108384 push {r4,r5,lr} ldr r4, =gUnknown_02038436 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _081083B8 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -19298,7 +19298,7 @@ _081083B4: adds r0, r2, 0 b _081083FA _081083B8: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -19402,7 +19402,7 @@ _08108472: lsls r6, r5, 16 cmp r2, 0x40 beq _081084DA - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -19578,7 +19578,7 @@ sub_81085C8: @ 81085C8 strh r0, [r4, 0xA] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08108600 @@ -19736,7 +19736,7 @@ sub_810871C: @ 810871C adds r4, r0, 0 lsls r1, 24 lsrs r6, r1, 24 - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0x18 ldrsh r0, [r4, r2] lsls r0, 1 @@ -19759,7 +19759,7 @@ sub_810871C: @ 810871C lsrs r1, r0, 24 cmp r1, 0x40 beq _08108776 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -19846,7 +19846,7 @@ sub_81087C0: @ 81087C0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 movs r1, 0x3 bl StartObjectRotScalAnim @@ -19971,7 +19971,7 @@ sub_81088E4: @ 81088E4 lsrs r0, 24 strh r0, [r5, 0x10] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -20202,7 +20202,7 @@ sub_8108AC0: @ 8108AC0 lsrs r0, 24 cmp r0, 0x40 beq _08108B1A - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -20584,7 +20584,7 @@ _08108DE2: bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -20639,7 +20639,7 @@ _08108E58: bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -20748,7 +20748,7 @@ sub_8108F4C: @ 8108F4C bl sub_80A6838 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08108F88 @@ -20800,7 +20800,7 @@ sub_8108FBC: @ 8108FBC adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08108FF0 @@ -20888,7 +20888,7 @@ sub_8109064: @ 8109064 bl sub_80A6838 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08109090 @@ -21039,24 +21039,24 @@ sub_8109198: @ 8109198 adds r6, r0, 0 ldr r5, =gUnknown_02038436 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _081091DE movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldrb r1, [r5] lsls r0, 24 lsrs r0, 24 cmp r1, r0 beq _081091D6 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldrb r1, [r5] lsls r0, 24 lsrs r0, 24 @@ -21398,7 +21398,7 @@ sub_8109460: @ 8109460 strh r5, [r4, 0xA] strh r5, [r4, 0xC] strh r5, [r4, 0xE] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21409,7 +21409,7 @@ sub_8109460: @ 8109460 strh r0, [r4, 0x10] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x12] @@ -21495,7 +21495,7 @@ _08109542: ands r0, r1 cmp r0, 0 beq _08109578 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21506,7 +21506,7 @@ _08109542: b _08109588 .pool _08109578: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21530,7 +21530,7 @@ _0810958A: ble _081095B8 movs r0, 0 strh r0, [r4, 0xE] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21553,7 +21553,7 @@ _081095C8: lsls r0, 24 lsrs r0, 24 bl sub_80A7E6C - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21648,7 +21648,7 @@ _08109672: ands r0, r1 cmp r0, 0 beq _081096AC - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21660,7 +21660,7 @@ _08109672: b _081096BE .pool _081096AC: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21720,7 +21720,7 @@ _0810971A: ands r0, r1 cmp r0, 0 beq _08109738 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21742,7 +21742,7 @@ _08109748: ldrsh r0, [r4, r1] cmp r0, 0 beq _08109764 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21759,7 +21759,7 @@ _08109764: lsrs r5, r0, 24 cmp r5, 0 bne _081097AA - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -21814,7 +21814,7 @@ sub_81097B4: @ 81097B4 lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -21822,7 +21822,7 @@ sub_81097B4: @ 81097B4 ldrh r4, [r0, 0x20] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810980C @@ -21867,7 +21867,7 @@ _08109834: lsrs r2, r0, 24 cmp r2, 0x40 beq _081098B6 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -21978,7 +21978,7 @@ sub_8109930: @ 8109930 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -21994,7 +21994,7 @@ sub_8109930: @ 8109930 lsrs r4, r0, 16 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08109970 @@ -22250,7 +22250,7 @@ _08109B18: strh r0, [r5, 0x3C] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08109B48 @@ -22281,7 +22281,7 @@ _08109B70: strh r0, [r5, 0x30] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08109B94 @@ -22580,7 +22580,7 @@ sub_8109DBC: @ 8109DBC adds r4, r1, r0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -22682,7 +22682,7 @@ _08109E94: ldrsh r0, [r2, r7] cmp r1, r0 bge _08109ED6 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r3, r2, 0 adds r3, 0x8 _08109EA6: @@ -22754,7 +22754,7 @@ _08109F1C: ldrsh r0, [r2, r7] cmp r1, r0 bge _08109F5E - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r3, r2, 0 adds r3, 0x8 _08109F2E: @@ -22829,7 +22829,7 @@ _08109FB0: ldrsh r0, [r2, r3] cmp r1, r0 bge _08109FF2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r3, r2, 0 adds r3, 0x8 _08109FC2: @@ -22878,7 +22878,7 @@ _0810A010: ldrsh r0, [r2, r3] cmp r1, r0 bge _0810A04E - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r3, r2, 0 adds r3, 0x8 movs r5, 0 @@ -22973,7 +22973,7 @@ _0810A0CA: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038437 ldrb r0, [r0] adds r0, r1 @@ -23007,7 +23007,7 @@ _0810A106: mov r12, r0 cmp r1, 0x1 bne _0810A154 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 @@ -23028,7 +23028,7 @@ _0810A144: b _0810A16E .pool _0810A154: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r4, r6, 4 adds r2, r4, r6 lsls r2, 2 @@ -23077,7 +23077,7 @@ sub_810A1A8: @ 810A1A8 adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810A1D0 @@ -23131,7 +23131,7 @@ sub_810A214: @ 810A214 adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810A23C @@ -23193,7 +23193,7 @@ sub_810A274: @ 810A274 strh r0, [r5, 0x22] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810A2C4 @@ -23329,7 +23329,7 @@ _0810A3BE: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r7, =gUnknown_08329F40 + ldr r7, =gSineTable ldr r6, =gUnknown_0203841E movs r1, 0 ldrsh r0, [r6, r1] @@ -23578,7 +23578,7 @@ sub_810A5BC: @ 810A5BC bne _0810A5D8 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810A5E0 @@ -23645,7 +23645,7 @@ _0810A64E: cmp r0, 0 bne _0810A666 adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810A66E @@ -24017,7 +24017,7 @@ _0810A970: _0810A978: cmp r7, 0 beq _0810A9AC - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r3, r5, 4 adds r3, r5 lsls r3, 2 @@ -24131,7 +24131,7 @@ sub_810AA2C: @ 810AA2C bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -24299,7 +24299,7 @@ sub_810AB78: @ 810AB78 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 ldr r1, =gUnknown_08595858 movs r2, 0x1A @@ -24539,7 +24539,7 @@ sub_810AD98: @ 810AD98 movs r0, 0x10 strh r0, [r5, 0x3C] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -24585,7 +24585,7 @@ _0810AE20: ldrh r1, [r4, 0x20] adds r0, r2, r1 strh r0, [r4, 0x20] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -24654,7 +24654,7 @@ _0810AE90: lsrs r0, 24 strh r0, [r5, 0x24] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810AECC @@ -24669,7 +24669,7 @@ _0810AECC: ldr r0, =0x0000fffe _0810AED2: strh r0, [r5, 0x22] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -24690,7 +24690,7 @@ _0810AEF0: ble _0810AFC0 movs r0, 0 strh r0, [r5, 0xA] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r1, 0x26 ldrsh r0, [r5, r1] lsls r2, r0, 4 @@ -24736,7 +24736,7 @@ _0810AF4C: ble _0810AFC0 movs r0, 0 strh r0, [r5, 0xA] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites movs r2, 0x26 ldrsh r0, [r5, r2] lsls r2, r0, 4 @@ -24769,7 +24769,7 @@ _0810AF92: b _0810AFC0 .pool _0810AFA0: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -24822,7 +24822,7 @@ _0810AFFA: _0810AFFC: ldr r4, =gUnknown_02038436 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -25005,7 +25005,7 @@ sub_810B154: @ 810B154 lsrs r2, r0, 24 cmp r2, 0x40 beq _0810B18A - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -25377,7 +25377,7 @@ sub_810B430: @ 810B430 lsrs r2, r0, 24 cmp r2, 0x40 beq _0810B49C - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -25629,7 +25629,7 @@ sub_810B614: @ 810B614 lsrs r1, r0, 24 cmp r1, 0x40 beq _0810B658 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -25985,7 +25985,7 @@ sub_810B8EC: @ 810B8EC strh r0, [r4, 0x32] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810B92C @@ -26051,7 +26051,7 @@ _0810B990: bl sub_80A8924 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810B9B6 @@ -26159,7 +26159,7 @@ _0810BA74: _0810BA86: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810BAAC @@ -26279,7 +26279,7 @@ sub_810BB60: @ 810BB60 strh r0, [r4, 0x2E] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =0x0000ffec cmp r0, 0 @@ -26314,7 +26314,7 @@ sub_810BBC8: @ 810BBC8 adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =0x0000ffec cmp r0, 0 @@ -26458,7 +26458,7 @@ _0810BCE0: _0810BCF2: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810BD1C @@ -26655,7 +26655,7 @@ _0810BE6C: bl sub_80A8924 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810BE92 @@ -26721,7 +26721,7 @@ _0810BEF4: movs r1, 0 bl sub_80A8924 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810BF20 @@ -26764,7 +26764,7 @@ _0810BF52: movs r1, 0 bl sub_80A8924 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810BF7C @@ -26808,7 +26808,7 @@ _0810BFB6: strh r0, [r5, 0x3A] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810BFCC @@ -27474,7 +27474,7 @@ sub_810C560: @ 810C560 lsls r0, 8 strh r0, [r5, 0x3C] _0810C594: - ldr r3, =gUnknown_02024076 + ldr r3, =gBanksBySide ldrb r0, [r7] adds r0, r3 ldrb r1, [r0] @@ -27506,7 +27506,7 @@ _0810C594: bne _0810C5F0 movs r0, 0x1 bl obj_id_for_side_relative_to_move - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -27643,7 +27643,7 @@ _0810C6F4: _0810C6F6: adds r0, r4, 0 bl sub_80A6F3C - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 1 @@ -27699,7 +27699,7 @@ _0810C736: lsls r0, 24 cmp r0, 0 bne _0810C78C - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide ldrb r0, [r6] adds r0, r1 ldrb r1, [r0] @@ -27716,7 +27716,7 @@ _0810C78C: _0810C78E: movs r0, 0 strh r0, [r4, 0x26] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 1 @@ -27737,7 +27737,7 @@ _0810C78E: _0810C7BC: adds r0, r4, 0 bl sub_80A6F3C - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 1 @@ -27843,7 +27843,7 @@ _0810C85A: lsls r0, 24 cmp r0, 0 bne _0810C8B4 - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide ldr r0, =gUnknown_02038437 ldrb r0, [r0] adds r0, r1 @@ -28050,7 +28050,7 @@ sub_810C9E4: @ 810C9E4 ldrh r0, [r4, 0x2] lsls r0, 20 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 adds r0, r5, 0 @@ -28162,7 +28162,7 @@ _0810CAE2: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r4, 0 mov r1, r9 @@ -28241,7 +28241,7 @@ _0810CB82: strh r0, [r4, 0x2E] cmp r0, 0x40 beq _0810CBE6 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -28373,7 +28373,7 @@ _0810CCA6: strh r0, [r5, 0x2E] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810CCCE @@ -28583,7 +28583,7 @@ sub_810CE68: @ 810CE68 bne _0810CE90 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810CE90 @@ -28771,7 +28771,7 @@ _0810D000: negs r0, r0 lsrs r4, r0, 16 _0810D012: - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide add r0, r8 ldrb r1, [r0] adds r0, r7, 0 @@ -28818,7 +28818,7 @@ _0810D028: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 movs r1, 0 bl StartObjectRotScalAnim @@ -28856,7 +28856,7 @@ sub_810D0B8: @ 810D0B8 ldrsh r0, [r5, r1] cmp r0, 0x40 beq _0810D0F4 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -28983,7 +28983,7 @@ sub_810D1B4: @ 810D1B4 cmp r0, r1 bne _0810D1E0 ldrb r0, [r2] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -28999,7 +28999,7 @@ _0810D1E0: bl sub_80A6980 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810D1FE @@ -29520,7 +29520,7 @@ sub_810D608: @ 810D608 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810D664 - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -29808,7 +29808,7 @@ sub_810D874: @ 810D874 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810D8B8 - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -29857,7 +29857,7 @@ _0810D8BE: .pool _0810D8F8: adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810D918 @@ -29954,7 +29954,7 @@ sub_810D984: @ 810D984 ldr r0, =gUnknown_02038432 ldrb r6, [r0] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810D9CE @@ -30020,7 +30020,7 @@ _0810DA34: _0810DA48: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810DA5E @@ -30130,7 +30130,7 @@ _0810DB1A: strh r0, [r4, 0x1C] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810DB50 @@ -30273,7 +30273,7 @@ _0810DC44: bl sub_80A8924 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810DC72 @@ -30399,7 +30399,7 @@ sub_810DD50: @ 810DD50 bl sub_80A8924 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810DD7C @@ -30460,7 +30460,7 @@ _0810DDE0: bl sub_80A8924 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810DE06 @@ -30682,7 +30682,7 @@ sub_810DFA8: @ 810DFA8 bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810DFC8 @@ -30750,7 +30750,7 @@ sub_810E044: @ 810E044 adds r5, r0, 0 ldr r4, =gUnknown_02038436 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810E070 @@ -30868,7 +30868,7 @@ sub_810E13C: @ 810E13C str r0, [r4, 0x1C] movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -30931,7 +30931,7 @@ sub_810E1C8: @ 810E1C8 adds r5, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810E1F8 @@ -31022,7 +31022,7 @@ _0810E274: _0810E296: movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -31107,7 +31107,7 @@ _0810E33C: _0810E33E: ldrb r6, [r0] adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810E354 @@ -31290,7 +31290,7 @@ _0810E4AA: ands r0, r2 orrs r0, r1 strb r0, [r5] - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable ldrh r0, [r5, 0x2] lsls r0, 1 adds r0, r3 @@ -31951,7 +31951,7 @@ _0810E97C: adds r0, 0xC adds r0, r1 ldrb r1, [r0] - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable mov r2, r12 lsls r0, r2, 1 adds r0, r3 @@ -32108,7 +32108,7 @@ _0810EAC4: bne _0810EADC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810EAF2 @@ -32119,7 +32119,7 @@ _0810EADC: bne _0810EAF8 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810EAF8 @@ -32290,7 +32290,7 @@ _0810EC46: bl sub_80A69CC movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -32380,7 +32380,7 @@ _0810ECE0: bge _0810ED1E movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -32417,7 +32417,7 @@ sub_810ED28: @ 810ED28 str r0, [r4, 0x1C] movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -32992,7 +32992,7 @@ sub_810F184: @ 810F184 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -33008,7 +33008,7 @@ _0810F1BC: bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -33040,7 +33040,7 @@ sub_810F1EC: @ 810F1EC mov r8, r0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810F212 @@ -33064,12 +33064,12 @@ _0810F212: bne _0810F2B8 _0810F22E: movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 adds r7, r4, 0 adds r0, r4, 0 - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -33111,7 +33111,7 @@ _0810F284: beq _0810F2B8 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810F2B0 @@ -33128,7 +33128,7 @@ _0810F2B0: _0810F2B8: ldr r6, =gUnknown_02038436 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810F2CE @@ -33193,7 +33193,7 @@ sub_810F340: @ 810F340 push {r4,r5,lr} adds r5, r0, 0 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 movs r1, 0x3C @@ -33209,8 +33209,8 @@ _0810F35C: lsls r0, 24 cmp r0, 0 beq _0810F382 - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -33230,8 +33230,8 @@ _0810F382: lsls r0, 24 cmp r0, 0 beq _0810F3AC - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -33370,7 +33370,7 @@ sub_810F46C: @ 810F46C cmp r0, 0 bne _0810F502 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 @@ -33379,8 +33379,8 @@ sub_810F46C: @ 810F46C lsls r0, 24 cmp r0, 0 beq _0810F4D4 - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -33402,8 +33402,8 @@ _0810F4D4: lsls r0, 24 cmp r0, 0 beq _0810F502 - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -33441,11 +33441,11 @@ sub_810F524: @ 810F524 cmp r0, 0 bne _0810F57C movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -33507,7 +33507,7 @@ _0810F5A6: beq _0810F5EE ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0810F5E0 @@ -33582,7 +33582,7 @@ sub_810F634: @ 810F634 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0810F684 @@ -33645,7 +33645,7 @@ sub_810F6B0: @ 810F6B0 lsls r1, 16 lsrs r7, r1, 16 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -33833,7 +33833,7 @@ sub_810F83C: @ 810F83C strh r1, [r4, 0xC] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0x8 cmp r0, 0 @@ -33890,7 +33890,7 @@ _0810F8D8: ldrsh r0, [r4, r1] cmp r0, 0 beq _0810F900 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -33906,7 +33906,7 @@ _0810F8D8: b _0810F936 .pool _0810F900: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -34081,7 +34081,7 @@ _0810FA5C: beq _0810FAA8 b _0810FABE _0810FA66: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -34090,7 +34090,7 @@ _0810FA66: b _0810FAB6 .pool _0810FA78: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -34102,7 +34102,7 @@ _0810FA78: b _0810FABC .pool _0810FA90: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -34114,7 +34114,7 @@ _0810FA90: b _0810FABE .pool _0810FAA8: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -34180,7 +34180,7 @@ _0810FB10: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles _0810FB2C: @@ -34455,7 +34455,7 @@ _0810FD60: lsrs r1, r0, 24 cmp r1, 0x40 beq _0810FDB4 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -34592,7 +34592,7 @@ _0810FE86: _0810FE92: ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -34697,7 +34697,7 @@ _0810FF66: ldrsh r0, [r5, r2] cmp r1, r0 bgt _0810FFFE - ldr r0, =gUnknown_08329F40 + ldr r0, =gSineTable mov r9, r0 movs r7, 0x3 ldr r1, =gUnknown_02038C28 @@ -34839,7 +34839,7 @@ _0811006C: b _08110116 .pool _08110094: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -34942,7 +34942,7 @@ _08110166: ldrh r0, [r4, 0xA] adds r0, 0x4 strh r0, [r4, 0xA] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 1 @@ -34980,7 +34980,7 @@ _081101B8: ldrh r0, [r4, 0xA] subs r0, 0x4 strh r0, [r4, 0xA] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 1 @@ -35020,7 +35020,7 @@ _08110208: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl obj_delete_but_dont_free_vram _0811021A: @@ -35211,7 +35211,7 @@ sub_8110368: @ 8110368 _08110394: ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _081103C4 @@ -35299,7 +35299,7 @@ sub_8110438: @ 8110438 _0811045C: ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08110478 @@ -35467,7 +35467,7 @@ sub_81105B4: @ 81105B4 bl sub_80A8924 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _081105F0 @@ -35492,7 +35492,7 @@ _081105FC: strh r0, [r4, 0x22] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08110618 @@ -35657,7 +35657,7 @@ sub_8110720: @ 8110720 _08110740: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08110762 @@ -35678,22 +35678,22 @@ _08110762: bne _081107B2 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r5, =gUnknown_02038437 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _081107B2 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 beq _081107A0 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -35782,7 +35782,7 @@ sub_8110850: @ 8110850 bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08110870 @@ -36066,7 +36066,7 @@ sub_8110AB4: @ 8110AB4 bl AnimateObject ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08110AE4 @@ -36256,7 +36256,7 @@ _08110C10: beq _08110C6E ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08110C6E @@ -36482,7 +36482,7 @@ sub_8110E4C: @ 8110E4C beq _08110E98 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08110E98 @@ -36786,7 +36786,7 @@ _081110E4: ldrh r1, [r4, 0x12] subs r0, r1 strh r0, [r4, 0x16] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -36855,7 +36855,7 @@ _08111170: adds r0, 0x1 strh r0, [r4, 0x8] _0811117A: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -37000,7 +37000,7 @@ _08111270: lsrs r2, r0, 24 cmp r2, 0x40 beq _081112FC - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -37195,7 +37195,7 @@ sub_8111418: @ 8111418 adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -37782,7 +37782,7 @@ sub_811188C: @ 811188C movs r2, 0x80 movs r3, 0 bl obj_id_set_rotscale - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -38276,7 +38276,7 @@ _08111C80: lsrs r1, 16 movs r0, 0x52 bl SetGpuReg - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -38287,7 +38287,7 @@ _08111C80: strh r1, [r0, 0x2E] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08111CF4 @@ -38326,7 +38326,7 @@ _08111CF4: ldr r1, =0x0000ff90 _08111D12: strh r1, [r0, 0x32] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -38443,7 +38443,7 @@ _08111DDA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl obj_delete_but_dont_free_vram movs r0, 0x1 @@ -38512,7 +38512,7 @@ sub_8111E78: @ 8111E78 adds r5, r0, r1 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r6, r0, 24 movs r1, 0x26 @@ -38561,7 +38561,7 @@ _08111EFE: b _081120CC .pool _08111F0C: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r1, 0x8 ldrsh r0, [r5, r1] lsls r1, r0, 4 @@ -38680,7 +38680,7 @@ _08111FD0: b _081120C6 .pool _08112014: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x22 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -38801,7 +38801,7 @@ sub_81120DC: @ 81120DC strh r0, [r4, 0x12] cmp r0, 0 bne _08112114 - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 1 @@ -38816,7 +38816,7 @@ _08112114: ldrsh r0, [r4, r2] cmp r0, 0x1 bne _08112136 - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 1 @@ -38866,7 +38866,7 @@ sub_8112170: @ 8112170 adds r4, r0, r1 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r6, r0, 24 movs r1, 0x26 @@ -38914,7 +38914,7 @@ _081121DC: b _08112258 .pool _081121F0: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x24 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -39235,7 +39235,7 @@ _08112436: lsls r5, r0, 4 add r5, r8 lsls r5, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r5, r1 lsls r0, r6, 4 strh r0, [r4, 0x2E] @@ -39314,7 +39314,7 @@ _08112530: mov r10, r3 movs r0, 0x28 mov r9, r0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites mov r1, r8 lsls r5, r1, 4 add r5, r8 @@ -39532,7 +39532,7 @@ _081126F4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r5, 0x1 @@ -39596,7 +39596,7 @@ sub_8112758: @ 8112758 bl SetGpuReg ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _081127A0 @@ -39871,7 +39871,7 @@ sub_81129F0: @ 81129F0 bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08112A24 @@ -40066,7 +40066,7 @@ sub_8112B78: @ 8112B78 strh r0, [r5, 0x24] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08112B9C @@ -40295,7 +40295,7 @@ _08112D56: lsrs r2, r0, 24 cmp r2, 0x40 beq _08112DAA - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -40303,7 +40303,7 @@ _08112D56: strh r7, [r5, 0x2E] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide movs r1, 0 lsls r0, 24 cmp r0, 0 @@ -40561,7 +40561,7 @@ sub_8112F60: @ 8112F60 movs r2, 0x4 orrs r1, r2 strb r1, [r3] - ldr r2, =gUnknown_020241E4 + ldr r2, =gBankSpriteIds ldr r1, =gUnknown_02038436 ldrb r1, [r1] adds r1, r2 @@ -40578,7 +40578,7 @@ sub_8112F60: @ 8112F60 strh r1, [r0, 0x34] ldr r1, =sub_8112FB8 str r1, [r0, 0x1C] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x38 ldrsh r1, [r0, r3] lsls r0, r1, 4 @@ -40608,7 +40608,7 @@ sub_8112FB8: @ 8112FB8 movs r2, 0x30 ldrsh r1, [r5, r2] bl Sin - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r1, 0x38 ldrsh r2, [r5, r1] lsls r1, r2, 4 @@ -40642,7 +40642,7 @@ sub_8112FB8: @ 8112FB8 b _08113054 .pool _08113020: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x38 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -40693,7 +40693,7 @@ sub_8113064: @ 8113064 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _081130B4 @@ -40767,7 +40767,7 @@ sub_8113100: @ 8113100 strh r0, [r5, 0x36] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08113164 @@ -40878,7 +40878,7 @@ sub_8113224: @ 8113224 adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0811323E @@ -40918,7 +40918,7 @@ sub_8113250: @ 8113250 ldr r0, =gUnknown_0203841E ldrh r0, [r0] strh r0, [r6, 0x3A] - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] movs r1, 0 bl sub_80A861C @@ -41108,7 +41108,7 @@ sub_81133E8: @ 81133E8 adds r4, r1, r0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -41294,7 +41294,7 @@ sub_8113574: @ 8113574 bgt _081135CA ldr r7, =gUnknown_02038C28 mov r12, r7 - ldr r0, =gUnknown_08329F40 + ldr r0, =gSineTable mov r8, r0 ldr r6, =gUnknown_02039B28 _08113592: @@ -41480,7 +41480,7 @@ sub_81136E8: @ 81136E8 movs r0, 0x52 bl SetGpuReg adds r0, r4, 0 - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -41543,8 +41543,8 @@ sub_811375C: @ 811375C strh r5, [r6, 0xC] cmp r4, 0x10 bne _081137DE - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 @@ -41663,7 +41663,7 @@ sub_8113888: @ 8113888 bl SetGpuReg ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -42085,7 +42085,7 @@ sub_8113BAC: @ 8113BAC adds r0, 0x20 strh r0, [r5, 0x26] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08113C1C @@ -42098,7 +42098,7 @@ _08113C1E: strh r0, [r5, 0x18] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xE] @@ -42417,7 +42417,7 @@ _08113EBC: _08113EF8: ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xE] @@ -42500,7 +42500,7 @@ _08113F84: adds r0, 0x4 strh r0, [r5, 0x26] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08113FD8 @@ -42969,7 +42969,7 @@ sub_8114374: @ 8114374 lsls r0, 24 lsrs r0, 24 movs r4, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r1, 0x3 ands r0, r1 lsls r5, r0, 2 @@ -43016,7 +43016,7 @@ sub_81143C0: @ 81143C0 mov r10, r0 ldr r6, =gUnknown_02038436 ldrb r0, [r6] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -43028,9 +43028,9 @@ sub_81143C0: @ 81143C0 adds r1, r4, 0 movs r2, 0x1 bl sub_80A438C - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r9, r0 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds mov r8, r0 ldrb r0, [r6] add r0, r8 @@ -43093,7 +43093,7 @@ sub_8114470: @ 8114470 lsrs r6, r0, 24 ldr r4, =gUnknown_02038436 ldrb r0, [r4] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -43204,13 +43204,13 @@ _0811455C: bne _081145D6 ldr r4, =gUnknown_02038436 ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _0811458C ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _081145D6 @@ -43223,8 +43223,8 @@ _0811458C: lsrs r0, 24 cmp r0, 0x1 bne _081145D6 - ldr r3, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r4] eors r0, r5 adds r0, r1 @@ -43264,11 +43264,11 @@ _081145D6: _08114614: ldr r4, =gUnknown_02038436 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08114640 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -43279,7 +43279,7 @@ _08114614: b _08114650 .pool _08114640: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -43325,7 +43325,7 @@ _0811465C: movs r2, 0x20 bl LoadCompressedPalette ldr r2, =gUnknown_02022E18 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -43424,7 +43424,7 @@ _08114776: bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -43457,7 +43457,7 @@ _081147B8: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _08114886 - ldr r2, =gUnknown_020241E4 + ldr r2, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r1, [r0] movs r0, 0x2 @@ -43586,7 +43586,7 @@ _08114902: beq _0811492E _08114908: adds r0, r4, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -43594,7 +43594,7 @@ _08114908: lsls r0, 24 cmp r0, 0 beq _0811492C - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r2, [r0] b _0811492E @@ -43604,7 +43604,7 @@ _0811492C: _0811492E: cmp r2, 0xFF beq _0811494A - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -43766,7 +43766,7 @@ sub_8114A7C: @ 8114A7C bl sub_80A6980 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08114A9C @@ -44098,7 +44098,7 @@ _08114D3C: strh r0, [r4, 0x1C] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1E] @@ -44133,7 +44133,7 @@ _08114D78: movs r0, 0 strh r0, [r4, 0x24] _08114D9A: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x1C ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -44174,7 +44174,7 @@ _08114DD4: adds r0, 0x1 strh r0, [r4, 0xE] _08114DF6: - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0xC ldrsh r0, [r4, r2] lsls r0, 1 @@ -44219,7 +44219,7 @@ _08114E4E: ldrh r0, [r4, 0x22] subs r0, r2 strh r0, [r1] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0x1C ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -44247,7 +44247,7 @@ _08114E7E: _08114E8C: adds r0, r2, 0 bl move_anim_task_del - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -44275,7 +44275,7 @@ sub_8114EB4: @ 8114EB4 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -44291,7 +44291,7 @@ sub_8114EB4: @ 8114EB4 strh r4, [r1, 0x26] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -44365,7 +44365,7 @@ _08114F78: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -44444,7 +44444,7 @@ _08115018: strh r0, [r4, 0x1C] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1E] @@ -44478,7 +44478,7 @@ _0811506C: bl sub_81150E0 b _081150C2 _0811507A: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -44490,7 +44490,7 @@ _0811507A: b _081150C2 .pool _08115094: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -44829,7 +44829,7 @@ _08115346: adds r1, r4, 0 adds r1, 0x8 adds r1, r0 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r5, r0 ldrb r0, [r0] strh r0, [r1] @@ -45084,7 +45084,7 @@ _08115540: ldrsh r0, [r4, r7] cmp r2, r0 bge _08115578 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r12, r0 adds r5, r4, 0 adds r5, 0x8 @@ -45155,7 +45155,7 @@ _081155C0: ldrsh r0, [r3, r7] cmp r2, r0 bge _081155F4 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r5, r3, 0 adds r5, 0x8 _081155D0: @@ -45335,7 +45335,7 @@ sub_811572C: @ 811572C strh r0, [r4, 0x2E] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -45846,7 +45846,7 @@ sub_8115B0C: @ 8115B0C strh r1, [r0, 0x12] strh r5, [r0, 0x18] movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] mov r9, r3 mov r8, r2 @@ -46449,7 +46449,7 @@ _08115FF8: ands r0, r1 cmp r0, 0 beq _08116028 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D70 add r0, r9 ldrb r1, [r0] @@ -46650,13 +46650,13 @@ _0811618A: cmp r0, 0x1 bhi _081161DC movs r4, 0 - ldr r5, =gUnknown_0202406C + ldr r5, =gNoOfAllBanks ldrb r0, [r5] cmp r4, r0 bcs _081161DC - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r12, r2 - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds movs r7, 0x3 negs r7, r7 _081161BA: @@ -46690,8 +46690,8 @@ _081161E2: thumb_func_start sub_81161F4 sub_81161F4: @ 81161F4 push {r4-r6,lr} - ldr r6, =gUnknown_02020630 - ldr r4, =gUnknown_020241E4 + ldr r6, =gSprites + ldr r4, =gBankSpriteIds ldr r5, =gUnknown_02038436 ldrb r0, [r5] adds r0, r4 @@ -46957,7 +46957,7 @@ sub_8116420: @ 8116420 adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08116444 @@ -47052,7 +47052,7 @@ sub_81164F0: @ 81164F0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -47679,7 +47679,7 @@ _08116A28: lsls r0, 16 cmp r0, 0 blt _08116AA6 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r1, 0x14 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -47869,13 +47869,13 @@ _08116BA2: bne _08116C26 ldr r5, =gUnknown_02038436 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _08116BD2 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _08116C26 @@ -47888,8 +47888,8 @@ _08116BD2: lsrs r0, 24 cmp r0, 0x1 bne _08116C26 - ldr r3, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r5] eors r0, r6 adds r0, r1 @@ -47934,11 +47934,11 @@ _08116C26: _08116C64: ldr r4, =gUnknown_02038436 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08116C90 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -47949,7 +47949,7 @@ _08116C64: b _08116CA0 .pool _08116C90: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -47997,7 +47997,7 @@ _08116CAC: movs r2, 0x2 bl LoadPalette ldr r2, =gUnknown_02022E18 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -48120,7 +48120,7 @@ _08116DF6: bl SetGpuReg movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -48137,7 +48137,7 @@ _08116DF6: ldrsh r0, [r5, r1] cmp r0, 0x1 bne _08116E7C - ldr r2, =gUnknown_020241E4 + ldr r2, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r1, [r0] movs r0, 0x2 @@ -48306,14 +48306,14 @@ _08116FBA: cmp r0, 0 bne _08117036 ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _08116FEC ldr r0, [r4] ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _08117036 @@ -48325,8 +48325,8 @@ _08116FEC: lsrs r5, r0, 24 cmp r5, 0x1 bne _08117036 - ldr r3, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r1, =gBankSpriteIds ldr r0, [r4] ldrb r0, [r0, 0x1] adds r0, r1 @@ -48370,11 +48370,11 @@ _08117078: ldr r4, =gUnknown_0203A110 ldr r0, [r4] ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _081170A8 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r0, [r4] ldrb r0, [r0] lsls r0, 1 @@ -48386,7 +48386,7 @@ _08117078: b _081170BA .pool _081170A8: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r0, [r4] ldrb r0, [r0] lsls r0, 1 @@ -48425,7 +48425,7 @@ sub_81170EC: @ 81170EC lsrs r5, r0, 24 movs r0, 0 mov r8, r0 - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldr r4, =gUnknown_0203A110 ldr r2, [r4] ldrb r0, [r2] @@ -48601,7 +48601,7 @@ _08117280: strh r4, [r1, 0xE] ldrb r0, [r3, 0x2] strh r0, [r1, 0x14] - ldr r2, =gUnknown_020241E4 + ldr r2, =gBankSpriteIds ldrb r0, [r3, 0x1] adds r0, r2 ldrb r0, [r0] @@ -48789,7 +48789,7 @@ _081173E6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles movs r1, 0xC @@ -49098,7 +49098,7 @@ sub_8117660: @ 8117660 beq _0811769C ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0811769C @@ -49198,7 +49198,7 @@ sub_8117754: @ 8117754 lsrs r4, 24 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide ldr r1, =gUnknown_0203841E lsls r0, 24 lsrs r0, 24 @@ -49219,7 +49219,7 @@ sub_8117780: @ 8117780 lsrs r4, 24 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide ldr r1, =gUnknown_0203841E lsls r0, 24 lsrs r0, 24 @@ -49264,7 +49264,7 @@ sub_81177E4: @ 81177E4 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites _081177EE: ldr r0, =gUnknown_02038436 ldrb r0, [r0] @@ -49276,7 +49276,7 @@ _081177EE: lsls r0, 24 cmp r0, 0 beq _0811782C - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r0, [r0] lsls r2, r0, 4 @@ -49431,11 +49431,11 @@ _08117930: .pool _08117964: adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08117988 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -49445,7 +49445,7 @@ _08117964: b _08117996 .pool _08117988: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -49459,7 +49459,7 @@ _08117996: lsls r0, 16 lsrs r4, r0, 16 _081179A2: - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r7, r5 ldrb r1, [r0] adds r0, r7, 0 @@ -49728,7 +49728,7 @@ _08117BB2: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles movs r1, 0xC @@ -50065,7 +50065,7 @@ sub_8117E94: @ 8117E94 lsls r0, 24 lsrs r0, 24 ldr r2, =gUnknown_02038436 - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r1, [r1] strb r1, [r2] ldr r2, =gUnknown_02038437 @@ -50085,11 +50085,11 @@ sub_8117EC4: @ 8117EC4 lsrs r5, r0, 24 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -50117,7 +50117,7 @@ sub_8117F10: @ 8117F10 lsls r0, 24 lsrs r0, 24 ldr r2, =gUnknown_02038437 - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r1, [r1] strb r1, [r2] bl move_anim_task_del @@ -50132,7 +50132,7 @@ sub_8117F30: @ 8117F30 lsls r0, 24 lsrs r0, 24 ldr r2, =gUnknown_02038436 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r1, [r1] strb r1, [r2] ldr r2, =gUnknown_02038437 @@ -51592,8 +51592,8 @@ _08118BA8: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - ldr r4, =gUnknown_02020630 - ldr r5, =gUnknown_0202449C + ldr r4, =gSprites + ldr r5, =gBattleStruct ldr r0, [r5] adds r0, 0x7D ldrb r0, [r0] @@ -52078,7 +52078,7 @@ sub_8118FBC: @ 8118FBC lsls r5, 16 lsrs r5, 16 adds r0, r4, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 ldr r1, =gUnknown_020244D4 diff --git a/asm/battle_anim_8170478.s b/asm/battle_anim_8170478.s index 608e5d200..726bebf2b 100644 --- a/asm/battle_anim_8170478.s +++ b/asm/battle_anim_8170478.s @@ -59,7 +59,7 @@ sub_8170478: @ 8170478 ldr r0, =gUnknown_03005D70 adds r4, r0 ldrb r0, [r4] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 lsls r4, r0, 4 adds r4, r0 @@ -359,7 +359,7 @@ _0817076C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r0, r6 bl RemoveObjectAndFreeTiles movs r0, 0xC @@ -440,7 +440,7 @@ sub_8170834: @ 8170834 lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r5, r0 ldrb r1, [r5, 0x6] mov r10, r1 @@ -464,7 +464,7 @@ sub_8170834: @ 8170834 lsls r6, r4, 4 adds r6, r4 lsls r6, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r6, r2 ldrb r4, [r6, 0x5] lsrs r4, 4 @@ -504,7 +504,7 @@ sub_8170834: @ 8170834 lsls r1, r2, 4 add r1, r10 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 mov r0, r9 ldrb r2, [r0] @@ -564,7 +564,7 @@ sub_817094C: @ 817094C ldr r1, =gUnknown_03005D70 adds r0, r1 ldrb r0, [r0] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 lsls r5, r0, 4 adds r5, r0 @@ -765,7 +765,7 @@ sub_8170B04: @ 8170B04 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 @@ -823,7 +823,7 @@ _08170B76: _08170B84: adds r0, r5, 0 bl sub_80A7344 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -851,17 +851,17 @@ sub_8170BB0: @ 8170BB0 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r4, =gUnknown_02038436 ldrb r0, [r4] adds r1, r0, r1 ldrb r1, [r1] mov r9, r1 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08170BF8 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -872,7 +872,7 @@ sub_8170BB0: @ 8170BB0 b _08170C08 .pool _08170BF8: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -916,7 +916,7 @@ _08170C44: bl sub_80A5C6C adds r1, r0, 0 lsls r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r3, r9 lsls r0, r3, 4 add r0, r9 @@ -1154,7 +1154,7 @@ sub_8170E04: @ 8170E04 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 lsls r4, r5, 4 adds r4, r5 @@ -1186,7 +1186,7 @@ sub_8170E04: @ 8170E04 ldr r0, =gUnknown_020244D0 ldr r0, [r0] ldr r3, [r0, 0x8] - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds mov r2, r8 ldrb r0, [r2] adds r0, r1 @@ -1236,7 +1236,7 @@ sub_8170EF0: @ 8170EF0 lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x8] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -1283,7 +1283,7 @@ _08170F54: lsls r4, 24 lsrs r4, 24 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 bl sub_80A82E4 @@ -1305,7 +1305,7 @@ _08170F54: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r9, r0 lsls r4, r5, 4 adds r4, r5 @@ -1335,8 +1335,8 @@ _08170F54: ldr r0, =DummyObjectCallback str r0, [r4] movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_020241E4 + bl GetBankByPlayerAI + ldr r1, =gBankSpriteIds lsls r0, 24 lsrs r0, 24 adds r0, r1 @@ -1369,10 +1369,10 @@ sub_8171030: @ 8171030 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_020241E4 + bl GetBankByPlayerAI + ldr r1, =gBankSpriteIds lsls r0, 24 lsrs r0, 24 adds r0, r1 @@ -1420,10 +1420,10 @@ sub_81710A8: @ 81710A8 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r0, 0 - bl battle_get_side_with_given_state - ldr r4, =gUnknown_020241E4 + bl GetBankByPlayerAI + ldr r4, =gBankSpriteIds lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -1438,7 +1438,7 @@ sub_81710A8: @ 81710A8 cmp r0, 0 bge _081710F4 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -1583,8 +1583,8 @@ sub_81711E8: @ 81711E8 strh r0, [r4, 0x38] ldr r0, =sub_8171240 str r0, [r4, 0x1C] - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038437 ldrb r0, [r0] adds r0, r1 @@ -1606,7 +1606,7 @@ _08171224: sub_8171240: @ 8171240 push {r4-r7,lr} adds r7, r0, 0 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038437 ldrb r0, [r0] adds r0, r1 @@ -1654,7 +1654,7 @@ _08171296: movs r0, 0x1C str r0, [r1] ldr r2, =gUnknown_030062E4 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1690,7 +1690,7 @@ _081712E8: ldrh r1, [r5, 0xE] adds r0, r1 strh r0, [r5, 0xE] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1710,7 +1710,7 @@ _081712E8: _0817132C: adds r0, r4, 0 bl sub_80A7344 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -2375,7 +2375,7 @@ _0817183C: _0817185A: cmp r1, 0x5F bne _08171880 - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim movs r1, 0 strb r1, [r0] movs r0, 0x1 @@ -2389,8 +2389,8 @@ _08171880: ldr r0, =0x0000013b cmp r1, r0 bne _081718BC - ldr r5, =gUnknown_02020630 - ldr r4, =gUnknown_020241E4 + ldr r5, =gSprites + ldr r4, =gBankSpriteIds ldrb r0, [r7] adds r0, r4 ldrb r1, [r0] @@ -2590,7 +2590,7 @@ _08171A14: movs r0, 0x4 bl sub_8171D60 movs r7, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r9, r2 movs r0, 0x1C add r0, r9 @@ -2722,8 +2722,8 @@ sub_8171AE4: @ 8171AE4 adds r3, r5, 0 bl sub_81729E8 _08171B36: - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds ldr r4, =gUnknown_02038437 ldrb r0, [r4] adds r0, r5 @@ -2790,8 +2790,8 @@ sub_8171BAC: @ 8171BAC orrs r0, r1 strb r0, [r2] _08171BCA: - ldr r4, =gUnknown_02020630 - ldr r3, =gUnknown_020241E4 + ldr r4, =gSprites + ldr r3, =gBankSpriteIds ldr r2, =gUnknown_02038437 ldrb r0, [r2] adds r0, r3 @@ -2839,8 +2839,8 @@ _08171C24: beq _08171C8A cmp r5, 0 beq _08171C8A - ldr r4, =gUnknown_02020630 - ldr r3, =gUnknown_020241E4 + ldr r4, =gSprites + ldr r3, =gBankSpriteIds ldr r2, =gUnknown_02038437 ldrb r0, [r2] adds r0, r3 @@ -2876,7 +2876,7 @@ _08171C24: strh r5, [r7, 0x2E] ldr r0, =sub_81719C0 str r0, [r7, 0x1C] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r6, [r0] movs r0, 0x1 bl sub_8072A88 @@ -2970,7 +2970,7 @@ _08171D3E: strh r0, [r4, 0x2E] ldr r0, =sub_81719C0 str r0, [r4, 0x1C] - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0 strb r0, [r1] movs r0, 0x1 @@ -3142,7 +3142,7 @@ sub_8171E50: @ 8171E50 lsls r4, r0, 4 add r4, r10 lsls r4, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r7, r4, r5 ldr r0, =gUnknown_085E51B4 ldr r1, [sp] @@ -3193,7 +3193,7 @@ _08171EEC: ands r0, r1 cmp r0, 0 bne _08171F22 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r2, r10 lsls r1, r2, 4 add r1, r10 @@ -3308,7 +3308,7 @@ sub_8171FC4: @ 8171FC4 ldrb r1, [r1, 0x10] str r1, [sp, 0xC] movs r7, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r10, r3 mov r1, r8 lsls r0, r1, 1 @@ -3375,7 +3375,7 @@ _0817206A: ands r0, r1 cmp r0, 0 bne _08172092 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -3426,7 +3426,7 @@ sub_81720C8: @ 81720C8 ldrb r1, [r1, 0x10] str r1, [sp, 0xC] movs r7, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r10, r3 mov r1, r8 lsls r0, r1, 1 @@ -3493,7 +3493,7 @@ _0817216E: ands r0, r1 cmp r0, 0 bne _08172196 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -3546,7 +3546,7 @@ sub_81721CC: @ 81721CC adds r0, r1 lsls r0, 3 str r0, [sp, 0x10] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r8, r3 ldr r0, =gUnknown_085E51B4 adds r1, r0 @@ -3609,7 +3609,7 @@ _0817226E: ands r0, r1 cmp r0, 0 bne _08172296 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -3660,7 +3660,7 @@ sub_81722CC: @ 81722CC ldrb r1, [r1, 0x10] str r1, [sp, 0xC] movs r7, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r10, r3 mov r1, r8 lsls r0, r1, 1 @@ -3729,7 +3729,7 @@ _08172376: ands r0, r1 cmp r0, 0 bne _0817239E - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -3793,7 +3793,7 @@ _08172404: adds r1, r0 lsls r1, 3 str r1, [sp, 0x10] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r9, r3 ldr r1, =gUnknown_085E51B4 adds r0, r1 @@ -3870,7 +3870,7 @@ _0817248C: ands r0, r1 cmp r0, 0 bne _081724D0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -3969,7 +3969,7 @@ sub_8172560: @ 8172560 adds r0, r1 lsls r0, 3 str r0, [sp, 0x10] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r8, r3 ldr r0, =gUnknown_085E51B4 adds r1, r0 @@ -4030,7 +4030,7 @@ _081725FE: ands r0, r1 cmp r0, 0 bne _08172626 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -4156,7 +4156,7 @@ _08172708: lsls r4, r6, 4 adds r4, r6 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r5, r4, r0 ldr r0, =gUnknown_085E51B4 add r0, r9 @@ -4216,7 +4216,7 @@ _08172790: ands r0, r1 cmp r0, 0 bne _081727C4 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -4269,7 +4269,7 @@ sub_81727E8: @ 81727E8 adds r0, r1 lsls r0, 3 str r0, [sp, 0x10] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r8, r3 ldr r0, =gUnknown_085E51B4 adds r1, r0 @@ -4327,7 +4327,7 @@ _08172880: ands r0, r1 cmp r0, 0 bne _081728A8 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -4729,7 +4729,7 @@ sub_8172BF0: @ 8172BF0 lsrs r7, r0, 24 movs r0, 0 mov r8, r0 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds ldr r3, =gUnknown_02038436 ldrb r2, [r3] adds r0, r2, r0 @@ -4764,11 +4764,11 @@ _08172C36: adds r0, r4 strh r0, [r5, 0x8] ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08172C78 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r6, 4 adds r1, r3, r6 lsls r1, 2 @@ -4783,7 +4783,7 @@ _08172C36: b _08172C90 .pool _08172C78: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r4, r6, 4 adds r2, r4, r6 lsls r2, 2 @@ -4838,11 +4838,11 @@ _08172CDA: adds r0, r2 strh r0, [r5, 0x8] ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08172D10 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r3, r6, 4 adds r2, r3, r6 lsls r2, 2 @@ -4857,7 +4857,7 @@ _08172CDA: b _08172D28 .pool _08172D10: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r6, 4 adds r1, r2, r6 lsls r1, 2 @@ -4879,12 +4879,12 @@ _08172D28: strh r1, [r0, 0x8] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 beq _08172D68 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r4, r6 lsls r1, 2 adds r1, r0 @@ -4897,7 +4897,7 @@ _08172D28: b _08172D84 .pool _08172D68: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r4, r6 lsls r1, 2 adds r1, r0 @@ -4951,7 +4951,7 @@ _08172DC0: _08172DC6: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5009,12 +5009,12 @@ _08172E14: strh r0, [r4, 0x26] b _08172E84 _08172E4E: - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r4, =gUnknown_02038436 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -5265,7 +5265,7 @@ _08173074: bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r5, 4 adds r2, r5 lsls r2, 2 @@ -5283,7 +5283,7 @@ _081730A8: bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r5, 4 adds r2, r5 lsls r2, 2 @@ -5311,7 +5311,7 @@ _081730D6: mov r9, r1 cmp r0, 0 bne _08173118 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r5, 4 adds r0, r2, r5 lsls r0, 2 @@ -5323,7 +5323,7 @@ _081730D6: b _08173160 .pool _08173118: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -5347,7 +5347,7 @@ _08173118: cmp r0, 0 bne _08173160 mov r0, r8 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0x3F cmp r0, 0 @@ -5359,7 +5359,7 @@ _08173156: movs r0, 0x66 bl audio_play_and_stuff _08173160: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r4, r5 lsls r0, 2 adds r0, r1 @@ -5575,7 +5575,7 @@ sub_817330C: @ 817330C movs r0, 0x1E strh r0, [r4, 0x2E] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -5587,7 +5587,7 @@ sub_817330C: @ 817330C adds r0, r1 strh r0, [r4, 0x32] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -5601,8 +5601,8 @@ sub_817330C: @ 817330C strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 @@ -5626,8 +5626,8 @@ sub_817330C: @ 817330C sub_817339C: @ 817339C push {lr} adds r3, r0, 0 - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 @@ -5677,8 +5677,8 @@ _081733F6: sub_8173400: @ 8173400 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, =gUnknown_02020630 - ldr r3, =gUnknown_020241E4 + ldr r5, =gSprites + ldr r3, =gBankSpriteIds ldr r2, =gUnknown_02038436 ldrb r0, [r2] adds r0, r3 @@ -5732,7 +5732,7 @@ sub_817345C: @ 817345C .pool _08173478: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, =gUnknown_02038436 strb r0, [r1] movs r0, 0x1 @@ -5740,12 +5740,12 @@ _08173478: .pool _0817348C: movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, =gUnknown_02038436 strb r0, [r1] movs r0, 0 _08173498: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, =gUnknown_02038437 strb r0, [r1] _081734A0: diff --git a/asm/battle_message.s b/asm/battle_message.s index 89b159706..6447e8221 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -16,7 +16,7 @@ battle_pick_message: @ 814E0C4 lsrs r6, r0, 16 movs r7, 0 ldr r4, =gUnknown_0203ABA8 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank mov r8, r0 ldrb r1, [r0] lsls r1, 9 @@ -26,13 +26,13 @@ battle_pick_message: @ 814E0C4 ldr r2, =gUnknown_02024208 ldrh r0, [r1, 0x4] strh r0, [r2] - ldr r2, =gUnknown_0202420A + ldr r2, =gLastUsedAbility ldrb r0, [r1, 0x6] strb r0, [r2] - ldr r5, =gUnknown_02024474 + ldr r5, =gBattleScripting ldrb r0, [r1, 0x7] strb r0, [r5, 0x17] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r0, [r3] adds r0, 0x52 ldrb r1, [r1, 0x8] @@ -53,7 +53,7 @@ battle_pick_message: @ 814E0C4 movs r2, 0 mov r12, r8 mov r9, r5 - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 mov r10, r1 ldr r3, =gUnknown_0203ABA4 _0814E126: @@ -67,10 +67,10 @@ _0814E126: cmp r2, 0x3 ble _0814E126 movs r2, 0 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 mov r8, r0 ldr r3, =gUnknown_0203ABA8 - ldr r5, =gUnknown_02022F68 + ldr r5, =gBattleTextBuff2 ldr r4, =gUnknown_02022F78 _0814E144: mov r0, r8 @@ -215,7 +215,7 @@ _0814E29E: _0814E2AC: mov r1, r12 ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0814E310 @@ -317,11 +317,11 @@ _0814E380: _0814E394: mov r1, r12 ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0814E3EC - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xB1 ldrb r2, [r0] @@ -385,11 +385,11 @@ _0814E428: _0814E430: mov r4, r9 ldrb r0, [r4, 0x17] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0814E488 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xB1 ldrb r2, [r0] @@ -482,8 +482,8 @@ _0814E4F8: lsls r0, 1 cmp r1, r0 bls _0814E534 - ldr r0, =gUnknown_02022F68 - ldr r1, =gUnknown_0202449C + ldr r0, =gBattleTextBuff2 + ldr r1, =gBattleStruct ldr r1, [r1] adds r1, 0x8E ldrb r2, [r1] @@ -495,7 +495,7 @@ _0814E4F8: b _0814E544 .pool _0814E534: - ldr r0, =gUnknown_02022F68 + ldr r0, =gBattleTextBuff2 ldrh r2, [r2] movs r1, 0xD muls r1, r2 @@ -503,13 +503,13 @@ _0814E534: adds r1, r2 bl StringCopy _0814E544: - ldr r0, =gUnknown_02022F68 + ldr r0, =gBattleTextBuff2 bl sub_814F950 ldr r7, =gUnknown_085CBDAC b _0814E6D8 .pool _0814E55C: - ldr r4, =gUnknown_02022F58 + ldr r4, =gBattleTextBuff1 ldrb r1, [r4] movs r0, 0x80 ands r0, r1 @@ -520,7 +520,7 @@ _0814E55C: strb r0, [r4] mov r1, r12 ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -532,7 +532,7 @@ _0814E55C: eors r0, r1 strb r0, [r4] _0814E58A: - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldrb r0, [r0] subs r0, 0x2 lsls r0, 24 @@ -558,7 +558,7 @@ _0814E5B4: _0814E5C4: mov r1, r12 ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -576,7 +576,7 @@ _0814E5E0: ands r0, r1 cmp r0, 0 beq _0814E638 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldrb r0, [r0] cmp r0, 0x2 beq _0814E628 @@ -615,7 +615,7 @@ _0814E638: lsls r0, 4 cmp r1, r0 bne _0814E680 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldrb r0, [r0] cmp r0, 0x2 beq _0814E670 @@ -642,7 +642,7 @@ _0814E678: b _0814E6D8 .pool _0814E680: - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldrb r0, [r0] cmp r0, 0x2 beq _0814E6A8 @@ -868,7 +868,7 @@ _0814E7CC: .4byte _0814F5B4 .4byte _0814E8E4 _0814E8A0: - ldr r5, =gUnknown_02022F58 + ldr r5, =gBattleTextBuff1 ldrb r0, [r5] cmp r0, 0xFD bne _0814E8B8 @@ -887,7 +887,7 @@ _0814E8C8: adds r4, r5, 0 bl _0814F5C0 _0814E8CE: - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 ldrb r0, [r1] cmp r0, 0xFD bne _0814E904 @@ -924,8 +924,8 @@ _0814E920: .pool _0814E92C: movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202406E + bl GetBankByPlayerAI + ldr r1, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -943,8 +943,8 @@ _0814E92C: .pool _0814E960: movs r0, 0x1 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202406E + bl GetBankByPlayerAI + ldr r1, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -962,8 +962,8 @@ _0814E960: .pool _0814E994: movs r0, 0x2 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202406E + bl GetBankByPlayerAI + ldr r1, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -981,8 +981,8 @@ _0814E994: .pool _0814E9C8: movs r0, 0x3 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202406E + bl GetBankByPlayerAI + ldr r1, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -999,7 +999,7 @@ _0814E9C8: bl _0814F5BE .pool _0814E9FC: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldr r1, =gUnknown_020229E8 lsls r0, r7, 3 subs r0, r7 @@ -1021,7 +1021,7 @@ _0814E9FC: bl _0814F5BE .pool _0814EA38: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldr r1, =gUnknown_020229E8 lsls r0, r7, 3 subs r0, r7 @@ -1045,7 +1045,7 @@ _0814EA38: bl _0814F5BE .pool _0814EA78: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldr r1, =gUnknown_020229E8 lsls r0, r7, 3 subs r0, r7 @@ -1069,7 +1069,7 @@ _0814EA78: bl _0814F5BE .pool _0814EAB8: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldr r1, =gUnknown_020229E8 lsls r0, r7, 3 subs r0, r7 @@ -1093,9 +1093,9 @@ _0814EAB8: bl _0814F5BE .pool _0814EAF8: - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 adds r2, r4, 0 cmp r0, 0 @@ -1122,12 +1122,12 @@ _0814EB36: cmp r0, 0xFF bne _0814EB2C ldrb r0, [r2] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r0, 0x1 ands r0, r1 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202406E + bl GetBankByPlayerAI + ldr r1, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -1143,12 +1143,12 @@ _0814EB36: .pool _0814EB74: ldrb r0, [r2] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r0, 0x1 ands r0, r1 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202406E + bl GetBankByPlayerAI + ldr r1, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -1166,19 +1166,19 @@ _0814EB9E: bl _0814F5BE .pool _0814EBB0: - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0814EBF8 ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r0, 0x1 ands r0, r1 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202406E + bl GetBankByPlayerAI + ldr r1, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, 0x4 @@ -1195,12 +1195,12 @@ _0814EBB0: .pool _0814EBF8: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r0, 0x1 ands r0, r1 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202406E + bl GetBankByPlayerAI + ldr r1, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, 0x4 @@ -1219,9 +1219,9 @@ _0814EC24: bl _0814F5BE .pool _0814EC38: - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0814ECA8 @@ -1236,7 +1236,7 @@ _0814EC38: _0814EC56: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldr r2, =gEnemyParty mov r12, r2 adds r2, r5, 0 @@ -1266,7 +1266,7 @@ _0814EC78: b _0814ECC2 .pool _0814ECA8: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -1284,9 +1284,9 @@ _0814ECC2: bl _0814F5BE .pool _0814ECD4: - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0814ED44 @@ -1301,7 +1301,7 @@ _0814ECD4: _0814ECF2: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldr r2, =gEnemyParty mov r12, r2 adds r2, r5, 0 @@ -1331,7 +1331,7 @@ _0814ED14: b _0814ED5E .pool _0814ED44: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -1351,7 +1351,7 @@ _0814ED5E: _0814ED70: ldr r5, =gUnknown_0202420E ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0814EDE0 @@ -1366,7 +1366,7 @@ _0814ED70: _0814ED8E: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldr r2, =gEnemyParty mov r12, r2 adds r2, r5, 0 @@ -1396,7 +1396,7 @@ _0814EDB0: b _0814EDFA .pool _0814EDE0: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -1414,9 +1414,9 @@ _0814EDFA: bl _0814F5BE .pool _0814EE0C: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0814EE7C @@ -1431,7 +1431,7 @@ _0814EE0C: _0814EE2A: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldr r2, =gEnemyParty mov r12, r2 adds r2, r5, 0 @@ -1461,7 +1461,7 @@ _0814EE4C: b _0814EE96 .pool _0814EE7C: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -1479,9 +1479,9 @@ _0814EE96: b _0814F5BE .pool _0814EEA8: - ldr r5, =gUnknown_02024474 + ldr r5, =gBattleScripting ldrb r0, [r5, 0x17] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0814EF18 @@ -1496,7 +1496,7 @@ _0814EEA8: _0814EEC6: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldr r2, =gEnemyParty mov r12, r2 adds r2, r5, 0 @@ -1526,7 +1526,7 @@ _0814EEE8: b _0814EF32 .pool _0814EF18: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5, 0x17] lsls r0, 1 adds r0, r1 @@ -1563,7 +1563,7 @@ _0814EF5C: cmp r1, r0 bls _0814EF88 _0814EF6A: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x8E ldrb r1, [r0] @@ -1597,7 +1597,7 @@ _0814EF98: ands r1, r0 cmp r1, 0 bne _0814F014 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r0, [r0] cmp r0, 0 @@ -1622,7 +1622,7 @@ _0814EFEC: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02024404 + ldr r0, =gEnigmaBerries adds r1, r0 mov r0, sp bl StringCopy @@ -1633,7 +1633,7 @@ _0814EFEC: .pool _0814F014: ldr r2, =gUnknown_020229E8 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -1648,7 +1648,7 @@ _0814F014: lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, =gUnknown_02024404 + ldr r0, =gEnigmaBerries adds r1, r0 mov r0, sp bl StringCopy @@ -1674,22 +1674,22 @@ _0814F06E: b _0814F5BE .pool _0814F080: - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility b _0814F0C0 .pool _0814F088: ldr r1, =gUnknown_0203ABA4 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker b _0814F0BC .pool _0814F098: ldr r1, =gUnknown_0203ABA4 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget b _0814F0BC .pool _0814F0A8: ldr r1, =gUnknown_0203ABA4 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0x17] b _0814F0BE .pool @@ -1783,7 +1783,7 @@ _0814F164: cmp r0, 0 beq _0814F1AC movs r2, 0 - ldr r4, =gUnknown_020244A8 + ldr r4, =gBattleResources ldr r3, [r4] _0814F178: mov r1, sp @@ -1910,7 +1910,7 @@ _0814F266: b _0814F5C0 .pool _0814F27C: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0x17] bl sub_806D864 _0814F284: @@ -1986,9 +1986,9 @@ _0814F328: b _0814F580 .pool _0814F330: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0x17] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0814F39C @@ -2005,7 +2005,7 @@ _0814F34E: adds r0, r1, 0 ldr r5, =gEnemyParty mov r12, r5 - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct cmp r0, 0xFF beq _0814F36E _0814F35C: @@ -2031,7 +2031,7 @@ _0814F36E: b _0814F3B4 .pool _0814F39C: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x52 ldrb r1, [r0] @@ -2060,14 +2060,14 @@ _0814F3D4: b _0814F5C0 .pool _0814F3E4: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker b _0814F3EE .pool _0814F3EC: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget _0814F3EE: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r4, =gUnknown_085CBD9A cmp r0, 0 @@ -2078,14 +2078,14 @@ _0814F3FE: b _0814F5C0 .pool _0814F410: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker b _0814F41A .pool _0814F418: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget _0814F41A: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r4, =gUnknown_085CBD91 cmp r0, 0 @@ -2096,14 +2096,14 @@ _0814F42A: b _0814F5C0 .pool _0814F43C: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker b _0814F446 .pool _0814F444: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget _0814F446: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r4, =gUnknown_085CBDA3 cmp r0, 0 @@ -2464,7 +2464,7 @@ _0814F734: .pool _0814F744: ldrb r0, [r4, 0x1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0814F768 @@ -2533,7 +2533,7 @@ _0814F7D0: _0814F7E2: adds r4, r5, r7 ldrb r0, [r4, 0x1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0814F808 @@ -2599,7 +2599,7 @@ _0814F858: cmp r2, 0xAF bne _0814F8CC ldr r2, =gUnknown_020229E8 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -2614,7 +2614,7 @@ _0814F858: lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, =gUnknown_02024404 + ldr r0, =gEnigmaBerries adds r1, r0 adds r0, r6, 0 bl StringCopy @@ -2784,7 +2784,7 @@ battle_show_message_maybe: @ 814F9EC lsls r1, 24 lsrs r7, r1, 24 ldr r1, =gUnknown_085CD660 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x24 ldrb r0, [r0] lsls r0, 2 @@ -2864,7 +2864,7 @@ _0814FA36: ldrb r0, [r0, 0x6] cmp r0, 0xFF bne _0814FAC6 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x24 ldrb r0, [r0] adds r1, r7, 0 @@ -2992,7 +2992,7 @@ _0814FB9C: thumb_func_start sub_814FBAC sub_814FBAC: @ 814FBAC push {r4,r5,lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r2, [r0] lsls r1, r2, 9 ldr r0, =gUnknown_02023068 diff --git a/asm/battle_records.s b/asm/battle_records.s index 5c4ea6688..516c4259e 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -397,7 +397,7 @@ _0813C258: sub_813C264: @ 813C264 push {r4,lr} adds r4, r0, 0 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0x1 beq _0813C27C @@ -445,7 +445,7 @@ sub_813C2A0: @ 813C2A0 subs r2, 0x30 adds r3, r2 ldrh r2, [r3, 0xE] - ldr r3, =gUnknown_0202433A + ldr r3, =gBattleOutcome ldrb r3, [r3] lsls r4, 24 lsrs r4, 24 diff --git a/asm/battle_setup.s b/asm/battle_setup.s index ae559ca27..721098b69 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -565,7 +565,7 @@ sub_80B0AF8: @ 80B0AF8 movs r0, 0 movs r1, 0x80 bl ResetSpriteRange - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 @@ -610,7 +610,7 @@ sub_80B0B6C: @ 80B0B6C movs r0, 0 movs r1, 0x80 bl ResetSpriteRange - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 @@ -2228,7 +2228,7 @@ sub_80B1918: @ 80B1918 lsls r0, 3 cmp r1, r0 beq _080B1946 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 @@ -2284,7 +2284,7 @@ sub_80B1994: @ 80B1994 b _080B19E2 .pool _080B19B4: - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 2d9aa39fe..9ff9b0910 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -2178,7 +2178,7 @@ sub_81470D0: @ 81470D0 bl AddObjectToBack lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -4313,7 +4313,7 @@ sub_8148218: @ 8148218 lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r1 movs r2, 0x24 ldrsh r0, [r4, r2] @@ -4569,7 +4569,7 @@ _0814847C: thumb_func_start sub_8148484 sub_8148484: @ 8148484 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, 16 asrs r0, 16 lsls r2, r0, 4 @@ -4583,7 +4583,7 @@ sub_8148484: @ 8148484 thumb_func_start sub_814849C sub_814849C: @ 814849C - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 16 asrs r0, 16 lsls r1, r0, 4 @@ -4599,7 +4599,7 @@ sub_814849C: @ 814849C thumb_func_start sub_81484B8 sub_81484B8: @ 81484B8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 16 asrs r0, 16 lsls r1, r0, 4 @@ -6742,7 +6742,7 @@ _0814963C: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r1, r0 movs r0, 0xF0 strh r0, [r2, 0x20] diff --git a/asm/berry_blender.s b/asm/berry_blender.s index c1610a472..f2af2e324 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -501,7 +501,7 @@ _0807FBBE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r1, r4, 0 adds r1, 0x8 @@ -718,7 +718,7 @@ sub_807FD90: @ 807FD90 mov r3, r8 lsls r3, 2 mov r8, r3 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites add r8, r0 ldr r5, =gUnknown_08339C78 lsls r4, r6, 2 @@ -1105,7 +1105,7 @@ _08080126: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r1, r5, 0 adds r1, 0x8 @@ -1919,7 +1919,7 @@ _080807E4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 mov r1, r8 lsrs r4, r1, 24 @@ -2140,7 +2140,7 @@ _08080A0A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r1, r4, 0 adds r1, 0x8 @@ -3130,7 +3130,7 @@ sub_8081288: @ 8081288 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r4, r5 movs r1, 0x2 bl StartObjectImageAnim @@ -3149,7 +3149,7 @@ _08081314: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectImageAnim @@ -3164,7 +3164,7 @@ _0808133C: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim @@ -3696,7 +3696,7 @@ _080817BA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r1, r5, 0x4 lsls r1, 24 @@ -6423,9 +6423,9 @@ sub_8082E84: @ 8082E84 adds r0, r1, 0x1 cmp r0, 0 beq _08082F40 - ldr r0, =gUnknown_08329F40 + ldr r0, =gSineTable mov r9, r0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r10, r2 adds r6, r1, 0x1 movs r3, 0x1F @@ -7259,7 +7259,7 @@ _080834DE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r6, 0x1 @@ -8074,7 +8074,7 @@ _08083B9A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r0, r6 movs r1, 0x3 bl StartObjectImageAnim diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index afb9a59fb..b7537432c 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -830,7 +830,7 @@ sub_817836C: @ 817836C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles bl sub_80D510C @@ -893,7 +893,7 @@ sub_8178404: @ 8178404 ldrb r0, [r5, 0x15] cmp r0, 0 beq _08178448 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r4] ldr r1, =0x00001803 adds r0, r1 @@ -910,7 +910,7 @@ sub_8178404: @ 8178404 b _08178462 .pool _08178448: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r4] ldr r1, =0x00001803 adds r0, r1 @@ -1080,7 +1080,7 @@ _08178598: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -1475,7 +1475,7 @@ _081788A6: _081788B8: ldrh r5, [r6] _081788BA: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r3, =gUnknown_0203BCF4 ldr r0, [r3] ldr r1, =0x00001802 diff --git a/asm/big_shroomish_barboach.s b/asm/big_shroomish_barboach.s index f3bc3cf8a..4e099d016 100644 --- a/asm/big_shroomish_barboach.s +++ b/asm/big_shroomish_barboach.s @@ -466,7 +466,7 @@ _080F9B6A: ldrb r1, [r0] adds r0, r4, 0 mov r2, r8 - bl pokemon_setattr + bl SetMonData movs r7, 0x1 _080F9B9C: adds r5, 0x1 diff --git a/asm/cable_car.s b/asm/cable_car.s index 3d82586fe..dd0a9fcbc 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -1961,7 +1961,7 @@ _08150D86: lsrs r6, r0, 24 cmp r6, 0x40 beq _08150DD0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -1990,7 +1990,7 @@ _08150DD0: bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -2067,7 +2067,7 @@ _08150E68: lsrs r6, r0, 24 cmp r6, 0x40 beq _08150ED4 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -2096,7 +2096,7 @@ _08150ED4: bl AddObjectToFront lsls r0, 24 lsrs r6, r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -2138,7 +2138,7 @@ _08150ED4: bl sub_80AB130 _08150F3A: movs r4, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites _08150F3E: lsls r1, r4, 20 movs r2, 0xC0 @@ -2200,7 +2200,7 @@ _08150F3E: lsrs r6, r0, 24 cmp r6, 0x40 beq _08151074 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r6, 4 adds r0, r2, r6 lsls r0, 2 @@ -2265,7 +2265,7 @@ _08151056: bl StartObjectImageAnim strh r5, [r4, 0x30] _0815105C: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r2, r8 adds r1, r2, r6 lsls r1, 2 diff --git a/asm/cable_club.s b/asm/cable_club.s index d716e488b..51b3821b1 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -2176,7 +2176,7 @@ sub_80B360C: @ 80B360C ldrb r0, [r0] cmp r0, 0 beq _080B36B2 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0x1 beq _080B3670 diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s index 379a8c46a..5aabfc4c3 100644 --- a/asm/calculate_base_damage.s +++ b/asm/calculate_base_damage.s @@ -36,7 +36,7 @@ sub_806957C: @ 806957C movs r5, 0 cmp r3, 0 bne _080695D4 - ldr r2, =gUnknown_020244E0 + ldr r2, =gBattleMovePower ldr r1, =gBattleMoves ldr r3, [sp, 0x8] lsls r0, r3, 1 @@ -48,7 +48,7 @@ sub_806957C: @ 806957C b _080695D8 .pool _080695D4: - ldr r0, =gUnknown_020244E0 + ldr r0, =gBattleMovePower strh r3, [r0] _080695D8: cmp r7, 0 @@ -82,7 +82,7 @@ _08069602: ldrh r0, [r6, 0x2E] cmp r0, 0xAF bne _08069634 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries ldr r2, [sp, 0x10] lsls r0, r2, 3 subs r0, r2 @@ -95,12 +95,12 @@ _08069602: .pool _08069634: ldrh r0, [r6, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 mov r9, r0 ldrh r0, [r6, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r0, 24 _0806964A: @@ -109,7 +109,7 @@ _0806964A: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0806967E - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries ldr r2, [sp, 0x14] lsls r0, r2, 3 subs r0, r2 @@ -131,13 +131,13 @@ _0806966C: _0806967E: ldr r3, [sp, 0x4] ldrh r0, [r3, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x20] ldr r1, [sp, 0x4] ldrh r0, [r1, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam _08069694: adds r0, r6, 0 adds r0, 0x20 @@ -212,7 +212,7 @@ _08069708: str r0, [sp, 0x1C] _08069728: movs r2, 0 - ldr r4, =gUnknown_08329D74 + ldr r4, =gHoldEffectToType ldr r3, [sp, 0x4] adds r3, 0x20 str r3, [sp, 0x2C] @@ -405,7 +405,7 @@ _08069898: movs r1, 0 movs r2, 0x3A movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080698C6 @@ -429,7 +429,7 @@ _080698C6: movs r1, 0 movs r2, 0x39 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080698F8 @@ -483,11 +483,11 @@ _08069936: movs r1, 0 movs r2, 0 movs r3, 0xFD - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0806995A - ldr r1, =gUnknown_020244E0 + ldr r1, =gBattleMovePower ldrh r0, [r1] lsrs r0, 1 strh r0, [r1] @@ -501,11 +501,11 @@ _0806995A: movs r1, 0 movs r2, 0 movs r3, 0xFE - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0806997E - ldr r1, =gUnknown_020244E0 + ldr r1, =gBattleMovePower ldrh r0, [r1] lsrs r0, 1 strh r0, [r1] @@ -525,7 +525,7 @@ _0806997E: lsrs r0, 16 cmp r1, r0 bhi _080699AE - ldr r4, =gUnknown_020244E0 + ldr r4, =gBattleMovePower ldrh r1, [r4] movs r0, 0x96 muls r0, r1 @@ -548,7 +548,7 @@ _080699AE: lsrs r0, 16 cmp r1, r0 bhi _080699DE - ldr r4, =gUnknown_020244E0 + ldr r4, =gBattleMovePower ldrh r1, [r4] movs r0, 0x96 muls r0, r1 @@ -571,7 +571,7 @@ _080699DE: lsrs r0, 16 cmp r1, r0 bhi _08069A0E - ldr r4, =gUnknown_020244E0 + ldr r4, =gBattleMovePower ldrh r1, [r4] movs r0, 0x96 muls r0, r1 @@ -594,7 +594,7 @@ _08069A0E: lsrs r0, 16 cmp r1, r0 bhi _08069A3E - ldr r4, =gUnknown_020244E0 + ldr r4, =gBattleMovePower ldrh r1, [r4] movs r0, 0x96 muls r0, r1 @@ -603,7 +603,7 @@ _08069A0E: strh r0, [r4] _08069A3E: ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -653,7 +653,7 @@ _08069AA6: bl __divsi3 adds r5, r0, 0 _08069ABE: - ldr r0, =gUnknown_020244E0 + ldr r0, =gBattleMovePower ldrh r0, [r0] muls r5, r0 adds r0, r6, 0 @@ -821,7 +821,7 @@ _08069C02: bl __divsi3 adds r5, r0, 0 _08069C1A: - ldr r0, =gUnknown_020244E0 + ldr r0, =gBattleMovePower ldrh r0, [r0] muls r5, r0 adds r0, r6, 0 @@ -933,7 +933,7 @@ _08069CFC: movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -943,7 +943,7 @@ _08069CFC: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08069DAC @@ -978,7 +978,7 @@ _08069D64: ands r0, r1 cmp r0, 0 beq _08069D7C - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] cmp r0, 0x4C bne _08069D7C @@ -1010,7 +1010,7 @@ _08069DA6: adds r0, r5, r0 asrs r5, r0, 1 _08069DAC: - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r0, [r0, 0x4] ldr r7, [sp, 0x10] diff --git a/asm/contest.s b/asm/contest.s index 0e66e6d65..c903e016d 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -1048,7 +1048,7 @@ _080D8004: bl sub_80DC594 bl sub_80DC5E8 bl sub_80DC7EC - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide strb r4, [r1] movs r0, 0x1 strb r0, [r1, 0x1] @@ -1058,12 +1058,12 @@ _080D8004: strb r2, [r1, 0x3] ldr r0, =gBattleTypeFlags str r4, [r0] - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker strb r2, [r4] - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget strb r3, [r0] bl sub_80DB0C4 - ldr r2, =gUnknown_020241E4 + ldr r2, =gBankSpriteIds ldrb r1, [r4] adds r1, r2 strb r0, [r1] @@ -2530,7 +2530,7 @@ _080D8DD0: bl sub_80DB174 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -2547,8 +2547,8 @@ _080D8DD0: lsls r4, 3 adds r4, r0 strh r5, [r4, 0xC] - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_0202420B + ldr r1, =gBankSpriteIds + ldr r0, =gBankAttacker ldrb r0, [r0] adds r0, r1 strb r5, [r0] @@ -2571,7 +2571,7 @@ _080D8E7C: lsls r0, 3 adds r2, r0, r4 ldrb r5, [r2, 0xC] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -4573,7 +4573,7 @@ _080D9FC0: lsls r2, 3 adds r2, r4 ldrb r5, [r2, 0xC] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -4592,7 +4592,7 @@ _080D9FEC: lsls r0, 3 adds r4, r0, r4 ldrb r5, [r4, 0xC] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -6664,7 +6664,7 @@ sub_80DB0C4: @ 80DB0C4 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -6699,7 +6699,7 @@ sub_80DB120: @ 80DB120 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -6785,7 +6785,7 @@ _080DB1CC: bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 lsls r0, r7, 4 adds r0, r7 @@ -6838,7 +6838,7 @@ _080DB280: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectRotScalAnim @@ -9005,7 +9005,7 @@ _080DC350: bge _080DC356 movs r5, 0 _080DC356: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r7, 4 adds r0, r3, r7 lsls r0, 2 @@ -9144,7 +9144,7 @@ _080DC446: sub_80DC44C: @ 80DC44C push {r4-r6,lr} movs r2, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r5, =gUnknown_02039F34 ldr r4, =gUnknown_08587A6C ldr r3, =gUnknown_02039F26 @@ -9179,7 +9179,7 @@ sub_80DC490: @ 80DC490 lsrs r6, r0, 24 movs r3, 0 ldr r7, =gUnknown_02039F26 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r4, =gUnknown_02039F34 movs r2, 0 _080DC4A0: @@ -9232,7 +9232,7 @@ sub_80DC4F0: @ 80DC4F0 bl LoadTaggedObjectPalette movs r5, 0 ldr r7, =gUnknown_02039F34 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 movs r6, 0 _080DC506: @@ -9305,7 +9305,7 @@ sub_80DC594: @ 80DC594 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -9902,7 +9902,7 @@ sub_80DC9EC: @ 80DC9EC lsls r5, r0, 4 add r5, r8 lsls r5, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r1 ldrh r2, [r5, 0x4] lsls r1, r2, 22 @@ -9968,7 +9968,7 @@ sub_80DC9EC: @ 80DC9EC lsls r4, r3, 4 add r4, r9 lsls r4, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r1 ldrh r1, [r4, 0x4] lsls r1, 22 @@ -10016,7 +10016,7 @@ sub_80DCB78: @ 80DCB78 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r5, r0, 4 adds r5, r0 lsls r5, 2 @@ -10085,7 +10085,7 @@ sub_80DCBE8: @ 80DCBE8 bl sub_80DCBB4 ldr r0, =gUnknown_02039F34 ldr r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r8, r2 lsls r6, r4, 4 adds r6, r4 @@ -10153,7 +10153,7 @@ sub_80DCC84: @ 80DCC84 ldrh r1, [r0, 0x2E] lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -11528,7 +11528,7 @@ _080DD748: .4byte _080DD8D4 .4byte _080DD8A0 _080DD76C: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -11546,7 +11546,7 @@ _080DD76C: b _080DD8F8 .pool _080DD79C: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -11566,7 +11566,7 @@ _080DD79C: b _080DD8F8 .pool _080DD7D0: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -11586,7 +11586,7 @@ _080DD7D0: b _080DD8F8 .pool _080DD804: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -11606,7 +11606,7 @@ _080DD804: b _080DD8F8 .pool _080DD838: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -11626,7 +11626,7 @@ _080DD838: b _080DD8F8 .pool _080DD86C: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -11646,7 +11646,7 @@ _080DD86C: b _080DD8F8 .pool _080DD8A0: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -11666,7 +11666,7 @@ _080DD8A0: b _080DD8F8 .pool _080DD8D4: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -11685,7 +11685,7 @@ _080DD8D4: bl audio_play _080DD8F8: adds r2, r4, 0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r2, r5 lsls r2, 2 adds r1, r2, r4 @@ -11721,7 +11721,7 @@ sub_80DD940: @ 80DD940 push {r6,r7} movs r5, 0 ldr r6, =gUnknown_02039F34 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r9, r0 ldr r0, =0x06010000 mov r8, r0 @@ -11938,7 +11938,7 @@ sub_80DDB0C: @ 80DDB0C ldr r0, =sub_80DDB6C movs r1, 0xA bl CreateTask - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r4, =gUnknown_02039F34 ldr r2, [r4] ldr r0, [r2] @@ -11989,7 +11989,7 @@ sub_80DDB6C: @ 80DDB6C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r0, r1 ldr r0, =gTasks lsls r1, r3, 2 @@ -12039,7 +12039,7 @@ _080DDBD4: thumb_func_start sub_80DDBE8 sub_80DDBE8: @ 80DDBE8 push {r4,r5,lr} - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r4, =gUnknown_02039F34 ldr r0, [r4] ldr r2, [r0] @@ -12101,7 +12101,7 @@ task08_080CD1CC: @ 80DDC4C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r3, r0, r1 ldr r0, =gTasks lsls r2, r4, 2 @@ -12260,7 +12260,7 @@ _080DDD9C: thumb_func_start sub_80DDDA8 sub_80DDDA8: @ 80DDDA8 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, =gUnknown_02039F34 ldr r2, [r0] ldr r0, [r2] @@ -12291,7 +12291,7 @@ sub_80DDDA8: @ 80DDDA8 thumb_func_start sub_80DDDE4 sub_80DDDE4: @ 80DDDE4 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_02039F34 ldr r0, [r0] ldr r0, [r0] @@ -12565,7 +12565,7 @@ sub_80DE008: @ 80DE008 ldr r0, =gUnknown_02039F34 mov r9, r0 mov r8, r9 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r4, 0 movs r7, 0 _080DE026: @@ -12909,7 +12909,7 @@ sub_80DE224: @ 80DE224 movs r0, 0x1 bl sub_80DED60 movs r5, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r6, 0x4 _080DE2F0: ldr r0, [r4] @@ -13008,7 +13008,7 @@ sub_80DE350: @ 80DE350 strh r5, [r0] ldr r0, =gUnknown_02022E1A strh r5, [r0] - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites _080DE3CA: ldr r0, [r6] ldr r0, [r0, 0x14] @@ -13355,7 +13355,7 @@ sub_80DE69C: @ 80DE69C lsrs r0, 24 mov r8, r0 movs r7, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r5, =gUnknown_02039F34 _080DE6AE: bl rotscale_alloc_entry @@ -13470,7 +13470,7 @@ sub_80DE794: @ 80DE794 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r3, =gUnknown_02039F34 ldr r0, [r3] ldr r0, [r0, 0x14] @@ -13524,7 +13524,7 @@ _080DE7EE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl obj_free_rotscale_entry adds r4, 0x1 @@ -13796,16 +13796,16 @@ sub_80DEA20: @ 80DEA20 push {lr} ldr r0, =DummyObjectCallback bl CreateInvisibleSpriteWithCallback - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds strb r0, [r1, 0x3] - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl obj_alloc_rotscale_entry bl sub_80DEA5C @@ -13817,12 +13817,12 @@ sub_80DEA20: @ 80DEA20 thumb_func_start sub_80DEA5C sub_80DEA5C: @ 80DEA5C push {r4,lr} - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds ldrb r0, [r0, 0x3] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 movs r0, 0 strh r0, [r4, 0x24] @@ -13905,12 +13905,12 @@ _080DEAD0: .4byte _080DEB60 .4byte _080DEB60 _080DEB54: - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget movs r0, 0x2 b _080DEB64 .pool _080DEB60: - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget movs r0, 0x3 _080DEB64: strb r0, [r1] diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index 08eb2359c..8116571f0 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -1431,7 +1431,7 @@ _080F64F2: bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -1532,7 +1532,7 @@ _080F65F0: bne _080F669C movs r0, 0 strh r0, [r3, 0xA] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203A034 ldr r0, [r0] ldr r0, [r0] @@ -2129,7 +2129,7 @@ sub_80F6AE8: @ 80F6AE8 movs r0, 0x8 movs r1, 0x8 bl sub_800DFB4 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, =gUnknown_02022B10 ldrb r1, [r0] lsls r0, r1, 4 @@ -2247,7 +2247,7 @@ _080F6BD0: lsls r1, r7, 4 adds r1, r7 lsls r1, 2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites adds r1, r3 ldrh r0, [r1, 0x4] lsls r0, 22 @@ -2488,7 +2488,7 @@ _080F6DEE: adds r4, 0x1 cmp r4, 0x7 ble _080F6DEE - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 @@ -2565,7 +2565,7 @@ sub_80F6E9C: @ 80F6E9C lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r4, r5 movs r6, 0 movs r5, 0x88 @@ -2605,7 +2605,7 @@ sub_80F6EF4: @ 80F6EF4 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r1, r2 ldrh r2, [r1, 0x24] ldrh r3, [r1, 0x20] @@ -2677,7 +2677,7 @@ sub_80F6F68: @ 80F6F68 strh r2, [r3, 0x20] _080F6F92: movs r4, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r5, 0x40 adds r2, r3, 0 adds r2, 0x2E @@ -2758,7 +2758,7 @@ sub_80F7014: @ 80F7014 ands r2, r0 strh r2, [r3, 0x3C] movs r4, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r5, 0x40 adds r2, r3, 0 adds r2, 0x2E @@ -2813,7 +2813,7 @@ sub_80F707C: @ 80F707C lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites adds r4, r1, r3 adds r0, 0x20 strh r0, [r4, 0x20] @@ -2900,7 +2900,7 @@ sub_80F7144: @ 80F7144 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites adds r2, r3 movs r0, 0x3E adds r0, r2 @@ -3582,7 +3582,7 @@ sub_80F7670: @ 80F7670 lsls r4, 24 lsrs r4, 24 bl Random - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r5, r4, 4 adds r5, r4 lsls r5, 2 @@ -4781,7 +4781,7 @@ _080F8074: adds r0, r4 movs r1, 0x32 mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r6] muls r0, r5 adds r0, r4 @@ -4830,7 +4830,7 @@ _080F80E2: adds r0, r5 movs r1, 0x33 mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r7] muls r0, r6 adds r0, r5 @@ -4879,7 +4879,7 @@ _080F814E: adds r0, r5 movs r1, 0x34 mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r7] muls r0, r6 adds r0, r5 @@ -4922,7 +4922,7 @@ _080F8190: adds r0, r5 movs r1, 0x35 mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r7] muls r0, r6 adds r0, r5 @@ -4965,7 +4965,7 @@ _080F81F8: adds r0, r5 movs r1, 0x36 mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r7] muls r0, r6 adds r0, r5 diff --git a/asm/credits.s b/asm/credits.s index c9a6072ff..2fafd4bf3 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -1516,7 +1516,7 @@ _08176158: bge _081761D8 adds r0, r3, 0x1 strh r0, [r1] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -1527,7 +1527,7 @@ _08176158: _081761D8: movs r0, 0 strh r0, [r1] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -1702,7 +1702,7 @@ _08176390: b _08176514 .pool _0817639C: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -1732,7 +1732,7 @@ _081763C0: strh r0, [r1, 0x12] b _0817644E _081763D8: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r2, r5, 2 adds r2, r5 lsls r2, 3 @@ -1803,7 +1803,7 @@ _0817644E: b _08176514 .pool _08176464: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0xC ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -1825,7 +1825,7 @@ _08176484: movs r1, 0x32 b _08176512 _08176490: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -1840,7 +1840,7 @@ _08176490: b _081764C8 .pool _081764B0: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -1859,7 +1859,7 @@ _081764C8: b _08176514 .pool _081764D4: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r2, r5, 2 adds r2, r5 lsls r2, 3 @@ -2077,7 +2077,7 @@ _08176670: .4byte _08176884 .4byte _08176934 _08176684: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gTasks lsls r4, r7, 2 adds r4, r7 @@ -2159,7 +2159,7 @@ _08176684: b _081769D4 .pool _0817672C: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gTasks lsls r4, r7, 2 adds r4, r7 @@ -2242,7 +2242,7 @@ _0817672C: b _081769D4 .pool _081767D8: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gTasks lsls r4, r7, 2 adds r4, r7 @@ -2326,7 +2326,7 @@ _081767D8: b _081769D4 .pool _08176884: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gTasks lsls r4, r7, 2 adds r4, r7 @@ -2409,7 +2409,7 @@ _08176884: b _081769D4 .pool _08176934: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gTasks lsls r4, r7, 2 adds r4, r7 @@ -2687,7 +2687,7 @@ _08176B54: lsls r4, 3 adds r4, r0 strh r2, [r4, 0x12] - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -2726,7 +2726,7 @@ _08176BD8: lsls r4, 3 adds r4, r0 strh r2, [r4, 0x12] - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -3505,7 +3505,7 @@ sub_8177224: @ 8177224 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -3562,7 +3562,7 @@ sub_8177224: @ 8177224 sub_81772B8: @ 81772B8 push {r4,lr} adds r3, r0, 0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r1, 0x2E ldrsh r0, [r3, r1] lsls r1, r0, 4 diff --git a/asm/daycare.s b/asm/daycare.s index 929c543bb..34cca5577 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -401,7 +401,7 @@ sub_806FCF8: @ 806FCF8 add r2, sp, 0x64 mov r0, sp movs r1, 0x19 - bl pokemon_setattr + bl SetMonData mov r0, sp bl sub_806FCA4 _0806FD46: @@ -498,7 +498,7 @@ sub_806FDEC: @ 806FDEC add r2, sp, 0x50 mov r0, sp movs r1, 0x19 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted mov r0, sp bl sub_80690C0 lsls r0, 24 @@ -1150,7 +1150,7 @@ _08070304: strb r0, [r2] mov r0, r9 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData b _080703AE _08070322: add r4, sp, 0x10 @@ -1205,7 +1205,7 @@ _08070370: movs r1, 0x2B _08070388: adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData b _080703AE _08070390: add r4, sp, 0x10 @@ -1220,7 +1220,7 @@ _08070390: mov r0, r9 movs r1, 0x2C adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData _080703AE: adds r0, r5, 0x1 lsls r0, 24 @@ -1919,7 +1919,7 @@ _08070918: strb r0, [r2] mov r0, sp movs r1, 0x2D - bl pokemon_setattr + bl SetMonData ldr r0, =gPlayerParty movs r1, 0xFA lsls r1, 1 @@ -1977,11 +1977,11 @@ sub_8070954: @ 8070954 adds r0, r7, 0 movs r1, 0x26 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData ldr r2, =gEggName adds r0, r7, 0 movs r1, 0x2 - bl pokemon_setattr + bl SetMonData lsls r2, r5, 3 subs r2, r5 lsls r2, 2 @@ -1989,15 +1989,15 @@ sub_8070954: @ 8070954 adds r2, r0 adds r0, r7, 0 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x24 mov r2, r8 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x3 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData cmp r6, 0 beq _080709E6 add r2, sp, 0x14 @@ -2005,7 +2005,7 @@ sub_8070954: @ 8070954 strb r0, [r2] adds r0, r7, 0 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData _080709E6: mov r2, sp adds r2, 0x15 @@ -2013,7 +2013,7 @@ _080709E6: strb r0, [r2] adds r0, r7, 0 movs r1, 0x2D - bl pokemon_setattr + bl SetMonData add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -2065,11 +2065,11 @@ sub_8070A0C: @ 8070A0C adds r0, r6, 0 movs r1, 0x26 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData ldr r2, =gEggName adds r0, r6, 0 movs r1, 0x2 - bl pokemon_setattr + bl SetMonData lsls r2, r5, 3 subs r2, r5 lsls r2, 2 @@ -2077,15 +2077,15 @@ sub_8070A0C: @ 8070A0C adds r2, r0 adds r0, r6, 0 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 movs r1, 0x24 mov r2, r9 - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 movs r1, 0x3 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -2214,7 +2214,7 @@ _08070B9A: adds r0, r4, 0 movs r1, 0x20 mov r2, sp - bl pokemon_setattr + bl SetMonData b _08070BB4 _08070BA8: ldr r0, =gUnknown_020375E0 diff --git a/asm/decoration.s b/asm/decoration.s index c22bd977f..dc85aca5d 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -2802,7 +2802,7 @@ ConfigureCameraObjectForPlacingDecoration: @ 8128118 lsls r1, 24 lsrs r1, 24 ldr r3, =gUnknown_0203AA38 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r5, =gUnknown_03005DD0 ldr r2, [r5, 0x4] lsls r0, r2, 4 @@ -2918,7 +2918,7 @@ _08128214: bl AddPseudoFieldObject ldr r1, =gUnknown_0203AA39 strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, =gUnknown_0203AA39 ldrb r1, [r0] lsls r0, r1, 4 @@ -3113,7 +3113,7 @@ sub_81283BC: @ 81283BC adds r0, r1 movs r1, 0 strh r1, [r0, 0x1C] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, =gUnknown_0203AA38 ldrb r1, [r0] lsls r0, r1, 4 @@ -3151,7 +3151,7 @@ sub_8128414: @ 8128414 adds r0, r1 movs r1, 0 strh r1, [r0, 0x1C] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, =gUnknown_0203AA38 ldrb r1, [r0] lsls r0, r1, 4 @@ -3928,7 +3928,7 @@ _08128A44: ldr r0, =gUnknown_08275D1F bl script_env_1_execute_new_script _08128A64: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AA38 ldrb r1, [r0] lsls r0, r1, 4 @@ -4367,7 +4367,7 @@ sub_8128DE0: @ 8128DE0 ldr r1, =gUnknown_0203AA3A movs r0, 0 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r3, =gUnknown_0203AA38 ldrb r1, [r3] lsls r0, r1, 4 @@ -4401,7 +4401,7 @@ sub_8128E18: @ 8128E18 lsls r0, 3 ldr r1, =gTasks + 0x8 adds r4, r0, r1 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r3, =gUnknown_0203AA38 ldrb r1, [r3] lsls r0, r1, 4 @@ -4558,7 +4558,7 @@ _08128F66: ldrb r0, [r0] cmp r0, 0 beq _08128F94 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_0203AA38 ldrb r1, [r2] lsls r0, r1, 4 @@ -4616,7 +4616,7 @@ sub_8128FD8: @ 8128FD8 movs r0, 0 movs r1, 0x1 bl sub_8197434 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AA38 ldrb r1, [r0] lsls r0, r1, 4 @@ -5390,7 +5390,7 @@ AddDecorationIconObject: @ 81295CC lsrs r4, r0, 24 cmp r4, 0x40 beq _08129696 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r4, 4 adds r1, r3, r4 lsls r1, 2 @@ -5418,7 +5418,7 @@ _08129634: lsrs r4, r0, 24 cmp r4, 0x40 beq _08129696 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r4, 4 adds r0, r2, r4 lsls r0, 2 @@ -5453,7 +5453,7 @@ _08129696: movs r0, 0x40 b _081296D8 _0812969A: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r4, 4 adds r1, r3, r4 lsls r1, 2 @@ -5867,7 +5867,7 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 81299DC sub sp, 0x4 bl player_get_direction_lower_nybble ldr r3, =gUnknown_0203AA38 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r4, =gUnknown_03005DD0 ldr r1, [r4, 0x4] lsls r0, r1, 4 @@ -5906,7 +5906,7 @@ _08129A44: bl AddPseudoFieldObject ldr r1, =gUnknown_0203AA39 strb r0, [r1] - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r0, =gUnknown_0203AA39 ldrb r0, [r0] lsls r1, r0, 4 @@ -6021,7 +6021,7 @@ sub_8129B34: @ 8129B34 movs r0, 0 movs r1, 0x1 bl sub_8197434 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r3, =gUnknown_0203AA38 ldrb r1, [r3] lsls r0, r1, 4 @@ -6115,7 +6115,7 @@ sub_8129BF8: @ 8129BF8 movs r1, 0 strh r1, [r0, 0x1C] bl sub_8128DE0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r5, =gUnknown_0203AA38 ldrb r1, [r5] lsls r0, r1, 4 @@ -6194,7 +6194,7 @@ _08129CA8: cmp r0, 0x1 bne _08129D3C _08129CDE: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r4, =gUnknown_0203AA38 ldrb r1, [r4] lsls r0, r1, 4 @@ -6350,7 +6350,7 @@ sub_8129E0C: @ 8129E0C push {r4-r6,lr} lsls r0, 24 lsls r1, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r6, =gUnknown_0203AA38 ldrb r3, [r6] lsls r2, r3, 4 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index d967dd140..c2be78142 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -7766,7 +7766,7 @@ sub_811DEC4: @ 811DEC4 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2] movs r0, 0x1 @@ -7888,7 +7888,7 @@ sub_811DFC8: @ 811DFC8 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r1, r4 str r1, [r2] movs r0, 0x20 @@ -8228,7 +8228,7 @@ sub_811E288: @ 811E288 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2] ldr r0, =sub_811E2DC @@ -8379,7 +8379,7 @@ sub_811E3AC: @ 811E3AC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r1, r4 str r1, [r2] movs r6, 0 @@ -8665,7 +8665,7 @@ sub_811E5D4: @ 811E5D4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r2] _0811E602: @@ -8686,7 +8686,7 @@ _0811E602: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r2] adds r0, 0x3F @@ -8836,7 +8836,7 @@ sub_811E720: @ 811E720 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r2] _0811E74E: @@ -8857,7 +8857,7 @@ _0811E74E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r2] movs r1, 0x1 @@ -8993,7 +8993,7 @@ _0811E852: lsrs r2, r0, 24 cmp r2, 0x40 beq _0811E892 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -9024,7 +9024,7 @@ _0811E8A0: lsrs r2, r0, 24 cmp r2, 0x40 beq _0811E8D0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 16c1be474..d2e923bcf 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -114,7 +114,7 @@ _0807141E: adds r2, r0 adds r2, 0x10 adds r0, r6, 0 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -127,7 +127,7 @@ _0807143C: lsls r2, r4, 2 adds r2, r7, r2 adds r0, r6, 0 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -139,30 +139,30 @@ _0807143C: adds r0, r6, 0 movs r1, 0x3 mov r2, r8 - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 movs r1, 0x25 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 movs r1, 0x8 ldr r2, [sp, 0x40] - bl pokemon_setattr + bl SetMonData movs r0, 0x78 ldr r1, [sp, 0x44] strb r0, [r1] adds r0, r6, 0 movs r1, 0x20 ldr r2, [sp, 0x44] - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 movs r1, 0x22 ldr r2, [sp, 0x4C] - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 movs r1, 0x50 ldr r2, [sp, 0x48] - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 adds r1, r6, 0 movs r2, 0x64 @@ -197,7 +197,7 @@ sub_80714B8: @ 80714B8 adds r0, r5, 0 movs r1, 0x2D adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 movs r1, 0xB bl GetMonData @@ -210,7 +210,7 @@ sub_80714B8: @ 80714B8 adds r0, r5, 0 movs r1, 0x2 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 bl SpeciesToNationalPokedexNum adds r4, r0, 0 @@ -231,20 +231,20 @@ sub_80714B8: @ 80714B8 strh r0, [r2] adds r0, r5, 0 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData add r2, sp, 0x10 movs r0, 0 strh r0, [r2] adds r0, r5, 0 movs r1, 0x24 - bl pokemon_setattr + bl SetMonData bl sav1_map_get_name mov r2, sp adds r2, 0x12 strb r0, [r2] adds r0, r5, 0 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 bl sub_806E924 adds r0, r5, 0 @@ -430,7 +430,7 @@ _080716D8: bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -736,7 +736,7 @@ sub_80719FC: @ 80719FC adds r0, r1 ldr r2, =gStringVar3 movs r1, 0x2 - bl pokemon_setattr + bl SetMonData bl sub_805F094 ldr r0, =gUnknown_03000DE0 ldr r0, [r0] @@ -891,7 +891,7 @@ _08071B7A: ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r5] ldrb r1, [r0] lsls r0, r1, 4 @@ -904,7 +904,7 @@ _08071B7A: b _08071E06 .pool _08071BA0: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r5] ldrb r1, [r2] lsls r0, r1, 4 @@ -942,7 +942,7 @@ _08071BBC: b _08071DC8 .pool _08071BF8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r3, [r5] ldrb r1, [r3, 0x1] lsls r0, r1, 4 @@ -1305,7 +1305,7 @@ sub_8071EF0: @ 8071EF0 adds r0, r1 movs r1, 0xB bl GetMonData - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, [r4] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -1449,7 +1449,7 @@ sub_8072048: @ 8072048 ldrsh r0, [r5, r1] cmp r0, 0 bne _08072084 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r3, =gUnknown_03000DE0 ldr r0, [r3] ldrb r1, [r0, 0x1] @@ -1489,7 +1489,7 @@ _0807209E: ldrsh r0, [r5, r1] cmp r0, 0x9 bgt _080720BC - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03000DE0 ldr r0, [r0] ldrb r1, [r0, 0x1] @@ -1650,7 +1650,7 @@ sub_8072194: @ 8072194 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index 166407983..baa0415ef 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -155,7 +155,7 @@ sub_817BB38: @ 817BB38 lsrs r0, 24 cmp r0, 0x40 beq _0817BB82 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -259,7 +259,7 @@ sub_817BC08: @ 817BC08 lsrs r0, 24 cmp r0, 0x40 beq _0817BC5E - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -351,7 +351,7 @@ sub_817BCB8: @ 817BCB8 lsrs r0, 24 cmp r0, 0x40 beq _0817BD0E - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -513,7 +513,7 @@ sub_817BDF0: @ 817BDF0 cmp r4, 0x40 beq _0817BE60 bl Random - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r5, r4, 4 adds r5, r4 lsls r5, 2 @@ -1273,7 +1273,7 @@ _0817C3BA: movs r2, 0 movs r3, 0 bl SetSpriteTransformationMatrix - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 lsls r2, r5, 4 adds r2, r5 @@ -1579,7 +1579,7 @@ sub_817C67C: @ 817C67C push {r6} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 ldr r1, =gTasks lsls r4, r0, 2 @@ -1667,7 +1667,7 @@ sub_817C72C: @ 817C72C push {r6} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 ldr r1, =gTasks lsls r4, r0, 2 diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 4b679428c..e65193803 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -265,7 +265,7 @@ evolution_cutscene: @ 813DA8C lsls r1, r0, 24 lsrs r3, r1, 24 strb r0, [r2] - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -521,7 +521,7 @@ sub_813DD7C: @ 813DD7C lsls r2, r0, 24 lsrs r2, 24 strb r0, [r1, 0x1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -729,7 +729,7 @@ _0813E0F0: lsls r2, r0, 24 lsrs r2, 24 strb r0, [r1, 0x1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -896,7 +896,7 @@ sub_813E1D4: @ 813E1D4 lsls r1, r0, 24 lsrs r6, r1, 24 strb r0, [r2, 0x1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -1052,7 +1052,7 @@ _0813E416: adds r2, r1, r7 adds r2, 0xC movs r1, 0xB - bl pokemon_setattr + bl SetMonData ldrb r0, [r6] muls r0, r5 adds r0, r4 @@ -1063,25 +1063,25 @@ _0813E416: ldr r1, =gSpeciesNames adds r2, r1 movs r1, 0x2 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6] muls r0, r5 adds r0, r4 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r6] muls r0, r5 adds r0, r4 movs r1, 0x8 mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r6] muls r0, r5 adds r0, r4 movs r1, 0xA mov r2, sp - bl pokemon_setattr + bl SetMonData movs r4, 0x32 ldr r0, [sp, 0x8] mov r8, r0 @@ -1094,7 +1094,7 @@ _0813E484: adds r0, r1 adds r1, r4, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r4, 0x1 cmp r4, 0x36 ble _0813E484 @@ -1108,7 +1108,7 @@ _0813E4A0: adds r0, r5 adds r1, r4, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r4, 0x1 cmp r4, 0x4F ble _0813E4A0 @@ -1118,7 +1118,7 @@ _0813E4A0: adds r0, r5 movs r1, 0x37 mov r2, sp - bl pokemon_setattr + bl SetMonData movs r0, 0xFF str r0, [sp] ldrb r0, [r4] @@ -1126,7 +1126,7 @@ _0813E4A0: adds r0, r5 movs r1, 0x40 mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r4] muls r0, r6 adds r0, r5 @@ -1170,7 +1170,7 @@ _0813E4A0: ldr r2, =gUnknown_085B58C4 mov r0, r9 movs r1, 0x2 - bl pokemon_setattr + bl SetMonData _0813E546: add sp, 0xC pop {r3-r5} @@ -1214,7 +1214,7 @@ evovle_mon_maybe: @ 813E570 ldrsh r0, [r3, r1] cmp r0, 0x8 bne _0813E5F0 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1291,7 +1291,7 @@ _0813E670: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB80 ldr r0, [r0] ldrb r1, [r0] @@ -1422,7 +1422,7 @@ _0813E7C0: bl sub_8140000 movs r0, 0x11 bl sub_817BE94 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication strb r0, [r1, 0x2] ldr r0, =gTasks mov r2, r8 @@ -1432,7 +1432,7 @@ _0813E7C0: b _0813EC52 .pool _0813E7E8: - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1459,7 +1459,7 @@ _0813E7FE: bl _0813F1A4 .pool _0813E828: - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1496,7 +1496,7 @@ _0813E874: ldr r1, [r2] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1515,7 +1515,7 @@ _0813E890: .pool _0813E8A4: bl sub_817C068 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication strb r0, [r1, 0x2] ldr r0, =gTasks mov r3, r8 @@ -1525,7 +1525,7 @@ _0813E8A4: b _0813EC52 .pool _0813E8C0: - ldr r6, =gUnknown_02024332 + ldr r6, =gBattleCommunication ldrb r0, [r6, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -1546,7 +1546,7 @@ _0813E8D6: b _0813EB96 .pool _0813E8EC: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -1641,7 +1641,7 @@ _0813E99E: adds r2, 0xC mov r0, r9 movs r1, 0xB - bl pokemon_setattr + bl SetMonData mov r0, r9 bl pokemon_calc_effective_stats ldrh r1, [r4, 0xA] @@ -1706,7 +1706,7 @@ _0813EA5E: movs r1, 0x2 add r2, sp, 0x4 bl GetMonData - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 add r1, sp, 0x4 bl StringCopy10 ldr r0, =0x0000ffff @@ -1787,7 +1787,7 @@ _0813EB06: b _0813F1A4 .pool _0813EB34: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -2097,7 +2097,7 @@ _0813EDEA: adds r0, 0x1 movs r2, 0 strh r0, [r1, 0x14] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r2, [r0, 0x1] movs r0, 0 bl sub_8056B74 @@ -2110,7 +2110,7 @@ _0813EE34: ands r0, r1 cmp r0, 0 beq _0813EE5C - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _0813EE5C @@ -2128,7 +2128,7 @@ _0813EE5C: ands r0, r1 cmp r0, 0 beq _0813EE84 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _0813EE84 @@ -2155,7 +2155,7 @@ _0813EE84: bl sub_8056A3C movs r0, 0x5 bl audio_play - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r2, [r0, 0x1] cmp r2, 0 beq _0813EECC @@ -2303,7 +2303,7 @@ _0813EFC8: b _0813F1A4 .pool _0813F014: - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -2618,7 +2618,7 @@ _0813F314: _0813F324: movs r0, 0x1 bl sub_8140000 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB80 ldr r0, [r0] ldrb r1, [r0] @@ -2632,7 +2632,7 @@ _0813F324: adds r6, 0x10 adds r0, r6, 0 bl sub_817BE94 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication strb r0, [r1, 0x2] ldr r1, =gTasks lsls r0, r7, 2 @@ -2648,7 +2648,7 @@ _0813F324: bl _0813FCC4 .pool _0813F380: - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -2675,7 +2675,7 @@ _0813F396: bl _0813FCC4 .pool _0813F3C0: - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -2708,7 +2708,7 @@ _0813F404: ldr r1, [r2] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -2723,7 +2723,7 @@ _0813F420: .pool _0813F42C: bl sub_817C068 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication strb r0, [r1, 0x2] ldr r1, =gTasks lsls r0, r7, 2 @@ -2733,7 +2733,7 @@ _0813F42C: b _0813F6B4 .pool _0813F448: - ldr r6, =gUnknown_02024332 + ldr r6, =gBattleCommunication ldrb r0, [r6, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -2754,7 +2754,7 @@ _0813F45E: b _0813F6F2 .pool _0813F474: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -2825,7 +2825,7 @@ _0813F4F2: adds r2, 0xC mov r0, r9 movs r1, 0xB - bl pokemon_setattr + bl SetMonData mov r0, r9 bl pokemon_calc_effective_stats ldrh r1, [r4, 0xA] @@ -2890,7 +2890,7 @@ _0813F58C: movs r1, 0x2 add r2, sp, 0x4 bl GetMonData - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 add r1, sp, 0x4 bl StringCopy10 ldr r0, =0x0000ffff @@ -2951,7 +2951,7 @@ _0813F634: b _0813FCC4 .pool _0813F668: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -2963,7 +2963,7 @@ _0813F668: b _0813FCC4 _0813F67C: bl m4aMPlayAllStop - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB80 ldr r0, [r0] ldrb r1, [r0] @@ -3260,7 +3260,7 @@ _0813F928: movs r2, 0xE movs r3, 0 bl CreateYesNoMenu - ldr r3, =gUnknown_02024332 + ldr r3, =gBattleCommunication strb r4, [r3, 0x1] ldr r0, =gTasks mov r2, r8 @@ -3292,7 +3292,7 @@ _0813F986: beq _0813F9E4 b _0813FCC4 _0813F98C: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r6, [r0, 0x1] ldr r0, =gUnknown_085CC270 movs r1, 0x92 @@ -3328,7 +3328,7 @@ _0813F9C8: b _0813FCC4 .pool _0813F9E4: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x1] ldr r0, =gUnknown_085CC270 @@ -3456,7 +3456,7 @@ _0813FAEC: b _0813FCC4 .pool _0813FB3C: - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -4178,7 +4178,7 @@ sub_81401E0: @ 81401E0 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r2 movs r2, 0 movs r3, 0 @@ -4193,7 +4193,7 @@ sub_8140208: @ 8140208 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 diff --git a/asm/field_camera.s b/asm/field_camera.s index 354dd8f36..8e31b002a 100644 --- a/asm/field_camera.s +++ b/asm/field_camera.s @@ -772,7 +772,7 @@ CameraUpdateCallback: @ 808A0F4 ldr r2, [r3, 0x4] cmp r2, 0 beq _0808A114 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -817,7 +817,7 @@ InitCameraUpdateCallback: @ 808A134 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles _0808A150: diff --git a/asm/field_effect.s b/asm/field_effect.s index 370fdf283..af22559f6 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -305,7 +305,7 @@ FieldEffectFreeTilesIfUnused: @ 80B5D04 cmp r3, r0 beq _080B5D58 movs r2, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites _080B5D1E: lsls r0, r2, 4 adds r0, r2 @@ -357,7 +357,7 @@ FieldEffectFreePaletteIfUnused: @ 80B5D68 cmp r5, r0 beq _080B5DB0 movs r2, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r3, r4, 0 _080B5D84: lsls r0, r2, 4 @@ -985,7 +985,7 @@ sub_80B6214: @ 80B6214 sub_80B6250: @ 80B6250 push {r4,lr} adds r2, r0, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r1, 0x14 ldrsh r0, [r2, r1] lsls r1, r0, 4 @@ -1019,7 +1019,7 @@ _080B6282: sub_80B628C: @ 80B628C push {lr} adds r3, r0, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x14 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -1042,7 +1042,7 @@ _080B62AC: thumb_func_start sub_80B62B4 sub_80B62B4: @ 80B62B4 push {lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x14 ldrsh r1, [r0, r3] lsls r0, r1, 4 @@ -1178,7 +1178,7 @@ sub_80B6360: @ 80B6360 sub_80B63D4: @ 80B63D4 push {lr} adds r3, r0, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x14 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -1205,7 +1205,7 @@ _080B63FA: sub_80B6404: @ 80B6404 push {lr} adds r3, r0, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x14 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -1228,7 +1228,7 @@ _080B6424: thumb_func_start sub_80B642C sub_80B642C: @ 80B642C push {lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x14 ldrsh r1, [r0, r3] lsls r0, r1, 4 @@ -1279,7 +1279,7 @@ sub_80B646C: @ 80B646C lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r1, r2 strh r4, [r1, 0x24] strh r5, [r1, 0x26] @@ -1347,7 +1347,7 @@ _080B64F4: bl AddObjectToBack lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1724,7 +1724,7 @@ nullsub_97: @ 80B6824 sub_80B6828: @ 80B6828 push {lr} adds r3, r0, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -1762,7 +1762,7 @@ sub_80B6850: @ 80B6850 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -1845,7 +1845,7 @@ sub_80B68EC: @ 80B68EC lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldr r1, =gUnknown_0855C2C4 bl SetSpriteOamTables_NoPriorityFromTable @@ -1862,7 +1862,7 @@ _080B6934: lsls r0, 24 lsrs r4, r0, 24 _080B6948: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -2175,7 +2175,7 @@ sub_80B6BCC: @ 80B6BCC lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 bl CameraObjectReset2 ldrb r1, [r6, 0x5] @@ -2261,7 +2261,7 @@ sub_80B6C90: @ 80B6C90 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r0, r2, 0 adds r0, 0x29 @@ -2320,7 +2320,7 @@ sub_80B6D04: @ 80B6D04 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r0, r1 ldrh r0, [r4, 0xA] ldrh r1, [r5, 0x26] @@ -2669,7 +2669,7 @@ sub_80B6FB8: @ 80B6FB8 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 movs r0, 0xC ldrsh r1, [r5, r0] @@ -2707,7 +2707,7 @@ sub_80B7004: @ 80B7004 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 movs r0, 0xC ldrsh r1, [r5, r0] @@ -2888,7 +2888,7 @@ sub_80B7190: @ 80B7190 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 movs r0, 0xA ldrsh r1, [r5, r0] @@ -2919,7 +2919,7 @@ sub_80B71D0: @ 80B71D0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r0, r1 movs r0, 0xA ldrsh r1, [r4, r0] @@ -2967,7 +2967,7 @@ sub_80B7230: @ 80B7230 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 movs r0, 0xA ldrsh r1, [r5, r0] @@ -2998,7 +2998,7 @@ sub_80B7270: @ 80B7270 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r0, r1 movs r0, 0xA ldrsh r1, [r4, r0] @@ -3457,7 +3457,7 @@ _080B7604: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 ldr r3, [r3] adds r0, r4, 0 @@ -3787,7 +3787,7 @@ _080B78A4: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 ldr r3, [r3] adds r0, r4, 0 @@ -3875,7 +3875,7 @@ sub_80B7968: @ 80B7968 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r0, 0x2B ldrb r0, [r0] @@ -3952,7 +3952,7 @@ sub_80B79F4: @ 80B79F4 bl AddObjectToBack lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -4036,7 +4036,7 @@ _080B7AA0: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 ldr r3, [r3] adds r0, r4, 0 @@ -4140,7 +4140,7 @@ sub_80B7B94: @ 80B7B94 push {r4,lr} adds r3, r0, 0 adds r4, r1, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0xA ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -4239,7 +4239,7 @@ sub_80B7C48: @ 80B7C48 bl AddObjectToBack lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -4776,7 +4776,7 @@ sub_80B80C4: @ 80B80C4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r0, r1 ldrh r0, [r4, 0xA] subs r0, 0x1 @@ -4966,7 +4966,7 @@ sub_80B8280: @ 80B8280 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r0, r2, 0 adds r0, 0x29 @@ -5038,7 +5038,7 @@ sub_80B830C: @ 80B830C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r0, r1 ldrh r0, [r4, 0xA] ldrh r1, [r5, 0x26] @@ -5456,7 +5456,7 @@ _080B869C: bne _080B86DC cmp r1, 0x78 bne _080B86DC - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -5483,7 +5483,7 @@ sub_80B86EC: @ 80B86EC ldrh r0, [r3, 0x12] subs r0, 0x10 strh r0, [r3, 0x12] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -5604,7 +5604,7 @@ overworld_bg_setup_2: @ 80B87B8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrh r1, [r4, 0x26] lsls r1, 24 @@ -5810,7 +5810,7 @@ sub_80B898C: @ 80B898C ldr r1, =0x00002878 movs r0, 0x46 bl SetGpuReg - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -5837,7 +5837,7 @@ sub_80B89DC: @ 80B89DC push {r4,lr} adds r4, r0, 0 bl sub_80B8B28 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -5934,7 +5934,7 @@ sub_80B8A64: @ 80B8A64 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrh r1, [r4, 0x26] lsls r1, 24 @@ -6183,7 +6183,7 @@ sub_80B8C60: @ 80B8C60 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r1 ldr r1, =DummyObjectCallback str r1, [r2, 0x1C] @@ -6562,7 +6562,7 @@ sub_80B8F98: @ 80B8F98 lsls r1, r0, 4 add r1, r8 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 ldrb r2, [r1, 0x5] movs r0, 0xD @@ -6691,7 +6691,7 @@ sub_80B90CC: @ 80B90CC lsls r2, r4, 4 adds r2, r4 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 ldrb r1, [r2, 0x5] movs r0, 0xF @@ -6745,7 +6745,7 @@ sub_80B9128: @ 80B9128 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -7041,7 +7041,7 @@ sub_80B9390: @ 80B9390 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r0, r6 movs r1, 0x16 bl StartObjectImageAnim @@ -7175,7 +7175,7 @@ sub_80B94C4: @ 80B94C4 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r1 ldrb r3, [r2, 0x5] movs r1, 0xF @@ -7197,7 +7197,7 @@ sub_80B94C4: @ 80B94C4 sub_80B9508: @ 80B9508 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -7217,7 +7217,7 @@ sub_80B9524: @ 80B9524 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 ldr r0, =sub_80B963C str r0, [r4, 0x1C] @@ -7245,7 +7245,7 @@ sub_80B9560: @ 80B9560 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -7373,7 +7373,7 @@ sub_80B963C: @ 80B963C lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -7529,7 +7529,7 @@ sub_80B9794: @ 80B9794 lsrs r4, 24 adds r0, r4, 0 bl sub_80B9524 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -7634,7 +7634,7 @@ _080B9856: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x16 bl StartObjectImageAnim @@ -7684,7 +7684,7 @@ _080B98D0: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 ldrb r0, [r5, 0xA] movs r1, 0x40 @@ -7725,7 +7725,7 @@ sub_80B9924: @ 80B9924 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 movs r2, 0xC ldrsh r0, [r4, r2] @@ -7771,7 +7771,7 @@ sub_80B9978: @ 80B9978 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 ldrb r1, [r5, 0x1] movs r0, 0x11 @@ -7847,7 +7847,7 @@ sub_80B9A28: @ 80B9A28 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldrh r0, [r4, 0x8] @@ -8130,7 +8130,7 @@ sub_80B9C54: @ 80B9C54 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 ldrb r0, [r1, 0x1] movs r2, 0x20 @@ -8243,7 +8243,7 @@ _080B9D5A: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 lsls r1, r5, 24 lsrs r1, 24 @@ -8391,7 +8391,7 @@ sub_80B9E28: @ 80B9E28 adds r2, r1 ldrb r0, [r4, 0x4] strh r0, [r2, 0xA] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -8437,7 +8437,7 @@ sub_80B9EDC: @ 80B9EDC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r6, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 9a0460934..a64472088 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -26,7 +26,7 @@ SetUpReflection: @ 8153ED4 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r7, r1, r0 ldr r0, =objc_reflection_maybe str r0, [r7, 0x1C] @@ -254,7 +254,7 @@ objc_reflection_maybe: @ 81540A8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r0, r1 ldr r0, [r7] ldr r1, =0x00020001 @@ -444,7 +444,7 @@ sub_8154228: @ 8154228 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 ldrb r2, [r1, 0x5] movs r0, 0xD @@ -471,7 +471,7 @@ _08154266: objid_set_invisible: @ 8154278 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -503,7 +503,7 @@ sub_8154298: @ 8154298 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r0, r1 adds r0, r2, 0 adds r0, 0x3E @@ -537,7 +537,7 @@ _081542E2: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r0, r1 mov r0, sp ldrh r0, [r0] @@ -607,7 +607,7 @@ oei_shadow: @ 8154340 lsrs r1, r0, 24 cmp r1, 0x40 beq _081543C4 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r1, 4 adds r2, r1 lsls r2, 2 @@ -679,7 +679,7 @@ _08154412: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 ldrb r0, [r1, 0x5] movs r2, 0xC @@ -771,7 +771,7 @@ oei_grass_normal: @ 81544AC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r3, r0, r1 adds r2, r3, 0 adds r2, 0x3E @@ -972,7 +972,7 @@ sub_8154658: @ 8154658 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -1016,7 +1016,7 @@ sub_81546C8: @ 81546C8 lsls r2, 24 lsrs r6, r2, 24 movs r5, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 lsls r3, 16 asrs r3, 16 @@ -1109,7 +1109,7 @@ sub_8154758: @ 8154758 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 adds r2, r4, 0 adds r2, 0x3E @@ -1303,7 +1303,7 @@ sub_81548FC: @ 81548FC lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -1361,7 +1361,7 @@ sub_815496C: @ 815496C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r2, r4 adds r3, r2, 0 adds r3, 0x3E @@ -1463,7 +1463,7 @@ _08154A5C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r6, r0, r1 ldrh r5, [r6, 0x22] ldrh r7, [r6, 0x20] @@ -1558,7 +1558,7 @@ sub_8154B04: @ 8154B04 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -1613,7 +1613,7 @@ sub_8154B78: @ 8154B78 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -1668,7 +1668,7 @@ sub_8154BEC: @ 8154BEC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -1804,7 +1804,7 @@ sub_8154CEC: @ 8154CEC lsls r3, r4, 4 adds r3, r4 lsls r3, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r3, r4 movs r1, 0x3E adds r1, r3 @@ -1880,7 +1880,7 @@ _08154DC0: bl FieldEffectStop b _08154E0A _08154DCA: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_02037350 mov r0, sp ldrb r1, [r0] @@ -1943,7 +1943,7 @@ sub_8154E1C: @ 8154E1C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -1997,7 +1997,7 @@ oei_water_drop_tall: @ 8154E8C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2058,7 +2058,7 @@ sub_8154EFC: @ 8154EFC lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites adds r0, r3 ldr r1, =sub_8154FB4 str r1, [r0, 0x1C] @@ -2149,7 +2149,7 @@ _08154FFC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrh r1, [r0, 0x20] strh r1, [r4, 0x20] @@ -2207,7 +2207,7 @@ oei_ripples: @ 8155054 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2263,7 +2263,7 @@ sub_81550B4: @ 81550B4 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r2, r4 adds r3, r2, 0 adds r3, 0x3E @@ -2362,7 +2362,7 @@ _081551A0: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r1, r2 ldrh r2, [r1, 0x20] strh r2, [r4, 0x20] @@ -2414,7 +2414,7 @@ sub_81551F0: @ 81551F0 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2466,7 +2466,7 @@ sub_815525C: @ 815525C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2518,7 +2518,7 @@ sub_81552C8: @ 81552C8 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2570,7 +2570,7 @@ sub_8155334: @ 8155334 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2659,7 +2659,7 @@ oei_ash: @ 81553D4 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2831,7 +2831,7 @@ sub_8155534: @ 8155534 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -2866,7 +2866,7 @@ sub_81555AC: @ 81555AC lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -2890,7 +2890,7 @@ sub_81555D8: @ 81555D8 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -2915,7 +2915,7 @@ sub_8155604: @ 8155604 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -2978,7 +2978,7 @@ sub_8155658: @ 8155658 lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r5, r0 adds r0, r4, 0 adds r1, r6, 0 @@ -3200,7 +3200,7 @@ sub_8155800: @ 8155800 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r1 ldr r1, =sub_8155850 str r1, [r2, 0x1C] @@ -3230,7 +3230,7 @@ sub_8155850: @ 8155850 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r3, r0, r1 ldrh r1, [r2, 0x32] adds r0, r1, 0x1 @@ -3282,7 +3282,7 @@ sub_8155890: @ 8155890 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -3343,7 +3343,7 @@ sub_8155900: @ 8155900 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 adds r3, r0, 0 adds r3, 0x3E @@ -3437,7 +3437,7 @@ _081559F6: b _08155A76 .pool _08155A04: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r1, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3473,7 +3473,7 @@ _08155A2C: _08155A46: strh r6, [r4, 0x20] strh r5, [r4, 0x22] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_02037350 mov r0, sp ldrb r1, [r0] @@ -3527,7 +3527,7 @@ sub_8155A88: @ 8155A88 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -3607,7 +3607,7 @@ sub_8155B2C: @ 8155B2C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -3723,7 +3723,7 @@ _08155C08: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 movs r0, 0x3E adds r0, r2 @@ -3812,7 +3812,7 @@ _08155CB8: lsls r2, r1, 4 adds r2, r1 lsls r2, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r1 adds r1, r2, 0 adds r1, 0x3E @@ -3896,7 +3896,7 @@ sub_8155D78: @ 8155D78 ldrb r0, [r0] cmp r0, 0x1 bne _08155D96 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r1, 0x1A] lsls r0, r1, 4 adds r0, r1 @@ -3925,7 +3925,7 @@ sub_8155DA0: @ 8155DA0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r1, r0, r1 movs r3, 0x3C ldrsh r0, [r1, r3] @@ -3975,7 +3975,7 @@ sub_8155DDC: @ 8155DDC lsrs r2, r0, 24 cmp r2, 0x40 beq _08155E3C - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -4254,7 +4254,7 @@ _08156022: b _0815611A .pool _08156034: - ldr r4, =gUnknown_08329F40 + ldr r4, =gSineTable movs r3, 0x2E ldrsh r0, [r5, r3] movs r1, 0x3 @@ -4526,7 +4526,7 @@ _08156212: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r0, r1 adds r0, r6, 0 adds r0, 0x28 diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 01471c59f..2d4caae29 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -73,7 +73,7 @@ sub_808D450: @ 808D450 bl AddObjectToBack lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r10, r1 lsls r4, r0, 4 adds r4, r0 @@ -725,7 +725,7 @@ RemoveFieldObjectInternal: @ 808D90C ands r0, r1 orrs r0, r2 str r0, [sp, 0x4] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -885,7 +885,7 @@ _0808DA64: lsls r0, r1, 4 add r0, r8 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 mov r2, r10 lsls r0, r2, 16 @@ -1050,7 +1050,7 @@ SpawnFieldObject: @ 808DB40 b _0808DBF2 .pool _0808DBBC: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r1, =gUnknown_02037350 lsls r0, r2, 3 adds r0, r2 @@ -1337,7 +1337,7 @@ _0808DDAE: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r4, 0 bl SetSpriteOamTables_NoPriorityFromTable @@ -1428,7 +1428,7 @@ sprite_new: @ 808DE0C lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r0, r1 ldrh r0, [r4, 0x8] lsls r0, 16 @@ -1943,7 +1943,7 @@ _0808E27E: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 mov r1, r10 lsls r0, r1, 16 @@ -2131,7 +2131,7 @@ FieldObjectSetGraphicsId: @ 808E3F8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 ldrb r0, [r6, 0xC] lsls r1, r0, 28 @@ -2298,7 +2298,7 @@ FieldObjectTurn: @ 808E544 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r4, r5 ldrb r0, [r6, 0x18] lsls r0, 28 @@ -2623,7 +2623,7 @@ sub_808E78C: @ 808E78C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrb r1, [r2, 0x3] movs r3, 0x4 @@ -2708,7 +2708,7 @@ sub_808E82C: @ 808E82C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 strh r5, [r0, 0x24] strh r4, [r0, 0x26] @@ -3086,7 +3086,7 @@ sub_808EB08: @ 808EB08 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r7, r0, r1 ldrb r0, [r6, 0x5] bl GetFieldObjectGraphicsInfo @@ -3383,7 +3383,7 @@ AddCameraObject: @ 808ED34 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -3429,7 +3429,7 @@ ObjectCB_CameraObject: @ 808ED78 @ void CameraObject_0(struct obj *object) CameraObject_0: @ 808EDA0 push {lr} - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -3462,7 +3462,7 @@ CameraObject_0: @ 808EDA0 @ void CameraObject_1(struct obj *object) CameraObject_1: @ 808EDDC push {r4,r5,lr} - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -3493,7 +3493,7 @@ CameraObject_1: @ 808EDDC @ void CameraObject_2(struct obj *object) CameraObject_2: @ 808EE14 push {r4,lr} - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -3522,7 +3522,7 @@ CameraObject_2: @ 808EE14 FindCameraObject: @ 808EE44 push {r4,r5,lr} movs r3, 0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r5, r4, 0 adds r5, 0x1C _0808EE4E: @@ -3635,7 +3635,7 @@ sub_808EEEC: @ 808EEEC lsls r3, 24 lsrs r7, r3, 24 movs r5, 0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites _0808EF06: lsls r0, r5, 4 adds r0, r5 @@ -3688,7 +3688,7 @@ obj_unfreeze: @ 808EF50 lsls r3, 24 lsrs r7, r3, 24 movs r5, 0x3F - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r2, 0x1 negs r2, r2 _0808EF6E: @@ -11833,7 +11833,7 @@ npc_set_running_behaviour_etc: @ 8092B2C strb r3, [r0] adds r0, 0x1 strb r3, [r0] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites mov r0, r12 ldrb r2, [r0, 0x4] lsls r0, r2, 4 @@ -12303,7 +12303,7 @@ sub_8092E9C: @ 8092E9C lsls r0, 24 cmp r0, 0 bne _08092EE8 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_02037350 mov r0, sp ldrb r1, [r0] @@ -12347,7 +12347,7 @@ sub_8092EF0: @ 8092EF0 lsls r0, 24 cmp r0, 0 bne _08092F2E - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_02037350 mov r0, sp ldrb r1, [r0] @@ -12749,7 +12749,7 @@ FieldObjectSetSpecialAnim: @ 80931C0 movs r1, 0x7F ands r0, r1 strb r0, [r4] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -12811,7 +12811,7 @@ FieldObjectClearAnim: @ 809323C movs r2, 0x7F ands r1, r2 strb r1, [r0] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r2, [r0, 0x4] lsls r1, r2, 4 adds r1, r2 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 146e360bb..a3b437237 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -2348,7 +2348,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC beq _0808BAFC b _0808BC24 _0808BAFC: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r3, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3118,7 +3118,7 @@ sub_808C0A8: @ 808C0A8 lsls r0, 24 cmp r0, 0 beq _0808C100 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -3165,7 +3165,7 @@ sub_808C114: @ 808C114 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectImageAnim @@ -3199,7 +3199,7 @@ sub_808C15C: @ 808C15C lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r5, 0 bl sub_8092A0C @@ -3240,7 +3240,7 @@ sub_808C1B4: @ 808C1B4 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 add r4, r8 adds r0, r5, 0 @@ -3289,7 +3289,7 @@ sub_808C228: @ 808C228 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r5, 0 bl FieldObjectDirectionToImageAnimId @@ -3527,7 +3527,7 @@ _0808C3F0: ldrb r0, [r4, 0xB] lsrs r0, 4 str r0, [r2, 0x8] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4013,7 +4013,7 @@ sub_808C814: @ 808C814 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r5, 0 @@ -4371,7 +4371,7 @@ _0808CB32: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 bl player_get_direction_lower_nybble lsls r0, 24 @@ -4606,7 +4606,7 @@ _0808CCBC: movs r2, 0 bl sub_8155604 _0808CD1A: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r7, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4669,7 +4669,7 @@ fishB: @ 808CD94 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 bl player_get_direction_lower_nybble lsls r0, 24 @@ -4717,7 +4717,7 @@ fishC: @ 808CE04 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 bl player_get_direction_lower_nybble lsls r0, 24 @@ -4776,7 +4776,7 @@ fishE: @ 808CE8C push {r7} adds r6, r0, 0 bl sub_808CF78 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r5, =gUnknown_02037590 ldrb r0, [r5, 0x4] lsls r1, r0, 4 @@ -4884,7 +4884,7 @@ sub_808CF78: @ 808CF78 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 adds r0, r4, 0 bl AnimateObject @@ -5043,7 +5043,7 @@ sub_808D094: @ 808D094 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r7, r0, r1 lsls r0, r2, 2 adds r0, r2 @@ -5223,7 +5223,7 @@ sub_808D1FC: @ 808D1FC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r7, r0, r1 mov r1, r8 lsls r0, r1, 2 diff --git a/asm/field_poison.s b/asm/field_poison.s index d1405ce30..f37acd399 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -77,7 +77,7 @@ sub_80F95C0: @ 80F95C0 adds r0, r4, 0 movs r1, 0x37 mov r2, sp - bl pokemon_setattr + bl SetMonData ldr r5, =gStringVar1 adds r0, r4, 0 movs r1, 0x2 @@ -287,7 +287,7 @@ _080F9788: adds r0, r4, 0 movs r1, 0x39 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r7, 0x1 _080F9794: adds r4, 0x64 diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index a881d207a..759e17d4e 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -691,7 +691,7 @@ sub_80FA13C: @ 80FA13C push {r4,lr} bl sub_80F9F78 ldr r0, =gUnknown_0858E600 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gUnknown_02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 @@ -848,7 +848,7 @@ _080FA26A: _080FA274: bl sub_80F9F78 ldr r0, =gUnknown_0858E618 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gUnknown_02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 @@ -999,7 +999,7 @@ sub_80FA3AC: @ 80FA3AC push {r4,lr} bl sub_80F9F78 ldr r0, =gUnknown_0858E630 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gUnknown_02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 @@ -1759,7 +1759,7 @@ sub_80FA9D0: @ 80FA9D0 lsrs r0, 24 cmp r0, 0x40 beq _080FAA5E - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -1834,7 +1834,7 @@ _080FAABC: b _080FAB8C _080FAAC6: ldr r0, =gUnknown_0858E68C - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gUnknown_02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 @@ -1856,7 +1856,7 @@ _080FAAC6: .pool _080FAAFC: ldr r0, =gUnknown_0858E68C - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gUnknown_02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 @@ -1875,7 +1875,7 @@ _080FAAFC: .pool _080FAB2C: ldr r0, =gUnknown_0858E68C - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gUnknown_02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 @@ -1897,7 +1897,7 @@ _080FAB4C: .pool _080FAB64: ldr r0, =gUnknown_0858E68C - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gUnknown_02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 @@ -2448,7 +2448,7 @@ sub_80FB00C: @ 80FB00C lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 adds r2, r4, 0 adds r2, 0x20 @@ -2483,7 +2483,7 @@ _080FB06E: thumb_func_start sub_80FB074 sub_80FB074: @ 80FB074 push {r4-r7,lr} - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r7, r4, 0 movs r6, 0 movs r5, 0x3F diff --git a/asm/fldeff_emotion.s b/asm/fldeff_emotion.s index 64a099744..cb3900da2 100644 --- a/asm/fldeff_emotion.s +++ b/asm/fldeff_emotion.s @@ -20,7 +20,7 @@ oei_exclamation_mark: @ 80B4620 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 movs r2, 0 @@ -47,7 +47,7 @@ sub_80B4658: @ 80B4658 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x21 movs r2, 0x1 @@ -74,7 +74,7 @@ sub_80B4690: @ 80B4690 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r4, 0 movs r1, 0x2E @@ -178,7 +178,7 @@ _080B4764: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 ldrh r3, [r4, 0x34] ldrh r0, [r4, 0x36] diff --git a/asm/front_pic_anim.s b/asm/front_pic_anim.s index aaa150644..5623cca6a 100644 --- a/asm/front_pic_anim.s +++ b/asm/front_pic_anim.s @@ -151,7 +151,7 @@ sub_817F594: @ 817F594 strh r5, [r4, 0xC] ldrh r0, [r5, 0x2E] lsls r0, 24 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsrs r0, 23 adds r0, r1 ldrh r1, [r0] diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 43a1a86c8..2ef1d0eeb 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -697,7 +697,7 @@ _08173B20: bl sub_818D3E4 lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -772,7 +772,7 @@ sub_8173BC0: @ 8173BC0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r3, r0, r1 ldr r1, [r3, 0x1C] ldr r0, =DummyObjectCallback @@ -832,7 +832,7 @@ sub_8173C34: @ 8173C34 .pool _08173C78: ldr r2, =gUnknown_0203BCD4 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 adds r0, r3, 0x5 lsls r0, 1 @@ -930,7 +930,7 @@ sub_8173D24: @ 8173D24 ldr r0, =gTasks + 0x8 mov r12, r0 mov r8, r1 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r7, 0xD negs r7, r7 _08173D52: @@ -1022,7 +1022,7 @@ _08173E04: adds r4, r5, 0 adds r7, 0x8 mov r8, r7 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r1, 0xD negs r1, r1 mov r12, r1 @@ -1204,7 +1204,7 @@ sub_8173F84: @ 8173F84 b _08174018 .pool _08173FAC: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x10 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -1342,7 +1342,7 @@ sub_81740B0: @ 81740B0 lsls r0, 3 adds r1, 0x12 adds r5, r0, r1 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r9, r2 movs r6, 0x5 _081740DC: @@ -1806,7 +1806,7 @@ _081744DE: bl sub_818D7D8 lsls r0, 16 lsrs r0, 16 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1937,7 +1937,7 @@ _08174630: lsls r6, r0, 3 ldr r0, =gTasks + 0x8 mov r10, r0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 movs r2, 0xD negs r2, r2 @@ -1984,7 +1984,7 @@ _0817466C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -3254,7 +3254,7 @@ _081751BA: movs r1, 0x3 ands r0, r1 adds r0, 0x8 - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable lsls r4, 1 adds r4, r1 movs r2, 0 @@ -3307,7 +3307,7 @@ sub_81751FC: @ 81751FC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r1, r0 bl Random lsls r0, 16 @@ -3424,7 +3424,7 @@ _08175324: movs r1, 0x3 ands r0, r1 adds r0, 0x8 - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable lsls r4, 1 adds r4, r1 movs r2, 0 diff --git a/asm/intro.s b/asm/intro.s index c7bbbc41f..3734b6a47 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -581,7 +581,7 @@ task_intro_3: @ 816D190 ldr r0, [r5] cmp r0, 0x4C bne _0816D1BE - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gTasks lsls r0, r4, 2 adds r0, r4 @@ -606,7 +606,7 @@ _0816D1CC: ldr r0, [r5] cmp r0, 0xFB bne _0816D1EE - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gTasks lsls r0, r4, 2 adds r0, r4 @@ -863,7 +863,7 @@ task_intro_4: @ 816D354 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1025,7 +1025,7 @@ _0816D590: _0816D598: lsls r0, 24 lsrs r6, r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -1143,7 +1143,7 @@ _0816D6A4: ldr r3, =gTasks cmp r1, r0 bne _0816D6C8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1161,7 +1161,7 @@ _0816D6C8: ldr r0, =0x000004be cmp r1, r0 bne _0816D6EA - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1179,7 +1179,7 @@ _0816D6EA: ldr r0, =0x00000572 cmp r1, r0 bne _0816D70C - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1197,7 +1197,7 @@ _0816D70C: ldr r0, =0x00000576 cmp r1, r0 bne _0816D72E - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1216,7 +1216,7 @@ _0816D72E: lsls r0, 3 cmp r1, r0 bne _0816D752 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1234,7 +1234,7 @@ _0816D752: ldr r0, =0x000006bf cmp r1, r0 bne _0816D774 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2428,7 +2428,7 @@ sub_816E190: @ 816E190 lsls r0, 24 lsrs r7, r0, 24 movs r4, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r5, =gUnknown_085E4C64 _0816E19C: movs r0, 0 @@ -3060,7 +3060,7 @@ sub_816E6D4: @ 816E6D4 mov r8, r0 movs r5, 0 ldr r7, =gUnknown_085E4CA8 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r9, r0 adds r4, r7, 0 movs r6, 0 @@ -3116,7 +3116,7 @@ sub_816E74C: @ 816E74C ldr r7, =gUnknown_085E4CA8 adds r4, r7, 0x4 movs r6, 0x24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 _0816E75E: movs r3, 0x20 @@ -3595,7 +3595,7 @@ _0816EB72: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 movs r1, 0x1 bl StartObjectImageAnim @@ -3642,7 +3642,7 @@ _0816EBE0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 movs r1, 0x1 bl StartObjectImageAnim @@ -4105,7 +4105,7 @@ _0816EFB6: lsrs r4, 24 movs r0, 0x67 bl audio_play - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -4566,7 +4566,7 @@ _0816F39A: sub_816F3A4: @ 816F3A4 push {r4,lr} adds r4, r0, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0x3C ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -4698,7 +4698,7 @@ sub_816F46C: @ 816F46C .pool _0816F4AC: ldrh r1, [r7, 0x36] - ldr r5, =gUnknown_08329F40 + ldr r5, =gSineTable lsls r0, r1, 24 lsrs r0, 23 adds r0, r5 @@ -4884,7 +4884,7 @@ sub_816F5B4: @ 816F5B4 strh r0, [r4, 0x36] ldrh r0, [r4, 0x36] adds r1, r0, 0 - ldr r2, =gUnknown_08329F40 + ldr r2, =gSineTable adds r0, 0x40 lsls r0, 24 lsrs r0, 23 @@ -4934,7 +4934,7 @@ sub_816F660: @ 816F660 ldrh r0, [r1, 0x36] adds r0, 0x8 strh r0, [r1, 0x36] - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable lsls r0, 24 lsrs r0, 23 adds r0, r3 @@ -5156,7 +5156,7 @@ sub_816F7D0: @ 816F7D0 bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r9, r2 lsls r0, r7, 4 adds r0, r7 @@ -5232,7 +5232,7 @@ _0816F8A0: bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -5896,7 +5896,7 @@ _0816FDD2: lsls r4, r6, 4 adds r4, r6 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 movs r1, 0 strh r1, [r4, 0x2E] @@ -5954,7 +5954,7 @@ _0816FDD2: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r2, 0 strh r2, [r0, 0x2E] @@ -6000,7 +6000,7 @@ sub_816FEDC: @ 816FEDC ldrsh r0, [r4, r1] cmp r0, 0 beq _0816FF48 - ldr r2, =gUnknown_08329F40 + ldr r2, =gSineTable ldrh r1, [r4, 0x32] lsls r0, r1, 24 lsrs r0, 23 @@ -6239,7 +6239,7 @@ _081700A6: adds r0, r1, 0x1 strh r0, [r5, 0x30] _081700BE: - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable ldrh r0, [r5, 0x30] lsls r0, 24 lsrs r0, 23 diff --git a/asm/intro_credits_graphics.s b/asm/intro_credits_graphics.s index 9748ca4b5..003b32d69 100644 --- a/asm/intro_credits_graphics.s +++ b/asm/intro_credits_graphics.s @@ -642,7 +642,7 @@ sub_817B698: @ 817B698 movs r7, 0 cmp r7, r8 bcs _0817B74E - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r10, r0 movs r2, 0x3F mov r9, r2 @@ -773,7 +773,7 @@ nullsub_65: @ 817B7C0 thumb_func_start sub_817B7C4 sub_817B7C4: @ 817B7C4 push {r4,lr} - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -855,7 +855,7 @@ sub_817B834: @ 817B834 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -895,7 +895,7 @@ sub_817B88C: @ 817B88C bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -916,7 +916,7 @@ nullsub_66: @ 817B8E4 thumb_func_start sub_817B8E8 sub_817B8E8: @ 817B8E8 push {r4,lr} - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -998,7 +998,7 @@ sub_817B948: @ 817B948 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -1053,7 +1053,7 @@ sub_817B9C4: @ 817B9C4 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 diff --git a/asm/item.s b/asm/item.s index fcc7eb6a8..3994375a5 100644 --- a/asm/item.s +++ b/asm/item.s @@ -55,7 +55,7 @@ encrypt_decrypt_all_item_quantities: @ 80D658C sub sp, 0x4 mov r8, r0 movs r1, 0 - ldr r0, =gUnknown_02039DD8 + ldr r0, =gBagItems mov r9, r0 _080D659E: movs r6, 0 @@ -66,7 +66,7 @@ _080D659E: ldrb r0, [r0, 0x4] cmp r6, r0 bcs _080D65CC - ldr r2, =gUnknown_02039DD8 + ldr r2, =gBagItems _080D65B0: adds r4, r5, r2 lsls r1, r6, 2 @@ -107,7 +107,7 @@ call_encrypt_decrypt_all_item_quantities: @ 80D65E4 @ void init_bag_pockets() init_bag_pockets: @ 80D65F0 push {r4,lr} - ldr r1, =gUnknown_02039DD8 + ldr r1, =gBagItems ldr r0, =gSaveBlock1Ptr ldr r2, [r0] movs r3, 0xAC @@ -239,7 +239,7 @@ IsBagPocketNonEmpty: @ 80D66EC push {lr} lsls r0, 24 movs r2, 0 - ldr r1, =gUnknown_02039DD8 + ldr r1, =gBagItems lsrs r0, 21 subs r0, 0x8 adds r0, r1 @@ -277,7 +277,7 @@ sub_80D6724: @ 80D6724 lsls r1, 16 lsrs r5, r1, 16 adds r0, r7, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 cmp r0, 0 beq _080D67B6 @@ -304,11 +304,11 @@ _080D6764: b _080D67B8 _080D6768: adds r0, r7, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket subs r0, 0x1 lsls r0, 24 movs r6, 0 - ldr r1, =gUnknown_02039DD8 + ldr r1, =gBagItems lsrs r4, r0, 21 b _080D67AE .pool @@ -335,7 +335,7 @@ _080D67A6: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, =gUnknown_02039DD8 + ldr r1, =gBagItems _080D67AE: adds r0, r4, r1 ldrb r0, [r0, 0x4] @@ -397,7 +397,7 @@ sub_80D6800: @ 80D6800 mov r8, r0 lsls r1, 16 lsrs r5, r1, 16 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 cmp r0, 0 beq _080D6906 @@ -421,7 +421,7 @@ _080D6838: .pool _080D684C: mov r0, r8 - bl itemid_get_pocket_number + bl ItemId_GetPocket subs r0, 0x1 lsls r0, 24 lsrs r2, r0, 24 @@ -431,7 +431,7 @@ _080D684C: movs r7, 0x63 _080D6860: movs r6, 0 - ldr r1, =gUnknown_02039DD8 + ldr r1, =gBagItems lsls r4, r2, 3 adds r0, r4, r1 mov r9, r4 @@ -472,7 +472,7 @@ _080D68AC: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, =gUnknown_02039DD8 + ldr r1, =gBagItems adds r0, r4, r1 ldrb r0, [r0, 0x4] cmp r6, r0 @@ -481,7 +481,7 @@ _080D68BC: cmp r5, 0 beq _080D6914 movs r6, 0 - ldr r3, =gUnknown_02039DD8 + ldr r3, =gBagItems mov r1, r9 adds r0, r1, r3 ldrb r0, [r0, 0x4] @@ -549,7 +549,7 @@ bag_add_item: @ 80D6928 mov r9, r0 lsls r1, 16 lsrs r5, r1, 16 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 cmp r0, 0 bne _080D694C @@ -576,13 +576,13 @@ _080D6964: .pool _080D6978: mov r0, r9 - bl itemid_get_pocket_number + bl ItemId_GetPocket subs r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r10, r0 lsls r1, r0, 3 - ldr r0, =gUnknown_02039DD8 + ldr r0, =gBagItems adds r7, r1, r0 ldrb r0, [r7, 0x4] lsls r0, 2 @@ -736,7 +736,7 @@ remove_item: @ 80D6AA4 lsls r1, 16 lsrs r7, r1, 16 movs r4, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 cmp r0, 0 beq _080D6B38 @@ -763,13 +763,13 @@ _080D6AE0: .pool _080D6AF4: mov r0, r8 - bl itemid_get_pocket_number + bl ItemId_GetPocket subs r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r9, r0 lsls r1, r0, 3 - ldr r0, =gUnknown_02039DD8 + ldr r0, =gBagItems adds r5, r1, r0 movs r6, 0 ldrb r2, [r5, 0x4] @@ -952,7 +952,7 @@ sub_80D6C68: @ 80D6C68 push {lr} lsls r0, 16 lsrs r0, 16 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 lsrs r0, 24 pop {r1} @@ -1314,7 +1314,7 @@ _080D6F0E: bag_pocket_get_itemid: @ 80D6F14 lsls r0, 24 lsls r1, 16 - ldr r2, =gUnknown_02039DD8 + ldr r2, =gBagItems lsrs r0, 21 subs r0, 0x8 adds r0, r2 @@ -1332,7 +1332,7 @@ bag_pocket_get_item_quantity: @ 80D6F30 push {lr} lsls r0, 24 lsls r1, 16 - ldr r2, =gUnknown_02039DD8 + ldr r2, =gBagItems lsrs r0, 21 subs r0, 0x8 adds r0, r2 @@ -1535,7 +1535,7 @@ _080D708C: sub_80D7094: @ 80D7094 push {r4,r5,lr} movs r4, 0 - ldr r5, =gUnknown_02039DD8 + ldr r5, =gBagItems _080D709A: lsls r1, r4, 3 adds r1, r5 @@ -1561,7 +1561,7 @@ CountTotalItemQuantityInBag: @ 80D70BC lsrs r6, r0, 16 movs r7, 0 adds r0, r6, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 lsrs r0, 21 ldr r1, =gUnknown_02039DD0 @@ -2008,8 +2008,8 @@ _080D744E: bx r1 thumb_func_end sub_80D7334 - thumb_func_start itemid_sanitize -itemid_sanitize: @ 80D745C + thumb_func_start SanitizeItemId +SanitizeItemId: @ 80D745C push {lr} lsls r0, 16 lsrs r1, r0, 16 @@ -2024,7 +2024,7 @@ _080D746E: _080D7470: pop {r1} bx r1 - thumb_func_end itemid_sanitize + thumb_func_end SanitizeItemId thumb_func_start itemid_get_item @ item *itemid_get_item(s16 itemId) @@ -2032,7 +2032,7 @@ itemid_get_item: @ 80D7474 push {lr} lsls r0, 16 lsrs r0, 16 - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2050,7 +2050,7 @@ itemid_get_number: @ 80D7494 lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2069,7 +2069,7 @@ itemid_get_market_price: @ 80D74B8 lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2082,13 +2082,13 @@ itemid_get_market_price: @ 80D74B8 .pool thumb_func_end itemid_get_market_price - thumb_func_start itemid_get_x12 -itemid_get_x12: @ 80D74DC + thumb_func_start ItemId_GetHoldEffect +ItemId_GetHoldEffect: @ 80D74DC push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2099,15 +2099,15 @@ itemid_get_x12: @ 80D74DC pop {r1} bx r1 .pool - thumb_func_end itemid_get_x12 + thumb_func_end ItemId_GetHoldEffect - thumb_func_start itemid_get_quality -itemid_get_quality: @ 80D7500 + thumb_func_start ItemId_GetHoldEffectParam +ItemId_GetHoldEffectParam: @ 80D7500 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2118,15 +2118,15 @@ itemid_get_quality: @ 80D7500 pop {r1} bx r1 .pool - thumb_func_end itemid_get_quality + thumb_func_end ItemId_GetHoldEffectParam - thumb_func_start itemid_get_description -itemid_get_description: @ 80D7524 + thumb_func_start ItemId_GetDescription +ItemId_GetDescription: @ 80D7524 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2138,7 +2138,7 @@ itemid_get_description: @ 80D7524 pop {r1} bx r1 .pool - thumb_func_end itemid_get_description + thumb_func_end ItemId_GetDescription thumb_func_start itemid_is_unique itemid_is_unique: @ 80D7548 @@ -2146,7 +2146,7 @@ itemid_is_unique: @ 80D7548 lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2165,7 +2165,7 @@ itemid_get_x19: @ 80D756C lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2178,13 +2178,13 @@ itemid_get_x19: @ 80D756C .pool thumb_func_end itemid_get_x19 - thumb_func_start itemid_get_pocket_number -itemid_get_pocket_number: @ 80D7590 + thumb_func_start ItemId_GetPocket +ItemId_GetPocket: @ 80D7590 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2195,15 +2195,15 @@ itemid_get_pocket_number: @ 80D7590 pop {r1} bx r1 .pool - thumb_func_end itemid_get_pocket_number + thumb_func_end ItemId_GetPocket - thumb_func_start itemid_get_type -itemid_get_type: @ 80D75B4 + thumb_func_start ItemId_GetType +ItemId_GetType: @ 80D75B4 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2214,15 +2214,15 @@ itemid_get_type: @ 80D75B4 pop {r1} bx r1 .pool - thumb_func_end itemid_get_type + thumb_func_end ItemId_GetType - thumb_func_start itemid_get_overworld_function -itemid_get_overworld_function: @ 80D75D8 + thumb_func_start ItemId_GetFieldFunc +ItemId_GetFieldFunc: @ 80D75D8 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2234,15 +2234,15 @@ itemid_get_overworld_function: @ 80D75D8 pop {r1} bx r1 .pool - thumb_func_end itemid_get_overworld_function + thumb_func_end ItemId_GetFieldFunc - thumb_func_start itemid_get_usage -itemid_get_usage: @ 80D75FC + thumb_func_start ItemId_GetBattleUsage +ItemId_GetBattleUsage: @ 80D75FC push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2254,15 +2254,15 @@ itemid_get_usage: @ 80D75FC pop {r1} bx r1 .pool - thumb_func_end itemid_get_usage + thumb_func_end ItemId_GetBattleUsage - thumb_func_start itemid_get_battle_function -itemid_get_battle_function: @ 80D7620 + thumb_func_start ItemId_GetBattleFunc +ItemId_GetBattleFunc: @ 80D7620 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2274,15 +2274,15 @@ itemid_get_battle_function: @ 80D7620 pop {r1} bx r1 .pool - thumb_func_end itemid_get_battle_function + thumb_func_end ItemId_GetBattleFunc - thumb_func_start itemid_get_x28 -itemid_get_x28: @ 80D7644 + thumb_func_start ItemId_GetSecondaryId +ItemId_GetSecondaryId: @ 80D7644 push {r4,lr} lsls r0, 16 lsrs r0, 16 ldr r4, =gItems - bl itemid_sanitize + bl SanitizeItemId lsls r0, 16 lsrs r0, 16 movs r1, 0x2C @@ -2294,6 +2294,6 @@ itemid_get_x28: @ 80D7644 pop {r1} bx r1 .pool - thumb_func_end itemid_get_x28 + thumb_func_end ItemId_GetSecondaryId .align 2, 0 @ Don't pad with nop. diff --git a/asm/item_use.s b/asm/item_use.s index e98b359fa..22a9204da 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -25,7 +25,7 @@ SetUpItemUseCallback: @ 80FD060 .pool _080FD084: ldrh r0, [r1] - bl itemid_get_type + bl ItemId_GetType _080FD08A: subs r0, 0x1 lsls r0, 24 @@ -231,7 +231,7 @@ CheckIfItemIsTMHMOrEvolutionStone: @ 80FD21C lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc ldr r1, =ItemUseOutOfBattle_TMHM cmp r0, r1 bne _080FD238 @@ -240,7 +240,7 @@ CheckIfItemIsTMHMOrEvolutionStone: @ 80FD21C .pool _080FD238: adds r0, r4, 0 - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc ldr r1, =ItemUseOutOfBattle_EvolutionStone cmp r0, r1 beq _080FD24C @@ -383,7 +383,7 @@ ItemUseOnFieldCB_Bike: @ 80FD358 lsrs r4, r0, 24 ldr r0, =gUnknown_0203CE7C ldrh r0, [r0] - bl itemid_get_x28 + bl ItemId_GetSecondaryId lsls r0, 24 cmp r0, 0 bne _080FD378 @@ -517,7 +517,7 @@ ItemUseOnFieldCB_Rod: @ 80FD468 lsrs r4, 24 ldr r0, =gUnknown_0203CE7C ldrh r0, [r0] - bl itemid_get_x28 + bl ItemId_GetSecondaryId lsls r0, 24 lsrs r0, 24 bl StartFishing @@ -1644,7 +1644,7 @@ sub_80FDD10: @ 80FDD10 _080FDD58: ldr r0, =gUnknown_0203CE7C ldrh r0, [r0] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc adds r1, r0, 0 adds r0, r4, 0 bl _call_via_r1 @@ -2017,12 +2017,12 @@ sub_80FE058: @ 80FE058 cmp r0, 0 bne _080FE0AC ldrh r0, [r4] - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 lsrs r0, 24 bl sub_81AB9A8 ldrh r0, [r4] - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 lsrs r0, 24 bl sub_81ABA88 @@ -2127,7 +2127,7 @@ sub_80FE164: @ 80FE164 ldr r4, =0x00004021 ldr r0, =gUnknown_0203CE7C ldrh r0, [r0] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2486,7 +2486,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r0, =gUnknown_020244B8 ldrb r0, [r0] lsls r0, 1 diff --git a/asm/link.s b/asm/link.s index 0d5cfde11..d9f4a78fb 100644 --- a/asm/link.s +++ b/asm/link.s @@ -9440,7 +9440,7 @@ _0800DFCA: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -9467,7 +9467,7 @@ _0800E024: bl AddObjectToFront ldr r4, =gUnknown_02022B10 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -9504,7 +9504,7 @@ _0800E06A: thumb_func_start sub_800E084 sub_800E084: @ 800E084 push {r4,lr} - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r3, =gUnknown_02022B10 ldrb r1, [r3] lsls r0, r1, 4 @@ -9628,7 +9628,7 @@ sub_800E174: @ 800E174 bne _0800E184 b _0800E346 _0800E184: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -31899,7 +31899,7 @@ sub_8019F04: @ 8019F04 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites _08019F0C: adds r0, r5, r4 ldrb r1, [r0] @@ -36542,7 +36542,7 @@ sub_801C4C0: @ 801C4C0 lsls r2, 1 adds r1, r2 strb r0, [r1] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r4] movs r1, 0xBE lsls r1, 1 @@ -36682,7 +36682,7 @@ sub_801C61C: @ 801C61C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl sub_80D2EF8 _0801C640: @@ -36698,7 +36698,7 @@ _0801C640: cmp r5, r2 bcs _0801C6A4 adds r6, r4, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites _0801C65A: ldr r0, [r6] lsls r4, r5, 1 @@ -45042,7 +45042,7 @@ sub_80208E8: @ 80208E8 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2] pop {r0} @@ -45237,7 +45237,7 @@ sub_8020A68: @ 8020A68 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r1, r4 str r1, [r2, 0x8] ldr r0, =gUnknown_082F31D4 @@ -45332,7 +45332,7 @@ sub_8020B20: @ 8020B20 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r1, r4 str r1, [r2, 0xC] ldr r0, =gUnknown_082F3244 @@ -46473,7 +46473,7 @@ _080214C6: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r6] ldrb r0, [r1, 0x5] @@ -48685,7 +48685,7 @@ _08022746: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r3] ldrb r1, [r0, 0x5] @@ -48736,7 +48736,7 @@ _080227AA: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r3] ldrb r0, [r1, 0x5] @@ -48797,7 +48797,7 @@ _08022828: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r3] ldrb r1, [r0, 0x5] @@ -48846,7 +48846,7 @@ _0802288E: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r3] ldrb r1, [r0, 0x5] @@ -60519,7 +60519,7 @@ sub_80284CC: @ 80284CC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r2, 0 movs r1, 0x1 @@ -60546,7 +60546,7 @@ sub_8028504: @ 8028504 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r2, 0 movs r1, 0x2 @@ -60693,7 +60693,7 @@ _08028622: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 cmp r0, 0 beq _0802863C @@ -60716,7 +60716,7 @@ sub_8028654: @ 8028654 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_02022C9C lsrs r1, 22 adds r1, r2 @@ -60779,7 +60779,7 @@ sub_80286B4: @ 80286B4 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r2 bl StartObjectImageAnim pop {r0} @@ -60796,7 +60796,7 @@ nullsub_15: @ 80286E0 sub_80286E4: @ 80286E4 push {r4-r7,lr} movs r4, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r12, r0 movs r6, 0 ldr r5, =gUnknown_02022CF4 @@ -60927,7 +60927,7 @@ _080287E8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 cmp r0, 0 beq _08028806 @@ -60970,7 +60970,7 @@ _0802883A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 adds r0, r2, 0 adds r0, 0x16 @@ -61056,7 +61056,7 @@ _080288E0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim @@ -61073,7 +61073,7 @@ _08028910: subs r0, r5 cmp r4, r0 bge _080289D6 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites _0802891C: cmp r5, 0x6 bls _08028984 @@ -61154,7 +61154,7 @@ _080289B4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim @@ -61177,7 +61177,7 @@ sub_80289E8: @ 80289E8 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r1, 0x1 ands r0, r1 lsls r4, r0, 2 @@ -61340,7 +61340,7 @@ _08028B40: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r1, r5, 0 bl StartObjectImageAnim @@ -61374,7 +61374,7 @@ _08028B86: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 cmp r0, 0 beq _08028BA0 @@ -61399,7 +61399,7 @@ _08028BB8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 cmp r0, 0 beq _08028BD2 @@ -61425,7 +61425,7 @@ sub_8028BF8: @ 8028BF8 lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_02022CB8 lsrs r0, 22 adds r0, r2 @@ -61455,7 +61455,7 @@ sub_8028C30: @ 8028C30 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r6, =gUnknown_02022CE4 movs r1, 0x1 ands r0, r1 @@ -61492,7 +61492,7 @@ _08028C46: sub_8028C7C: @ 8028C7C lsls r0, 24 lsls r1, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_02022CB8 lsrs r0, 22 adds r0, r2 @@ -61522,7 +61522,7 @@ sub_8028CA4: @ 8028CA4 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r2 bl StartObjectImageAnim pop {r0} @@ -61534,7 +61534,7 @@ sub_8028CA4: @ 8028CA4 sub_8028CD0: @ 8028CD0 lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -61683,7 +61683,7 @@ sub_8028DFC: @ 8028DFC mov r12, r0 ldr r4, =gUnknown_082FB356 adds r7, r4, 0x2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r5, 0x1 _08028E0C: lsls r2, r3, 2 @@ -61720,7 +61720,7 @@ sub_8028E4C: @ 8028E4C push {r4,r5,lr} movs r2, 0 ldr r5, =gUnknown_02022CB0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r3, 0 _08028E56: lsls r0, r2, 2 @@ -61757,7 +61757,7 @@ _08028E8A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 cmp r0, 0 beq _08028EA4 @@ -61784,7 +61784,7 @@ sub_8028EC8: @ 8028EC8 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r6, =gUnknown_02022CB0 movs r1, 0x1 ands r0, r1 @@ -69045,7 +69045,7 @@ _0802CA32: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r2] ldr r0, =0x000081fc @@ -69090,7 +69090,7 @@ sub_802CB14: @ 802CB14 adds r4, r0 adds r4, r6 ldr r1, [r4] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites subs r1, r0 lsls r0, r1, 4 subs r0, r1 @@ -69474,7 +69474,7 @@ _0802CDF4: movs r0, 0 strh r0, [r5, 0x30] _0802CE06: - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0x30 ldrsh r0, [r5, r2] lsls r0, 1 @@ -69525,7 +69525,7 @@ sub_802CE48: @ 802CE48 lsrs r2, r0, 24 cmp r2, 0x40 beq _0802CE88 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -69578,7 +69578,7 @@ _0802CEA6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r2] adds r5, 0x1 @@ -69613,7 +69613,7 @@ _0802CEE8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r2] adds r0, 0x3F @@ -72725,7 +72725,7 @@ _0802E7C4: movs r3, 0xD negs r3, r3 mov r12, r3 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites _0802E7D8: lsls r0, r5, 1 adds r0, r4 @@ -72803,7 +72803,7 @@ sub_802E83C: @ 802E83C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 movs r1, 0x4 bl StartObjectImageAnim @@ -72858,7 +72858,7 @@ _0802E8E0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r5, 0x1 @@ -72957,7 +72957,7 @@ _0802E9BA: lsrs r1, 24 adds r0, r6, 0 bl StartObjectImageAnim - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r2, 0x1C ldrsh r0, [r5, r2] lsls r1, r0, 4 @@ -72990,7 +72990,7 @@ _0802EA04: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x1C ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -73037,7 +73037,7 @@ sub_802EA50: @ 802EA50 adds r6, r4, r5 movs r0, 0x38 bl audio_play - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x1A ldrsh r1, [r6, r0] lsls r0, r1, 4 @@ -73254,7 +73254,7 @@ _0802EC08: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry movs r3, 0xE @@ -73280,7 +73280,7 @@ _0802EC4C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles movs r0, 0x12 @@ -73312,7 +73312,7 @@ sub_802EC98: @ 802EC98 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r1, r0 movs r1, 0x2E ldrsh r0, [r4, r1] @@ -73473,7 +73473,7 @@ sub_802EDCC: @ 802EDCC lsrs r1, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 lsls r4, r1, 4 adds r4, r1 @@ -73519,7 +73519,7 @@ sub_802EE30: @ 802EE30 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -73605,7 +73605,7 @@ _0802EEC8: adds r0, 0x1 strh r0, [r4] _0802EEE6: - ldr r0, =gUnknown_08329F40 + ldr r0, =gSineTable movs r2, 0x2 ldrsh r1, [r4, r2] lsls r1, 1 @@ -73631,7 +73631,7 @@ _0802EEFC: adds r0, 0x1 strh r0, [r4] _0802EF1A: - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0x2 ldrsh r0, [r4, r2] lsls r0, 1 @@ -73802,7 +73802,7 @@ sub_802EFFC: @ 802EFFC lsrs r0, 24 mov r4, r8 strh r0, [r4] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r5, r9 movs r6, 0 ldrsh r1, [r5, r6] diff --git a/asm/mail.s b/asm/mail.s index b53707a0d..8e275ccbd 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -1004,7 +1004,7 @@ sub_8121D00: @ 8121D00 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl sub_80D2EF8 _08121D58: diff --git a/asm/main_menu.s b/asm/main_menu.s index 050c38c80..327dc9628 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -1991,7 +1991,7 @@ task_new_game_prof_birch_speech_2: @ 80308B0 .pool _080308D4: ldrb r0, [r4, 0x18] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -2045,7 +2045,7 @@ task_new_game_prof_birch_speech_3: @ 8030928 ldrsh r0, [r4, r1] cmp r0, 0 beq _080309B6 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0x18 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -2183,7 +2183,7 @@ sub_8030A70: @ 8030A70 lsls r0, 3 adds r0, r6 ldrb r0, [r0, 0x1A] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -2264,7 +2264,7 @@ sub_8030B14: @ 8030B14 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r3, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -2369,7 +2369,7 @@ task_new_game_prof_birch_speech_7: @ 8030C18 lsls r0, 16 cmp r0, 0 bne _08030C7C - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gTasks lsls r4, r6, 2 adds r4, r6 @@ -2466,7 +2466,7 @@ task_new_game_prof_birch_speech_9: @ 8030CD4 ldrsh r0, [r4, r1] cmp r0, 0 beq _08030D7A - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x18 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -2552,7 +2552,7 @@ task_new_game_prof_birch_speech_10: @ 8030D84 ldrsh r0, [r3, r1] cmp r0, 0 beq _08030DB8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0xC ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -2666,7 +2666,7 @@ _08030E76: cmp r3, r0 beq _08030EB8 strh r3, [r4, 0x14] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0xC ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -2708,7 +2708,7 @@ sub_8030ED4: @ 8030ED4 adds r7, r1, 0 cmp r0, 0 bne _08030F0C - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -2719,7 +2719,7 @@ sub_8030ED4: @ 8030ED4 b _08030F72 .pool _08030F0C: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -2788,7 +2788,7 @@ sub_8030F7C: @ 8030F7C lsls r1, 3 adds r3, r1, r2 ldrb r1, [r3, 0xC] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -3044,7 +3044,7 @@ _080311A8: _080311AE: movs r0, 0x5 bl audio_play - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gTasks lsls r4, r5, 2 adds r4, r5 @@ -3135,7 +3135,7 @@ task_new_game_prof_birch_speech_part2_6: @ 8031258 ldrsh r0, [r7, r1] cmp r0, 0 beq _08031320 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r2, 0x1C ldrsh r1, [r7, r2] lsls r0, r1, 4 @@ -3239,7 +3239,7 @@ task_new_game_prof_birch_speech_part2_7: @ 803133C ldrsh r0, [r4, r1] cmp r0, 0 beq _080313D2 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r1, 0x18 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -3321,7 +3321,7 @@ task_new_game_prof_birch_speech_part2_8: @ 80313E4 adds r7, r1, 0 cmp r0, 0 beq _080314B0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x18 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -3427,7 +3427,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4 ldrsh r0, [r6, r1] cmp r0, 0 beq _0803155C - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r1, 0xC ldrsh r0, [r6, r1] lsls r1, r0, 4 @@ -3504,7 +3504,7 @@ task_new_game_prof_birch_speech_part2_10: @ 8031580 lsls r1, 3 adds r3, r1, r2 ldrb r1, [r3, 0xC] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -3540,7 +3540,7 @@ task_new_game_prof_birch_speech_part2_11: @ 80315BC lsls r4, 3 adds r4, r0 ldrb r2, [r4, 0xC] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -3728,7 +3728,7 @@ _080317DC: strh r0, [r4, 0x14] ldrb r3, [r4, 0x1C] _080317E0: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -3886,7 +3886,7 @@ AddBirchSpeechObjects: @ 803192C bl AddNewGameBirchObject lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 lsls r2, r0, 4 adds r2, r0 diff --git a/asm/map_obj_8097404.s b/asm/map_obj_8097404.s index b8e2f98f7..853f24dfe 100644 --- a/asm/map_obj_8097404.s +++ b/asm/map_obj_8097404.s @@ -20,7 +20,7 @@ sub_8097404: @ 8097404 movs r4, 0x1 orrs r0, r4 strb r0, [r5, 0x1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -167,7 +167,7 @@ npc_sync_anim_pause_bits: @ 8097514 negs r0, r0 ands r0, r1 strb r0, [r5, 0x1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r0, [r5, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -991,7 +991,7 @@ sub_8097AF0: @ 8097AF0 movs r5, 0 movs r4, 0x3F _08097AF6: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r5, r0 adds r0, r2, 0 adds r0, 0x3E @@ -1023,7 +1023,7 @@ sub_8097B2C: @ 8097B2C lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r4, 0 _08097B38: adds r2, r4, r6 @@ -1073,7 +1073,7 @@ sub_8097B78: @ 8097B78 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r5, 0 bl FieldObjectDirectionToImageAnimId @@ -1103,7 +1103,7 @@ sub_8097BB4: @ 8097BB4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 adds r0, r5, 0 bl GetFieldObjectGraphicsInfo @@ -1174,7 +1174,7 @@ sub_8097C44: @ 8097C44 beq _08097C80 cmp r4, 0 beq _08097C74 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -1184,7 +1184,7 @@ sub_8097C44: @ 8097C44 b _08097C80 .pool _08097C74: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -1211,7 +1211,7 @@ sub_8097C8C: @ 8097C8C b _08097CBA _08097CA2: movs r3, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -1241,7 +1241,7 @@ sub_8097CC4: @ 8097CC4 lsrs r2, r0, 24 cmp r2, 0x40 beq _08097CEA - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -1369,7 +1369,7 @@ sub_8097D9C: @ 8097D9C lsrs r2, r0, 24 cmp r2, 0x40 beq _08097DC0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -1695,7 +1695,7 @@ sub_8097FE4: @ 8097FE4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r0, r1 ldrh r1, [r4, 0xC] movs r0, 0x3 diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 98003c7f0..15d9bc4da 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -775,7 +775,7 @@ sub_8122344: @ 8122344 movs r5, 0 cmp r5, r6 bcs _0812239C - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites _08122358: lsls r1, r5, 4 ldr r0, =gUnknown_0859F524 @@ -828,7 +828,7 @@ sub_81223B0: @ 81223B0 movs r4, 0 cmp r4, r5 bcs _081223F6 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites _081223C0: subs r0, r5, 0x1 cmp r4, r0 @@ -873,7 +873,7 @@ sub_81223FC: @ 81223FC movs r3, 0 cmp r3, r4 bcs _0812243E - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r12, r1 movs r1, 0x1 ands r0, r1 @@ -930,7 +930,7 @@ sub_8122448: @ 8122448 movs r3, 0 cmp r3, r4 bcs _081224C8 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r0, r7, 16 asrs r0, 16 subs r0, 0x8 diff --git a/asm/mon_markings.s b/asm/mon_markings.s index 0270a71a6..372f7e31b 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -570,7 +570,7 @@ _0811FD70: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r2] lsls r1, r5, 24 @@ -633,7 +633,7 @@ _0811FDEE: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites adds r0, r7 str r0, [r1] strh r5, [r0, 0x2E] @@ -717,7 +717,7 @@ _0811FEAE: lsls r1, r3, 4 adds r1, r3 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2, 0x24] ldr r3, [sp, 0x4C] @@ -916,7 +916,7 @@ _08120068: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 _08120072: add sp, 0x28 diff --git a/asm/money.s b/asm/money.s index 5f83e756a..6994cdd75 100644 --- a/asm/money.s +++ b/asm/money.s @@ -391,7 +391,7 @@ RemoveMoneyLabelObject: @ 80E53F4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeResources pop {r0} diff --git a/asm/naming_screen.s b/asm/naming_screen.s index d189a83ee..7b43fde12 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -247,7 +247,7 @@ _080E2F64: sub_80E2FA4: @ 80E2FA4 push {r4,r5,lr} movs r3, 0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r5, 0x5 negs r5, r5 _080E2FAE: @@ -1820,7 +1820,7 @@ sub_80E3CE4: @ 80E3CE4 strb r0, [r1] movs r0, 0x1 bl sub_80E3E3C - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -1888,7 +1888,7 @@ sub_80E3D78: @ 80E3D78 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r5, r1, r2 lsrs r1, r0, 16 mov r8, r1 @@ -1943,7 +1943,7 @@ sub_80E3DFC: @ 80E3DFC lsls r2, r3, 4 adds r2, r3 lsls r2, 2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites adds r2, r3 ldrh r3, [r2, 0x2E] strh r3, [r0] @@ -1970,7 +1970,7 @@ sub_80E3E3C: @ 80E3E3C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r1, =gUnknown_02039F94 ldr r4, [r1] ldr r1, =0x00001e23 @@ -2009,7 +2009,7 @@ sub_80E3E3C: @ 80E3E3C sub_80E3E94: @ 80E3E94 push {r4,r5,lr} lsls r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r1, =gUnknown_02039F94 ldr r4, [r1] ldr r1, =0x00001e23 @@ -2049,7 +2049,7 @@ sub_80E3ED8: @ 80E3ED8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim @@ -2060,7 +2060,7 @@ sub_80E3ED8: @ 80E3ED8 thumb_func_start sub_80E3F04 sub_80E3F04: @ 80E3F04 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_02039F94 ldr r0, [r0] ldr r1, =0x00001e23 @@ -2146,7 +2146,7 @@ sub_80E3F8C: @ 80E3F8C lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 add r5, r8 ldr r1, =gUnknown_0858C050 @@ -2217,7 +2217,7 @@ sub_80E4050: @ 80E4050 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x2 strh r1, [r0, 0x2E] @@ -2260,7 +2260,7 @@ sub_80E40AC: @ 80E40AC lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r5, r1 movs r2, 0x3C ldrsh r0, [r6, r2] @@ -2304,7 +2304,7 @@ sub_80E4104: @ 80E4104 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r4, r0, r2 movs r0, 0x3C ldrsh r1, [r3, r0] @@ -2361,7 +2361,7 @@ sub_80E4178: @ 80E4178 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r0, r1 adds r3, r2, 0 adds r3, 0x3E @@ -2450,7 +2450,7 @@ sub_80E4218: @ 80E4218 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r4, r6 ldr r0, =gUnknown_0858C070 mov r8, r0 @@ -2505,7 +2505,7 @@ sub_80E4290: @ 80E4290 bl AddObjectToFront lsls r0, 24 lsrs r1, r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -2624,7 +2624,7 @@ sub_80E4384: @ 80E4384 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -2654,7 +2654,7 @@ sub_80E43E0: @ 80E43E0 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 ldr r1, =gUnknown_0858C078 adds r0, r4, 0 @@ -2693,7 +2693,7 @@ sub_80E4420: @ 80E4420 bl sub_80D2CC4 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -2722,7 +2722,7 @@ sub_80E447C: @ 80E447C adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 diff --git a/asm/new_game.s b/asm/new_game.s index 36b09aaf6..00eb8cf7f 100644 --- a/asm/new_game.s +++ b/asm/new_game.s @@ -278,7 +278,7 @@ _080844B2: adds r0, 0xA8 str r5, [r0] bl set_player_trainer_id - bl reset_playtime + bl PlayTimeCounter_Reset bl sub_8084390 bl sub_809D300 bl sub_80EBEE0 diff --git a/asm/play_time.s b/asm/play_time.s deleted file mode 100644 index 8dc5aa53f..000000000 --- a/asm/play_time.s +++ /dev/null @@ -1,125 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start reset_playtime -reset_playtime: @ 80841E4 - ldr r1, =gUnknown_03000E08 - movs r0, 0 - strb r0, [r1] - ldr r2, =gSaveBlock2Ptr - ldr r3, [r2] - movs r1, 0 - movs r0, 0 - strh r0, [r3, 0xE] - strb r1, [r3, 0x10] - ldr r0, [r2] - strb r1, [r0, 0x11] - ldr r0, [r2] - strb r1, [r0, 0x12] - bx lr - .pool - thumb_func_end reset_playtime - - thumb_func_start set_max_playtime_if_appropriate -set_max_playtime_if_appropriate: @ 8084208 - push {lr} - ldr r1, =gUnknown_03000E08 - movs r0, 0x1 - strb r0, [r1] - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrh r1, [r0, 0xE] - ldr r0, =0x000003e7 - cmp r1, r0 - bls _08084220 - bl set_max_playtime -_08084220: - pop {r0} - bx r0 - .pool - thumb_func_end set_max_playtime_if_appropriate - - thumb_func_start sub_8084230 -sub_8084230: @ 8084230 - ldr r1, =gUnknown_03000E08 - movs r0, 0 - strb r0, [r1] - bx lr - .pool - thumb_func_end sub_8084230 - - thumb_func_start PlayTimeCounter_Update -PlayTimeCounter_Update: @ 808423C - push {lr} - ldr r0, =gUnknown_03000E08 - ldrb r0, [r0] - cmp r0, 0x1 - bne _08084294 - ldr r2, =gSaveBlock2Ptr - ldr r0, [r2] - ldrb r1, [r0, 0x12] - adds r1, 0x1 - movs r3, 0 - strb r1, [r0, 0x12] - ldr r1, [r2] - ldrb r0, [r1, 0x12] - cmp r0, 0x3B - bls _08084294 - strb r3, [r1, 0x12] - ldr r0, [r2] - ldrb r1, [r0, 0x11] - adds r1, 0x1 - strb r1, [r0, 0x11] - ldr r1, [r2] - ldrb r0, [r1, 0x11] - cmp r0, 0x3B - bls _08084294 - strb r3, [r1, 0x11] - ldr r0, [r2] - ldrb r1, [r0, 0x10] - adds r1, 0x1 - strb r1, [r0, 0x10] - ldr r1, [r2] - ldrb r0, [r1, 0x10] - cmp r0, 0x3B - bls _08084294 - strb r3, [r1, 0x10] - ldr r0, [r2] - ldrh r1, [r0, 0xE] - adds r1, 0x1 - strh r1, [r0, 0xE] - lsls r1, 16 - ldr r0, =0x03e70000 - cmp r1, r0 - bls _08084294 - bl set_max_playtime -_08084294: - pop {r0} - bx r0 - .pool - thumb_func_end PlayTimeCounter_Update - - thumb_func_start set_max_playtime -set_max_playtime: @ 80842A4 - ldr r1, =gUnknown_03000E08 - movs r0, 0x2 - strb r0, [r1] - ldr r2, =gSaveBlock2Ptr - ldr r3, [r2] - ldr r0, =0x000003e7 - strh r0, [r3, 0xE] - movs r1, 0x3B - strb r1, [r3, 0x10] - ldr r0, [r2] - strb r1, [r0, 0x11] - ldr r0, [r2] - strb r1, [r0, 0x12] - bx lr - .pool - thumb_func_end set_max_playtime - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/player_pc.s b/asm/player_pc.s index ad85fb330..335743869 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -1999,7 +1999,7 @@ sub_816BEF0: @ 816BEF0 lsls r1, 3 adds r0, r1 ldrh r0, [r0] - bl itemid_get_description + bl ItemId_GetDescription b _0816BF32 .pool _0816BF2C: @@ -2185,7 +2185,7 @@ sub_816C060: @ 816C060 cmp r2, 0x40 beq _0816C0B2 strb r2, [r5] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -2225,7 +2225,7 @@ sub_816C0C8: @ 816C0C8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles movs r0, 0xFF @@ -2416,7 +2416,7 @@ _0816C2AC: .pool _0816C2B4: adds r0, r1, 0 - bl itemid_get_description + bl ItemId_GetDescription _0816C2BA: pop {r1} bx r1 diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s index 904e0a6cf..d9029e2bc 100644 --- a/asm/pokeblock_feed.s +++ b/asm/pokeblock_feed.s @@ -870,7 +870,7 @@ sub_817A358: @ 817A358 ldr r2, =0x0000105a adds r1, r2 strb r0, [r1] - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites mov r1, r8 lsls r0, r1, 4 add r0, r8 @@ -930,7 +930,7 @@ _0817A402: sub_817A434: @ 817A434 lsls r0, 24 lsrs r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -995,7 +995,7 @@ sub_817A4A4: @ 817A4A4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r3, r4, 4 adds r3, r4 lsls r3, 2 @@ -1034,7 +1034,7 @@ sub_817A4F8: @ 817A4F8 lsrs r7, r0, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 lsls r0, r7, 4 adds r0, r7 @@ -1067,7 +1067,7 @@ _0817A548: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl obj_alloc_rotscale_entry pop {r3} @@ -1088,7 +1088,7 @@ sub_817A56C: @ 817A56C bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1304,7 +1304,7 @@ _0817A7C8: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 adds r0, r4, 0 stm r0!, {r1} diff --git a/asm/pokedex.s b/asm/pokedex.s index 2b9dd2d35..8b0454bcf 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -601,7 +601,7 @@ _080BB810: cmp r0, 0 beq _080BB8A4 bl sub_80BD8D0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, [r7] ldr r5, =0x00000626 adds r0, r5 @@ -1006,7 +1006,7 @@ sub_80BBBF4: @ 80BBBF4 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r5, =gUnknown_02039B4C ldr r3, [r5] ldr r6, =0x00000626 @@ -1334,7 +1334,7 @@ _080BBEEC: cmp r0, 0 beq _080BBF70 bl sub_80BD8D0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r5] ldr r2, =0x00000626 adds r0, r2 @@ -1734,7 +1734,7 @@ sub_80BC2D4: @ 80BC2D4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r5, =gUnknown_02039B4C ldr r3, [r5] ldr r4, =0x00000626 @@ -3611,7 +3611,7 @@ _080BD2DA: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -3635,7 +3635,7 @@ _080BD334: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -3661,7 +3661,7 @@ _080BD366: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -3739,7 +3739,7 @@ _080BD440: movs r3, 0 ldr r4, =0x0000ffff mov r12, r4 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 adds r2, r7, 0 _080BD44C: @@ -3804,7 +3804,7 @@ _080BD4DC: movs r3, 0 ldr r2, =0x0000ffff mov r12, r2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites mov r8, r4 adds r2, r7, 0 _080BD4E8: @@ -3930,7 +3930,7 @@ _080BD5D8: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -3972,7 +3972,7 @@ _080BD638: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -4258,7 +4258,7 @@ sub_80BD8D0: @ 80BD8D0 movs r4, 0 ldr r0, =gUnknown_02039B4C mov r12, r0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r5, =0x0000ffff _080BD8DC: mov r1, r12 @@ -4535,7 +4535,7 @@ _080BDAE8: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -4603,7 +4603,7 @@ sub_80BDB7C: @ 80BDB7C bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r10, r1 lsls r0, r7, 4 adds r0, r7 @@ -4837,7 +4837,7 @@ _080BDDB0: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -4845,7 +4845,7 @@ _080BDDB0: b _080BDDE8 .pool _080BDDD4: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -4879,7 +4879,7 @@ _080BDDE8: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 lsls r1, 24 lsrs r1, 24 @@ -4952,7 +4952,7 @@ _080BDEC4: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -4960,7 +4960,7 @@ _080BDEC4: b _080BDEFC .pool _080BDEE8: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -4993,7 +4993,7 @@ _080BDEFC: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r2 lsls r1, 24 lsrs r1, 24 @@ -5123,7 +5123,7 @@ _080BE060: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -5131,7 +5131,7 @@ _080BE060: b _080BE090 .pool _080BE07C: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -5161,7 +5161,7 @@ _080BE090: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 lsls r1, 24 lsrs r1, 24 @@ -5235,7 +5235,7 @@ _080BE160: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -5243,7 +5243,7 @@ _080BE160: b _080BE198 .pool _080BE184: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -5277,7 +5277,7 @@ _080BE198: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 lsls r1, 24 lsrs r1, 24 @@ -5347,7 +5347,7 @@ _080BE26C: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -5355,7 +5355,7 @@ _080BE26C: b _080BE29C .pool _080BE288: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -5385,7 +5385,7 @@ _080BE29C: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 lsls r1, 24 lsrs r1, 24 @@ -5459,7 +5459,7 @@ _080BE36C: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -5467,7 +5467,7 @@ _080BE36C: b _080BE3A4 .pool _080BE390: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -5500,7 +5500,7 @@ _080BE3A4: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r2 lsls r1, 24 lsrs r1, 24 @@ -5513,7 +5513,7 @@ _080BE3E2: bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -5664,7 +5664,7 @@ sub_80BE4E0: @ 80BE4E0 b _080BE5EC .pool _080BE520: - ldr r2, =gUnknown_08329F40 + ldr r2, =gSineTable ldrh r0, [r4, 0x38] lsls r0, 24 lsrs r0, 23 @@ -5896,7 +5896,7 @@ _080BE6EC: _080BE6F8: lsrs r0, 24 adds r4, r1, 0 - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable lsls r0, 1 adds r0, r1 movs r1, 0 @@ -5993,7 +5993,7 @@ _080BE7AC: adds r1, r0 lsls r1, 24 lsrs r1, 24 - ldr r4, =gUnknown_08329F40 + ldr r4, =gSineTable lsls r0, r1, 1 adds r0, r4 ldrh r3, [r0] @@ -6105,7 +6105,7 @@ _080BE86C: ldrh r0, [r0] lsls r0, 4 strh r0, [r3, 0x26] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable ldrh r2, [r3, 0x32] lsls r0, r2, 24 lsrs r0, 23 @@ -6492,7 +6492,7 @@ _080BEC08: movs r3, 0 bl sub_80C0E9C strh r0, [r4, 0x10] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r3, 0x10 ldrsh r0, [r4, r3] lsls r1, r0, 4 @@ -6528,7 +6528,7 @@ _080BEC76: ldrsh r0, [r1, r2] cmp r0, 0 beq _080BEC98 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x10 ldrsh r1, [r1, r0] lsls r0, r1, 4 @@ -7342,7 +7342,7 @@ _080BF3D0: adds r1, r2 movs r3, 0 strh r0, [r1, 0x10] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r4, 0x10 ldrsh r0, [r1, r4] lsls r1, r0, 4 @@ -7932,7 +7932,7 @@ _080BF982: bl sub_80C0EF8 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r6, 4 adds r4, r6 lsls r4, 2 @@ -8002,7 +8002,7 @@ _080BFA34: bl sub_80C0E9C lsls r0, 24 lsrs r6, r0, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r6, 4 adds r4, r6 lsls r4, 2 @@ -8612,7 +8612,7 @@ _080BFFA8: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -8719,7 +8719,7 @@ sub_80C0088: @ 80C0088 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, =gTasks lsls r1, r4, 2 adds r1, r4 @@ -8815,7 +8815,7 @@ _080C0168: lsls r2, 16 ldrh r3, [r4, 0x24] orrs r2, r3 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r3, 0xE ldrsh r4, [r4, r3] lsls r3, r4, 4 @@ -13206,7 +13206,7 @@ _080C2550: lsls r0, 7 adds r0, r2, r0 lsls r0, 24 - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable lsrs r0, 23 adds r0, r1 movs r1, 0 @@ -13252,7 +13252,7 @@ sub_80C2594: @ 80C2594 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index 65a7c0b1c..9d938b412 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -1070,7 +1070,7 @@ _0813D2A8: movs r2, 0x7F ands r1, r2 strh r1, [r0] - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable ldr r1, [r7] ldr r2, =0x0000061a adds r0, r1, r2 @@ -1647,7 +1647,7 @@ _0813D710: lsrs r1, r0, 24 cmp r1, 0x40 beq _0813D7BE - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r1, 4 adds r2, r1 lsls r2, 2 @@ -1824,7 +1824,7 @@ _0813D904: .pool _0813D920: movs r4, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites _0813D924: lsls r1, r4, 21 movs r6, 0xA0 diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s index 2ef4cb544..4ff6d7517 100644 --- a/asm/pokedex_cry_screen.s +++ b/asm/pokedex_cry_screen.s @@ -721,7 +721,7 @@ _081458F8: thumb_func_start sub_8145914 sub_8145914: @ 8145914 push {r4-r6,lr} - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r6, =gUnknown_0203AB98 ldr r0, [r6] ldrh r1, [r0, 0x4] @@ -761,7 +761,7 @@ sub_814596C: @ 814596C push {r4-r7,lr} sub sp, 0x14 adds r7, r0, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r4, =gUnknown_0203AB98 ldr r0, [r4] ldrh r1, [r0, 0x4] @@ -936,7 +936,7 @@ _08145A82: str r0, [sp] movs r0, 0 bl SetSpriteTransformationMatrix - ldr r2, =gUnknown_08329F40 + ldr r2, =gSineTable ldr r0, [r6] ldrb r0, [r0] lsls r0, 24 diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s index 9d0d4d108..1cc49a1b9 100644 --- a/asm/pokemon_1.s +++ b/asm/pokemon_1.s @@ -34,45 +34,45 @@ zero_pokemon_struct: @ 8067A8C adds r0, r4, 0 movs r1, 0x37 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3B mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F mov r2, sp - bl pokemon_setattr + bl SetMonData movs r0, 0xFF str r0, [sp] adds r0, r4, 0 movs r1, 0x40 mov r2, sp - bl pokemon_setattr + bl SetMonData add sp, 0x4 pop {r4} pop {r0} @@ -157,13 +157,13 @@ create_pokemon_set_level: @ 8067B4C mov r0, r8 movs r1, 0x38 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData movs r0, 0xFF str r0, [sp, 0x14] add r2, sp, 0x14 mov r0, r8 movs r1, 0x40 - bl pokemon_setattr + bl SetMonData mov r0, r8 bl pokemon_calc_effective_stats add sp, 0x1C @@ -219,7 +219,7 @@ _08067C0C: add r2, sp, 0x14 adds r0, r7, 0 movs r1, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted add r0, sp, 0x18 mov r9, r0 add r5, sp, 0xC @@ -280,14 +280,14 @@ _08067C8A: adds r0, r7, 0 movs r1, 0x1 mov r2, r9 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 bl pokemon_calc_checksum strh r0, [r5] adds r0, r7, 0 movs r1, 0x9 adds r2, r5, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 bl pokemon_encrypt mov r0, sp @@ -296,21 +296,21 @@ _08067C8A: adds r0, r7, 0 movs r1, 0x2 mov r2, sp - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldr r2, =gGameLanguage adds r0, r7, 0 movs r1, 0x3 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldr r5, =gSaveBlock2Ptr ldr r2, [r5] adds r0, r7, 0 movs r1, 0x7 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 movs r1, 0xB mov r2, sp adds r2, 0xE - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldr r4, =gBaseStats mov r2, sp ldrh r1, [r2, 0xE] @@ -331,7 +331,7 @@ _08067C8A: adds r2, r0 adds r0, r7, 0 movs r1, 0x19 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted mov r1, sp ldrh r0, [r1, 0xE] lsls r2, r0, 3 @@ -341,7 +341,7 @@ _08067C8A: adds r2, r4 adds r0, r7, 0 movs r1, 0x20 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted bl sav1_map_get_name lsls r0, 24 lsrs r0, 24 @@ -349,26 +349,26 @@ _08067C8A: adds r0, r7, 0 movs r1, 0x23 mov r2, r9 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 movs r1, 0x24 add r2, sp, 0x10 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldr r2, =gGameVersion adds r0, r7, 0 movs r1, 0x25 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted movs r0, 0x4 str r0, [sp, 0x18] adds r0, r7, 0 movs r1, 0x26 mov r2, r9 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldr r2, [r5] adds r2, 0x8 adds r0, r7, 0 movs r1, 0x31 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted mov r2, sp ldrb r0, [r2, 0x11] cmp r0, 0x1F @@ -376,32 +376,32 @@ _08067C8A: adds r0, r7, 0 movs r1, 0x27 adds r2, 0x11 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 movs r1, 0x28 mov r2, sp adds r2, 0x11 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 movs r1, 0x29 mov r2, sp adds r2, 0x11 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 movs r1, 0x2A mov r2, sp adds r2, 0x11 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 movs r1, 0x2B mov r2, sp adds r2, 0x11 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 movs r1, 0x2C mov r2, sp adds r2, 0x11 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted b _08067E50 .pool _08067DC8: @@ -417,7 +417,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x27 adds r2, r4, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldr r0, [sp, 0x18] movs r6, 0xF8 lsls r6, 2 @@ -427,7 +427,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x28 adds r2, r4, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldr r0, [sp, 0x18] movs r5, 0xF8 lsls r5, 7 @@ -437,7 +437,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x29 adds r2, r4, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted bl Random lsls r0, 16 lsrs r0, 16 @@ -448,7 +448,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x2A adds r2, r4, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldr r0, [sp, 0x18] ands r0, r6 lsrs r0, 5 @@ -456,7 +456,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x2B adds r2, r4, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldr r0, [sp, 0x18] ands r0, r5 lsrs r0, 10 @@ -464,7 +464,7 @@ _08067DC8: adds r0, r7, 0 movs r1, 0x2C adds r2, r4, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted _08067E50: ldr r2, =gBaseStats mov r3, sp @@ -483,7 +483,7 @@ _08067E50: adds r0, r7, 0 movs r1, 0x2E mov r2, r9 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted _08067E76: adds r0, r7, 0 bl sub_8069270 @@ -747,7 +747,7 @@ sub_8068060: @ 8068060 adds r0, r4, 0 movs r1, 0x42 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 bl pokemon_calc_effective_stats add sp, 0x14 @@ -779,28 +779,28 @@ sub_80680A0: @ 80680A0 adds r0, r5, 0 movs r1, 0x27 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData adds r2, r4, 0x1 adds r0, r5, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData adds r2, r4, 0x2 adds r0, r5, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData adds r2, r4, 0x3 adds r0, r5, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData adds r2, r4, 0x4 adds r0, r5, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData adds r4, 0x5 adds r0, r5, 0 movs r1, 0x2C adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 bl pokemon_calc_effective_stats add sp, 0x10 @@ -864,7 +864,7 @@ _0806816C: adds r1, 0x1A adds r0, r7, 0 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData _08068180: lsls r0, r4, 25 lsrs r4, r0, 24 @@ -923,16 +923,16 @@ _080681D2: adds r2, 0xD adds r0, r7, 0 movs r1, 0x15 - bl pokemon_setattr + bl SetMonData adds r2, r6, 0x2 adds r0, r7, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x2B adds r0, r7, 0 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData adds r1, r6, 0 adds r1, 0x20 add r0, sp, 0x10 @@ -959,41 +959,41 @@ _08068236: adds r0, r7, 0 movs r1, 0x3 mov r2, r9 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x2 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0xE adds r0, r7, 0 movs r1, 0x1A - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0xF adds r0, r7, 0 movs r1, 0x1B - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x10 adds r0, r7, 0 movs r1, 0x1C - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x11 adds r0, r7, 0 movs r1, 0x1D - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x12 adds r0, r7, 0 movs r1, 0x1E - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x13 adds r0, r7, 0 movs r1, 0x1F - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x1B] lsrs r0, 7 mov r1, r8 @@ -1001,7 +1001,7 @@ _08068236: adds r0, r7, 0 movs r1, 0x2E mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x18] lsls r0, 27 lsrs r0, 27 @@ -1010,7 +1010,7 @@ _08068236: adds r0, r7, 0 movs r1, 0x27 mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrh r0, [r6, 0x18] lsls r0, 22 lsrs r0, 27 @@ -1019,7 +1019,7 @@ _08068236: adds r0, r7, 0 movs r1, 0x28 mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x19] lsls r0, 25 lsrs r0, 27 @@ -1028,7 +1028,7 @@ _08068236: adds r0, r7, 0 movs r1, 0x29 mov r2, r8 - bl pokemon_setattr + bl SetMonData ldr r0, [r6, 0x18] lsls r0, 12 lsrs r0, 27 @@ -1037,7 +1037,7 @@ _08068236: adds r0, r7, 0 movs r1, 0x2A mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrh r0, [r6, 0x1A] lsls r0, 23 lsrs r0, 27 @@ -1046,7 +1046,7 @@ _08068236: adds r0, r7, 0 movs r1, 0x2B mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x1B] lsls r0, 26 lsrs r0, 27 @@ -1055,7 +1055,7 @@ _08068236: adds r0, r7, 0 movs r1, 0x2C mov r2, r8 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 bl sub_806E924 adds r0, r7, 0 @@ -1158,15 +1158,15 @@ _080683D2: adds r0, r7, 0 movs r1, 0x15 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0xC ldr r2, [sp, 0x38] - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x20 ldr r2, [sp, 0x34] - bl pokemon_setattr + bl SetMonData add r0, sp, 0x10 ldr r1, [sp, 0x54] bl StringCopy @@ -1192,35 +1192,35 @@ _08068430: adds r0, r7, 0 movs r1, 0x3 mov r2, r9 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x2 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x1A ldr r2, [sp, 0x3C] - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x1B ldr r2, [sp, 0x40] - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x1C ldr r2, [sp, 0x44] - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x1D ldr r2, [sp, 0x48] - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x1E ldr r2, [sp, 0x4C] - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x1F ldr r2, [sp, 0x50] - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x1B] lsrs r0, 7 mov r1, r8 @@ -1228,7 +1228,7 @@ _08068430: adds r0, r7, 0 movs r1, 0x2E mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x18] lsls r0, 27 lsrs r0, 27 @@ -1237,7 +1237,7 @@ _08068430: adds r0, r7, 0 movs r1, 0x27 mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrh r0, [r6, 0x18] lsls r0, 22 lsrs r0, 27 @@ -1246,7 +1246,7 @@ _08068430: adds r0, r7, 0 movs r1, 0x28 mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x19] lsls r0, 25 lsrs r0, 27 @@ -1255,7 +1255,7 @@ _08068430: adds r0, r7, 0 movs r1, 0x29 mov r2, r8 - bl pokemon_setattr + bl SetMonData ldr r0, [r6, 0x18] lsls r0, 12 lsrs r0, 27 @@ -1264,7 +1264,7 @@ _08068430: adds r0, r7, 0 movs r1, 0x2A mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrh r0, [r6, 0x1A] lsls r0, 23 lsrs r0, 27 @@ -1273,7 +1273,7 @@ _08068430: adds r0, r7, 0 movs r1, 0x2B mov r2, r8 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x1B] lsls r0, 26 lsrs r0, 27 @@ -1282,7 +1282,7 @@ _08068430: adds r0, r7, 0 movs r1, 0x2C mov r2, r8 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 bl sub_806E924 adds r0, r7, 0 @@ -1364,7 +1364,7 @@ sub_8068528: @ 8068528 adds r2, 0xE adds r0, r7, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r4, 0 movs r2, 0x12 add r2, sp @@ -1393,7 +1393,7 @@ _080685E0: adds r1, 0x1A adds r0, r7, 0 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData adds r4, 0x1 cmp r4, 0x5 ble _080685E0 @@ -1403,7 +1403,7 @@ _080685E0: adds r0, r7, 0 movs r1, 0x3 mov r2, r8 - bl pokemon_setattr + bl SetMonData mov r2, r9 ldrb r0, [r2] lsls r0, 27 @@ -1414,7 +1414,7 @@ _080685E0: adds r2, r0, 0 adds r0, r7, 0 movs r1, 0x7 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 bl pokemon_calc_effective_stats add sp, 0x14 @@ -1509,7 +1509,7 @@ _080686C6: adds r1, 0x1A adds r0, r7, 0 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData _080686DA: lsls r0, r5, 25 lsrs r5, r0, 24 @@ -1752,7 +1752,7 @@ sub_80688A8: @ 80688A8 mov r0, r8 movs r1, 0x50 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData add sp, 0x14 pop {r3} mov r8, r3 @@ -1871,7 +1871,7 @@ _080689E4: beq _080689CE _080689F4: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080689CE @@ -1985,7 +1985,7 @@ _08068AAA: adds r0, r4, 0 movs r1, 0x3B mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C movs r2, 0 @@ -1994,7 +1994,7 @@ _08068AAA: adds r0, r4, 0 movs r1, 0x3C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D movs r2, 0 @@ -2003,7 +2003,7 @@ _08068AAA: adds r0, r4, 0 movs r1, 0x3D mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E movs r2, 0 @@ -2012,7 +2012,7 @@ _08068AAA: adds r0, r4, 0 movs r1, 0x3E mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F movs r2, 0 @@ -2021,7 +2021,7 @@ _08068AAA: adds r0, r4, 0 movs r1, 0x3F mov r2, sp - bl pokemon_setattr + bl SetMonData _08068B34: adds r5, 0x1 cmp r5, 0x5 @@ -2163,7 +2163,7 @@ DoScriptedWildBattle: @ 8068C18 adds r0, r7, 0 movs r1, 0xC add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData _08068C60: add sp, 0x14 pop {r4-r7} @@ -2342,7 +2342,7 @@ pokemon_calc_effective_stats: @ 8068D0C adds r0, r5, 0 movs r1, 0x38 mov r2, sp - bl pokemon_setattr + bl SetMonData ldr r0, =0x0000012f cmp r7, r0 bne _08068DF8 @@ -2376,7 +2376,7 @@ _08068E12: adds r0, 0xA str r0, [sp, 0x4] _08068E26: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting add r2, sp, 0x4 ldrb r0, [r2] mov r3, r8 @@ -2391,7 +2391,7 @@ _08068E26: _08068E3E: adds r0, r5, 0 movs r1, 0x3A - bl pokemon_setattr + bl SetMonData ldr r0, =gBaseStats subs r1, r6, r7 lsls r1, 2 @@ -2427,7 +2427,7 @@ _08068E5E: adds r0, r5, 0 movs r1, 0x3B adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x2] lsls r0, 1 ldr r3, [sp, 0x20] @@ -2459,7 +2459,7 @@ _08068EA4: adds r0, r5, 0 movs r1, 0x3C adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x3] lsls r0, 1 ldr r2, [sp, 0x28] @@ -2491,7 +2491,7 @@ _08068EEA: adds r0, r5, 0 movs r1, 0x3D adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x4] lsls r0, 1 ldr r3, [sp, 0x30] @@ -2523,7 +2523,7 @@ _08068F30: adds r0, r5, 0 movs r1, 0x3E adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x5] lsls r0, 1 ldr r2, [sp, 0x38] @@ -2555,7 +2555,7 @@ _08068F76: adds r0, r5, 0 movs r1, 0x3F adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData ldr r0, =0x0000012f cmp r7, r0 bne _08068FD0 @@ -2588,7 +2588,7 @@ _08068FE8: add r2, sp, 0x1C adds r0, r5, 0 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData _08068FF4: add sp, 0x40 pop {r3-r5} @@ -2615,21 +2615,21 @@ sub_8069004: @ 8069004 adds r0, r4, 0 movs r1, 0x37 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A mov r2, sp - bl pokemon_setattr + bl SetMonData movs r0, 0xFF str r0, [sp] adds r0, r4, 0 movs r1, 0x40 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 bl pokemon_calc_effective_stats add sp, 0x4 @@ -2781,7 +2781,7 @@ _0806914E: adds r0, r7, 0 adds r1, r4, 0 mov r2, sp - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r1, r5, 0 adds r1, 0x11 ldrh r0, [r6] @@ -2791,7 +2791,7 @@ _0806914E: ldr r0, =gBattleMoves + 0x4 @ PP offset adds r2, r0 adds r0, r7, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted ldrh r0, [r6] b _080691A4 .pool @@ -2868,7 +2868,7 @@ sub_80691F4: @ 80691F4 adds r1, 0xD adds r0, r5, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r4, 0x11 mov r0, sp ldrh r0, [r0] @@ -2879,7 +2879,7 @@ sub_80691F4: @ 80691F4 adds r2, r0 adds r0, r5, 0 adds r1, r4, 0 - bl pokemon_setattr + bl SetMonData add sp, 0x4 pop {r4,r5} pop {r0} @@ -3194,12 +3194,12 @@ _08069494: adds r1, 0xD adds r0, r6, 0 adds r2, r5, 0 - bl pokemon_setattr + bl SetMonData adds r1, r4, 0 adds r1, 0x11 adds r2, r7, r4 adds r0, r6, 0 - bl pokemon_setattr + bl SetMonData adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 @@ -3207,7 +3207,7 @@ _08069494: adds r0, r6, 0 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr + bl SetMonData add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -3279,12 +3279,12 @@ _08069540: adds r1, 0xD adds r0, r6, 0 adds r2, r5, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r1, r4, 0 adds r1, 0x11 adds r2, r7, r4 adds r0, r6, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 @@ -3292,7 +3292,7 @@ _08069540: adds r0, r6, 0 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted add sp, 0x10 pop {r3,r4} mov r8, r3 diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s index c7d017580..0983fcc93 100644 --- a/asm/pokemon_2.s +++ b/asm/pokemon_2.s @@ -25,9 +25,9 @@ _08069E04: b _08069EC2 _08069E0A: movs r5, 0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] - ldr r4, =gUnknown_02024210 + ldr r4, =gAbsentBankFlags ldr r2, =gBitTable _08069E14: cmp r5, r3 @@ -52,16 +52,16 @@ _08069E40: _08069E42: lsls r0, r5, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _08069E74 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable lsls r0, r5, 2 @@ -84,16 +84,16 @@ _08069E88: _08069E8A: lsls r0, r5, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _08069EBC - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable lsls r0, r5, 2 @@ -131,7 +131,7 @@ sub_8069ED8: @ 8069ED8 cmp r0, 0 bne _08069F1C adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08069F1C @@ -169,7 +169,7 @@ sub_8069F34: @ 8069F34 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 movs r6, 0x1 adds r4, r6, 0 @@ -203,7 +203,7 @@ _08069F7C: adds r0, r4, 0 b _08069FA6 _08069F80: - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable lsls r0, r4, 2 @@ -220,7 +220,7 @@ _08069FA0: eors r5, r0 adds r0, r5, 0 _08069FA6: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 pop {r4-r6} @@ -1938,9 +1938,9 @@ _0806AC98: bx r1 thumb_func_end pokemon_getattr_encrypted - thumb_func_start pokemon_setattr -@ int pokemon_setattr(pokemon *mon, enum pokemon_data_request req, void *data) -pokemon_setattr: @ 806ACAC + thumb_func_start SetMonData +@ int SetMonData(pokemon *mon, enum pokemon_data_request req, void *data) +SetMonData: @ 806ACAC push {lr} adds r3, r0, 0 adds r0, r1, 0 @@ -2056,15 +2056,15 @@ _0806AD86: b _0806AD96 _0806AD90: adds r0, r3, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted _0806AD96: pop {r0} bx r0 - thumb_func_end pokemon_setattr + thumb_func_end SetMonData - thumb_func_start pokemon_setattr_encrypted -@ int pokemon_setattr_encrypted(pokemon *mon, enum pokemon_data_request req, void *data) -pokemon_setattr_encrypted: @ 806AD9C + thumb_func_start SetMonData_encrypted +@ int SetMonData_encrypted(pokemon *mon, enum pokemon_data_request req, void *data) +SetMonData_encrypted: @ 806AD9C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2863,7 +2863,7 @@ _0806B3EC: pop {r0} bx r0 .pool - thumb_func_end pokemon_setattr_encrypted + thumb_func_end SetMonData_encrypted thumb_func_start memcpy_pokemon @ void *memcpy_pokemon(void *dest, void *src, unsigned int size) @@ -2882,17 +2882,17 @@ pokemon_catch: @ 806B414 ldr r4, =gSaveBlock2Ptr ldr r2, [r4] movs r1, 0x7 - bl pokemon_setattr + bl SetMonData ldr r2, [r4] adds r2, 0x8 adds r0, r6, 0 movs r1, 0x31 - bl pokemon_setattr + bl SetMonData ldr r2, [r4] adds r2, 0xA adds r0, r6, 0 movs r1, 0x1 - bl pokemon_setattr + bl SetMonData movs r5, 0 b _0806B446 .pool @@ -3201,7 +3201,7 @@ sub_806B694: @ 806B694 lsls r1, 24 cmp r1, 0 beq _0806B6B8 - ldr r2, =gUnknown_0202420A + ldr r2, =gLastUsedAbility ldr r1, =gBaseStats lsls r0, r3, 3 subs r0, r3 @@ -3211,7 +3211,7 @@ sub_806B694: @ 806B694 b _0806B6C6 .pool _0806B6B8: - ldr r2, =gUnknown_0202420A + ldr r2, =gLastUsedAbility ldr r1, =gBaseStats lsls r0, r3, 3 subs r0, r3 @@ -3263,7 +3263,7 @@ create_enemy_party: @ 806B70C sub sp, 0x14 adds r5, r0, 0 bl zero_enemy_party_data - ldr r4, =gUnknown_020244A8 + ldr r4, =gBattleResources ldr r0, [r4] ldr r0, [r0] adds r1, r5, 0 @@ -3272,7 +3272,7 @@ create_enemy_party: @ 806B70C movs r0, 0 mov r9, r0 _0806B730: - ldr r1, =gUnknown_020244A8 + ldr r1, =gBattleResources ldr r3, [r1] ldr r2, [r3] mov r4, r9 @@ -3312,7 +3312,7 @@ _0806B730: adds r0, r5, 0 movs r3, 0xF bl create_pokemon_set_level - ldr r1, =gUnknown_020244A8 + ldr r1, =gBattleResources ldr r0, [r1] adds r1, r7, 0 adds r1, 0x88 @@ -3320,7 +3320,7 @@ _0806B730: adds r2, r1 adds r0, r5, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r5, 0 mov r10, r4 mov r7, r9 @@ -3329,12 +3329,12 @@ _0806B730: _0806B7A0: adds r1, r5, 0 adds r1, 0x1A - ldr r2, =gUnknown_020244A8 + ldr r2, =gBattleResources ldr r0, [r2] ldr r2, [r0] adds r2, r7 adds r0, r6, r4 - bl pokemon_setattr + bl SetMonData adds r5, 0x1 cmp r5, 0x5 ble _0806B7A0 @@ -3352,15 +3352,15 @@ _0806B7A0: _0806B7CE: adds r1, r5, 0 adds r1, 0xD - ldr r2, =gUnknown_020244A8 + ldr r2, =gBattleResources ldr r0, [r2] ldr r2, [r0] adds r2, r6 adds r0, r7, 0 - bl pokemon_setattr + bl SetMonData adds r1, r5, 0 adds r1, 0x11 - ldr r3, =gUnknown_020244A8 + ldr r3, =gBattleResources ldr r0, [r3] ldr r0, [r0] adds r0, 0x4C @@ -3372,7 +3372,7 @@ _0806B7CE: ldr r0, =gBattleMoves + 0x4 @ PP offset adds r2, r0 adds r0, r7, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x2 adds r4, 0x2 adds r5, 0x1 @@ -3398,7 +3398,7 @@ _0806B80A: sub_806B830: @ 806B830 push {r4,r5,lr} ldr r5, =gUnknown_08329EB8 - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r4, [r0] ldrb r0, [r4, 0x9] @@ -3427,7 +3427,7 @@ sub_806B830: @ 806B830 sub_806B870: @ 806B870 push {r4,r5,lr} ldr r5, =gUnknown_08329EB8 - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r4, [r0] ldrb r0, [r4, 0x9] @@ -3618,7 +3618,7 @@ sub_806B9A8: @ 806B9A8 adds r0, r5, 0 movs r1, 0x15 mov r2, sp - bl pokemon_setattr + bl SetMonData add sp, 0x4 pop {r4,r5} pop {r0} @@ -3945,8 +3945,8 @@ _0806BA4E: movs r1, 0x7 bl GetMonData ldr r0, [sp, 0x14] - bl battle_side_get_owner - ldr r1, =gUnknown_0202449C + bl GetBankSide + ldr r1, =gBattleStruct lsls r0, 24 lsrs r0, 23 adds r0, 0xA8 diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index ec4cc0050..ad6a84923 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -75,7 +75,7 @@ ExecuteTableBasedItemEffect: @ 806BD28 ands r0, r1 cmp r0, 0 beq _0806BDA8 - ldr r2, =gUnknown_02024404 + ldr r2, =gEnigmaBerries ldr r0, =gUnknown_020244B8 ldrb r1, [r0] lsls r0, r1, 3 @@ -94,7 +94,7 @@ _0806BDA8: b _0806BDC4 .pool _0806BDBC: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 _0806BDC4: @@ -113,23 +113,23 @@ _0806BDC4: lsrs r1, r0, 24 cmp r1, 0 beq _0806BE64 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r2, [r0] ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 negs r1, r0 orrs r1, r0 lsrs r1, 31 str r1, [sp, 0x1C] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldr r4, [sp, 0xC] subs r4, 0xD ldrb r0, [r0] cmp r1, r0 bge _0806BE70 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r0, r1, 1 adds r0, r2 ldrh r3, [r0] @@ -147,7 +147,7 @@ _0806BE3C: ldr r1, [sp, 0x1C] adds r1, 0x2 str r1, [sp, 0x1C] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r1, r0 bge _0806BE70 @@ -164,7 +164,7 @@ _0806BE3C: b _0806BE70 .pool _0806BE64: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r1, [r0] movs r3, 0x4 str r3, [sp, 0x38] @@ -199,7 +199,7 @@ _0806BE9A: ands r0, r1 cmp r0, 0 beq _0806BECC - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -296,7 +296,7 @@ _0806BF76: cmp r0, 0 beq _0806BFA4 ldr r1, =gBattleMons - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -322,7 +322,7 @@ _0806BFA4: bl _0806CD4C _0806BFB2: ldr r6, =gBattleMons - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -361,7 +361,7 @@ _0806BFFC: cmp r3, 0 beq _0806C042 ldr r7, =gBattleMons - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -395,7 +395,7 @@ _0806C042: bl _0806CD4C _0806C050: ldr r6, =gBattleMons - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -432,7 +432,7 @@ _0806C08C: cmp r3, 0 beq _0806C0D2 ldr r7, =gBattleMons - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -466,7 +466,7 @@ _0806C0D2: bl _0806CD4C _0806C0E0: ldr r6, =gBattleMons - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -504,10 +504,10 @@ _0806C120: adds r6, r2, 0 cmp r0, 0 beq _0806C168 - ldr r5, =gUnknown_02024294 - ldr r4, =gUnknown_02024064 + ldr r5, =gSideTimers + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -518,7 +518,7 @@ _0806C120: cmp r0, 0 bne _0806C168 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -569,7 +569,7 @@ _0806C168: mov r0, r8 movs r1, 0x19 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r0, r8 bl pokemon_calc_effective_stats movs r0, 0 @@ -780,7 +780,7 @@ _0806C300: mov r0, r8 movs r1, 0x15 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r0, r8 adds r1, r5, 0 movs r2, 0 @@ -809,7 +809,7 @@ _0806C300: mov r0, r8 adds r1, r4, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData movs r5, 0 str r5, [sp, 0x20] _0806C3D8: @@ -925,7 +925,7 @@ _0806C4B4: ldrb r1, [r0] add r2, sp, 0x4 mov r0, r8 - bl pokemon_setattr + bl SetMonData mov r0, r8 bl pokemon_calc_effective_stats ldr r0, [sp, 0x28] @@ -964,7 +964,7 @@ _0806C4FC: ldr r3, [sp, 0x38] cmp r3, 0x4 beq _0806C55C - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldr r1, =gBitTable lsls r0, r3, 2 adds r0, r1 @@ -972,7 +972,7 @@ _0806C4FC: ldrb r0, [r2] bics r0, r1 strb r0, [r2] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r3, 1 adds r0, r1 ldrb r0, [r0] @@ -982,14 +982,14 @@ _0806C4FC: lsrs r1, 24 ldr r0, [sp, 0x38] bl battle_data_fill - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] b _0806C574 .pool _0806C55C: - ldr r3, =gUnknown_02024210 + ldr r3, =gAbsentBankFlags ldr r1, =gBitTable - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] eors r0, r4 lsls r0, 2 @@ -1000,7 +1000,7 @@ _0806C55C: strb r0, [r3] ldrb r0, [r2] _0806C574: - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0806C5B2 @@ -1068,7 +1068,7 @@ _0806C5F4: movs r0, 0x1 b _0806C610 _0806C60A: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x23 ldrb r0, [r0] _0806C610: @@ -1111,7 +1111,7 @@ _0806C65E: mov r0, r8 movs r1, 0x39 mov r2, sp - bl pokemon_setattr + bl SetMonData ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 @@ -1134,9 +1134,9 @@ _0806C65E: ands r0, r3 cmp r0, 0 bne _0806C6EC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0806C6EC @@ -1274,7 +1274,7 @@ _0806C7CC: mov r0, r8 mov r1, r9 mov r2, sp - bl pokemon_setattr + bl SetMonData ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 @@ -1299,7 +1299,7 @@ _0806C7CC: ands r1, r0 cmp r1, 0 bne _0806C82E - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -1425,7 +1425,7 @@ _0806C914: mov r0, r8 adds r1, r6, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 @@ -1450,7 +1450,7 @@ _0806C914: ands r0, r1 cmp r0, 0 bne _0806C978 - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -1613,7 +1613,7 @@ _0806CA9A: ldrb r1, [r0] add r2, sp, 0x4 mov r0, r8 - bl pokemon_setattr + bl SetMonData mov r0, r8 bl pokemon_calc_effective_stats movs r3, 0 @@ -1685,7 +1685,7 @@ _0806CB10: mov r0, r8 movs r1, 0x15 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r0, r8 adds r1, r6, 0 movs r2, 0 @@ -1713,7 +1713,7 @@ _0806CB10: mov r0, r8 adds r1, r4, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData movs r5, 0 str r5, [sp, 0x20] b _0806CD3A @@ -1923,7 +1923,7 @@ _0806CD22: add r2, sp, 0x8 mov r0, r8 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData movs r5, 0 str r5, [sp, 0x20] _0806CD30: @@ -1985,7 +1985,7 @@ HealStatusConditions: @ 806CD6C adds r0, r5, 0 movs r1, 0x37 mov r2, sp - bl pokemon_setattr + bl SetMonData ldr r0, =gMain ldr r1, =0x00000439 adds r0, r1 @@ -2045,7 +2045,7 @@ _0806CE08: cmp r3, 0xAF bne _0806CE1A _0806CE0C: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -2199,11 +2199,11 @@ _0806CF1C: thumb_func_start sub_806CF24 sub_806CF24: @ 806CF24 push {lr} - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget ldr r1, =gUnknown_020244B8 ldrb r1, [r1] strb r1, [r2] - ldr r3, =gUnknown_02022F58 + ldr r3, =gBattleTextBuff1 ldr r2, =gUnknown_085CBE00 ldr r1, =gUnknown_08329EC8 adds r0, r1 @@ -2213,7 +2213,7 @@ sub_806CF24: @ 806CF24 ldr r1, [r0] adds r0, r3, 0 bl StringCopy - ldr r0, =gUnknown_02022F68 + ldr r0, =gBattleTextBuff2 ldr r1, =gUnknown_085CB38A bl StringCopy ldr r0, =gUnknown_085CB3AA @@ -2269,7 +2269,7 @@ _0806CFD8: ldrb r0, [r2] strb r0, [r1] movs r5, 0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker mov r8, r0 movs r6, 0 _0806CFE6: @@ -2310,7 +2310,7 @@ _0806D02E: ands r0, r1 cmp r0, 0 beq _0806D04E - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldr r0, =gUnknown_020244B8 ldrb r0, [r0] strb r0, [r1] @@ -2407,7 +2407,7 @@ GetEvolutionTargetSpecies: @ 806D098 b _0806D114 .pool _0806D10C: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 _0806D114: @@ -2708,7 +2708,7 @@ _0806D350: mov r0, r8 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData _0806D370: ldrh r2, [r4, 0x4] mov r10, r2 @@ -3312,7 +3312,7 @@ sub_806D778: @ 806D778 adds r2, r4 adds r0, r5, 0 movs r1, 0x2 - bl pokemon_setattr + bl SetMonData _0806D7D4: add sp, 0x4 pop {r3,r4} @@ -3549,7 +3549,7 @@ _0806D94A: ands r0, r1 cmp r0, 0 beq _0806D98C - ldr r0, =gUnknown_02024404 + ldr r0, =gEnigmaBerries ldrb r4, [r0, 0x7] b _0806D9A8 .pool @@ -3562,7 +3562,7 @@ _0806D98C: b _0806D9A8 .pool _0806D9A0: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 _0806D9A8: @@ -3710,7 +3710,7 @@ _0806DAB8: adds r0, r7, 0 movs r1, 0x20 mov r2, sp - bl pokemon_setattr + bl SetMonData _0806DAC2: add sp, 0x4 pop {r4-r7} @@ -3855,7 +3855,7 @@ _0806DBC8: ands r0, r1 cmp r0, 0 beq _0806DC00 - ldr r0, =gUnknown_02024404 + ldr r0, =gEnigmaBerries ldrb r0, [r0, 0x7] b _0806DC1C .pool @@ -3868,7 +3868,7 @@ _0806DC00: b _0806DC1C .pool _0806DC14: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 _0806DC1C: @@ -3913,7 +3913,7 @@ _0806DC58: adds r1, r6, 0 adds r1, 0x1A mov r0, r8 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 cmp r6, 0x5 bgt _0806DC7A @@ -4046,7 +4046,7 @@ _0806DD46: adds r0, r6, r0 movs r1, 0x22 mov r2, sp - bl pokemon_setattr + bl SetMonData _0806DD70: add sp, 0x4 pop {r4-r6} @@ -4222,7 +4222,7 @@ _0806DEA2: adds r0, r1 movs r1, 0x22 mov r2, sp - bl pokemon_setattr + bl SetMonData _0806DEB2: adds r6, 0x1 cmp r6, 0x5 @@ -4289,7 +4289,7 @@ _0806DEE0: adds r0, r4, 0 movs r1, 0x22 mov r2, sp - bl pokemon_setattr + bl SetMonData _0806DF3A: cmp r5, 0x5 beq _0806DF64 @@ -4308,7 +4308,7 @@ _0806DF3A: adds r0, r4, 0 movs r1, 0x22 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r5, 0x1 _0806DF64: adds r5, 0x1 @@ -4366,7 +4366,7 @@ sub_806DF74: @ 806DF74 add r2, sp, 0x4 adds r0, r5, 0 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData _0806DFD4: mov r0, sp ldrb r0, [r0] @@ -4387,7 +4387,7 @@ _0806DFF8: adds r0, r5, 0 movs r1, 0x38 mov r2, sp - bl pokemon_setattr + bl SetMonData movs r0, 0x1 _0806E004: add sp, 0x8 @@ -5580,7 +5580,7 @@ _0806E938: adds r1, 0x11 adds r0, r5, 0 mov r2, sp - bl pokemon_setattr_encrypted + bl SetMonData_encrypted _0806E984: adds r6, 0x1 cmp r6, 0x3 @@ -5594,14 +5594,14 @@ _0806E984: thumb_func_start sub_806E994 sub_806E994: @ 806E994 push {r4,r5,lr} - ldr r2, =gUnknown_0202420A - ldr r5, =gUnknown_0202449C + ldr r2, =gLastUsedAbility + ldr r5, =gBattleStruct ldr r1, [r5] adds r0, r1, 0 adds r0, 0xB0 ldrb r0, [r0] strb r0, [r2] - ldr r4, =gUnknown_02022F58 + ldr r4, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r4] movs r0, 0x4 @@ -5612,11 +5612,11 @@ sub_806E994: @ 806E994 movs r0, 0xFF strb r0, [r4, 0x4] ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0806E9E8 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r0, [r5] adds r0, 0x49 ldrb r0, [r0] @@ -5627,7 +5627,7 @@ sub_806E994: @ 806E994 b _0806E9F6 .pool _0806E9E8: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r0, [r5] adds r0, 0x49 ldrb r0, [r0] @@ -5636,7 +5636,7 @@ _0806E9E8: ldrh r0, [r0] _0806E9F6: strb r0, [r4, 0x3] - ldr r4, =gUnknown_02022F68 + ldr r4, =gBattleTextBuff2 movs r0, 0xFD strb r0, [r4] movs r0, 0x4 @@ -5644,7 +5644,7 @@ _0806E9F6: ldr r1, =gUnknown_020244B8 ldrb r0, [r1] strb r0, [r4, 0x2] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r1] lsls r0, 1 adds r0, r2 @@ -5803,7 +5803,7 @@ _0806EB6C: adds r2, r1 _0806EB6E: movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _0806EB90 .pool _0806EB80: @@ -5813,7 +5813,7 @@ _0806EB80: ldr r1, =gBaseStats + 0xe @ item 2 offset adds r2, r1 movs r1, 0xC - bl pokemon_setattr + bl SetMonData _0806EB90: pop {r3} mov r8, r3 @@ -5994,7 +5994,7 @@ sub_806ECEC: @ 806ECEC lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -6203,7 +6203,7 @@ sub_806EEB4: @ 806EEB4 adds r4, r0, 0 lsls r1, 16 lsrs r2, r1, 16 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 diff --git a/asm/porthole.s b/asm/porthole.s index a82ffc02f..f99a0cb47 100644 --- a/asm/porthole.s +++ b/asm/porthole.s @@ -185,7 +185,7 @@ sub_80FB6EC: @ 80FB6EC bl AddPseudoFieldObject lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 diff --git a/asm/region_map.s b/asm/region_map.s index 52328cf8a..a9fc438e7 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -1287,7 +1287,7 @@ sub_81236C4: @ 81236C4 lsrs r5, 24 ldr r4, =gUnknown_0203A144 ldr r6, [r4] - ldr r7, =gUnknown_08329F40 + ldr r7, =gSineTable mov r12, r7 adds r4, r5, 0 adds r4, 0x40 @@ -2656,7 +2656,7 @@ _0812416E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r3, r0, r1 str r3, [r2, 0x1C] adds r2, 0x78 @@ -2848,7 +2848,7 @@ _08124316: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2, 0x20] adds r0, r2, 0 @@ -3823,7 +3823,7 @@ _08124B44: lsrs r5, r0, 24 cmp r5, 0x40 beq _08124BB8 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 lsls r4, r5, 4 adds r0, r4, r5 @@ -3854,7 +3854,7 @@ _08124B9C: _08124BA2: adds r4, r5 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 lsls r1, r7, 24 lsrs r1, 24 @@ -3903,7 +3903,7 @@ sub_8124BE4: @ 8124BE4 mov r5, sp adds r5, 0x6 add r7, sp, 0x4 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 movs r0, 0x1C add r0, r9 diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index 8edd73d7f..8c622ab78 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -299,7 +299,7 @@ sub_809EB04: @ 809EB04 bl AddObjectToBack lsls r0, 24 lsrs r1, r0, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 diff --git a/asm/rom3.s b/asm/rom3.s index 380f605a1..db36be324 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -46,12 +46,12 @@ sub_803269C: @ 803269C movs r0, 0 str r0, [sp, 0x10] movs r1, 0 - ldr r7, =gUnknown_03005D60 + ldr r7, =gBattleBankFunc ldr r6, =gUnknown_020244AC movs r2, 0 ldr r5, =gUnknown_020244B0 ldr r4, =nullsub_21 - ldr r3, =gUnknown_02024076 + ldr r3, =gBanksBySide _080326B8: lsls r0, r1, 2 adds r0, r7 @@ -72,7 +72,7 @@ _080326B8: cmp r1, 0x3 ble _080326B8 bl battle_wireless_setup_if_required_maybe - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer movs r5, 0 str r5, [r0] bl sub_80A3934 @@ -101,7 +101,7 @@ _080326B8: adds r0, r4, 0 movs r1, 0xC add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData _08032728: ldr r0, =gUnknown_02022FF4 str r5, [r0] @@ -160,7 +160,7 @@ _080327B4: cmp r0, 0 bne _080327E2 movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] cmp r4, r1 bge _080327E2 @@ -176,7 +176,7 @@ _080327D0: blt _080327D0 _080327E2: movs r4, 0 - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct movs r2, 0xD2 lsls r2, 1 movs r1, 0 @@ -189,7 +189,7 @@ _080327EC: cmp r4, 0x5F bls _080327EC movs r4, 0 - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct movs r2, 0x81 lsls r2, 2 movs r1, 0 @@ -229,19 +229,19 @@ b_setup_bx: @ 8032824 ands r4, r3 cmp r4, 0 beq _08032874 - ldr r2, =gUnknown_03005D60 + ldr r2, =gBattleBankFunc ldr r0, =sub_818994C str r0, [r2] - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide movs r0, 0 strb r0, [r1] b _0803287E .pool _08032874: - ldr r2, =gUnknown_03005D60 - ldr r0, =sub_805745C + ldr r2, =gBattleBankFunc + ldr r0, =SetBankFuncToPlayerBufferRunCommand str r0, [r2] - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide strb r4, [r1] _0803287E: ldr r3, =sub_805F164 @@ -255,7 +255,7 @@ _0803287E: str r3, [r2, 0xC] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks movs r0, 0x4 strb r0, [r1] movs r0, 0 @@ -270,7 +270,7 @@ _0803287E: movs r0, 0x3 movs r1, 0x1 bl sub_81B8D64 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID movs r1, 0 strh r1, [r0] strh r1, [r0, 0x2] @@ -293,7 +293,7 @@ _080328F0: mov r12, r2 cmp r1, 0 beq _08032918 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldr r0, =sub_815936C b _08032934 .pool @@ -303,17 +303,17 @@ _08032918: ands r3, r0 cmp r3, 0 beq _08032930 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldr r0, =bx_goto_buffer_A_ch0_tbl3 b _08032934 .pool _08032930: - ldr r1, =gUnknown_03005D60 - ldr r0, =sub_805745C + ldr r1, =gBattleBankFunc + ldr r0, =SetBankFuncToPlayerBufferRunCommand _08032934: str r0, [r1] mov r10, r1 - ldr r4, =gUnknown_02024076 + ldr r4, =gBanksBySide movs r0, 0 mov r9, r0 mov r1, r9 @@ -324,7 +324,7 @@ _08032934: str r2, [r5, 0x4] movs r6, 0x1 strb r6, [r4, 0x1] - ldr r2, =gUnknown_0202406C + ldr r2, =gNoOfAllBanks movs r7, 0x2 strb r7, [r2] ldr r0, =gBattleTypeFlags @@ -383,10 +383,10 @@ _080329E0: ldr r1, =sub_8039ECC ldr r2, =gUnknown_03005D04 str r1, [r2] - ldr r2, =gUnknown_03005D60 - ldr r0, =sub_805745C + ldr r2, =gBattleBankFunc + ldr r0, =SetBankFuncToPlayerBufferRunCommand str r0, [r2] - ldr r4, =gUnknown_02024076 + ldr r4, =gBanksBySide strb r5, [r4] ldr r6, =sub_805F164 str r6, [r2, 0x4] @@ -401,7 +401,7 @@ _080329E0: mov r8, r0 mov r1, r8 strb r1, [r4, 0x3] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks mov r10, r0 movs r1, 0x4 mov r9, r1 @@ -448,7 +448,7 @@ _08032A20: movs r0, 0x3 movs r1, 0x1 bl sub_81B8D64 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID strh r5, [r0] strh r5, [r0, 0x2] mov r1, r8 @@ -472,7 +472,7 @@ _08032AAA: mov r12, r1 adds r7, r4, 0 mov r8, r0 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID movs r4, 0 movs r2, 0x3 mov r9, r2 @@ -511,7 +511,7 @@ _08032B06: adds r3, r4, r0 ldrh r1, [r3, 0x18] lsls r1, 2 - ldr r2, =gUnknown_03005D60 + ldr r2, =gBattleBankFunc adds r1, r2 ldr r2, =sub_818994C str r2, [r1] @@ -579,7 +579,7 @@ _08032B92: adds r2, r4, r0 ldrh r0, [r2, 0x18] lsls r0, 2 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc adds r0, r1 ldr r1, =sub_818994C str r1, [r0] @@ -614,7 +614,7 @@ _08032BD8: adds r2, r4, r0 ldrh r0, [r2, 0x18] lsls r0, 2 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc adds r0, r1 ldr r1, =sub_81864EC str r1, [r0] @@ -753,28 +753,28 @@ b_setup_bx_link: @ 8032CC0 ldr r1, =gUnknown_03005D04 ldr r0, =sub_8039ECC str r0, [r1] - ldr r2, =gUnknown_03005D60 - ldr r0, =sub_805745C + ldr r2, =gBattleBankFunc + ldr r0, =SetBankFuncToPlayerBufferRunCommand str r0, [r2] - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide strb r3, [r1] ldr r0, =sub_8064394 str r0, [r2, 0x4] strb r5, [r1, 0x1] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks movs r0, 0x2 b _0803303A .pool _08032D1C: - ldr r2, =gUnknown_03005D60 - ldr r0, =sub_805745C + ldr r2, =gBattleBankFunc + ldr r0, =SetBankFuncToPlayerBufferRunCommand str r0, [r2, 0x4] - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide strb r4, [r1, 0x1] ldr r0, =sub_8064394 str r0, [r2] strb r5, [r1] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks movs r0, 0x2 b _0803303A .pool @@ -791,10 +791,10 @@ _08032D48: ldr r1, =gUnknown_03005D04 ldr r0, =sub_8039ECC str r0, [r1] - ldr r2, =gUnknown_03005D60 - ldr r4, =sub_805745C + ldr r2, =gBattleBankFunc + ldr r4, =SetBankFuncToPlayerBufferRunCommand str r4, [r2] - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide movs r0, 0 strb r0, [r1] ldr r3, =sub_8064394 @@ -809,10 +809,10 @@ _08032D48: b _08032DB4 .pool _08032D98: - ldr r2, =gUnknown_03005D60 - ldr r0, =sub_805745C + ldr r2, =gBattleBankFunc + ldr r0, =SetBankFuncToPlayerBufferRunCommand str r0, [r2, 0x4] - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide strb r3, [r1, 0x1] ldr r3, =sub_8064394 str r3, [r2] @@ -824,7 +824,7 @@ _08032D98: movs r0, 0x3 strb r0, [r1, 0x2] _08032DB4: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks strb r6, [r0] b _0803303C .pool @@ -842,10 +842,10 @@ _08032DD0: ldr r1, =gUnknown_03005D04 ldr r0, =sub_8039ECC str r0, [r1] - ldr r2, =gUnknown_03005D60 - ldr r0, =sub_805745C + ldr r2, =gBattleBankFunc + ldr r0, =SetBankFuncToPlayerBufferRunCommand str r0, [r2] - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide movs r0, 0 strb r0, [r1] ldr r3, =sub_805F164 @@ -855,15 +855,15 @@ _08032DD0: b _08032E2E .pool _08032E1C: - ldr r2, =gUnknown_03005D60 + ldr r2, =gBattleBankFunc ldr r0, =sub_814AEB0 str r0, [r2] - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide strb r3, [r1] ldr r3, =sub_8064394 str r3, [r2, 0x4] strb r5, [r1, 0x1] - ldr r0, =sub_805745C + ldr r0, =SetBankFuncToPlayerBufferRunCommand _08032E2E: str r0, [r2, 0x8] movs r0, 0x2 @@ -871,7 +871,7 @@ _08032E2E: str r3, [r2, 0xC] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks strb r4, [r0] movs r0, 0 movs r1, 0 @@ -885,7 +885,7 @@ _08032E2E: movs r0, 0x3 movs r1, 0x1 bl sub_81B8D64 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID movs r1, 0 strh r1, [r0] strh r1, [r0, 0x2] @@ -911,9 +911,9 @@ _08032EA4: mov r10, r0 ldr r1, =gUnknown_020229E8 mov r12, r1 - ldr r7, =gUnknown_02024076 + ldr r7, =gBanksBySide mov r8, r0 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID movs r4, 0 movs r2, 0x3 mov r9, r2 @@ -952,9 +952,9 @@ _08032F02: adds r3, r4, r0 ldrh r1, [r3, 0x18] lsls r1, 2 - ldr r2, =gUnknown_03005D60 + ldr r2, =gBattleBankFunc adds r1, r2 - ldr r2, =sub_805745C + ldr r2, =SetBankFuncToPlayerBufferRunCommand str r2, [r1] ldrh r1, [r3, 0x18] mov r12, r0 @@ -1020,7 +1020,7 @@ _08032F8E: adds r2, r4, r0 ldrh r0, [r2, 0x18] lsls r0, 2 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc adds r0, r1 ldr r1, =sub_814AEB0 str r1, [r0] @@ -1055,7 +1055,7 @@ _08032FD4: adds r2, r4, r0 ldrh r0, [r2, 0x18] lsls r0, 2 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc adds r0, r1 ldr r1, =sub_8064394 str r1, [r0] @@ -1105,7 +1105,7 @@ _08033028: bgt _08033036 b _08032EB8 _08033036: - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks movs r0, 0x4 _0803303A: strb r0, [r1] @@ -1144,7 +1144,7 @@ _08033074: movs r0, 0x1 add r0, r8 mov r10, r0 - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide add r0, r8 mov r9, r0 mov r0, r8 @@ -1189,7 +1189,7 @@ _080330AA: bl GetMonData cmp r0, 0 bne _08033170 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r6, r0 strh r5, [r0] b _08033178 @@ -1238,7 +1238,7 @@ _0803312C: bl GetMonData cmp r0, 0 bne _08033170 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID mov r0, r8 subs r0, 0x2 lsls r0, 1 @@ -1258,7 +1258,7 @@ _08033170: _08033178: mov r8, r10 _0803317A: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r8, r0 bge _08033184 @@ -1271,7 +1271,7 @@ _08033184: ands r0, r1 cmp r0, 0 beq _0803319C - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID movs r1, 0 strh r1, [r0, 0x2] movs r1, 0x3 @@ -1305,7 +1305,7 @@ dp01_prepare_buffer: @ 80331B8 adds r0, r3, 0 adds r1, r2, 0 adds r2, r4, 0 - bl dp01_prepare_buffer_wireless_probably + bl PrepareBufferDataTransferLink b _08033236 .pool _080331E4: @@ -1318,8 +1318,8 @@ _080331EE: movs r3, 0 cmp r3, r2 bge _08033236 - ldr r6, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r6, =gBattleBufferA + ldr r5, =gActiveBank _080331F8: ldrb r0, [r5] lsls r0, 9 @@ -1337,8 +1337,8 @@ _08033218: movs r3, 0 cmp r3, r2 bge _08033236 - ldr r6, =gUnknown_02023864 - ldr r5, =gUnknown_02024064 + ldr r6, =gBattleBufferB + ldr r5, =gActiveBank _08033222: ldrb r0, [r5] lsls r0, 9 @@ -1435,8 +1435,8 @@ sub_8033244: @ 8033244 .pool thumb_func_end sub_8033244 - thumb_func_start dp01_prepare_buffer_wireless_probably -dp01_prepare_buffer_wireless_probably: @ 80332F4 + thumb_func_start PrepareBufferDataTransferLink +PrepareBufferDataTransferLink: @ 80332F4 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1499,7 +1499,7 @@ _08033346: ldrsh r1, [r0, r7] ldr r0, [r4] adds r1, r0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] strb r0, [r1, 0x1] ldrb r1, [r3] @@ -1511,7 +1511,7 @@ _08033346: ldrsh r1, [r0, r2] ldr r0, [r4] adds r1, r0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r1, 0x2] ldrb r1, [r3] @@ -1523,7 +1523,7 @@ _08033346: ldrsh r1, [r0, r7] ldr r0, [r4] adds r1, r0 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] strb r0, [r1, 0x3] ldrb r1, [r3] @@ -1561,7 +1561,7 @@ _08033346: ldrsh r1, [r0, r7] ldr r0, [r4] adds r1, r0 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r0, [r0] strb r0, [r1, 0x6] ldrb r1, [r3] @@ -1617,7 +1617,7 @@ _08033434: pop {r0} bx r0 .pool - thumb_func_end dp01_prepare_buffer_wireless_probably + thumb_func_end PrepareBufferDataTransferLink thumb_func_start task00_wireless_something task00_wireless_something: @ 8033474 @@ -2040,7 +2040,7 @@ _080337CC: beq _08033874 b _0803388A _080337D2: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable lsls r0, r4, 2 adds r0, r1 @@ -2050,7 +2050,7 @@ _080337D2: cmp r1, 0 bne _0803389C lsls r0, r4, 9 - ldr r1, =gUnknown_02023064 + ldr r1, =gBattleBufferA adds r0, r1 adds r1, r3, 0 adds r1, 0x8 @@ -2064,7 +2064,7 @@ _080337D2: ands r0, r1 cmp r0, 0 bne _0803388A - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker movs r4, 0x26 ldrsh r0, [r5, r4] mov r3, r8 @@ -2072,13 +2072,13 @@ _080337D2: adds r0, r1 ldrb r0, [r0, 0x2] strb r0, [r2] - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget movs r4, 0x26 ldrsh r0, [r5, r4] adds r0, r1 ldrb r0, [r0, 0x3] strb r0, [r2] - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags movs r3, 0x26 ldrsh r0, [r5, r3] adds r0, r1 @@ -2094,7 +2094,7 @@ _080337D2: .pool _0803385C: lsls r0, r4, 9 - ldr r1, =gUnknown_02023864 + ldr r1, =gBattleBufferB adds r0, r1 adds r1, r3, 0 adds r1, 0x8 @@ -2104,7 +2104,7 @@ _0803385C: .pool _08033874: ldrb r2, [r3, 0x8] - ldr r3, =gUnknown_02024068 + ldr r3, =gBattleExecBuffer ldr r1, =gBitTable lsls r0, r4, 2 adds r0, r1 @@ -2518,7 +2518,7 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -2528,7 +2528,7 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08033BAC @@ -2585,7 +2585,7 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 ldr r2, =gUnknown_02022D10 movs r0, 0x10 strb r0, [r2] - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] strb r0, [r2, 0x1] strb r1, [r2, 0x2] @@ -2593,7 +2593,7 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 strb r1, [r2, 0x3] adds r0, r2, 0x4 mov r12, r0 - ldr r4, =gUnknown_020241EA + ldr r4, =gCurrentMove ldrh r0, [r4] strh r0, [r2, 0x4] ldr r0, =gUnknown_020241EC @@ -2603,13 +2603,13 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 ldr r0, =gUnknown_02024208 ldrh r0, [r0] strh r0, [r1, 0x4] - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility ldrb r0, [r0] strb r0, [r1, 0x6] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0x17] strb r0, [r1, 0x7] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r1, r0, 0 adds r1, 0x52 @@ -2652,12 +2652,12 @@ _08033C6A: adds r5, 0x10 mov r4, r12 adds r4, 0x20 - ldr r6, =gUnknown_02022F68 + ldr r6, =gBattleTextBuff2 mov r2, r12 adds r2, 0x30 _08033C88: adds r1, r5, r3 - ldr r7, =gUnknown_02022F58 + ldr r7, =gBattleTextBuff1 adds r0, r3, r7 ldrb r0, [r0] strb r0, [r1] @@ -2708,7 +2708,7 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC strb r1, [r2, 0x3] adds r0, r2, 0x4 mov r12, r0 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] strh r0, [r2, 0x4] ldr r0, =gUnknown_020241EC @@ -2718,13 +2718,13 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC ldr r0, =gUnknown_02024208 ldrh r0, [r0] strh r0, [r1, 0x4] - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility ldrb r0, [r0] strb r0, [r1, 0x6] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0x17] strb r0, [r1, 0x7] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x52 ldrb r0, [r0] @@ -2751,12 +2751,12 @@ _08033D5E: adds r5, 0x10 mov r4, r12 adds r4, 0x20 - ldr r6, =gUnknown_02022F68 + ldr r6, =gBattleTextBuff2 mov r2, r12 adds r2, 0x30 _08033D7C: adds r1, r5, r3 - ldr r7, =gUnknown_02022F58 + ldr r7, =gBattleTextBuff1 adds r0, r3, r7 ldrb r0, [r0] strb r0, [r1] diff --git a/asm/rom4.s b/asm/rom4.s index bd848781a..16ebcc335 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -3171,7 +3171,7 @@ CB2_NewGame: @ 8085EF8 bl ResetSafariZoneFlag_ bl NewGameInitData bl player_avatar_init_params_reset - bl set_max_playtime_if_appropriate + bl PlayTimeCounter_Start bl script_env_1_init bl script_env_2_disable ldr r1, =gUnknown_03005DAC @@ -3545,7 +3545,7 @@ _080862B0: _080862BA: bl sub_8087D74 _080862BE: - bl set_max_playtime_if_appropriate + bl PlayTimeCounter_Start bl script_env_1_init bl script_env_2_disable bl sub_8195E10 @@ -6157,7 +6157,7 @@ sub_808780C: @ 808780C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles _08087838: @@ -6713,7 +6713,7 @@ _08087C56: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r3, r0, 0 adds r3, 0x3E diff --git a/asm/rom5.s b/asm/rom5.s index 5f2cb20e9..ac205f38d 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -25,7 +25,7 @@ sub_80A92F8: @ 80A92F8 movs r0, 0x4C movs r1, 0 bl SetGpuReg - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r2, r0, 0 adds r2, 0x21 movs r1, 0 @@ -43,7 +43,7 @@ sub_80A92F8: @ 80A92F8 c2_80777E8: @ 80A933C push {r4-r7,lr} sub sp, 0x8 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x13 @@ -144,7 +144,7 @@ _080A9460: bl sub_805E350 b _080A95D2 _080A9466: - ldr r5, =gUnknown_02024474 + ldr r5, =gBattleScripting adds r4, r5, 0 adds r4, 0x22 ldrb r0, [r4] @@ -180,7 +180,7 @@ _080A949C: beq _080A94A8 b _080A95D2 _080A94A8: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting _080A94AA: adds r1, 0x21 ldrb r0, [r1] @@ -223,11 +223,11 @@ _080A94F0: _080A94F8: bl sub_805EC84 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r7, =gUnknown_0202406E + ldr r7, =gBattlePartyID lsls r0, r4, 1 adds r0, r7 ldrh r0, [r0] @@ -247,7 +247,7 @@ _080A94F8: cmp r0, 0 beq _080A955C movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -305,7 +305,7 @@ _080A95A4: bl SetMainCallback2 bl sub_805EF14 _080A95D2: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting adds r1, 0x21 ldrb r0, [r1] adds r0, 0x1 @@ -339,12 +339,12 @@ sub_80A9614: @ 80A9614 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bcs _080A96FC adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A9676 @@ -358,7 +358,7 @@ sub_80A9614: @ 80A9614 ands r0, r1 cmp r0, 0 bne _080A966C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -414,7 +414,7 @@ _080A96B2: ands r0, r1 cmp r0, 0 bne _080A96EC - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -431,7 +431,7 @@ _080A96EC: movs r1, 0 bl sub_805E7DC _080A96F4: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x22 movs r1, 0 strb r1, [r0] @@ -453,7 +453,7 @@ sub_80A9708: @ 80A9708 sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r7, r0 bcc _080A9722 @@ -482,13 +482,13 @@ _080A974E: lsrs r0, 24 mov r8, r0 adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A9762 b _080A986C _080A9762: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r6, r0, r1 ldrh r0, [r6] @@ -517,7 +517,7 @@ _080A9786: lsls r4, 16 lsrs r4, 16 adds r0, r7, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -539,10 +539,10 @@ _080A9786: adds r1, r4, 0 mov r2, r8 bl AddObjectToFront - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds adds r4, r7, r1 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -611,7 +611,7 @@ _080A986C: ldr r0, [r5] ldrb r4, [r0, 0x8] movs r0, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -649,7 +649,7 @@ _080A98D0: cmp r7, 0 bne _080A9968 movs r0, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -675,9 +675,9 @@ _080A9914: movs r1, 0x50 adds r2, r4, 0 bl AddObjectToFront - ldr r3, =gUnknown_020241E4 + ldr r3, =gBankSpriteIds strb r0, [r3] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r0, [r3] lsls r1, r0, 4 adds r1, r0 @@ -705,7 +705,7 @@ _080A9914: b _080A9A70 .pool _080A9968: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r6, r0, r1 ldrh r0, [r6] @@ -734,7 +734,7 @@ _080A998C: lsls r4, 16 lsrs r4, 16 adds r0, r7, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -756,10 +756,10 @@ _080A998C: adds r1, r4, 0 mov r2, r8 bl AddObjectToFront - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds adds r4, r7, r1 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -831,8 +831,8 @@ _080A9A50: ldr r0, [r0] str r0, [r1] _080A9A70: - ldr r1, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r1, =gSprites + ldr r0, =gBankSpriteIds adds r0, r7, r0 ldrb r0, [r0] lsls r2, r0, 4 @@ -872,7 +872,7 @@ sub_80A9ADC: @ 80A9ADC push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 bcc _080A9AEC @@ -913,12 +913,12 @@ _080A9B24: adds r0, r6, 0 bl sub_80729D0 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A9B6C ldrb r0, [r4] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] @@ -938,7 +938,7 @@ _080A9B6C: cmp r0, 0 beq _080A9BA0 ldrb r0, [r4] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] @@ -952,7 +952,7 @@ _080A9B6C: .pool _080A9BA0: ldrb r0, [r4] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] @@ -964,13 +964,13 @@ _080A9BA0: bl healthbar_draw_field_maybe _080A9BB8: adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _080A9BD4 adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -991,11 +991,11 @@ _080A9BF0: bl nullsub_30 _080A9BFC: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A9C34 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 @@ -1017,7 +1017,7 @@ _080A9C34: ands r0, r1 cmp r0, 0 bne _080A9C5E - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 @@ -1048,7 +1048,7 @@ sub_80A9C70: @ 80A9C70 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r6, [r0] ldr r0, =sub_80A9DB4 @@ -1074,7 +1074,7 @@ sub_80A9C70: @ 80A9C70 strh r0, [r1, 0xA] movs r5, 0 lsls r0, r6, 4 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites adds r0, r6 lsls r0, 2 adds r6, r0, r7 @@ -1126,7 +1126,7 @@ _080A9D30: strh r0, [r1, 0xA] movs r5, 0 lsls r0, r6, 4 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites adds r0, r6 lsls r0, 2 adds r6, r0, r7 @@ -1171,7 +1171,7 @@ _080A9D86: cmp r5, 0x9 bls _080A9D42 _080A9D90: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1411,7 +1411,7 @@ _080A9F32: ldr r1, =0xffff0000 cmp r0, r1 bne _080A9F7C - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1425,7 +1425,7 @@ _080A9F7C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldr r1, =gUnknown_0853EF40 bl SetSpriteOamTables_NoPriorityFromTable @@ -1629,7 +1629,7 @@ sub_80AA124: @ 80AA124 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r4, 0 bl obj_free_rotscale_entry diff --git a/asm/rom6.s b/asm/rom6.s index 776979615..77248757f 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -208,7 +208,7 @@ _081355B8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrb r1, [r6, 0x8] bl StartObjectImageAnim @@ -1250,7 +1250,7 @@ sub_8135F70: @ 8135F70 beq _08135F9C movs r0, 0x5 bl audio_play - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB50 ldr r0, [r0] ldr r1, =0x00000e74 @@ -2783,7 +2783,7 @@ sub_8136C8C: @ 8136C8C adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldr r3, =gUnknown_085B262C ldr r2, [r5] ldrh r1, [r7] @@ -4119,7 +4119,7 @@ _081377BC: adds r0, r4, 0 movs r1, 0x43 add r2, sp, 0x18 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 bl sub_80EE5A4 strb r0, [r5, 0x1] @@ -5682,7 +5682,7 @@ _08138454: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 lsls r3, r5, 4 ldrb r2, [r1, 0x5] @@ -6464,7 +6464,7 @@ _08138B74: thumb_func_start sub_8138B80 sub_8138B80: @ 8138B80 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] bx lr .pool @@ -7517,7 +7517,7 @@ sub_8139370: @ 8139370 adds r0, r4, 0 movs r1, 0x47 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 bl sub_80EE5A4 lsls r0, 24 @@ -7637,28 +7637,28 @@ sub_813946C: @ 813946C adds r0, r5, 0 movs r1, 0x2E add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData add r1, sp, 0x10 movs r0, 0x21 strh r0, [r1] adds r0, r5, 0 movs r1, 0xD add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData add r0, sp, 0x10 strh r4, [r0] adds r0, r5, 0 movs r1, 0xE add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 movs r1, 0xF add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 movs r1, 0x10 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData add sp, 0x14 pop {r4,r5} pop {r0} @@ -10468,7 +10468,7 @@ sub_813ABD4: @ 813ABD4 lsrs r0, 24 cmp r0, 0x40 beq _0813AC32 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -10517,7 +10517,7 @@ sub_813AC44: @ 813AC44 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeResources _0813AC6A: @@ -12714,7 +12714,7 @@ sub_813BF10: @ 813BF10 cmp r0, 0x2 bne _0813BF40 bl sub_813BA30 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0x1 bne _0813BF3C diff --git a/asm/rom_8034C54.s b/asm/rom_8034C54.s index 25eea3ffc..1eae642d5 100644 --- a/asm/rom_8034C54.s +++ b/asm/rom_8034C54.s @@ -1283,7 +1283,7 @@ sub_8035608: @ 8035608 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1325,7 +1325,7 @@ trs_config: @ 8035658 ands r1, r0 cmp r1, 0 beq _080356A4 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x24 movs r1, 0x1 strb r1, [r0] @@ -1339,12 +1339,12 @@ trs_config: @ 8035658 b _080356AA .pool _080356A4: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x24 strb r1, [r0] _080356AA: ldr r1, =gUnknown_0831ABA0 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x24 ldrb r0, [r0] lsls r0, 2 @@ -1817,7 +1817,7 @@ _08035B92: b _08035C36 .pool _08035BCC: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r0, [r0] cmp r5, r0 @@ -1882,7 +1882,7 @@ _08035C36: thumb_func_start sub_8035C4C sub_8035C4C: @ 8035C4C push {lr} - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r2, [r0] cmp r2, 0x3 bne _08035C68 @@ -1901,7 +1901,7 @@ _08035C68: cmp r2, 0x1 bne _08035CAE ldr r2, =gUnknown_020229E8 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -1925,7 +1925,7 @@ _08035CA4: b _08035CFC _08035CAE: ldr r2, =gUnknown_020229E8 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -1951,7 +1951,7 @@ _08035CE2: cmp r2, 0x1 bne _08035D20 ldr r2, =gUnknown_020229E8 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -1972,7 +1972,7 @@ _08035CFC: .pool _08035D20: ldr r2, =gUnknown_020229E8 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -2114,7 +2114,7 @@ _08035E3A: bge _08035DBC b _08035EA6 _08035E44: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r5, [r0] movs r0, 0x1 @@ -2190,7 +2190,7 @@ _08035EC4: movs r2, 0x50 movs r3, 0 bl AddObjectToFront - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r1, [r4] adds r1, 0x7D strb r0, [r1] @@ -2202,7 +2202,7 @@ _08035EC4: ldr r1, [r4] adds r1, 0x7E strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r4] adds r0, 0x7D ldrb r1, [r0] @@ -2359,8 +2359,8 @@ _0803607C: bl audio_play adds r0, r7, 0 bl DestroyTask - ldr r4, =gUnknown_02020630 - ldr r5, =gUnknown_0202449C + ldr r4, =gSprites + ldr r5, =gBattleStruct ldr r0, [r5] adds r0, 0x7D ldrb r0, [r0] @@ -3099,7 +3099,7 @@ _080367B4: ldr r0, =intro_end bl SetMainCallback2 _080367BA: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1] b _080367D0 @@ -3336,7 +3336,7 @@ _08036A10: cmp r4, r5 ble _08036A10 movs r1, 0 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r1, [r0] add sp, 0x4 pop {r4,r5} @@ -3429,7 +3429,7 @@ _08036AEE: mov r2, r9 cmp r2, 0x5 ble _08036A72 - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r0, [r4] movs r1, 0xC1 lsls r1, 1 @@ -3461,7 +3461,7 @@ _08036AEE: thumb_func_start sub_8036B44 sub_8036B44: @ 8036B44 push {r4-r7,lr} - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r5, [r0] movs r0, 0xC2 lsls r0, 1 @@ -3573,7 +3573,7 @@ _08036C20: cmp r0, 0x1 bne _08036CDC movs r5, 0 - ldr r3, =gUnknown_02024404 + ldr r3, =gEnigmaBerries ldr r0, =gSaveBlock1Ptr mov r8, r0 adds r6, r3, 0 @@ -3659,7 +3659,7 @@ _08036CDC: bl GetBerryInfo adds r6, r0, 0 movs r5, 0 - ldr r4, =gUnknown_02024404 + ldr r4, =gEnigmaBerries adds r7, r4, 0 adds r7, 0x38 adds r3, r4, 0 @@ -3729,7 +3729,7 @@ _08036D66: _08036D6E: ldr r0, =gUnknown_020229E8 mov r12, r0 - ldr r3, =gUnknown_02024404 + ldr r3, =gEnigmaBerries adds r6, r3, 0 movs r1, 0x8 adds r1, r6 @@ -3792,7 +3792,7 @@ _08036DC0: .pool _08036DF0: movs r5, 0 - ldr r4, =gUnknown_02024404 + ldr r4, =gEnigmaBerries mov r9, r4 _08036DF6: lsls r0, r5, 8 @@ -3845,7 +3845,7 @@ _08036E1C: orrs r0, r4 strb r0, [r1] movs r4, 0 - ldr r0, =gUnknown_02024404 + ldr r0, =gEnigmaBerries adds r0, 0x8 adds r2, r0 adds r3, r0 @@ -4034,13 +4034,13 @@ sub_8036FAC: @ 8036FAC bl link_get_multiplayer_id lsls r0, 24 lsrs r6, r0, 24 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 strb r6, [r0] movs r0, 0x1 adds r5, r6, 0 eors r5, r0 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0] cmp r0, 0x12 bls _08036FD8 @@ -4087,7 +4087,7 @@ _0803703C: movs r0, 0x3 bl ShowBg bl sub_805EF14 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1] _08037068: @@ -4118,7 +4118,7 @@ _08037098: lsls r0, 24 cmp r0, 0 beq _080370EE - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r0, [r4] movs r5, 0xC0 lsls r5, 1 @@ -4151,7 +4151,7 @@ _080370D8: adds r1, r5 movs r2, 0x20 bl link_0800A448 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r6, [r0] _080370EE: ldr r0, =gLinkVSyncDisabled @@ -4175,7 +4175,7 @@ _08037124: orrs r1, r0 str r1, [r2] _08037134: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0xF strb r0, [r1] bl berry_801017C @@ -4211,7 +4211,7 @@ _08037152: movs r0, 0x5A strh r0, [r2, 0xC] strh r1, [r2, 0x12] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r3, [r0] movs r4, 0xC1 lsls r4, 1 @@ -4236,7 +4236,7 @@ _08037152: ldrh r0, [r4] bl sub_8185F90 bl sub_8068AA4 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication b _08037446 .pool _080371D8: @@ -4252,7 +4252,7 @@ _080371E4: ldr r1, =gPlayerParty movs r2, 0xC8 bl link_0800A448 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication b _08037446 .pool _08037200: @@ -4270,7 +4270,7 @@ _0803720E: adds r1, r2 movs r2, 0xC8 bl memcpy - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication b _08037446 .pool _08037230: @@ -4286,7 +4286,7 @@ _0803723C: ldr r1, =gUnknown_020245B4 movs r2, 0xC8 bl link_0800A448 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication b _08037446 .pool _08037258: @@ -4304,7 +4304,7 @@ _08037266: adds r1, r2 movs r2, 0xC8 bl memcpy - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication b _08037446 .pool _08037288: @@ -4320,7 +4320,7 @@ _08037294: ldr r1, =gUnknown_0202467C movs r2, 0xC8 bl link_0800A448 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication b _08037446 .pool _080372B0: @@ -4356,13 +4356,13 @@ _080372BE: adds r0, r4, 0 adds r0, 0x64 bl shedinja_something - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication b _08037446 .pool _08037318: bl sub_8032768 bl sub_8184E58 - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication movs r0, 0 strb r0, [r2, 0x1] strb r0, [r2, 0x2] @@ -4416,7 +4416,7 @@ _08037378: ldr r1, =gUnknown_0203BD2C movs r2, 0x4 bl link_0800A448 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication b _08037446 .pool _080373A0: @@ -4439,7 +4439,7 @@ _080373A0: movs r2, 0x4 bl memcpy _080373CA: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication b _08037446 .pool _080373E0: @@ -4469,14 +4469,14 @@ _080373E0: b _0803744C .pool _0803742C: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] movs r1, 0x1 strb r1, [r0, 0x1] _08037438: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1, 0x1] subs r0, 0x1 strb r0, [r1, 0x1] @@ -4504,13 +4504,13 @@ sub_8037458: @ 8037458 bl link_get_multiplayer_id lsls r0, 24 lsrs r6, r0, 24 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 strb r6, [r0] movs r0, 0x1 adds r7, r6, 0 eors r7, r0 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0] cmp r0, 0x10 bls _08037486 @@ -4555,7 +4555,7 @@ _080374E0: movs r0, 0x3 bl ShowBg bl sub_805EF14 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1] _0803750C: @@ -4619,7 +4619,7 @@ _08037530: lsls r0, 24 cmp r0, 0 beq _080375C4 - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r0, [r4] movs r5, 0xC0 lsls r5, 1 @@ -4640,7 +4640,7 @@ _08037530: adds r1, r5 movs r2, 0x20 bl link_0800A448 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1] _080375C4: @@ -4665,7 +4665,7 @@ _080375FC: orrs r1, r0 str r1, [r2] _0803760C: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0xD strb r0, [r1] bl berry_801017C @@ -4983,7 +4983,7 @@ _0803788A: _08037908: bl sub_8032768 bl sub_8184E58 - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication movs r0, 0 strb r0, [r2, 0x1] strb r0, [r2, 0x2] @@ -5035,7 +5035,7 @@ _0803795C: _08037982: bl memcpy _08037986: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -5200,12 +5200,12 @@ _08037B02: bl link_get_multiplayer_id lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 movs r2, 0 mov r8, r2 strb r7, [r0] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r1, r0, 0 adds r1, 0xB4 @@ -5215,7 +5215,7 @@ _08037B02: bl RunTasks bl CallObjectCallbacks bl PrepareSpritesForOamLoad - ldr r5, =gUnknown_02024332 + ldr r5, =gBattleCommunication ldrb r0, [r5] cmp r0, 0x1 beq _08037BA4 @@ -5334,7 +5334,7 @@ _08037C1E: cmp r5, r9 blt _08037BC6 _08037C2E: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -5435,7 +5435,7 @@ intro_end: @ 8037D2C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] movs r1, 0xB4 adds r1, r0 @@ -5445,7 +5445,7 @@ intro_end: @ 8037D2C bl RunTasks bl CallObjectCallbacks bl PrepareSpritesForOamLoad - ldr r5, =gUnknown_02024332 + ldr r5, =gBattleCommunication ldrb r0, [r5] cmp r0, 0 beq _08037D64 @@ -5517,13 +5517,13 @@ sub_8037DF4: @ 8037DF4 bl link_get_multiplayer_id lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 strb r7, [r0] bl RunTasks bl CallObjectCallbacks bl PrepareSpritesForOamLoad - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0] cmp r0, 0xA bls _08037E20 @@ -5562,7 +5562,7 @@ _08037E64: movs r0, 0x3 bl ShowBg bl sub_805EF14 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1] _08037E90: @@ -5592,7 +5592,7 @@ _08037EBE: lsls r0, 24 cmp r0, 0 beq _08037F02 - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r0, [r4] movs r5, 0xC0 lsls r5, 1 @@ -5613,7 +5613,7 @@ _08037EBE: adds r1, r5 movs r2, 0x20 bl link_0800A448 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -5639,7 +5639,7 @@ _08037F30: orrs r1, r0 str r1, [r2] _08037F40: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x7 strb r0, [r1] bl berry_801017C @@ -5743,7 +5743,7 @@ _0803800C: cmp r6, 0 bge _08037FA4 bl zero_enemy_party_data - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -6070,7 +6070,7 @@ _08038242: _080382CC: bl sub_8032768 bl sub_8184E58 - ldr r3, =gUnknown_02024332 + ldr r3, =gBattleCommunication movs r0, 0 strb r0, [r3, 0x1] strb r0, [r3, 0x2] @@ -6118,7 +6118,7 @@ _0803832C: lsls r0, 24 cmp r0, 0 beq _080383F8 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r4, [r0] movs r0, 0xC0 lsls r0, 1 @@ -6167,7 +6167,7 @@ _08038386: movs r2, 0x4 bl memcpy _080383A6: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -6239,7 +6239,7 @@ sub_8038420: @ 8038420 cmp r0, 0 beq _08038482 ldr r2, =gUnknown_020375F0 - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0x5 strb r0, [r1] movs r0, 0x5 @@ -6712,7 +6712,7 @@ _08038820: adds r1, 0xD adds r0, r5, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData adds r1, r6, 0 adds r1, 0x11 ldrh r0, [r4] @@ -6722,7 +6722,7 @@ _08038820: ldr r0, =gBattleMoves + 0x4 @ PP offset adds r2, r0 adds r0, r5, 0 - bl pokemon_setattr + bl SetMonData adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 @@ -6799,7 +6799,7 @@ _08038896: adds r0, r4, 0 movs r1, 0xC adds r2, r5, 0 - bl pokemon_setattr + bl SetMonData b _080389AC .pool _080388E8: @@ -6873,7 +6873,7 @@ _0803892A: adds r0, r4, 0 movs r1, 0xC adds r2, r5, 0 - bl pokemon_setattr + bl SetMonData movs r6, 0 adds r5, r4, 0 mov r0, r8 @@ -6884,7 +6884,7 @@ _08038982: adds r1, 0xD adds r0, r5, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData adds r1, r6, 0 adds r1, 0x11 ldrh r0, [r4] @@ -6894,7 +6894,7 @@ _08038982: ldr r0, =gBattleMoves + 0x4 @ PP offset adds r2, r0 adds r0, r5, 0 - bl pokemon_setattr + bl SetMonData adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 @@ -7124,7 +7124,7 @@ sub_8038B94: @ 8038B94 str r0, [sp, 0x4] movs r1, 0 str r1, [sp, 0x8] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r2, [r0] ldr r0, =gBattleTypeFlags @@ -7477,7 +7477,7 @@ _08038E1A: bl sub_8038B94 ldr r0, =sub_8038F14 bl SetMainCallback2 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0] _08038EB6: add sp, 0x4 @@ -7504,7 +7504,7 @@ sub_8038F14: @ 8038F14 sub_8038F34: @ 8038F34 push {r4-r6,lr} sub sp, 0x8 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x9 @@ -7536,7 +7536,7 @@ _08038F80: bl ShowBg movs r0, 0x2 bl ShowBg - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0xFF strb r0, [r1, 0x1] b _08039174 @@ -7740,7 +7740,7 @@ _08039166: bne _08039172 bl sub_800AC34 _08039172: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication _08039174: ldrb r0, [r1] adds r0, 0x1 @@ -7941,7 +7941,7 @@ _080392FE: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0] add sp, 0x8 pop {r4} @@ -7967,7 +7967,7 @@ sub_803937C: @ 803937C sub_803939C: @ 803939C push {r4,r5,lr} sub sp, 0x4 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0xC @@ -8002,7 +8002,7 @@ _080393F4: bl ShowBg movs r0, 0x2 bl ShowBg - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 b _0803975C @@ -8024,7 +8024,7 @@ _08039414: movs r1, 0x5 bl CreateTask _08039434: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 b _0803975C @@ -8037,7 +8037,7 @@ _08039450: beq _0803945E b _0803975E _0803945E: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 b _0803975C @@ -8054,7 +8054,7 @@ _0803947E: ldr r0, =gUnknown_085CD28F movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 b _0803975C @@ -8077,7 +8077,7 @@ _080394AC: ldr r0, =gUnknown_085CCABB movs r1, 0xC bl battle_show_message_maybe - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication movs r0, 0x1 strb r0, [r4, 0x1] bl sub_8056B74 @@ -8129,7 +8129,7 @@ _08039526: beq _08039560 movs r0, 0x5 bl audio_play - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _08039540 @@ -8156,7 +8156,7 @@ _08039560: _0803956A: movs r0, 0x5 bl audio_play - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 b _0803975C @@ -8188,7 +8188,7 @@ _0803958A: movs r1, 0 bl battle_show_message_maybe _080395B4: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 b _0803975C @@ -8216,7 +8216,7 @@ _080395DA: bne _080395F6 bl sub_800AC34 _080395F6: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 b _0803975C @@ -8294,7 +8294,7 @@ _080396A8: lsls r0, 16 cmp r0, 0 bne _0803975E - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] subs r0, 0x1 strb r0, [r4, 0x1] @@ -8355,7 +8355,7 @@ _0803974A: movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x20 strb r0, [r1, 0x1] movs r0, 0x8 @@ -8401,7 +8401,7 @@ shedinja_something: @ 803976C adds r0, r4, 0 movs r1, 0x3 adds r2, r5, 0 - bl pokemon_setattr + bl SetMonData _080397B4: add sp, 0x10 pop {r4,r5} @@ -8626,7 +8626,7 @@ _0803995C: mov r0, r9 ldrh r4, [r0, 0x32] _08039960: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r6, 1 adds r5, r0, r1 ldrh r0, [r5] @@ -8763,7 +8763,7 @@ _08039A7C: ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r0, 24 - bl battle_get_per_side_status + bl GetBankIdentity ldr r1, =gUnknown_020244D4 ldr r1, [r1] lsls r0, 24 @@ -8887,7 +8887,7 @@ sub_8039B58: @ 8039B58 ands r0, r1 cmp r0, 0 beq _08039BA0 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -9062,7 +9062,7 @@ _08039C76: movs r2, 0x2 orrs r0, r2 strb r0, [r1] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -9071,7 +9071,7 @@ _08039C76: b _08039CFE .pool _08039CD0: - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r7, [r0] ldr r2, =gUnknown_020244D0 @@ -9088,7 +9088,7 @@ _08039CD0: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -9150,7 +9150,7 @@ dp11b_obj_free: @ 8039D48 ands r0, r1 cmp r0, 0 beq _08039DEA - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r3, 0x2] lsls r0, r1, 4 adds r0, r1 @@ -9181,7 +9181,7 @@ _08039D9C: ands r0, r1 cmp r0, 0 beq _08039DEA - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r3, 0x3] lsls r0, r1, 4 adds r0, r1 @@ -9200,7 +9200,7 @@ _08039D9C: _08039DD6: ands r0, r2 strb r0, [r1] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -9236,7 +9236,7 @@ _08039E14: movs r2, 0x32 ldrsh r1, [r4, r2] bl Sin - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -9343,7 +9343,7 @@ nullsub_20: @ 8039EC8 sub_8039ECC: @ 8039ECC push {lr} bl sub_8039F40 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x1] ldr r1, =gUnknown_03005D04 @@ -9360,14 +9360,14 @@ sub_8039EF0: @ 8039EF0 ldr r0, =gUnknown_03005D04 ldr r0, [r0] bl _call_via_r0 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r0, 0 beq _08039F2A - ldr r5, =gUnknown_03005D60 + ldr r5, =gBattleBankFunc adds r4, r1, 0 _08039F0C: ldrb r0, [r4] @@ -9378,7 +9378,7 @@ _08039F0C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -9411,12 +9411,12 @@ sub_8039F40: @ 8039F40 mov r8, r0 ldr r1, =gUnknown_02024248 mov r12, r1 - ldr r5, =gUnknown_020242BC + ldr r5, =gDisableStructs movs r4, 0 ldr r7, =gUnknown_02024240 ldr r6, =gUnknown_02024268 _08039F70: - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 adds r0, r4, r0 str r3, [r0] movs r1, 0 @@ -9445,7 +9445,7 @@ _08039F78: strb r0, [r1] strh r3, [r6] strh r3, [r7] - ldr r1, =gUnknown_020244A8 + ldr r1, =gBattleResources ldr r0, [r1] ldr r0, [r0, 0x4] adds r0, r4 @@ -9466,7 +9466,7 @@ _08039F78: cmp r2, 0x3 ble _08039F70 movs r5, 0 - ldr r3, =gUnknown_02024294 + ldr r3, =gSideTimers ldr r4, =gUnknown_0202428E movs r2, 0x1 _08039FD8: @@ -9484,9 +9484,9 @@ _08039FDC: cmp r2, 0 bge _08039FD8 movs r1, 0 - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker strb r1, [r2] - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget strb r1, [r0] ldr r2, =gBattleWeather strh r1, [r2] @@ -9499,7 +9499,7 @@ _0803A004: adds r2, 0x1 cmp r2, 0x2B bls _0803A004 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker movs r0, 0 str r0, [r2] ldr r0, =gBattleTypeFlags @@ -9532,15 +9532,15 @@ _0803A090: lsls r0, 24 cmp r0, 0 beq _0803A0AE - ldr r1, =gUnknown_02024280 + ldr r1, =gHitMarker ldr r0, [r1] movs r1, 0x80 orrs r0, r1 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker _0803A0AC: str r0, [r2] _0803A0AE: - ldr r3, =gUnknown_02024474 + ldr r3, =gBattleScripting ldr r0, =gSaveBlock2Ptr ldr r0, [r0] ldrb r0, [r0, 0x15] @@ -9550,14 +9550,14 @@ _0803A0AE: strb r0, [r3, 0x1D] ldr r0, =gUnknown_02024212 strb r1, [r0] - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome strb r1, [r0] - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer str r1, [r0] ldr r0, =gUnknown_0202432E movs r2, 0 strh r1, [r0] - ldr r1, =gUnknown_020244A8 + ldr r1, =gBattleResources ldr r0, [r1] ldr r0, [r0, 0x8] adds r0, 0x20 @@ -9571,11 +9571,11 @@ _0803A0AE: ldr r7, =gUnknown_020243FC ldr r0, =gUnknown_03005D54 mov r8, r0 - ldr r1, =gUnknown_02024210 + ldr r1, =gAbsentBankFlags mov r9, r1 ldr r2, =gEnemyParty mov r10, r2 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r2, 0 adds r0, r1, 0x7 _0803A0FA: @@ -9594,7 +9594,7 @@ _0803A0FA: strb r4, [r0] mov r1, r9 strb r4, [r1] - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r0, [r5] adds r0, 0x6C strb r4, [r0] @@ -9670,7 +9670,7 @@ _0803A16A: cmp r2, 0x7 ble _0803A16A movs r2, 0 - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct movs r3, 0xA5 lsls r3, 2 movs r1, 0x6 @@ -9713,7 +9713,7 @@ _0803A1E4: ands r0, r2 orrs r0, r1 strb r0, [r3, 0x5] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] movs r1, 0xA8 lsls r1, 2 @@ -9742,8 +9742,8 @@ sub_803A284: @ 803A284 mov r5, r8 push {r5-r7} sub sp, 0x20 - ldr r4, =gUnknown_020242BC - ldr r5, =gUnknown_02024064 + ldr r4, =gDisableStructs + ldr r5, =gActiveBank ldrb r1, [r5] lsls r0, r1, 3 subs r0, r1 @@ -9757,7 +9757,7 @@ sub_803A284: @ 803A284 ldr r0, [r0] str r0, [r1] ldr r2, =gBattleMoves - ldr r3, =gUnknown_020241EA + ldr r3, =gCurrentMove ldrh r1, [r3] lsls r0, r1, 1 adds r0, r1 @@ -9766,7 +9766,7 @@ sub_803A284: @ 803A284 ldrb r0, [r0] mov r12, r4 mov r9, r5 - ldr r6, =gUnknown_020242AC + ldr r6, =gStatuses3 mov r10, r6 cmp r0, 0x7F beq _0803A35C @@ -9786,14 +9786,14 @@ _0803A2D4: cmp r5, 0x7 ble _0803A2D4 movs r5, 0 - ldr r7, =gUnknown_0202406C + ldr r7, =gNoOfAllBanks ldrb r7, [r7] cmp r5, r7 bge _0803A348 ldr r0, =gUnknown_020240D4 mov r8, r0 - ldr r4, =gUnknown_020242BC - ldr r3, =gUnknown_020242AC + ldr r4, =gDisableStructs + ldr r3, =gStatuses3 _0803A2F6: movs r0, 0x58 muls r0, r5 @@ -9806,7 +9806,7 @@ _0803A2F6: cmp r0, 0 beq _0803A31A ldrb r0, [r4, 0x14] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r6, [r6] cmp r0, r6 bne _0803A31A @@ -9820,7 +9820,7 @@ _0803A31A: cmp r0, 0 beq _0803A33A ldrb r0, [r4, 0x15] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r7, [r7] cmp r0, r7 bne _0803A33A @@ -9834,12 +9834,12 @@ _0803A33A: adds r4, 0x1C adds r3, 0x4 adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _0803A2F6 _0803A348: - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r0, [r1] lsls r1, r0, 1 adds r1, r0 @@ -9870,7 +9870,7 @@ _0803A35C: ands r0, r2 str r0, [r1] movs r5, 0 - ldr r6, =gUnknown_0202406C + ldr r6, =gNoOfAllBanks ldrb r6, [r6] cmp r5, r6 bge _0803A430 @@ -9878,16 +9878,16 @@ _0803A35C: movs r6, 0 _0803A390: ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 lsls r0, r5, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 beq _0803A3D0 - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 lsls r0, r5, 2 adds r2, r0, r1 ldr r1, [r2] @@ -9895,7 +9895,7 @@ _0803A390: ands r0, r1 cmp r0, 0 beq _0803A3D0 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs adds r0, r6, r0 ldrb r0, [r0, 0x15] ldrb r3, [r7] @@ -9910,13 +9910,13 @@ _0803A390: _0803A3D0: adds r6, 0x1C adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _0803A390 - ldr r6, =gUnknown_020242BC + ldr r6, =gDisableStructs mov r12, r6 - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank mov r9, r7 b _0803A430 .pool @@ -9937,17 +9937,17 @@ _0803A414: str r1, [r0] _0803A430: movs r5, 0 - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct mov r8, r3 ldr r6, =gUnknown_020244AC mov r10, r6 - ldr r7, =gUnknown_0202406C + ldr r7, =gNoOfAllBanks ldrb r7, [r7] cmp r5, r7 bge _0803A490 ldr r3, =gUnknown_020240D4 ldr r7, =gBitTable - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank _0803A448: movs r0, 0x58 muls r0, r5 @@ -9983,7 +9983,7 @@ _0803A466: str r1, [r4] _0803A486: adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _0803A448 @@ -10012,7 +10012,7 @@ _0803A4B4: adds r5, 0x1 cmp r5, 0x1B bls _0803A4B4 - ldr r7, =gUnknown_020241EA + ldr r7, =gCurrentMove ldrh r0, [r7] lsls r1, r0, 1 adds r1, r0 @@ -10210,7 +10210,7 @@ _0803A540: bics r0, r2 strb r0, [r1] movs r5, 0 - ldr r7, =gUnknown_0202406C + ldr r7, =gNoOfAllBanks ldrb r7, [r7] cmp r5, r7 bge _0803A6B4 @@ -10224,11 +10224,11 @@ _0803A656: lsls r0, r5, 24 lsrs r0, 24 str r3, [sp, 0x1C] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r3, [sp, 0x1C] ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 ldr r3, [sp, 0x1C] @@ -10260,7 +10260,7 @@ _0803A68C: adds r0, 0xE1 strb r6, [r0] adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _0803A656 @@ -10282,7 +10282,7 @@ _0803A6B4: adds r0, r1 adds r0, 0xC9 strb r2, [r0] - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r1, [r0, 0x4] ldrb r0, [r3] @@ -10290,7 +10290,7 @@ _0803A6B4: adds r1, r0 movs r2, 0 str r2, [r1] - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove strh r2, [r0] ldr r0, [r6] adds r0, 0xDA @@ -10322,16 +10322,16 @@ sub_803A75C: @ 803A75C sub sp, 0x4 movs r5, 0 ldr r6, =gBattleMons - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 mov r8, r0 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct mov r12, r1 ldr r2, =gUnknown_020244AC mov r9, r2 ldr r3, =gUnknown_020244B0 mov r10, r3 - ldr r7, =gUnknown_0202433C - ldr r4, =gUnknown_02024064 + ldr r7, =gProtectStructs + ldr r4, =gActiveBank movs r3, 0x58 adds r2, r6, 0 adds r2, 0x18 @@ -10345,7 +10345,7 @@ _0803A788: adds r5, 0x1 cmp r5, 0x7 ble _0803A788 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -10354,13 +10354,13 @@ _0803A788: adds r0, r2 movs r1, 0 str r1, [r0] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 2 add r0, r8 str r1, [r0] movs r5, 0 - ldr r6, =gUnknown_0202406C + ldr r6, =gNoOfAllBanks ldrb r6, [r6] cmp r5, r6 bge _0803A830 @@ -10375,10 +10375,10 @@ _0803A7C6: ands r0, r1 cmp r0, 0 beq _0803A7E6 - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs adds r0, r4, r2 ldrb r0, [r0, 0x14] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r6, [r6] cmp r0, r6 bne _0803A7E6 @@ -10386,7 +10386,7 @@ _0803A7C6: ands r1, r0 str r1, [r3] _0803A7E6: - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r0, [r1] lsls r0, 2 add r0, r8 @@ -10410,7 +10410,7 @@ _0803A800: ldr r0, [r2] adds r0, r5, r0 ldrb r0, [r0, 0x14] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r6, [r6] cmp r0, r6 bne _0803A822 @@ -10421,17 +10421,17 @@ _0803A822: adds r3, 0x58 adds r4, 0x1C adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _0803A7C6 _0803A830: - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r0, [r1] add r0, r9 movs r1, 0 strb r1, [r0] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] add r0, r10 strb r1, [r0] @@ -10439,7 +10439,7 @@ _0803A830: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r3, =gUnknown_020242BC + ldr r3, =gDisableStructs adds r1, r0, r3 movs r5, 0 movs r2, 0 @@ -10449,7 +10449,7 @@ _0803A852: adds r5, 0x1 cmp r5, 0x1B bls _0803A852 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] lsls r1, 4 adds r1, r7 @@ -10478,7 +10478,7 @@ _0803A852: adds r0, r6, 0 ands r0, r2 strb r0, [r1] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] lsls r1, 4 adds r1, r7 @@ -10488,7 +10488,7 @@ _0803A852: mov r0, r10 ands r0, r2 strb r0, [r1] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] lsls r1, 4 adds r1, r7 @@ -10497,7 +10497,7 @@ _0803A852: negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r1, [r2] lsls r1, 4 adds r1, r7 @@ -10507,7 +10507,7 @@ _0803A852: adds r0, r5, 0 ands r0, r2 strb r0, [r1] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] lsls r1, 4 adds r1, r7 @@ -10525,7 +10525,7 @@ _0803A852: adds r0, r3, 0 ands r0, r2 strb r0, [r1] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] lsls r1, 4 adds r1, r7 @@ -10533,7 +10533,7 @@ _0803A852: mov r0, r9 ands r0, r2 strb r0, [r1, 0x1] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r1, [r2] lsls r1, 4 adds r1, r7 @@ -10541,7 +10541,7 @@ _0803A852: mov r0, r8 ands r0, r2 strb r0, [r1, 0x1] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] lsls r1, 4 adds r1, r7 @@ -10549,7 +10549,7 @@ _0803A852: adds r0, r6, 0 ands r0, r2 strb r0, [r1, 0x1] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r1, [r2] lsls r1, 4 adds r1, r7 @@ -10558,14 +10558,14 @@ _0803A852: negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r0, [r1] lsls r0, 4 adds r0, r7 ldrb r1, [r0, 0x1] ands r5, r1 strb r5, [r0, 0x1] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 4 adds r0, r7 @@ -10592,7 +10592,7 @@ _0803A852: mov r2, r8 ands r2, r1 strb r2, [r0, 0x2] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 4 adds r0, r7 @@ -10610,7 +10610,7 @@ _0803A852: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs adds r0, r1 movs r2, 0 movs r1, 0x2 @@ -10621,7 +10621,7 @@ _0803A852: adds r0, r3 movs r3, 0 strh r2, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] lsls r0, 1 ldr r1, =gUnknown_02024250 @@ -10632,7 +10632,7 @@ _0803A852: ldr r6, =gUnknown_02024258 adds r0, r6 strh r2, [r0] - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r0, [r1] lsls r0, 1 ldr r6, =gUnknown_02024260 @@ -10643,7 +10643,7 @@ _0803A852: ldr r1, =gUnknown_02024240 adds r0, r1 strh r2, [r0] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] ldr r6, =gUnknown_02024270 adds r0, r6 @@ -10656,7 +10656,7 @@ _0803A852: adds r0, r1 adds r0, 0xC8 strb r3, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] ldr r1, [r2] lsls r0, 1 @@ -10734,7 +10734,7 @@ _0803A852: bics r0, r2 strb r0, [r1] movs r5, 0 - ldr r3, =gUnknown_0202406C + ldr r3, =gNoOfAllBanks ldrb r3, [r3] cmp r5, r3 bge _0803AB02 @@ -10748,11 +10748,11 @@ _0803AAA4: lsls r0, r5, 24 lsrs r0, 24 str r3, [sp] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldr r3, [sp] ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 ldr r3, [sp] @@ -10784,15 +10784,15 @@ _0803AADA: adds r0, 0xE1 strb r6, [r0] adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _0803AAA4 _0803AB02: - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r1, [r0, 0x4] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r1, r0 @@ -10816,7 +10816,7 @@ _0803AB6C: ldrb r0, [r0, 0x6] adds r2, 0x21 strb r0, [r2] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] adds r1, r0, 0 muls r1, r3 @@ -10847,7 +10847,7 @@ _0803AB6C: thumb_func_start bc_8012FAC bc_8012FAC: @ 803ABC0 push {r4,r5,lr} - ldr r5, =gUnknown_02024332 + ldr r5, =gBattleCommunication ldrb r0, [r5] cmp r0, 0 beq _0803ABD4 @@ -10856,7 +10856,7 @@ bc_8012FAC: @ 803ABC0 b _0803AC2E .pool _0803ABD4: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r5, 0x1] strb r0, [r4] movs r0, 0 @@ -10871,14 +10871,14 @@ _0803ABD4: b _0803AC2E .pool _0803ABF8: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r2, [r0] cmp r2, 0 bne _0803AC2E ldrb r0, [r5, 0x1] adds r0, 0x1 strb r0, [r5, 0x1] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -10900,13 +10900,13 @@ _0803AC2E: thumb_func_start bc_load_battlefield bc_load_battlefield: @ 803AC34 push {r4,r5,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r5, [r0] cmp r5, 0 bne _0803AC64 movs r0, 0 - bl battle_get_side_with_given_state - ldr r4, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r4, =gActiveBank strb r0, [r4] ldr r0, =gUnknown_02022FF0 ldrb r1, [r0] @@ -10917,7 +10917,7 @@ bc_load_battlefield: @ 803AC34 ldr r1, =gUnknown_03005D04 ldr r0, =sub_803AC84 str r0, [r1] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r5, [r0] strb r5, [r0, 0x1] _0803AC64: @@ -10934,15 +10934,15 @@ sub_803AC84: @ 803AC84 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r1, [r0] cmp r1, 0 beq _0803AC98 b _0803AF4E _0803AC98: - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank strb r1, [r2] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r1, r0 bcc _0803ACA6 @@ -10962,9 +10962,9 @@ _0803ACB4: ands r0, r1 cmp r0, 0 beq _0803ACFC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803ACFC @@ -10990,8 +10990,8 @@ _0803ACFC: adds r3, r0, r2 movs r2, 0 ldr r6, =gBaseStats - ldr r5, =gUnknown_02023864 - ldr r4, =gUnknown_02024064 + ldr r5, =gBattleBufferB + ldr r4, =gActiveBank _0803AD0E: adds r0, r3, r2 ldrb r1, [r4] @@ -11046,8 +11046,8 @@ _0803AD0E: adds r1, 0x20 strb r0, [r1] ldrb r0, [r2] - bl battle_side_get_owner - ldr r1, =gUnknown_0202449C + bl GetBankSide + ldr r1, =gBattleStruct lsls r0, 24 lsrs r0, 23 adds r0, 0xA8 @@ -11060,7 +11060,7 @@ _0803AD0E: ldrh r0, [r0, 0x28] strh r0, [r1] movs r2, 0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank movs r5, 0x58 ldr r1, =gUnknown_0202409C adds r6, r4, 0 @@ -11087,9 +11087,9 @@ _0803ADAA: movs r0, 0 str r0, [r1] _0803ADCA: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _0803ADE4 @@ -11105,7 +11105,7 @@ _0803ADE4: cmp r0, 0 beq _0803AE60 ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -11116,7 +11116,7 @@ _0803ADE4: bl dp01_battle_side_mark_buffer_for_execution _0803AE0A: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -11143,7 +11143,7 @@ _0803AE0A: .pool _0803AE60: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -11171,7 +11171,7 @@ _0803AE96: bl dp01_build_cmdbuf_x04_4_4_4 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -11192,15 +11192,15 @@ _0803AEC0: ands r0, r1 cmp r0, 0 beq _0803AEF6 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 beq _0803AEEA ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -11218,9 +11218,9 @@ _0803AEF6: ands r0, r1 cmp r0, 0 beq _0803AF20 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -11243,7 +11243,7 @@ _0803AF32: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -11271,7 +11271,7 @@ bc_801333C: @ 803AF80 mov r7, r8 push {r7} sub sp, 0x30 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0803AF92 @@ -11330,8 +11330,8 @@ _0803AFFA: cmp r7, 0x5 ble _0803AFAA movs r0, 0x1 - bl battle_get_side_with_given_state - ldr r4, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r4, =gActiveBank strb r0, [r4] movs r0, 0 mov r1, sp @@ -11382,8 +11382,8 @@ _0803B072: cmp r7, 0x5 ble _0803B026 movs r0, 0 - bl battle_get_side_with_given_state - ldr r4, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r4, =gActiveBank strb r0, [r4] movs r0, 0 mov r1, sp @@ -11455,13 +11455,13 @@ _0803B10C: thumb_func_start bc_battle_begin_message bc_battle_begin_message: @ 803B120 push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0803B142 movs r0, 0x1 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r1, =gActiveBank strb r0, [r1] ldrb r1, [r1] movs r0, 0 @@ -11478,7 +11478,7 @@ _0803B142: thumb_func_start bc_8013568 bc_8013568: @ 803B158 push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0803B170 @@ -11497,7 +11497,7 @@ _0803B170: thumb_func_start sub_803B180 sub_803B180: @ 803B180 push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0803B1D0 @@ -11524,7 +11524,7 @@ sub_803B180: @ 803B180 _0803B1B8: movs r0, 0x1 _0803B1BA: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -11560,17 +11560,17 @@ sub_803B1DC: @ 803B1DC _0803B1FC: movs r5, 0x3 _0803B1FE: - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r0, 0 beq _0803B23A adds r4, r1, 0 _0803B20E: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, r5 @@ -11583,7 +11583,7 @@ _0803B228: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -11630,13 +11630,13 @@ _0803B288: _0803B298: movs r5, 0x1 _0803B29A: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r2, [r0] cmp r2, 0 bne _0803B2F2 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r2, [r0] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks adds r4, r0, 0 ldrb r1, [r1] cmp r2, r1 @@ -11644,7 +11644,7 @@ _0803B29A: adds r6, r4, 0 _0803B2B2: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, r5 @@ -11663,10 +11663,10 @@ _0803B2D8: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r1] cmp r0, r1 bcc _0803B2B2 @@ -11685,13 +11685,13 @@ _0803B2F2: thumb_func_start bc_801362C bc_801362C: @ 803B314 push {r4-r7,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r1, [r0] cmp r1, 0 bne _0803B384 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank strb r1, [r2] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r1, r0 bcs _0803B37E @@ -11702,7 +11702,7 @@ bc_801362C: @ 803B314 adds r7, 0x48 _0803B334: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -11730,7 +11730,7 @@ _0803B36C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -11750,7 +11750,7 @@ _0803B384: thumb_func_start sub_803B3AC sub_803B3AC: @ 803B3AC push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0803B3BC @@ -11766,7 +11766,7 @@ _0803B3BC: thumb_func_start sub_803B3CC sub_803B3CC: @ 803B3CC push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0803B418 @@ -11794,7 +11794,7 @@ _0803B3F6: cmp r0, 0 bne _0803B412 adds r0, r3, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -11831,17 +11831,17 @@ sub_803B42C: @ 803B42C _0803B44C: movs r5, 0x2 _0803B44E: - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r0, 0 beq _0803B48A adds r4, r1, 0 _0803B45E: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, r5 @@ -11854,14 +11854,14 @@ _0803B478: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bcc _0803B45E _0803B48A: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r0, 0x4C movs r1, 0 @@ -11911,13 +11911,13 @@ _0803B4F0: _0803B500: movs r6, 0 _0803B502: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r2, [r0] cmp r2, 0 bne _0803B574 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r2, [r0] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks adds r4, r0, 0 ldrb r1, [r1] cmp r2, r1 @@ -11925,7 +11925,7 @@ _0803B502: adds r5, r4, 0 _0803B51A: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, r6 @@ -11944,15 +11944,15 @@ _0803B540: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r1] cmp r0, r1 bcc _0803B51A _0803B554: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r0, 0x4C movs r1, 0 @@ -11979,21 +11979,21 @@ _0803B574: thumb_func_start sub_803B598 sub_803B598: @ 803B598 push {r4,r5,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r1, [r0] cmp r1, 0 bne _0803B606 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank strb r1, [r2] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r1, r0 bcs _0803B5E6 adds r4, r2, 0 - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID _0803B5B2: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803B5D4 @@ -12010,14 +12010,14 @@ _0803B5D4: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bcc _0803B5B2 _0803B5E6: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r0, 0x4C movs r1, 0 @@ -12050,25 +12050,25 @@ sub_803B628: @ 803B628 sub sp, 0x4 movs r0, 0 mov r9, r0 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0803B642 b _0803B8B2 _0803B642: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x4C ldrb r0, [r0] cmp r0, 0 bne _0803B6C2 movs r5, 0 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks mov r10, r1 ldrb r3, [r1] cmp r5, r3 bge _0803B668 - ldr r2, =gUnknown_0202407E + ldr r2, =gTurnOrder _0803B65C: adds r0, r5, r2 strb r5, [r0] @@ -12086,8 +12086,8 @@ _0803B67C: ldrb r1, [r1] cmp r8, r1 bge _0803B6B6 - ldr r6, =gUnknown_0202407E - ldr r1, =gUnknown_0202406C + ldr r6, =gTurnOrder + ldr r1, =gNoOfAllBanks mov r10, r1 lsls r7, r5, 24 _0803B68E: @@ -12106,7 +12106,7 @@ _0803B68E: bl sub_803CEDC _0803B6AC: adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0803B68E @@ -12119,7 +12119,7 @@ _0803B6B8: cmp r5, r0 blt _0803B67C _0803B6C2: - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r0, [r5] movs r4, 0xD1 lsls r4, 1 @@ -12132,7 +12132,7 @@ _0803B6C2: movs r1, 0 movs r2, 0 movs r3, 0xFF - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0803B6FC @@ -12143,15 +12143,15 @@ _0803B6C2: b _0803B8B2 .pool _0803B6FC: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r0, 0x4C - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 bcs _0803B756 - ldr r5, =gUnknown_0202407E + ldr r5, =gTurnOrder adds r4, r2, 0 _0803B710: ldr r0, [r4] @@ -12163,7 +12163,7 @@ _0803B710: str r0, [sp] movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0803B736 @@ -12185,7 +12185,7 @@ _0803B736: _0803B748: ldr r0, [r4] adds r0, 0x4C - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -12197,7 +12197,7 @@ _0803B756: movs r1, 0 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -12209,21 +12209,21 @@ _0803B770: movs r1, 0 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0803B786 b _0803B8B2 _0803B786: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r0, 0xD9 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 bcs _0803B7DA - ldr r5, =gUnknown_0202407E + ldr r5, =gTurnOrder adds r4, r2, 0 _0803B79A: ldr r0, [r4] @@ -12253,14 +12253,14 @@ _0803B7BC: bne _0803B8B2 ldr r0, [r4] adds r0, 0xD9 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 bcc _0803B79A _0803B7DA: movs r5, 0 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct mov r8, r1 movs r7, 0x6 ldr r6, =gUnknown_0202421C @@ -12285,10 +12285,10 @@ _0803B7EA: movs r0, 0 bl sub_803D580 bl sub_803D6A0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x91 - ldr r1, =gUnknown_02024210 + ldr r1, =gAbsentBankFlags ldrb r1, [r1] strb r1, [r0] ldr r0, =gUnknown_085CC23E @@ -12298,7 +12298,7 @@ _0803B7EA: ldr r0, =sub_803BE74 str r0, [r1] bl sub_803F988 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r2, 0 adds r0, r1, 0x7 _0803B834: @@ -12307,9 +12307,9 @@ _0803B834: cmp r0, r1 bge _0803B834 movs r5, 0 - ldr r3, =gUnknown_0202406C - ldr r2, =gUnknown_0202449C - ldr r6, =gUnknown_02024474 + ldr r3, =gNoOfAllBanks + ldr r2, =gBattleStruct + ldr r6, =gBattleScripting ldr r7, =gBattleMoveFlags ldrb r0, [r3] cmp r5, r0 @@ -12379,15 +12379,15 @@ _0803B8B2: thumb_func_start bc_8013B1C bc_8013B1C: @ 803B904 push {r4-r6,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0803B994 ldr r1, =gUnknown_03005D04 ldr r0, =sub_803B9BC str r0, [r1] - ldr r3, =gUnknown_0202406C - ldr r1, =gUnknown_02024332 + ldr r3, =gNoOfAllBanks + ldr r1, =gBattleCommunication movs r2, 0 adds r0, r1, 0x7 _0803B91C: @@ -12426,15 +12426,15 @@ _0803B932: beq _0803B964 lsls r0, r4, 24 lsrs r0, 24 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves _0803B964: adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0803B932 _0803B96E: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] movs r1, 0 strb r1, [r0] @@ -12468,7 +12468,7 @@ sub_803B9BC: @ 803B9BC push {r6,r7} movs r0, 0x1 bl sub_803D580 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0 bne _0803B9EA @@ -12491,7 +12491,7 @@ _0803B9EA: beq _0803B9F8 b _0803BB78 _0803B9F8: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x4D strb r1, [r0] @@ -12504,7 +12504,7 @@ _0803B9F8: _0803BA0E: movs r0, 0 bl sub_803D580 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xfffffdff ands r0, r1 @@ -12515,7 +12515,7 @@ _0803BA0E: ldr r1, =0xffefffff ands r0, r1 str r0, [r2] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r4, [r0, 0x18] strb r4, [r0, 0x19] strb r4, [r0, 0x14] @@ -12523,7 +12523,7 @@ _0803BA0E: str r4, [r0] ldr r0, =gBattleMoveFlags strb r4, [r0] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r2, 0 adds r0, r1, 0x4 _0803BA40: @@ -12531,11 +12531,11 @@ _0803BA40: subs r0, 0x1 cmp r0, r1 bge _0803BA40 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0 beq _0803BA98 - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xC strb r0, [r1] ldr r1, =gUnknown_03005D04 @@ -12546,7 +12546,7 @@ _0803BA40: _0803BA98: ldr r1, =gUnknown_03005D10 ldrb r0, [r1, 0x13] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct mov r8, r2 cmp r0, 0xFE bhi _0803BAB2 @@ -12559,8 +12559,8 @@ _0803BA98: strb r0, [r1] _0803BAB2: movs r2, 0 - ldr r4, =gUnknown_0202406C - ldr r0, =gUnknown_02024210 + ldr r4, =gNoOfAllBanks + ldr r0, =gAbsentBankFlags mov r12, r0 ldr r1, =gUnknown_085CC23E mov r9, r1 @@ -12584,7 +12584,7 @@ _0803BACC: blt _0803BACC _0803BAE0: movs r2, 0 - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct movs r1, 0x6 _0803BAE6: ldr r0, [r3] @@ -12649,7 +12649,7 @@ sub_803BB88: @ 803BB88 push {r4-r7,lr} sub sp, 0x4 ldr r1, =gBattleMons - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -12657,7 +12657,7 @@ sub_803BB88: @ 803BB88 ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0803BBB8 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -12667,12 +12667,12 @@ sub_803BB88: @ 803BB88 .pool _0803BBB8: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r2, r0, 24 _0803BBC2: ldr r1, =gUnknown_0202420F - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] strb r0, [r1] cmp r2, 0x25 @@ -12699,11 +12699,11 @@ _0803BBDE: b _0803BD4C _0803BBF2: adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 bge _0803BC86 @@ -12711,7 +12711,7 @@ _0803BBF2: _0803BC08: lsrs r4, r7, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r6, r0 @@ -12728,13 +12728,13 @@ _0803BC08: b _0803BD54 _0803BC2C: adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r6, r0 beq _0803BC76 ldr r3, =gBattleMons - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] movs r2, 0x58 muls r0, r2 @@ -12768,19 +12768,19 @@ _0803BC76: lsls r0, 17 adds r7, r0 adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _0803BC08 _0803BC86: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] movs r0, 0 str r0, [sp] movs r0, 0xF movs r2, 0x2A movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 @@ -12801,23 +12801,23 @@ _0803BC86: cmp r0, 0x8 bne _0803BCF8 _0803BCBE: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting subs r1, r5, 0x1 strb r1, [r0, 0x17] - ldr r2, =gUnknown_0202420A + ldr r2, =gLastUsedAbility adds r0, r1, 0 muls r0, r3 adds r0, r6 adds r0, 0x20 ldrb r0, [r0] strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 b _0803BD90 .pool _0803BCF8: ldr r1, =gBattleMons - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -12828,7 +12828,7 @@ _0803BCF8: ands r0, r1 cmp r0, 0 bne _0803BD22 - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] @@ -12838,7 +12838,7 @@ _0803BCF8: cmp r0, 0 beq _0803BD40 _0803BD22: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] movs r0, 0x1 @@ -12856,27 +12856,27 @@ _0803BD4C: b _0803BD92 .pool _0803BD54: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r5, [r0, 0x17] - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r0, [r2] strb r0, [r1] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 b _0803BD90 .pool _0803BD70: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r5, [r0, 0x17] - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r0, [r2] strb r0, [r1] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 b _0803BD90 .pool _0803BD8C: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 _0803BD90: strb r0, [r1, 0x5] @@ -12896,11 +12896,11 @@ sub_803BDA0: @ 803BDA0 lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r8, r0 ldr r1, =gUnknown_0203CF00 mov r12, r1 - ldr r7, =gUnknown_0202449C + ldr r7, =gBattleStruct lsls r0, r5, 1 adds r4, r0, r5 adds r6, r0, 0 @@ -12923,7 +12923,7 @@ _0803BDBC: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r7, =gUnknown_0202449C + ldr r7, =gBattleStruct ldr r0, [r7] adds r0, r5, r0 adds r0, 0x5C @@ -13000,21 +13000,21 @@ sub_803BE74: @ 803BE74 mov r5, r8 push {r5-r7} sub sp, 0x1C - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication movs r1, 0 strb r1, [r0, 0x4] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r1, [r0] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks bl _0803CD12 .pool _0803BE9C: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r5, r0, 24 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -13041,16 +13041,16 @@ _0803BED0: .4byte _0803CC38 _0803BEF4: bl sub_8185FD0 - ldr r1, =gUnknown_02024332 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleCommunication + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 bl _0803CC20 .pool _0803BF0C: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r0, [r4] adds r1, r0 adds r1, 0x5C @@ -13069,7 +13069,7 @@ _0803BF0C: beq _0803BF68 eors r5, r1 adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, [r4] adds r1, 0x91 ldrb r1, [r1] @@ -13081,9 +13081,9 @@ _0803BF0C: ands r1, r0 cmp r1, 0 bne _0803BF68 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -13092,12 +13092,12 @@ _0803BF0C: beq _0803BF68 bl _0803CD04 _0803BF68: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x91 ldrb r3, [r0] ldr r1, =gBitTable - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -13115,7 +13115,7 @@ _0803BF68: ands r0, r1 cmp r0, 0 bne _0803BFBC - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r4] adds r1, r0 movs r0, 0x5 @@ -13123,7 +13123,7 @@ _0803BF68: bl _0803CD04 .pool _0803BFBC: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r4] adds r1, r0 movs r0, 0x4 @@ -13151,14 +13151,14 @@ _0803BFF0: ldr r0, =gUnknown_0202421C adds r0, r2, r0 strb r3, [r0] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r4] bl _0803CC72 .pool _0803C00C: ldr r0, =gUnknown_0202421C ldrb r1, [r0] - ldr r0, =gUnknown_02023864 + ldr r0, =gBattleBufferB ldrb r2, [r0, 0x1] ldrb r0, [r0, 0x2] lsls r0, 8 @@ -13168,9 +13168,9 @@ _0803C00C: bl _0803CB68 .pool _0803C02C: - ldr r3, =gUnknown_02024068 + ldr r3, =gBattleExecBuffer ldr r1, =gBitTable - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r5, [r6] lsls r0, r5, 2 adds r0, r1 @@ -13190,7 +13190,7 @@ _0803C02C: beq _0803C058 bl _0803CD04 _0803C058: - ldr r4, =gUnknown_02023864 + ldr r4, =gBattleBufferB lsls r0, r5, 9 adds r4, 0x1 adds r0, r4 @@ -13238,15 +13238,15 @@ _0803C0DC: lsls r0, 24 cmp r0, 0 beq _0803C134 - ldr r0, =gUnknown_02024332 - ldr r3, =gUnknown_02024064 + ldr r0, =gBattleCommunication + ldr r3, =gActiveBank ldrb r1, [r3] adds r1, r0 movs r4, 0 movs r0, 0x6 strb r0, [r1] ldrb r1, [r3] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -13260,7 +13260,7 @@ _0803C0DC: ldrb r1, [r3] ldr r2, [r2] adds r2, r1, r2 - ldr r0, =gUnknown_02023864 + ldr r0, =gBattleBufferB lsls r1, 9 adds r0, 0x3 adds r1, r0 @@ -13269,8 +13269,8 @@ _0803C0DC: bl _0803CD70 .pool _0803C134: - ldr r3, =gUnknown_020242BC - ldr r5, =gUnknown_02024064 + ldr r3, =gDisableStructs + ldr r5, =gActiveBank ldrb r4, [r5] lsls r0, r4, 3 subs r0, r4 @@ -13284,7 +13284,7 @@ _0803C134: adds r0, r1 strh r2, [r0] ldrb r2, [r5] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r1, r2, r1 adds r1, 0x80 @@ -13294,7 +13294,7 @@ _0803C134: adds r0, r3 ldrb r0, [r0, 0xC] strb r0, [r1] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r5] adds r0, r1 movs r1, 0x4 @@ -13391,7 +13391,7 @@ _0803C230: bne _0803C23E b _0803C48C _0803C23E: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] movs r1, 0x1 bl sub_8185008 @@ -13403,13 +13403,13 @@ _0803C23E: b _0803C784 .pool _0803C268: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r1, [r3] adds r1, r0, r1 adds r1, 0x58 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -13434,7 +13434,7 @@ _0803C268: ands r0, r1 cmp r0, 0 bne _0803C2B8 - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -13444,7 +13444,7 @@ _0803C268: cmp r1, 0 beq _0803C2EC _0803C2B8: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r1, r0, 1 adds r1, r0 @@ -13463,7 +13463,7 @@ _0803C2EC: adds r1, r2, 0 movs r2, 0x17 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -13473,7 +13473,7 @@ _0803C2EC: movs r0, 0xC movs r2, 0x47 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -13497,14 +13497,14 @@ _0803C2EC: cmp r0, 0x1A bne _0803C374 _0803C33C: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] movs r0, 0 str r0, [sp] movs r0, 0xF movs r2, 0x2A movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -13531,10 +13531,10 @@ _0803C374: orrs r1, r0 lsls r1, 24 lsrs r1, 24 - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility ldrb r3, [r0] - ldr r4, =gUnknown_0202449C - ldr r0, =gUnknown_02024064 + ldr r4, =gBattleStruct + ldr r0, =gActiveBank ldrb r0, [r0] lsls r2, r0, 1 adds r2, r0 @@ -13548,7 +13548,7 @@ _0803C374: b _0803C42E .pool _0803C3B0: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 @@ -13557,7 +13557,7 @@ _0803C3B0: ldrb r0, [r0] cmp r0, 0x2 bne _0803C3D8 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r3, [r0] adds r0, r3, 0 adds r0, 0x5C @@ -13571,7 +13571,7 @@ _0803C3D8: ldrb r0, [r0, 0x1] cmp r0, 0x2 bne _0803C410 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r3, [r0] adds r0, r3, 0 adds r0, 0x5D @@ -13591,8 +13591,8 @@ _0803C400: b _0803C42E .pool _0803C410: - ldr r2, =gUnknown_0202449C - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleStruct + ldr r0, =gActiveBank ldrb r0, [r0] lsls r1, r0, 1 adds r1, r0 @@ -13606,7 +13606,7 @@ _0803C410: movs r3, 0 bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f _0803C42E: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution b _0803C6C4 @@ -13619,20 +13619,20 @@ _0803C440: b _0803C6C4 _0803C44C: ldr r1, =gUnknown_02024220 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 2 adds r0, r1 ldr r1, =gUnknown_082DAB11 str r1, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r3] adds r1, r0 movs r4, 0 movs r0, 0x6 strb r0, [r1] ldrb r1, [r3] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -13641,8 +13641,8 @@ _0803C44C: b _0803C7A0 .pool _0803C48C: - ldr r2, =gUnknown_0202449C - ldr r4, =gUnknown_02024064 + ldr r2, =gBattleStruct + ldr r4, =gActiveBank ldrb r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -13656,19 +13656,19 @@ _0803C48C: b _0803C6C4 .pool _0803C4B4: - ldr r4, =gUnknown_02024332 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleCommunication + ldr r5, =gActiveBank ldrb r0, [r5] adds r0, r4 movs r1, 0x7 strb r1, [r0] ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r6, 0x2 eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -13677,11 +13677,11 @@ _0803C4B4: ldrb r0, [r5] bl sub_8185008 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, =gBattleMons lsls r0, 24 lsrs r0, 24 @@ -13697,11 +13697,11 @@ _0803C4B4: cmp r0, 0 bne _0803C532 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 muls r0, r7 @@ -13722,11 +13722,11 @@ _0803C532: _0803C550: ldr r4, =gUnknown_0202421C ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -13734,11 +13734,11 @@ _0803C550: cmp r0, 0x2 bne _0803C590 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 movs r1, 0x2 @@ -13747,11 +13747,11 @@ _0803C550: .pool _0803C590: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -13759,29 +13759,29 @@ _0803C590: cmp r0, 0x3 bne _0803C5B6 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 b _0803C668 _0803C5B6: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 ldrb r0, [r0] cmp r0, 0 bne _0803C628 - ldr r4, =gUnknown_0202433C + ldr r4, =gProtectStructs ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 20 adds r0, r4 @@ -13789,13 +13789,13 @@ _0803C5B6: lsls r0, 29 cmp r0, 0 blt _0803C616 - ldr r4, =gUnknown_020242BC + ldr r4, =gDisableStructs ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -13807,7 +13807,7 @@ _0803C5B6: beq _0803C628 _0803C616: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r6 b _0803C668 .pool @@ -13820,14 +13820,14 @@ _0803C628: cmp r0, 0 beq _0803C690 ldr r4, =gUnknown_0202421C - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity movs r5, 0x2 eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -13839,12 +13839,12 @@ _0803C628: ldr r0, [r0] str r0, [r1] ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r5 _0803C668: lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -13852,14 +13852,14 @@ _0803C668: b _0803C6AE .pool _0803C690: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 movs r1, 0x3 @@ -13867,7 +13867,7 @@ _0803C690: _0803C6AE: movs r0, 0 bl dp01_build_cmdbuf_x32_32_32_32 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution b _0803CD70 @@ -13885,8 +13885,8 @@ _0803C6C4: ands r2, r0 cmp r2, 0 beq _0803C720 - ldr r0, =gUnknown_02023864 - ldr r4, =gUnknown_02024064 + ldr r0, =gBattleBufferB + ldr r4, =gActiveBank ldrb r2, [r4] lsls r1, r2, 9 adds r0, 0x1 @@ -13899,7 +13899,7 @@ _0803C6C4: adds r0, r1 ldr r1, =gUnknown_082DB9BA str r1, [r0] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r4] adds r0, r1 movs r3, 0 @@ -13912,8 +13912,8 @@ _0803C720: ands r0, r1 cmp r0, 0x8 bne _0803C760 - ldr r0, =gUnknown_02023864 - ldr r4, =gUnknown_02024064 + ldr r0, =gBattleBufferB + ldr r4, =gActiveBank ldrb r1, [r4] lsls r1, 9 adds r0, 0x1 @@ -13923,7 +13923,7 @@ _0803C720: bne _0803C760 ldr r0, =gUnknown_082DAAFE bl b_call_bc_move_exec - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r4] adds r0, r1 b _0803CC20 @@ -13933,8 +13933,8 @@ _0803C760: lsls r0, 24 cmp r0, 0 beq _0803C7C4 - ldr r0, =gUnknown_02023864 - ldr r4, =gUnknown_02024064 + ldr r0, =gBattleBufferB + ldr r4, =gActiveBank ldrb r2, [r4] lsls r1, r2, 9 adds r0, 0x1 @@ -13948,7 +13948,7 @@ _0803C760: ldr r1, =gUnknown_082DAB0B _0803C784: str r1, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r4] adds r1, r0 movs r3, 0 @@ -13956,7 +13956,7 @@ _0803C784: strb r0, [r1] _0803C792: ldrb r1, [r4] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -13971,16 +13971,16 @@ _0803C7A0: b _0803CD70 .pool _0803C7C4: - ldr r2, =gUnknown_02024332 - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleCommunication + ldr r0, =gActiveBank ldrb r1, [r0] adds r1, r2 b _0803CB74 .pool _0803C7D8: - ldr r4, =gUnknown_02024068 + ldr r4, =gBattleExecBuffer ldr r1, =gBitTable - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r5, [r3] lsls r0, r5, 2 adds r0, r1 @@ -14028,7 +14028,7 @@ _0803C830: .4byte _0803CA98 .4byte _0803CABC _0803C858: - ldr r1, =gUnknown_02023864 + ldr r1, =gBattleBufferB ldrb r3, [r4] lsls r0, r3, 9 adds r1, 0x1 @@ -14055,8 +14055,8 @@ _0803C87E: _0803C88A: movs r0, 0x2 bl sub_818603C - ldr r4, =gUnknown_02023864 - ldr r6, =gUnknown_02024064 + ldr r4, =gBattleBufferB + ldr r6, =gActiveBank ldrb r3, [r6] lsls r1, r3, 9 adds r5, r4, 0x2 @@ -14070,7 +14070,7 @@ _0803C88A: ldr r0, =0x0000ffff cmp r2, r0 bne _0803C8D0 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication adds r0, r3, r0 movs r1, 0x1 strb r1, [r0] @@ -14086,14 +14086,14 @@ _0803C8D0: ldrb r0, [r6] movs r1, 0x1 bl sub_8185008 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r6] adds r1, r0 movs r3, 0 movs r0, 0x6 strb r0, [r1] ldrb r1, [r6] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -14131,7 +14131,7 @@ _0803C91C: bl sub_8184FBC _0803C942: ldrb r0, [r6] - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r1, [r4] adds r1, r0, r1 adds r1, 0x80 @@ -14162,13 +14162,13 @@ _0803C942: adds r0, r7 ldrb r0, [r0] strb r0, [r4, 0xC] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r6] b _0803CB72 .pool _0803C99C: - ldr r2, =gUnknown_02023864 - ldr r5, =gUnknown_02024064 + ldr r2, =gBattleBufferB + ldr r5, =gActiveBank ldrb r4, [r5] lsls r1, r4, 9 adds r0, r2, 0x1 @@ -14185,13 +14185,13 @@ _0803C99C: _0803C9BA: ldr r0, =gUnknown_02024208 strh r3, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r5] b _0803CB72 .pool _0803C9D4: - ldr r0, =gUnknown_02023864 - ldr r4, =gUnknown_02024064 + ldr r0, =gBattleBufferB + ldr r4, =gActiveBank ldrb r2, [r4] lsls r1, r2, 9 adds r0, 0x1 @@ -14199,7 +14199,7 @@ _0803C9D4: ldrb r0, [r1] cmp r0, 0x6 bne _0803CA04 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication adds r0, r2, r0 movs r1, 0x1 strb r1, [r0] @@ -14211,35 +14211,35 @@ _0803CA04: bl sub_803CDF8 b _0803CB6E _0803CA0A: - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 8 orrs r0, r1 str r0, [r2] - ldr r2, =gUnknown_02024332 - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleCommunication + ldr r0, =gActiveBank ldrb r1, [r0] adds r1, r2 b _0803CB74 .pool _0803CA2C: - ldr r2, =gUnknown_02024332 - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleCommunication + ldr r0, =gActiveBank ldrb r1, [r0] adds r1, r2 b _0803CB74 .pool _0803CA40: - ldr r2, =gUnknown_02024332 - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleCommunication + ldr r0, =gActiveBank ldrb r1, [r0] adds r1, r2 b _0803CB74 .pool _0803CA54: - ldr r3, =gUnknown_02023864 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferB + ldr r0, =gActiveBank ldrb r4, [r0] lsls r1, r4, 9 adds r0, r3, 0x1 @@ -14254,41 +14254,41 @@ _0803CA54: bne _0803CA72 b _0803CC1C _0803CA72: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication adds r1, r4, r1 b _0803CB74 .pool _0803CA84: - ldr r2, =gUnknown_02024332 - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleCommunication + ldr r0, =gActiveBank ldrb r1, [r0] adds r1, r2 b _0803CB74 .pool _0803CA98: - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 8 orrs r0, r1 str r0, [r2] - ldr r2, =gUnknown_02024332 - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleCommunication + ldr r0, =gActiveBank ldrb r1, [r0] adds r1, r2 b _0803CB74 .pool _0803CABC: - ldr r2, =gUnknown_02024332 - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleCommunication + ldr r0, =gActiveBank ldrb r1, [r0] adds r1, r2 b _0803CB74 .pool _0803CAD0: - ldr r3, =gUnknown_02024068 + ldr r3, =gBattleExecBuffer ldr r6, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r6 @@ -14327,8 +14327,8 @@ _0803CAFA: bne _0803CB3C adds r0, r5, 0 eors r0, r1 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202449C + bl GetBankByPlayerAI + ldr r1, =gBattleStruct ldr r1, [r1] adds r1, 0x91 ldrb r1, [r1] @@ -14352,12 +14352,12 @@ _0803CB5C: adds r2, r4, 0 bl sub_8034464 _0803CB66: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank _0803CB68: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0803CB6E: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r4] _0803CB72: adds r1, r0 @@ -14368,9 +14368,9 @@ _0803CB74: b _0803CD04 .pool _0803CB84: - ldr r3, =gUnknown_02024068 + ldr r3, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -14390,16 +14390,16 @@ _0803CB84: beq _0803CBAE b _0803CD04 _0803CBAE: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] b _0803CD04 .pool _0803CBC8: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r1, r2, r0 adds r0, r1, 0 @@ -14407,7 +14407,7 @@ _0803CBC8: ldrb r0, [r0] cmp r0, 0 beq _0803CCB4 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication adds r0, r2, r0 adds r1, 0x84 ldrb r1, [r1] @@ -14415,9 +14415,9 @@ _0803CBC8: b _0803CD04 .pool _0803CBF4: - ldr r3, =gUnknown_02024068 + ldr r3, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r4, [r0] lsls r0, r4, 2 adds r0, r1 @@ -14436,7 +14436,7 @@ _0803CBF4: cmp r0, 0 bne _0803CD04 _0803CC1C: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication adds r0, r4, r0 _0803CC20: movs r1, 0x1 @@ -14444,23 +14444,23 @@ _0803CC20: b _0803CD04 .pool _0803CC38: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r0, [r4] adds r0, r2, r0 adds r0, 0x54 ldrb r0, [r0] cmp r0, 0 beq _0803CCB4 - ldr r0, =gUnknown_02023864 + ldr r0, =gBattleBufferB lsls r1, r2, 9 adds r0, 0x1 adds r1, r0 ldrb r0, [r1] cmp r0, 0xD bne _0803CC94 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 8 @@ -14471,7 +14471,7 @@ _0803CC38: adds r0, r1 movs r1, 0x3 strb r1, [r0] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r5] _0803CC72: adds r0, r1 @@ -14483,7 +14483,7 @@ _0803CC94: adds r0, r2, 0 movs r1, 0x1 bl sub_8185008 - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication ldrb r0, [r5] adds r2, r0, r2 ldr r1, [r4] @@ -14494,16 +14494,16 @@ _0803CC94: b _0803CD04 .pool _0803CCB4: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker strb r2, [r0] - ldr r7, =gUnknown_02024214 + ldr r7, =gBattlescriptCurrInstr ldr r6, =gUnknown_02024220 ldrb r0, [r5] lsls r0, 2 adds r0, r6 ldr r4, [r0] str r4, [r7] - ldr r3, =gUnknown_02024068 + ldr r3, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r5] lsls r0, 2 @@ -14535,11 +14535,11 @@ _0803CCFA: ldr r1, [r7] str r1, [r0] _0803CD04: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks lsls r1, 24 lsrs r1, 24 _0803CD12: @@ -14549,7 +14549,7 @@ _0803CD12: bcs _0803CD1E bl _0803BE9C _0803CD1E: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x4] ldrb r1, [r5] cmp r0, r1 @@ -14578,7 +14578,7 @@ _0803CD4A: bne _0803CD66 lsls r0, r4, 24 lsrs r0, 24 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r1, r4, r1 adds r1, 0x5C @@ -14586,7 +14586,7 @@ _0803CD4A: bl sub_80571DC _0803CD66: adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0803CD4A @@ -14607,12 +14607,12 @@ sub_803CDB8: @ 803CDB8 push {r4,r5,lr} movs r3, 0 movs r1, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r2, [r0] adds r5, r0, 0 cmp r3, r2 bge _0803CDDA - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication _0803CDCA: adds r0, r1, r4 ldrb r0, [r0] @@ -14642,13 +14642,13 @@ _0803CDF2: thumb_func_start sub_803CDF8 sub_803CDF8: @ 803CDF8 push {r4-r7,lr} - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r0, [r7] - ldr r6, =gUnknown_0202449C + ldr r6, =gBattleStruct ldr r1, [r6] adds r1, r0, r1 adds r1, 0x5C - ldr r4, =gUnknown_02023864 + ldr r4, =gBattleBufferB lsls r0, 9 adds r2, r4, 0x1 adds r0, r2 @@ -14764,7 +14764,7 @@ sub_803CEDC: @ 803CEDC ldrb r3, [r2] strb r3, [r4] strb r5, [r2] - ldr r2, =gUnknown_0202407E + ldr r2, =gTurnOrder adds r0, r2 ldrb r5, [r0] adds r1, r2 @@ -14801,7 +14801,7 @@ b_first_side: @ 803CF10 movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0803CFD8 @@ -14811,7 +14811,7 @@ b_first_side: @ 803CF10 movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0803CFD8 @@ -14904,7 +14904,7 @@ _0803CFDC: ldrh r0, [r4, 0x2E] cmp r0, 0xAF bne _0803D02C - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries mov r3, r9 lsls r0, r3, 3 subs r0, r3 @@ -14916,11 +14916,11 @@ _0803CFDC: .pool _0803D02C: ldrh r0, [r4, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r6, r0, 24 ldrh r0, [r4, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r5, r0, 24 _0803D040: @@ -14936,7 +14936,7 @@ _0803D040: cmp r0, 0 beq _0803D074 mov r0, r9 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803D074 @@ -15008,7 +15008,7 @@ _0803D0B8: ldrh r0, [r4, 0x2E] cmp r0, 0xAF bne _0803D118 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries mov r3, r10 lsls r0, r3, 3 subs r0, r3 @@ -15020,11 +15020,11 @@ _0803D0B8: .pool _0803D118: ldrh r0, [r4, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r6, r0, 24 ldrh r0, [r4, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r5, r0, 24 _0803D12C: @@ -15040,7 +15040,7 @@ _0803D12C: cmp r0, 0 beq _0803D15C mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803D15C @@ -15096,7 +15096,7 @@ _0803D1B8: adds r2, r0, 0 cmp r1, 0 bne _0803D208 - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] @@ -15107,7 +15107,7 @@ _0803D1B8: b _0803D20A .pool _0803D1E0: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] add r0, r9 adds r0, 0x80 @@ -15132,7 +15132,7 @@ _0803D20A: ldrb r0, [r0] cmp r0, 0 bne _0803D254 - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, 4 adds r1, r0 ldrb r0, [r1] @@ -15143,7 +15143,7 @@ _0803D20A: b _0803D256 .pool _0803D22C: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] add r0, r10 adds r0, 0x80 @@ -15255,9 +15255,9 @@ sub_803D2E8: @ 803D2E8 ands r0, r1 cmp r0, 0 beq _0803D354 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r3, [r0] - ldr r4, =gUnknown_0202406C + ldr r4, =gNoOfAllBanks mov r8, r0 ldrb r0, [r4] cmp r3, r0 @@ -15267,7 +15267,7 @@ _0803D310: ldr r7, =gUnknown_0202407A ldr r6, =gUnknown_0202421C mov r2, r8 - ldr r5, =gUnknown_0202407E + ldr r5, =gTurnOrder _0803D318: adds r1, r3, r7 ldrb r0, [r2] @@ -15293,9 +15293,9 @@ _0803D354: ands r1, r2 cmp r1, 0 beq _0803D3A4 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r3, [r0] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks mov r8, r0 adds r2, r1, 0 ldrb r2, [r2] @@ -15313,7 +15313,7 @@ _0803D376: strb r0, [r7] lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r1, [r1] cmp r0, r1 bcs _0803D3C0 @@ -15327,7 +15327,7 @@ _0803D376: _0803D3A4: ldr r1, =gUnknown_0202421C ldrb r0, [r1] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank mov r8, r4 cmp r0, 0x3 bne _0803D3B4 @@ -15351,7 +15351,7 @@ _0803D3C0: adds r0, r1 ldrb r0, [r0] strb r0, [r6] - ldr r2, =gUnknown_0202407E + ldr r2, =gTurnOrder mov r3, r8 ldrb r0, [r3] strb r0, [r2] @@ -15362,16 +15362,16 @@ _0803D3C0: mov r10, r7 ldr r0, =bc_80154A0 mov r12, r0 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct mov r9, r1 - ldr r7, =gUnknown_0202406C + ldr r7, =gNoOfAllBanks ldrb r7, [r7] cmp r5, r7 bge _0803D41A adds r7, r6, 0 adds r6, r4, 0 adds r4, r2, 0 - ldr r2, =gUnknown_0202406C + ldr r2, =gNoOfAllBanks _0803D3FC: mov r0, r8 ldrb r0, [r0] @@ -15401,14 +15401,14 @@ _0803D448: movs r0, 0 mov r7, r8 strb r0, [r7] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r1] cmp r0, 0 beq _0803D48E ldr r6, =gUnknown_0202421C mov r2, r8 ldr r5, =gUnknown_0202407A - ldr r4, =gUnknown_0202407E + ldr r4, =gTurnOrder _0803D45E: ldrb r0, [r2] adds r0, r6 @@ -15431,7 +15431,7 @@ _0803D47C: strb r0, [r2] lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r1, [r1] cmp r0, r1 bcc _0803D45E @@ -15439,13 +15439,13 @@ _0803D48E: movs r0, 0 mov r2, r8 strb r0, [r2] - ldr r4, =gUnknown_0202406C + ldr r4, =gNoOfAllBanks ldrb r0, [r4] cmp r0, 0 beq _0803D4D2 ldr r6, =gUnknown_0202421C ldr r5, =gUnknown_0202407A - ldr r4, =gUnknown_0202407E + ldr r4, =gTurnOrder _0803D4A2: ldrb r0, [r2] adds r0, r6 @@ -15468,7 +15468,7 @@ _0803D4C0: strb r0, [r2] lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r1, [r1] cmp r0, r1 bcc _0803D4A2 @@ -15486,7 +15486,7 @@ _0803D4E8: lsls r2, r5, 24 mov r8, r2 _0803D4F8: - ldr r0, =gUnknown_0202407E + ldr r0, =gTurnOrder adds r1, r5, r0 ldrb r3, [r1] adds r0, r4, r0 @@ -15516,14 +15516,14 @@ _0803D4F8: bl sub_803CEDC _0803D534: adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0803D4F8 _0803D53E: adds r5, r7, 0 _0803D540: - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r1] subs r0, 0x1 cmp r5, r0 @@ -15532,7 +15532,7 @@ _0803D54A: ldr r1, =gUnknown_03005D04 ldr r0, =bc_80154A0 str r0, [r1] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] _0803D554: adds r0, 0x48 @@ -15558,19 +15558,19 @@ sub_803D580: @ 803D580 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r2, [r0] adds r5, r1, 0 cmp r2, 0 beq _0803D678 - ldr r7, =gUnknown_0202433C + ldr r7, =gProtectStructs adds r6, r5, 0 ldr r0, =gUnknown_020240D4 mov r12, r0 - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs mov r8, r1 mov r10, r8 _0803D5AE: @@ -15666,13 +15666,13 @@ _0803D666: strb r0, [r5] lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r1, [r1] cmp r0, r1 bcc _0803D5AE _0803D678: movs r0, 0 - ldr r2, =gUnknown_02024294 + ldr r2, =gSideTimers strb r0, [r2, 0x8] strb r0, [r2, 0x14] pop {r3-r5} @@ -15688,17 +15688,17 @@ _0803D678: thumb_func_start sub_803D6A0 sub_803D6A0: @ 803D6A0 push {r4-r6,lr} - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank movs r0, 0 strb r0, [r2] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] adds r6, r0, 0 cmp r1, 0 beq _0803D6DE adds r3, r2, 0 movs r4, 0 - ldr r5, =gUnknown_0202437C + ldr r5, =gSpecialStatuses _0803D6B8: ldrb r1, [r3] lsls r0, r1, 2 @@ -15730,25 +15730,25 @@ _0803D6DE: thumb_func_start bc_80154A0 bc_80154A0: @ 803D6F0 push {r4-r7,lr} - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 bne _0803D7AE - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r0, 0x48 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r0, [r0] mov r12, r2 adds r6, r1, 0 ldrb r1, [r6] cmp r0, r1 bcs _0803D7AE - ldr r5, =gUnknown_02024064 - ldr r4, =gUnknown_0202420B + ldr r5, =gActiveBank + ldr r4, =gBankAttacker movs r7, 0x84 lsls r7, 1 _0803D71C: @@ -15777,7 +15777,7 @@ _0803D71C: ands r0, r1 cmp r0, 0 bne _0803D7A0 - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -15787,7 +15787,7 @@ _0803D71C: lsls r0, 31 cmp r0, 0 bne _0803D7A0 - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] @@ -15811,7 +15811,7 @@ _0803D7AE: ldr r1, =gUnknown_02024082 movs r0, 0 strb r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker ldr r0, =gUnknown_0202407A movs r3, 0 ldrb r0, [r0] @@ -15819,18 +15819,18 @@ _0803D7AE: ldr r0, =gUnknown_02024400 movs r2, 0 strh r3, [r0] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] strb r2, [r0, 0x13] ldr r1, =gUnknown_03005D04 ldr r0, =bc_bs_exec str r0, [r1] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r2, [r0, 0x3] strb r2, [r0, 0x4] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r2, [r0, 0x16] - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0x20 @@ -15845,15 +15845,15 @@ _0803D7E8: thumb_func_start bc_bs_exec bc_bs_exec: @ 803D818 push {r4-r6,lr} - ldr r6, =gUnknown_0202433A + ldr r6, =gBattleOutcome ldrb r0, [r6] - ldr r2, =gUnknown_02024083 + ldr r2, =gFightStateTracker cmp r0, 0 beq _0803D828 movs r0, 0xC strb r0, [r2] _0803D828: - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r0, [r5] adds r0, 0x4B ldr r4, =gUnknown_02024082 @@ -15865,12 +15865,12 @@ _0803D828: adds r0, r1 ldr r0, [r0] bl _call_via_r0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r4] ldrb r0, [r0] cmp r1, r0 bcc _0803D894 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xffefffff ands r0, r1 @@ -15892,7 +15892,7 @@ _0803D894: ldrb r0, [r0] cmp r0, r1 beq _0803D8AC - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xfffffdff ands r0, r1 @@ -15909,7 +15909,7 @@ _0803D8AC: thumb_func_start sub_803D8C0 sub_803D8C0: @ 803D8C0 push {r4,lr} - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0 strb r0, [r1] ldr r1, =gBattleTypeFlags @@ -15919,17 +15919,17 @@ sub_803D8C0: @ 803D8C0 cmp r0, 0 beq _0803D920 ldr r1, =gUnknown_020375F0 - ldr r4, =gUnknown_0202433A + ldr r4, =gBattleOutcome ldrb r0, [r4] strh r0, [r1] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 ldrb r0, [r4] strb r0, [r1] movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202420B + bl GetBankByPlayerAI + ldr r1, =gBankAttacker strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAA35 str r0, [r1] ldrb r1, [r4] @@ -15948,7 +15948,7 @@ _0803D920: cmp r2, 0 beq _0803D95C bl sub_805EA60 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAA87 str r0, [r1] ldr r0, =gUnknown_02038BCA @@ -15969,7 +15969,7 @@ _0803D95C: b _0803DA9E _0803D968: bl sub_805EA60 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DA92D str r0, [r1] ldr r2, =gTrainers @@ -16065,7 +16065,7 @@ _0803DA94: bl song_play_for_text b _0803DAA4 _0803DA9E: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DA96A str r0, [r1] _0803DAA4: @@ -16081,7 +16081,7 @@ _0803DAA4: thumb_func_start sub_803DAC0 sub_803DAC0: @ 803DAC0 push {r4,lr} - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0 strb r0, [r1] ldr r0, =gBattleTypeFlags @@ -16094,13 +16094,13 @@ sub_803DAC0: @ 803DAC0 ands r1, r0 cmp r1, 0 beq _0803DB44 - ldr r3, =gUnknown_0202433A + ldr r3, =gBattleOutcome ldrb r2, [r3] movs r0, 0x80 ands r0, r2 cmp r0, 0 beq _0803DB2C - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB9C8 str r0, [r1] movs r0, 0x7F @@ -16117,7 +16117,7 @@ sub_803DAC0: @ 803DAC0 b _0803DB82 .pool _0803DB2C: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAA0B str r0, [r1] movs r0, 0x7F @@ -16126,15 +16126,15 @@ _0803DB2C: b _0803DB82 .pool _0803DB44: - ldr r1, =gUnknown_02022F58 - ldr r4, =gUnknown_0202433A + ldr r1, =gBattleTextBuff1 + ldr r4, =gBattleOutcome ldrb r0, [r4] strb r0, [r1] movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202420B + bl GetBankByPlayerAI + ldr r1, =gBankAttacker strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAA35 str r0, [r1] ldrb r1, [r4] @@ -16144,7 +16144,7 @@ _0803DB44: b _0803DB82 .pool _0803DB7C: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DA96D str r0, [r1] _0803DB82: @@ -16160,7 +16160,7 @@ _0803DB82: thumb_func_start sub_803DBA0 sub_803DBA0: @ 803DBA0 push {lr} - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0 strb r0, [r1] ldr r1, =gBattleTypeFlags @@ -16173,10 +16173,10 @@ sub_803DBA0: @ 803DBA0 ands r2, r0 cmp r2, 0 beq _0803DBFC - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB9C1 str r0, [r1] - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0x9 strb r0, [r1] ldr r0, =gSaveBlock2Ptr @@ -16196,17 +16196,17 @@ _0803DBFC: ands r0, r1 cmp r0, 0 beq _0803DC24 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB9C1 str r0, [r1] - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0x9 strb r0, [r1] b _0803DC6A .pool _0803DC24: - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -16217,17 +16217,17 @@ _0803DC24: beq _0803DC54 cmp r0, 0x2 beq _0803DC64 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAAF0 b _0803DC68 .pool _0803DC54: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAADB b _0803DC68 .pool _0803DC64: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAAE9 _0803DC68: str r0, [r1] @@ -16242,18 +16242,18 @@ _0803DC6A: thumb_func_start bc_80158BC bc_80158BC: @ 803DC84 - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0 strb r0, [r1] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -16261,7 +16261,7 @@ bc_80158BC: @ 803DC84 strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAAF7 str r0, [r1] ldr r1, =gUnknown_03005D04 @@ -16276,7 +16276,7 @@ sub_803DCD8: @ 803DCD8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, =gUnknown_02024083 + ldr r0, =gFightStateTracker ldrb r0, [r0] subs r0, 0xB lsls r0, 24 @@ -16291,20 +16291,20 @@ _0803DCEE: ands r1, r0 cmp r1, 0 bne _0803DDB6 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank strb r1, [r2] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r1, r0 bcs _0803DDB2 adds r5, r2, 0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r8, r0 movs r7, 0x64 ldr r6, =gPlayerParty _0803DD10: ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803DDA0 @@ -16359,7 +16359,7 @@ _0803DDA0: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -16396,12 +16396,12 @@ _0803DDD2: b _0803DE2A .pool _0803DE10: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0803DE2A ldr r1, =gUnknown_0831BD10 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -16431,7 +16431,7 @@ sub_803DE40: @ 803DE40 ldrb r0, [r0] cmp r0, 0 beq _0803DE62 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0x1 beq _0803DE80 @@ -16570,7 +16570,7 @@ _0803DF8C: bne _0803DFEC _0803DF9E: ldr r1, =gUnknown_020375F0 - ldr r5, =gUnknown_0202433A + ldr r5, =gBattleOutcome ldrb r0, [r5] strh r0, [r1] ldr r3, =gMain @@ -16616,14 +16616,14 @@ _0803DFEC: thumb_func_start bc_move_exec_returning bc_move_exec_returning: @ 803E018 push {lr} - ldr r0, =gUnknown_02024083 + ldr r0, =gFightStateTracker ldrb r0, [r0] subs r0, 0xB lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bhi _0803E060 - ldr r3, =gUnknown_020244A8 + ldr r3, =gBattleResources ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0 @@ -16647,12 +16647,12 @@ _0803E03C: b _0803E07A .pool _0803E060: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0803E07A ldr r1, =gUnknown_0831BD10 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -16668,12 +16668,12 @@ _0803E07A: thumb_func_start sub_803E08C sub_803E08C: @ 803E08C push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0803E0A8 ldr r1, =gUnknown_0831BD10 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -16696,14 +16696,14 @@ sub_803E0B8: @ 803E0B8 sub sp, 0x4 movs r0, 0x4 str r0, [sp] - ldr r6, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r6, =gBankAttacker + ldr r1, =gTurnOrder ldr r0, =gUnknown_02024082 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r6] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r3, [r1] adds r0, r3, 0 adds r0, 0x91 @@ -16716,7 +16716,7 @@ sub_803E0B8: @ 803E0B8 ands r2, r0 cmp r2, 0 beq _0803E110 - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xC b _0803E83C .pool @@ -16724,7 +16724,7 @@ _0803E110: ldr r1, =gCritMultiplier movs r0, 0x1 strb r0, [r1] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x1 strb r0, [r1, 0xE] ldr r5, =0x000001a3 @@ -16734,13 +16734,13 @@ _0803E110: strb r2, [r0] ldr r0, =gUnknown_02024212 strb r2, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r2, [r0, 0x6] - ldr r2, =gUnknown_020241E8 + ldr r2, =gCurrMovePos ldr r0, =gUnknown_020241E9 mov r9, r0 ldrb r0, [r6] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r1, [r3] adds r0, r1 adds r0, 0x80 @@ -16748,7 +16748,7 @@ _0803E110: mov r5, r9 strb r0, [r5] strb r0, [r2] - ldr r1, =gUnknown_0202433C + ldr r1, =gProtectStructs ldrb r4, [r6] lsls r0, r4, 4 adds r3, r0, r1 @@ -16761,12 +16761,12 @@ _0803E110: negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r2, =gUnknown_020241EA + ldr r2, =gCurrentMove ldr r1, =gUnknown_020241EC movs r0, 0xA5 strh r0, [r1] strh r0, [r2] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 4 @@ -16774,9 +16774,9 @@ _0803E110: str r0, [r2] movs r0, 0xA5 movs r1, 0 - bl sub_80458E0 + bl GetMoveTarget ldrb r1, [r6] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r2, [r3] b _0803E316 .pool @@ -16801,7 +16801,7 @@ _0803E1BC: cmp r7, 0 beq _0803E204 _0803E1E2: - ldr r3, =gUnknown_020241EA + ldr r3, =gCurrentMove ldr r2, =gUnknown_020241EC ldr r1, =gUnknown_02024268 lsls r0, r4, 1 @@ -16812,7 +16812,7 @@ _0803E1E2: b _0803E33C .pool _0803E204: - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs mov r12, r1 lsls r0, r4, 3 subs r0, r4 @@ -16831,7 +16831,7 @@ _0803E204: ldrh r0, [r0] cmp r1, r0 bne _0803E268 - ldr r2, =gUnknown_020241EA + ldr r2, =gCurrentMove ldr r0, =gUnknown_020241EC strh r3, [r0] strh r3, [r2] @@ -16847,9 +16847,9 @@ _0803E204: strb r0, [r5] ldrh r0, [r2] movs r1, 0 - bl sub_80458E0 + bl GetMoveTarget ldrb r1, [r6] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r2, [r3] b _0803E316 .pool @@ -16862,7 +16862,7 @@ _0803E268: strb r2, [r5] mov r0, r8 strb r2, [r0] - ldr r3, =gUnknown_020241EA + ldr r3, =gCurrentMove ldr r2, =gUnknown_020241EC ldrb r0, [r0] lsls r0, 1 @@ -16899,9 +16899,9 @@ _0803E268: strb r0, [r1, 0xE] ldrh r0, [r3] movs r1, 0 - bl sub_80458E0 + bl GetMoveTarget ldrb r1, [r6] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r2, [r3] b _0803E316 .pool @@ -16910,7 +16910,7 @@ _0803E2DC: mov r5, r8 ldrb r0, [r5] lsls r0, 1 - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r2, [r4] movs r1, 0x58 muls r1, r2 @@ -16924,15 +16924,15 @@ _0803E2DC: ldrh r2, [r2] cmp r3, r2 beq _0803E334 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldr r0, =gUnknown_020241EC strh r3, [r0] strh r3, [r1] ldrh r0, [r1] movs r1, 0 - bl sub_80458E0 + bl GetMoveTarget ldrb r1, [r4] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r2, [r2] _0803E316: adds r1, r2 @@ -16940,13 +16940,13 @@ _0803E316: b _0803E33C .pool _0803E334: - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldr r0, =gUnknown_020241EC strh r3, [r0] strh r3, [r1] _0803E33C: ldr r2, =gBattleMons - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r3, [r1] movs r0, 0x58 muls r0, r3 @@ -16956,30 +16956,30 @@ _0803E33C: cmp r0, 0 beq _0803E384 adds r0, r3, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803E37C ldr r0, =gUnknown_03005D10 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r1, [r1] strh r1, [r0, 0x22] b _0803E384 .pool _0803E37C: ldr r0, =gUnknown_03005D10 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r1, [r1] strh r1, [r0, 0x24] _0803E384: mov r1, r8 ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -16988,7 +16988,7 @@ _0803E384: cmp r0, 0 beq _0803E400 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -16999,10 +16999,10 @@ _0803E384: bne _0803E400 mov r3, r8 ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r5, 0x9] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -17015,7 +17015,7 @@ _0803E384: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0803E400 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget strb r2, [r0] b _0803E76A .pool @@ -17024,13 +17024,13 @@ _0803E400: ldr r0, [r0] movs r1, 0x1 ands r0, r1 - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker mov r8, r5 cmp r0, 0 bne _0803E412 b _0803E6E0 _0803E412: - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -17041,7 +17041,7 @@ _0803E412: b _0803E630 _0803E424: ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -17056,9 +17056,9 @@ _0803E424: b _0803E630 _0803E440: ldr r3, =gBattleMons - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r6, [r2] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, r6, r0 ldrb r1, [r0, 0xC] @@ -17078,26 +17078,26 @@ _0803E460: b _0803E630 _0803E468: adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank strb r5, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 bcs _0803E4E0 adds r4, r1, 0 _0803E480: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r6, r0 beq _0803E4CE - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r1, r0 ldrb r0, [r1, 0xC] @@ -17129,7 +17129,7 @@ _0803E4CE: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -17152,9 +17152,9 @@ _0803E4E8: ands r5, r0 cmp r5, 0 beq _0803E568 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803E548 @@ -17180,26 +17180,26 @@ _0803E548: _0803E558: movs r0, 0x2 _0803E55A: - bl battle_get_side_with_given_state - ldr r1, =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r1, =gBankTarget strb r0, [r1] b _0803E578 .pool _0803E568: - ldr r2, =gEnemyMonIndex - ldr r0, =gUnknown_0202420B + ldr r2, =gBankTarget + ldr r0, =gBankAttacker ldrb r0, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r2] _0803E578: - ldr r7, =gUnknown_02024210 + ldr r7, =gAbsentBankFlags ldrb r0, [r7] ldr r1, =gBitTable mov r8, r1 - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r1, [r5] lsls r1, 2 add r1, r8 @@ -17209,12 +17209,12 @@ _0803E578: bne _0803E592 b _0803E76A _0803E592: - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -17224,12 +17224,12 @@ _0803E592: .pool _0803E5C4: ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] ldrb r1, [r7] ldrb r2, [r5] @@ -17237,8 +17237,8 @@ _0803E5C4: add r0, r8 b _0803E74E _0803E5E2: - ldr r4, =gUnknown_02024064 - ldr r0, =gUnknown_0202407E + ldr r4, =gActiveBank + ldr r0, =gTurnOrder ldr r3, [sp] adds r0, r3, r0 ldrb r0, [r0] @@ -17250,8 +17250,8 @@ _0803E5E2: adds r1, r2 adds r1, 0x20 ldrb r1, [r1] - bl b_history__record_ability_usage_of_player - ldr r2, =gUnknown_0202437C + bl RecordAbilityBattle + ldr r2, =gSpecialStatuses ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -17261,7 +17261,7 @@ _0803E5E2: movs r2, 0x2 orrs r1, r2 strb r1, [r0] - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r4] strb r0, [r1] b _0803E76A @@ -17287,7 +17287,7 @@ _0803E630: beq _0803E6E0 mov r5, r8 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803E684 @@ -17313,13 +17313,13 @@ _0803E684: _0803E694: movs r0, 0x2 _0803E696: - bl battle_get_side_with_given_state - ldr r1, =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r1, =gBankTarget strb r0, [r1] - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -17327,12 +17327,12 @@ _0803E696: ands r1, r0 cmp r1, 0 beq _0803E76A - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -17341,15 +17341,15 @@ _0803E696: b _0803E758 .pool _0803E6E0: - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget mov r2, r8 ldrb r0, [r2] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r5] - ldr r6, =gUnknown_02024210 + ldr r6, =gAbsentBankFlags ldrb r1, [r6] ldr r7, =gBitTable ldrb r0, [r5] @@ -17360,10 +17360,10 @@ _0803E6E0: cmp r1, 0 beq _0803E76A ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -17374,12 +17374,12 @@ _0803E6E0: _0803E730: mov r1, r8 ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] ldrb r1, [r6] ldrb r2, [r5] @@ -17392,12 +17392,12 @@ _0803E74E: beq _0803E76A adds r0, r2, 0 _0803E758: - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] _0803E76A: ldr r0, =gBattleTypeFlags @@ -17408,8 +17408,8 @@ _0803E76A: adds r5, r0, 0 cmp r1, 0 beq _0803E808 - ldr r0, =gUnknown_0202433C - ldr r4, =gUnknown_0202420B + ldr r0, =gProtectStructs + ldr r4, =gBankAttacker ldrb r2, [r4] lsls r1, r2, 4 adds r1, r0 @@ -17424,7 +17424,7 @@ _0803E76A: ldrh r0, [r0, 0x28] cmp r0, 0 bne _0803E7B4 - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xC b _0803E83C .pool @@ -17435,11 +17435,11 @@ _0803E7B4: ldr r0, [r0] cmp r0, 0 beq _0803E7EC - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r2, 0 movs r0, 0x4 strb r0, [r1, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldrb r0, [r4] lsls r0, 2 adds r0, r3 @@ -17452,19 +17452,19 @@ _0803E7B4: b _0803E824 .pool _0803E7EC: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB6AD str r0, [r1] b _0803E824 .pool _0803E808: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r3, =gUnknown_082D86A8 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -17482,11 +17482,11 @@ _0803E824: ands r0, r1 cmp r0, 0 beq _0803E838 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] bl sub_81A56E8 _0803E838: - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xA _0803E83C: strb r0, [r1] @@ -17504,8 +17504,8 @@ _0803E83C: thumb_func_start bs2_8016374 bs2_8016374: @ 803E868 push {r4,lr} - ldr r3, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r3, =gBankAttacker + ldr r1, =gTurnOrder ldr r0, =gUnknown_02024082 ldrb r0, [r0] adds r0, r1 @@ -17524,7 +17524,7 @@ bs2_8016374: @ 803E868 ldrb r0, [r3] adds r0, r1 strb r2, [r0] - ldr r2, =gUnknown_02022F58 + ldr r2, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r2] movs r0, 0x7 @@ -17532,7 +17532,7 @@ bs2_8016374: @ 803E868 ldrb r4, [r3] strb r4, [r2, 0x2] ldrb r0, [r3] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x58 @@ -17540,12 +17540,12 @@ bs2_8016374: @ 803E868 strb r0, [r2, 0x3] movs r0, 0xFF strb r0, [r2, 0x4] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r4, [r0, 0x17] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAB15 str r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xA strb r0, [r1] ldr r1, =gUnknown_03005D10 @@ -17568,9 +17568,9 @@ sub_803E90C: @ 803E90C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, =gUnknown_0202420B - ldr r2, =gEnemyMonIndex - ldr r1, =gUnknown_0202407E + ldr r4, =gBankAttacker + ldr r2, =gBankTarget + ldr r1, =gTurnOrder ldr r0, =gUnknown_02024082 ldrb r0, [r0] adds r0, r1 @@ -17585,7 +17585,7 @@ sub_803E90C: @ 803E90C ldrb r0, [r4] bl sub_8045868 ldr r5, =gUnknown_02024208 - ldr r2, =gUnknown_02023864 + ldr r2, =gBattleBufferB ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -17599,14 +17599,14 @@ sub_803E90C: @ 803E90C strh r3, [r5] cmp r3, 0xC bhi _0803E998 - ldr r2, =gUnknown_02024214 + ldr r2, =gBattlescriptCurrInstr ldr r1, =gUnknown_082DBD08 ldrh r0, [r5] lsls r0, 2 adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r0, =gUnknown_02024083 + ldr r0, =gFightStateTracker mov r10, r0 b _0803EBF6 .pool @@ -17617,47 +17617,47 @@ _0803E998: lsrs r0, 16 cmp r0, 0x1 bhi _0803E9C0 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r1, =gUnknown_082DBD54 ldr r1, [r1] str r1, [r0] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker mov r10, r1 b _0803EBF6 .pool _0803E9C0: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803E9E8 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r1, =gUnknown_082DBD3C ldr r1, [r1] str r1, [r0] - ldr r2, =gUnknown_02024083 + ldr r2, =gFightStateTracker mov r10, r2 b _0803EBF6 .pool _0803E9E8: - ldr r3, =gUnknown_02024474 + ldr r3, =gBattleScripting ldrb r0, [r4] strb r0, [r3, 0x17] lsls r0, 24 lsrs r0, 25 - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r0, r1 adds r0, 0xC4 ldrb r0, [r0] subs r0, 0x1 mov r8, r4 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr mov r9, r1 ldr r6, =gUnknown_082DBD3C mov r12, r3 adds r7, r2, 0 - ldr r2, =gUnknown_02024083 + ldr r2, =gFightStateTracker mov r10, r2 cmp r0, 0x4 bls _0803EA14 @@ -17677,10 +17677,10 @@ _0803EA38: .4byte _0803EAE0 .4byte _0803EBB0 _0803EA4C: - ldr r5, =gUnknown_02024332 + ldr r5, =gBattleCommunication movs r0, 0 strb r0, [r5, 0x5] - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r0, [r2] lsrs r0, 1 ldr r1, [r7] @@ -17694,10 +17694,10 @@ _0803EA4C: beq _0803EA98 movs r0, 0x3E ands r0, r1 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr mov r9, r1 ldr r6, =gUnknown_082DBD3C - ldr r2, =gUnknown_02024083 + ldr r2, =gFightStateTracker mov r10, r2 cmp r0, 0 bne _0803EA7E @@ -17708,10 +17708,10 @@ _0803EA7E: b _0803EBDE .pool _0803EA98: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r9, r0 ldr r6, =gUnknown_082DBD3C - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker mov r10, r1 mov r4, r8 adds r3, r7, 0 @@ -17741,10 +17741,10 @@ _0803EAA8: b _0803EBDE .pool _0803EAE0: - ldr r3, =gUnknown_02024332 + ldr r3, =gBattleCommunication movs r0, 0x4 strb r0, [r3, 0x5] - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r0, [r2] lsrs r0, 1 ldr r1, [r7] @@ -17761,15 +17761,15 @@ _0803EAE0: beq _0803EB28 movs r0, 0x5 strb r0, [r3, 0x5] - ldr r2, =gUnknown_02024214 + ldr r2, =gBattlescriptCurrInstr mov r9, r2 ldr r6, =gUnknown_082DBD3C - ldr r0, =gUnknown_02024083 + ldr r0, =gFightStateTracker mov r10, r0 b _0803EBDE .pool _0803EB28: - ldr r3, =gUnknown_02022F58 + ldr r3, =gBattleTextBuff1 movs r4, 0xFD strb r4, [r3] movs r0, 0x5 @@ -17778,7 +17778,7 @@ _0803EB28: strb r2, [r3, 0x2] movs r0, 0xFF strb r0, [r3, 0x3] - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 strb r4, [r1] strb r5, [r1, 0x1] movs r0, 0xD2 @@ -17788,10 +17788,10 @@ _0803EB28: strb r0, [r1, 0x4] ldrb r0, [r6] ands r2, r0 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr mov r9, r1 ldr r6, =gUnknown_082DBD3C - ldr r0, =gUnknown_02024083 + ldr r0, =gFightStateTracker mov r10, r0 cmp r2, 0 bne _0803EB8C @@ -17836,21 +17836,21 @@ _0803EBB0: ands r1, r0 cmp r1, 0 beq _0803EBCC - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _0803EBD0 .pool _0803EBCC: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r1, [r0, 0x5] _0803EBD0: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker mov r8, r0 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr mov r9, r1 ldr r6, =gUnknown_082DBD3C - ldr r2, =gUnknown_02024083 + ldr r2, =gFightStateTracker mov r10, r2 _0803EBDE: mov r1, r8 @@ -17896,7 +17896,7 @@ sub_803EC20: @ 803EC20 ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0803EC54 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -17906,7 +17906,7 @@ sub_803EC20: @ 803EC20 .pool _0803EC54: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r1, r0, 24 _0803EC5E: @@ -17921,7 +17921,7 @@ _0803EC5E: adds r0, r1 ldrh r0, [r0, 0x2E] strh r0, [r2] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r2, r5, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -17950,7 +17950,7 @@ _0803EC9C: lsls r0, 24 cmp r0, 0 beq _0803ED38 - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r1, [r4] adds r1, 0x6C ldrb r0, [r1] @@ -17987,9 +17987,9 @@ _0803EC9C: bhi _0803ED0C b _0803EE12 _0803ED0C: - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r6, [r0] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r2, r5, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -18002,9 +18002,9 @@ _0803ED0C: b _0803ED70 .pool _0803ED38: - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r6, [r0] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r2, r5, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -18079,7 +18079,7 @@ _0803EDBC: _0803EDDA: ldrh r1, [r1, 0x6] bl __divsi3 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r1, 0x6C ldrb r2, [r1] @@ -18099,7 +18099,7 @@ _0803EE00: lsls r0, 24 lsrs r7, r0, 24 _0803EE06: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r1, 0x6C ldrb r0, [r1] @@ -18109,10 +18109,10 @@ _0803EE12: cmp r7, 0 beq _0803EE24 ldr r1, =gUnknown_02024082 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] strb r0, [r1] - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0x4 strb r0, [r1] _0803EE24: @@ -18130,8 +18130,8 @@ _0803EE24: thumb_func_start sub_803EE48 sub_803EE48: @ 803EE48 push {r4-r6,lr} - ldr r4, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r4, =gBankAttacker + ldr r1, =gTurnOrder ldr r5, =gUnknown_02024082 ldrb r0, [r5] adds r0, r1 @@ -18143,10 +18143,10 @@ sub_803EE48: @ 803EE48 ands r0, r1 cmp r0, 0 beq _0803EF0C - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] strb r1, [r5] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank movs r0, 0 strb r0, [r2] lsls r1, 24 @@ -18154,10 +18154,10 @@ sub_803EE48: @ 803EE48 beq _0803EEE0 adds r4, r2, 0 ldr r6, =gUnknown_0202421C - ldr r5, =gUnknown_0202433A + ldr r5, =gBattleOutcome _0803EE7C: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803EEBC @@ -18185,14 +18185,14 @@ _0803EECE: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bcc _0803EE7C _0803EEE0: - ldr r2, =gUnknown_0202433A + ldr r2, =gBattleOutcome ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 @@ -18208,7 +18208,7 @@ _0803EEE0: .pool _0803EF0C: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0803EF4C @@ -18219,13 +18219,13 @@ _0803EF0C: bne _0803EF98 ldrb r0, [r4] bl sub_8045868 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAB02 str r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xA b _0803EF96 .pool @@ -18241,21 +18241,21 @@ _0803EF4C: ands r0, r1 cmp r0, 0 beq _0803EF8C - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAB02 str r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xA b _0803EF96 .pool _0803EF8C: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] strb r0, [r5] - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0x6 _0803EF96: strb r0, [r1] @@ -18268,8 +18268,8 @@ _0803EF98: thumb_func_start sub_803EFA8 sub_803EFA8: @ 803EFA8 - ldr r2, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r2, =gBankAttacker + ldr r1, =gTurnOrder ldr r0, =gUnknown_02024082 ldrb r0, [r0] adds r0, r1 @@ -18280,11 +18280,11 @@ sub_803EFA8: @ 803EFA8 strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBD58 ldr r0, [r0] str r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xA strb r0, [r1] bx lr @@ -18293,8 +18293,8 @@ sub_803EFA8: @ 803EFA8 thumb_func_start bs5_8016AC0 bs5_8016AC0: @ 803EFF0 - ldr r2, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r2, =gBankAttacker + ldr r1, =gTurnOrder ldr r0, =gUnknown_02024082 ldrb r0, [r0] adds r0, r1 @@ -18312,11 +18312,11 @@ bs5_8016AC0: @ 803EFF0 ldr r1, =gUnknown_02024208 movs r0, 0x5 strh r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBD08 ldr r0, [r0, 0x14] str r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xA strb r0, [r1] bx lr @@ -18326,8 +18326,8 @@ bs5_8016AC0: @ 803EFF0 thumb_func_start sub_803F050 sub_803F050: @ 803F050 push {r4-r6,lr} - ldr r3, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r3, =gBankAttacker + ldr r1, =gTurnOrder ldr r0, =gUnknown_02024082 ldrb r0, [r0] adds r0, r1 @@ -18338,8 +18338,8 @@ sub_803F050: @ 803F050 strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r6, =gUnknown_02024332 - ldr r2, =gUnknown_02023864 + ldr r6, =gBattleCommunication + ldr r2, =gBattleBufferB ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -18361,7 +18361,7 @@ sub_803F050: @ 803F050 adds r0, 0x1 strb r0, [r1, 0x1F] _0803F096: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r1, r0, 0 adds r1, 0x7A @@ -18397,11 +18397,11 @@ _0803F0FC: _0803F0FE: strb r0, [r3] _0803F100: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBD58 ldr r0, [r0, 0x8] str r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xA strb r0, [r1] pop {r4-r6} @@ -18413,8 +18413,8 @@ _0803F100: thumb_func_start sub_803F120 sub_803F120: @ 803F120 push {r4,lr} - ldr r2, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r2, =gBankAttacker + ldr r1, =gTurnOrder ldr r0, =gUnknown_02024082 ldrb r0, [r0] adds r0, r1 @@ -18425,7 +18425,7 @@ sub_803F120: @ 803F120 strh r4, [r0] ldr r0, =gUnknown_02022E16 strh r4, [r0] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r0, [r3] adds r2, r0, 0 adds r2, 0x7C @@ -18474,20 +18474,20 @@ _0803F188: bhi _0803F1C4 adds r0, 0x1 strb r0, [r1] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] b _0803F1CA .pool _0803F1C4: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _0803F1CA: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBD58 ldr r0, [r0, 0x4] str r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xA strb r0, [r1] pop {r4} @@ -18499,8 +18499,8 @@ _0803F1CA: thumb_func_start bs8_exit_by_flight bs8_exit_by_flight: @ 803F1F0 push {r4,lr} - ldr r2, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r2, =gBankAttacker + ldr r1, =gTurnOrder ldr r4, =gUnknown_02024082 ldrb r0, [r4] adds r0, r1 @@ -18508,10 +18508,10 @@ bs8_exit_by_flight: @ 803F1F0 strb r0, [r2] movs r0, 0x11 bl audio_play - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] strb r0, [r4] - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0x4 strb r0, [r1] pop {r4} @@ -18522,8 +18522,8 @@ bs8_exit_by_flight: @ 803F1F0 thumb_func_start bs9_8016C9C bs9_8016C9C: @ 803F22C - ldr r3, =gUnknown_0202420B - ldr r1, =gUnknown_0202407E + ldr r3, =gBankAttacker + ldr r1, =gTurnOrder ldr r0, =gUnknown_02024082 ldrb r0, [r0] adds r0, r1 @@ -18534,13 +18534,13 @@ bs9_8016C9C: @ 803F22C strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] strb r2, [r1, 0x2] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -18548,11 +18548,11 @@ bs9_8016C9C: @ 803F22C strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBD58 ldr r0, [r0, 0xC] str r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xA strb r0, [r1] ldr r1, =gUnknown_0202407A @@ -18570,11 +18570,11 @@ bsB_exit_by_move: @ 803F2A4 lsrs r1, r0, 24 cmp r1, 0 bne _0803F2C0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x4D strb r1, [r0] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xC strb r0, [r1] _0803F2C0: @@ -18589,13 +18589,13 @@ bsD_proceed: @ 803F2CC ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r3, =gUnknown_02024083 + ldr r3, =gFightStateTracker ldr r2, =gUnknown_0202407A ldrb r0, [r1] adds r0, r2 ldrb r0, [r0] strb r0, [r3] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xf1e892af ands r0, r1 @@ -18607,12 +18607,12 @@ bsD_proceed: @ 803F2CC thumb_func_start bsC_8016D70 bsC_8016D70: @ 803F300 push {r4-r6,lr} - ldr r1, =gUnknown_0202407E + ldr r1, =gTurnOrder ldr r2, =gUnknown_02024082 ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] - ldr r6, =gUnknown_0202449C + ldr r6, =gBattleStruct ldr r1, [r6] adds r0, r1 adds r0, 0x5C @@ -18621,19 +18621,19 @@ bsC_8016D70: @ 803F300 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - ldr r3, =gUnknown_02024083 + ldr r3, =gFightStateTracker ldr r1, =gUnknown_0202407A ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] strb r0, [r3] bl sub_803D6A0 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xf1e892af ands r0, r1 str r0, [r2] - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove movs r1, 0 strh r1, [r0] ldr r0, =gBattleMoveDamage @@ -18641,11 +18641,11 @@ bsC_8016D70: @ 803F300 str r4, [r0] ldr r0, =gBattleMoveFlags strb r1, [r0] - ldr r5, =gUnknown_02024474 + ldr r5, =gBattleScripting strb r1, [r5, 0x18] strb r1, [r5, 0x19] ldr r2, =gUnknown_02024250 - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -18660,11 +18660,11 @@ bsC_8016D70: @ 803F300 ldr r0, =gUnknown_02024400 strh r4, [r0] strb r1, [r5, 0x14] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r1, [r0, 0x3] strb r1, [r0, 0x4] strb r1, [r5, 0x16] - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0x20 @@ -18707,12 +18707,12 @@ _0803F3E8: .4byte _0803F46C .4byte _0803F470 _0803F424: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] b _0803F47A .pool _0803F430: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] b _0803F47A .pool @@ -18725,7 +18725,7 @@ _0803F448: movs r0, 0 b _0803F47A _0803F44C: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0x17] b _0803F47A .pool @@ -18746,7 +18746,7 @@ _0803F46C: _0803F470: movs r0, 0x3 _0803F472: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 _0803F47A: @@ -18814,7 +18814,7 @@ _0803F4DE: ands r0, r1 cmp r0, 0 bne _0803F532 - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -18828,7 +18828,7 @@ _0803F4DE: ands r1, r0 cmp r1, 0 bne _0803F532 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r5, [r4] adds r1, r3, 0 adds r1, 0x9 @@ -18866,12 +18866,12 @@ sub_803F548: @ 803F548 movs r0, 0x4 mov r8, r0 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 mov r9, r0 movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bge _0803F5F0 @@ -18884,7 +18884,7 @@ sub_803F548: @ 803F548 _0803F57E: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 adds r6, r4, 0x1 @@ -18937,7 +18937,7 @@ _0803F5CE: strb r0, [r1] _0803F5E6: adds r4, r6, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0803F57E @@ -18958,7 +18958,7 @@ _0803F5F0: ands r0, r1 cmp r0, 0 bne _0803F658 - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -18973,7 +18973,7 @@ _0803F5F0: ands r1, r0 cmp r1, 0 bne _0803F658 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r5, [r4] mov r1, r8 adds r1, 0x9 @@ -19016,7 +19016,7 @@ sub_803F67C: @ 803F67C lsrs r3, r0, 24 movs r6, 0x4 movs r1, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks mov r8, r0 ldrb r0, [r0] cmp r1, r0 @@ -19091,7 +19091,7 @@ _0803F6FE: ands r0, r1 cmp r0, 0 bne _0803F762 - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -19105,7 +19105,7 @@ _0803F6FE: ands r1, r0 cmp r1, 0 bne _0803F762 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r3, [r4] adds r1, r6, 0 adds r1, 0x9 @@ -19146,11 +19146,11 @@ sub_803F790: @ 803F790 cmp r0, 0 beq _0803F7D0 movs r2, 0 - ldr r4, =gUnknown_0202406C + ldr r4, =gNoOfAllBanks ldrb r0, [r4] cmp r2, r0 bge _0803F7EE - ldr r3, =gUnknown_02024068 + ldr r3, =gBattleExecBuffer ldr r5, =gBitTable _0803F7AC: ldm r5!, {r1} @@ -19166,11 +19166,11 @@ _0803F7AC: .pool _0803F7D0: movs r2, 0 - ldr r4, =gUnknown_0202406C + ldr r4, =gNoOfAllBanks ldrb r0, [r4] cmp r2, r0 bge _0803F7EE - ldr r3, =gUnknown_02024068 + ldr r3, =gBattleExecBuffer ldr r5, =gBitTable _0803F7DE: ldr r0, [r3] @@ -19199,7 +19199,7 @@ dp01_battle_side_mark_buffer_for_execution: @ 803F800 ands r0, r1 cmp r0, 0 beq _0803F834 - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable lsls r0, r3, 2 adds r0, r1 @@ -19211,7 +19211,7 @@ dp01_battle_side_mark_buffer_for_execution: @ 803F800 b _0803F844 .pool _0803F834: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable lsls r0, r3, 2 adds r0, r1 @@ -19231,7 +19231,7 @@ sub_803F850: @ 803F850 lsls r0, 24 lsrs r7, r0, 24 movs r4, 0 - ldr r5, =gUnknown_02024068 + ldr r5, =gBattleExecBuffer ldr r1, =gBitTable lsls r0, r7, 2 adds r6, r0, r1 @@ -19251,7 +19251,7 @@ _0803F87A: lsrs r0, 24 cmp r4, r0 blt _0803F86C - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer movs r1, 0x80 lsls r1, 21 lsls r1, r7 @@ -19264,8 +19264,8 @@ _0803F87A: .pool thumb_func_end sub_803F850 - thumb_func_start b_cancel_multi_turn_move_maybe -b_cancel_multi_turn_move_maybe: @ 803F8A0 + thumb_func_start CancelMultiTurnMoves +CancelMultiTurnMoves: @ 803F8A0 lsls r0, 24 lsrs r0, 24 ldr r1, =gBattleMons @@ -19285,14 +19285,14 @@ b_cancel_multi_turn_move_maybe: @ 803F8A0 ldr r2, =0xfffffcff ands r1, r2 str r1, [r3] - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 lsls r2, r0, 2 adds r2, r1 ldr r1, [r2] ldr r3, =0xfffbff3f ands r1, r3 str r1, [r2] - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -19306,13 +19306,13 @@ b_cancel_multi_turn_move_maybe: @ 803F8A0 strb r0, [r1, 0x10] bx lr .pool - thumb_func_end b_cancel_multi_turn_move_maybe + thumb_func_end CancelMultiTurnMoves thumb_func_start sub_803F90C sub_803F90C: @ 803F90C push {lr} lsls r0, 24 - ldr r1, =gUnknown_0202433C + ldr r1, =gProtectStructs lsrs r0, 20 adds r1, r0, r1 ldrb r0, [r1] @@ -19362,7 +19362,7 @@ b_std_message: @ 803F964 adds r2, r0, 0 lsls r2, 16 lsrs r2, 16 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r1, [r4] movs r0, 0 adds r1, r2, 0 @@ -19383,14 +19383,14 @@ sub_803F988: @ 803F988 strb r3, [r0] strb r3, [r0, 0x1] movs r1, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r2, [r0] adds r6, r0, 0 cmp r1, r2 bge _0803F9B6 ldr r5, =gBitTable adds r4, r2, 0 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID _0803F9A4: ldrh r0, [r2] lsls r0, 2 @@ -19435,7 +19435,7 @@ sub_803F9EC: @ 803F9EC lsrs r5, r0, 24 movs r4, 0 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -19449,16 +19449,16 @@ sub_803F9EC: @ 803F9EC adds r0, r1 strb r4, [r0] adds r5, r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r2, [r0] mov r8, r1 cmp r4, r2 bge _0803FA4A - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r7, [r0] ldr r1, =gBitTable adds r6, r2, 0 - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID adds r2, r1, 0 _0803FA2E: ldr r0, [r2] @@ -19495,7 +19495,7 @@ sub_803FA70: @ 803FA70 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -19505,7 +19505,7 @@ sub_803FA70: @ 803FA70 b _0803FAC2 _0803FA8C: movs r3, 0x1 - ldr r5, =gUnknown_0202406C + ldr r5, =gNoOfAllBanks ldrb r0, [r5] cmp r3, r0 bge _0803FAC2 @@ -19513,7 +19513,7 @@ _0803FA8C: mov r12, r0 movs r7, 0x2 ldr r6, =gBitTable - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r4, r0, r1 _0803FAA4: diff --git a/asm/rom_8045FFC.s b/asm/rom_8045FFC.s index a5ea96339..aad4aeb4a 100644 --- a/asm/rom_8045FFC.s +++ b/asm/rom_8045FFC.s @@ -12,18 +12,18 @@ atk00_attackcanceler: @ 8045FFC mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0 beq _08046020 - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xC strb r0, [r1] b _08046398 .pool _08046020: ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -31,7 +31,7 @@ _08046020: ldrh r0, [r0, 0x28] cmp r0, 0 bne _08046064 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 2 @@ -42,7 +42,7 @@ _08046020: lsls r0, 12 orrs r1, r0 str r1, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082D8A4E b _08046396 .pool @@ -54,22 +54,22 @@ _08046064: beq _08046072 b _08046398 _08046072: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] str r2, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0804608A b _08046398 _0804608A: ldr r4, =gBattleMons - ldr r0, =gUnknown_020241E8 + ldr r0, =gCurrMovePos ldrb r1, [r0] - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r2, [r3] movs r0, 0x58 muls r2, r0 @@ -78,10 +78,10 @@ _0804608A: adds r0, 0x24 adds r1, r0 ldrb r0, [r1] - ldr r5, =gUnknown_02024280 + ldr r5, =gHitMarker cmp r0, 0 bne _08046108 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] cmp r0, 0xA5 beq _08046108 @@ -99,7 +99,7 @@ _0804608A: ands r0, r1 cmp r0, 0 bne _08046108 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB07A str r0, [r1] ldr r2, =gBattleMoveFlags @@ -152,14 +152,14 @@ _08046150: b _08046398 .pool _08046160: - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 18 orrs r0, r1 str r0, [r2] - ldr r2, =gUnknown_0202433C - ldr r1, =gEnemyMonIndex + ldr r2, =gProtectStructs + ldr r1, =gBankTarget ldrb r3, [r1] lsls r0, r3, 4 adds r0, r2 @@ -170,7 +170,7 @@ _08046160: cmp r0, 0 bge _080461E8 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -181,7 +181,7 @@ _08046160: ands r0, r1 cmp r0, 0 beq _080461E8 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] ldr r2, =0x00000115 adds r1, r3, 0 @@ -196,21 +196,21 @@ _08046160: ands r0, r2 strb r0, [r1] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB194 b _08046396 .pool _080461E8: movs r2, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r2, r0 bge _0804622A - ldr r6, =gUnknown_0202433C + ldr r6, =gProtectStructs ldr r1, =gBattleMoves mov r12, r1 adds r5, r0, 0 - ldr r7, =gUnknown_0202407E + ldr r7, =gTurnOrder _080461FC: adds r4, r2, r7 ldrb r3, [r4] @@ -220,7 +220,7 @@ _080461FC: lsls r0, 26 cmp r0, 0 bge _08046224 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -237,7 +237,7 @@ _08046224: cmp r2, r5 blt _080461FC _0804622A: - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses mov r1, r8 ldrb r2, [r1] lsls r1, r2, 2 @@ -252,17 +252,17 @@ _0804622A: negs r0, r0 ands r0, r3 strb r0, [r1] - ldr r4, =gUnknown_0202420A + ldr r4, =gLastUsedAbility movs r0, 0x1F strb r0, [r4] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB53E str r0, [r1] mov r1, r8 ldrb r0, [r1] ldrb r1, [r4] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _08046398 .pool _08046288: @@ -275,7 +275,7 @@ _08046288: b _08046390 _08046296: ldr r1, =gBattleMoves - ldr r2, =gUnknown_020241EA + ldr r2, =gCurrentMove ldrh r3, [r2] lsls r0, r3, 1 adds r0, r3 @@ -290,7 +290,7 @@ _08046296: cmp r3, 0xAE bne _080462D4 ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -312,7 +312,7 @@ _080462D4: cmp r0, 0 beq _080462FA ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -325,16 +325,16 @@ _080462D4: cmp r0, 0 beq _08046390 _080462FA: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves ldr r2, =gBattleMoveFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] ldr r1, =gUnknown_02024250 - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r0, [r3] lsls r0, 1 adds r0, r1 @@ -345,13 +345,13 @@ _080462FA: lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x6] b _08046390 .pool _08046350: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] ldr r2, =0x00000121 adds r1, r3, 0 @@ -364,16 +364,16 @@ _08046350: negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r4] strb r0, [r1, 0x17] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB1AC b _08046396 .pool _08046390: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 _08046396: @@ -397,7 +397,7 @@ mcmd_jump_if_move_not_executed: @ 80463AC lsrs r0, 24 lsls r1, 16 lsrs r6, r1, 16 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r5, [r1] adds r4, r5, r0 ldr r0, =gBattleMoveFlags @@ -407,7 +407,7 @@ mcmd_jump_if_move_not_executed: @ 80463AC cmp r0, 0 beq _0804640C ldr r1, =gUnknown_02024250 - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r0, [r3] lsls r0, 1 adds r0, r1 @@ -432,18 +432,18 @@ mcmd_jump_if_move_not_executed: @ 80463AC .pool _0804640C: bl b_feature_update_destiny_bond - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] str r6, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0804642A _08046426: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr str r4, [r0] _0804642A: add sp, 0x4 @@ -456,8 +456,8 @@ _0804642A: thumb_func_start atk40_801DBA0 atk40_801DBA0: @ 804643C push {lr} - ldr r1, =gUnknown_0202433C - ldr r0, =gEnemyMonIndex + ldr r1, =gProtectStructs + ldr r0, =gBankTarget ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -466,7 +466,7 @@ atk40_801DBA0: @ 804643C cmp r0, 0 beq _0804649C ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -485,13 +485,13 @@ atk40_801DBA0: @ 804643C movs r0, 0x5 movs r1, 0 bl mcmd_jump_if_move_not_executed - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x6] b _080464A4 .pool _0804649C: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -507,8 +507,8 @@ sub_80464AC: @ 80464AC lsls r0, 16 lsrs r3, r0, 16 movs r4, 0 - ldr r1, =gUnknown_0202433C - ldr r0, =gEnemyMonIndex + ldr r1, =gProtectStructs + ldr r0, =gBankTarget ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -517,7 +517,7 @@ sub_80464AC: @ 80464AC cmp r0, 0 beq _080464F8 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -536,7 +536,7 @@ sub_80464AC: @ 80464AC movs r0, 0x7 adds r1, r3, 0 bl mcmd_jump_if_move_not_executed - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x6] movs r4, 0x1 @@ -554,8 +554,8 @@ sub_8046518: @ 8046518 sub sp, 0x4 lsls r0, 16 lsrs r5, r0, 16 - ldr r2, =gUnknown_020242AC - ldr r3, =gEnemyMonIndex + ldr r2, =gStatuses3 + ldr r3, =gBankTarget ldrb r4, [r3] lsls r0, r4, 2 adds r0, r2 @@ -565,18 +565,18 @@ sub_8046518: @ 8046518 adds r6, r2, 0 cmp r1, 0 beq _0804654A - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r1 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 beq _08046634 _0804654A: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r1, [r0] movs r2, 0x80 lsls r2, 9 @@ -646,7 +646,7 @@ _080465D2: movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 lsls r4, r5, 1 @@ -657,7 +657,7 @@ _080465D2: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08046622 @@ -708,7 +708,7 @@ atk01_accuracycheck: @ 8046660 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r5, [r0] ldrb r6, [r5, 0x5] ldrb r1, [r5, 0x6] @@ -720,8 +720,8 @@ atk01_accuracycheck: @ 8046660 adds r7, r0, 0 cmp r1, 0x1 bhi _0804671C - ldr r2, =gUnknown_020242AC - ldr r3, =gEnemyMonIndex + ldr r2, =gStatuses3 + ldr r3, =gBankTarget ldrb r4, [r3] lsls r0, r4, 2 adds r0, r2 @@ -733,12 +733,12 @@ atk01_accuracycheck: @ 8046660 ldr r0, =0x0000ffff cmp r6, r0 bne _080466D0 - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r1 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 @@ -778,7 +778,7 @@ _08046700: beq _0804670E b _080469D2 _0804670E: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x7 str r0, [r1] @@ -787,10 +787,10 @@ _0804670E: _0804671C: cmp r6, 0 bne _08046724 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r6, [r0] _08046724: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -826,7 +826,7 @@ _08046760: b _080469D2 _0804676E: ldr r3, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] movs r2, 0x58 adds r4, r0, 0 @@ -840,7 +840,7 @@ _0804676E: ands r0, r1 cmp r0, 0 beq _080467A8 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -848,7 +848,7 @@ _0804676E: b _080467BE .pool _080467A8: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -884,7 +884,7 @@ _080467D0: movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 str r4, [sp, 0x4] @@ -895,7 +895,7 @@ _080467D0: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08046822 @@ -924,7 +924,7 @@ _08046822: lsls r0, 16 lsrs r4, r0, 16 ldr r7, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] movs r5, 0x58 muls r0, r5 @@ -947,7 +947,7 @@ _08046860: movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -957,11 +957,11 @@ _08046860: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _080468B8 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] muls r0, r5 adds r0, r7 @@ -984,7 +984,7 @@ _08046860: lsrs r4, r0, 16 _080468B8: ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -1005,7 +1005,7 @@ _080468B8: lsls r0, 16 lsrs r4, r0, 16 _080468E4: - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget mov r8, r2 ldrb r2, [r2] movs r7, 0x58 @@ -1016,7 +1016,7 @@ _080468E4: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _08046928 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -1027,7 +1027,7 @@ _080468E4: .pool _08046928: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r5, r0, 24 mov r1, r8 @@ -1035,12 +1035,12 @@ _08046928: muls r0, r7 add r0, r9 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r2, r0, 24 _08046944: ldr r0, =gUnknown_0202420F - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r1, [r1] strb r1, [r0] cmp r5, 0x16 @@ -1085,12 +1085,12 @@ _08046960: cmp r0, 0x20 bne _080469C0 _080469A2: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 b _080469C4 .pool _080469C0: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 _080469C4: strb r0, [r1, 0x6] @@ -1114,18 +1114,18 @@ _080469D2: thumb_func_start atk02_attackstring atk02_attackstring: @ 80469E8 push {r4,r5,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r5, [r0] cmp r5, 0 bne _08046A20 - ldr r4, =gUnknown_02024280 + ldr r4, =gHitMarker ldr r0, [r4] movs r1, 0xC0 lsls r1, 3 ands r0, r1 cmp r0, 0 bne _08046A14 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x4 bl b_std_message @@ -1135,11 +1135,11 @@ atk02_attackstring: @ 80469E8 orrs r0, r1 str r0, [r4] _08046A14: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r1, [r0] adds r1, 0x1 str r1, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r5, [r0, 0x7] _08046A20: pop {r4,r5} @@ -1157,14 +1157,14 @@ atk03_ppreduce: @ 8046A3C push {r5-r7} sub sp, 0x4 movs r6, 0x1 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _08046A54 b _08046BEE _08046A54: - ldr r1, =gUnknown_0202437C - ldr r2, =gUnknown_0202420B + ldr r1, =gSpecialStatuses + ldr r2, =gBankAttacker ldrb r3, [r2] lsls r0, r3, 2 adds r0, r3 @@ -1177,7 +1177,7 @@ _08046A54: cmp r4, 0 bne _08046AF6 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1202,7 +1202,7 @@ _08046AA6: adds r1, r3, 0 movs r2, 0x2E movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 adds r6, r0, 0x1 @@ -1215,13 +1215,13 @@ _08046ABC: movs r0, 0x10 movs r2, 0x2E movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 adds r6, r0 b _08046AF6 _08046AD6: - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget mov r2, r9 ldrb r0, [r2] ldrb r7, [r1] @@ -1238,7 +1238,7 @@ _08046AD6: bne _08046AF6 adds r6, 0x1 _08046AF6: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r4, [r0] movs r0, 0xA0 lsls r0, 4 @@ -1246,8 +1246,8 @@ _08046AF6: cmp r4, 0 bne _08046BDC ldr r2, =gBattleMons - ldr r3, =gUnknown_020241E8 - ldr r1, =gUnknown_0202420B + ldr r3, =gCurrMovePos + ldr r1, =gBankAttacker ldrb r5, [r1] movs r0, 0x58 mov r8, r0 @@ -1265,7 +1265,7 @@ _08046AF6: adds r7, r3, 0 cmp r0, 0 beq _08046BDC - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r5, 4 adds r1, r0 ldrb r0, [r1, 0x2] @@ -1305,7 +1305,7 @@ _08046B72: ands r0, r1 cmp r0, 0 bne _08046BDC - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -1320,7 +1320,7 @@ _08046B72: ands r1, r0 cmp r1, 0 bne _08046BDC - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r3, [r0] ldrb r1, [r7] adds r1, 0x9 @@ -1343,12 +1343,12 @@ _08046B72: ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution _08046BDC: - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xfffff7ff ands r0, r1 str r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -1368,7 +1368,7 @@ _08046BEE: atk04_critcalc: @ 8046C18 push {r4-r7,lr} ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -1376,7 +1376,7 @@ atk04_critcalc: @ 8046C18 ldrh r0, [r0, 0x2E] cmp r0, 0xAF bne _08046C48 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -1385,12 +1385,12 @@ atk04_critcalc: @ 8046C18 b _08046C50 .pool _08046C48: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r6, r0, 24 _08046C50: ldr r1, =gUnknown_0202420F - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r0, [r3] strb r0, [r1] ldr r4, =gBattleMons @@ -1410,7 +1410,7 @@ _08046C50: movs r0, 0x2 ands r5, r0 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1477,7 +1477,7 @@ _08046CF2: bls _08046D00 movs r5, 0x4 _08046D00: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -1488,7 +1488,7 @@ _08046D00: beq _08046D70 cmp r4, 0x4B beq _08046D70 - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 mov r2, r12 ldrb r0, [r2] lsls r0, 2 @@ -1526,7 +1526,7 @@ _08046D70: movs r0, 0x1 _08046D74: strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -1541,15 +1541,15 @@ atk05_cmd5: @ 8046D8C push {r4-r7,lr} sub sp, 0x10 ldr r4, =gUnknown_0202428E - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 lsls r1, 1 adds r1, r4 ldrh r3, [r1] - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] movs r4, 0x58 muls r0, r4 @@ -1558,12 +1558,12 @@ atk05_cmd5: @ 8046D8C ldrb r1, [r5] muls r1, r4 adds r1, r2 - ldr r7, =gUnknown_020241EA + ldr r7, =gCurrentMove ldrh r2, [r7] ldr r4, =gUnknown_02024400 ldrh r4, [r4] str r4, [sp] - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r4, [r4] ldrb r4, [r4, 0x13] str r4, [sp, 0x4] @@ -1576,12 +1576,12 @@ atk05_cmd5: @ 8046D8C ldr r1, =gCritMultiplier ldrb r1, [r1] muls r1, r0 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0xE] adds r3, r1, 0 muls r3, r0 str r3, [r4] - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -1603,8 +1603,8 @@ atk05_cmd5: @ 8046D8C lsls r0, r3, 1 str r0, [r4] _08046E10: - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -1620,7 +1620,7 @@ _08046E10: bl __divsi3 str r0, [r4] _08046E32: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -1644,7 +1644,7 @@ sub_8046E7C: @ 8046E7C lsrs r5, 24 ldr r4, =gUnknown_0202428E adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 lsls r1, 1 @@ -1657,13 +1657,13 @@ sub_8046E7C: @ 8046E7C adds r0, r2 muls r1, r5 adds r1, r2 - ldr r2, =gUnknown_020241EA + ldr r2, =gCurrentMove mov r8, r2 ldrh r2, [r2] ldr r6, =gUnknown_02024400 ldrh r4, [r6] str r4, [sp] - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r4, [r4] ldrb r4, [r4, 0x13] str r4, [sp, 0x4] @@ -1676,12 +1676,12 @@ sub_8046E7C: @ 8046E7C ldr r1, =gCritMultiplier ldrb r1, [r1] muls r1, r0 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0xE] adds r3, r1, 0 muls r3, r0 str r3, [r4] - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 lsls r0, r7, 2 adds r0, r1 ldr r0, [r0] @@ -1703,7 +1703,7 @@ sub_8046E7C: @ 8046E7C lsls r0, r3, 1 str r0, [r4] _08046F0A: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r7, 4 adds r1, r0 ldrb r0, [r1] @@ -1770,7 +1770,7 @@ _08046F9A: .pool _08046FB0: ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1798,7 +1798,7 @@ _08046FEC: b _0804702E _08046FF0: ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -1840,13 +1840,13 @@ sub_8047038: @ 8047038 push {r7} sub sp, 0x8 movs r3, 0 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r0, [r1] cmp r0, 0xA5 bne _0804704C b _08047260 _0804704C: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -1868,7 +1868,7 @@ _08047068: mov r8, r0 _08047078: ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -1896,7 +1896,7 @@ _0804709A: str r0, [r4] ldr r3, [sp, 0x4] _080470B0: - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -1909,7 +1909,7 @@ _080470B0: mov r1, r8 cmp r1, 0x4 bne _08047128 - ldr r3, =gUnknown_0202420A + ldr r3, =gLastUsedAbility strb r0, [r3] ldr r2, =gBattleMoveFlags ldrb r0, [r2] @@ -1927,12 +1927,12 @@ _080470B0: lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication mov r1, r8 strb r1, [r0, 0x6] ldrb r0, [r4] ldrb r1, [r3] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _080471C4 .pool _08047128: @@ -1954,7 +1954,7 @@ _0804713C: adds r1, r3, 0x1 adds r1, r5 ldr r2, =gBattleMons - ldr r7, =gEnemyMonIndex + ldr r7, =gBankTarget ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -1994,7 +1994,7 @@ _08047172: _08047198: adds r3, 0x3 ldr r5, =gBattleMons - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldr r2, =gUnknown_0831ACE8 _080471A0: adds r0, r3, r2 @@ -2018,7 +2018,7 @@ _080471A4: beq _08047138 _080471C4: ldr r2, =gBattleMons - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -2027,9 +2027,9 @@ _080471C4: ldrb r6, [r0] cmp r6, 0x19 bne _08047242 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - ldr r7, =gUnknown_020241EA + ldr r7, =gCurrentMove ldrh r1, [r7] bl move_weather_interaction lsls r0, 24 @@ -2056,7 +2056,7 @@ _08047200: ldrb r0, [r0, 0x1] cmp r0, 0 beq _08047242 - ldr r3, =gUnknown_0202420A + ldr r3, =gLastUsedAbility strb r6, [r3] movs r0, 0x1 orrs r0, r4 @@ -2073,12 +2073,12 @@ _08047200: lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x6] ldrb r0, [r5] ldrb r1, [r3] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle _08047242: ldr r0, =gBattleMoveFlags ldrb r1, [r0] @@ -2086,8 +2086,8 @@ _08047242: ands r0, r1 cmp r0, 0 beq _08047260 - ldr r2, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r2, =gProtectStructs + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -2096,7 +2096,7 @@ _08047242: orrs r0, r2 strb r0, [r1, 0x1] _08047260: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -2117,7 +2117,7 @@ b_wonderguard_and_levitate: @ 80472A8 push {r6,r7} movs r6, 0 movs r5, 0 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] mov r9, r0 cmp r1, 0xA5 @@ -2134,7 +2134,7 @@ _080472C0: bne _080472D2 b _08047508 _080472D2: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -2151,7 +2151,7 @@ _080472F4: mov r12, r1 _080472F8: ldr r2, =gBattleMons - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -2165,14 +2165,14 @@ _080472F8: mov r0, r12 cmp r0, 0x4 bne _0804733C - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r1, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication mov r1, r12 strb r1, [r0, 0x6] ldrb r0, [r3] movs r1, 0x1A - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _08047508 .pool _0804733C: @@ -2212,8 +2212,8 @@ _08047356: movs r1, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r2, [r0] lsls r2, 4 adds r2, r1 @@ -2248,8 +2248,8 @@ _08047396: movs r1, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r2, [r0] lsls r2, 4 adds r2, r1 @@ -2381,7 +2381,7 @@ _080474B2: ldrb r4, [r0] cmp r4, 0x19 bne _08047508 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] mov r2, r9 ldrh r1, [r2] @@ -2404,15 +2404,15 @@ _080474B2: ldrb r0, [r0, 0x1] cmp r0, 0 beq _08047508 - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r4, [r0] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x6] mov r1, r8 ldrb r0, [r1] movs r1, 0x19 - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle _08047508: pop {r3,r4} mov r8, r3 @@ -2950,7 +2950,7 @@ atk07_cmd7: @ 80478F4 str r0, [r4] _08047926: ldr r7, =gBattleMons - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -2959,7 +2959,7 @@ _08047926: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0804795C - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -2970,19 +2970,19 @@ _08047926: .pool _0804795C: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r6] muls r0, r5 adds r0, r7 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r6, r0, 24 _08047976: ldr r1, =gUnknown_0202420F - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -2999,7 +2999,7 @@ _08047976: ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -3011,7 +3011,7 @@ _08047976: strb r1, [r0] _080479B4: ldr r2, =gBattleMons - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -3026,7 +3026,7 @@ _080479B4: cmp r1, 0 bne _08047A84 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3035,14 +3035,14 @@ _080479B4: ldrb r0, [r0] cmp r0, 0x65 beq _08047A06 - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 blt _08047A06 - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r4, 2 adds r1, r4 lsls r1, 2 @@ -3063,7 +3063,7 @@ _08047A06: bgt _08047A84 subs r0, r1, 0x1 str r0, [r2] - ldr r1, =gUnknown_0202433C + ldr r1, =gProtectStructs ldrb r3, [r3] lsls r0, r3, 4 adds r0, r1 @@ -3079,7 +3079,7 @@ _08047A06: b _08047A84 .pool _08047A5C: - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -3100,7 +3100,7 @@ _08047A5C: ldrh r0, [r0, 0x2E] strh r0, [r1] _08047A84: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3137,7 +3137,7 @@ atk08_cmd8: @ 8047AA4 str r0, [r4] _08047AD6: ldr r7, =gBattleMons - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -3146,7 +3146,7 @@ _08047AD6: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _08047B0C - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -3157,19 +3157,19 @@ _08047AD6: .pool _08047B0C: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r6] muls r0, r5 adds r0, r7 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r6, r0, 24 _08047B26: ldr r1, =gUnknown_0202420F - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -3186,7 +3186,7 @@ _08047B26: ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -3198,7 +3198,7 @@ _08047B26: strb r1, [r0] _08047B64: ldr r4, =gBattleMons - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r2, [r6] movs r7, 0x58 adds r3, r2, 0 @@ -3212,14 +3212,14 @@ _08047B64: ands r0, r1 cmp r0, 0 bne _08047C10 - ldr r5, =gUnknown_0202433C + ldr r5, =gProtectStructs lsls r0, r2, 4 adds r0, r5 ldrb r0, [r0] lsls r0, 30 cmp r0, 0 blt _08047BA2 - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -3252,7 +3252,7 @@ _08047BA2: b _08047C10 .pool _08047BE8: - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -3273,7 +3273,7 @@ _08047BE8: ldrh r0, [r0, 0x2E] strh r0, [r1] _08047C10: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3287,17 +3287,17 @@ _08047C10: atk09_attackanimation: @ 8047C30 push {r4-r7,lr} sub sp, 0x10 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _08047C3E b _08047DB6 _08047C3E: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 - ldr r5, =gUnknown_020241EA + ldr r5, =gCurrentMove cmp r0, 0 beq _08047C8C ldrh r0, [r5] @@ -3305,13 +3305,13 @@ _08047C3E: beq _08047C8C cmp r0, 0xA4 beq _08047C8C - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DABB9 str r0, [r4] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x18] adds r0, 0x1 strb r0, [r1, 0x18] @@ -3341,7 +3341,7 @@ _08047C8C: cmp r0, 0 beq _08047CBA _08047CB2: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0x19] cmp r0, 0 bne _08047D88 @@ -3352,12 +3352,12 @@ _08047CBA: ands r0, r1 cmp r0, 0 bne _08047DA8 - ldr r1, =gUnknown_02024064 - ldr r3, =gUnknown_0202420B + ldr r1, =gActiveBank + ldr r3, =gBankAttacker ldrb r0, [r3] strb r0, [r1] ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 adds r4, r1, 0 @@ -3400,9 +3400,9 @@ _08047D42: ldr r4, =gBattleMoveDamage _08047D44: ldrh r1, [r5] - ldr r5, =gUnknown_02024474 + ldr r5, =gBattleScripting ldrb r2, [r5, 0x18] - ldr r0, =gUnknown_020244E0 + ldr r0, =gBattleMovePower ldrh r3, [r0] ldr r0, [r4] str r0, [sp] @@ -3417,7 +3417,7 @@ _08047D44: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r4, =gUnknown_020242BC + ldr r4, =gDisableStructs adds r0, r4 str r0, [sp, 0x8] str r6, [sp, 0xC] @@ -3432,14 +3432,14 @@ _08047D44: ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution _08047D88: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] b _08047DB6 .pool _08047DA8: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -3456,11 +3456,11 @@ _08047DB6: thumb_func_start sub_8047DC8 sub_8047DC8: @ 8047DC8 push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08047DDA - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -3473,7 +3473,7 @@ _08047DDA: thumb_func_start atk0B_graphicalhpupdate atk0B_graphicalhpupdate: @ 8047DE8 push {r4,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08047EAA @@ -3483,11 +3483,11 @@ atk0B_graphicalhpupdate: @ 8047DE8 ands r0, r1 cmp r0, 0 bne _08047EA2 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank strb r0, [r2] ldr r1, =gBattleMons ldrb r2, [r2] @@ -3501,7 +3501,7 @@ atk0B_graphicalhpupdate: @ 8047DE8 ands r0, r1 cmp r0, 0 beq _08047E68 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -3509,7 +3509,7 @@ atk0B_graphicalhpupdate: @ 8047DE8 ldrb r0, [r1, 0xA] cmp r0, 0 beq _08047E68 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -3532,11 +3532,11 @@ _08047E68: _08047E76: movs r0, 0 bl dp01_build_cmdbuf_x18_0_aa_health_bar_update - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08047EA2 @@ -3550,7 +3550,7 @@ _08047E76: orrs r1, r2 strb r1, [r0, 0x5] _08047EA2: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -3565,13 +3565,13 @@ _08047EAA: atk0C_datahpupdate: @ 8047EC4 push {r4-r7,lr} sub sp, 0x4 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _08047ED2 b _080482A2 _08047ED2: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x13] cmp r1, 0 @@ -3586,7 +3586,7 @@ _08047ED2: .pool _08047EF4: ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -3602,11 +3602,11 @@ _08047F04: beq _08047F12 b _08048274 _08047F12: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank strb r0, [r7] ldr r1, =gBattleMons ldrb r2, [r7] @@ -3620,7 +3620,7 @@ _08047F12: ands r0, r1 cmp r0, 0 beq _08048028 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -3629,7 +3629,7 @@ _08047F12: mov r12, r0 cmp r1, 0 beq _08048028 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r3, [r0] movs r0, 0x80 lsls r0, 1 @@ -3641,7 +3641,7 @@ _08047F12: ldr r4, [r6] cmp r5, r4 blt _08047FBC - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -3667,7 +3667,7 @@ _08047F76: b _08047FEC .pool _08047FBC: - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -3693,7 +3693,7 @@ _08047FD0: add r0, r12 strb r3, [r0, 0xA] _08047FEC: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -3704,7 +3704,7 @@ _08047FEC: beq _08048000 b _0804829A _08048000: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x2 str r0, [r4] @@ -3714,7 +3714,7 @@ _08048000: b _080482A2 .pool _08048028: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r2, [r0] ldr r1, =0xfffffeff ands r2, r1 @@ -3726,7 +3726,7 @@ _08048028: cmp r5, 0 bge _0804807C ldr r4, =gBattleMons - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] movs r3, 0x58 adds r1, r0, 0 @@ -3758,19 +3758,19 @@ _0804807C: ands r2, r0 mov r0, r12 str r2, [r0] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank b _080480E0 .pool _08048098: ldr r0, =gUnknown_020241F8 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r1, [r2] lsls r1, 2 adds r1, r0 ldr r0, [r1] adds r0, r5 str r0, [r1] - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] adds r5, r2, 0 @@ -3779,14 +3779,14 @@ _08048098: ldr r1, =gUnknown_02024288 ldrb r0, [r5] adds r0, r1 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker b _080480DC .pool _080480D4: ldr r1, =gUnknown_02024288 ldrb r0, [r5] adds r0, r1 - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget _080480DC: ldrb r1, [r1] strb r1, [r0] @@ -3817,7 +3817,7 @@ _08048110: strh r1, [r0, 0x28] adds r7, r2, 0 _08048120: - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -3847,11 +3847,11 @@ _08048148: ands r0, r1 cmp r0, 0 bne _080481CC - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] cmp r0, 0xDC beq _080481CC - ldr r3, =gUnknown_0202433C + ldr r3, =gProtectStructs ldrb r0, [r5] lsls r0, 4 adds r1, r3, 0x4 @@ -3866,7 +3866,7 @@ _08048148: adds r1, 0x8 adds r0, r1 str r2, [r0] - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -3874,14 +3874,14 @@ _08048148: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker b _080481B4 .pool _080481AC: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget _080481B4: ldrb r1, [r2] strb r1, [r0, 0xC] @@ -3905,7 +3905,7 @@ _080481D0: ands r0, r1 cmp r0, 0 bne _0804823A - ldr r3, =gUnknown_0202433C + ldr r3, =gProtectStructs ldrb r0, [r5] lsls r0, 4 adds r1, r3, 0 @@ -3921,7 +3921,7 @@ _080481D0: adds r1, 0xC adds r0, r1 str r2, [r0] - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -3929,14 +3929,14 @@ _080481D0: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker b _08048228 .pool _08048220: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget _08048228: ldrb r1, [r2] strb r1, [r0, 0xD] @@ -3970,13 +3970,13 @@ _0804823A: b _0804829A .pool _08048274: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank strb r0, [r1] - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r1] lsls r0, r1, 2 adds r0, r1 @@ -3989,7 +3989,7 @@ _08048274: ldr r0, =0x0000ffff str r0, [r1] _0804829A: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -4004,7 +4004,7 @@ _080482A2: thumb_func_start atk0D_critmessage atk0D_critmessage: @ 80482BC push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _080482F2 @@ -4018,15 +4018,15 @@ atk0D_critmessage: @ 80482BC ands r0, r1 cmp r0, 0 bne _080482EA - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0xD9 bl b_std_message - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x7] _080482EA: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -4039,12 +4039,12 @@ _080482F2: thumb_func_start atk0E_missmessage atk0E_missmessage: @ 8048310 push {r4,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _080483D0 - ldr r4, =gUnknown_02024064 - ldr r0, =gEnemyMonIndex + ldr r4, =gActiveBank + ldr r0, =gBankTarget ldrb r0, [r0] strb r0, [r4] ldr r1, =gBattleMoveFlags @@ -4109,7 +4109,7 @@ _08048392: movs r1, 0xC _0804839E: bl dp01_build_cmdbuf_x2B_aa_0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution b _080483C8 @@ -4122,11 +4122,11 @@ _080483B0: movs r0, 0 movs r1, 0xD bl dp01_build_cmdbuf_x2B_aa_0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution _080483C8: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -4141,7 +4141,7 @@ _080483D0: atk0F_resultmessage: @ 80483E0 push {r4-r7,lr} movs r3, 0 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _080483EE @@ -4153,7 +4153,7 @@ _080483EE: adds r0, r4, 0 ands r0, r2 adds r6, r1, 0 - ldr r7, =gUnknown_02024332 + ldr r7, =gBattleCommunication cmp r0, 0 beq _0804842C movs r0, 0x8 @@ -4222,7 +4222,7 @@ _08048474: _08048478: ldr r4, =gUnknown_02024208 ldr r2, =gBattleMons - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -4236,7 +4236,7 @@ _08048478: ands r0, r5 strb r0, [r6] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB816 b _0804857E .pool @@ -4263,7 +4263,7 @@ _080484C8: ands r0, r1 strb r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB1CE b _0804857E .pool @@ -4276,7 +4276,7 @@ _080484F0: ands r0, r5 strb r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB1C7 b _0804857E .pool @@ -4287,7 +4287,7 @@ _08048510: beq _08048558 ldr r4, =gUnknown_02024208 ldr r2, =gBattleMons - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -4301,7 +4301,7 @@ _08048510: ands r0, r5 strb r0, [r6] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB816 b _0804857E .pool @@ -4322,11 +4322,11 @@ _0804856A: beq _08048578 _0804856E: adds r0, r3, 0 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r1, [r1] bl b_std_message _08048578: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 _0804857E: @@ -4341,23 +4341,23 @@ _08048580: thumb_func_start atk10_printstring atk10_printstring: @ 8048590 push {r4,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _080485BA - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r1, [r4] ldrb r0, [r1, 0x1] ldrb r1, [r1, 0x2] lsls r1, 8 orrs r0, r1 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r1, [r1] bl b_std_message ldr r0, [r4] adds r0, 0x3 str r0, [r4] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x7] _080485BA: @@ -4370,11 +4370,11 @@ _080485BA: thumb_func_start atk11_printstring2 atk11_printstring2: @ 80485D0 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r5, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r5] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -4387,7 +4387,7 @@ atk11_printstring2: @ 80485D0 ldr r0, [r4] adds r0, 0x3 str r0, [r4] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x7] pop {r4,r5} @@ -4399,22 +4399,22 @@ atk11_printstring2: @ 80485D0 thumb_func_start atk12_waitmessage atk12_waitmessage: @ 8048614 push {r4-r6,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r4, [r0] cmp r4, 0 bne _08048662 - ldr r6, =gUnknown_02024332 + ldr r6, =gBattleCommunication ldrb r0, [r6, 0x7] cmp r0, 0 bne _0804863C - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 str r0, [r1] b _08048662 .pool _0804863C: - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -4443,11 +4443,11 @@ _08048662: thumb_func_start atk13_printfromtable atk13_printfromtable: @ 8048670 push {r4,r5,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _080486AE - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r2, [r4] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -4459,12 +4459,12 @@ atk13_printfromtable: @ 8048670 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r5, =gUnknown_02024332 + ldr r5, =gBattleCommunication ldrb r0, [r5, 0x5] lsls r0, 1 adds r1, r0 ldrh r0, [r1] - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r1, [r1] bl b_std_message ldr r0, [r4] @@ -4482,11 +4482,11 @@ _080486AE: thumb_func_start atk14_printfromtable2 atk14_printfromtable2: @ 80486C4 push {r4-r6,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804870E - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -4498,12 +4498,12 @@ atk14_printfromtable2: @ 80486C4 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r6, =gUnknown_02024332 + ldr r6, =gBattleCommunication ldrb r0, [r6, 0x5] lsls r0, 1 adds r1, r0 - ldr r4, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r4] ldrh r1, [r1] @@ -4529,11 +4529,11 @@ sub_8048728: @ 8048728 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r3, [r0] cmp r1, r3 bge _0804874E - ldr r4, =gUnknown_0202407E + ldr r4, =gTurnOrder ldrb r0, [r4] cmp r0, r2 beq _0804874E @@ -4571,14 +4571,14 @@ sub_8048760: @ 8048760 movs r7, 0 movs r1, 0x1 str r1, [sp, 0x4] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r3, [r1, 0x3] movs r0, 0x40 ands r0, r3 cmp r0, 0 beq _080487B8 ldr r2, =gUnknown_0202420E - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r2] movs r0, 0xBF @@ -4586,17 +4586,17 @@ sub_8048760: @ 8048760 adds r3, r1, 0 strb r0, [r3, 0x3] movs r7, 0x40 - ldr r1, =gUnknown_02024474 - ldr r0, =gEnemyMonIndex + ldr r1, =gBattleScripting + ldr r0, =gBankTarget b _080487C4 .pool _080487B8: ldr r2, =gUnknown_0202420E - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] strb r0, [r2] - ldr r1, =gUnknown_02024474 - ldr r0, =gUnknown_0202420B + ldr r1, =gBattleScripting + ldr r0, =gBankAttacker _080487C4: ldrb r0, [r0] strb r0, [r1, 0x17] @@ -4611,7 +4611,7 @@ _080487C4: ldrb r0, [r0] cmp r0, 0x13 bne _08048828 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -4620,22 +4620,22 @@ _080487C4: bne _08048828 cmp r5, 0 bne _08048828 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1, 0x3] cmp r0, 0x9 bhi _08048828 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication strb r5, [r2, 0x3] bl _080499B8 .pool _08048828: mov r3, r9 ldrb r0, [r3] - bl battle_get_per_side_status + bl GetBankIdentity ldr r2, =gUnknown_0202428E movs r1, 0x1 ands r1, r0 @@ -4646,7 +4646,7 @@ _08048828: ands r0, r1 cmp r0, 0 beq _08048880 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -4655,15 +4655,15 @@ _08048828: bne _08048880 cmp r5, 0 bne _08048880 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0, 0x3] cmp r1, 0x7 bhi _08048880 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication strb r5, [r4, 0x3] bl _080499B8 .pool @@ -4679,17 +4679,17 @@ _08048880: mov r8, r3 cmp r4, 0 bne _080488C4 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1, 0x3] cmp r0, 0xB beq _080488C4 cmp r0, 0x1F beq _080488C4 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication strb r4, [r2, 0x3] bl _080499B8 .pool @@ -4709,24 +4709,24 @@ _080488C4: beq _080488FC cmp r7, 0x40 beq _080488FC - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r1, [r0] adds r1, 0x1 str r1, [r0] movs r0, 0 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication strb r0, [r4, 0x3] bl _080499B8 .pool _080488FC: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1, 0x3] cmp r0, 0x6 bls _08048906 b _08048F40 _08048906: ldr r1, =gUnknown_0831C134 - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication ldrb r0, [r2, 0x3] lsls r0, 2 adds r0, r1 @@ -4771,10 +4771,10 @@ _0804894A: ldrb r0, [r0] cmp r0, 0x2B beq _080489AC - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank movs r1, 0 strb r1, [r0] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r3, [r1] adds r7, r0, 0 mov r12, r1 @@ -4809,8 +4809,8 @@ _08048984: b _080489B8 .pool _080489AC: - ldr r0, =gUnknown_02024064 - ldr r2, =gUnknown_0202406C + ldr r0, =gActiveBank + ldr r2, =gNoOfAllBanks ldrb r1, [r2] strb r1, [r0] adds r7, r0, 0 @@ -4849,7 +4849,7 @@ _080489EA: b _08048DF4 _080489F0: adds r0, r2, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves b _08048DE4 .pool _08048A00: @@ -4867,19 +4867,19 @@ _08048A00: cmp r6, 0x80 bne _08048A70 _08048A1A: - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r1, [r0] mov r3, r9 ldrb r0, [r3] movs r1, 0x11 - bl b_history__record_ability_usage_of_player - ldr r4, =gUnknown_02024214 + bl RecordAbilityBattle + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DB5E9 str r0, [r4] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -4889,7 +4889,7 @@ _08048A1A: b _08048D20 _08048A46: movs r0, 0x1 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication strb r0, [r4, 0x5] _08048A4C: ldr r0, =0xffffdfff @@ -4917,7 +4917,7 @@ _08048A70: cmp r0, 0x8 bne _08048AAE _08048A94: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -4991,19 +4991,19 @@ _08048AFC: cmp r6, 0x80 bne _08048B54 _08048B16: - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r1, [r0] mov r3, r9 ldrb r0, [r3] movs r1, 0x29 - bl b_history__record_ability_usage_of_player - ldr r4, =gUnknown_02024214 + bl RecordAbilityBattle + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DB5D1 str r0, [r4] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -5032,7 +5032,7 @@ _08048B54: cmp r0, 0xA bne _08048BA4 _08048B74: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5044,7 +5044,7 @@ _08048B74: cmp r6, 0x80 bne _08048BA4 _08048B8A: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -5098,7 +5098,7 @@ _08048BEA: movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5108,7 +5108,7 @@ _08048BEA: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08048C26 @@ -5163,7 +5163,7 @@ _08048C62: b _08048DF4 _08048C6E: adds r0, r3, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves b _08048DE4 .pool _08048C84: @@ -5183,19 +5183,19 @@ _08048C84: beq _08048CA2 b _08048DF4 _08048CA2: - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r2, [r0] mov r4, r9 ldrb r0, [r4] movs r1, 0x7 - bl b_history__record_ability_usage_of_player - ldr r4, =gUnknown_02024214 + bl RecordAbilityBattle + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DB5DD str r0, [r4] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -5203,12 +5203,12 @@ _08048CA2: cmp r0, 0 beq _08048CE8 movs r0, 0x1 - ldr r3, =gUnknown_02024332 + ldr r3, =gBattleCommunication strb r0, [r3, 0x5] b _08048A4C .pool _08048CE8: - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication strb r0, [r4, 0x5] bl _080499B2 .pool @@ -5238,7 +5238,7 @@ _08048D1A: bne _08048D2C b _08048A1A _08048D20: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication strb r0, [r1, 0x5] bl _080499B2 .pool @@ -5262,7 +5262,7 @@ _08048D2C: cmp r0, 0x8 bne _08048D94 _08048D50: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -5274,14 +5274,14 @@ _08048D50: cmp r6, 0x80 bne _08048D94 _08048D66: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DB5E9 _08048D72: str r0, [r4] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r2, 0 movs r0, 0x2 strb r0, [r1, 0x5] @@ -5345,12 +5345,12 @@ _08048DF4: beq _08048DFC b _08048F1C _08048DFC: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] adds r0, 0x1 bl b_movescr_stack_push ldr r1, =gUnknown_0831C134 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -5385,15 +5385,15 @@ _08048E50: orrs r0, r3 str r0, [r1] _08048E64: - ldr r2, =gUnknown_02024214 + ldr r2, =gBattlescriptCurrInstr ldr r1, =gUnknown_0831C224 - ldr r5, =gUnknown_02024332 + ldr r5, =gBattleCommunication ldrb r0, [r5, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldr r1, =gUnknown_0202420E ldrb r0, [r1] strb r0, [r4] @@ -5410,7 +5410,7 @@ _08048E64: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -5427,7 +5427,7 @@ _08048E64: _08048ED8: strb r0, [r5, 0x5] _08048EDA: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r2, [r0, 0x3] cmp r2, 0x2 beq _08048EF2 @@ -5439,13 +5439,13 @@ _08048EDA: beq _08048EF2 bl _080499B8 _08048EF2: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xB2 - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication ldrb r1, [r2, 0x3] strb r1, [r0] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 7 @@ -5459,9 +5459,9 @@ _08048F1C: beq _08048F26 bl _080499B8 _08048F26: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r3, [r0, 0x3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -5476,7 +5476,7 @@ _08048F40: adds r0, 0x50 adds r1, r0 ldr r2, =gUnknown_0831C134 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r3, [r0, 0x3] lsls r0, r3, 2 adds r0, r2 @@ -5592,12 +5592,12 @@ _0804908A: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r1, =gUnknown_0831C224 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -5621,13 +5621,13 @@ _080490D0: beq _080490F0 bl _08049994 _080490F0: - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r1, [r0] mov r1, r9 ldrb r0, [r1] movs r1, 0x27 - bl b_history__record_ability_usage_of_player - ldr r1, =gUnknown_02024214 + bl RecordAbilityBattle + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB603 str r0, [r1] bl _080499B2 @@ -5651,7 +5651,7 @@ _0804912A: adds r0, 0x50 adds r2, r0 ldr r1, =gUnknown_0831C134 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -5684,7 +5684,7 @@ _08049178: ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r1, [r1] strh r1, [r0] bl Random @@ -5700,12 +5700,12 @@ _08049178: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r1, =gUnknown_0831C224 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -5713,9 +5713,9 @@ _08049178: bl _080499B0 .pool _080491D8: - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 cmp r1, 0 @@ -5741,12 +5741,12 @@ _080491D8: adds r0, r3, 0 strh r0, [r4] _08049210: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r1, =gUnknown_0831C224 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -5767,7 +5767,7 @@ _08049244: b _08049994 _0804925A: bl Random - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication lsls r0, 16 lsrs r0, 16 movs r1, 0x3 @@ -5798,10 +5798,10 @@ _0804927C: ldrb r0, [r2] lsls r0, 1 adds r0, r1 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r1, [r1] strh r1, [r0] - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r2] lsls r1, 4 adds r1, r0 @@ -5842,11 +5842,11 @@ _080492E0: str r0, [r2] mov r3, r9 ldrb r1, [r3] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] lsls r1, 1 adds r1, r0 - ldr r6, =gUnknown_020241EA + ldr r6, =gCurrentMove ldrh r0, [r6] strb r0, [r1, 0x4] ldrb r1, [r3] @@ -5859,15 +5859,15 @@ _080492E0: ldrb r1, [r3] ldr r0, [r2] adds r1, r0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r1, 0x14] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r1, =gUnknown_0831C224 - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication ldrb r0, [r2, 0x3] lsls r0, 2 adds r0, r1 @@ -5917,12 +5917,12 @@ _0804939C: movs r0, 0x1 str r0, [r1] _080493A8: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r1, =gUnknown_0831C224 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -5930,7 +5930,7 @@ _080493A8: b _080499B0 .pool _080493D4: - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r1, [r4, 0x3] adds r1, 0xF2 lsls r1, 24 @@ -5945,13 +5945,13 @@ _080493D4: beq _080493F2 b _08049994 _080493F2: - ldr r2, =gUnknown_02024474 + ldr r2, =gBattleScripting ldrb r1, [r4, 0x3] movs r0, 0x3F ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -5961,7 +5961,7 @@ _080493F2: _0804941C: movs r0, 0x70 negs r0, r0 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r1, [r4, 0x3] adds r1, 0xEB lsls r1, 24 @@ -5975,13 +5975,13 @@ _0804941C: beq _0804943C b _08049994 _0804943C: - ldr r2, =gUnknown_02024474 + ldr r2, =gBattleScripting ldrb r1, [r4, 0x3] movs r0, 0x3F ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -5989,7 +5989,7 @@ _0804943C: b _080499B0 .pool _08049468: - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r1, [r4, 0x3] adds r1, 0xDA lsls r1, 24 @@ -6004,13 +6004,13 @@ _08049468: beq _08049486 b _08049994 _08049486: - ldr r2, =gUnknown_02024474 + ldr r2, =gBattleScripting ldrb r1, [r4, 0x3] movs r0, 0x3F ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -6020,7 +6020,7 @@ _08049486: _080494B0: movs r0, 0x60 negs r0, r0 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r1, [r4, 0x3] adds r1, 0xD3 lsls r1, 24 @@ -6034,13 +6034,13 @@ _080494B0: beq _080494D0 b _08049994 _080494D0: - ldr r2, =gUnknown_02024474 + ldr r2, =gBattleScripting ldrb r1, [r4, 0x3] movs r0, 0x3F ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -6061,7 +6061,7 @@ _080494FC: lsls r1, 15 orrs r0, r1 str r0, [r2] - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs mov r3, r9 ldrb r1, [r3] lsls r0, r1, 3 @@ -6074,13 +6074,13 @@ _080494FC: ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r1, [r1] strh r1, [r0] b _08049994 .pool _08049544: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 adds r2, r1, 0 @@ -6106,13 +6106,13 @@ _08049564: beq _08049574 b _08049994 _08049574: - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6135,7 +6135,7 @@ _080495A8: adds r0, r4, r0 ldrb r1, [r0] ldr r3, =gBitTable - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r6] lsls r0, 1 adds r0, r2 @@ -6149,7 +6149,7 @@ _080495A8: b _08049994 _080495D4: ldr r2, =gBattleMons - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r1] movs r5, 0x58 muls r0, r5 @@ -6165,10 +6165,10 @@ _080495D4: cmp r0, 0x3C bne _0804963C bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB682 str r0, [r1] - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r0, [r7] muls r0, r5 add r0, r8 @@ -6177,11 +6177,11 @@ _080495D4: strb r0, [r1] ldrb r0, [r7] ldrb r1, [r1] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _080499B2 .pool _0804963C: - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker mov r10, r4 ldrb r2, [r4] movs r0, 0x58 @@ -6217,7 +6217,7 @@ _08049676: bne _0804967C b _08049994 _0804967C: - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct lsls r0, r2, 1 adds r0, 0xD0 ldr r1, [r5] @@ -6232,7 +6232,7 @@ _0804967C: add r0, r8 movs r6, 0 strh r4, [r0, 0x2E] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank mov r1, r10 ldrb r0, [r1] strb r0, [r4] @@ -6262,7 +6262,7 @@ _0804967C: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -6283,7 +6283,7 @@ _0804967C: b _080499B2 .pool _08049720: - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r1, [r3] movs r0, 0x58 adds r2, r1, 0 @@ -6296,19 +6296,19 @@ _08049720: lsls r1, 19 orrs r0, r1 str r0, [r2] - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r1, [r1] strb r1, [r0, 0x14] b _08049994 .pool _0804975C: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 adds r2, r1, 0 @@ -6322,7 +6322,7 @@ _0804975C: b _0804955A .pool _08049778: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -6330,7 +6330,7 @@ _08049778: b _080499B0 .pool _08049790: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -6338,7 +6338,7 @@ _08049790: b _080499B0 .pool _080497A8: - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r0, [r6] movs r2, 0x58 muls r0, r2 @@ -6356,7 +6356,7 @@ _080497C2: negs r0, r0 ands r4, r0 str r4, [r5] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r6] strb r0, [r4] ldrb r0, [r4] @@ -6370,7 +6370,7 @@ _080497C2: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -6378,7 +6378,7 @@ _080497C2: b _080499B0 .pool _08049808: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -6397,12 +6397,12 @@ _08049820: movs r0, 0x1 str r0, [r4] _08049836: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r1, =gUnknown_0831C224 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -6434,7 +6434,7 @@ _08049880: ldrb r0, [r2] lsls r0, 1 adds r0, r1 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r1, [r1] strh r1, [r0] bl Random @@ -6468,14 +6468,14 @@ _080498C0: ldrh r0, [r1, 0x2E] cmp r0, 0 beq _08049994 - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r2, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB63F str r0, [r1] ldrb r0, [r4] movs r1, 0x3C - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _080499B2 .pool _08049900: @@ -6483,7 +6483,7 @@ _08049900: cmp r0, 0 beq _08049994 adds r0, r3, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 ldr r1, =gUnknown_02024208 @@ -6503,7 +6503,7 @@ _08049900: adds r2, 0x29 adds r2, r4, r2 ldr r3, =gBitTable - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID mov r4, r9 ldrb r0, [r4] lsls r0, 1 @@ -6515,7 +6515,7 @@ _08049900: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -6523,7 +6523,7 @@ _08049900: str r0, [r4] mov r1, r9 ldrb r0, [r1] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] lsls r0, 1 adds r0, r1 @@ -6539,14 +6539,14 @@ _08049900: b _080499B2 .pool _08049994: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] b _080499B2 .pool _080499A4: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -6554,7 +6554,7 @@ _080499A4: _080499B0: str r0, [r4] _080499B2: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x3] _080499B8: @@ -6573,7 +6573,7 @@ _080499B8: atk15_seteffectwithchancetarget: @ 80499D4 push {r4,lr} ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -6583,7 +6583,7 @@ atk15_seteffectwithchancetarget: @ 80499D4 cmp r0, 0x20 bne _08049A10 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -6595,7 +6595,7 @@ atk15_seteffectwithchancetarget: @ 80499D4 .pool _08049A10: ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -6603,7 +6603,7 @@ _08049A10: adds r0, r2 ldrb r4, [r0, 0x5] _08049A20: - ldr r3, =gUnknown_02024332 + ldr r3, =gBattleCommunication ldrb r2, [r3, 0x3] movs r0, 0x80 ands r0, r2 @@ -6630,7 +6630,7 @@ _08049A50: lsrs r0, 16 cmp r0, r4 bcs _08049A9A - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x3] cmp r0, 0 beq _08049A9A @@ -6654,15 +6654,15 @@ _08049A90: bl sub_8048760 b _08049AA2 _08049A9A: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] _08049AA2: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication movs r1, 0 strb r1, [r0, 0x3] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r1, [r0, 0x16] pop {r4} pop {r0} @@ -6693,13 +6693,13 @@ sub_8049AD0: @ 8049AD0 thumb_func_start sub_8049AE0 sub_8049AE0: @ 8049AE0 push {lr} - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank strb r0, [r2] - ldr r3, =gUnknown_02024332 + ldr r3, =gBattleCommunication ldrb r0, [r3, 0x3] cmp r0, 0x6 bhi _08049B14 @@ -6726,14 +6726,14 @@ _08049B1E: ldr r0, [r2] bics r0, r1 str r0, [r2] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication movs r2, 0 strb r2, [r0, 0x3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r2, [r0, 0x16] pop {r0} bx r0 @@ -6747,7 +6747,7 @@ atk19_faintpokemon: @ 8049B5C mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r2, [r0] ldrb r1, [r2, 0x2] adds r6, r0, 0 @@ -6755,9 +6755,9 @@ atk19_faintpokemon: @ 8049B5C beq _08049BE0 ldrb r0, [r2, 0x1] bl get_battle_side_of_something - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank strb r0, [r5] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, =gBitTable ldrb r0, [r5] lsls r0, 2 @@ -6784,7 +6784,7 @@ _08049B94: bl b_movescr_stack_pop_cursor str r4, [r6] ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide ldr r1, =gUnknown_0202428E lsls r0, 24 lsrs r0, 23 @@ -6799,28 +6799,28 @@ _08049BE0: ldrb r0, [r2, 0x1] cmp r0, 0x1 bne _08049C08 - ldr r1, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r1, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r1] - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] mov r9, r0 ldr r4, =gUnknown_082DA7AA b _08049C18 .pool _08049C08: - ldr r1, =gUnknown_02024064 - ldr r0, =gEnemyMonIndex + ldr r1, =gActiveBank + ldr r0, =gBankTarget ldrb r0, [r0] strb r0, [r1] - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] mov r9, r0 ldr r4, =gUnknown_082DA7B7 _08049C18: mov r8, r1 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable mov r7, r8 @@ -6842,7 +6842,7 @@ _08049C32: beq _08049C42 b _08049E2C _08049C42: - ldr r5, =gUnknown_02024280 + ldr r5, =gHitMarker lsls r1, r2, 28 ldr r0, [r5] orrs r0, r1 @@ -6852,7 +6852,7 @@ _08049C42: bl b_movescr_stack_push str r4, [r6] ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08049CA4 @@ -6880,7 +6880,7 @@ _08049CA4: adds r0, 0x1 strb r0, [r4, 0x1] _08049CB0: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID mov r2, r8 ldrb r0, [r2] lsls r0, 1 @@ -6895,14 +6895,14 @@ _08049CB0: bl GetMonData strh r0, [r4, 0x20] _08049CCE: - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, [r2] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _08049D0C ldr r6, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] movs r5, 0x58 muls r0, r5 @@ -6914,7 +6914,7 @@ _08049CCE: negs r0, r0 ands r1, r0 str r1, [r2] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] bl b_movescr_stack_push ldr r1, =gBattleMoveDamage @@ -6926,8 +6926,8 @@ _08049CCE: ldr r0, =gUnknown_082DAE3E str r0, [r4] _08049D0C: - ldr r1, =gUnknown_020242AC - ldr r6, =gEnemyMonIndex + ldr r1, =gStatuses3 + ldr r6, =gBankTarget ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -6939,7 +6939,7 @@ _08049D0C: bne _08049D24 b _08049E32 _08049D24: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r5, [r0] movs r0, 0x80 lsls r0, 17 @@ -6948,13 +6948,13 @@ _08049D24: beq _08049D34 b _08049E32 _08049D34: - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker mov r8, r3 ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -6970,11 +6970,11 @@ _08049D34: ldrh r0, [r0, 0x28] cmp r0, 0 beq _08049E32 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] cmp r0, 0xA5 beq _08049E32 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, r1, r0 adds r0, 0x80 @@ -6984,12 +6984,12 @@ _08049D34: adds r6, 0x24 adds r0, r6 strb r5, [r0] - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] bl b_movescr_stack_push ldr r0, =gUnknown_082DB18D str r0, [r5] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank mov r3, r8 ldrb r0, [r3] strb r0, [r5] @@ -7008,7 +7008,7 @@ _08049D34: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -7052,15 +7052,15 @@ _08049E32: thumb_func_start sub_8049E40 sub_8049E40: @ 8049E40 push {r4,r5,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08049E6A - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x0A_A_A_A @@ -7080,15 +7080,15 @@ _08049E6A: sub_8049E7C: @ 8049E7C push {r4,r5,lr} sub sp, 0x4 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r5, [r0] cmp r5, 0 bne _08049EE8 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -7126,7 +7126,7 @@ _08049EB4: bl dp01_battle_side_mark_buffer_for_execution _08049EDC: bl sub_803A75C - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -7141,7 +7141,7 @@ _08049EE8: thumb_func_start atk1C_jumpifstatus atk1C_jumpifstatus: @ 8049F04 push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something @@ -7186,7 +7186,7 @@ atk1C_jumpifstatus: @ 8049F04 b _08049F70 .pool _08049F68: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -7200,7 +7200,7 @@ _08049F70: thumb_func_start atk1D_jumpifsecondarystatus atk1D_jumpifsecondarystatus: @ 8049F7C push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something @@ -7245,7 +7245,7 @@ atk1D_jumpifsecondarystatus: @ 8049F7C b _08049FE8 .pool _08049FE0: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -7262,7 +7262,7 @@ atk1E_jumpifability: @ 8049FF4 mov r7, r8 push {r7} sub sp, 0x4 - ldr r6, =gUnknown_02024214 + ldr r6, =gBattlescriptCurrInstr ldr r2, [r6] ldrb r5, [r2, 0x2] mov r8, r5 @@ -7279,19 +7279,19 @@ atk1E_jumpifability: @ 8049FF4 ldrb r0, [r2, 0x1] cmp r0, 0x8 bne _0804A054 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0xD adds r2, r5, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 beq _0804A0C8 - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility strb r5, [r1] str r7, [r6] subs r4, 0x1 @@ -7303,19 +7303,19 @@ atk1E_jumpifability: @ 8049FF4 _0804A054: cmp r0, 0x9 bne _0804A08C - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0xC adds r2, r5, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 beq _0804A0C8 - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility strb r5, [r1] str r7, [r6] subs r4, 0x1 @@ -7337,14 +7337,14 @@ _0804A08C: ldrb r1, [r0] cmp r1, r8 bne _0804A0C8 - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r1, [r0] str r7, [r6] ldrb r1, [r0] adds r0, r4, 0 _0804A0B0: - bl b_history__record_ability_usage_of_player - ldr r0, =gUnknown_02024474 + bl RecordAbilityBattle + ldr r0, =gBattleScripting strb r4, [r0, 0x15] b _0804A0CE .pool @@ -7364,24 +7364,24 @@ _0804A0CE: thumb_func_start sub_804A0DC sub_804A0DC: @ 804A0DC push {r4-r6,lr} - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r4, [r0, 0x1] cmp r4, 0x1 bne _0804A0FC - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity b _0804A106 .pool _0804A0FC: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r4, 0x1 _0804A106: ands r4, r0 - ldr r6, =gUnknown_02024214 + ldr r6, =gBattlescriptCurrInstr ldr r3, [r6] ldrb r2, [r3, 0x2] ldrb r0, [r3, 0x3] @@ -7421,7 +7421,7 @@ _0804A14E: sub_804A154: @ 804A154 push {r4,r5,lr} movs r5, 0 - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something @@ -7454,7 +7454,7 @@ _0804A194: .4byte _0804A1EC .4byte _0804A200 _0804A1AC: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 @@ -7462,7 +7462,7 @@ _0804A1AC: b _0804A20C .pool _0804A1BC: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 @@ -7470,7 +7470,7 @@ _0804A1BC: b _0804A20C .pool _0804A1CC: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 @@ -7478,7 +7478,7 @@ _0804A1CC: b _0804A20C .pool _0804A1DC: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 @@ -7486,7 +7486,7 @@ _0804A1DC: b _0804A20C .pool _0804A1EC: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 @@ -7495,7 +7495,7 @@ _0804A1EC: b _0804A20C .pool _0804A200: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 @@ -7508,7 +7508,7 @@ _0804A20C: _0804A212: cmp r5, 0 beq _0804A238 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -7524,7 +7524,7 @@ _0804A212: b _0804A240 .pool _0804A238: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x9 str r0, [r1] @@ -7538,11 +7538,11 @@ _0804A240: thumb_func_start atk21_jumpifspecialstatusflag atk21_jumpifspecialstatusflag: @ 804A24C push {r4-r6,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank strb r0, [r5] ldr r2, [r4] ldrb r1, [r2, 0x2] @@ -7568,7 +7568,7 @@ atk21_jumpifspecialstatusflag: @ 804A24C ldrb r0, [r2, 0x6] cmp r0, 0 beq _0804A2AC - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -7579,7 +7579,7 @@ atk21_jumpifspecialstatusflag: @ 804A24C b _0804A2BC .pool _0804A2AC: - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -7604,7 +7604,7 @@ _0804A2CA: thumb_func_start sub_804A2D0 sub_804A2D0: @ 804A2D0 push {r4-r6,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something @@ -7656,11 +7656,11 @@ sub_804A32C: @ 804A32C mov r6, r8 push {r6,r7} movs r6, 0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x50 mov r9, r0 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something @@ -7674,7 +7674,7 @@ sub_804A32C: @ 804A32C adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0x1C] cmp r0, 0x6 bls _0804A368 @@ -7698,7 +7698,7 @@ _0804A38C: _0804A3A8: ldr r4, =gUnknown_0202420D ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -7713,15 +7713,15 @@ _0804A3BC: beq _0804A3CC bl _0804AC7C _0804A3CC: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x1C] adds r0, 0x1 strb r0, [r1, 0x1C] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r2, [r0] adds r2, 0xDF ldr r3, =gBitTable - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -7778,7 +7778,7 @@ _0804A44C: b _0804A480 .pool _0804A478: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 _0804A480: @@ -7850,12 +7850,12 @@ _0804A512: ldr r0, =gUnknown_02024402 strh r6, [r0] _0804A516: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x1C] adds r0, 0x1 movs r2, 0 strb r0, [r1, 0x1C] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] strb r2, [r0, 0x10] ldr r0, [r1] @@ -7863,13 +7863,13 @@ _0804A516: mov r4, r8 strb r4, [r0] _0804A52E: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0804A538 b _0804ACB2 _0804A538: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 @@ -7890,11 +7890,11 @@ _0804A538: b _0804A584 .pool _0804A57C: - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 _0804A584: - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct cmp r4, 0x19 beq _0804A5AC ldr r0, [r5] @@ -7907,7 +7907,7 @@ _0804A584: bne _0804A5AC lsrs r0, 1 strb r0, [r1] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting b _0804A5D0 .pool _0804A5AC: @@ -7926,7 +7926,7 @@ _0804A5AC: ldrb r0, [r1] lsrs r0, 1 strb r0, [r1] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r2, 0 _0804A5D0: movs r0, 0x5 @@ -7958,7 +7958,7 @@ _0804A5E8: adds r0, 0x1 strb r0, [r1, 0x12] _0804A616: - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r0, [r5] ldrb r1, [r0, 0x10] movs r0, 0x64 @@ -8023,7 +8023,7 @@ _0804A68E: bl __divsi3 str r0, [r4] _0804A6AA: - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r0, [r4] ldrb r1, [r0, 0x10] movs r0, 0x64 @@ -8073,13 +8073,13 @@ _0804A71A: ands r1, r0 cmp r1, 0 beq _0804A786 - ldr r0, =gUnknown_0202406E - ldr r1, =gUnknown_0202449C + ldr r0, =gBattlePartyID + ldr r1, =gBattleStruct ldr r4, [r1] ldrh r0, [r0, 0x4] adds r5, r1, 0 ldr r3, =gBitTable - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldrb r1, [r4, 0x10] cmp r0, r1 bne _0804A76C @@ -8110,20 +8110,20 @@ _0804A77E: movs r1, 0x2 b _0804A78C _0804A786: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x8F _0804A78C: strb r1, [r0] _0804A78E: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r2, 0 mov r12, r2 movs r3, 0xFD strb r3, [r1] movs r5, 0x4 strb r5, [r1, 0x1] - ldr r6, =gUnknown_0202449C + ldr r6, =gBattleStruct ldr r2, [r6] movs r4, 0x8F adds r4, r2 @@ -8134,7 +8134,7 @@ _0804A78E: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 strb r3, [r1] mov r0, r12 strb r0, [r1, 0x1] @@ -8190,7 +8190,7 @@ _0804A78E: ldrh r1, [r1] bl sub_806DADC _0804A824: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r1, 0x53 ldrb r0, [r1] @@ -8199,14 +8199,14 @@ _0804A824: b _0804A92A .pool _0804A850: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r2, [r0] cmp r2, 0 beq _0804A85A b _0804ACB2 _0804A85A: - ldr r1, =gUnknown_02023864 - ldr r7, =gUnknown_0202449C + ldr r1, =gBattleBufferB + ldr r7, =gBattleStruct ldr r0, [r7] adds r0, 0x8F ldrb r0, [r0] @@ -8237,7 +8237,7 @@ _0804A85A: adds r0, r5 movs r1, 0x3A bl GetMonData - ldr r4, =gUnknown_020244A8 + ldr r4, =gBattleResources ldr r1, [r4] ldr r1, [r1, 0x10] strh r0, [r1] @@ -8286,7 +8286,7 @@ _0804A85A: ldr r1, [r4] ldr r1, [r1, 0x10] strh r0, [r1, 0xA] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldr r1, [r7] adds r0, r1, 0 adds r0, 0x8F @@ -8300,27 +8300,27 @@ _0804A85A: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0804A92A: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x1C] adds r0, 0x1 strb r0, [r1, 0x1C] b _0804ACB2 .pool _0804A954: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0804A95E b _0804ACB2 _0804A95E: - ldr r1, =gUnknown_02024064 - ldr r0, =gUnknown_0202449C + ldr r1, =gActiveBank + ldr r0, =gBattleStruct ldr r4, [r0] adds r0, r4, 0 adds r0, 0x8F ldrb r0, [r0] strb r0, [r1] - ldr r3, =gUnknown_02023864 + ldr r3, =gBattleBufferB ldrb r2, [r1] lsls r1, r2, 9 adds r0, r1, r3 @@ -8342,7 +8342,7 @@ _0804A988: ands r0, r1 cmp r0, 0 beq _0804A9B2 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrh r0, [r1] @@ -8357,22 +8357,22 @@ _0804A988: adds r1, r2, 0 bl sub_805E990 _0804A9B2: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r3, 0xFD strb r3, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] strb r0, [r1, 0x2] - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct mov r9, r4 ldr r2, [r4] ldrb r0, [r2, 0x10] strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r4, =gUnknown_02022F68 + ldr r4, =gBattleTextBuff2 strb r3, [r4] movs r0, 0x1 strb r0, [r4, 0x1] @@ -8405,11 +8405,11 @@ _0804A9B2: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DABBD str r0, [r1] ldr r4, =gBattleMoveDamage - ldr r2, =gUnknown_02023864 + ldr r2, =gBattleBufferB ldrb r1, [r6] lsls r1, 9 adds r0, r2, 0x2 @@ -8428,7 +8428,7 @@ _0804A9B2: adds r0, r7 movs r1, 0 bl happiness_algorithm - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID mov r2, r9 ldr r0, [r2] ldrb r2, [r0, 0x10] @@ -8528,8 +8528,8 @@ _0804A9B2: bl GetMonData strh r0, [r4, 0xA] _0804AB1E: - ldr r0, =gUnknown_0202406E - ldr r7, =gUnknown_0202449C + ldr r0, =gBattlePartyID + ldr r7, =gBattleStruct ldr r1, [r7] ldrb r2, [r1, 0x10] ldrh r0, [r0, 0x4] @@ -8629,7 +8629,7 @@ _0804AC28: movs r0, 0 str r0, [r1] _0804AC2E: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x5 strb r0, [r1, 0x1C] b _0804ACB2 @@ -8639,13 +8639,13 @@ _0804AC40: ldr r0, [r0] cmp r0, 0 beq _0804AC58 - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x3 strb r0, [r1, 0x1C] b _0804ACB2 .pool _0804AC58: - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] ldrb r0, [r1, 0x10] adds r0, 0x1 @@ -8654,19 +8654,19 @@ _0804AC58: ldrb r0, [r0, 0x10] cmp r0, 0x5 bhi _0804AC7C - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x2 strb r0, [r1, 0x1C] b _0804ACB2 .pool _0804AC7C: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x6 strb r0, [r1, 0x1C] b _0804ACB2 .pool _0804AC88: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r5, [r0] cmp r5, 0 bne _0804ACB2 @@ -8683,7 +8683,7 @@ _0804AC88: adds r0, r4 adds r0, 0x20 strb r3, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -8703,7 +8703,7 @@ sub_804ACD0: @ 804ACD0 mov r7, r8 push {r7} movs r6, 0 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0804ACE2 @@ -8775,7 +8775,7 @@ _0804AD4A: ands r0, r1 cmp r0, 0 beq _0804AD94 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] movs r1, 0xA8 lsls r1, 2 @@ -8802,7 +8802,7 @@ _0804ADA2: _0804ADA8: cmp r6, 0 bne _0804ADB6 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r1, [r0] movs r2, 0x2 orrs r1, r2 @@ -8833,7 +8833,7 @@ _0804ADBA: ands r0, r1 cmp r0, 0 beq _0804AE02 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldr r1, =0x000002a1 adds r0, r1 @@ -8856,7 +8856,7 @@ _0804AE10: adds r5, 0x1 cmp r5, 0x5 ble _0804ADBA - ldr r2, =gUnknown_0202433A + ldr r2, =gBattleOutcome cmp r6, 0 bne _0804AE24 ldrb r0, [r2] @@ -8876,18 +8876,18 @@ _0804AE24: beq _0804AF1A movs r3, 0 movs r5, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] mov r12, r0 - ldr r7, =gUnknown_02024214 + ldr r7, =gBattlescriptCurrInstr cmp r3, r1 bge _0804AE70 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker movs r6, 0x80 lsls r6, 21 ldr r4, [r0] adds r2, r1, 0 - ldr r1, =gUnknown_0202437C + ldr r1, =gSpecialStatuses _0804AE54: adds r0, r6, 0 lsls r0, r5 @@ -8911,12 +8911,12 @@ _0804AE70: ldrb r1, [r4] cmp r5, r1 bge _0804AEAA - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker movs r4, 0x80 lsls r4, 21 mov r12, r4 ldr r6, [r0] - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses adds r4, r1, 0 adds r1, r0, 0 adds r1, 0x14 @@ -8973,7 +8973,7 @@ _0804AF12: str r0, [r7] b _0804AF22 _0804AF1A: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -8991,16 +8991,16 @@ sub_804AF30: @ 804AF30 ldr r1, =gBattleMoveFlags movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting movs r2, 0 movs r1, 0x1 strb r1, [r0, 0xE] ldr r0, =gCritMultiplier strb r1, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r2, [r0, 0x3] strb r2, [r0, 0x6] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] subs r1, 0x42 ands r0, r1 @@ -9015,7 +9015,7 @@ sub_804AF30: @ 804AF30 atk25_cmd25: @ 804AF70 push {lr} bl sub_804AF30 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -9027,7 +9027,7 @@ atk25_cmd25: @ 804AF70 thumb_func_start atk26_80225F0_storebyteforjump atk26_80225F0_storebyteforjump: @ 804AF88 ldr r3, =gUnknown_02024212 - ldr r2, =gUnknown_02024214 + ldr r2, =gBattlescriptCurrInstr ldr r0, [r2] ldrb r1, [r0, 0x1] strb r1, [r3] @@ -9047,14 +9047,14 @@ atk27_cmd27: @ 804AFA0 lsls r0, 24 cmp r0, 0 bne _0804AFC4 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0804AFDE .pool _0804AFC4: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9075,7 +9075,7 @@ _0804AFDE: thumb_func_start atk28_goto atk28_goto: @ 804AFE8 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9095,7 +9095,7 @@ atk28_goto: @ 804AFE8 thumb_func_start atk29_jumpifbyte atk29_jumpifbyte: @ 804B008 push {r4-r6,lr} - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -9179,7 +9179,7 @@ _0804B0A0: thumb_func_start sub_804B0A8 sub_804B0A8: @ 804B0A8 push {r4-r6,lr} - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -9266,7 +9266,7 @@ _0804B148: thumb_func_start sub_804B150 sub_804B150: @ 804B150 push {r4-r6,lr} - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -9359,7 +9359,7 @@ _0804B1FC: thumb_func_start sub_804B204 sub_804B204: @ 804B204 push {r4-r7,lr} - ldr r2, =gUnknown_02024214 + ldr r2, =gBattlescriptCurrInstr ldr r3, [r2] ldrb r1, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -9434,7 +9434,7 @@ _0804B284: sub_804B28C: @ 804B28C push {r4-r7,lr} movs r7, 0 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -9505,7 +9505,7 @@ _0804B308: thumb_func_start sub_804B310 sub_804B310: @ 804B310 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9528,7 +9528,7 @@ sub_804B310: @ 804B310 thumb_func_start sub_804B338 sub_804B338: @ 804B338 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9553,7 +9553,7 @@ sub_804B338: @ 804B338 thumb_func_start sub_804B364 sub_804B364: @ 804B364 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9579,7 +9579,7 @@ sub_804B364: @ 804B364 thumb_func_start atk31_copyarray atk31_copyarray: @ 804B390 push {r4-r6,lr} - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -9626,7 +9626,7 @@ _0804B3D4: thumb_func_start atk32_memcpy_with_offset atk32_memcpy_with_offset: @ 804B3E4 push {r4-r7,lr} - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -9684,7 +9684,7 @@ _0804B440: thumb_func_start atk33_orbyte atk33_orbyte: @ 804B450 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9710,7 +9710,7 @@ atk33_orbyte: @ 804B450 thumb_func_start atk34_orhalfword atk34_orhalfword: @ 804B47C push {r4,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r3, [r4] ldrb r2, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -9741,7 +9741,7 @@ atk34_orhalfword: @ 804B47C thumb_func_start atk35_orword atk35_orword: @ 804B4B4 push {r4,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r2, [r4] ldrb r3, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9777,7 +9777,7 @@ atk35_orword: @ 804B4B4 thumb_func_start atk36_bicbyte atk36_bicbyte: @ 804B4F8 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9803,7 +9803,7 @@ atk36_bicbyte: @ 804B4F8 thumb_func_start atk37_bichalfword atk37_bichalfword: @ 804B524 push {r4,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r3, [r4] ldrb r1, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -9834,7 +9834,7 @@ atk37_bichalfword: @ 804B524 thumb_func_start atk38_bicword atk38_bicword: @ 804B55C push {r4,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r2, [r4] ldrb r3, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9871,11 +9871,11 @@ atk38_bicword: @ 804B55C thumb_func_start atk39_pause atk39_pause: @ 804B5A0 push {r4,r5,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r4, [r0] cmp r4, 0 bne _0804B5CC - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -9902,11 +9902,11 @@ _0804B5CC: thumb_func_start sub_804B5E0 sub_804B5E0: @ 804B5E0 push {lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804B5F2 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -9919,18 +9919,18 @@ _0804B5F2: thumb_func_start atk3B_8022C68 atk3B_8022C68: @ 804B600 push {lr} - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 bne _0804B620 - ldr r0, =gUnknown_02024064 - ldr r1, =gEnemyMonIndex + ldr r0, =gActiveBank + ldr r1, =gBankTarget b _0804B624 .pool _0804B620: - ldr r0, =gUnknown_02024064 - ldr r1, =gUnknown_0202420B + ldr r0, =gActiveBank + ldr r1, =gBankAttacker _0804B624: ldrb r1, [r1] strb r1, [r0] @@ -9938,10 +9938,10 @@ _0804B624: ldrh r1, [r0] movs r0, 0 bl dp01_build_cmdbuf_x18_0_aa_health_bar_update - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -9968,16 +9968,16 @@ sub_804B664: @ 804B664 ands r0, r1 cmp r0, 0 beq _0804B67C - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] bl sub_81A5718 _0804B67C: ldr r0, =gBattleMoveFlags movs r1, 0 strb r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r1, [r0] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xB strb r0, [r1] pop {r0} @@ -9987,10 +9987,10 @@ _0804B67C: thumb_func_start atk3E_end2 atk3E_end2: @ 804B6A4 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0 strb r0, [r1] - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xB strb r0, [r1] bx lr @@ -10001,7 +10001,7 @@ atk3E_end2: @ 804B6A4 atk3F_end3: @ 804B6BC push {lr} bl b_movescr_stack_pop_cursor - ldr r3, =gUnknown_020244A8 + ldr r3, =gBattleResources ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0 @@ -10030,7 +10030,7 @@ _0804B6D6: thumb_func_start atk41_call atk41_call: @ 804B6F8 push {r4,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x5 bl b_movescr_stack_push @@ -10055,7 +10055,7 @@ atk41_call: @ 804B6F8 thumb_func_start atk42_jumpiftype2 atk42_jumpiftype2: @ 804B728 push {r4,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something @@ -10103,7 +10103,7 @@ _0804B77C: sub_804B784: @ 804B784 push {r4,lr} sub sp, 0x4 - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r2, [r0, 0x1] movs r0, 0 @@ -10111,7 +10111,7 @@ sub_804B784: @ 804B784 movs r0, 0x13 movs r1, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0804B7C0 @@ -10142,9 +10142,9 @@ _0804B7C6: thumb_func_start sub_804B7D0 sub_804B7D0: @ 804B7D0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x54 @@ -10157,11 +10157,11 @@ sub_804B7D0: @ 804B7D0 thumb_func_start atk46_cmd46 atk46_cmd46: @ 804B7EC push {r4-r6,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank strb r0, [r6] ldr r2, [r5] ldrb r1, [r2, 0x3] @@ -10183,13 +10183,13 @@ atk46_cmd46: @ 804B7EC cmp r0, 0x2 bne _0804B848 _0804B822: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x2] ldrh r2, [r3] movs r0, 0 bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution ldr r0, [r4] @@ -10198,7 +10198,7 @@ _0804B822: b _0804B8AA .pool _0804B848: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -10216,7 +10216,7 @@ _0804B868: lsrs r0, 24 cmp r0, 0x3 bls _0804B894 - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -10248,11 +10248,11 @@ _0804B8AA: thumb_func_start sub_804B8B0 sub_804B8B0: @ 804B8B0 push {r4-r7,lr} - ldr r6, =gUnknown_02024214 + ldr r6, =gBattlescriptCurrInstr ldr r0, [r6] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank strb r0, [r7] ldr r2, [r6] ldrb r1, [r2, 0x2] @@ -10288,17 +10288,17 @@ _0804B8FA: ldrh r2, [r4] movs r0, 0 bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] b _0804B976 .pool _0804B920: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -10314,7 +10314,7 @@ _0804B934: lsrs r0, 24 cmp r0, 0x3 bls _0804B960 - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -10347,7 +10347,7 @@ _0804B976: sub_804B97C: @ 804B97C push {r4,lr} movs r3, 0 - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x1A] movs r2, 0xF0 ands r2, r0 @@ -10386,7 +10386,7 @@ _0804B9B4: movs r1, 0 strb r0, [r4, 0x10] strb r1, [r4, 0x11] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -10408,12 +10408,12 @@ atk48_playstatchangeanimation: @ 804B9D8 movs r0, 0 mov r8, r0 movs r3, 0 - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] str r3, [sp] bl get_battle_side_of_something - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank strb r0, [r2] ldr r0, [r5] ldrb r4, [r0, 0x2] @@ -10443,14 +10443,14 @@ _0804BA26: ands r0, r1 cmp r0, 0 beq _0804BAB2 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _0804BA58 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -10458,16 +10458,16 @@ _0804BA26: b _0804BAA0 .pool _0804BA58: - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] str r3, [sp] - bl battle_get_per_side_status + bl GetBankIdentity mov r1, r10 ands r1, r0 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers adds r0, r1 ldrb r0, [r0, 0x4] ldr r3, [sp] @@ -10514,7 +10514,7 @@ _0804BAB2: cmp r4, 0 bne _0804BA26 _0804BAC0: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r9, r0 cmp r3, 0x1 ble _0804BB4E @@ -10601,7 +10601,7 @@ _0804BB4E: _0804BB6C: cmp r3, 0 beq _0804BBB4 - ldr r4, =gUnknown_02024474 + ldr r4, =gBattleScripting ldrb r0, [r4, 0x1B] cmp r0, 0 bne _0804BBB4 @@ -10610,10 +10610,10 @@ _0804BB6C: mov r2, r8 str r3, [sp] bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x4 @@ -10626,7 +10626,7 @@ _0804BB6C: movs r0, 0x1 strb r0, [r4, 0x1B] _0804BBA4: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr b _0804BBB6 .pool _0804BBB4: @@ -10666,14 +10666,14 @@ sub_804BBCC: @ 804BBCC ldrh r2, [r2] str r2, [sp, 0x18] _0804BBEE: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r4, [r0, 0x1] str r4, [sp, 0x10] ldrb r0, [r0, 0x2] str r0, [sp, 0x14] ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -10681,7 +10681,7 @@ _0804BBEE: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0804BC34 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -10691,13 +10691,13 @@ _0804BBEE: .pool _0804BC34: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r0, 24 _0804BC3E: str r0, [sp, 0x8] - ldr r1, =gUnknown_0202449C - ldr r0, =gUnknown_0202420B + ldr r1, =gBattleStruct + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, 0xC8 @@ -10713,7 +10713,7 @@ _0804BC3E: b _0804BD02 .pool _0804BC68: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r2, [r4] movs r0, 0 movs r1, 0x1 @@ -10723,7 +10723,7 @@ _0804BC68: b _0804C15A .pool _0804BC80: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r2, [r4] movs r0, 0 movs r1, 0 @@ -10744,7 +10744,7 @@ _0804BCAC: ldr r0, [r5] orrs r0, r6 str r0, [r5] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r4, [r0, 0x14] bl sub_804AF30 ldr r2, =gUnknown_082D86A8 @@ -10759,13 +10759,13 @@ _0804BCAC: adds r0, r2 ldr r0, [r0] bl b_movescr_stack_push - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB87D bl _0804C5B8 .pool _0804BCF0: ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -10774,7 +10774,7 @@ _0804BCF0: ldrb r0, [r0, 0x2] str r0, [sp, 0x4] _0804BD02: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting mov r12, r1 b _0804BD1E .pool @@ -10818,7 +10818,7 @@ _0804BD38: .4byte _0804C570 _0804BD80: ldr r6, =gBattleMons - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r3, [r5] movs r7, 0x58 adds r2, r3, 0 @@ -10840,17 +10840,17 @@ _0804BDA0: bne _0804BDAA b _0804C184 _0804BDAA: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] cmp r1, r3 bne _0804BDB4 b _0804C184 _0804BDB4: adds r0, r1, 0 - bl battle_side_get_owner + bl GetBankSide adds r4, r0, 0 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -10865,7 +10865,7 @@ _0804BDCC: beq _0804BDDA b _0804C184 _0804BDDA: - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r3, [r5] lsls r0, r3, 2 adds r0, r3 @@ -10885,7 +10885,7 @@ _0804BDDA: b _0804C184 _0804BDFE: ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -10909,14 +10909,14 @@ _0804BE26: adds r0, r2, 0x1 strb r0, [r1, 0x19] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAE0D str r0, [r1] b _0804C0B8 .pool _0804BE5C: ldr r4, =gBattleMons - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r2, [r6] movs r5, 0x58 mov r12, r5 @@ -10938,13 +10938,13 @@ _0804BE7C: bne _0804BE86 b _0804C184 _0804BE86: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] cmp r0, r2 bne _0804BE90 b _0804C184 _0804BE90: - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -10972,7 +10972,7 @@ _0804BEBA: negs r0, r0 ands r3, r0 str r3, [r5] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r6] strb r0, [r4] ldrb r0, [r6] @@ -10989,7 +10989,7 @@ _0804BEBA: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB282 str r0, [r1] movs r2, 0x1 @@ -10997,14 +10997,14 @@ _0804BEBA: b _0804C184 .pool _0804BF18: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0x7 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0804BF32 @@ -11015,14 +11015,14 @@ _0804BF32: b _0804C184 .pool _0804BF3C: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0x4 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects b _0804C0B2 .pool _0804BF54: @@ -11032,7 +11032,7 @@ _0804BF54: movs r1, 0 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0804BF6C @@ -11040,19 +11040,19 @@ _0804BF54: _0804BF6C: movs r5, 0x1 mov r10, r5 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting mov r12, r0 b _0804C570 .pool _0804BF7C: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0 str r0, [sp] movs r0, 0x8 movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _0804BF96 @@ -11063,7 +11063,7 @@ _0804BF96: b _0804C184 .pool _0804BFA0: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 18 @@ -11102,7 +11102,7 @@ _0804BFDE: _0804BFE4: movs r4, 0 ldr r2, =gBattleMons - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -11144,13 +11144,13 @@ _0804C026: .pool _0804C048: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r3, [r0] cmp r4, r3 blt _0804C054 b _0804C202 _0804C054: - ldr r7, =gUnknown_0202449C + ldr r7, =gBattleStruct movs r6, 0 movs r3, 0xD0 adds r5, r0, 0 @@ -11182,7 +11182,7 @@ _0804C088: beq _0804C184 movs r2, 0x1 mov r10, r2 - ldr r3, =gUnknown_02024474 + ldr r3, =gBattleScripting mov r12, r3 b _0804C570 .pool @@ -11200,8 +11200,8 @@ _0804C0B8: mov r10, r4 b _0804C184 _0804C0BE: - ldr r1, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r1, =gStatuses3 + ldr r0, =gBankAttacker ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -11212,7 +11212,7 @@ _0804C0BE: bne _0804C0D4 b _0804C4B6 _0804C0D4: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -11229,8 +11229,8 @@ _0804C0F4: ands r0, r1 cmp r0, 0 bne _0804C120 - ldr r1, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r1, =gStatuses3 + ldr r0, =gBankAttacker ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -11245,8 +11245,8 @@ _0804C0F4: cmp r0, 0 beq _0804C184 _0804C120: - ldr r4, =gUnknown_02024064 - ldr r5, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r5, =gBankAttacker ldrb r0, [r5] strb r0, [r4] movs r0, 0 @@ -11254,7 +11254,7 @@ _0804C120: bl dp01_build_cmdbuf_x33_a_33_33 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 ldrb r2, [r5] lsls r2, 2 adds r2, r0 @@ -11262,7 +11262,7 @@ _0804C120: ldr r1, =0xfffbff3f ands r0, r1 str r0, [r2] - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -11273,14 +11273,14 @@ _0804C120: orrs r1, r2 strb r1, [r0] _0804C15A: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] b _0804C5BA .pool _0804C184: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] @@ -11288,8 +11288,8 @@ _0804C184: b _0804C570 .pool _0804C194: - ldr r0, =gUnknown_0202437C - ldr r6, =gEnemyMonIndex + ldr r0, =gSpecialStatuses + ldr r6, =gBankTarget ldrb r2, [r6] lsls r3, r2, 2 adds r1, r3, r2 @@ -11299,11 +11299,11 @@ _0804C194: lsls r0, 29 cmp r0, 0 blt _0804C202 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r2, r0 bcs _0804C202 - ldr r5, =gUnknown_020242AC + ldr r5, =gStatuses3 adds r0, r3, r5 ldr r0, [r0] ldr r1, =0x000400c0 @@ -11316,11 +11316,11 @@ _0804C1C2: .pool _0804C1D8: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r2, [r0] cmp r4, r2 bge _0804C202 - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldr r5, =0xfeffffff adds r3, r0, 0 ldr r1, =gUnknown_020240D4 @@ -11346,20 +11346,20 @@ _0804C202: b _0804C570 .pool _0804C21C: - ldr r1, =gUnknown_02024280 + ldr r1, =gHitMarker ldr r3, [r1] movs r0, 0x80 lsls r0, 5 ands r0, r3 - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker mov r9, r2 adds r5, r1, 0 cmp r0, 0 beq _0804C246 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r2, [r2] strb r2, [r0] - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r1] mov r4, r9 strb r0, [r4] @@ -11383,7 +11383,7 @@ _0804C246: ldrh r0, [r0] strh r0, [r1] _0804C262: - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable mov r3, r9 @@ -11397,7 +11397,7 @@ _0804C262: beq _0804C27C b _0804C3E8 _0804C27C: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r1, 0x91 ldrb r1, [r1] @@ -11436,7 +11436,7 @@ _0804C2A4: ldrb r1, [r3] lsls r1, 1 adds r1, r0 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] strh r0, [r1] b _0804C322 @@ -11456,7 +11456,7 @@ _0804C308: negs r1, r1 strh r1, [r0] _0804C322: - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget ldrb r3, [r2] lsls r0, r3, 2 adds r0, r6 @@ -11501,7 +11501,7 @@ _0804C390: ldrb r1, [r2] lsls r1, 1 adds r1, r0 - ldr r4, =gUnknown_020241EA + ldr r4, =gCurrentMove ldrh r0, [r4] strh r0, [r1] ldr r0, [r7] @@ -11546,10 +11546,10 @@ _0804C3E8: b _0804C570 .pool _0804C3FC: - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r7, =gBitTable - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r3, [r2] lsls r0, r3, 2 adds r0, r7 @@ -11558,7 +11558,7 @@ _0804C3FC: mov r9, r2 cmp r1, 0 bne _0804C4B6 - ldr r6, =gUnknown_0202449C + ldr r6, =gBattleStruct ldr r5, [r6] adds r0, r5, 0 adds r0, 0x91 @@ -11577,14 +11577,14 @@ _0804C3FC: ands r0, r1 cmp r0, 0 beq _0804C4B6 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r1, [r0] movs r0, 0x80 lsls r0, 18 ands r0, r1 cmp r0, 0 beq _0804C4B6 - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldrb r0, [r4] cmp r3, r0 beq _0804C4B6 @@ -11647,7 +11647,7 @@ _0804C4B6: b _0804C570 .pool _0804C4E4: - ldr r5, =gUnknown_02024280 + ldr r5, =gHitMarker ldr r2, [r5] movs r0, 0x80 lsls r0, 12 @@ -11660,8 +11660,8 @@ _0804C4E4: ands r0, r1 cmp r0, 0 beq _0804C568 - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -11671,7 +11671,7 @@ _0804C4E4: blt _0804C568 ldr r0, =gBattleMoves mov r9, r0 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove mov r8, r1 ldrh r0, [r1] lsls r1, r0, 1 @@ -11687,14 +11687,14 @@ _0804C4E4: ands r4, r2 cmp r4, 0 bne _0804C568 - ldr r7, =gEnemyMonIndex + ldr r7, =gBankTarget ldrb r0, [r7] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r2, r0, 24 ldr r1, =gBattleMons @@ -11709,7 +11709,7 @@ _0804C55E: ldr r0, [r5] orrs r0, r6 str r0, [r5] - ldr r2, =gUnknown_02024474 + ldr r2, =gBattleScripting mov r12, r2 _0804C568: mov r3, r12 @@ -11752,7 +11752,7 @@ _0804C5A4: mov r2, r10 cmp r2, 0 bne _0804C5BA - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 _0804C5B8: @@ -11777,7 +11777,7 @@ atk4A_damagecalc2: @ 804C5F4 movs r4, 0 movs r5, 0 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -11786,7 +11786,7 @@ atk4A_damagecalc2: @ 804C5F4 ldrb r0, [r0, 0x2] mov r8, r0 ldr r2, =gBattleMons - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -11800,7 +11800,7 @@ atk4A_damagecalc2: @ 804C5F4 mov r1, r8 cmp r1, 0x4 bne _0804C688 - ldr r3, =gUnknown_0202420A + ldr r3, =gLastUsedAbility strb r0, [r3] ldr r2, =gBattleMoveFlags ldrb r0, [r2] @@ -11812,12 +11812,12 @@ atk4A_damagecalc2: @ 804C5F4 lsls r0, 1 adds r0, r1 strh r4, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication mov r2, r8 strb r2, [r0, 0x6] ldrb r0, [r7] ldrb r1, [r3] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _0804C76A .pool _0804C678: @@ -11949,7 +11949,7 @@ _0804C74A: beq _0804C744 _0804C76A: ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget mov r8, r0 ldrb r1, [r0] movs r0, 0x58 @@ -11963,9 +11963,9 @@ _0804C76A: ands r5, r4 cmp r5, 0 bne _0804C7E6 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - ldr r7, =gUnknown_020241EA + ldr r7, =gCurrentMove ldrh r1, [r7] bl move_weather_interaction lsls r0, 24 @@ -11990,7 +11990,7 @@ _0804C7AC: ldrb r0, [r0, 0x1] cmp r0, 0 beq _0804C7E6 - ldr r3, =gUnknown_0202420A + ldr r3, =gLastUsedAbility strb r6, [r3] ldr r2, =gBattleMoveFlags ldrb r0, [r2] @@ -12003,12 +12003,12 @@ _0804C7AC: lsls r0, 1 adds r0, r1 strh r5, [r0] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x6] ldrb r0, [r2] ldrb r1, [r3] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle _0804C7E6: ldr r0, =gBattleMoveFlags ldrb r1, [r0] @@ -12016,8 +12016,8 @@ _0804C7E6: ands r0, r1 cmp r0, 0 beq _0804C804 - ldr r2, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r2, =gProtectStructs + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -12026,7 +12026,7 @@ _0804C7E6: orrs r0, r2 strb r0, [r1, 0x1] _0804C804: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -12041,11 +12041,11 @@ _0804C804: thumb_func_start atk4B_cmd4b atk4B_cmd4b: @ 804C844 push {r4,lr} - ldr r4, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r4] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -12062,7 +12062,7 @@ atk4B_cmd4b: @ 804C844 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0804C872: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -12075,21 +12075,21 @@ _0804C872: thumb_func_start atk4C_switch1 atk4C_switch1: @ 804C894 push {r4,r5,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804C8E4 - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldrb r0, [r4] lsls r2, r0, 1 adds r2, r3 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x5C @@ -12122,17 +12122,17 @@ _0804C8E4: sub_804C904: @ 804C904 push {r4-r7,lr} sub sp, 0x58 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0804C912 b _0804CAA4 _0804C912: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] ldr r6, =gBattleMons ldrb r0, [r4] @@ -12147,7 +12147,7 @@ _0804C912: muls r0, r5 adds r3, r0, r6 movs r2, 0 - ldr r5, =gUnknown_02023864 + ldr r5, =gBattleBufferB _0804C93E: adds r0, r3, r2 ldrb r1, [r4] @@ -12161,7 +12161,7 @@ _0804C93E: cmp r2, 0x57 bls _0804C93E ldr r4, =gBattleMons - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] movs r7, 0x58 adds r2, r0, 0 @@ -12202,7 +12202,7 @@ _0804C93E: adds r1, 0x20 strb r0, [r1] ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 ldr r0, =gUnknown_020243D0 @@ -12210,7 +12210,7 @@ _0804C93E: adds r0, r2, r0 ldrb r1, [r0] ldr r3, =gBitTable - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r5, [r6] lsls r0, r5, 1 adds r0, r2 @@ -12229,7 +12229,7 @@ _0804C93E: strh r1, [r0, 0x2E] _0804C9DE: ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -12256,7 +12256,7 @@ _0804C9FE: adds r2, 0x1 cmp r2, 0x7 ble _0804C9FE - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -12275,7 +12275,7 @@ _0804CA26: cmp r0, 0 beq _0804CA78 ldr r4, =gBattleMons - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] movs r0, 0x58 adds r2, r3, 0 @@ -12296,7 +12296,7 @@ _0804CA26: ands r0, r1 cmp r0, 0 bne _0804CA78 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r2, [r0] adds r2, 0x92 ldr r1, =gBitTable @@ -12307,17 +12307,17 @@ _0804CA26: orrs r0, r1 strb r0, [r2] _0804CA78: - ldr r0, =gUnknown_02024474 - ldr r3, =gUnknown_02024064 + ldr r0, =gBattleScripting + ldr r3, =gActiveBank ldrb r2, [r3] strb r2, [r0, 0x17] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] strb r2, [r1, 0x2] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -12325,7 +12325,7 @@ _0804CA78: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -12340,18 +12340,18 @@ _0804CAA4: thumb_func_start atk4E_switch3 atk4E_switch3: @ 804CAE8 push {r4-r6,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804CB86 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank strb r0, [r6] ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12379,9 +12379,9 @@ atk4E_switch3: @ 804CAE8 movs r1, 0x2 bl SetPokedexFlag _0804CB3E: - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldr r1, =gBitTable - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -12389,12 +12389,12 @@ _0804CB3E: ldrb r0, [r2] bics r0, r1 strb r0, [r2] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrb r1, [r0] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r2, [r0, 0x2] movs r0, 0 @@ -12424,13 +12424,13 @@ atk4F_jumpifcannotswitch: @ 804CBB0 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] movs r0, 0x7F ands r0, r1 bl get_battle_side_of_something - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank strb r0, [r3] ldr r2, [r4] ldrb r1, [r2, 0x1] @@ -12449,7 +12449,7 @@ atk4F_jumpifcannotswitch: @ 804CBB0 ands r0, r1 cmp r0, 0 bne _0804CBFC - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] @@ -12480,9 +12480,9 @@ _0804CC28: ands r0, r1 cmp r0, 0 beq _0804CCC0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 ldr r1, =gPlayerParty @@ -12503,7 +12503,7 @@ _0804CC5C: adds r6, r4, 0x3 cmp r4, r6 bge _0804CCA4 - ldr r7, =gUnknown_0202406E + ldr r7, =gBattlePartyID _0804CC64: movs r0, 0x64 muls r0, r4 @@ -12524,7 +12524,7 @@ _0804CC64: bl GetMonData cmp r0, 0 beq _0804CC9E - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r7 @@ -12552,9 +12552,9 @@ _0804CCC0: ands r1, r0 cmp r1, 0 beq _0804CD00 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0804CCEC @@ -12572,9 +12572,9 @@ _0804CCEC: b _0804CD32 .pool _0804CD00: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 ldr r1, =gPlayerParty @@ -12600,7 +12600,7 @@ _0804CD32: adds r6, r4, 0x3 cmp r4, r6 bge _0804CCA4 - ldr r7, =gUnknown_0202406E + ldr r7, =gBattlePartyID _0804CD3A: movs r0, 0x64 muls r0, r4 @@ -12621,7 +12621,7 @@ _0804CD3A: bl GetMonData cmp r0, 0 beq _0804CD74 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r7 @@ -12640,9 +12640,9 @@ _0804CD8C: ands r1, r0 cmp r1, 0 beq _0804CE10 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12660,7 +12660,7 @@ _0804CDB4: blt _0804CDBC b _0804CCA4 _0804CDBC: - ldr r7, =gUnknown_0202406E + ldr r7, =gBattlePartyID _0804CDBE: movs r0, 0x64 muls r0, r4 @@ -12681,7 +12681,7 @@ _0804CDBE: bl GetMonData cmp r0, 0 beq _0804CDFA - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r7 @@ -12696,15 +12696,15 @@ _0804CDFA: b _0804CCA4 .pool _0804CE10: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 bne _0804CE54 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 ldr r0, =gBattleTypeFlags @@ -12713,7 +12713,7 @@ _0804CE10: cmp r0, 0 beq _0804CE48 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 b _0804CE4A @@ -12727,7 +12727,7 @@ _0804CE4A: .pool _0804CE54: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 ldr r0, =gBattleTypeFlags @@ -12737,7 +12737,7 @@ _0804CE54: cmp r0, 0 beq _0804CE7C movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 b _0804CE7E @@ -12769,7 +12769,7 @@ _0804CE84: bl GetMonData cmp r0, 0 bne _0804CEC6 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -12788,7 +12788,7 @@ _0804CECC: cmp r4, 0x6 bne _0804CEF8 _0804CED0: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -12804,7 +12804,7 @@ _0804CED0: b _0804CF00 .pool _0804CEF8: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -12824,13 +12824,13 @@ sub_804CF10: @ 804CF10 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r1, [r4] adds r1, r0, r1 adds r1, 0x58 - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID lsls r0, 1 adds r0, r3 ldrh r0, [r0] @@ -12881,7 +12881,7 @@ atk50_openpartyscreen: @ 804CF88 movs r7, 0 movs r0, 0 mov r9, r0 - ldr r6, =gUnknown_02024214 + ldr r6, =gBattlescriptCurrInstr ldr r2, [r6] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -12907,18 +12907,18 @@ _0804CFBE: ands r1, r0 cmp r1, 0x1 beq _0804D0B0 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank strb r7, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r7, r0 bcc _0804CFD8 b _0804D450 _0804CFD8: - ldr r7, =gUnknown_02024280 + ldr r7, =gHitMarker ldr r6, =gBitTable adds r4, r1, 0 - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags mov r8, r2 _0804CFE2: ldrb r2, [r4] @@ -12962,7 +12962,7 @@ _0804CFE2: b _0804D098 .pool _0804D054: - ldr r5, =gUnknown_0202437C + ldr r5, =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -12996,7 +12996,7 @@ _0804D098: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -13010,7 +13010,7 @@ _0804D0B0: bne _0804D0B8 b _0804D450 _0804D0B8: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker mov r8, r0 ldr r0, [r0] lsrs r5, r0, 28 @@ -13019,7 +13019,7 @@ _0804D0B8: ands r0, r5 cmp r0, 0 beq _0804D170 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r7, [r4] movs r0, 0 movs r1, 0x6 @@ -13028,7 +13028,7 @@ _0804D0B8: lsls r0, 24 cmp r0, 0 beq _0804D120 - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13052,7 +13052,7 @@ _0804D0B8: b _0804D170 .pool _0804D120: - ldr r6, =gUnknown_0202437C + ldr r6, =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -13062,7 +13062,7 @@ _0804D120: lsls r0, 25 cmp r0, 0 blt _0804D15C - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x5E ldrb r0, [r0] @@ -13097,7 +13097,7 @@ _0804D170: ands r0, r5 cmp r0, 0 bne _0804D22E - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank movs r0, 0x2 strb r0, [r4] movs r0, 0x2 @@ -13107,7 +13107,7 @@ _0804D170: lsls r0, 24 cmp r0, 0 beq _0804D1D8 - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13115,7 +13115,7 @@ _0804D170: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13131,7 +13131,7 @@ _0804D170: b _0804D22E .pool _0804D1D8: - ldr r6, =gUnknown_0202437C + ldr r6, =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -13141,7 +13141,7 @@ _0804D1D8: lsls r0, 25 cmp r0, 0 blt _0804D214 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x5C ldrb r0, [r0] @@ -13175,7 +13175,7 @@ _0804D22E: ands r0, r5 cmp r0, 0 beq _0804D2E4 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank movs r0, 0x1 strb r0, [r4] movs r0, 0x1 @@ -13185,7 +13185,7 @@ _0804D22E: lsls r0, 24 cmp r0, 0 beq _0804D290 - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13193,7 +13193,7 @@ _0804D22E: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13209,7 +13209,7 @@ _0804D22E: b _0804D2E4 .pool _0804D290: - ldr r6, =gUnknown_0202437C + ldr r6, =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -13219,7 +13219,7 @@ _0804D290: lsls r0, 25 cmp r0, 0 blt _0804D2CC - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x5F ldrb r0, [r0] @@ -13256,7 +13256,7 @@ _0804D2E4: ands r0, r5 cmp r0, 0 bne _0804D3A2 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank movs r0, 0x3 strb r0, [r4] movs r0, 0x3 @@ -13266,7 +13266,7 @@ _0804D2E4: lsls r0, 24 cmp r0, 0 beq _0804D34C - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13274,7 +13274,7 @@ _0804D2E4: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -13290,7 +13290,7 @@ _0804D2E4: b _0804D3A2 .pool _0804D34C: - ldr r6, =gUnknown_0202437C + ldr r6, =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -13300,7 +13300,7 @@ _0804D34C: lsls r0, 25 cmp r0, 0 blt _0804D388 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x5D ldrb r0, [r0] @@ -13329,7 +13329,7 @@ _0804D388: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0804D3A2: - ldr r1, =gUnknown_0202437C + ldr r1, =gSpecialStatuses ldrb r0, [r1] lsls r0, 25 cmp r0, 0 @@ -13342,31 +13342,31 @@ _0804D3A2: blt _0804D3FA cmp r5, 0 beq _0804D3FA - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r0, =gBitTable ldr r0, [r0] ands r1, r0 cmp r1, 0 beq _0804D3E4 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0x2 strb r0, [r1] b _0804D3E8 .pool _0804D3E4: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r1, [r0] _0804D3E8: movs r0, 0 movs r1, 0x2 movs r2, 0 bl sub_8034464 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution _0804D3FA: - ldr r1, =gUnknown_0202437C + ldr r1, =gSpecialStatuses ldrb r0, [r1, 0x14] lsls r0, 25 cmp r0, 0 @@ -13379,19 +13379,19 @@ _0804D3FA: blt _0804D450 cmp r5, 0 beq _0804D450 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r0, [r0] ldr r1, =gBitTable ldr r1, [r1, 0x4] ands r0, r1 cmp r0, 0 beq _0804D438 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0x3 b _0804D43C .pool _0804D438: - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0x1 _0804D43C: strb r0, [r1] @@ -13399,11 +13399,11 @@ _0804D43C: movs r1, 0x2 movs r2, 0 bl sub_8034464 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution _0804D450: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -13428,7 +13428,7 @@ _0804D478: bne _0804D482 b _0804D5F4 _0804D482: - ldr r7, =gUnknown_02024280 + ldr r7, =gHitMarker ldr r0, [r7] lsrs r5, r0, 28 ldr r4, =gBitTable @@ -13440,10 +13440,10 @@ _0804D482: ands r0, r5 cmp r0, 0 beq _0804D52A - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank movs r0, 0x2 strb r0, [r6] - ldr r0, =gUnknown_02023864 + ldr r0, =gBattleBufferB ldrb r1, [r0, 0x1] movs r0, 0x2 movs r2, 0x6 @@ -13451,7 +13451,7 @@ _0804D482: lsls r0, 24 cmp r0, 0 beq _0804D4F8 - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldrb r0, [r6] lsls r0, 2 adds r0, r4 @@ -13474,7 +13474,7 @@ _0804D482: b _0804D52A .pool _0804D4F8: - ldr r4, =gUnknown_0202437C + ldr r4, =gSpecialStatuses ldrb r0, [r6] lsls r1, r0, 2 adds r1, r0 @@ -13484,7 +13484,7 @@ _0804D4F8: lsls r0, 25 cmp r0, 0 blt _0804D52A - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x5C ldrb r0, [r0] @@ -13508,10 +13508,10 @@ _0804D52A: ands r5, r0 cmp r5, 0 beq _0804D5DA - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank movs r0, 0x3 strb r0, [r5] - ldr r0, =gUnknown_02023864 + ldr r0, =gBattleBufferB ldr r2, =0x00000201 adds r0, r2 ldrb r1, [r0] @@ -13521,7 +13521,7 @@ _0804D52A: lsls r0, 24 cmp r0, 0 beq _0804D5A8 - ldr r2, =gUnknown_02024210 + ldr r2, =gAbsentBankFlags ldrb r0, [r5] lsls r0, 2 adds r0, r4 @@ -13529,7 +13529,7 @@ _0804D52A: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldrb r0, [r5] lsls r0, 2 adds r0, r4 @@ -13545,7 +13545,7 @@ _0804D52A: b _0804D5DA .pool _0804D5A8: - ldr r4, =gUnknown_0202437C + ldr r4, =gSpecialStatuses ldrb r0, [r5] lsls r1, r0, 2 adds r1, r0 @@ -13555,7 +13555,7 @@ _0804D5A8: lsls r0, 25 cmp r0, 0 blt _0804D5DA - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x5D ldrb r0, [r0] @@ -13570,7 +13570,7 @@ _0804D5A8: orrs r1, r2 strb r1, [r0] _0804D5DA: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -13581,7 +13581,7 @@ _0804D5F4: adds r0, r2, 0x6 str r0, [r6] _0804D5F8: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] lsrs r5, r0, 28 ldr r1, =gUnknown_0202420D @@ -13590,7 +13590,7 @@ _0804D5F8: ldr r4, =gBitTable ldr r2, [r4] ands r2, r5 - ldr r6, =gUnknown_0202406C + ldr r6, =gNoOfAllBanks cmp r2, 0 bne _0804D634 adds r7, r6, 0 @@ -13637,7 +13637,7 @@ _0804D664: bl get_battle_side_of_something lsls r0, 24 lsrs r7, r0, 24 - ldr r1, =gUnknown_0202437C + ldr r1, =gSpecialStatuses lsls r0, r7, 2 adds r0, r7 lsls r0, 2 @@ -13659,9 +13659,9 @@ _0804D690: lsls r0, 24 cmp r0, 0 beq _0804D6E0 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank strb r7, [r2] - ldr r3, =gUnknown_02024210 + ldr r3, =gAbsentBankFlags ldr r4, =gBitTable ldrb r0, [r2] lsls r0, 2 @@ -13670,7 +13670,7 @@ _0804D690: ldrb r1, [r3] orrs r0, r1 strb r0, [r3] - ldr r3, =gUnknown_02024280 + ldr r3, =gHitMarker ldrb r0, [r2] lsls r0, 2 adds r0, r4 @@ -13684,14 +13684,14 @@ _0804D690: b _0804D804 .pool _0804D6E0: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r7, [r4] ldrb r0, [r4] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r1, [r3] adds r1, r0, r1 adds r1, 0x58 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -13735,7 +13735,7 @@ _0804D6E0: adds r0, 0x6 str r0, [r6] ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _0804D760 @@ -13752,10 +13752,10 @@ _0804D760: ands r0, r1 cmp r0, 0 beq _0804D7C4 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r0, 0 beq _0804D804 @@ -13774,7 +13774,7 @@ _0804D792: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -13784,15 +13784,15 @@ _0804D792: .pool _0804D7C4: adds r0, r7, 0 - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r4, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r4, =gActiveBank strb r0, [r4] - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r3, [r4] @@ -13826,17 +13826,17 @@ _0804D804: thumb_func_start atk51_cmd51 atk51_cmd51: @ 804D820 push {r4-r7,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0804D82C b _0804DA8A _0804D82C: - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank strb r0, [r5] ldr r0, [r4] ldrb r0, [r0, 0x2] @@ -13856,18 +13856,18 @@ _0804D858: b _0804DA82 _0804D862: movs r6, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 blt _0804D86E b _0804DA82 _0804D86E: - ldr r7, =gUnknown_02023864 + ldr r7, =gBattleBufferB _0804D870: ldrb r0, [r7] cmp r0, 0x22 bne _0804D8AA - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r0, [r5] adds r0, r6, r0 adds r0, 0x5C @@ -13897,7 +13897,7 @@ _0804D8AA: lsls r0, 2 adds r7, r0 adds r6, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 blt _0804D870 @@ -13917,7 +13917,7 @@ _0804D8DA: b _0804DA82 .pool _0804D8E8: - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r0, [r4] adds r0, 0x93 ldrb r1, [r0] @@ -13929,7 +13929,7 @@ _0804D8E8: ands r1, r0 cmp r1, 0 bne _0804D922 - ldr r0, =gUnknown_02023864 + ldr r0, =gBattleBufferB lsls r1, r2, 9 adds r0, 0x1 adds r1, r0 @@ -13946,9 +13946,9 @@ _0804D8E8: orrs r0, r1 strb r0, [r2] _0804D922: - ldr r1, =gUnknown_02024332 - ldr r6, =gUnknown_02023864 - ldr r7, =gUnknown_02024064 + ldr r1, =gBattleCommunication + ldr r6, =gBattleBufferB + ldr r7, =gActiveBank ldrb r0, [r7] lsls r0, 9 adds r2, r6, 0x1 @@ -13956,7 +13956,7 @@ _0804D922: ldrb r0, [r0] strb r0, [r1] ldrb r0, [r7] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct mov r12, r1 ldr r1, [r1] adds r1, r0, r1 @@ -14073,13 +14073,13 @@ _0804DA30: ldrb r0, [r7] bl sub_803BDA0 _0804DA36: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r5, 0xFD strb r5, [r1] movs r0, 0x6 strb r0, [r1, 0x1] ldr r4, =gBattleMons - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r0, [r3] movs r2, 0x58 muls r0, r2 @@ -14094,14 +14094,14 @@ _0804DA36: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r2, =gUnknown_02022F68 + ldr r2, =gBattleTextBuff2 strb r5, [r2] movs r0, 0x7 strb r0, [r2, 0x1] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] strb r0, [r2, 0x2] - ldr r1, =gUnknown_02023864 + ldr r1, =gBattleBufferB ldrb r0, [r3] lsls r0, 9 adds r1, 0x1 @@ -14112,7 +14112,7 @@ _0804DA36: negs r0, r0 strb r0, [r2, 0x4] _0804DA82: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 str r0, [r1] @@ -14131,16 +14131,16 @@ atk52_cmd52: @ 804DAAC mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r9, r0 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] ldrb r0, [r4] bl sub_803FA70 - ldr r1, =gUnknown_02024280 + ldr r1, =gHitMarker mov r8, r1 ldr r1, =gBitTable ldrb r0, [r4] @@ -14152,7 +14152,7 @@ atk52_cmd52: @ 804DAAC ldr r0, [r2] bics r0, r1 str r0, [r2] - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -14164,7 +14164,7 @@ atk52_cmd52: @ 804DAAC ands r0, r2 strb r0, [r1] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide ldr r5, =gUnknown_0202428E lsls r0, 24 lsrs r0, 23 @@ -14180,7 +14180,7 @@ atk52_cmd52: @ 804DAAC b _0804DC30 _0804DB1C: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 23 adds r0, r5 @@ -14213,7 +14213,7 @@ _0804DB34: cmp r0, 0x1A beq _0804DC30 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 23 adds r0, r5 @@ -14238,8 +14238,8 @@ _0804DB34: ands r0, r2 str r0, [r1] ldrb r0, [r4] - bl battle_side_get_owner - ldr r2, =gUnknown_02024294 + bl GetBankSide + ldr r2, =gSideTimers lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -14263,7 +14263,7 @@ _0804DB34: movs r0, 0x1 str r0, [r5] _0804DBC8: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r1, [r4] strb r1, [r0, 0x17] bl b_movescr_stack_push_cursor @@ -14292,7 +14292,7 @@ _0804DC24: .pool _0804DC30: ldr r2, =gBattleMons - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r3, [r1] movs r0, 0x58 muls r0, r3 @@ -14300,7 +14300,7 @@ _0804DC30: adds r0, 0x20 ldrb r0, [r0] adds r5, r1, 0 - ldr r4, =gUnknown_020242BC + ldr r4, =gDisableStructs cmp r0, 0x36 bne _0804DC5E lsls r0, r3, 3 @@ -14330,7 +14330,7 @@ _0804DC5E: str r0, [sp] movs r2, 0 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _0804DC88 @@ -14344,7 +14344,7 @@ _0804DC88: cmp r0, 0 bne _0804DD8E ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide ldr r1, =gUnknown_0202428E lsls r0, 24 lsrs r0, 23 @@ -14354,11 +14354,11 @@ _0804DC88: ands r1, r2 strh r1, [r0] movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r7, [r0] cmp r4, r7 bge _0804DCD8 - ldr r6, =gUnknown_0202407E + ldr r6, =gTurnOrder adds r1, r5, 0 ldr r5, =gUnknown_0202407A movs r3, 0xC @@ -14378,16 +14378,16 @@ _0804DCD0: blt _0804DCC2 _0804DCD8: movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bge _0804DD0C - ldr r6, =gUnknown_0202449C + ldr r6, =gBattleStruct ldr r5, =gBattleMons _0804DCE6: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 23 adds r0, 0xA8 @@ -14399,18 +14399,18 @@ _0804DCE6: ldrh r0, [r0, 0x28] strh r0, [r1] adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0804DCE6 _0804DD0C: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x5 bne _0804DD88 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] lsrs r4, r0, 28 ldr r1, =gUnknown_0202420D @@ -14421,7 +14421,7 @@ _0804DD0C: b _0804DD6E .pool _0804DD60: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r3, [r1] ldrb r0, [r0] cmp r3, r0 @@ -14437,7 +14437,7 @@ _0804DD6E: ands r0, r3 cmp r0, 0 beq _0804DD60 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r0, [r0] ands r0, r3 cmp r0, 0 @@ -14461,11 +14461,11 @@ _0804DD8E: thumb_func_start sub_804DDA8 sub_804DDA8: @ 804DDA8 push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl battle_get_side_with_given_state - ldr r4, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r4, =gActiveBank strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x08_8_8_8 @@ -14483,11 +14483,11 @@ sub_804DDA8: @ 804DDA8 thumb_func_start atk54_802511C atk54_802511C: @ 804DDD8 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r5, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r5] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -14509,11 +14509,11 @@ atk54_802511C: @ 804DDD8 thumb_func_start sub_804DE14 sub_804DE14: @ 804DE14 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r5, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r5] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -14536,11 +14536,11 @@ sub_804DE14: @ 804DE14 thumb_func_start atk56_8025194 atk56_8025194: @ 804DE50 push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x2D_2D_2D_2D @@ -14559,16 +14559,16 @@ atk56_8025194: @ 804DE50 atk57_80251C4_flee: @ 804DE80 push {r4,lr} movs r0, 0 - bl battle_get_side_with_given_state - ldr r4, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r4, =gActiveBank strb r0, [r4] - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r1, [r0] movs r0, 0 bl dp01_build_cmdbuf_x37_a ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -14581,11 +14581,11 @@ atk57_80251C4_flee: @ 804DE80 thumb_func_start atk58_cmd58 atk58_cmd58: @ 804DEB8 push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] movs r0, 0 movs r1, 0x1 @@ -14604,7 +14604,7 @@ atk58_cmd58: @ 804DEB8 thumb_func_start atk59_8025230 atk59_8025230: @ 804DEEC push {r4-r7,lr} - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r2, [r0] ldrb r6, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -14626,7 +14626,7 @@ atk59_8025230: @ 804DEEC ldrb r0, [r2, 0x8] lsls r0, 24 orrs r4, r0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 @@ -14642,7 +14642,7 @@ atk59_8025230: @ 804DEEC bne _0804DF56 adds r7, r5, 0 _0804DF3A: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 @@ -14658,7 +14658,7 @@ _0804DF3A: _0804DF56: cmp r5, 0 bne _0804DF70 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr str r4, [r0] b _0804E018 .pool @@ -14666,7 +14666,7 @@ _0804DF70: ldr r0, =0x0000ffff cmp r5, r0 bne _0804DF88 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -14674,14 +14674,14 @@ _0804DF70: .pool _0804DF88: movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r1, =gActiveBank strb r0, [r1] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] ldrh r0, [r0] ldrb r1, [r1, 0x10] @@ -14711,14 +14711,14 @@ _0804DFC8: cmp r0, 0 beq _0804E014 movs r0, 0x2 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r1, =gActiveBank strb r0, [r1] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] ldrh r0, [r0] ldrb r1, [r1, 0x10] @@ -14741,7 +14741,7 @@ _0804DFC8: adds r1, r5, 0 bl sub_80691B0 _0804E014: - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr str r6, [r0] _0804E018: pop {r4-r7} @@ -14756,10 +14756,10 @@ sub_804E038: @ 804E038 mov r7, r8 push {r7} sub sp, 0x4 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank movs r1, 0 strb r1, [r0] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r1, [r0, 0x1F] adds r2, r0, 0 cmp r1, 0x6 @@ -14792,11 +14792,11 @@ _0804E084: ldr r0, =gUnknown_085CCABB movs r1, 0xC bl battle_show_message_maybe - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x1F] adds r0, 0x1 strb r0, [r1, 0x1F] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x1] movs r0, 0 bl sub_8056B74 @@ -14809,7 +14809,7 @@ _0804E0BC: ands r0, r1 cmp r0, 0 beq _0804E0E4 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _0804E0E4 @@ -14827,7 +14827,7 @@ _0804E0E4: ands r0, r1 cmp r0, 0 beq _0804E10C - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _0804E10C @@ -14848,7 +14848,7 @@ _0804E10C: beq _0804E150 movs r0, 0x5 bl audio_play - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r4, [r0, 0x1] cmp r4, 0 bne _0804E20A @@ -14888,7 +14888,7 @@ _0804E162: _0804E170: bl FreeAllWindowBuffers ldr r0, =gPlayerParty - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] ldrb r1, [r1, 0x10] ldr r2, =gUnknown_020244E9 @@ -14902,7 +14902,7 @@ _0804E170: str r4, [sp] bl sub_81BFA38 _0804E192: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x1F] adds r0, 0x1 strb r0, [r1, 0x1F] @@ -14950,13 +14950,13 @@ _0804E1FE: cmp r5, 0x4 bne _0804E224 _0804E20A: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x5 strb r0, [r1, 0x1F] b _0804E3B8 .pool _0804E224: - ldr r6, =gUnknown_0202449C + ldr r6, =gBattleStruct ldr r0, [r6] ldrb r0, [r0, 0x10] movs r1, 0x64 @@ -14976,16 +14976,16 @@ _0804E224: cmp r0, 0 beq _0804E274 ldr r0, =0x0000013f - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r1, [r1] bl b_std_message - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x6 strb r0, [r1, 0x1F] b _0804E3B8 .pool _0804E274: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -14998,7 +14998,7 @@ _0804E274: lsls r0, 24 orrs r1, r0 str r1, [r3] - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -15026,7 +15026,7 @@ _0804E274: ldrh r1, [r7] adds r2, r5, 0 bl sub_80691F4 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID ldr r1, [r6] ldrh r0, [r0] ldrb r1, [r1, 0x10] @@ -15039,7 +15039,7 @@ _0804E274: ands r0, r1 cmp r0, 0 bne _0804E30A - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs ldrb r1, [r0, 0x18] lsrs r1, 4 ldr r2, =gBitTable @@ -15063,8 +15063,8 @@ _0804E30A: ands r0, r1 cmp r0, 0 beq _0804E3B8 - ldr r2, =gUnknown_0202406E - ldr r0, =gUnknown_0202449C + ldr r2, =gBattlePartyID + ldr r0, =gBattleStruct ldr r1, [r0] ldrh r0, [r2, 0x4] ldrb r1, [r1, 0x10] @@ -15080,7 +15080,7 @@ _0804E30A: ands r0, r1 cmp r0, 0 bne _0804E3B8 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs adds r0, 0x50 ldrb r1, [r0] lsrs r1, 4 @@ -15110,14 +15110,14 @@ _0804E38C: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0804E3B8 .pool _0804E3AC: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804E3B8 @@ -15138,7 +15138,7 @@ _0804E3B8: atk5B_80256E0: @ 804E3C8 push {r4,r5,lr} sub sp, 0x4 - ldr r5, =gUnknown_02024474 + ldr r5, =gBattleScripting ldrb r4, [r5, 0x1F] cmp r4, 0 beq _0804E3E0 @@ -15159,7 +15159,7 @@ _0804E3E0: ldrb r0, [r5, 0x1F] adds r0, 0x1 strb r0, [r5, 0x1F] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x1] movs r0, 0 bl sub_8056B74 @@ -15172,7 +15172,7 @@ _0804E410: ands r0, r1 cmp r0, 0 beq _0804E438 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 beq _0804E438 @@ -15190,7 +15190,7 @@ _0804E438: ands r0, r1 cmp r0, 0 beq _0804E460 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _0804E460 @@ -15211,11 +15211,11 @@ _0804E460: beq _0804E4C4 movs r0, 0x5 bl audio_play - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x1] cmp r0, 0 beq _0804E4A4 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -15231,7 +15231,7 @@ _0804E460: b _0804E4AC .pool _0804E4A4: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -15252,7 +15252,7 @@ _0804E4C4: beq _0804E4FA movs r0, 0x5 bl audio_play - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -15282,11 +15282,11 @@ _0804E4FA: thumb_func_start atk5C_cmd5c atk5C_cmd5c: @ 804E508 push {r4,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank strb r0, [r2] ldr r0, =gBattleMoveFlags ldrb r1, [r0] @@ -15294,7 +15294,7 @@ atk5C_cmd5c: @ 804E508 ands r0, r1 cmp r0, 0 bne _0804E58C - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -15313,7 +15313,7 @@ atk5C_cmd5c: @ 804E508 ands r0, r1 cmp r0, 0 beq _0804E55A - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -15324,10 +15324,10 @@ atk5C_cmd5c: @ 804E508 _0804E55A: movs r0, 0 bl dp01_build_cmdbuf_x29_29_29_29 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -15358,12 +15358,12 @@ sub_804E598: @ 804E598 lsls r0, 3 cmp r6, r0 bne _0804E5D8 - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r0, [r0] adds r0, 0x94 ldrb r2, [r0] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x4A ldrb r1, [r0] @@ -15437,7 +15437,7 @@ _0804E644: lsls r0, r7, 2 adds r4, r0, r1 ldrb r3, [r4] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct mov r8, r0 mov r9, r1 ldr r1, =gBattleTypeFlags @@ -15535,7 +15535,7 @@ _0804E6FC: adds r0, r1 adds r1, r4, 0 bl add_money - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x1 @@ -15559,7 +15559,7 @@ _0804E6FC: strb r0, [r1, 0x7] movs r0, 0xFF strb r0, [r1, 0x8] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -15574,13 +15574,13 @@ atk5E_8025A70: @ 804E764 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank strb r0, [r6] - ldr r5, =gUnknown_02024332 + ldr r5, =gBattleCommunication ldrb r0, [r5] mov r8, r4 cmp r0, 0 @@ -15601,7 +15601,7 @@ _0804E794: strb r0, [r5] b _0804E800 _0804E7AC: - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804E800 @@ -15656,15 +15656,15 @@ _0804E800: thumb_func_start atk5F_8025B24 atk5F_8025B24: @ 804E818 push {lr} - ldr r0, =gUnknown_02024064 - ldr r2, =gUnknown_0202420B + ldr r0, =gActiveBank + ldr r2, =gBankAttacker ldrb r3, [r2] strb r3, [r0] - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r1] strb r0, [r2] strb r3, [r1] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, [r2] movs r3, 0x80 lsls r3, 5 @@ -15680,7 +15680,7 @@ _0804E854: orrs r1, r3 _0804E856: str r1, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -15692,18 +15692,18 @@ _0804E856: thumb_func_start atk60_cmd60 atk60_cmd60: @ 804E868 push {lr} - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0804E882 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl sav12_xor_increment _0804E882: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -15718,18 +15718,18 @@ atk61_8025BA4: @ 804E898 mov r7, r8 push {r7} sub sp, 0x30 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804E94C - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank strb r0, [r1] ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty mov r8, r1 @@ -15783,10 +15783,10 @@ _0804E926: mov r1, sp movs r2, 0x1 bl dp01_build_cmdbuf_x30_TODO - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -15803,11 +15803,11 @@ _0804E94C: thumb_func_start atk62_08025C6C atk62_08025C6C: @ 804E960 push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x31_31_31_31 @@ -15825,22 +15825,22 @@ atk62_08025C6C: @ 804E960 thumb_func_start atk63_jumptoattack atk63_jumptoattack: @ 804E990 push {r4,lr} - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0 beq _0804E9B4 - ldr r0, =gUnknown_020241EA - ldr r1, =gUnknown_020241EE + ldr r0, =gCurrentMove + ldr r1, =gRandomMove ldrh r1, [r1] strh r1, [r0] b _0804E9C2 .pool _0804E9B4: ldr r2, =gUnknown_020241EC - ldr r1, =gUnknown_020241EA - ldr r0, =gUnknown_020241EE + ldr r1, =gCurrentMove + ldr r0, =gRandomMove ldrh r0, [r0] strh r0, [r1] strh r0, [r2] @@ -15867,17 +15867,17 @@ _0804E9C2: thumb_func_start atk64_statusanimation atk64_statusanimation: @ 804E9F4 push {r4,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804EA5C - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -15886,7 +15886,7 @@ atk64_statusanimation: @ 804E9F4 ands r0, r1 cmp r0, 0 bne _0804EA54 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -15894,7 +15894,7 @@ atk64_statusanimation: @ 804E9F4 ldrb r0, [r1, 0xA] cmp r0, 0 bne _0804EA54 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -15912,7 +15912,7 @@ atk64_statusanimation: @ 804E9F4 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0804EA54: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -15926,15 +15926,15 @@ _0804EA5C: thumb_func_start atk65_8025D90 atk65_8025D90: @ 804EA84 push {r4,r5,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804EB04 - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank strb r0, [r5] ldr r1, [r4] ldrb r3, [r1, 0x2] @@ -15947,7 +15947,7 @@ atk65_8025D90: @ 804EA84 ldrb r0, [r1, 0x5] lsls r0, 24 orrs r3, r0 - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 ldrb r2, [r5] lsls r0, r2, 2 adds r0, r1 @@ -15956,7 +15956,7 @@ atk65_8025D90: @ 804EA84 ands r0, r1 cmp r0, 0 bne _0804EAFC - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -15964,7 +15964,7 @@ atk65_8025D90: @ 804EA84 ldrb r0, [r1, 0xA] cmp r0, 0 bne _0804EAFC - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -15983,7 +15983,7 @@ atk65_8025D90: @ 804EA84 ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution _0804EAFC: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -15997,15 +15997,15 @@ _0804EB04: thumb_func_start atk66_8025E38 atk66_8025E38: @ 804EB2C push {r4,r5,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _0804EB9E - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank strb r0, [r5] ldr r4, [r4] ldrb r2, [r4, 0x3] @@ -16018,7 +16018,7 @@ atk66_8025E38: @ 804EB2C ldrb r0, [r4, 0x6] lsls r0, 24 orrs r2, r0 - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 ldrb r3, [r5] lsls r0, r3, 2 adds r0, r1 @@ -16027,7 +16027,7 @@ atk66_8025E38: @ 804EB2C ands r0, r1 cmp r0, 0 bne _0804EB96 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -16035,7 +16035,7 @@ atk66_8025E38: @ 804EB2C ldrb r0, [r1, 0xA] cmp r0, 0 bne _0804EB96 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -16047,7 +16047,7 @@ atk66_8025E38: @ 804EB2C ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution _0804EB96: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x7 str r0, [r1] @@ -16062,7 +16062,7 @@ _0804EB9E: atk67_8025ECC: @ 804EBC0 push {r4,r5,lr} sub sp, 0x4 - ldr r5, =gUnknown_02024332 + ldr r5, =gBattleCommunication ldrb r4, [r5] cmp r4, 0 beq _0804EBD8 @@ -16112,7 +16112,7 @@ _0804EC2A: ands r0, r1 cmp r0, 0 beq _0804EC52 - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _0804EC52 @@ -16130,7 +16130,7 @@ _0804EC52: ands r0, r1 cmp r0, 0 beq _0804EC70 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication movs r4, 0x1 strb r4, [r0, 0x1] b _0804EC7A @@ -16150,7 +16150,7 @@ _0804EC7A: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -16166,8 +16166,8 @@ _0804EC96: sub_804ECA4: @ 804ECA4 push {r4,r5,lr} movs r1, 0 - ldr r2, =gUnknown_0202406C - ldr r5, =gUnknown_02024214 + ldr r2, =gNoOfAllBanks + ldr r5, =gBattlescriptCurrInstr ldrb r0, [r2] cmp r1, r0 bge _0804ECC2 @@ -16194,7 +16194,7 @@ _0804ECC2: atk69_8025FE0: @ 804ECDC push {r4-r7,lr} ldr r7, =gBattleMons - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -16203,7 +16203,7 @@ atk69_8025FE0: @ 804ECDC ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0804ED10 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -16214,19 +16214,19 @@ atk69_8025FE0: @ 804ECDC .pool _0804ED10: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r6] muls r0, r5 adds r0, r7 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r6, r0, 24 _0804ED2A: ldr r1, =gUnknown_0202420F - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -16243,7 +16243,7 @@ _0804ED2A: ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -16255,7 +16255,7 @@ _0804ED2A: strb r1, [r0] _0804ED68: ldr r2, =gBattleMons - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -16270,7 +16270,7 @@ _0804ED68: cmp r1, 0 bne _0804EE38 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -16279,14 +16279,14 @@ _0804ED68: ldrb r0, [r0] cmp r0, 0x65 beq _0804EDBA - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 blt _0804EDBA - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r4, 2 adds r1, r4 lsls r1, 2 @@ -16307,7 +16307,7 @@ _0804EDBA: bgt _0804EE38 subs r0, r1, 0x1 str r0, [r2] - ldr r1, =gUnknown_0202433C + ldr r1, =gProtectStructs ldrb r3, [r3] lsls r0, r3, 4 adds r0, r1 @@ -16323,7 +16323,7 @@ _0804EDBA: b _0804EE38 .pool _0804EE10: - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -16344,7 +16344,7 @@ _0804EE10: ldrh r0, [r0, 0x2E] strh r0, [r1] _0804EE38: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -16358,13 +16358,13 @@ _0804EE38: atk6A_stash_item_for_side: @ 804EE58 push {r4-r6,lr} sub sp, 0x4 - ldr r6, =gUnknown_02024214 + ldr r6, =gBattlescriptCurrInstr ldr r0, [r6] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank strb r0, [r5] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldrb r4, [r5] lsls r0, r4, 1 adds r0, 0xB8 @@ -16406,15 +16406,15 @@ atk6A_stash_item_for_side: @ 804EE58 thumb_func_start atk6B_end_battle_80261CC atk6B_end_battle_80261CC: @ 804EEC8 - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -16422,7 +16422,7 @@ atk6B_end_battle_80261CC: @ 804EEC8 strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -16434,7 +16434,7 @@ atk6B_end_battle_80261CC: @ 804EEC8 atk6C_8026208: @ 804EF04 push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r1, [r0, 0x1E] adds r4, r0, 0 cmp r1, 0 @@ -16485,7 +16485,7 @@ _0804EF68: movs r0, 0x2 bl ShowBg bl sub_804F17C - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x2 strb r0, [r1, 0x1E] b _0804F0F2 @@ -16497,7 +16497,7 @@ _0804EF94: beq _0804EFA0 b _0804F0F2 _0804EFA0: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x3 strb r0, [r1, 0x1E] b _0804F0F2 @@ -16530,7 +16530,7 @@ _0804EFAC: movs r2, 0x1D movs r3, 0x13 bl sub_8056A3C - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x4 strb r0, [r1, 0x1E] b _0804F0F2 @@ -16581,7 +16581,7 @@ _0804F04C: movs r3, 0x13 bl sub_8056A3C _0804F06A: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x1E] adds r0, 0x1 strb r0, [r1, 0x1E] @@ -16608,7 +16608,7 @@ _0804F07C: bl SetBgAttribute movs r0, 0x2 bl ShowBg - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0xA strb r0, [r1, 0x1E] b _0804F0F2 @@ -16630,7 +16630,7 @@ _0804F0C0: bl ShowBg movs r0, 0x1 bl ShowBg - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -16646,7 +16646,7 @@ _0804F0F2: sub_804F100: @ 804F100 push {lr} sub sp, 0x14 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 @@ -16655,7 +16655,7 @@ sub_804F100: @ 804F100 adds r0, r1 add r1, sp, 0x8 bl sub_81D388C - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r1, [r0, 0x10] movs r0, 0xD @@ -16676,7 +16676,7 @@ sub_804F100: @ 804F100 sub_804F144: @ 804F144 push {lr} sub sp, 0x10 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 @@ -16782,7 +16782,7 @@ sub_804F220: @ 804F220 mov r7, r8 push {r7} sub sp, 0x10 - ldr r6, =gUnknown_0202449C + ldr r6, =gBattleStruct ldr r0, [r6] ldrb r0, [r0, 0x10] movs r5, 0x64 @@ -16955,7 +16955,7 @@ sub_804F384: @ 804F384 mov r6, r8 push {r6} sub sp, 0x10 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct mov r8, r0 ldr r0, [r0] ldrb r0, [r0, 0x10] @@ -17012,7 +17012,7 @@ sub_804F384: @ 804F384 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -17069,8 +17069,8 @@ _0804F48C: thumb_func_start sub_804F498 sub_804F498: @ 804F498 push {lr} - ldr r3, =gUnknown_0202406E - ldr r0, =gUnknown_0202449C + ldr r3, =gBattlePartyID + ldr r0, =gBattleStruct ldr r0, [r0] ldrh r1, [r3] ldrb r2, [r0, 0x10] @@ -17100,7 +17100,7 @@ _0804F4CE: sub_804F4D4: @ 804F4D4 push {lr} bl sub_803F988 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17113,10 +17113,10 @@ sub_804F4D4: @ 804F4D4 atk6E_state0_side_becomes_attacker: @ 804F4EC push {lr} movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_0202420B + bl GetBankByPlayerAI + ldr r1, =gBankAttacker strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17128,11 +17128,11 @@ atk6E_state0_side_becomes_attacker: @ 804F4EC thumb_func_start atk6F_8026810 atk6F_8026810: @ 804F50C push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] movs r0, 0 movs r1, 0 @@ -17151,16 +17151,16 @@ atk6F_8026810: @ 804F50C thumb_func_start atk70_record_ability_usage_of_side atk70_record_ability_usage_of_side: @ 804F540 push {r4,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank strb r0, [r1] ldrb r0, [r1] - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r1, [r1] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle ldr r0, [r4] adds r0, 0x1 str r0, [r4] @@ -17172,7 +17172,7 @@ atk70_record_ability_usage_of_side: @ 804F540 thumb_func_start sub_804F574 sub_804F574: @ 804F574 - ldr r2, =gUnknown_02022F68 + ldr r2, =gBattleTextBuff2 movs r0, 0xFD strb r0, [r2] movs r0, 0x2 @@ -17195,7 +17195,7 @@ sub_804F574: @ 804F574 atk71_80268A0: @ 804F59C push {lr} bl sub_804F574 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17213,7 +17213,7 @@ atk72_flee: @ 804F5B4 lsls r0, 24 cmp r0, 0 beq _0804F5E8 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -17229,7 +17229,7 @@ atk72_flee: @ 804F5B4 b _0804F5F0 .pool _0804F5E8: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -17248,11 +17248,11 @@ atk73_cmd73: @ 804F5F8 ands r4, r6 cmp r4, 0 bne _0804F68E - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank strb r0, [r1] movs r1, 0x1 eors r0, r1 @@ -17276,7 +17276,7 @@ _0804F636: cmp r5, 0 bne _0804F65C _0804F63E: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xB1 strb r4, [r0] @@ -17285,7 +17285,7 @@ _0804F63E: _0804F65C: cmp r0, 0x27 ble _0804F670 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xB1 strb r6, [r0] @@ -17294,21 +17294,21 @@ _0804F65C: _0804F670: cmp r0, 0x9 ble _0804F684 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xB1 movs r1, 0x2 b _0804F68C .pool _0804F684: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xB1 movs r1, 0x3 _0804F68C: strb r1, [r0] _0804F68E: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -17330,21 +17330,21 @@ atk74_hp_tresholds_2: @ 804F6A4 ands r7, r0 cmp r7, 0 bne _0804F73E - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something adds r4, r0, 0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank strb r4, [r0] movs r0, 0x1 eors r4, r0 lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r6, [r1] lsrs r0, 23 adds r0, r6 @@ -17390,7 +17390,7 @@ _0804F736: _0804F73C: strb r0, [r1] _0804F73E: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -17407,10 +17407,10 @@ atk75_8026A58: @ 804F754 push {lr} sub sp, 0x4 ldr r2, =gUnknown_020244B8 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r0, [r1] strb r0, [r2] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r1] lsls r0, 1 adds r0, r2 @@ -17427,7 +17427,7 @@ atk75_8026A58: @ 804F754 str r3, [sp] movs r3, 0 bl ExecuteTableBasedItemEffect - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -17442,11 +17442,11 @@ sub_804F7AC: @ 804F7AC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank strb r0, [r1] ldr r0, [r4] ldrb r0, [r0, 0x2] @@ -17490,23 +17490,23 @@ _0804F7E0: .4byte _0804FD30 .4byte _0804FD5C _0804F84C: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves b _0804FD70 .pool _0804F85C: - ldr r1, =gUnknown_0202420B - ldr r4, =gEnemyMonIndex + ldr r1, =gBankAttacker + ldr r4, =gBankTarget ldrb r0, [r4] strb r0, [r1] ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02024294 + ldr r2, =gSideTimers lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -17526,31 +17526,31 @@ _0804F85C: b _0804FD70 .pool _0804F8A8: - ldr r0, =gEnemyMonIndex - ldr r1, =gUnknown_02024064 + ldr r0, =gBankTarget + ldr r1, =gActiveBank ldrb r1, [r1] strb r1, [r0] b _0804FD70 .pool _0804F8BC: bl sub_803BB88 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication strb r0, [r1] b _0804FD70 .pool _0804F8CC: - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] movs r1, 0 - bl sub_80458E0 - ldr r1, =gEnemyMonIndex + bl GetMoveTarget + ldr r1, =gBankTarget strb r0, [r1] b _0804FD70 .pool _0804F8E4: - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -17560,19 +17560,19 @@ _0804F8E4: ands r2, r0 cmp r2, 0 beq _0804F914 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1] b _0804FD70 .pool _0804F914: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r2, [r0] b _0804FD70 .pool _0804F920: - ldr r4, =gUnknown_0202437C - ldr r3, =gUnknown_02024064 + ldr r4, =gSpecialStatuses + ldr r3, =gActiveBank ldrb r0, [r3] lsls r1, r0, 2 adds r1, r0 @@ -17596,8 +17596,8 @@ _0804F920: b _0804FD70 .pool _0804F958: - ldr r4, =gUnknown_0202406E - ldr r1, =gUnknown_0202449C + ldr r4, =gBattlePartyID + ldr r1, =gBattleStruct ldr r0, [r1] ldrh r3, [r4] ldrb r2, [r0, 0x10] @@ -17612,12 +17612,12 @@ _0804F970: cmp r3, r0 bne _0804F988 _0804F974: - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0 b _0804F98C .pool _0804F988: - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank movs r0, 0x2 _0804F98C: strb r0, [r1] @@ -17684,7 +17684,7 @@ _0804F9F8: bne _0804FA04 b _0804FD70 _0804FA04: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r1, [r0] ldr r2, =0xffbfffff ands r1, r2 @@ -17692,16 +17692,16 @@ _0804FA04: b _0804FD70 .pool _0804FA20: - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication mov r8, r2 movs r0, 0 strb r0, [r2] - ldr r1, =gUnknown_02024474 - ldr r6, =gUnknown_02024064 + ldr r1, =gBattleScripting + ldr r6, =gActiveBank ldrb r0, [r2, 0x1] strb r0, [r6] strb r0, [r1, 0x17] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r7, r0, 0 adds r7, 0x92 @@ -17769,7 +17769,7 @@ _0804FA82: b _0804FD70 .pool _0804FACC: - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication adds r0, r4, 0 bl sub_81A5258 lsls r0, 24 @@ -17786,18 +17786,18 @@ _0804FAE8: adds r0, 0x80 movs r1, 0 strh r1, [r0] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r3, =gBitTable ldr r1, [r3, 0x4] lsls r1, 28 ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r2, [r0] ldr r0, =0x000002a1 adds r2, r0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID ldrh r0, [r0, 0x2] lsls r0, 2 adds r0, r3 @@ -17805,7 +17805,7 @@ _0804FAE8: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs adds r1, 0x34 ldrb r0, [r1] movs r2, 0x2 @@ -17815,7 +17815,7 @@ _0804FB3C: ldr r1, =gBattleMons movs r0, 0 strh r0, [r1, 0x28] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r3, =gBitTable ldr r1, [r3] lsls r1, 28 @@ -17825,12 +17825,12 @@ _0804FB3C: lsls r1, 15 orrs r0, r1 str r0, [r2] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r2, [r0] movs r1, 0xA8 lsls r1, 2 adds r2, r1 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID ldrh r0, [r0] lsls r0, 2 adds r0, r3 @@ -17838,7 +17838,7 @@ _0804FB3C: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r0, [r2, 0x18] movs r1, 0x2 orrs r0, r1 @@ -17851,7 +17851,7 @@ _0804FB94: strh r1, [r0, 0x28] adds r0, 0x80 strh r1, [r0] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r3, =gBitTable ldr r0, [r3] lsls r0, 28 @@ -17864,12 +17864,12 @@ _0804FB94: lsls r0, 15 orrs r1, r0 str r1, [r2] - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r2, [r5] movs r0, 0xA8 lsls r0, 2 adds r2, r0 - ldr r4, =gUnknown_0202406E + ldr r4, =gBattlePartyID ldrh r0, [r4] lsls r0, 2 adds r0, r3 @@ -17887,7 +17887,7 @@ _0804FB94: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs ldrb r0, [r1, 0x18] movs r2, 0x2 orrs r0, r2 @@ -17902,7 +17902,7 @@ _0804FBF4: _0804FC18: movs r0, 0 bl sub_8033E10 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution b _0804FD70 @@ -17915,7 +17915,7 @@ _0804FC32: b _0804FD70 _0804FC38: ldr r1, =gUnknown_085CD1C8 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] lsls r0, 2 @@ -17941,7 +17941,7 @@ _0804FC6A: _0804FC76: b _0804FD70 _0804FC78: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank movs r0, 0x1 strb r0, [r4] ldr r0, =gBattleMons @@ -17949,11 +17949,11 @@ _0804FC78: b _0804FCA2 .pool _0804FC8C: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r0, 0x3 bls _0804FD70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank movs r0, 0x3 strb r0, [r4] ldr r0, =gBattleMons @@ -17987,12 +17987,12 @@ _0804FCD8: b _0804FD70 .pool _0804FCF0: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r2, [r0] ldr r0, =0x000002a2 adds r2, r0 ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -18003,7 +18003,7 @@ _0804FCF0: b _0804FD70 .pool _0804FD1C: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl sub_805725C _0804FD24: @@ -18012,19 +18012,19 @@ _0804FD24: b _0804FD70 .pool _0804FD30: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0804FD50 - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0x5 strb r0, [r1] b _0804FD70 .pool _0804FD50: - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0xA strb r0, [r1] b _0804FD70 @@ -18035,11 +18035,11 @@ _0804FD5C: movs r0, 0 movs r2, 0x1 bl sub_8034300 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution _0804FD70: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x3 str r0, [r1] @@ -18059,13 +18059,13 @@ atk77_setprotect: @ 804FD8C push {r7} movs r6, 0x1 ldr r2, =gUnknown_02024260 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 ldrh r0, [r0] mov r8, r1 - ldr r7, =gUnknown_020242BC + ldr r7, =gDisableStructs cmp r0, 0xB6 beq _0804FDBC cmp r0, 0xC5 @@ -18081,7 +18081,7 @@ atk77_setprotect: @ 804FD8C _0804FDBC: ldr r0, =gUnknown_02024082 ldrb r1, [r0] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 @@ -18107,7 +18107,7 @@ _0804FDCC: cmp r6, 0 beq _0804FE80 ldr r4, =gBattleMoves - ldr r3, =gUnknown_020241EA + ldr r3, =gCurrentMove ldrh r0, [r3] lsls r1, r0, 1 adds r1, r0 @@ -18116,7 +18116,7 @@ _0804FDCC: ldrb r0, [r1] cmp r0, 0x6F bne _0804FE1C - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -18124,7 +18124,7 @@ _0804FDCC: movs r2, 0x1 orrs r0, r2 strb r0, [r1] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] _0804FE1C: @@ -18136,7 +18136,7 @@ _0804FE1C: ldrb r0, [r1] cmp r0, 0x74 bne _0804FE42 - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -18144,7 +18144,7 @@ _0804FE1C: movs r2, 0x2 orrs r0, r2 strb r0, [r1] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] _0804FE42: @@ -18160,8 +18160,8 @@ _0804FE42: b _0804FEA2 .pool _0804FE80: - ldr r2, =gUnknown_020242BC - ldr r0, =gUnknown_0202420B + ldr r2, =gDisableStructs + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -18169,7 +18169,7 @@ _0804FE80: adds r0, r2 movs r1, 0 strb r1, [r0, 0x8] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] ldr r2, =gBattleMoveFlags @@ -18178,7 +18178,7 @@ _0804FE80: orrs r0, r1 strb r0, [r2] _0804FEA2: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18195,13 +18195,13 @@ atk78_faintifabilitynotdamp: @ 804FEC8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r2, [r0] cmp r2, 0 bne _0804FFCC - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget strb r2, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r3, [r0] adds r5, r1, 0 mov r8, r0 @@ -18237,8 +18237,8 @@ _0804FF14: ldrb r1, [r1] cmp r0, r1 bne _0804FFB0 - ldr r4, =gUnknown_02024064 - ldr r7, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r7, =gBankAttacker ldrb r0, [r7] strb r0, [r4] ldr r2, =gBattleMoveDamage @@ -18253,7 +18253,7 @@ _0804FF14: bl dp01_build_cmdbuf_x18_0_aa_health_bar_update ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18267,7 +18267,7 @@ _0804FF14: ldrb r5, [r7] ldr r7, =gBitTable adds r4, r0, 0 - ldr r6, =gUnknown_02024210 + ldr r6, =gAbsentBankFlags _0804FF60: ldrb r2, [r3] cmp r2, r5 @@ -18290,7 +18290,7 @@ _0804FF76: b _0804FFCC .pool _0804FFB0: - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility movs r0, 0x6 strb r0, [r1] ldrb r0, [r5] @@ -18299,8 +18299,8 @@ _0804FFB0: adds r1, r6 adds r1, 0x20 ldrb r1, [r1] - bl b_history__record_ability_usage_of_player - ldr r1, =gUnknown_02024214 + bl RecordAbilityBattle + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB560 str r0, [r1] _0804FFCC: @@ -18316,12 +18316,12 @@ _0804FFCC: atk79_setuserhptozero: @ 804FFE4 push {r4,lr} sub sp, 0x4 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r3, [r0] cmp r3, 0 bne _08050028 - ldr r4, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r4] ldr r1, =gBattleMons @@ -18342,7 +18342,7 @@ atk79_setuserhptozero: @ 804FFE4 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18357,7 +18357,7 @@ _08050028: thumb_func_start sub_8050044 sub_8050044: @ 8050044 push {r4-r7,lr} - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r4, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -18376,17 +18376,17 @@ sub_8050044: @ 8050044 adds r7, r3, 0 cmp r0, 0 beq _080500DC - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker lsls r1, 24 lsrs r1, 24 adds r3, r0, 0 - ldr r6, =gUnknown_02024210 + ldr r6, =gAbsentBankFlags ldr r5, =gBitTable - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks mov r12, r0 ldrb r0, [r2] cmp r1, r0 @@ -18434,7 +18434,7 @@ _080500E0: thumb_func_start sub_80500E8 sub_80500E8: @ 80500E8 push {r4-r6,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r1, [r4] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -18447,10 +18447,10 @@ sub_80500E8: @ 80500E8 lsls r0, 24 orrs r2, r0 ldrb r0, [r1, 0x5] - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget cmp r0, 0x1 bne _08050110 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r3] _08050110: @@ -18499,8 +18499,8 @@ sub_8050164: @ 8050164 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r2, =gUnknown_0202406C - ldr r0, =gUnknown_0202420B + ldr r2, =gNoOfAllBanks + ldr r0, =gBankAttacker mov r10, r0 movs r1, 0 add r0, sp, 0x4 @@ -18515,13 +18515,13 @@ _0805017A: ldrb r1, [r2] cmp r5, r1 bge _080501D0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r6, [r0] ldr r2, =0x0000ffff mov r9, r2 lsls r4, r6, 3 mov r2, sp - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct mov r12, r0 adds r7, r1, 0 _080501A0: @@ -18553,7 +18553,7 @@ _080501C8: _080501D0: mov r1, r10 ldrb r0, [r1] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] lsls r0, 1 adds r0, r1 @@ -18569,12 +18569,12 @@ _080501D0: ldr r0, =0x0000ffff cmp r3, r0 beq _08050220 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, =gUnknown_020241EA + ldr r4, =gCurrentMove strh r3, [r4] b _0805024A .pool @@ -18582,7 +18582,7 @@ _08050220: mov r0, r8 cmp r0, 0 beq _08050290 - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xfffffbff ands r0, r1 @@ -18593,7 +18593,7 @@ _08050220: mov r1, r8 bl __modsi3 adds r5, r0, 0 - ldr r4, =gUnknown_020241EA + ldr r4, =gCurrentMove lsls r0, r5, 1 add r0, sp ldrh r0, [r0] @@ -18601,10 +18601,10 @@ _08050220: _0805024A: ldrh r0, [r4] movs r1, 0 - bl sub_80458E0 - ldr r1, =gEnemyMonIndex + bl GetMoveTarget + ldr r1, =gBankTarget strb r0, [r1] - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r3, =gUnknown_082D86A8 ldr r2, =gBattleMoves ldrh r1, [r4] @@ -18620,7 +18620,7 @@ _0805024A: b _080502AE .pool _08050290: - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses mov r0, r10 ldrb r1, [r0] lsls r0, r1, 2 @@ -18631,7 +18631,7 @@ _08050290: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18661,7 +18661,7 @@ sub_80502C8: @ 80502C8 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08050304 @@ -18669,14 +18669,14 @@ sub_80502C8: @ 80502C8 _080502F4: movs r0, 0x1 strh r0, [r2] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r1, [r0, 0x5] ldr r0, =gUnknown_020243D0 adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _08050304: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18688,9 +18688,9 @@ _08050304: thumb_func_start atk7E_setreflect atk7E_setreflect: @ 805031C push {r4-r6,lr} - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity ldr r4, =gUnknown_0202428E movs r5, 0x1 adds r1, r5, 0 @@ -18707,13 +18707,13 @@ atk7E_setreflect: @ 805031C movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 b _080503D0 .pool _0805035C: ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r5, 0 ands r1, r0 lsls r1, 1 @@ -18723,8 +18723,8 @@ _0805035C: orrs r0, r2 strh r0, [r1] ldrb r0, [r6] - bl battle_get_per_side_status - ldr r4, =gUnknown_02024294 + bl GetBankIdentity + ldr r4, =gSideTimers adds r1, r5, 0 ands r1, r0 lsls r0, r1, 1 @@ -18734,7 +18734,7 @@ _0805035C: movs r1, 0x5 strb r1, [r0] ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r5, 0 ands r1, r0 lsls r0, r1, 1 @@ -18754,17 +18754,17 @@ _0805035C: lsrs r1, r0, 24 cmp r1, 0x2 bne _080503CC - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r1, [r0, 0x5] b _080503D2 .pool _080503CC: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 _080503D0: strb r0, [r1, 0x5] _080503D2: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18786,9 +18786,9 @@ sub_80503E8: @ 80503E8 ands r0, r5 cmp r0, 0 bne _0805041A - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 mov r9, r0 - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget mov r8, r1 ldrb r4, [r1] lsls r0, r4, 2 @@ -18805,7 +18805,7 @@ _0805041A: movs r0, 0x1 orrs r0, r5 strb r0, [r7] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08050488 @@ -18829,13 +18829,13 @@ _08050454: movs r0, 0x1 orrs r0, r5 strb r0, [r7] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08050488 .pool _0805046C: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] orrs r2, r0 str r2, [r6] @@ -18847,10 +18847,10 @@ _0805046C: mov r2, r12 orrs r0, r2 str r0, [r1] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r3, [r0, 0x5] _08050488: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -18866,7 +18866,7 @@ _08050488: thumb_func_start atk80_manipulatedamage atk80_manipulatedamage: @ 80504A8 push {r4,lr} - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] ldrb r2, [r0, 0x1] adds r4, r1, 0 @@ -18900,7 +18900,7 @@ _080504D8: str r2, [r3] _080504EA: ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -18933,7 +18933,7 @@ _08050518: atk81_setrest: @ 8050528 push {r4-r7,lr} sub sp, 0x4 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r12, r0 ldr r1, [r0] ldrb r6, [r1, 0x1] @@ -18946,9 +18946,9 @@ atk81_setrest: @ 8050528 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r6, r0 - ldr r5, =gUnknown_02024064 - ldr r2, =gEnemyMonIndex - ldr r0, =gUnknown_0202420B + ldr r5, =gActiveBank + ldr r2, =gBankTarget + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r2] strb r0, [r5] @@ -18985,13 +18985,13 @@ _08050598: ands r1, r0 cmp r1, 0 beq _080505B4 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _080505B8 .pool _080505B4: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r1, [r0, 0x5] _080505B8: ldrb r0, [r5] @@ -19012,7 +19012,7 @@ _080505B8: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -19027,7 +19027,7 @@ _080505E8: thumb_func_start atk82_jumpifnotfirstturn atk82_jumpifnotfirstturn: @ 80505F8 push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r4, [r5] ldrb r3, [r4, 0x1] ldrb r0, [r4, 0x2] @@ -19039,8 +19039,8 @@ atk82_jumpifnotfirstturn: @ 80505F8 ldrb r0, [r4, 0x4] lsls r0, 24 orrs r3, r0 - ldr r2, =gUnknown_020242BC - ldr r0, =gUnknown_0202420B + ldr r2, =gDisableStructs + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -19063,7 +19063,7 @@ _0805063A: thumb_func_start sub_8050640 sub_8050640: @ 8050640 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19079,7 +19079,7 @@ sub_8050650: @ 8050650 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] mov r8, r0 cmp r2, r1 @@ -19093,8 +19093,8 @@ sub_8050650: @ 8050650 adds r5, 0x20 adds r4, r1, 0 movs r3, 0 - ldr r6, =gUnknown_02024474 - ldr r7, =gUnknown_02024332 + ldr r6, =gBattleScripting + ldr r7, =gBattleCommunication _0805067C: mov r0, r12 adds r0, 0x50 @@ -19109,7 +19109,7 @@ _0805067C: beq _080506BC movs r3, 0 strb r2, [r6, 0x17] - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r1] cmp r0, 0xFF beq _080506DC @@ -19132,7 +19132,7 @@ _080506C4: movs r0, 0x1 b _080506E2 _080506D0: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r3, [r0, 0x5] b _080506C4 .pool @@ -19152,7 +19152,7 @@ _080506E2: thumb_func_start sub_80506EC sub_80506EC: @ 80506EC push {r4-r6,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r1, [r5] ldrb r4, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -19164,7 +19164,7 @@ sub_80506EC: @ 80506EC ldrb r0, [r1, 0x4] lsls r0, 24 orrs r4, r0 - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r0, [r6] bl sub_8050650 lsls r0, 24 @@ -19187,15 +19187,15 @@ _08050720: cmp r1, 0x48 bne _0805075C _08050738: - ldr r2, =gUnknown_0202420A + ldr r2, =gLastUsedAbility strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] str r4, [r5] ldrb r1, [r2] adds r0, r3, 0 - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _08050762 .pool _0805075C: @@ -19211,8 +19211,8 @@ _08050762: thumb_func_start sub_8050768 sub_8050768: @ 8050768 push {r4,r5,lr} - ldr r5, =gUnknown_020242BC - ldr r4, =gUnknown_0202420B + ldr r5, =gDisableStructs + ldr r4, =gBankAttacker ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -19226,7 +19226,7 @@ sub_8050768: @ 8050768 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _080507CA @@ -19235,7 +19235,7 @@ _080507A0: adds r0, 0x1 movs r3, 0 strb r0, [r1, 0x9] - ldr r2, =gUnknown_02022F58 + ldr r2, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r2] movs r0, 0x1 @@ -19251,10 +19251,10 @@ _080507A0: strb r0, [r2, 0x4] movs r0, 0xFF strb r0, [r2, 0x5] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r3, [r0, 0x5] _080507CA: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19270,7 +19270,7 @@ atk86_stockpiletobasedamage: @ 80507E4 mov r7, r8 push {r7} sub sp, 0x10 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -19282,8 +19282,8 @@ atk86_stockpiletobasedamage: @ 80507E4 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r2, r0 - ldr r7, =gUnknown_020242BC - ldr r6, =gUnknown_0202420B + ldr r7, =gDisableStructs + ldr r6, =gBankAttacker ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -19296,16 +19296,16 @@ atk86_stockpiletobasedamage: @ 80507E4 b _080508CA .pool _08050828: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _080508B0 ldr r0, =gBattleMoveDamage mov r8, r0 ldr r4, =gUnknown_0202428E - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 lsls r1, 1 @@ -19319,7 +19319,7 @@ _08050828: ldrb r1, [r5] muls r1, r4 adds r1, r2 - ldr r2, =gUnknown_020241EA + ldr r2, =gCurrentMove ldrh r2, [r2] movs r4, 0 str r4, [sp] @@ -19339,7 +19339,7 @@ _08050828: muls r3, r1 mov r1, r8 str r3, [r1] - ldr r2, =gUnknown_02024474 + ldr r2, =gBattleScripting ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -19347,7 +19347,7 @@ _08050828: adds r0, r7 ldrb r0, [r0, 0x9] strb r0, [r2, 0x18] - ldr r1, =gUnknown_0202433C + ldr r1, =gProtectStructs ldrb r0, [r6] lsls r0, 4 adds r0, r1 @@ -19362,8 +19362,8 @@ _08050828: mov r1, r8 str r0, [r1] _080508B0: - ldr r2, =gUnknown_020242BC - ldr r0, =gUnknown_0202420B + ldr r2, =gDisableStructs + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -19371,7 +19371,7 @@ _080508B0: adds r0, r2 movs r1, 0 strb r1, [r0, 0x9] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -19390,7 +19390,7 @@ atk87_stockpiletohprecovery: @ 8050904 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, =gUnknown_02024214 + ldr r7, =gBattlescriptCurrInstr ldr r1, [r7] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -19402,9 +19402,9 @@ atk87_stockpiletohprecovery: @ 8050904 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r2, r0 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs mov r8, r0 - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r3, [r6] lsls r0, r3, 3 subs r0, r3 @@ -19415,7 +19415,7 @@ atk87_stockpiletohprecovery: @ 8050904 cmp r1, 0 bne _08050954 str r2, [r7] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r1, [r0, 0x5] b _080509D0 .pool @@ -19431,10 +19431,10 @@ _08050954: movs r0, 0 strb r0, [r4, 0x9] str r2, [r7] - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r6] strb r0, [r1] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _080509D0 @@ -19457,7 +19457,7 @@ _080509A0: ldr r0, [r5] negs r0, r0 str r0, [r5] - ldr r3, =gUnknown_02024474 + ldr r3, =gBattleScripting ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -19475,7 +19475,7 @@ _080509A0: ldr r0, [r7] adds r0, 0x5 str r0, [r7] - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r6] strb r0, [r1] _080509D0: @@ -19504,7 +19504,7 @@ atk88_negativedamage: @ 80509E8 negs r0, r0 str r0, [r2] _08050A04: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -19534,13 +19534,13 @@ sub_8050A1C: @ 8050A1C ands r0, r5 cmp r0, 0 beq _08050A50 - ldr r0, =gUnknown_02024064 - ldr r1, =gUnknown_0202420B + ldr r0, =gActiveBank + ldr r1, =gBankAttacker b _08050A54 .pool _08050A50: - ldr r0, =gUnknown_02024064 - ldr r1, =gEnemyMonIndex + ldr r0, =gActiveBank + ldr r1, =gBankTarget _08050A54: ldrb r1, [r1] strb r1, [r0] @@ -19570,7 +19570,7 @@ _08050A6E: _08050A84: movs r0, 0xDF ands r5, r0 - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r4, 0 movs r2, 0xFD strb r2, [r1] @@ -19587,10 +19587,10 @@ _08050A84: blt _08050AA8 b _08050D8C _08050AA8: - ldr r4, =gUnknown_02024294 - ldr r1, =gUnknown_02024064 + ldr r4, =gSideTimers + ldr r1, =gActiveBank ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 lsls r0, r1, 1 @@ -19603,14 +19603,14 @@ _08050AA8: mov r2, r9 cmp r2, 0 bne _08050B48 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] cmp r0, 0xAE beq _08050B78 cmp r5, 0x1 bne _08050B68 - ldr r4, =gUnknown_0202437C - ldr r3, =gUnknown_02024064 + ldr r4, =gSpecialStatuses + ldr r3, =gActiveBank ldrb r0, [r3] lsls r1, r0, 2 adds r1, r0 @@ -19620,7 +19620,7 @@ _08050AA8: lsls r0, 31 cmp r0, 0 beq _08050B10 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r4, r8 str r4, [r0] b _08050B68 @@ -19628,11 +19628,11 @@ _08050AA8: _08050B10: mov r0, r8 bl b_movescr_stack_push - ldr r1, =gUnknown_02024474 - ldr r6, =gUnknown_02024064 + ldr r1, =gBattleScripting + ldr r6, =gActiveBank ldrb r0, [r6] strb r0, [r1, 0x17] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAE03 str r0, [r1] ldrb r1, [r6] @@ -19647,7 +19647,7 @@ _08050B10: b _08050B68 .pool _08050B48: - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] cmp r0, 0xAE beq _08050B78 @@ -19659,7 +19659,7 @@ _08050B48: lsls r0, 24 cmp r0, 0 beq _08050B78 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082D9F1C str r0, [r1] _08050B68: @@ -19668,7 +19668,7 @@ _08050B68: .pool _08050B78: ldr r2, =gBattleMons - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r3, [r1] movs r4, 0x58 adds r0, r3, 0 @@ -19685,13 +19685,13 @@ _08050B94: mov r0, r9 cmp r0, 0 bne _08050C2C - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] cmp r0, 0xAE beq _08050C2C cmp r5, 0x1 bne _08050B68 - ldr r4, =gUnknown_0202437C + ldr r4, =gSpecialStatuses lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -19700,7 +19700,7 @@ _08050B94: lsls r0, 31 cmp r0, 0 beq _08050BD4 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r1, r8 str r1, [r0] b _08050B68 @@ -19708,14 +19708,14 @@ _08050B94: _08050BD4: mov r0, r8 bl b_movescr_stack_push - ldr r1, =gUnknown_02024474 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleScripting + ldr r2, =gActiveBank ldrb r0, [r2] strb r0, [r1, 0x17] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB5C7 str r0, [r1] - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r0, [r2] movs r3, 0x58 muls r0, r3 @@ -19725,8 +19725,8 @@ _08050BD4: strb r0, [r1] ldrb r0, [r2] ldrb r1, [r1] - bl b_history__record_ability_usage_of_player - ldr r6, =gUnknown_02024064 + bl RecordAbilityBattle + ldr r6, =gActiveBank ldrb r1, [r6] lsls r0, r1, 2 adds r0, r1 @@ -19739,7 +19739,7 @@ _08050BD4: b _08050B68 .pool _08050C2C: - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r0, [r1] movs r4, 0x58 muls r0, r4 @@ -19757,14 +19757,14 @@ _08050C2C: bne _08050B68 mov r0, r8 bl b_movescr_stack_push - ldr r1, =gUnknown_02024474 - ldr r3, =gUnknown_02024064 + ldr r1, =gBattleScripting + ldr r3, =gActiveBank ldrb r0, [r3] strb r0, [r1, 0x17] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB62F str r0, [r1] - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r0, [r3] muls r0, r4 add r0, r10 @@ -19773,11 +19773,11 @@ _08050C2C: strb r0, [r1] ldrb r0, [r3] ldrb r1, [r1] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _08050B68 .pool _08050C8C: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] movs r4, 0x58 muls r0, r4 @@ -19797,14 +19797,14 @@ _08050C8C: _08050CAE: mov r0, r8 bl b_movescr_stack_push - ldr r1, =gUnknown_02024474 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleScripting + ldr r2, =gActiveBank ldrb r0, [r2] strb r0, [r1, 0x17] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB62F str r0, [r1] - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r0, [r2] muls r0, r4 add r0, r10 @@ -19813,11 +19813,11 @@ _08050CAE: strb r0, [r1] ldrb r0, [r2] ldrb r1, [r1] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _08050B68 .pool _08050CF0: - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -19836,7 +19836,7 @@ _08050D08: ands r0, r1 negs r0, r0 lsls r0, 24 - ldr r3, =gUnknown_02022F68 + ldr r3, =gBattleTextBuff2 movs r4, 0 movs r1, 0xFD strb r1, [r3] @@ -19865,7 +19865,7 @@ _08050D32: adds r1, r2, r3 movs r0, 0xFF strb r0, [r1] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -19879,9 +19879,9 @@ _08050D32: cmp r0, 0 beq _08050DE2 movs r1, 0 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] - ldr r3, =gUnknown_02024332 + ldr r3, =gBattleCommunication mov r8, r3 cmp r0, r2 bne _08050D76 @@ -19895,7 +19895,7 @@ _08050D8C: asrs r6, r0, 28 movs r0, 0x7 ands r6, r0 - ldr r3, =gUnknown_02022F68 + ldr r3, =gBattleTextBuff2 strb r2, [r3] movs r2, 0x1 cmp r6, 0x2 @@ -19922,7 +19922,7 @@ _08050DA6: orrs r0, r2 strb r0, [r1] ldr r2, =gBattleMons - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r3, [r4] movs r0, 0x58 muls r0, r3 @@ -19937,7 +19937,7 @@ _08050DA6: cmp r0, 0xC bne _08050DFC _08050DE2: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] mov r8, r1 @@ -19945,9 +19945,9 @@ _08050DE2: .pool _08050DFC: movs r1, 0 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication mov r8, r2 cmp r0, r3 bne _08050E0C @@ -19956,7 +19956,7 @@ _08050E0C: mov r3, r8 strb r1, [r3, 0x5] _08050E10: - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] movs r4, 0x58 adds r1, r0, 0 @@ -19981,7 +19981,7 @@ _08050E10: movs r0, 0 strb r0, [r1] _08050E40: - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r0, [r1] muls r0, r4 adds r0, r7, r0 @@ -20030,7 +20030,7 @@ _08050E80: thumb_func_start atk89_statbuffchange atk89_statbuffchange: @ 8050EA0 push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r2, [r5] ldrb r3, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -20042,7 +20042,7 @@ atk89_statbuffchange: @ 8050EA0 ldrb r0, [r2, 0x5] lsls r0, 24 orrs r3, r0 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r4, [r0, 0x1A] movs r0, 0xF0 ands r0, r4 @@ -20069,9 +20069,9 @@ _08050EDC: atk8A_normalisebuffs: @ 8050EEC push {r4-r7,lr} movs r2, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r1, [r0] - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r12, r0 cmp r2, r1 bge _08050F24 @@ -20112,7 +20112,7 @@ _08050F24: atk8B_setbide: @ 8050F40 push {r4,r5,lr} ldr r4, =gBattleMons - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r0, [r3] movs r5, 0x58 adds r2, r0, 0 @@ -20128,7 +20128,7 @@ atk8B_setbide: @ 8050F40 ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove ldrh r1, [r1] movs r2, 0 strh r1, [r0] @@ -20146,7 +20146,7 @@ atk8B_setbide: @ 8050F40 lsls r2, 2 orrs r0, r2 str r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20160,7 +20160,7 @@ atk8B_setbide: @ 8050F40 atk8C_confuseifrepeatingattackends: @ 8050FB0 push {lr} ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -20172,11 +20172,11 @@ atk8C_confuseifrepeatingattackends: @ 8050FB0 ands r0, r1 cmp r0, 0 bne _08050FD2 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x75 strb r0, [r1, 0x3] _08050FD2: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20188,7 +20188,7 @@ _08050FD2: thumb_func_start atk8D_setloopcounter atk8D_setloopcounter: @ 8050FF0 push {r4,r5,lr} - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r1, [r0, 0x1] cmp r1, 0 @@ -20211,7 +20211,7 @@ _08051022: adds r0, 0x2 strb r0, [r4] _08051026: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -20223,7 +20223,7 @@ _08051026: thumb_func_start atk8E_cmd8e atk8E_cmd8e: @ 805103C - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r2, 0 movs r0, 0xFD strb r0, [r1, 0x8] @@ -20234,7 +20234,7 @@ atk8E_cmd8e: @ 805103C strb r2, [r1, 0xC] movs r0, 0xFF strb r0, [r1, 0xD] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20246,14 +20246,14 @@ atk8E_cmd8e: @ 805103C sub_8051064: @ 8051064 push {r4-r7,lr} ldr r6, =gBattleMons - ldr r7, =gUnknown_0202420B + ldr r7, =gBankAttacker ldrb r0, [r7] movs r5, 0x58 adds r1, r0, 0 muls r1, r5 adds r1, r6 adds r1, 0x2A - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldrb r3, [r4] adds r0, r3, 0 muls r0, r5 @@ -20263,11 +20263,11 @@ sub_8051064: @ 8051064 ldrb r0, [r0] cmp r1, r0 bcc _080510AC - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r1, r3, r1 adds r1, 0x58 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r0, r3, 1 b _08051108 .pool @@ -20294,7 +20294,7 @@ _080510AC: lsrs r1, 2 cmp r0, r1 bhi _080510FC - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -20311,17 +20311,17 @@ _080510AC: b _08051116 .pool _080510FC: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r1, r4, r1 adds r1, 0x58 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r0, r4, 1 _08051108: adds r0, r2 ldrh r0, [r0] strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DADD8 str r0, [r1] movs r0, 0x1 @@ -20350,9 +20350,9 @@ sub_805112C: @ 805112C bne _0805114A b _08051410 _0805114A: - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty str r1, [sp] @@ -20379,7 +20379,7 @@ _08051160: cmp r0, 0 beq _080511C8 _08051182: - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -20401,7 +20401,7 @@ _080511B2: mov r10, r0 movs r0, 0x1 str r0, [sp, 0x8] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r1] b _0805128E .pool @@ -20440,8 +20440,8 @@ _08051202: mov r10, r1 movs r0, 0x1 str r0, [sp, 0x8] - ldr r2, =gUnknown_0202406E - ldr r0, =gEnemyMonIndex + ldr r2, =gBattlePartyID + ldr r0, =gBankTarget ldrb r1, [r0] b _0805128E .pool @@ -20452,7 +20452,7 @@ _0805121C: cmp r0, 0 beq _08051274 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08051240 @@ -20484,8 +20484,8 @@ _08051258: movs r1, 0x1 _08051260: str r1, [sp, 0x8] - ldr r2, =gUnknown_0202406E - ldr r0, =gEnemyMonIndex + ldr r2, =gBattlePartyID + ldr r0, =gBankTarget ldrb r1, [r0] b _0805128E .pool @@ -20501,7 +20501,7 @@ _08051274: mov r10, r1 movs r0, 0x2 str r0, [sp, 0x8] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r4] _0805128E: lsls r0, r1, 1 @@ -20522,7 +20522,7 @@ _080512A4: mov r10, r0 movs r1, 0x1 str r1, [sp, 0x8] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -20564,7 +20564,7 @@ _080512FC: ldr r0, [sp, 0x8] cmp r1, r0 bgt _08051328 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -20616,9 +20616,9 @@ _08051332: cmp r0, 0 beq _08051332 _08051378: - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldrb r0, [r4] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x5C @@ -20652,7 +20652,7 @@ _08051396: cmp r2, r0 bne _080513DE _080513C0: - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] lsls r4, r6, 24 lsrs r4, 24 @@ -20673,7 +20673,7 @@ _080513DE: ands r0, r1 cmp r0, 0 beq _08051414 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] lsls r1, r6, 24 lsrs r1, 24 @@ -20702,7 +20702,7 @@ sub_8051424: @ 8051424 push {r5-r7} movs r6, 0 ldr r2, =gBattleMons - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -20737,7 +20737,7 @@ _08051466: mov r10, r0 ldr r5, =gBattleMons mov r12, r5 - ldr r7, =gUnknown_0202420B + ldr r7, =gBankAttacker ldrb r0, [r7] movs r4, 0x58 adds r5, r0, 0 @@ -20797,7 +20797,7 @@ _080514DE: _080514E8: cmp r3, r6 bne _0805150C - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -20824,7 +20824,7 @@ _08051512: bcs _08051512 ldr r4, =gBattleMons lsls r1, r3, 1 - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r2, [r3] movs r0, 0x58 adds r5, r2, 0 @@ -20881,7 +20881,7 @@ _08051572: add r0, r8 adds r0, 0x22 strb r2, [r0] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -20889,7 +20889,7 @@ _08051572: strb r2, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -20918,7 +20918,7 @@ atk91_givemoney: @ 80515C8 cmp r0, 0 beq _08051650 adds r1, r0, 0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x4A ldrb r0, [r0] @@ -20931,7 +20931,7 @@ atk91_givemoney: @ 80515C8 adds r0, r1 adds r1, r4, 0 bl add_money - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x1 @@ -20948,7 +20948,7 @@ atk91_givemoney: @ 80515C8 strb r4, [r1, 0x5] movs r0, 0xFF strb r0, [r1, 0x6] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push @@ -20957,7 +20957,7 @@ atk91_givemoney: @ 80515C8 b _08051658 .pool _08051650: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -20971,9 +20971,9 @@ _08051658: thumb_func_start atk92_setlightscreen atk92_setlightscreen: @ 8051664 push {r4-r6,lr} - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity ldr r4, =gUnknown_0202428E movs r6, 0x1 adds r1, r6, 0 @@ -20990,13 +20990,13 @@ atk92_setlightscreen: @ 8051664 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 b _08051718 .pool _080516A4: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r6, 0 ands r1, r0 lsls r1, 1 @@ -21006,8 +21006,8 @@ _080516A4: orrs r0, r2 strh r0, [r1] ldrb r0, [r5] - bl battle_get_per_side_status - ldr r4, =gUnknown_02024294 + bl GetBankIdentity + ldr r4, =gSideTimers adds r1, r6, 0 ands r1, r0 lsls r0, r1, 1 @@ -21017,7 +21017,7 @@ _080516A4: movs r1, 0x5 strb r1, [r0, 0x2] ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r6, 0 ands r1, r0 lsls r0, r1, 1 @@ -21037,16 +21037,16 @@ _080516A4: lsrs r0, 24 cmp r0, 0x2 bne _08051714 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x4 b _08051718 .pool _08051714: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x3 _08051718: strb r0, [r1, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -21063,7 +21063,7 @@ atk93_ko_move: @ 8051730 mov r6, r8 push {r6,r7} ldr r7, =gBattleMons - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -21072,7 +21072,7 @@ atk93_ko_move: @ 8051730 ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _08051768 - ldr r1, =gUnknown_02024404 + ldr r1, =gEnigmaBerries lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -21083,19 +21083,19 @@ atk93_ko_move: @ 8051730 .pool _08051768: ldrh r0, [r1, 0x2E] - bl itemid_get_x12 + bl ItemId_GetHoldEffect lsls r0, 24 lsrs r4, r0, 24 ldrb r0, [r6] muls r0, r5 adds r0, r7 ldrh r0, [r0, 0x2E] - bl itemid_get_quality + bl ItemId_GetHoldEffectParam lsls r0, 24 lsrs r6, r0, 24 _08051782: ldr r1, =gUnknown_0202420F - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -21112,7 +21112,7 @@ _08051782: ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -21124,7 +21124,7 @@ _08051782: strb r1, [r0] _080517C0: ldr r1, =gBattleMons - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget ldrb r3, [r2] movs r6, 0x58 adds r0, r3, 0 @@ -21142,19 +21142,19 @@ _080517C0: movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r4, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB552 str r0, [r1] mov r1, r9 ldrb r0, [r1] movs r1, 0x5 - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _08051A70 .pool _0805181C: - ldr r1, =gUnknown_020242AC + ldr r1, =gStatuses3 lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] @@ -21163,13 +21163,13 @@ _0805181C: cmp r0, 0 bne _080518A0 ldr r1, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] lsls r2, r0, 1 adds r2, r0 lsls r2, 2 adds r2, r1 - ldr r7, =gUnknown_0202420B + ldr r7, =gBankAttacker ldrb r0, [r7] muls r0, r6 add r0, r8 @@ -21213,12 +21213,12 @@ _08051870: b _08051A08 .pool _080518A0: - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r0, r1 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r0, [r0, 0x15] adds r7, r1, 0 ldrb r3, [r7] @@ -21236,7 +21236,7 @@ _080518A0: bcs _08051942 _080518CA: ldr r1, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] lsls r2, r0, 1 adds r2, r0 @@ -21249,7 +21249,7 @@ _080518CA: adds r0, r6 adds r0, 0x2A ldrb r1, [r0] - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget mov r8, r0 ldrb r0, [r0] muls r0, r5 @@ -21291,12 +21291,12 @@ _08051934: _08051936: ldr r3, =gBattleMons mov r8, r3 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget mov r9, r0 cmp r4, 0 beq _08051A08 _08051942: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs mov r1, r9 ldrb r2, [r1] lsls r1, r2, 4 @@ -21318,7 +21318,7 @@ _08051942: b _080519EE .pool _08051990: - ldr r0, =gUnknown_0202437C + ldr r0, =gSpecialStatuses lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -21363,7 +21363,7 @@ _080519EE: orrs r0, r1 strb r0, [r2] _080519F2: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -21376,14 +21376,14 @@ _08051A08: orrs r0, r1 strb r0, [r2] ldr r3, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] movs r2, 0x58 adds r1, r0, 0 muls r1, r2 adds r1, r3 adds r1, 0x2A - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -21392,16 +21392,16 @@ _08051A08: ldrb r0, [r0] cmp r1, r0 bcc _08051A50 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 b _08051A54 .pool _08051A50: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 _08051A54: strb r0, [r1, 0x5] - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -21429,7 +21429,7 @@ atk94_gethalfcurrentenemyhp: @ 8051A84 push {lr} ldr r3, =gBattleMoveDamage ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -21442,7 +21442,7 @@ atk94_gethalfcurrentenemyhp: @ 8051A84 movs r0, 0x1 str r0, [r3] _08051AA2: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -21465,7 +21465,7 @@ sub_8051AC0: @ 8051AC0 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08051AFE @@ -21473,7 +21473,7 @@ sub_8051AC0: @ 8051AC0 _08051AEC: movs r0, 0x8 strh r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x3 strb r0, [r1, 0x5] ldr r0, =gUnknown_020243D0 @@ -21481,7 +21481,7 @@ _08051AEC: movs r1, 0x5 strb r1, [r0] _08051AFE: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -21500,7 +21500,7 @@ sub_8051B18: @ 8051B18 movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -21512,7 +21512,7 @@ _08051B36: movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08051B4C @@ -21523,7 +21523,7 @@ _08051B4C: movs r0, 0x18 ands r0, r1 adds r4, r2, 0 - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker cmp r0, 0 beq _08051BDA ldr r0, =gBattleMons @@ -21554,7 +21554,7 @@ _08051B4C: ldrb r0, [r0] cmp r0, 0x8 beq _08051BD4 - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -21603,7 +21603,7 @@ _08051BDA: ldrb r0, [r0] cmp r0, 0xF beq _08051C3C - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 lsls r1, r3, 2 adds r1, r0 ldr r1, [r1] @@ -21636,9 +21636,9 @@ _08051C48: ldr r1, =gBattleMoveDamage movs r0, 0 str r0, [r1] - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker _08051C50: - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r0, [r5] @@ -21652,7 +21652,7 @@ _08051C50: movs r0, 0 str r0, [r1] _08051C6A: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -21670,13 +21670,13 @@ atk97_tryinfatuatetarget: @ 8051C90 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08051CC8 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -21687,7 +21687,7 @@ atk97_tryinfatuatetarget: @ 8051C90 b _08051CD8 .pool _08051CC8: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -21697,13 +21697,13 @@ _08051CC8: ldr r0, =gEnemyParty _08051CD8: adds r5, r1, r0 - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08051D0C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -21714,7 +21714,7 @@ _08051CD8: b _08051D1C .pool _08051D0C: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -21744,7 +21744,7 @@ _08051D1C: movs r1, 0 bl GetMonData adds r7, r0, 0 - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] movs r6, 0x58 muls r0, r6 @@ -21754,14 +21754,14 @@ _08051D1C: ldrb r2, [r0] cmp r2, 0xC bne _08051D94 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB5F5 str r0, [r1] - ldr r0, =gUnknown_0202420A + ldr r0, =gLastUsedAbility strb r2, [r0] ldrb r0, [r5] movs r1, 0xC - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _08051E2C .pool _08051D94: @@ -21802,7 +21802,7 @@ _08051D94: cmp r0, 0xFF bne _08051E08 _08051DE4: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -21823,7 +21823,7 @@ _08051E08: muls r2, r6 adds r2, r4 ldr r1, =gBitTable - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -21832,7 +21832,7 @@ _08051E08: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -21850,17 +21850,17 @@ _08051E2C: thumb_func_start sub_8051E48 sub_8051E48: @ 8051E48 push {r4-r7,lr} - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 bne _08051F34 - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r1, [r5] ldrb r0, [r1, 0x1] cmp r0, 0x4 beq _08051EA0 bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] ldr r3, =gBattleMons ldrb r1, [r4] @@ -21884,11 +21884,11 @@ sub_8051E48: @ 8051E48 b _08051F34 .pool _08051EA0: - ldr r4, =gUnknown_02024064 - ldr r5, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r5, =gBankAttacker ldrb r0, [r5] strb r0, [r4] - ldr r6, =gUnknown_02024210 + ldr r6, =gAbsentBankFlags ldrb r1, [r6] ldr r7, =gBitTable ldrb r2, [r4] @@ -21920,12 +21920,12 @@ _08051EDC: cmp r0, 0 beq _08051F2C ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r4] ldrb r1, [r6] ldrb r2, [r4] @@ -21950,7 +21950,7 @@ _08051EDC: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _08051F2C: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -21964,10 +21964,10 @@ _08051F34: thumb_func_start atk99_setmisteffect atk99_setmisteffect: @ 8051F58 push {r4-r6,lr} - ldr r6, =gUnknown_02024294 - ldr r4, =gUnknown_0202420B + ldr r6, =gSideTimers + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity movs r5, 0x1 adds r1, r5, 0 ands r1, r0 @@ -21983,13 +21983,13 @@ atk99_setmisteffect: @ 8051F58 movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r5, [r0, 0x5] b _08051FE6 .pool _08051F98: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r5, 0 ands r1, r0 lsls r0, r1, 1 @@ -21999,7 +21999,7 @@ _08051F98: movs r1, 0x5 strb r1, [r0, 0x4] ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r5, 0 ands r1, r0 lsls r0, r1, 1 @@ -22009,7 +22009,7 @@ _08051F98: ldrb r1, [r4] strb r1, [r0, 0x5] ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity ldr r2, =gUnknown_0202428E adds r1, r5, 0 ands r1, r0 @@ -22022,10 +22022,10 @@ _08051F98: movs r3, 0 orrs r0, r2 strh r0, [r1] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r3, [r0, 0x5] _08051FE6: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22039,7 +22039,7 @@ _08051FE6: atk9A_setincreasedcriticalchance: @ 8052000 push {lr} ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -22057,7 +22057,7 @@ atk9A_setincreasedcriticalchance: @ 8052000 movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08052048 @@ -22065,10 +22065,10 @@ atk9A_setincreasedcriticalchance: @ 8052000 _08052040: orrs r1, r3 str r1, [r0] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r2, [r0, 0x5] _08052048: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22086,12 +22086,12 @@ atk9B_transformdataexecution: @ 805205C ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] ldr r7, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget mov r12, r0 ldrb r1, [r0] movs r6, 0x58 @@ -22106,7 +22106,7 @@ atk9B_transformdataexecution: @ 805205C ands r0, r4 cmp r0, 0 bne _080520A2 - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 lsls r1, 2 adds r1, r0 ldr r2, [r1] @@ -22120,12 +22120,12 @@ _080520A2: movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 b _080521EC .pool _080520D8: - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r0, [r3] adds r1, r0, 0 muls r1, r6 @@ -22133,7 +22133,7 @@ _080520D8: ldr r0, [r1] orrs r0, r4 str r0, [r1] - ldr r4, =gUnknown_020242BC + ldr r4, =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -22172,7 +22172,7 @@ _080520D8: movs r0, 0xF ands r0, r2 strb r0, [r1, 0x18] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x6 @@ -22199,7 +22199,7 @@ _080520D8: adds r2, r0, r7 movs r4, 0 adds r6, r3, 0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank mov r8, r0 _08052170: adds r0, r5, r4 @@ -22251,7 +22251,7 @@ _080521CA: mov r2, r8 ldrb r0, [r2] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 _080521EC: strb r0, [r1, 0x5] @@ -22267,7 +22267,7 @@ _080521EC: sub_80521FC: @ 80521FC push {r4-r7,lr} ldr r7, =gBattleMons - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -22285,7 +22285,7 @@ _08052216: ldr r1, =gBattleMoveDamage movs r0, 0 str r0, [r1] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08052290 @@ -22317,7 +22317,7 @@ _08052248: ldr r2, =0xffff1fff ands r0, r2 str r0, [r1] - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -22326,16 +22326,16 @@ _08052248: ldr r1, [r4] movs r2, 0 strb r1, [r0, 0xA] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r2, [r0, 0x5] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] movs r1, 0x80 lsls r1, 1 orrs r0, r1 str r0, [r2] _08052290: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22395,7 +22395,7 @@ atk9D_copyattack: @ 8052300 adds r7, r1, 0 strh r7, [r0] ldr r5, =gUnknown_02024248 - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -22405,7 +22405,7 @@ atk9D_copyattack: @ 8052300 cmp r0, 0 bne _0805235A ldr r3, =gBattleMons - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r1, [r2] movs r0, 0x58 adds r4, r1, 0 @@ -22430,7 +22430,7 @@ atk9D_copyattack: @ 8052300 cmp r1, r7 bne _08052394 _0805235A: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -22451,7 +22451,7 @@ _08052394: adds r3, 0xC adds r0, r4, r3 ldrh r0, [r0] - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr mov r10, r4 cmp r0, r1 beq _080523CE @@ -22479,7 +22479,7 @@ _080523B0: _080523CE: cmp r2, 0x4 bne _080524B0 - ldr r5, =gUnknown_020241E8 + ldr r5, =gCurrMovePos ldrb r1, [r5] lsls r1, 1 mov r2, r9 @@ -22491,7 +22491,7 @@ _080523CE: adds r0, 0xC adds r1, r0 ldr r2, =gUnknown_02024248 - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -22532,7 +22532,7 @@ _08052438: movs r1, 0x5 strb r1, [r0] _0805244C: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -22550,7 +22550,7 @@ _0805244C: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs mov r2, r9 ldrb r0, [r2] lsls r2, r0, 3 @@ -22606,11 +22606,11 @@ sub_80524DC: @ 80524DC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, =gUnknown_020241EA + ldr r7, =gCurrentMove movs r6, 0xB1 lsls r6, 1 ldr r5, =gUnknown_0831C3E0 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r8, r0 _080524EE: bl Random @@ -22626,7 +22626,7 @@ _08052502: subs r0, 0x1 cmp r0, 0 bge _08052502 - ldr r4, =gUnknown_020241EA + ldr r4, =gCurrentMove ldrh r2, [r4] ldr r3, =0x0000ffff subs r0, r5, 0x2 @@ -22641,7 +22641,7 @@ _0805251C: ldr r0, =0x0000ffff cmp r1, r0 bne _080524EE - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xfffffbff ands r0, r1 @@ -22661,8 +22661,8 @@ _0805251C: str r0, [r1] ldrh r0, [r4] movs r1, 0 - bl sub_80458E0 - ldr r1, =gEnemyMonIndex + bl GetMoveTarget + ldr r1, =gBankTarget strb r0, [r1] pop {r3} mov r8, r3 @@ -22676,7 +22676,7 @@ _0805251C: atk9F_nightshadedamageeffect: @ 8052584 ldr r3, =gBattleMoveDamage ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -22684,7 +22684,7 @@ atk9F_nightshadedamageeffect: @ 8052584 adds r0, 0x2A ldrb r0, [r0] str r0, [r3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22707,7 +22707,7 @@ _080525B8: lsls r3, r0, 1 ldr r4, =gBattleMoveDamage ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -22720,7 +22720,7 @@ _080525B8: movs r1, 0x64 bl __divsi3 str r0, [r4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -22733,17 +22733,17 @@ _080525B8: thumb_func_start atkA1_counterdamagecalculator atkA1_counterdamagecalculator: @ 8052608 push {r4-r6,lr} - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 - ldr r5, =gUnknown_0202433C + ldr r5, =gProtectStructs ldrb r0, [r4] lsls r0, 4 adds r0, r5 ldrb r0, [r0, 0xC] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 ldrb r0, [r4] @@ -22767,7 +22767,7 @@ atkA1_counterdamagecalculator: @ 8052608 ldr r1, =gBattleMoveDamage lsls r0, r3, 1 str r0, [r1] - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -22782,29 +22782,29 @@ atkA1_counterdamagecalculator: @ 8052608 ldrh r0, [r0, 0x28] cmp r0, 0 beq _08052690 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget strb r1, [r0] b _080526A0 .pool _08052690: - ldr r2, =gEnemyMonIndex - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r2, =gBankTarget + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r2] _080526A0: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080526EC .pool _080526BC: - ldr r2, =gUnknown_0202437C - ldr r0, =gUnknown_0202420B + ldr r2, =gSpecialStatuses + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -22814,7 +22814,7 @@ _080526BC: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -22837,17 +22837,17 @@ _080526EC: thumb_func_start atkA2_mirrorcoatdamagecalculator atkA2_mirrorcoatdamagecalculator: @ 8052700 push {r4-r6,lr} - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 - ldr r5, =gUnknown_0202433C + ldr r5, =gProtectStructs ldrb r0, [r4] lsls r0, 4 adds r0, r5 ldrb r0, [r0, 0xD] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 ldrb r0, [r4] @@ -22872,7 +22872,7 @@ atkA2_mirrorcoatdamagecalculator: @ 8052700 ldr r1, =gBattleMoveDamage lsls r0, r3, 1 str r0, [r1] - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -22887,29 +22887,29 @@ atkA2_mirrorcoatdamagecalculator: @ 8052700 ldrh r0, [r0, 0x28] cmp r0, 0 beq _08052788 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget strb r1, [r0] b _08052798 .pool _08052788: - ldr r2, =gEnemyMonIndex - ldr r1, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r2, =gBankTarget + ldr r1, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0xD] strb r0, [r2] _08052798: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080527E4 .pool _080527B4: - ldr r2, =gUnknown_0202437C - ldr r0, =gUnknown_0202420B + ldr r2, =gSpecialStatuses + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -22919,7 +22919,7 @@ _080527B4: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -22947,7 +22947,7 @@ atkA3_disablelastusedattack: @ 80527F8 push {r6,r7} movs r4, 0 ldr r2, =gBattleMons - ldr r3, =gEnemyMonIndex + ldr r3, =gBankTarget ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -22960,7 +22960,7 @@ atkA3_disablelastusedattack: @ 80527F8 ldrh r0, [r0] mov r9, r2 adds r6, r3, 0 - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs mov r8, r2 ldrh r1, [r1] cmp r0, r1 @@ -23005,7 +23005,7 @@ _0805284C: ldrb r0, [r0] cmp r0, 0 beq _08052910 - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -23065,14 +23065,14 @@ _0805284C: ands r0, r3 orrs r0, r2 strb r0, [r1, 0xB] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0805292A .pool _08052910: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23104,7 +23104,7 @@ atkA4_setencore: @ 805293C push {r5-r7} movs r5, 0 ldr r3, =gBattleMons - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldrb r1, [r4] movs r0, 0x58 muls r0, r1 @@ -23117,7 +23117,7 @@ atkA4_setencore: @ 805293C ldrh r0, [r0] mov r10, r3 mov r8, r2 - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs mov r9, r2 ldrh r1, [r1] cmp r0, r1 @@ -23217,14 +23217,14 @@ _080529AC: ands r0, r3 orrs r0, r2 strb r0, [r1, 0xE] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08052A5E .pool _08052A44: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23252,7 +23252,7 @@ _08052A5E: sub_8052A70: @ 8052A70 push {r4-r7,lr} ldr r6, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget mov r12, r0 ldrb r0, [r0] movs r7, 0x58 @@ -23267,7 +23267,7 @@ sub_8052A70: @ 8052A70 ands r0, r1 cmp r0, 0 bne _08052B10 - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r0, [r5] muls r0, r7 adds r0, r6 @@ -23279,7 +23279,7 @@ sub_8052A70: @ 8052A70 ldr r4, =gBattleMoveDamage subs r1, r3 str r1, [r4] - ldr r2, =gUnknown_02024474 + ldr r2, =gBattleScripting strb r1, [r2] movs r0, 0xFF lsls r0, 8 @@ -23299,7 +23299,7 @@ sub_8052A70: @ 8052A70 ldrh r0, [r0, 0x28] subs r0, r3 str r0, [r4] - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses mov r0, r12 ldrb r1, [r0] lsls r0, r1, 2 @@ -23309,14 +23309,14 @@ sub_8052A70: @ 8052A70 adds r0, r2 ldr r1, =0x0000ffff str r1, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08052B2A .pool _08052B10: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23344,7 +23344,7 @@ atkA6_settypetorandomresistance: @ 8052B34 mov r5, r8 push {r5-r7} ldr r1, =gUnknown_02024250 - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] lsls r0, 1 adds r2, r0, r1 @@ -23375,7 +23375,7 @@ atkA6_settypetorandomresistance: @ 8052B34 cmp r0, 0 beq _08052C1C _08052B7E: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23399,7 +23399,7 @@ _08052BB4: adds r0, r7 adds r0, 0x22 strb r5, [r0] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -23407,7 +23407,7 @@ _08052BB4: strb r5, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr b _08052C0A .pool _08052BE0: @@ -23423,7 +23423,7 @@ _08052BE0: adds r0, r7 adds r0, 0x22 strb r2, [r0] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -23454,7 +23454,7 @@ _08052C24: ldr r6, =gUnknown_0831ACE8 adds r3, r4, r6 ldr r1, =gUnknown_02024258 - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r5, [r2] lsls r0, r5, 1 adds r0, r1 @@ -23497,7 +23497,7 @@ _08052C80: ble _08052C24 movs r0, 0 mov r8, r0 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr mov r12, r1 ldr r3, =gUnknown_0831ACE8 adds r0, r4, 0x1 @@ -23575,8 +23575,8 @@ _08052D08: thumb_func_start atkA7_setalwayshitflag atkA7_setalwayshitflag: @ 8052D34 push {r4,lr} - ldr r4, =gUnknown_020242AC - ldr r3, =gEnemyMonIndex + ldr r4, =gStatuses3 + ldr r3, =gBankTarget ldrb r1, [r3] lsls r1, 2 adds r1, r4 @@ -23592,16 +23592,16 @@ atkA7_setalwayshitflag: @ 8052D34 movs r2, 0x10 orrs r0, r2 str r0, [r1] - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r1, [r1] strb r1, [r0, 0x15] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -23624,7 +23624,7 @@ atkA8_copymovepermanently: @ 8052D8C adds r5, r1, 0 strh r5, [r0] ldr r3, =gBattleMons - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r1, [r2] movs r0, 0x58 adds r4, r1, 0 @@ -23643,7 +23643,7 @@ atkA8_copymovepermanently: @ 8052D8C b _08052F18 _08052DC4: ldr r0, =gUnknown_02024240 - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget ldrb r1, [r2] lsls r1, 1 adds r1, r0 @@ -23692,7 +23692,7 @@ _08052E12: beq _08052E18 b _08052F18 _08052E18: - ldr r4, =gUnknown_020241E8 + ldr r4, =gCurrMovePos ldrb r1, [r4] lsls r1, 1 mov r2, r10 @@ -23730,7 +23730,7 @@ _08052E18: adds r0, r4 ldrb r0, [r0, 0x4] strb r0, [r2] - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank mov r2, r10 ldrb r0, [r2] strb r0, [r1] @@ -23769,16 +23769,16 @@ _08052E7A: movs r2, 0 movs r3, 0x10 bl dp01_build_cmdbuf_x02_a_b_varargs - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 strb r0, [r1, 0x1] ldr r3, =gUnknown_02024240 - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -23792,14 +23792,14 @@ _08052E7A: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08052F32 .pool _08052F18: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -23924,7 +23924,7 @@ _08052FD0: cmp r0, 0x1A bne _08053010 _08052FF2: - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 20 @@ -23950,7 +23950,7 @@ sub_8053018: @ 8053018 push {r5-r7} movs r6, 0 movs r5, 0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker mov r9, r0 movs r1, 0x58 mov r8, r1 @@ -24001,7 +24001,7 @@ _08053084: adds r5, 0x1 cmp r5, 0x3 ble _08053036 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] adds r1, r6, 0 movs r2, 0xFD @@ -24010,7 +24010,7 @@ _08053084: lsrs r6, r0, 24 cmp r6, 0xF bne _080530B8 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -24029,10 +24029,10 @@ _080530BC: ands r0, r6 cmp r0, 0 bne _080530BC - ldr r4, =gUnknown_020241EE + ldr r4, =gRandomMove ldr r2, =gBattleMons lsls r1, r5, 1 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r3, [r0] movs r0, 0x58 muls r0, r3 @@ -24041,19 +24041,19 @@ _080530BC: adds r1, r2 ldrh r0, [r1] strh r0, [r4] - ldr r0, =gUnknown_020241E8 + ldr r0, =gCurrMovePos strb r5, [r0] - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] ldrh r0, [r4] movs r1, 0 - bl sub_80458E0 - ldr r1, =gEnemyMonIndex + bl GetMoveTarget + ldr r1, =gBankTarget strb r0, [r1] - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24080,7 +24080,7 @@ _0805311C: thumb_func_start atkAA_destinybondeffect atkAA_destinybondeffect: @ 8053150 ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -24091,7 +24091,7 @@ atkAA_destinybondeffect: @ 8053150 lsls r1, 18 orrs r0, r1 str r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -24102,14 +24102,14 @@ atkAA_destinybondeffect: @ 8053150 thumb_func_start b_feature_update_destiny_bond b_feature_update_destiny_bond: @ 8053180 push {r4,r5,lr} - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r3, r0, 24 ldr r1, =gBattleMons @@ -24126,7 +24126,7 @@ b_feature_update_destiny_bond: @ 8053180 beq _080531CA cmp r5, r3 beq _080531CA - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r1, [r2] movs r0, 0x80 lsls r0, 17 @@ -24147,7 +24147,7 @@ _080531CA: atkAB_802A458: @ 80531E0 push {lr} bl b_feature_update_destiny_bond - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -24160,7 +24160,7 @@ atkAB_802A458: @ 80531E0 atkAC_remaininghptopower: @ 80531F8 push {lr} ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -24194,7 +24194,7 @@ _08053232: adds r0, r1 ldrb r0, [r0] strh r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -24212,7 +24212,7 @@ atkAD_reducepprandom: @ 8053260 push {r5-r7} sub sp, 0x4 ldr r4, =gUnknown_02024248 - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r3, [r1] lsls r0, r3, 1 adds r0, r4 @@ -24293,7 +24293,7 @@ _080532E6: bge _08053304 adds r6, r0, 0 _08053304: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r5, 0xFD strb r5, [r1] movs r0, 0x2 @@ -24313,7 +24313,7 @@ _08053304: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r4, =gUnknown_02022F68 + ldr r4, =gBattleTextBuff2 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0 @@ -24336,11 +24336,11 @@ _08053304: ldrb r0, [r1] subs r0, r6 strb r0, [r1] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank mov r3, r8 ldrb r0, [r3] strb r0, [r4] - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs ldrb r3, [r4] lsls r0, r3, 3 subs r0, r3 @@ -24381,12 +24381,12 @@ _08053304: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _080533B8: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] ldr r1, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -24397,11 +24397,11 @@ _080533B8: cmp r0, 0 bne _08053422 adds r0, r2, 0 - bl b_cancel_multi_turn_move_maybe + bl CancelMultiTurnMoves b _08053422 .pool _08053408: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24437,18 +24437,18 @@ atkAE_clearstatusifnotsoundproofed: @ 8053438 movs r4, 0 str r4, [sp, 0x4] mov r8, r4 - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] cmp r0, 0xD7 beq _08053454 b _0805363E _08053454: - ldr r6, =gUnknown_02024332 + ldr r6, =gBattleCommunication mov r0, r8 strb r0, [r6, 0x5] - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty mov r10, r1 @@ -24488,24 +24488,24 @@ _08053470: _080534C4: ldrb r1, [r1] adds r0, r3, 0 - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle ldrb r0, [r6, 0x5] movs r1, 0x1 orrs r0, r1 strb r0, [r6, 0x5] _080534D4: - ldr r7, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r7, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r2, 0x2 mov r9, r2 mov r1, r9 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024474 + bl GetBankByPlayerAI + ldr r1, =gBattleScripting strb r0, [r1, 0x17] strb r0, [r7] ldr r0, =gBattleTypeFlags @@ -24514,7 +24514,7 @@ _080534D4: ands r0, r1 cmp r0, 0 beq _0805357A - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r2, [r0] ldr r1, =gBitTable ldrb r3, [r7] @@ -24553,8 +24553,8 @@ _080534D4: _08053568: ldrb r1, [r1] adds r0, r3, 0 - bl b_history__record_ability_usage_of_player - ldr r1, =gUnknown_02024332 + bl RecordAbilityBattle + ldr r1, =gBattleCommunication ldrb r0, [r1, 0x5] mov r2, r9 orrs r0, r2 @@ -24583,8 +24583,8 @@ _0805357E: lsls r0, 1 cmp r5, r0 beq _08053636 - ldr r2, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r2, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -24602,14 +24602,14 @@ _080535D0: ands r0, r1 cmp r0, 0 beq _08053618 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 1 adds r0, r2 ldrh r0, [r0] cmp r0, r6 bne _08053618 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable lsls r0, r3, 2 @@ -24648,13 +24648,13 @@ _08053636: ble _0805357E b _080536BC _0805363E: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] movs r2, 0x3F mov r8, r2 ldr r3, =gBattleMons - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r0, [r2] movs r5, 0x58 muls r0, r5 @@ -24674,13 +24674,13 @@ _0805363E: ands r0, r6 str r0, [r1] ldrb r0, [r2] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r4, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r4, =gActiveBank strb r0, [r4] ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -24688,7 +24688,7 @@ _0805363E: ands r0, r1 cmp r0, 0 beq _080536BC - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r2, [r0] ldr r1, =gBitTable ldrb r3, [r4] @@ -24713,8 +24713,8 @@ _080536BC: mov r2, r8 cmp r2, 0 beq _080536DE - ldr r4, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r4] add r0, sp, 0x4 @@ -24726,7 +24726,7 @@ _080536BC: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _080536DE: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -24745,7 +24745,7 @@ _080536DE: atkAF_cursetarget: @ 805371C push {r4,r5,lr} ldr r5, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] movs r4, 0x58 adds r1, r0, 0 @@ -24760,7 +24760,7 @@ atkAF_cursetarget: @ 805371C ands r0, r3 cmp r0, 0 beq _08053768 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24779,7 +24779,7 @@ _08053768: orrs r2, r3 str r2, [r1] ldr r1, =gBattleMoveDamage - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] muls r0, r4 adds r0, r5 @@ -24791,7 +24791,7 @@ _08053768: movs r0, 0x1 str r0, [r1] _08053784: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -24805,14 +24805,14 @@ _0805378C: thumb_func_start atkB0_setspikes atkB0_setspikes: @ 80537A0 push {r4,lr} - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers lsls r2, r0, 1 adds r0, r2, r0 lsls r0, 2 @@ -24820,7 +24820,7 @@ atkB0_setspikes: @ 80537A0 ldrb r0, [r3, 0xA] cmp r0, 0x3 bne _08053804 - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -24830,7 +24830,7 @@ atkB0_setspikes: @ 80537A0 movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24855,7 +24855,7 @@ _08053804: ldrb r0, [r3, 0xA] adds r0, 0x1 strb r0, [r3, 0xA] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -24869,7 +24869,7 @@ _0805381E: thumb_func_start atkB1_setforesight atkB1_setforesight: @ 805382C ldr r1, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -24880,7 +24880,7 @@ atkB1_setforesight: @ 805382C lsls r1, 22 orrs r0, r1 str r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -24896,9 +24896,9 @@ atkB2_setperishsong: @ 805385C push {r6,r7} movs r6, 0 movs r3, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks adds r7, r0, 0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker mov r8, r0 ldrb r1, [r7] cmp r6, r1 @@ -24906,10 +24906,10 @@ atkB2_setperishsong: @ 805385C movs r5, 0x20 ldr r0, =gBattleMons mov r12, r0 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs adds r4, r0, 0 adds r4, 0xF - ldr r2, =gUnknown_020242AC + ldr r2, =gStatuses3 _08053884: ldr r1, [r2] adds r0, r1, 0 @@ -24943,11 +24943,11 @@ _080538C8: mov r1, r8 ldrb r0, [r1] bl sub_803F67C - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bne _080538FC - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -24963,7 +24963,7 @@ _080538C8: b _08053904 .pool _080538FC: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -24989,17 +24989,17 @@ atkB3_rolloutdamagecalculation: @ 8053914 ands r0, r1 cmp r0, 0 beq _08053948 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl b_cancel_multi_turn_move_maybe - ldr r1, =gUnknown_02024214 + bl CancelMultiTurnMoves + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082D8A60 str r0, [r1] b _08053A60 .pool _08053948: ldr r2, =gBattleMons - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r3, [r1] movs r5, 0x58 adds r0, r3, 0 @@ -25013,9 +25013,9 @@ _08053948: ands r0, r7 adds r6, r1, 0 mov r9, r2 - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs mov r12, r1 - ldr r2, =gUnknown_020241EA + ldr r2, =gCurrentMove mov r8, r2 cmp r0, 0 bne _080539BA @@ -25105,7 +25105,7 @@ _080539EE: lsrs r0, 28 movs r1, 0x5 subs r1, r0 - ldr r7, =gUnknown_02024214 + ldr r7, =gBattlescriptCurrInstr adds r5, r3, 0 cmp r2, r1 bge _08053A3C @@ -25157,7 +25157,7 @@ _08053A60: atkB4_jumpifconfusedandattackmaxed: @ 8053A90 push {r4,r5,lr} ldr r5, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 adds r3, r1, 0 @@ -25168,7 +25168,7 @@ atkB4_jumpifconfusedandattackmaxed: @ 8053A90 ldr r0, [r0] movs r1, 0x7 ands r0, r1 - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr cmp r0, 0 beq _08053AEC ldr r2, [r4] @@ -25214,8 +25214,8 @@ sub_8053AF8: @ 8053AF8 ands r0, r1 cmp r0, 0 beq _08053B34 - ldr r2, =gUnknown_020242BC - ldr r0, =gUnknown_0202420B + ldr r2, =gDisableStructs + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -25223,14 +25223,14 @@ sub_8053AF8: @ 8053AF8 adds r0, r2 movs r1, 0 strb r1, [r0, 0x10] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082D8A60 str r0, [r1] b _08053B8C .pool _08053B34: - ldr r5, =gUnknown_020242BC - ldr r4, =gUnknown_0202420B + ldr r5, =gDisableStructs + ldr r4, =gBankAttacker ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -25244,7 +25244,7 @@ _08053B34: _08053B4C: ldr r3, =gUnknown_02024400 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -25258,7 +25258,7 @@ _08053B4C: subs r0, r1 lsls r0, 2 adds r0, r5 - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldrb r1, [r0, 0x10] cmp r2, r1 bge _08053B86 @@ -25287,7 +25287,7 @@ _08053B8C: atkB6_happinesstodamagecalculation: @ 8053BAC push {r4,lr} ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -25298,7 +25298,7 @@ atkB6_happinesstodamagecalculation: @ 8053BAC bne _08053BEC ldr r4, =gUnknown_02024400 ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -25310,7 +25310,7 @@ atkB6_happinesstodamagecalculation: @ 8053BAC _08053BEC: ldr r4, =gUnknown_02024400 ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -25326,7 +25326,7 @@ _08053C02: movs r1, 0x19 bl __divsi3 strh r0, [r4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -25368,7 +25368,7 @@ _08053C5C: _08053C6C: ldr r3, =gBattleMoveDamage ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -25387,13 +25387,13 @@ _08053C88: _08053C8E: cmp r4, 0xCB bgt _08053CAC - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082D8A30 b _08053CE6 .pool _08053CAC: ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -25402,7 +25402,7 @@ _08053CAC: ldrh r0, [r0, 0x28] cmp r1, r0 bne _08053CD8 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082D9EFB b _08053CE6 .pool @@ -25412,7 +25412,7 @@ _08053CD8: movs r0, 0xF7 ands r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082D9EE1 _08053CE6: str r0, [r1] @@ -25425,9 +25425,9 @@ _08053CE6: thumb_func_start atkB8_setsafeguard atkB8_setsafeguard: @ 8053CFC push {r4-r7,lr} - ldr r7, =gUnknown_0202420B + ldr r7, =gBankAttacker ldrb r0, [r7] - bl battle_get_per_side_status + bl GetBankIdentity ldr r4, =gUnknown_0202428E movs r6, 0x1 adds r1, r6, 0 @@ -25444,14 +25444,14 @@ atkB8_setsafeguard: @ 8053CFC movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] b _08053D88 .pool _08053D40: ldrb r0, [r7] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r6, 0 ands r1, r0 lsls r1, 1 @@ -25461,8 +25461,8 @@ _08053D40: orrs r0, r2 strh r0, [r1] ldrb r0, [r7] - bl battle_get_per_side_status - ldr r5, =gUnknown_02024294 + bl GetBankIdentity + ldr r5, =gSideTimers adds r1, r6, 0 ands r1, r0 lsls r0, r1, 1 @@ -25472,7 +25472,7 @@ _08053D40: movs r4, 0x5 strb r4, [r0, 0x6] ldrb r0, [r7] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r6, 0 ands r1, r0 lsls r0, r1, 1 @@ -25481,10 +25481,10 @@ _08053D40: adds r0, r5 ldrb r1, [r7] strb r1, [r0, 0x7] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] _08053D88: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -25565,7 +25565,7 @@ _08053E34: strh r0, [r1] movs r3, 0xA _08053E3C: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r2, 0 movs r0, 0xFD strb r0, [r1] @@ -25577,21 +25577,21 @@ _08053E3C: strb r3, [r1, 0x4] movs r0, 0xFF strb r0, [r1, 0x5] - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget strb r2, [r1] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r3, [r0] adds r6, r1, 0 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r8, r0 cmp r2, r3 bcs _08053E94 adds r4, r6, 0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r5, [r0] ldr r1, =gBitTable mov r12, r1 - ldr r7, =gUnknown_02024210 + ldr r7, =gAbsentBankFlags _08053E72: ldrb r2, [r4] cmp r2, r5 @@ -25635,9 +25635,9 @@ atkBA_802B140: @ 8053EC8 ldrb r0, [r0] cmp r0, 0x1 bne _08053EF8 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08053EF4 @@ -25648,9 +25648,9 @@ _08053EF4: movs r0, 0 b _08053F12 _08053EF8: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08053F10 @@ -25660,11 +25660,11 @@ _08053EF8: _08053F10: movs r0, 0x2 _08053F12: - bl battle_get_side_with_given_state - ldr r1, =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r1, =gBankTarget strb r0, [r1] ldr r0, =gUnknown_0202421C - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r3, [r1] adds r0, r3, r0 ldrb r0, [r0] @@ -25672,8 +25672,8 @@ _08053F12: beq _08053F2A b _08054030 _08053F2A: - ldr r5, =gUnknown_0202420B - ldr r0, =gUnknown_0202449C + ldr r5, =gBankAttacker + ldr r0, =gBattleStruct ldr r1, [r0] adds r1, r3, r1 ldrb r2, [r5] @@ -25698,7 +25698,7 @@ _08053F2A: ldrh r0, [r0, 0x28] cmp r0, 0 beq _08054030 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -25714,20 +25714,20 @@ _08053F2A: cmp r0, 0xE4 bne _08054030 movs r1, 0 - ldr r0, =gUnknown_0202406C - ldr r2, =gUnknown_020241EA + ldr r0, =gNoOfAllBanks + ldr r2, =gCurrentMove mov r8, r2 - ldr r7, =gUnknown_020241E8 + ldr r7, =gCurrMovePos mov r10, r7 ldr r2, =gUnknown_020241E9 mov r9, r2 - ldr r7, =gUnknown_02024280 + ldr r7, =gHitMarker mov r12, r7 ldrb r2, [r0] cmp r1, r2 bge _08053FB6 - ldr r6, =gUnknown_0202407E - ldr r5, =gEnemyMonIndex + ldr r6, =gTurnOrder + ldr r5, =gBankTarget ldr r4, =gUnknown_0202407A movs r3, 0xB adds r2, r0, 0 @@ -25748,9 +25748,9 @@ _08053FB6: movs r0, 0xE4 mov r1, r8 strh r0, [r1] - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget ldrb r0, [r2] - ldr r7, =gUnknown_0202449C + ldr r7, =gBattleStruct ldr r1, [r7] adds r0, r1 adds r0, 0x80 @@ -25759,12 +25759,12 @@ _08053FB6: strb r0, [r1] mov r2, r10 strb r0, [r2] - ldr r7, =gUnknown_02024214 + ldr r7, =gBattlescriptCurrInstr ldr r0, [r7] adds r0, 0x5 str r0, [r7] movs r0, 0x1 - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting strb r0, [r1, 0x18] mov r2, r12 ldr r0, [r2] @@ -25774,7 +25774,7 @@ _08053FB6: b _0805404A .pool _08054030: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25812,7 +25812,7 @@ sub_805405C: @ 805405C movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _0805409A @@ -25820,7 +25820,7 @@ sub_805405C: @ 805405C _08054088: movs r0, 0x20 strh r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x4 strb r0, [r1, 0x5] ldr r0, =gUnknown_020243D0 @@ -25828,7 +25828,7 @@ _08054088: movs r1, 0x5 strb r1, [r0] _0805409A: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -25841,7 +25841,7 @@ _0805409A: atkBC_maxattackhalvehp: @ 80540B4 push {r4,r5,lr} ldr r5, =gBattleMons - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] movs r3, 0x58 muls r0, r3 @@ -25873,14 +25873,14 @@ _080540CC: movs r0, 0x1 str r0, [r1] _080540F4: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0805412A .pool _08054110: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -25904,11 +25904,11 @@ _0805412A: atkBD_copyfoestats: @ 8054134 push {r4-r7,lr} movs r2, 0 - ldr r7, =gUnknown_02024214 - ldr r6, =gUnknown_0202420B + ldr r7, =gBattlescriptCurrInstr + ldr r6, =gBankAttacker movs r4, 0x58 ldr r3, =gUnknown_0202409C - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget _08054142: ldrb r0, [r6] adds r1, r0, 0 @@ -25937,7 +25937,7 @@ _08054142: atkBE_breakfree: @ 805417C push {r4-r6,lr} ldr r1, =gBattleMons - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r2, [r5] movs r6, 0x58 adds r0, r2, 0 @@ -25951,8 +25951,8 @@ atkBE_breakfree: @ 805417C ands r0, r1 cmp r0, 0 beq _08054210 - ldr r1, =gUnknown_02024474 - ldr r3, =gEnemyMonIndex + ldr r1, =gBattleScripting + ldr r3, =gBankTarget ldrb r0, [r3] strb r0, [r1, 0x17] ldrb r0, [r5] @@ -25964,12 +25964,12 @@ atkBE_breakfree: @ 805417C ands r0, r2 str r0, [r1] ldrb r0, [r5] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r2, [r1] adds r0, r2 ldrb r0, [r0, 0x14] strb r0, [r3] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -25987,12 +25987,12 @@ atkBE_breakfree: @ 805417C movs r0, 0xFF strb r0, [r1, 0x4] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAFC5 b _080542BA .pool _08054210: - ldr r4, =gUnknown_020242AC + ldr r4, =gStatuses3 lsls r0, r2, 2 adds r3, r0, r4 ldr r1, [r3] @@ -26013,13 +26013,13 @@ _08054210: ands r0, r2 str r0, [r1] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAFD6 b _080542BA .pool _08054250: adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide ldr r4, =gUnknown_0202428E lsls r0, 24 lsrs r0, 23 @@ -26030,7 +26030,7 @@ _08054250: cmp r0, 0 beq _080542B4 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -26040,8 +26040,8 @@ _08054250: movs r4, 0 strh r1, [r0] ldrb r0, [r5] - bl battle_side_get_owner - ldr r2, =gUnknown_02024294 + bl GetBankSide + ldr r2, =gSideTimers lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -26050,12 +26050,12 @@ _08054250: adds r1, r2 strb r4, [r1, 0xA] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DAFDD b _080542BA .pool _080542B4: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 _080542BA: @@ -26069,7 +26069,7 @@ _080542BA: thumb_func_start atkBF_setcurled atkBF_setcurled: @ 80542C8 ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -26080,7 +26080,7 @@ atkBF_setcurled: @ 80542C8 lsls r1, 23 orrs r0, r1 str r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26092,8 +26092,8 @@ atkBF_setcurled: @ 80542C8 atkC0_recoverbasedonsunlight: @ 80542F8 push {r4-r7,lr} sub sp, 0x4 - ldr r1, =gEnemyMonIndex - ldr r5, =gUnknown_0202420B + ldr r1, =gBankTarget + ldr r5, =gBankAttacker ldrb r0, [r5] strb r0, [r1] ldr r7, =gBattleMons @@ -26115,7 +26115,7 @@ atkC0_recoverbasedonsunlight: @ 80542F8 movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -26125,14 +26125,14 @@ atkC0_recoverbasedonsunlight: @ 80542F8 movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _08054378 _0805434A: ldr r3, =gBattleMoveDamage ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -26182,14 +26182,14 @@ _080543BE: ldr r0, [r1] negs r0, r0 str r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080543F2 .pool _080543D8: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -26218,7 +26218,7 @@ sub_8054400: @ 8054400 mov r5, r8 push {r5-r7} ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 adds r4, r1, 0 @@ -26316,7 +26316,7 @@ sub_8054400: @ 8054400 bl __divsi3 adds r0, 0x1E strh r0, [r5] - ldr r6, =gUnknown_0202449C + ldr r6, =gBattleStruct ldr r5, [r6] lsls r0, r4, 4 subs r0, r4 @@ -26336,7 +26336,7 @@ _080544F0: movs r1, 0xC0 orrs r0, r1 strb r0, [r2, 0x13] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26355,23 +26355,23 @@ atkC2_selectnexttarget: @ 8054524 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget movs r1, 0 strb r1, [r0] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks ldrb r1, [r1] adds r6, r0, 0 - ldr r0, =gUnknown_02024214 + ldr r0, =gBattlescriptCurrInstr mov r8, r0 cmp r1, 0 beq _0805456E adds r3, r6, 0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r5, [r0] ldr r0, =gBitTable mov r12, r0 adds r4, r1, 0 - ldr r7, =gUnknown_02024210 + ldr r7, =gAbsentBankFlags _0805454C: ldrb r2, [r3] cmp r2, r5 @@ -26414,13 +26414,13 @@ atkC3_setfutureattack: @ 8054598 sub sp, 0x14 ldr r0, =gUnknown_020243D0 mov r8, r0 - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r1, [r6] adds r0, r1, r0 ldrb r7, [r0] cmp r7, 0 beq _080545DC - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -26437,7 +26437,7 @@ atkC3_setfutureattack: @ 8054598 .pool _080545DC: adds r0, r1, 0 - bl battle_get_per_side_status + bl GetBankIdentity ldr r4, =gUnknown_0202428E lsls r0, 24 lsrs r0, 24 @@ -26458,7 +26458,7 @@ _080545DC: mov r1, r8 adds r1, 0x18 adds r0, r1 - ldr r1, =gUnknown_020241EA + ldr r1, =gCurrentMove mov r9, r1 ldrh r1, [r1] strh r1, [r0] @@ -26466,7 +26466,7 @@ _080545DC: adds r0, 0x4 ldrb r2, [r6] adds r0, r2 - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r1, [r5] strb r1, [r0] ldrb r0, [r6] @@ -26474,7 +26474,7 @@ _080545DC: movs r1, 0x3 strb r1, [r0] ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity mov r1, r10 ands r1, r0 lsls r1, 1 @@ -26503,7 +26503,7 @@ _080545DC: adds r2, 0x8 adds r1, r2 str r0, [r1] - ldr r1, =gUnknown_0202433C + ldr r1, =gProtectStructs ldrb r0, [r5] lsls r0, 4 adds r0, r1 @@ -26526,18 +26526,18 @@ _0805468C: ldr r0, =0x00000161 cmp r1, r0 bne _080546BC - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication mov r1, r10 strb r1, [r0, 0x5] b _080546C4 .pool _080546BC: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication mov r2, sp ldrb r2, [r2, 0x10] strb r2, [r0, 0x5] _080546C4: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -26559,9 +26559,9 @@ atkC4_802B910: @ 80546E4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r7, =gEnemyParty cmp r0, 0 @@ -26569,7 +26569,7 @@ atkC4_802B910: @ 80546E4 ldr r7, =gPlayerParty _080546FE: ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -26577,7 +26577,7 @@ _080546FE: ldrh r0, [r0, 0x28] cmp r0, 0 bne _08054740 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -26590,7 +26590,7 @@ _080546FE: b _080548DC .pool _08054740: - ldr r6, =gUnknown_02024332 + ldr r6, =gBattleCommunication ldrb r0, [r6] mov r8, r0 cmp r0, 0x5 @@ -26640,23 +26640,23 @@ _08054794: cmp r0, 0x5 bls _08054750 _080547A4: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication mov r9, r1 ldrb r2, [r1] cmp r2, 0x5 bhi _080548A8 - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] strb r0, [r1, 0x2] strb r2, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x9 str r0, [r1] @@ -26678,7 +26678,7 @@ _080547A4: mov r2, r8 str r3, [r2] ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -26703,7 +26703,7 @@ _080547A4: muls r0, r1 str r0, [r2] ldr r3, =gBattleMons - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -26722,7 +26722,7 @@ _080547A4: adds r2, r0, 0x2 mov r0, r8 str r2, [r0] - ldr r1, =gUnknown_0202433C + ldr r1, =gProtectStructs ldrb r0, [r6] lsls r0, 4 adds r0, r1 @@ -26747,7 +26747,7 @@ _080548A8: mov r0, r8 cmp r0, 0 beq _080548C8 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -26760,7 +26760,7 @@ _080548A8: b _080548DC .pool _080548C8: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -26787,7 +26787,7 @@ _080548E2: thumb_func_start atkC5_hidepreattack atkC5_hidepreattack: @ 80548F4 push {lr} - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] cmp r1, 0x5B beq _08054934 @@ -26805,8 +26805,8 @@ _0805490C: cmp r1, r0 bne _08054960 _08054918: - ldr r2, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r2, =gStatuses3 + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -26815,8 +26815,8 @@ _08054918: b _0805495C .pool _08054934: - ldr r2, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r2, =gStatuses3 + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -26825,8 +26825,8 @@ _08054934: b _0805495C .pool _0805494C: - ldr r2, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r2, =gStatuses3 + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -26837,7 +26837,7 @@ _0805495C: orrs r0, r2 str r0, [r1] _08054960: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26849,7 +26849,7 @@ _08054960: thumb_func_start atkC6_unhidepostattack atkC6_unhidepostattack: @ 8054978 push {lr} - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] cmp r1, 0x5B beq _080549BC @@ -26867,8 +26867,8 @@ _08054990: cmp r1, r0 bne _080549EA _0805499C: - ldr r2, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r2, =gStatuses3 + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -26878,8 +26878,8 @@ _0805499C: b _080549E6 .pool _080549BC: - ldr r2, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r2, =gStatuses3 + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -26889,8 +26889,8 @@ _080549BC: b _080549E6 .pool _080549D8: - ldr r2, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r2, =gStatuses3 + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -26900,7 +26900,7 @@ _080549E6: ands r0, r2 str r0, [r1] _080549EA: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26912,15 +26912,15 @@ _080549EA: thumb_func_start atkC7_setminimize atkC7_setminimize: @ 8054A08 push {lr} - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 beq _08054A2C - ldr r2, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r2, =gStatuses3 + ldr r0, =gBankAttacker ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -26930,7 +26930,7 @@ atkC7_setminimize: @ 8054A08 orrs r0, r2 str r0, [r1] _08054A2C: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26954,21 +26954,21 @@ sub_8054A48: @ 8054A48 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] b _08054A86 .pool _08054A78: strh r2, [r3] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication movs r1, 0x5 strb r1, [r0, 0x5] ldr r0, =gUnknown_020243D0 adds r0, 0x28 strb r1, [r0] _08054A86: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -26981,7 +26981,7 @@ _08054A86: atkC9_jumpifattackandspecialattackcannotfall: @ 8054AA0 push {r4,lr} ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -26995,11 +26995,11 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 8054AA0 ldrsb r0, [r1, r0] cmp r0, 0 bne _08054AF4 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _08054AF4 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27015,8 +27015,8 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 8054AA0 b _08054B20 .pool _08054AF4: - ldr r4, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r4] ldr r2, =gBattleMoveDamage @@ -27031,7 +27031,7 @@ _08054AF4: bl dp01_build_cmdbuf_x18_0_aa_health_bar_update ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -27045,10 +27045,10 @@ _08054B20: thumb_func_start atkCA_setforcedtarget atkCA_setforcedtarget: @ 8054B3C push {r4,r5,lr} - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner - ldr r5, =gUnknown_02024294 + bl GetBankSide + ldr r5, =gSideTimers lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -27058,7 +27058,7 @@ atkCA_setforcedtarget: @ 8054B3C movs r0, 0x1 strb r0, [r1, 0x8] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -27067,7 +27067,7 @@ atkCA_setforcedtarget: @ 8054B3C adds r1, r5 ldrb r0, [r4] strb r0, [r1, 0x9] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -27080,8 +27080,8 @@ atkCA_setforcedtarget: @ 8054B3C thumb_func_start atkCB_setcharge atkCB_setcharge: @ 8054B88 push {r4,lr} - ldr r0, =gUnknown_020242AC - ldr r3, =gUnknown_0202420B + ldr r0, =gStatuses3 + ldr r3, =gBankAttacker ldrb r1, [r3] lsls r1, 2 adds r1, r0 @@ -27090,7 +27090,7 @@ atkCB_setcharge: @ 8054B88 lsls r2, 2 orrs r0, r2 str r0, [r1] - ldr r4, =gUnknown_020242BC + ldr r4, =gDisableStructs ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -27114,7 +27114,7 @@ atkCB_setcharge: @ 8054B88 movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x12] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -27127,12 +27127,12 @@ atkCB_setcharge: @ 8054B88 thumb_func_start atkCC_callterrainattack atkCC_callterrainattack: @ 8054BEC push {r4,lr} - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, =gUnknown_020241EA + ldr r4, =gCurrentMove ldr r1, =gUnknown_0831C414 ldr r0, =gUnknown_02022FF0 ldrb r0, [r0] @@ -27142,8 +27142,8 @@ atkCC_callterrainattack: @ 8054BEC strh r0, [r4] ldrh r0, [r4] movs r1, 0 - bl sub_80458E0 - ldr r1, =gEnemyMonIndex + bl GetMoveTarget + ldr r1, =gBankTarget strb r0, [r1] ldr r3, =gUnknown_082D86A8 ldr r2, =gBattleMoves @@ -27157,7 +27157,7 @@ atkCC_callterrainattack: @ 8054BEC adds r0, r3 ldr r0, [r0] bl b_movescr_stack_push - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -27172,7 +27172,7 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8054C60 push {r4-r6,lr} sub sp, 0x4 ldr r1, =gBattleMons - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r0, [r3] movs r6, 0x58 muls r0, r6 @@ -27186,11 +27186,11 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8054C60 beq _08054CBC movs r0, 0 str r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r3] strb r0, [r4] ldrb r0, [r4] @@ -27207,7 +27207,7 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8054C60 b _08054CD6 .pool _08054CBC: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27232,7 +27232,7 @@ _08054CD6: atkCE_settorment: @ 8054CE4 push {lr} ldr r1, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -27243,7 +27243,7 @@ atkCE_settorment: @ 8054CE4 lsls r2, 24 cmp r1, 0 bge _08054D28 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27261,7 +27261,7 @@ atkCE_settorment: @ 8054CE4 _08054D28: orrs r1, r2 str r1, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -27274,8 +27274,8 @@ _08054D34: thumb_func_start atkCF_jumpifnodamage atkCF_jumpifnodamage: @ 8054D3C push {lr} - ldr r2, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r2, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r1, r0, 4 adds r0, r2, 0x4 @@ -27290,14 +27290,14 @@ atkCF_jumpifnodamage: @ 8054D3C cmp r0, 0 beq _08054D74 _08054D5C: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08054D8E .pool _08054D74: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27319,8 +27319,8 @@ _08054D8E: thumb_func_start atkD0_settaunt atkD0_settaunt: @ 8054D98 push {r4,lr} - ldr r4, =gUnknown_020242BC - ldr r3, =gEnemyMonIndex + ldr r4, =gDisableStructs + ldr r3, =gBankTarget ldrb r0, [r3] lsls r1, r0, 3 subs r1, r0 @@ -27347,14 +27347,14 @@ atkD0_settaunt: @ 8054D98 movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x13] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08054E02 .pool _08054DE8: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27377,15 +27377,15 @@ _08054E02: thumb_func_start atkD1_sethelpinghand atkD1_sethelpinghand: @ 8054E0C push {r4,lr} - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r3, =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r3, =gBankTarget strb r0, [r3] ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -27393,7 +27393,7 @@ atkD1_sethelpinghand: @ 8054E0C ands r0, r1 cmp r0, 0 beq _08054E90 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r3, [r3] @@ -27403,7 +27403,7 @@ atkD1_sethelpinghand: @ 8054E0C ands r1, r0 cmp r1, 0 bne _08054E90 - ldr r1, =gUnknown_0202433C + ldr r1, =gProtectStructs ldrb r0, [r4] lsls r0, 4 adds r0, r1 @@ -27420,14 +27420,14 @@ atkD1_sethelpinghand: @ 8054E0C movs r0, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08054EAA .pool _08054E90: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27462,9 +27462,9 @@ sub_8054EB4: @ 8054EB4 ands r0, r1 cmp r0, 0 bne _08054F9A - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -27475,14 +27475,14 @@ sub_8054EB4: @ 8054EB4 cmp r0, 0 beq _08054F9A _08054EE8: - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 - ldr r7, =gEnemyMonIndex + ldr r7, =gBankTarget ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 ldr r0, =gBattleTypeFlags @@ -27497,7 +27497,7 @@ _08054EE8: adds r0, r4, r2 ldrb r1, [r0] ldr r4, =gBitTable - ldr r3, =gUnknown_0202406E + ldr r3, =gBattlePartyID ldrb r0, [r6] lsls r0, 1 adds r0, r3 @@ -27523,7 +27523,7 @@ _08054EE8: _08054F46: ldr r0, =gBattleMons mov r8, r0 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r4, [r1] movs r5, 0x58 adds r0, r4, 0 @@ -27534,7 +27534,7 @@ _08054F46: adds r1, r3, 0 cmp r1, 0 bne _08054F6E - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] muls r0, r5 add r0, r8 @@ -27544,7 +27544,7 @@ _08054F46: _08054F6E: cmp r1, 0xAF beq _08054F9A - ldr r7, =gEnemyMonIndex + ldr r7, =gBankTarget ldrb r0, [r7] muls r0, r5 mov r2, r8 @@ -27565,7 +27565,7 @@ _08054F6E: cmp r0, 0xB bhi _08054FDC _08054F9A: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27586,10 +27586,10 @@ _08054FDC: ldrb r0, [r0] cmp r0, 0x3C bne _08055010 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB63F str r0, [r1] - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r0, [r7] muls r0, r5 add r0, r8 @@ -27598,11 +27598,11 @@ _08054FDC: strb r0, [r1] ldrb r0, [r7] ldrb r1, [r1] - bl b_history__record_ability_usage_of_player + bl RecordAbilityBattle b _08055132 .pool _08055010: - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct mov r10, r3 lsls r0, r4, 1 adds r0, 0xD0 @@ -27612,7 +27612,7 @@ _08055010: ldrh r0, [r0, 0x2E] mov r9, r0 strh r2, [r6] - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r0, [r1] muls r0, r5 add r0, r8 @@ -27623,8 +27623,8 @@ _08055010: add r0, r8 mov r2, r9 strh r2, [r0, 0x2E] - ldr r4, =gUnknown_02024064 - ldr r3, =gUnknown_0202420B + ldr r4, =gActiveBank + ldr r3, =gBankAttacker ldrb r0, [r3] strb r0, [r4] str r6, [sp] @@ -27633,7 +27633,7 @@ _08055010: movs r2, 0 movs r3, 0x2 bl dp01_build_cmdbuf_x02_a_b_varargs - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r0, [r1] bl dp01_battle_side_mark_buffer_for_execution ldrb r0, [r7] @@ -27665,14 +27665,14 @@ _08055010: adds r0, r1 adds r0, 0xC9 strb r3, [r0] - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker ldrb r0, [r1] ldr r1, [r2] lsls r0, 1 adds r0, r1 adds r0, 0xC8 strb r3, [r0] - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r0, [r2] mov r3, r10 ldr r1, [r3] @@ -27681,11 +27681,11 @@ _08055010: adds r0, 0xC9 movs r1, 0 strb r1, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r3, 0xFD strb r3, [r1] movs r2, 0xA @@ -27697,7 +27697,7 @@ _08055010: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 strb r3, [r1] strb r2, [r1, 0x1] mov r2, r9 @@ -27713,7 +27713,7 @@ _08055010: ldrh r0, [r6] cmp r0, 0 beq _0805512C - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 b _08055130 .pool @@ -27721,13 +27721,13 @@ _08055118: ldrh r0, [r6] cmp r0, 0 beq _0805512C - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication movs r1, 0 strb r1, [r0, 0x5] b _08055132 .pool _0805512C: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 _08055130: strb r0, [r1, 0x5] @@ -27747,7 +27747,7 @@ _08055132: sub_8055148: @ 8055148 push {r4,lr} ldr r3, =gBattleMons - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldrb r0, [r4] movs r2, 0x58 muls r0, r2 @@ -27759,27 +27759,27 @@ sub_8055148: @ 8055148 beq _0805519C cmp r0, 0x19 beq _0805519C - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] muls r0, r2 adds r0, r3 adds r0, 0x20 strb r1, [r0] - ldr r1, =gUnknown_0202420A + ldr r1, =gLastUsedAbility ldrb r0, [r4] muls r0, r2 adds r0, r3 adds r0, 0x20 ldrb r0, [r0] strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080551B6 .pool _0805519C: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27802,7 +27802,7 @@ _080551B6: thumb_func_start atkD4_802C408 atkD4_802C408: @ 80551C0 push {r4-r7,lr} - ldr r7, =gUnknown_02024214 + ldr r7, =gBattlescriptCurrInstr ldr r2, [r7] ldrb r3, [r2, 0x1] cmp r3, 0 @@ -27813,7 +27813,7 @@ atkD4_802C408: @ 80551C0 .pool _080551D8: ldr r1, =gUnknown_020243D0 - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker adds r0, r1, 0 adds r0, 0x20 ldrb r5, [r4] @@ -27826,7 +27826,7 @@ _080551D8: ldrb r0, [r4] adds r1, 0x24 adds r1, r0, r1 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -27836,12 +27836,12 @@ _080551D8: b _0805528A .pool _08055210: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldrb r0, [r4] strb r0, [r1, 0x2] ldr r0, =gUnknown_020243D0 @@ -27902,8 +27902,8 @@ _0805528C: thumb_func_start sub_8055294 sub_8055294: @ 8055294 push {lr} - ldr r1, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r1, =gStatuses3 + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -27914,7 +27914,7 @@ sub_8055294: @ 8055294 ands r0, r3 cmp r0, 0 beq _080552D8 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -27932,7 +27932,7 @@ sub_8055294: @ 8055294 _080552D8: orrs r1, r3 str r1, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -27945,8 +27945,8 @@ _080552E4: thumb_func_start atkD6_doubledamagedealtifdamaged atkD6_doubledamagedealtifdamaged: @ 80552EC push {lr} - ldr r3, =gUnknown_0202433C - ldr r0, =gUnknown_0202420B + ldr r3, =gProtectStructs + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r2, r0, 4 adds r0, r3, 0x4 @@ -27955,7 +27955,7 @@ atkD6_doubledamagedealtifdamaged: @ 80552EC cmp r0, 0 beq _0805530C adds r0, r2, r3 - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r0, 0xC] ldrb r1, [r1] cmp r0, r1 @@ -27968,17 +27968,17 @@ _0805530C: cmp r0, 0 beq _0805532A adds r0, r2, r3 - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r0, 0xD] ldrb r1, [r1] cmp r0, r1 bne _0805532A _08055324: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x2 strb r0, [r1, 0xE] _0805532A: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -27990,8 +27990,8 @@ _0805532A: thumb_func_start sub_805534C sub_805534C: @ 805534C push {r4,lr} - ldr r1, =gUnknown_020242AC - ldr r0, =gEnemyMonIndex + ldr r1, =gStatuses3 + ldr r0, =gBankTarget ldrb r3, [r0] lsls r0, r3, 2 adds r4, r0, r1 @@ -28010,7 +28010,7 @@ sub_805534C: @ 805534C cmp r0, 0 beq _080553A0 _08055374: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28030,7 +28030,7 @@ _080553A0: lsls r0, 5 orrs r2, r0 str r2, [r4] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28045,12 +28045,12 @@ _080553B0: atkD8_setdamagetohealthdifference: @ 80553BC push {lr} ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] movs r1, 0x58 muls r0, r1 adds r3, r0, r2 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] muls r0, r1 adds r1, r0, r2 @@ -28058,7 +28058,7 @@ atkD8_setdamagetohealthdifference: @ 80553BC ldrh r2, [r1, 0x28] cmp r0, r2 bhi _08055408 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28079,7 +28079,7 @@ _08055408: ldrh r1, [r1, 0x28] subs r0, r1 str r0, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28097,7 +28097,7 @@ atkD9_scaledamagebyhealthratio: @ 8055428 cmp r0, 0 bne _08055464 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -28105,7 +28105,7 @@ atkD9_scaledamagebyhealthratio: @ 8055428 adds r0, r2 ldrb r3, [r0, 0x1] ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -28121,7 +28121,7 @@ atkD9_scaledamagebyhealthratio: @ 8055428 movs r0, 0x1 strh r0, [r4] _08055464: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28135,7 +28135,7 @@ _08055464: atkDA_abilityswap: @ 805548C push {r4-r6,lr} ldr r5, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] movs r4, 0x58 muls r0, r4 @@ -28145,7 +28145,7 @@ atkDA_abilityswap: @ 805548C ldrb r1, [r2] cmp r1, 0 bne _080554B4 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] muls r0, r4 adds r0, r5 @@ -28156,7 +28156,7 @@ atkDA_abilityswap: @ 805548C _080554B4: cmp r1, 0x19 beq _080554D4 - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget ldrb r0, [r6] muls r0, r4 adds r0, r5 @@ -28171,7 +28171,7 @@ _080554B4: cmp r0, 0 beq _08055504 _080554D4: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28194,7 +28194,7 @@ _08055504: adds r0, r5 adds r0, 0x20 strb r1, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28211,8 +28211,8 @@ atkDB_imprisoneffect: @ 8055524 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r1, =gUnknown_020242AC - ldr r4, =gUnknown_0202420B + ldr r1, =gStatuses3 + ldr r4, =gBankAttacker ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -28225,7 +28225,7 @@ atkDB_imprisoneffect: @ 8055524 b _080555F6 .pool _0805554C: - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 mov r2, r9 ldrb r1, [r2] lsls r1, 2 @@ -28235,7 +28235,7 @@ _0805554C: lsls r2, 6 orrs r0, r2 str r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28243,7 +28243,7 @@ _0805554C: .pool _08055574: adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -28253,13 +28253,13 @@ _08055574: b _080555E6 _0805558A: adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r8, r0 beq _080555E0 movs r4, 0 - ldr r7, =gUnknown_0202420B + ldr r7, =gBankAttacker mov r9, r7 ldr r0, =gBattleMons mov r12, r0 @@ -28304,17 +28304,17 @@ _080555E0: lsls r0, 24 lsrs r6, r0, 24 _080555E6: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bcc _0805558A _080555EE: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r6, r0 bne _08055610 _080555F6: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28340,8 +28340,8 @@ _08055610: thumb_func_start atkDC_setgrudge atkDC_setgrudge: @ 805562C push {lr} - ldr r1, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r1, =gStatuses3 + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -28352,7 +28352,7 @@ atkDC_setgrudge: @ 805562C ands r0, r3 cmp r0, 0 beq _08055670 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28370,7 +28370,7 @@ atkDC_setgrudge: @ 805562C _08055670: orrs r1, r3 str r1, [r2] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28397,7 +28397,7 @@ atkDD_weightdamagecalculation: @ 8055684 adds r7, r1, 0 adds r4, r6, 0 _080556A0: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -28438,7 +28438,7 @@ _080556FC: movs r0, 0x78 strh r0, [r1] _08055702: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -28460,13 +28460,13 @@ atkDE_asistattackselect: @ 805571C sub sp, 0xC movs r0, 0 mov r10, r0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x18 str r0, [sp, 0x4] - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 ldr r0, =gPlayerParty @@ -28478,8 +28478,8 @@ atkDE_asistattackselect: @ 805571C _0805574C: movs r2, 0 _0805574E: - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -28569,12 +28569,12 @@ _080557F4: mov r1, r10 cmp r1, 0 beq _0805586C - ldr r2, =gUnknown_02024280 + ldr r2, =gHitMarker ldr r0, [r2] ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, =gUnknown_020241EE + ldr r4, =gRandomMove bl Random movs r1, 0xFF ands r1, r0 @@ -28588,17 +28588,17 @@ _080557F4: strh r0, [r4] ldrh r0, [r4] movs r1, 0 - bl sub_80458E0 - ldr r1, =gEnemyMonIndex + bl GetMoveTarget + ldr r1, =gBankTarget strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08055886 .pool _0805586C: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28626,11 +28626,11 @@ _08055886: thumb_func_start atkDF_setmagiccoat atkDF_setmagiccoat: @ 805589C push {lr} - ldr r1, =gEnemyMonIndex - ldr r3, =gUnknown_0202420B + ldr r1, =gBankTarget + ldr r3, =gBankAttacker ldrb r0, [r3] strb r0, [r1] - ldr r2, =gUnknown_0202437C + ldr r2, =gSpecialStatuses ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -28642,12 +28642,12 @@ atkDF_setmagiccoat: @ 805589C strb r1, [r0] ldr r0, =gUnknown_02024082 ldrb r1, [r0] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 bne _080558FC - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28663,7 +28663,7 @@ atkDF_setmagiccoat: @ 805589C b _08055914 .pool _080558FC: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r3] lsls r1, 4 adds r1, r0 @@ -28671,7 +28671,7 @@ _080558FC: movs r2, 0x10 orrs r0, r2 strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28684,8 +28684,8 @@ _08055914: thumb_func_start atkE0_setstealstatchange atkE0_setstealstatchange: @ 8055920 push {lr} - ldr r2, =gUnknown_0202437C - ldr r3, =gUnknown_0202420B + ldr r2, =gSpecialStatuses + ldr r3, =gBankAttacker ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -28697,12 +28697,12 @@ atkE0_setstealstatchange: @ 8055920 strb r1, [r0] ldr r0, =gUnknown_02024082 ldrb r1, [r0] - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 bne _08055978 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28718,14 +28718,14 @@ atkE0_setstealstatchange: @ 8055920 b _0805598E .pool _08055978: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs ldrb r1, [r3] lsls r1, 4 adds r1, r0 ldrb r0, [r1] orrs r0, r2 strb r0, [r1] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28738,17 +28738,17 @@ _0805598E: thumb_func_start atkE1_802CBE4 atkE1_802CBE4: @ 805599C push {r4-r6,lr} - ldr r4, =gUnknown_02024474 - ldr r0, =gUnknown_0202449C + ldr r4, =gBattleScripting + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xD8 ldrb r0, [r0] strb r0, [r4, 0x17] ldrb r0, [r4, 0x17] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r5, r0, 24 - ldr r2, =gUnknown_02022F58 + ldr r2, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r2] movs r0, 0x9 @@ -28763,8 +28763,8 @@ atkE1_802CBE4: @ 805599C strb r0, [r2, 0x2] movs r0, 0xFF strb r0, [r2, 0x3] - ldr r2, =gEnemyMonIndex - ldr r1, =gUnknown_0202406C + ldr r2, =gBankTarget + ldr r1, =gNoOfAllBanks ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 @@ -28773,26 +28773,26 @@ atkE1_802CBE4: @ 805599C ldr r6, =gBitTable _080559E2: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, r5 beq _08055A04 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldrb r0, [r4] lsls r0, 2 adds r0, r6 ldr r0, [r0] ands r1, r0 - ldr r2, =gUnknown_0202406C + ldr r2, =gNoOfAllBanks cmp r1, 0 beq _08055A18 _08055A04: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 adds r2, r1, 0 @@ -28800,13 +28800,13 @@ _08055A04: cmp r0, r1 bcc _080559E2 _08055A18: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] ldrb r2, [r2] cmp r0, r2 bcc _08055A64 _08055A22: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -28822,7 +28822,7 @@ _08055A22: b _08055A6C .pool _08055A64: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -28837,11 +28837,11 @@ _08055A6C: atkE2_cmde2: @ 8055A78 push {r4-r6,lr} sub sp, 0x4 - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank strb r0, [r4] ldr r3, =gBattleMons ldrb r0, [r4] @@ -28859,7 +28859,7 @@ atkE2_cmde2: @ 8055A78 str r0, [r1] ldr r2, =gBitTable ldrb r1, [r4] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, r1, r0 adds r0, 0x58 @@ -28891,11 +28891,11 @@ _08055AD2: thumb_func_start atkE3_jumpiffainted atkE3_jumpiffainted: @ 8055AF4 push {r4,lr} - ldr r4, =gUnknown_02024214 + ldr r4, =gBattlescriptCurrInstr ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank strb r0, [r1] ldr r2, =gBattleMons ldrb r1, [r1] @@ -28953,51 +28953,51 @@ _08055B64: .4byte _08055BCC .4byte _08055BD8 _08055B84: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 b _08055BE8 .pool _08055B90: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 b _08055BE8 .pool _08055B9C: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1B b _08055BE8 .pool _08055BA8: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x17 b _08055BE8 .pool _08055BB4: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x16 b _08055BE8 .pool _08055BC0: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x18 b _08055BE8 .pool _08055BCC: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x7 b _08055BE8 .pool _08055BD8: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x8 b _08055BE8 .pool _08055BE4: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x5 _08055BE8: strb r0, [r1, 0x3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -29089,7 +29089,7 @@ _08055C76: adds r0, r1 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData _08055CB6: adds r6, 0x1 cmp r6, 0x5 @@ -29140,7 +29140,7 @@ _08055D10: ldr r1, =gRarePickupItems adds r2, r1 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _08055DD0 .pool _08055D30: @@ -29219,14 +29219,14 @@ _08055DAE: ldr r1, =gPickupItems adds r2, r1 movs r1, 0xC - bl pokemon_setattr + bl SetMonData _08055DD0: mov r6, r9 cmp r6, 0x5 bgt _08055DD8 b _08055CCE _08055DD8: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -29244,8 +29244,8 @@ _08055DD8: thumb_func_start atkE6_castform_transform atkE6_castform_transform: @ 8055DFC push {r4,lr} - ldr r4, =gUnknown_02024064 - ldr r0, =gUnknown_02024474 + ldr r4, =gActiveBank + ldr r0, =gBattleScripting ldrb r0, [r0, 0x17] strb r0, [r4] ldr r1, =gBattleMons @@ -29258,7 +29258,7 @@ atkE6_castform_transform: @ 8055DFC movs r1, 0x80 lsls r1, 17 ands r0, r1 - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct cmp r0, 0 beq _08055E2C ldr r0, [r3] @@ -29276,7 +29276,7 @@ _08055E2C: bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -29289,11 +29289,11 @@ _08055E2C: thumb_func_start atkE7_castform_switch atkE7_castform_switch: @ 8055E64 push {r4,lr} - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldrb r0, [r0, 0x17] bl castform_switch lsls r0, 24 @@ -29302,7 +29302,7 @@ atkE7_castform_switch: @ 8055E64 beq _08055E8E ldr r0, =gUnknown_082DB4A9 bl b_push_move_exec - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x7F subs r1, r4, 0x1 @@ -29319,7 +29319,7 @@ atkE8_settypebasedhalvers: @ 8055EA4 push {r4,lr} movs r4, 0 ldr r2, =gBattleMoves - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -29328,8 +29328,8 @@ atkE8_settypebasedhalvers: @ 8055EA4 ldrb r0, [r0] cmp r0, 0xC9 bne _08055EF4 - ldr r1, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r1, =gStatuses3 + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -29342,13 +29342,13 @@ atkE8_settypebasedhalvers: @ 8055EA4 bne _08055F18 orrs r1, r3 str r1, [r2] - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] b _08055F1C .pool _08055EF4: - ldr r1, =gUnknown_020242AC - ldr r0, =gUnknown_0202420B + ldr r1, =gStatuses3 + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -29361,7 +29361,7 @@ _08055EF4: bne _08055F18 orrs r1, r3 str r1, [r2] - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] movs r4, 0x1 @@ -29369,14 +29369,14 @@ _08055F18: cmp r4, 0 beq _08055F38 _08055F1C: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08055F52 .pool _08055F38: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29406,7 +29406,7 @@ atkE9_seteffectbyweather: @ 8055F5C movs r1, 0 movs r2, 0xD movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -29416,7 +29416,7 @@ atkE9_seteffectbyweather: @ 8055F5C movs r1, 0 movs r2, 0x4D movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 bne _08055FFC @@ -29424,7 +29424,7 @@ atkE9_seteffectbyweather: @ 8055F5C ldrb r0, [r2] cmp r0, 0 beq _08055F9A - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x2 strb r0, [r1, 0xE] _08055F9A: @@ -29433,7 +29433,7 @@ _08055F9A: ands r0, r1 cmp r0, 0 beq _08055FB8 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] movs r0, 0x8B b _08055FFA @@ -29443,7 +29443,7 @@ _08055FB8: ands r0, r1 cmp r0, 0 beq _08055FCC - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] movs r0, 0x85 b _08055FFA @@ -29453,7 +29453,7 @@ _08055FCC: ands r0, r1 cmp r0, 0 beq _08055FE0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] movs r0, 0x8A b _08055FFA @@ -29463,19 +29463,19 @@ _08055FE0: ands r0, r1 cmp r0, 0 beq _08055FF4 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] movs r0, 0x8F b _08055FFA .pool _08055FF4: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] movs r0, 0x80 _08055FFA: strb r0, [r1, 0x13] _08055FFC: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -29489,11 +29489,11 @@ _08055FFC: atkEA_recycleitem: @ 8056014 push {r4-r7,lr} sub sp, 0x4 - ldr r7, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r7, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r7] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldrb r2, [r7] lsls r0, r2, 1 adds r0, 0xB8 @@ -29531,14 +29531,14 @@ atkEA_recycleitem: @ 8056014 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080560AE .pool _08056094: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29566,7 +29566,7 @@ atkEB_settypetoterrain: @ 80560BC push {r7} ldr r0, =gBattleMons mov r8, r0 - ldr r7, =gUnknown_0202420B + ldr r7, =gBankAttacker ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -29601,7 +29601,7 @@ atkEB_settypetoterrain: @ 80560BC ldrb r0, [r0] adds r1, 0x22 strb r0, [r1] - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -29612,14 +29612,14 @@ atkEB_settypetoterrain: @ 80560BC strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0805615E .pool _08056144: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29644,15 +29644,15 @@ _0805615E: thumb_func_start atkEC_802D2A0 atkEC_802D2A0: @ 805616C push {r4-r6,lr} - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r4, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r4, =gActiveBank strb r0, [r4] ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -29660,7 +29660,7 @@ atkEC_802D2A0: @ 805616C ands r0, r6 cmp r0, 0 beq _0805620C - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r3, [r4] @@ -29685,13 +29685,13 @@ atkEC_802D2A0: @ 805616C adds r0, r3, r0 movs r1, 0xB strb r1, [r0] - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove strh r2, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r6, [r0, 0x18] ldrb r1, [r5] adds r0, 0x20 @@ -29701,7 +29701,7 @@ atkEC_802D2A0: @ 805616C b _08056226 .pool _0805620C: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -29725,30 +29725,30 @@ _08056226: atkED_802D364: @ 8056230 push {r4,lr} ldr r1, =gUnknown_0202420E - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrb r0, [r3] strb r0, [r1] - ldr r2, =gEnemyMonIndex + ldr r2, =gBankTarget lsls r0, 24 lsrs r0, 24 adds r4, r1, 0 ldrb r1, [r2] cmp r0, r1 bne _08056264 - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x17] strb r0, [r2] strb r0, [r3] b _0805626A .pool _08056264: - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting ldrb r0, [r1, 0x17] strb r0, [r2] _0805626A: ldrb r0, [r4] strb r0, [r1, 0x17] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -29761,14 +29761,14 @@ _0805626A: thumb_func_start atkEE_removereflectlightscreen atkEE_removereflectlightscreen: @ 8056284 push {r4,lr} - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02024294 + ldr r1, =gSideTimers lsls r3, r0, 1 adds r0, r3, r0 lsls r0, 2 @@ -29791,18 +29791,18 @@ _080562AC: strh r0, [r2] strb r3, [r4] strb r3, [r4, 0x2] - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x1 strb r0, [r1, 0x18] strb r0, [r1, 0x19] b _080562EA .pool _080562E4: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting strb r1, [r0, 0x18] strb r1, [r0, 0x19] _080562EA: - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -29816,17 +29816,17 @@ _080562EA: sub_8056300: @ 8056300 push {r4-r6,lr} movs r4, 0 - ldr r0, =gUnknown_02024068 + ldr r0, =gBattleExecBuffer ldr r0, [r0] cmp r0, 0 beq _0805630E b _08056696 _0805630E: - ldr r5, =gUnknown_02024064 - ldr r0, =gUnknown_0202420B + ldr r5, =gActiveBank + ldr r0, =gBankAttacker ldrb r0, [r0] strb r0, [r5] - ldr r6, =gEnemyMonIndex + ldr r6, =gBankTarget movs r1, 0x1 eors r0, r1 strb r0, [r6] @@ -29841,7 +29841,7 @@ _0805630E: bl dp01_build_cmdbuf_x0D_a ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBE02 b _08056694 .pool @@ -29856,7 +29856,7 @@ _0805635C: bl dp01_build_cmdbuf_x0D_a ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBDCA b _08056694 .pool @@ -29865,7 +29865,7 @@ _08056384: ldrh r0, [r0] cmp r0, 0x5 bne _080563B0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x7C ldrb r0, [r0] @@ -29921,7 +29921,7 @@ _080563F4: .4byte _08056472 _08056410: ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -29952,7 +29952,7 @@ _08056440: b _080564D2 _08056452: ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -29973,7 +29973,7 @@ _08056472: .pool _08056480: ldr r2, =gBattleMons - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -30015,7 +30015,7 @@ _080564D2: movs r1, 0xA bl __divsi3 ldr r5, =gBattleMons - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r2, [r1] movs r1, 0x58 adds r4, r2, 0 @@ -30079,14 +30079,14 @@ _08056564: movs r0, 0 movs r1, 0x4 bl dp01_build_cmdbuf_x0D_a - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBD84 str r0, [r1] - ldr r1, =gUnknown_0202406E - ldr r0, =gEnemyMonIndex + ldr r1, =gBattlePartyID + ldr r0, =gBankTarget ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -30097,7 +30097,7 @@ _08056564: adds r0, r1 ldr r2, =gUnknown_02024208 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData bl calc_player_party_count lsls r0, 24 lsrs r0, 24 @@ -30145,16 +30145,16 @@ _08056614: movs r0, 0 adds r1, r4, 0 bl dp01_build_cmdbuf_x0D_a - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution cmp r4, 0x4 bne _0805668C - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBD84 str r0, [r1] - ldr r1, =gUnknown_0202406E - ldr r0, =gEnemyMonIndex + ldr r1, =gBattlePartyID + ldr r0, =gBankTarget ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -30165,28 +30165,28 @@ _08056614: adds r0, r1 movs r1, 0x26 adds r2, r5, 0 - bl pokemon_setattr + bl SetMonData bl calc_player_party_count lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 bne _08056680 _08056656: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0 strb r0, [r1, 0x5] b _08056696 .pool _08056680: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x5] b _08056696 .pool _0805668C: - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DBDD4 _08056694: str r0, [r1] @@ -30204,9 +30204,9 @@ atkF0_catch_pokemon: @ 80566A8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r9, r0 - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r0, [r5] movs r6, 0x1 eors r0, r6 @@ -30227,7 +30227,7 @@ atkF0_catch_pokemon: @ 80566A8 lsrs r1, r0, 24 cmp r1, 0 bne _08056734 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r1, [r0, 0x5] ldr r4, =gStringVar1 ldr r0, =0x00004036 @@ -30278,7 +30278,7 @@ _08056734: adds r1, r0, 0 adds r0, r4, 0 bl StringCopy - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication movs r0, 0x2 strb r0, [r1, 0x5] _0805677E: @@ -30287,14 +30287,14 @@ _0805677E: lsls r0, 24 cmp r0, 0 beq _08056792 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] _08056792: - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r10, r0 - ldr r1, =gUnknown_0202420B + ldr r1, =gBankAttacker mov r9, r1 ldrb r0, [r1] movs r4, 0x1 @@ -30350,7 +30350,7 @@ _08056792: ands r1, r2 orrs r1, r0 strb r1, [r5, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -30388,7 +30388,7 @@ atkF1_802D95C: @ 8056850 lsls r0, 24 cmp r0, 0 beq _080568A8 - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -30411,7 +30411,7 @@ _080568A8: movs r1, 0x3 adds r2, r4, 0 bl SetPokedexFlag - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -30432,7 +30432,7 @@ sub_80568CC: @ 80568CC bl GetMonData lsls r0, 16 lsrs r4, r0, 16 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0] cmp r0, 0x5 bls _080568E8 @@ -30476,7 +30476,7 @@ _08056938: lsls r0, 16 lsrs r0, 16 ldr r3, =gBattleMons - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r2, [r1] movs r1, 0x58 muls r2, r1 @@ -30488,7 +30488,7 @@ _08056938: adds r2, r3 ldr r2, [r2] bl sub_80BFDF4 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication strb r0, [r1, 0x1] b _08056A08 .pool @@ -30505,7 +30505,7 @@ _08056978: cmp r1, r0 bne _08056A2C ldr r2, =gTasks - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r1, [r4, 0x1] lsls r0, r1, 2 adds r0, r1 @@ -30548,7 +30548,7 @@ _080569E0: movs r0, 0x3 bl ShowBg _08056A06: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication _08056A08: ldrb r0, [r1] adds r0, 0x1 @@ -30562,7 +30562,7 @@ _08056A18: ands r0, r1 cmp r0, 0 bne _08056A2C - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -30802,7 +30802,7 @@ atkF3_receive_new_pokemon_maybe: @ 8056BEC mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x4 @@ -30833,7 +30833,7 @@ _08056C2C: ldr r0, =gUnknown_085CCABB movs r1, 0xC bl battle_show_message_maybe - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -30866,7 +30866,7 @@ _08056C86: ands r0, r1 cmp r0, 0 beq _08056CAE - ldr r4, =gUnknown_02024332 + ldr r4, =gBattleCommunication ldrb r0, [r4, 0x1] cmp r0, 0 bne _08056CAE @@ -30886,7 +30886,7 @@ _08056CAE: beq _08056CE0 movs r0, 0x5 bl audio_play - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1, 0x1] cmp r0, 0 bne _08056CF2 @@ -30906,7 +30906,7 @@ _08056CE0: _08056CEA: movs r0, 0x5 bl audio_play - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication _08056CF2: movs r0, 0x4 strb r0, [r1] @@ -30921,8 +30921,8 @@ _08056CFC: beq _08056D0A b _08056E62 _08056D0A: - ldr r7, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r7, =gBattlePartyID + ldr r0, =gBankAttacker mov r10, r0 ldrb r0, [r0] movs r4, 0x1 @@ -30938,7 +30938,7 @@ _08056D0A: ldr r1, =gEnemyParty mov r8, r1 add r0, r8 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r2, [r1] adds r2, 0x6D movs r1, 0x2 @@ -30986,7 +30986,7 @@ _08056D0A: movs r1, 0 movs r2, 0 bl GetMonData - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r1, 0x6D str r0, [sp] @@ -30996,7 +30996,7 @@ _08056D0A: adds r2, r6, 0 adds r3, r5, 0 bl do_choose_name_or_words_screen - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -31014,8 +31014,8 @@ _08056DD4: ands r0, r1 cmp r0, 0 bne _08056E62 - ldr r2, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r2, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x1 eors r0, r1 @@ -31026,11 +31026,11 @@ _08056DD4: muls r0, r1 ldr r1, =gEnemyParty adds r0, r1 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r2, [r1] adds r2, 0x6D movs r1, 0x2 - bl pokemon_setattr + bl SetMonData b _08056E48 .pool _08056E2C: @@ -31039,14 +31039,14 @@ _08056E2C: lsrs r0, 24 cmp r0, 0x6 bne _08056E48 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08056E62 .pool _08056E48: - ldr r3, =gUnknown_02024214 + ldr r3, =gBattlescriptCurrInstr ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -31074,7 +31074,7 @@ _08056E62: thumb_func_start sub_8056E78 sub_8056E78: @ 8056E78 ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -31084,7 +31084,7 @@ sub_8056E78: @ 8056E78 ldrh r0, [r1, 0x28] subs r0, r2 strh r0, [r1, 0x28] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31095,7 +31095,7 @@ sub_8056E78: @ 8056E78 thumb_func_start atkF5_reset_attacker_bd_x4C atkF5_reset_attacker_bd_x4C: @ 8056EA8 ldr r1, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -31103,7 +31103,7 @@ atkF5_reset_attacker_bd_x4C: @ 8056EA8 adds r0, r1 movs r1, 0 str r1, [r0] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -31113,7 +31113,7 @@ atkF5_reset_attacker_bd_x4C: @ 8056EA8 thumb_func_start sub_8056ED0 sub_8056ED0: @ 8056ED0 - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xC strb r0, [r1] bx lr @@ -31122,11 +31122,11 @@ sub_8056ED0: @ 8056ED0 thumb_func_start sub_8056EDC sub_8056EDC: @ 8056EDC - ldr r1, =gUnknown_02024083 + ldr r1, =gFightStateTracker movs r0, 0xC strb r0, [r1] ldr r1, =gUnknown_02024082 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] strb r0, [r1] bx lr @@ -31136,11 +31136,11 @@ sub_8056EDC: @ 8056EDC thumb_func_start sub_8056EF8 sub_8056EF8: @ 8056EF8 push {r4,r5,lr} - ldr r5, =gUnknown_02024214 + ldr r5, =gBattlescriptCurrInstr ldr r0, [r5] ldrb r0, [r0, 0x1] - bl battle_get_side_with_given_state - ldr r4, =gUnknown_02024064 + bl GetBankByPlayerAI + ldr r4, =gActiveBank strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x09_9_9_9 @@ -31158,7 +31158,7 @@ sub_8056EF8: @ 8056EF8 thumb_func_start sub_8056F28 sub_8056F28: @ 8056F28 push {r4-r6,lr} - ldr r5, =gUnknown_020244A8 + ldr r5, =gBattleResources ldr r6, =gBattleTypeFlags ldr r0, [r6] movs r1, 0x80 @@ -31168,7 +31168,7 @@ sub_8056F28: @ 8056F28 beq _08056F3E bl sub_81D55D0 _08056F3E: - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct movs r0, 0xA9 lsls r0, 2 bl AllocZeroed @@ -31265,11 +31265,11 @@ sub_8057028: @ 8057028 beq _0805703C bl sub_81D5694 _0805703C: - ldr r6, =gUnknown_020244A8 + ldr r6, =gBattleResources ldr r0, [r6] cmp r0, 0 beq _080570D0 - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r0, [r4] bl Free movs r5, 0 @@ -31344,11 +31344,11 @@ sub_80570F4: @ 80570F4 cmp r0, 0 beq _08057140 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r3, r0, 24 ldr r2, =gBattleMons @@ -31369,7 +31369,7 @@ sub_80570F4: @ 80570F4 .pool _08057140: movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 _0805714A: @@ -31393,7 +31393,7 @@ _0805714A: subs r0, r1 cmp r0, 0x1D ble _08057198 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -31406,7 +31406,7 @@ _0805714A: b _080571CE .pool _08057198: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -31419,7 +31419,7 @@ _08057198: b _080571CE .pool _080571B8: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -31444,16 +31444,16 @@ sub_80571DC: @ 80571DC lsls r1, 24 lsrs r7, r1, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08057248 movs r2, 0 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r3, r4, 1 ldr r5, =gUnknown_0203CF00 - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct _080571FE: adds r0, r2, r5 ldr r1, [r4] @@ -31478,7 +31478,7 @@ _080571FE: adds r0, r4, 0 bl sub_81B8FB0 movs r2, 0 - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r3, =gUnknown_0203CF00 _08057236: ldr r0, [r4] @@ -31510,7 +31510,7 @@ sub_805725C: @ 805725C mov r9, r0 movs r0, 0 mov r8, r0 - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication mov r10, r1 b _08057284 .pool @@ -31567,7 +31567,7 @@ _0805729A: movs r0, 0x1 mov r2, r10 strb r0, [r2, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB220 str r0, [r1] movs r0, 0x2 @@ -31609,7 +31609,7 @@ _08057322: ands r4, r0 cmp r4, 0 beq _08057354 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB213 str r0, [r1] movs r1, 0x2 @@ -31624,15 +31624,15 @@ _08057354: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication strb r4, [r0, 0x5] - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB220 str r0, [r1] movs r2, 0x2 mov r8, r2 _08057372: - ldr r1, =gUnknown_02024332 + ldr r1, =gBattleCommunication ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -31661,7 +31661,7 @@ _08057390: lsrs r5, r0, 16 cmp r5, 0 beq _080573D4 - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB26A str r0, [r1] b _080573EC @@ -31673,7 +31673,7 @@ _080573D4: ands r0, r1 str r0, [r4] bl b_movescr_stack_push_cursor - ldr r1, =gUnknown_02024214 + ldr r1, =gBattlescriptCurrInstr ldr r0, =gUnknown_082DB277 str r0, [r1] mov r0, r10 @@ -31681,7 +31681,7 @@ _080573D4: _080573EC: movs r1, 0x2 mov r8, r1 - ldr r2, =gUnknown_02024332 + ldr r2, =gBattleCommunication mov r10, r2 _080573F4: mov r1, r10 @@ -31698,7 +31698,7 @@ _08057406: mov r0, r8 cmp r0, 0x2 bne _08057430 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank mov r1, r9 strb r1, [r4] ldrb r1, [r4] @@ -31732,34 +31732,34 @@ nullsub_21: @ 8057458 bx lr thumb_func_end nullsub_21 - thumb_func_start sub_805745C -sub_805745C: @ 805745C - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + thumb_func_start SetBankFuncToPlayerBufferRunCommand +SetBankFuncToPlayerBufferRunCommand: @ 805745C + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl1 + ldr r1, =PlayerBufferRunCommand str r1, [r0] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim movs r1, 0 strb r1, [r0] ldr r0, =gUnknown_020244CC strb r1, [r0] bx lr .pool - thumb_func_end sub_805745C + thumb_func_end SetBankFuncToPlayerBufferRunCommand - thumb_func_start dp01_tbl1_exec_completed -dp01_tbl1_exec_completed: @ 805748C + thumb_func_start PlayerBufferExecCompleted +PlayerBufferExecCompleted: @ 805748C push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl1 + ldr r1, =PlayerBufferRunCommand str r1, [r0] ldr r0, =gBattleTypeFlags ldr r0, [r0] @@ -31773,8 +31773,8 @@ dp01_tbl1_exec_completed: @ 805748C movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably - ldr r1, =gUnknown_02023064 + bl PrepareBufferDataTransferLink + ldr r1, =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -31783,7 +31783,7 @@ dp01_tbl1_exec_completed: @ 805748C b _080574F2 .pool _080574E0: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -31798,14 +31798,14 @@ _080574F2: pop {r0} bx r0 .pool - thumb_func_end dp01_tbl1_exec_completed + thumb_func_end PlayerBufferExecCompleted - thumb_func_start bx_exec_buffer_A_ch0_tbl1 -bx_exec_buffer_A_ch0_tbl1: @ 8057504 + thumb_func_start PlayerBufferRunCommand +PlayerBufferRunCommand: @ 8057504 push {lr} - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -31814,13 +31814,13 @@ bx_exec_buffer_A_ch0_tbl1: @ 8057504 ands r1, r0 cmp r1, 0 beq _08057550 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _0805754C - ldr r0, =gUnknown_0831C514 + ldr r0, =gPlayerBufferCommands ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -31829,18 +31829,18 @@ bx_exec_buffer_A_ch0_tbl1: @ 8057504 b _08057550 .pool _0805754C: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08057550: pop {r0} bx r0 - thumb_func_end bx_exec_buffer_A_ch0_tbl1 + thumb_func_end PlayerBufferRunCommand thumb_func_start bx_0802E404 bx_0802E404: @ 8057554 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -31852,7 +31852,7 @@ bx_0802E404: @ 8057554 ldrsh r0, [r0, r1] cmp r0, 0 bne _08057576 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08057576: pop {r0} bx r0 @@ -31862,8 +31862,8 @@ _08057576: thumb_func_start sub_8057588 sub_8057588: @ 8057588 push {r4-r7,lr} - ldr r3, =gUnknown_02023064 - ldr r4, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r4, =gActiveBank ldrb r0, [r4] lsls r2, r0, 9 adds r1, r3, 0x2 @@ -31914,7 +31914,7 @@ _080575F0: movs r0, 0x5 bl audio_play ldr r1, =gUnknown_020244AC - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -31956,7 +31956,7 @@ _08057658: cmp r0, 0 beq _08057698 ldr r5, =gUnknown_020244AC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -31984,7 +31984,7 @@ _08057698: cmp r0, 0 beq _080576D8 ldr r5, =gUnknown_020244AC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -32013,7 +32013,7 @@ _080576D8: cmp r0, 0 beq _08057700 ldr r5, =gUnknown_020244AC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -32029,7 +32029,7 @@ _08057700: cmp r0, 0 beq _0805774C ldr r5, =gUnknown_020244AC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -32072,16 +32072,16 @@ _0805775A: ands r0, r3 cmp r0, 0 beq _080577E8 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 bne _080577E8 movs r0, 0 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024210 + bl GetBankByPlayerAI + ldr r1, =gAbsentBankFlags ldrb r1, [r1] ldr r2, =gBitTable lsls r0, 24 @@ -32095,7 +32095,7 @@ _0805775A: ands r0, r7 cmp r0, 0 bne _080577E8 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA ldrb r1, [r6] lsls r1, 9 adds r0, 0x1 @@ -32117,7 +32117,7 @@ _080577BC: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb _080577C2: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _080577E8 .pool _080577DC: @@ -32135,14 +32135,14 @@ _080577E8: thumb_func_start sub_80577F0 sub_80577F0: @ 80577F0 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free ldrb r0, [r4] movs r1, 0 bl dp11b_obj_free - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -32169,7 +32169,7 @@ sub_8057824: @ 8057824 movs r3, 0x1 bl dp11b_obj_instanciate movs r4, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r0, 0 beq _08057866 @@ -32184,7 +32184,7 @@ _0805784A: bl dp11b_obj_free _0805785C: adds r4, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 blt _0805784A @@ -32217,8 +32217,8 @@ _080578A0: beq _08057910 movs r0, 0x5 bl audio_play - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldr r4, =gUnknown_03005D74 ldrb r0, [r4] adds r0, r1 @@ -32231,7 +32231,7 @@ _080578A0: ldr r1, =sub_8039B2C str r1, [r0] ldr r1, =gUnknown_020244B0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -32244,7 +32244,7 @@ _080578A0: ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _08057BC8 .pool _08057910: @@ -32258,8 +32258,8 @@ _08057910: _0805791E: movs r0, 0x5 bl audio_play - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldr r5, =gUnknown_03005D74 ldrb r0, [r5] adds r0, r1 @@ -32271,8 +32271,8 @@ _0805791E: adds r0, r2 ldr r1, =sub_8039B2C str r1, [r0] - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -32302,8 +32302,8 @@ _0805798C: _08057996: movs r0, 0x5 bl audio_play - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldr r3, =gUnknown_03005D74 ldrb r0, [r3] adds r0, r1 @@ -32318,7 +32318,7 @@ _08057996: adds r5, r3, 0 _080579B8: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r1, r0, 24 movs r4, 0 @@ -32344,9 +32344,9 @@ _080579F0: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -32354,7 +32354,7 @@ _080579F0: beq _080579E8 movs r4, 0 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -32372,12 +32372,12 @@ _08057A28: beq _08057A6E b _08057A70 _08057A32: - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 bne _08057A6E - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r2, [r2] lsls r0, r2, 1 adds r0, r1 @@ -32404,7 +32404,7 @@ _08057A32: _08057A6E: adds r4, 0x1 _08057A70: - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r0, [r5] @@ -32430,8 +32430,8 @@ _08057AB0: _08057ABA: movs r0, 0x5 bl audio_play - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldr r3, =gUnknown_03005D74 ldrb r0, [r3] adds r0, r1 @@ -32446,7 +32446,7 @@ _08057ABA: adds r5, r3, 0 _08057ADC: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r1, r0, 24 movs r4, 0 @@ -32472,9 +32472,9 @@ _08057B14: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -32482,7 +32482,7 @@ _08057B14: beq _08057B0C movs r4, 0 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -32500,12 +32500,12 @@ _08057B4C: beq _08057B92 b _08057B94 _08057B56: - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 bne _08057B92 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r2, [r2] lsls r0, r2, 1 adds r0, r1 @@ -32532,7 +32532,7 @@ _08057B56: _08057B92: adds r4, 0x1 _08057B94: - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r0, [r5] @@ -32548,8 +32548,8 @@ _08057BAC: cmp r4, 0 beq _08057ADC _08057BB0: - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -32575,7 +32575,7 @@ sub_8057BFC: @ 8057BFC push {r7} movs r0, 0 mov r8, r0 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 ldr r1, =gUnknown_02023068 @@ -32613,7 +32613,7 @@ _08057C58: movs r0, 0x5 bl audio_play ldr r1, =gUnknown_020244B0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -32650,26 +32650,26 @@ _08057CA6: cmp r0, 0 beq _08057CC4 ldr r0, =gUnknown_03005D74 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r1, [r1] strb r1, [r0] b _08057CDE .pool _08057CC4: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r2, 0x1 movs r0, 0x1 ands r0, r1 eors r0, r2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, =gUnknown_03005D74 strb r0, [r1] _08057CDE: - ldr r5, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r5, =gBattleBufferA + ldr r0, =gActiveBank ldrb r3, [r0] lsls r2, r3, 9 adds r1, r5, 0x1 @@ -32725,7 +32725,7 @@ _08057D24: movs r0, 0 mov r8, r0 _08057D5A: - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank mov r0, r8 cmp r0, 0 bne _08057D80 @@ -32741,7 +32741,7 @@ _08057D62: b _08057E1C .pool _08057D80: - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -32757,8 +32757,8 @@ _08057D80: .pool _08057DA8: movs r0, 0x1 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024210 + bl GetBankByPlayerAI + ldr r1, =gAbsentBankFlags ldrb r1, [r1] ldr r2, =gBitTable lsls r0, 24 @@ -32774,12 +32774,12 @@ _08057DA8: _08057DD0: movs r0, 0x1 _08057DD2: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI ldr r1, =gUnknown_03005D74 _08057DD8: strb r0, [r1] - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_03005D74 ldrb r0, [r0] adds r0, r1 @@ -32809,7 +32809,7 @@ _08057E1C: movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _08057F9E .pool _08057E30: @@ -32970,8 +32970,8 @@ _08057F80: ldr r0, =gUnknown_085CCACA movs r1, 0xB bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -33025,7 +33025,7 @@ _08057FF8: cmp r0, 0 beq _08058038 ldr r5, =gUnknown_020244B0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r2, r0, r5 ldrb r1, [r2] @@ -33056,7 +33056,7 @@ _08058038: cmp r0, 0 beq _08058086 ldr r5, =gUnknown_020244B0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r3, r0, r5 ldrb r2, [r3] @@ -33093,7 +33093,7 @@ _08058086: cmp r0, 0 beq _080580C8 ldr r5, =gUnknown_020244B0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r2, r0, r5 ldrb r1, [r2] @@ -33124,7 +33124,7 @@ _080580C8: cmp r0, 0 beq _08058116 ldr r5, =gUnknown_020244B0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r3, r0, r5 ldrb r2, [r3] @@ -33181,7 +33181,7 @@ _08058152: bl audio_play ldr r0, =gUnknown_020244B0 mov r10, r0 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank mov r8, r1 ldrb r1, [r1] adds r2, r1, r0 @@ -33244,7 +33244,7 @@ _08058170: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs adds r6, r0, r2 ldrb r4, [r6, 0x18] lsls r3, r4, 24 @@ -33272,7 +33272,7 @@ _08058170: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r3, =gUnknown_020242BC + ldr r3, =gDisableStructs adds r1, r3 ldrb r4, [r1, 0x18] lsrs r3, r4, 4 @@ -33394,7 +33394,7 @@ _080582D8: adds r6, 0x1 cmp r6, 0x3 ble _080582D8 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -33415,7 +33415,7 @@ _0805831A: str r1, [sp, 0x20] add r3, sp, 0xC mov r10, r3 - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID mov r9, r5 mov r8, r2 movs r7, 0x64 @@ -33450,8 +33450,8 @@ _08058332: adds r6, 0x1 cmp r6, 0x3 ble _08058332 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -33481,7 +33481,7 @@ _08058392: cmp r6, 0x3 ble _08058392 ldr r4, =gUnknown_020244B0 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] adds r0, r4 ldrb r1, [r0] @@ -33551,9 +33551,9 @@ _0805841E: cmp r6, 0x3 ble _0805841E movs r6, 0 - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID mov r10, r5 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank mov r9, r0 movs r1, 0x64 mov r8, r1 @@ -33574,7 +33574,7 @@ _0805844A: adds r1, r6, 0 adds r1, 0xD adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r9 ldrb r0, [r1] lsls r0, 1 @@ -33587,14 +33587,14 @@ _0805844A: adds r1, r6, 0 adds r1, 0x11 adds r2, r5, 0 - bl pokemon_setattr + bl SetMonData adds r5, 0x1 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 ble _0805844A - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -33605,10 +33605,10 @@ _0805844A: adds r0, r1 movs r1, 0x15 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData _080584A8: - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -33638,13 +33638,13 @@ _08058500: ldrb r0, [r0] bl battle_menu_cursor_related ldr r1, =gUnknown_020244B0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl battle_menu_cursor_related_2 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -33670,7 +33670,7 @@ _08058554: b _080586E8 _0805856A: ldr r0, =gUnknown_020244B0 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] @@ -33713,7 +33713,7 @@ _080585BA: b _080586E8 _080585C8: ldr r0, =gUnknown_020244B0 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] @@ -33733,7 +33733,7 @@ _080585E8: cmp r0, 0 beq _080586E8 ldr r0, =gUnknown_020244B0 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] @@ -33757,7 +33757,7 @@ _0805862C: movs r0, 0x5 bl audio_play ldr r1, =gUnknown_020244B0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -33787,7 +33787,7 @@ _0805865C: cmp r0, r1 bcs _080586E8 ldr r0, =gUnknown_020244B0 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] @@ -33810,7 +33810,7 @@ _080586AA: movs r0, 0x5 bl audio_play ldr r1, =gUnknown_020244B0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -33864,7 +33864,7 @@ sub_80586F8: @ 80586F8 str r0, [r3] ldr r0, =sub_8038D64 bl SetMainCallback2 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0x1 bne _08058738 @@ -33893,7 +33893,7 @@ _0805875C: str r0, [r3] ldr r0, =sub_8038D64 bl SetMainCallback2 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0x1 bne _08058794 @@ -33935,8 +33935,8 @@ sub_80587B0: @ 80587B0 _080587F0: bl sub_800ADF8 _080587F4: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -33969,9 +33969,9 @@ _08058832: thumb_func_start sub_8058844 sub_8058844: @ 8058844 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -33984,7 +33984,7 @@ sub_8058844: @ 8058844 ldr r0, =DummyObjectCallback cmp r1, r0 bne _08058868 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08058868: pop {r0} bx r0 @@ -33994,9 +33994,9 @@ _08058868: thumb_func_start sub_805887C sub_805887C: @ 805887C push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -34009,7 +34009,7 @@ sub_805887C: @ 805887C ldr r0, =DummyObjectCallback cmp r1, r0 bne _080588A0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _080588A0: pop {r0} bx r0 @@ -34019,9 +34019,9 @@ _080588A0: thumb_func_start bx_802F7A0 bx_802F7A0: @ 80588B4 push {r4-r6,lr} - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -34055,7 +34055,7 @@ bx_802F7A0: @ 80588B4 lsls r0, 2 adds r0, r6 bl RemoveObjectAndFreeTiles - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08058908: pop {r4-r6} pop {r0} @@ -34068,7 +34068,7 @@ sub_8058924: @ 8058924 push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r1, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -34091,7 +34091,7 @@ sub_8058924: @ 8058924 adds r0, r2 movs r1, 0 strb r1, [r0, 0x9] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0805895C: pop {r4} pop {r0} @@ -34122,9 +34122,9 @@ sub_805896C: @ 805896C cmp r0, 0 beq _080589D0 _08058998: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gUnknown_03005D70 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -34141,9 +34141,9 @@ _08058998: b _08058A0E .pool _080589D0: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r6, =gUnknown_03005D70 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r4, [r2] adds r0, r4, r6 ldrb r1, [r0] @@ -34253,7 +34253,7 @@ _08058A0E: bl FreeObjectTilesByTag adds r0, r4, 0 bl FreeObjectPaletteByTag - ldr r7, =gUnknown_0202406E + ldr r7, =gBattlePartyID ldrb r1, [r6] lsls r0, r1, 1 adds r0, r7 @@ -34288,7 +34288,7 @@ _08058AE4: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc mov r2, r10 ldrb r0, [r2] lsls r0, 2 @@ -34317,7 +34317,7 @@ sub_8058B40: @ 8058B40 mov r8, r0 ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r2, [r7] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -34330,7 +34330,7 @@ sub_8058B40: @ 8058B40 ands r0, r1 cmp r0, 0 bne _08058B80 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -34355,7 +34355,7 @@ _08058B80: ands r0, r1 cmp r0, 0 bne _08058BB2 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -34410,7 +34410,7 @@ _08058BB2: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -34430,11 +34430,11 @@ _08058BB2: bl sub_80729D0 _08058C38: ldr r5, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -34453,7 +34453,7 @@ _08058C38: _08058C68: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -34467,7 +34467,7 @@ _08058C68: _08058C82: ldr r5, =gUnknown_020244D0 ldr r0, [r5] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -34525,7 +34525,7 @@ _08058D08: _08058D14: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -34554,9 +34554,9 @@ _08058D32: cmp r0, 0 beq _08058DAC _08058D52: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D7C - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r4, [r1] adds r0, r4, r0 ldrb r1, [r0] @@ -34569,7 +34569,7 @@ _08058D52: ldr r0, =DummyObjectCallback cmp r3, r0 bne _08058E0A - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -34582,9 +34582,9 @@ _08058D52: b _08058E06 .pool _08058DAC: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r7, =gUnknown_03005D7C - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] adds r0, r3, r7 ldrb r1, [r0] @@ -34597,7 +34597,7 @@ _08058DAC: ldr r0, =DummyObjectCallback cmp r4, r0 bne _08058E0A - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -34648,7 +34648,7 @@ _08058E0A: cmp r0, 0 bne _08058E48 ldr r2, =gUnknown_03005D7C - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -34657,19 +34657,19 @@ _08058E0A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles _08058E48: ldr r1, =gUnknown_03005D7C - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldr r3, =gUnknown_020244D0 @@ -34703,7 +34703,7 @@ _08058E48: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -34722,9 +34722,9 @@ _08058EAA: thumb_func_start sub_8058EDC sub_8058EDC: @ 8058EDC push {r4-r6,lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D70 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r3, [r6] adds r0, r3, r0 ldrb r1, [r0] @@ -34749,7 +34749,7 @@ sub_8058EDC: @ 8058EDC ands r0, r1 cmp r0, 0 beq _08058F94 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -34804,7 +34804,7 @@ sub_8058EDC: @ 8058EDC movs r3, 0x6 bl move_anim_start_t4 _08058F88: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -34822,7 +34822,7 @@ sub_8058FC0: @ 8058FC0 push {r4,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -34843,7 +34843,7 @@ sub_8058FC0: @ 8058FC0 movs r2, 0x80 lsls r2, 1 bl m4aMPlayVolumeControl - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r4] lsls r0, r1, 1 adds r0, r2 @@ -34853,7 +34853,7 @@ sub_8058FC0: @ 8058FC0 ldr r2, =gPlayerParty adds r0, r2 bl sub_805E990 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0805900E: pop {r4} pop {r0} @@ -34866,7 +34866,7 @@ sub_805902C: @ 805902C push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -34878,7 +34878,7 @@ sub_805902C: @ 805902C ands r0, r1 cmp r0, 0 bne _0805905E - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -34888,7 +34888,7 @@ sub_805902C: @ 805902C adds r0, r2, 0 bl sub_8172EF0 _0805905E: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, =gUnknown_03005D7C ldrb r2, [r5] adds r0, r2, r0 @@ -34920,7 +34920,7 @@ _0805905E: ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -34936,7 +34936,7 @@ _0805905E: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -34975,7 +34975,7 @@ _08059122: thumb_func_start bx_t1_healthbar_update bx_t1_healthbar_update: @ 8059130 push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] ldr r6, =gUnknown_03005D70 adds r1, r0, r6 @@ -35004,7 +35004,7 @@ bx_t1_healthbar_update: @ 8059130 b _08059192 .pool _08059178: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -35014,7 +35014,7 @@ _08059178: ldr r2, =gPlayerParty adds r0, r2 bl sub_805E990 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059192: pop {r4-r6} pop {r0} @@ -35030,7 +35030,7 @@ sub_80591A0: @ 80591A0 lsls r0, 16 cmp r0, 0 bne _080591B2 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _080591B2: pop {r0} bx r0 @@ -35065,7 +35065,7 @@ sub_80591B8: @ 80591B8 lsrs r0, 24 cmp r0, 0x1 beq _080591FE - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -35119,7 +35119,7 @@ _080591FE: adds r0, r6, 0 movs r1, 0x19 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 bl pokemon_calc_effective_stats ldr r2, [sp] @@ -35128,7 +35128,7 @@ _080591FE: subs r2, r0 ldr r0, [sp, 0xC] subs r2, r0, r2 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -35142,7 +35142,7 @@ _080591FE: lsrs r0, 24 cmp r0, 0x1 bne _080592D4 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r0, r7, 1 adds r0, r2 mov r1, r10 @@ -35175,8 +35175,8 @@ _080592EC: add r2, sp, 0x4 adds r0, r6, 0 movs r1, 0x19 - bl pokemon_setattr - ldr r1, =gUnknown_03005D60 + bl SetMonData + ldr r1, =gBattleBankFunc ldr r3, [sp, 0x8] lsls r0, r3, 2 adds r0, r1 @@ -35393,7 +35393,7 @@ _08059430: adds r0, r5, 0 movs r1, 0x19 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 bl pokemon_calc_effective_stats ldr r2, [sp] @@ -35401,7 +35401,7 @@ _08059430: ldrh r0, [r0] subs r2, r0 subs r2, r4, r2 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -35419,8 +35419,8 @@ _08059510: add r2, sp, 0x4 adds r0, r5, 0 movs r1, 0x19 - bl pokemon_setattr - ldr r1, =gUnknown_03005D60 + bl SetMonData + ldr r1, =gBattleBankFunc lsls r0, r7, 2 adds r0, r1 ldr r1, =sub_80591A0 @@ -35456,7 +35456,7 @@ sub_8059544: @ 8059544 lsrs r0, 24 cmp r0, 0x1 bne _08059578 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID movs r0, 0x2 adds r2, r4, 0 eors r2, r0 @@ -35522,7 +35522,7 @@ sub_80595A4: @ 80595A4 lsrs r0, 24 cmp r0, 0x1 bne _08059624 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID movs r0, 0x2 adds r2, r5, 0 eors r2, r0 @@ -35583,7 +35583,7 @@ sub_805965C: @ 805965C movs r1, 0x38 bl GetMonData ldrb r0, [r4, 0xC] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc lsls r0, 2 adds r0, r1 ldr r1, =sub_80591A0 @@ -35599,9 +35599,9 @@ sub_805965C: @ 805965C thumb_func_start sub_80596A8 sub_80596A8: @ 80596A8 push {r4-r6,lr} - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r2, [r4] adds r0, r2, r5 ldrb r1, [r0] @@ -35616,7 +35616,7 @@ sub_80596A8: @ 80596A8 adds r1, r0 cmp r1, 0xA0 ble _08059724 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] @@ -35653,7 +35653,7 @@ sub_80596A8: @ 80596A8 adds r0, r1 ldrb r0, [r0] bl sub_8072984 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059724: pop {r4-r6} pop {r0} @@ -35666,7 +35666,7 @@ sub_8059744: @ 8059744 push {r4-r6,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -35678,13 +35678,13 @@ sub_8059744: @ 8059744 ands r0, r1 cmp r0, 0 bne _08059798 - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -35700,7 +35700,7 @@ sub_8059744: @ 8059744 adds r0, r1 ldrb r0, [r0] bl sub_8072984 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059798: pop {r4-r6} pop {r0} @@ -35716,7 +35716,7 @@ sub_80597B4: @ 80597B4 lsls r0, 16 cmp r0, 0 bne _080597C6 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _080597C6: pop {r0} bx r0 @@ -35731,8 +35731,8 @@ sub_80597CC: @ 80597CC ands r0, r1 cmp r0, 0 bne _0805980A - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -35790,8 +35790,8 @@ _08059870: movs r2, 0 bl dp01_build_cmdbuf_x22_a_three_bytes _0805987A: - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -35803,7 +35803,7 @@ _0805987A: bne _08059894 bl b_link_standby_message _08059894: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059898: pop {r0} bx r0 @@ -35819,8 +35819,8 @@ sub_80598A4: @ 80598A4 ands r0, r1 cmp r0, 0 bne _080598CC - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -35853,7 +35853,7 @@ sub_80598E0: @ 80598E0 ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059906: pop {r0} bx r0 @@ -35863,13 +35863,13 @@ _08059906: thumb_func_start bx_wait_t1 bx_wait_t1: @ 805991C push {lr} - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim ldrb r0, [r0] cmp r0, 0 beq _08059942 ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -35882,7 +35882,7 @@ bx_wait_t1: @ 805991C cmp r0, 0 bne _08059946 _08059942: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059946: pop {r0} bx r0 @@ -35892,12 +35892,12 @@ _08059946: thumb_func_start bx_blink_t1 bx_blink_t1: @ 8059958 push {r4,lr} - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -35915,9 +35915,9 @@ bx_blink_t1: @ 8059958 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r3, [r0] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _080599CE .pool _080599A4: @@ -36022,7 +36022,7 @@ _08059A6C: movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb _08059A76: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059A7A: ldr r0, =gMain ldrh r1, [r0, 0x2E] @@ -36039,7 +36039,7 @@ _08059A7A: bl sub_8056A3C movs r0, 0x5 bl audio_play - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059AA0: add sp, 0x4 pop {r4} @@ -36051,7 +36051,7 @@ _08059AA0: thumb_func_start sub_8059AAC sub_8059AAC: @ 8059AAC push {r4-r7,lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] lsls r1, 9 ldr r3, =gUnknown_02023068 @@ -36114,8 +36114,8 @@ sub_8059B18: @ 8059B18 thumb_func_start sub_8059B3C sub_8059B3C: @ 8059B3C push {r4-r7,lr} - ldr r5, =gUnknown_02023064 - ldr r7, =gUnknown_02024064 + ldr r5, =gBattleBufferA + ldr r7, =gActiveBank ldrb r0, [r7] lsls r0, 9 adds r1, r5, 0x2 @@ -36165,7 +36165,7 @@ _08059B98: thumb_func_start sub_8059BB0 sub_8059BB0: @ 8059BB0 push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r4, [r5] lsls r4, 9 ldr r0, =gUnknown_02023068 @@ -36381,7 +36381,7 @@ sub_8059D60: @ 8059D60 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -36393,7 +36393,7 @@ sub_8059D60: @ 8059D60 ands r0, r1 cmp r0, 0 bne _08059D82 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059D82: pop {r0} bx r0 @@ -36405,7 +36405,7 @@ bx_8030B2C: @ 8059D90 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -36417,7 +36417,7 @@ bx_8030B2C: @ 8059D90 ands r0, r1 cmp r0, 0 bne _08059DB2 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _08059DB2: pop {r0} bx r0 @@ -36452,8 +36452,8 @@ dp01t_00_1_getattr: @ 8059DF4 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -36461,7 +36461,7 @@ dp01t_00_1_getattr: @ 8059DF4 ldrb r0, [r1] cmp r0, 0 bne _08059E2C - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -36495,7 +36495,7 @@ _08059E4E: movs r0, 0x1 mov r2, sp bl dp01_build_cmdbuf_x1D_1D_numargs_varargs - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted add sp, 0x100 pop {r4-r6} pop {r0} @@ -36514,8 +36514,8 @@ dp01_getattr_by_ch1_for_player_pokemon_: @ 8059E68 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, =gUnknown_02023064 - ldr r3, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -37384,8 +37384,8 @@ _0805A5FE: sub_805A614: @ 805A614 push {r4-r7,lr} sub sp, 0x58 - ldr r2, =gUnknown_0202406E - ldr r5, =gUnknown_02024064 + ldr r2, =gBattlePartyID + ldr r5, =gActiveBank ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -37393,7 +37393,7 @@ sub_805A614: @ 805A614 movs r0, 0x64 adds r4, r2, 0 muls r4, r0 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA lsls r1, 9 adds r0, r3, 0x1 adds r0, r1, r0 @@ -37436,7 +37436,7 @@ _0805A66A: movs r0, 0x1 adds r2, r4, 0 bl dp01_build_cmdbuf_x1D_1D_numargs_varargs - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted add sp, 0x58 pop {r4-r7} pop {r0} @@ -37447,8 +37447,8 @@ _0805A66A: thumb_func_start dp01t_02_1_setattr dp01t_02_1_setattr: @ 805A69C push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -37456,7 +37456,7 @@ dp01t_02_1_setattr: @ 805A69C ldrb r0, [r1] cmp r0, 0 bne _0805A6CC - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -37481,7 +37481,7 @@ _0805A6DE: cmp r5, 0x5 bls _0805A6D0 _0805A6EA: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4,r5} pop {r0} bx r0 @@ -37497,7 +37497,7 @@ dp01_setattr_by_ch1_for_player_pokemon: @ 805A6F4 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r2, =gUnknown_02023067 @@ -37588,12 +37588,12 @@ _0805A828: adds r0, r4, 0 movs r1, 0xB adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x2E adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r0, 0 mov r8, r0 movs r0, 0x3B @@ -37634,12 +37634,12 @@ _0805A88E: adds r1, 0xD mov r0, r9 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 mov r0, r9 adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData adds r7, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -37655,15 +37655,15 @@ _0805A88E: adds r0, r4, 0 movs r1, 0x15 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x20] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x19 ldr r2, [sp, 0x28] - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x14] lsls r0, 27 lsrs r0, 27 @@ -37672,7 +37672,7 @@ _0805A88E: adds r0, r4, 0 movs r1, 0x27 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x14] lsls r0, 22 @@ -37681,7 +37681,7 @@ _0805A88E: adds r0, r4, 0 movs r1, 0x28 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x15] lsls r0, 25 @@ -37690,7 +37690,7 @@ _0805A88E: adds r0, r4, 0 movs r1, 0x29 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldr r0, [r6, 0x14] lsls r0, 12 @@ -37699,7 +37699,7 @@ _0805A88E: adds r0, r4, 0 movs r1, 0x2A mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x16] lsls r0, 23 @@ -37708,7 +37708,7 @@ _0805A88E: adds r0, r4, 0 movs r1, 0x2B mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x17] lsls r0, 26 @@ -37717,47 +37717,47 @@ _0805A88E: adds r0, r4, 0 movs r1, 0x2C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0 ldr r2, [sp, 0x2C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x37 ldr r2, [sp, 0x30] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 ldr r2, [sp, 0x18] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A ldr r2, [sp, 0x24] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3B ldr r2, [sp, 0x4] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C ldr r2, [sp, 0x8] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D ldr r2, [sp, 0xC] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E ldr r2, [sp, 0x10] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F ldr r2, [sp, 0x14] - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805A9C0: @@ -37765,12 +37765,12 @@ _0805A9C0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xB - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805A9E0: @@ -37778,12 +37778,12 @@ _0805A9E0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AA00: @@ -37805,12 +37805,12 @@ _0805AA1A: adds r1, 0xD adds r0, r7, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 adds r0, r7, 0 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -37824,7 +37824,7 @@ _0805AA1A: adds r0, r1 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AA58: @@ -37832,8 +37832,8 @@ _0805AA58: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -37848,41 +37848,41 @@ _0805AA80: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x11 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x12 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x13 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x14 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x15 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AAE4: @@ -37890,8 +37890,8 @@ _0805AAE4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -37901,7 +37901,7 @@ _0805AAE4: _0805AAFC: adds r3, 0x3 adds r2, r3 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AB14: @@ -37909,12 +37909,12 @@ _0805AB14: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AB34: @@ -37922,12 +37922,12 @@ _0805AB34: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AB54: @@ -37935,12 +37935,12 @@ _0805AB54: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1A - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AB74: @@ -37948,12 +37948,12 @@ _0805AB74: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1B - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AB94: @@ -37961,12 +37961,12 @@ _0805AB94: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1C - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805ABB4: @@ -37974,12 +37974,12 @@ _0805ABB4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1D - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805ABD4: @@ -37987,12 +37987,12 @@ _0805ABD4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1E - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805ABF4: @@ -38000,12 +38000,12 @@ _0805ABF4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1F - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AC14: @@ -38013,12 +38013,12 @@ _0805AC14: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AC34: @@ -38026,12 +38026,12 @@ _0805AC34: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x22 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AC54: @@ -38039,12 +38039,12 @@ _0805AC54: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AC74: @@ -38052,12 +38052,12 @@ _0805AC74: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x24 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AC94: @@ -38065,12 +38065,12 @@ _0805AC94: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x25 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805ACB4: @@ -38078,12 +38078,12 @@ _0805ACB4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805ACD4: @@ -38092,41 +38092,41 @@ _0805ACD4: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x5 @@ -38139,12 +38139,12 @@ _0805AD44: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AD64: @@ -38152,12 +38152,12 @@ _0805AD64: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AD84: @@ -38165,12 +38165,12 @@ _0805AD84: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805ADA4: @@ -38178,12 +38178,12 @@ _0805ADA4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805ADC4: @@ -38191,12 +38191,12 @@ _0805ADC4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805ADE4: @@ -38204,13 +38204,13 @@ _0805ADE4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 _0805ADF4: movs r1, 0x2C - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AE04: @@ -38218,12 +38218,12 @@ _0805AE04: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AE24: @@ -38231,12 +38231,12 @@ _0805AE24: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x9 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AE44: @@ -38244,12 +38244,12 @@ _0805AE44: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x37 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AE64: @@ -38257,12 +38257,12 @@ _0805AE64: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x38 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AE84: @@ -38270,12 +38270,12 @@ _0805AE84: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AEA4: @@ -38283,12 +38283,12 @@ _0805AEA4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3A - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AEC4: @@ -38296,12 +38296,12 @@ _0805AEC4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3B - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AEE4: @@ -38309,12 +38309,12 @@ _0805AEE4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3C - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AF04: @@ -38322,12 +38322,12 @@ _0805AF04: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3D - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AF24: @@ -38335,12 +38335,12 @@ _0805AF24: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3E - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AF44: @@ -38348,12 +38348,12 @@ _0805AF44: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3F - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AF64: @@ -38361,12 +38361,12 @@ _0805AF64: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AF84: @@ -38374,12 +38374,12 @@ _0805AF84: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AFA4: @@ -38387,12 +38387,12 @@ _0805AFA4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AFC4: @@ -38400,12 +38400,12 @@ _0805AFC4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805AFE4: @@ -38413,12 +38413,12 @@ _0805AFE4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805B004: @@ -38426,12 +38426,12 @@ _0805B004: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x30 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805B024: @@ -38439,12 +38439,12 @@ _0805B024: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x32 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805B044: @@ -38452,12 +38452,12 @@ _0805B044: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x33 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805B064: @@ -38465,12 +38465,12 @@ _0805B064: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x34 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805B084: @@ -38478,12 +38478,12 @@ _0805B084: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x35 - bl pokemon_setattr + bl SetMonData b _0805B0BA .pool _0805B0A4: @@ -38491,15 +38491,15 @@ _0805B0A4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 - bl pokemon_setattr + bl SetMonData _0805B0BA: - ldr r2, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r2, =gBattlePartyID + ldr r0, =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -38523,8 +38523,8 @@ _0805B0BA: thumb_func_start sub_805B0F0 sub_805B0F0: @ 805B0F0 push {r4-r7,lr} - ldr r1, =gUnknown_0202406E - ldr r7, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r7, =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -38532,7 +38532,7 @@ sub_805B0F0: @ 805B0F0 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -38568,7 +38568,7 @@ _0805B126: cmp r3, r0 bcc _0805B126 _0805B148: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4-r7} pop {r0} bx r0 @@ -38578,8 +38578,8 @@ _0805B148: thumb_func_start sub_805B164 sub_805B164: @ 805B164 push {r4,lr} - ldr r2, =gUnknown_0202406E - ldr r4, =gUnknown_02024064 + ldr r2, =gBattlePartyID + ldr r4, =gActiveBank ldrb r1, [r4] lsls r0, r1, 1 adds r0, r2 @@ -38589,8 +38589,8 @@ sub_805B164: @ 805B164 ldr r2, =gPlayerParty adds r0, r2 bl sub_805DD7C - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds ldrb r3, [r4] adds r0, r3, r0 ldrb r0, [r0] @@ -38604,7 +38604,7 @@ sub_805B164: @ 805B164 ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -38619,15 +38619,15 @@ sub_805B164: @ 805B164 thumb_func_start sub_805B1CC sub_805B1CC: @ 805B1CC push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r1, r0, 9 adds r6, r4, 0x2 adds r1, r6 ldrb r1, [r1] bl sub_805EF84 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -38659,7 +38659,7 @@ sub_805B1CC: @ 805B1CC adds r1, r6 ldrb r1, [r1] bl sub_805B258 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -38685,10 +38685,10 @@ sub_805B258: @ 805B258 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r2, r6, 1 adds r2, r0 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -38713,7 +38713,7 @@ sub_805B258: @ 805B258 mov r1, r9 strb r0, [r1] adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -38741,10 +38741,10 @@ sub_805B258: @ 805B258 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds adds r4, r6, r4 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -38837,8 +38837,8 @@ sub_805B258: @ 805B258 thumb_func_start sub_805B3D4 sub_805B3D4: @ 805B3D4 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -38854,7 +38854,7 @@ sub_805B3D4: @ 805B3D4 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -38863,13 +38863,13 @@ sub_805B3D4: @ 805B3D4 b _0805B452 .pool _0805B41C: - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -38885,7 +38885,7 @@ _0805B41C: adds r0, r1 ldrb r0, [r0] bl sub_8072984 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0805B452: pop {r4-r6} pop {r0} @@ -38898,7 +38898,7 @@ sub_805B464: @ 805B464 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -38950,7 +38950,7 @@ _0805B4BA: adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -39068,9 +39068,9 @@ _0805B5BA: adds r5, r0, 0 cmp r1, 0 beq _0805B63C - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 ands r1, r0 movs r0, 0x20 @@ -39149,12 +39149,12 @@ _0805B670: lsls r0, 16 lsrs r4, r0, 16 adds r5, r4, 0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] adds r0, r5, 0 bl sub_805DF38 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -39173,7 +39173,7 @@ _0805B670: mov r1, r9 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds ldrb r1, [r6] adds r1, r4 strb r0, [r1] @@ -39182,7 +39182,7 @@ _0805B670: adds r5, r0 ldrh r0, [r5, 0x4] bl IndexOfObjectPaletteTag - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r1, [r6] adds r1, r4 ldrb r1, [r1] @@ -39261,12 +39261,12 @@ _0805B670: b _0805B82A .pool _0805B794: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -39285,11 +39285,11 @@ _0805B794: mov r1, r8 adds r2, r4, 0 bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -39332,8 +39332,8 @@ _0805B794: ldr r1, =sub_805D7AC str r1, [r0] _0805B82A: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -39443,12 +39443,12 @@ _0805B920: ldr r0, [r0] ldrb r4, [r0, 0x8] _0805B926: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -39469,11 +39469,11 @@ _0805B926: movs r1, 0x50 movs r3, 0x1E bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -39515,7 +39515,7 @@ _0805B926: adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -39530,15 +39530,15 @@ _0805B926: thumb_func_start sub_805B9F8 sub_805B9F8: @ 805B9F8 push {r4-r6,lr} - ldr r5, =gUnknown_020241E4 - ldr r6, =gUnknown_02024064 + ldr r5, =gBankSpriteIds + ldr r6, =gActiveBank ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -39597,7 +39597,7 @@ sub_805B9F8: @ 805B9F8 adds r0, r4 movs r1, 0x1 bl StartObjectImageAnim - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -39614,7 +39614,7 @@ sub_805BAB8: @ 805BAB8 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -39658,7 +39658,7 @@ _0805BB0C: cmp r4, 0 bne _0805BB82 strb r4, [r3, 0x4] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -39672,8 +39672,8 @@ _0805BB0C: negs r1, r1 movs r0, 0x10 bl audio_play_and_stuff - ldr r2, =gUnknown_02020630 - ldr r3, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r3, =gBankSpriteIds ldrb r0, [r5] adds r0, r3 ldrb r1, [r0] @@ -39701,7 +39701,7 @@ _0805BB0C: adds r0, r2 ldr r1, =sub_8039C00 str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -39726,7 +39726,7 @@ sub_805BBA4: @ 805BBA4 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted add sp, 0x4 pop {r0} bx r0 @@ -39740,13 +39740,13 @@ sub_805BBC4: @ 805BBC4 ldr r1, [r0, 0x8] movs r0, 0x4 strb r0, [r1, 0x8] - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -39754,7 +39754,7 @@ sub_805BBC4: @ 805BBC4 adds r1, r4, 0 movs r3, 0x3 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -39769,8 +39769,8 @@ sub_805BBC4: @ 805BBC4 thumb_func_start sub_805BC18 sub_805BC18: @ 805BC18 push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -39780,12 +39780,12 @@ sub_805BC18: @ 805BC18 ldr r0, [r0] ldr r0, [r0, 0x8] strb r1, [r0, 0x8] - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -39793,7 +39793,7 @@ sub_805BC18: @ 805BC18 adds r1, r4, 0 movs r3, 0x3 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -39808,8 +39808,8 @@ sub_805BC18: @ 805BC18 thumb_func_start sub_805BC78 sub_805BC78: @ 805BC78 push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -39824,7 +39824,7 @@ _0805BC8C: cmp r0, 0 bne _0805BC8C _0805BC96: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .pool @@ -39835,7 +39835,7 @@ dp01t_0F_1_move_anim: @ 805BCA8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -39843,7 +39843,7 @@ dp01t_0F_1_move_anim: @ 805BCA8 beq _0805BCBE b _0805BDE4 _0805BCBE: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA mov r12, r0 ldrb r1, [r5] lsls r1, 9 @@ -39947,7 +39947,7 @@ _0805BCBE: lsrs r3, r0, 24 cmp r3, 0 beq _0805BDBC - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0805BDE4 .pool _0805BDBC: @@ -39960,7 +39960,7 @@ _0805BDBC: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -39986,8 +39986,8 @@ bx_move_anim_1: @ 805BDFC mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r6, =gActiveBank ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -40114,7 +40114,7 @@ _0805BEBE: _0805BF0C: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -40152,7 +40152,7 @@ _0805BF34: lsls r0, 2 adds r0, r2 strb r4, [r0, 0x4] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0805BF70: pop {r3-r5} mov r8, r3 @@ -40171,7 +40171,7 @@ sub_805BF80: @ 805BF80 strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r4, [r5] lsls r4, 9 ldr r0, =gUnknown_02023066 @@ -40181,7 +40181,7 @@ sub_805BF80: @ 805BF80 ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -40201,9 +40201,9 @@ sub_805BF80: @ 805BF80 thumb_func_start dp01t_11_1_message_for_player_only dp01t_11_1_message_for_player_only: @ 805BFE0 push {lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0805BFFC @@ -40211,7 +40211,7 @@ dp01t_11_1_message_for_player_only: @ 805BFE0 b _0805C000 .pool _0805BFFC: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0805C000: pop {r0} bx r0 @@ -40230,8 +40230,8 @@ sub_805C004: @ 805C004 ldr r1, =gUnknown_02022E16 movs r0, 0xA0 strh r0, [r1] - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -40246,8 +40246,8 @@ _0805C02A: thumb_func_start dp01t_12_6_battle_menu dp01t_12_6_battle_menu: @ 805C044 push {r4,lr} - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -40266,7 +40266,7 @@ _0805C062: cmp r4, 0x3 ble _0805C062 ldr r1, =gUnknown_020244AC - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -40287,9 +40287,9 @@ _0805C062: sub_805C0B0: @ 805C0B0 push {r4,lr} sub sp, 0x4 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -40308,7 +40308,7 @@ sub_805C0B0: @ 805C0B0 strb r0, [r1] movs r0, 0x1 bl sub_8056B74 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -40317,7 +40317,7 @@ sub_805C0B0: @ 805C0B0 b _0805C10C .pool _0805C108: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0805C10C: add sp, 0x4 pop {r4} @@ -40340,8 +40340,8 @@ sub_805C114: @ 805C114 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -40356,9 +40356,9 @@ _0805C13E: thumb_func_start sub_805C158 sub_805C158: @ 805C158 push {lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r1, r0 movs r0, 0xA6 @@ -40381,7 +40381,7 @@ sub_805C158: @ 805C158 movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0805C194: pop {r0} bx r0 @@ -40398,9 +40398,9 @@ dp01t_14_5_move_menu_pokedude: @ 805C1A8 ands r0, r1 cmp r0, 0 beq _0805C1EC - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 movs r1, 0xA6 @@ -40408,7 +40408,7 @@ dp01t_14_5_move_menu_pokedude: @ 805C1A8 adds r0, r1 movs r1, 0x8 strb r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -40417,8 +40417,8 @@ dp01t_14_5_move_menu_pokedude: @ 805C1A8 .pool _0805C1EC: bl sub_805C210 - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -40438,7 +40438,7 @@ sub_805C210: @ 805C210 movs r0, 0xFF strb r0, [r1] ldr r1, =gUnknown_020244B0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -40463,8 +40463,8 @@ sub_805C248: @ 805C248 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -40475,7 +40475,7 @@ sub_805C248: @ 805C248 strb r0, [r1] movs r3, 0 ldr r5, =gUnknown_0203CF00 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA _0805C276: adds r0, r3, r5 ldrb r1, [r2] @@ -40504,9 +40504,9 @@ sub_805C2AC: @ 805C2AC movs r3, 0 ldr r0, =gUnknown_0203CF00 mov r12, r0 - ldr r1, =gUnknown_02023064 + ldr r1, =gBattleBufferA mov r8, r1 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldr r7, =gBattleTypeFlags mov r6, r12 mov r5, r8 @@ -40539,7 +40539,7 @@ _0805C2C8: ands r0, r1 cmp r0, 0x2 beq _0805C330 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r3, 1 adds r0, r1 ldrb r1, [r0] @@ -40549,7 +40549,7 @@ _0805C2C8: movs r0, 0x1 mov r2, r12 bl dp01_build_cmdbuf_x22_a_three_bytes - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0805C3BC .pool _0805C330: @@ -40557,7 +40557,7 @@ _0805C330: movs r1, 0xFF bl CreateTask ldr r3, =gUnknown_03005D7C - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] adds r1, r3 movs r2, 0 @@ -40571,7 +40571,7 @@ _0805C330: adds r1, r0 lsls r1, 3 adds r1, r5 - ldr r5, =gUnknown_02023064 + ldr r5, =gBattleBufferA lsls r2, 9 adds r6, r5, 0x1 adds r2, r6 @@ -40579,7 +40579,7 @@ _0805C330: movs r0, 0xF ands r0, r2 strh r0, [r1, 0x8] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r1, [r3] adds r1, 0x49 ldrb r0, [r4] @@ -40612,7 +40612,7 @@ _0805C330: movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -40644,7 +40644,7 @@ sub_805C3EC: @ 805C3EC movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted add sp, 0x4 pop {r0} bx r0 @@ -40659,8 +40659,8 @@ sub_805C410: @ 805C410 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r0, =gActiveBank mov r9, r0 ldrb r1, [r0] lsls r1, 9 @@ -40684,7 +40684,7 @@ _0805C44A: ldr r0, =0x00007fff cmp r7, r0 beq _0805C4B4 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID mov r1, r9 ldrb r0, [r1] lsls r0, 1 @@ -40718,7 +40718,7 @@ _0805C44A: b _0805C4F2 .pool _0805C4B4: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID mov r2, r9 ldrb r0, [r2] lsls r0, 1 @@ -40747,8 +40747,8 @@ _0805C4B4: movs r2, 0 bl heathbar_draw_hp _0805C4F2: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -40767,8 +40767,8 @@ _0805C4F2: thumb_func_start sub_805C528 sub_805C528: @ 805C528 push {r4-r7,lr} - ldr r5, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r5, =gBattleBufferA + ldr r6, =gActiveBank ldrb r0, [r6] lsls r0, 9 adds r1, r5, 0x1 @@ -40784,7 +40784,7 @@ sub_805C528: @ 805C528 bl GetMonData cmp r0, 0x63 bls _0805C560 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0805C5AC .pool _0805C560: @@ -40817,7 +40817,7 @@ _0805C560: strh r4, [r1, 0xA] ldrb r0, [r6] strh r0, [r1, 0xC] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -40833,7 +40833,7 @@ _0805C5AC: thumb_func_start sub_805C5C4 sub_805C5C4: @ 805C5C4 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -40843,7 +40843,7 @@ sub_805C5C4: @ 805C5C4 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -40866,7 +40866,7 @@ sub_805C5C4: @ 805C5C4 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -40882,13 +40882,13 @@ _0805C618: thumb_func_start sub_805C63C sub_805C63C: @ 805C63C push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0805C68C - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -40913,7 +40913,7 @@ sub_805C63C: @ 805C63C lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -40932,9 +40932,9 @@ sub_805C6A4: @ 805C6A4 mov r6, r8 push {r6} sub sp, 0x4 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r8, r0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 1 add r0, r8 @@ -40945,7 +40945,7 @@ sub_805C6A4: @ 805C6A4 adds r0, r5 movs r1, 0x37 bl GetMonData - ldr r2, =gUnknown_02023064 + ldr r2, =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r2, 0x1 @@ -40962,8 +40962,8 @@ sub_805C6A4: @ 805C6A4 adds r0, r5 movs r1, 0x37 mov r2, sp - bl pokemon_setattr - bl dp01_tbl1_exec_completed + bl SetMonData + bl PlayerBufferExecCompleted add sp, 0x4 pop {r3} mov r8, r3 @@ -40976,7 +40976,7 @@ sub_805C6A4: @ 805C6A4 thumb_func_start sub_805C710 sub_805C710: @ 805C710 push {lr} - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_805C710 @@ -40984,8 +40984,8 @@ sub_805C710: @ 805C710 thumb_func_start sub_805C71C sub_805C71C: @ 805C71C push {r4,r5,lr} - ldr r3, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r2, 9 adds r0, r3, 0x1 @@ -41057,7 +41057,7 @@ _0805C78C: str r0, [r3, 0x8] ldr r0, [r3, 0x8] _0805C7B8: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4,r5} pop {r0} bx r0 @@ -41067,8 +41067,8 @@ _0805C7B8: thumb_func_start sub_805C7D0 sub_805C7D0: @ 805C7D0 push {lr} - ldr r2, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r0, =gActiveBank ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -41080,7 +41080,7 @@ sub_805C7D0: @ 805C7D0 lsls r1, 8 orrs r0, r1 bl song_play_for_text - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .pool @@ -41089,7 +41089,7 @@ sub_805C7D0: @ 805C7D0 thumb_func_start sub_805C800 sub_805C800: @ 805C800 push {lr} - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_805C800 @@ -41101,7 +41101,7 @@ sub_805C80C: @ 805C80C movs r1, 0 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_805C80C @@ -41113,7 +41113,7 @@ sub_805C820: @ 805C820 movs r1, 0 movs r2, 0 bl dp01_build_cmdbuf_x22_a_three_bytes - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_805C820 @@ -41124,7 +41124,7 @@ sub_805C834: @ 805C834 movs r0, 0x1 movs r1, 0 bl dp01_build_cmdbuf_x23_aa_0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_805C834 @@ -41135,7 +41135,7 @@ sub_805C848: @ 805C848 movs r0, 0x1 movs r1, 0 bl dp01_build_cmdbuf_x24_aa_0 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_805C848 @@ -41149,7 +41149,7 @@ sub_805C85C: @ 805C85C negs r0, r0 ands r0, r1 strb r0, [r2] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .pool @@ -41159,8 +41159,8 @@ sub_805C85C: @ 805C85C sub_805C878: @ 805C878 push {lr} ldr r3, =gUnknown_02022D0C - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -41174,7 +41174,7 @@ sub_805C878: @ 805C878 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .pool @@ -41188,7 +41188,7 @@ sub_805C8B0: @ 805C8B0 movs r0, 0x7F ands r0, r1 strb r0, [r2] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .pool @@ -41209,7 +41209,7 @@ sub_805C8C8: @ 805C8C8 ands r0, r2 orrs r0, r1 strb r0, [r3] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .pool @@ -41218,9 +41218,9 @@ sub_805C8C8: @ 805C8C8 thumb_func_start dp01t_29_1_blink dp01t_29_1_blink: @ 805C8F0 push {r4,lr} - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -41233,11 +41233,11 @@ dp01t_29_1_blink: @ 805C8F0 lsls r0, 29 cmp r0, 0 bge _0805C924 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0805C94E .pool _0805C924: - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -41251,7 +41251,7 @@ _0805C924: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -41267,7 +41267,7 @@ _0805C94E: thumb_func_start sub_805C960 sub_805C960: @ 805C960 push {lr} - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 thumb_func_end sub_805C960 @@ -41275,16 +41275,16 @@ sub_805C960: @ 805C960 thumb_func_start sub_805C96C sub_805C96C: @ 805C96C push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _0805C980 movs r3, 0xC0 _0805C980: - ldr r2, =gUnknown_02023064 + ldr r2, =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -41298,7 +41298,7 @@ _0805C980: lsls r1, r3, 24 asrs r1, 24 bl audio_play_and_stuff - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -41308,8 +41308,8 @@ _0805C980: thumb_func_start sub_805C9B0 sub_805C9B0: @ 805C9B0 push {r4,r5,lr} - ldr r4, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -41342,7 +41342,7 @@ _0805C9EC: orrs r0, r1 bl fanfare_play _0805CA00: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4,r5} pop {r0} bx r0 @@ -41351,8 +41351,8 @@ _0805CA00: thumb_func_start sub_805CA0C sub_805CA0C: @ 805CA0C push {lr} - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -41369,7 +41369,7 @@ sub_805CA0C: @ 805CA0C negs r1, r1 movs r2, 0x5 bl sub_80A32E4 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .pool @@ -41378,8 +41378,8 @@ sub_805CA0C: @ 805CA0C thumb_func_start dp01t_2E_1_battle_intro dp01t_2E_1_battle_intro: @ 805CA4C push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -41391,7 +41391,7 @@ dp01t_2E_1_battle_intro: @ 805CA4C movs r1, 0x1 orrs r0, r1 strh r0, [r2] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .pool @@ -41400,15 +41400,15 @@ dp01t_2E_1_battle_intro: @ 805CA4C thumb_func_start dp01t_2F_1_pokemon_enter dp01t_2F_1_pokemon_enter: @ 805CA80 push {r4-r7,lr} - ldr r6, =gUnknown_020241E4 - ldr r7, =gUnknown_02024064 + ldr r6, =gBankSpriteIds + ldr r7, =gActiveBank ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r7] @@ -41545,7 +41545,7 @@ _0805CBA2: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -41573,7 +41573,7 @@ sub_805CC00: @ 805CC00 bl FreeObjectPaletteByTag adds r0, r5, 0 bl RemoveObjectAndFreeTiles - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -41583,13 +41583,13 @@ sub_805CC00: @ 805CC00 adds r0, r1 adds r1, r4, 0 bl sub_805DD7C - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r4, r0 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectImageAnim @@ -41623,7 +41623,7 @@ task05_08033660: @ 805CC68 b _0805CD50 .pool _0805CC94: - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -41639,12 +41639,12 @@ _0805CC94: cmp r0, 0 beq _0805CCE4 _0805CCB4: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -41655,12 +41655,12 @@ _0805CCB4: b _0805CD38 .pool _0805CCE4: - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -41695,8 +41695,8 @@ _0805CCE4: eors r0, r6 strb r0, [r7] _0805CD38: - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -41719,8 +41719,8 @@ _0805CD50: thumb_func_start sub_805CD74 sub_805CD74: @ 805CD74 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -41729,17 +41729,17 @@ sub_805CD74: @ 805CD74 cmp r0, 0 beq _0805CDA4 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0805CDA4 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0805CE18 .pool _0805CDA4: ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -41789,7 +41789,7 @@ _0805CDA4: movs r1, 0x5D strb r1, [r0, 0x5] _0805CE0C: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -41807,7 +41807,7 @@ sub_805CE38: @ 805CE38 push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -41830,7 +41830,7 @@ sub_805CE38: @ 805CE38 adds r0, r2 movs r1, 0 strb r1, [r0, 0x5] - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted _0805CE70: pop {r4} pop {r0} @@ -41843,7 +41843,7 @@ sub_805CE80: @ 805CE80 push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -41866,7 +41866,7 @@ sub_805CE80: @ 805CE80 ldr r1, =sub_8073C30 str r1, [r0] _0805CEB2: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r0} bx r0 .pool @@ -41875,14 +41875,14 @@ _0805CEB2: thumb_func_start sub_805CED0 sub_805CED0: @ 805CED0 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free ldrb r0, [r4] movs r1, 0 bl dp11b_obj_free - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -41892,14 +41892,14 @@ sub_805CED0: @ 805CED0 thumb_func_start dp01t_33_1_enemy_move dp01t_33_1_enemy_move: @ 805CEF4 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _0805CF3A - ldr r3, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r0, =gBankSpriteIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -41907,7 +41907,7 @@ dp01t_33_1_enemy_move: @ 805CEF4 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -41925,7 +41925,7 @@ dp01t_33_1_enemy_move: @ 805CEF4 ldrb r0, [r4] bl sub_805E408 _0805CF3A: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -41936,13 +41936,13 @@ _0805CF3A: sub_805CF54: @ 805CF54 push {r4-r6,lr} sub sp, 0x4 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0805CFB6 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r2, [r5] lsls r1, r2, 9 adds r0, r4, 0x1 @@ -41964,11 +41964,11 @@ sub_805CF54: @ 805CF54 lsls r0, 24 cmp r0, 0 beq _0805CFA4 - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted b _0805CFB0 .pool _0805CFA4: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -41988,7 +41988,7 @@ _0805CFB6: thumb_func_start dp01t_35_1_link_standby_message_and_free_vram dp01t_35_1_link_standby_message_and_free_vram: @ 805CFC8 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 9 ldr r4, =gUnknown_02023066 @@ -42014,7 +42014,7 @@ _0805CFF8: _0805CFFE: bl b_link_standby_message _0805D002: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free @@ -42026,7 +42026,7 @@ _0805D002: _0805D01C: bl b_link_standby_message _0805D020: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4,r5} pop {r0} bx r0 @@ -42035,8 +42035,8 @@ _0805D020: thumb_func_start sub_805D02C sub_805D02C: @ 805D02C push {r4,lr} - ldr r1, =gUnknown_02023064 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r4, =gActiveBank ldrb r3, [r4] lsls r0, r3, 9 adds r1, 0x1 @@ -42075,7 +42075,7 @@ _0805D07E: movs r1, 0 strb r1, [r0] _0805D084: - bl dp01_tbl1_exec_completed + bl PlayerBufferExecCompleted pop {r4} pop {r0} bx r0 @@ -42085,13 +42085,13 @@ _0805D084: thumb_func_start sub_805D094 sub_805D094: @ 805D094 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 9 ldr r4, =gUnknown_02023068 adds r0, r4 bl sub_81851A8 - ldr r2, =gUnknown_0202433A + ldr r2, =gBattleOutcome ldrb r0, [r5] lsls r0, 9 subs r1, r4, 0x3 @@ -42120,8 +42120,8 @@ sub_805D094: @ 805D094 bl sub_80A2F50 movs r0, 0x3 bl BeginFastPaletteFade - bl dp01_tbl1_exec_completed - ldr r1, =gUnknown_03005D60 + bl PlayerBufferExecCompleted + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -42210,7 +42210,7 @@ sub_805D19C: @ 805D19C movs r0, 0x1 negs r0, r0 mov r9, r0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] lsls r2, r0, 9 ldr r1, =gUnknown_02023068 @@ -42229,7 +42229,7 @@ sub_805D19C: @ 805D19C bl __umodsi3 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0x92 ldrb r1, [r0] @@ -42253,7 +42253,7 @@ _0805D20C: _0805D20E: cmp r4, r5 bge _0805D234 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -42311,7 +42311,7 @@ _0805D26E: _0805D27C: cmp r6, 0 beq _0805D2AC - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r1, [r3] adds r1, 0x92 ldrb r2, [r1] @@ -42491,8 +42491,8 @@ _0805D3D4: cmp r0, 0x31 bls _0805D40C _0805D3EA: - ldr r2, =gUnknown_0202433C - ldr r0, =gUnknown_02024064 + ldr r2, =gProtectStructs + ldr r0, =gActiveBank ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -42537,7 +42537,7 @@ _0805D442: ands r0, r5 cmp r0, 0 beq _0805D45C - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 8 b _0805D48A @@ -42553,15 +42553,15 @@ _0805D45C: mov r9, r2 b _0805D490 _0805D470: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 movs r2, 0x1 movs r0, 0x1 ands r0, r1 eors r0, r2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 16 _0805D48A: @@ -42705,14 +42705,14 @@ sub_805D5F4: @ 805D5F4 ands r0, r1 cmp r0, 0 beq _0805D6FA - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0805D630 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -42721,13 +42721,13 @@ sub_805D5F4: @ 805D5F4 .pool _0805D630: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 mov r8, r0 movs r0, 0x2 _0805D63E: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 ldr r1, =gBattleMons @@ -42744,7 +42744,7 @@ _0805D63E: bne _0805D680 bl Random adds r3, r0, 0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r2, 0x1 movs r0, 0x1 @@ -42757,7 +42757,7 @@ _0805D63E: .pool _0805D680: ldr r4, =gUnknown_0831C604 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank mov r9, r0 ldrb r0, [r0] muls r0, r2 @@ -42818,7 +42818,7 @@ _0805D6DE: lsrs r0, 16 b _0805D704 _0805D6FA: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r0, 0x1 eors r0, r1 @@ -42841,7 +42841,7 @@ sub_805D714: @ 805D714 ldrh r1, [r4, 0x30] lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -42974,7 +42974,7 @@ move_anim_start_t2_for_situation: @ 805D808 lsls r0, 24 ldr r6, =gUnknown_020244D0 ldr r1, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r3, [r1, 0x4] lsls r1, r2, 1 @@ -43167,8 +43167,8 @@ _0805D980: beq _0805D9CC cmp r5, 0x2 bne _0805D9CC - ldr r1, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r1, =gSprites + ldr r0, =gBankSpriteIds adds r0, r6, r0 ldrb r2, [r0] lsls r0, r2, 4 @@ -43418,7 +43418,7 @@ mplay_80342A4: @ 805DB90 adds r1, 0x1 strb r1, [r0, 0x8] ldr r2, [r2] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -43499,7 +43499,7 @@ _0805DC58: bl GetMonData mov r10, r0 mov r0, r8 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsls r2, r5, 3 ldr r1, =gMonFrontPicTable @@ -43559,7 +43559,7 @@ _0805DCC6: movs r7, 0x80 lsls r7, 1 add r7, r9 - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r1, [r5] movs r4, 0x80 lsls r4, 1 @@ -43652,7 +43652,7 @@ _0805DDC8: bl GetMonData str r0, [sp, 0x4] mov r0, r8 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r7, r0, 24 movs r0, 0x1 @@ -43744,7 +43744,7 @@ _0805DE7E: movs r7, 0x80 lsls r7, 1 add r7, r9 - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r1, [r5] movs r4, 0x80 lsls r4, 1 @@ -43812,7 +43812,7 @@ sub_805DF38: @ 805DF38 lsrs r4, 16 lsls r0, 24 lsrs r0, 24 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsls r4, 3 ldr r2, =gTrainerFrontPicTable @@ -43846,7 +43846,7 @@ sub_805DF84: @ 805DF84 lsls r4, 24 lsrs r4, 24 adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsls r5, 3 ldr r2, =gTrainerBackPicTable @@ -43934,7 +43934,7 @@ _0805E056: movs r4, 0 cmp r4, r5 bcs _0805E076 - ldr r7, =gUnknown_02024076 + ldr r7, =gBanksBySide ldr r6, =gUnknown_0832C108 _0805E060: adds r0, r4, r7 @@ -44007,14 +44007,14 @@ _0805E0F0: _0805E100: cmp r4, 0x4 bne _0805E110 - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide ldrb r0, [r0] b _0805E198 .pool _0805E110: cmp r4, 0x5 bne _0805E1AC - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide ldrb r0, [r0, 0x1] b _0805E198 .pool @@ -44049,28 +44049,28 @@ _0805E150: _0805E160: cmp r4, 0x6 bne _0805E170 - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide ldrb r0, [r0] b _0805E198 .pool _0805E170: cmp r4, 0x7 bne _0805E180 - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide ldrb r0, [r0, 0x1] b _0805E198 .pool _0805E180: cmp r4, 0x8 bne _0805E190 - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide ldrb r0, [r0, 0x2] b _0805E198 .pool _0805E190: cmp r5, 0x9 bne _0805E1AC - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide ldrb r0, [r0, 0x3] _0805E198: lsls r0, 3 @@ -44171,7 +44171,7 @@ _0805E252: _0805E260: ldrb r0, [r4] bl sub_8072B18 - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -44194,7 +44194,7 @@ _0805E288: .pool _0805E29C: ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0805E2E4 @@ -44208,7 +44208,7 @@ _0805E29C: ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -44225,7 +44225,7 @@ _0805E2E4: ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -44245,7 +44245,7 @@ _0805E30E: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -44313,11 +44313,11 @@ sub_805E394: @ 805E394 mov r6, r8 push {r6,r7} movs r4, 0 - ldr r5, =gUnknown_0202406C + ldr r5, =gNoOfAllBanks ldrb r0, [r5] cmp r4, r0 bge _0805E3EA - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r9, r0 movs r0, 0x1 mov r12, r0 @@ -44325,7 +44325,7 @@ sub_805E394: @ 805E394 negs r0, r0 mov r8, r0 ldr r7, =gUnknown_020244D0 - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds _0805E3B8: ldr r0, [r7] ldr r0, [r0] @@ -44371,8 +44371,8 @@ sub_805E408: @ 805E408 ldr r1, [r1] lsls r3, r0, 2 adds r3, r1 - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -44409,13 +44409,13 @@ sub_805E448: @ 805E448 lsls r2, 24 cmp r2, 0 beq _0805E51C - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r5, r7, r0 ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 add r0, r8 ldr r4, =gUnknown_020244D0 @@ -44428,7 +44428,7 @@ sub_805E448: @ 805E448 lsls r2, 17 adds r0, r2 lsrs r6, r0, 16 - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r4] ldr r0, [r0, 0x8] ldrh r1, [r0] @@ -44505,17 +44505,17 @@ _0805E51C: .pool _0805E558: adds r0, r7, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 mov r10, r0 ldr r0, [sp] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0805E58C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r2, [sp] lsls r0, r2, 1 adds r0, r1 @@ -44526,7 +44526,7 @@ _0805E558: b _0805E59C .pool _0805E58C: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r3, [sp] lsls r0, r3, 1 adds r0, r1 @@ -44542,11 +44542,11 @@ _0805E59C: lsrs r0, 16 mov r8, r0 adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0805E618 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r4, r7, 1 adds r4, r0 ldrh r0, [r4] @@ -44584,7 +44584,7 @@ _0805E5FA: b _0805E662 .pool _0805E618: - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r4, r7, 1 adds r4, r0 ldrh r0, [r4] @@ -44626,14 +44626,14 @@ _0805E662: adds r0, 0x4 adds r0, r1 ldr r2, [r0] - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r7 mov r10, r0 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites adds r0, r3 ldrh r0, [r0, 0x4] lsls r0, 22 @@ -44671,7 +44671,7 @@ _0805E662: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r1, 0x8 adds r0, r1 ldr r1, =gUnknown_08309AAC @@ -44680,7 +44680,7 @@ _0805E662: adds r1, r2 ldr r1, [r1] str r1, [r0] - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r1, [r5] movs r4, 0x80 lsls r4, 1 @@ -44736,7 +44736,7 @@ _0805E74A: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r1, r2 lsls r0, 24 lsrs r0, 24 @@ -44780,7 +44780,7 @@ sub_805E7DC: @ 805E7DC b _0805E802 _0805E7F8: adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r4, r0, 24 _0805E802: @@ -44793,7 +44793,7 @@ _0805E802: .pool _0805E814: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0805E83C @@ -44852,11 +44852,11 @@ _0805E898: cmp r0, 0 bne _0805E8E6 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0805E8D0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -44869,7 +44869,7 @@ _0805E898: b _0805E8E6 .pool _0805E8D0: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -44903,7 +44903,7 @@ refresh_graphics_maybe: @ 805E8F4 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 ldr r0, =gUnknown_020244E4 adds r0, r6, r0 @@ -45074,7 +45074,7 @@ _0805EA5A: sub_805EA60: @ 805EA60 push {r4-r6,lr} movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 ldr r5, =gUnknown_020244D0 @@ -45153,16 +45153,16 @@ sub_805EAE8: @ 805EAE8 cmp r0, 0 beq _0805EB7E movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 mov r8, r0 movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID mov r1, r8 lsls r0, r1, 1 adds r0, r5 @@ -45228,7 +45228,7 @@ sub_805EB9C: @ 805EB9C lsrs r0, 24 mov r8, r0 movs r5, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 bge _0805EC6C @@ -45248,8 +45248,8 @@ _0805EBC8: lsls r0, 24 cmp r0, 0 beq _0805EC60 - ldr r4, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r4, =gSprites + ldr r0, =gBankSpriteIds adds r3, r5, r0 ldrb r1, [r3] lsls r0, r1, 4 @@ -45313,7 +45313,7 @@ _0805EC3C: _0805EC60: adds r6, 0xC adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _0805EBC8 @@ -45336,7 +45336,7 @@ sub_805EC84: @ 805EC84 ldr r0, =gUnknown_0831C6A0 bl LoadCompressedObjectPic movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -45370,7 +45370,7 @@ sub_805EC84: @ 805EC84 lsls r1, 2 adds r2, r1, r2 strb r0, [r2, 0x7] - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r0, [r6] ldr r0, [r0, 0x4] adds r1, r0 @@ -45385,7 +45385,7 @@ sub_805EC84: @ 805EC84 cmp r0, 0 beq _0805ED56 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 @@ -45446,13 +45446,13 @@ sub_805ED70: @ 805ED70 ldrh r0, [r5, 0x2E] lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r7, r0, r1 adds r6, r7, 0 adds r6, 0x3E @@ -45560,7 +45560,7 @@ sub_805EE54: @ 805EE54 lsls r1, 16 lsrs r5, r1, 16 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0805EED0 @@ -45579,7 +45579,7 @@ _0805EE7E: ldrb r0, [r0] cmp r0, 0 beq _0805EEB4 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, [r3, 0x4] lsls r0, r4, 1 adds r0, r4 @@ -45595,7 +45595,7 @@ _0805EE7E: b _0805EECE .pool _0805EEB4: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, [r3, 0x4] lsls r0, r6, 1 adds r0, r6 @@ -45621,7 +45621,7 @@ _0805EED0: sub_805EEE0: @ 805EEE0 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gUnknown_020244D0 ldr r1, [r1] ldr r3, [r1, 0x4] @@ -45952,8 +45952,8 @@ nullsub_26: @ 805F160 thumb_func_start sub_805F164 sub_805F164: @ 805F164 - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -45966,9 +45966,9 @@ sub_805F164: @ 805F164 thumb_func_start bx_exec_buffer_A_ch0_tbl7 bx_exec_buffer_A_ch0_tbl7: @ 805F180 push {lr} - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -45977,7 +45977,7 @@ bx_exec_buffer_A_ch0_tbl7: @ 805F180 ands r1, r0 cmp r1, 0 beq _0805F1CC - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] @@ -46001,9 +46001,9 @@ _0805F1CC: thumb_func_start sub_805F1D0 sub_805F1D0: @ 805F1D0 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -46026,9 +46026,9 @@ _0805F1F4: thumb_func_start sub_805F208 sub_805F208: @ 805F208 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -46051,9 +46051,9 @@ _0805F22C: thumb_func_start sub_805F240 sub_805F240: @ 805F240 push {r4-r6,lr} - ldr r5, =gUnknown_02020630 - ldr r6, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r5, =gSprites + ldr r6, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -46099,7 +46099,7 @@ sub_805F2A8: @ 805F2A8 push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r1, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -46162,9 +46162,9 @@ _0805F31E: cmp r0, 0 beq _0805F368 _0805F32C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gUnknown_03005D70 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -46184,9 +46184,9 @@ _0805F34E: b _0805F3A2 .pool _0805F368: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r6, =gUnknown_03005D70 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r4, [r2] adds r0, r4, r6 ldrb r1, [r0] @@ -46219,7 +46219,7 @@ _0805F3A2: ldr r1, =gUnknown_020244D0 mov r8, r1 ldr r2, [r1] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r1, [r7] lsls r0, r1, 1 adds r0, r1 @@ -46333,7 +46333,7 @@ _0805F494: cmp r0, 0 beq _0805F53C adds r0, r2, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -46362,7 +46362,7 @@ _0805F494: _0805F4E4: mov r1, r8 ldr r0, [r1] - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -46375,7 +46375,7 @@ _0805F4E4: strb r0, [r1] mov r1, r8 ldr r0, [r1] - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -46390,7 +46390,7 @@ _0805F4E4: _0805F51A: ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -46399,7 +46399,7 @@ _0805F51A: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r3] lsls r0, 2 adds r0, r1 @@ -46429,7 +46429,7 @@ sub_805F560: @ 805F560 mov r10, r0 ldr r5, =gUnknown_020244D0 ldr r0, [r5] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -46443,7 +46443,7 @@ sub_805F560: @ 805F560 ands r0, r1 cmp r0, 0 bne _0805F5A6 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -46478,7 +46478,7 @@ _0805F5A6: ands r0, r1 cmp r0, 0 bne _0805F5EE - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 @@ -46490,7 +46490,7 @@ _0805F5A6: _0805F5EE: ldr r2, =gUnknown_020244D0 ldr r0, [r2] - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank mov r8, r1 ldrb r4, [r1] ldr r5, [r0, 0x4] @@ -46539,7 +46539,7 @@ _0805F5EE: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -46561,11 +46561,11 @@ _0805F5EE: bl sub_80729D0 _0805F684: ldr r5, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -46584,7 +46584,7 @@ _0805F684: _0805F6B4: ldr r3, =gUnknown_020244D0 ldr r2, [r3] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -46599,7 +46599,7 @@ _0805F6B4: _0805F6D0: mov r1, r9 ldr r0, [r1] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -46646,7 +46646,7 @@ _0805F6D0: cmp r0, 0x42 bne _0805F768 adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -46664,7 +46664,7 @@ _0805F768: _0805F774: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -46693,9 +46693,9 @@ _0805F792: cmp r0, 0 beq _0805F810 _0805F7B2: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D7C - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r4, [r1] adds r0, r4, r0 ldrb r1, [r0] @@ -46708,7 +46708,7 @@ _0805F7B2: ldr r0, =DummyObjectCallback cmp r3, r0 bne _0805F86E - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -46723,9 +46723,9 @@ _0805F7B2: b _0805F86E .pool _0805F810: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r7, =gUnknown_03005D7C - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] adds r0, r3, r7 ldrb r1, [r0] @@ -46738,7 +46738,7 @@ _0805F810: ldr r0, =DummyObjectCallback cmp r4, r0 bne _0805F86E - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -46788,7 +46788,7 @@ _0805F86E: cmp r0, 0 bne _0805F8D2 ldr r1, =gUnknown_03005D7C - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -46797,12 +46797,12 @@ _0805F86E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldrb r0, [r5] eors r4, r0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -46819,18 +46819,18 @@ _0805F86E: bl sub_805EE54 _0805F8D2: ldr r1, =gUnknown_03005D7C - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldrb r5, [r4] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -46876,7 +46876,7 @@ _0805F8D2: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -46897,9 +46897,9 @@ _0805F958: thumb_func_start sub_805F994 sub_805F994: @ 805F994 push {r4,r5,lr} - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 - ldr r1, =gUnknown_02024064 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds + ldr r1, =gActiveBank ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -46924,7 +46924,7 @@ sub_805F994: @ 805F994 ands r0, r1 cmp r0, 0 bne _0805F9E0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 @@ -46934,9 +46934,9 @@ sub_805F994: @ 805F994 adds r0, r3, 0 bl sub_8172EF0 _0805F9E0: - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 - ldr r5, =gUnknown_02024064 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds + ldr r5, =gActiveBank ldrb r3, [r5] adds r0, r3, r0 ldrb r1, [r0] @@ -46993,7 +46993,7 @@ _0805FA48: thumb_func_start sub_805FA70 sub_805FA70: @ 805FA70 push {r4-r6,lr} - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] ldr r5, =gUnknown_03005D70 adds r1, r0, r5 @@ -47032,9 +47032,9 @@ _0805FABC: thumb_func_start sub_805FAC4 sub_805FAC4: @ 805FAC4 push {lr} - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 - ldr r1, =gUnknown_02024064 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds + ldr r1, =gActiveBank ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -47063,7 +47063,7 @@ sub_805FB08: @ 805FB08 push {r4-r6,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -47075,13 +47075,13 @@ sub_805FB08: @ 805FB08 ands r0, r1 cmp r0, 0 bne _0805FB62 - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -47124,12 +47124,12 @@ _0805FB8E: thumb_func_start bx_blink_t7 bx_blink_t7: @ 805FB94 push {r4,lr} - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -47147,7 +47147,7 @@ bx_blink_t7: @ 805FB94 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r3, [r0] bl dp01_tbl7_exec_completed b _0805FC0A @@ -47184,9 +47184,9 @@ _0805FC0A: thumb_func_start sub_805FC10 sub_805FC10: @ 805FC10 push {r4,lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -47215,7 +47215,7 @@ sub_805FC10: @ 805FC10 movs r3, 0x6 bl move_anim_start_t4 _0805FC50: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -47233,7 +47233,7 @@ bx_803AEDC: @ 805FC80 push {r4,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -47249,8 +47249,8 @@ bx_803AEDC: @ 805FC80 lsls r0, 24 cmp r0, 0 bne _0805FCDA - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -47285,7 +47285,7 @@ sub_805FD00: @ 805FD00 push {r4-r7,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -47297,8 +47297,8 @@ sub_805FD00: @ 805FD00 ands r0, r1 cmp r0, 0 beq _0805FDBC - ldr r7, =gUnknown_02020630 - ldr r6, =gUnknown_020241E4 + ldr r7, =gSprites + ldr r6, =gBankSpriteIds adds r0, r2, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -47345,7 +47345,7 @@ sub_805FD00: @ 805FD00 ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -47363,7 +47363,7 @@ sub_805FD00: @ 805FD00 bl sub_80729D0 ldrb r0, [r5] bl sub_805E408 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -47381,7 +47381,7 @@ sub_805FDF0: @ 805FDF0 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -47393,7 +47393,7 @@ sub_805FDF0: @ 805FDF0 ands r0, r1 cmp r0, 0 bne _0805FE22 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -47403,7 +47403,7 @@ sub_805FDF0: @ 805FDF0 adds r0, r2, 0 bl sub_8172EF0 _0805FE22: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, =gUnknown_03005D7C ldrb r2, [r5] adds r0, r2, r0 @@ -47432,7 +47432,7 @@ _0805FE22: adds r0, r3, r4 bl RemoveObjectAndFreeTiles ldrb r4, [r5] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -47447,7 +47447,7 @@ _0805FE22: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -47465,7 +47465,7 @@ sub_805FEB8: @ 805FEB8 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -47489,7 +47489,7 @@ bx_803B0F4: @ 805FEE8 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -47512,8 +47512,8 @@ _0805FF0A: dp01_tbl7_exec_completed: @ 805FF18 push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -47531,8 +47531,8 @@ dp01_tbl7_exec_completed: @ 805FF18 movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably - ldr r1, =gUnknown_02023064 + bl PrepareBufferDataTransferLink + ldr r1, =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -47541,7 +47541,7 @@ dp01_tbl7_exec_completed: @ 805FF18 b _0805FF7E .pool _0805FF6C: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -47563,8 +47563,8 @@ dp01t_00_7_getattr: @ 805FF90 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -47572,7 +47572,7 @@ dp01t_00_7_getattr: @ 805FF90 ldrb r0, [r1] cmp r0, 0 bne _0805FFC8 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -47625,8 +47625,8 @@ sub_8060004: @ 8060004 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, =gUnknown_02023064 - ldr r3, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -48495,8 +48495,8 @@ _0806079A: dp01t_01_2_read_pokmon_data_slice: @ 80607B0 push {r4-r7,lr} sub sp, 0x58 - ldr r2, =gUnknown_0202406E - ldr r5, =gUnknown_02024064 + ldr r2, =gBattlePartyID + ldr r5, =gActiveBank ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -48504,7 +48504,7 @@ dp01t_01_2_read_pokmon_data_slice: @ 80607B0 movs r0, 0x64 adds r4, r2, 0 muls r4, r0 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA lsls r1, 9 adds r0, r3, 0x1 adds r0, r1, r0 @@ -48558,8 +48558,8 @@ _08060806: thumb_func_start dp01t_02_7_setattr dp01t_02_7_setattr: @ 8060838 push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -48567,7 +48567,7 @@ dp01t_02_7_setattr: @ 8060838 ldrb r0, [r1] cmp r0, 0 bne _08060868 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -48608,7 +48608,7 @@ sub_8060890: @ 8060890 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 ldr r2, =gUnknown_02023067 @@ -48700,12 +48700,12 @@ _080609C4: adds r0, r4, 0 movs r1, 0xB adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData adds r2, r7, 0 adds r2, 0x2E adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r0, 0 mov r8, r0 movs r0, 0x3B @@ -48746,12 +48746,12 @@ _08060A2A: adds r1, 0xD mov r0, r9 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 mov r0, r9 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -48767,15 +48767,15 @@ _08060A2A: adds r0, r4, 0 movs r1, 0x15 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x20] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x19 ldr r2, [sp, 0x28] - bl pokemon_setattr + bl SetMonData ldrb r0, [r7, 0x14] lsls r0, 27 lsrs r0, 27 @@ -48784,7 +48784,7 @@ _08060A2A: adds r0, r4, 0 movs r1, 0x27 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r7, 0x14] lsls r0, 22 @@ -48793,7 +48793,7 @@ _08060A2A: adds r0, r4, 0 movs r1, 0x28 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r7, 0x15] lsls r0, 25 @@ -48802,7 +48802,7 @@ _08060A2A: adds r0, r4, 0 movs r1, 0x29 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldr r0, [r7, 0x14] lsls r0, 12 @@ -48811,7 +48811,7 @@ _08060A2A: adds r0, r4, 0 movs r1, 0x2A mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r7, 0x16] lsls r0, 23 @@ -48820,7 +48820,7 @@ _08060A2A: adds r0, r4, 0 movs r1, 0x2B mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r7, 0x17] lsls r0, 26 @@ -48829,47 +48829,47 @@ _08060A2A: adds r0, r4, 0 movs r1, 0x2C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0 ldr r2, [sp, 0x2C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x37 ldr r2, [sp, 0x30] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 ldr r2, [sp, 0x18] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A ldr r2, [sp, 0x24] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3B ldr r2, [sp, 0x4] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C ldr r2, [sp, 0x8] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D ldr r2, [sp, 0xC] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E ldr r2, [sp, 0x10] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F ldr r2, [sp, 0x14] - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060B5C: @@ -48881,7 +48881,7 @@ _08060B5C: lsls r2, 9 adds r2, r3 movs r1, 0xB - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060B78: @@ -48893,7 +48893,7 @@ _08060B78: lsls r2, 9 adds r2, r3 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060B94: @@ -48914,12 +48914,12 @@ _08060BAC: adds r1, 0xD adds r0, r7, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 adds r0, r7, 0 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -48933,7 +48933,7 @@ _08060BAC: adds r0, r1 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060BE8: @@ -48941,7 +48941,7 @@ _08060BE8: muls r0, r5 ldr r1, =gEnemyParty adds r0, r1 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -48962,7 +48962,7 @@ _08060C08: adds r0, r4, 0 movs r1, 0x11 str r3, [sp, 0x34] - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -48970,7 +48970,7 @@ _08060C08: adds r2, r0 adds r0, r4, 0 movs r1, 0x12 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -48978,7 +48978,7 @@ _08060C08: adds r2, r0 adds r0, r4, 0 movs r1, 0x13 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -48986,7 +48986,7 @@ _08060C08: adds r2, r0 adds r0, r4, 0 movs r1, 0x14 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -48994,7 +48994,7 @@ _08060C08: adds r2, r0 adds r0, r4, 0 movs r1, 0x15 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060C70: @@ -49002,7 +49002,7 @@ _08060C70: muls r0, r5 ldr r1, =gEnemyParty adds r0, r1 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -49012,7 +49012,7 @@ _08060C70: _08060C86: adds r3, 0x3 adds r2, r3 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060C98: @@ -49024,7 +49024,7 @@ _08060C98: lsls r2, 9 adds r2, r3 movs r1, 0x1 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060CB4: @@ -49036,7 +49036,7 @@ _08060CB4: lsls r2, 9 adds r2, r3 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060CD0: @@ -49048,7 +49048,7 @@ _08060CD0: lsls r2, 9 adds r2, r3 movs r1, 0x1A - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060CEC: @@ -49060,7 +49060,7 @@ _08060CEC: lsls r2, 9 adds r2, r3 movs r1, 0x1B - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060D08: @@ -49072,7 +49072,7 @@ _08060D08: lsls r2, 9 adds r2, r3 movs r1, 0x1C - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060D24: @@ -49084,7 +49084,7 @@ _08060D24: lsls r2, 9 adds r2, r3 movs r1, 0x1D - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060D40: @@ -49096,7 +49096,7 @@ _08060D40: lsls r2, 9 adds r2, r3 movs r1, 0x1E - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060D5C: @@ -49108,7 +49108,7 @@ _08060D5C: lsls r2, 9 adds r2, r3 movs r1, 0x1F - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060D78: @@ -49120,7 +49120,7 @@ _08060D78: lsls r2, 9 adds r2, r3 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060D94: @@ -49132,7 +49132,7 @@ _08060D94: lsls r2, 9 adds r2, r3 movs r1, 0x22 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060DB0: @@ -49144,7 +49144,7 @@ _08060DB0: lsls r2, 9 adds r2, r3 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060DCC: @@ -49156,7 +49156,7 @@ _08060DCC: lsls r2, 9 adds r2, r3 movs r1, 0x24 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060DE8: @@ -49168,7 +49168,7 @@ _08060DE8: lsls r2, 9 adds r2, r3 movs r1, 0x25 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060E04: @@ -49180,7 +49180,7 @@ _08060E04: lsls r2, 9 adds r2, r3 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060E20: @@ -49195,7 +49195,7 @@ _08060E20: adds r0, r4, 0 movs r1, 0x27 str r3, [sp, 0x34] - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -49203,7 +49203,7 @@ _08060E20: adds r2, r0 adds r0, r4, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -49211,7 +49211,7 @@ _08060E20: adds r2, r0 adds r0, r4, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -49219,7 +49219,7 @@ _08060E20: adds r2, r0 adds r0, r4, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -49227,7 +49227,7 @@ _08060E20: adds r2, r0 adds r0, r4, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -49245,7 +49245,7 @@ _08060E94: lsls r2, 9 adds r2, r3 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060EB0: @@ -49257,7 +49257,7 @@ _08060EB0: lsls r2, 9 adds r2, r3 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060ECC: @@ -49269,7 +49269,7 @@ _08060ECC: lsls r2, 9 adds r2, r3 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060EE8: @@ -49281,7 +49281,7 @@ _08060EE8: lsls r2, 9 adds r2, r3 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060F04: @@ -49293,7 +49293,7 @@ _08060F04: lsls r2, 9 adds r2, r3 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060F20: @@ -49306,7 +49306,7 @@ _08060F20: adds r2, r3 _08060F2E: movs r1, 0x2C - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060F3C: @@ -49318,7 +49318,7 @@ _08060F3C: lsls r2, 9 adds r2, r3 movs r1, 0 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060F58: @@ -49330,7 +49330,7 @@ _08060F58: lsls r2, 9 adds r2, r3 movs r1, 0x9 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060F74: @@ -49342,7 +49342,7 @@ _08060F74: lsls r2, 9 adds r2, r3 movs r1, 0x37 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060F90: @@ -49354,7 +49354,7 @@ _08060F90: lsls r2, 9 adds r2, r3 movs r1, 0x38 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060FAC: @@ -49366,7 +49366,7 @@ _08060FAC: lsls r2, 9 adds r2, r3 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060FC8: @@ -49378,7 +49378,7 @@ _08060FC8: lsls r2, 9 adds r2, r3 movs r1, 0x3A - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08060FE4: @@ -49390,7 +49390,7 @@ _08060FE4: lsls r2, 9 adds r2, r3 movs r1, 0x3B - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08061000: @@ -49402,7 +49402,7 @@ _08061000: lsls r2, 9 adds r2, r3 movs r1, 0x3C - bl pokemon_setattr + bl SetMonData b _0806119C .pool _0806101C: @@ -49414,7 +49414,7 @@ _0806101C: lsls r2, 9 adds r2, r3 movs r1, 0x3D - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08061038: @@ -49426,7 +49426,7 @@ _08061038: lsls r2, 9 adds r2, r3 movs r1, 0x3E - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08061054: @@ -49438,7 +49438,7 @@ _08061054: lsls r2, 9 adds r2, r3 movs r1, 0x3F - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08061070: @@ -49450,7 +49450,7 @@ _08061070: lsls r2, 9 adds r2, r3 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _0806108C: @@ -49462,7 +49462,7 @@ _0806108C: lsls r2, 9 adds r2, r3 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _080610A8: @@ -49474,7 +49474,7 @@ _080610A8: lsls r2, 9 adds r2, r3 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _080610C4: @@ -49486,7 +49486,7 @@ _080610C4: lsls r2, 9 adds r2, r3 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _080610E0: @@ -49498,7 +49498,7 @@ _080610E0: lsls r2, 9 adds r2, r3 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData b _0806119C .pool _080610FC: @@ -49510,7 +49510,7 @@ _080610FC: lsls r2, 9 adds r2, r3 movs r1, 0x30 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08061118: @@ -49522,7 +49522,7 @@ _08061118: lsls r2, 9 adds r2, r3 movs r1, 0x32 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08061134: @@ -49534,7 +49534,7 @@ _08061134: lsls r2, 9 adds r2, r3 movs r1, 0x33 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08061150: @@ -49546,7 +49546,7 @@ _08061150: lsls r2, 9 adds r2, r3 movs r1, 0x34 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _0806116C: @@ -49558,7 +49558,7 @@ _0806116C: lsls r2, 9 adds r2, r3 movs r1, 0x35 - bl pokemon_setattr + bl SetMonData b _0806119C .pool _08061188: @@ -49570,7 +49570,7 @@ _08061188: lsls r2, 9 adds r2, r3 movs r1, 0x36 - bl pokemon_setattr + bl SetMonData _0806119C: add sp, 0x38 pop {r3-r5} @@ -49586,8 +49586,8 @@ _0806119C: thumb_func_start sub_80611B0 sub_80611B0: @ 80611B0 push {r4-r7,lr} - ldr r1, =gUnknown_0202406E - ldr r7, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r7, =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -49595,7 +49595,7 @@ sub_80611B0: @ 80611B0 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -49645,10 +49645,10 @@ sub_8061224: @ 8061224 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] lsls r0, 1 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID adds r0, r1 ldrh r0, [r0] movs r7, 0x64 @@ -49664,14 +49664,14 @@ sub_8061224: @ 8061224 mov r8, r0 ldrb r1, [r6] lsls r0, r1, 1 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID adds r0, r2 ldrh r0, [r0] muls r0, r7 add r0, r10 bl sub_805DC0C ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -49699,11 +49699,11 @@ sub_8061224: @ 8061224 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -49756,7 +49756,7 @@ sub_8061224: @ 8061224 bl StartObjectImageAnim ldrb r4, [r6] lsls r0, r4, 1 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID adds r0, r2 ldrh r0, [r0] muls r0, r7 @@ -49768,7 +49768,7 @@ sub_8061224: @ 8061224 lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -49787,19 +49787,19 @@ sub_8061224: @ 8061224 thumb_func_start sub_806137C sub_806137C: @ 806137C push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x5C movs r1, 0x6 strb r1, [r0] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA lsls r0, 9 adds r1, r3, 0x1 adds r0, r1 @@ -49811,7 +49811,7 @@ sub_806137C: @ 806137C adds r1, r3 ldrb r1, [r1] bl sub_80613DC - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -49837,10 +49837,10 @@ sub_80613DC: @ 80613DC lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r4, r6, 1 adds r4, r0 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -49875,7 +49875,7 @@ sub_80613DC: @ 80613DC adds r1, r6, 0 bl sub_805DC0C adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -49903,10 +49903,10 @@ sub_80613DC: @ 80613DC adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds adds r4, r6, r4 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -49999,8 +49999,8 @@ sub_80613DC: @ 80613DC thumb_func_start sub_806156C sub_806156C: @ 806156C push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -50016,7 +50016,7 @@ sub_806156C: @ 806156C lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -50025,13 +50025,13 @@ sub_806156C: @ 806156C b _080615F0 .pool _080615B4: - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -50062,7 +50062,7 @@ sub_8061604: @ 8061604 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -50114,7 +50114,7 @@ _0806165A: adds r1, r2, 0 movs r3, 0x2 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -50163,7 +50163,7 @@ _080616C8: ands r2, r0 cmp r2, 0 beq _08061700 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] cmp r0, 0x1 bne _080616F0 @@ -50190,7 +50190,7 @@ _08061708: ands r2, r0 cmp r2, 0 beq _08061744 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] cmp r0, 0x1 bne _08061734 @@ -50225,7 +50225,7 @@ _08061760: ands r2, r0 cmp r2, 0 beq _08061788 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] cmp r0, 0x1 beq _08061788 @@ -50250,9 +50250,9 @@ _08061796: ands r0, r1 cmp r0, 0 beq _080617C8 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 ands r1, r0 movs r7, 0xC8 @@ -50265,12 +50265,12 @@ _080617C8: movs r7, 0xB0 _080617CA: mov r8, r4 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] mov r0, r8 bl sub_805DF38 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -50299,11 +50299,11 @@ _080617CA: mov r1, r9 adds r2, r4, 0 bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -50360,7 +50360,7 @@ _080617CA: adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -50410,7 +50410,7 @@ _08061910: ands r2, r0 cmp r2, 0 beq _08061948 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] cmp r0, 0x1 bne _08061938 @@ -50437,7 +50437,7 @@ _08061950: ands r2, r0 cmp r2, 0 beq _0806198C - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] cmp r0, 0x1 bne _0806197C @@ -50472,7 +50472,7 @@ _080619A8: ands r2, r0 cmp r2, 0 beq _080619D0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] cmp r0, 0x1 beq _080619D0 @@ -50492,11 +50492,11 @@ _080619D4: ldrb r0, [r0, 0x3] _080619DE: mov r8, r0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] bl sub_805DF38 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -50518,11 +50518,11 @@ _080619DE: movs r1, 0xB0 movs r3, 0x1E bl AddObjectToFront - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds ldrb r1, [r6] adds r1, r5 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -50589,7 +50589,7 @@ _080619DE: adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -50606,15 +50606,15 @@ _080619DE: thumb_func_start sub_8061AF0 sub_8061AF0: @ 8061AF0 push {r4-r6,lr} - ldr r6, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -50665,7 +50665,7 @@ sub_8061AF0: @ 8061AF0 adds r0, r5 ldr r1, =DummyObjectCallback bl oamt_set_x3A_32 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -50682,7 +50682,7 @@ sub_8061B9C: @ 8061B9C push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -50729,8 +50729,8 @@ _08061BF0: movs r0, 0x10 movs r1, 0x3F bl audio_play_and_stuff - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -50741,7 +50741,7 @@ _08061BF0: adds r0, r2 ldr r1, =sub_8039934 str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -50789,7 +50789,7 @@ sub_8061C6C: @ 8061C6C thumb_func_start sub_8061C78 sub_8061C78: @ 8061C78 push {r4-r6,lr} - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -50797,7 +50797,7 @@ sub_8061C78: @ 8061C78 beq _08061C8A b _08061D9E _08061C8A: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -50910,7 +50910,7 @@ _08061D80: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -50930,8 +50930,8 @@ bx_move_anim_7: @ 8061DB0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r6, =gActiveBank ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -51058,7 +51058,7 @@ _08061E72: _08061EC0: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -51115,7 +51115,7 @@ sub_8061F34: @ 8061F34 strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r4, [r5] lsls r4, 9 ldr r0, =gUnknown_02023066 @@ -51125,7 +51125,7 @@ sub_8061F34: @ 8061F34 ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -51188,7 +51188,7 @@ _08061FDA: b _08062156 .pool _08061FE4: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r1, =gUnknown_02023068 @@ -51226,7 +51226,7 @@ _0806202C: movs r2, 0 b _08061FD6 _08062030: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r2, [r0] movs r0, 0x1 movs r1, 0xF @@ -51246,8 +51246,8 @@ _08062040: ands r0, r1 cmp r0, 0 beq _08062062 - ldr r0, =gEnemyMonIndex - ldr r1, =gUnknown_02024064 + ldr r0, =gBankTarget + ldr r1, =gActiveBank ldrb r1, [r1] strb r1, [r0] _08062062: @@ -51262,10 +51262,10 @@ _08062062: cmp r0, 0 beq _0806209C movs r0, 0 - bl battle_get_side_with_given_state - ldr r5, =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r5, =gBankTarget strb r0, [r5] - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r0, [r5] @@ -51276,10 +51276,10 @@ _08062062: cmp r1, 0 beq _0806209C movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r5] _0806209C: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] lsls r0, 8 orrs r4, r0 @@ -51310,7 +51310,7 @@ _080620C6: ands r0, r1 cmp r0, 0 beq _08062108 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 8 orrs r4, r0 @@ -51333,7 +51333,7 @@ _08062108: lsls r1, 24 lsrs r1, 24 adds r0, r1, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 16 @@ -51345,7 +51345,7 @@ _08062108: .pool _0806213C: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 16 @@ -51364,10 +51364,10 @@ _08062156: thumb_func_start sub_806215C sub_806215C: @ 806215C push {lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsrs r0, 1 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] lsls r0, 1 adds r0, r1 @@ -51384,9 +51384,9 @@ sub_806215C: @ 806215C thumb_func_start sub_8062188 sub_8062188: @ 8062188 push {r4-r7,lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 movs r2, 0xA5 @@ -51407,7 +51407,7 @@ sub_8062188: @ 8062188 cmp r0, 0 bne _080621D4 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 adds r7, r5, 0 @@ -51415,11 +51415,11 @@ sub_8062188: @ 8062188 .pool _080621D4: movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 _080621E8: @@ -51429,7 +51429,7 @@ _080621E8: ands r0, r1 cmp r0, 0 beq _08062214 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] cmp r0, 0x1 bne _08062210 @@ -51460,7 +51460,7 @@ _0806221E: bl GetMonData cmp r0, 0 beq _0806221C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -51478,9 +51478,9 @@ _08062254: movs r0, 0x6 strb r0, [r1] _0806225A: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x5C @@ -51514,8 +51514,8 @@ sub_8062294: @ 8062294 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r0, =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -51532,7 +51532,7 @@ sub_8062294: @ 8062294 ldr r0, =0x00007fff cmp r7, r0 beq _08062324 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -51564,7 +51564,7 @@ sub_8062294: @ 8062294 b _0806234E .pool _08062324: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -51584,8 +51584,8 @@ _08062324: movs r3, 0 bl sub_807294C _0806234E: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -51612,7 +51612,7 @@ sub_8062384: @ 8062384 thumb_func_start sub_8062390 sub_8062390: @ 8062390 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -51622,7 +51622,7 @@ sub_8062390: @ 8062390 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -51645,7 +51645,7 @@ sub_8062390: @ 8062390 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -51661,13 +51661,13 @@ _080623E4: thumb_func_start sub_8062408 sub_8062408: @ 8062408 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08062458 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -51692,7 +51692,7 @@ sub_8062408: @ 8062408 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -51796,8 +51796,8 @@ sub_80624DC: @ 80624DC sub_80624F8: @ 80624F8 push {lr} ldr r3, =gUnknown_02022D0C - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -51855,9 +51855,9 @@ sub_8062548: @ 8062548 thumb_func_start dp01t_29_7_blink dp01t_29_7_blink: @ 8062570 push {r4,lr} - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -51874,7 +51874,7 @@ dp01t_29_7_blink: @ 8062570 b _080625CE .pool _080625A4: - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -51888,7 +51888,7 @@ _080625A4: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -51912,16 +51912,16 @@ sub_80625E0: @ 80625E0 thumb_func_start sub_80625EC sub_80625EC: @ 80625EC push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _08062600 movs r3, 0xC0 _08062600: - ldr r2, =gUnknown_02023064 + ldr r2, =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -51945,8 +51945,8 @@ _08062600: thumb_func_start sub_8062630 sub_8062630: @ 8062630 push {r4,r5,lr} - ldr r4, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -51988,8 +51988,8 @@ _08062680: thumb_func_start sub_806268C sub_806268C: @ 806268C push {lr} - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -52014,8 +52014,8 @@ sub_806268C: @ 806268C thumb_func_start dp01t_2E_7_battle_intro dp01t_2E_7_battle_intro: @ 80626C8 push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -52036,15 +52036,15 @@ dp01t_2E_7_battle_intro: @ 80626C8 thumb_func_start sub_80626FC sub_80626FC: @ 80626FC push {r4-r6,lr} - ldr r5, =gUnknown_020241E4 - ldr r6, =gUnknown_02024064 + ldr r5, =gBankSpriteIds + ldr r6, =gActiveBank ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -52136,7 +52136,7 @@ _080627BE: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -52172,7 +52172,7 @@ sub_8062828: @ 8062828 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r0, [r7] mov r9, r0 ldr r1, =gTasks @@ -52199,12 +52199,12 @@ sub_8062828: @ 8062828 cmp r1, 0 beq _080628A0 _0806286C: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -52215,12 +52215,12 @@ _0806286C: b _080628E0 .pool _080628A0: - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -52246,8 +52246,8 @@ _080628A0: eors r0, r5 strb r0, [r7] _080628E0: - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -52269,8 +52269,8 @@ _080628E0: thumb_func_start dp01t_30_7_0803D67C dp01t_30_7_0803D67C: @ 8062918 push {r4-r7,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -52279,7 +52279,7 @@ dp01t_30_7_0803D67C: @ 8062918 cmp r0, 0 beq _08062948 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08062948 @@ -52289,7 +52289,7 @@ dp01t_30_7_0803D67C: @ 8062918 _08062948: ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -52300,7 +52300,7 @@ _08062948: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - ldr r1, =gUnknown_02023064 + ldr r1, =gBattleBufferA ldrb r2, [r3] lsls r0, r2, 9 adds r1, 0x2 @@ -52378,7 +52378,7 @@ _080629B4: movs r1, 0x5D strb r1, [r0, 0x5] _08062A06: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r7] lsls r1, 2 adds r1, r0 @@ -52396,7 +52396,7 @@ bx_0803D790_t7: @ 8062A2C push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -52432,7 +52432,7 @@ sub_8062A74: @ 8062A74 push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -52472,14 +52472,14 @@ sub_8062AC4: @ 8062AC4 thumb_func_start sub_8062AD0 sub_8062AD0: @ 8062AD0 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _08062B16 - ldr r3, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r0, =gBankSpriteIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -52487,7 +52487,7 @@ sub_8062AD0: @ 8062AD0 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -52516,13 +52516,13 @@ _08062B16: dp01t_34_7_move_anim_start_t3: @ 8062B30 push {r4-r6,lr} sub sp, 0x4 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08062B88 - ldr r5, =gUnknown_02023064 + ldr r5, =gBattleBufferA ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -52547,7 +52547,7 @@ dp01t_34_7_move_anim_start_t3: @ 8062B30 b _08062B88 .pool _08062B7C: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -52614,8 +52614,8 @@ nullsub_91: @ 8062BF4 thumb_func_start ai_switch_perish_song ai_switch_perish_song: @ 8062BF8 push {lr} - ldr r1, =gUnknown_020242AC - ldr r0, =gUnknown_02024064 + ldr r1, =gStatuses3 + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -52624,7 +52624,7 @@ ai_switch_perish_song: @ 8062BF8 ands r0, r1 cmp r0, 0 beq _08062C50 - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -52633,7 +52633,7 @@ ai_switch_perish_song: @ 8062BF8 lsls r0, 28 cmp r0, 0 bne _08062C50 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, r2, r0 movs r1, 0xA5 @@ -52671,16 +52671,16 @@ sub_8062C58: @ 8062C58 beq _08062C72 b _08062E2C _08062C72: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 mov r10, r0 ldr r4, =gBattleMons - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 movs r1, 0x58 @@ -52693,7 +52693,7 @@ _08062C72: b _08062E2C _08062C9E: mov r0, r10 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r2, r0, 24 movs r6, 0 @@ -52707,7 +52707,7 @@ _08062C9E: mov r9, r0 _08062CBA: lsls r1, r6, 1 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] muls r0, r7 adds r1, r0 @@ -52755,9 +52755,9 @@ _08062D20: str r3, [sp] b _08062D58 _08062D28: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 movs r1, 0xA5 @@ -52778,7 +52778,7 @@ _08062D50: adds r1, r5, 0 _08062D58: ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty mov r9, r1 @@ -52814,8 +52814,8 @@ _08062D74: lsls r1, 1 cmp r0, r1 beq _08062E24 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -52829,7 +52829,7 @@ _08062D74: movs r1, 0x2E bl GetMonData mov r0, r10 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r2, r0, 24 movs r4, 0 @@ -52915,7 +52915,7 @@ sub_8062E54: @ 8062E54 b _080630AC _08062E82: ldr r1, =gUnknown_02024250 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r3, [r5] lsls r0, r3, 1 adds r4, r0, r1 @@ -52948,13 +52948,13 @@ _08062EB0: beq _08062F1A mov r8, r3 mov r0, r8 - bl battle_get_per_side_status + bl GetBankIdentity movs r4, 0x2 eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024210 + bl GetBankByPlayerAI + ldr r1, =gAbsentBankFlags ldrb r1, [r1] ldr r2, =gBitTable lsls r0, 24 @@ -52969,11 +52969,11 @@ _08062EB0: .pool _08062F04: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r7, r0, 24 b _08062F1E @@ -52983,7 +52983,7 @@ _08062F1A: _08062F1E: ldr r3, =gBattleMoves ldr r1, =gUnknown_02024250 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 1 adds r0, r1 @@ -53045,9 +53045,9 @@ _08062F9C: mov r10, r1 b _08062FD2 _08062FA4: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 movs r2, 0xA5 @@ -53068,7 +53068,7 @@ _08062FD0: mov r10, r0 _08062FD2: ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty str r1, [sp, 0x4] @@ -53104,7 +53104,7 @@ _08062FF0: lsls r1, 1 cmp r0, r1 beq _080630A6 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID mov r2, r8 lsls r0, r2, 1 adds r0, r1 @@ -53116,7 +53116,7 @@ _08062FF0: ldrh r0, [r0] cmp r5, r0 beq _080630A6 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C @@ -53182,7 +53182,7 @@ _080630AE: ai_switchout_natural_cure: @ 80630C0 push {r4,r5,lr} ldr r3, =gBattleMons - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r4, [r5] movs r0, 0x58 adds r2, r4, 0 @@ -53227,7 +53227,7 @@ _08063106: _08063128: ldr r2, =gBattleMoves ldr r1, =gUnknown_02024250 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -53269,10 +53269,10 @@ _08063188: movs r0, 0 b _080631AC _0806318C: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] _08063190: - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 movs r1, 0xA5 @@ -53303,18 +53303,18 @@ ai_has_super_effective_move_on_field: @ 80631BC lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 mov r10, r0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r3, r0, 24 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable lsls r0, r3, 2 @@ -53334,7 +53334,7 @@ ai_has_super_effective_move_on_field: @ 80631BC mov r8, r0 _0806320A: lsls r1, r4, 1 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] muls r0, r7 adds r1, r0 @@ -53385,10 +53385,10 @@ _0806327C: movs r1, 0x2 mov r0, r10 eors r0, r1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r3, r0, 24 - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable lsls r0, r3, 2 @@ -53408,7 +53408,7 @@ _0806327C: mov r8, r3 _080632AE: lsls r1, r4, 1 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] muls r0, r7 adds r1, r0 @@ -53461,7 +53461,7 @@ ai_is_too_invested_in_stat_buffs: @ 806331C push {r4,lr} movs r4, 0 ldr r1, =gBattleMons - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -53511,7 +53511,7 @@ ai_switchout_something: @ 8063364 lsrs r1, 24 str r1, [sp, 0x4] ldr r2, =gUnknown_02024250 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r3, [r1] lsls r0, r3, 1 adds r4, r0, r2 @@ -53552,13 +53552,13 @@ _080633B8: beq _0806342C mov r9, r3 mov r0, r9 - bl battle_get_per_side_status + bl GetBankIdentity movs r4, 0x2 eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024210 + bl GetBankByPlayerAI + ldr r1, =gAbsentBankFlags ldrb r1, [r1] ldr r2, =gBitTable lsls r0, 24 @@ -53574,11 +53574,11 @@ _080633B8: .pool _08063414: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -53593,7 +53593,7 @@ _08063430: ands r0, r1 cmp r0, 0 beq _08063490 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -53611,9 +53611,9 @@ _08063460: str r1, [sp, 0x8] b _08063498 _08063468: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 movs r2, 0xA5 @@ -53631,10 +53631,10 @@ _08063490: movs r4, 0 movs r0, 0x6 str r0, [sp, 0x8] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank _08063498: ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty str r1, [sp, 0xC] @@ -53672,7 +53672,7 @@ _080634E0: lsls r1, 1 cmp r0, r1 beq _080635E4 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID mov r2, r9 lsls r0, r2, 1 adds r0, r1 @@ -53685,7 +53685,7 @@ _080634E0: ldrh r0, [r0] cmp r6, r0 beq _080635E4 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] mov r2, r9 adds r0, r2, r1 @@ -53726,7 +53726,7 @@ _08063558: ldrb r2, [r0, 0x16] _08063564: ldr r1, =gUnknown_02024250 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -53816,7 +53816,7 @@ sub_8063614: @ 8063614 push {r5-r7} sub sp, 0x4 ldr r6, =gBattleMons - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] movs r5, 0x58 adds r0, r2, 0 @@ -53831,7 +53831,7 @@ sub_8063614: @ 8063614 beq _0806363E b _0806386C _0806363E: - ldr r0, =gUnknown_020242AC + ldr r0, =gStatuses3 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -53847,7 +53847,7 @@ _08063652: adds r1, r2, 0 movs r2, 0x17 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -53859,7 +53859,7 @@ _0806366A: movs r0, 0xC movs r2, 0x47 movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -53871,7 +53871,7 @@ _08063682: movs r1, 0 movs r2, 0x2A movs r3, 0 - bl ability_something + bl AbilityBattleEffects lsls r0, 24 cmp r0, 0 beq _080636B4 @@ -53909,13 +53909,13 @@ _080636C4: beq _0806372E ldrb r7, [r4] adds r0, r7, 0 - bl battle_get_per_side_status + bl GetBankIdentity movs r5, 0x2 eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024210 + bl GetBankByPlayerAI + ldr r1, =gAbsentBankFlags ldrb r1, [r1] ldr r2, =gBitTable lsls r0, 24 @@ -53930,11 +53930,11 @@ _080636C4: .pool _08063718: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 b _08063732 @@ -53948,7 +53948,7 @@ _08063732: ands r0, r1 cmp r0, 0 beq _08063768 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -53968,10 +53968,10 @@ _08063768: movs r4, 0 movs r1, 0x6 mov r8, r1 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank _08063770: ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty mov r9, r1 @@ -54005,7 +54005,7 @@ _0806378A: lsls r1, 1 cmp r0, r1 beq _080637EC - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -54016,7 +54016,7 @@ _0806378A: ldrh r0, [r0] cmp r5, r0 beq _080637EC - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r0, r7, r1 adds r0, 0x5C @@ -54097,14 +54097,14 @@ sub_8063880: @ 8063880 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r6, r0, 24 adds r5, r6, 0 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r1, =gEnemyParty mov r8, r1 @@ -54128,7 +54128,7 @@ _080638B6: b _080639DC _080638C2: ldrb r0, [r4] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r0, r1 movs r1, 0xA5 @@ -54148,7 +54148,7 @@ _080638C2: cmp r0, 0 bne _08063910 adds r0, r6, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 @@ -54156,13 +54156,13 @@ _080638C2: .pool _08063910: adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 movs r0, 0x2 eors r5, r0 adds r0, r5, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 _08063928: @@ -54172,7 +54172,7 @@ _08063928: ands r0, r1 cmp r0, 0 beq _08063958 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -54201,7 +54201,7 @@ _08063962: bl GetMonData cmp r0, 0 beq _080639A0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] @@ -54212,7 +54212,7 @@ _08063962: ldrh r0, [r0] cmp r4, r0 beq _080639A0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r0, r6, r1 adds r0, 0x5C @@ -54229,9 +54229,9 @@ _080639A0: cmp r4, r7 blt _08063962 _080639A6: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r0, r1 movs r1, 0xA5 @@ -54239,7 +54239,7 @@ _080639A6: adds r0, r1 strb r4, [r0] _080639B8: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r0, [r2] adds r0, r1, r0 @@ -54258,7 +54258,7 @@ _080639DC: cmp r0, 0 bne _080639F8 _080639E6: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] movs r2, 0x1 eors r2, r0 @@ -54355,9 +54355,9 @@ sub_8063A90: @ 8063A90 mov r5, r8 push {r5-r7} sub sp, 0x24 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, r2, r0 adds r1, r0, 0 @@ -54374,7 +54374,7 @@ _08063AB2: ands r0, r1 cmp r0, 0 beq _08063AE0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r2, 1 adds r0, r1 ldrb r0, [r0] @@ -54390,13 +54390,13 @@ _08063AE0: beq _08063B6C str r2, [sp, 0x10] adds r0, r2, 0 - bl battle_get_per_side_status + bl GetBankIdentity movs r5, 0x2 eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state - ldr r1, =gUnknown_02024210 + bl GetBankByPlayerAI + ldr r1, =gAbsentBankFlags ldrb r1, [r1] ldr r2, =gBitTable lsls r0, 24 @@ -54412,11 +54412,11 @@ _08063AE0: .pool _08063B20: ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] @@ -54427,7 +54427,7 @@ _08063B36: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldr r4, [sp, 0x4] @@ -54445,12 +54445,12 @@ _08063B36: .pool _08063B6C: adds r0, r2, 0 - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] @@ -54464,7 +54464,7 @@ _08063B8A: ands r0, r1 cmp r0, 0 beq _08063BC2 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -54487,10 +54487,10 @@ _08063BC2: str r1, [sp, 0x18] movs r2, 0x6 str r2, [sp, 0x1C] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank _08063BCC: ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r4, =gEnemyParty str r4, [sp, 0x20] @@ -54540,7 +54540,7 @@ _08063C00: ands r0, r1 cmp r0, 0 bne _08063CD8 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r2, [sp, 0x10] lsls r0, r2, 1 adds r0, r1 @@ -54553,7 +54553,7 @@ _08063C00: ldrh r0, [r0] cmp r0, r7 beq _08063CD8 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C @@ -54641,7 +54641,7 @@ _08063D02: lsrs r4, r0, 16 cmp r4, 0 beq _08063D2A - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] adds r0, r4, 0 ldr r2, [sp, 0x4] @@ -54683,10 +54683,10 @@ _08063D60: ldr r0, =gUnknown_02024400 movs r1, 0 strh r1, [r0] - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] strb r1, [r0, 0x13] - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting movs r2, 0x1 strb r2, [r0, 0xE] ldr r0, =gBattleMoveFlags @@ -54720,7 +54720,7 @@ _08063D8A: bl GetMonData cmp r0, 0 beq _08063E46 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r2, [sp, 0x10] lsls r0, r2, 1 adds r0, r1 @@ -54733,7 +54733,7 @@ _08063D8A: ldrh r0, [r0] cmp r0, r7 beq _08063E46 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C @@ -54749,7 +54749,7 @@ _08063D8A: mov r9, r6 ldr r0, =gBattleMoveDamage mov r8, r0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank _08063DEE: adds r1, r5, 0 adds r1, 0xD @@ -54888,18 +54888,18 @@ sub_8063EE0: @ 8063EE0 ands r0, r1 cmp r0, 0 beq _08063F12 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 bne _08063F12 b _0806437C _08063F12: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r5, =gEnemyParty cmp r0, 0 @@ -54945,7 +54945,7 @@ _08063F64: movs r2, 0 mov r8, r2 _08063F72: - ldr r1, =gUnknown_020244A8 + ldr r1, =gBattleResources mov r0, r8 cmp r0, 0 beq _08063F8E @@ -54999,10 +54999,10 @@ _08063FEA: lsrs r0, 24 adds r1, r5, 0 bl ai_identify_item_effect - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] lsrs r1, 1 - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r2, [r3] adds r1, r2 adds r1, 0xC4 @@ -55034,7 +55034,7 @@ _08064030: .4byte _0806437C _08064048: ldr r2, =gBattleMons - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -55065,7 +55065,7 @@ _08064074: b _08064324 _08064088: ldr r2, =gBattleMons - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -55090,10 +55090,10 @@ _080640B2: b _08064066 .pool _080640BC: - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] lsrs r0, 1 - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r1, [r2] adds r0, r1 adds r0, 0xC6 @@ -55265,16 +55265,16 @@ _080641F6: b _08064066 .pool _08064214: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] lsrs r0, 1 - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r1, [r3] adds r0, r1 adds r0, 0xC6 movs r1, 0 strb r1, [r0] - ldr r1, =gUnknown_020242BC + ldr r1, =gDisableStructs ldrb r2, [r4] lsls r0, r2, 3 subs r0, r2 @@ -55378,12 +55378,12 @@ _080642D2: b _08064066 .pool _080642F4: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r3, r0, 24 - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -55392,7 +55392,7 @@ _080642F4: ldrb r0, [r0, 0x16] cmp r0, 0 beq _08064324 - ldr r0, =gUnknown_02024294 + ldr r0, =gSideTimers lsls r1, r3, 1 adds r1, r3 lsls r1, 2 @@ -55409,17 +55409,17 @@ _08064328: movs r1, 0x1 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsrs r0, 1 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] lsls r0, 1 adds r0, r1 adds r0, 0xC0 mov r1, r9 strb r1, [r0] - ldr r0, =gUnknown_020244A8 + ldr r0, =gBattleResources ldr r0, [r0] ldr r0, [r0, 0x18] adds r0, 0x48 @@ -55457,8 +55457,8 @@ nullsub_28: @ 8064390 thumb_func_start sub_8064394 sub_8064394: @ 8064394 - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -55471,9 +55471,9 @@ sub_8064394: @ 8064394 thumb_func_start sub_80643B0 sub_80643B0: @ 80643B0 push {lr} - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -55482,7 +55482,7 @@ sub_80643B0: @ 80643B0 ands r1, r0 cmp r1, 0 beq _080643FC - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] @@ -55506,9 +55506,9 @@ _080643FC: thumb_func_start sub_8064400 sub_8064400: @ 8064400 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -55531,9 +55531,9 @@ _08064424: thumb_func_start sub_8064438 sub_8064438: @ 8064438 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -55556,9 +55556,9 @@ _0806445C: thumb_func_start sub_8064470 sub_8064470: @ 8064470 push {r4-r6,lr} - ldr r5, =gUnknown_02020630 - ldr r6, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r5, =gSprites + ldr r6, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -55604,7 +55604,7 @@ sub_80644D8: @ 80644D8 push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r1, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -55658,9 +55658,9 @@ sub_8064520: @ 8064520 cmp r0, 0 beq _08064584 _0806454C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gUnknown_03005D70 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -55677,9 +55677,9 @@ _0806454C: b _080645CA .pool _08064584: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r6, =gUnknown_03005D70 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r4, [r2] adds r0, r4, r6 ldrb r1, [r0] @@ -55728,7 +55728,7 @@ _080645DE: ldr r1, =gUnknown_020244D0 mov r12, r1 ldr r0, [r1] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r2, [r7] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -55838,7 +55838,7 @@ _0806469C: ands r0, r2 strb r0, [r1, 0x1] ldrb r0, [r7] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -55851,7 +55851,7 @@ _0806469C: _080646F2: ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -55860,7 +55860,7 @@ _080646F2: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r3] lsls r0, 2 adds r0, r1 @@ -55886,7 +55886,7 @@ sub_8064734: @ 8064734 mov r10, r0 ldr r5, =gUnknown_020244D0 ldr r0, [r5] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -55900,7 +55900,7 @@ sub_8064734: @ 8064734 ands r0, r1 cmp r0, 0 bne _08064776 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -55931,7 +55931,7 @@ _08064776: ands r0, r1 cmp r0, 0 bne _080647B4 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 @@ -55943,7 +55943,7 @@ _08064776: _080647B4: ldr r3, =gUnknown_020244D0 ldr r0, [r3] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r5, [r2] ldr r4, [r0, 0x4] lsls r0, r5, 1 @@ -55992,7 +55992,7 @@ _080647B4: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -56014,11 +56014,11 @@ _080647B4: bl sub_80729D0 _0806484A: ldr r5, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -56037,7 +56037,7 @@ _0806484A: _0806487A: ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -56101,7 +56101,7 @@ _08064898: cmp r0, 0x42 bne _08064930 adds r0, r2, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -56119,7 +56119,7 @@ _08064930: _0806493C: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -56138,9 +56138,9 @@ _0806495A: bne _08064962 b _08064AC0 _08064962: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D7C - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r3, [r5] adds r0, r3, r0 ldrb r1, [r0] @@ -56155,7 +56155,7 @@ _08064962: beq _08064982 b _08064AC0 _08064982: - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -56174,7 +56174,7 @@ _08064998: cmp r0, 0 beq _080649E2 adds r0, r3, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -56215,7 +56215,7 @@ _080649E2: cmp r0, 0 bne _08064A3A ldr r1, =gUnknown_03005D7C - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -56224,12 +56224,12 @@ _080649E2: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldrb r0, [r5] eors r4, r0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -56246,18 +56246,18 @@ _080649E2: bl sub_805EE54 _08064A3A: ldr r1, =gUnknown_03005D7C - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldrb r5, [r4] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -56303,7 +56303,7 @@ _08064A3A: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -56323,9 +56323,9 @@ _08064AC0: thumb_func_start sub_8064B04 sub_8064B04: @ 8064B04 push {r4-r7,lr} - ldr r4, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 - ldr r7, =gUnknown_02024064 + ldr r4, =gSprites + ldr r0, =gBankSpriteIds + ldr r7, =gActiveBank ldrb r3, [r7] adds r0, r3, r0 ldrb r1, [r0] @@ -56356,7 +56356,7 @@ sub_8064B04: @ 8064B04 ands r0, r5 cmp r0, 0 bne _08064B7C - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 @@ -56404,7 +56404,7 @@ _08064BB6: thumb_func_start sub_8064BC0 sub_8064BC0: @ 8064BC0 push {r4-r6,lr} - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] ldr r5, =gUnknown_03005D70 adds r1, r0, r5 @@ -56443,9 +56443,9 @@ _08064C0C: thumb_func_start sub_8064C14 sub_8064C14: @ 8064C14 push {lr} - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 - ldr r1, =gUnknown_02024064 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds + ldr r1, =gActiveBank ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -56474,7 +56474,7 @@ sub_8064C58: @ 8064C58 push {r4-r6,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -56486,13 +56486,13 @@ sub_8064C58: @ 8064C58 ands r0, r1 cmp r0, 0 bne _08064CB2 - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -56535,12 +56535,12 @@ _08064CDE: thumb_func_start sub_8064CE4 sub_8064CE4: @ 8064CE4 push {r4,lr} - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -56558,7 +56558,7 @@ sub_8064CE4: @ 8064CE4 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r3, [r0] bl sub_8065068 b _08064D5A @@ -56595,9 +56595,9 @@ _08064D5A: thumb_func_start sub_8064D60 sub_8064D60: @ 8064D60 push {r4,lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -56626,7 +56626,7 @@ sub_8064D60: @ 8064D60 movs r3, 0x6 bl move_anim_start_t4 _08064DA0: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -56644,7 +56644,7 @@ sub_8064DD0: @ 8064DD0 push {r4,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -56660,8 +56660,8 @@ sub_8064DD0: @ 8064DD0 lsls r0, 24 cmp r0, 0 bne _08064E2A - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -56696,7 +56696,7 @@ sub_8064E50: @ 8064E50 push {r4-r7,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -56708,8 +56708,8 @@ sub_8064E50: @ 8064E50 ands r0, r1 cmp r0, 0 beq _08064F0C - ldr r7, =gUnknown_02020630 - ldr r6, =gUnknown_020241E4 + ldr r7, =gSprites + ldr r6, =gBankSpriteIds adds r0, r2, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -56756,7 +56756,7 @@ sub_8064E50: @ 8064E50 ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -56774,7 +56774,7 @@ sub_8064E50: @ 8064E50 bl sub_80729D0 ldrb r0, [r5] bl sub_805E408 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -56792,7 +56792,7 @@ sub_8064F40: @ 8064F40 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -56804,7 +56804,7 @@ sub_8064F40: @ 8064F40 ands r0, r1 cmp r0, 0 bne _08064F72 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -56814,7 +56814,7 @@ sub_8064F40: @ 8064F40 adds r0, r2, 0 bl sub_8172EF0 _08064F72: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, =gUnknown_03005D7C ldrb r2, [r5] adds r0, r2, r0 @@ -56843,7 +56843,7 @@ _08064F72: adds r0, r3, r4 bl RemoveObjectAndFreeTiles ldrb r4, [r5] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -56858,7 +56858,7 @@ _08064F72: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -56876,7 +56876,7 @@ sub_8065008: @ 8065008 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -56900,7 +56900,7 @@ sub_8065038: @ 8065038 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -56923,8 +56923,8 @@ _0806505A: sub_8065068: @ 8065068 push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -56942,8 +56942,8 @@ sub_8065068: @ 8065068 movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably - ldr r1, =gUnknown_02023064 + bl PrepareBufferDataTransferLink + ldr r1, =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -56952,7 +56952,7 @@ sub_8065068: @ 8065068 b _080650CE .pool _080650BC: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -56974,8 +56974,8 @@ dp01t_00_2_getattr: @ 80650E0 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -56983,7 +56983,7 @@ dp01t_00_2_getattr: @ 80650E0 ldrb r0, [r1] cmp r0, 0 bne _08065118 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -57036,8 +57036,8 @@ dp01_getattr_by_ch1_for_opponent_pokemon: @ 8065154 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, =gUnknown_02023064 - ldr r3, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -57913,8 +57913,8 @@ sub_8065900: @ 8065900 thumb_func_start sub_806590C sub_806590C: @ 806590C push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -57922,7 +57922,7 @@ sub_806590C: @ 806590C ldrb r0, [r1] cmp r0, 0 bne _0806593C - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -57963,7 +57963,7 @@ sub_8065964: @ 8065964 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 ldr r2, =gUnknown_02023067 @@ -58055,12 +58055,12 @@ _08065A98: adds r0, r4, 0 movs r1, 0xB adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData adds r2, r7, 0 adds r2, 0x2E adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r0, 0 mov r8, r0 movs r0, 0x3B @@ -58101,12 +58101,12 @@ _08065AFE: adds r1, 0xD mov r0, r9 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 mov r0, r9 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -58122,15 +58122,15 @@ _08065AFE: adds r0, r4, 0 movs r1, 0x15 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x20] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x19 ldr r2, [sp, 0x28] - bl pokemon_setattr + bl SetMonData ldrb r0, [r7, 0x14] lsls r0, 27 lsrs r0, 27 @@ -58139,7 +58139,7 @@ _08065AFE: adds r0, r4, 0 movs r1, 0x27 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r7, 0x14] lsls r0, 22 @@ -58148,7 +58148,7 @@ _08065AFE: adds r0, r4, 0 movs r1, 0x28 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r7, 0x15] lsls r0, 25 @@ -58157,7 +58157,7 @@ _08065AFE: adds r0, r4, 0 movs r1, 0x29 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldr r0, [r7, 0x14] lsls r0, 12 @@ -58166,7 +58166,7 @@ _08065AFE: adds r0, r4, 0 movs r1, 0x2A mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r7, 0x16] lsls r0, 23 @@ -58175,7 +58175,7 @@ _08065AFE: adds r0, r4, 0 movs r1, 0x2B mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r7, 0x17] lsls r0, 26 @@ -58184,47 +58184,47 @@ _08065AFE: adds r0, r4, 0 movs r1, 0x2C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0 ldr r2, [sp, 0x2C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x37 ldr r2, [sp, 0x30] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 ldr r2, [sp, 0x18] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A ldr r2, [sp, 0x24] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3B ldr r2, [sp, 0x4] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C ldr r2, [sp, 0x8] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D ldr r2, [sp, 0xC] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E ldr r2, [sp, 0x10] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F ldr r2, [sp, 0x14] - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065C30: @@ -58236,7 +58236,7 @@ _08065C30: lsls r2, 9 adds r2, r3 movs r1, 0xB - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065C4C: @@ -58248,7 +58248,7 @@ _08065C4C: lsls r2, 9 adds r2, r3 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065C68: @@ -58269,12 +58269,12 @@ _08065C80: adds r1, 0xD adds r0, r7, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 adds r0, r7, 0 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -58288,7 +58288,7 @@ _08065C80: adds r0, r1 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065CBC: @@ -58296,7 +58296,7 @@ _08065CBC: muls r0, r5 ldr r1, =gEnemyParty adds r0, r1 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -58317,7 +58317,7 @@ _08065CDC: adds r0, r4, 0 movs r1, 0x11 str r3, [sp, 0x34] - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -58325,7 +58325,7 @@ _08065CDC: adds r2, r0 adds r0, r4, 0 movs r1, 0x12 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -58333,7 +58333,7 @@ _08065CDC: adds r2, r0 adds r0, r4, 0 movs r1, 0x13 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -58341,7 +58341,7 @@ _08065CDC: adds r2, r0 adds r0, r4, 0 movs r1, 0x14 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -58349,7 +58349,7 @@ _08065CDC: adds r2, r0 adds r0, r4, 0 movs r1, 0x15 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065D44: @@ -58357,7 +58357,7 @@ _08065D44: muls r0, r5 ldr r1, =gEnemyParty adds r0, r1 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -58367,7 +58367,7 @@ _08065D44: _08065D5A: adds r3, 0x3 adds r2, r3 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065D6C: @@ -58379,7 +58379,7 @@ _08065D6C: lsls r2, 9 adds r2, r3 movs r1, 0x1 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065D88: @@ -58391,7 +58391,7 @@ _08065D88: lsls r2, 9 adds r2, r3 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065DA4: @@ -58403,7 +58403,7 @@ _08065DA4: lsls r2, 9 adds r2, r3 movs r1, 0x1A - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065DC0: @@ -58415,7 +58415,7 @@ _08065DC0: lsls r2, 9 adds r2, r3 movs r1, 0x1B - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065DDC: @@ -58427,7 +58427,7 @@ _08065DDC: lsls r2, 9 adds r2, r3 movs r1, 0x1C - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065DF8: @@ -58439,7 +58439,7 @@ _08065DF8: lsls r2, 9 adds r2, r3 movs r1, 0x1D - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065E14: @@ -58451,7 +58451,7 @@ _08065E14: lsls r2, 9 adds r2, r3 movs r1, 0x1E - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065E30: @@ -58463,7 +58463,7 @@ _08065E30: lsls r2, 9 adds r2, r3 movs r1, 0x1F - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065E4C: @@ -58475,7 +58475,7 @@ _08065E4C: lsls r2, 9 adds r2, r3 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065E68: @@ -58487,7 +58487,7 @@ _08065E68: lsls r2, 9 adds r2, r3 movs r1, 0x22 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065E84: @@ -58499,7 +58499,7 @@ _08065E84: lsls r2, 9 adds r2, r3 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065EA0: @@ -58511,7 +58511,7 @@ _08065EA0: lsls r2, 9 adds r2, r3 movs r1, 0x24 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065EBC: @@ -58523,7 +58523,7 @@ _08065EBC: lsls r2, 9 adds r2, r3 movs r1, 0x25 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065ED8: @@ -58535,7 +58535,7 @@ _08065ED8: lsls r2, 9 adds r2, r3 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065EF4: @@ -58550,7 +58550,7 @@ _08065EF4: adds r0, r4, 0 movs r1, 0x27 str r3, [sp, 0x34] - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -58558,7 +58558,7 @@ _08065EF4: adds r2, r0 adds r0, r4, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -58566,7 +58566,7 @@ _08065EF4: adds r2, r0 adds r0, r4, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -58574,7 +58574,7 @@ _08065EF4: adds r2, r0 adds r0, r4, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -58582,7 +58582,7 @@ _08065EF4: adds r2, r0 adds r0, r4, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -58600,7 +58600,7 @@ _08065F68: lsls r2, 9 adds r2, r3 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065F84: @@ -58612,7 +58612,7 @@ _08065F84: lsls r2, 9 adds r2, r3 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065FA0: @@ -58624,7 +58624,7 @@ _08065FA0: lsls r2, 9 adds r2, r3 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065FBC: @@ -58636,7 +58636,7 @@ _08065FBC: lsls r2, 9 adds r2, r3 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065FD8: @@ -58648,7 +58648,7 @@ _08065FD8: lsls r2, 9 adds r2, r3 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08065FF4: @@ -58661,7 +58661,7 @@ _08065FF4: adds r2, r3 _08066002: movs r1, 0x2C - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066010: @@ -58673,7 +58673,7 @@ _08066010: lsls r2, 9 adds r2, r3 movs r1, 0 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _0806602C: @@ -58685,7 +58685,7 @@ _0806602C: lsls r2, 9 adds r2, r3 movs r1, 0x9 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066048: @@ -58697,7 +58697,7 @@ _08066048: lsls r2, 9 adds r2, r3 movs r1, 0x37 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066064: @@ -58709,7 +58709,7 @@ _08066064: lsls r2, 9 adds r2, r3 movs r1, 0x38 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066080: @@ -58721,7 +58721,7 @@ _08066080: lsls r2, 9 adds r2, r3 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _0806609C: @@ -58733,7 +58733,7 @@ _0806609C: lsls r2, 9 adds r2, r3 movs r1, 0x3A - bl pokemon_setattr + bl SetMonData b _08066270 .pool _080660B8: @@ -58745,7 +58745,7 @@ _080660B8: lsls r2, 9 adds r2, r3 movs r1, 0x3B - bl pokemon_setattr + bl SetMonData b _08066270 .pool _080660D4: @@ -58757,7 +58757,7 @@ _080660D4: lsls r2, 9 adds r2, r3 movs r1, 0x3C - bl pokemon_setattr + bl SetMonData b _08066270 .pool _080660F0: @@ -58769,7 +58769,7 @@ _080660F0: lsls r2, 9 adds r2, r3 movs r1, 0x3D - bl pokemon_setattr + bl SetMonData b _08066270 .pool _0806610C: @@ -58781,7 +58781,7 @@ _0806610C: lsls r2, 9 adds r2, r3 movs r1, 0x3E - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066128: @@ -58793,7 +58793,7 @@ _08066128: lsls r2, 9 adds r2, r3 movs r1, 0x3F - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066144: @@ -58805,7 +58805,7 @@ _08066144: lsls r2, 9 adds r2, r3 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066160: @@ -58817,7 +58817,7 @@ _08066160: lsls r2, 9 adds r2, r3 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _0806617C: @@ -58829,7 +58829,7 @@ _0806617C: lsls r2, 9 adds r2, r3 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066198: @@ -58841,7 +58841,7 @@ _08066198: lsls r2, 9 adds r2, r3 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _080661B4: @@ -58853,7 +58853,7 @@ _080661B4: lsls r2, 9 adds r2, r3 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData b _08066270 .pool _080661D0: @@ -58865,7 +58865,7 @@ _080661D0: lsls r2, 9 adds r2, r3 movs r1, 0x30 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _080661EC: @@ -58877,7 +58877,7 @@ _080661EC: lsls r2, 9 adds r2, r3 movs r1, 0x32 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066208: @@ -58889,7 +58889,7 @@ _08066208: lsls r2, 9 adds r2, r3 movs r1, 0x33 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066224: @@ -58901,7 +58901,7 @@ _08066224: lsls r2, 9 adds r2, r3 movs r1, 0x34 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _08066240: @@ -58913,7 +58913,7 @@ _08066240: lsls r2, 9 adds r2, r3 movs r1, 0x35 - bl pokemon_setattr + bl SetMonData b _08066270 .pool _0806625C: @@ -58925,7 +58925,7 @@ _0806625C: lsls r2, 9 adds r2, r3 movs r1, 0x36 - bl pokemon_setattr + bl SetMonData _08066270: add sp, 0x38 pop {r3-r5} @@ -58941,8 +58941,8 @@ _08066270: thumb_func_start sub_8066284 sub_8066284: @ 8066284 push {r4-r7,lr} - ldr r1, =gUnknown_0202406E - ldr r7, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r7, =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -58950,7 +58950,7 @@ sub_8066284: @ 8066284 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -59000,8 +59000,8 @@ sub_80662F8: @ 80662F8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r7, =gUnknown_0202406E - ldr r6, =gUnknown_02024064 + ldr r7, =gBattlePartyID + ldr r6, =gActiveBank ldrb r0, [r6] lsls r0, 1 adds r0, r7 @@ -59029,7 +59029,7 @@ sub_80662F8: @ 80662F8 add r0, r9 bl sub_805DC0C ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -59057,11 +59057,11 @@ sub_80662F8: @ 80662F8 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -59118,7 +59118,7 @@ sub_80662F8: @ 80662F8 lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -59137,12 +59137,12 @@ sub_80662F8: @ 80662F8 thumb_func_start sub_8066448 sub_8066448: @ 8066448 push {r4,lr} - ldr r1, =gUnknown_0202406E - ldr r4, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r4, =gActiveBank ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA lsls r0, 9 adds r1, r3, 0x1 adds r0, r1 @@ -59154,7 +59154,7 @@ sub_8066448: @ 8066448 adds r1, r3 ldrb r1, [r1] bl sub_8066494 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -59180,10 +59180,10 @@ sub_8066494: @ 8066494 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r4, r6, 1 adds r4, r0 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -59218,7 +59218,7 @@ sub_8066494: @ 8066494 adds r1, r6, 0 bl sub_805DC0C adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -59246,10 +59246,10 @@ sub_8066494: @ 8066494 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds adds r4, r6, r4 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites mov r0, r10 ldrb r1, [r0] lsls r0, r1, 4 @@ -59342,8 +59342,8 @@ sub_8066494: @ 8066494 thumb_func_start sub_8066624 sub_8066624: @ 8066624 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -59359,7 +59359,7 @@ sub_8066624: @ 8066624 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -59368,13 +59368,13 @@ sub_8066624: @ 8066624 b _080666A8 .pool _0806666C: - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -59405,7 +59405,7 @@ sub_80666BC: @ 80666BC push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -59457,7 +59457,7 @@ _08066712: adds r1, r2, 0 movs r3, 0x2 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -59482,9 +59482,9 @@ sub_8066748: @ 8066748 ands r0, r1 cmp r0, 0 beq _08066840 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 ands r1, r0 movs r7, 0xC8 @@ -59715,11 +59715,11 @@ _08066948: lsrs r0, 16 _0806694C: mov r8, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] bl sub_805DF38 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -59748,11 +59748,11 @@ _0806694C: mov r1, r9 adds r2, r4, 0 bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -59809,7 +59809,7 @@ _0806694C: adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -59829,7 +59829,7 @@ sub_8066A58: @ 8066A58 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] cmp r0, 0x1 bne _08066A74 @@ -59844,11 +59844,11 @@ _08066A76: lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] bl sub_805DF38 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -59870,11 +59870,11 @@ _08066A76: movs r1, 0xB0 movs r3, 0x1E bl AddObjectToFront - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds ldrb r1, [r6] adds r1, r5 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -59941,7 +59941,7 @@ _08066A76: adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -59959,15 +59959,15 @@ _08066A76: thumb_func_start sub_8066B94 sub_8066B94: @ 8066B94 push {r4-r6,lr} - ldr r6, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -60018,7 +60018,7 @@ sub_8066B94: @ 8066B94 adds r0, r5 ldr r1, =DummyObjectCallback bl oamt_set_x3A_32 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -60035,7 +60035,7 @@ sub_8066C40: @ 8066C40 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -60082,8 +60082,8 @@ _08066C94: movs r0, 0x10 movs r1, 0x3F bl audio_play_and_stuff - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -60094,7 +60094,7 @@ _08066C94: adds r0, r2 ldr r1, =sub_8039934 str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -60144,7 +60144,7 @@ sub_8066D1C: @ 8066D1C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -60152,7 +60152,7 @@ sub_8066D1C: @ 8066D1C beq _08066D32 b _08066E58 _08066D32: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA mov r12, r0 ldrb r1, [r5] lsls r1, 9 @@ -60269,7 +60269,7 @@ _08066E30: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -60295,8 +60295,8 @@ sub_8066E70: @ 8066E70 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r6, =gActiveBank ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -60423,7 +60423,7 @@ _08066F32: _08066F80: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -60480,7 +60480,7 @@ sub_8066FF4: @ 8066FF4 strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r4, [r5] lsls r4, 9 ldr r0, =gUnknown_02023066 @@ -60490,7 +60490,7 @@ sub_8066FF4: @ 8066FF4 ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -60569,8 +60569,8 @@ sub_80670A0: @ 80670A0 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r0, =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -60587,7 +60587,7 @@ sub_80670A0: @ 80670A0 ldr r0, =0x00007fff cmp r7, r0 beq _08067130 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -60619,7 +60619,7 @@ sub_80670A0: @ 80670A0 b _0806715A .pool _08067130: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -60639,8 +60639,8 @@ _08067130: movs r3, 0 bl sub_807294C _0806715A: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -60667,7 +60667,7 @@ sub_8067190: @ 8067190 thumb_func_start sub_806719C sub_806719C: @ 806719C push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -60677,7 +60677,7 @@ sub_806719C: @ 806719C ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -60700,7 +60700,7 @@ sub_806719C: @ 806719C negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -60716,13 +60716,13 @@ _080671F0: thumb_func_start sub_8067214 sub_8067214: @ 8067214 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08067264 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -60747,7 +60747,7 @@ sub_8067214: @ 8067214 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -60851,8 +60851,8 @@ sub_80672E8: @ 80672E8 sub_8067304: @ 8067304 push {lr} ldr r3, =gUnknown_02022D0C - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -60910,9 +60910,9 @@ sub_8067354: @ 8067354 thumb_func_start sub_806737C sub_806737C: @ 806737C push {r4,lr} - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -60929,7 +60929,7 @@ sub_806737C: @ 806737C b _080673DA .pool _080673B0: - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -60943,7 +60943,7 @@ _080673B0: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -60967,16 +60967,16 @@ sub_80673EC: @ 80673EC thumb_func_start sub_80673F8 sub_80673F8: @ 80673F8 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _0806740C movs r3, 0xC0 _0806740C: - ldr r2, =gUnknown_02023064 + ldr r2, =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -61000,8 +61000,8 @@ _0806740C: thumb_func_start sub_806743C sub_806743C: @ 806743C push {r4,r5,lr} - ldr r4, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -61043,8 +61043,8 @@ _0806748C: thumb_func_start sub_8067498 sub_8067498: @ 8067498 push {lr} - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -61069,8 +61069,8 @@ sub_8067498: @ 8067498 thumb_func_start sub_80674D4 sub_80674D4: @ 80674D4 push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -61091,15 +61091,15 @@ sub_80674D4: @ 80674D4 thumb_func_start sub_8067508 sub_8067508: @ 8067508 push {r4-r6,lr} - ldr r5, =gUnknown_020241E4 - ldr r6, =gUnknown_02024064 + ldr r5, =gBankSpriteIds + ldr r6, =gActiveBank ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -61191,7 +61191,7 @@ _080675CA: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -61212,7 +61212,7 @@ c3_08038DC4: @ 8067618 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r0, [r7] mov r9, r0 ldr r1, =gTasks @@ -61234,12 +61234,12 @@ c3_08038DC4: @ 8067618 cmp r0, 0 beq _08067684 _08067652: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -61250,12 +61250,12 @@ _08067652: b _080676C4 .pool _08067684: - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -61281,8 +61281,8 @@ _08067684: eors r0, r5 strb r0, [r7] _080676C4: - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -61319,8 +61319,8 @@ sub_80676FC: @ 80676FC thumb_func_start sub_8067718 sub_8067718: @ 8067718 push {r4-r7,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -61329,7 +61329,7 @@ sub_8067718: @ 8067718 cmp r0, 0 beq _08067748 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08067748 @@ -61339,7 +61339,7 @@ sub_8067718: @ 8067718 _08067748: ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -61350,7 +61350,7 @@ _08067748: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - ldr r1, =gUnknown_02023064 + ldr r1, =gBattleBufferA ldrb r2, [r3] lsls r0, r2, 9 adds r1, 0x2 @@ -61428,7 +61428,7 @@ _080677B4: movs r1, 0x5D strb r1, [r0, 0x5] _08067806: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r7] lsls r1, 2 adds r1, r0 @@ -61446,7 +61446,7 @@ sub_806782C: @ 806782C push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -61482,7 +61482,7 @@ sub_8067874: @ 8067874 push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -61522,14 +61522,14 @@ sub_80678C4: @ 80678C4 thumb_func_start sub_80678D0 sub_80678D0: @ 80678D0 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _08067916 - ldr r3, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r0, =gBankSpriteIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -61537,7 +61537,7 @@ sub_80678D0: @ 80678D0 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -61566,13 +61566,13 @@ _08067916: sub_8067930: @ 8067930 push {r4-r6,lr} sub sp, 0x4 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08067992 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r2, [r5] lsls r1, r2, 9 adds r0, r4, 0x1 @@ -61598,7 +61598,7 @@ sub_8067930: @ 8067930 b _0806798C .pool _08067980: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -61618,7 +61618,7 @@ _08067992: thumb_func_start sub_80679A4 sub_80679A4: @ 80679A4 push {lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r1, =gUnknown_02023066 @@ -61641,7 +61641,7 @@ sub_80679C4: @ 80679C4 thumb_func_start sub_80679D0 sub_80679D0: @ 80679D0 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 9 ldr r4, =gUnknown_02023068 @@ -61654,20 +61654,20 @@ sub_80679D0: @ 80679D0 ldrb r2, [r0] cmp r2, 0x3 bne _08067A00 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome strb r2, [r0] b _08067A08 .pool _08067A00: - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome movs r1, 0x3 eors r1, r2 strb r1, [r0] _08067A08: ldr r0, =gSaveBlock2Ptr ldr r3, [r0] - ldr r1, =gUnknown_02023064 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 adds r1, 0x2 @@ -61689,7 +61689,7 @@ _08067A08: movs r0, 0x3 bl BeginFastPaletteFade bl sub_8065068 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 diff --git a/asm/rom_8072304.s b/asm/rom_8072304.s index 4f55c9577..05a2d44ed 100644 --- a/asm/rom_8072304.s +++ b/asm/rom_8072304.s @@ -279,7 +279,7 @@ battle_make_oam_normal_battle: @ 80724DC cmp r0, 0 bne _080725F0 mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08072574 @@ -298,7 +298,7 @@ battle_make_oam_normal_battle: @ 80724DC bl AddObjectToBack lsls r0, 24 lsrs r7, r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -344,7 +344,7 @@ _08072574: bl AddObjectToBack lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r7, 4 adds r2, r7 lsls r2, 2 @@ -363,7 +363,7 @@ _08072574: movs r0, 0x2 str r0, [sp] _080725BA: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -382,12 +382,12 @@ _080725BA: .pool _080725F0: mov r0, r10 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08072694 mov r0, r10 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 25 @@ -403,7 +403,7 @@ _080725F0: lsls r0, 24 lsrs r6, r0, 24 mov r0, r10 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 25 @@ -417,7 +417,7 @@ _080725F0: bl AddObjectToBack lsls r0, 24 lsrs r7, r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -451,7 +451,7 @@ _080725F0: .pool _08072694: mov r0, r10 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 25 @@ -467,7 +467,7 @@ _08072694: lsls r0, 24 lsrs r6, r0, 24 mov r0, r10 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 25 @@ -481,7 +481,7 @@ _08072694: bl AddObjectToBack lsls r0, 24 lsrs r7, r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -514,7 +514,7 @@ _08072694: _08072716: str r0, [sp] _08072718: - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide add r0, r10 ldrb r1, [r0] lsls r0, r1, 1 @@ -532,11 +532,11 @@ _08072718: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 add r4, r8 mov r0, r10 - bl battle_side_get_owner + bl GetBankSide adds r1, r0, 0 lsls r1, 24 lsrs r1, 21 @@ -632,7 +632,7 @@ battle_make_oam_safari_battle: @ 8072804 bl AddObjectToBack lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 lsls r4, r6, 4 adds r4, r6 @@ -707,7 +707,7 @@ sub_80728B4: @ 80728B4 bgt _080728F8 cmp r0, 0 bne _080728F8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -717,7 +717,7 @@ sub_80728B4: @ 80728B4 b _08072906 .pool _080728E4: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -727,7 +727,7 @@ _080728E4: b _08072906 .pool _080728F8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -756,7 +756,7 @@ sub_8072924: @ 8072924 ldrh r1, [r0, 0x38] lsls r1, 24 lsrs r1, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r2, r1, 4 adds r2, r1 lsls r2, 2 @@ -807,7 +807,7 @@ sub_8072984: @ 8072984 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -848,7 +848,7 @@ sub_80729D0: @ 80729D0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -892,7 +892,7 @@ sub_8072A24: @ 8072A24 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -910,7 +910,7 @@ sub_8072A44: @ 8072A44 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -950,12 +950,12 @@ sub_8072A88: @ 8072A88 lsls r0, 24 lsrs r0, 24 movs r6, 0 - ldr r1, =gUnknown_0202406C + ldr r1, =gNoOfAllBanks mov r8, r1 ldrb r2, [r1] cmp r6, r2 bge _08072B00 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r12, r1 movs r1, 0x3 ands r0, r1 @@ -1026,7 +1026,7 @@ sub_8072B18: @ 8072B18 cmp r0, 0 bne _08072B44 adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08072B3E @@ -1039,7 +1039,7 @@ _08072B3E: b _08072B7C _08072B44: adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1117,7 +1117,7 @@ healthbar_draw_level: @ 8072B94 movs r3, 0x2 bl write_to_rbox adds r5, r0, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1128,7 +1128,7 @@ healthbar_draw_level: @ 8072B94 ldrh r0, [r1, 0x3A] lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08072C18 @@ -1175,7 +1175,7 @@ heathbar_draw_hp: @ 8072C38 lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -1183,7 +1183,7 @@ heathbar_draw_hp: @ 8072C38 ldrh r0, [r4, 0x3A] lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08072D10 @@ -1259,7 +1259,7 @@ _08072D10: add r0, sp, 0x4 movs r2, 0x14 bl memcpy - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r4, r7, 4 adds r0, r4, r7 lsls r0, 2 @@ -1274,7 +1274,7 @@ _08072D10: cmp r0, 0x1 beq _08072D46 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1292,7 +1292,7 @@ _08072D60: ldrh r0, [r6, 0x3A] lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08072D7C @@ -1327,7 +1327,7 @@ _08072D86: add r2, sp, 0x4 bl RenderTextFont9 movs r4, 0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r2, r10 adds r0, r2, r7 lsls r0, 2 @@ -1386,7 +1386,7 @@ sub_8072E0C: @ 8072E0C lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r0, 4 add r0, r9 lsls r0, 2 @@ -1394,7 +1394,7 @@ sub_8072E0C: @ 8072E0C ldrh r0, [r7, 0x3A] lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08072F28 @@ -1616,7 +1616,7 @@ _08073024: adds r0, r1 ldr r0, [r0] adds r0, 0xE0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -1642,13 +1642,13 @@ _08073024: .pool _08073084: ldr r0, [sp, 0x2C] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080730B8 movs r0, 0x74 bl sub_80728A4 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r3, r9 lsls r1, r3, 4 add r1, r9 @@ -1692,7 +1692,7 @@ sub_80730D4: @ 80730D4 mov r0, sp movs r2, 0x14 bl memcpy - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites ldr r2, [sp, 0x14] lsls r0, r2, 4 adds r0, r2 @@ -1701,7 +1701,7 @@ sub_80730D4: @ 80730D4 ldrh r0, [r0, 0x3A] lsls r0, 24 lsrs r0, 24 - bl battle_get_per_side_status + bl GetBankIdentity ldr r1, =gUnknown_020244D4 ldr r2, [r1] movs r3, 0xBA @@ -1798,7 +1798,7 @@ _080731AA: mov r9, r1 cmp r7, r9 bge _08073236 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites ldr r2, =0x04000008 mov r10, r2 ldr r3, [sp, 0x14] @@ -1847,7 +1847,7 @@ _080731F6: cmp r7, r9 blt _080731E6 _08073236: - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r3, [sp, 0x18] ldr r1, [sp, 0x14] adds r0, r3, r1 @@ -1856,7 +1856,7 @@ _08073236: ldrh r4, [r0, 0x38] lsls r4, 24 lsrs r4, 24 - ldr r5, =gUnknown_0202449C + ldr r5, =gBattleStruct ldr r0, [r5] adds r0, 0x7C ldrb r1, [r0] @@ -1955,15 +1955,15 @@ sub_8073314: @ 8073314 sub sp, 0x4 movs r0, 0 mov r9, r0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r9, r0 blt _0807332E b _080735BA _0807332E: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r10, r1 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID mov r8, r2 _08073336: ldr r0, =gUnknown_03005D70 @@ -1986,7 +1986,7 @@ _08073354: lsls r0, r2, 24 lsrs r7, r0, 24 adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1998,7 +1998,7 @@ _0807336A: cmp r0, 0 bne _08073382 adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08073382 @@ -2032,7 +2032,7 @@ _08073382: lsls r0, 27 lsrs r4, r0, 31 adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080734B0 @@ -2240,7 +2240,7 @@ _080735A8: add r8, r0 movs r1, 0x1 add r9, r1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r9, r0 bge _080735BA @@ -2277,14 +2277,14 @@ sub_80735DC: @ 80735DC str r3, [sp, 0x10] cmp r4, 0 beq _0807360C - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _0807365C _0807360C: ldr r0, [sp, 0x8] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08073630 @@ -2358,7 +2358,7 @@ _0807366C: ldr r1, [sp, 0x14] adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r7, r0, r1 ldr r1, =gUnknown_0832C2C4 adds r0, r7, 0 @@ -2391,7 +2391,7 @@ _08073700: _08073706: movs r0, 0 mov r8, r0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r10, r1 mov r7, sp mov r2, r9 @@ -2425,7 +2425,7 @@ _0807371C: ldr r0, =sub_80741C8 str r0, [r1] _0807374C: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites mov r3, r9 cmp r3, 0 bne _0807376E @@ -2532,7 +2532,7 @@ _0807380A: b _0807371C _0807382C: ldr r0, [sp, 0x8] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0807383A @@ -2546,7 +2546,7 @@ _0807383A: beq _080738F4 ldr r5, =0x0000ffff mov r10, r5 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r0, =0x000003ff adds r7, r0, 0 ldr r1, =0xfffffc00 @@ -2628,7 +2628,7 @@ _080738F4: movs r1, 0x5 mov r10, r1 movs r7, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r8, r2 ldr r3, =0x000003ff mov r9, r3 @@ -2690,7 +2690,7 @@ _08073970: ands r0, r1 cmp r0, 0 beq _080739B8 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] movs r2, 0xA8 lsls r2, 2 @@ -2751,7 +2751,7 @@ _080739E8: beq _08073AA4 ldr r1, =0x0000ffff mov r10, r1 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r2, =0x000003ff adds r7, r2, 0 ldr r3, =0xfffffc00 @@ -2834,7 +2834,7 @@ _08073AA4: movs r3, 0 mov r8, r3 movs r7, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites mov r9, r5 ldr r6, =0x000003ff mov r12, r6 @@ -2896,7 +2896,7 @@ _08073B20: ands r0, r1 cmp r0, 0 beq _08073B6C - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] ldr r3, =0x000002a1 adds r0, r3 @@ -3071,7 +3071,7 @@ _08073C5E: mov r1, r10 lsls r1, 4 str r1, [sp, 0x10] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r6, 0xD negs r6, r6 mov r12, r3 @@ -3117,7 +3117,7 @@ _08073CDA: _08073CE8: ldr r0, [sp, 0x8] str r3, [sp, 0x14] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 ldr r3, [sp, 0x14] @@ -3154,7 +3154,7 @@ _08073CE8: adds r0, r3 ldr r1, =sub_8074158 str r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r12, r2 b _08073D82 .pool @@ -3184,7 +3184,7 @@ _08073D4C: adds r0, r3 ldr r1, =sub_8074158 str r1, [r0] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r12, r0 _08073D82: adds r4, 0x1 @@ -3348,7 +3348,7 @@ _08073E96: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeResources mov r0, sp @@ -3364,7 +3364,7 @@ _08073EFC: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r4, r5 adds r0, r4, 0 bl obj_free_rotscale_entry @@ -3386,7 +3386,7 @@ _08073EFC: bl RemoveObjectAndFreeTiles _08073F32: movs r4, 0x1 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites _08073F36: mov r1, sp adds r0, r1, r4 @@ -3486,7 +3486,7 @@ _08073FE6: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeResources mov r0, sp @@ -3739,7 +3739,7 @@ sub_80741C8: @ 80741C8 ldrh r2, [r0, 0x2E] lsls r2, 24 lsrs r2, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -3822,7 +3822,7 @@ _08074272: movs r3, 0x2 bl write_to_rbox adds r6, r0, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -3833,7 +3833,7 @@ _08074272: ldrh r0, [r1, 0x3A] lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080742F0 @@ -3893,7 +3893,7 @@ sub_8074310: @ 8074310 ands r1, r0 cmp r1, 0 bne _080743E6 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -3902,11 +3902,11 @@ sub_8074310: @ 8074310 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080743E6 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -3984,7 +3984,7 @@ draw_status_ailment_maybe: @ 80743F8 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r2, r9 lsls r1, r2, 4 add r1, r9 @@ -3998,11 +3998,11 @@ draw_status_ailment_maybe: @ 80743F8 lsrs r0, 24 mov r10, r0 adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08074468 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -4024,7 +4024,7 @@ draw_status_ailment_maybe: @ 80743F8 b _08074484 .pool _08074468: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -4119,7 +4119,7 @@ _08074524: lsls r3, 16 mov r8, r3 lsls r7, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites add r0, r9 lsls r0, 2 adds r5, r0, r1 @@ -4151,7 +4151,7 @@ _08074542: bne _08074598 movs r0, 0x1 bl sub_80728A4 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r3, r10 lsls r1, r3, 4 add r1, r10 @@ -4175,7 +4175,7 @@ _080745B8: lsls r5, r1, 4 add r5, r9 lsls r5, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r5, r2 ldrb r4, [r5, 0x5] lsrs r4, 4 @@ -4216,7 +4216,7 @@ _080745B8: cmp r0, 0x1 beq _08074626 adds r0, r7, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4238,7 +4238,7 @@ _08074626: lsls r4, r3, 4 add r4, r10 lsls r4, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r1 ldrh r1, [r4, 0x4] lsls r1, 22 @@ -4383,7 +4383,7 @@ sub_8074770: @ 8074770 movs r3, 0x2 bl write_to_rbox adds r5, r0, 0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -4439,7 +4439,7 @@ sub_80747D8: @ 80747D8 movs r3, 0x2 bl write_to_rbox adds r5, r0, 0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -4481,7 +4481,7 @@ healthbar_draw_field_maybe: @ 8074860 lsrs r6, r0, 24 lsls r2, 24 lsrs r7, r2, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -4497,9 +4497,9 @@ healthbar_draw_field_maybe: @ 8074860 cmp r0, 0 bne _0807489C mov r0, r9 - bl battle_side_get_owner + bl GetBankSide _0807489C: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -4507,7 +4507,7 @@ _0807489C: ldrh r0, [r0, 0x3A] lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080748B8 @@ -4921,7 +4921,7 @@ _08074BB8: mov r9, r4 _08074BF4: movs r5, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 _08074BFA: ldr r0, =gUnknown_020244D0 @@ -5011,7 +5011,7 @@ _08074CA0: movs r4, 0x8 str r4, [sp, 0x4] bl sub_8074E8C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r6, 1 adds r0, r1 ldrh r1, [r0] @@ -5040,7 +5040,7 @@ _08074CE6: bls _08074CE6 _08074CF8: movs r5, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 adds r0, r7, r6 lsls r4, r0, 2 @@ -5766,7 +5766,7 @@ _0807524E: lsls r5, r0, 4 add r5, r8 lsls r5, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r5, r0 strh r4, [r5, 0x30] ldr r0, =gUnknown_0831C688 @@ -5791,7 +5791,7 @@ _0807524E: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 mov r0, r8 strh r0, [r1, 0x2E] @@ -5810,7 +5810,7 @@ _0807524E: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 mov r0, r8 strh r0, [r4, 0x2E] @@ -5832,7 +5832,7 @@ _0807524E: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 mov r0, r8 strh r0, [r4, 0x2E] @@ -5854,7 +5854,7 @@ _0807524E: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 mov r0, r8 strh r0, [r4, 0x2E] @@ -5919,7 +5919,7 @@ sub_80753B4: @ 80753B4 ands r0, r1 cmp r0, 0 beq _080753DE - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -5946,12 +5946,12 @@ sub_80753E8: @ 80753E8 lsrs r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -6016,11 +6016,11 @@ _08075488: mov r8, r0 ldrb r5, [r1, 0xE] adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080754B4 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -6030,7 +6030,7 @@ _08075488: b _080754C2 .pool _080754B4: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -6060,7 +6060,7 @@ _080754C2: bl AddObjectToFront lsls r0, 24 lsrs r7, r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r9, r2 lsls r0, r7, 4 adds r0, r7 @@ -6077,7 +6077,7 @@ _080754C2: beq _08075548 cmp r2, 0xFF bne _08075584 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget strb r5, [r0] movs r0, 0x18 strh r0, [r4, 0x20] @@ -6104,7 +6104,7 @@ _08075548: lsrs r0, 24 adds r0, 0x18 strh r0, [r4, 0x22] - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget strb r5, [r0] movs r3, 0 strh r3, [r4, 0x2E] @@ -6117,18 +6117,18 @@ _08075548: .pool _08075584: movs r0, 0x1 - bl battle_get_side_with_given_state - ldr r1, =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r1, =gBankTarget strb r0, [r1] movs r0, 0x1 str r0, [sp] _08075592: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r7, 4 adds r1, r7 lsls r1, 2 adds r4, r1, r0 - ldr r5, =gEnemyMonIndex + ldr r5, =gBankTarget ldrb r0, [r5] strh r0, [r4, 0x3A] ldr r2, [sp] @@ -6292,7 +6292,7 @@ sub_80756E0: @ 80756E0 strh r7, [r6, 0x38] ldr r0, =sub_807574C str r0, [r6, 0x1C] - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r5 @@ -6300,7 +6300,7 @@ sub_80756E0: @ 80756E0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 movs r1, 0x2 bl StartObjectRotScalAnim @@ -6343,8 +6343,8 @@ sub_807574C: @ 807574C movs r0, 0x3C bl audio_play _08075764: - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds movs r1, 0x3A ldrsh r0, [r4, r1] adds r0, r5 @@ -6845,7 +6845,7 @@ _08075B04: .4byte _08075C7E .4byte _08075CA8 _08075B88: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -7095,11 +7095,11 @@ sub_8075D14: @ 8075D14 b _08075EF4 _08075D88: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08075DC0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r2, r5, 1 adds r0, r2, r0 ldrh r1, [r0] @@ -7112,7 +7112,7 @@ _08075D88: b _08075DD4 .pool _08075DC0: - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r2, r5, 1 adds r0, r2, r0 ldrh r1, [r0] @@ -7131,13 +7131,13 @@ _08075DD4: lsrs r0, 16 mov r9, r0 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r5, r0 beq _08075E00 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r5, r0 @@ -7193,13 +7193,13 @@ _08075E70: .pool _08075E80: movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r5, r0 beq _08075E9C movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r5, r0 @@ -7240,7 +7240,7 @@ _08075EA2: strh r0, [r1, 0xA] strh r4, [r1, 0xC] strh r5, [r1, 0xE] - ldr r2, =gUnknown_020241E4 + ldr r2, =gBankSpriteIds movs r4, 0x3A ldrsh r0, [r6, r4] adds r0, r2 @@ -7251,7 +7251,7 @@ _08075EA2: strh r7, [r1, 0x14] strh r3, [r1, 0x26] _08075EF4: - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r4 @@ -7259,14 +7259,14 @@ _08075EF4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 movs r1, 0x1 bl StartObjectRotScalAnim ldrh r0, [r6, 0x3A] lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -7298,7 +7298,7 @@ _08075F50: ldr r1, =sub_8039E44 _08075F66: str r1, [r0] - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds movs r2, 0x3A ldrsh r0, [r6, r2] adds r0, r5 @@ -7306,7 +7306,7 @@ _08075F66: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl AnimateObject movs r1, 0x3A @@ -7357,8 +7357,8 @@ sub_8075FD4: @ 8075FD4 ldrh r0, [r5, 0x3A] lsls r0, 24 lsrs r6, r0, 24 - ldr r4, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r4, =gSprites + ldr r0, =gBankSpriteIds adds r3, r6, r0 ldrb r1, [r3] lsls r0, r1, 4 @@ -7427,8 +7427,8 @@ _0807605C: beq _080760DE cmp r7, 0 beq _080760DE - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r6, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -7438,7 +7438,7 @@ _0807605C: movs r2, 0 movs r1, 0 strh r1, [r0, 0x26] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r2, [r0] ldr r4, =gUnknown_020244D0 ldr r0, [r4] @@ -7506,7 +7506,7 @@ sub_80760F8: @ 80760F8 beq _08076196 cmp r1, 0x5F bne _08076130 - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim movs r1, 0 strb r1, [r0] bl m4aMPlayAllStop @@ -7518,8 +7518,8 @@ _08076130: ldr r0, =0x0000013b cmp r1, r0 bne _08076196 - ldr r5, =gUnknown_02020630 - ldr r4, =gUnknown_020241E4 + ldr r5, =gSprites + ldr r4, =gBankSpriteIds movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r4 @@ -7762,7 +7762,7 @@ _080762F8: movs r0, 0x3A ldrsh r4, [r5, r0] movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -7835,7 +7835,7 @@ sub_8076398: @ 8076398 movs r0, 0x3A ldrsh r4, [r5, r0] movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -7939,7 +7939,7 @@ sub_8076438: @ 8076438 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 lsls r4, r0, 4 adds r4, r0 @@ -8060,7 +8060,7 @@ _08076560: strh r0, [r6, 0x30] ldr r0, =sub_80765E0 str r0, [r6, 0x1C] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -8121,7 +8121,7 @@ sub_80765E0: @ 80765E0 orrs r0, r1 strb r0, [r2] _08076610: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r6, 4 adds r0, r2, r6 lsls r0, 2 @@ -8178,7 +8178,7 @@ _08076668: ldrsh r0, [r4, r3] cmp r0, 0x7F bgt _080766AC - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable lsls r0, r2, 24 lsrs r0, 23 adds r0, r1 @@ -8219,7 +8219,7 @@ _080766BA: beq _0807670E cmp r7, 0 beq _0807670E - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r3, r8 adds r0, r3, r6 lsls r0, 2 @@ -8300,7 +8300,7 @@ sub_807671C: @ 807671C bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -8401,7 +8401,7 @@ _08076810: lsls r4, r7, 4 adds r4, r7 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r4, 0 movs r1, 0x2 @@ -8439,7 +8439,7 @@ _08076894: ldrh r1, [r5, 0x2E] lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -8518,7 +8518,7 @@ sub_8076918: @ 8076918 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r4, r0, r6 movs r1, 0 movs r0, 0x5 @@ -8530,7 +8530,7 @@ sub_8076918: @ 8076918 ldr r0, =sub_80769CC str r0, [r4, 0x1C] adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08076966 @@ -8559,7 +8559,7 @@ _08076966: ldr r1, [r1] bl _call_via_r1 adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -8628,7 +8628,7 @@ sub_80769F4: @ 80769F4 bl CreateInvisibleSpriteWithCallback lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -8655,7 +8655,7 @@ oamc_804BEB4: @ 8076A38 ldrh r1, [r3, 0x30] lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -8757,11 +8757,11 @@ sub_8076B14: @ 8076B14 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08076B40 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -8771,7 +8771,7 @@ sub_8076B14: @ 8076B14 b _08076B4E .pool _08076B40: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] diff --git a/asm/rom_80A5C6C.s b/asm/rom_80A5C6C.s index c6abfe2c4..49e166a96 100644 --- a/asm/rom_80A5C6C.s +++ b/asm/rom_80A5C6C.s @@ -40,7 +40,7 @@ _080A5C9C: _080A5CB0: ldr r4, =gUnknown_08525F58 adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 22 ldr r1, =gBattleTypeFlags @@ -56,7 +56,7 @@ _080A5CB0: _080A5CD8: ldr r4, =gUnknown_08525F58 adds r0, r5, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 22 ldr r1, =gBattleTypeFlags @@ -90,7 +90,7 @@ _080A5D24: b _080A5D9A _080A5D28: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A5D60 @@ -102,7 +102,7 @@ _080A5D28: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A5D98 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -120,7 +120,7 @@ _080A5D60: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A5D98 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -164,7 +164,7 @@ sub_80A5DB8: @ 80A5DB8 lsls r1, 16 lsrs r5, r1, 16 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A5DDA @@ -203,7 +203,7 @@ _080A5E04: ldrh r0, [r0, 0x2] cmp r0, 0 bne _080A5E3C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -293,7 +293,7 @@ _080A5EC8: ldrh r0, [r0, 0x2] cmp r0, 0 bne _080A5F04 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -394,7 +394,7 @@ sub_80A5FA0: @ 80A5FA0 adds r7, r4, 0 movs r5, 0 adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -445,7 +445,7 @@ sub_80A600C: @ 80A600C lsls r2, 24 lsrs r7, r2, 24 adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A6030 @@ -476,7 +476,7 @@ _080A603E: lsrs r4, r0, 16 _080A605C: adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity ldr r3, =gUnknown_08525F58 lsls r0, 24 lsrs r0, 22 @@ -494,7 +494,7 @@ _080A605C: cmp r7, 0 beq _080A609C adds r0, r6, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A6096 @@ -605,7 +605,7 @@ sub_80A614C: @ 80A614C lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A6170 @@ -650,7 +650,7 @@ sub_80A6190: @ 80A6190 cmp r0, 0 bne _080A6238 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A61E4 @@ -662,7 +662,7 @@ sub_80A6190: @ 80A6190 ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A621C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -680,7 +680,7 @@ _080A61E4: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A621C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -699,7 +699,7 @@ _080A621C: ldrh r4, [r1, 0x2] _080A621E: adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A6238 @@ -730,7 +730,7 @@ obj_id_for_side_relative_to_move: @ 80A6240 lsls r0, 24 cmp r0, 0 beq _080A62B6 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldrb r0, [r4] b _080A62C6 .pool @@ -743,7 +743,7 @@ _080A6268: lsls r0, 24 cmp r0, 0 beq _080A62B6 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldrb r0, [r4] b _080A62C6 .pool @@ -774,7 +774,7 @@ _080A62B6: b _080A62CA .pool _080A62C0: - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldrb r0, [r5] eors r0, r4 _080A62C6: @@ -1274,7 +1274,7 @@ sub_80A6630: @ 80A6630 ble _080A6674 subs r0, r1, 0x1 strh r0, [r3, 0x2E] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r4, 0x34 ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -1325,7 +1325,7 @@ sub_80A6680: @ 80A6680 ldrh r2, [r4, 0x36] adds r0, r2 strh r0, [r4, 0x36] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x38 ldrsh r2, [r4, r0] lsls r0, r2, 4 @@ -1596,7 +1596,7 @@ sub_80A6864: @ 80A6864 .pool _080A68A4: ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A68BC @@ -1806,41 +1806,41 @@ _080A6A04: .pool thumb_func_end sub_80A69CC - thumb_func_start battle_side_get_owner -battle_side_get_owner: @ 80A6A30 + thumb_func_start GetBankSide +GetBankSide: @ 80A6A30 lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide adds r0, r1 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 bx lr .pool - thumb_func_end battle_side_get_owner + thumb_func_end GetBankSide - thumb_func_start battle_get_per_side_status -battle_get_per_side_status: @ 80A6A44 + thumb_func_start GetBankIdentity +GetBankIdentity: @ 80A6A44 lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02024076 + ldr r1, =gBanksBySide adds r0, r1 ldrb r0, [r0] bx lr .pool - thumb_func_end battle_get_per_side_status + thumb_func_end GetBankIdentity - thumb_func_start battle_get_side_with_given_state -battle_get_side_with_given_state: @ 80A6A54 + thumb_func_start GetBankByPlayerAI +GetBankByPlayerAI: @ 80A6A54 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 movs r1, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r2, [r0] cmp r1, r2 bcs _080A6A7E - ldr r4, =gUnknown_02024076 + ldr r4, =gBanksBySide ldrb r0, [r4] cmp r0, r3 beq _080A6A7E @@ -1860,7 +1860,7 @@ _080A6A7E: pop {r1} bx r1 .pool - thumb_func_end battle_get_side_with_given_state + thumb_func_end GetBankByPlayerAI thumb_func_start sub_80A6A90 sub_80A6A90: @ 80A6A90 @@ -1883,17 +1883,17 @@ sub_80A6A90: @ 80A6A90 b _080A6B18 .pool _080A6ABC: - ldr r0, =gUnknown_02024076 + ldr r0, =gBanksBySide adds r0, r4, r0 ldrb r0, [r0] cmp r0, 0xFF beq _080A6B18 adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A6AF0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -1903,7 +1903,7 @@ _080A6ABC: b _080A6AFE .pool _080A6AF0: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -2063,7 +2063,7 @@ sub_80A6BFC: @ 80A6BFC _080A6C30: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 @@ -2848,7 +2848,7 @@ obj_id_set_rotscale: @ 80A71B4 orrs r1, r0 str r1, [sp] _080A71F0: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -2887,7 +2887,7 @@ sub_80A7238: @ 80A7238 lsls r0, 24 cmp r0, 0 beq _080A7268 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -2921,7 +2921,7 @@ sub_80A7270: @ 80A7270 lsls r1, 24 lsrs r1, 24 mov r8, r1 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -2947,7 +2947,7 @@ _080A72A6: ands r0, r1 strb r0, [r2] _080A72B4: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r4, r6, 4 adds r0, r4, r6 lsls r0, 2 @@ -2994,7 +2994,7 @@ _080A72B4: orrs r0, r1 strb r0, [r5, 0x3] _080A7312: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r4, r6 lsls r0, 2 adds r0, r1 @@ -3028,7 +3028,7 @@ sub_80A7344: @ 80A7344 adds r1, r2, 0 movs r3, 0 bl obj_id_set_rotscale - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -3067,7 +3067,7 @@ sub_80A73A0: @ 80A73A0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -3496,7 +3496,7 @@ _080A76F2: cmp r5, 0 beq _080A771A movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 bl b_side_obj__get_some_boolean @@ -3504,7 +3504,7 @@ _080A76F2: cmp r0, 0 beq _080A771A movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -3514,7 +3514,7 @@ _080A771A: cmp r6, 0 beq _080A7746 movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 bl b_side_obj__get_some_boolean @@ -3522,7 +3522,7 @@ _080A771A: cmp r0, 0 beq _080A7746 movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 @@ -3534,7 +3534,7 @@ _080A7746: cmp r7, 0 beq _080A7772 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 bl b_side_obj__get_some_boolean @@ -3542,7 +3542,7 @@ _080A7746: cmp r0, 0 beq _080A7772 movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 @@ -3555,7 +3555,7 @@ _080A7772: cmp r0, 0 beq _080A77A0 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 bl b_side_obj__get_some_boolean @@ -3563,7 +3563,7 @@ _080A7772: cmp r0, 0 beq _080A77A0 movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 adds r1, r0, 0 @@ -3592,7 +3592,7 @@ sub_80A77B4: @ 80A77B4 push {lr} lsls r0, 24 lsrs r0, 24 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r0, 24 pop {r1} @@ -3672,7 +3672,7 @@ _080A7842: bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A785C @@ -3718,7 +3718,7 @@ sub_80A78AC: @ 80A78AC bl sub_80A69CC ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A78CC @@ -3811,7 +3811,7 @@ _080A7976: ldrb r6, [r0] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A798E @@ -3864,7 +3864,7 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: @ 80A79E8 cmp r1, 0xFF beq _080A7A52 movs r6, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r1, r0, 2 @@ -4099,7 +4099,7 @@ _080A7BBC: adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -4413,7 +4413,7 @@ _080A7E34: strh r0, [r4, 0x16] b _080A7E62 _080A7E3C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -4451,7 +4451,7 @@ sub_80A7E6C: @ 80A7E6C lsrs r0, 15 movs r1, 0x40 subs r5, r1, r0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -4495,7 +4495,7 @@ sub_80A7EC0: @ 80A7EC0 lsrs r0, 15 movs r1, 0x40 subs r5, r1, r0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -4530,7 +4530,7 @@ sub_80A7F18: @ 80A7F18 push {r4-r7,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -4539,7 +4539,7 @@ sub_80A7F18: @ 80A7F18 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r7, =0x00000181 ldr r0, =gUnknown_020244E4 adds r6, r5, r0 @@ -4567,7 +4567,7 @@ _080A7F42: _080A7F78: lsls r0, r4, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A7FD8 @@ -4579,7 +4579,7 @@ _080A7F78: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A7FC0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -4614,7 +4614,7 @@ _080A7FD8: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A8010 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -4785,7 +4785,7 @@ _080A80FA: bl sub_80A7E6C b _080A8134 _080A8124: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -4843,8 +4843,8 @@ sub_80A8174: @ 80A8174 lsls r0, 24 cmp r0, 0 beq _080A81B4 - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -4870,8 +4870,8 @@ _080A81B4: lsls r0, 24 cmp r0, 0 beq _080A81EC - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds mov r3, r8 ldrb r0, [r3] adds r0, r1 @@ -4898,8 +4898,8 @@ _080A81EC: lsls r0, 24 cmp r0, 0 beq _080A8224 - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r6] eors r0, r5 adds r0, r1 @@ -4926,8 +4926,8 @@ _080A8224: lsls r0, 24 cmp r0, 0 beq _080A825C - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds mov r3, r8 ldrb r0, [r3] eors r0, r5 @@ -4959,11 +4959,11 @@ _080A825C: sub_80A8278: @ 80A8278 push {r4-r6,lr} movs r5, 0 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 bge _080A82D2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites _080A8286: lsls r0, r5, 24 lsrs r4, r0, 24 @@ -4974,7 +4974,7 @@ _080A8286: beq _080A82C8 adds r0, r4, 0 bl sub_80A82E4 - ldr r3, =gUnknown_020241E4 + ldr r3, =gBankSpriteIds adds r3, r5, r3 ldrb r2, [r3] lsls r1, r2, 4 @@ -4998,7 +4998,7 @@ _080A8286: strb r2, [r0, 0x5] _080A82C8: adds r5, 0x1 - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r5, r0 blt _080A8286 @@ -5027,7 +5027,7 @@ _080A82FC: b _080A8320 _080A8300: adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 movs r1, 0x1E @@ -5053,7 +5053,7 @@ sub_80A8328: @ 80A8328 push {r4,lr} lsls r0, 24 lsrs r0, 24 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r4, r0, 24 bl sub_80A4DF0 @@ -5083,8 +5083,8 @@ _080A835C: bx r1 thumb_func_end sub_80A8328 - thumb_func_start battle_get_per_side_status_permutated -battle_get_per_side_status_permutated: @ 80A8364 + thumb_func_start GetBankIdentity_permutated +GetBankIdentity_permutated: @ 80A8364 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -5093,7 +5093,7 @@ battle_get_per_side_status_permutated: @ 80A8364 cmp r0, 0 bne _080A838A adds r0, r4, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5109,7 +5109,7 @@ _080A838C: pop {r4} pop {r1} bx r1 - thumb_func_end battle_get_per_side_status_permutated + thumb_func_end GetBankIdentity_permutated thumb_func_start sub_80A8394 sub_80A8394: @ 80A8394 @@ -5367,7 +5367,7 @@ _080A85B2: lsls r0, 24 cmp r0, 0 beq _080A85EE - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -5486,7 +5486,7 @@ _080A86AC: .pool _080A86C4: mov r0, r8 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A8790 @@ -5499,7 +5499,7 @@ _080A86C4: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A871C - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r1, r8 lsls r4, r1, 1 adds r4, r0 @@ -5589,7 +5589,7 @@ _080A8790: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A87DC - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r1, r8 lsls r4, r1, 1 adds r4, r0 @@ -5876,7 +5876,7 @@ sub_80A89C8: @ 80A89C8 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r9, r0 mov r0, r8 lsls r3, r0, 4 @@ -5943,7 +5943,7 @@ sub_80A8A6C: @ 80A8A6C bl sub_80A6838 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A8AAC @@ -6000,7 +6000,7 @@ sub_80A8AEC: @ 80A8AEC adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A8B1C @@ -6056,7 +6056,7 @@ sub_80A8B64: @ 80A8B64 bl sub_80A6838 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080A8B90 @@ -6108,7 +6108,7 @@ sub_80A8BC4: @ 80A8BC4 strh r0, [r5, 0x8] ldr r7, =gUnknown_02038436 ldrb r0, [r7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r1, 0x8 cmp r0, 0 @@ -6120,7 +6120,7 @@ _080A8BF8: strh r1, [r5, 0xA] strh r6, [r5, 0xC] strh r6, [r5, 0xE] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -6219,7 +6219,7 @@ _080A8CDA: adds r0, r4, 0 adds r1, r5, 0 bl sub_80A8D78 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6244,7 +6244,7 @@ _080A8D10: adds r0, r4, 0 adds r1, r5, 0 bl sub_80A8D78 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6307,7 +6307,7 @@ sub_80A8D78: @ 80A8D78 asrs r0, 16 cmp r0, 0 blt _080A8DE8 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -6403,7 +6403,7 @@ sub_80A8E30: @ 80A8E30 lsrs r0, 24 strh r0, [r5, 0x22] ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A8E68 @@ -6489,7 +6489,7 @@ sub_80A8EE4: @ 80A8EE4 strh r0, [r4, 0x36] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080A8F24 diff --git a/asm/rom_80C6FA0.s b/asm/rom_80C6FA0.s index 519a8ddcf..03d63f372 100644 --- a/asm/rom_80C6FA0.s +++ b/asm/rom_80C6FA0.s @@ -1302,7 +1302,7 @@ sub_80C7958: @ 80C7958 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r3] ldrb r2, [r4, 0x1] @@ -1343,7 +1343,7 @@ _080C7A10: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r1, r0, r1 str r1, [r2] movs r5, 0 @@ -5477,7 +5477,7 @@ sub_80C9F6C: @ 80C9F6C adds r0, r1 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData b _080C9FB6 .pool _080C9FAC: @@ -5743,7 +5743,7 @@ _080CA1DA: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2] adds r0, r4, 0x1 @@ -5964,7 +5964,7 @@ _080CA3C4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r3] lsls r0, r4, 4 @@ -9147,7 +9147,7 @@ _080CBE18: ldr r0, [r4] ldr r0, [r0] mov r8, r0 - ldr r5, =gUnknown_08329F40 + ldr r5, =gSineTable mov r0, r9 adds r1, r3, r0 ldrb r0, [r1] @@ -9722,7 +9722,7 @@ sub_80CC230: @ 80CC230 lsrs r2, r0, 24 cmp r2, 0x40 beq _080CC2FC - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -10879,7 +10879,7 @@ _080CCC70: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r2] lsls r1, r4, 24 @@ -11071,7 +11071,7 @@ _080CCE2E: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2] mov r0, r8 @@ -11318,7 +11318,7 @@ _080CD036: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -11682,7 +11682,7 @@ sub_80CD2E8: @ 80CD2E8 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r6, r4, r5 adds r0, r6, 0 bl StartObjectImageAnim @@ -14295,7 +14295,7 @@ sub_80CE9A8: @ 80CE9A8 adds r0, r1 movs r1, 0x8 mov r2, sp - bl pokemon_setattr + bl SetMonData b _080CEA1C .pool _080CE9E8: @@ -14313,7 +14313,7 @@ _080CE9E8: adds r0, r1 movs r1, 0x8 mov r2, sp - bl pokemon_setattr + bl SetMonData _080CEA08: movs r0, 0 ldrsb r0, [r4, r0] @@ -16512,7 +16512,7 @@ sub_80CFC14: @ 80CFC14 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r3] ldr r0, =gUnknown_02039D7D @@ -16584,7 +16584,7 @@ _080CFD40: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2] lsls r3, r4, 2 @@ -18609,7 +18609,7 @@ _080D0CA0: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2] adds r1, 0x3E @@ -18821,7 +18821,7 @@ _080D0EF8: adds r0, r1 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x1 bl sub_80CBBDC @@ -18959,7 +18959,7 @@ _080D101C: adds r2, r5 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData mov r1, r8 ldr r0, [r1] adds r0, r5 @@ -19041,7 +19041,7 @@ _080D10E0: ldr r1, =0x00002234 adds r2, r1 movs r1, 0xC - bl pokemon_setattr + bl SetMonData mov r0, r8 movs r1, 0 bl sub_80CBBDC @@ -19103,7 +19103,7 @@ _080D1170: adds r0, r1 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x1 bl sub_80CBBDC @@ -19894,7 +19894,7 @@ _080D17D4: _080D17DA: adds r0, r1 ldrh r0, [r0] - bl itemid_get_description + bl ItemId_GetDescription adds r4, r0, 0 movs r0, 0x2 movs r1, 0x11 @@ -20401,7 +20401,7 @@ _080D1BC2: lsls r0, 16 asrs r0, 20 strh r0, [r4, 0x22] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 4 @@ -20480,7 +20480,7 @@ _080D1C5E: lsls r1, 16 asrs r1, 20 strh r1, [r4, 0x22] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 4 @@ -20650,7 +20650,7 @@ set_pokemon_data_from_any_box: @ 80D1D74 adds r0, r1 adds r1, r5, 0 adds r2, r6, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted _080D1DAC: pop {r4-r6} pop {r0} @@ -20801,7 +20801,7 @@ sub_80D1E90: @ 80D1E90 adds r0, r1 movs r1, 0x2 adds r2, r5, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted _080D1EC6: pop {r4,r5} pop {r0} @@ -22748,7 +22748,7 @@ _080D2D2A: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl sub_80D30DC adds r0, r4, 0 @@ -22812,7 +22812,7 @@ sub_80D2D78: @ 80D2D78 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl sub_80D30DC adds r0, r4, 0 @@ -23414,7 +23414,7 @@ sub_80D31B4: @ 80D31B4 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -24599,7 +24599,7 @@ _080D3B64: bl AllocZeroed str r0, [r4] movs r6, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites _080D3BA0: ldr r0, =gUnknown_02037590 ldrb r1, [r0, 0x4] @@ -25355,7 +25355,7 @@ _080D41D4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -25816,11 +25816,11 @@ _080D4500: mov r0, r8 movs r1, 0x40 mov r2, r9 - bl pokemon_setattr + bl SetMonData mov r0, r8 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, r9 ldrb r0, [r1] b _080D45B6 @@ -25918,7 +25918,7 @@ sub_80D460C: @ 80D460C adds r0, r6, 0 movs r1, 0x40 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r0, sp strb r5, [r0] mov r1, sp @@ -25927,7 +25927,7 @@ sub_80D460C: @ 80D460C adds r0, r6, 0 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r4] b _080D4672 .pool @@ -25980,11 +25980,11 @@ sub_80D4680: @ 80D4680 strb r1, [r0, 0x1] adds r0, r4, 0 movs r1, 0x40 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData _080D46D2: add sp, 0x8 pop {r4} @@ -26080,11 +26080,11 @@ _080D4724: adds r0, r5, 0 movs r1, 0x40 mov r2, r9 - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 b _080D47AC .pool @@ -26708,7 +26708,7 @@ RemoveBagObject: @ 80D4CA8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r1, [r5] @@ -26767,7 +26767,7 @@ SetBagVisualPocketId: @ 80D4D38 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r2, r0, r2 cmp r1, 0 beq _080D4D84 @@ -26833,7 +26833,7 @@ ShakeBagVisual: @ 80D4DC4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x3F @@ -26898,7 +26898,7 @@ AddSwitchPocketRotatingBallObject: @ 80D4E34 movs r3, 0 bl AddObjectToFront strb r0, [r4] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -27034,7 +27034,7 @@ AddBagItemIconObject: @ 80D4F38 cmp r2, 0x40 beq _080D4F86 strb r2, [r5] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -27283,7 +27283,7 @@ sub_80D511C: @ 80D511C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl StartObjectRotScalAnim @@ -27331,7 +27331,7 @@ sub_80D51AC: @ 80D51AC b _080D520C .pool _080D51D0: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -27383,7 +27383,7 @@ sub_80D5220: @ 80D5220 adds r7, r1, 0 cmp r5, 0 bne _080D52C6 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r6, 0x8 ldrsh r1, [r3, r6] lsls r0, r1, 4 @@ -27509,7 +27509,7 @@ _080D5320: _080D5324: movs r0, 0x3 _080D5326: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -27519,12 +27519,12 @@ _080D5326: bne _080D533C movs r6, 0x1 _080D533C: - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r4, r0 b _080D5350 .pool _080D5348: - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 @@ -27539,7 +27539,7 @@ _080D5356: b _080D53A6 .pool _080D5368: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -27594,7 +27594,7 @@ sub_80D53BC: @ 80D53BC mov r12, r1 cmp r0, 0 bne _080D5474 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r7, 0x8 ldrsh r1, [r3, r7] lsls r0, r1, 4 @@ -27698,7 +27698,7 @@ sub_80D5484: @ 80D5484 b _080D54F6 .pool _080D54A8: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -27766,7 +27766,7 @@ _080D5526: ands r0, r1 cmp r0, 0 beq _080D5568 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -27791,7 +27791,7 @@ _080D5526: b _080D5592 .pool _080D5568: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -27915,7 +27915,7 @@ sub_80D5644: @ 80D5644 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -27966,7 +27966,7 @@ sub_80D56A4: @ 80D56A4 lsls r1, 16 asrs r1, 16 mov r12, r2 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites cmp r0, r1 bne _080D56F6 movs r0, 0 @@ -28103,7 +28103,7 @@ sub_80D57B8: @ 80D57B8 movs r2, 0xA ldrsh r1, [r5, r2] bl Sin - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -28153,7 +28153,7 @@ sub_80D5830: @ 80D5830 lsrs r4, r0, 24 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D584C @@ -28182,7 +28182,7 @@ sub_80D5860: @ 80D5860 strb r0, [r2] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D5890 @@ -28200,7 +28200,7 @@ _080D5894: movs r0, 0 strh r2, [r4, 0x2E] strh r0, [r4, 0x32] - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 @@ -28296,12 +28296,12 @@ sub_80D5968: @ 80D5968 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D598C - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 b _080D5990 .pool _080D598C: - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038437 _080D5990: ldrb r0, [r0] @@ -28311,7 +28311,7 @@ _080D5990: ldrh r0, [r5, 0x4] movs r3, 0 strh r0, [r6, 0x2E] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -28383,7 +28383,7 @@ sub_80D5A24: @ 80D5A24 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r3, r1, r0 ldrh r0, [r2, 0x2E] movs r6, 0x2E @@ -28449,11 +28449,11 @@ _080D5AB0: ldr r0, =gUnknown_02038437 _080D5AB2: ldrb r2, [r0] - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r2, r0 ldrb r6, [r0] adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D5ADC @@ -28473,7 +28473,7 @@ _080D5ADC: ldrh r0, [r2, 0x8] movs r4, 0 strh r0, [r5, 0x2E] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -28534,11 +28534,11 @@ _080D5B70: ldr r0, =gUnknown_02038437 _080D5B72: ldrb r1, [r0] - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r1, r0 ldrb r7, [r0] adds r0, r1, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D5B9C @@ -28557,7 +28557,7 @@ _080D5B9C: ldr r5, =gUnknown_0203841E ldrh r0, [r5, 0x8] strh r0, [r6, 0x2E] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -28611,7 +28611,7 @@ _080D5C0C: thumb_func_start sub_80D5C20 sub_80D5C20: @ 80D5C20 push {r4,lr} - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r1, 0x38 ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -28649,7 +28649,7 @@ sub_80D5C50: @ 80D5C50 lsrs r7, r0, 16 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D5C82 @@ -28716,7 +28716,7 @@ sub_80D5CE4: @ 80D5CE4 ldrh r2, [r5, 0x1E] adds r0, r2 strh r0, [r5, 0x1E] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -28775,7 +28775,7 @@ _080D5D70: ldrh r1, [r4, 0x20] adds r2, r1 strh r2, [r4, 0x20] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -28840,7 +28840,7 @@ _080D5DEA: lsls r0, 24 cmp r0, 0 beq _080D5E10 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldrb r0, [r5] eors r0, r4 adds r0, r1 @@ -28860,7 +28860,7 @@ _080D5E18: strh r2, [r5, 0x8] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D5E44 @@ -28898,7 +28898,7 @@ sub_80D5E6C: @ 80D5E6C lsls r1, 3 adds r1, r0 ldrb r2, [r1, 0x8] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -28933,7 +28933,7 @@ sub_80D5EB8: @ 80D5EB8 lsrs r5, r0, 24 ldr r6, =gUnknown_02038436 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D5ED4 @@ -29019,7 +29019,7 @@ sub_80D5F3C: @ 80D5F3C ldrsh r0, [r4, r1] cmp r0, 0 bne _080D5F94 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r7, 4 adds r1, r2, r7 lsls r1, 2 @@ -29031,11 +29031,11 @@ sub_80D5F3C: @ 80D5F3C .pool _080D5F94: ldrb r0, [r4, 0x12] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _080D5FBC - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r7, 4 adds r0, r2, r7 lsls r0, 2 @@ -29049,7 +29049,7 @@ _080D5F94: b _080D5FD6 .pool _080D5FBC: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r7, 4 adds r0, r2, r7 lsls r0, 2 @@ -29311,7 +29311,7 @@ _080D61C8: ldr r0, =gUnknown_02038437 _080D61CA: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide movs r1, 0 lsls r0, 24 cmp r0, 0 @@ -29392,7 +29392,7 @@ _080D6274: ldr r0, =gUnknown_02038437 _080D6276: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _080D6288 @@ -29603,7 +29603,7 @@ _080D63EE: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x16] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x16 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -29666,7 +29666,7 @@ sub_80D646C: @ 80D646C beq _080D64DE cmp r1, 0 beq _080D64C8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -29679,7 +29679,7 @@ sub_80D646C: @ 80D646C b _080D64DC .pool _080D64C8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -29700,7 +29700,7 @@ _080D64DE: ldrsh r4, [r3, r2] cmp r4, 0 beq _080D6508 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -29712,7 +29712,7 @@ _080D64DE: b _080D6518 .pool _080D6508: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -29728,7 +29728,7 @@ _080D6518: asrs r4, r0, 16 cmp r4, 0 bne _080D654A - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 diff --git a/asm/rom_8158B30.s b/asm/rom_8158B30.s index df78857e0..6875403e6 100644 --- a/asm/rom_8158B30.s +++ b/asm/rom_8158B30.s @@ -379,11 +379,11 @@ _08158E1E: .pool _08158E38: adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08158E5C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -393,7 +393,7 @@ _08158E38: b _08158E6A .pool _08158E5C: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -504,11 +504,11 @@ _08158F2E: .pool _08158F48: adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _08158F6C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -518,7 +518,7 @@ _08158F48: b _08158F7A .pool _08158F6C: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -1010,8 +1010,8 @@ nullsub_114: @ 8159368 thumb_func_start sub_815936C sub_815936C: @ 815936C - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -1024,9 +1024,9 @@ sub_815936C: @ 815936C thumb_func_start bx_exec_buffer_A_ch0_tbl6 bx_exec_buffer_A_ch0_tbl6: @ 8159388 push {lr} - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -1035,7 +1035,7 @@ bx_exec_buffer_A_ch0_tbl6: @ 8159388 ands r1, r0 cmp r1, 0 beq _081593D4 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] @@ -1069,7 +1069,7 @@ bx_battle_menu_t6_2: @ 81593D8 movs r0, 0x5 bl audio_play ldr r1, =gUnknown_020244AC - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -1116,7 +1116,7 @@ _08159446: cmp r0, 0 beq _08159484 ldr r5, =gUnknown_020244AC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -1142,7 +1142,7 @@ _08159484: cmp r0, 0 beq _081594C0 ldr r5, =gUnknown_020244AC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -1168,7 +1168,7 @@ _081594C0: cmp r0, 0 beq _0815950C ldr r5, =gUnknown_020244AC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -1202,7 +1202,7 @@ _0815950C: cmp r0, 0 beq _0815954E ldr r5, =gUnknown_020244AC - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -1237,9 +1237,9 @@ _0815954E: thumb_func_start sub_815955C sub_815955C: @ 815955C push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -1276,9 +1276,9 @@ _081595A6: thumb_func_start sub_81595AC sub_81595AC: @ 81595AC push {lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gUnknown_03005D70 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -1329,13 +1329,13 @@ _0815960E: thumb_func_start bx_wait_t6 bx_wait_t6: @ 8159624 push {lr} - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim ldrb r0, [r0] cmp r0, 0 beq _0815964A ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1364,8 +1364,8 @@ sub_8159660: @ 8159660 ands r0, r1 cmp r0, 0 bne _08159684 - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -1409,7 +1409,7 @@ sub_81596D4: @ 81596D4 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1432,8 +1432,8 @@ _081596F6: dp01_tbl6_exec_completed: @ 8159704 push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -1451,8 +1451,8 @@ dp01_tbl6_exec_completed: @ 8159704 movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably - ldr r1, =gUnknown_02023064 + bl PrepareBufferDataTransferLink + ldr r1, =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -1461,7 +1461,7 @@ dp01_tbl6_exec_completed: @ 8159704 b _0815976A .pool _08159758: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -1483,7 +1483,7 @@ bx_80364D0: @ 815977C push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1564,13 +1564,13 @@ sub_8159800: @ 8159800 ldr r4, =gSaveBlock2Ptr ldr r0, [r4] ldrb r0, [r0, 0x8] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] bl sub_805DF84 ldr r0, [r4] ldrb r6, [r0, 0x8] ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1593,11 +1593,11 @@ sub_8159800: @ 8159800 movs r1, 0x50 movs r3, 0x1E bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -1639,7 +1639,7 @@ sub_8159800: @ 8159800 adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -1691,13 +1691,13 @@ sub_8159910: @ 8159910 ldr r1, [r0, 0x8] movs r0, 0x4 strb r0, [r1, 0x8] - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -1705,7 +1705,7 @@ sub_8159910: @ 8159910 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -1720,8 +1720,8 @@ sub_8159910: @ 8159910 thumb_func_start sub_8159964 sub_8159964: @ 8159964 push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -1731,12 +1731,12 @@ sub_8159964: @ 8159964 ldr r0, [r0] ldr r0, [r0, 0x8] strb r1, [r0, 0x8] - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -1744,7 +1744,7 @@ sub_8159964: @ 8159964 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -1780,7 +1780,7 @@ dp01t_10_6_message: @ 81599DC strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 ldr r1, =gUnknown_02023066 @@ -1790,7 +1790,7 @@ dp01t_10_6_message: @ 81599DC ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -1805,9 +1805,9 @@ dp01t_10_6_message: @ 81599DC thumb_func_start dp01t_11_6_message_for_player_only dp01t_11_6_message_for_player_only: @ 8159A30 push {lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08159A4C @@ -1834,8 +1834,8 @@ sub_8159A54: @ 8159A54 ldr r1, =gUnknown_02022E16 movs r0, 0xA0 strh r0, [r1] - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -1850,8 +1850,8 @@ _08159A7A: thumb_func_start sub_8159A94 sub_8159A94: @ 8159A94 push {r4,lr} - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -1869,7 +1869,7 @@ _08159AAE: cmp r4, 0x3 ble _08159AAE ldr r1, =gUnknown_020244AC - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -1913,8 +1913,8 @@ sub_8159B14: @ 8159B14 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -1965,11 +1965,11 @@ sub_8159B78: @ 8159B78 sub_8159B84: @ 8159B84 push {lr} ldr r0, =gUnknown_03005D70 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r1, [r1] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -2116,16 +2116,16 @@ sub_8159C74: @ 8159C74 thumb_func_start sub_8159C80 sub_8159C80: @ 8159C80 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _08159C94 movs r3, 0xC0 _08159C94: - ldr r2, =gUnknown_02023064 + ldr r2, =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -2149,8 +2149,8 @@ _08159C94: thumb_func_start dp01t_34_6_move_anim_start_t3 dp01t_34_6_move_anim_start_t3: @ 8159CC4 push {r4,r5,lr} - ldr r4, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -2192,8 +2192,8 @@ _08159D14: thumb_func_start sub_8159D20 sub_8159D20: @ 8159D20 push {lr} - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -2217,8 +2217,8 @@ sub_8159D20: @ 8159D20 thumb_func_start dp01t_2E_6_battle_intro dp01t_2E_6_battle_intro: @ 8159D5C push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -2240,11 +2240,11 @@ dp01t_2E_6_battle_intro: @ 8159D5C sub_8159D90: @ 8159D90 push {r4,r5,lr} ldr r5, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -2260,7 +2260,7 @@ sub_8159D90: @ 8159D90 adds r0, r5 ldrb r0, [r0] bl sub_80729D0 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -2308,8 +2308,8 @@ sub_8159E10: @ 8159E10 sub_8159E1C: @ 8159E1C push {r4-r6,lr} sub sp, 0x4 - ldr r5, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r5, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -2334,7 +2334,7 @@ sub_8159E1C: @ 8159E1C b _08159E68 .pool _08159E5C: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -2367,9 +2367,9 @@ sub_8159E84: @ 8159E84 thumb_func_start sub_8159E90 sub_8159E90: @ 8159E90 push {r4,lr} - ldr r2, =gUnknown_0202433A - ldr r1, =gUnknown_02023064 - ldr r4, =gUnknown_02024064 + ldr r2, =gBattleOutcome + ldr r1, =gBattleBufferA + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -2387,7 +2387,7 @@ sub_8159E90: @ 8159E90 ands r0, r1 cmp r0, 0x2 bne _08159ECC - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -2473,7 +2473,7 @@ sub_8159F5C: @ 8159F5C adds r2, r4, 0 bl CpuFastSet bl GetPlayerAvatarObjectId - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -2556,7 +2556,7 @@ _0815A044: ldr r0, =sub_815A090 str r0, [r4] bl GetPlayerAvatarObjectId - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -3389,7 +3389,7 @@ sub_815A6C4: @ 815A6C4 bl sub_80A8924 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815A6F8 @@ -3532,7 +3532,7 @@ sub_815A7EC: @ 815A7EC bne _0815A840 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815A830 @@ -3630,7 +3630,7 @@ sub_815A8C8: @ 815A8C8 lsrs r4, r0, 24 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4172,7 +4172,7 @@ sub_815AD4C: @ 815AD4C movs r1, 0xFF ands r0, r1 strh r0, [r2, 0x30] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r3, 0x30 ldrsh r0, [r2, r3] lsls r0, 1 @@ -4240,7 +4240,7 @@ _0815ADDE: lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r7, r0, 24 adds r0, r6, 0 @@ -4623,7 +4623,7 @@ _0815B0BC: bl audio_play_and_stuff cmp r4, 0x40 beq _0815B120 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -4721,7 +4721,7 @@ _0815B1B2: _0815B1B8: movs r5, 0 movs r7, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x1C adds r0, r3 mov r8, r0 @@ -5050,7 +5050,7 @@ _0815B424: bne _0815B496 movs r0, 0 strh r0, [r5, 0x34] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -5095,7 +5095,7 @@ sub_815B49C: @ 815B49C adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815B4BC @@ -5126,7 +5126,7 @@ sub_815B4D4: @ 815B4D4 strh r0, [r4, 0x2E] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815B4F8 @@ -5546,7 +5546,7 @@ _0815B81C: bl SetGpuReg ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5631,7 +5631,7 @@ _0815B8A8: .pool _0815B8E0: ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r1, r0, 24 _0815B8EA: @@ -5732,8 +5732,8 @@ _0815B99C: lsls r0, 24 cmp r0, 0 beq _0815B9EC - ldr r3, =gUnknown_02020630 - ldr r4, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r4, =gBankSpriteIds ldr r2, =gUnknown_02038436 ldrb r0, [r2] adds r0, r4 @@ -5748,8 +5748,8 @@ _0815B99C: b _0815BA06 .pool _0815B9EC: - ldr r3, =gUnknown_02020630 - ldr r4, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r4, =gBankSpriteIds ldr r2, =gUnknown_02038436 ldrb r0, [r2] adds r0, r4 @@ -5822,7 +5822,7 @@ _0815BA82: bl SetGpuReg ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5845,7 +5845,7 @@ _0815BAB6: bne _0815BAF6 ldr r4, =gUnknown_02038436 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5888,8 +5888,8 @@ c3_80DFBE4: @ 815BB18 lsls r0, 24 lsrs r0, 24 ldr r4, =gUnknown_0203841E - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds ldr r1, =gUnknown_02038436 ldrb r1, [r1] adds r1, r2 @@ -6003,7 +6003,7 @@ _0815BC02: _0815BC34: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815BC58 @@ -6289,7 +6289,7 @@ _0815BE2E: lsls r2, r0, 4 add r2, r9 lsls r2, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r10, r1 adds r5, r2, r1 adds r0, r5, 0 @@ -6378,7 +6378,7 @@ sub_815BF44: @ 815BF44 negs r1, r1 cmp r0, r1 bge _0815BF92 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x3A ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -6405,7 +6405,7 @@ _0815BF92: negs r0, r0 cmp r1, r0 bge _0815BFC6 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x3C ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -6449,7 +6449,7 @@ _0815BFE8: sub_815BFF4: @ 815BFF4 push {r4-r6,lr} adds r4, r0, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6609,7 +6609,7 @@ _0815C124: _0815C15C: ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r4, r0, 24 bl battle_type_is_double @@ -6698,7 +6698,7 @@ _0815C224: strh r0, [r5, 0xE] ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6938,7 +6938,7 @@ _0815C41E: strh r0, [r4, 0x32] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815C450 @@ -7045,7 +7045,7 @@ _0815C508: ldr r0, =gUnknown_02038437 _0815C50A: ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -7102,7 +7102,7 @@ _0815C570: _0815C57A: b _0815C6A8 _0815C57C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -7142,7 +7142,7 @@ _0815C57C: b _0815C690 .pool _0815C5D0: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -7184,7 +7184,7 @@ _0815C5D0: b _0815C690 .pool _0815C628: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -7256,7 +7256,7 @@ sub_815C6B0: @ 815C6B0 adds r4, r0, 0 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -7296,7 +7296,7 @@ sub_815C700: @ 815C700 strh r0, [r4, 0x2E] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815C744 @@ -7535,7 +7535,7 @@ _0815C8DA: lsls r0, 24 lsrs r0, 24 bl sub_80A73A0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r7, r0] lsls r0, r1, 4 @@ -7783,13 +7783,13 @@ _0815CAD2: cmp r0, 0 bne _0815CAF8 ldrb r0, [r6, 0x1E] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsls r2, r5, 4 cmp r0, 0 bne _0815CB08 _0815CAF8: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r5, 4 adds r1, r2, r5 lsls r1, 2 @@ -7798,7 +7798,7 @@ _0815CAF8: adds r0, 0x10 strh r0, [r1, 0x26] _0815CB08: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r2, r5 lsls r0, 2 adds r0, r1 @@ -7824,7 +7824,7 @@ _0815CB2C: cmp r0, 0x3 bne _0815CB50 strh r4, [r2, 0xC] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -7842,7 +7842,7 @@ _0815CB50: bne _0815CB78 adds r0, r5, 0 bl sub_80A7344 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -8306,13 +8306,13 @@ sub_815CED8: @ 815CED8 _0815CF18: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815CFC4 movs r0, 0 str r0, [sp, 0x1C] - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID ldr r4, =gUnknown_02038437 ldrb r0, [r4] lsls r0, 1 @@ -8344,7 +8344,7 @@ _0815CF18: cmp r0, 0 bne _0815CFBC adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815CF9C @@ -8380,7 +8380,7 @@ _0815CFBE: _0815CFC4: movs r2, 0x1 str r2, [sp, 0x1C] - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID ldr r4, =gUnknown_02038437 ldrb r0, [r4] lsls r0, 1 @@ -8412,7 +8412,7 @@ _0815CFC4: cmp r0, 0 bne _0815D054 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815D03C @@ -8488,7 +8488,7 @@ _0815D05A: adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r5, r6, 4 adds r5, r6 lsls r5, 2 @@ -8624,7 +8624,7 @@ sub_815D1BC: @ 815D1BC ldrh r0, [r5, 0x1E] adds r0, 0x80 strh r0, [r5, 0x1E] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -8704,7 +8704,7 @@ _0815D26E: movs r0, 0x18 strh r0, [r4, 0x18] adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8734,7 +8734,7 @@ _0815D2B4: lsrs r0, 24 strh r0, [r4, 0x26] adds r0, r5, 0 - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8829,7 +8829,7 @@ sub_815D398: @ 815D398 ldr r1, =gTasks adds r6, r0, r1 ldrb r0, [r6, 0x12] - bl battle_get_per_side_status_permutated + bl GetBankIdentity_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8964,7 +8964,7 @@ _0815D47E: lsls r2, r7, 16 asrs r2, 16 lsls r0, r2, 1 - ldr r7, =gUnknown_08329F40 + ldr r7, =gSineTable adds r0, r7 ldrh r0, [r0] lsls r0, 16 @@ -9224,7 +9224,7 @@ sub_815D694: @ 815D694 ands r0, r5 cmp r0, 0 bne _0815D6F8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -9236,7 +9236,7 @@ sub_815D694: @ 815D694 b _0815D708 .pool _0815D6F8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -9440,7 +9440,7 @@ sub_815D870: @ 815D870 bl StartObjectRotScalAnim ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815D896 @@ -9559,7 +9559,7 @@ _0815D95A: mov r12, r2 cmp r0, 0 beq _0815D998 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r2, 0x26 ldrsh r0, [r4, r2] lsls r1, r0, 4 @@ -9574,7 +9574,7 @@ _0815D95A: b _0815D9AE .pool _0815D998: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -9744,7 +9744,7 @@ _0815DAA6: mov r12, r3 cmp r0, 0 beq _0815DB00 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r2, 0x26 ldrsh r0, [r4, r2] lsls r1, r0, 4 @@ -9759,7 +9759,7 @@ _0815DAA6: b _0815DB16 .pool _0815DB00: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -9848,7 +9848,7 @@ sub_815DB90: @ 815DB90 lsls r0, 3 mov r1, r8 adds r4, r0, r1 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r2, =gUnknown_02038436 ldrb r0, [r2] adds r0, r1 @@ -9872,7 +9872,7 @@ sub_815DB90: @ 815DB90 strh r0, [r4, 0x14] _0815DBD4: ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815DC04 @@ -10154,7 +10154,7 @@ _0815DE0C: strh r0, [r2, 0x2] movs r5, 0 mov r8, r2 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites _0815DE44: lsls r0, r5, 1 add r0, sp @@ -10275,7 +10275,7 @@ sub_815DF0C: @ 815DF0C bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -10388,7 +10388,7 @@ sub_815E01C: @ 815E01C adds r5, r0, 0 ldr r6, =gUnknown_02038436 ldrb r0, [r6] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -10450,7 +10450,7 @@ _0815E09A: _0815E0A8: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815E0C8 @@ -10536,7 +10536,7 @@ _0815E144: _0815E14E: ldr r5, =gUnknown_02038436 ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815E188 @@ -10670,7 +10670,7 @@ _0815E238: bl sub_815E34C movs r6, 0 mov r8, r4 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites _0815E272: add r0, sp, 0x10 movs r2, 0 @@ -10735,7 +10735,7 @@ _0815E2DC: _0815E2EC: strh r0, [r1, 0x26] _0815E2EE: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r2, r3 lsls r0, 2 adds r0, r1 @@ -11020,7 +11020,7 @@ _0815E4EE: strh r0, [r7, 0x26] cmp r0, 0x40 beq _0815E5B8 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r0, 0x26 ldrsh r1, [r7, r0] lsls r0, r1, 4 @@ -11062,7 +11062,7 @@ _0815E4EE: bl sub_80A68D4 mov r1, r10 ldrb r0, [r1] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -11133,7 +11133,7 @@ _0815E5FE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl sub_80A6900 ldrh r0, [r4, 0xC] @@ -11151,7 +11151,7 @@ _0815E634: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl sub_80A6900 lsls r0, 24 @@ -11175,7 +11175,7 @@ _0815E658: ldrh r2, [r4, 0xC] adds r2, 0x1 strh r2, [r4, 0xC] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -11479,7 +11479,7 @@ sub_815E898: @ 815E898 ands r0, r1 cmp r0, 0 bne _0815E8E0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -11490,7 +11490,7 @@ sub_815E898: @ 815E898 b _0815E8F0 .pool _0815E8E0: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -11507,7 +11507,7 @@ _0815E8F2: lsrs r5, r0, 24 cmp r5, 0 bne _0815E94E - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -11756,7 +11756,7 @@ _0815EAE4: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable movs r0, 0x30 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -11799,7 +11799,7 @@ _0815EB36: ldrh r0, [r4, 0x22] subs r0, r1 strh r0, [r4, 0x22] - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable movs r0, 0x30 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -11829,7 +11829,7 @@ _0815EB74: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable movs r0, 0x30 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -11976,7 +11976,7 @@ _0815ECAC: _0815ECB4: ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815ECD0 @@ -12041,7 +12041,7 @@ _0815ED34: _0815ED44: b _0815EE50 _0815ED46: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -12067,7 +12067,7 @@ _0815ED72: b _0815EE50 .pool _0815ED78: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -12111,7 +12111,7 @@ _0815EDA8: strh r0, [r3, 0x8] b _0815EE78 _0815EDCE: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -12141,7 +12141,7 @@ _0815EDF8: bne _0815EE78 b _0815EE50 _0815EE08: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -12156,7 +12156,7 @@ _0815EE08: b _0815EE40 .pool _0815EE28: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -12187,7 +12187,7 @@ _0815EE54: b _0815EE78 .pool _0815EE60: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -12228,7 +12228,7 @@ _0815EEAA: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12610,7 +12610,7 @@ sub_815F18C: @ 815F18C movs r1, 0x3 bl sub_80A5C6C ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 beq _0815F1B8 @@ -12720,7 +12720,7 @@ _0815F254: strh r0, [r4, 0xE] adds r0, r5, 0 bl sub_80A7344 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -12745,8 +12745,8 @@ _0815F2AC: lsls r0, 24 cmp r0, 0 beq _0815F2EE - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -12827,7 +12827,7 @@ _0815F360: beq _0815F43C b _0815F482 _0815F36A: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -12849,7 +12849,7 @@ _0815F394: adds r1, 0x70 movs r5, 0 strh r1, [r4, 0x1C] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -12905,7 +12905,7 @@ _0815F400: movs r0, 0 strh r0, [r4, 0x1C] _0815F410: - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -12930,7 +12930,7 @@ _0815F43C: ldrh r0, [r4, 0x1C] adds r0, 0x70 strh r0, [r4, 0x1C] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -12973,7 +12973,7 @@ sub_815F48C: @ 815F48C adds r5, r0, 0 ldr r4, =gUnknown_02038437 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815F4B8 @@ -13056,7 +13056,7 @@ _0815F544: adds r1, 0x4 movs r5, 0 strh r1, [r4, 0x30] - ldr r2, =gUnknown_08329F40 + ldr r2, =gSineTable movs r3, 0x30 ldrsh r0, [r4, r3] lsls r0, 1 @@ -13086,7 +13086,7 @@ _0815F584: adds r1, 0x6 movs r3, 0 strh r1, [r4, 0x30] - ldr r2, =gUnknown_08329F40 + ldr r2, =gSineTable movs r5, 0x30 ldrsh r0, [r4, r5] lsls r0, 1 @@ -13195,7 +13195,7 @@ sub_815F620: @ 815F620 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl obj_delete_but_dont_free_vram _0815F66E: @@ -13204,7 +13204,7 @@ _0815F66E: b _0815F780 .pool _0815F67C: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -13571,12 +13571,12 @@ _0815F940: strh r0, [r6, 0xA] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 mov r9, r4 cmp r0, 0 bne _0815F998 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r7, 4 adds r1, r3, r7 lsls r1, 2 @@ -13590,7 +13590,7 @@ _0815F940: b _0815F9B2 .pool _0815F998: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r4, r7, 4 adds r2, r4, r7 lsls r2, 2 @@ -13658,11 +13658,11 @@ _0815F9F4: _0815FA28: ldr r4, =gUnknown_02038436 ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815FAC8 - ldr r7, =gUnknown_0202406E + ldr r7, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r7 @@ -13708,7 +13708,7 @@ _0815FA9C: _0815FA9E: movs r0, 0x1 bl obj_id_for_side_relative_to_move - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -13726,7 +13726,7 @@ _0815FA9E: b _0815FB50 .pool _0815FAC8: - ldr r7, =gUnknown_0202406E + ldr r7, =gBattlePartyID ldrb r0, [r4] lsls r0, 1 adds r0, r7 @@ -13772,7 +13772,7 @@ _0815FB2C: _0815FB2E: movs r0, 0x1 bl obj_id_for_side_relative_to_move - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -13822,7 +13822,7 @@ _0815FB50: ldrh r0, [r0, 0x2] cmp r0, 0 beq _0815FBBA - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -13866,12 +13866,12 @@ _0815FBE8: strh r0, [r6, 0xA] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 mov r9, r4 cmp r0, 0 bne _0815FC40 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r4, r5, 4 adds r2, r4, r5 lsls r2, 2 @@ -13887,7 +13887,7 @@ _0815FBE8: b _0815FC56 .pool _0815FC40: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -13920,7 +13920,7 @@ _0815FC56: bne _0815FCD6 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815FCB4 @@ -13991,12 +13991,12 @@ _0815FD08: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl sub_80A8610 ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -14055,13 +14055,13 @@ _0815FD8C: mov r10, r0 ldrb r0, [r0] str r2, [sp, 0x18] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 mov r9, r4 ldr r2, [sp, 0x18] cmp r0, 0 bne _0815FE0C - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r5, r7, 4 adds r0, r5, r7 lsls r0, 2 @@ -14091,7 +14091,7 @@ _0815FD8C: b _0815FE44 .pool _0815FE0C: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r5, r7, 4 adds r0, r5, r7 lsls r0, 2 @@ -14126,7 +14126,7 @@ _0815FE44: adds r0, r1 ldrb r1, [r0, 0xA] strh r1, [r0, 0xA] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r3, r7 lsls r0, 2 adds r0, r1 @@ -14196,7 +14196,7 @@ _0815FE92: strb r0, [r2] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -14207,7 +14207,7 @@ _0815FE92: bne _0815FFBC movs r0, 0x1 bl obj_id_for_side_relative_to_move - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -14265,7 +14265,7 @@ _0815FF6E: strh r0, [r4, 0x32] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0815FF9C @@ -14366,12 +14366,12 @@ _0816003E: b _08160150 .pool _08160058: - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -14422,12 +14422,12 @@ _081600B4: strh r1, [r0, 0x26] b _08160150 _081600CC: - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -14472,12 +14472,12 @@ _0816012A: strh r0, [r2, 0x26] b _08160150 _08160132: - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldr r0, =gUnknown_02038436 ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -14511,7 +14511,7 @@ sub_8160164: @ 8160164 strh r0, [r4, 0xE] ldr r0, =gUnknown_02038436 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -14521,7 +14521,7 @@ sub_8160164: @ 8160164 movs r1, 0x1 _08160198: strh r1, [r4, 0x10] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0xE ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -14579,14 +14579,14 @@ _0816020A: movs r2, 0xFF ands r0, r2 strh r0, [r4, 0x1E] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r6, 0xE ldrsh r0, [r4, r6] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r5 - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable movs r6, 0x1E ldrsh r0, [r4, r6] lsls r0, 1 @@ -14637,14 +14637,14 @@ _08160284: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x1E] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r1, 0xE ldrsh r0, [r4, r1] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r3 - ldr r2, =gUnknown_08329F40 + ldr r2, =gSineTable movs r5, 0x1E ldrsh r0, [r4, r5] lsls r0, 1 @@ -14685,7 +14685,7 @@ sub_81602E0: @ 81602E0 adds r4, r0, 0 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldrh r0, [r4, 0x2E] ldrh r1, [r4, 0x30] @@ -14728,7 +14728,7 @@ sub_8160338: @ 8160338 adds r4, r0, 0 ldr r0, =gUnknown_02038437 ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0816037C @@ -15058,7 +15058,7 @@ sub_816058C: @ 816058C ands r0, r5 cmp r0, 0 bne _081605F0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -15070,7 +15070,7 @@ sub_816058C: @ 816058C b _08160600 .pool _081605F0: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -16015,7 +16015,7 @@ render_previous_quest_text: @ 8160EE0 lsls r0, 24 lsrs r5, r0, 24 movs r2, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r4, =gUnknown_0203BC34 movs r3, 0x4 _08160EF0: @@ -16301,7 +16301,7 @@ _08161124: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 movs r1, 0x2 bl StartObjectImageAnim @@ -16562,7 +16562,7 @@ sub_816137C: @ 816137C bne _081613CC _08161394: movs r5, 0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r3, =gUnknown_0203BC34 movs r2, 0x4 _0816139C: @@ -16605,7 +16605,7 @@ _081613CC: _081613EE: movs r5, 0 ldr r7, =gUnknown_0203BC34 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites _081613F4: cmp r5, r6 bcs _08161420 @@ -16671,7 +16671,7 @@ _0816147C: movs r5, 0 ldr r0, =gUnknown_0203BC34 mov r8, r0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites _08161484: cmp r5, r6 bcs _081614B8 @@ -17885,43 +17885,43 @@ sub_8161E28: @ 8161E28 adds r2, r0 adds r0, r5, 0 movs r1, 0x37 - bl pokemon_setattr + bl SetMonData ldr r2, [r4] ldr r1, =0x000031e6 adds r2, r1 adds r0, r5, 0 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData ldr r2, [r4] ldr r0, =0x000031ea adds r2, r0 adds r0, r5, 0 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData ldr r2, [r4] ldr r1, =0x000031eb adds r2, r1 adds r0, r5, 0 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData ldr r2, [r4] ldr r0, =0x000031ec adds r2, r0 adds r0, r5, 0 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData ldr r2, [r4] ldr r1, =0x000031ed adds r2, r1 adds r0, r5, 0 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData ldr r2, [r4] ldr r0, =0x000031ee adds r2, r0 adds r0, r5, 0 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData add sp, 0x4 pop {r4,r5} pop {r0} @@ -20405,7 +20405,7 @@ _081633EC: adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0x14 - bl pokemon_setattr + bl SetMonData ldr r0, =gUnknown_0203BC8C ldr r0, [r0] add r0, r9 @@ -20415,7 +20415,7 @@ _081633EC: adds r2, r0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData ldr r7, [sp, 0x34] _0816341E: ldr r0, [sp, 0x1C] @@ -20524,14 +20524,14 @@ _081634D4: adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0x4 - bl pokemon_setattr + bl SetMonData adds r2, r5, r7 lsls r2, 2 add r2, r10 adds r2, 0xE adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData mov r7, r8 cmp r7, 0x3 bne _08163494 @@ -20813,7 +20813,7 @@ _08163718: adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0xC - bl pokemon_setattr + bl SetMonData ldr r1, =gUnknown_0203BC8C ldr r0, [r1] adds r0, r7, r0 @@ -20823,7 +20823,7 @@ _08163718: adds r2, r0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData mov r2, r10 lsls r0, r2, 24 lsrs r7, r0, 24 @@ -20942,7 +20942,7 @@ _08163846: adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0xC - bl pokemon_setattr + bl SetMonData ldr r1, =gUnknown_0203BC8C ldr r0, [r1] add r0, r8 @@ -20952,7 +20952,7 @@ _08163846: adds r2, r0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData ldr r2, [sp, 0x14] lsls r0, r2, 24 lsrs r0, 24 @@ -21096,7 +21096,7 @@ sub_81639AC: @ 81639AC push {r4-r6,lr} sub sp, 0x4 bl sub_81864CC - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x26 ldrb r0, [r0] cmp r0, 0xA @@ -21164,7 +21164,7 @@ _08163A3C: adds r0, r4, 0 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData adds r5, 0x1 cmp r5, 0x5 ble _08163A3C @@ -21210,7 +21210,7 @@ _08163AB0: sub_8163AC4: @ 8163AC4 push {r4-r6,lr} sub sp, 0x4 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting ldr r2, =gUnknown_020375E0 ldrh r1, [r2] adds r0, 0x26 @@ -21327,7 +21327,7 @@ _08163BC4: adds r0, r4 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData adds r5, 0x1 cmp r5, 0x5 ble _08163BC4 @@ -23355,7 +23355,7 @@ sub_8164E04: @ 8164E04 adds r0, r2 ldrh r1, [r5] bl sub_8165B88 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID ldrh r0, [r6, 0x2] movs r5, 0x64 muls r0, r5 @@ -23395,7 +23395,7 @@ _08164E7C: cmp r2, 0xA ble _08164E7C ldr r0, [r6] - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome ldrb r1, [r1] ldr r2, =0x00000d06 adds r0, r2 @@ -23671,7 +23671,7 @@ _0816508C: ldr r0, [r7] adds r0, r4 mov r1, r10 - bl pokemon_setattr + bl SetMonData ldr r0, [r7] adds r0, r4 bl sub_80EE5A4 @@ -24006,7 +24006,7 @@ sub_8165360: @ 8165360 thumb_func_start sub_816537C sub_816537C: @ 816537C push {lr} - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0x3 bne _08165398 @@ -24154,7 +24154,7 @@ _081654B0: adds r1, 0x1A adds r2, r5, r3 adds r0, r6, r4 - bl pokemon_setattr + bl SetMonData ldr r0, [sp, 0x44] adds r0, 0x1 str r0, [sp, 0x44] @@ -24195,13 +24195,13 @@ _081654DE: adds r0, r4, 0 movs r1, 0x7 ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 @ Steven's name - bl pokemon_setattr + bl SetMonData movs r0, 0 str r0, [sp, 0x44] adds r0, r4, 0 movs r1, 0x31 ldr r2, [sp, 0x64] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 bl pokemon_calc_effective_stats ldr r2, [sp, 0x60] @@ -24339,7 +24339,7 @@ _08165634: adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x5C] - bl pokemon_setattr + bl SetMonData ldr r0, =gUnknown_0203BC8C ldr r1, [r0] ldr r2, [sp, 0x54] @@ -24351,7 +24351,7 @@ _08165634: adds r2, r0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r0, 0 str r0, [sp, 0x44] movs r2, 0 @@ -24382,7 +24382,7 @@ _0816567E: adds r0, r4, 0 movs r1, 0x7 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 bl sub_8162F68 lsls r0, 24 @@ -24391,7 +24391,7 @@ _0816567E: adds r0, r4, 0 movs r1, 0x31 ldr r2, [sp, 0x64] - bl pokemon_setattr + bl SetMonData ldr r6, [sp, 0x60] mov r10, r6 cmp r6, 0x1 @@ -24493,7 +24493,7 @@ _0816579C: adds r0, r4, 0 movs r1, 0x7 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData movs r2, 0x96 lsls r2, 1 adds r0, r7, r2 @@ -24506,7 +24506,7 @@ _0816579C: adds r0, r4, 0 movs r1, 0x31 ldr r2, [sp, 0x64] - bl pokemon_setattr + bl SetMonData ldr r3, [sp, 0x6C] adds r3, 0x2 str r3, [sp, 0x6C] @@ -24562,7 +24562,7 @@ _08165812: adds r0, r4, 0 movs r1, 0x31 ldr r2, [sp, 0x64] - bl pokemon_setattr + bl SetMonData adds r5, 0x2 movs r0, 0x1 add r10, r0 @@ -25603,7 +25603,7 @@ _0816605E: adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0x14 - bl pokemon_setattr + bl SetMonData ldr r0, =gUnknown_0203BC8C ldr r0, [r0] add r0, r9 @@ -25613,7 +25613,7 @@ _0816605E: adds r2, r0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData ldr r0, [sp, 0x30] mov r8, r0 _08166092: @@ -25789,7 +25789,7 @@ _081661A6: adds r2, r6 adds r0, r4, 0 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 bl pokemon_calc_effective_stats _081661E2: @@ -26901,7 +26901,7 @@ _08166C70: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -26942,7 +26942,7 @@ _08166CAE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles _08166CE6: @@ -27395,7 +27395,7 @@ _081670B0: adds r0, r5, 0 adds r1, r6, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -27420,7 +27420,7 @@ _081670E2: adds r0, r5, 0 movs r1, 0x30 mov r2, sp - bl pokemon_setattr + bl SetMonData _081670F0: add sp, 0x4 pop {r3} @@ -28119,7 +28119,7 @@ _081676AC: ldr r0, [r7] add r0, r8 strb r1, [r0] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r7] mov r0, r8 adds r3, r2, r0 @@ -28225,7 +28225,7 @@ sub_8167760: @ 8167760 cmp r4, r0 bge _0816781C adds r5, r1, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r0, 0x1C adds r0, r7 mov r8, r0 @@ -28284,7 +28284,7 @@ _0816781C: cmp r4, 0x5 bhi _0816788A ldr r5, =gUnknown_0203BCAC - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites _08167828: lsls r2, r4, 2 adds r2, r4 @@ -28355,7 +28355,7 @@ _0816788A: adds r0, r1 adds r0, r4 strb r3, [r0] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r3, 4 adds r2, r3 lsls r2, 2 @@ -29456,7 +29456,7 @@ _081682B6: lsrs r1, r0, 24 cmp r1, 0x40 beq _081682FE - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -29573,14 +29573,14 @@ nullsub_117: @ 81683B4 thumb_func_start bx_goto_buffer_A_ch0_tbl3 bx_goto_buffer_A_ch0_tbl3: @ 81683B8 - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 ldr r1, =bx_exec_buffer_A_ch0_tbl2 str r1, [r0] - ldr r2, =gUnknown_0202449C + ldr r2, =gBattleStruct ldr r0, [r2] adds r0, 0x94 movs r1, 0 @@ -29601,9 +29601,9 @@ bx_goto_buffer_A_ch0_tbl3: @ 81683B8 thumb_func_start bx_exec_buffer_A_ch0_tbl2 bx_exec_buffer_A_ch0_tbl2: @ 81683F4 push {lr} - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -29612,7 +29612,7 @@ bx_exec_buffer_A_ch0_tbl2: @ 81683F4 ands r1, r0 cmp r1, 0 beq _08168440 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] @@ -29636,7 +29636,7 @@ _08168440: thumb_func_start sub_8168444 sub_8168444: @ 8168444 push {r4,r5,lr} - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r0, [r1] adds r0, 0x94 ldrb r0, [r0] @@ -29779,9 +29779,9 @@ _08168564: thumb_func_start sub_816856C sub_816856C: @ 816856C push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -29818,7 +29818,7 @@ _081685B6: thumb_func_start bx_wait_t5 bx_wait_t5: @ 81685BC push {lr} - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim ldrb r0, [r0] cmp r0, 0 bne _081685CA @@ -29838,8 +29838,8 @@ sub_81685D4: @ 81685D4 ands r0, r1 cmp r0, 0 bne _081685FC - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -29886,7 +29886,7 @@ sub_816864C: @ 816864C push {r7} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -29899,7 +29899,7 @@ sub_816864C: @ 816864C ands r0, r1 cmp r0, 0 bne _08168684 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -29924,7 +29924,7 @@ _08168684: ands r0, r1 cmp r0, 0 bne _081686B6 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -29960,7 +29960,7 @@ _081686D2: ands r0, r1 cmp r0, 0 bne _081687DC - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 ldr r7, =gUnknown_03005D7C adds r0, r2, r7 @@ -29975,7 +29975,7 @@ _081686D2: ldr r0, =DummyObjectCallback cmp r3, r0 bne _081687DC - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -30010,7 +30010,7 @@ _081686D2: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -30030,21 +30030,21 @@ _081686D2: bl sub_80729D0 _0816877A: ldr r1, =gUnknown_03005D7C - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldr r5, =gUnknown_03005D70 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -30068,7 +30068,7 @@ _0816877A: negs r0, r0 ands r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -30089,9 +30089,9 @@ sub_8168818: @ 8168818 mov r7, r8 push {r7} movs r4, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D70 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank mov r8, r1 ldrb r3, [r1] adds r0, r3, r0 @@ -30187,7 +30187,7 @@ _08168842: ldr r0, =c3_0802FDF4 movs r1, 0xA bl CreateTask - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID mov r0, r8 ldrb r1, [r0] lsls r0, r1, 1 @@ -30211,7 +30211,7 @@ _08168904: thumb_func_start sub_8168934 sub_8168934: @ 8168934 push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] ldr r6, =gUnknown_03005D70 adds r1, r0, r6 @@ -30240,7 +30240,7 @@ sub_8168934: @ 8168934 b _08168996 .pool _0816897C: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -30261,12 +30261,12 @@ _08168996: thumb_func_start bx_blink_t5 bx_blink_t5: @ 81689A4 push {r4,lr} - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -30284,7 +30284,7 @@ bx_blink_t5: @ 81689A4 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r3, [r0] bl dp01_tbl5_exec_completed b _08168A1A @@ -30323,7 +30323,7 @@ sub_8168A20: @ 8168A20 push {r4-r6,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -30335,13 +30335,13 @@ sub_8168A20: @ 8168A20 ands r0, r1 cmp r0, 0 bne _08168A74 - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -30368,9 +30368,9 @@ _08168A74: thumb_func_start sub_8168A90 sub_8168A90: @ 8168A90 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -30395,7 +30395,7 @@ sub_8168AC8: @ 8168AC8 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -30418,8 +30418,8 @@ _08168AEA: dp01_tbl5_exec_completed: @ 8168AF8 push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -30437,8 +30437,8 @@ dp01_tbl5_exec_completed: @ 8168AF8 movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably - ldr r1, =gUnknown_02023064 + bl PrepareBufferDataTransferLink + ldr r1, =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -30447,7 +30447,7 @@ dp01_tbl5_exec_completed: @ 8168AF8 b _08168B5E .pool _08168B4C: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -30469,7 +30469,7 @@ sub_8168B70: @ 8168B70 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -30493,8 +30493,8 @@ dp01t_00_5_getattr: @ 8168BA0 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -30502,7 +30502,7 @@ dp01t_00_5_getattr: @ 8168BA0 ldrb r0, [r1] cmp r0, 0 bne _08168BD8 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -30555,8 +30555,8 @@ sub_8168C14: @ 8168C14 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, =gUnknown_02023064 - ldr r3, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -31432,8 +31432,8 @@ sub_81693C0: @ 81693C0 thumb_func_start sub_81693CC sub_81693CC: @ 81693CC push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -31441,7 +31441,7 @@ sub_81693CC: @ 81693CC ldrb r0, [r1] cmp r0, 0 bne _081693FC - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -31482,7 +31482,7 @@ sub_8169424: @ 8169424 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r2, =gUnknown_02023067 @@ -31573,12 +31573,12 @@ _08169558: adds r0, r4, 0 movs r1, 0xB adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x2E adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r0, 0 mov r8, r0 movs r0, 0x3B @@ -31619,12 +31619,12 @@ _081695BE: adds r1, 0xD mov r0, r9 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 mov r0, r9 adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData adds r7, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -31640,15 +31640,15 @@ _081695BE: adds r0, r4, 0 movs r1, 0x15 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x20] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x19 ldr r2, [sp, 0x28] - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x14] lsls r0, 27 lsrs r0, 27 @@ -31657,7 +31657,7 @@ _081695BE: adds r0, r4, 0 movs r1, 0x27 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x14] lsls r0, 22 @@ -31666,7 +31666,7 @@ _081695BE: adds r0, r4, 0 movs r1, 0x28 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x15] lsls r0, 25 @@ -31675,7 +31675,7 @@ _081695BE: adds r0, r4, 0 movs r1, 0x29 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldr r0, [r6, 0x14] lsls r0, 12 @@ -31684,7 +31684,7 @@ _081695BE: adds r0, r4, 0 movs r1, 0x2A mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x16] lsls r0, 23 @@ -31693,7 +31693,7 @@ _081695BE: adds r0, r4, 0 movs r1, 0x2B mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x17] lsls r0, 26 @@ -31702,47 +31702,47 @@ _081695BE: adds r0, r4, 0 movs r1, 0x2C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0 ldr r2, [sp, 0x2C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x37 ldr r2, [sp, 0x30] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 ldr r2, [sp, 0x18] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A ldr r2, [sp, 0x24] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3B ldr r2, [sp, 0x4] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C ldr r2, [sp, 0x8] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D ldr r2, [sp, 0xC] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E ldr r2, [sp, 0x10] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F ldr r2, [sp, 0x14] - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _081696F0: @@ -31750,12 +31750,12 @@ _081696F0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xB - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169710: @@ -31763,12 +31763,12 @@ _08169710: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169730: @@ -31790,12 +31790,12 @@ _0816974A: adds r1, 0xD adds r0, r7, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 adds r0, r7, 0 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -31809,7 +31809,7 @@ _0816974A: adds r0, r1 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169788: @@ -31817,8 +31817,8 @@ _08169788: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -31833,41 +31833,41 @@ _081697B0: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x11 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x12 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x13 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x14 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x15 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169814: @@ -31875,8 +31875,8 @@ _08169814: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -31886,7 +31886,7 @@ _08169814: _0816982C: adds r3, 0x3 adds r2, r3 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169844: @@ -31894,12 +31894,12 @@ _08169844: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169864: @@ -31907,12 +31907,12 @@ _08169864: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169884: @@ -31920,12 +31920,12 @@ _08169884: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1A - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _081698A4: @@ -31933,12 +31933,12 @@ _081698A4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1B - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _081698C4: @@ -31946,12 +31946,12 @@ _081698C4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1C - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _081698E4: @@ -31959,12 +31959,12 @@ _081698E4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1D - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169904: @@ -31972,12 +31972,12 @@ _08169904: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1E - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169924: @@ -31985,12 +31985,12 @@ _08169924: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1F - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169944: @@ -31998,12 +31998,12 @@ _08169944: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169964: @@ -32011,12 +32011,12 @@ _08169964: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x22 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169984: @@ -32024,12 +32024,12 @@ _08169984: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _081699A4: @@ -32037,12 +32037,12 @@ _081699A4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x24 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _081699C4: @@ -32050,12 +32050,12 @@ _081699C4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x25 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _081699E4: @@ -32063,12 +32063,12 @@ _081699E4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169A04: @@ -32077,41 +32077,41 @@ _08169A04: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x5 @@ -32124,12 +32124,12 @@ _08169A74: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169A94: @@ -32137,12 +32137,12 @@ _08169A94: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169AB4: @@ -32150,12 +32150,12 @@ _08169AB4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169AD4: @@ -32163,12 +32163,12 @@ _08169AD4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169AF4: @@ -32176,12 +32176,12 @@ _08169AF4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169B14: @@ -32189,13 +32189,13 @@ _08169B14: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 _08169B24: movs r1, 0x2C - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169B34: @@ -32203,12 +32203,12 @@ _08169B34: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169B54: @@ -32216,12 +32216,12 @@ _08169B54: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x9 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169B74: @@ -32229,12 +32229,12 @@ _08169B74: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x37 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169B94: @@ -32242,12 +32242,12 @@ _08169B94: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x38 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169BB4: @@ -32255,12 +32255,12 @@ _08169BB4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169BD4: @@ -32268,12 +32268,12 @@ _08169BD4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3A - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169BF4: @@ -32281,12 +32281,12 @@ _08169BF4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3B - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169C14: @@ -32294,12 +32294,12 @@ _08169C14: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3C - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169C34: @@ -32307,12 +32307,12 @@ _08169C34: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3D - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169C54: @@ -32320,12 +32320,12 @@ _08169C54: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3E - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169C74: @@ -32333,12 +32333,12 @@ _08169C74: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3F - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169C94: @@ -32346,12 +32346,12 @@ _08169C94: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169CB4: @@ -32359,12 +32359,12 @@ _08169CB4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169CD4: @@ -32372,12 +32372,12 @@ _08169CD4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169CF4: @@ -32385,12 +32385,12 @@ _08169CF4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169D14: @@ -32398,12 +32398,12 @@ _08169D14: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169D34: @@ -32411,12 +32411,12 @@ _08169D34: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x30 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169D54: @@ -32424,12 +32424,12 @@ _08169D54: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x32 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169D74: @@ -32437,12 +32437,12 @@ _08169D74: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x33 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169D94: @@ -32450,12 +32450,12 @@ _08169D94: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x34 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169DB4: @@ -32463,12 +32463,12 @@ _08169DB4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x35 - bl pokemon_setattr + bl SetMonData b _08169DEA .pool _08169DD4: @@ -32476,15 +32476,15 @@ _08169DD4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 - bl pokemon_setattr + bl SetMonData _08169DEA: - ldr r2, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r2, =gBattlePartyID + ldr r0, =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -32532,8 +32532,8 @@ sub_8169E38: @ 8169E38 thumb_func_start sub_8169E44 sub_8169E44: @ 8169E44 push {r4-r6,lr} - ldr r0, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r0, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r1, r2, 9 adds r0, 0x1 @@ -32545,7 +32545,7 @@ sub_8169E44: @ 8169E44 adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -32554,13 +32554,13 @@ sub_8169E44: @ 8169E44 b _08169EB6 .pool _08169E80: - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -32587,12 +32587,12 @@ _08169EB6: thumb_func_start sub_8169EC8 sub_8169EC8: @ 8169EC8 push {r4-r6,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] movs r0, 0x6 bl sub_805DF84 ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -32611,11 +32611,11 @@ sub_8169EC8: @ 8169EC8 movs r1, 0x50 movs r3, 0x1E bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r4] adds r1, r6 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r3, [r4] adds r0, r3, r6 ldrb r0, [r0] @@ -32657,7 +32657,7 @@ sub_8169EC8: @ 8169EC8 adds r0, r5 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -32672,12 +32672,12 @@ sub_8169EC8: @ 8169EC8 thumb_func_start dp01t_07_6_ dp01t_07_6_: @ 8169F94 push {r4-r6,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] movs r0, 0x6 bl sub_805DF84 ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -32696,11 +32696,11 @@ dp01t_07_6_: @ 8169F94 movs r1, 0x50 movs r3, 0x1E bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r4] adds r1, r6 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r3, [r4] adds r0, r3, r6 ldrb r0, [r0] @@ -32742,7 +32742,7 @@ dp01t_07_6_: @ 8169F94 adds r0, r5 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -32786,13 +32786,13 @@ sub_816A084: @ 816A084 ldr r1, [r0, 0x8] movs r0, 0x4 strb r0, [r1, 0x8] - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -32800,7 +32800,7 @@ sub_816A084: @ 816A084 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -32815,8 +32815,8 @@ sub_816A084: @ 816A084 thumb_func_start sub_816A0D8 sub_816A0D8: @ 816A0D8 push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 @@ -32826,12 +32826,12 @@ sub_816A0D8: @ 816A0D8 ldr r0, [r0] ldr r0, [r0, 0x8] strb r1, [r0, 0x8] - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r4, [r5] movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -32839,7 +32839,7 @@ sub_816A0D8: @ 816A0D8 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -32862,9 +32862,9 @@ sub_816A138: @ 816A138 thumb_func_start sub_816A144 sub_816A144: @ 816A144 push {r4-r6,lr} - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA mov r12, r0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r2, [r6] lsls r2, 9 adds r0, 0x1 @@ -32976,7 +32976,7 @@ _0816A23C: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -32995,8 +32995,8 @@ bx_move_anim_5: @ 816A26C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r2, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r6, =gActiveBank ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -33157,7 +33157,7 @@ sub_816A3B8: @ 816A3B8 strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 ldr r1, =gUnknown_02023066 @@ -33167,7 +33167,7 @@ sub_816A3B8: @ 816A3B8 ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -33182,9 +33182,9 @@ sub_816A3B8: @ 816A3B8 thumb_func_start dp01t_11_5_message_for_player_only dp01t_11_5_message_for_player_only: @ 816A40C push {lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0816A428 @@ -33211,8 +33211,8 @@ sub_816A430: @ 816A430 ldr r1, =gUnknown_02022E16 movs r0, 0xA0 strh r0, [r1] - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -33227,8 +33227,8 @@ _0816A456: thumb_func_start dp01t_12_1_battle_menu dp01t_12_1_battle_menu: @ 816A470 push {r4,lr} - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -33246,7 +33246,7 @@ _0816A48A: cmp r4, 0x3 ble _0816A48A ldr r1, =gUnknown_020244AC - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -33274,7 +33274,7 @@ sub_816A4D8: @ 816A4D8 thumb_func_start sub_816A4E4 sub_816A4E4: @ 816A4E4 push {r4,lr} - ldr r4, =gUnknown_0202449C + ldr r4, =gBattleStruct ldr r1, [r4] adds r0, r1, 0 adds r0, 0x95 @@ -33356,8 +33356,8 @@ sub_816A57C: @ 816A57C movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -33397,8 +33397,8 @@ sub_816A5D4: @ 816A5D4 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r0, =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -33415,7 +33415,7 @@ sub_816A5D4: @ 816A5D4 ldr r0, =0x00007fff cmp r7, r0 beq _0816A664 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -33447,7 +33447,7 @@ sub_816A5D4: @ 816A5D4 b _0816A69E .pool _0816A664: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -33474,8 +33474,8 @@ _0816A664: movs r2, 0 bl heathbar_draw_hp _0816A69E: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -33622,9 +33622,9 @@ sub_816A788: @ 816A788 thumb_func_start sub_816A794 sub_816A794: @ 816A794 push {r4,lr} - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -33641,7 +33641,7 @@ sub_816A794: @ 816A794 b _0816A7F2 .pool _0816A7C8: - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -33655,7 +33655,7 @@ _0816A7C8: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -33679,8 +33679,8 @@ sub_816A804: @ 816A804 thumb_func_start sub_816A810 sub_816A810: @ 816A810 push {lr} - ldr r2, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r0, =gActiveBank ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -33701,8 +33701,8 @@ sub_816A810: @ 816A810 thumb_func_start sub_816A840 sub_816A840: @ 816A840 push {r4,r5,lr} - ldr r4, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -33744,8 +33744,8 @@ _0816A890: thumb_func_start sub_816A89C sub_816A89C: @ 816A89C push {lr} - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -33769,8 +33769,8 @@ sub_816A89C: @ 816A89C thumb_func_start dp01t_2E_5_battle_intro dp01t_2E_5_battle_intro: @ 816A8D8 push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -33791,15 +33791,15 @@ dp01t_2E_5_battle_intro: @ 816A8D8 thumb_func_start sub_816A90C sub_816A90C: @ 816A90C push {r4-r7,lr} - ldr r6, =gUnknown_020241E4 - ldr r7, =gUnknown_02024064 + ldr r6, =gBankSpriteIds + ldr r7, =gActiveBank ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r7] @@ -33931,7 +33931,7 @@ _0816AA24: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -33960,10 +33960,10 @@ sub_816AA80: @ 816AA80 adds r0, r1 movs r1, 0 strh r1, [r0, 0x2] - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r2, r6, 1 adds r2, r0 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -33988,7 +33988,7 @@ sub_816AA80: @ 816AA80 mov r1, r9 strb r0, [r1] adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -34016,10 +34016,10 @@ sub_816AA80: @ 816AA80 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds adds r4, r6, r4 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -34129,23 +34129,23 @@ sub_816AC04: @ 816AC04 b _0816AC5E .pool _0816AC28: - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r5, [r4] ldrh r0, [r1, 0x8] strb r0, [r4] - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA ldrb r1, [r4] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] strb r0, [r2] ldrb r0, [r4] bl sub_816AA80 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -34164,8 +34164,8 @@ _0816AC5E: thumb_func_start sub_816AC78 sub_816AC78: @ 816AC78 push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -34174,7 +34174,7 @@ sub_816AC78: @ 816AC78 cmp r0, 0 beq _0816ACA8 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0816ACA8 @@ -34184,7 +34184,7 @@ sub_816AC78: @ 816AC78 _0816ACA8: ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -34246,8 +34246,8 @@ sub_816AD14: @ 816AD14 sub_816AD20: @ 816AD20 push {r4-r6,lr} sub sp, 0x4 - ldr r5, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r5, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -34272,7 +34272,7 @@ sub_816AD20: @ 816AD20 b _0816AD6C .pool _0816AD60: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -34305,9 +34305,9 @@ sub_816AD88: @ 816AD88 thumb_func_start sub_816AD94 sub_816AD94: @ 816AD94 push {r4,lr} - ldr r2, =gUnknown_0202433A - ldr r1, =gUnknown_02023064 - ldr r4, =gUnknown_02024064 + ldr r2, =gBattleOutcome + ldr r1, =gBattleBufferA + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -34325,7 +34325,7 @@ sub_816AD94: @ 816AD94 ands r0, r1 cmp r0, 0x2 bne _0816ADD0 - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 diff --git a/asm/rom_817C95C.s b/asm/rom_817C95C.s index 343f21347..528c7655a 100644 --- a/asm/rom_817C95C.s +++ b/asm/rom_817C95C.s @@ -29,37 +29,37 @@ sub_817C95C: @ 817C95C beq _0817C988 bl _0817E0A6 _0817C988: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] movs r1, 0x81 lsls r1, 2 adds r7, r0, r1 - ldr r5, =gUnknown_0202420B + ldr r5, =gBankAttacker ldrb r0, [r5] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r6, r0, 24 ldr r0, =gUnknown_0202420E ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 mov r9, r0 ldr r0, =gUnknown_0203ABA8 ldr r0, [r0] ldrb r0, [r0, 0x7] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] cmp r4, 0 bne _0817CA00 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r2 @@ -70,7 +70,7 @@ _0817C988: b _0817CA10 .pool _0817CA00: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r5] lsls r0, 1 adds r0, r2 @@ -83,7 +83,7 @@ _0817CA10: str r1, [sp, 0x8] cmp r6, 0 bne _0817CA3C - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] lsls r0, 1 adds r0, r2 @@ -94,7 +94,7 @@ _0817CA10: b _0817CA4C .pool _0817CA3C: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] lsls r0, 1 adds r0, r2 @@ -105,7 +105,7 @@ _0817CA3C: _0817CA4C: adds r1, r0 str r1, [sp, 0xC] - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] ldr r1, =gUnknown_0203ABA8 ldr r1, [r1] @@ -134,20 +134,20 @@ _0817CA4C: bl _0817E0A2 .pool _0817CA9C: - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 25 mov r8, r0 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r5, r0, 25 ldr r0, =gUnknown_0202420E ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r3, r0, 25 ldr r1, [sp] @@ -571,8 +571,8 @@ _0817D0DC: adds r3, r4 lsls r3, 2 adds r3, r7, r3 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -601,8 +601,8 @@ _0817D124: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -634,8 +634,8 @@ _0817D16C: adds r0, r4 lsls r0, 2 adds r5, r7, r0 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -715,8 +715,8 @@ _0817D216: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -775,8 +775,8 @@ _0817D296: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -833,8 +833,8 @@ _0817D314: lsls r0, r4, 4 adds r3, r0 adds r3, r7, r3 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -899,7 +899,7 @@ _0817D38C: bl sub_817E684 bl _0817E0A6 _0817D3A6: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] adds r0, 0xB3 movs r1, 0x1 @@ -911,7 +911,7 @@ _0817D3B8: movs r2, 0 b _0817D48E _0817D3C0: - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldrb r2, [r0, 0x2] cmp r2, 0 bne _0817D3CC @@ -934,14 +934,14 @@ _0817D3E8: movs r0, 0x16 b _0817D48C _0817D3F2: - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldrb r2, [r0, 0x2] cmp r2, 0 bne _0817D3FE bl _0817E0A6 _0817D3FE: - ldr r0, =gUnknown_0202420B - ldr r1, =gEnemyMonIndex + ldr r0, =gBankAttacker + ldr r1, =gBankTarget ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -969,7 +969,7 @@ _0817D436: movs r0, 0x1B b _0817D48C _0817D440: - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldrb r2, [r0, 0x2] cmp r2, 0 bne _0817D44C @@ -982,7 +982,7 @@ _0817D44C: b _0817D48C .pool _0817D45C: - ldr r0, =gUnknown_02022F58 + ldr r0, =gBattleTextBuff1 ldrb r2, [r0, 0x2] cmp r2, 0 bne _0817D468 @@ -1014,8 +1014,8 @@ _0817D498: lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1091,8 +1091,8 @@ _0817D53C: lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1161,8 +1161,8 @@ _0817D5CE: lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1226,8 +1226,8 @@ _0817D65E: lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1301,7 +1301,7 @@ _0817D6F2: strb r0, [r1] bl _0817E0A6 _0817D704: - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID ldr r6, =gUnknown_0202420E ldrb r0, [r6] lsls r0, 1 @@ -1314,7 +1314,7 @@ _0817D704: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -1353,8 +1353,8 @@ _0817D76C: bne _0817D77E bl _0817E0A6 _0817D77E: - ldr r6, =gUnknown_0202406E - ldr r5, =gUnknown_0202420B + ldr r6, =gBattlePartyID + ldr r5, =gBankAttacker ldrb r0, [r5] lsls r0, 1 adds r0, r6 @@ -1395,7 +1395,7 @@ _0817D7B2: b _0817D934 .pool _0817D7D8: - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID ldr r6, =gUnknown_0202420E ldrb r0, [r6] lsls r0, 1 @@ -1408,7 +1408,7 @@ _0817D7D8: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -1439,7 +1439,7 @@ _0817D7D8: b _0817D88C .pool _0817D838: - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID ldr r6, =gUnknown_0202420E ldrb r0, [r6] lsls r0, 1 @@ -1452,7 +1452,7 @@ _0817D838: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -1496,9 +1496,9 @@ _0817D8A4: bne _0817D8B6 bl _0817E0A6 _0817D8B6: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID mov r8, r2 - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] lsls r0, 1 add r0, r8 @@ -1573,8 +1573,8 @@ _0817D94C: lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1627,7 +1627,7 @@ _0817D9AE: movs r0, 0x9 b _0817E086 _0817D9C2: - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID ldr r6, =gUnknown_0202420E ldrb r0, [r6] lsls r0, 1 @@ -1640,7 +1640,7 @@ _0817D9C2: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -1671,8 +1671,8 @@ _0817D9C2: b _0817DB76 .pool _0817DA24: - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1702,7 +1702,7 @@ _0817DA48: b _0817E0A6 .pool _0817DA68: - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID ldr r6, =gUnknown_0202420E ldrb r0, [r6] lsls r0, 1 @@ -1715,7 +1715,7 @@ _0817DA68: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -1747,8 +1747,8 @@ _0817DA68: b _0817DB76 .pool _0817DACC: - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1790,7 +1790,7 @@ _0817DB10: b _0817E0A6 .pool _0817DB24: - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID ldr r6, =gUnknown_0202420E ldrb r0, [r6] lsls r0, 1 @@ -1803,7 +1803,7 @@ _0817DB24: lsls r4, 3 adds r3, r4 adds r3, r7, r3 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -1838,8 +1838,8 @@ _0817DB76: b _0817E0A6 .pool _0817DB90: - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1875,8 +1875,8 @@ _0817DBD4: lsls r0, r1, 4 adds r3, r0 adds r3, r7, r3 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -1943,8 +1943,8 @@ _0817DC62: adds r2, r6 lsls r2, 2 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -2021,8 +2021,8 @@ _0817DCFC: lsls r0, r4, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -2049,8 +2049,8 @@ _0817DD38: lsls r0, r4, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -2121,8 +2121,8 @@ _0817DDC8: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -2154,8 +2154,8 @@ _0817DE10: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -2253,8 +2253,8 @@ _0817DEDC: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -2331,8 +2331,8 @@ _0817DF70: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -2413,8 +2413,8 @@ _0817DFE6: negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -2551,22 +2551,22 @@ sub_817E0FC: @ 817E0FC bne _0817E122 b _0817E310 _0817E122: - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] movs r1, 0x81 lsls r1, 2 adds r1, r0, r1 str r1, [sp, 0x8] - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker mov r10, r2 ldrb r0, [r2] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 mov r1, r10 @@ -2593,7 +2593,7 @@ _0817E122: _0817E184: mov r2, r10 ldrb r0, [r2] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 25 lsls r0, 3 @@ -2604,7 +2604,7 @@ _0817E184: mov r2, r10 ldrb r1, [r2] lsls r1, 1 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID adds r1, r2 ldrh r2, [r1] adds r2, 0x1 @@ -2617,7 +2617,7 @@ _0817E184: strb r1, [r0] mov r1, r10 ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 25 lsls r0, 3 @@ -2685,7 +2685,7 @@ _0817E23C: mov r1, r10 ldrb r0, [r1] lsls r0, 1 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID adds r0, r2 ldrh r1, [r0] adds r1, 0x1 @@ -2723,7 +2723,7 @@ _0817E27A: mov r1, r10 ldrb r0, [r1] lsls r0, 1 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID adds r0, r1 ldrh r1, [r0] adds r1, 0x1 @@ -2807,14 +2807,14 @@ sub_817E32C: @ 817E32C ands r0, r1 cmp r0, 0 beq _0817E3EE - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] movs r1, 0x81 lsls r1, 2 adds r4, r0, r1 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 cmp r5, 0x12 @@ -2916,7 +2916,7 @@ sub_817E3F4: @ 817E3F4 movs r7, 0 str r7, [sp, 0x14] mov r8, r0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r1, [r0] adds r0, r1, 0 adds r0, 0xB3 @@ -3158,7 +3158,7 @@ _0817E5C8: ldr r3, [sp, 0x10] cmp r3, 0x2 bhi _0817E620 - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r0, [r0] bl sub_806D82C @@ -3168,7 +3168,7 @@ _0817E5C8: b _0817E670 .pool _0817E620: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r0, [r0] bl sub_806D82C @@ -3184,7 +3184,7 @@ _0817E630: _0817E63A: lsls r0, r3, 24 lsrs r0, 24 - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting adds r1, 0x25 ldrb r1, [r1] bl sub_806EF84 @@ -3197,7 +3197,7 @@ _0817E63A: b _0817E670 .pool _0817E65C: - ldr r0, =gUnknown_02024474 + ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] movs r0, 0x1 @@ -3235,7 +3235,7 @@ sub_817E684: @ 817E684 lsls r3, 24 lsrs r3, 24 mov r9, r3 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] movs r1, 0xD2 lsls r1, 1 @@ -3244,14 +3244,14 @@ sub_817E684: @ 817E684 movs r2, 0x81 lsls r2, 2 adds r7, r0, r2 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r3, r0, 24 mov r0, r10 @@ -3297,8 +3297,8 @@ _0817E6F0: .4byte _0817E760 .4byte _0817E760 _0817E760: - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -3324,13 +3324,13 @@ _0817E760: _0817E79C: ldr r1, =gUnknown_0860A834 add r1, r12 - ldr r7, =gUnknown_0202406E + ldr r7, =gBattlePartyID lsls r0, r4, 1 adds r0, r4 lsls r2, r0, 4 ldr r4, =0x0000ffff ldr r1, [r1] - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldrh r0, [r1] cmp r6, r0 bne _0817E7E0 @@ -3703,20 +3703,20 @@ sub_817EA80: @ 817EA80 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] movs r1, 0x81 lsls r1, 2 adds r5, r0, r1 - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker mov r8, r3 ldrb r0, [r3] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r2, r0, 24 lsls r0, r4, 1 @@ -4005,8 +4005,8 @@ _0817ECCC: ldrb r0, [r0] lsrs r0, 5 subs r6, r0, 0x1 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -4164,8 +4164,8 @@ _0817EE1C: cmp r7, 0x1 bne _0817EEBC adds r2, r4, 0 - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_0202420B + ldr r1, =gBattlePartyID + ldr r0, =gBankAttacker ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -4227,7 +4227,7 @@ _0817EE8E: b _0817EEBC _0817EE96: adds r2, r4, 0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID mov r3, r8 ldrb r0, [r3] lsls r0, 1 @@ -4269,9 +4269,9 @@ sub_817EECC: @ 817EECC beq _0817EEE6 b _0817F1FA _0817EEE6: - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4291,7 +4291,7 @@ _0817EEF8: bgt _0817EF10 b _0817F1FA _0817EF10: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r0, [r0] muls r0, r1 adds r0, r5 @@ -4302,7 +4302,7 @@ _0817EF10: ble _0817EF24 b _0817F1FA _0817EF24: - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] cmp r1, 0xED bne _0817EF2E @@ -4367,7 +4367,7 @@ _0817EF8A: beq _0817EF98 b _0817F1FA _0817EF98: - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r0, [r2] adds r0, r6 ldrb r0, [r0] @@ -4378,7 +4378,7 @@ _0817EF98: ldr r0, =gBattleMoveDamage ldr r0, [r0] str r0, [r1] - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r1, [r0] str r1, [sp, 0x24] movs r5, 0 @@ -4386,11 +4386,11 @@ _0817EF98: mov r10, r3 mov r8, r0 add r7, sp, 0x10 - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget mov r9, r4 _0817EFC2: lsls r1, r5, 1 - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r0, [r6] movs r2, 0x58 muls r0, r2 @@ -4414,13 +4414,13 @@ _0817EFC2: ldr r4, =gUnknown_0202428E mov r1, r9 ldrb r0, [r1] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x1 ands r1, r0 lsls r1, 1 adds r1, r4 ldrh r3, [r1] - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r0, [r2] movs r4, 0x58 muls r0, r4 @@ -4437,7 +4437,7 @@ _0817EFC2: str r4, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r6, =gUnknown_0202420B + ldr r6, =gBankAttacker ldrb r4, [r6] str r4, [sp, 0x8] mov r6, r9 @@ -4447,8 +4447,8 @@ _0817EFC2: adds r3, r0, 0 ldr r4, =gBattleMoveDamage str r3, [r4] - ldr r1, =gUnknown_020242AC - ldr r2, =gUnknown_0202420B + ldr r1, =gStatuses3 + ldr r2, =gBankAttacker ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -4471,8 +4471,8 @@ _0817EFC2: lsls r0, r3, 1 str r0, [r4] _0817F06A: - ldr r0, =gUnknown_0202433C - ldr r6, =gUnknown_0202420B + ldr r0, =gProtectStructs + ldr r6, =gBankAttacker ldrb r1, [r6] lsls r1, 4 adds r1, r0 @@ -4513,9 +4513,9 @@ _0817F0B4: cmp r5, 0x3 ble _0817EFC2 movs r5, 0 - ldr r3, =gUnknown_0202420B + ldr r3, =gBankAttacker ldr r6, =gUnknown_020244B0 - ldr r4, =gUnknown_0202406E + ldr r4, =gBattlePartyID mov r8, r4 movs r7, 0x64 mov r9, r7 @@ -4545,9 +4545,9 @@ _0817F0D8: movs r7, 0 _0817F0F6: movs r5, 0 - ldr r4, =gEnemyMonIndex + ldr r4, =gBankTarget ldr r6, =gEnemyParty - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] add r0, r10 ldrb r3, [r0] @@ -4582,7 +4582,7 @@ _0817F11A: adds r6, r0, 0 lsls r6, 16 lsrs r6, 16 - ldr r2, =gUnknown_0202420B + ldr r2, =gBankAttacker ldrb r0, [r2] lsls r0, 1 add r0, r8 @@ -4598,7 +4598,7 @@ _0817F11A: adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r4, =gUnknown_0202420B + ldr r4, =gBankAttacker ldrb r3, [r4] mov r2, r10 adds r0, r3, r2 @@ -4625,7 +4625,7 @@ _0817F1D4: _0817F1DC: ldr r2, =gBattleMoveDamage ldr r1, =gUnknown_020244B0 - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -4634,7 +4634,7 @@ _0817F1DC: adds r0, 0x10 ldr r0, [r0] str r0, [r2] - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove mov r3, sp ldrh r3, [r3, 0x24] strh r3, [r0] @@ -4695,7 +4695,7 @@ _0817F270: cmp r2, 0x95 bne _0817F294 ldr r2, =gBattleMons - ldr r0, =gUnknown_0202420B + ldr r0, =gBankAttacker ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -4731,7 +4731,7 @@ sub_817F2A8: @ 817F2A8 ands r0, r1 cmp r0, 0 beq _0817F324 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r3, [r0] ldr r0, =0x0000025b adds r4, r3, r0 @@ -4801,7 +4801,7 @@ sub_817F33C: @ 817F33C lsls r1, 16 lsrs r7, r1, 16 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 ldr r6, =gEnemyParty cmp r0, 0 @@ -4809,7 +4809,7 @@ sub_817F33C: @ 817F33C ldr r6, =gPlayerParty _0817F356: movs r4, 0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r5, r0, r1 b _0817F36E diff --git a/asm/rom_8184DA4.s b/asm/rom_8184DA4.s index 1882225cc..c07b21de4 100644 --- a/asm/rom_8184DA4.s +++ b/asm/rom_8184DA4.s @@ -63,7 +63,7 @@ _08184DFC: ldr r0, [r5] ldr r1, =gUnknown_0203C7B8 str r0, [r1] - ldr r3, =gUnknown_020244A8 + ldr r3, =gBattleResources ldr r0, [r3] ldr r0, [r0, 0x14] ldr r0, [r0, 0xC] @@ -335,7 +335,7 @@ sub_8185054: @ 8185054 bne _081850BC _0818507A: ldr r2, =gUnknown_020375F0 - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0x5 strb r0, [r1] movs r0, 0x5 @@ -1536,7 +1536,7 @@ sub_8185AB0: @ 8185AB0 ands r0, r3 orrs r0, r1 strb r0, [r2] - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0 strb r0, [r1] ldr r0, =gBattleTypeFlags @@ -2008,7 +2008,7 @@ sub_8185F40: @ 8185F40 push {r4,r5,lr} movs r2, 0 ldr r0, =gUnknown_020229E8 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrh r1, [r0, 0x18] adds r4, r0, 0 ldrb r0, [r3] @@ -2095,9 +2095,9 @@ sub_8185FC4: @ 8185FC4 thumb_func_start sub_8185FD0 sub_8185FD0: @ 8185FD0 push {r4-r7,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2167,7 +2167,7 @@ _0818606C: lsls r4, r1, 24 lsrs r5, r4, 24 adds r0, r5, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 lsrs r0, 24 str r4, [sp, 0x4C] @@ -2357,7 +2357,7 @@ _081861A6: mov r1, r10 subs r0, r2, r1 lsls r0, 2 - ldr r2, =gUnknown_020242BC + ldr r2, =gDisableStructs adds r0, r2 ldrb r1, [r0, 0x18] lsrs r1, 4 @@ -2378,7 +2378,7 @@ _081861A6: negs r3, r3 add r3, r8 mov r12, r3 - ldr r4, =gUnknown_020242BC + ldr r4, =gDisableStructs mov r9, r4 movs r6, 0x58 mov r1, r10 @@ -2425,7 +2425,7 @@ _0818622C: ldr r1, =gBattleMons adds r4, r1 adds r4, 0x3B - ldr r0, =gUnknown_020242BC + ldr r0, =gDisableStructs adds r6, r3, r0 _08186274: ldr r2, [sp, 0x3C] @@ -2469,7 +2469,7 @@ _081862BC: mov r3, sp adds r3, 0x20 str r3, [sp, 0x40] - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID ldr r4, [sp, 0x44] adds r6, r4, r0 _081862CA: @@ -2493,7 +2493,7 @@ _081862CA: cmp r5, 0x3 ble _081862CA movs r5, 0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID ldr r2, [sp, 0x44] adds r7, r2, r0 movs r3, 0x64 @@ -2536,7 +2536,7 @@ _08186304: cmp r5, 0x3 ble _08186304 movs r5, 0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID ldr r1, [sp, 0x44] adds r7, r1, r0 movs r2, 0x64 @@ -2555,7 +2555,7 @@ _08186360: adds r1, r5, 0 adds r1, 0xD adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData ldrh r0, [r7] mov r2, r9 muls r2, r0 @@ -2564,7 +2564,7 @@ _08186360: adds r1, r5, 0 adds r1, 0x11 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 adds r5, 0x1 @@ -2574,7 +2574,7 @@ _08186360: ldr r3, [sp, 0x40] strb r0, [r3] movs r5, 0 - ldr r4, =gUnknown_0202406E + ldr r4, =gBattlePartyID ldr r6, =gPlayerParty ldr r3, [sp, 0x3C] ldr r2, [sp, 0x40] @@ -2597,12 +2597,12 @@ _081863A2: adds r0, r6 movs r1, 0x15 ldr r2, [sp, 0x40] - bl pokemon_setattr + bl SetMonData _081863CA: ldr r2, =gUnknown_02024274 ldr r3, [sp, 0x44] adds r2, r3, r2 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] add r0, r10 adds r0, 0x80 @@ -2621,7 +2621,7 @@ _081863EE: ldr r6, [sp, 0x38] mov r10, r6 _081863F2: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r10, r0 bge _081863FC @@ -2732,7 +2732,7 @@ sub_81864C0: @ 81864C0 thumb_func_start sub_81864CC sub_81864CC: @ 81864CC ldr r0, =gUnknown_0203CCE8 - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome ldrb r1, [r1] strb r1, [r0] bx lr @@ -2753,8 +2753,8 @@ nullsub_70: @ 81864E8 thumb_func_start sub_81864EC sub_81864EC: @ 81864EC - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -2767,9 +2767,9 @@ sub_81864EC: @ 81864EC thumb_func_start sub_8186508 sub_8186508: @ 8186508 push {lr} - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -2778,7 +2778,7 @@ sub_8186508: @ 8186508 ands r1, r0 cmp r1, 0 beq _08186554 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] @@ -2802,9 +2802,9 @@ _08186554: thumb_func_start sub_8186558 sub_8186558: @ 8186558 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2827,9 +2827,9 @@ _0818657C: thumb_func_start sub_8186590 sub_8186590: @ 8186590 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -2852,9 +2852,9 @@ _081865B4: thumb_func_start sub_81865C8 sub_81865C8: @ 81865C8 push {r4-r6,lr} - ldr r5, =gUnknown_02020630 - ldr r6, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r5, =gSprites + ldr r6, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -2900,7 +2900,7 @@ sub_8186630: @ 8186630 push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r1, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -2954,9 +2954,9 @@ sub_8186678: @ 8186678 cmp r0, 0 beq _081866F8 _081866A4: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, =gUnknown_03005D70 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r3, [r2] adds r0, r3, r0 ldrb r1, [r0] @@ -2971,7 +2971,7 @@ _081866A4: mov r8, r2 cmp r1, r0 bne _08186764 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -2986,9 +2986,9 @@ _081866A4: b _0818676A .pool _081866F8: - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r7, =gUnknown_03005D70 - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r3, [r2] adds r0, r3, r7 ldrb r1, [r0] @@ -3015,7 +3015,7 @@ _081866F8: ldr r0, [r0] cmp r0, r4 bne _08186764 - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds adds r0, r3, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -3047,7 +3047,7 @@ _08186764: _0818676A: mov r6, r8 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 @@ -3140,7 +3140,7 @@ _08186816: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc mov r2, r8 ldrb r0, [r2] lsls r0, 2 @@ -3168,7 +3168,7 @@ sub_818686C: @ 818686C mov r8, r0 ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r2, [r7] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -3181,7 +3181,7 @@ sub_818686C: @ 818686C ands r0, r1 cmp r0, 0 bne _081868AC - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -3206,7 +3206,7 @@ _081868AC: ands r0, r1 cmp r0, 0 bne _081868DE - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -3261,7 +3261,7 @@ _081868DE: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -3281,11 +3281,11 @@ _081868DE: bl sub_80729D0 _08186964: ldr r5, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -3304,7 +3304,7 @@ _08186964: _08186994: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -3318,7 +3318,7 @@ _08186994: _081869AE: ldr r5, =gUnknown_020244D0 ldr r0, [r5] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -3364,7 +3364,7 @@ _081869AE: cmp r0, 0x42 bne _08186A40 adds r0, r2, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3382,7 +3382,7 @@ _08186A40: _08186A4C: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -3400,9 +3400,9 @@ _08186A6A: lsls r0, 24 cmp r0, 0 bne _08186AC8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D7C - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r4, [r1] adds r0, r4, r0 ldrb r1, [r0] @@ -3415,7 +3415,7 @@ _08186A6A: ldr r0, =DummyObjectCallback cmp r3, r0 bne _08186B26 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -3428,9 +3428,9 @@ _08186A6A: b _08186B22 .pool _08186AC8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r7, =gUnknown_03005D7C - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] adds r0, r3, r7 ldrb r1, [r0] @@ -3443,7 +3443,7 @@ _08186AC8: ldr r0, =DummyObjectCallback cmp r4, r0 bne _08186B26 - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -3494,7 +3494,7 @@ _08186B26: cmp r0, 0 bne _08186B8A ldr r1, =gUnknown_03005D7C - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -3503,12 +3503,12 @@ _08186B26: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldrb r0, [r5] eors r4, r0 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -3525,18 +3525,18 @@ _08186B26: bl sub_805EE54 _08186B8A: ldr r1, =gUnknown_03005D7C - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldrb r5, [r4] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -3582,7 +3582,7 @@ _08186B8A: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -3601,9 +3601,9 @@ _08186C10: thumb_func_start sub_8186C48 sub_8186C48: @ 8186C48 push {r4-r7,lr} - ldr r4, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 - ldr r7, =gUnknown_02024064 + ldr r4, =gSprites + ldr r0, =gBankSpriteIds + ldr r7, =gActiveBank ldrb r3, [r7] adds r0, r3, r0 ldrb r1, [r0] @@ -3634,7 +3634,7 @@ sub_8186C48: @ 8186C48 ands r0, r5 cmp r0, 0 bne _08186CC0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 @@ -3682,7 +3682,7 @@ _08186CFA: thumb_func_start sub_8186D04 sub_8186D04: @ 8186D04 push {r4-r6,lr} - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] ldr r5, =gUnknown_03005D70 adds r1, r0, r5 @@ -3721,9 +3721,9 @@ _08186D50: thumb_func_start sub_8186D58 sub_8186D58: @ 8186D58 push {lr} - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 - ldr r1, =gUnknown_02024064 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds + ldr r1, =gActiveBank ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -3752,7 +3752,7 @@ sub_8186D9C: @ 8186D9C push {r4-r6,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -3764,13 +3764,13 @@ sub_8186D9C: @ 8186D9C ands r0, r1 cmp r0, 0 bne _08186DF6 - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -3813,12 +3813,12 @@ _08186E22: thumb_func_start bx_blink_t2 bx_blink_t2: @ 8186E28 push {r4,lr} - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -3836,7 +3836,7 @@ bx_blink_t2: @ 8186E28 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r3, [r0] bl sub_81871AC b _08186E9E @@ -3873,9 +3873,9 @@ _08186E9E: thumb_func_start sub_8186EA4 sub_8186EA4: @ 8186EA4 push {r4,lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -3904,7 +3904,7 @@ sub_8186EA4: @ 8186EA4 movs r3, 0x6 bl move_anim_start_t4 _08186EE4: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -3922,7 +3922,7 @@ sub_8186F14: @ 8186F14 push {r4,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -3938,8 +3938,8 @@ sub_8186F14: @ 8186F14 lsls r0, 24 cmp r0, 0 bne _08186F6E - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -3974,7 +3974,7 @@ sub_8186F94: @ 8186F94 push {r4-r7,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -3986,8 +3986,8 @@ sub_8186F94: @ 8186F94 ands r0, r1 cmp r0, 0 beq _08187050 - ldr r7, =gUnknown_02020630 - ldr r6, =gUnknown_020241E4 + ldr r7, =gSprites + ldr r6, =gBankSpriteIds adds r0, r2, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -4034,7 +4034,7 @@ sub_8186F94: @ 8186F94 ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -4052,7 +4052,7 @@ sub_8186F94: @ 8186F94 bl sub_80729D0 ldrb r0, [r5] bl sub_805E408 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4070,7 +4070,7 @@ sub_8187084: @ 8187084 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -4082,7 +4082,7 @@ sub_8187084: @ 8187084 ands r0, r1 cmp r0, 0 bne _081870B6 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -4092,7 +4092,7 @@ sub_8187084: @ 8187084 adds r0, r2, 0 bl sub_8172EF0 _081870B6: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, =gUnknown_03005D7C ldrb r2, [r5] adds r0, r2, r0 @@ -4121,7 +4121,7 @@ _081870B6: adds r0, r3, r4 bl RemoveObjectAndFreeTiles ldrb r4, [r5] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -4136,7 +4136,7 @@ _081870B6: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4154,7 +4154,7 @@ sub_818714C: @ 818714C push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -4178,7 +4178,7 @@ sub_818717C: @ 818717C push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -4201,8 +4201,8 @@ _0818719E: sub_81871AC: @ 81871AC push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4220,8 +4220,8 @@ sub_81871AC: @ 81871AC movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably - ldr r1, =gUnknown_02023064 + bl PrepareBufferDataTransferLink + ldr r1, =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -4230,7 +4230,7 @@ sub_81871AC: @ 81871AC b _08187212 .pool _08187200: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -4252,8 +4252,8 @@ sub_8187224: @ 8187224 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -4261,7 +4261,7 @@ sub_8187224: @ 8187224 ldrb r0, [r1] cmp r0, 0 bne _0818725C - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -4314,8 +4314,8 @@ sub_8187298: @ 8187298 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, =gUnknown_02023064 - ldr r3, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -5191,8 +5191,8 @@ sub_8187A44: @ 8187A44 thumb_func_start sub_8187A50 sub_8187A50: @ 8187A50 push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -5200,7 +5200,7 @@ sub_8187A50: @ 8187A50 ldrb r0, [r1] cmp r0, 0 bne _08187A80 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -5241,7 +5241,7 @@ dp01_setattr_for_opponent_pokemon: @ 8187AA8 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 ldr r2, =gUnknown_02023067 @@ -5333,12 +5333,12 @@ _08187BDC: adds r0, r4, 0 movs r1, 0xB adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData adds r2, r7, 0 adds r2, 0x2E adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r0, 0 mov r8, r0 movs r0, 0x3B @@ -5379,12 +5379,12 @@ _08187C42: adds r1, 0xD mov r0, r9 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 mov r0, r9 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -5400,15 +5400,15 @@ _08187C42: adds r0, r4, 0 movs r1, 0x15 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x20] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x19 ldr r2, [sp, 0x28] - bl pokemon_setattr + bl SetMonData ldrb r0, [r7, 0x14] lsls r0, 27 lsrs r0, 27 @@ -5417,7 +5417,7 @@ _08187C42: adds r0, r4, 0 movs r1, 0x27 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r7, 0x14] lsls r0, 22 @@ -5426,7 +5426,7 @@ _08187C42: adds r0, r4, 0 movs r1, 0x28 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r7, 0x15] lsls r0, 25 @@ -5435,7 +5435,7 @@ _08187C42: adds r0, r4, 0 movs r1, 0x29 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldr r0, [r7, 0x14] lsls r0, 12 @@ -5444,7 +5444,7 @@ _08187C42: adds r0, r4, 0 movs r1, 0x2A mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r7, 0x16] lsls r0, 23 @@ -5453,7 +5453,7 @@ _08187C42: adds r0, r4, 0 movs r1, 0x2B mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r7, 0x17] lsls r0, 26 @@ -5462,47 +5462,47 @@ _08187C42: adds r0, r4, 0 movs r1, 0x2C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0 ldr r2, [sp, 0x2C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x37 ldr r2, [sp, 0x30] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 ldr r2, [sp, 0x18] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A ldr r2, [sp, 0x24] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3B ldr r2, [sp, 0x4] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C ldr r2, [sp, 0x8] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D ldr r2, [sp, 0xC] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E ldr r2, [sp, 0x10] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F ldr r2, [sp, 0x14] - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187D74: @@ -5514,7 +5514,7 @@ _08187D74: lsls r2, 9 adds r2, r3 movs r1, 0xB - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187D90: @@ -5526,7 +5526,7 @@ _08187D90: lsls r2, 9 adds r2, r3 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187DAC: @@ -5547,12 +5547,12 @@ _08187DC4: adds r1, 0xD adds r0, r7, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 adds r0, r7, 0 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -5566,7 +5566,7 @@ _08187DC4: adds r0, r1 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187E00: @@ -5574,7 +5574,7 @@ _08187E00: muls r0, r5 ldr r1, =gEnemyParty adds r0, r1 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -5595,7 +5595,7 @@ _08187E20: adds r0, r4, 0 movs r1, 0x11 str r3, [sp, 0x34] - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -5603,7 +5603,7 @@ _08187E20: adds r2, r0 adds r0, r4, 0 movs r1, 0x12 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -5611,7 +5611,7 @@ _08187E20: adds r2, r0 adds r0, r4, 0 movs r1, 0x13 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -5619,7 +5619,7 @@ _08187E20: adds r2, r0 adds r0, r4, 0 movs r1, 0x14 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -5627,7 +5627,7 @@ _08187E20: adds r2, r0 adds r0, r4, 0 movs r1, 0x15 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187E88: @@ -5635,7 +5635,7 @@ _08187E88: muls r0, r5 ldr r1, =gEnemyParty adds r0, r1 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -5645,7 +5645,7 @@ _08187E88: _08187E9E: adds r3, 0x3 adds r2, r3 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187EB0: @@ -5657,7 +5657,7 @@ _08187EB0: lsls r2, 9 adds r2, r3 movs r1, 0x1 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187ECC: @@ -5669,7 +5669,7 @@ _08187ECC: lsls r2, 9 adds r2, r3 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187EE8: @@ -5681,7 +5681,7 @@ _08187EE8: lsls r2, 9 adds r2, r3 movs r1, 0x1A - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187F04: @@ -5693,7 +5693,7 @@ _08187F04: lsls r2, 9 adds r2, r3 movs r1, 0x1B - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187F20: @@ -5705,7 +5705,7 @@ _08187F20: lsls r2, 9 adds r2, r3 movs r1, 0x1C - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187F3C: @@ -5717,7 +5717,7 @@ _08187F3C: lsls r2, 9 adds r2, r3 movs r1, 0x1D - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187F58: @@ -5729,7 +5729,7 @@ _08187F58: lsls r2, 9 adds r2, r3 movs r1, 0x1E - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187F74: @@ -5741,7 +5741,7 @@ _08187F74: lsls r2, 9 adds r2, r3 movs r1, 0x1F - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187F90: @@ -5753,7 +5753,7 @@ _08187F90: lsls r2, 9 adds r2, r3 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187FAC: @@ -5765,7 +5765,7 @@ _08187FAC: lsls r2, 9 adds r2, r3 movs r1, 0x22 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187FC8: @@ -5777,7 +5777,7 @@ _08187FC8: lsls r2, 9 adds r2, r3 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08187FE4: @@ -5789,7 +5789,7 @@ _08187FE4: lsls r2, 9 adds r2, r3 movs r1, 0x24 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188000: @@ -5801,7 +5801,7 @@ _08188000: lsls r2, 9 adds r2, r3 movs r1, 0x25 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _0818801C: @@ -5813,7 +5813,7 @@ _0818801C: lsls r2, 9 adds r2, r3 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188038: @@ -5828,7 +5828,7 @@ _08188038: adds r0, r4, 0 movs r1, 0x27 str r3, [sp, 0x34] - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -5836,7 +5836,7 @@ _08188038: adds r2, r0 adds r0, r4, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -5844,7 +5844,7 @@ _08188038: adds r2, r0 adds r0, r4, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -5852,7 +5852,7 @@ _08188038: adds r2, r0 adds r0, r4, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -5860,7 +5860,7 @@ _08188038: adds r2, r0 adds r0, r4, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData ldrb r2, [r6] lsls r2, 9 ldr r3, [sp, 0x34] @@ -5878,7 +5878,7 @@ _081880AC: lsls r2, 9 adds r2, r3 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081880C8: @@ -5890,7 +5890,7 @@ _081880C8: lsls r2, 9 adds r2, r3 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081880E4: @@ -5902,7 +5902,7 @@ _081880E4: lsls r2, 9 adds r2, r3 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188100: @@ -5914,7 +5914,7 @@ _08188100: lsls r2, 9 adds r2, r3 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _0818811C: @@ -5926,7 +5926,7 @@ _0818811C: lsls r2, 9 adds r2, r3 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188138: @@ -5939,7 +5939,7 @@ _08188138: adds r2, r3 _08188146: movs r1, 0x2C - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188154: @@ -5951,7 +5951,7 @@ _08188154: lsls r2, 9 adds r2, r3 movs r1, 0 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188170: @@ -5963,7 +5963,7 @@ _08188170: lsls r2, 9 adds r2, r3 movs r1, 0x9 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _0818818C: @@ -5975,7 +5975,7 @@ _0818818C: lsls r2, 9 adds r2, r3 movs r1, 0x37 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081881A8: @@ -5987,7 +5987,7 @@ _081881A8: lsls r2, 9 adds r2, r3 movs r1, 0x38 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081881C4: @@ -5999,7 +5999,7 @@ _081881C4: lsls r2, 9 adds r2, r3 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081881E0: @@ -6011,7 +6011,7 @@ _081881E0: lsls r2, 9 adds r2, r3 movs r1, 0x3A - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081881FC: @@ -6023,7 +6023,7 @@ _081881FC: lsls r2, 9 adds r2, r3 movs r1, 0x3B - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188218: @@ -6035,7 +6035,7 @@ _08188218: lsls r2, 9 adds r2, r3 movs r1, 0x3C - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188234: @@ -6047,7 +6047,7 @@ _08188234: lsls r2, 9 adds r2, r3 movs r1, 0x3D - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188250: @@ -6059,7 +6059,7 @@ _08188250: lsls r2, 9 adds r2, r3 movs r1, 0x3E - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _0818826C: @@ -6071,7 +6071,7 @@ _0818826C: lsls r2, 9 adds r2, r3 movs r1, 0x3F - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188288: @@ -6083,7 +6083,7 @@ _08188288: lsls r2, 9 adds r2, r3 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081882A4: @@ -6095,7 +6095,7 @@ _081882A4: lsls r2, 9 adds r2, r3 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081882C0: @@ -6107,7 +6107,7 @@ _081882C0: lsls r2, 9 adds r2, r3 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081882DC: @@ -6119,7 +6119,7 @@ _081882DC: lsls r2, 9 adds r2, r3 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081882F8: @@ -6131,7 +6131,7 @@ _081882F8: lsls r2, 9 adds r2, r3 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188314: @@ -6143,7 +6143,7 @@ _08188314: lsls r2, 9 adds r2, r3 movs r1, 0x30 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188330: @@ -6155,7 +6155,7 @@ _08188330: lsls r2, 9 adds r2, r3 movs r1, 0x32 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _0818834C: @@ -6167,7 +6167,7 @@ _0818834C: lsls r2, 9 adds r2, r3 movs r1, 0x33 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188368: @@ -6179,7 +6179,7 @@ _08188368: lsls r2, 9 adds r2, r3 movs r1, 0x34 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _08188384: @@ -6191,7 +6191,7 @@ _08188384: lsls r2, 9 adds r2, r3 movs r1, 0x35 - bl pokemon_setattr + bl SetMonData b _081883B4 .pool _081883A0: @@ -6203,7 +6203,7 @@ _081883A0: lsls r2, 9 adds r2, r3 movs r1, 0x36 - bl pokemon_setattr + bl SetMonData _081883B4: add sp, 0x38 pop {r3-r5} @@ -6219,8 +6219,8 @@ _081883B4: thumb_func_start sub_81883C8 sub_81883C8: @ 81883C8 push {r4-r7,lr} - ldr r1, =gUnknown_0202406E - ldr r7, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r7, =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -6228,7 +6228,7 @@ sub_81883C8: @ 81883C8 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -6278,8 +6278,8 @@ sub_818843C: @ 818843C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r7, =gUnknown_0202406E - ldr r6, =gUnknown_02024064 + ldr r7, =gBattlePartyID + ldr r6, =gActiveBank ldrb r0, [r6] lsls r0, 1 adds r0, r7 @@ -6307,7 +6307,7 @@ sub_818843C: @ 818843C add r0, r9 bl sub_805DC0C ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -6335,11 +6335,11 @@ sub_818843C: @ 818843C adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -6396,7 +6396,7 @@ sub_818843C: @ 818843C lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -6415,12 +6415,12 @@ sub_818843C: @ 818843C thumb_func_start sub_818858C sub_818858C: @ 818858C push {r4,lr} - ldr r1, =gUnknown_0202406E - ldr r4, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r4, =gActiveBank ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 - ldr r3, =gUnknown_02023064 + ldr r3, =gBattleBufferA lsls r0, 9 adds r1, r3, 0x1 adds r0, r1 @@ -6432,7 +6432,7 @@ sub_818858C: @ 818858C adds r1, r3 ldrb r1, [r1] bl sub_81885D8 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -6458,10 +6458,10 @@ sub_81885D8: @ 81885D8 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r4, r6, 1 adds r4, r0 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -6496,7 +6496,7 @@ sub_81885D8: @ 81885D8 adds r1, r6, 0 bl sub_805DC0C adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -6524,10 +6524,10 @@ sub_81885D8: @ 81885D8 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds adds r4, r6, r4 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites mov r0, r10 ldrb r1, [r0] lsls r0, r1, 4 @@ -6620,8 +6620,8 @@ sub_81885D8: @ 81885D8 thumb_func_start sub_8188768 sub_8188768: @ 8188768 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -6637,7 +6637,7 @@ sub_8188768: @ 8188768 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -6646,13 +6646,13 @@ sub_8188768: @ 8188768 b _081887EC .pool _081887B0: - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -6683,7 +6683,7 @@ sub_8188800: @ 8188800 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -6735,7 +6735,7 @@ _08188856: adds r1, r2, 0 movs r3, 0x2 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -6760,9 +6760,9 @@ sub_818888C: @ 818888C ands r0, r1 cmp r0, 0 beq _081888F6 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 ands r1, r0 movs r7, 0xC8 @@ -6825,11 +6825,11 @@ _08188928: lsrs r0, 16 _0818892C: mov r8, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] bl sub_805DF38 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -6858,11 +6858,11 @@ _0818892C: mov r1, r9 adds r2, r4, 0 bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -6919,7 +6919,7 @@ _0818892C: adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -6945,15 +6945,15 @@ sub_8188A40: @ 8188A40 thumb_func_start sub_8188A4C sub_8188A4C: @ 8188A4C push {r4-r6,lr} - ldr r6, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -7004,7 +7004,7 @@ sub_8188A4C: @ 8188A4C adds r0, r5 ldr r1, =DummyObjectCallback bl oamt_set_x3A_32 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -7021,7 +7021,7 @@ sub_8188AF8: @ 8188AF8 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -7068,8 +7068,8 @@ _08188B4C: movs r0, 0x10 movs r1, 0x3F bl audio_play_and_stuff - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -7080,7 +7080,7 @@ _08188B4C: adds r0, r2 ldr r1, =sub_8039934 str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -7128,7 +7128,7 @@ sub_8188BC8: @ 8188BC8 thumb_func_start sub_8188BD4 sub_8188BD4: @ 8188BD4 push {r4-r6,lr} - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -7136,7 +7136,7 @@ sub_8188BD4: @ 8188BD4 beq _08188BE6 b _08188CFA _08188BE6: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -7249,7 +7249,7 @@ _08188CDC: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -7269,8 +7269,8 @@ sub_8188D0C: @ 8188D0C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r6, =gActiveBank ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -7397,7 +7397,7 @@ _08188DCE: _08188E1C: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -7454,7 +7454,7 @@ sub_8188E90: @ 8188E90 strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 ldr r1, =gUnknown_02023066 @@ -7464,7 +7464,7 @@ sub_8188E90: @ 8188E90 ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -7487,7 +7487,7 @@ sub_8188EE4: @ 8188EE4 thumb_func_start sub_8188EF0 sub_8188EF0: @ 8188EF0 push {lr} - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl sub_8185054 adds r1, r0, 0 @@ -7530,7 +7530,7 @@ sub_8188F20: @ 8188F20 b _08188F6C .pool _08188F48: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl sub_8185054 adds r4, r0, 0 @@ -7564,11 +7564,11 @@ sub_8188F7C: @ 8188F7C thumb_func_start sub_8188F88 sub_8188F88: @ 8188F88 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl sub_8185054 ldrb r1, [r4] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r2, [r3] adds r1, r2 adds r1, 0x5C @@ -7605,8 +7605,8 @@ sub_8188FD0: @ 8188FD0 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r0, =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -7623,7 +7623,7 @@ sub_8188FD0: @ 8188FD0 ldr r0, =0x00007fff cmp r7, r0 beq _08189060 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -7655,7 +7655,7 @@ sub_8188FD0: @ 8188FD0 b _0818908A .pool _08189060: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -7675,8 +7675,8 @@ _08189060: movs r3, 0 bl sub_807294C _0818908A: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -7703,7 +7703,7 @@ sub_81890C0: @ 81890C0 thumb_func_start sub_81890CC sub_81890CC: @ 81890CC push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -7713,7 +7713,7 @@ sub_81890CC: @ 81890CC ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -7736,7 +7736,7 @@ sub_81890CC: @ 81890CC negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -7752,13 +7752,13 @@ _08189120: thumb_func_start sub_8189144 sub_8189144: @ 8189144 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08189194 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -7783,7 +7783,7 @@ sub_8189144: @ 8189144 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -7887,8 +7887,8 @@ sub_8189218: @ 8189218 sub_8189234: @ 8189234 push {lr} ldr r3, =gUnknown_02022D0C - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -7946,9 +7946,9 @@ sub_8189284: @ 8189284 thumb_func_start sub_81892AC sub_81892AC: @ 81892AC push {r4,lr} - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -7965,7 +7965,7 @@ sub_81892AC: @ 81892AC b _0818930A .pool _081892E0: - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -7979,7 +7979,7 @@ _081892E0: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -8003,16 +8003,16 @@ sub_818931C: @ 818931C thumb_func_start sub_8189328 sub_8189328: @ 8189328 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _0818933C movs r3, 0xC0 _0818933C: - ldr r2, =gUnknown_02023064 + ldr r2, =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -8036,8 +8036,8 @@ _0818933C: thumb_func_start sub_818936C sub_818936C: @ 818936C push {r4,r5,lr} - ldr r4, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -8079,8 +8079,8 @@ _081893BC: thumb_func_start sub_81893C8 sub_81893C8: @ 81893C8 push {lr} - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -8105,8 +8105,8 @@ sub_81893C8: @ 81893C8 thumb_func_start sub_8189404 sub_8189404: @ 8189404 push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -8127,15 +8127,15 @@ sub_8189404: @ 8189404 thumb_func_start sub_8189438 sub_8189438: @ 8189438 push {r4-r6,lr} - ldr r5, =gUnknown_020241E4 - ldr r6, =gUnknown_02024064 + ldr r5, =gBankSpriteIds + ldr r6, =gActiveBank ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -8227,7 +8227,7 @@ _081894FA: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -8248,7 +8248,7 @@ c3_0803D564: @ 8189548 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r0, [r7] mov r9, r0 ldr r1, =gTasks @@ -8270,12 +8270,12 @@ c3_0803D564: @ 8189548 cmp r0, 0 beq _081895B4 _08189582: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -8286,12 +8286,12 @@ _08189582: b _081895F4 .pool _081895B4: - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -8317,8 +8317,8 @@ _081895B4: eors r0, r5 strb r0, [r7] _081895F4: - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -8355,8 +8355,8 @@ sub_818962C: @ 818962C thumb_func_start sub_8189648 sub_8189648: @ 8189648 push {r4-r7,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -8365,7 +8365,7 @@ sub_8189648: @ 8189648 cmp r0, 0 beq _08189678 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08189678 @@ -8375,7 +8375,7 @@ sub_8189648: @ 8189648 _08189678: ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -8386,7 +8386,7 @@ _08189678: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - ldr r1, =gUnknown_02023064 + ldr r1, =gBattleBufferA ldrb r2, [r3] lsls r0, r2, 9 adds r1, 0x2 @@ -8464,7 +8464,7 @@ _081896E4: movs r1, 0x5D strb r1, [r0, 0x5] _08189736: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r7] lsls r1, 2 adds r1, r0 @@ -8482,7 +8482,7 @@ sub_818975C: @ 818975C push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -8518,7 +8518,7 @@ sub_81897A4: @ 81897A4 push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -8558,14 +8558,14 @@ sub_81897F4: @ 81897F4 thumb_func_start sub_8189800 sub_8189800: @ 8189800 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _08189846 - ldr r3, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r0, =gBankSpriteIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -8573,7 +8573,7 @@ sub_8189800: @ 8189800 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -8602,13 +8602,13 @@ _08189846: sub_8189860: @ 8189860 push {r4-r6,lr} sub sp, 0x4 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _081898B8 - ldr r5, =gUnknown_02023064 + ldr r5, =gBattleBufferA ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -8633,7 +8633,7 @@ sub_8189860: @ 8189860 b _081898B8 .pool _081898AC: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -8666,8 +8666,8 @@ sub_81898D4: @ 81898D4 thumb_func_start sub_81898E0 sub_81898E0: @ 81898E0 push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -8675,12 +8675,12 @@ sub_81898E0: @ 81898E0 ldrb r2, [r0] cmp r2, 0x3 bne _08189908 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome strb r2, [r0] b _08189910 .pool _08189908: - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome movs r1, 0x3 eors r1, r2 strb r1, [r0] @@ -8690,8 +8690,8 @@ _08189910: movs r0, 0x3 bl BeginFastPaletteFade bl sub_81871AC - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -8714,8 +8714,8 @@ nullsub_120: @ 8189948 thumb_func_start sub_818994C sub_818994C: @ 818994C - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -8728,9 +8728,9 @@ sub_818994C: @ 818994C thumb_func_start sub_8189968 sub_8189968: @ 8189968 push {lr} - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -8739,7 +8739,7 @@ sub_8189968: @ 8189968 ands r1, r0 cmp r1, 0 beq _081899B4 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] @@ -8763,9 +8763,9 @@ _081899B4: thumb_func_start sub_81899B8 sub_81899B8: @ 81899B8 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -8788,9 +8788,9 @@ _081899DC: thumb_func_start sub_81899F0 sub_81899F0: @ 81899F0 push {r4-r6,lr} - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -8835,7 +8835,7 @@ sub_8189A58: @ 8189A58 push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r1, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -8873,9 +8873,9 @@ sub_8189AA0: @ 8189AA0 mov r6, r8 push {r6,r7} movs r6, 0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 beq _08189ABA @@ -8896,7 +8896,7 @@ _08189ABA: cmp r0, 0 beq _08189B0C _08189ADA: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gUnknown_03005D70 ldrb r0, [r4] adds r0, r1 @@ -8913,9 +8913,9 @@ _08189ADA: b _08189B48 .pool _08189B0C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r5, =gUnknown_03005D70 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -8948,7 +8948,7 @@ _08189B48: ldr r0, =gUnknown_020244D0 mov r9, r0 ldr r0, [r0] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -9028,7 +9028,7 @@ _08189B86: bl FreeObjectTilesByTag adds r0, r4, 0 bl FreeObjectPaletteByTag - ldr r7, =gUnknown_0202406E + ldr r7, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r7 @@ -9062,7 +9062,7 @@ _08189C22: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] b _08189D10 .pool @@ -9082,7 +9082,7 @@ _08189C60: cmp r0, 0 beq _08189CB0 _08189C80: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gUnknown_03005D70 ldrb r0, [r4] adds r0, r1 @@ -9099,9 +9099,9 @@ _08189C80: b _08189CE4 .pool _08189CB0: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r5, =gUnknown_03005D70 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -9138,7 +9138,7 @@ _08189CF2: beq _08189D18 ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -9147,7 +9147,7 @@ _08189CF2: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r3] _08189D10: lsls r0, 2 @@ -9173,9 +9173,9 @@ sub_8189D40: @ 8189D40 push {r5-r7} movs r0, 0 mov r10, r0 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _08189DBE @@ -9193,7 +9193,7 @@ sub_8189D40: @ 8189D40 ands r0, r1 cmp r0, 0 bne _08189D8C - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -9218,7 +9218,7 @@ _08189D8C: ands r0, r1 cmp r0, 0 bne _08189DBE - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 @@ -9230,7 +9230,7 @@ _08189D8C: _08189DBE: ldr r3, =gUnknown_020244D0 ldr r0, [r3] - ldr r2, =gUnknown_02024064 + ldr r2, =gActiveBank ldrb r5, [r2] ldr r4, [r0, 0x4] lsls r0, r5, 1 @@ -9279,7 +9279,7 @@ _08189DBE: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -9301,11 +9301,11 @@ _08189DBE: bl sub_80729D0 _08189E54: ldr r5, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -9324,7 +9324,7 @@ _08189E54: _08189E84: ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -9388,7 +9388,7 @@ _08189EA2: cmp r0, 0x42 bne _08189F38 adds r0, r2, 0 - bl battle_get_per_side_status + bl GetBankIdentity lsls r0, 24 cmp r0, 0 bne _08189F44 @@ -9405,7 +9405,7 @@ _08189F38: _08189F44: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -9422,9 +9422,9 @@ _08189F62: mov r1, r10 cmp r1, 0 beq _0818A02A - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r6, =gUnknown_03005D7C - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r3, [r5] adds r0, r3, r6 ldrb r1, [r0] @@ -9438,7 +9438,7 @@ _08189F62: ldr r0, =DummyObjectCallback cmp r2, r0 bne _0818A02A - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -9470,14 +9470,14 @@ _08189F62: bl RemoveObjectAndFreeTiles _08189FC8: ldr r1, =gUnknown_03005D7C - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldr r3, =gUnknown_020244D0 @@ -9511,7 +9511,7 @@ _08189FC8: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -9531,9 +9531,9 @@ _0818A02A: thumb_func_start sub_818A064 sub_818A064: @ 818A064 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -9561,7 +9561,7 @@ _0818A092: thumb_func_start sub_818A0A4 sub_818A0A4: @ 818A0A4 push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] ldr r6, =gUnknown_03005D70 adds r1, r0, r6 @@ -9590,7 +9590,7 @@ sub_818A0A4: @ 818A0A4 b _0818A106 .pool _0818A0EC: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -9611,9 +9611,9 @@ _0818A106: thumb_func_start sub_818A114 sub_818A114: @ 818A114 push {r4-r6,lr} - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r2, [r4] adds r0, r2, r5 ldrb r1, [r0] @@ -9628,7 +9628,7 @@ sub_818A114: @ 818A114 adds r1, r0 cmp r1, 0xA0 ble _0818A190 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] @@ -9678,7 +9678,7 @@ sub_818A1B0: @ 818A1B0 push {r4-r6,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -9690,13 +9690,13 @@ sub_818A1B0: @ 818A1B0 ands r0, r1 cmp r0, 0 bne _0818A204 - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -9737,12 +9737,12 @@ _0818A232: thumb_func_start sub_818A238 sub_818A238: @ 818A238 push {r4,lr} - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -9760,7 +9760,7 @@ sub_818A238: @ 818A238 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r3, [r0] bl sub_818A514 b _0818A2AE @@ -9797,9 +9797,9 @@ _0818A2AE: thumb_func_start sub_818A2B4 sub_818A2B4: @ 818A2B4 push {r4,lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -9830,7 +9830,7 @@ sub_818A2B4: @ 818A2B4 movs r3, 0x6 bl move_anim_start_t4 _0818A2FA: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -9848,7 +9848,7 @@ sub_818A328: @ 818A328 push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -9860,8 +9860,8 @@ sub_818A328: @ 818A328 ands r0, r1 cmp r0, 0 bne _0818A364 - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -9887,7 +9887,7 @@ sub_818A37C: @ 818A37C push {r7} ldr r3, =gUnknown_020244D0 ldr r0, [r3] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r1, [r7] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -9923,7 +9923,7 @@ sub_818A37C: @ 818A37C ldr r0, =c3_0802FDF4 movs r1, 0xA bl CreateTask - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r8, r0 ldrb r1, [r7] lsls r0, r1, 1 @@ -9934,14 +9934,14 @@ sub_818A37C: @ 818A37C ldr r5, =gPlayerParty adds r0, r5 bl sub_805E990 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldrb r0, [r7] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectImageAnim @@ -9962,7 +9962,7 @@ sub_818A37C: @ 818A37C adds r0, r4 ldrb r0, [r0] bl sub_80729D0 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -9982,7 +9982,7 @@ sub_818A470: @ 818A470 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -9994,7 +9994,7 @@ sub_818A470: @ 818A470 ands r0, r1 cmp r0, 0 bne _0818A4A2 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -10004,7 +10004,7 @@ sub_818A470: @ 818A470 adds r0, r2, 0 bl sub_8172EF0 _0818A4A2: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gUnknown_03005D7C ldrb r2, [r4] adds r0, r2, r0 @@ -10032,7 +10032,7 @@ _0818A4A2: bne _0818A4E8 adds r0, r3, r5 bl RemoveObjectAndFreeTiles - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -10049,8 +10049,8 @@ _0818A4E8: sub_818A514: @ 818A514 push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -10068,8 +10068,8 @@ sub_818A514: @ 818A514 movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably - ldr r1, =gUnknown_02023064 + bl PrepareBufferDataTransferLink + ldr r1, =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -10078,7 +10078,7 @@ sub_818A514: @ 818A514 b _0818A57A .pool _0818A568: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -10100,7 +10100,7 @@ sub_818A58C: @ 818A58C push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -10124,7 +10124,7 @@ sub_818A5BC: @ 818A5BC push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -10148,8 +10148,8 @@ sub_818A5EC: @ 818A5EC push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -10157,7 +10157,7 @@ sub_818A5EC: @ 818A5EC ldrb r0, [r1] cmp r0, 0 bne _0818A624 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -10210,8 +10210,8 @@ sub_818A660: @ 818A660 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, =gUnknown_02023064 - ldr r3, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -11087,8 +11087,8 @@ sub_818AE0C: @ 818AE0C thumb_func_start sub_818AE18 sub_818AE18: @ 818AE18 push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -11096,7 +11096,7 @@ sub_818AE18: @ 818AE18 ldrb r0, [r1] cmp r0, 0 bne _0818AE48 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -11137,7 +11137,7 @@ sub_818AE70: @ 818AE70 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r2, =gUnknown_02023067 @@ -11228,12 +11228,12 @@ _0818AFA4: adds r0, r4, 0 movs r1, 0xB adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x2E adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r0, 0 mov r8, r0 movs r0, 0x3B @@ -11274,12 +11274,12 @@ _0818B00A: adds r1, 0xD mov r0, r9 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 mov r0, r9 adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData adds r7, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -11295,15 +11295,15 @@ _0818B00A: adds r0, r4, 0 movs r1, 0x15 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x20] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x19 ldr r2, [sp, 0x28] - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x14] lsls r0, 27 lsrs r0, 27 @@ -11312,7 +11312,7 @@ _0818B00A: adds r0, r4, 0 movs r1, 0x27 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x14] lsls r0, 22 @@ -11321,7 +11321,7 @@ _0818B00A: adds r0, r4, 0 movs r1, 0x28 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x15] lsls r0, 25 @@ -11330,7 +11330,7 @@ _0818B00A: adds r0, r4, 0 movs r1, 0x29 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldr r0, [r6, 0x14] lsls r0, 12 @@ -11339,7 +11339,7 @@ _0818B00A: adds r0, r4, 0 movs r1, 0x2A mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x16] lsls r0, 23 @@ -11348,7 +11348,7 @@ _0818B00A: adds r0, r4, 0 movs r1, 0x2B mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x17] lsls r0, 26 @@ -11357,47 +11357,47 @@ _0818B00A: adds r0, r4, 0 movs r1, 0x2C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0 ldr r2, [sp, 0x2C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x37 ldr r2, [sp, 0x30] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 ldr r2, [sp, 0x18] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A ldr r2, [sp, 0x24] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3B ldr r2, [sp, 0x4] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C ldr r2, [sp, 0x8] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D ldr r2, [sp, 0xC] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E ldr r2, [sp, 0x10] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F ldr r2, [sp, 0x14] - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B13C: @@ -11405,12 +11405,12 @@ _0818B13C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xB - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B15C: @@ -11418,12 +11418,12 @@ _0818B15C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B17C: @@ -11445,12 +11445,12 @@ _0818B196: adds r1, 0xD adds r0, r7, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 adds r0, r7, 0 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -11464,7 +11464,7 @@ _0818B196: adds r0, r1 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B1D4: @@ -11472,8 +11472,8 @@ _0818B1D4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -11488,41 +11488,41 @@ _0818B1FC: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x11 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x12 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x13 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x14 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x15 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B260: @@ -11530,8 +11530,8 @@ _0818B260: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -11541,7 +11541,7 @@ _0818B260: _0818B278: adds r3, 0x3 adds r2, r3 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B290: @@ -11549,12 +11549,12 @@ _0818B290: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B2B0: @@ -11562,12 +11562,12 @@ _0818B2B0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B2D0: @@ -11575,12 +11575,12 @@ _0818B2D0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1A - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B2F0: @@ -11588,12 +11588,12 @@ _0818B2F0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1B - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B310: @@ -11601,12 +11601,12 @@ _0818B310: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1C - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B330: @@ -11614,12 +11614,12 @@ _0818B330: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1D - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B350: @@ -11627,12 +11627,12 @@ _0818B350: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1E - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B370: @@ -11640,12 +11640,12 @@ _0818B370: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1F - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B390: @@ -11653,12 +11653,12 @@ _0818B390: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B3B0: @@ -11666,12 +11666,12 @@ _0818B3B0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x22 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B3D0: @@ -11679,12 +11679,12 @@ _0818B3D0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B3F0: @@ -11692,12 +11692,12 @@ _0818B3F0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x24 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B410: @@ -11705,12 +11705,12 @@ _0818B410: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x25 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B430: @@ -11718,12 +11718,12 @@ _0818B430: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B450: @@ -11732,41 +11732,41 @@ _0818B450: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x5 @@ -11779,12 +11779,12 @@ _0818B4C0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B4E0: @@ -11792,12 +11792,12 @@ _0818B4E0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B500: @@ -11805,12 +11805,12 @@ _0818B500: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B520: @@ -11818,12 +11818,12 @@ _0818B520: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B540: @@ -11831,12 +11831,12 @@ _0818B540: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B560: @@ -11844,13 +11844,13 @@ _0818B560: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 _0818B570: movs r1, 0x2C - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B580: @@ -11858,12 +11858,12 @@ _0818B580: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B5A0: @@ -11871,12 +11871,12 @@ _0818B5A0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x9 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B5C0: @@ -11884,12 +11884,12 @@ _0818B5C0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x37 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B5E0: @@ -11897,12 +11897,12 @@ _0818B5E0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x38 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B600: @@ -11910,12 +11910,12 @@ _0818B600: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B620: @@ -11923,12 +11923,12 @@ _0818B620: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3A - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B640: @@ -11936,12 +11936,12 @@ _0818B640: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3B - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B660: @@ -11949,12 +11949,12 @@ _0818B660: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3C - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B680: @@ -11962,12 +11962,12 @@ _0818B680: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3D - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B6A0: @@ -11975,12 +11975,12 @@ _0818B6A0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3E - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B6C0: @@ -11988,12 +11988,12 @@ _0818B6C0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3F - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B6E0: @@ -12001,12 +12001,12 @@ _0818B6E0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B700: @@ -12014,12 +12014,12 @@ _0818B700: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B720: @@ -12027,12 +12027,12 @@ _0818B720: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B740: @@ -12040,12 +12040,12 @@ _0818B740: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B760: @@ -12053,12 +12053,12 @@ _0818B760: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B780: @@ -12066,12 +12066,12 @@ _0818B780: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x30 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B7A0: @@ -12079,12 +12079,12 @@ _0818B7A0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x32 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B7C0: @@ -12092,12 +12092,12 @@ _0818B7C0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x33 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B7E0: @@ -12105,12 +12105,12 @@ _0818B7E0: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x34 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B800: @@ -12118,12 +12118,12 @@ _0818B800: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x35 - bl pokemon_setattr + bl SetMonData b _0818B836 .pool _0818B820: @@ -12131,15 +12131,15 @@ _0818B820: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 - bl pokemon_setattr + bl SetMonData _0818B836: - ldr r2, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r2, =gBattlePartyID + ldr r0, =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -12163,8 +12163,8 @@ _0818B836: thumb_func_start sub_818B86C sub_818B86C: @ 818B86C push {r4-r7,lr} - ldr r1, =gUnknown_0202406E - ldr r7, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r7, =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -12172,7 +12172,7 @@ sub_818B86C: @ 818B86C movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -12220,9 +12220,9 @@ sub_818B8E0: @ 818B8E0 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r8, r0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] lsls r0, r1, 1 add r0, r8 @@ -12244,7 +12244,7 @@ sub_818B8E0: @ 818B8E0 lsls r4, 16 lsrs r4, 16 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -12272,11 +12272,11 @@ sub_818B8E0: @ 818B8E0 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -12318,7 +12318,7 @@ sub_818B8E0: @ 818B8E0 adds r2, r1 ldrb r1, [r2] bl StartObjectImageAnim - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -12335,15 +12335,15 @@ sub_818B8E0: @ 818B8E0 thumb_func_start sub_818B9FC sub_818B9FC: @ 818B9FC push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r1, r0, 9 adds r6, r4, 0x2 adds r1, r6 ldrb r1, [r1] bl sub_805EF84 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -12366,7 +12366,7 @@ sub_818B9FC: @ 818B9FC adds r1, r6 ldrb r1, [r1] bl sub_818BA6C - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -12392,10 +12392,10 @@ sub_818BA6C: @ 818BA6C lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r2, r6, 1 adds r2, r0 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -12420,7 +12420,7 @@ sub_818BA6C: @ 818BA6C mov r1, r9 strb r0, [r1] adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -12448,10 +12448,10 @@ sub_818BA6C: @ 818BA6C adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds adds r4, r6, r4 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -12544,8 +12544,8 @@ sub_818BA6C: @ 818BA6C thumb_func_start sub_818BBE8 sub_818BBE8: @ 818BBE8 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -12561,7 +12561,7 @@ sub_818BBE8: @ 818BBE8 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -12570,13 +12570,13 @@ sub_818BBE8: @ 818BBE8 b _0818BC66 .pool _0818BC30: - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -12605,7 +12605,7 @@ sub_818BC78: @ 818BC78 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -12657,7 +12657,7 @@ _0818BCCE: adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -12714,9 +12714,9 @@ _0818BD4C: adds r5, r0, 0 cmp r1, 0 beq _0818BD98 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - bl battle_get_per_side_status + bl GetBankIdentity movs r1, 0x2 ands r1, r0 movs r0, 0x20 @@ -12768,12 +12768,12 @@ _0818BDC0: lsls r0, 16 lsrs r4, r0, 16 adds r5, r4, 0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] adds r0, r5, 0 bl sub_805DF38 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -12792,7 +12792,7 @@ _0818BDC0: mov r1, r9 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds ldrb r1, [r6] adds r1, r4 strb r0, [r1] @@ -12801,7 +12801,7 @@ _0818BDC0: adds r5, r0 ldrh r0, [r5, 0x4] bl IndexOfObjectPaletteTag - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r1, [r6] adds r1, r4 ldrb r1, [r1] @@ -12880,12 +12880,12 @@ _0818BDC0: b _0818BF72 .pool _0818BEDC: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -12904,11 +12904,11 @@ _0818BEDC: mov r1, r8 adds r2, r4, 0 bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -12951,8 +12951,8 @@ _0818BEDC: ldr r1, =sub_805D7AC str r1, [r0] _0818BF72: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -12978,15 +12978,15 @@ sub_818BFAC: @ 818BFAC thumb_func_start sub_818BFB8 sub_818BFB8: @ 818BFB8 push {r4-r6,lr} - ldr r6, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -13036,7 +13036,7 @@ sub_818BFB8: @ 818BFB8 adds r0, r5 ldr r1, =DummyObjectCallback bl oamt_set_x3A_32 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -13053,7 +13053,7 @@ sub_818C064: @ 818C064 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -13097,7 +13097,7 @@ _0818C0B8: cmp r4, 0 bne _0818C12E strb r4, [r3, 0x4] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -13111,8 +13111,8 @@ _0818C0B8: negs r1, r1 movs r0, 0x10 bl audio_play_and_stuff - ldr r2, =gUnknown_02020630 - ldr r3, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r3, =gBankSpriteIds ldrb r0, [r5] adds r0, r3 ldrb r1, [r0] @@ -13140,7 +13140,7 @@ _0818C0B8: adds r0, r2 ldr r1, =sub_8039C00 str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -13188,7 +13188,7 @@ sub_818C174: @ 818C174 thumb_func_start sub_818C180 sub_818C180: @ 818C180 push {r4-r6,lr} - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -13196,7 +13196,7 @@ sub_818C180: @ 818C180 beq _0818C192 b _0818C2A6 _0818C192: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -13309,7 +13309,7 @@ _0818C288: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -13329,8 +13329,8 @@ bx_move_anim_2: @ 818C2B8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r6, =gActiveBank ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -13457,7 +13457,7 @@ _0818C37A: _0818C3C8: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -13514,7 +13514,7 @@ sub_818C43C: @ 818C43C strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 ldr r1, =gUnknown_02023066 @@ -13524,7 +13524,7 @@ sub_818C43C: @ 818C43C ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -13547,14 +13547,14 @@ sub_818C490: @ 818C490 thumb_func_start sub_818C49C sub_818C49C: @ 818C49C push {lr} - ldr r1, =gUnknown_02024332 - ldr r0, =gUnknown_0202406C + ldr r1, =gBattleCommunication + ldr r0, =gNoOfAllBanks ldrb r0, [r0] ldrb r1, [r1, 0x4] lsrs r0, 1 cmp r1, r0 bcc _0818C4C6 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl sub_8185054 adds r1, r0, 0 @@ -13580,8 +13580,8 @@ sub_818C4D8: @ 818C4D8 ands r0, r1 cmp r0, 0 beq _0818C508 - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -13590,7 +13590,7 @@ sub_818C4D8: @ 818C4D8 b _0818C522 .pool _0818C508: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] bl sub_8185054 adds r1, r0, 0 @@ -13634,7 +13634,7 @@ sub_818C538: @ 818C538 b _0818C584 .pool _0818C560: - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl sub_8185054 adds r4, r0, 0 @@ -13668,11 +13668,11 @@ sub_818C594: @ 818C594 thumb_func_start sub_818C5A0 sub_818C5A0: @ 818C5A0 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl sub_8185054 ldrb r1, [r4] - ldr r3, =gUnknown_0202449C + ldr r3, =gBattleStruct ldr r2, [r3] adds r1, r2 adds r1, 0x5C @@ -13709,8 +13709,8 @@ sub_818C5E8: @ 818C5E8 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r0, =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -13727,7 +13727,7 @@ sub_818C5E8: @ 818C5E8 ldr r0, =0x00007fff cmp r7, r0 beq _0818C678 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -13759,7 +13759,7 @@ sub_818C5E8: @ 818C5E8 b _0818C6B2 .pool _0818C678: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -13786,8 +13786,8 @@ _0818C678: movs r2, 0 bl heathbar_draw_hp _0818C6B2: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -13814,7 +13814,7 @@ sub_818C6E8: @ 818C6E8 thumb_func_start sub_818C6F4 sub_818C6F4: @ 818C6F4 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -13824,7 +13824,7 @@ sub_818C6F4: @ 818C6F4 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -13847,7 +13847,7 @@ sub_818C6F4: @ 818C6F4 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -13863,13 +13863,13 @@ _0818C748: thumb_func_start sub_818C76C sub_818C76C: @ 818C76C push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0818C7BC - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -13894,7 +13894,7 @@ sub_818C76C: @ 818C76C lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -13998,8 +13998,8 @@ sub_818C840: @ 818C840 sub_818C85C: @ 818C85C push {lr} ldr r3, =gUnknown_02022D0C - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -14057,9 +14057,9 @@ sub_818C8AC: @ 818C8AC thumb_func_start sub_818C8D4 sub_818C8D4: @ 818C8D4 push {r4,lr} - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -14076,7 +14076,7 @@ sub_818C8D4: @ 818C8D4 b _0818C932 .pool _0818C908: - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -14090,7 +14090,7 @@ _0818C908: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -14114,16 +14114,16 @@ sub_818C944: @ 818C944 thumb_func_start sub_818C950 sub_818C950: @ 818C950 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _0818C964 movs r3, 0xC0 _0818C964: - ldr r2, =gUnknown_02023064 + ldr r2, =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -14147,8 +14147,8 @@ _0818C964: thumb_func_start sub_818C994 sub_818C994: @ 818C994 push {r4,r5,lr} - ldr r4, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -14190,8 +14190,8 @@ _0818C9E4: thumb_func_start sub_818C9F0 sub_818C9F0: @ 818C9F0 push {lr} - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -14217,8 +14217,8 @@ sub_818C9F0: @ 818C9F0 thumb_func_start dp01t_2E_2_battle_intro dp01t_2E_2_battle_intro: @ 818CA30 push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -14239,15 +14239,15 @@ dp01t_2E_2_battle_intro: @ 818CA30 thumb_func_start sub_818CA64 sub_818CA64: @ 818CA64 push {r4-r6,lr} - ldr r5, =gUnknown_020241E4 - ldr r6, =gUnknown_02024064 + ldr r5, =gBankSpriteIds + ldr r6, =gActiveBank ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -14350,9 +14350,9 @@ _0818CB5A: adds r1, r4, r2 movs r2, 0x20 bl LoadCompressedPalette - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r5, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r5, =gActiveBank ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -14406,7 +14406,7 @@ _0818CBD4: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -14442,7 +14442,7 @@ sub_818CC24: @ 818CC24 b _0818CD0C .pool _0818CC50: - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -14458,12 +14458,12 @@ _0818CC50: cmp r0, 0 beq _0818CCA0 _0818CC70: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -14474,12 +14474,12 @@ _0818CC70: b _0818CCF4 .pool _0818CCA0: - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -14514,8 +14514,8 @@ _0818CCA0: eors r0, r6 strb r0, [r7] _0818CCF4: - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -14538,8 +14538,8 @@ _0818CD0C: thumb_func_start sub_818CD30 sub_818CD30: @ 818CD30 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -14548,7 +14548,7 @@ sub_818CD30: @ 818CD30 cmp r0, 0 beq _0818CD60 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _0818CD60 @@ -14558,7 +14558,7 @@ sub_818CD30: @ 818CD30 _0818CD60: ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -14608,7 +14608,7 @@ _0818CD60: movs r1, 0x5D strb r1, [r0, 0x5] _0818CDC8: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -14626,7 +14626,7 @@ bx_increment_dp11b_field_5_till_x60_then_resume: @ 818CDF4 push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -14662,7 +14662,7 @@ sub_818CE3C: @ 818CE3C push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -14702,14 +14702,14 @@ sub_818CE8C: @ 818CE8C thumb_func_start sub_818CE98 sub_818CE98: @ 818CE98 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _0818CEDE - ldr r3, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r0, =gBankSpriteIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -14717,7 +14717,7 @@ sub_818CE98: @ 818CE98 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -14746,13 +14746,13 @@ _0818CEDE: sub_818CEF8: @ 818CEF8 push {r4-r6,lr} sub sp, 0x4 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0818CF50 - ldr r5, =gUnknown_02023064 + ldr r5, =gBattleBufferA ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -14777,7 +14777,7 @@ sub_818CEF8: @ 818CEF8 b _0818CF50 .pool _0818CF44: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -14810,9 +14810,9 @@ sub_818CF6C: @ 818CF6C thumb_func_start sub_818CF78 sub_818CF78: @ 818CF78 push {r4,lr} - ldr r2, =gUnknown_0202433A - ldr r1, =gUnknown_02023064 - ldr r4, =gUnknown_02024064 + ldr r2, =gBattleOutcome + ldr r1, =gBattleBufferA + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -14824,7 +14824,7 @@ sub_818CF78: @ 818CF78 movs r0, 0x3 bl BeginFastPaletteFade bl sub_818A514 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -15268,7 +15268,7 @@ _0818D2C6: ldr r0, =0x0000ffff cmp r10, r0 bne _0818D336 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -15536,7 +15536,7 @@ _0818D518: ldr r1, [sp, 0x1C] cmp r1, r0 bne _0818D566 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -15626,7 +15626,7 @@ _0818D5F0: lsls r6, r4, 4 cmp r1, r0 beq _0818D624 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r6, r4 lsls r0, 2 adds r0, r1 @@ -15639,7 +15639,7 @@ _0818D5F0: _0818D624: adds r0, r6, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles mov r0, r8 @@ -20043,7 +20043,7 @@ _0818FB74: adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0xC - bl pokemon_setattr + bl SetMonData ldr r0, =gSaveBlock2Ptr ldr r0, [r0] ldr r1, [sp, 0x20] @@ -20062,7 +20062,7 @@ _0818FB74: adds r2, r0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData add sp, 0x30 pop {r3-r5} mov r8, r3 @@ -21407,7 +21407,7 @@ _081906B0: lsls r4, r7, 4 adds r4, r7 lsls r4, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 add r4, r8 adds r0, r4, 0 @@ -22589,7 +22589,7 @@ _08191084: movs r6, 0 ldr r5, =gUnknown_0203CD78 mov r10, r5 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r0, r9 add r0, r8 lsls r0, 3 @@ -22686,7 +22686,7 @@ _08191150: movs r6, 0x8 ldr r2, =gUnknown_0203CD78 mov r12, r2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gTasks mov r0, r9 add r0, r8 @@ -22981,7 +22981,7 @@ _0819141C: movs r6, 0 ldr r0, =gUnknown_0203CD78 mov r10, r0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r0, r9 add r0, r8 lsls r0, 3 @@ -23078,7 +23078,7 @@ _081914E8: movs r6, 0x8 ldr r2, =gUnknown_0203CD78 mov r12, r2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gTasks mov r0, r9 add r0, r8 @@ -23281,7 +23281,7 @@ _081916C6: movs r6, 0 ldr r0, =gUnknown_0203CD78 mov r10, r0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r0, r9 add r0, r8 lsls r0, 3 @@ -23378,7 +23378,7 @@ _08191798: movs r6, 0x8 ldr r2, =gUnknown_0203CD78 mov r12, r2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gTasks mov r0, r9 add r0, r8 @@ -23568,7 +23568,7 @@ _08191958: movs r6, 0 ldr r0, =gUnknown_0203CD78 mov r10, r0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r0, r9 add r0, r8 lsls r0, 3 @@ -23665,7 +23665,7 @@ _08191A24: movs r6, 0x8 ldr r2, =gUnknown_0203CD78 mov r12, r2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gTasks mov r0, r9 add r0, r8 @@ -23845,7 +23845,7 @@ _08191B9E: ldrb r1, [r1] bl sub_819314C movs r6, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites mov r12, r6 mov r10, r5 adds r5, r7, 0 @@ -23939,7 +23939,7 @@ _08191C96: movs r6, 0x8 ldr r2, =gUnknown_0203CD78 mov r12, r2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gTasks mov r0, r9 add r0, r8 @@ -24122,7 +24122,7 @@ _08191E44: movs r6, 0 ldr r0, =gUnknown_0203CD78 mov r10, r0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r0, r9 add r0, r8 lsls r0, 3 @@ -24219,7 +24219,7 @@ _08191F10: movs r6, 0x8 ldr r2, =gUnknown_0203CD78 mov r12, r2 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gTasks mov r0, r9 add r0, r8 @@ -24463,7 +24463,7 @@ _08192134: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl sub_80D2EF8 _0819214E: @@ -24493,7 +24493,7 @@ _08192174: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl sub_80D2EF8 _0819218E: @@ -25025,7 +25025,7 @@ _081925B6: ands r0, r4 cmp r0, 0 beq _081925FC - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203CD78 ldr r0, [r0] adds r0, r5 @@ -25054,7 +25054,7 @@ _081925FC: ldr r4, [sp, 0x20] adds r0, r4 ldr r6, =gUnknown_0203CD78 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r10, r2 adds r4, r1, 0 lsls r5, r0, 1 @@ -26606,7 +26606,7 @@ _081932F8: ands r0, r3 cmp r0, 0 beq _08193334 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203CD78 ldr r0, [r0] ldr r7, [sp, 0x3C] @@ -26625,7 +26625,7 @@ _08193334: ldr r0, [sp, 0x2C] cmp r0, 0 beq _0819335A - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203CD78 ldr r0, [r0] ldr r1, [sp, 0x3C] @@ -26693,7 +26693,7 @@ _081933B8: ands r0, r1 cmp r0, 0 beq _081933F0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203CD78 ldr r0, [r0] add r0, r9 @@ -26712,7 +26712,7 @@ _081933F0: ldr r0, [r2, 0x4] cmp r0, 0 beq _08193416 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203CD78 ldr r0, [r0] add r0, r9 @@ -26734,7 +26734,7 @@ _08193416: str r3, [sp, 0x70] mov r8, r5 ldr r6, =gUnknown_0203CD78 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r4, [sp, 0x54] mov r9, r5 movs r0, 0x1 @@ -26879,7 +26879,7 @@ _08193548: _08193556: movs r5, 0 ldr r6, =gUnknown_0203CD78 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites mov r8, r7 ldr r4, [sp, 0x5C] mov r9, r5 @@ -27377,7 +27377,7 @@ _081939C2: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim @@ -27721,7 +27721,7 @@ _08193CDE: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 movs r1, 0 bl StartObjectImageAnim @@ -27888,7 +27888,7 @@ _08193E10: ldr r0, =gUnknown_03005D10 ldrh r0, [r0, 0x24] strh r0, [r1] - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] cmp r0, 0x9 beq _08193E78 @@ -29705,7 +29705,7 @@ _08194E50: adds r0, r5, r0 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData adds r5, 0x64 adds r4, 0x1 cmp r4, 0x1 @@ -41244,7 +41244,7 @@ sub_819AA18: @ 819AA18 push {r7} movs r4, 0 mov r8, r4 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites _0819AA24: lsls r1, r4, 3 adds r1, r4 @@ -41282,7 +41282,7 @@ _0819AA24: bls _0819AA24 ldr r0, [r6] ldrb r1, [r0, 0x3] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites muls r1, r5 adds r0, r1 ldrh r0, [r0, 0xE] @@ -41388,7 +41388,7 @@ _0819AB44: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -41457,7 +41457,7 @@ _0819ABDE: strb r0, [r1, 0x3] ldr r2, [r2] ldrb r3, [r2, 0x3] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r0, [r2, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -41511,7 +41511,7 @@ _0819AC44: movs r0, 0x2 _0819AC46: strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, [r2] ldrb r0, [r2, 0x1] lsls r1, r0, 4 @@ -41568,7 +41568,7 @@ _0819ACAC: movs r0, 0x1 _0819ACAE: strb r0, [r1, 0x7] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, [r2] ldrb r0, [r2, 0x1] lsls r1, r0, 4 @@ -41673,7 +41673,7 @@ _0819AD60: adds r0, 0x1 _0819AD78: strb r0, [r1, 0x5] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0300127C ldr r0, [r0] movs r1, 0x6C @@ -41719,7 +41719,7 @@ _0819ADCE: bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r3, r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0300127C ldr r0, [r0] movs r1, 0x6C @@ -42637,7 +42637,7 @@ _0819B5B8: adds r0, 0x8 movs r1, 0x20 add r2, sp, 0xC - bl pokemon_setattr + bl SetMonData ldr r2, =gUnknown_0300127C ldr r0, [r2] adds r0, r4 @@ -42649,7 +42649,7 @@ _0819B5B8: ldr r1, =gBattleFrontierHeldItems adds r2, r1 movs r1, 0xC - bl pokemon_setattr + bl SetMonData mov r3, r8 lsls r0, r3, 24 lsrs r0, 24 @@ -42778,7 +42778,7 @@ _0819B6D4: adds r0, 0x8 movs r1, 0x20 add r2, sp, 0xC - bl pokemon_setattr + bl SetMonData ldr r2, =gUnknown_0300127C ldr r0, [r2] adds r0, r4 @@ -42791,7 +42791,7 @@ _0819B6D4: ldr r1, =gBattleFrontierHeldItems adds r2, r1 movs r1, 0xC - bl pokemon_setattr + bl SetMonData mov r7, r9 lsls r0, r7, 24 lsrs r0, 24 @@ -42922,7 +42922,7 @@ sub_819B844: @ 819B844 bne _0819B852 strb r0, [r1] _0819B852: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r5] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -42992,7 +42992,7 @@ sub_819B8D4: @ 819B8D4 ldr r1, [r5] movs r0, 0 strb r0, [r1, 0x7] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r5] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -43056,7 +43056,7 @@ sub_819B958: @ 819B958 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r3, =gUnknown_0300127C ldr r0, [r3] ldrb r1, [r0, 0x1] @@ -43580,7 +43580,7 @@ sub_819BD70: @ 819BD70 adds r1, r2 movs r3, 0 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, [r6] adds r0, r2 ldrb r1, [r0] @@ -43651,7 +43651,7 @@ sub_819BE34: @ 819BE34 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 add r0, r8 movs r1, 0x2 @@ -43820,7 +43820,7 @@ _0819BF48: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r2 adds r0, 0x28 movs r1, 0 @@ -43835,7 +43835,7 @@ _0819BF48: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r2 adds r0, 0x29 movs r1, 0 @@ -43882,7 +43882,7 @@ sub_819C040: @ 819C040 ands r0, r1 cmp r0, 0 beq _0819C0DC - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r6, =gUnknown_0300127C ldr r2, [r6] ldr r0, =0x00000295 @@ -43967,7 +43967,7 @@ sub_819C100: @ 819C100 ands r0, r1 cmp r0, 0 beq _0819C1BA - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r4, =gUnknown_0300127C ldr r2, [r4] ldr r7, =0x00000295 @@ -44203,7 +44203,7 @@ _0819C2F6: _0819C2FC: movs r0, 0x3 bl HideBg - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, =gUnknown_0300127C mov r8, r0 ldr r0, [r0] @@ -44435,7 +44435,7 @@ sub_819C4B4: @ 819C4B4 ldr r4, =0x0000029d adds r1, r4 strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, [r6] add r8, r2 mov r0, r8 @@ -44832,7 +44832,7 @@ sub_819C810: @ 819C810 adds r0, r4 movs r1, 0x20 mov r2, sp - bl pokemon_setattr + bl SetMonData ldr r3, =gSaveBlock2Ptr mov r8, r3 ldr r3, [r3] @@ -45925,7 +45925,7 @@ _0819D174: mov r9, r0 cmp r4, 0x2 beq _0819D1F2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r3, =gUnknown_03001284 ldr r0, [r3] adds r0, 0x5 @@ -45981,7 +45981,7 @@ _0819D1D8: strh r0, [r6, 0x20] b _0819D210 _0819D1F2: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r4, =gUnknown_03001284 ldr r0, [r4] ldrb r1, [r0, 0x7] @@ -46170,7 +46170,7 @@ _0819D360: b _0819D570 .pool _0819D368: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_03001284 ldr r0, [r2] ldrb r1, [r0, 0x8] @@ -46210,7 +46210,7 @@ _0819D3B2: cmp r1, 0x1 bne _0819D3FC movs r3, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r6, =gUnknown_03001284 asrs r5, r2, 24 _0819D3BE: @@ -46251,7 +46251,7 @@ _0819D3FC: movs r0, 0x30 add r0, r8 mov r9, r0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites _0819D40E: ldr r1, =gUnknown_03001284 ldr r2, [r1] @@ -46306,7 +46306,7 @@ _0819D40E: b _0819D570 .pool _0819D480: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03001284 ldr r0, [r0] ldrb r1, [r0, 0xE] @@ -46346,7 +46346,7 @@ _0819D4CA: cmp r1, 0x1 bne _0819D510 movs r3, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r6, =gUnknown_03001284 asrs r5, r2, 24 _0819D4D6: @@ -46383,7 +46383,7 @@ _0819D510: mov r12, r1 mov r6, r8 adds r6, 0x10 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gUnknown_03001284 mov r9, r0 _0819D520: @@ -46891,7 +46891,7 @@ _0819D96A: ldrb r0, [r1, 0x3] cmp r0, 0x2 bhi _0819D98C - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r1, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -46993,7 +46993,7 @@ _0819DA44: .pool _0819DA58: bl sub_819EADC - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03001284 ldr r0, [r0] ldrb r1, [r0, 0x4] @@ -47063,7 +47063,7 @@ _0819DB04: movs r0, 0 bl sub_819F048 movs r2, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r3, 0x4 _0819DB10: ldr r0, [r4] @@ -47084,7 +47084,7 @@ _0819DB10: cmp r2, 0x2 bls _0819DB10 _0819DB32: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r4, =gUnknown_03001284 ldr r3, [r4] ldrb r0, [r3, 0x4] @@ -47664,7 +47664,7 @@ sub_819E0C0: @ 819E0C0 movs r6, 0 ldr r4, =gUnknown_03001284 movs r7, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites _0819E0E6: lsls r1, r6, 1 adds r1, r6 @@ -47704,7 +47704,7 @@ _0819E0E6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 movs r5, 0x20 ldrsh r1, [r0, r5] @@ -47734,7 +47734,7 @@ _0819E0E6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r0, r6 adds r0, 0x3E ldrb r1, [r0] @@ -47941,7 +47941,7 @@ _0819E1E8: ldr r1, [r7] strb r0, [r1, 0x11] movs r6, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r4, r7, 0 movs r7, 0 movs r0, 0x4 @@ -48121,7 +48121,7 @@ _0819E330: lsrs r6, r0, 24 ldr r3, =gUnknown_03001284 mov r8, r3 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r9, r0 cmp r6, 0x1 bhi _0819E496 @@ -48212,7 +48212,7 @@ _0819E53C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles adds r0, r5, 0x1 @@ -48256,7 +48256,7 @@ _0819E594: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -48284,7 +48284,7 @@ _0819E5CC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -48309,7 +48309,7 @@ sub_819E608: @ 819E608 lsrs r6, r0, 24 cmp r6, 0x2 bhi _0819E65C - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r5, =gUnknown_03001284 ldr r0, [r5] ldrb r1, [r0, 0x4] @@ -48342,7 +48342,7 @@ sub_819E608: @ 819E608 b _0819E684 .pool _0819E65C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r3, =gUnknown_03001284 ldr r0, [r3] ldrb r1, [r0, 0x4] @@ -48504,7 +48504,7 @@ _0819E78C: movs r0, 0x1 _0819E78E: strb r0, [r1, 0x16] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, [r2] ldrb r0, [r2, 0x1] lsls r1, r0, 4 @@ -48566,7 +48566,7 @@ _0819E800: movs r0, 0x2 _0819E802: strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, [r2] ldrb r0, [r2, 0x1] lsls r1, r0, 4 @@ -48606,13 +48606,13 @@ sub_819E838: @ 819E838 mov r9, r0 movs r2, 0x4 mov r8, r2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r12, r0 ldr r7, =gUnknown_03001284 _0819E856: cmp r6, 0x2 bne _0819E898 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r3, =gUnknown_03001284 ldr r0, [r3] adds r0, 0xB @@ -48690,7 +48690,7 @@ _0819E8D4: sub_819E8EC: @ 819E8EC push {r4-r6,lr} movs r2, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r4, =gUnknown_03001284 adds r6, r5, 0 movs r3, 0x4 @@ -48750,7 +48750,7 @@ _0819E95C: movs r0, 0 strb r0, [r3] _0819E960: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r5] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -48820,7 +48820,7 @@ sub_819E9E0: @ 819E9E0 ldr r1, [r5] movs r0, 0 strb r0, [r1, 0x16] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r5] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -48884,7 +48884,7 @@ sub_819EA64: @ 819EA64 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r3, =gUnknown_03001284 ldr r0, [r3] ldrb r1, [r0, 0x1] @@ -49864,7 +49864,7 @@ sub_819F2B4: @ 819F2B4 movs r3, 0x1 bl AddObjectToFront strb r0, [r4] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -49913,7 +49913,7 @@ sub_819F304: @ 819F304 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 add r0, r8 movs r1, 0x2 @@ -50042,7 +50042,7 @@ sub_819F444: @ 819F444 lsls r0, r4, 24 lsrs r0, 24 bl sub_818D820 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r4, 16 lsrs r1, r4, 24 lsls r0, r1, 4 @@ -50458,7 +50458,7 @@ sub_819F7B4: @ 819F7B4 beq _0819F894 movs r0, 0x3 bl HideBg - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x14 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -50640,7 +50640,7 @@ _0819F908: adds r1, 0x2C movs r3, 0 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, [r2] adds r0, 0x2C ldrb r1, [r0] @@ -54600,7 +54600,7 @@ _081A18E4: .pool _081A1900: ldr r2, =gUnknown_020375F0 - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome ldrb r0, [r1] strh r0, [r2] movs r0, 0 @@ -57497,7 +57497,7 @@ _081A3298: mov r3, r8 cmp r3, 0x3 bne _081A32F2 - ldr r6, =gUnknown_02024474 + ldr r6, =gBattleScripting adds r6, 0x25 ldrb r0, [r6] movs r4, 0x1 @@ -59452,7 +59452,7 @@ _081A43B2: adds r0, r1 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData _081A43EE: adds r0, r4, 0x1 lsls r0, 24 @@ -60803,7 +60803,7 @@ _081A4E96: mov r0, r10 movs r1, 0xC adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData movs r7, 0 mov r6, r8 ldr r3, =gEnemyParty @@ -60818,7 +60818,7 @@ _081A4F32: adds r2, r0 adds r0, r6, r3 str r3, [sp, 0x40] - bl pokemon_setattr + bl SetMonData adds r7, 0x1 ldr r3, [sp, 0x40] cmp r7, 0x5 @@ -60874,7 +60874,7 @@ _081A4F9C: adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 bl pokemon_calc_effective_stats ldr r2, [sp, 0x2C] @@ -61269,12 +61269,12 @@ _081A531C: beq _081A5328 b _081A5544 _081A5328: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 movs r2, 0xA1 strb r2, [r1] movs r0, 0xFF strb r0, [r1, 0x1] - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 strb r2, [r1] movs r0, 0x1 negs r0, r0 @@ -61334,7 +61334,7 @@ _081A53CE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x3 bl StartObjectImageAnim @@ -61401,14 +61401,14 @@ _081A5490: movs r0, 0x85 lsls r0, 1 bl audio_play - ldr r0, =gUnknown_02022F58 - ldr r1, =gUnknown_02022F68 + ldr r0, =gBattleTextBuff1 + ldr r1, =gBattleTextBuff2 ldrb r2, [r0] ldrb r0, [r1] cmp r2, r0 bls _081A54BC movs r6, 0x2 - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0 strb r0, [r1, 0x17] b _081A553E @@ -61417,7 +61417,7 @@ _081A54BC: cmp r2, r0 bcs _081A54D0 movs r6, 0x3 - ldr r1, =gUnknown_02024474 + ldr r1, =gBattleScripting movs r0, 0x1 strb r0, [r1, 0x17] b _081A553E @@ -61501,7 +61501,7 @@ sub_81A5558: @ 81A5558 lsrs r7, r3, 24 movs r6, 0 movs r1, 0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] movs r3, 0xA6 lsls r3, 2 @@ -61580,11 +61580,11 @@ _081A5612: movs r4, 0x2 cmp r7, 0 beq _081A5628 - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 b _081A562A .pool _081A5628: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 _081A562A: ldrb r0, [r1] adds r0, 0x2 @@ -61597,11 +61597,11 @@ _081A5638: movs r4, 0x1 cmp r7, 0 beq _081A564C - ldr r1, =gUnknown_02022F68 + ldr r1, =gBattleTextBuff2 b _081A564E .pool _081A564C: - ldr r1, =gUnknown_02022F58 + ldr r1, =gBattleTextBuff1 _081A564E: ldrb r0, [r1] adds r0, 0x1 @@ -61621,7 +61621,7 @@ _081A565E: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r1, r4, 0 bl StartObjectImageAnim @@ -61640,7 +61640,7 @@ _081A565E: sub_81A5698: @ 81A5698 push {lr} adds r1, r0, 0 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0] cmp r0, 0x8 bls _081A56AA @@ -61654,7 +61654,7 @@ _081A56AA: thumb_func_start sub_81A56B4 sub_81A56B4: @ 81A56B4 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r2, [r0] movs r0, 0xA6 lsls r0, 2 @@ -61682,14 +61682,14 @@ sub_81A56B4: @ 81A56B4 sub_81A56E8: @ 81A56E8 lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] movs r2, 0xA6 lsls r2, 2 adds r1, r2 adds r1, r0 ldr r2, =gBattleArenaMoveMindRatings - ldr r0, =gUnknown_020241EA + ldr r0, =gCurrentMove ldrh r0, [r0] adds r0, r2 ldrb r0, [r0] @@ -61706,11 +61706,11 @@ sub_81A5718: @ 81A5718 lsls r0, 24 lsrs r3, r0, 24 adds r6, r3, 0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r2, [r0] ldr r0, =0x0000029a adds r5, r2, r0 - ldr r0, =gUnknown_02024280 + ldr r0, =gHitMarker ldr r0, [r0] movs r1, 0x80 lsls r1, 18 @@ -61746,7 +61746,7 @@ _081A576C: ands r0, r1 cmp r0, 0 beq _081A5788 - ldr r0, =gUnknown_02024332 + ldr r0, =gBattleCommunication ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _081A57DA @@ -61782,7 +61782,7 @@ _081A57B4: subs r0, 0x1 b _081A57D8 _081A57C4: - ldr r0, =gUnknown_0202433C + ldr r0, =gProtectStructs lsls r1, r6, 4 adds r1, r0 ldrb r0, [r1] @@ -61810,7 +61810,7 @@ sub_81A57E4: @ 81A57E4 lsls r1, 16 lsrs r1, 16 adds r2, r1, 0 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct ldr r0, [r0] ldr r5, =0x0000029a adds r3, r0, r5 @@ -61878,7 +61878,7 @@ sub_81A586C: @ 81A586C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r3, [r1] movs r1, 0xA7 lsls r1, 2 @@ -63285,7 +63285,7 @@ _081A6408: adds r2, r0 adds r0, r5, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 @@ -63438,7 +63438,7 @@ _081A65C4: adds r0, r6, r3 add r2, sp, 0x10 str r3, [sp, 0x20] - bl pokemon_setattr + bl SetMonData ldr r3, [sp, 0x20] _081A65E2: lsls r0, r4, 25 @@ -63479,7 +63479,7 @@ _081A6602: adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData mov r1, r9 ldr r0, [r1] adds r0, r7, r0 @@ -63489,7 +63489,7 @@ _081A6602: adds r2, r0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData mov r2, r10 add r2, r8 lsls r2, 2 @@ -63500,7 +63500,7 @@ _081A6602: adds r2, r0 adds r0, r4, 0 movs r1, 0x2E - bl pokemon_setattr + bl SetMonData ldr r1, [sp, 0x18] mov r8, r1 cmp r1, 0x2 @@ -63607,7 +63607,7 @@ _081A6716: adds r0, r6, r3 add r2, sp, 0x10 str r3, [sp, 0x20] - bl pokemon_setattr + bl SetMonData ldr r3, [sp, 0x20] _081A6734: lsls r0, r4, 25 @@ -63651,7 +63651,7 @@ _081A674E: adds r2, r0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData mov r2, r10 add r2, r8 lsls r2, 2 @@ -63662,7 +63662,7 @@ _081A674E: adds r2, r5 adds r0, r4, 0 movs r1, 0x2E - bl pokemon_setattr + bl SetMonData ldr r0, [sp, 0x18] mov r8, r0 cmp r0, 0x2 @@ -64262,7 +64262,7 @@ _081A6C50: ldr r1, =gBattleFrontierHeldItems adds r2, r1 movs r1, 0xC - bl pokemon_setattr + bl SetMonData adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -64535,7 +64535,7 @@ _081A6E6E: adds r0, r4, 0 movs r1, 0x20 mov r2, r10 - bl pokemon_setattr + bl SetMonData ldr r2, =gUnknown_0203BC8C ldr r0, [r2] adds r0, r7, r0 @@ -64545,7 +64545,7 @@ _081A6E6E: adds r2, r0 adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData mov r9, r8 _081A6EB8: mov r3, r9 @@ -65377,7 +65377,7 @@ _081A759E: adds r0, r5, 0 movs r1, 0x39 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 movs r1, 0x15 bl GetMonData @@ -65400,7 +65400,7 @@ _081A75DA: adds r1, 0x11 adds r0, r5, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -65415,7 +65415,7 @@ _081A75DA: adds r0, r5, 0 movs r1, 0x37 mov r2, sp - bl pokemon_setattr + bl SetMonData add sp, 0x4 pop {r4-r6} pop {r0} @@ -65825,7 +65825,7 @@ _081A78DC: adds r0, r5, 0 movs r1, 0x37 adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData _081A7946: cmp r8, r10 beq _081A7954 @@ -66242,7 +66242,7 @@ _081A7C4A: adds r1, r3 adds r2, r1 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData mov r1, r10 ldr r0, [r1] adds r4, r0 @@ -66265,7 +66265,7 @@ _081A7CA8: ldr r0, =gEnemyParty movs r1, 0x2E mov r2, sp - bl pokemon_setattr + bl SetMonData movs r4, 0 adds r0, r6, r5 lsls r6, r0, 2 @@ -67678,7 +67678,7 @@ _081A87EC: adds r3, r1 adds r2, r3 movs r1, 0xC - bl pokemon_setattr + bl SetMonData adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -67733,7 +67733,7 @@ sub_81A8830: @ 81A8830 _081A887C: ldr r0, =gUnknown_02038BCA strh r4, [r0] - ldr r1, =gUnknown_0202433A + ldr r1, =gBattleOutcome movs r0, 0 strb r0, [r1] pop {r4-r6} @@ -68580,7 +68580,7 @@ _081A8F14: ldr r0, =gUnknown_02038BCA movs r1, 0 strh r1, [r0] - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome strb r1, [r0] pop {r4-r6} pop {r0} @@ -69557,7 +69557,7 @@ _081A977E: adds r0, r6, r1 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData _081A97A2: adds r4, 0x1 cmp r4, 0x3 @@ -70140,7 +70140,7 @@ _081A9C56: adds r2, r6, r2 adds r0, r4, 0 movs r1, 0xB - bl pokemon_setattr + bl SetMonData ldr r1, [sp, 0x10] lsls r0, r1, 1 adds r0, r1 @@ -70152,7 +70152,7 @@ _081A9C56: adds r0, r4, 0 movs r1, 0x2 mov r2, sp - bl pokemon_setattr + bl SetMonData cmp r5, 0 beq _081A9CD4 bl sub_8165C40 @@ -70216,7 +70216,7 @@ _081A9CF6: adds r2, r0 adds r0, r4, 0 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData ldr r1, [sp, 0x10] lsls r0, r1, 1 adds r0, r1 @@ -70257,7 +70257,7 @@ _081A9D4C: _081A9D7C: adds r0, r4, 0 movs r1, 0x2E - bl pokemon_setattr + bl SetMonData b _081A9D9C .pool _081A9D90: @@ -70265,7 +70265,7 @@ _081A9D90: ldr r0, =gEnemyParty add r2, sp, 0xC movs r1, 0x2E - bl pokemon_setattr + bl SetMonData _081A9D9C: movs r0, 0 str r0, [sp, 0xC] @@ -70315,7 +70315,7 @@ _081A9DF6: adds r1, 0x27 ldr r0, =gEnemyParty add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData ldr r0, [sp, 0xC] adds r0, 0x1 str r0, [sp, 0xC] @@ -72817,7 +72817,7 @@ load_bag_item_list_buffers: @ 81AB240 lsls r0, 24 lsrs r7, r0, 24 lsls r1, r7, 3 - ldr r0, =gUnknown_02039DD8 + ldr r0, =gBagItems adds r1, r0 mov r8, r1 ldr r0, =gUnknown_0203CE54 @@ -73321,7 +73321,7 @@ bag_menu_print_description_box_text: @ 81AB6B0 bl bag_pocket_get_itemid lsls r0, 16 lsrs r0, 16 - bl itemid_get_description + bl ItemId_GetDescription adds r4, r0, 0 b _081AB6FC .pool @@ -73656,7 +73656,7 @@ sub_81AB9A8: @ 81AB9A8 lsls r0, 24 lsrs r5, r0, 24 lsls r1, r5, 3 - ldr r0, =gUnknown_02039DD8 + ldr r0, =gBagItems adds r4, r1, r0 cmp r5, 0x3 bgt _081AB9C8 @@ -74416,7 +74416,7 @@ SwitchBagPocket: @ 81ABFA8 bl sub_81AE6C8 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, =gUnknown_0203CE54 ldr r2, [r0] ldr r1, =0x0000081b @@ -74986,7 +74986,7 @@ _081AC4E2: b _081AC566 .pool _081AC4F8: - ldr r1, =gUnknown_02039DD8 + ldr r1, =gBagItems lsls r0, r6, 3 adds r0, r1 ldr r0, [r0] @@ -75157,7 +75157,7 @@ _081AC668: _081AC690: ldr r0, =gUnknown_0203CE7C ldrh r0, [r0] - bl itemid_get_usage + bl ItemId_GetBattleUsage lsls r0, 24 cmp r0, 0 beq _081AC6C4 @@ -76017,7 +76017,7 @@ ItemMenu_UseOutOfBattle: @ 81ACE7C lsrs r4, r0, 24 ldr r5, =gUnknown_0203CE7C ldrh r0, [r5] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc cmp r0, 0 beq _081ACEEE bl bag_menu_remove_some_window @@ -76026,7 +76026,7 @@ ItemMenu_UseOutOfBattle: @ 81ACE7C cmp r0, 0 bne _081ACEB8 ldrh r0, [r5] - bl itemid_get_type + bl ItemId_GetType lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -76047,7 +76047,7 @@ _081ACEB8: beq _081ACEE8 ldr r0, =gUnknown_0203CE7C ldrh r0, [r0] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc adds r1, r0, 0 adds r0, r4, 0 bl _call_via_r1 @@ -76599,12 +76599,12 @@ ItemMenu_UseInBattle: @ 81AD3DC lsrs r5, r0, 24 ldr r4, =gUnknown_0203CE7C ldrh r0, [r4] - bl itemid_get_battle_function + bl ItemId_GetBattleFunc cmp r0, 0 beq _081AD400 bl bag_menu_remove_some_window ldrh r0, [r4] - bl itemid_get_battle_function + bl ItemId_GetBattleFunc adds r1, r0, 0 adds r0, r5, 0 bl _call_via_r1 @@ -76787,7 +76787,7 @@ _081AD550: ldrh r1, [r0] strh r1, [r2] ldrh r0, [r0] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc movs r1, 0x8 bl CreateTask lsls r0, 24 @@ -80392,7 +80392,7 @@ _081AF28A: _081AF29A: movs r0, 0x34 ldrsh r3, [r4, r0] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable ldrh r2, [r4, 0x38] lsls r0, r2, 24 lsrs r0, 23 @@ -80411,7 +80411,7 @@ _081AF2B4: _081AF2C0: movs r0, 0x34 ldrsh r3, [r4, r0] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable ldrh r2, [r4, 0x38] lsls r0, r2, 24 lsrs r0, 23 @@ -80469,7 +80469,7 @@ AddScrollIndicatorArrowObject: @ 81AF2F0 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -80597,7 +80597,7 @@ _081AF3EE: ldr r0, =0x0000ffff cmp r1, r0 bne _081AF47C - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r0, [r7, 0xC] lsls r1, r0, 4 adds r1, r0 @@ -80703,7 +80703,7 @@ Task_ScrollIndicatorArrowPair: @ 81AF504 ldr r0, =0x0000ffff cmp r5, r0 beq _081AF548 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -80716,7 +80716,7 @@ Task_ScrollIndicatorArrowPair: @ 81AF504 b _081AF55E .pool _081AF548: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -80775,7 +80775,7 @@ Task_ScrollIndicatorArrowPairOnMainMenu: @ 81AF59C ldrsh r0, [r4, r1] cmp r0, 0 beq _081AF5E8 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -80799,7 +80799,7 @@ Task_ScrollIndicatorArrowPairOnMainMenu: @ 81AF59C b _081AF612 .pool _081AF5E8: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -80854,7 +80854,7 @@ _081AF648: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles ldrb r1, [r5, 0xD] @@ -81201,7 +81201,7 @@ _081AF896: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites adds r0, r7 adds r1, r5, 0 bl SetSpriteOamTables_NoPriorityFromTable @@ -81276,7 +81276,7 @@ ListMenuUpdateRedOutlineCursorObject: @ 81AF994 lsls r3, 3 ldr r0, =gTasks + 0x8 adds r3, r0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r4, [r3, 0xC] lsls r0, r4, 4 adds r0, r4 @@ -81325,7 +81325,7 @@ _081AFA06: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r5, 0 @@ -81340,7 +81340,7 @@ _081AFA06: ObjectCB_RedArrowCursor: @ 81AFA30 push {lr} adds r2, r0, 0 - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable ldrh r3, [r2, 0x2E] lsls r0, r3, 24 lsrs r0, 23 @@ -81442,7 +81442,7 @@ _081AFAC6: movs r3, 0 bl AddObjectToFront strb r0, [r4] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -81492,7 +81492,7 @@ ListMenuUpdateRedArrowCursorObject: @ 81AFB68 lsls r3, 3 ldr r0, =gTasks + 0x8 adds r3, r0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r4, [r3] lsls r0, r4, 4 adds r0, r4 @@ -81537,7 +81537,7 @@ _081AFBC8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r5, 0 @@ -84227,7 +84227,7 @@ _081B11B4: beq _081B11F6 adds r0, r2, 0 bl sub_81B8F38 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] movs r2, 0xA8 lsls r2, 2 @@ -85714,7 +85714,7 @@ _081B1DE2: adds r0, r6, 0 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData _081B1DF6: add sp, 0x4 pop {r4-r7} @@ -85749,7 +85749,7 @@ _081B1E1C: adds r0, r4, 0 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData movs r0, 0x2 b _081B1E3E _081B1E3C: @@ -85800,7 +85800,7 @@ sub_81B1E60: @ 81B1E60 adds r0, r4 movs r1, 0x39 adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData movs r3, 0x8 ldrsh r2, [r7, r3] adds r0, r2, 0 @@ -89341,7 +89341,7 @@ _081B3BFA: thumb_func_start sub_81B3C0C sub_81B3C0C: @ 81B3C0C push {r4,lr} - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r2, [r0, 0xB] lsls r3, r2, 4 adds r3, r2 @@ -89703,7 +89703,7 @@ oamt_swap_pos: @ 81B3F10 ldrb r2, [r1] strb r2, [r0] strb r3, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r2, [r0] lsls r3, r2, 4 adds r3, r2 @@ -90436,7 +90436,7 @@ sub_81B4578: @ 81B4578 adds r0, r5, 0 movs r1, 0xC adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData ldrh r0, [r4] movs r1, 0x1 bl remove_item @@ -90859,7 +90859,7 @@ sub_81B4988: @ 81B4988 adds r0, r5, 0 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData ldr r4, =gUnknown_0203CEDC movs r0, 0x9 ldrsb r0, [r6, r0] @@ -92708,7 +92708,7 @@ party_menu_link_mon_icon_anim: @ 81B5A2C adds r0, r5, 0 bl sub_80D2CC4 strb r0, [r4, 0x9] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r0, [r4, 0x9] lsls r1, r0, 4 adds r1, r0 @@ -92761,7 +92761,7 @@ _081B5AB4: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl sub_80D32C8 @@ -92771,7 +92771,7 @@ _081B5AD4: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl sub_80D32C8 @@ -92781,7 +92781,7 @@ _081B5AEC: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x2 bl sub_80D32C8 @@ -92791,7 +92791,7 @@ _081B5B04: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x3 bl sub_80D32C8 @@ -92801,7 +92801,7 @@ _081B5B1C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x4 bl sub_80D32C8 @@ -92845,7 +92845,7 @@ sub_81B5B6C: @ 81B5B6C lsls r0, 24 lsrs r4, r0, 24 lsls r1, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r6, r0, 2 @@ -92969,7 +92969,7 @@ party_menu_link_mon_held_item_object: @ 81B5C48 movs r3, 0 bl AddObjectToFront strb r0, [r4, 0xA] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r0, [r4, 0xA] lsls r1, r0, 4 adds r1, r0 @@ -93013,7 +93013,7 @@ sub_81B5CB0: @ 81B5CB0 lsrs r0, 16 cmp r0, 0 bne _081B5CD8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 @@ -93034,7 +93034,7 @@ _081B5CD8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim @@ -93045,12 +93045,12 @@ _081B5CFC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectImageAnim _081B5D0E: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 @@ -93179,7 +93179,7 @@ sub_81B5DF0: @ 81B5DF0 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 lsls r0, r6, 4 adds r0, r6 @@ -93233,7 +93233,7 @@ sub_81B5E74: @ 81B5E74 ldrh r1, [r4, 0x3C] lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -93310,7 +93310,7 @@ party_menu_link_mon_pokeball_object: @ 81B5EF4 movs r3, 0x8 bl AddObjectToFront strb r0, [r4, 0xB] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r0, [r4, 0xB] lsls r1, r0, 4 adds r1, r0 @@ -93343,7 +93343,7 @@ sub_81B5F34: @ 81B5F34 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -93391,7 +93391,7 @@ sub_81B5F98: @ 81B5F98 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r2 bl StartObjectImageAnim pop {r0} @@ -93415,7 +93415,7 @@ sub_81B5FBC: @ 81B5FBC lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 add r4, r8 adds r0, r4, 0 @@ -93436,7 +93436,7 @@ _081B6000: lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 add r5, r8 adds r0, r5, 0 @@ -93521,7 +93521,7 @@ party_menu_link_mon_status_condition_object: @ 81B6098 adds r0, r5, 0 adds r1, r4, 0 bl party_menu_update_status_condition_object - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r0, [r4, 0xC] lsls r1, r0, 4 adds r1, r0 @@ -93566,7 +93566,7 @@ party_menu_update_status_condition_object: @ 81B60FC cmp r2, 0x6 bne _081B6128 _081B610C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -93583,7 +93583,7 @@ _081B6128: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 subs r1, r2, 0x1 lsls r1, 24 @@ -94156,7 +94156,7 @@ _081B6656: adds r1, r0 adds r0, r5, 0 bl party_menu_get_status_condition_and_update_object - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x9 ldrsb r0, [r7, r0] ldr r1, [r4] @@ -95814,7 +95814,7 @@ sub_81B754C: @ 81B754C adds r1, r4 adds r0, r5, 0 bl party_menu_get_status_condition_and_update_object - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r6] adds r3, r4, r0 ldrb r1, [r3, 0xC] @@ -96403,7 +96403,7 @@ _081B7A94: adds r1, r0 adds r0, r5, 0 bl party_menu_get_status_condition_and_update_object - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x9 ldrsb r0, [r6, r0] ldr r1, [r4] @@ -97234,7 +97234,7 @@ sub_81B81A8: @ 81B81A8 adds r0, r5, 0 movs r1, 0xC adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData ldrh r0, [r4] movs r1, 0x1 bl remove_item @@ -98332,14 +98332,14 @@ _081B8AF8: b _081B8B24 _081B8AFC: adds r0, r4, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _081B8B1E adds r0, r5, 0 bl sub_81B8F38 lsls r0, 24 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, r4, 1 adds r1, r2 lsrs r0, 24 @@ -98351,7 +98351,7 @@ _081B8B1E: lsls r0, 24 lsrs r4, r0, 24 _081B8B24: - ldr r0, =gUnknown_0202406C + ldr r0, =gNoOfAllBanks ldrb r0, [r0] cmp r4, r0 bcc _081B8AFC @@ -98373,7 +98373,7 @@ _081B8B24: _081B8B60: adds r0, r5, 0 bl sub_81B8F38 - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r1, 0x8B lsls r0, 24 @@ -98406,7 +98406,7 @@ _081B8BA8: ldr r1, =gUnknown_0203CEE8 movs r0, 0x1 strb r0, [r1] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID ldr r0, =gUnknown_020244B8 ldrb r0, [r0] lsls r0, 1 @@ -98441,7 +98441,7 @@ _081B8BFC: _081B8C20: ldr r0, =gUnknown_020244B8 ldrb r0, [r0] - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, 1 adds r0, r1 ldrb r0, [r0] @@ -98519,9 +98519,9 @@ _081B8CBE: bne _081B8CFC movs r5, 0x1 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI mov r2, sp - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -98546,16 +98546,16 @@ _081B8CF0: _081B8CFC: movs r5, 0x2 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI mov r1, sp - ldr r4, =gUnknown_0202406E + ldr r4, =gBattlePartyID lsls r0, 24 lsrs r0, 23 adds r0, r4 ldrh r0, [r0] strb r0, [r1] movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI mov r1, sp lsls r0, 24 lsrs r0, 23 @@ -98608,7 +98608,7 @@ sub_81B8D64: @ 81B8D64 lsrs r2, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct lsls r3, r2, 1 adds r3, r2 adds r3, 0x60 @@ -98630,24 +98630,24 @@ sub_81B8D88: @ 81B8D88 lsrs r7, r1, 24 lsls r0, 24 lsrs r0, 24 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _081B8DB0 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x2 b _081B8DBC _081B8DB0: movs r0, 0x1 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x3 _081B8DBC: - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 bl sub_81B1250 @@ -98679,7 +98679,7 @@ _081B8DF0: bne _081B8E28 movs r3, 0x1 mov r2, sp - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -98703,7 +98703,7 @@ _081B8E1A: _081B8E28: movs r3, 0x2 mov r1, sp - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r0, r4, 1 adds r0, r2 ldrh r0, [r0] @@ -98765,7 +98765,7 @@ sub_81B8E80: @ 81B8E80 lsls r0, 24 cmp r0, 0 beq _081B8F2E - ldr r0, =gUnknown_0202449C + ldr r0, =gBattleStruct lsls r1, r4, 1 adds r1, r4 adds r1, 0x60 @@ -99272,7 +99272,7 @@ sub_81B9270: @ 81B9270 lsrs r3, r1, 16 cmp r1, 0 blt _081B928A - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -99990,23 +99990,23 @@ sub_81B97DC: @ 81B97DC mov r0, r8 ldr r1, [sp, 0x8] mov r2, sp - bl pokemon_setattr + bl SetMonData mov r0, r8 ldr r1, [sp, 0xC] ldr r2, [sp, 0x14] - bl pokemon_setattr + bl SetMonData mov r0, r8 ldr r1, [sp, 0x10] mov r2, r10 - bl pokemon_setattr + bl SetMonData mov r0, r8 ldr r1, [sp, 0x1C] ldr r2, [sp, 0x18] - bl pokemon_setattr + bl SetMonData mov r0, r8 movs r1, 0x15 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData add sp, 0x20 pop {r3-r5} mov r8, r3 diff --git a/asm/rom_81BAD84.s b/asm/rom_81BAD84.s index 757831b5e..b458a4687 100644 --- a/asm/rom_81BAD84.s +++ b/asm/rom_81BAD84.s @@ -60,8 +60,8 @@ nullsub_77: @ 81BADF0 thumb_func_start sub_81BADF4 sub_81BADF4: @ 81BADF4 - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -74,9 +74,9 @@ sub_81BADF4: @ 81BADF4 thumb_func_start bx_exec_buffer_A_ch0_tbl3 bx_exec_buffer_A_ch0_tbl3: @ 81BAE10 push {lr} - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -85,7 +85,7 @@ bx_exec_buffer_A_ch0_tbl3: @ 81BAE10 ands r1, r0 cmp r1, 0 beq _081BAE5C - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] @@ -109,9 +109,9 @@ _081BAE5C: thumb_func_start sub_81BAE60 sub_81BAE60: @ 81BAE60 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -134,9 +134,9 @@ _081BAE84: thumb_func_start sub_81BAE98 sub_81BAE98: @ 81BAE98 push {r4-r6,lr} - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -181,7 +181,7 @@ sub_81BAF00: @ 81BAF00 push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r1, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -231,9 +231,9 @@ sub_81BAF48: @ 81BAF48 cmp r0, 0 beq _081BAFA0 _081BAF6C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, =gUnknown_03005D70 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -249,9 +249,9 @@ _081BAF6C: b _081BAFD6 .pool _081BAFA0: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r5, =gUnknown_03005D70 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -289,7 +289,7 @@ _081BAFE4: beq _081BB00A ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -298,7 +298,7 @@ _081BAFE4: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r3] lsls r0, 2 adds r0, r1 @@ -321,7 +321,7 @@ sub_81BB02C: @ 81BB02C ldr r0, =gUnknown_020244D0 mov r12, r0 ldr r0, [r0] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r2, [r7] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -354,7 +354,7 @@ _081BB058: beq _081BB07A b _081BB196 _081BB07A: - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r10, r1 ldr r0, =gUnknown_03005D7C mov r9, r0 @@ -370,7 +370,7 @@ _081BB07A: ldr r0, =DummyObjectCallback cmp r3, r0 bne _081BB196 - ldr r0, =gUnknown_020241E4 + ldr r0, =gBankSpriteIds adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -422,7 +422,7 @@ _081BB07A: eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -444,21 +444,21 @@ _081BB07A: bl sub_80729D0 _081BB134: ldr r1, =gUnknown_03005D7C - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldr r5, =gUnknown_03005D70 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -482,7 +482,7 @@ _081BB134: negs r0, r0 ands r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -502,9 +502,9 @@ _081BB196: thumb_func_start sub_81BB1D4 sub_81BB1D4: @ 81BB1D4 push {lr} - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -532,7 +532,7 @@ _081BB202: thumb_func_start bx_t3_healthbar_update bx_t3_healthbar_update: @ 81BB214 push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] ldr r6, =gUnknown_03005D70 adds r1, r0, r6 @@ -561,7 +561,7 @@ bx_t3_healthbar_update: @ 81BB214 b _081BB276 .pool _081BB25C: - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -622,7 +622,7 @@ sub_81BB29C: @ 81BB29C lsrs r0, 24 cmp r0, 0x1 beq _081BB2E2 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -676,7 +676,7 @@ _081BB2E2: adds r0, r6, 0 movs r1, 0x19 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 bl pokemon_calc_effective_stats ldr r2, [sp] @@ -685,7 +685,7 @@ _081BB2E2: subs r2, r0 ldr r0, [sp, 0xC] subs r2, r0, r2 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -699,7 +699,7 @@ _081BB2E2: lsrs r0, 24 cmp r0, 0x1 bne _081BB3B8 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r0, r7, 1 adds r0, r2 mov r1, r10 @@ -732,8 +732,8 @@ _081BB3D0: add r2, sp, 0x4 adds r0, r6, 0 movs r1, 0x19 - bl pokemon_setattr - ldr r1, =gUnknown_03005D60 + bl SetMonData + ldr r1, =gBattleBankFunc ldr r3, [sp, 0x8] lsls r0, r3, 2 adds r0, r1 @@ -950,7 +950,7 @@ _081BB514: adds r0, r5, 0 movs r1, 0x19 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r5, 0 bl pokemon_calc_effective_stats ldr r2, [sp] @@ -958,7 +958,7 @@ _081BB514: ldrh r0, [r0] subs r2, r0 subs r2, r4, r2 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -976,8 +976,8 @@ _081BB5F4: add r2, sp, 0x4 adds r0, r5, 0 movs r1, 0x19 - bl pokemon_setattr - ldr r1, =gUnknown_03005D60 + bl SetMonData + ldr r1, =gBattleBankFunc lsls r0, r7, 2 adds r0, r1 ldr r1, =sub_81BB284 @@ -1013,7 +1013,7 @@ sub_81BB628: @ 81BB628 lsrs r0, 24 cmp r0, 0x1 bne _081BB65C - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID movs r0, 0x2 adds r2, r4, 0 eors r2, r0 @@ -1079,7 +1079,7 @@ sub_81BB688: @ 81BB688 lsrs r0, 24 cmp r0, 0x1 bne _081BB708 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID movs r0, 0x2 adds r2, r5, 0 eors r2, r0 @@ -1140,7 +1140,7 @@ sub_81BB740: @ 81BB740 movs r1, 0x38 bl GetMonData ldrb r0, [r4, 0xC] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc lsls r0, 2 adds r0, r1 ldr r1, =sub_81BB284 @@ -1156,9 +1156,9 @@ sub_81BB740: @ 81BB740 thumb_func_start sub_81BB78C sub_81BB78C: @ 81BB78C push {r4-r6,lr} - ldr r6, =gUnknown_02020630 - ldr r5, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gSprites + ldr r5, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r2, [r4] adds r0, r2, r5 ldrb r1, [r0] @@ -1173,7 +1173,7 @@ sub_81BB78C: @ 81BB78C adds r1, r0 cmp r1, 0xA0 ble _081BB808 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] @@ -1223,7 +1223,7 @@ sub_81BB828: @ 81BB828 push {r4-r6,lr} ldr r0, =gUnknown_020244D0 ldr r0, [r0] - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -1235,13 +1235,13 @@ sub_81BB828: @ 81BB828 ands r0, r1 cmp r0, 0 bne _081BB87C - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -1282,12 +1282,12 @@ _081BB8AA: thumb_func_start bx_blink_t3 bx_blink_t3: @ 81BB8B0 push {r4,lr} - ldr r1, =gUnknown_020241E4 - ldr r0, =gUnknown_02024064 + ldr r1, =gBankSpriteIds + ldr r0, =gActiveBank ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -1305,7 +1305,7 @@ bx_blink_t3: @ 81BB8B0 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, =gUnknown_020244B9 + ldr r0, =gDoingBattleAnim strb r3, [r0] bl dp01_tbl3_exec_completed b _081BB926 @@ -1342,9 +1342,9 @@ _081BB926: thumb_func_start sub_81BB92C sub_81BB92C: @ 81BB92C push {r4,lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_03005D70 - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -1375,7 +1375,7 @@ sub_81BB92C: @ 81BB92C movs r3, 0x6 bl move_anim_start_t4 _081BB972: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -1393,7 +1393,7 @@ dp01t_35_3_free_vram: @ 81BB9A0 push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -1405,8 +1405,8 @@ dp01t_35_3_free_vram: @ 81BB9A0 ands r0, r1 cmp r0, 0 bne _081BB9DC - ldr r2, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r0, =gBankSpriteIds adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -1432,7 +1432,7 @@ sub_81BB9F4: @ 81BB9F4 push {r7} ldr r3, =gUnknown_020244D0 ldr r0, [r3] - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r1, [r7] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -1468,7 +1468,7 @@ sub_81BB9F4: @ 81BB9F4 ldr r0, =c3_0802FDF4 movs r1, 0xA bl CreateTask - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r8, r0 ldrb r1, [r7] lsls r0, r1, 1 @@ -1479,14 +1479,14 @@ sub_81BB9F4: @ 81BB9F4 ldr r5, =gPlayerParty adds r0, r5 bl sub_805E990 - ldr r1, =gUnknown_020241E4 + ldr r1, =gBankSpriteIds ldrb r0, [r7] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectImageAnim @@ -1507,7 +1507,7 @@ sub_81BB9F4: @ 81BB9F4 adds r0, r4 ldrb r0, [r0] bl sub_80729D0 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -1527,7 +1527,7 @@ sub_81BBAE8: @ 81BBAE8 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -1539,7 +1539,7 @@ sub_81BBAE8: @ 81BBAE8 ands r0, r1 cmp r0, 0 bne _081BBB1A - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 @@ -1549,7 +1549,7 @@ sub_81BBAE8: @ 81BBAE8 adds r0, r2, 0 bl sub_8172EF0 _081BBB1A: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, =gUnknown_03005D7C ldrb r2, [r4] adds r0, r2, r0 @@ -1577,7 +1577,7 @@ _081BBB1A: bne _081BBB60 adds r0, r3, r5 bl RemoveObjectAndFreeTiles - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -1594,8 +1594,8 @@ _081BBB60: dp01_tbl3_exec_completed: @ 81BBB8C push {r4,lr} sub sp, 0x4 - ldr r1, =gUnknown_03005D60 - ldr r4, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -1613,8 +1613,8 @@ dp01_tbl3_exec_completed: @ 81BBB8C movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably - ldr r1, =gUnknown_02023064 + bl PrepareBufferDataTransferLink + ldr r1, =gBattleBufferA ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -1623,7 +1623,7 @@ dp01_tbl3_exec_completed: @ 81BBB8C b _081BBBF2 .pool _081BBBE0: - ldr r2, =gUnknown_02024068 + ldr r2, =gBattleExecBuffer ldr r1, =gBitTable ldrb r0, [r4] lsls r0, 2 @@ -1645,7 +1645,7 @@ sub_81BBC04: @ 81BBC04 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1669,7 +1669,7 @@ bx_80E8A6C: @ 81BBC34 push {lr} ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -1693,8 +1693,8 @@ dp01t_00_3_getattr: @ 81BBC64 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -1702,7 +1702,7 @@ dp01t_00_3_getattr: @ 81BBC64 ldrb r0, [r1] cmp r0, 0 bne _081BBC9C - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -1755,8 +1755,8 @@ dp01_getattr_by_ch1_for_player_pokemon: @ 81BBCD8 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, =gUnknown_02023064 - ldr r3, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r3, =gActiveBank ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -2632,8 +2632,8 @@ sub_81BC484: @ 81BC484 thumb_func_start sub_81BC490 sub_81BC490: @ 81BC490 push {r4,r5,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -2641,7 +2641,7 @@ sub_81BC490: @ 81BC490 ldrb r0, [r1] cmp r0, 0 bne _081BC4C0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -2682,7 +2682,7 @@ sub_81BC4E8: @ 81BC4E8 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 ldr r2, =gUnknown_02023067 @@ -2773,12 +2773,12 @@ _081BC61C: adds r0, r4, 0 movs r1, 0xB adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r2, r6, 0 adds r2, 0x2E adds r0, r4, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData movs r0, 0 mov r8, r0 movs r0, 0x3B @@ -2819,12 +2819,12 @@ _081BC682: adds r1, 0xD mov r0, r9 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 mov r0, r9 adds r2, r7, 0 - bl pokemon_setattr + bl SetMonData adds r7, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -2840,15 +2840,15 @@ _081BC682: adds r0, r4, 0 movs r1, 0x15 mov r2, r10 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x20] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x19 ldr r2, [sp, 0x28] - bl pokemon_setattr + bl SetMonData ldrb r0, [r6, 0x14] lsls r0, 27 lsrs r0, 27 @@ -2857,7 +2857,7 @@ _081BC682: adds r0, r4, 0 movs r1, 0x27 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x14] lsls r0, 22 @@ -2866,7 +2866,7 @@ _081BC682: adds r0, r4, 0 movs r1, 0x28 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x15] lsls r0, 25 @@ -2875,7 +2875,7 @@ _081BC682: adds r0, r4, 0 movs r1, 0x29 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldr r0, [r6, 0x14] lsls r0, 12 @@ -2884,7 +2884,7 @@ _081BC682: adds r0, r4, 0 movs r1, 0x2A mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrh r0, [r6, 0x16] lsls r0, 23 @@ -2893,7 +2893,7 @@ _081BC682: adds r0, r4, 0 movs r1, 0x2B mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, sp ldrb r0, [r6, 0x17] lsls r0, 26 @@ -2902,47 +2902,47 @@ _081BC682: adds r0, r4, 0 movs r1, 0x2C mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0 ldr r2, [sp, 0x2C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x37 ldr r2, [sp, 0x30] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x39 ldr r2, [sp, 0x18] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3A ldr r2, [sp, 0x24] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3B ldr r2, [sp, 0x4] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3C ldr r2, [sp, 0x8] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3D ldr r2, [sp, 0xC] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3E ldr r2, [sp, 0x10] - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x3F ldr r2, [sp, 0x14] - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC7B4: @@ -2950,12 +2950,12 @@ _081BC7B4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xB - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC7D4: @@ -2963,12 +2963,12 @@ _081BC7D4: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC7F4: @@ -2990,12 +2990,12 @@ _081BC80E: adds r1, 0xD adds r0, r7, 0 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r1, r8 adds r1, 0x11 adds r0, r7, 0 adds r2, r6, 0 - bl pokemon_setattr + bl SetMonData adds r6, 0x1 adds r4, 0x2 movs r0, 0x1 @@ -3009,7 +3009,7 @@ _081BC80E: adds r0, r1 movs r1, 0x15 mov r2, r9 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC84C: @@ -3017,8 +3017,8 @@ _081BC84C: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -3033,41 +3033,41 @@ _081BC874: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x11 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x12 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x13 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x14 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x15 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC8D8: @@ -3075,8 +3075,8 @@ _081BC8D8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r3, =gUnknown_02023064 - ldr r1, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -3086,7 +3086,7 @@ _081BC8D8: _081BC8F0: adds r3, 0x3 adds r2, r3 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC908: @@ -3094,12 +3094,12 @@ _081BC908: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC928: @@ -3107,12 +3107,12 @@ _081BC928: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC948: @@ -3120,12 +3120,12 @@ _081BC948: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1A - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC968: @@ -3133,12 +3133,12 @@ _081BC968: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1B - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC988: @@ -3146,12 +3146,12 @@ _081BC988: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1C - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC9A8: @@ -3159,12 +3159,12 @@ _081BC9A8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1D - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC9C8: @@ -3172,12 +3172,12 @@ _081BC9C8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1E - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BC9E8: @@ -3185,12 +3185,12 @@ _081BC9E8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x1F - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCA08: @@ -3198,12 +3198,12 @@ _081BCA08: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x20 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCA28: @@ -3211,12 +3211,12 @@ _081BCA28: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x22 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCA48: @@ -3224,12 +3224,12 @@ _081BCA48: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x23 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCA68: @@ -3237,12 +3237,12 @@ _081BCA68: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x24 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCA88: @@ -3250,12 +3250,12 @@ _081BCA88: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x25 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCAA8: @@ -3263,12 +3263,12 @@ _081BCAA8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x26 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCAC8: @@ -3277,41 +3277,41 @@ _081BCAC8: muls r4, r0 ldr r0, =gPlayerParty adds r4, r0 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] lsls r2, 9 adds r2, r7 adds r0, r4, 0 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x1 adds r2, r0 adds r0, r4, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x2 adds r2, r0 adds r0, r4, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x3 adds r2, r0 adds r0, r4, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x4 adds r2, r0 adds r0, r4, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData ldrb r2, [r5] lsls r2, 9 adds r0, r7, 0x5 @@ -3324,12 +3324,12 @@ _081BCB38: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCB58: @@ -3337,12 +3337,12 @@ _081BCB58: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCB78: @@ -3350,12 +3350,12 @@ _081BCB78: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCB98: @@ -3363,12 +3363,12 @@ _081BCB98: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCBB8: @@ -3376,12 +3376,12 @@ _081BCBB8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCBD8: @@ -3389,13 +3389,13 @@ _081BCBD8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 _081BCBE8: movs r1, 0x2C - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCBF8: @@ -3403,12 +3403,12 @@ _081BCBF8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCC18: @@ -3416,12 +3416,12 @@ _081BCC18: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x9 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCC38: @@ -3429,12 +3429,12 @@ _081BCC38: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x37 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCC58: @@ -3442,12 +3442,12 @@ _081BCC58: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x38 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCC78: @@ -3455,12 +3455,12 @@ _081BCC78: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x39 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCC98: @@ -3468,12 +3468,12 @@ _081BCC98: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3A - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCCB8: @@ -3481,12 +3481,12 @@ _081BCCB8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3B - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCCD8: @@ -3494,12 +3494,12 @@ _081BCCD8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3C - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCCF8: @@ -3507,12 +3507,12 @@ _081BCCF8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3D - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCD18: @@ -3520,12 +3520,12 @@ _081BCD18: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3E - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCD38: @@ -3533,12 +3533,12 @@ _081BCD38: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x3F - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCD58: @@ -3546,12 +3546,12 @@ _081BCD58: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCD78: @@ -3559,12 +3559,12 @@ _081BCD78: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCD98: @@ -3572,12 +3572,12 @@ _081BCD98: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCDB8: @@ -3585,12 +3585,12 @@ _081BCDB8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCDD8: @@ -3598,12 +3598,12 @@ _081BCDD8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCDF8: @@ -3611,12 +3611,12 @@ _081BCDF8: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x30 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCE18: @@ -3624,12 +3624,12 @@ _081BCE18: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x32 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCE38: @@ -3637,12 +3637,12 @@ _081BCE38: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x33 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCE58: @@ -3650,12 +3650,12 @@ _081BCE58: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x34 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCE78: @@ -3663,12 +3663,12 @@ _081BCE78: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x35 - bl pokemon_setattr + bl SetMonData b _081BCEAE .pool _081BCE98: @@ -3676,15 +3676,15 @@ _081BCE98: muls r0, r5 ldr r1, =gPlayerParty adds r0, r1 - ldr r1, =gUnknown_02024064 + ldr r1, =gActiveBank ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 - bl pokemon_setattr + bl SetMonData _081BCEAE: - ldr r2, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r2, =gBattlePartyID + ldr r0, =gActiveBank ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -3708,8 +3708,8 @@ _081BCEAE: thumb_func_start sub_81BCEE4 sub_81BCEE4: @ 81BCEE4 push {r4-r7,lr} - ldr r1, =gUnknown_0202406E - ldr r7, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r7, =gActiveBank ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -3717,7 +3717,7 @@ sub_81BCEE4: @ 81BCEE4 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 @@ -3765,9 +3765,9 @@ sub_81BCF58: @ 81BCF58 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID mov r8, r0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] lsls r0, r1, 1 add r0, r8 @@ -3789,7 +3789,7 @@ sub_81BCF58: @ 81BCF58 lsls r4, 16 lsrs r4, 16 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3817,11 +3817,11 @@ sub_81BCF58: @ 81BCF58 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -3863,7 +3863,7 @@ sub_81BCF58: @ 81BCF58 adds r2, r1 ldrb r1, [r2] bl StartObjectImageAnim - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -3880,15 +3880,15 @@ sub_81BCF58: @ 81BCF58 thumb_func_start sub_81BD074 sub_81BD074: @ 81BD074 push {r4-r6,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA lsls r1, r0, 9 adds r6, r4, 0x2 adds r1, r6 ldrb r1, [r1] bl sub_805EF84 - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -3911,7 +3911,7 @@ sub_81BD074: @ 81BD074 adds r1, r6 ldrb r1, [r1] bl sub_81BD0E4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -3937,10 +3937,10 @@ sub_81BD0E4: @ 81BD0E4 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r2, r6, 1 adds r2, r0 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -3965,7 +3965,7 @@ sub_81BD0E4: @ 81BD0E4 mov r1, r9 strb r0, [r1] adds r0, r6, 0 - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3993,10 +3993,10 @@ sub_81BD0E4: @ 81BD0E4 adds r1, r5, 0 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds adds r4, r6, r4 strb r0, [r4] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -4089,8 +4089,8 @@ sub_81BD0E4: @ 81BD0E4 thumb_func_start sub_81BD260 sub_81BD260: @ 81BD260 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r6, =gActiveBank ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -4106,7 +4106,7 @@ sub_81BD260: @ 81BD260 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -4115,13 +4115,13 @@ sub_81BD260: @ 81BD260 b _081BD2DE .pool _081BD2A8: - ldr r5, =gUnknown_020241E4 + ldr r5, =gBankSpriteIds adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -4150,7 +4150,7 @@ sub_81BD2F0: @ 81BD2F0 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -4202,7 +4202,7 @@ _081BD346: adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4257,12 +4257,12 @@ _081BD3BE: ldr r0, =0x00000c03 cmp r1, r0 bne _081BD494 - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 ldrb r0, [r5] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -4281,11 +4281,11 @@ _081BD3BE: mov r1, r8 adds r2, r4, 0 bl AddObjectToFront - ldr r6, =gUnknown_020241E4 + ldr r6, =gBankSpriteIds ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -4331,12 +4331,12 @@ _081BD3BE: .pool _081BD494: adds r5, r4, 0 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r1, [r6] adds r0, r5, 0 bl sub_805DF38 ldrb r0, [r6] - bl battle_get_per_side_status + bl GetBankIdentity adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -4355,7 +4355,7 @@ _081BD494: mov r1, r9 adds r2, r4, 0 bl AddObjectToFront - ldr r4, =gUnknown_020241E4 + ldr r4, =gBankSpriteIds ldrb r1, [r6] adds r1, r4 strb r0, [r1] @@ -4364,7 +4364,7 @@ _081BD494: adds r5, r0 ldrh r0, [r5, 0x4] bl IndexOfObjectPaletteTag - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldrb r1, [r6] adds r1, r4 ldrb r1, [r1] @@ -4441,8 +4441,8 @@ _081BD494: orrs r1, r2 strb r1, [r0] _081BD57C: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -4468,15 +4468,15 @@ sub_81BD5BC: @ 81BD5BC thumb_func_start sub_81BD5C8 sub_81BD5C8: @ 81BD5C8 push {r4-r6,lr} - ldr r6, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r6, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -4526,7 +4526,7 @@ sub_81BD5C8: @ 81BD5C8 adds r0, r5 ldr r1, =DummyObjectCallback bl oamt_set_x3A_32 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -4543,7 +4543,7 @@ sub_81BD674: @ 81BD674 push {r4-r6,lr} ldr r6, =gUnknown_020244D0 ldr r4, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -4587,7 +4587,7 @@ _081BD6C8: cmp r4, 0 bne _081BD73E strb r4, [r3, 0x4] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -4601,8 +4601,8 @@ _081BD6C8: negs r1, r1 movs r0, 0x10 bl audio_play_and_stuff - ldr r2, =gUnknown_02020630 - ldr r3, =gUnknown_020241E4 + ldr r2, =gSprites + ldr r3, =gBankSpriteIds ldrb r0, [r5] adds r0, r3 ldrb r1, [r0] @@ -4630,7 +4630,7 @@ _081BD6C8: adds r0, r2 ldr r1, =sub_8039C00 str r1, [r0] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -4678,7 +4678,7 @@ sub_81BD784: @ 81BD784 thumb_func_start sub_81BD790 sub_81BD790: @ 81BD790 push {r4-r6,lr} - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -4686,7 +4686,7 @@ sub_81BD790: @ 81BD790 beq _081BD7A2 b _081BD8B6 _081BD7A2: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -4799,7 +4799,7 @@ _081BD898: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -4819,8 +4819,8 @@ bx_move_anim_3: @ 81BD8C8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r2, =gBattleBufferA + ldr r6, =gActiveBank ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -4947,7 +4947,7 @@ _081BD98A: _081BD9D8: ldr r0, =gUnknown_020244D0 ldr r2, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -5004,7 +5004,7 @@ sub_81BDA4C: @ 81BDA4C strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 ldr r1, =gUnknown_02023066 @@ -5014,7 +5014,7 @@ sub_81BDA4C: @ 81BDA4C ldr r0, =gUnknown_02022E2C movs r1, 0 bl battle_show_message_maybe - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -5054,7 +5054,7 @@ sub_81BDABC: @ 81BDABC thumb_func_start sub_81BDAC8 sub_81BDAC8: @ 81BDAC8 push {r4-r6,lr} - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r4, [r6] lsls r4, 9 ldr r0, =gUnknown_02023068 @@ -5077,7 +5077,7 @@ sub_81BDAC8: @ 81BDAC8 ands r0, r1 cmp r0, 0 beq _081BDB02 - ldr r1, =gEnemyMonIndex + ldr r1, =gBankTarget ldrb r0, [r6] strb r0, [r1] _081BDB02: @@ -5092,10 +5092,10 @@ _081BDB02: cmp r0, 0 beq _081BDB3C movs r0, 0x1 - bl battle_get_side_with_given_state - ldr r4, =gEnemyMonIndex + bl GetBankByPlayerAI + ldr r4, =gBankTarget strb r0, [r4] - ldr r0, =gUnknown_02024210 + ldr r0, =gAbsentBankFlags ldrb r1, [r0] ldr r2, =gBitTable ldrb r0, [r4] @@ -5106,10 +5106,10 @@ _081BDB02: cmp r1, 0 beq _081BDB3C movs r0, 0x3 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI strb r0, [r4] _081BDB3C: - ldr r0, =gEnemyMonIndex + ldr r0, =gBankTarget ldrb r2, [r0] lsls r2, 8 orrs r2, r5 @@ -5140,11 +5140,11 @@ sub_81BDB7C: @ 81BDB7C cmp r4, 0x6 bne _081BDBD0 movs r0, 0 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r6, r0, 24 movs r0, 0x2 - bl battle_get_side_with_given_state + bl GetBankByPlayerAI lsls r0, 24 lsrs r5, r0, 24 movs r4, 0x3 @@ -5162,7 +5162,7 @@ _081BDBA4: bl GetMonData cmp r0, 0 beq _081BDBA2 - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] @@ -5174,9 +5174,9 @@ _081BDBA4: cmp r4, r0 beq _081BDBA2 _081BDBD0: - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r0, [r0] - ldr r1, =gUnknown_0202449C + ldr r1, =gBattleStruct ldr r1, [r1] adds r0, r1 adds r0, 0x5C @@ -5210,8 +5210,8 @@ sub_81BDC10: @ 81BDC10 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r3, =gBattleBufferA + ldr r0, =gActiveBank mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -5228,7 +5228,7 @@ sub_81BDC10: @ 81BDC10 ldr r0, =0x00007fff cmp r7, r0 beq _081BDCA0 - ldr r6, =gUnknown_0202406E + ldr r6, =gBattlePartyID lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -5260,7 +5260,7 @@ sub_81BDC10: @ 81BDC10 b _081BDCCA .pool _081BDCA0: - ldr r1, =gUnknown_0202406E + ldr r1, =gBattlePartyID lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -5280,8 +5280,8 @@ _081BDCA0: movs r3, 0 bl sub_807294C _081BDCCA: - ldr r1, =gUnknown_03005D60 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -5300,8 +5300,8 @@ _081BDCCA: thumb_func_start sub_81BDD00 sub_81BDD00: @ 81BDD00 push {r4-r7,lr} - ldr r5, =gUnknown_02023064 - ldr r6, =gUnknown_02024064 + ldr r5, =gBattleBufferA + ldr r6, =gActiveBank ldrb r0, [r6] lsls r0, 9 adds r1, r5, 0x1 @@ -5350,7 +5350,7 @@ _081BDD38: strh r4, [r1, 0xA] ldrb r0, [r6] strh r0, [r1, 0xC] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -5366,7 +5366,7 @@ _081BDD84: thumb_func_start sub_81BDD9C sub_81BDD9C: @ 81BDD9C push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 @@ -5376,7 +5376,7 @@ sub_81BDD9C: @ 81BDD9C ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, =gUnknown_0202406E + ldr r2, =gBattlePartyID lsls r1, 1 adds r1, r2 ldrh r2, [r1] @@ -5399,7 +5399,7 @@ sub_81BDD9C: @ 81BDD9C negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -5415,13 +5415,13 @@ _081BDDF0: thumb_func_start sub_81BDE14 sub_81BDE14: @ 81BDE14 push {r4,r5,lr} - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _081BDE64 - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -5446,7 +5446,7 @@ sub_81BDE14: @ 81BDE14 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -5550,8 +5550,8 @@ sub_81BDEE8: @ 81BDEE8 sub_81BDF04: @ 81BDF04 push {lr} ldr r3, =gUnknown_02022D0C - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -5609,9 +5609,9 @@ sub_81BDF54: @ 81BDF54 thumb_func_start dp01t_29_3_blink dp01t_29_3_blink: @ 81BDF7C push {r4,lr} - ldr r3, =gUnknown_02020630 - ldr r2, =gUnknown_020241E4 - ldr r4, =gUnknown_02024064 + ldr r3, =gSprites + ldr r2, =gBankSpriteIds + ldr r4, =gActiveBank ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -5628,7 +5628,7 @@ dp01t_29_3_blink: @ 81BDF7C b _081BDFDA .pool _081BDFB0: - ldr r1, =gUnknown_020244B9 + ldr r1, =gDoingBattleAnim movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -5642,7 +5642,7 @@ _081BDFB0: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -5666,16 +5666,16 @@ sub_81BDFEC: @ 81BDFEC thumb_func_start sub_81BDFF8 sub_81BDFF8: @ 81BDFF8 push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 movs r3, 0x3F cmp r0, 0 bne _081BE00C movs r3, 0xC0 _081BE00C: - ldr r2, =gUnknown_02023064 + ldr r2, =gBattleBufferA ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -5699,8 +5699,8 @@ _081BE00C: thumb_func_start sub_81BE03C sub_81BE03C: @ 81BE03C push {r4,r5,lr} - ldr r4, =gUnknown_02023064 - ldr r5, =gUnknown_02024064 + ldr r4, =gBattleBufferA + ldr r5, =gActiveBank ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -5742,8 +5742,8 @@ _081BE08C: thumb_func_start sub_81BE098 sub_81BE098: @ 81BE098 push {lr} - ldr r1, =gUnknown_0202406E - ldr r0, =gUnknown_02024064 + ldr r1, =gBattlePartyID + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -5769,8 +5769,8 @@ sub_81BE098: @ 81BE098 thumb_func_start dp01t_2E_3_battle_intro dp01t_2E_3_battle_intro: @ 81BE0D8 push {lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -5791,15 +5791,15 @@ dp01t_2E_3_battle_intro: @ 81BE0D8 thumb_func_start sub_81BE10C sub_81BE10C: @ 81BE10C push {r4-r6,lr} - ldr r6, =gUnknown_020241E4 - ldr r5, =gUnknown_02024064 + ldr r6, =gBankSpriteIds + ldr r5, =gActiveBank ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r5] @@ -5900,9 +5900,9 @@ _081BE1FC: movs r2, 0x20 bl LoadCompressedPalette _081BE21A: - ldr r2, =gUnknown_02020630 - ldr r1, =gUnknown_020241E4 - ldr r5, =gUnknown_02024064 + ldr r2, =gSprites + ldr r1, =gBankSpriteIds + ldr r5, =gActiveBank ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -5956,7 +5956,7 @@ _081BE27E: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -5992,7 +5992,7 @@ sub_81BE2C8: @ 81BE2C8 b _081BE3B0 .pool _081BE2F4: - ldr r7, =gUnknown_02024064 + ldr r7, =gActiveBank ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -6008,12 +6008,12 @@ _081BE2F4: cmp r0, 0 beq _081BE344 _081BE314: - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, =gUnknown_0202406E + ldr r0, =gBattlePartyID lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -6024,12 +6024,12 @@ _081BE314: b _081BE398 .pool _081BE344: - ldr r4, =gUnknown_02023064 + ldr r4, =gBattleBufferA ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, =gUnknown_0202406E + ldr r5, =gBattlePartyID lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -6064,8 +6064,8 @@ _081BE344: eors r0, r6 strb r0, [r7] _081BE398: - ldr r1, =gUnknown_03005D60 - ldr r2, =gUnknown_02024064 + ldr r1, =gBattleBankFunc + ldr r2, =gActiveBank ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -6088,8 +6088,8 @@ _081BE3B0: thumb_func_start dp01t_30_3_80EB11C dp01t_30_3_80EB11C: @ 81BE3D4 push {r4-r6,lr} - ldr r1, =gUnknown_02023064 - ldr r0, =gUnknown_02024064 + ldr r1, =gBattleBufferA + ldr r0, =gActiveBank ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -6098,7 +6098,7 @@ dp01t_30_3_80EB11C: @ 81BE3D4 cmp r0, 0 beq _081BE404 adds r0, r2, 0 - bl battle_side_get_owner + bl GetBankSide lsls r0, 24 cmp r0, 0 bne _081BE404 @@ -6108,7 +6108,7 @@ dp01t_30_3_80EB11C: @ 81BE3D4 _081BE404: ldr r6, =gUnknown_020244D0 ldr r0, [r6] - ldr r5, =gUnknown_02024064 + ldr r5, =gActiveBank ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -6158,7 +6158,7 @@ _081BE404: movs r1, 0x5D strb r1, [r0, 0x5] _081BE46C: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -6176,7 +6176,7 @@ sub_81BE498: @ 81BE498 push {r4,lr} ldr r4, =gUnknown_020244D0 ldr r0, [r4] - ldr r3, =gUnknown_02024064 + ldr r3, =gActiveBank ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -6212,7 +6212,7 @@ sub_81BE4E0: @ 81BE4E0 push {lr} ldr r0, =gUnknown_020244D0 ldr r1, [r0] - ldr r0, =gUnknown_02024064 + ldr r0, =gActiveBank ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -6252,14 +6252,14 @@ sub_81BE530: @ 81BE530 thumb_func_start sub_81BE53C sub_81BE53C: @ 81BE53C push {r4,lr} - ldr r4, =gUnknown_02024064 + ldr r4, =gActiveBank ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _081BE582 - ldr r3, =gUnknown_02020630 - ldr r0, =gUnknown_020241E4 + ldr r3, =gSprites + ldr r0, =gBankSpriteIds ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -6267,7 +6267,7 @@ sub_81BE53C: @ 81BE53C adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, =gUnknown_02023064 + ldr r0, =gBattleBufferA lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -6296,13 +6296,13 @@ _081BE582: sub_81BE59C: @ 81BE59C push {r4-r6,lr} sub sp, 0x4 - ldr r6, =gUnknown_02024064 + ldr r6, =gActiveBank ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _081BE5F4 - ldr r5, =gUnknown_02023064 + ldr r5, =gBattleBufferA ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -6327,7 +6327,7 @@ sub_81BE59C: @ 81BE59C b _081BE5F4 .pool _081BE5E8: - ldr r0, =gUnknown_03005D60 + ldr r0, =gBattleBankFunc ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -6360,9 +6360,9 @@ sub_81BE610: @ 81BE610 thumb_func_start sub_81BE61C sub_81BE61C: @ 81BE61C push {r4,lr} - ldr r2, =gUnknown_0202433A - ldr r1, =gUnknown_02023064 - ldr r4, =gUnknown_02024064 + ldr r2, =gBattleOutcome + ldr r1, =gBattleBufferA + ldr r4, =gActiveBank ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -6374,7 +6374,7 @@ sub_81BE61C: @ 81BE61C movs r0, 0x3 bl BeginFastPaletteFade bl dp01_tbl3_exec_completed - ldr r1, =gUnknown_03005D60 + ldr r1, =gBattleBankFunc ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -6612,7 +6612,7 @@ sub_81BE808: @ 81BE808 lsls r2, 2 ldr r4, =gUnknown_02037350 adds r2, r4 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r2, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -6856,7 +6856,7 @@ sub_81BEA20: @ 81BEA20 movs r4, 0 ldr r5, =gUnknown_08617D64 adds r7, r5, 0x2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites _081BEA2A: lsls r0, r4, 1 adds r0, r4 @@ -6895,7 +6895,7 @@ _081BEA2A: movs r4, 0 ldr r5, =gUnknown_08617D64 adds r7, r5, 0x2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites _081BEA78: lsls r0, r4, 1 adds r0, r4 @@ -7674,7 +7674,7 @@ _081BF0F0: ldr r1, [r4] movs r3, 0 strb r0, [r1, 0x8] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r4] ldrb r1, [r0, 0x8] lsls r0, r1, 4 @@ -7742,7 +7742,7 @@ _081BF178: lsrs r5, r0, 16 cmp r5, r8 bls _081BF178 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r3, 0x8] lsls r0, r1, 4 adds r0, r1 @@ -7754,7 +7754,7 @@ _081BF178: b _081BF228 .pool _081BF1CC: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r5, =gUnknown_0203CF0C ldr r0, [r5] ldrb r1, [r0, 0x8] @@ -10136,7 +10136,7 @@ _081C0786: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeResources b _081C08EC @@ -10213,7 +10213,7 @@ _081C0828: ldrb r0, [r1] cmp r0, 0xFF beq _081C08F2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -10243,7 +10243,7 @@ _081C0878: b _081C08EC .pool _081C0894: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203CF1C ldr r0, [r0] ldr r1, =0x000040d3 @@ -10926,7 +10926,7 @@ sub_81C0E48: @ 81C0E48 mov r8, r6 movs r0, 0x13 bl ClearWindowTilemap - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r5] ldr r1, =0x000040d5 adds r0, r1 @@ -11229,7 +11229,7 @@ _081C1110: _081C1118: movs r0, 0x13 bl ClearWindowTilemap - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203CF1C ldr r0, [r0] ldr r1, =0x000040d5 @@ -11712,26 +11712,26 @@ sub_81C14BC: @ 81C14BC adds r1, 0xD adds r0, r7, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r1, r6, 0 adds r1, 0xD adds r0, r7, 0 ldr r2, [sp, 0x1C] - bl pokemon_setattr + bl SetMonData adds r4, 0x11 adds r0, r7, 0 adds r1, r4, 0 ldr r2, [sp, 0x20] - bl pokemon_setattr + bl SetMonData adds r6, 0x11 adds r0, r7, 0 adds r1, r6, 0 ldr r2, [sp, 0x24] - bl pokemon_setattr + bl SetMonData adds r0, r7, 0 movs r1, 0x15 adds r2, r5, 0 - bl pokemon_setattr + bl SetMonData mov r0, sp ldrh r0, [r0] ldr r1, [sp, 0x8] @@ -11860,26 +11860,26 @@ sub_81C15EC: @ 81C15EC adds r1, 0xD adds r0, r7, 0 mov r2, sp - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r1, r6, 0 adds r1, 0xD adds r0, r7, 0 ldr r2, [sp, 0x1C] - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r4, 0x11 adds r0, r7, 0 adds r1, r4, 0 ldr r2, [sp, 0x20] - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r6, 0x11 adds r0, r7, 0 adds r1, r6, 0 ldr r2, [sp, 0x24] - bl pokemon_setattr_encrypted + bl SetMonData_encrypted adds r0, r7, 0 movs r1, 0x15 adds r2, r5, 0 - bl pokemon_setattr_encrypted + bl SetMonData_encrypted mov r0, sp ldrh r0, [r0] ldr r1, [sp, 0x8] @@ -12240,7 +12240,7 @@ _081C19F0: _081C1A00: movs r0, 0x13 bl ClearWindowTilemap - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r4] ldr r1, =0x000040d5 adds r0, r1 @@ -12296,7 +12296,7 @@ _081C1A7A: beq _081C1B74 movs r0, 0x13 bl ClearWindowTilemap - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r4] ldr r1, =0x000040d5 adds r0, r1 @@ -12349,7 +12349,7 @@ _081C1B04: beq _081C1B74 movs r0, 0x13 bl ClearWindowTilemap - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r4, =gUnknown_0203CF1C ldr r0, [r4] ldr r1, =0x000040d5 @@ -12796,7 +12796,7 @@ _081C1E80: b _081C1ED4 .pool _081C1EAC: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r5] ldr r1, =0x000040d5 adds r0, r1 @@ -12965,7 +12965,7 @@ _081C2006: b _081C204C .pool _081C2024: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r5] ldr r1, =0x000040d5 adds r0, r1 @@ -16806,7 +16806,7 @@ sub_81C41C0: @ 81C41C0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldr r0, [r5] @@ -16829,7 +16829,7 @@ sub_81C4204: @ 81C4204 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_0203CF1C ldr r2, [r2] ldr r4, =0x000040d3 @@ -16985,7 +16985,7 @@ sub_81C4318: @ 81C4318 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r4, 0 adds r1, r5, 0 @@ -17260,7 +17260,7 @@ sub_81C4568: @ 81C4568 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r4, r5 adds r1, 0x3 adds r2, r1 @@ -17529,7 +17529,7 @@ sub_81C47B4: @ 81C47B4 lsls r4, r0, 4 add r4, r8 lsls r4, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r7, r4, r5 adds r0, r7, 0 bl obj_free_rotscale_entry @@ -17639,7 +17639,7 @@ _081C48AA: thumb_func_start sub_81C48B4 sub_81C48B4: @ 81C48B4 push {lr} - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203CF1C ldr r0, [r0] ldr r1, =0x000040d3 @@ -17667,7 +17667,7 @@ _081C48EA: thumb_func_start sub_81C48F0 sub_81C48F0: @ 81C48F0 push {r4-r6,lr} - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r5, =gUnknown_0203CF1C ldr r0, [r5] ldr r4, =0x000040d3 @@ -17818,7 +17818,7 @@ sub_81C4A08: @ 81C4A08 ldr r3, =0x000040d4 adds r1, r3 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r2] adds r2, r3 ldrb r1, [r2] @@ -17873,7 +17873,7 @@ _081C4AA6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 subs r1, r2, 0x1 lsls r1, 24 @@ -17923,7 +17923,7 @@ sub_81C4AF8: @ 81C4AF8 mov r9, r0 _081C4B2A: movs r5, 0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites mov r10, r5 _081C4B30: lsls r1, r5, 20 @@ -18110,7 +18110,7 @@ sub_81C4C84: @ 81C4C84 adds r0, r6 lsls r0, 24 movs r4, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r2, 0x80 lsls r2, 19 adds r2, r0 @@ -18180,7 +18180,7 @@ sub_81C4D18: @ 81C4D18 ldr r1, [r1] adds r5, r1, r0 movs r3, 0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r7, 0x5 negs r7, r7 movs r6, 0 @@ -18964,7 +18964,7 @@ sub_81C540C: @ 81C540C lsls r1, 16 lsrs r4, r1, 16 adds r0, r4, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 @@ -19177,7 +19177,7 @@ sub_81C55D8: @ 81C55D8 adds r2, r0 adds r2, r3 ldrh r0, [r2] - bl itemid_get_description + bl ItemId_GetDescription adds r4, r0, 0 b _081C5638 .pool @@ -20057,7 +20057,7 @@ sub_81C5D20: @ 81C5D20 _081C5D74: ldr r0, =gUnknown_0203CE7C ldrh r0, [r0] - bl itemid_get_usage + bl ItemId_GetBattleUsage lsls r0, 24 cmp r0, 0 beq _081C5DA0 @@ -20571,7 +20571,7 @@ sub_81C61E0: @ 81C61E0 lsrs r5, r0, 24 ldr r4, =gUnknown_0203CE7C ldrh r0, [r4] - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 @@ -20596,7 +20596,7 @@ _081C620C: .pool _081C6228: ldrh r0, [r4] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc cmp r0, 0 beq _081C6252 bl sub_81C61A8 @@ -20606,7 +20606,7 @@ _081C6228: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram ldrh r0, [r4] - bl itemid_get_overworld_function + bl ItemId_GetFieldFunc adds r1, r0, 0 adds r0, r5, 0 bl _call_via_r1 @@ -21196,12 +21196,12 @@ sub_81C679C: @ 81C679C lsrs r5, r0, 24 ldr r4, =gUnknown_0203CE7C ldrh r0, [r4] - bl itemid_get_battle_function + bl ItemId_GetBattleFunc cmp r0, 0 beq _081C67C0 bl sub_81C61A8 ldrh r0, [r4] - bl itemid_get_battle_function + bl ItemId_GetBattleFunc adds r1, r0, 0 adds r0, r5, 0 bl _call_via_r1 @@ -21634,7 +21634,7 @@ _081C6B9C: add r0, r9 movs r1, 0xC mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -21979,7 +21979,7 @@ sub_81C6E38: @ 81C6E38 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl obj_free_rotscale_entry ldrb r1, [r5] @@ -22063,7 +22063,7 @@ sub_81C6F20: @ 81C6F20 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x3F @@ -22136,7 +22136,7 @@ sub_81C6F90: @ 81C6F90 cmp r2, 0x40 beq _081C6FE0 strb r2, [r5] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -23763,7 +23763,7 @@ _081C7C36: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r6, 0x18] pop {r4-r6} @@ -23865,7 +23865,7 @@ sub_81C7D28: @ 81C7D28 movs r0, 0x2 bl AllocObjectPalette movs r5, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 movs r7, 0x4 _081C7D50: @@ -26171,7 +26171,7 @@ sub_81C8EF8: @ 81C8EF8 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 add r0, r8 str r0, [r5, 0x3C] @@ -28368,7 +28368,7 @@ _081CA054: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 stm r6!, {r1} lsls r0, r4, 5 @@ -29166,7 +29166,7 @@ sub_81CA640: @ 81CA640 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r4, 0x28] bl sub_81C98D4 @@ -29622,7 +29622,7 @@ sub_81CA9EC: @ 81CA9EC movs r1, 0x7F ands r0, r1 strh r0, [r2, 0x2] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r3, 0x2 ldrsh r0, [r2, r3] lsls r0, 1 @@ -32027,7 +32027,7 @@ sub_81CBC64: @ 81CBC64 movs r1, 0x7F ands r0, r1 strh r0, [r2] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r3, 0 ldrsh r0, [r2, r3] lsls r0, 1 @@ -32850,7 +32850,7 @@ sub_81CC2F0: @ 81CC2F0 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r4, 0x1C] adds r0, r4, 0 @@ -32921,7 +32921,7 @@ sub_81CC370: @ 81CC370 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 pop {r1} bx r1 @@ -34302,7 +34302,7 @@ _081CCE80: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 movs r0, 0 strh r0, [r2, 0x2E] @@ -34647,7 +34647,7 @@ sub_81CD110: @ 81CD110 adds r0, r1 movs r1, 0x8 mov r2, sp - bl pokemon_setattr + bl SetMonData b _081CD180 .pool _081CD174: @@ -37685,7 +37685,7 @@ _081CEA8C: adds r0, r6, r2 adds r0, r4 strb r3, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -37722,7 +37722,7 @@ _081CEAE8: bhi _081CEB5C ldr r0, =0x00001806 adds r5, r6, r0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 _081CEB0A: lsls r2, r4, 2 @@ -37786,7 +37786,7 @@ _081CEB5C: adds r0, r6, r1 adds r0, r4 strb r3, [r0] - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r2, r3, 4 adds r2, r3 lsls r2, 2 @@ -37864,7 +37864,7 @@ _081CEC2A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -37892,7 +37892,7 @@ _081CEC68: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles movs r0, 0x64 @@ -38028,7 +38028,7 @@ sub_81CED30: @ 81CED30 .pool _081CEDBC: strb r0, [r7] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrb r1, [r7] lsls r0, r1, 4 adds r0, r1 @@ -42660,7 +42660,7 @@ sub_81D1184: @ 81D1184 bl sub_818D7D8 lsls r0, 16 lsrs r0, 16 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -42683,7 +42683,7 @@ sub_81D11D8: @ 81D11D8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r2, 0x20 negs r2, r2 @@ -42711,7 +42711,7 @@ sub_81D11FC: @ 81D11FC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r1, r5, 0 movs r2, 0x28 @@ -42725,7 +42725,7 @@ sub_81D11FC: @ 81D11FC thumb_func_start sub_81D1234 sub_81D1234: @ 81D1234 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldrh r1, [r0, 0x10] lsls r0, r1, 4 adds r0, r1 @@ -42980,7 +42980,7 @@ sub_81D13FC: @ 81D13FC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r4, 0x14] adds r1, 0x3E @@ -45657,7 +45657,7 @@ sub_81D2754: @ 81D2754 mov r12, r0 movs r2, 0x1 mov r9, r2 - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable mov r10, r3 _081D2786: adds r0, r7, 0 @@ -47143,7 +47143,7 @@ sub_81D3314: @ 81D3314 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r3, r1, r0 cmp r3, 0 beq _081D3360 @@ -47273,7 +47273,7 @@ sub_81D3408: @ 81D3408 adds r0, 0x1 cmp r3, r0 bge _081D3454 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r7, 0x1C adds r7, r5 mov r12, r7 @@ -47363,7 +47363,7 @@ _081D34A2: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 str r0, [r4] adds r0, 0x3E @@ -47535,7 +47535,7 @@ _081D3604: lsls r4, r1, 4 adds r4, r1 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r4, 0 movs r1, 0 @@ -50084,7 +50084,7 @@ sub_81D4A90: @ 81D4A90 movs r1, 0x4 orrs r0, r1 strb r0, [r5, 0x3] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -50114,7 +50114,7 @@ _081D4AF8: movs r1, 0x4 orrs r0, r1 strb r0, [r5, 0x3] - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -50223,7 +50223,7 @@ sub_81D4BEC: @ 81D4BEC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles _081D4C06: @@ -51748,7 +51748,7 @@ _081D5854: lsls r1, 4 adds r0, r1 strb r5, [r0] - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome strb r5, [r0] ldr r1, [r6] adds r1, r3 @@ -53156,11 +53156,11 @@ sub_81D642C: @ 81D642C add r2, sp, 0x4 adds r0, r4, 0 movs r1, 0x19 - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x38 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 bl pokemon_calc_effective_stats add sp, 0x8 @@ -53776,7 +53776,7 @@ sub_81D6984: @ 81D6984 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -53851,7 +53851,7 @@ sub_81D6A20: @ 81D6A20 beq _081D6A84 subs r0, r1, 0x1 strh r0, [r3, 0x20] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r4, 0x2E ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -53900,7 +53900,7 @@ _081D6A9C: beq _081D6AE4 b _081D6B68 _081D6AA6: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r0, r12 movs r4, 0x2 ldrsh r1, [r0, r4] @@ -53931,7 +53931,7 @@ _081D6AA6: b _081D6B5E .pool _081D6AE4: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r0, r12 movs r3, 0x2 ldrsh r1, [r0, r3] @@ -53961,7 +53961,7 @@ _081D6AE4: b _081D6B58 .pool _081D6B24: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r3, r12 movs r4, 0x2 ldrsh r1, [r3, r4] @@ -54020,7 +54020,7 @@ sub_81D6B7C: @ 81D6B7C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r4, r0, 4 add r4, r8 lsls r4, 2 @@ -54201,7 +54201,7 @@ sub_81D6D20: @ 81D6D20 movs r1, 0x1F ands r0, r1 strh r0, [r3, 0xA] - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites cmp r0, 0 bne _081D6E0E ldrh r1, [r4, 0x20] @@ -55150,7 +55150,7 @@ sub_81D752C: @ 81D752C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl sub_81D7860 movs r0, 0x6 @@ -55294,7 +55294,7 @@ sub_81D7664: @ 81D7664 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -55371,7 +55371,7 @@ sub_81D7700: @ 81D7700 beq _081D7768 subs r0, r1, 0x1 strh r0, [r3, 0x20] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r4, 0x2E ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -55420,7 +55420,7 @@ _081D7780: beq _081D77C8 b _081D784C _081D778A: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r0, r12 movs r4, 0x2 ldrsh r1, [r0, r4] @@ -55451,7 +55451,7 @@ _081D778A: b _081D7842 .pool _081D77C8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r0, r12 movs r3, 0x2 ldrsh r1, [r0, r3] @@ -55481,7 +55481,7 @@ _081D77C8: b _081D783C .pool _081D7808: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r3, r12 movs r4, 0x2 ldrsh r1, [r3, r4] @@ -55538,7 +55538,7 @@ sub_81D7860: @ 81D7860 adds r0, r2, 0 adds r0, 0x8 strh r0, [r1, 0x22] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r1, r0] lsls r0, r1, 4 @@ -55589,7 +55589,7 @@ sub_81D78BC: @ 81D78BC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r4, r0, 4 add r4, r8 lsls r4, 2 @@ -55772,7 +55772,7 @@ sub_81D7A60: @ 81D7A60 strh r0, [r3, 0xA] movs r1, 0x7 ands r1, r0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites cmp r1, 0 bne _081D7B52 ldrh r1, [r4, 0x20] @@ -56130,7 +56130,7 @@ sub_81D7D14: @ 81D7D14 adds r0, r1, 0 adds r0, 0x8 strh r0, [r2, 0x22] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrh r1, [r2, 0x2E] lsls r1, 16 asrs r1, 24 @@ -56688,7 +56688,7 @@ sub_81D81A4: @ 81D81A4 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -57345,7 +57345,7 @@ _081D87C4: ldrh r0, [r5, 0x24] subs r0, 0x1 strh r0, [r5, 0x24] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -57366,7 +57366,7 @@ _081D87EE: ldrh r0, [r5, 0x26] adds r0, 0x1 strh r0, [r5, 0x26] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -58095,7 +58095,7 @@ _081D8EBA: strh r5, [r4, 0x2] b _081D8F30 _081D8EDE: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0xA ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -58541,7 +58541,7 @@ sub_81D9274: @ 81D9274 lsls r2, 3 ldr r0, =gTasks + 0x8 adds r2, r0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x6 ldrsh r1, [r2, r0] lsls r0, r1, 4 @@ -58642,7 +58642,7 @@ pokemon_alive_on_battle_side: @ 81D9338 ldrh r3, [r4, 0x3A] subs r0, r3 strh r0, [r4, 0x20] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -58658,7 +58658,7 @@ _081D9370: ldrh r1, [r4, 0x20] adds r0, r2, r1 strh r0, [r4, 0x20] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -58717,7 +58717,7 @@ sub_81D93D8: @ 81D93D8 lsls r2, 3 ldr r0, =gTasks + 0x8 adds r2, r0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x6 ldrsh r1, [r2, r0] lsls r0, r1, 4 @@ -58769,7 +58769,7 @@ _081D9440: movs r1, 0xC bl __umodsi3 lsls r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites cmp r0, 0 bne _081D9470 ldrh r0, [r4, 0x20] @@ -58796,7 +58796,7 @@ _081D9470: b _081D94C4 .pool _081D9488: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -58912,7 +58912,7 @@ _081D9550: lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x3C] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r1, 0x3C ldrsh r0, [r7, r1] lsls r1, r0, 4 @@ -59010,7 +59010,7 @@ sub_81D961C: @ 81D961C ldrh r0, [r4, 0x26] adds r0, 0x2 strh r0, [r4, 0x26] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -59080,7 +59080,7 @@ _081D96A4: _081D96BE: cmp r1, 0x70 bne _081D96EC - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -59122,7 +59122,7 @@ _081D9700: bl sub_81D9868 movs r3, 0x1 strh r3, [r4, 0x24] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -59149,7 +59149,7 @@ _081D974C: bne _081D979E movs r3, 0 strh r3, [r4, 0x24] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -59190,7 +59190,7 @@ _081D979E: ldrsh r2, [r4, r1] negs r2, r2 strh r2, [r4, 0x24] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -59218,7 +59218,7 @@ sub_81D97E0: @ 81D97E0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r4, r0, r5 ldrh r1, [r3, 0x3A] ldrh r0, [r4, 0x36] @@ -59294,7 +59294,7 @@ sub_81D9868: @ 81D9868 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r1 lsls r2, 16 asrs r2, 16 @@ -61172,12 +61172,12 @@ _081DA7A8: cmp r7, 0x2 beq _081DA7E4 _081DA7AC: - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r3, r5, 4 b _081DA7F8 .pool _081DA7B8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -61188,7 +61188,7 @@ _081DA7B8: b _081DA7F4 .pool _081DA7D0: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -61197,7 +61197,7 @@ _081DA7D0: b _081DA7F0 .pool _081DA7E4: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -61367,12 +61367,12 @@ _081DA924: cmp r5, 0x2 beq _081DA960 _081DA928: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r6, 4 b _081DA972 .pool _081DA934: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 @@ -61383,7 +61383,7 @@ _081DA934: b _081DA970 .pool _081DA94C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 @@ -61392,7 +61392,7 @@ _081DA94C: b _081DA96C .pool _081DA960: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 @@ -61505,7 +61505,7 @@ sub_81DAA20: @ 81DAA20 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles movs r0, 0x12 @@ -61532,7 +61532,7 @@ sub_81DAA20: @ 81DAA20 sub_81DAA74: @ 81DAA74 push {r4,r5,lr} adds r3, r0, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x10 ldrsh r1, [r3, r0] lsls r0, r1, 4 diff --git a/asm/rotating_gate.s b/asm/rotating_gate.s index b10e27e65..6bf0f7d99 100644 --- a/asm/rotating_gate.s +++ b/asm/rotating_gate.s @@ -338,7 +338,7 @@ _080FBA38: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r4, r2 strh r6, [r4, 0x2E] movs r2, 0x3E @@ -625,7 +625,7 @@ _080FBC94: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r4, 0 bl obj_free_rotscale_entry @@ -818,7 +818,7 @@ sub_80FBE08: @ 80FBE08 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 strh r1, [r4, 0x30] adds r0, r3, 0 diff --git a/asm/roulette.s b/asm/roulette.s index df993ef43..45a347eba 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -1384,7 +1384,7 @@ _08140E20: bl sub_8142284 movs r4, 0 mov r9, r6 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r12, r1 movs r2, 0x8 add r2, r12 @@ -1459,7 +1459,7 @@ _08140E8C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r3, r0, r1 adds r2, r3, 0 adds r2, 0x40 @@ -1717,7 +1717,7 @@ _08141128: asrs r0, 16 cmp r0, 0x68 bne _08141180 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r1, 0 adds r0, 0x55 ldrb r1, [r0] @@ -2238,7 +2238,7 @@ sub_814155C: @ 814155C lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r1, r2 str r1, [r3, 0x38] ldr r2, =sub_81446AC @@ -2427,7 +2427,7 @@ _08141700: asrs r0, 16 cmp r0, 0x68 bne _08141768 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r1, 0 adds r0, 0x55 ldrb r1, [r0] @@ -2873,7 +2873,7 @@ sub_8141AC0: @ 8141AC0 ldrb r0, [r2] ands r1, r0 strb r1, [r2] - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r2, [r5] ldr r5, =gUnknown_085B6154 ldr r0, =gTasks @@ -2934,7 +2934,7 @@ sub_8141B58: @ 8141B58 strb r2, [r1] movs r0, 0 bl sub_81424FC - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r4] adds r0, 0x6C ldrb r1, [r0] @@ -3111,7 +3111,7 @@ dp01t_12_3_battle_menu: @ 8141D0C bl sub_81424FC movs r0, 0x6 bl sub_814372C - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r3, =gUnknown_0203AB88 movs r6, 0x5 negs r6, r6 @@ -3861,28 +3861,28 @@ _08142368: b _081423D4 .pool _0814237C: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_0203AB88 ldr r0, [r2] adds r0, 0x43 b _081423C0 .pool _08142390: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_0203AB88 ldr r0, [r2] adds r0, 0x44 b _081423C0 .pool _081423A4: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_0203AB88 ldr r0, [r2] adds r0, 0x45 b _081423C0 .pool _081423B8: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gUnknown_0203AB88 ldr r0, [r2] adds r0, 0x46 @@ -4900,7 +4900,7 @@ sub_8142C60: @ 8142C60 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -4972,7 +4972,7 @@ sub_8142CD0: @ 8142CD0 mov r0, sp bl LoadObjectPic movs r6, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 _08142D18: lsls r0, r6, 1 @@ -5030,7 +5030,7 @@ _08142D6E: cmp r6, 0x2 bls _08142D18 movs r6, 0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites _08142D86: lsls r1, r6, 1 adds r1, r6 @@ -5065,7 +5065,7 @@ _08142D86: cmp r6, 0x3 bls _08142D86 movs r6, 0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites _08142DCC: lsls r2, r6, 1 adds r2, r6 @@ -5121,7 +5121,7 @@ _08142E40: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -5151,7 +5151,7 @@ sub_8142E70: @ 8142E70 cmp r0, 0x1 bne _08142F66 movs r4, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r3, =gUnknown_0203AB88 movs r2, 0x4 _08142E92: @@ -5181,7 +5181,7 @@ _08142EC0: ldr r7, =gUnknown_085B62E4 adds r1, r7, 0x4 mov r8, r1 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites movs r6, 0x5 negs r6, r6 _08142ED2: @@ -5234,7 +5234,7 @@ _08142F2C: bls _08142ED2 cmp r4, 0x12 bhi _08142F66 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r3, =gUnknown_0203AB88 movs r5, 0x5 negs r5, r5 @@ -5274,7 +5274,7 @@ sub_8142F7C: @ 8142F7C push {r7} movs r5, 0 ldr r6, =gUnknown_0203AB88 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites movs r0, 0x4 mov r8, r0 _08142F8C: @@ -5371,7 +5371,7 @@ sub_8143038: @ 8143038 movs r6, 0 cmp r0, 0 beq _08143084 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r3, =gUnknown_0203AB88 movs r2, 0x4 _08143056: @@ -5397,7 +5397,7 @@ _08143056: _08143084: ldr r0, =gUnknown_0203AB88 mov r8, r0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r0, =gUnknown_085B6154 mov r12, r0 movs r0, 0x5 @@ -5505,7 +5505,7 @@ sub_8143150: @ 8143150 lsrs r5, r0, 24 cmp r5, 0 bne _08143180 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB88 ldr r0, [r0] adds r0, 0x6C @@ -5522,7 +5522,7 @@ sub_8143150: @ 8143150 b _081431D0 .pool _08143180: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r3, =gUnknown_0203AB88 ldr r0, [r3] adds r0, 0x6C @@ -5590,7 +5590,7 @@ sub_81431E4: @ 81431E4 mov r0, sp strh r1, [r0] movs r0, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites _08143210: movs r4, 0 adds r6, r0, 0x1 @@ -5758,7 +5758,7 @@ _08143322: ldr r1, [r3] adds r1, 0x50 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, [r3] adds r0, 0x50 ldrb r1, [r0] @@ -5829,7 +5829,7 @@ _0814338C: ldr r1, [r2] adds r1, 0x55 strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r2] adds r0, 0x55 ldrb r1, [r0] @@ -5902,7 +5902,7 @@ _0814341C: ldr r1, [r3] adds r1, 0x6C strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r0, [r3] adds r0, 0x6C ldrb r0, [r0] @@ -5962,7 +5962,7 @@ sub_8143514: @ 8143514 mov r8, r0 movs r4, 0 movs r6, 0 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 ldr r0, =gUnknown_0203AB88 mov r10, r0 @@ -5982,7 +5982,7 @@ _08143534: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r0, 0x3E ldrb r1, [r0] @@ -6176,7 +6176,7 @@ sub_81436D0: @ 81436D0 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r4, r1, r2 bl sub_8143614 adds r3, r4, 0 @@ -6243,7 +6243,7 @@ _08143760: .4byte _0814377C _0814377C: movs r4, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r6, =gUnknown_0203AB88 movs r0, 0x5 negs r0, r0 @@ -6300,13 +6300,13 @@ _08143790: b _081438F4 .pool _081437FC: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r5] adds r0, 0x58 b _0814386A .pool _08143808: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r5] adds r0, 0x58 ldrb r1, [r0] @@ -6326,13 +6326,13 @@ _08143808: b _08143886 .pool _08143830: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r5] adds r0, 0x57 b _0814386A .pool _0814383C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r5] adds r0, 0x57 ldrb r1, [r0] @@ -6352,7 +6352,7 @@ _0814383C: b _08143886 .pool _08143864: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r5] adds r0, 0x56 _0814386A: @@ -6386,7 +6386,7 @@ _08143886: _081438A8: movs r4, 0 lsls r7, r6, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites movs r0, 0x8 adds r0, r6 mov r12, r0 @@ -6466,7 +6466,7 @@ sub_814391C: @ 814391C bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -6524,7 +6524,7 @@ sub_81439C8: @ 81439C8 push {r4-r6,lr} movs r4, 0 ldr r5, =gUnknown_0203AB88 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites _081439D0: movs r3, 0x39 subs r3, r4 @@ -6591,7 +6591,7 @@ sub_8143A40: @ 8143A40 adds r0, 0x3C ldrb r5, [r0] movs r6, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites movs r0, 0x1C adds r0, r7 mov r10, r0 @@ -7337,7 +7337,7 @@ sub_8144050: @ 8144050 asrs r0, 16 cmp r0, 0x2D bne _0814411E - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB88 ldr r0, [r0] adds r0, 0x73 @@ -7360,7 +7360,7 @@ _08144098: ldrsh r1, [r3, r2] cmp r0, r1 bge _081440E4 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB88 ldr r0, [r0] adds r0, 0x73 @@ -8166,7 +8166,7 @@ sub_81446DC: @ 81446DC ldr r1, [r5] adds r1, 0x75 strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r5] adds r0, 0x75 ldrb r1, [r0] @@ -8304,7 +8304,7 @@ _0814477C: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites cmp r7, 0x2 bls _0814477C mov r3, r10 @@ -8378,7 +8378,7 @@ sub_81448B8: @ 81448B8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r0, r6 ldrh r1, [r7, 0x2E] lsls r1, 24 @@ -8919,7 +8919,7 @@ _08144D54: ldr r1, =gUnknown_02021BBE movs r0, 0 strh r0, [r1] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB88 ldr r0, [r0] adds r0, 0x73 @@ -8987,7 +8987,7 @@ _08144DDC: strh r0, [r5, 0x30] ldr r3, =sub_8144C70 str r3, [r5, 0x1C] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x3A ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -9142,7 +9142,7 @@ _08144F30: _08144F42: cmp r2, r0 bne _08144F7C - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x36 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -9225,7 +9225,7 @@ _08144FC8: bl m4aSongNumStop adds r0, r4, 0 bl RemoveObjectAndFreeTiles - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r4, =gUnknown_0203AB88 ldr r0, [r4] adds r0, 0x74 @@ -9320,7 +9320,7 @@ _08145090: bl StartObjectImageAnim ldr r0, =sub_8144FB0 str r0, [r4, 0x1C] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -9510,7 +9510,7 @@ sub_8145218: @ 8145218 ldrh r2, [r4, 0x20] adds r0, r2 strh r0, [r4, 0x20] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites movs r2, 0x3A ldrsh r0, [r4, r2] lsls r2, r0, 4 @@ -9564,7 +9564,7 @@ sub_8145294: @ 8145294 adds r0, 0x5A cmp r2, r0 bne _0814533E - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -9588,7 +9588,7 @@ _081452DC: adds r0, r1 cmp r2, r0 bne _0814533E - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 diff --git a/asm/safari_zone.s b/asm/safari_zone.s index 5ea9bf61f..4bca22fb9 100644 --- a/asm/safari_zone.s +++ b/asm/safari_zone.s @@ -130,7 +130,7 @@ sub_80FC190: @ 80FC190 ldrb r2, [r1] adds r0, r2 strb r0, [r1] - ldr r2, =gUnknown_0202433A + ldr r2, =gBattleOutcome ldrb r0, [r2] cmp r0, 0x7 bne _080FC1AE diff --git a/asm/scrcmd.s b/asm/scrcmd.s index cf3917979..249a7f91a 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -5440,7 +5440,7 @@ sCD_set_obedient_bit: @ 809BC44 adds r0, r1 movs r1, 0x50 mov r2, sp - bl pokemon_setattr + bl SetMonData movs r0, 0 add sp, 0x4 pop {r1} @@ -5588,7 +5588,7 @@ sub_809BD70: @ 809BD70 adds r0, r1 movs r1, 0x23 mov r2, sp - bl pokemon_setattr + bl SetMonData _0809BDA6: movs r0, 0 add sp, 0x4 diff --git a/asm/script_menu.s b/asm/script_menu.s index 1ebd3670e..48ca1afc2 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -1313,7 +1313,7 @@ _080E28CA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrb r1, [r4, 0xC] bl sub_80B6070 @@ -1391,7 +1391,7 @@ sub_80E2900: @ 80E2900 mov r0, r8 strh r0, [r3, 0xA] strh r5, [r3, 0xC] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index 4438a1a31..fe776459e 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -517,7 +517,7 @@ _080F8BBA: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 ldrb r2, [r1, 0x5] movs r0, 0xF @@ -621,7 +621,7 @@ sub_80F8C7C: @ 80F8C7C adds r0, r4 movs r1, 0x46 mov r2, sp - bl pokemon_setattr + bl SetMonData ldrb r0, [r6] muls r0, r5 adds r0, r4 @@ -771,7 +771,7 @@ _080F8DD8: bne _080F8E6C adds r0, r4, r5 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r1, r6, 0 movs r2, 0 @@ -783,7 +783,7 @@ _080F8E58: lsls r4, r5, 4 adds r0, r4, r5 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r1, r6, 0 movs r2, 0 @@ -800,7 +800,7 @@ _080F8E6C: strh r1, [r0, 0xE] mov r2, r10 strh r2, [r0, 0x10] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites adds r1, r4, r5 lsls r1, 2 adds r0, r3, 0 @@ -895,7 +895,7 @@ _080F8F42: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 ldrb r0, [r4, 0x5] lsrs r0, 4 @@ -1206,7 +1206,7 @@ _080F919E: adds r0, r4, 0 movs r1, 0x39 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r4, 0 movs r1, 0x15 bl GetMonData @@ -1231,7 +1231,7 @@ _080F91D4: adds r1, 0x11 adds r0, r4, 0 mov r2, sp - bl pokemon_setattr + bl SetMonData adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -1248,7 +1248,7 @@ _080F91D4: add r0, r10 movs r1, 0x37 mov r2, sp - bl pokemon_setattr + bl SetMonData mov r1, r9 lsls r0, r1, 24 lsrs r0, 24 @@ -1305,7 +1305,7 @@ sub_80F9244: @ 80F9244 adds r0, r6, 0 movs r1, 0xC add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 bl pokemon_catch lsls r0, 24 @@ -1349,7 +1349,7 @@ sub_80F92C8: @ 80F92C8 strb r0, [r2] mov r0, sp movs r1, 0x2D - bl pokemon_setattr + bl SetMonData mov r0, sp bl pokemon_catch lsls r0, 24 @@ -1487,7 +1487,7 @@ sub_80F93A0: @ 80F93A0 mov r0, r8 movs r1, 0xC add r2, sp, 0x10 - bl pokemon_setattr + bl SetMonData _080F93EE: add sp, 0x14 pop {r3} diff --git a/asm/shop.s b/asm/shop.s index e58c988b8..fc5cef498 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -735,7 +735,7 @@ _080E008A: cmp r0, 0 bne _080E00D8 mov r0, r8 - bl itemid_get_description + bl ItemId_GetDescription adds r4, r0, 0 b _080E00EA .pool @@ -975,7 +975,7 @@ _080E02AE: cmp r2, 0x40 beq _080E0310 strb r2, [r4] - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -1034,7 +1034,7 @@ BuyMenuRemoveItemIcon: @ 80E031C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles movs r0, 0xFF @@ -1732,7 +1732,7 @@ BuyMenuDrawFieldObjects: @ 80E08F0 mov r8, r0 ldr r1, =gUnknown_02037350 mov r10, r1 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r9, r2 _080E090A: mov r3, r8 @@ -2075,7 +2075,7 @@ _080E0BD0: adds r0, r5, 0 bl itemid_get_name adds r0, r5, 0 - bl itemid_get_pocket_number + bl ItemId_GetPocket lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 diff --git a/asm/slot_machine.s b/asm/slot_machine.s index f7c85d0bf..c529f09bf 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5356,7 +5356,7 @@ _0812CEE4: sub_812CEF4: @ 812CEF4 push {r4,r5,lr} movs r4, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites _0812CEFA: ldr r0, =sub_812D024 bl obj_add_empty_with_callback @@ -5395,7 +5395,7 @@ sub_812CF34: @ 812CF34 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r2, 0 movs r1, 0x1 @@ -5419,7 +5419,7 @@ sub_812CF6C: @ 812CF6C ldr r0, [r0] adds r3, r0, 0 adds r3, 0x44 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites _0812CF7A: adds r0, r3, r2 ldrb r1, [r0] @@ -5489,7 +5489,7 @@ sub_812CFEC: @ 812CFEC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 movs r2, 0x30 ldrsh r0, [r1, r2] @@ -5835,7 +5835,7 @@ sub_812D264: @ 812D264 sub_812D28C: @ 812D28C push {r4,r5,lr} adds r4, r0, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r0, 0xC ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6350,7 +6350,7 @@ sub_812D63C: @ 812D63C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 mov r2, sp adds r1, r2, r5 @@ -6407,7 +6407,7 @@ sub_812D6EC: @ 812D6EC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x3 bl StartObjectImageAnimIfDifferent @@ -6608,7 +6608,7 @@ sub_812D870: @ 812D870 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x5 bl StartObjectImageAnimIfDifferent @@ -6625,7 +6625,7 @@ _0812D8D0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 movs r1, 0x4 bl StartObjectImageAnimIfDifferent @@ -6848,7 +6848,7 @@ sub_812DA90: @ 812DA90 bl sub_812EA7C bl sub_812EBCC bl sub_812EC20 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r3, =gUnknown_0203AB34 ldr r0, [r3] adds r0, 0x4E @@ -6928,7 +6928,7 @@ _0812DB3C: bl sub_812EC94 bl sub_812E5A8 bl sub_812EDC0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB34 ldr r0, [r0] adds r0, 0x4E @@ -7543,7 +7543,7 @@ _0812E00E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles movs r0, 0x40 @@ -7575,7 +7575,7 @@ sub_812E054: @ 812E054 movs r2, 0x4 adds r3, r0, 0 adds r3, 0x8 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites _0812E070: lsls r0, r2, 1 adds r1, r3, r0 @@ -7655,7 +7655,7 @@ _0812E0F0: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 ldrb r0, [r1, 0x5] movs r2, 0xC @@ -7830,7 +7830,7 @@ sub_812E230: @ 812E230 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 ldrb r1, [r2, 0x5] movs r0, 0xD @@ -7914,7 +7914,7 @@ sub_812E300: @ 812E300 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -7982,7 +7982,7 @@ _0812E350: bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -8020,7 +8020,7 @@ sub_812E3E8: @ 812E3E8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldr r4, =gUnknown_0203AAE4 @@ -8127,7 +8127,7 @@ _0812E490: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites mov r9, r5 adds r2, r0, r5 ldrb r1, [r2, 0x5] @@ -8263,7 +8263,7 @@ _0812E5BC: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -8308,7 +8308,7 @@ _0812E656: lsls r3, r0, 4 adds r3, r0 lsls r3, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r3, r1 ldrb r2, [r3, 0x5] movs r6, 0xD @@ -8401,7 +8401,7 @@ sub_812E70C: @ 812E70C lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites adds r2, r0, r7 adds r1, r2, 0 adds r1, 0x3E @@ -8485,7 +8485,7 @@ sub_812E7CC: @ 812E7CC lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -8522,7 +8522,7 @@ sub_812E82C: @ 812E82C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles movs r4, 0 @@ -8535,7 +8535,7 @@ _0812E846: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -8569,7 +8569,7 @@ _0812E88A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -8596,7 +8596,7 @@ _0812E8C8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -8620,7 +8620,7 @@ sub_812E8F8: @ 812E8F8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles ldr r4, =gUnknown_0203AAF0 @@ -8655,7 +8655,7 @@ sub_812E934: @ 812E934 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r9, r2 adds r3, r1, r2 ldrb r2, [r3, 0x5] @@ -8779,7 +8779,7 @@ sub_812EA44: @ 812EA44 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r1, =gUnknown_0203AB34 ldr r3, [r1] adds r1, r3, 0 @@ -8816,7 +8816,7 @@ _0812EA80: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -8844,7 +8844,7 @@ sub_812EAB0: @ 812EAB0 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 lsls r2, r0, 4 adds r2, r0 @@ -8952,7 +8952,7 @@ _0812EB9A: thumb_func_start sub_812EBAC sub_812EBAC: @ 812EBAC - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r1, =gUnknown_0203AB34 ldr r1, [r1] adds r1, 0x52 @@ -8990,7 +8990,7 @@ _0812EBEA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -9014,7 +9014,7 @@ sub_812EC20: @ 812EC20 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -9054,7 +9054,7 @@ sub_812EC70: @ 812EC70 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles pop {r0} @@ -9087,7 +9087,7 @@ _0812ECA4: lsls r3, r0, 4 adds r3, r0 lsls r3, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r3, r1 ldrb r2, [r3, 0x5] movs r5, 0xD @@ -9196,7 +9196,7 @@ _0812ED90: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 bl RemoveObjectAndFreeTiles adds r0, r4, 0x1 @@ -9224,7 +9224,7 @@ sub_812EDC0: @ 812EDC0 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -9330,7 +9330,7 @@ _0812EE90: thumb_func_start sub_812EEA8 sub_812EEA8: @ 812EEA8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203AB34 ldr r0, [r0] adds r0, 0x43 @@ -9356,7 +9356,7 @@ sub_812EECC: @ 812EECC lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 ldrb r0, [r4, 0x3] lsls r0, 26 @@ -9389,7 +9389,7 @@ sub_812EF00: @ 812EF00 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -9435,7 +9435,7 @@ sub_812EF6C: @ 812EF6C lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 ldrb r0, [r4, 0x3] lsls r0, 26 @@ -9525,7 +9525,7 @@ sub_812EFDC: @ 812EFDC lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r0, r1 ldrb r0, [r2, 0x5] movs r1, 0xC diff --git a/asm/sprite.s b/asm/sprite.s index 92c4150eb..adf074fd7 100644 --- a/asm/sprite.s +++ b/asm/sprite.s @@ -44,7 +44,7 @@ _080069C6: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r4, r0, r1 adds r5, r4, 0 adds r5, 0x3E @@ -113,7 +113,7 @@ PrepareSpritesForOamLoad: @ 8006A0C UpdateObjectOamCoords: @ 8006A58 push {r4-r7,lr} movs r4, 0 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites ldr r0, =0x000001ff adds r5, r0, 0 ldr r6, =0xfffffe00 @@ -209,7 +209,7 @@ _08006B0A: BuildObjectPriorityList: @ 8006B1C push {r4,lr} movs r2, 0 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r3, =gUnknown_02021774 _08006B24: lsls r0, r2, 4 @@ -264,7 +264,7 @@ _08006B78: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r7, =gUnknown_02020630 + ldr r7, =gSprites adds r3, r0, r7 mov r0, r12 add r0, r10 @@ -366,7 +366,7 @@ _08006C38: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r3, r0, r6 mov r7, r10 adds r0, r5, r7 @@ -528,7 +528,7 @@ _08006D72: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r2, r0, r1 adds r0, r2, 0 adds r0, 0x3E @@ -591,7 +591,7 @@ AddObjectToFront: @ 8006DF4 lsls r3, 24 lsrs r4, r3, 24 movs r3, 0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r12, r0 lsls r5, r1, 16 lsls r6, r2, 16 @@ -640,7 +640,7 @@ AddObjectToBack: @ 8006E48 lsls r3, 24 lsrs r6, r3, 24 movs r3, 0x3F - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 movs r0, 0x1 negs r0, r0 @@ -701,7 +701,7 @@ obj_add_empty_with_callback: @ 8006EB4 lsrs r5, r0, 24 cmp r5, 0x40 beq _08006EF4 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -749,7 +749,7 @@ AddObject: @ 8006EFC lsls r0, 4 add r0, r10 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r7, r0, r1 adds r0, r7, 0 bl RemoveObject @@ -906,7 +906,7 @@ AddObjectAndAnimateForOneFrame: @ 8007054 lsrs r3, 24 mov r9, r3 movs r3, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r1, 16 mov r12, r1 lsls r2, 16 @@ -1572,7 +1572,7 @@ _0800752C: Unused_CopyFromObjects: @ 800753C push {r4,lr} adds r1, r0, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r2, 0 ldr r4, =0x000010ff _08007546: @@ -1594,7 +1594,7 @@ _08007546: Unused_CopyToObjects: @ 8007564 push {r4,lr} adds r1, r0, 0 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites movs r2, 0 ldr r4, =0x000010ff _0800756E: @@ -1620,7 +1620,7 @@ _08007590: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 bl RemoveObject ldr r0, =gUnknown_020217F4 diff --git a/asm/starter_choose.s b/asm/starter_choose.s index 3bc828190..3d07f5b85 100644 --- a/asm/starter_choose.s +++ b/asm/starter_choose.s @@ -232,7 +232,7 @@ set_256color_bg_bg0: @ 8133F0C bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites mov r8, r3 lsls r1, r0, 4 adds r1, r0 @@ -393,7 +393,7 @@ sub_813425C: @ 813425C bl sub_8134690 lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -453,7 +453,7 @@ sub_8134340: @ 8134340 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -578,7 +578,7 @@ _08134450: lsls r5, 3 adds r5, r0 ldrb r4, [r5, 0xA] - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -848,7 +848,7 @@ sub_8134690: @ 8134690 bl sub_818D3E4 lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 diff --git a/asm/title_screen.s b/asm/title_screen.s index 4090aad96..48c2e44db 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -153,7 +153,7 @@ _080AA4FA: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r4, 0 adds r1, r6, 0 @@ -196,7 +196,7 @@ _080AA556: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 adds r1, r5, 0x5 lsls r1, 24 @@ -361,7 +361,7 @@ _080AA69C: bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -385,7 +385,7 @@ _080AA6D0: bl AddObjectToFront lsls r0, 24 lsrs r2, r0, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -890,7 +890,7 @@ _080AABC0: bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 diff --git a/asm/trade.s b/asm/trade.s index e021af95a..03f172167 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -1990,7 +1990,7 @@ sub_8078388: @ 8078388 movs r3, 0 ldr r5, =gUnknown_0203229C mov r8, r5 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r12, r0 movs r1, 0x5 negs r1, r1 @@ -2399,7 +2399,7 @@ _08078726: adds r0, r4, 0 movs r1, 0x2 ldr r2, =gSpeciesNames + SPECIES_SHEDINJA * POKEMON_NAME_LENGTH - bl pokemon_setattr + bl SetMonData _08078766: adds r4, 0x64 subs r5, 0x1 @@ -3064,7 +3064,7 @@ sub_8078CB8: @ 8078CB8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 movs r1, 0x1 bl StartObjectImageAnim @@ -3094,7 +3094,7 @@ _08078D10: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites adds r0, r5 movs r1, 0 bl StartObjectImageAnim @@ -3315,7 +3315,7 @@ sub_8078EF8: @ 8078EF8 adds r0, 0x6F movs r1, 0 strb r1, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r3] adds r0, 0x34 ldrb r1, [r0] @@ -3407,7 +3407,7 @@ _08078FCC: .4byte _08079018 _08078FE4: bl sub_8078D78 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, =gUnknown_0203229C ldr r0, [r0] adds r0, 0x34 @@ -3818,7 +3818,7 @@ _08079306: ldr r0, =0x0000eeaa movs r1, 0 bl sub_8078C10 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r3, =gUnknown_0203229C ldr r0, [r3] adds r0, 0x34 @@ -3974,7 +3974,7 @@ _0807942E: adds r0, 0x6F movs r1, 0 strb r1, [r0] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r2] adds r0, 0x34 ldrb r1, [r0] @@ -4305,7 +4305,7 @@ _08079716: ldrb r0, [r0] cmp r8, r0 bcs _0807976A - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites mov r8, r0 ldr r4, =gUnknown_0203229C ldr r0, [sp, 0x60] @@ -4352,7 +4352,7 @@ _08079772: lsrs r5, r0, 24 cmp r5, 0x5 bls _08079772 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r8, r1 ldr r2, =gUnknown_0203229C ldr r0, [r2] @@ -4463,7 +4463,7 @@ _08079868: b _08079A24 .pool _08079884: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r1, [sp, 0x60] lsls r0, r1, 1 adds r0, r1 @@ -4506,7 +4506,7 @@ _080798BC: bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0x1 bl CopyBgTilemapBufferToVram - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites ldr r1, =gUnknown_0203229C ldr r4, [r1] ldr r2, [sp, 0x60] @@ -5221,7 +5221,7 @@ sub_8079EA8: @ 8079EA8 ldrb r0, [r0] cmp r7, r0 bge _08079F5A - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites mov r9, r3 mov r1, r12 lsls r0, r1, 1 @@ -6048,7 +6048,7 @@ _0807A560: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 adds r2, 0x5D adds r2, r3 @@ -7184,7 +7184,7 @@ _0807ADE0: adds r1, 0x8E adds r1, r6 strb r0, [r1] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r4] adds r0, 0x8E adds r0, r6 @@ -7974,7 +7974,7 @@ _0807B52A: adds r0, r7, 0 movs r1, 0x20 mov r2, sp - bl pokemon_setattr + bl SetMonData _0807B566: mov r0, r8 cmp r0, 0xFF @@ -8910,7 +8910,7 @@ _0807BC1C: .4byte _0807CFB4 .4byte _0807CE38 _0807C04C: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r7] adds r0, 0x8E ldrb r1, [r0] @@ -8968,7 +8968,7 @@ _0807C0C4: ldrsh r0, [r6, r1] cmp r0, 0 ble _0807C0F8 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -8985,7 +8985,7 @@ _0807C0C4: bl _0807CFB4 .pool _0807C0F8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -9043,7 +9043,7 @@ _0807C178: adds r0, r1, 0 adds r0, 0x8E ldrb r0, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -9080,7 +9080,7 @@ _0807C178: bl _0807CFB4 .pool _0807C1DC: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, [r7] adds r0, 0xD2 ldrb r1, [r0] @@ -9238,7 +9238,7 @@ _0807C328: bl _0807CF4C .pool _0807C348: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -9328,7 +9328,7 @@ _0807C3E0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim @@ -9356,7 +9356,7 @@ _0807C44E: bl _0807CFB4 .pool _0807C460: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -9428,7 +9428,7 @@ _0807C4EC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles ldr r0, [r7] @@ -9491,7 +9491,7 @@ _0807C574: adds r0, 0x1 strh r0, [r1] _0807C592: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, =gUnknown_020322A0 ldr r2, [r0] adds r0, r2, 0 @@ -9516,7 +9516,7 @@ _0807C592: bl _0807CFB4 .pool _0807C5D0: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r4, [r7] adds r2, r4, 0 adds r2, 0x90 @@ -9592,7 +9592,7 @@ _0807C66C: lsls r0, 24 cmp r0, 0 bne _0807C6E4 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r5] adds r2, 0x8E ldrb r1, [r2] @@ -9642,7 +9642,7 @@ _0807C6E4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectRotScalAnim @@ -9654,7 +9654,7 @@ _0807C6FA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 movs r1, 0 bl StartObjectRotScalAnim @@ -9717,7 +9717,7 @@ _0807C6FA: bl _0807CF4C .pool _0807C794: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r7] adds r3, r2, 0 adds r3, 0x8E @@ -9818,7 +9818,7 @@ _0807C7FC: b _0807CFB4 .pool _0807C864: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r7] adds r3, r2, 0 adds r3, 0x90 @@ -9927,7 +9927,7 @@ _0807C8FA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim @@ -9958,7 +9958,7 @@ _0807C98C: b _0807CF48 .pool _0807C994: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -10021,7 +10021,7 @@ _0807CA02: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles ldr r0, [r7] @@ -10097,7 +10097,7 @@ _0807CA92: ldr r1, [r7] adds r1, 0x92 strb r0, [r1] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r7] adds r0, 0x92 ldrb r1, [r0] @@ -10127,7 +10127,7 @@ _0807CAC8: b _0807CFB4 .pool _0807CAF0: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -10264,7 +10264,7 @@ _0807CBF4: adds r1, 0xD3 movs r6, 0 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r5] adds r2, 0xD3 ldrb r1, [r2] @@ -10324,7 +10324,7 @@ _0807CBF4: b _0807CFB4 .pool _0807CC9C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r7] adds r0, 0xD3 ldrb r1, [r0] @@ -10347,7 +10347,7 @@ _0807CC9C: b _0807CF4C .pool _0807CCD0: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r3, [r7] adds r0, r3, 0 adds r0, 0xD3 @@ -10378,7 +10378,7 @@ _0807CCEE: b _0807CF4C .pool _0807CD1C: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r7] adds r6, r2, 0 adds r6, 0x8F @@ -10972,7 +10972,7 @@ _0807CFF8: .4byte _0807E400 .4byte _0807E284 _0807D428: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, [r7] adds r0, 0x8E ldrb r1, [r0] @@ -11030,7 +11030,7 @@ _0807D4A0: ldrsh r0, [r6, r1] cmp r0, 0 ble _0807D4D4 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -11047,7 +11047,7 @@ _0807D4A0: bl _0807E400 .pool _0807D4D4: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -11105,7 +11105,7 @@ _0807D554: adds r0, r1, 0 adds r0, 0x8E ldrb r0, [r0] - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -11142,7 +11142,7 @@ _0807D554: bl _0807E400 .pool _0807D5B8: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, [r7] adds r0, 0xD2 ldrb r1, [r0] @@ -11300,7 +11300,7 @@ _0807D704: bl _0807E398 .pool _0807D728: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -11372,7 +11372,7 @@ _0807D7C4: ldr r1, [r4] adds r1, 0x90 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, [r4] adds r0, 0x90 ldrb r1, [r0] @@ -11425,7 +11425,7 @@ _0807D84A: bl _0807E400 .pool _0807D85C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -11497,7 +11497,7 @@ _0807D8E8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles ldr r0, [r7] @@ -11560,7 +11560,7 @@ _0807D970: adds r0, 0x1 strh r0, [r1] _0807D98E: - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldr r0, =gUnknown_020322A0 ldr r2, [r0] adds r0, r2, 0 @@ -11585,7 +11585,7 @@ _0807D98E: bl _0807E400 .pool _0807D9CC: - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r4, [r7] adds r2, r4, 0 adds r2, 0x90 @@ -11666,7 +11666,7 @@ _0807DA74: lsls r0, 24 cmp r0, 0 bne _0807DAEC - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r5] adds r2, 0x8E ldrb r1, [r2] @@ -11716,7 +11716,7 @@ _0807DAEC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites adds r0, r1 movs r1, 0 bl StartObjectRotScalAnim @@ -11728,7 +11728,7 @@ _0807DB02: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 movs r1, 0 bl StartObjectRotScalAnim @@ -11791,7 +11791,7 @@ _0807DB02: bl _0807E398 .pool _0807DB9C: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r7] adds r3, r2, 0 adds r3, 0x8E @@ -11892,7 +11892,7 @@ _0807DC5A: b _0807E400 .pool _0807DC6C: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r7] adds r3, r2, 0 adds r3, 0x90 @@ -11994,7 +11994,7 @@ _0807DD02: ldr r1, [r7] adds r1, 0x90 strb r0, [r1] - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites ldr r0, [r7] adds r0, 0x90 ldrb r1, [r0] @@ -12050,7 +12050,7 @@ _0807DDBC: b _0807E394 .pool _0807DDC4: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -12149,7 +12149,7 @@ _0807DE84: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles ldr r0, [r7] @@ -12232,7 +12232,7 @@ _0807DF16: b _0807E400 .pool _0807DF3C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -12369,7 +12369,7 @@ _0807E040: adds r1, 0xD3 movs r6, 0 strb r0, [r1] - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r5] adds r2, 0xD3 ldrb r1, [r2] @@ -12429,7 +12429,7 @@ _0807E040: b _0807E400 .pool _0807E0E8: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r0, [r7] adds r0, 0xD3 ldrb r1, [r0] @@ -12452,7 +12452,7 @@ _0807E0E8: b _0807E398 .pool _0807E11C: - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites ldr r3, [r7] adds r0, r3, 0 adds r0, 0xD3 @@ -12483,7 +12483,7 @@ _0807E13A: b _0807E398 .pool _0807E168: - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites ldr r2, [r7] adds r6, r2, 0 adds r6, 0x8F @@ -13281,85 +13281,85 @@ sub_807E7E8: @ 807E7E8 adds r2, 0xE adds r0, r6, 0 movs r1, 0x27 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0xF adds r0, r6, 0 movs r1, 0x28 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x10 adds r0, r6, 0 movs r1, 0x29 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x11 adds r0, r6, 0 movs r1, 0x2A - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x12 adds r0, r6, 0 movs r1, 0x2B - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x13 adds r0, r6, 0 movs r1, 0x2C - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 movs r1, 0x2 adds r2, r5, 0 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x2B adds r0, r6, 0 movs r1, 0x7 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x36 adds r0, r6, 0 movs r1, 0x31 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x14 adds r0, r6, 0 movs r1, 0x2E - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x1D adds r0, r6, 0 movs r1, 0x17 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x1E adds r0, r6, 0 movs r1, 0x18 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x1C adds r0, r6, 0 movs r1, 0x16 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x1F adds r0, r6, 0 movs r1, 0x21 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x20 adds r0, r6, 0 movs r1, 0x2F - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x37 adds r0, r6, 0 movs r1, 0x30 - bl pokemon_setattr + bl SetMonData adds r0, r6, 0 movs r1, 0x23 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData mov r4, sp adds r4, 0x35 movs r0, 0 @@ -13385,12 +13385,12 @@ sub_807E7E8: @ 807E7E8 adds r0, r6, 0 movs r1, 0x40 adds r2, r4, 0 - bl pokemon_setattr + bl SetMonData adds r2, r5, 0 adds r2, 0x28 adds r0, r6, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData b _0807E960 .pool _0807E954: @@ -13398,7 +13398,7 @@ _0807E954: adds r2, 0x28 adds r0, r6, 0 movs r1, 0xC - bl pokemon_setattr + bl SetMonData _0807E960: ldr r0, =gEnemyParty bl pokemon_calc_effective_stats @@ -13517,7 +13517,7 @@ sub_807EA2C: @ 807EA2C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, =gUnknown_02020630 + ldr r4, =gSprites adds r0, r4 bl RemoveObjectAndFreeTiles ldr r0, [r5] diff --git a/asm/trainer_card.s b/asm/trainer_card.s index e73381ae0..921f14e3f 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -6972,7 +6972,7 @@ sub_80C62DC: @ 80C62DC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2] ldrb r2, [r1, 0x5] @@ -7030,7 +7030,7 @@ _080C633C: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2] ldrb r2, [r1, 0x5] @@ -7724,7 +7724,7 @@ sub_80C6974: @ 80C6974 lsls r1, r3, 4 adds r1, r3 lsls r1, 2 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites mov r9, r2 add r1, r9 str r1, [r0, 0x4] @@ -7917,7 +7917,7 @@ _080C6B3E: lsls r1, r3, 4 adds r1, r3 lsls r1, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r1, r0 str r1, [r2, 0x8] ldrb r2, [r1, 0x5] diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 71941b44f..0c8265dac 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -1057,7 +1057,7 @@ sub_80B43E0: @ 80B43E0 movs r1, 0x12 ldrsh r0, [r4, r1] str r0, [r2, 0x4] - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -1088,7 +1088,7 @@ sub_80B4438: @ 80B4438 push {r4,r5,lr} adds r5, r1, 0 adds r4, r2, 0 - ldr r2, =gUnknown_02020630 + ldr r2, =gSprites movs r1, 0x10 ldrsh r0, [r5, r1] lsls r1, r0, 4 diff --git a/asm/trig.s b/asm/trig.s deleted file mode 100644 index 2eb9c4e88..000000000 --- a/asm/trig.s +++ /dev/null @@ -1,98 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start Sin -@ s16 sine(s16 t, s16 amplitude) -Sin: @ 806F534 - lsls r1, 16 - asrs r1, 16 - ldr r2, =gUnknown_08329F40 - lsls r0, 16 - asrs r0, 15 - adds r0, r2 - movs r2, 0 - ldrsh r0, [r0, r2] - muls r0, r1 - lsls r0, 8 - asrs r0, 16 - bx lr - .pool - thumb_func_end Sin - - thumb_func_start Cos -@ s16 cosine(s16 t, s16 amplitude) -Cos: @ 806F550 - lsls r1, 16 - asrs r1, 16 - ldr r2, =gUnknown_08329F40 - lsls r0, 16 - asrs r0, 15 - adds r0, 0x80 - adds r0, r2 - movs r2, 0 - ldrsh r0, [r0, r2] - muls r0, r1 - lsls r0, 8 - asrs r0, 16 - bx lr - .pool - thumb_func_end Cos - - thumb_func_start Sin2 -@ s16 sine2(u16 angle) -Sin2: @ 806F570 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r5, 16 - lsrs r5, 16 - adds r0, r5, 0 - movs r1, 0xB4 - bl __umodsi3 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r0, r5, 0 - movs r1, 0xB4 - bl __udivsi3 - movs r1, 0x1 - ands r0, r1 - ldr r1, =gUnknown_0832A1C0 - lsls r4, 1 - adds r4, r1 - ldrh r1, [r4] - cmp r0, 0 - bne _0806F5A8 - lsls r0, r1, 16 - b _0806F5AC - .pool -_0806F5A8: - lsls r0, r1, 16 - negs r0, r0 -_0806F5AC: - asrs r0, 16 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end Sin2 - - thumb_func_start Cos2 -@ s16 cosine2(u16 angle) -Cos2: @ 806F5B4 - push {lr} - lsls r0, 16 - movs r1, 0xB4 - lsls r1, 15 - adds r0, r1 - lsrs r0, 16 - bl Sin2 - lsls r0, 16 - asrs r0, 16 - pop {r1} - bx r1 - thumb_func_end Cos2 - - .align 2, 0 @ Don't pad with nop. @@ -1260,7 +1260,7 @@ _080EC914: _080EC92E: cmp r5, 0x2 bls _080EC9B4 - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome mov r8, r0 ldrb r0, [r0] cmp r0, 0x6 @@ -4081,7 +4081,7 @@ _080EE1FE: bl StringCopy ldrh r0, [r6, 0x6] strh r0, [r4, 0xA] - ldr r0, =gUnknown_0202433A + ldr r0, =gBattleOutcome ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x9 @@ -7553,7 +7553,7 @@ c2_080CC144: @ 80EFE98 adds r0, r1 ldr r2, =gStringVar2 movs r1, 0x2 - bl pokemon_setattr + bl SetMonData bl c2_exit_to_overworld_1_continue_scripts_restart_music pop {r0} bx r0 diff --git a/asm/unknown_task.s b/asm/unknown_task.s index 0d9b6a1dd..e3526c809 100644 --- a/asm/unknown_task.s +++ b/asm/unknown_task.s @@ -424,7 +424,7 @@ sub_80BA33C: @ 80BA33C lsrs r4, r2, 24 movs r1, 0 movs r2, 0 - ldr r0, =gUnknown_08329F40 + ldr r0, =gSineTable mov r12, r0 _080BA350: lsls r0, r1, 1 diff --git a/asm/util.s b/asm/util.s index 865e98937..e66a6a3c7 100644 --- a/asm/util.s +++ b/asm/util.s @@ -16,7 +16,7 @@ CreateInvisibleSpriteWithCallback: @ 806F640 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 diff --git a/asm/wallclock.s b/asm/wallclock.s index 9ce2108f7..cde851f2c 100644 --- a/asm/wallclock.s +++ b/asm/wallclock.s @@ -279,7 +279,7 @@ Cb2_StartWallClock: @ 81349F4 bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_02020630 + ldr r1, =gSprites mov r9, r1 lsls r1, r0, 4 adds r1, r0 @@ -424,7 +424,7 @@ _08134BA4: bl AddObjectToFront lsls r0, 24 lsrs r0, 24 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 diff --git a/asm/weather.s b/asm/weather.s index eae277f59..1f4aeeca4 100644 --- a/asm/weather.s +++ b/asm/weather.s @@ -2092,7 +2092,7 @@ _080AC090: movs r1, 0x7F ands r0, r1 strh r0, [r2] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r3, 0 ldrsh r0, [r2, r3] lsls r0, 1 @@ -2750,7 +2750,7 @@ _080AC5B2: lsls r4, r3, 4 adds r4, r3 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 str r4, [r1] ldr r0, =gUnknown_0854FB50 @@ -3690,7 +3690,7 @@ _080ACD92: lsrs r5, r0, 24 cmp r5, 0x40 beq _080ACE40 - ldr r3, =gUnknown_02020630 + ldr r3, =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -3715,7 +3715,7 @@ _080ACD92: _080ACDDE: adds r0, r4, r5 lsls r0, 2 - ldr r6, =gUnknown_02020630 + ldr r6, =gSprites adds r0, r6 ldr r3, =0xfffffda8 ldrh r6, [r0, 0x30] @@ -4151,7 +4151,7 @@ snowflake_add: @ 80AD164 lsrs r1, r0, 24 cmp r1, 0x40 beq _080AD1C8 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -4361,7 +4361,7 @@ sub_80AD30C: @ 80AD30C movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x34] - ldr r1, =gUnknown_08329F40 + ldr r1, =gSineTable movs r3, 0x34 ldrsh r0, [r4, r3] lsls r0, 1 @@ -5473,7 +5473,7 @@ _080ADCD0: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r5, 0 movs r1, 0x5 @@ -5804,7 +5804,7 @@ _080ADF80: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 movs r0, 0 strh r0, [r4, 0x30] @@ -6251,7 +6251,7 @@ _080AE314: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 adds r0, r6, 0 movs r1, 0x5 @@ -6609,7 +6609,7 @@ sub_80AE624: @ 80AE624 ldr r2, [r0] ldr r0, =0x00000704 adds r4, r2, r0 - ldr r6, =gUnknown_08329F40 + ldr r6, =gSineTable ldr r1, =0x00000712 adds r5, r2, r1 ldrh r0, [r5] @@ -6771,7 +6771,7 @@ _080AE758: lsls r4, r1, 4 adds r4, r1 lsls r4, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r4, r0 str r4, [r5] adds r0, r7, 0 @@ -6858,7 +6858,7 @@ _080AE818: lsls r2, r1, 4 adds r2, r1 lsls r2, 2 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites adds r2, r0 str r2, [r4] ldrb r1, [r2, 0x3] @@ -7016,7 +7016,7 @@ sub_80AE97C: @ 80AE97C _080AE99A: movs r0, 0x2E ldrsh r4, [r5, r0] - ldr r3, =gUnknown_08329F40 + ldr r3, =gSineTable movs r2, 0x30 ldrsh r1, [r5, r2] lsls r0, r1, 1 @@ -7250,7 +7250,7 @@ sub_80AEB48: @ 80AEB48 lsrs r2, r0, 24 cmp r2, 0x40 beq _080AEBB0 - ldr r0, =gUnknown_02020630 + ldr r0, =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -7297,7 +7297,7 @@ sub_80AEBD0: @ 80AEBD0 cmp r0, 0 beq _080AEC1A movs r4, 0 - ldr r5, =gUnknown_02020630 + ldr r5, =gSprites _080AEBE4: lsls r0, r4, 4 adds r0, r4 diff --git a/data/data2.s b/data/data2.s index ba871b516..8a1ac0d23 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1398,7 +1398,7 @@ gUnknown_0831C494:: @ 831C494 gUnknown_0831C4F8:: @ 831C4F8 .incbin "baserom.gba", 0x31c4f8, 0x1c -gUnknown_0831C514:: @ 831C514 +gPlayerBufferCommands:: @ 831C514 .incbin "baserom.gba", 0x31c514, 0xe4 gUnknown_0831C5F8:: @ 831C5F8 @@ -1496,7 +1496,7 @@ gUnknown_08329D48:: @ 8329D48 gUnknown_08329D54:: @ 8329D54 .incbin "baserom.gba", 0x329d54, 0x20 -gUnknown_08329D74:: @ 8329D74 +gHoldEffectToType:: @ 8329D74 .incbin "baserom.gba", 0x329d74, 0x24 gUnknown_08329D98:: @ 8329D98 @@ -1528,5062 +1528,3 @@ gUnknown_08329EFE:: @ 8329EFE gUnknown_08329F28:: @ 8329F28 .incbin "baserom.gba", 0x329f28, 0x18 - -gUnknown_08329F40:: @ 8329F40 - .incbin "baserom.gba", 0x329f40, 0x280 - -gUnknown_0832A1C0:: @ 832A1C0 - .incbin "baserom.gba", 0x32a1c0, 0x168 - -gBitTable:: @ 832A328 - .incbin "baserom.gba", 0x32a328, 0x80 - -gUnknown_0832A3A8:: @ 832A3A8 - .incbin "baserom.gba", 0x32a3a8, 0x18 - -gUnknown_0832A3C0:: @ 832A3C0 - .incbin "baserom.gba", 0x32a3c0, 0x18 - -gUnknown_0832A3D8:: @ 832A3D8 - .incbin "baserom.gba", 0x32a3d8, 0xa00 - -@ 832ADD8 - .include "data/egg_moves.inc" - - .align 2 -gUnknown_0832B6C0:: @ 832B6C0 - .incbin "baserom.gba", 0x32b6c0, 0x20 - -gUnknown_0832B6E0:: @ 832B6E0 - .incbin "baserom.gba", 0x32b6e0, 0x18 - -gUnknown_0832B6F8:: @ 832B6F8 - .incbin "baserom.gba", 0x32b6f8, 0x10 - -gEggName:: @ 832B708 - .string "タマゴ$" @ "tamago" ("egg" in Japanese) - -@ 832B70C - .incbin "baserom.gba", 0x32b70c, 0x8d8 - -gUnknown_0832BFE4:: @ 832BFE4 - .incbin "baserom.gba", 0x32bfe4, 0x8 - -gUnknown_0832BFEC:: @ 832BFEC - .incbin "baserom.gba", 0x32bfec, 0x8 - -gUnknown_0832BFF4:: @ 832BFF4 - .incbin "baserom.gba", 0x32bff4, 0x8 - -gUnknown_0832BFFC:: @ 832BFFC - .incbin "baserom.gba", 0x32bffc, 0x50 - -gUnknown_0832C04C:: @ 832C04C - .incbin "baserom.gba", 0x32c04c, 0x18 - -gUnknown_0832C064:: @ 832C064 - .incbin "baserom.gba", 0x32c064, 0x8 - -gUnknown_0832C06C:: @ 832C06C - .incbin "baserom.gba", 0x32c06c, 0x10 - -gUnknown_0832C07C:: @ 832C07C - .incbin "baserom.gba", 0x32c07c, 0x8 - -gUnknown_0832C084:: @ 832C084 - .incbin "baserom.gba", 0x32c084, 0x4c - -gUnknown_0832C0D0:: @ 832C0D0 - .incbin "baserom.gba", 0x32c0d0, 0x8 - -gUnknown_0832C0D8:: @ 832C0D8 - .incbin "baserom.gba", 0x32c0d8, 0x8 - -gUnknown_0832C0E0:: @ 832C0E0 - .incbin "baserom.gba", 0x32c0e0, 0x8 - -gUnknown_0832C0E8:: @ 832C0E8 - .incbin "baserom.gba", 0x32c0e8, 0x8 - -gUnknown_0832C0F0:: @ 832C0F0 - .incbin "baserom.gba", 0x32c0f0, 0x8 - -gUnknown_0832C0F8:: @ 832C0F8 - .incbin "baserom.gba", 0x32c0f8, 0x8 - -gUnknown_0832C100:: @ 832C100 - .incbin "baserom.gba", 0x32c100, 0x8 - -gUnknown_0832C108:: @ 832C108 - .incbin "baserom.gba", 0x32c108, 0x20 - -gUnknown_0832C128:: @ 832C128 - .incbin "baserom.gba", 0x32c128, 0x18 - -gUnknown_0832C140:: @ 832C140 - .incbin "baserom.gba", 0x32c140, 0x30 - -gUnknown_0832C170:: @ 832C170 - .incbin "baserom.gba", 0x32c170, 0x30 - -gUnknown_0832C1A0:: @ 832C1A0 - .incbin "baserom.gba", 0x32c1a0, 0x20 - -gUnknown_0832C1C0:: @ 832C1C0 - .incbin "baserom.gba", 0x32c1c0, 0xcc - -gUnknown_0832C28C:: @ 832C28C - .incbin "baserom.gba", 0x32c28c, 0x38 - -gUnknown_0832C2C4:: @ 832C2C4 - .incbin "baserom.gba", 0x32c2c4, 0x8 - -gUnknown_0832C2CC:: @ 832C2CC - .incbin "baserom.gba", 0x32c2cc, 0x68 - -gUnknown_0832C334:: @ 832C334 - .incbin "baserom.gba", 0x32c334, 0x8 - -gUnknown_0832C33C:: @ 832C33C - .incbin "baserom.gba", 0x32c33c, 0x8 - -gUnknown_0832C344:: @ 832C344 - .incbin "baserom.gba", 0x32c344, 0x8 - -gUnknown_0832C34C:: @ 832C34C - .incbin "baserom.gba", 0x32c34c, 0x18 - -gUnknown_0832C364:: @ 832C364 - .incbin "baserom.gba", 0x32c364, 0x30 - -gUnknown_0832C394:: @ 832C394 - .incbin "baserom.gba", 0x32c394, 0x30 - -gUnknown_0832C3C4:: @ 832C3C4 - .incbin "baserom.gba", 0x32c3c4, 0x14 - -gUnknown_0832C3D8:: @ 832C3D8 - .incbin "baserom.gba", 0x32c3d8, 0x14 - -gUnknown_0832C3EC:: @ 832C3EC - .incbin "baserom.gba", 0x32c3ec, 0xc - -gUnknown_0832C3F8:: @ 832C3F8 - .incbin "baserom.gba", 0x32c3f8, 0x8 - -gUnknown_0832C400:: @ 832C400 - .incbin "baserom.gba", 0x32c400, 0x60 - -gUnknown_0832C460:: @ 832C460 - .incbin "baserom.gba", 0x32c460, 0x128 - -gUnknown_0832C588:: @ 832C588 - .incbin "baserom.gba", 0x32c588, 0x138 - -gUnknown_0832C6C0:: @ 832C6C0 - .incbin "baserom.gba", 0x32c6c0, 0x1fe - -gUnknown_0832C8BE:: @ 832C8BE - .incbin "baserom.gba", 0x32c8be, 0x1fe - -gUnknown_0832CABC:: @ 832CABC - .incbin "baserom.gba", 0x32cabc, 0x800 - -gUnknown_0832D2BC:: @ 832D2BC - .incbin "baserom.gba", 0x32d2bc, 0x800 - -gUnknown_0832DABC:: @ 832DABC - .incbin "baserom.gba", 0x32dabc, 0xb - -gUnknown_0832DAC7:: @ 832DAC7 - .incbin "baserom.gba", 0x32dac7, 0x2 - -gUnknown_0832DAC9:: @ 832DAC9 - .incbin "baserom.gba", 0x32dac9, 0x2 - -gUnknown_0832DACB:: @ 832DACB - .incbin "baserom.gba", 0x32dacb, 0x7 - -gUnknown_0832DAD2:: @ 832DAD2 - .incbin "baserom.gba", 0x32dad2, 0xd - -gUnknown_0832DADF:: @ 832DADF - .incbin "baserom.gba", 0x32dadf, 0x6 - -gUnknown_0832DAE5:: @ 832DAE5 - .incbin "baserom.gba", 0x32dae5, 0x157 - -gUnknown_0832DC3C:: @ 832DC3C - .incbin "baserom.gba", 0x32dc3c, 0x8 - -gUnknown_0832DC44:: @ 832DC44 - .incbin "baserom.gba", 0x32dc44, 0x50 - -gUnknown_0832DC94:: @ 832DC94 - .incbin "baserom.gba", 0x32dc94, 0x18 - -gUnknown_0832DCAC:: @ 832DCAC - .incbin "baserom.gba", 0x32dcac, 0x38 - -gUnknown_0832DCE4:: @ 832DCE4 - .incbin "baserom.gba", 0x32dce4, 0x8 - -gUnknown_0832DCEC:: @ 832DCEC - .incbin "baserom.gba", 0x32dcec, 0x138 - -gUnknown_0832DE24:: @ 832DE24 - .incbin "baserom.gba", 0x32de24, 0x1a - -gUnknown_0832DE3E:: @ 832DE3E - .incbin "baserom.gba", 0x32de3e, 0x18 - -gUnknown_0832DE56:: @ 832DE56 - .incbin "baserom.gba", 0x32de56, 0x3e - -gUnknown_0832DE94:: @ 832DE94 - .incbin "baserom.gba", 0x32de94, 0x18 - -gUnknown_0832DEAC:: @ 832DEAC - .incbin "baserom.gba", 0x32deac, 0x10 - -gUnknown_0832DEBC:: @ 832DEBC - .incbin "baserom.gba", 0x32debc, 0x24 - -gUnknown_0832DEE0:: @ 832DEE0 - .incbin "baserom.gba", 0x32dee0, 0x4 - -gUnknown_0832DEE4:: @ 832DEE4 - .incbin "baserom.gba", 0x32dee4, 0x10 - -gUnknown_0832DEF4:: @ 832DEF4 - .incbin "baserom.gba", 0x32def4, 0x98 - -gUnknown_0832DF8C:: @ 832DF8C - .incbin "baserom.gba", 0x32df8c, 0x8 - -gUnknown_0832DF94:: @ 832DF94 - .incbin "baserom.gba", 0x32df94, 0x5 - -gUnknown_0832DF99:: @ 832DF99 - .incbin "baserom.gba", 0x32df99, 0x2027 - -gUnknown_0832FFC0:: @ 832FFC0 - .incbin "baserom.gba", 0x32ffc0, 0x1fa0 - -gUnknown_08331F60:: @ 8331F60 - .incbin "baserom.gba", 0x331f60, 0x1000 - -gUnknown_08332F60:: @ 8332F60 - .incbin "baserom.gba", 0x332f60, 0x2840 - -gUnknown_083357A0:: @ 83357A0 - .incbin "baserom.gba", 0x3357a0, 0x100 - -gUnknown_083358A0:: @ 83358A0 - .incbin "baserom.gba", 0x3358a0, 0x100 - -gUnknown_083359A0:: @ 83359A0 - .incbin "baserom.gba", 0x3359a0, 0x1000 - -gUnknown_083369A0:: @ 83369A0 - .incbin "baserom.gba", 0x3369a0, 0x1000 - -gUnknown_083379A0:: @ 83379A0 - .incbin "baserom.gba", 0x3379a0, 0x100 - -gUnknown_08337AA0:: @ 8337AA0 - .incbin "baserom.gba", 0x337aa0, 0x200 - -gUnknown_08337CA0:: @ 8337CA0 - .incbin "baserom.gba", 0x337ca0, 0x200 - -gUnknown_08337EA0:: @ 8337EA0 - .incbin "baserom.gba", 0x337ea0, 0x20 - -gUnknown_08337EC0:: @ 8337EC0 - .incbin "baserom.gba", 0x337ec0, 0x690 - -gUnknown_08338550:: @ 8338550 - .incbin "baserom.gba", 0x338550, 0x7c8 - -gUnknown_08338D18:: @ 8338D18 - .incbin "baserom.gba", 0x338d18, 0x8 - -gUnknown_08338D20:: @ 8338D20 - .incbin "baserom.gba", 0x338d20, 0x8 - -gUnknown_08338D28:: @ 8338D28 - .incbin "baserom.gba", 0x338d28, 0x48 - -gUnknown_08338D70:: @ 8338D70 - .incbin "baserom.gba", 0x338d70, 0x8 - -gUnknown_08338D78:: @ 8338D78 - .incbin "baserom.gba", 0x338d78, 0x8 - -gUnknown_08338D80:: @ 8338D80 - .incbin "baserom.gba", 0x338d80, 0x8 - -gUnknown_08338D88:: @ 8338D88 - .incbin "baserom.gba", 0x338d88, 0x38 - -gUnknown_08338DC0:: @ 8338DC0 - .incbin "baserom.gba", 0x338dc0, 0x8 - -gUnknown_08338DC8:: @ 8338DC8 - .incbin "baserom.gba", 0x338dc8, 0x2c - -gUnknown_08338DF4:: @ 8338DF4 - .incbin "baserom.gba", 0x338df4, 0x8 - -gUnknown_08338DFC:: @ 8338DFC - .incbin "baserom.gba", 0x338dfc, 0x70 - -gUnknown_08338E6C:: @ 8338E6C - .incbin "baserom.gba", 0x338e6c, 0x8 - -gUnknown_08338E74:: @ 8338E74 - .incbin "baserom.gba", 0x338e74, 0x18 - -gUnknown_08338E8C:: @ 8338E8C - .incbin "baserom.gba", 0x338e8c, 0x18 - -gUnknown_08338EA4:: @ 8338EA4 - .incbin "baserom.gba", 0x338ea4, 0x28 - -gUnknown_08338ECC:: @ 8338ECC - .incbin "baserom.gba", 0x338ecc, 0x4 - -gUnknown_08338ED0:: @ 8338ED0 - .incbin "baserom.gba", 0x338ed0, 0xf0 - -gUnknown_08338FC0:: @ 8338FC0 - .incbin "baserom.gba", 0x338fc0, 0x3c - -gUnknown_08338FFC:: @ 8338FFC - .incbin "baserom.gba", 0x338ffc, 0x10 - -gUnknown_0833900C:: @ 833900C - .incbin "baserom.gba", 0x33900c, 0x8 - -gUnknown_08339014:: @ 8339014 - .incbin "baserom.gba", 0x339014, 0x10 - -gUnknown_08339024:: @ 8339024 - .incbin "baserom.gba", 0x339024, 0x6c - -gUnknown_08339090:: @ 8339090 - .incbin "baserom.gba", 0x339090, 0x44 - -gUnknown_083390D4:: @ 83390D4 - .incbin "baserom.gba", 0x3390d4, 0x20 - -gUnknown_083390F4:: @ 83390F4 - .incbin "baserom.gba", 0x3390f4, 0x400 - -gUnknown_083394F4:: @ 83394F4 - .incbin "baserom.gba", 0x3394f4, 0x246 - -gUnknown_0833973A:: @ 833973A - .incbin "baserom.gba", 0x33973a, 0x61 - -gUnknown_0833979B:: @ 833979B - .incbin "baserom.gba", 0x33979b, 0x2 - -gUnknown_0833979D:: @ 833979D - .incbin "baserom.gba", 0x33979d, 0x33 - -gUnknown_083397D0:: @ 83397D0 - .incbin "baserom.gba", 0x3397d0, 0x4a - -gUnknown_0833981A:: @ 833981A - .incbin "baserom.gba", 0x33981a, 0x17 - -gUnknown_08339831:: @ 8339831 - .incbin "baserom.gba", 0x339831, 0x27 - -gUnknown_08339858:: @ 8339858 - .incbin "baserom.gba", 0x339858, 0x3e - -gUnknown_08339896:: @ 8339896 - .incbin "baserom.gba", 0x339896, 0x1a - -gUnknown_083398B0:: @ 83398B0 - .incbin "baserom.gba", 0x3398b0, 0x2d - -gUnknown_083398DD:: @ 83398DD - .incbin "baserom.gba", 0x3398dd, 0x18 - -gUnknown_083398F5:: @ 83398F5 - .incbin "baserom.gba", 0x3398f5, 0x1f - -gUnknown_08339914:: @ 8339914 - .incbin "baserom.gba", 0x339914, 0x7 - -gUnknown_0833991B:: @ 833991B - .incbin "baserom.gba", 0x33991b, 0x6 - -gUnknown_08339921:: @ 8339921 - .incbin "baserom.gba", 0x339921, 0x7 - -gUnknown_08339928:: @ 8339928 - .incbin "baserom.gba", 0x339928, 0x6 - -gUnknown_0833992E:: @ 833992E - .incbin "baserom.gba", 0x33992e, 0xe - -gUnknown_0833993C:: @ 833993C - .incbin "baserom.gba", 0x33993c, 0x5 - -gUnknown_08339941:: @ 8339941 - .incbin "baserom.gba", 0x339941, 0x2 - -gUnknown_08339943:: @ 8339943 - .incbin "baserom.gba", 0x339943, 0x4 - -gUnknown_08339947:: @ 8339947 - .incbin "baserom.gba", 0x339947, 0x8 - -gUnknown_0833994F:: @ 833994F - .incbin "baserom.gba", 0x33994f, 0xe - -gUnknown_0833995D:: @ 833995D - .incbin "baserom.gba", 0x33995d, 0x13 - -gUnknown_08339970:: @ 8339970 - .incbin "baserom.gba", 0x339970, 0x4 - -gUnknown_08339974:: @ 8339974 - .incbin "baserom.gba", 0x339974, 0xc - -gUnknown_08339980:: @ 8339980 - .incbin "baserom.gba", 0x339980, 0x38 - -gUnknown_083399B8:: @ 83399B8 - .incbin "baserom.gba", 0x3399b8, 0x8 - -gUnknown_083399C0:: @ 83399C0 - .incbin "baserom.gba", 0x3399c0, 0x8 - -gUnknown_083399C8:: @ 83399C8 - .incbin "baserom.gba", 0x3399c8, 0x8 - -gUnknown_083399D0:: @ 83399D0 - .incbin "baserom.gba", 0x3399d0, 0xc - -gUnknown_083399DC:: @ 83399DC - .incbin "baserom.gba", 0x3399dc, 0x8 - -gUnknown_083399E4:: @ 83399E4 - .incbin "baserom.gba", 0x3399e4, 0x3 - -gUnknown_083399E7:: @ 83399E7 - .incbin "baserom.gba", 0x3399e7, 0x5 - -gUnknown_083399EC:: @ 83399EC - .incbin "baserom.gba", 0x3399ec, 0xd4 - -gUnknown_08339AC0:: @ 8339AC0 - .incbin "baserom.gba", 0x339ac0, 0x8 - -gUnknown_08339AC8:: @ 8339AC8 - .incbin "baserom.gba", 0x339ac8, 0x8 - -gUnknown_08339AD0:: @ 8339AD0 - .incbin "baserom.gba", 0x339ad0, 0x8 - -gUnknown_08339AD8:: @ 8339AD8 - .incbin "baserom.gba", 0x339ad8, 0x60 - -gUnknown_08339B38:: @ 8339B38 - .incbin "baserom.gba", 0x339b38, 0x8 - -gUnknown_08339B40:: @ 8339B40 - .incbin "baserom.gba", 0x339b40, 0x98 - -gUnknown_08339BD8:: @ 8339BD8 - .incbin "baserom.gba", 0x339bd8, 0x8 - -gUnknown_08339BE0:: @ 8339BE0 - .incbin "baserom.gba", 0x339be0, 0x44 - -gUnknown_08339C24:: @ 8339C24 - .incbin "baserom.gba", 0x339c24, 0x8 - -gUnknown_08339C2C:: @ 8339C2C - .incbin "baserom.gba", 0x339c2c, 0x2c - -gUnknown_08339C58:: @ 8339C58 - .incbin "baserom.gba", 0x339c58, 0x8 - -gUnknown_08339C60:: @ 8339C60 - .incbin "baserom.gba", 0x339c60, 0x18 - -gUnknown_08339C78:: @ 8339C78 - .incbin "baserom.gba", 0x339c78, 0x28 - -gUnknown_08339CA0:: @ 8339CA0 - .incbin "baserom.gba", 0x339ca0, 0x1e - -gUnknown_08339CBE:: @ 8339CBE - .incbin "baserom.gba", 0x339cbe, 0x5 - -gUnknown_08339CC3:: @ 8339CC3 - .incbin "baserom.gba", 0x339cc3, 0x5 - -gUnknown_08339CC8:: @ 8339CC8 - .incbin "baserom.gba", 0x339cc8, 0x4c - -gUnknown_08339D14:: @ 8339D14 - .incbin "baserom.gba", 0x339d14, 0x8 - -gUnknown_08339D1C:: @ 8339D1C - .incbin "baserom.gba", 0x339d1c, 0x20 - -gUnknown_08339D3C:: @ 8339D3C - .incbin "baserom.gba", 0x339d3c, 0x28 - -gUnknown_08339D64:: @ 8339D64 - .incbin "baserom.gba", 0x339d64, 0x48 - -gUnknown_08339DAC:: @ 8339DAC - .incbin "baserom.gba", 0x339dac, 0x10 - -gUnknown_08339DBC:: @ 8339DBC - .incbin "baserom.gba", 0x339dbc, 0xc - -gUnknown_08339DC8:: @ 8339DC8 - .incbin "baserom.gba", 0x339dc8, 0xc - -gUnknown_08339DD4:: @ 8339DD4 - .incbin "baserom.gba", 0x339dd4, 0x2c - -gUnknown_08339E00:: @ 8339E00 - .incbin "baserom.gba", 0x339e00, 0x8 - -@ 8339E08 - .include "data/tilesets/tileset_graphics.inc" - -@ 83960F0 - .include "data/tilesets/metatiles.inc" - -@ 83DF704 - .include "data/tilesets/tilesets.inc" - -@ 83DFE14 - .incbin "baserom.gba", 0x3dfe14, 0xa1fc0 - -gUnknown_08481DD4:: @ 8481DD4 - .incbin "baserom.gba", 0x481dd4, 0x47a4 - -gUnknown_08486578:: @ 8486578 - .incbin "baserom.gba", 0x486578, 0x980 - -gUnknown_08486EF8:: @ 8486EF8 - .incbin "baserom.gba", 0x486ef8, 0x4 - -gUnknown_08486EFC:: @ 8486EFC - .incbin "baserom.gba", 0x486efc, 0x10090 - -gUnknown_08496F8C:: @ 8496F8C - .incbin "baserom.gba", 0x496f8c, 0x14 - -gUnknown_08496FA0:: @ 8496FA0 - .incbin "baserom.gba", 0x496fa0, 0x14 - -gUnknown_08496FB4:: @ 8496FB4 - .incbin "baserom.gba", 0x496fb4, 0x1c0 - -gUnknown_08497174:: @ 8497174 - .incbin "baserom.gba", 0x497174, 0x288 - -gUnknown_084973FC:: @ 84973FC - .incbin "baserom.gba", 0x4973fc, 0x48 - -gUnknown_08497444:: @ 8497444 - .incbin "baserom.gba", 0x497444, 0x4c - -gUnknown_08497490:: @ 8497490 - .incbin "baserom.gba", 0x497490, 0xc - -gUnknown_0849749C:: @ 849749C - .incbin "baserom.gba", 0x49749c, 0x14 - -gUnknown_084974B0:: @ 84974B0 - .incbin "baserom.gba", 0x4974b0, 0x8 - -gUnknown_084974B8:: @ 84974B8 - .incbin "baserom.gba", 0x4974b8, 0x20 - -gUnknown_084974D8:: @ 84974D8 - .incbin "baserom.gba", 0x4974d8, 0x10 - -gUnknown_084974E8:: @ 84974E8 - .incbin "baserom.gba", 0x4974e8, 0x10 - -gUnknown_084974F8:: @ 84974F8 - .incbin "baserom.gba", 0x4974f8, 0x10 - -gUnknown_08497508:: @ 8497508 - .incbin "baserom.gba", 0x497508, 0x2 - -gUnknown_0849750A:: @ 849750A - .incbin "baserom.gba", 0x49750a, 0x2 - -gUnknown_0849750C:: @ 849750C - .incbin "baserom.gba", 0x49750c, 0x14 - -gUnknown_08497520:: @ 8497520 - .incbin "baserom.gba", 0x497520, 0x10 - -gUnknown_08497530:: @ 8497530 - .incbin "baserom.gba", 0x497530, 0xc - -gUnknown_0849753C:: @ 849753C - .incbin "baserom.gba", 0x49753c, 0x4 - -gUnknown_08497540:: @ 8497540 - .incbin "baserom.gba", 0x497540, 0x10 - -gUnknown_08497550:: @ 8497550 - .incbin "baserom.gba", 0x497550, 0x4 - -gUnknown_08497554:: @ 8497554 - .incbin "baserom.gba", 0x497554, 0x8 - -gUnknown_0849755C:: @ 849755C - .incbin "baserom.gba", 0x49755c, 0x40 - -gUnknown_0849759C:: @ 849759C - .incbin "baserom.gba", 0x49759c, 0x6 - -gUnknown_084975A2:: @ 84975A2 - .incbin "baserom.gba", 0x4975a2, 0x6 - -gUnknown_084975A8:: @ 84975A8 - .incbin "baserom.gba", 0x4975a8, 0x2 - -gUnknown_084975AA:: @ 84975AA - .incbin "baserom.gba", 0x4975aa, 0x6 - -gUnknown_084975B0:: @ 84975B0 - .incbin "baserom.gba", 0x4975b0, 0xc - -gUnknown_084975BC:: @ 84975BC - .incbin "baserom.gba", 0x4975bc, 0x8 - -gUnknown_084975C4:: @ 84975C4 - .incbin "baserom.gba", 0x4975c4, 0x10 - -gUnknown_084975D4:: @ 84975D4 - .incbin "baserom.gba", 0x4975d4, 0x18 - -gUnknown_084975EC:: @ 84975EC - .incbin "baserom.gba", 0x4975ec, 0xc - -@ 84975F8 - .include "data/graphics/field_objects/field_object_graphics.inc" - -gUnknown_08505438:: @ 8505438 - .incbin "baserom.gba", 0x505438, 0x144 - -gUnknown_0850557C:: @ 850557C - .incbin "baserom.gba", 0x50557c, 0x51 - -gUnknown_085055CD:: @ 85055CD - .incbin "baserom.gba", 0x5055cd, 0x53 - -@ 8505620 - .include "data/graphics/field_objects/field_object_graphics_info_pointers.inc" - -@ 85059F8 - .include "data/graphics/field_objects/field_effect_object_template_pointers.inc" - -@ 8505A8C - .include "data/graphics/field_objects/field_object_pic_tables.inc" - -@ 85089FC - .include "data/graphics/field_objects/field_object_anims.inc" - -gUnknown_085094AC:: @ 85094AC - .incbin "baserom.gba", 0x5094ac, 0x40 - -@ 85094EC - .include "data/graphics/field_objects/field_object_oam.inc" - -@ 8509954 - .include "data/graphics/field_objects/field_object_graphics_info.inc" - -gUnknown_0850BBC8:: @ 850BBC8 - .incbin "baserom.gba", 0x50bbc8, 0x138 - -gUnknown_0850BD00:: @ 850BD00 - .incbin "baserom.gba", 0x50bd00, 0x78 - -gUnknown_0850BD78:: @ 850BD78 - .incbin "baserom.gba", 0x50bd78, 0xc0 - -gUnknown_0850BE38:: @ 850BE38 - .incbin "baserom.gba", 0x50be38, 0x10 - -@ 850BE48 - .include "data/graphics/field_objects/berry_tree_graphics_tables.inc" - -@ 850C9C0 - .include "data/graphics/field_objects/field_effect_objects.inc" - - .incbin "baserom.gba", 0x50d6d4, 0x8 - -gUnknown_0850D6DC:: @ 850D6DC - .incbin "baserom.gba", 0x50d6dc, 0x10 - -gUnknown_0850D6EC:: @ 850D6EC - .incbin "baserom.gba", 0x50d6ec, 0x8 - -gUnknown_0850D6F4:: @ 850D6F4 - .incbin "baserom.gba", 0x50d6f4, 0x1c - -gUnknown_0850D710:: @ 850D710 - .incbin "baserom.gba", 0x50d710, 0x4 - -gUnknown_0850D714:: @ 850D714 - .incbin "baserom.gba", 0x50d714, 0x2c - -gUnknown_0850D740:: @ 850D740 - .incbin "baserom.gba", 0x50d740, 0x14 - -gUnknown_0850D754:: @ 850D754 - .incbin "baserom.gba", 0x50d754, 0x1c - -gUnknown_0850D770:: @ 850D770 - .incbin "baserom.gba", 0x50d770, 0x4 - -gUnknown_0850D774:: @ 850D774 - .incbin "baserom.gba", 0x50d774, 0x1c - -gUnknown_0850D790:: @ 850D790 - .incbin "baserom.gba", 0x50d790, 0x4 - -gUnknown_0850D794:: @ 850D794 - .incbin "baserom.gba", 0x50d794, 0xc - -gUnknown_0850D7A0:: @ 850D7A0 - .incbin "baserom.gba", 0x50d7a0, 0x14 - -gUnknown_0850D7B4:: @ 850D7B4 - .incbin "baserom.gba", 0x50d7b4, 0x14 - -gUnknown_0850D7C8:: @ 850D7C8 - .incbin "baserom.gba", 0x50d7c8, 0x14 - -gUnknown_0850D7DC:: @ 850D7DC - .incbin "baserom.gba", 0x50d7dc, 0x14 - -gUnknown_0850D7F0:: @ 850D7F0 - .incbin "baserom.gba", 0x50d7f0, 0x4 - -gUnknown_0850D7F4:: @ 850D7F4 - .incbin "baserom.gba", 0x50d7f4, 0x14 - -gUnknown_0850D808:: @ 850D808 - .incbin "baserom.gba", 0x50d808, 0x4 - -gUnknown_0850D80C:: @ 850D80C - .incbin "baserom.gba", 0x50d80c, 0x14 - -gUnknown_0850D820:: @ 850D820 - .incbin "baserom.gba", 0x50d820, 0x4 - -gUnknown_0850D824:: @ 850D824 - .incbin "baserom.gba", 0x50d824, 0x14 - -gUnknown_0850D838:: @ 850D838 - .incbin "baserom.gba", 0x50d838, 0x4 - -gUnknown_0850D83C:: @ 850D83C - .incbin "baserom.gba", 0x50d83c, 0x14 - -gUnknown_0850D850:: @ 850D850 - .incbin "baserom.gba", 0x50d850, 0x4 - -gUnknown_0850D854:: @ 850D854 - .incbin "baserom.gba", 0x50d854, 0x14 - -gUnknown_0850D868:: @ 850D868 - .incbin "baserom.gba", 0x50d868, 0x4 - -gUnknown_0850D86C:: @ 850D86C - .incbin "baserom.gba", 0x50d86c, 0x14 - -gUnknown_0850D880:: @ 850D880 - .incbin "baserom.gba", 0x50d880, 0x4 - -gUnknown_0850D884:: @ 850D884 - .incbin "baserom.gba", 0x50d884, 0x14 - -gUnknown_0850D898:: @ 850D898 - .incbin "baserom.gba", 0x50d898, 0x4 - -gUnknown_0850D89C:: @ 850D89C - .incbin "baserom.gba", 0x50d89c, 0x10 - -gUnknown_0850D8AC:: @ 850D8AC - .incbin "baserom.gba", 0x50d8ac, 0x8 - -gUnknown_0850D8B4:: @ 850D8B4 - .incbin "baserom.gba", 0x50d8b4, 0x10 - -gUnknown_0850D8C4:: @ 850D8C4 - .incbin "baserom.gba", 0x50d8c4, 0x8 - -gUnknown_0850D8CC:: @ 850D8CC - .incbin "baserom.gba", 0x50d8cc, 0x10 - -gUnknown_0850D8DC:: @ 850D8DC - .incbin "baserom.gba", 0x50d8dc, 0xc - -gUnknown_0850D8E8:: @ 850D8E8 - .incbin "baserom.gba", 0x50d8e8, 0x4 - -gUnknown_0850D8EC:: @ 850D8EC - .incbin "baserom.gba", 0x50d8ec, 0xc - -gUnknown_0850D8F8:: @ 850D8F8 - .incbin "baserom.gba", 0x50d8f8, 0x4 - -gUnknown_0850D8FC:: @ 850D8FC - .incbin "baserom.gba", 0x50d8fc, 0xc - -gUnknown_0850D908:: @ 850D908 - .incbin "baserom.gba", 0x50d908, 0x4 - -gUnknown_0850D90C:: @ 850D90C - .incbin "baserom.gba", 0x50d90c, 0xc - -gUnknown_0850D918:: @ 850D918 - .incbin "baserom.gba", 0x50d918, 0x4 - -gUnknown_0850D91C:: @ 850D91C - .incbin "baserom.gba", 0x50d91c, 0xc - -gUnknown_0850D928:: @ 850D928 - .incbin "baserom.gba", 0x50d928, 0x4 - -gUnknown_0850D92C:: @ 850D92C - .incbin "baserom.gba", 0x50d92c, 0xc - -gUnknown_0850D938:: @ 850D938 - .incbin "baserom.gba", 0x50d938, 0x4 - -gUnknown_0850D93C:: @ 850D93C - .incbin "baserom.gba", 0x50d93c, 0xc - -gUnknown_0850D948:: @ 850D948 - .incbin "baserom.gba", 0x50d948, 0xc - -gUnknown_0850D954:: @ 850D954 - .incbin "baserom.gba", 0x50d954, 0x4 - -gUnknown_0850D958:: @ 850D958 - .incbin "baserom.gba", 0x50d958, 0xc - -gUnknown_0850D964:: @ 850D964 - .incbin "baserom.gba", 0x50d964, 0x4 - -gUnknown_0850D968:: @ 850D968 - .incbin "baserom.gba", 0x50d968, 0xc - -gUnknown_0850D974:: @ 850D974 - .incbin "baserom.gba", 0x50d974, 0x4 - -gUnknown_0850D978:: @ 850D978 - .incbin "baserom.gba", 0x50d978, 0xc - -gUnknown_0850D984:: @ 850D984 - .incbin "baserom.gba", 0x50d984, 0x4 - -gUnknown_0850D988:: @ 850D988 - .incbin "baserom.gba", 0x50d988, 0xc - -gUnknown_0850D994:: @ 850D994 - .incbin "baserom.gba", 0x50d994, 0x4 - -gUnknown_0850D998:: @ 850D998 - .incbin "baserom.gba", 0x50d998, 0xc - -gUnknown_0850D9A4:: @ 850D9A4 - .incbin "baserom.gba", 0x50d9a4, 0x4 - -gUnknown_0850D9A8:: @ 850D9A8 - .incbin "baserom.gba", 0x50d9a8, 0xc - -gUnknown_0850D9B4:: @ 850D9B4 - .incbin "baserom.gba", 0x50d9b4, 0x4 - -gUnknown_0850D9B8:: @ 850D9B8 - .incbin "baserom.gba", 0x50d9b8, 0xc - -gUnknown_0850D9C4:: @ 850D9C4 - .incbin "baserom.gba", 0x50d9c4, 0x4 - -gUnknown_0850D9C8:: @ 850D9C8 - .incbin "baserom.gba", 0x50d9c8, 0xc - -gUnknown_0850D9D4:: @ 850D9D4 - .incbin "baserom.gba", 0x50d9d4, 0x4 - -gUnknown_0850D9D8:: @ 850D9D8 - .incbin "baserom.gba", 0x50d9d8, 0xc - -gUnknown_0850D9E4:: @ 850D9E4 - .incbin "baserom.gba", 0x50d9e4, 0x4 - -gUnknown_0850D9E8:: @ 850D9E8 - .incbin "baserom.gba", 0x50d9e8, 0xc - -gUnknown_0850D9F4:: @ 850D9F4 - .incbin "baserom.gba", 0x50d9f4, 0x4 - -gUnknown_0850D9F8:: @ 850D9F8 - .incbin "baserom.gba", 0x50d9f8, 0xc - -gUnknown_0850DA04:: @ 850DA04 - .incbin "baserom.gba", 0x50da04, 0x4 - -gUnknown_0850DA08:: @ 850DA08 - .incbin "baserom.gba", 0x50da08, 0xc - -gUnknown_0850DA14:: @ 850DA14 - .incbin "baserom.gba", 0x50da14, 0x4 - -gUnknown_0850DA18:: @ 850DA18 - .incbin "baserom.gba", 0x50da18, 0xc - -gUnknown_0850DA24:: @ 850DA24 - .incbin "baserom.gba", 0x50da24, 0x4 - -gUnknown_0850DA28:: @ 850DA28 - .incbin "baserom.gba", 0x50da28, 0xc - -gUnknown_0850DA34:: @ 850DA34 - .incbin "baserom.gba", 0x50da34, 0x4 - -gUnknown_0850DA38:: @ 850DA38 - .incbin "baserom.gba", 0x50da38, 0xc - -gUnknown_0850DA44:: @ 850DA44 - .incbin "baserom.gba", 0x50da44, 0x4 - -gUnknown_0850DA48:: @ 850DA48 - .incbin "baserom.gba", 0x50da48, 0xc - -gUnknown_0850DA54:: @ 850DA54 - .incbin "baserom.gba", 0x50da54, 0x4 - -gUnknown_0850DA58:: @ 850DA58 - .incbin "baserom.gba", 0x50da58, 0xc - -gUnknown_0850DA64:: @ 850DA64 - .incbin "baserom.gba", 0x50da64, 0x2c - -gUnknown_0850DA90:: @ 850DA90 - .incbin "baserom.gba", 0x50da90, 0xc - -gUnknown_0850DA9C:: @ 850DA9C - .incbin "baserom.gba", 0x50da9c, 0x4 - -gUnknown_0850DAA0:: @ 850DAA0 - .incbin "baserom.gba", 0x50daa0, 0x8 - -gUnknown_0850DAA8:: @ 850DAA8 - .incbin "baserom.gba", 0x50daa8, 0x8 - -gUnknown_0850DAB0:: @ 850DAB0 - .incbin "baserom.gba", 0x50dab0, 0x8 - -gUnknown_0850DAB8:: @ 850DAB8 - .incbin "baserom.gba", 0x50dab8, 0x8 - -gUnknown_0850DAC0:: @ 850DAC0 - .incbin "baserom.gba", 0x50dac0, 0xc - -gUnknown_0850DACC:: @ 850DACC - .incbin "baserom.gba", 0x50dacc, 0x9 - -gUnknown_0850DAD5:: @ 850DAD5 - .incbin "baserom.gba", 0x50dad5, 0x9 - -gUnknown_0850DADE:: @ 850DADE - .incbin "baserom.gba", 0x50dade, 0x9 - -gUnknown_0850DAE7:: @ 850DAE7 - .incbin "baserom.gba", 0x50dae7, 0x9 - -gUnknown_0850DAF0:: @ 850DAF0 - .incbin "baserom.gba", 0x50daf0, 0x9 - -gUnknown_0850DAF9:: @ 850DAF9 - .incbin "baserom.gba", 0x50daf9, 0x9 - -gUnknown_0850DB02:: @ 850DB02 - .incbin "baserom.gba", 0x50db02, 0x9 - -gUnknown_0850DB0B:: @ 850DB0B - .incbin "baserom.gba", 0x50db0b, 0x9 - -gUnknown_0850DB14:: @ 850DB14 - .incbin "baserom.gba", 0x50db14, 0x9 - -gUnknown_0850DB1D:: @ 850DB1D - .incbin "baserom.gba", 0x50db1d, 0x9 - -gUnknown_0850DB26:: @ 850DB26 - .incbin "baserom.gba", 0x50db26, 0x9 - -gUnknown_0850DB2F:: @ 850DB2F - .incbin "baserom.gba", 0x50db2f, 0x9 - -gUnknown_0850DB38:: @ 850DB38 - .incbin "baserom.gba", 0x50db38, 0x9 - -gUnknown_0850DB41:: @ 850DB41 - .incbin "baserom.gba", 0x50db41, 0x9 - -gUnknown_0850DB4A:: @ 850DB4A - .incbin "baserom.gba", 0x50db4a, 0x9 - -gUnknown_0850DB53:: @ 850DB53 - .incbin "baserom.gba", 0x50db53, 0x9 - -gUnknown_0850DB5C:: @ 850DB5C - .incbin "baserom.gba", 0x50db5c, 0x10 - -gUnknown_0850DB6C:: @ 850DB6C - .incbin "baserom.gba", 0x50db6c, 0x10 - -gUnknown_0850DB7C:: @ 850DB7C - .incbin "baserom.gba", 0x50db7c, 0x24 - -gUnknown_0850DBA0:: @ 850DBA0 - .incbin "baserom.gba", 0x50dba0, 0x5 - -gUnknown_0850DBA5:: @ 850DBA5 - .incbin "baserom.gba", 0x50dba5, 0x5 - -gUnknown_0850DBAA:: @ 850DBAA - .incbin "baserom.gba", 0x50dbaa, 0x5 - -gUnknown_0850DBAF:: @ 850DBAF - .incbin "baserom.gba", 0x50dbaf, 0x5 - -gUnknown_0850DBB4:: @ 850DBB4 - .incbin "baserom.gba", 0x50dbb4, 0x5 - -gUnknown_0850DBB9:: @ 850DBB9 - .incbin "baserom.gba", 0x50dbb9, 0x5 - -gUnknown_0850DBBE:: @ 850DBBE - .incbin "baserom.gba", 0x50dbbe, 0x5 - -gUnknown_0850DBC3:: @ 850DBC3 - .incbin "baserom.gba", 0x50dbc3, 0x5 - -gUnknown_0850DBC8:: @ 850DBC8 - .incbin "baserom.gba", 0x50dbc8, 0x5 - -gUnknown_0850DBCD:: @ 850DBCD - .incbin "baserom.gba", 0x50dbcd, 0x5 - -gUnknown_0850DBD2:: @ 850DBD2 - .incbin "baserom.gba", 0x50dbd2, 0x5 - -gUnknown_0850DBD7:: @ 850DBD7 - .incbin "baserom.gba", 0x50dbd7, 0x5 - -gUnknown_0850DBDC:: @ 850DBDC - .incbin "baserom.gba", 0x50dbdc, 0x5 - -gUnknown_0850DBE1:: @ 850DBE1 - .incbin "baserom.gba", 0x50dbe1, 0x5 - -gUnknown_0850DBE6:: @ 850DBE6 - .incbin "baserom.gba", 0x50dbe6, 0x5 - -gUnknown_0850DBEB:: @ 850DBEB - .incbin "baserom.gba", 0x50dbeb, 0x5 - -gUnknown_0850DBF0:: @ 850DBF0 - .incbin "baserom.gba", 0x50dbf0, 0x5 - -gUnknown_0850DBF5:: @ 850DBF5 - .incbin "baserom.gba", 0x50dbf5, 0x5 - -gUnknown_0850DBFA:: @ 850DBFA - .incbin "baserom.gba", 0x50dbfa, 0x5 - -gUnknown_0850DBFF:: @ 850DBFF - .incbin "baserom.gba", 0x50dbff, 0x5 - -gUnknown_0850DC04:: @ 850DC04 - .incbin "baserom.gba", 0x50dc04, 0x5 - -gUnknown_0850DC09:: @ 850DC09 - .incbin "baserom.gba", 0x50dc09, 0x5 - -gUnknown_0850DC0E:: @ 850DC0E - .incbin "baserom.gba", 0x50dc0e, 0x5 - -gUnknown_0850DC13:: @ 850DC13 - .incbin "baserom.gba", 0x50dc13, 0x5 - -gUnknown_0850DC18:: @ 850DC18 - .incbin "baserom.gba", 0x50dc18, 0x5 - -gUnknown_0850DC1D:: @ 850DC1D - .incbin "baserom.gba", 0x50dc1d, 0x5 - -gUnknown_0850DC22:: @ 850DC22 - .incbin "baserom.gba", 0x50dc22, 0x5 - -gUnknown_0850DC27:: @ 850DC27 - .incbin "baserom.gba", 0x50dc27, 0x8 - -gUnknown_0850DC2F:: @ 850DC2F - .incbin "baserom.gba", 0x50dc2f, 0x10 - -gUnknown_0850DC3F:: @ 850DC3F - .incbin "baserom.gba", 0x50dc3f, 0x11 - -gUnknown_0850DC50:: @ 850DC50 - .incbin "baserom.gba", 0x50dc50, 0x298 - -gUnknown_0850DEE8:: @ 850DEE8 - .incbin "baserom.gba", 0x50dee8, 0xd4 - -gUnknown_0850DFBC:: @ 850DFBC - .incbin "baserom.gba", 0x50dfbc, 0x6 - -gUnknown_0850DFC2:: @ 850DFC2 - .incbin "baserom.gba", 0x50dfc2, 0x61a - -gUnknown_0850E5DC:: @ 850E5DC - .incbin "baserom.gba", 0x50e5dc, 0x8 - -gUnknown_0850E5E4:: @ 850E5E4 - .incbin "baserom.gba", 0x50e5e4, 0x18 - -gUnknown_0850E5FC:: @ 850E5FC - .incbin "baserom.gba", 0x50e5fc, 0x18 - -gUnknown_0850E614:: @ 850E614 - .incbin "baserom.gba", 0x50e614, 0x10 - -gUnknown_0850E624:: @ 850E624 - .incbin "baserom.gba", 0x50e624, 0x10 - -gUnknown_0850E634:: @ 850E634 - .incbin "baserom.gba", 0x50e634, 0x10 - -gUnknown_0850E644:: @ 850E644 - .incbin "baserom.gba", 0x50e644, 0x10 - -gUnknown_0850E654:: @ 850E654 - .incbin "baserom.gba", 0x50e654, 0xc - -gUnknown_0850E660:: @ 850E660 - .incbin "baserom.gba", 0x50e660, 0x4 - -gUnknown_0850E664:: @ 850E664 - .incbin "baserom.gba", 0x50e664, 0x10 - -gUnknown_0850E674:: @ 850E674 - .incbin "baserom.gba", 0x50e674, 0xe0 - -gUnknown_0850E754:: @ 850E754 - .incbin "baserom.gba", 0x50e754, 0x14 - -gUnknown_0850E768:: @ 850E768 - .incbin "baserom.gba", 0x50e768, 0xa - -gUnknown_0850E772:: @ 850E772 - .incbin "baserom.gba", 0x50e772, 0x48 - -gUnknown_0850E7BA:: @ 850E7BA - .incbin "baserom.gba", 0x50e7ba, 0x7a - -gUnknown_0850E834:: @ 850E834 - .incbin "baserom.gba", 0x50e834, 0xc - -gUnknown_0850E840:: @ 850E840 - .incbin "baserom.gba", 0x50e840, 0x6 - -gUnknown_0850E846:: @ 850E846 - .incbin "baserom.gba", 0x50e846, 0x4 - -gUnknown_0850E84A:: @ 850E84A - .incbin "baserom.gba", 0x50e84a, 0x6 - -gUnknown_0850E850:: @ 850E850 - .incbin "baserom.gba", 0x50e850, 0x2c - -gUnknown_0850E87C:: @ 850E87C - .incbin "baserom.gba", 0x50e87c, 0x1680 - -gUnknown_0850FEFC:: @ 850FEFC - .incbin "baserom.gba", 0x50fefc, 0x280 - -gUnknown_0851017C:: @ 851017C - .incbin "baserom.gba", 0x51017c, 0xa0 - -gUnknown_0851021C:: @ 851021C - .incbin "baserom.gba", 0x51021c, 0xa0 - -gUnknown_085102BC:: @ 85102BC - .incbin "baserom.gba", 0x5102bc, 0x4 - -gUnknown_085102C0:: @ 85102C0 - .incbin "baserom.gba", 0x5102c0, 0x14 - -gUnknown_085102D4:: @ 85102D4 - .incbin "baserom.gba", 0x5102d4, 0xc - -gUnknown_085102E0:: @ 85102E0 - .incbin "baserom.gba", 0x5102e0, 0x68 - -gUnknown_08510348:: @ 8510348 - .incbin "baserom.gba", 0x510348, 0x20 - -gUnknown_08510368:: @ 8510368 - .incbin "baserom.gba", 0x510368, 0x20 - -gUnknown_08510388:: @ 8510388 - .incbin "baserom.gba", 0x510388, 0x20 - -gUnknown_085103A8:: @ 85103A8 - .incbin "baserom.gba", 0x5103a8, 0x20 - -gUnknown_085103C8:: @ 85103C8 - .incbin "baserom.gba", 0x5103c8, 0x34 - -gUnknown_085103FC:: @ 85103FC - .incbin "baserom.gba", 0x5103fc, 0x8 - -gUnknown_08510404:: @ 8510404 - .incbin "baserom.gba", 0x510404, 0x4 - -gUnknown_08510408:: @ 8510408 - .incbin "baserom.gba", 0x510408, 0x14 - -gUnknown_0851041C:: @ 851041C - .incbin "baserom.gba", 0x51041c, 0x4 - -gUnknown_08510420:: @ 8510420 - .incbin "baserom.gba", 0x510420, 0xa4 - -gUnknown_085104C4:: @ 85104C4 - .incbin "baserom.gba", 0x5104c4, 0x2c - -gUnknown_085104F0:: @ 85104F0 - .incbin "baserom.gba", 0x5104f0, 0x18 - -gUnknown_08510508:: @ 8510508 - .incbin "baserom.gba", 0x510508, 0x8 - -gUnknown_08510510:: @ 8510510 - .incbin "baserom.gba", 0x510510, 0x20 - -gUnknown_08510530:: @ 8510530 - .incbin "baserom.gba", 0x510530, 0x8 - -gUnknown_08510538:: @ 8510538 - .incbin "baserom.gba", 0x510538, 0x8 - -gUnknown_08510540:: @ 8510540 - .incbin "baserom.gba", 0x510540, 0x68 - -gUnknown_085105A8:: @ 85105A8 - .incbin "baserom.gba", 0x5105a8, 0x4 - -gUnknown_085105AC:: @ 85105AC - .incbin "baserom.gba", 0x5105ac, 0x10 - -gUnknown_085105BC:: @ 85105BC - .incbin "baserom.gba", 0x5105bc, 0x1a8 - -gUnknown_08510764:: @ 8510764 - .incbin "baserom.gba", 0x510764, 0xb60 - -gUnknown_085112C4:: @ 85112C4 - .incbin "baserom.gba", 0x5112c4, 0x908 - -gUnknown_08511BCC:: @ 8511BCC - .incbin "baserom.gba", 0x511bcc, 0x9a8 - -gUnknown_08512574:: @ 8512574 - .incbin "baserom.gba", 0x512574, 0x8e0 - -gUnknown_08512E54:: @ 8512E54 - .incbin "baserom.gba", 0x512e54, 0x320 - -gUnknown_08513174:: @ 8513174 - .incbin "baserom.gba", 0x513174, 0x510 - -gUnknown_08513684:: @ 8513684 - .incbin "baserom.gba", 0x513684, 0x210 - -gUnknown_08513894:: @ 8513894 - .incbin "baserom.gba", 0x513894, 0xb50 - -gUnknown_085143E4:: @ 85143E4 - .incbin "baserom.gba", 0x5143e4, 0x210 - -gUnknown_085145F4:: @ 85145F4 - .incbin "baserom.gba", 0x5145f4, 0x810 - -gUnknown_08514E04:: @ 8514E04 - .incbin "baserom.gba", 0x514e04, 0x540 - -gUnknown_08515344:: @ 8515344 - .incbin "baserom.gba", 0x515344, 0x20 - -gUnknown_08515364:: @ 8515364 - .incbin "baserom.gba", 0x515364, 0x20 - -gUnknown_08515384:: @ 8515384 - .incbin "baserom.gba", 0x515384, 0x30 - -gUnknown_085153B4:: @ 85153B4 - .incbin "baserom.gba", 0x5153b4, 0x30 - -gUnknown_085153E4:: @ 85153E4 - .incbin "baserom.gba", 0x5153e4, 0x10 - -gUnknown_085153F4:: @ 85153F4 - .incbin "baserom.gba", 0x5153f4, 0x410 - -gUnknown_08515804:: @ 8515804 - .incbin "baserom.gba", 0x515804, 0x20 - -gUnknown_08515824:: @ 8515824 - .incbin "baserom.gba", 0x515824, 0x140 - -gUnknown_08515964:: @ 8515964 - .incbin "baserom.gba", 0x515964, 0x428 - -gUnknown_08515D8C:: @ 8515D8C - .incbin "baserom.gba", 0x515d8c, 0x430 - -gUnknown_085161BC:: @ 85161BC - .incbin "baserom.gba", 0x5161bc, 0x20 - -gUnknown_085161DC:: @ 85161DC - .incbin "baserom.gba", 0x5161dc, 0x320 - -gUnknown_085164FC:: @ 85164FC - .incbin "baserom.gba", 0x5164fc, 0x310 - -gUnknown_0851680C:: @ 851680C - .incbin "baserom.gba", 0x51680c, 0x310 - -gUnknown_08516B1C:: @ 8516B1C - .incbin "baserom.gba", 0x516b1c, 0x210 - -gUnknown_08516D2C:: @ 8516D2C - .incbin "baserom.gba", 0x516d2c, 0x110 - -gUnknown_08516E3C:: @ 8516E3C - .incbin "baserom.gba", 0x516e3c, 0xc08 - -gUnknown_08517A44:: @ 8517A44 - .incbin "baserom.gba", 0x517a44, 0xc - -gUnknown_08517A50:: @ 8517A50 - .incbin "baserom.gba", 0x517a50, 0x1ac - -gUnknown_08517BFC:: @ 8517BFC - .incbin "baserom.gba", 0x517bfc, 0x10 - -gUnknown_08517C0C:: @ 8517C0C - .incbin "baserom.gba", 0x517c0c, 0x428 - -gUnknown_08518034:: @ 8518034 - .incbin "baserom.gba", 0x518034, 0x268 - -gUnknown_0851829C:: @ 851829C - .incbin "baserom.gba", 0x51829c, 0x8028 - -gUnknown_085202C4:: @ 85202C4 - .incbin "baserom.gba", 0x5202c4, 0x45a0 - -gUnknown_08524864:: @ 8524864 - .incbin "baserom.gba", 0x524864, 0xc - -gUnknown_08524870:: @ 8524870 - .incbin "baserom.gba", 0x524870, 0xc - -gUnknown_0852487C:: @ 852487C - .incbin "baserom.gba", 0x52487c, 0x10 - -gDummyPaletteStructTemplate:: @ 852488C - .2byte 0xFFFF - .space 9 - .byte 0x20 - .space 4 - - .align 2 -gUnknown_0852489C:: @ 852489C - .incbin "baserom.gba", 0x52489c, 0x20 - -gUnknown_085248BC:: @ 85248BC - .incbin "baserom.gba", 0x5248bc, 0x288 - -gUnknown_08524B44:: @ 8524B44 - .incbin "baserom.gba", 0x524b44, 0x1d0 - -gUnknown_08524D14:: @ 8524D14 - .incbin "baserom.gba", 0x524d14, 0x270 - -gUnknown_08524F84:: @ 8524F84 - .incbin "baserom.gba", 0x524f84, 0x308 - -gUnknown_0852528C:: @ 852528C - .incbin "baserom.gba", 0x52528c, 0x120 - -gUnknown_085253AC:: @ 85253AC - .incbin "baserom.gba", 0x5253ac, 0x270 - -gUnknown_0852561C:: @ 852561C - .incbin "baserom.gba", 0x52561c, 0x270 - -gUnknown_0852588C:: @ 852588C - .incbin "baserom.gba", 0x52588c, 0x308 - -gUnknown_08525B94:: @ 8525B94 - .incbin "baserom.gba", 0x525b94, 0x120 - -gUnknown_08525CB4:: @ 8525CB4 - .incbin "baserom.gba", 0x525cb4, 0xa0 - -gUnknown_08525D54:: @ 8525D54 - .incbin "baserom.gba", 0x525d54, 0x144 - -gUnknown_08525E98:: @ 8525E98 - .incbin "baserom.gba", 0x525e98, 0xc0 - -gUnknown_08525F58:: @ 8525F58 - .incbin "baserom.gba", 0x525f58, 0x20 - -gUnknown_08525F78:: @ 8525F78 - .incbin "baserom.gba", 0x525f78, 0x10 - -gUnknown_08525F88:: @ 8525F88 - .incbin "baserom.gba", 0x525f88, 0x4 - -gUnknown_08525F8C:: @ 8525F8C - .incbin "baserom.gba", 0x525f8c, 0x4 - -gUnknown_08525F90:: @ 8525F90 - .incbin "baserom.gba", 0x525f90, 0x30 - -gUnknown_08525FC0:: @ 8525FC0 - .incbin "baserom.gba", 0x525fc0, 0x18f80 - -gUnknown_0853EF40:: @ 853EF40 - .incbin "baserom.gba", 0x53ef40, 0x8 - -gUnknown_0853EF48:: @ 853EF48 - .incbin "baserom.gba", 0x53ef48, 0x18 - -gUnknown_0853EF60:: @ 853EF60 - .incbin "baserom.gba", 0x53ef60, 0xf8 - -gTitleScreenRayquazaTiles:: @ 853F058 - .incbin "graphics/title_screen/rayquaza.4bpp.lz" - - .align 2 -gUnknown_0853F83C:: @ 853F83C - .incbin "baserom.gba", 0x53f83c, 0x450 - -gTitleScreenCloudsTiles:: @ 853FC8C - .incbin "graphics/title_screen/clouds.4bpp.lz" - - .align 2 -gUnknown_0853FF70:: @ 853FF70 - .incbin "baserom.gba", 0x53ff70, 0xa8 - -gUnknown_08540018:: @ 8540018 - .incbin "baserom.gba", 0x540018, 0x18 - -gUnknown_08540030:: @ 8540030 - .incbin "baserom.gba", 0x540030, 0x18 - -gUnknown_08540048:: @ 8540048 - .incbin "baserom.gba", 0x540048, 0x90 - -gUnknown_085400D8:: @ 85400D8 - .incbin "baserom.gba", 0x5400d8, 0x18 - -gUnknown_085400F0:: @ 85400F0 - .incbin "baserom.gba", 0x5400f0, 0x10 - -gUnknown_08540100:: @ 8540100 - .incbin "baserom.gba", 0x540100, 0x24 - -gUnknown_08540124:: @ 8540124 - .incbin "baserom.gba", 0x540124, 0x18 - -gUnknown_0854013C:: @ 854013C - .incbin "baserom.gba", 0x54013c, 0x10 - -gUnknown_0854014C:: @ 854014C - .incbin "baserom.gba", 0x54014c, 0xc000 - -gUnknown_0854C14C:: @ 854C14C - .incbin "baserom.gba", 0x54c14c, 0x4 - -gUnknown_0854C150:: @ 854C150 - .incbin "baserom.gba", 0x54c150, 0xf0 - -gUnknown_0854C240:: @ 854C240 - .incbin "baserom.gba", 0x54c240, 0x10 - -gUnknown_0854C250:: @ 854C250 - .incbin "baserom.gba", 0x54c250, 0x20 - -gUnknown_0854C270:: @ 854C270 - .incbin "baserom.gba", 0x54c270, 0x20 - -gUnknown_0854C290:: @ 854C290 - .incbin "baserom.gba", 0x54c290, 0x20 - -gUnknown_0854C2B0:: @ 854C2B0 - .incbin "baserom.gba", 0x54c2b0, 0x820 - -gUnknown_0854CAD0:: @ 854CAD0 - .incbin "baserom.gba", 0x54cad0, 0x3080 - -gUnknown_0854FB50:: @ 854FB50 - .incbin "baserom.gba", 0x54fb50, 0xc - -gUnknown_0854FB5C:: @ 854FB5C - .incbin "baserom.gba", 0x54fb5c, 0x1c - -gUnknown_0854FB78:: @ 854FB78 - .incbin "baserom.gba", 0x54fb78, 0x18 - -gUnknown_0854FB90:: @ 854FB90 - .incbin "baserom.gba", 0x54fb90, 0x9c - -gUnknown_0854FC2C:: @ 854FC2C - .incbin "baserom.gba", 0x54fc2c, 0x18 - -gUnknown_0854FC44:: @ 854FC44 - .incbin "baserom.gba", 0x54fc44, 0x8 - -gUnknown_0854FC4C:: @ 854FC4C - .incbin "baserom.gba", 0x54fc4c, 0x8 - -gUnknown_0854FC54:: @ 854FC54 - .incbin "baserom.gba", 0x54fc54, 0x38 - -gUnknown_0854FC8C:: @ 854FC8C - .incbin "baserom.gba", 0x54fc8c, 0x8c - -gUnknown_0854FD18:: @ 854FD18 - .incbin "baserom.gba", 0x54fd18, 0x18 - -gUnknown_0854FD30:: @ 854FD30 - .incbin "baserom.gba", 0x54fd30, 0x8 - -gUnknown_0854FD38:: @ 854FD38 - .incbin "baserom.gba", 0x54fd38, 0x20 - -gUnknown_0854FD58:: @ 854FD58 - .incbin "baserom.gba", 0x54fd58, 0x18 - -gUnknown_0854FD70:: @ 854FD70 - .incbin "baserom.gba", 0x54fd70, 0x1c - -gUnknown_0854FD8C:: @ 854FD8C - .incbin "baserom.gba", 0x54fd8c, 0x38 - -gUnknown_0854FDC4:: @ 854FDC4 - .incbin "baserom.gba", 0x54fdc4, 0x18 - -gUnknown_0854FDDC:: @ 854FDDC - .incbin "baserom.gba", 0x54fddc, 0x8 - -gUnknown_0854FDE4:: @ 854FDE4 - .incbin "baserom.gba", 0x54fde4, 0xc - -gUnknown_0854FDF0:: @ 854FDF0 - .incbin "baserom.gba", 0x54fdf0, 0x8 - -gUnknown_0854FDF8:: @ 854FDF8 - .incbin "baserom.gba", 0x54fdf8, 0x8 - -gUnknown_0854FE00:: @ 854FE00 - .incbin "baserom.gba", 0x54fe00, 0x44 - -gUnknown_0854FE44:: @ 854FE44 - .incbin "baserom.gba", 0x54fe44, 0x18 - -gUnknown_0854FE5C:: @ 854FE5C - .incbin "baserom.gba", 0x54fe5c, 0x4 - -gUnknown_0854FE60:: @ 854FE60 - .incbin "baserom.gba", 0x54fe60, 0x4 - -gUnknown_0854FE64:: @ 854FE64 - .incbin "baserom.gba", 0x54fe64, 0x14 - -gUnknown_0854FE78:: @ 854FE78 - .incbin "baserom.gba", 0x54fe78, 0x4 - -gUnknown_0854FE7C:: @ 854FE7C - .incbin "baserom.gba", 0x54fe7c, 0xc - -gUnknown_0854FE88:: @ 854FE88 - .incbin "baserom.gba", 0x54fe88, 0x8 - -gUnknown_0854FE90:: @ 854FE90 - .incbin "baserom.gba", 0x54fe90, 0x8 - -gUnknown_0854FE98:: @ 854FE98 - .incbin "baserom.gba", 0x54fe98, 0xc - -gUnknown_0854FEA4:: @ 854FEA4 - .incbin "baserom.gba", 0x54fea4, 0x3 - -gUnknown_0854FEA7:: @ 854FEA7 - .incbin "baserom.gba", 0x54fea7, 0x5 - -gUnknown_0854FEAC:: @ 854FEAC - .incbin "baserom.gba", 0x54feac, 0x48 - -gUnknown_0854FEF4:: @ 854FEF4 - .incbin "baserom.gba", 0x54fef4, 0x48 - -gUnknown_0854FF3C:: @ 854FF3C - .incbin "baserom.gba", 0x54ff3c, 0x48 - -gUnknown_0854FF84:: @ 854FF84 - .incbin "baserom.gba", 0x54ff84, 0x48 - -gUnknown_0854FFCC:: @ 854FFCC - .incbin "baserom.gba", 0x54ffcc, 0x48 - -gUnknown_08550014:: @ 8550014 - .incbin "baserom.gba", 0x550014, 0x48 - -gUnknown_0855005C:: @ 855005C - .incbin "baserom.gba", 0x55005c, 0x48 - -gUnknown_085500A4:: @ 85500A4 - .incbin "baserom.gba", 0x5500a4, 0x4e0 - -gUnknown_08550584:: @ 8550584 - .incbin "baserom.gba", 0x550584, 0x10 - -gUnknown_08550594:: @ 8550594 - .incbin "baserom.gba", 0x550594, 0x8 - -gUnknown_0855059C:: @ 855059C - .incbin "baserom.gba", 0x55059c, 0x190 - -gUnknown_0855072C:: @ 855072C - .incbin "baserom.gba", 0x55072c, 0x10 - -gUnknown_0855073C:: @ 855073C - .incbin "baserom.gba", 0x55073c, 0x30 - -gUnknown_0855076C:: @ 855076C - .incbin "baserom.gba", 0x55076c, 0x48 - -gUnknown_085507B4:: @ 85507B4 - .incbin "baserom.gba", 0x5507b4, 0x18 - -gUnknown_085507CC:: @ 85507CC - .incbin "baserom.gba", 0x5507cc, 0x18 - -@ 85507E4 - .include "data/wild_mons.inc" - - .incbin "baserom.gba", 0x55370c, 0x188 - -gUnknown_08553894:: @ 8553894 - .incbin "baserom.gba", 0x553894, 0x180 - -gUnknown_08553A14:: @ 8553A14 - .incbin "baserom.gba", 0x553a14, 0x64 - -gUnknown_08553A78:: @ 8553A78 - .incbin "baserom.gba", 0x553a78, 0x4 - -gUnknown_08553A7C:: @ 8553A7C - .incbin "baserom.gba", 0x553a7c, 0x14 - - .align 2 -gNewGameBirchPic:: @ 8553A90 - .incbin "graphics/birch_speech/birch.4bpp" - - .incbin "baserom.gba", 0x554290, 0x66c0 - - .align 2 -gNewGameBirchPalette:: @ 855A950 - .incbin "graphics/birch_speech/birch.gbapal" - - .align 2 - .incbin "baserom.gba", 0x55a970, 0x20 - - .align 2 -gFieldEffectObjectPalette4:: @ 855A990 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_04.gbapal" - - .incbin "baserom.gba", 0x55a9b0, 0x480 - - .align 2 -gFieldEffectObjectPalette5:: @ 855AE30 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_05.gbapal" - -gUnknown_0855AE50:: @ 855AE50 - .incbin "baserom.gba", 0x55ae50, 0x200 - -gUnknown_0855B050:: @ 855B050 - .incbin "baserom.gba", 0x55b050, 0x20 - -gUnknown_0855B070:: @ 855B070 - .incbin "baserom.gba", 0x55b070, 0x280 - -gUnknown_0855B2F0:: @ 855B2F0 - .incbin "baserom.gba", 0x55b2f0, 0x80 - -gUnknown_0855B370:: @ 855B370 - .incbin "baserom.gba", 0x55b370, 0x20 - -gUnknown_0855B390:: @ 855B390 - .incbin "baserom.gba", 0x55b390, 0x280 - -gUnknown_0855B610:: @ 855B610 - .incbin "baserom.gba", 0x55b610, 0x20 - -gUnknown_0855B630:: @ 855B630 - .incbin "baserom.gba", 0x55b630, 0xbc0 - -gUnknown_0855C1F0:: @ 855C1F0 - .incbin "baserom.gba", 0x55c1f0, 0x20 - - .align 2 -@ TODO: something else uses these too -gNewGameBirchOamAttributes:: @ 855C210 - .4byte OAM_SIZE_64x64 - .2byte 0 - - .align 2 - .incbin "baserom.gba", 0x55c218, 0x10 - - .align 2 -gNewGameBirchPicTable:: @ 855C228 - obj_tiles gNewGameBirchPic, 0x800 - - .align 2 -gNewGameBirchObjectPaletteInfo:: @ 855C230 - obj_pal gNewGameBirchPalette, 0x1006 - - .align 2 -gNewGameBirchImageAnim:: @ 855C238 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gNewGameBirchImageAnimTable:: @ 855C240 - .4byte gNewGameBirchImageAnim - - .align 2 -gNewGameBirchObjectTemplate:: @ 855C244 - .2byte 0xFFFF @ tiles tag - .2byte 0x1006 @ palette tag - .4byte gNewGameBirchOamAttributes - .4byte gNewGameBirchImageAnimTable - .4byte gNewGameBirchPicTable - .4byte gDummyObjectRotScalAnimTable - .4byte DummyObjectCallback - - .align 2 -gFieldEffectObjectPaletteInfo4:: @ 855C25C - obj_pal gFieldEffectObjectPalette4, 0x1007 - - .align 2 -gFieldEffectObjectPaletteInfo5:: @ 855C264 - obj_pal gFieldEffectObjectPalette5, 0x1010 - - .incbin "baserom.gba", 0x55c26c, 0x40 - -gUnknown_0855C2AC:: @ 855C2AC - .incbin "baserom.gba", 0x55c2ac, 0x18 - -gUnknown_0855C2C4:: @ 855C2C4 - .incbin "baserom.gba", 0x55c2c4, 0x40 - -gUnknown_0855C304:: @ 855C304 - .incbin "baserom.gba", 0x55c304, 0x18 - -gUnknown_0855C31C:: @ 855C31C - .incbin "baserom.gba", 0x55c31c, 0x18 - -gUnknown_0855C334:: @ 855C334 - .incbin "baserom.gba", 0x55c334, 0x18 - -gUnknown_0855C34C:: @ 855C34C - .incbin "baserom.gba", 0x55c34c, 0x18 - -gUnknown_0855C364:: @ 855C364 - .incbin "baserom.gba", 0x55c364, 0x10 - -gUnknown_0855C374:: @ 855C374 - .incbin "baserom.gba", 0x55c374, 0x10 - -gUnknown_0855C384:: @ 855C384 - .incbin "baserom.gba", 0x55c384, 0x20 - -gUnknown_0855C3A4:: @ 855C3A4 - .incbin "baserom.gba", 0x55c3a4, 0x18 - -gUnknown_0855C3BC:: @ 855C3BC - .incbin "baserom.gba", 0x55c3bc, 0x4 - -gUnknown_0855C3C0:: @ 855C3C0 - .incbin "baserom.gba", 0x55c3c0, 0x4 - -gUnknown_0855C3C4:: @ 855C3C4 - .incbin "baserom.gba", 0x55c3c4, 0x4 - -gUnknown_0855C3C8:: @ 855C3C8 - .incbin "baserom.gba", 0x55c3c8, 0x1c - -gUnknown_0855C3E4:: @ 855C3E4 - .incbin "baserom.gba", 0x55c3e4, 0x18 - -gUnknown_0855C3FC:: @ 855C3FC - .incbin "baserom.gba", 0x55c3fc, 0x1c - -gUnknown_0855C418:: @ 855C418 - .incbin "baserom.gba", 0x55c418, 0x14 - -gUnknown_0855C42C:: @ 855C42C - .incbin "baserom.gba", 0x55c42c, 0xc - -gUnknown_0855C438:: @ 855C438 - .incbin "baserom.gba", 0x55c438, 0x18 - -gUnknown_0855C450:: @ 855C450 - .incbin "baserom.gba", 0x55c450, 0x10 - -gUnknown_0855C460:: @ 855C460 - .incbin "baserom.gba", 0x55c460, 0x14 - -gUnknown_0855C474:: @ 855C474 - .incbin "baserom.gba", 0x55c474, 0x8 - -gUnknown_0855C47C:: @ 855C47C - .incbin "baserom.gba", 0x55c47c, 0x8 - -gUnknown_0855C484:: @ 855C484 - .incbin "baserom.gba", 0x55c484, 0x8 - -gUnknown_0855C48C:: @ 855C48C - .incbin "baserom.gba", 0x55c48c, 0x10 - -gUnknown_0855C49C:: @ 855C49C - .incbin "baserom.gba", 0x55c49c, 0xc - -gUnknown_0855C4A8:: @ 855C4A8 - .incbin "baserom.gba", 0x55c4a8, 0x1c - -gUnknown_0855C4C4:: @ 855C4C4 - .incbin "baserom.gba", 0x55c4c4, 0x1c - -gUnknown_0855C4E0:: @ 855C4E0 - .incbin "baserom.gba", 0x55c4e0, 0x14 - -gUnknown_0855C4F4:: @ 855C4F4 - .incbin "baserom.gba", 0x55c4f4, 0x54 - -gUnknown_0855C548:: @ 855C548 - .incbin "baserom.gba", 0x55c548, 0x8 - -gUnknown_0855C550:: @ 855C550 - .incbin "baserom.gba", 0x55c550, 0x1c - -gUnknown_0855C56C:: @ 855C56C - .incbin "baserom.gba", 0x55c56c, 0x24 - -gUnknown_0855C590:: @ 855C590 - .incbin "baserom.gba", 0x55c590, 0x5c - -gUnknown_0855C5EC:: @ 855C5EC - .incbin "baserom.gba", 0x55c5ec, 0x18 - -gUnknown_0855C604:: @ 855C604 - .incbin "baserom.gba", 0x55c604, 0x60 - -gUnknown_0855C664:: @ 855C664 - .incbin "baserom.gba", 0x55c664, 0x1c - -gUnknown_0855C680:: @ 855C680 - .incbin "baserom.gba", 0x55c680, 0x18 - -gUnknown_0855C698:: @ 855C698 - .incbin "baserom.gba", 0x55c698, 0x8 - -gUnknown_0855C6A0:: @ 855C6A0 - .incbin "baserom.gba", 0x55c6a0, 0x4 - -gUnknown_0855C6A4:: @ 855C6A4 - .incbin "baserom.gba", 0x55c6a4, 0x336 - -gUnknown_0855C9DA:: @ 855C9DA - .incbin "baserom.gba", 0x55c9da, 0x304 - -gUnknown_0855CCDE:: @ 855CCDE - .incbin "baserom.gba", 0x55ccde, 0x4b6 - -gUnknown_0855D194:: @ 855D194 - .incbin "baserom.gba", 0x55d194, 0x18 - -gUnknown_0855D1AC:: @ 855D1AC - .incbin "baserom.gba", 0x55d1ac, 0x18 - -gUnknown_0855D1C4:: @ 855D1C4 - .incbin "baserom.gba", 0x55d1c4, 0x18 - -gUnknown_0855D1DC:: @ 855D1DC - .incbin "baserom.gba", 0x55d1dc, 0x18 - -gUnknown_0855D1F4:: @ 855D1F4 - .incbin "baserom.gba", 0x55d1f4, 0x18 - -gUnknown_0855D20C:: @ 855D20C - .incbin "baserom.gba", 0x55d20c, 0x18 - -gUnknown_0855D224:: @ 855D224 - .incbin "baserom.gba", 0x55d224, 0x18 - -gUnknown_0855D23C:: @ 855D23C - .incbin "baserom.gba", 0x55d23c, 0x18 - -gUnknown_0855D254:: @ 855D254 - .incbin "baserom.gba", 0x55d254, 0x18 - -gUnknown_0855D26C:: @ 855D26C - .incbin "baserom.gba", 0x55d26c, 0x10 - -gUnknown_0855D27C:: @ 855D27C - .incbin "baserom.gba", 0x55d27c, 0x10 - -gUnknown_0855D28C:: @ 855D28C - .incbin "baserom.gba", 0x55d28c, 0x5 - -gUnknown_0855D291:: @ 855D291 - .incbin "baserom.gba", 0x55d291, 0x7 - -gUnknown_0855D298:: @ 855D298 - .incbin "baserom.gba", 0x55d298, 0x10 - -gUnknown_0855D2A8:: @ 855D2A8 - .incbin "baserom.gba", 0x55d2a8, 0x10 - -gUnknown_0855D2B8:: @ 855D2B8 - .incbin "baserom.gba", 0x55d2b8, 0x6 - -gUnknown_0855D2BE:: @ 855D2BE - .incbin "baserom.gba", 0x55d2be, 0x40 - -gUnknown_0855D2FE:: @ 855D2FE - .incbin "baserom.gba", 0x55d2fe, 0xe - -gUnknown_0855D30C:: @ 855D30C - .string "$" - -@ 855D30D - .include "data/text/pokedex_text.inc" - -@ 856B5B0 - .include "data/pokedex_entries.inc" - -gUnknown_0856E610:: @ 856E610 - .incbin "baserom.gba", 0x56e610, 0x20 - -gUnknown_0856E630:: @ 856E630 - .incbin "baserom.gba", 0x56e630, 0x10 - -gUnknown_0856E640:: @ 856E640 - .incbin "baserom.gba", 0x56e640, 0x28 - -gUnknown_0856E668:: @ 856E668 - .incbin "baserom.gba", 0x56e668, 0x8 - -gUnknown_0856E670:: @ 856E670 - .incbin "baserom.gba", 0x56e670, 0x18 - -gUnknown_0856E688:: @ 856E688 - .incbin "baserom.gba", 0x56e688, 0xc - -@ 856E694 - .include "data/graphics/pokemon/mon_footprint_table.inc" - -gUnknown_0856ED08:: @ 856ED08 - .incbin "baserom.gba", 0x56ed08, 0x28 - -gUnknown_0856ED30:: @ 856ED30 - .incbin "baserom.gba", 0x56ed30, 0x18 - -gUnknown_0856ED48:: @ 856ED48 - .incbin "baserom.gba", 0x56ed48, 0x54 - -gUnknown_0856ED9C:: @ 856ED9C - .incbin "baserom.gba", 0x56ed9c, 0x1c - -gUnknown_0856EDB8:: @ 856EDB8 - .incbin "baserom.gba", 0x56edb8, 0x1c - -gUnknown_0856EDD4:: @ 856EDD4 - .incbin "baserom.gba", 0x56edd4, 0x1c - -gUnknown_0856EDF0:: @ 856EDF0 - .incbin "baserom.gba", 0x56edf0, 0x1c - -gUnknown_0856EE0C:: @ 856EE0C - .incbin "baserom.gba", 0x56ee0c, 0x18 - -gUnknown_0856EE24:: @ 856EE24 - .incbin "baserom.gba", 0x56ee24, 0x38 - -gUnknown_0856EE5C:: @ 856EE5C - .incbin "baserom.gba", 0x56ee5c, 0x58 - -gUnknown_0856EEB4:: @ 856EEB4 - .incbin "baserom.gba", 0x56eeb4, 0x60 - -gUnknown_0856EF14:: @ 856EF14 - .incbin "baserom.gba", 0x56ef14, 0x98 - -gUnknown_0856EFAC:: @ 856EFAC - .incbin "baserom.gba", 0x56efac, 0x2 - -gUnknown_0856EFAE:: @ 856EFAE - .incbin "baserom.gba", 0x56efae, 0x6 - -gUnknown_0856EFB4:: @ 856EFB4 - .incbin "baserom.gba", 0x56efb4, 0x14 - -gUnknown_0856EFC8:: @ 856EFC8 - .incbin "baserom.gba", 0x56efc8, 0x30 - -gUnknown_0856EFF8:: @ 856EFF8 - .incbin "baserom.gba", 0x56eff8, 0x10 - -gUnknown_0856F008:: @ 856F008 - .incbin "baserom.gba", 0x56f008, 0x10 - -gUnknown_0856F018:: @ 856F018 - .incbin "baserom.gba", 0x56f018, 0x494 - -gUnknown_0856F4AC:: @ 856F4AC - .incbin "baserom.gba", 0x56f4ac, 0x20 - -gUnknown_0856F4CC:: @ 856F4CC - .incbin "baserom.gba", 0x56f4cc, 0x20 - -gUnknown_0856F4EC:: @ 856F4EC - .incbin "baserom.gba", 0x56f4ec, 0x20 - -gUnknown_0856F50C:: @ 856F50C - .incbin "baserom.gba", 0x56f50c, 0x20 - -gUnknown_0856F52C:: @ 856F52C - .incbin "baserom.gba", 0x56f52c, 0x20 - -gUnknown_0856F54C:: @ 856F54C - .incbin "baserom.gba", 0x56f54c, 0x20 - -gUnknown_0856F56C:: @ 856F56C - .incbin "baserom.gba", 0x56f56c, 0x20 - -gUnknown_0856F58C:: @ 856F58C - .incbin "baserom.gba", 0x56f58c, 0x20 - -gUnknown_0856F5AC:: @ 856F5AC - .incbin "baserom.gba", 0x56f5ac, 0x20 - -gUnknown_0856F5CC:: @ 856F5CC - .incbin "baserom.gba", 0x56f5cc, 0x248 - -gUnknown_0856F814:: @ 856F814 - .incbin "baserom.gba", 0x56f814, 0x2a0 - -gUnknown_0856FAB4:: @ 856FAB4 - .incbin "baserom.gba", 0x56fab4, 0x10 - -gUnknown_0856FAC4:: @ 856FAC4 - .incbin "baserom.gba", 0x56fac4, 0x20 - -gUnknown_0856FAE4:: @ 856FAE4 - .incbin "baserom.gba", 0x56fae4, 0x14 - -gUnknown_0856FAF8:: @ 856FAF8 - .incbin "baserom.gba", 0x56faf8, 0x14 - -gUnknown_0856FB0C:: @ 856FB0C - .incbin "baserom.gba", 0x56fb0c, 0x3 - -gUnknown_0856FB0F:: @ 856FB0F - .incbin "baserom.gba", 0x56fb0f, 0x9 - -gUnknown_0856FB18:: @ 856FB18 - .incbin "baserom.gba", 0x56fb18, 0x8 - -gUnknown_0856FB20:: @ 856FB20 - .incbin "baserom.gba", 0x56fb20, 0x8 - -gUnknown_0856FB28:: @ 856FB28 - .incbin "baserom.gba", 0x56fb28, 0x18 - -gUnknown_0856FB40:: @ 856FB40 - .incbin "baserom.gba", 0x56fb40, 0x8 - -gUnknown_0856FB48:: @ 856FB48 - .incbin "baserom.gba", 0x56fb48, 0x2 - -gUnknown_0856FB4A:: @ 856FB4A - .incbin "baserom.gba", 0x56fb4a, 0x2 - -gUnknown_0856FB4C:: @ 856FB4C - .incbin "baserom.gba", 0x56fb4c, 0x9 - -gUnknown_0856FB55:: @ 856FB55 - .incbin "baserom.gba", 0x56fb55, 0x2 - -gUnknown_0856FB57:: @ 856FB57 - .incbin "baserom.gba", 0x56fb57, 0x5 - -gUnknown_0856FB5C:: @ 856FB5C - .incbin "baserom.gba", 0x56fb5c, 0xc - -gUnknown_0856FB68:: @ 856FB68 - .incbin "baserom.gba", 0x56fb68, 0x6 - -gUnknown_0856FB6E:: @ 856FB6E - .incbin "baserom.gba", 0x56fb6e, 0x6 - -gUnknown_0856FB74:: @ 856FB74 - .incbin "baserom.gba", 0x56fb74, 0x4 - -gUnknown_0856FB78:: @ 856FB78 - .incbin "baserom.gba", 0x56fb78, 0x44 - -gUnknown_0856FBBC:: @ 856FBBC - .incbin "baserom.gba", 0x56fbbc, 0x1244 - -gUnknown_08570E00:: @ 8570E00 - .incbin "baserom.gba", 0x570e00, 0x260 - -gUnknown_08571060:: @ 8571060 - .incbin "baserom.gba", 0x571060, 0x260 - -gUnknown_085712C0:: @ 85712C0 - .incbin "baserom.gba", 0x5712c0, 0x38 - -gUnknown_085712F8:: @ 85712F8 - .incbin "baserom.gba", 0x5712f8, 0xe8 - -gUnknown_085713E0:: @ 85713E0 - .incbin "baserom.gba", 0x5713e0, 0x8 - -gUnknown_085713E8:: @ 85713E8 - .incbin "baserom.gba", 0x5713e8, 0xc - -gUnknown_085713F4:: @ 85713F4 - .incbin "baserom.gba", 0x5713f4, 0xc - -gUnknown_08571400:: @ 8571400 - .incbin "baserom.gba", 0x571400, 0x28 - -gUnknown_08571428:: @ 8571428 - .incbin "baserom.gba", 0x571428, 0x20 - -gUnknown_08571448:: @ 8571448 - .incbin "baserom.gba", 0x571448, 0x3 - -gUnknown_0857144B:: @ 857144B - .incbin "baserom.gba", 0x57144b, 0x3 - -gUnknown_0857144E:: @ 857144E - .incbin "baserom.gba", 0x57144e, 0x6 - -gUnknown_08571454:: @ 8571454 - .incbin "baserom.gba", 0x571454, 0x68 - -gUnknown_085714BC:: @ 85714BC - .incbin "baserom.gba", 0x5714bc, 0x18 - -gUnknown_085714D4:: @ 85714D4 - .incbin "baserom.gba", 0x5714d4, 0x10 - -gUnknown_085714E4:: @ 85714E4 - .incbin "baserom.gba", 0x5714e4, 0xd0 - -gUnknown_085715B4:: @ 85715B4 - .incbin "baserom.gba", 0x5715b4, 0x30 - -gUnknown_085715E4:: @ 85715E4 - .incbin "baserom.gba", 0x5715e4, 0x18 - -gUnknown_085715FC:: @ 85715FC - .incbin "baserom.gba", 0x5715fc, 0x18 - -gUnknown_08571614:: @ 8571614 - .incbin "baserom.gba", 0x571614, 0x3c - -gUnknown_08571650:: @ 8571650 - .incbin "baserom.gba", 0x571650, 0x70 - -gUnknown_085716C0:: @ 85716C0 - .incbin "baserom.gba", 0x5716c0, 0x28 - -gUnknown_085716E8:: @ 85716E8 - .incbin "baserom.gba", 0x5716e8, 0x28 - -gUnknown_08571710:: @ 8571710 - .incbin "baserom.gba", 0x571710, 0x24 - -gUnknown_08571734:: @ 8571734 - .incbin "baserom.gba", 0x571734, 0x3 - -gUnknown_08571737:: @ 8571737 - .incbin "baserom.gba", 0x571737, 0x5 - -gUnknown_0857173C:: @ 857173C - .incbin "baserom.gba", 0x57173c, 0x20 - -gUnknown_0857175C:: @ 857175C - .incbin "baserom.gba", 0x57175c, 0x800 - -gUnknown_08571F5C:: @ 8571F5C - .incbin "baserom.gba", 0x571f5c, 0x180 - -gUnknown_085720DC:: @ 85720DC - .incbin "baserom.gba", 0x5720dc, 0x98 - -gUnknown_08572174:: @ 8572174 - .incbin "baserom.gba", 0x572174, 0x12c - -gUnknown_085722A0:: @ 85722A0 - .incbin "baserom.gba", 0x5722a0, 0xfc - -gUnknown_0857239C:: @ 857239C - .incbin "baserom.gba", 0x57239c, 0x40 - -gUnknown_085723DC:: @ 85723DC - .incbin "baserom.gba", 0x5723dc, 0x20 - -gUnknown_085723FC:: @ 85723FC - .incbin "baserom.gba", 0x5723fc, 0x20 - -gUnknown_0857241C:: @ 857241C - .incbin "baserom.gba", 0x57241c, 0x20 - -gUnknown_0857243C:: @ 857243C - .incbin "baserom.gba", 0x57243c, 0x20 - -gUnknown_0857245C:: @ 857245C - .incbin "baserom.gba", 0x57245c, 0x48 - -gUnknown_085724A4:: @ 85724A4 - .incbin "baserom.gba", 0x5724a4, 0x18 - -gUnknown_085724BC:: @ 85724BC - .incbin "baserom.gba", 0x5724bc, 0x238 - -gUnknown_085726F4:: @ 85726F4 - .incbin "baserom.gba", 0x5726f4, 0x20 - -gUnknown_08572714:: @ 8572714 - .incbin "baserom.gba", 0x572714, 0x20 - -gUnknown_08572734:: @ 8572734 - .incbin "baserom.gba", 0x572734, 0x10 - -gUnknown_08572744:: @ 8572744 - .incbin "baserom.gba", 0x572744, 0x8 - -gUnknown_0857274C:: @ 857274C - .incbin "baserom.gba", 0x57274c, 0x8 - -gUnknown_08572754:: @ 8572754 - .incbin "baserom.gba", 0x572754, 0x18 - -gUnknown_0857276C:: @ 857276C - .incbin "baserom.gba", 0x57276c, 0xf8 - -gUnknown_08572864:: @ 8572864 - .incbin "baserom.gba", 0x572864, 0x58 - -gUnknown_085728BC:: @ 85728BC - .incbin "baserom.gba", 0x5728bc, 0x18 - -gUnknown_085728D4:: @ 85728D4 - .incbin "baserom.gba", 0x5728d4, 0x48 - -gUnknown_0857291C:: @ 857291C - .incbin "baserom.gba", 0x57291c, 0x4c58 - -gUnknown_08577574:: @ 8577574 - .incbin "baserom.gba", 0x577574, 0x44 - -gUnknown_085775B8:: @ 85775B8 - .incbin "baserom.gba", 0x5775b8, 0x398c - -gUnknown_0857AF44:: @ 857AF44 - .incbin "baserom.gba", 0x57af44, 0xc0 - -gUnknown_0857B004:: @ 857B004 - .incbin "baserom.gba", 0x57b004, 0x7c - -gUnknown_0857B080:: @ 857B080 - .incbin "baserom.gba", 0x57b080, 0x28 - -gUnknown_0857B0A8:: @ 857B0A8 - .incbin "baserom.gba", 0x57b0a8, 0x38 - -gUnknown_0857B0E0:: @ 857B0E0 - .incbin "baserom.gba", 0x57b0e0, 0x8b8 - -gUnknown_0857B998:: @ 857B998 - .incbin "baserom.gba", 0x57b998, 0xc - -gUnknown_0857B9A4:: @ 857B9A4 - .incbin "baserom.gba", 0x57b9a4, 0x18 - -gUnknown_0857B9BC:: @ 857B9BC - .incbin "baserom.gba", 0x57b9bc, 0x28 - -gUnknown_0857B9E4:: @ 857B9E4 - .incbin "baserom.gba", 0x57b9e4, 0x18 - -gUnknown_0857B9FC:: @ 857B9FC - .incbin "baserom.gba", 0x57b9fc, 0x54 - -gUnknown_0857BA50:: @ 857BA50 - .incbin "baserom.gba", 0x57ba50, 0x18 - -gUnknown_0857BA68:: @ 857BA68 - .incbin "baserom.gba", 0x57ba68, 0x18 - -gUnknown_0857BA80:: @ 857BA80 - .incbin "baserom.gba", 0x57ba80, 0x9c - -gUnknown_0857BB1C:: @ 857BB1C - .incbin "baserom.gba", 0x57bb1c, 0x8 - -gUnknown_0857BB24:: @ 857BB24 - .incbin "baserom.gba", 0x57bb24, 0x14c - -gUnknown_0857BC70:: @ 857BC70 - .incbin "baserom.gba", 0x57bc70, 0x18 - -gUnknown_0857BC88:: @ 857BC88 - .incbin "baserom.gba", 0x57bc88, 0x20 - -@ 857BCA8 - .include "data/graphics/pokemon/mon_icon_table.inc" - -@ 857C388 - .include "data/graphics/pokemon/mon_icon_palette_indices.inc" - -@ 857C540 - .include "data/graphics/pokemon/mon_icon_palette_table.inc" - -gUnknown_0857C570:: @ 857C570 - .incbin "baserom.gba", 0x57c570, 0x44 - -gUnknown_0857C5B4:: @ 857C5B4 - .incbin "baserom.gba", 0x57c5b4, 0x34 - -gUnknown_0857C5E8:: @ 857C5E8 - .incbin "baserom.gba", 0x57c5e8, 0x8 - -gUnknown_0857C5F0:: @ 857C5F0 - .incbin "baserom.gba", 0x57c5f0, 0x18 - -gUnknown_0857C608:: @ 857C608 - .incbin "baserom.gba", 0x57c608, 0x2 - -gUnknown_0857C60A:: @ 857C60A - .incbin "baserom.gba", 0x57c60a, 0x5a - - .align 2 -gFieldEffectObjectPaletteInfo6:: @ 857C664 - obj_pal gFieldEffectObjectPalette6, 0x1000 - -gUnknown_0857C66C:: @ 857C66C - .incbin "baserom.gba", 0x57c66c, 0x18 - -gUnknown_0857C684:: @ 857C684 - .incbin "baserom.gba", 0x57c684, 0x1680 - -gUnknown_0857DD04:: @ 857DD04 - .incbin "baserom.gba", 0x57dd04, 0x1680 - -gUnknown_0857F384:: @ 857F384 - .incbin "baserom.gba", 0x57f384, 0xc0 - -gUnknown_0857F444:: @ 857F444 - .incbin "baserom.gba", 0x57f444, 0x20 - -gUnknown_0857F464:: @ 857F464 - .incbin "baserom.gba", 0x57f464, 0xe0 - -gUnknown_0857F544:: @ 857F544 - .incbin "baserom.gba", 0x57f544, 0x5f0 - -gUnknown_0857FB34:: @ 857FB34 - .incbin "baserom.gba", 0x57fb34, 0x8 - -gUnknown_0857FB3C:: @ 857FB3C - .incbin "baserom.gba", 0x57fb3c, 0x8 - -gUnknown_0857FB44:: @ 857FB44 - .incbin "baserom.gba", 0x57fb44, 0x8 - -gUnknown_0857FB4C:: @ 857FB4C - .incbin "baserom.gba", 0x57fb4c, 0x4c - -gUnknown_0857FB98:: @ 857FB98 - .incbin "baserom.gba", 0x57fb98, 0x4 - -gUnknown_0857FB9C:: @ 857FB9C - .incbin "baserom.gba", 0x57fb9c, 0x4 - -gUnknown_0857FBA0:: @ 857FBA0 - .incbin "baserom.gba", 0x57fba0, 0x8 - -gUnknown_0857FBA8:: @ 857FBA8 - .incbin "baserom.gba", 0x57fba8, 0x8 - -gUnknown_0857FBB0:: @ 857FBB0 - .incbin "baserom.gba", 0x57fbb0, 0x3c - -gUnknown_0857FBEC:: @ 857FBEC - .incbin "baserom.gba", 0x57fbec, 0x90 - -gUnknown_0857FC7C:: @ 857FC7C - .incbin "baserom.gba", 0x57fc7c, 0x18 - -@ 857FC94 - .include "data/graphics/berries/berry_pic_table.inc" - -gUnknown_0857FDEC:: @ 857FDEC - .incbin "baserom.gba", 0x57fdec, 0x8 - -gUnknown_0857FDF4:: @ 857FDF4 - .incbin "baserom.gba", 0x57fdf4, 0x1c - -gUnknown_0857FE10:: @ 857FE10 - .incbin "baserom.gba", 0x57fe10, 0x90 - -@ 857FEA0 - .include "data/text/item_descriptions.inc" - -@ 85839A0 - .include "data/items.inc" - -gUnknown_08587A6C:: @ 8587A6C - .incbin "baserom.gba", 0x587a6c, 0x4 - -gUnknown_08587A70:: @ 8587A70 - .incbin "baserom.gba", 0x587a70, 0x4 - -gUnknown_08587A74:: @ 8587A74 - .incbin "baserom.gba", 0x587a74, 0x5c - -gUnknown_08587AD0:: @ 8587AD0 - .incbin "baserom.gba", 0x587ad0, 0x18 - -gUnknown_08587AE8:: @ 8587AE8 - .incbin "baserom.gba", 0x587ae8, 0x20 - -gUnknown_08587B08:: @ 8587B08 - .incbin "baserom.gba", 0x587b08, 0x10 - -gUnknown_08587B18:: @ 8587B18 - .incbin "baserom.gba", 0x587b18, 0x68 - -gUnknown_08587B80:: @ 8587B80 - .incbin "baserom.gba", 0x587b80, 0x30 - -gUnknown_08587BB0:: @ 8587BB0 - .incbin "baserom.gba", 0x587bb0, 0x8 - -gUnknown_08587BB8:: @ 8587BB8 - .incbin "baserom.gba", 0x587bb8, 0x10 - -gUnknown_08587BC8:: @ 8587BC8 - .incbin "baserom.gba", 0x587bc8, 0x20 - -gUnknown_08587BE8:: @ 8587BE8 - .incbin "baserom.gba", 0x587be8, 0x18 - -gUnknown_08587C00:: @ 8587C00 - .incbin "baserom.gba", 0x587c00, 0x8 - -gUnknown_08587C08:: @ 8587C08 - .incbin "baserom.gba", 0x587c08, 0x8 - -gUnknown_08587C10:: @ 8587C10 - .incbin "baserom.gba", 0x587c10, 0x8 - -gUnknown_08587C18:: @ 8587C18 - .incbin "baserom.gba", 0x587c18, 0x18 - -gUnknown_08587C30:: @ 8587C30 - .incbin "baserom.gba", 0x587c30, 0x20 - -@ 8587C50 - .include "data/text/contest_text_pointers.inc" - -@ 8587D5C - .incbin "baserom.gba", 0x587d5c, 0x34 - -gUnknown_08587D90:: @ 8587D90 - .incbin "baserom.gba", 0x587d90, 0x80 - -gUnknown_08587E10:: @ 8587E10 - .incbin "baserom.gba", 0x587e10, 0xf8 - -gUnknown_08587F08:: @ 8587F08 - .incbin "baserom.gba", 0x587f08, 0x14 - -gUnknown_08587F1C:: @ 8587F1C - .incbin "baserom.gba", 0x587f1c, 0x18 - -gUnknown_08587F34:: @ 8587F34 - .incbin "baserom.gba", 0x587f34, 0x10 - -gUnknown_08587F44:: @ 8587F44 - .incbin "baserom.gba", 0x587f44, 0x60 - -gUnknown_08587FA4:: @ 8587FA4 - .incbin "baserom.gba", 0x587fa4, 0x100 - -gUnknown_085880A4:: @ 85880A4 - .incbin "baserom.gba", 0x5880a4, 0x1740 - -gUnknown_085897E4:: @ 85897E4 - .incbin "baserom.gba", 0x5897e4, 0xc0 - -gUnknown_085898A4:: @ 85898A4 - .incbin "baserom.gba", 0x5898a4, 0x60 - -gUnknown_08589904:: @ 8589904 - .incbin "baserom.gba", 0x589904, 0x20 - -gUnknown_08589924:: @ 8589924 - .incbin "baserom.gba", 0x589924, 0x68 - -gUnknown_0858998C:: @ 858998C - .incbin "baserom.gba", 0x58998c, 0x60 - -gUnknown_085899EC:: @ 85899EC - .incbin "baserom.gba", 0x5899ec, 0x1c - -gUnknown_08589A08:: @ 8589A08 - .incbin "baserom.gba", 0x589a08, 0x8 - -gUnknown_08589A10:: @ 8589A10 - .incbin "baserom.gba", 0x589a10, 0x18 - -gUnknown_08589A28:: @ 8589A28 - .incbin "baserom.gba", 0x589a28, 0x10 - -gUnknown_08589A38:: @ 8589A38 - .incbin "baserom.gba", 0x589a38, 0x10 - -gUnknown_08589A48:: @ 8589A48 - .incbin "baserom.gba", 0x589a48, 0x18 - -gUnknown_08589A60:: @ 8589A60 - .incbin "baserom.gba", 0x589a60, 0x10 - -gUnknown_08589A70:: @ 8589A70 - .incbin "baserom.gba", 0x589a70, 0x38 - -gUnknown_08589AA8:: @ 8589AA8 - .incbin "baserom.gba", 0x589aa8, 0x8 - -gUnknown_08589AB0:: @ 8589AB0 - .incbin "baserom.gba", 0x589ab0, 0x3 - -gUnknown_08589AB3:: @ 8589AB3 - .incbin "baserom.gba", 0x589ab3, 0x7 - -gUnknown_08589ABA:: @ 8589ABA - .incbin "baserom.gba", 0x589aba, 0x6 - -gUnknown_08589AC0:: @ 8589AC0 - .incbin "baserom.gba", 0x589ac0, 0x6 - -gUnknown_08589AC6:: @ 8589AC6 - .incbin "baserom.gba", 0x589ac6, 0x6 - -gUnknown_08589ACC:: @ 8589ACC - .incbin "baserom.gba", 0x589acc, 0x6 - -gUnknown_08589AD2:: @ 8589AD2 - .incbin "baserom.gba", 0x589ad2, 0x6 - -gUnknown_08589AD8:: @ 8589AD8 - .incbin "baserom.gba", 0x589ad8, 0x6 - -gUnknown_08589ADE:: @ 8589ADE - .incbin "baserom.gba", 0x589ade, 0x6 - -@ 8589AE4 - .include "data/text/berry_descriptions.inc" - -@ 858A670 - .include "data/berries.inc" - -gUnknown_0858AB24:: @ 858AB24 - .incbin "baserom.gba", 0x58ab24, 0xac - -gUnknown_0858ABD0:: @ 858ABD0 - .incbin "baserom.gba", 0x58abd0, 0xb90 - -gUnknown_0858B760:: @ 858B760 - .incbin "baserom.gba", 0x58b760, 0x390 - -gUnknown_0858BAF0:: @ 858BAF0 - .incbin "baserom.gba", 0x58baf0, 0x78 - -gUnknown_0858BB68:: @ 858BB68 - .incbin "baserom.gba", 0x58bb68, 0x8 - -gUnknown_0858BB70:: @ 858BB70 - .incbin "baserom.gba", 0x58bb70, 0x10 - -gUnknown_0858BB80:: @ 858BB80 - .incbin "baserom.gba", 0x58bb80, 0x1c - -gUnknown_0858BB9C:: @ 858BB9C - .incbin "baserom.gba", 0x58bb9c, 0x10 - -gUnknown_0858BBAC:: @ 858BBAC - .incbin "baserom.gba", 0x58bbac, 0x10 - -gUnknown_0858BBBC:: @ 858BBBC - .incbin "baserom.gba", 0x58bbbc, 0x10 - -gUnknown_0858BBCC:: @ 858BBCC - .incbin "baserom.gba", 0x58bbcc, 0x14 - -gUnknown_0858BBE0:: @ 858BBE0 - .incbin "baserom.gba", 0x58bbe0, 0xc - -gUnknown_0858BBEC:: @ 858BBEC - .incbin "baserom.gba", 0x58bbec, 0x18c - -gUnknown_0858BD78:: @ 858BD78 - .incbin "baserom.gba", 0x58bd78, 0x40 - -gUnknown_0858BDB8:: @ 858BDB8 - .incbin "baserom.gba", 0x58bdb8, 0x10 - -gUnknown_0858BDC8:: @ 858BDC8 - .incbin "baserom.gba", 0x58bdc8, 0x38 - -gUnknown_0858BE00:: @ 858BE00 - .incbin "baserom.gba", 0x58be00, 0x10 - -gUnknown_0858BE10:: @ 858BE10 - .incbin "baserom.gba", 0x58be10, 0x30 - -gUnknown_0858BE40:: @ 858BE40 - .incbin "baserom.gba", 0x58be40, 0x60 - -gUnknown_0858BEA0:: @ 858BEA0 - .incbin "baserom.gba", 0x58bea0, 0x3 - -gUnknown_0858BEA3:: @ 858BEA3 - .incbin "baserom.gba", 0x58bea3, 0x18 - -gUnknown_0858BEBB:: @ 858BEBB - .incbin "baserom.gba", 0x58bebb, 0x3 - -gUnknown_0858BEBE:: @ 858BEBE - .incbin "baserom.gba", 0x58bebe, 0x3 - -gUnknown_0858BEC1:: @ 858BEC1 - .incbin "baserom.gba", 0x58bec1, 0x3 - -gUnknown_0858BEC4:: @ 858BEC4 - .incbin "baserom.gba", 0x58bec4, 0x10 - -gUnknown_0858BED4:: @ 858BED4 - .incbin "baserom.gba", 0x58bed4, 0x8 - -gUnknown_0858BEDC:: @ 858BEDC - .incbin "baserom.gba", 0x58bedc, 0x8 - -gUnknown_0858BEE4:: @ 858BEE4 - .incbin "baserom.gba", 0x58bee4, 0x4 - -gUnknown_0858BEE8:: @ 858BEE8 - .incbin "baserom.gba", 0x58bee8, 0x10 - -gUnknown_0858BEF8:: @ 858BEF8 - .incbin "baserom.gba", 0x58bef8, 0x6 - -gUnknown_0858BEFE:: @ 858BEFE - .incbin "baserom.gba", 0x58befe, 0x6 - -gUnknown_0858BF04:: @ 858BF04 - .incbin "baserom.gba", 0x58bf04, 0x14 - -gUnknown_0858BF18:: @ 858BF18 - .incbin "baserom.gba", 0x58bf18, 0x10 - -gUnknown_0858BF28:: @ 858BF28 - .incbin "baserom.gba", 0x58bf28, 0xc - -gUnknown_0858BF34:: @ 858BF34 - .incbin "baserom.gba", 0x58bf34, 0xa - -gUnknown_0858BF3E:: @ 858BF3E - .incbin "baserom.gba", 0x58bf3e, 0xa - -gUnknown_0858BF48:: @ 858BF48 - .incbin "baserom.gba", 0x58bf48, 0x8 - -gUnknown_0858BF50:: @ 858BF50 - .incbin "baserom.gba", 0x58bf50, 0x8 - -gUnknown_0858BF58:: @ 858BF58 - .incbin "baserom.gba", 0x58bf58, 0x14 - -gUnknown_0858BF6C:: @ 858BF6C - .incbin "baserom.gba", 0x58bf6c, 0x8 - -gUnknown_0858BF74:: @ 858BF74 - .incbin "baserom.gba", 0x58bf74, 0x14 - -gUnknown_0858BF88:: @ 858BF88 - .incbin "baserom.gba", 0x58bf88, 0x4 - -gUnknown_0858BF8C:: @ 858BF8C - .incbin "baserom.gba", 0x58bf8c, 0xc - -gUnknown_0858BF98:: @ 858BF98 - .incbin "baserom.gba", 0x58bf98, 0xc - -gUnknown_0858BFA4:: @ 858BFA4 - .incbin "baserom.gba", 0x58bfa4, 0x34 - -gUnknown_0858BFD8:: @ 858BFD8 - .incbin "baserom.gba", 0x58bfd8, 0x78 - -gUnknown_0858C050:: @ 858C050 - .incbin "baserom.gba", 0x58c050, 0x8 - -gUnknown_0858C058:: @ 858C058 - .incbin "baserom.gba", 0x58c058, 0x18 - -gUnknown_0858C070:: @ 858C070 - .incbin "baserom.gba", 0x58c070, 0x8 - -gUnknown_0858C078:: @ 858C078 - .incbin "baserom.gba", 0x58c078, 0x48 - -gUnknown_0858C0C0:: @ 858C0C0 - .incbin "baserom.gba", 0x58c0c0, 0x18 - -gUnknown_0858C0D8:: @ 858C0D8 - .incbin "baserom.gba", 0x58c0d8, 0x18 - -gUnknown_0858C0F0:: @ 858C0F0 - .incbin "baserom.gba", 0x58c0f0, 0x18 - -gUnknown_0858C108:: @ 858C108 - .incbin "baserom.gba", 0x58c108, 0x18 - -gUnknown_0858C120:: @ 858C120 - .incbin "baserom.gba", 0x58c120, 0x18 - -gUnknown_0858C138:: @ 858C138 - .incbin "baserom.gba", 0x58c138, 0x18 - -gUnknown_0858C150:: @ 858C150 - .incbin "baserom.gba", 0x58c150, 0x18 - -gUnknown_0858C168:: @ 858C168 - .incbin "baserom.gba", 0x58c168, 0x18 - -gUnknown_0858C180:: @ 858C180 - .incbin "baserom.gba", 0x58c180, 0x18 - -gUnknown_0858C198:: @ 858C198 - .incbin "baserom.gba", 0x58c198, 0x30 - -gUnknown_0858C1C8:: @ 858C1C8 - .incbin "baserom.gba", 0x58c1c8, 0x68 - -gUnknown_0858C230:: @ 858C230 - .incbin "baserom.gba", 0x58c230, 0x5c - -gUnknown_0858C28C:: @ 858C28C - .incbin "baserom.gba", 0x58c28c, 0x18 - -gUnknown_0858C2A4:: @ 858C2A4 - .incbin "baserom.gba", 0x58c2a4, 0x8 - -gUnknown_0858C2AC:: @ 858C2AC - .incbin "baserom.gba", 0x58c2ac, 0x8 - -@ 858C2B4 - .include "data/contest_moves.inc" - -@ 858CDCC - .include "data/contest_effects.inc" - -@ A lookup table with a 1 for each combo starter ID and a 0 for ID 0, -@ which means "not a combo starter move". -gComboStarterLookupTable:: @ 858CE8C - .byte 0 - .rept 62 - .byte 1 - .endr - - .align 2 -@ 858CECC - .include "data/contest_effect_function_table.inc" - -gUnknown_0858CF8C:: @ 858CF8C - .incbin "baserom.gba", 0x58cf8c, 0x2 - -gUnknown_0858CF8E:: @ 858CF8E - .incbin "baserom.gba", 0x58cf8e, 0x6 - -gUnknown_0858CF94:: @ 858CF94 - .incbin "baserom.gba", 0x58cf94, 0x24 - -gUnknown_0858CFB8:: @ 858CFB8 - .incbin "baserom.gba", 0x58cfb8, 0x6 - -gUnknown_0858CFBE:: @ 858CFBE - .incbin "baserom.gba", 0x58cfbe, 0xe - -gUnknown_0858CFCC:: @ 858CFCC - .incbin "baserom.gba", 0x58cfcc, 0x1c - -gUnknown_0858CFE8:: @ 858CFE8 - .incbin "baserom.gba", 0x58cfe8, 0x60 - -gUnknown_0858D048:: @ 858D048 - .incbin "baserom.gba", 0x58d048, 0x10 - -gUnknown_0858D058:: @ 858D058 - .incbin "baserom.gba", 0x58d058, 0x8 - -gUnknown_0858D060:: @ 858D060 - .incbin "baserom.gba", 0x58d060, 0xc - -gUnknown_0858D06C:: @ 858D06C - .incbin "baserom.gba", 0x58d06c, 0x10 - -gUnknown_0858D07C:: @ 858D07C - .incbin "baserom.gba", 0x58d07c, 0x18 - -gUnknown_0858D094:: @ 858D094 - .incbin "baserom.gba", 0x58d094, 0x3c - -gUnknown_0858D0D0:: @ 858D0D0 - .incbin "baserom.gba", 0x58d0d0, 0xe - -gUnknown_0858D0DE:: @ 858D0DE - .incbin "baserom.gba", 0x58d0de, 0xe - -gUnknown_0858D0EC:: @ 858D0EC - .incbin "baserom.gba", 0x58d0ec, 0x1c - -gUnknown_0858D108:: @ 858D108 - .incbin "baserom.gba", 0x58d108, 0x14 - -gUnknown_0858D11C:: @ 858D11C - .incbin "baserom.gba", 0x58d11c, 0x14 - -gUnknown_0858D130:: @ 858D130 - .incbin "baserom.gba", 0x58d130, 0x14 - -gUnknown_0858D144:: @ 858D144 - .incbin "baserom.gba", 0x58d144, 0xc - -gUnknown_0858D150:: @ 858D150 - .incbin "baserom.gba", 0x58d150, 0x20 - -gUnknown_0858D170:: @ 858D170 - .incbin "baserom.gba", 0x58d170, 0x18 - -gUnknown_0858D188:: @ 858D188 - .incbin "baserom.gba", 0x58d188, 0x14 - -gUnknown_0858D19C:: @ 858D19C - .incbin "baserom.gba", 0x58d19c, 0x4 - -gUnknown_0858D1A0:: @ 858D1A0 - .incbin "baserom.gba", 0x58d1a0, 0x30 - -gUnknown_0858D1D0:: @ 858D1D0 - .incbin "baserom.gba", 0x58d1d0, 0x34 - -gUnknown_0858D204:: @ 858D204 - .incbin "baserom.gba", 0x58d204, 0x24 - -gUnknown_0858D228:: @ 858D228 - .incbin "baserom.gba", 0x58d228, 0x18 - -gUnknown_0858D240:: @ 858D240 - .incbin "baserom.gba", 0x58d240, 0x3c - -gUnknown_0858D27C:: @ 858D27C - .incbin "baserom.gba", 0x58d27c, 0x84 - -gUnknown_0858D300:: @ 858D300 - .incbin "baserom.gba", 0x58d300, 0x20 - -gUnknown_0858D320:: @ 858D320 - .incbin "baserom.gba", 0x58d320, 0x18 - -gUnknown_0858D338:: @ 858D338 - .incbin "baserom.gba", 0x58d338, 0x4c - -gUnknown_0858D384:: @ 858D384 - .incbin "baserom.gba", 0x58d384, 0x10 - -gUnknown_0858D394:: @ 858D394 - .incbin "baserom.gba", 0x58d394, 0x1c - -gUnknown_0858D3B0:: @ 858D3B0 - .incbin "baserom.gba", 0x58d3b0, 0x8 - -gUnknown_0858D3B8:: @ 858D3B8 - .incbin "baserom.gba", 0x58d3b8, 0xc - -gUnknown_0858D3C4:: @ 858D3C4 - .incbin "baserom.gba", 0x58d3c4, 0x2c - -gUnknown_0858D3F0:: @ 858D3F0 - .incbin "baserom.gba", 0x58d3f0, 0x1c - -gUnknown_0858D40C:: @ 858D40C - .incbin "baserom.gba", 0x58d40c, 0xc - -gUnknown_0858D418:: @ 858D418 - .incbin "baserom.gba", 0x58d418, 0x10 - -gUnknown_0858D428:: @ 858D428 - .incbin "baserom.gba", 0x58d428, 0x34 - -gUnknown_0858D45C:: @ 858D45C - .incbin "baserom.gba", 0x58d45c, 0x38 - -gUnknown_0858D494:: @ 858D494 - .incbin "baserom.gba", 0x58d494, 0x4 - -gUnknown_0858D498:: @ 858D498 - .incbin "baserom.gba", 0x58d498, 0x1c - -gUnknown_0858D4B4:: @ 858D4B4 - .incbin "baserom.gba", 0x58d4b4, 0x30 - -gUnknown_0858D4E4:: @ 858D4E4 - .incbin "baserom.gba", 0x58d4e4, 0x40 - -gUnknown_0858D524:: @ 858D524 - .incbin "baserom.gba", 0x58d524, 0x4c - -gUnknown_0858D570:: @ 858D570 - .incbin "baserom.gba", 0x58d570, 0x24 - -gUnknown_0858D594:: @ 858D594 - .incbin "baserom.gba", 0x58d594, 0xac - -gUnknown_0858D640:: @ 858D640 - .incbin "baserom.gba", 0x58d640, 0x2c - -gUnknown_0858D66C:: @ 858D66C - .incbin "baserom.gba", 0x58d66c, 0x24 - -gUnknown_0858D690:: @ 858D690 - .incbin "baserom.gba", 0x58d690, 0x20 - -gUnknown_0858D6B0:: @ 858D6B0 - .incbin "baserom.gba", 0x58d6b0, 0x20 - -gUnknown_0858D6D0:: @ 858D6D0 - .incbin "baserom.gba", 0x58d6d0, 0x128 - -gUnknown_0858D7F8:: @ 858D7F8 - .incbin "baserom.gba", 0x58d7f8, 0x18 - -gUnknown_0858D810:: @ 858D810 - .incbin "baserom.gba", 0x58d810, 0x40 - -gUnknown_0858D850:: @ 858D850 - .incbin "baserom.gba", 0x58d850, 0x10 - -gUnknown_0858D860:: @ 858D860 - .incbin "baserom.gba", 0x58d860, 0x18 - -gUnknown_0858D878:: @ 858D878 - .incbin "baserom.gba", 0x58d878, 0x8 - -gUnknown_0858D880:: @ 858D880 - .incbin "baserom.gba", 0x58d880, 0x8 - -gUnknown_0858D888:: @ 858D888 - .incbin "baserom.gba", 0x58d888, 0x10 - -gUnknown_0858D898:: @ 858D898 - .incbin "baserom.gba", 0x58d898, 0x30 - -gUnknown_0858D8C8:: @ 858D8C8 - .incbin "baserom.gba", 0x58d8c8, 0x18 - -gUnknown_0858D8E0:: @ 858D8E0 - .incbin "baserom.gba", 0x58d8e0, 0x8 - -gUnknown_0858D8E8:: @ 858D8E8 - .incbin "baserom.gba", 0x58d8e8, 0x4 - -gUnknown_0858D8EC:: @ 858D8EC - .incbin "baserom.gba", 0x58d8ec, 0x4 - -gUnknown_0858D8F0:: @ 858D8F0 - .incbin "baserom.gba", 0x58d8f0, 0x80 - -gUnknown_0858D970:: @ 858D970 - .incbin "baserom.gba", 0x58d970, 0x2a8 - - .align 2 -gFieldEffectObjectPalette7:: @ 858DC18 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal" - - .incbin "baserom.gba", 0x58dc38, 0x580 - - .align 2 -gFieldEffectObjectPalette8:: @ 858E1B8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal" - - .incbin "baserom.gba", 0x58e1d8, 0x428 - -gUnknown_0858E600:: @ 858E600 - .incbin "baserom.gba", 0x58e600, 0x18 - -gUnknown_0858E618:: @ 858E618 - .incbin "baserom.gba", 0x58e618, 0x18 - -gUnknown_0858E630:: @ 858E630 - .incbin "baserom.gba", 0x58e630, 0x18 - - .align 2 -gFieldEffectObjectPaletteInfo7:: @ 858E648 - obj_pal gFieldEffectObjectPalette7, 0x1003 - - .align 2 -gFieldEffectObjectPaletteInfo8:: @ 858E650 - obj_pal gFieldEffectObjectPalette8, 0x1008 - - .incbin "baserom.gba", 0x58e658, 0x34 - -gUnknown_0858E68C:: @ 858E68C - .incbin "baserom.gba", 0x58e68c, 0x18 - - .align 2 -@ This uses one of the secret base palettes, so there is no -@ "field_effect_object_palette_09.pal" file. -gFieldEffectObjectPaletteInfo9:: @ 858E6A4 - obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E - - .incbin "baserom.gba", 0x58e6ac, 0x1b8 - -gUnknown_0858E864:: @ 858E864 - .incbin "baserom.gba", 0x58e864, 0x1c - -gUnknown_0858E880:: @ 858E880 - .incbin "baserom.gba", 0x58e880, 0x18 - -gUnknown_0858E898:: @ 858E898 - .incbin "baserom.gba", 0x58e898, 0x13 - -gUnknown_0858E8AB:: @ 858E8AB - .incbin "baserom.gba", 0x58e8ab, 0x2 - -gUnknown_0858E8AD:: @ 858E8AD - .incbin "baserom.gba", 0x58e8ad, 0x3 - -gUnknown_0858E8B0:: @ 858E8B0 - .incbin "baserom.gba", 0x58e8b0, 0x40 - -gUnknown_0858E8F0:: @ 858E8F0 - .incbin "baserom.gba", 0x58e8f0, 0x3468 - -gUnknown_08591D58:: @ 8591D58 - .incbin "baserom.gba", 0x591d58, 0x270 - -gUnknown_08591FC8:: @ 8591FC8 - .incbin "baserom.gba", 0x591fc8, 0x18 - -gUnknown_08591FE0:: @ 8591FE0 - .incbin "baserom.gba", 0x591fe0, 0x18 - -gUnknown_08591FF8:: @ 8591FF8 - .incbin "baserom.gba", 0x591ff8, 0x10 - -gUnknown_08592008:: @ 8592008 - .incbin "baserom.gba", 0x592008, 0x10 - -gUnknown_08592018:: @ 8592018 - .incbin "baserom.gba", 0x592018, 0x10 - -gUnknown_08592028:: @ 8592028 - .incbin "baserom.gba", 0x592028, 0x10 - -gUnknown_08592038:: @ 8592038 - .incbin "baserom.gba", 0x592038, 0x20 - -gUnknown_08592058:: @ 8592058 - .incbin "baserom.gba", 0x592058, 0x20 - -gUnknown_08592078:: @ 8592078 - .incbin "baserom.gba", 0x592078, 0x60 - -gUnknown_085920D8:: @ 85920D8 - .incbin "baserom.gba", 0x5920d8, 0xc - -gUnknown_085920E4:: @ 85920E4 - .incbin "baserom.gba", 0x5920e4, 0x4 - -gUnknown_085920E8:: @ 85920E8 - .incbin "baserom.gba", 0x5920e8, 0x128 - -gUnknown_08592210:: @ 8592210 - .incbin "baserom.gba", 0x592210, 0x4f0 - -gUnknown_08592700:: @ 8592700 - .incbin "baserom.gba", 0x592700, 0x78 - -gUnknown_08592778:: @ 8592778 - .incbin "baserom.gba", 0x592778, 0x100 - -gUnknown_08592878:: @ 8592878 - .incbin "baserom.gba", 0x592878, 0x458 - -gUnknown_08592CD0:: @ 8592CD0 - .incbin "baserom.gba", 0x592cd0, 0x1ec - -gUnknown_08592EBC:: @ 8592EBC - .incbin "baserom.gba", 0x592ebc, 0x30 - -gUnknown_08592EEC:: @ 8592EEC - .incbin "baserom.gba", 0x592eec, 0x134 - -gUnknown_08593020:: @ 8593020 - .incbin "baserom.gba", 0x593020, 0xf4 - -gUnknown_08593114:: @ 8593114 - .incbin "baserom.gba", 0x593114, 0x29c - -gUnknown_085933B0:: @ 85933B0 - .incbin "baserom.gba", 0x5933b0, 0xf0 - -gUnknown_085934A0:: @ 85934A0 - .incbin "baserom.gba", 0x5934a0, 0x148 - -gUnknown_085935E8:: @ 85935E8 - .incbin "baserom.gba", 0x5935e8, 0x20 - -gUnknown_08593608:: @ 8593608 - .incbin "baserom.gba", 0x593608, 0x9c - -gUnknown_085936A4:: @ 85936A4 - .incbin "baserom.gba", 0x5936a4, 0x20c - -gUnknown_085938B0:: @ 85938B0 - .incbin "baserom.gba", 0x5938b0, 0x2c - -gUnknown_085938DC:: @ 85938DC - .incbin "baserom.gba", 0x5938dc, 0x18 - -gUnknown_085938F4:: @ 85938F4 - .incbin "baserom.gba", 0x5938f4, 0x5c - -gUnknown_08593950:: @ 8593950 - .incbin "baserom.gba", 0x593950, 0x38 - -gUnknown_08593988:: @ 8593988 - .incbin "baserom.gba", 0x593988, 0x210 - -gUnknown_08593B98:: @ 8593B98 - .incbin "baserom.gba", 0x593b98, 0x1488 - -gUnknown_08595020:: @ 8595020 - .incbin "baserom.gba", 0x595020, 0x248 - -gUnknown_08595268:: @ 8595268 - .incbin "baserom.gba", 0x595268, 0xa8 - -gUnknown_08595310:: @ 8595310 - .incbin "baserom.gba", 0x595310, 0x2a4 - -gUnknown_085955B4:: @ 85955B4 - .incbin "baserom.gba", 0x5955b4, 0x18 - -gUnknown_085955CC:: @ 85955CC - .incbin "baserom.gba", 0x5955cc, 0x2 - -gUnknown_085955CE:: @ 85955CE - .incbin "baserom.gba", 0x5955ce, 0xb6 - -gUnknown_08595684:: @ 8595684 - .incbin "baserom.gba", 0x595684, 0x10 - -gUnknown_08595694:: @ 8595694 - .incbin "baserom.gba", 0x595694, 0x2c - -gUnknown_085956C0:: @ 85956C0 - .incbin "baserom.gba", 0x5956c0, 0x168 - -gUnknown_08595828:: @ 8595828 - .incbin "baserom.gba", 0x595828, 0x18 - -gUnknown_08595840:: @ 8595840 - .incbin "baserom.gba", 0x595840, 0x18 - -gUnknown_08595858:: @ 8595858 - .incbin "baserom.gba", 0x595858, 0x50 - -gUnknown_085958A8:: @ 85958A8 - .incbin "baserom.gba", 0x5958a8, 0x158 - -gUnknown_08595A00:: @ 8595A00 - .incbin "baserom.gba", 0x595a00, 0x30 - -gUnknown_08595A30:: @ 8595A30 - .incbin "baserom.gba", 0x595a30, 0x138 - -gUnknown_08595B68:: @ 8595B68 - .incbin "baserom.gba", 0x595b68, 0xf4 - -gUnknown_08595C5C:: @ 8595C5C - .incbin "baserom.gba", 0x595c5c, 0x2c - -gUnknown_08595C88:: @ 8595C88 - .incbin "baserom.gba", 0x595c88, 0x2c - -gUnknown_08595CB4:: @ 8595CB4 - .incbin "baserom.gba", 0x595cb4, 0x78 - -gUnknown_08595D2C:: @ 8595D2C - .incbin "baserom.gba", 0x595d2c, 0xa14 - -gUnknown_08596740:: @ 8596740 - .incbin "baserom.gba", 0x596740, 0x1c - -gUnknown_0859675C:: @ 859675C - .incbin "baserom.gba", 0x59675c, 0x20 - -gUnknown_0859677C:: @ 859677C - .incbin "baserom.gba", 0x59677c, 0x18 - -gUnknown_08596794:: @ 8596794 - .incbin "baserom.gba", 0x596794, 0xd0 - -gUnknown_08596864:: @ 8596864 - .incbin "baserom.gba", 0x596864, 0x35c - -gUnknown_08596BC0:: @ 8596BC0 - .incbin "baserom.gba", 0x596bc0, 0x50 - -gUnknown_08596C10:: @ 8596C10 - .incbin "baserom.gba", 0x596c10, 0x18 - -gUnknown_08596C28:: @ 8596C28 - .incbin "baserom.gba", 0x596c28, 0x18 - -gUnknown_08596C40:: @ 8596C40 - .incbin "baserom.gba", 0x596c40, 0x178 - -gUnknown_08596DB8:: @ 8596DB8 - .incbin "baserom.gba", 0x596db8, 0x78 - -gUnknown_08596E30:: @ 8596E30 - .incbin "baserom.gba", 0x596e30, 0x528 - -gUnknown_08597358:: @ 8597358 - .incbin "baserom.gba", 0x597358, 0x30 - -gUnknown_08597388:: @ 8597388 - .incbin "baserom.gba", 0x597388, 0x60 - -gUnknown_085973E8:: @ 85973E8 - .incbin "baserom.gba", 0x5973e8, 0x30 - -gUnknown_08597418:: @ 8597418 - .incbin "baserom.gba", 0x597418, 0x2 - -gUnknown_0859741A:: @ 859741A - .incbin "baserom.gba", 0x59741a, 0x4 - -gUnknown_0859741E:: @ 859741E - .incbin "baserom.gba", 0x59741e, 0x6 - -gUnknown_08597424:: @ 8597424 - .incbin "baserom.gba", 0x597424, 0x28 - -gUnknown_0859744C:: @ 859744C - .incbin "baserom.gba", 0x59744c, 0x10 - -gUnknown_0859745C:: @ 859745C - .incbin "baserom.gba", 0x59745c, 0xc - -gUnknown_08597468:: @ 8597468 - .incbin "baserom.gba", 0x597468, 0x34 - -gUnknown_0859749C:: @ 859749C - .incbin "baserom.gba", 0x59749c, 0x1c - -gUnknown_085974B8:: @ 85974B8 - .incbin "baserom.gba", 0x5974b8, 0x8 - -gUnknown_085974C0:: @ 85974C0 - .incbin "baserom.gba", 0x5974c0, 0x70 - -gUnknown_08597530:: @ 8597530 - .incbin "baserom.gba", 0x597530, 0x20 - -gUnknown_08597550:: @ 8597550 - .incbin "baserom.gba", 0x597550, 0x1f8 - -gUnknown_08597748:: @ 8597748 - .incbin "baserom.gba", 0x597748, 0x1c - -gUnknown_08597764:: @ 8597764 - .incbin "baserom.gba", 0x597764, 0x8 - -gUnknown_0859776C:: @ 859776C - .incbin "baserom.gba", 0x59776c, 0x3a8 - -gUnknown_08597B14:: @ 8597B14 - .incbin "baserom.gba", 0x597b14, 0x20 - -gUnknown_08597B34:: @ 8597B34 - .incbin "baserom.gba", 0x597b34, 0x20 - -gUnknown_08597B54:: @ 8597B54 - .incbin "baserom.gba", 0x597b54, 0xc8 - -gUnknown_08597C1C:: @ 8597C1C - .incbin "baserom.gba", 0x597c1c, 0x8 - -gUnknown_08597C24:: @ 8597C24 - .incbin "baserom.gba", 0x597c24, 0xc - -gUnknown_08597C30:: @ 8597C30 - .incbin "baserom.gba", 0x597c30, 0x24 - -gUnknown_08597C54:: @ 8597C54 - .incbin "baserom.gba", 0x597c54, 0x10 - -gUnknown_08597C64:: @ 8597C64 - .incbin "baserom.gba", 0x597c64, 0x20 - -gUnknown_08597C84:: @ 8597C84 - .incbin "baserom.gba", 0x597c84, 0x8 - -gUnknown_08597C8C:: @ 8597C8C - .incbin "baserom.gba", 0x597c8c, 0x4 - -gUnknown_08597C90:: @ 8597C90 - .incbin "baserom.gba", 0x597c90, 0x10 - -gUnknown_08597CA0:: @ 8597CA0 - .incbin "baserom.gba", 0x597ca0, 0x20 - -gUnknown_08597CC0:: @ 8597CC0 - .incbin "baserom.gba", 0x597cc0, 0x28 - -gUnknown_08597CE8:: @ 8597CE8 - .incbin "baserom.gba", 0x597ce8, 0x20 - -gUnknown_08597D08:: @ 8597D08 - .incbin "baserom.gba", 0x597d08, 0x10 - -gUnknown_08597D18:: @ 8597D18 - .incbin "baserom.gba", 0x597d18, 0x50 - -gUnknown_08597D68:: @ 8597D68 - .incbin "baserom.gba", 0x597d68, 0x68 - -gUnknown_08597DD0:: @ 8597DD0 - .incbin "baserom.gba", 0x597dd0, 0x20 - -gUnknown_08597DF0:: @ 8597DF0 - .incbin "baserom.gba", 0x597df0, 0x40 - -gUnknown_08597E30:: @ 8597E30 - .incbin "baserom.gba", 0x597e30, 0x18 - -gUnknown_08597E48:: @ 8597E48 - .incbin "baserom.gba", 0x597e48, 0x18 - -gUnknown_08597E60:: @ 8597E60 - .incbin "baserom.gba", 0x597e60, 0xc - -gUnknown_08597E6C:: @ 8597E6C - .incbin "baserom.gba", 0x597e6c, 0x30 - -@ 8597E9C - .include "data/text/easy_chat/easy_chat_groups.inc" - -@ 859D0B4 - .include "data/text/easy_chat/easy_chat_words_by_letter.inc" - -@ 859E5D4 - .include "data/text/easy_chat/easy_chat_group_name_pointers.inc" - -gUnknown_0859E62C:: @ 859E62C - .incbin "baserom.gba", 0x59e62c, 0x8 - -gUnknown_0859E634:: @ 859E634 - .incbin "baserom.gba", 0x59e634, 0xc - -gUnknown_0859E640:: @ 859E640 - .incbin "baserom.gba", 0x59e640, 0xc - -gUnknown_0859E64C:: @ 859E64C - .incbin "baserom.gba", 0x59e64c, 0xc - -gUnknown_0859E658:: @ 859E658 - .incbin "baserom.gba", 0x59e658, 0x4 - -gUnknown_0859E65C:: @ 859E65C - .incbin "baserom.gba", 0x59e65c, 0x20 - -gUnknown_0859E67C:: @ 859E67C - .incbin "baserom.gba", 0x59e67c, 0x800 - -gUnknown_0859EE7C:: @ 859EE7C - .incbin "baserom.gba", 0x59ee7c, 0x8 - -gUnknown_0859EE84:: @ 859EE84 - .incbin "baserom.gba", 0x59ee84, 0x58 - -gUnknown_0859EEDC:: @ 859EEDC - .incbin "baserom.gba", 0x59eedc, 0x38 - -gUnknown_0859EF14:: @ 859EF14 - .incbin "baserom.gba", 0x59ef14, 0x8 - -gUnknown_0859EF1C:: @ 859EF1C - .incbin "baserom.gba", 0x59ef1c, 0x88 - -gUnknown_0859EFA4:: @ 859EFA4 - .incbin "baserom.gba", 0x59efa4, 0x40 - -gUnknown_0859EFE4:: @ 859EFE4 - .incbin "baserom.gba", 0x59efe4, 0xc - -gUnknown_0859EFF0:: @ 859EFF0 - .incbin "baserom.gba", 0x59eff0, 0x20 - -gUnknown_0859F010:: @ 859F010 - .incbin "baserom.gba", 0x59f010, 0x20 - -gUnknown_0859F030:: @ 859F030 - .incbin "baserom.gba", 0x59f030, 0x18 - -gUnknown_0859F048:: @ 859F048 - .incbin "baserom.gba", 0x59f048, 0x230 - -gUnknown_0859F278:: @ 859F278 - .incbin "baserom.gba", 0x59f278, 0x10 - -gUnknown_0859F288:: @ 859F288 - .incbin "baserom.gba", 0x59f288, 0x8 - -gUnknown_0859F290:: @ 859F290 - .incbin "baserom.gba", 0x59f290, 0xc - -gUnknown_0859F29C:: @ 859F29C - .incbin "baserom.gba", 0x59f29c, 0x10 - -gUnknown_0859F2AC:: @ 859F2AC - .incbin "baserom.gba", 0x59f2ac, 0x4 - -gUnknown_0859F2B0:: @ 859F2B0 - .incbin "baserom.gba", 0x59f2b0, 0x8 - -gUnknown_0859F2B8:: @ 859F2B8 - .incbin "baserom.gba", 0x59f2b8, 0xfc - -gUnknown_0859F3B4:: @ 859F3B4 - .incbin "baserom.gba", 0x59f3b4, 0xa4 - -gUnknown_0859F458:: @ 859F458 - .incbin "baserom.gba", 0x59f458, 0xbc - -gUnknown_0859F514:: @ 859F514 - .incbin "baserom.gba", 0x59f514, 0x8 - -gUnknown_0859F51C:: @ 859F51C - .incbin "baserom.gba", 0x59f51c, 0x8 - -gUnknown_0859F524:: @ 859F524 - .incbin "baserom.gba", 0x59f524, 0x10 - -gUnknown_0859F534:: @ 859F534 - .incbin "baserom.gba", 0x59f534, 0x8 - -gUnknown_0859F53C:: @ 859F53C - .incbin "baserom.gba", 0x59f53c, 0xd0 - -gUnknown_0859F60C:: @ 859F60C - .incbin "baserom.gba", 0x59f60c, 0x44 - -gUnknown_0859F650:: @ 859F650 - .incbin "baserom.gba", 0x59f650, 0xec - -gUnknown_0859F73C:: @ 859F73C - .incbin "baserom.gba", 0x59f73c, 0x40 - -gUnknown_0859F77C:: @ 859F77C - .incbin "baserom.gba", 0x59f77c, 0xd64 - -gUnknown_085A04E0:: @ 85A04E0 - .incbin "baserom.gba", 0x5a04e0, 0x34c - -gUnknown_085A082C:: @ 85A082C - .incbin "baserom.gba", 0x5a082c, 0x20 - -gUnknown_085A084C:: @ 85A084C - .incbin "baserom.gba", 0x5a084c, 0x80 - -gUnknown_085A08CC:: @ 85A08CC - .incbin "baserom.gba", 0x5a08cc, 0x20 - -gUnknown_085A08EC:: @ 85A08EC - .incbin "baserom.gba", 0x5a08ec, 0x80 - -gUnknown_085A096C:: @ 85A096C - .incbin "baserom.gba", 0x5a096c, 0x1a4 - -@ 85A0B10 - .include "data/region_map_entries.inc" - -gUnknown_085A1B24:: @ 85A1B24 - .incbin "baserom.gba", 0x5a1b24, 0x60 - -gUnknown_085A1B84:: @ 85A1B84 - .incbin "baserom.gba", 0x5a1b84, 0x6 - -gUnknown_085A1B8A:: @ 85A1B8A - .incbin "baserom.gba", 0x5a1b8a, 0x22 - -gUnknown_085A1BAC:: @ 85A1BAC - .incbin "baserom.gba", 0x5a1bac, 0x20 - -gUnknown_085A1BCC:: @ 85A1BCC - .incbin "baserom.gba", 0x5a1bcc, 0x34 - -gUnknown_085A1C00:: @ 85A1C00 - .incbin "baserom.gba", 0x5a1c00, 0x8 - -gUnknown_085A1C08:: @ 85A1C08 - .incbin "baserom.gba", 0x5a1c08, 0x18 - -gUnknown_085A1C20:: @ 85A1C20 - .incbin "baserom.gba", 0x5a1c20, 0x10 - -gUnknown_085A1C30:: @ 85A1C30 - .incbin "baserom.gba", 0x5a1c30, 0x4 - -gUnknown_085A1C34:: @ 85A1C34 - .incbin "baserom.gba", 0x5a1c34, 0x4 - -gUnknown_085A1C38:: @ 85A1C38 - .incbin "baserom.gba", 0x5a1c38, 0x20 - -gUnknown_085A1C58:: @ 85A1C58 - .incbin "baserom.gba", 0x5a1c58, 0x38 - -gUnknown_085A1C90:: @ 85A1C90 - .incbin "baserom.gba", 0x5a1c90, 0xd8 - -gUnknown_085A1D68:: @ 85A1D68 - .incbin "baserom.gba", 0x5a1d68, 0xd4 - -gUnknown_085A1E3C:: @ 85A1E3C - .incbin "baserom.gba", 0x5a1e3c, 0xa0 - -gUnknown_085A1EDC:: @ 85A1EDC - .incbin "baserom.gba", 0x5a1edc, 0x8 - -gUnknown_085A1EE4:: @ 85A1EE4 - .incbin "baserom.gba", 0x5a1ee4, 0xc - -gUnknown_085A1EF0:: @ 85A1EF0 - .incbin "baserom.gba", 0x5a1ef0, 0x20 - -gUnknown_085A1F10:: @ 85A1F10 - .incbin "baserom.gba", 0x5a1f10, 0x8 - -gUnknown_085A1F18:: @ 85A1F18 - .incbin "baserom.gba", 0x5a1f18, 0x64 - -gUnknown_085A1F7C:: @ 85A1F7C - .incbin "baserom.gba", 0x5a1f7c, 0x18 - -gUnknown_085A1F94:: @ 85A1F94 - .incbin "baserom.gba", 0x5a1f94, 0x3c74 - -gUnknown_085A5C08:: @ 85A5C08 - .incbin "baserom.gba", 0x5a5c08, 0x1 - -gUnknown_085A5C09:: @ 85A5C09 - .incbin "baserom.gba", 0x5a5c09, 0x1b - -gUnknown_085A5C24:: @ 85A5C24 - .incbin "baserom.gba", 0x5a5c24, 0xf04 - -gUnknown_085A6B28:: @ 85A6B28 - .incbin "baserom.gba", 0x5a6b28, 0x20 - -gUnknown_085A6B48:: @ 85A6B48 - .incbin "baserom.gba", 0x5a6b48, 0x20 - -gUnknown_085A6B68:: @ 85A6B68 - .incbin "baserom.gba", 0x5a6b68, 0x10 - -gUnknown_085A6B78:: @ 85A6B78 - .incbin "baserom.gba", 0x5a6b78, 0x18 - -gUnknown_085A6B90:: @ 85A6B90 - .incbin "baserom.gba", 0x5a6b90, 0x20 - -gUnknown_085A6BB0:: @ 85A6BB0 - .incbin "baserom.gba", 0x5a6bb0, 0x20 - -gUnknown_085A6BD0:: @ 85A6BD0 - .incbin "baserom.gba", 0x5a6bd0, 0x18 - -gUnknown_085A6BE8:: @ 85A6BE8 - .incbin "baserom.gba", 0x5a6be8, 0x5c8 - -gUnknown_085A71B0:: @ 85A71B0 - .incbin "baserom.gba", 0x5a71b0, 0xa0 - -gUnknown_085A7250:: @ 85A7250 - .incbin "baserom.gba", 0x5a7250, 0x3c - -gUnknown_085A728C:: @ 85A728C - .incbin "baserom.gba", 0x5a728c, 0x18 - -gUnknown_085A72A4:: @ 85A72A4 - .incbin "baserom.gba", 0x5a72a4, 0x18 - -gUnknown_085A72BC:: @ 85A72BC - .incbin "baserom.gba", 0x5a72bc, 0x8 - -gUnknown_085A72C4:: @ 85A72C4 - .incbin "baserom.gba", 0x5a72c4, 0x8 - -gUnknown_085A72CC:: @ 85A72CC - .incbin "baserom.gba", 0x5a72cc, 0x8 - -gUnknown_085A72D4:: @ 85A72D4 - .incbin "baserom.gba", 0x5a72d4, 0x10 - -gUnknown_085A72E4:: @ 85A72E4 - .incbin "baserom.gba", 0x5a72e4, 0x8 - -gUnknown_085A72EC:: @ 85A72EC - .incbin "baserom.gba", 0x5a72ec, 0x8 - -gUnknown_085A72F4:: @ 85A72F4 - .incbin "baserom.gba", 0x5a72f4, 0x54 - -gUnknown_085A7348:: @ 85A7348 - .incbin "baserom.gba", 0x5a7348, 0x8 - -gUnknown_085A7350:: @ 85A7350 - .incbin "baserom.gba", 0x5a7350, 0x88 - -gUnknown_085A73D8:: @ 85A73D8 - .incbin "baserom.gba", 0x5a73d8, 0x8 - -gUnknown_085A73E0:: @ 85A73E0 - .incbin "baserom.gba", 0x5a73e0, 0x24 - -gUnknown_085A7404:: @ 85A7404 - .incbin "baserom.gba", 0x5a7404, 0x18 - -gUnknown_085A741C:: @ 85A741C - .incbin "baserom.gba", 0x5a741c, 0x8 - -gUnknown_085A7424:: @ 85A7424 - .incbin "baserom.gba", 0x5a7424, 0x10 - -gUnknown_085A7434:: @ 85A7434 - .incbin "baserom.gba", 0x5a7434, 0x10 - -gUnknown_085A7444:: @ 85A7444 - .incbin "baserom.gba", 0x5a7444, 0x8 - -gUnknown_085A744C:: @ 85A744C - .incbin "baserom.gba", 0x5a744c, 0x4 - -gUnknown_085A7450:: @ 85A7450 - .incbin "baserom.gba", 0x5a7450, 0x74 - -gUnknown_085A74C4:: @ 85A74C4 - .incbin "baserom.gba", 0x5a74c4, 0xc - -gUnknown_085A74D0:: @ 85A74D0 - .incbin "baserom.gba", 0x5a74d0, 0x14 - -gUnknown_085A74E4:: @ 85A74E4 - .incbin "baserom.gba", 0x5a74e4, 0xc - -gUnknown_085A74F0:: @ 85A74F0 - .incbin "baserom.gba", 0x5a74f0, 0xc - -gUnknown_085A74FC:: @ 85A74FC - .incbin "baserom.gba", 0x5a74fc, 0xc - -gUnknown_085A7508:: @ 85A7508 - .incbin "baserom.gba", 0x5a7508, 0xc - -gUnknown_085A7514:: @ 85A7514 - .incbin "baserom.gba", 0x5a7514, 0xc - -gUnknown_085A7520:: @ 85A7520 - .incbin "baserom.gba", 0x5a7520, 0xc - -gUnknown_085A752C:: @ 85A752C - .incbin "baserom.gba", 0x5a752c, 0xc - -gUnknown_085A7538:: @ 85A7538 - .incbin "baserom.gba", 0x5a7538, 0xc - -gUnknown_085A7544:: @ 85A7544 - .incbin "baserom.gba", 0x5a7544, 0xc - -gUnknown_085A7550:: @ 85A7550 - .incbin "baserom.gba", 0x5a7550, 0x8 - -gUnknown_085A7558:: @ 85A7558 - .incbin "baserom.gba", 0x5a7558, 0x10 - -gUnknown_085A7568:: @ 85A7568 - .incbin "baserom.gba", 0x5a7568, 0x2 - -gUnknown_085A756A:: @ 85A756A - .incbin "baserom.gba", 0x5a756a, 0xa - -gUnknown_085A7574:: @ 85A7574 - .incbin "baserom.gba", 0x5a7574, 0x4c - -gUnknown_085A75C0:: @ 85A75C0 - .incbin "baserom.gba", 0x5a75c0, 0x4 - -gUnknown_085A75C4:: @ 85A75C4 - .incbin "baserom.gba", 0x5a75c4, 0x8 - -gUnknown_085A75CC:: @ 85A75CC - .incbin "baserom.gba", 0x5a75cc, 0x8 - -gUnknown_085A75D4:: @ 85A75D4 - .incbin "baserom.gba", 0x5a75d4, 0x3c - -gUnknown_085A7610:: @ 85A7610 - .incbin "baserom.gba", 0x5a7610, 0x4 - -gUnknown_085A7614:: @ 85A7614 - .incbin "baserom.gba", 0x5a7614, 0x2 - -gUnknown_085A7616:: @ 85A7616 - .incbin "baserom.gba", 0x5a7616, 0x8 - -gUnknown_085A761E:: @ 85A761E - .incbin "baserom.gba", 0x5a761e, 0x8 - -gUnknown_085A7626:: @ 85A7626 - .incbin "baserom.gba", 0x5a7626, 0x8 - -gUnknown_085A762E:: @ 85A762E - .incbin "baserom.gba", 0x5a762e, 0x10 - -gUnknown_085A763E:: @ 85A763E - .incbin "baserom.gba", 0x5a763e, 0x10 - -gUnknown_085A764E:: @ 85A764E - .incbin "baserom.gba", 0x5a764e, 0x10 - -gUnknown_085A765E:: @ 85A765E - .incbin "baserom.gba", 0x5a765e, 0x10 - -gUnknown_085A766E:: @ 85A766E - .incbin "baserom.gba", 0x5a766e, 0x3f - -gUnknown_085A76AD:: @ 85A76AD - .incbin "baserom.gba", 0x5a76ad, 0x7 - -gUnknown_085A76B4:: @ 85A76B4 - .incbin "baserom.gba", 0x5a76b4, 0xc - -gUnknown_085A76C0:: @ 85A76C0 - .incbin "baserom.gba", 0x5a76c0, 0x12 - -gUnknown_085A76D2:: @ 85A76D2 - .incbin "baserom.gba", 0x5a76d2, 0x12 - -gUnknown_085A76E4:: @ 85A76E4 - .incbin "baserom.gba", 0x5a76e4, 0x1e - -gUnknown_085A7702:: @ 85A7702 - .incbin "baserom.gba", 0x5a7702, 0x66 - -gUnknown_085A7768:: @ 85A7768 - .incbin "baserom.gba", 0x5a7768, 0x66 - -gUnknown_085A77CE:: @ 85A77CE - .incbin "baserom.gba", 0x5a77ce, 0xa - -gUnknown_085A77D8:: @ 85A77D8 - .incbin "baserom.gba", 0x5a77d8, 0x14 - -gUnknown_085A77EC:: @ 85A77EC - .incbin "baserom.gba", 0x5a77ec, 0xa - -gUnknown_085A77F6:: @ 85A77F6 - .incbin "baserom.gba", 0x5a77f6, 0x8 - -gUnknown_085A77FE:: @ 85A77FE - .incbin "baserom.gba", 0x5a77fe, 0x6 - -gUnknown_085A7804:: @ 85A7804 - .incbin "baserom.gba", 0x5a7804, 0xa - -gUnknown_085A780E:: @ 85A780E - .incbin "baserom.gba", 0x5a780e, 0x8 - -gUnknown_085A7816:: @ 85A7816 - .incbin "baserom.gba", 0x5a7816, 0x12 - -gUnknown_085A7828:: @ 85A7828 - .incbin "baserom.gba", 0x5a7828, 0x12 - -gUnknown_085A783A:: @ 85A783A - .incbin "baserom.gba", 0x5a783a, 0x8e - -gUnknown_085A78C8:: @ 85A78C8 - .incbin "baserom.gba", 0x5a78c8, 0x13c - -gUnknown_085A7A04:: @ 85A7A04 - .incbin "baserom.gba", 0x5a7a04, 0x1c - -gUnknown_085A7A20:: @ 85A7A20 - .incbin "baserom.gba", 0x5a7a20, 0x2c0 - -gUnknown_085A7CE0:: @ 85A7CE0 - .incbin "baserom.gba", 0x5a7ce0, 0x18 - -gUnknown_085A7CF8:: @ 85A7CF8 - .incbin "baserom.gba", 0x5a7cf8, 0x18 - -gUnknown_085A7D10:: @ 85A7D10 - .incbin "baserom.gba", 0x5a7d10, 0x18 - -gUnknown_085A7D28:: @ 85A7D28 - .incbin "baserom.gba", 0x5a7d28, 0x18 - -gUnknown_085A7D40:: @ 85A7D40 - .incbin "baserom.gba", 0x5a7d40, 0x18 - -gUnknown_085A7D58:: @ 85A7D58 - .incbin "baserom.gba", 0x5a7d58, 0x18 - -gUnknown_085A7D70:: @ 85A7D70 - .incbin "baserom.gba", 0x5a7d70, 0x18 - -gUnknown_085A7D88:: @ 85A7D88 - .incbin "baserom.gba", 0x5a7d88, 0x18 - -gUnknown_085A7DA0:: @ 85A7DA0 - .incbin "baserom.gba", 0x5a7da0, 0x18 - -gUnknown_085A7DB8:: @ 85A7DB8 - .incbin "baserom.gba", 0x5a7db8, 0x18 - -gUnknown_085A7DD0:: @ 85A7DD0 - .incbin "baserom.gba", 0x5a7dd0, 0x18 - -gUnknown_085A7DE8:: @ 85A7DE8 - .incbin "baserom.gba", 0x5a7de8, 0x18 - -gUnknown_085A7E00:: @ 85A7E00 - .incbin "baserom.gba", 0x5a7e00, 0x18 - -gUnknown_085A7E18:: @ 85A7E18 - .incbin "baserom.gba", 0x5a7e18, 0x18 - -gUnknown_085A7E30:: @ 85A7E30 - .incbin "baserom.gba", 0x5a7e30, 0x168 - -gUnknown_085A7F98:: @ 85A7F98 - .incbin "baserom.gba", 0x5a7f98, 0x28 - -gUnknown_085A7FC0:: @ 85A7FC0 - .incbin "baserom.gba", 0x5a7fc0, 0x20 - -gUnknown_085A7FE0:: @ 85A7FE0 - .incbin "baserom.gba", 0x5a7fe0, 0x14 - -gUnknown_085A7FF4:: @ 85A7FF4 - .incbin "baserom.gba", 0x5a7ff4, 0x1c - -gUnknown_085A8010:: @ 85A8010 - .incbin "baserom.gba", 0x5a8010, 0x18 - -gUnknown_085A8028:: @ 85A8028 - .incbin "baserom.gba", 0x5a8028, 0x14 - -gUnknown_085A803C:: @ 85A803C - .incbin "baserom.gba", 0x5a803c, 0x228 - -gUnknown_085A8264:: @ 85A8264 - .incbin "baserom.gba", 0x5a8264, 0x68 - -gUnknown_085A82CC:: @ 85A82CC - .incbin "baserom.gba", 0x5a82cc, 0x68 - -gUnknown_085A8334:: @ 85A8334 - .incbin "baserom.gba", 0x5a8334, 0xb0 - -gUnknown_085A83E4:: @ 85A83E4 - .incbin "baserom.gba", 0x5a83e4, 0x24 - -gUnknown_085A8408:: @ 85A8408 - .incbin "baserom.gba", 0x5a8408, 0x14 - -gUnknown_085A841C:: @ 85A841C - .incbin "baserom.gba", 0x5a841c, 0x14 - -gUnknown_085A8430:: @ 85A8430 - .incbin "baserom.gba", 0x5a8430, 0x5 - -gUnknown_085A8435:: @ 85A8435 - .incbin "baserom.gba", 0x5a8435, 0x6 - -gUnknown_085A843B:: @ 85A843B - .incbin "baserom.gba", 0x5a843b, 0x65 - -gUnknown_085A84A0:: @ 85A84A0 - .incbin "baserom.gba", 0x5a84a0, 0xc - -gUnknown_085A84AC:: @ 85A84AC - .incbin "baserom.gba", 0x5a84ac, 0x64 - -gUnknown_085A8510:: @ 85A8510 - .incbin "baserom.gba", 0x5a8510, 0x10 - -gUnknown_085A8520:: @ 85A8520 - .incbin "baserom.gba", 0x5a8520, 0x4 - -gUnknown_085A8524:: @ 85A8524 - .incbin "baserom.gba", 0x5a8524, 0x20 - -gUnknown_085A8544:: @ 85A8544 - .incbin "baserom.gba", 0x5a8544, 0x48 - -gUnknown_085A858C:: @ 85A858C - .incbin "baserom.gba", 0x5a858c, 0x1154 - -gUnknown_085A96E0:: @ 85A96E0 - .incbin "baserom.gba", 0x5a96e0, 0x1b8 - -gUnknown_085A9898:: @ 85A9898 - .incbin "baserom.gba", 0x5a9898, 0x4 - -gUnknown_085A989C:: @ 85A989C - .incbin "baserom.gba", 0x5a989c, 0x200 - -gUnknown_085A9A9C:: @ 85A9A9C - .incbin "baserom.gba", 0x5a9a9c, 0x1084 - -gUnknown_085AAB20:: @ 85AAB20 - .incbin "baserom.gba", 0x5aab20, 0xc30 - -gUnknown_085AB750:: @ 85AB750 - .incbin "baserom.gba", 0x5ab750, 0xb38 - -gUnknown_085AC288:: @ 85AC288 - .incbin "baserom.gba", 0x5ac288, 0xfb8 - -gUnknown_085AD240:: @ 85AD240 - .incbin "baserom.gba", 0x5ad240, 0x1130 - -gUnknown_085AE370:: @ 85AE370 - .incbin "baserom.gba", 0x5ae370, 0x604 - -gUnknown_085AE974:: @ 85AE974 - .incbin "baserom.gba", 0x5ae974, 0x50c - -gUnknown_085AEE80:: @ 85AEE80 - .incbin "baserom.gba", 0x5aee80, 0x50c - -gUnknown_085AF38C:: @ 85AF38C - .incbin "baserom.gba", 0x5af38c, 0x50c - -gUnknown_085AF898:: @ 85AF898 - .incbin "baserom.gba", 0x5af898, 0x50c - -gUnknown_085AFDA4:: @ 85AFDA4 - .incbin "baserom.gba", 0x5afda4, 0x50c - -gUnknown_085B02B0:: @ 85B02B0 - .incbin "baserom.gba", 0x5b02b0, 0x524 - -gUnknown_085B07D4:: @ 85B07D4 - .incbin "baserom.gba", 0x5b07d4, 0x14 - -gUnknown_085B07E8:: @ 85B07E8 - .incbin "baserom.gba", 0x5b07e8, 0x4 - -gUnknown_085B07EC:: @ 85B07EC - .incbin "baserom.gba", 0x5b07ec, 0x8 - -gUnknown_085B07F4:: @ 85B07F4 - .incbin "baserom.gba", 0x5b07f4, 0x3c - -gUnknown_085B0830:: @ 85B0830 - .incbin "baserom.gba", 0x5b0830, 0x8 - -gUnknown_085B0838:: @ 85B0838 - .incbin "baserom.gba", 0x5b0838, 0x4 - - @ todo, label functions from battle_ai.c -sBattleAICmdTable:: @ 85B083C - .4byte 0x08131179 - .4byte 0x081311b9 - .4byte 0x081311f9 - .4byte 0x08131239 - .4byte 0x08131279 - .4byte 0x081312bd - .4byte 0x08131325 - .4byte 0x0813138d - .4byte 0x081313f5 - .4byte 0x0813145d - .4byte 0x081314d1 - .4byte 0x08131545 - .4byte 0x081315b9 - .4byte 0x0813162d - .4byte 0x0813169d - .4byte 0x0813170d - .4byte 0x08131789 - .4byte 0x08131805 - .4byte 0x08131841 - .4byte 0x0813187d - .4byte 0x081318b9 - .4byte 0x081318f5 - .4byte 0x08131949 - .4byte 0x0813199d - .4byte 0x081319f1 - .4byte 0x08131a45 - .4byte 0x08131a89 - .4byte 0x08131acd - .4byte 0x08131b35 - .4byte 0x08131ba1 - .4byte 0x08131c0d - .4byte 0x08131c7d - .4byte 0x08131ced - .4byte 0x08131d5d - .4byte 0x08131d81 - .4byte 0x08131f1d - .4byte 0x08131f49 - .4byte 0x0813214d - .4byte 0x081321a5 - .4byte 0x081321e1 - .4byte 0x0813221d - .4byte 0x08132269 - .4byte 0x081322b5 - .4byte 0x081322b9 - .4byte 0x081322bd - .4byte 0x081323b9 - .4byte 0x081323d5 - .4byte 0x08132401 - .4byte 0x08132615 - .4byte 0x08132701 - .4byte 0x081327d1 - .4byte 0x081327d5 - .4byte 0x081327d9 - .4byte 0x081328b9 - .4byte 0x08132995 - .4byte 0x08132a01 - .4byte 0x08132a4d - .4byte 0x08132a99 - .4byte 0x08132b01 - .4byte 0x08132b69 - .4byte 0x08132bd1 - .4byte 0x08132c39 - .4byte 0x08132d35 - .4byte 0x08132e19 - .4byte 0x08132f49 - .4byte 0x08133021 - .4byte 0x08133119 - .4byte 0x081331fd - .4byte 0x08133285 - .4byte 0x08133315 - .4byte 0x08133329 - .4byte 0x08133389 - .4byte 0x0813339d - .4byte 0x08133495 - .4byte 0x081334ed - .4byte 0x08133539 - .4byte 0x08133585 - .4byte 0x081335ad - .4byte 0x081335f9 - .4byte 0x08133625 - .4byte 0x08133651 - .4byte 0x0813367d - .4byte 0x081336c9 - .4byte 0x081336cd - .4byte 0x081336d1 - .4byte 0x081336d5 - .4byte 0x081336d9 - .4byte 0x081336dd - .4byte 0x081336e1 - .4byte 0x08133711 - .4byte 0x08133731 - .4byte 0x08133755 - .4byte 0x0813382d - .4byte 0x0813387d - .4byte 0x081338cd - .4byte 0x08131eb5 - .4byte 0x0813251d - .4byte 0x0813391d - .4byte 0x08133415 - -gUnknown_085B09C8:: @ 85B09C8 - .incbin "baserom.gba", 0x5b09c8, 0x1c - -gUnknown_085B09E4:: @ 85B09E4 - .incbin "baserom.gba", 0x5b09e4, 0x10 - -gUnknown_085B09F4:: @ 85B09F4 - .incbin "baserom.gba", 0x5b09f4, 0x4 - -gUnknown_085B09F8:: @ 85B09F8 - .incbin "baserom.gba", 0x5b09f8, 0x8 - -gUnknown_085B0A00:: @ 85B0A00 - .incbin "baserom.gba", 0x5b0a00, 0x2 - -gUnknown_085B0A02:: @ 85B0A02 - .incbin "baserom.gba", 0x5b0a02, 0x7e - -gUnknown_085B0A80:: @ 85B0A80 - .incbin "baserom.gba", 0x5b0a80, 0x18c - -gUnknown_085B0C0C:: @ 85B0C0C - .incbin "baserom.gba", 0x5b0c0c, 0x1f8 - -gUnknown_085B0E04:: @ 85B0E04 - .incbin "baserom.gba", 0x5b0e04, 0xfc8 - -gUnknown_085B1DCC:: @ 85B1DCC - .incbin "baserom.gba", 0x5b1dcc, 0x10 - -gUnknown_085B1DDC:: @ 85B1DDC - .incbin "baserom.gba", 0x5b1ddc, 0x8 - -gUnknown_085B1DE4:: @ 85B1DE4 - .incbin "baserom.gba", 0x5b1de4, 0x8 - -gUnknown_085B1DEC:: @ 85B1DEC - .incbin "baserom.gba", 0x5b1dec, 0x6 - -gUnknown_085B1DF2:: @ 85B1DF2 - .incbin "baserom.gba", 0x5b1df2, 0x6 - -gUnknown_085B1DF8:: @ 85B1DF8 - .incbin "baserom.gba", 0x5b1df8, 0x8 - -gUnknown_085B1E00:: @ 85B1E00 - .incbin "baserom.gba", 0x5b1e00, 0xc - -gUnknown_085B1E0C:: @ 85B1E0C - .incbin "baserom.gba", 0x5b1e0c, 0x1c - -gUnknown_085B1E28:: @ 85B1E28 - .incbin "baserom.gba", 0x5b1e28, 0xa8 - -gUnknown_085B1ED0:: @ 85B1ED0 - .incbin "baserom.gba", 0x5b1ed0, 0x8 - -gUnknown_085B1ED8:: @ 85B1ED8 - .incbin "baserom.gba", 0x5b1ed8, 0x10 - -gUnknown_085B1EE8:: @ 85B1EE8 - .incbin "baserom.gba", 0x5b1ee8, 0x10 - -gUnknown_085B1EF8:: @ 85B1EF8 - .incbin "baserom.gba", 0x5b1ef8, 0x18 - -gUnknown_085B1F10:: @ 85B1F10 - .incbin "baserom.gba", 0x5b1f10, 0x18 - -gUnknown_085B1F28:: @ 85B1F28 - .incbin "baserom.gba", 0x5b1f28, 0x18 - -gUnknown_085B1F40:: @ 85B1F40 - .incbin "baserom.gba", 0x5b1f40, 0x294 - -gUnknown_085B21D4:: @ 85B21D4 - .incbin "baserom.gba", 0x5b21d4, 0x8 - -gUnknown_085B21DC:: @ 85B21DC - .incbin "baserom.gba", 0x5b21dc, 0x18 - -gUnknown_085B21F4:: @ 85B21F4 - .incbin "baserom.gba", 0x5b21f4, 0x8 - -gUnknown_085B21FC:: @ 85B21FC - .incbin "baserom.gba", 0x5b21fc, 0xc - -gUnknown_085B2208:: @ 85B2208 - .incbin "baserom.gba", 0x5b2208, 0x10 - -gUnknown_085B2218:: @ 85B2218 - .incbin "baserom.gba", 0x5b2218, 0x38 - -gUnknown_085B2250:: @ 85B2250 - .incbin "baserom.gba", 0x5b2250, 0x18 - -gUnknown_085B2268:: @ 85B2268 - .incbin "baserom.gba", 0x5b2268, 0x38 - -gUnknown_085B22A0:: @ 85B22A0 - .incbin "baserom.gba", 0x5b22a0, 0x18 - -gUnknown_085B22B8:: @ 85B22B8 - .incbin "baserom.gba", 0x5b22b8, 0x18 - -gUnknown_085B22D0:: @ 85B22D0 - .incbin "baserom.gba", 0x5b22d0, 0x2d0 - -gUnknown_085B25A0:: @ 85B25A0 - .incbin "baserom.gba", 0x5b25a0, 0x80 - -gUnknown_085B2620:: @ 85B2620 - .incbin "baserom.gba", 0x5b2620, 0xc - -gUnknown_085B262C:: @ 85B262C - .incbin "baserom.gba", 0x5b262c, 0x3c - -gUnknown_085B2668:: @ 85B2668 - .incbin "baserom.gba", 0x5b2668, 0x30 - -gUnknown_085B2698:: @ 85B2698 - .incbin "baserom.gba", 0x5b2698, 0x3 - -gUnknown_085B269B:: @ 85B269B - .incbin "baserom.gba", 0x5b269b, 0x2 - -gUnknown_085B269D:: @ 85B269D - .incbin "baserom.gba", 0x5b269d, 0x2 - -gUnknown_085B269F:: @ 85B269F - .incbin "baserom.gba", 0x5b269f, 0x5 - -gUnknown_085B26A4:: @ 85B26A4 - .incbin "baserom.gba", 0x5b26a4, 0x4c - -gUnknown_085B26F0:: @ 85B26F0 - .incbin "baserom.gba", 0x5b26f0, 0x4 - -gUnknown_085B26F4:: @ 85B26F4 - .incbin "baserom.gba", 0x5b26f4, 0x8 - -gUnknown_085B26FC:: @ 85B26FC - .incbin "baserom.gba", 0x5b26fc, 0x8 - -gUnknown_085B2704:: @ 85B2704 - .incbin "baserom.gba", 0x5b2704, 0x18 - -gUnknown_085B271C:: @ 85B271C - .incbin "baserom.gba", 0x5b271c, 0x4 - -gUnknown_085B2720:: @ 85B2720 - .incbin "baserom.gba", 0x5b2720, 0x28 - -gUnknown_085B2748:: @ 85B2748 - .incbin "baserom.gba", 0x5b2748, 0x60 - -gUnknown_085B27A8:: @ 85B27A8 - .incbin "baserom.gba", 0x5b27a8, 0x8 - -gUnknown_085B27B0:: @ 85B27B0 - .incbin "baserom.gba", 0x5b27b0, 0x18 - -gUnknown_085B27C8:: @ 85B27C8 - .incbin "baserom.gba", 0x5b27c8, 0x88 - -gUnknown_085B2850:: @ 85B2850 - .incbin "baserom.gba", 0x5b2850, 0x20 - -gUnknown_085B2870:: @ 85B2870 - .incbin "baserom.gba", 0x5b2870, 0x20 - -gUnknown_085B2890:: @ 85B2890 - .incbin "baserom.gba", 0x5b2890, 0x10 - -gUnknown_085B28A0:: @ 85B28A0 - .incbin "baserom.gba", 0x5b28a0, 0x10 - -gUnknown_085B28B0:: @ 85B28B0 - .incbin "baserom.gba", 0x5b28b0, 0x1e0 - -gUnknown_085B2A90:: @ 85B2A90 - .incbin "baserom.gba", 0x5b2a90, 0xb4 - -gUnknown_085B2B44:: @ 85B2B44 - .incbin "baserom.gba", 0x5b2b44, 0x18 - -gUnknown_085B2B5C:: @ 85B2B5C - .incbin "baserom.gba", 0x5b2b5c, 0x4 - -gUnknown_085B2B60:: @ 85B2B60 - .incbin "baserom.gba", 0x5b2b60, 0x8 - -gUnknown_085B2B68:: @ 85B2B68 - .incbin "baserom.gba", 0x5b2b68, 0x10 - -gUnknown_085B2B78:: @ 85B2B78 - .incbin "baserom.gba", 0x5b2b78, 0x6 - -gUnknown_085B2B7E:: @ 85B2B7E - .incbin "baserom.gba", 0x5b2b7e, 0xa - -gUnknown_085B2B88:: @ 85B2B88 - .incbin "baserom.gba", 0x5b2b88, 0xc - -gUnknown_085B2B94:: @ 85B2B94 - .incbin "baserom.gba", 0x5b2b94, 0xc - -gUnknown_085B2BA0:: @ 85B2BA0 - .incbin "baserom.gba", 0x5b2ba0, 0xc - -gUnknown_085B2BAC:: @ 85B2BAC - .incbin "baserom.gba", 0x5b2bac, 0x8 - -gUnknown_085B2BB4:: @ 85B2BB4 - .incbin "baserom.gba", 0x5b2bb4, 0x40 - -gUnknown_085B2BF4:: @ 85B2BF4 - .incbin "baserom.gba", 0x5b2bf4, 0x12 - -gUnknown_085B2C06:: @ 85B2C06 - .incbin "baserom.gba", 0x5b2c06, 0x12 - -gUnknown_085B2C18:: @ 85B2C18 - .incbin "baserom.gba", 0x5b2c18, 0x9 - -gUnknown_085B2C21:: @ 85B2C21 - .incbin "baserom.gba", 0x5b2c21, 0x9 - -gUnknown_085B2C2A:: @ 85B2C2A - .incbin "baserom.gba", 0x5b2c2a, 0x26 - -gUnknown_085B2C50:: @ 85B2C50 - .incbin "baserom.gba", 0x5b2c50, 0x78 - -gUnknown_085B2CC8:: @ 85B2CC8 - .incbin "baserom.gba", 0x5b2cc8, 0x14 - -gUnknown_085B2CDC:: @ 85B2CDC - .incbin "baserom.gba", 0x5b2cdc, 0x14 - -gUnknown_085B2CF0:: @ 85B2CF0 - .incbin "baserom.gba", 0x5b2cf0, 0x340 - -gUnknown_085B3030:: @ 85B3030 - .incbin "baserom.gba", 0x5b3030, 0x10 - -gUnknown_085B3040:: @ 85B3040 - .incbin "baserom.gba", 0x5b3040, 0x64 - -gUnknown_085B30A4:: @ 85B30A4 - .incbin "baserom.gba", 0x5b30a4, 0x30 - -gUnknown_085B30D4:: @ 85B30D4 - .incbin "baserom.gba", 0x5b30d4, 0x30 - -gUnknown_085B3104:: @ 85B3104 - .incbin "baserom.gba", 0x5b3104, 0x18 - -gUnknown_085B311C:: @ 85B311C - .incbin "baserom.gba", 0x5b311c, 0x8 - -gUnknown_085B3124:: @ 85B3124 - .incbin "baserom.gba", 0x5b3124, 0x8 - -gUnknown_085B312C:: @ 85B312C - .incbin "baserom.gba", 0x5b312c, 0x16 - -gUnknown_085B3142:: @ 85B3142 - .incbin "baserom.gba", 0x5b3142, 0xc - -gUnknown_085B314E:: @ 85B314E - .incbin "baserom.gba", 0x5b314e, 0xe - -gUnknown_085B315C:: @ 85B315C - .incbin "baserom.gba", 0x5b315c, 0x14 - -gUnknown_085B3170:: @ 85B3170 - .incbin "baserom.gba", 0x5b3170, 0x2c - -gUnknown_085B319C:: @ 85B319C - .incbin "baserom.gba", 0x5b319c, 0x18 - -gUnknown_085B31B4:: @ 85B31B4 - .incbin "baserom.gba", 0x5b31b4, 0x1c - -gUnknown_085B31D0:: @ 85B31D0 - .incbin "baserom.gba", 0x5b31d0, 0x28 - -gUnknown_085B31F8:: @ 85B31F8 - .incbin "baserom.gba", 0x5b31f8, 0x14 - -gUnknown_085B320C:: @ 85B320C - .incbin "baserom.gba", 0x5b320c, 0x14 - -gUnknown_085B3220:: @ 85B3220 - .incbin "baserom.gba", 0x5b3220, 0x8 - -gUnknown_085B3228:: @ 85B3228 - .incbin "baserom.gba", 0x5b3228, 0x2c - -gUnknown_085B3254:: @ 85B3254 - .incbin "baserom.gba", 0x5b3254, 0x2c - -gUnknown_085B3280:: @ 85B3280 - .incbin "baserom.gba", 0x5b3280, 0x160 - -gUnknown_085B33E0:: @ 85B33E0 - .incbin "baserom.gba", 0x5b33e0, 0x16 - -gUnknown_085B33F6:: @ 85B33F6 - .incbin "baserom.gba", 0x5b33f6, 0xa - -gUnknown_085B3400:: @ 85B3400 - .incbin "baserom.gba", 0x5b3400, 0x10 - -gUnknown_085B3410:: @ 85B3410 - .incbin "baserom.gba", 0x5b3410, 0x10 - -gUnknown_085B3420:: @ 85B3420 - .incbin "baserom.gba", 0x5b3420, 0x24 - -gUnknown_085B3444:: @ 85B3444 - .incbin "baserom.gba", 0x5b3444, 0x2c - -gUnknown_085B3470:: @ 85B3470 - .incbin "baserom.gba", 0x5b3470, 0x4 - -gUnknown_085B3474:: @ 85B3474 - .incbin "baserom.gba", 0x5b3474, 0x8 - -gUnknown_085B347C:: @ 85B347C - .incbin "baserom.gba", 0x5b347c, 0x8 - -gUnknown_085B3484:: @ 85B3484 - .incbin "baserom.gba", 0x5b3484, 0xc0 - -gUnknown_085B3544:: @ 85B3544 - .incbin "baserom.gba", 0x5b3544, 0x20 - -gUnknown_085B3564:: @ 85B3564 - .incbin "baserom.gba", 0x5b3564, 0x800 - -gUnknown_085B3D64:: @ 85B3D64 - .incbin "baserom.gba", 0x5b3d64, 0x8 - -gUnknown_085B3D6C:: @ 85B3D6C - .incbin "baserom.gba", 0x5b3d6c, 0x10 - -gUnknown_085B3D7C:: @ 85B3D7C - .incbin "baserom.gba", 0x5b3d7c, 0x8 - -gUnknown_085B3D84:: @ 85B3D84 - .incbin "baserom.gba", 0x5b3d84, 0x8 - -gUnknown_085B3D8C:: @ 85B3D8C - .incbin "baserom.gba", 0x5b3d8c, 0x8 - -gUnknown_085B3D94:: @ 85B3D94 - .incbin "baserom.gba", 0x5b3d94, 0x20 - -gUnknown_085B3DB4:: @ 85B3DB4 - .incbin "baserom.gba", 0x5b3db4, 0x134 - -gUnknown_085B3EE8:: @ 85B3EE8 - .incbin "baserom.gba", 0x5b3ee8, 0x2 - -gUnknown_085B3EEA:: @ 85B3EEA - .incbin "baserom.gba", 0x5b3eea, 0x6 - -gUnknown_085B3EF0:: @ 85B3EF0 - .incbin "baserom.gba", 0x5b3ef0, 0xc - -gUnknown_085B3EFC:: @ 85B3EFC - .incbin "baserom.gba", 0x5b3efc, 0x1c - -gUnknown_085B3F18:: @ 85B3F18 - .incbin "baserom.gba", 0x5b3f18, 0x100 - -gUnknown_085B4018:: @ 85B4018 - .incbin "baserom.gba", 0x5b4018, 0x4 - -gUnknown_085B401C:: @ 85B401C - .incbin "baserom.gba", 0x5b401c, 0x8 - -gUnknown_085B4024:: @ 85B4024 - .incbin "baserom.gba", 0x5b4024, 0x10 - -gUnknown_085B4034:: @ 85B4034 - .incbin "baserom.gba", 0x5b4034, 0xb8 - -gUnknown_085B40EC:: @ 85B40EC - .incbin "baserom.gba", 0x5b40ec, 0x10 - -gUnknown_085B40FC:: @ 85B40FC - .incbin "baserom.gba", 0x5b40fc, 0x38 - -gUnknown_085B4134:: @ 85B4134 - .incbin "baserom.gba", 0x5b4134, 0x6f8 - -gUnknown_085B482C:: @ 85B482C - .incbin "baserom.gba", 0x5b482c, 0x4e4 - -gUnknown_085B4D10:: @ 85B4D10 - .incbin "baserom.gba", 0x5b4d10, 0x4d4 - -gUnknown_085B51E4:: @ 85B51E4 - .incbin "baserom.gba", 0x5b51e4, 0x6a0 - -gUnknown_085B5884:: @ 85B5884 - .incbin "baserom.gba", 0x5b5884, 0x40 - -gUnknown_085B58C4:: @ 85B58C4 - .incbin "baserom.gba", 0x5b58c4, 0x5 - -gUnknown_085B58C9:: @ 85B58C9 - .incbin "baserom.gba", 0x5b58c9, 0x10 - -gUnknown_085B58D9:: @ 85B58D9 - .incbin "baserom.gba", 0x5b58d9, 0x323 - -gUnknown_085B5BFC:: @ 85B5BFC - .incbin "baserom.gba", 0x5b5bfc, 0x200 - -gUnknown_085B5DFC:: @ 85B5DFC - .incbin "baserom.gba", 0x5b5dfc, 0x1a4 - -gUnknown_085B5FA0:: @ 85B5FA0 - .incbin "baserom.gba", 0x5b5fa0, 0x1a0 - -gUnknown_085B6140:: @ 85B6140 - .incbin "baserom.gba", 0x5b6140, 0xc - -gUnknown_085B614C:: @ 85B614C - .incbin "baserom.gba", 0x5b614c, 0x8 - -gUnknown_085B6154:: @ 85B6154 - .incbin "baserom.gba", 0x5b6154, 0xc - -gUnknown_085B6160:: @ 85B6160 - .incbin "baserom.gba", 0x5b6160, 0x184 - -gUnknown_085B62E4:: @ 85B62E4 - .incbin "baserom.gba", 0x5b62e4, 0x4 - -gUnknown_085B62E8:: @ 85B62E8 - .incbin "baserom.gba", 0x5b62e8, 0x5c - -gUnknown_085B6344:: @ 85B6344 - .incbin "baserom.gba", 0x5b6344, 0x4 - -gUnknown_085B6348:: @ 85B6348 - .incbin "baserom.gba", 0x5b6348, 0x40 - -gUnknown_085B6388:: @ 85B6388 - .incbin "baserom.gba", 0x5b6388, 0x68 - -gUnknown_085B63F0:: @ 85B63F0 - .incbin "baserom.gba", 0x5b63f0, 0x18 - -gUnknown_085B6408:: @ 85B6408 - .incbin "baserom.gba", 0x5b6408, 0x8 - -gUnknown_085B6410:: @ 85B6410 - .incbin "baserom.gba", 0x5b6410, 0x8 - -gUnknown_085B6418:: @ 85B6418 - .incbin "baserom.gba", 0x5b6418, 0x6 - -gUnknown_085B641E:: @ 85B641E - .incbin "baserom.gba", 0x5b641e, 0x4 - -gUnknown_085B6422:: @ 85B6422 - .incbin "baserom.gba", 0x5b6422, 0xa - -gUnknown_085B642C:: @ 85B642C - .incbin "baserom.gba", 0x5b642c, 0x10 - -gUnknown_085B643C:: @ 85B643C - .incbin "baserom.gba", 0x5b643c, 0xc - -gUnknown_085B6448:: @ 85B6448 - .incbin "baserom.gba", 0x5b6448, 0xf3c - -gUnknown_085B7384:: @ 85B7384 - .incbin "baserom.gba", 0x5b7384, 0x98 - -gUnknown_085B741C:: @ 85B741C - .incbin "baserom.gba", 0x5b741c, 0x6c - -gUnknown_085B7488:: @ 85B7488 - .incbin "baserom.gba", 0x5b7488, 0x8 - -gUnknown_085B7490:: @ 85B7490 - .incbin "baserom.gba", 0x5b7490, 0x78 - -gUnknown_085B7508:: @ 85B7508 - .incbin "baserom.gba", 0x5b7508, 0x60 - -gUnknown_085B7568:: @ 85B7568 - .incbin "baserom.gba", 0x5b7568, 0x48 - -gUnknown_085B75B0:: @ 85B75B0 - .incbin "baserom.gba", 0x5b75b0, 0x60 - -gUnknown_085B7610:: @ 85B7610 - .incbin "baserom.gba", 0x5b7610, 0x140 - -gUnknown_085B7750:: @ 85B7750 - .incbin "baserom.gba", 0x5b7750, 0x94 - -gUnknown_085B77E4:: @ 85B77E4 - .incbin "baserom.gba", 0x5b77e4, 0x18 - -gUnknown_085B77FC:: @ 85B77FC - .incbin "baserom.gba", 0x5b77fc, 0x18 - -gUnknown_085B7814:: @ 85B7814 - .incbin "baserom.gba", 0x5b7814, 0x18 - -gUnknown_085B782C:: @ 85B782C - .incbin "baserom.gba", 0x5b782c, 0x18 - -gUnknown_085B7844:: @ 85B7844 - .incbin "baserom.gba", 0x5b7844, 0x20 - -gUnknown_085B7864:: @ 85B7864 - .incbin "baserom.gba", 0x5b7864, 0xc4 - -gUnknown_085B7928:: @ 85B7928 - .incbin "baserom.gba", 0x5b7928, 0x20 - -gUnknown_085B7948:: @ 85B7948 - .incbin "baserom.gba", 0x5b7948, 0x8 - -gUnknown_085B7950:: @ 85B7950 - .incbin "baserom.gba", 0x5b7950, 0x28 - -gUnknown_085B7978:: @ 85B7978 - .incbin "baserom.gba", 0x5b7978, 0x80 - -gUnknown_085B79F8:: @ 85B79F8 - .incbin "baserom.gba", 0x5b79f8, 0x18 - -gUnknown_085B7A10:: @ 85B7A10 - .incbin "baserom.gba", 0x5b7a10, 0x30 - -gUnknown_085B7A40:: @ 85B7A40 - .incbin "baserom.gba", 0x5b7a40, 0x7c - -gUnknown_085B7ABC:: @ 85B7ABC - .incbin "baserom.gba", 0x5b7abc, 0x30 - -gUnknown_085B7AEC:: @ 85B7AEC - .incbin "baserom.gba", 0x5b7aec, 0x18 - -gUnknown_085B7B04:: @ 85B7B04 - .incbin "baserom.gba", 0x5b7b04, 0x6 - -gUnknown_085B7B0A:: @ 85B7B0A - .incbin "baserom.gba", 0x5b7b0a, 0x8 - -gUnknown_085B7B12:: @ 85B7B12 - .incbin "baserom.gba", 0x5b7b12, 0x8 - -gUnknown_085B7B1A:: @ 85B7B1A - .incbin "baserom.gba", 0x5b7b1a, 0x14 - -gUnknown_085B7B2E:: @ 85B7B2E - .incbin "baserom.gba", 0x5b7b2e, 0x18 - -gUnknown_085B7B46:: @ 85B7B46 - .incbin "baserom.gba", 0x5b7b46, 0x2 - -gUnknown_085B7B48:: @ 85B7B48 - .incbin "baserom.gba", 0x5b7b48, 0x8d0 - -gUnknown_085B8418:: @ 85B8418 - .incbin "baserom.gba", 0x5b8418, 0x20 - -gUnknown_085B8438:: @ 85B8438 - .incbin "baserom.gba", 0x5b8438, 0x338 - -gUnknown_085B8770:: @ 85B8770 - .incbin "baserom.gba", 0x5b8770, 0x480 - -gUnknown_085B8BF0:: @ 85B8BF0 - .incbin "baserom.gba", 0x5b8bf0, 0x20 - -gUnknown_085B8C10:: @ 85B8C10 - .incbin "baserom.gba", 0x5b8c10, 0x20 - -gUnknown_085B8C30:: @ 85B8C30 - .incbin "baserom.gba", 0x5b8c30, 0x2 - -gUnknown_085B8C32:: @ 85B8C32 - .incbin "baserom.gba", 0x5b8c32, 0x36 - -gUnknown_085B8C68:: @ 85B8C68 - .incbin "baserom.gba", 0x5b8c68, 0x18 - -gUnknown_085B8C80:: @ 85B8C80 - .incbin "baserom.gba", 0x5b8c80, 0x10 - -gUnknown_085B8C90:: @ 85B8C90 - .incbin "baserom.gba", 0x5b8c90, 0x528 - -gUnknown_085B91B8:: @ 85B91B8 - .incbin "baserom.gba", 0x5b91b8, 0x178 - -gUnknown_085B9330:: @ 85B9330 - .incbin "baserom.gba", 0x5b9330, 0x580 - -gUnknown_085B98B0:: @ 85B98B0 - .incbin "baserom.gba", 0x5b98b0, 0x240 - -gUnknown_085B9AF0:: @ 85B9AF0 - .incbin "baserom.gba", 0x5b9af0, 0x11e0 - -gUnknown_085BACD0:: @ 85BACD0 - .incbin "baserom.gba", 0x5bacd0, 0x1e0 - -gUnknown_085BAEB0:: @ 85BAEB0 - .incbin "baserom.gba", 0x5baeb0, 0x20 - -gUnknown_085BAED0:: @ 85BAED0 - .incbin "baserom.gba", 0x5baed0, 0x378 - -gUnknown_085BB248:: @ 85BB248 - .incbin "baserom.gba", 0x5bb248, 0x25c - -gUnknown_085BB4A4:: @ 85BB4A4 - .incbin "baserom.gba", 0x5bb4a4, 0x48c - -gUnknown_085BB930:: @ 85BB930 - .incbin "baserom.gba", 0x5bb930, 0x2e4 - -gUnknown_085BBC14:: @ 85BBC14 - .incbin "baserom.gba", 0x5bbc14, 0x6a0 - -gUnknown_085BC2B4:: @ 85BC2B4 - .incbin "baserom.gba", 0x5bc2b4, 0x20 - -gUnknown_085BC2D4:: @ 85BC2D4 - .incbin "baserom.gba", 0x5bc2d4, 0x20 - -gUnknown_085BC2F4:: @ 85BC2F4 - .incbin "baserom.gba", 0x5bc2f4, 0x20 - -gUnknown_085BC314:: @ 85BC314 - .incbin "baserom.gba", 0x5bc314, 0x800 - -gUnknown_085BCB14:: @ 85BCB14 - .incbin "baserom.gba", 0x5bcb14, 0x800 - -gUnknown_085BD314:: @ 85BD314 - .incbin "baserom.gba", 0x5bd314, 0x820 - -gUnknown_085BDB34:: @ 85BDB34 - .incbin "baserom.gba", 0x5bdb34, 0x6b4 - -gUnknown_085BE1E8:: @ 85BE1E8 - .incbin "baserom.gba", 0x5be1e8, 0x334 - -gUnknown_085BE51C:: @ 85BE51C - .incbin "baserom.gba", 0x5be51c, 0x56c - -gUnknown_085BEA88:: @ 85BEA88 - .incbin "baserom.gba", 0x5bea88, 0x318 - -gUnknown_085BEDA0:: @ 85BEDA0 - .incbin "baserom.gba", 0x5beda0, 0x140 - -gUnknown_085BEEE0:: @ 85BEEE0 - .incbin "baserom.gba", 0x5beee0, 0x1c0 - -gUnknown_085BF0A0:: @ 85BF0A0 - .incbin "baserom.gba", 0x5bf0a0, 0x200 - -gUnknown_085BF2A0:: @ 85BF2A0 - .incbin "baserom.gba", 0x5bf2a0, 0x200 - -gUnknown_085BF4A0:: @ 85BF4A0 - .incbin "baserom.gba", 0x5bf4a0, 0xa0 - -gUnknown_085BF540:: @ 85BF540 - .incbin "baserom.gba", 0x5bf540, 0x160 - -gUnknown_085BF6A0:: @ 85BF6A0 - .incbin "baserom.gba", 0x5bf6a0, 0x7540 - -gUnknown_085C6BE0:: @ 85C6BE0 - .incbin "baserom.gba", 0x5c6be0, 0x1000 - -gUnknown_085C7BE0:: @ 85C7BE0 - .incbin "baserom.gba", 0x5c7be0, 0x20 - -gUnknown_085C7C00:: @ 85C7C00 - .incbin "baserom.gba", 0x5c7c00, 0x68c - -gUnknown_085C828C:: @ 85C828C - .incbin "baserom.gba", 0x5c828c, 0x2ec - -gUnknown_085C8578:: @ 85C8578 - .incbin "baserom.gba", 0x5c8578, 0x20 - -gUnknown_085C8598:: @ 85C8598 - .incbin "baserom.gba", 0x5c8598, 0x15c - -gUnknown_085C86F4:: @ 85C86F4 - .incbin "baserom.gba", 0x5c86f4, 0x100 - -gUnknown_085C87F4:: @ 85C87F4 - .incbin "baserom.gba", 0x5c87f4, 0xb0 - -gUnknown_085C88A4:: @ 85C88A4 - .incbin "baserom.gba", 0x5c88a4, 0x84 - -gUnknown_085C8928:: @ 85C8928 - .incbin "baserom.gba", 0x5c8928, 0x20 - -gUnknown_085C8948:: @ 85C8948 - .incbin "baserom.gba", 0x5c8948, 0xa8 - -gUnknown_085C89F0:: @ 85C89F0 - .incbin "baserom.gba", 0x5c89f0, 0xa8 - -gUnknown_085C8A98:: @ 85C8A98 - .incbin "baserom.gba", 0x5c8a98, 0x10 - -gUnknown_085C8AA8:: @ 85C8AA8 - .incbin "baserom.gba", 0x5c8aa8, 0xc - -gUnknown_085C8AB4:: @ 85C8AB4 - .incbin "baserom.gba", 0x5c8ab4, 0x8 - -gUnknown_085C8ABC:: @ 85C8ABC - .incbin "baserom.gba", 0x5c8abc, 0x8 - -gUnknown_085C8AC4:: @ 85C8AC4 - .incbin "baserom.gba", 0x5c8ac4, 0x1c - -gUnknown_085C8AE0:: @ 85C8AE0 - .incbin "baserom.gba", 0x5c8ae0, 0x1c - -gUnknown_085C8AFC:: @ 85C8AFC - .incbin "baserom.gba", 0x5c8afc, 0x18 - -gUnknown_085C8B14:: @ 85C8B14 - .incbin "baserom.gba", 0x5c8b14, 0x18 - -gUnknown_085C8B2C:: @ 85C8B2C - .incbin "baserom.gba", 0x5c8b2c, 0x18 - -gUnknown_085C8B44:: @ 85C8B44 - .incbin "baserom.gba", 0x5c8b44, 0x18 - -gUnknown_085C8B5C:: @ 85C8B5C - .incbin "baserom.gba", 0x5c8b5c, 0x20 - -gUnknown_085C8B7C:: @ 85C8B7C - .incbin "baserom.gba", 0x5c8b7c, 0xc - -gUnknown_085C8B88:: @ 85C8B88 - .incbin "baserom.gba", 0x5c8b88, 0x4 - -gUnknown_085C8B8C:: @ 85C8B8C - .incbin "baserom.gba", 0x5c8b8c, 0xa - -gUnknown_085C8B96:: @ 85C8B96 - .incbin "baserom.gba", 0x5c8b96, 0x6 - -gUnknown_085C8B9C:: @ 85C8B9C - .incbin "baserom.gba", 0x5c8b9c, 0x1c - -gUnknown_085C8BB8:: @ 85C8BB8 - .incbin "baserom.gba", 0x5c8bb8, 0x8 - -gUnknown_085C8BC0:: @ 85C8BC0 - .incbin "baserom.gba", 0x5c8bc0, 0xc - -gUnknown_085C8BCC:: @ 85C8BCC - .incbin "baserom.gba", 0x5c8bcc, 0x28 - -gUnknown_085C8BF4:: @ 85C8BF4 - .incbin "baserom.gba", 0x5c8bf4, 0x6 - -gUnknown_085C8BFA:: @ 85C8BFA - .incbin "baserom.gba", 0x5c8bfa, 0x14 - -gUnknown_085C8C0E:: @ 85C8C0E - .incbin "baserom.gba", 0x5c8c0e, 0x16 - -gUnknown_085C8C24:: @ 85C8C24 - .incbin "baserom.gba", 0x5c8c24, 0x1c - -gUnknown_085C8C40:: @ 85C8C40 - .incbin "baserom.gba", 0x5c8c40, 0x4 - -gUnknown_085C8C44:: @ 85C8C44 - .incbin "baserom.gba", 0x5c8c44, 0x4 - -gUnknown_085C8C48:: @ 85C8C48 - .incbin "baserom.gba", 0x5c8c48, 0xc - -gUnknown_085C8C54:: @ 85C8C54 - .incbin "baserom.gba", 0x5c8c54, 0x10 - -gUnknown_085C8C64:: @ 85C8C64 - .incbin "baserom.gba", 0x5c8c64, 0x2 - -gUnknown_085C8C66:: @ 85C8C66 - .incbin "baserom.gba", 0x5c8c66, 0x6 - -gUnknown_085C8C6C:: @ 85C8C6C - .incbin "baserom.gba", 0x5c8c6c, 0xc - -gUnknown_085C8C78:: @ 85C8C78 - .incbin "baserom.gba", 0x5c8c78, 0x8 - -gUnknown_085C8C80:: @ 85C8C80 - .incbin "baserom.gba", 0x5c8c80, 0x4 - -gUnknown_085C8C84:: @ 85C8C84 - .incbin "baserom.gba", 0x5c8c84, 0xb4 - -gUnknown_085C8D38:: @ 85C8D38 - .incbin "baserom.gba", 0x5c8d38, 0x8 - -gUnknown_085C8D40:: @ 85C8D40 - .incbin "baserom.gba", 0x5c8d40, 0x20 - -gUnknown_085C8D60:: @ 85C8D60 - .incbin "baserom.gba", 0x5c8d60, 0x2c - -gUnknown_085C8D8C:: @ 85C8D8C - .incbin "baserom.gba", 0x5c8d8c, 0x14 - -gUnknown_085C8DA0:: @ 85C8DA0 - .incbin "baserom.gba", 0x5c8da0, 0x10 - -gUnknown_085C8DB0:: @ 85C8DB0 - .incbin "baserom.gba", 0x5c8db0, 0xc - -gUnknown_085C8DBC:: @ 85C8DBC - .incbin "baserom.gba", 0x5c8dbc, 0x14 - -gUnknown_085C8DD0:: @ 85C8DD0 - .incbin "baserom.gba", 0x5c8dd0, 0x46 - -gUnknown_085C8E16:: @ 85C8E16 - .incbin "baserom.gba", 0x5c8e16, 0xe - -gUnknown_085C8E24:: @ 85C8E24 - .incbin "baserom.gba", 0x5c8e24, 0x44 - -gUnknown_085C8E68:: @ 85C8E68 - .incbin "baserom.gba", 0x5c8e68, 0x6c - - .align 2 -gFieldEffectObjectPalette10:: @ 85C8ED4 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal" - - .align 2 -gFieldEffectObjectPaletteInfo10:: @ 85C8EF4 - obj_pal gFieldEffectObjectPalette10, 0x1009 - - .incbin "baserom.gba", 0x5c8efc, 0xe0 - -gUnknown_085C8FDC:: @ 85C8FDC - .incbin "baserom.gba", 0x5c8fdc, 0x14 - -gUnknown_085C8FF0:: @ 85C8FF0 - .incbin "baserom.gba", 0x5c8ff0, 0x30 - -gUnknown_085C9020:: @ 85C9020 - .incbin "baserom.gba", 0x5c9020, 0x4b0 - -gUnknown_085C94D0:: @ 85C94D0 - .incbin "baserom.gba", 0x5c94d0, 0x500 - -gUnknown_085C99D0:: @ 85C99D0 - .incbin "baserom.gba", 0x5c99d0, 0x18 - -gUnknown_085C99E8:: @ 85C99E8 - .incbin "baserom.gba", 0x5c99e8, 0x10 - -gUnknown_085C99F8:: @ 85C99F8 - .incbin "baserom.gba", 0x5c99f8, 0x10 - -gUnknown_085C9A08:: @ 85C9A08 - .incbin "baserom.gba", 0x5c9a08, 0x14 - -gUnknown_085C9A1C:: @ 85C9A1C - .incbin "baserom.gba", 0x5c9a1c, 0x14 - -gUnknown_085C9A30:: @ 85C9A30 - .incbin "baserom.gba", 0x5c9a30, 0x23 - -gUnknown_085C9A53:: @ 85C9A53 - .incbin "baserom.gba", 0x5c9a53, 0x41 - -gUnknown_085C9A94:: @ 85C9A94 - .incbin "baserom.gba", 0x5c9a94, 0xe4 diff --git a/data/data3.s b/data/data3.s new file mode 100644 index 000000000..b06d2566e --- /dev/null +++ b/data/data3.s @@ -0,0 +1,5059 @@ +@ the third big chunk of data + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gBitTable:: @ 832A328 + .incbin "baserom.gba", 0x32a328, 0x80 + +gUnknown_0832A3A8:: @ 832A3A8 + .incbin "baserom.gba", 0x32a3a8, 0x18 + +gUnknown_0832A3C0:: @ 832A3C0 + .incbin "baserom.gba", 0x32a3c0, 0x18 + +gUnknown_0832A3D8:: @ 832A3D8 + .incbin "baserom.gba", 0x32a3d8, 0xa00 + +@ 832ADD8 + .include "data/egg_moves.inc" + + .align 2 +gUnknown_0832B6C0:: @ 832B6C0 + .incbin "baserom.gba", 0x32b6c0, 0x20 + +gUnknown_0832B6E0:: @ 832B6E0 + .incbin "baserom.gba", 0x32b6e0, 0x18 + +gUnknown_0832B6F8:: @ 832B6F8 + .incbin "baserom.gba", 0x32b6f8, 0x10 + +gEggName:: @ 832B708 + .string "タマゴ$" @ "tamago" ("egg" in Japanese) + +@ 832B70C + .incbin "baserom.gba", 0x32b70c, 0x8d8 + +gUnknown_0832BFE4:: @ 832BFE4 + .incbin "baserom.gba", 0x32bfe4, 0x8 + +gUnknown_0832BFEC:: @ 832BFEC + .incbin "baserom.gba", 0x32bfec, 0x8 + +gUnknown_0832BFF4:: @ 832BFF4 + .incbin "baserom.gba", 0x32bff4, 0x8 + +gUnknown_0832BFFC:: @ 832BFFC + .incbin "baserom.gba", 0x32bffc, 0x50 + +gUnknown_0832C04C:: @ 832C04C + .incbin "baserom.gba", 0x32c04c, 0x18 + +gUnknown_0832C064:: @ 832C064 + .incbin "baserom.gba", 0x32c064, 0x8 + +gUnknown_0832C06C:: @ 832C06C + .incbin "baserom.gba", 0x32c06c, 0x10 + +gUnknown_0832C07C:: @ 832C07C + .incbin "baserom.gba", 0x32c07c, 0x8 + +gUnknown_0832C084:: @ 832C084 + .incbin "baserom.gba", 0x32c084, 0x4c + +gUnknown_0832C0D0:: @ 832C0D0 + .incbin "baserom.gba", 0x32c0d0, 0x8 + +gUnknown_0832C0D8:: @ 832C0D8 + .incbin "baserom.gba", 0x32c0d8, 0x8 + +gUnknown_0832C0E0:: @ 832C0E0 + .incbin "baserom.gba", 0x32c0e0, 0x8 + +gUnknown_0832C0E8:: @ 832C0E8 + .incbin "baserom.gba", 0x32c0e8, 0x8 + +gUnknown_0832C0F0:: @ 832C0F0 + .incbin "baserom.gba", 0x32c0f0, 0x8 + +gUnknown_0832C0F8:: @ 832C0F8 + .incbin "baserom.gba", 0x32c0f8, 0x8 + +gUnknown_0832C100:: @ 832C100 + .incbin "baserom.gba", 0x32c100, 0x8 + +gUnknown_0832C108:: @ 832C108 + .incbin "baserom.gba", 0x32c108, 0x20 + +gUnknown_0832C128:: @ 832C128 + .incbin "baserom.gba", 0x32c128, 0x18 + +gUnknown_0832C140:: @ 832C140 + .incbin "baserom.gba", 0x32c140, 0x30 + +gUnknown_0832C170:: @ 832C170 + .incbin "baserom.gba", 0x32c170, 0x30 + +gUnknown_0832C1A0:: @ 832C1A0 + .incbin "baserom.gba", 0x32c1a0, 0x20 + +gUnknown_0832C1C0:: @ 832C1C0 + .incbin "baserom.gba", 0x32c1c0, 0xcc + +gUnknown_0832C28C:: @ 832C28C + .incbin "baserom.gba", 0x32c28c, 0x38 + +gUnknown_0832C2C4:: @ 832C2C4 + .incbin "baserom.gba", 0x32c2c4, 0x8 + +gUnknown_0832C2CC:: @ 832C2CC + .incbin "baserom.gba", 0x32c2cc, 0x68 + +gUnknown_0832C334:: @ 832C334 + .incbin "baserom.gba", 0x32c334, 0x8 + +gUnknown_0832C33C:: @ 832C33C + .incbin "baserom.gba", 0x32c33c, 0x8 + +gUnknown_0832C344:: @ 832C344 + .incbin "baserom.gba", 0x32c344, 0x8 + +gUnknown_0832C34C:: @ 832C34C + .incbin "baserom.gba", 0x32c34c, 0x18 + +gUnknown_0832C364:: @ 832C364 + .incbin "baserom.gba", 0x32c364, 0x30 + +gUnknown_0832C394:: @ 832C394 + .incbin "baserom.gba", 0x32c394, 0x30 + +gUnknown_0832C3C4:: @ 832C3C4 + .incbin "baserom.gba", 0x32c3c4, 0x14 + +gUnknown_0832C3D8:: @ 832C3D8 + .incbin "baserom.gba", 0x32c3d8, 0x14 + +gUnknown_0832C3EC:: @ 832C3EC + .incbin "baserom.gba", 0x32c3ec, 0xc + +gUnknown_0832C3F8:: @ 832C3F8 + .incbin "baserom.gba", 0x32c3f8, 0x8 + +gUnknown_0832C400:: @ 832C400 + .incbin "baserom.gba", 0x32c400, 0x60 + +gUnknown_0832C460:: @ 832C460 + .incbin "baserom.gba", 0x32c460, 0x128 + +gUnknown_0832C588:: @ 832C588 + .incbin "baserom.gba", 0x32c588, 0x138 + +gUnknown_0832C6C0:: @ 832C6C0 + .incbin "baserom.gba", 0x32c6c0, 0x1fe + +gUnknown_0832C8BE:: @ 832C8BE + .incbin "baserom.gba", 0x32c8be, 0x1fe + +gUnknown_0832CABC:: @ 832CABC + .incbin "baserom.gba", 0x32cabc, 0x800 + +gUnknown_0832D2BC:: @ 832D2BC + .incbin "baserom.gba", 0x32d2bc, 0x800 + +gUnknown_0832DABC:: @ 832DABC + .incbin "baserom.gba", 0x32dabc, 0xb + +gUnknown_0832DAC7:: @ 832DAC7 + .incbin "baserom.gba", 0x32dac7, 0x2 + +gUnknown_0832DAC9:: @ 832DAC9 + .incbin "baserom.gba", 0x32dac9, 0x2 + +gUnknown_0832DACB:: @ 832DACB + .incbin "baserom.gba", 0x32dacb, 0x7 + +gUnknown_0832DAD2:: @ 832DAD2 + .incbin "baserom.gba", 0x32dad2, 0xd + +gUnknown_0832DADF:: @ 832DADF + .incbin "baserom.gba", 0x32dadf, 0x6 + +gUnknown_0832DAE5:: @ 832DAE5 + .incbin "baserom.gba", 0x32dae5, 0x157 + +gUnknown_0832DC3C:: @ 832DC3C + .incbin "baserom.gba", 0x32dc3c, 0x8 + +gUnknown_0832DC44:: @ 832DC44 + .incbin "baserom.gba", 0x32dc44, 0x50 + +gUnknown_0832DC94:: @ 832DC94 + .incbin "baserom.gba", 0x32dc94, 0x18 + +gUnknown_0832DCAC:: @ 832DCAC + .incbin "baserom.gba", 0x32dcac, 0x38 + +gUnknown_0832DCE4:: @ 832DCE4 + .incbin "baserom.gba", 0x32dce4, 0x8 + +gUnknown_0832DCEC:: @ 832DCEC + .incbin "baserom.gba", 0x32dcec, 0x138 + +gUnknown_0832DE24:: @ 832DE24 + .incbin "baserom.gba", 0x32de24, 0x1a + +gUnknown_0832DE3E:: @ 832DE3E + .incbin "baserom.gba", 0x32de3e, 0x18 + +gUnknown_0832DE56:: @ 832DE56 + .incbin "baserom.gba", 0x32de56, 0x3e + +gUnknown_0832DE94:: @ 832DE94 + .incbin "baserom.gba", 0x32de94, 0x18 + +gUnknown_0832DEAC:: @ 832DEAC + .incbin "baserom.gba", 0x32deac, 0x10 + +gUnknown_0832DEBC:: @ 832DEBC + .incbin "baserom.gba", 0x32debc, 0x24 + +gUnknown_0832DEE0:: @ 832DEE0 + .incbin "baserom.gba", 0x32dee0, 0x4 + +gUnknown_0832DEE4:: @ 832DEE4 + .incbin "baserom.gba", 0x32dee4, 0x10 + +gUnknown_0832DEF4:: @ 832DEF4 + .incbin "baserom.gba", 0x32def4, 0x98 + +gUnknown_0832DF8C:: @ 832DF8C + .incbin "baserom.gba", 0x32df8c, 0x8 + +gUnknown_0832DF94:: @ 832DF94 + .incbin "baserom.gba", 0x32df94, 0x5 + +gUnknown_0832DF99:: @ 832DF99 + .incbin "baserom.gba", 0x32df99, 0x2027 + +gUnknown_0832FFC0:: @ 832FFC0 + .incbin "baserom.gba", 0x32ffc0, 0x1fa0 + +gUnknown_08331F60:: @ 8331F60 + .incbin "baserom.gba", 0x331f60, 0x1000 + +gUnknown_08332F60:: @ 8332F60 + .incbin "baserom.gba", 0x332f60, 0x2840 + +gUnknown_083357A0:: @ 83357A0 + .incbin "baserom.gba", 0x3357a0, 0x100 + +gUnknown_083358A0:: @ 83358A0 + .incbin "baserom.gba", 0x3358a0, 0x100 + +gUnknown_083359A0:: @ 83359A0 + .incbin "baserom.gba", 0x3359a0, 0x1000 + +gUnknown_083369A0:: @ 83369A0 + .incbin "baserom.gba", 0x3369a0, 0x1000 + +gUnknown_083379A0:: @ 83379A0 + .incbin "baserom.gba", 0x3379a0, 0x100 + +gUnknown_08337AA0:: @ 8337AA0 + .incbin "baserom.gba", 0x337aa0, 0x200 + +gUnknown_08337CA0:: @ 8337CA0 + .incbin "baserom.gba", 0x337ca0, 0x200 + +gUnknown_08337EA0:: @ 8337EA0 + .incbin "baserom.gba", 0x337ea0, 0x20 + +gUnknown_08337EC0:: @ 8337EC0 + .incbin "baserom.gba", 0x337ec0, 0x690 + +gUnknown_08338550:: @ 8338550 + .incbin "baserom.gba", 0x338550, 0x7c8 + +gUnknown_08338D18:: @ 8338D18 + .incbin "baserom.gba", 0x338d18, 0x8 + +gUnknown_08338D20:: @ 8338D20 + .incbin "baserom.gba", 0x338d20, 0x8 + +gUnknown_08338D28:: @ 8338D28 + .incbin "baserom.gba", 0x338d28, 0x48 + +gUnknown_08338D70:: @ 8338D70 + .incbin "baserom.gba", 0x338d70, 0x8 + +gUnknown_08338D78:: @ 8338D78 + .incbin "baserom.gba", 0x338d78, 0x8 + +gUnknown_08338D80:: @ 8338D80 + .incbin "baserom.gba", 0x338d80, 0x8 + +gUnknown_08338D88:: @ 8338D88 + .incbin "baserom.gba", 0x338d88, 0x38 + +gUnknown_08338DC0:: @ 8338DC0 + .incbin "baserom.gba", 0x338dc0, 0x8 + +gUnknown_08338DC8:: @ 8338DC8 + .incbin "baserom.gba", 0x338dc8, 0x2c + +gUnknown_08338DF4:: @ 8338DF4 + .incbin "baserom.gba", 0x338df4, 0x8 + +gUnknown_08338DFC:: @ 8338DFC + .incbin "baserom.gba", 0x338dfc, 0x70 + +gUnknown_08338E6C:: @ 8338E6C + .incbin "baserom.gba", 0x338e6c, 0x8 + +gUnknown_08338E74:: @ 8338E74 + .incbin "baserom.gba", 0x338e74, 0x18 + +gUnknown_08338E8C:: @ 8338E8C + .incbin "baserom.gba", 0x338e8c, 0x18 + +gUnknown_08338EA4:: @ 8338EA4 + .incbin "baserom.gba", 0x338ea4, 0x28 + +gUnknown_08338ECC:: @ 8338ECC + .incbin "baserom.gba", 0x338ecc, 0x4 + +gUnknown_08338ED0:: @ 8338ED0 + .incbin "baserom.gba", 0x338ed0, 0xf0 + +gUnknown_08338FC0:: @ 8338FC0 + .incbin "baserom.gba", 0x338fc0, 0x3c + +gUnknown_08338FFC:: @ 8338FFC + .incbin "baserom.gba", 0x338ffc, 0x10 + +gUnknown_0833900C:: @ 833900C + .incbin "baserom.gba", 0x33900c, 0x8 + +gUnknown_08339014:: @ 8339014 + .incbin "baserom.gba", 0x339014, 0x10 + +gUnknown_08339024:: @ 8339024 + .incbin "baserom.gba", 0x339024, 0x6c + +gUnknown_08339090:: @ 8339090 + .incbin "baserom.gba", 0x339090, 0x44 + +gUnknown_083390D4:: @ 83390D4 + .incbin "baserom.gba", 0x3390d4, 0x20 + +gUnknown_083390F4:: @ 83390F4 + .incbin "baserom.gba", 0x3390f4, 0x400 + +gUnknown_083394F4:: @ 83394F4 + .incbin "baserom.gba", 0x3394f4, 0x246 + +gUnknown_0833973A:: @ 833973A + .incbin "baserom.gba", 0x33973a, 0x61 + +gUnknown_0833979B:: @ 833979B + .incbin "baserom.gba", 0x33979b, 0x2 + +gUnknown_0833979D:: @ 833979D + .incbin "baserom.gba", 0x33979d, 0x33 + +gUnknown_083397D0:: @ 83397D0 + .incbin "baserom.gba", 0x3397d0, 0x4a + +gUnknown_0833981A:: @ 833981A + .incbin "baserom.gba", 0x33981a, 0x17 + +gUnknown_08339831:: @ 8339831 + .incbin "baserom.gba", 0x339831, 0x27 + +gUnknown_08339858:: @ 8339858 + .incbin "baserom.gba", 0x339858, 0x3e + +gUnknown_08339896:: @ 8339896 + .incbin "baserom.gba", 0x339896, 0x1a + +gUnknown_083398B0:: @ 83398B0 + .incbin "baserom.gba", 0x3398b0, 0x2d + +gUnknown_083398DD:: @ 83398DD + .incbin "baserom.gba", 0x3398dd, 0x18 + +gUnknown_083398F5:: @ 83398F5 + .incbin "baserom.gba", 0x3398f5, 0x1f + +gUnknown_08339914:: @ 8339914 + .incbin "baserom.gba", 0x339914, 0x7 + +gUnknown_0833991B:: @ 833991B + .incbin "baserom.gba", 0x33991b, 0x6 + +gUnknown_08339921:: @ 8339921 + .incbin "baserom.gba", 0x339921, 0x7 + +gUnknown_08339928:: @ 8339928 + .incbin "baserom.gba", 0x339928, 0x6 + +gUnknown_0833992E:: @ 833992E + .incbin "baserom.gba", 0x33992e, 0xe + +gUnknown_0833993C:: @ 833993C + .incbin "baserom.gba", 0x33993c, 0x5 + +gUnknown_08339941:: @ 8339941 + .incbin "baserom.gba", 0x339941, 0x2 + +gUnknown_08339943:: @ 8339943 + .incbin "baserom.gba", 0x339943, 0x4 + +gUnknown_08339947:: @ 8339947 + .incbin "baserom.gba", 0x339947, 0x8 + +gUnknown_0833994F:: @ 833994F + .incbin "baserom.gba", 0x33994f, 0xe + +gUnknown_0833995D:: @ 833995D + .incbin "baserom.gba", 0x33995d, 0x13 + +gUnknown_08339970:: @ 8339970 + .incbin "baserom.gba", 0x339970, 0x4 + +gUnknown_08339974:: @ 8339974 + .incbin "baserom.gba", 0x339974, 0xc + +gUnknown_08339980:: @ 8339980 + .incbin "baserom.gba", 0x339980, 0x38 + +gUnknown_083399B8:: @ 83399B8 + .incbin "baserom.gba", 0x3399b8, 0x8 + +gUnknown_083399C0:: @ 83399C0 + .incbin "baserom.gba", 0x3399c0, 0x8 + +gUnknown_083399C8:: @ 83399C8 + .incbin "baserom.gba", 0x3399c8, 0x8 + +gUnknown_083399D0:: @ 83399D0 + .incbin "baserom.gba", 0x3399d0, 0xc + +gUnknown_083399DC:: @ 83399DC + .incbin "baserom.gba", 0x3399dc, 0x8 + +gUnknown_083399E4:: @ 83399E4 + .incbin "baserom.gba", 0x3399e4, 0x3 + +gUnknown_083399E7:: @ 83399E7 + .incbin "baserom.gba", 0x3399e7, 0x5 + +gUnknown_083399EC:: @ 83399EC + .incbin "baserom.gba", 0x3399ec, 0xd4 + +gUnknown_08339AC0:: @ 8339AC0 + .incbin "baserom.gba", 0x339ac0, 0x8 + +gUnknown_08339AC8:: @ 8339AC8 + .incbin "baserom.gba", 0x339ac8, 0x8 + +gUnknown_08339AD0:: @ 8339AD0 + .incbin "baserom.gba", 0x339ad0, 0x8 + +gUnknown_08339AD8:: @ 8339AD8 + .incbin "baserom.gba", 0x339ad8, 0x60 + +gUnknown_08339B38:: @ 8339B38 + .incbin "baserom.gba", 0x339b38, 0x8 + +gUnknown_08339B40:: @ 8339B40 + .incbin "baserom.gba", 0x339b40, 0x98 + +gUnknown_08339BD8:: @ 8339BD8 + .incbin "baserom.gba", 0x339bd8, 0x8 + +gUnknown_08339BE0:: @ 8339BE0 + .incbin "baserom.gba", 0x339be0, 0x44 + +gUnknown_08339C24:: @ 8339C24 + .incbin "baserom.gba", 0x339c24, 0x8 + +gUnknown_08339C2C:: @ 8339C2C + .incbin "baserom.gba", 0x339c2c, 0x2c + +gUnknown_08339C58:: @ 8339C58 + .incbin "baserom.gba", 0x339c58, 0x8 + +gUnknown_08339C60:: @ 8339C60 + .incbin "baserom.gba", 0x339c60, 0x18 + +gUnknown_08339C78:: @ 8339C78 + .incbin "baserom.gba", 0x339c78, 0x28 + +gUnknown_08339CA0:: @ 8339CA0 + .incbin "baserom.gba", 0x339ca0, 0x1e + +gUnknown_08339CBE:: @ 8339CBE + .incbin "baserom.gba", 0x339cbe, 0x5 + +gUnknown_08339CC3:: @ 8339CC3 + .incbin "baserom.gba", 0x339cc3, 0x5 + +gUnknown_08339CC8:: @ 8339CC8 + .incbin "baserom.gba", 0x339cc8, 0x4c + +gUnknown_08339D14:: @ 8339D14 + .incbin "baserom.gba", 0x339d14, 0x8 + +gUnknown_08339D1C:: @ 8339D1C + .incbin "baserom.gba", 0x339d1c, 0x20 + +gUnknown_08339D3C:: @ 8339D3C + .incbin "baserom.gba", 0x339d3c, 0x28 + +gUnknown_08339D64:: @ 8339D64 + .incbin "baserom.gba", 0x339d64, 0x48 + +gUnknown_08339DAC:: @ 8339DAC + .incbin "baserom.gba", 0x339dac, 0x10 + +gUnknown_08339DBC:: @ 8339DBC + .incbin "baserom.gba", 0x339dbc, 0xc + +gUnknown_08339DC8:: @ 8339DC8 + .incbin "baserom.gba", 0x339dc8, 0xc + +gUnknown_08339DD4:: @ 8339DD4 + .incbin "baserom.gba", 0x339dd4, 0x2c + +gUnknown_08339E00:: @ 8339E00 + .incbin "baserom.gba", 0x339e00, 0x8 + +@ 8339E08 + .include "data/tilesets/tileset_graphics.inc" + +@ 83960F0 + .include "data/tilesets/metatiles.inc" + +@ 83DF704 + .include "data/tilesets/tilesets.inc" + +@ 83DFE14 + .incbin "baserom.gba", 0x3dfe14, 0xa1fc0 + +gUnknown_08481DD4:: @ 8481DD4 + .incbin "baserom.gba", 0x481dd4, 0x47a4 + +gUnknown_08486578:: @ 8486578 + .incbin "baserom.gba", 0x486578, 0x980 + +gUnknown_08486EF8:: @ 8486EF8 + .incbin "baserom.gba", 0x486ef8, 0x4 + +gUnknown_08486EFC:: @ 8486EFC + .incbin "baserom.gba", 0x486efc, 0x10090 + +gUnknown_08496F8C:: @ 8496F8C + .incbin "baserom.gba", 0x496f8c, 0x14 + +gUnknown_08496FA0:: @ 8496FA0 + .incbin "baserom.gba", 0x496fa0, 0x14 + +gUnknown_08496FB4:: @ 8496FB4 + .incbin "baserom.gba", 0x496fb4, 0x1c0 + +gUnknown_08497174:: @ 8497174 + .incbin "baserom.gba", 0x497174, 0x288 + +gUnknown_084973FC:: @ 84973FC + .incbin "baserom.gba", 0x4973fc, 0x48 + +gUnknown_08497444:: @ 8497444 + .incbin "baserom.gba", 0x497444, 0x4c + +gUnknown_08497490:: @ 8497490 + .incbin "baserom.gba", 0x497490, 0xc + +gUnknown_0849749C:: @ 849749C + .incbin "baserom.gba", 0x49749c, 0x14 + +gUnknown_084974B0:: @ 84974B0 + .incbin "baserom.gba", 0x4974b0, 0x8 + +gUnknown_084974B8:: @ 84974B8 + .incbin "baserom.gba", 0x4974b8, 0x20 + +gUnknown_084974D8:: @ 84974D8 + .incbin "baserom.gba", 0x4974d8, 0x10 + +gUnknown_084974E8:: @ 84974E8 + .incbin "baserom.gba", 0x4974e8, 0x10 + +gUnknown_084974F8:: @ 84974F8 + .incbin "baserom.gba", 0x4974f8, 0x10 + +gUnknown_08497508:: @ 8497508 + .incbin "baserom.gba", 0x497508, 0x2 + +gUnknown_0849750A:: @ 849750A + .incbin "baserom.gba", 0x49750a, 0x2 + +gUnknown_0849750C:: @ 849750C + .incbin "baserom.gba", 0x49750c, 0x14 + +gUnknown_08497520:: @ 8497520 + .incbin "baserom.gba", 0x497520, 0x10 + +gUnknown_08497530:: @ 8497530 + .incbin "baserom.gba", 0x497530, 0xc + +gUnknown_0849753C:: @ 849753C + .incbin "baserom.gba", 0x49753c, 0x4 + +gUnknown_08497540:: @ 8497540 + .incbin "baserom.gba", 0x497540, 0x10 + +gUnknown_08497550:: @ 8497550 + .incbin "baserom.gba", 0x497550, 0x4 + +gUnknown_08497554:: @ 8497554 + .incbin "baserom.gba", 0x497554, 0x8 + +gUnknown_0849755C:: @ 849755C + .incbin "baserom.gba", 0x49755c, 0x40 + +gUnknown_0849759C:: @ 849759C + .incbin "baserom.gba", 0x49759c, 0x6 + +gUnknown_084975A2:: @ 84975A2 + .incbin "baserom.gba", 0x4975a2, 0x6 + +gUnknown_084975A8:: @ 84975A8 + .incbin "baserom.gba", 0x4975a8, 0x2 + +gUnknown_084975AA:: @ 84975AA + .incbin "baserom.gba", 0x4975aa, 0x6 + +gUnknown_084975B0:: @ 84975B0 + .incbin "baserom.gba", 0x4975b0, 0xc + +gUnknown_084975BC:: @ 84975BC + .incbin "baserom.gba", 0x4975bc, 0x8 + +gUnknown_084975C4:: @ 84975C4 + .incbin "baserom.gba", 0x4975c4, 0x10 + +gUnknown_084975D4:: @ 84975D4 + .incbin "baserom.gba", 0x4975d4, 0x18 + +gUnknown_084975EC:: @ 84975EC + .incbin "baserom.gba", 0x4975ec, 0xc + +@ 84975F8 + .include "data/graphics/field_objects/field_object_graphics.inc" + +gUnknown_08505438:: @ 8505438 + .incbin "baserom.gba", 0x505438, 0x144 + +gUnknown_0850557C:: @ 850557C + .incbin "baserom.gba", 0x50557c, 0x51 + +gUnknown_085055CD:: @ 85055CD + .incbin "baserom.gba", 0x5055cd, 0x53 + +@ 8505620 + .include "data/graphics/field_objects/field_object_graphics_info_pointers.inc" + +@ 85059F8 + .include "data/graphics/field_objects/field_effect_object_template_pointers.inc" + +@ 8505A8C + .include "data/graphics/field_objects/field_object_pic_tables.inc" + +@ 85089FC + .include "data/graphics/field_objects/field_object_anims.inc" + +gUnknown_085094AC:: @ 85094AC + .incbin "baserom.gba", 0x5094ac, 0x40 + +@ 85094EC + .include "data/graphics/field_objects/field_object_oam.inc" + +@ 8509954 + .include "data/graphics/field_objects/field_object_graphics_info.inc" + +gUnknown_0850BBC8:: @ 850BBC8 + .incbin "baserom.gba", 0x50bbc8, 0x138 + +gUnknown_0850BD00:: @ 850BD00 + .incbin "baserom.gba", 0x50bd00, 0x78 + +gUnknown_0850BD78:: @ 850BD78 + .incbin "baserom.gba", 0x50bd78, 0xc0 + +gUnknown_0850BE38:: @ 850BE38 + .incbin "baserom.gba", 0x50be38, 0x10 + +@ 850BE48 + .include "data/graphics/field_objects/berry_tree_graphics_tables.inc" + +@ 850C9C0 + .include "data/graphics/field_objects/field_effect_objects.inc" + + .incbin "baserom.gba", 0x50d6d4, 0x8 + +gUnknown_0850D6DC:: @ 850D6DC + .incbin "baserom.gba", 0x50d6dc, 0x10 + +gUnknown_0850D6EC:: @ 850D6EC + .incbin "baserom.gba", 0x50d6ec, 0x8 + +gUnknown_0850D6F4:: @ 850D6F4 + .incbin "baserom.gba", 0x50d6f4, 0x1c + +gUnknown_0850D710:: @ 850D710 + .incbin "baserom.gba", 0x50d710, 0x4 + +gUnknown_0850D714:: @ 850D714 + .incbin "baserom.gba", 0x50d714, 0x2c + +gUnknown_0850D740:: @ 850D740 + .incbin "baserom.gba", 0x50d740, 0x14 + +gUnknown_0850D754:: @ 850D754 + .incbin "baserom.gba", 0x50d754, 0x1c + +gUnknown_0850D770:: @ 850D770 + .incbin "baserom.gba", 0x50d770, 0x4 + +gUnknown_0850D774:: @ 850D774 + .incbin "baserom.gba", 0x50d774, 0x1c + +gUnknown_0850D790:: @ 850D790 + .incbin "baserom.gba", 0x50d790, 0x4 + +gUnknown_0850D794:: @ 850D794 + .incbin "baserom.gba", 0x50d794, 0xc + +gUnknown_0850D7A0:: @ 850D7A0 + .incbin "baserom.gba", 0x50d7a0, 0x14 + +gUnknown_0850D7B4:: @ 850D7B4 + .incbin "baserom.gba", 0x50d7b4, 0x14 + +gUnknown_0850D7C8:: @ 850D7C8 + .incbin "baserom.gba", 0x50d7c8, 0x14 + +gUnknown_0850D7DC:: @ 850D7DC + .incbin "baserom.gba", 0x50d7dc, 0x14 + +gUnknown_0850D7F0:: @ 850D7F0 + .incbin "baserom.gba", 0x50d7f0, 0x4 + +gUnknown_0850D7F4:: @ 850D7F4 + .incbin "baserom.gba", 0x50d7f4, 0x14 + +gUnknown_0850D808:: @ 850D808 + .incbin "baserom.gba", 0x50d808, 0x4 + +gUnknown_0850D80C:: @ 850D80C + .incbin "baserom.gba", 0x50d80c, 0x14 + +gUnknown_0850D820:: @ 850D820 + .incbin "baserom.gba", 0x50d820, 0x4 + +gUnknown_0850D824:: @ 850D824 + .incbin "baserom.gba", 0x50d824, 0x14 + +gUnknown_0850D838:: @ 850D838 + .incbin "baserom.gba", 0x50d838, 0x4 + +gUnknown_0850D83C:: @ 850D83C + .incbin "baserom.gba", 0x50d83c, 0x14 + +gUnknown_0850D850:: @ 850D850 + .incbin "baserom.gba", 0x50d850, 0x4 + +gUnknown_0850D854:: @ 850D854 + .incbin "baserom.gba", 0x50d854, 0x14 + +gUnknown_0850D868:: @ 850D868 + .incbin "baserom.gba", 0x50d868, 0x4 + +gUnknown_0850D86C:: @ 850D86C + .incbin "baserom.gba", 0x50d86c, 0x14 + +gUnknown_0850D880:: @ 850D880 + .incbin "baserom.gba", 0x50d880, 0x4 + +gUnknown_0850D884:: @ 850D884 + .incbin "baserom.gba", 0x50d884, 0x14 + +gUnknown_0850D898:: @ 850D898 + .incbin "baserom.gba", 0x50d898, 0x4 + +gUnknown_0850D89C:: @ 850D89C + .incbin "baserom.gba", 0x50d89c, 0x10 + +gUnknown_0850D8AC:: @ 850D8AC + .incbin "baserom.gba", 0x50d8ac, 0x8 + +gUnknown_0850D8B4:: @ 850D8B4 + .incbin "baserom.gba", 0x50d8b4, 0x10 + +gUnknown_0850D8C4:: @ 850D8C4 + .incbin "baserom.gba", 0x50d8c4, 0x8 + +gUnknown_0850D8CC:: @ 850D8CC + .incbin "baserom.gba", 0x50d8cc, 0x10 + +gUnknown_0850D8DC:: @ 850D8DC + .incbin "baserom.gba", 0x50d8dc, 0xc + +gUnknown_0850D8E8:: @ 850D8E8 + .incbin "baserom.gba", 0x50d8e8, 0x4 + +gUnknown_0850D8EC:: @ 850D8EC + .incbin "baserom.gba", 0x50d8ec, 0xc + +gUnknown_0850D8F8:: @ 850D8F8 + .incbin "baserom.gba", 0x50d8f8, 0x4 + +gUnknown_0850D8FC:: @ 850D8FC + .incbin "baserom.gba", 0x50d8fc, 0xc + +gUnknown_0850D908:: @ 850D908 + .incbin "baserom.gba", 0x50d908, 0x4 + +gUnknown_0850D90C:: @ 850D90C + .incbin "baserom.gba", 0x50d90c, 0xc + +gUnknown_0850D918:: @ 850D918 + .incbin "baserom.gba", 0x50d918, 0x4 + +gUnknown_0850D91C:: @ 850D91C + .incbin "baserom.gba", 0x50d91c, 0xc + +gUnknown_0850D928:: @ 850D928 + .incbin "baserom.gba", 0x50d928, 0x4 + +gUnknown_0850D92C:: @ 850D92C + .incbin "baserom.gba", 0x50d92c, 0xc + +gUnknown_0850D938:: @ 850D938 + .incbin "baserom.gba", 0x50d938, 0x4 + +gUnknown_0850D93C:: @ 850D93C + .incbin "baserom.gba", 0x50d93c, 0xc + +gUnknown_0850D948:: @ 850D948 + .incbin "baserom.gba", 0x50d948, 0xc + +gUnknown_0850D954:: @ 850D954 + .incbin "baserom.gba", 0x50d954, 0x4 + +gUnknown_0850D958:: @ 850D958 + .incbin "baserom.gba", 0x50d958, 0xc + +gUnknown_0850D964:: @ 850D964 + .incbin "baserom.gba", 0x50d964, 0x4 + +gUnknown_0850D968:: @ 850D968 + .incbin "baserom.gba", 0x50d968, 0xc + +gUnknown_0850D974:: @ 850D974 + .incbin "baserom.gba", 0x50d974, 0x4 + +gUnknown_0850D978:: @ 850D978 + .incbin "baserom.gba", 0x50d978, 0xc + +gUnknown_0850D984:: @ 850D984 + .incbin "baserom.gba", 0x50d984, 0x4 + +gUnknown_0850D988:: @ 850D988 + .incbin "baserom.gba", 0x50d988, 0xc + +gUnknown_0850D994:: @ 850D994 + .incbin "baserom.gba", 0x50d994, 0x4 + +gUnknown_0850D998:: @ 850D998 + .incbin "baserom.gba", 0x50d998, 0xc + +gUnknown_0850D9A4:: @ 850D9A4 + .incbin "baserom.gba", 0x50d9a4, 0x4 + +gUnknown_0850D9A8:: @ 850D9A8 + .incbin "baserom.gba", 0x50d9a8, 0xc + +gUnknown_0850D9B4:: @ 850D9B4 + .incbin "baserom.gba", 0x50d9b4, 0x4 + +gUnknown_0850D9B8:: @ 850D9B8 + .incbin "baserom.gba", 0x50d9b8, 0xc + +gUnknown_0850D9C4:: @ 850D9C4 + .incbin "baserom.gba", 0x50d9c4, 0x4 + +gUnknown_0850D9C8:: @ 850D9C8 + .incbin "baserom.gba", 0x50d9c8, 0xc + +gUnknown_0850D9D4:: @ 850D9D4 + .incbin "baserom.gba", 0x50d9d4, 0x4 + +gUnknown_0850D9D8:: @ 850D9D8 + .incbin "baserom.gba", 0x50d9d8, 0xc + +gUnknown_0850D9E4:: @ 850D9E4 + .incbin "baserom.gba", 0x50d9e4, 0x4 + +gUnknown_0850D9E8:: @ 850D9E8 + .incbin "baserom.gba", 0x50d9e8, 0xc + +gUnknown_0850D9F4:: @ 850D9F4 + .incbin "baserom.gba", 0x50d9f4, 0x4 + +gUnknown_0850D9F8:: @ 850D9F8 + .incbin "baserom.gba", 0x50d9f8, 0xc + +gUnknown_0850DA04:: @ 850DA04 + .incbin "baserom.gba", 0x50da04, 0x4 + +gUnknown_0850DA08:: @ 850DA08 + .incbin "baserom.gba", 0x50da08, 0xc + +gUnknown_0850DA14:: @ 850DA14 + .incbin "baserom.gba", 0x50da14, 0x4 + +gUnknown_0850DA18:: @ 850DA18 + .incbin "baserom.gba", 0x50da18, 0xc + +gUnknown_0850DA24:: @ 850DA24 + .incbin "baserom.gba", 0x50da24, 0x4 + +gUnknown_0850DA28:: @ 850DA28 + .incbin "baserom.gba", 0x50da28, 0xc + +gUnknown_0850DA34:: @ 850DA34 + .incbin "baserom.gba", 0x50da34, 0x4 + +gUnknown_0850DA38:: @ 850DA38 + .incbin "baserom.gba", 0x50da38, 0xc + +gUnknown_0850DA44:: @ 850DA44 + .incbin "baserom.gba", 0x50da44, 0x4 + +gUnknown_0850DA48:: @ 850DA48 + .incbin "baserom.gba", 0x50da48, 0xc + +gUnknown_0850DA54:: @ 850DA54 + .incbin "baserom.gba", 0x50da54, 0x4 + +gUnknown_0850DA58:: @ 850DA58 + .incbin "baserom.gba", 0x50da58, 0xc + +gUnknown_0850DA64:: @ 850DA64 + .incbin "baserom.gba", 0x50da64, 0x2c + +gUnknown_0850DA90:: @ 850DA90 + .incbin "baserom.gba", 0x50da90, 0xc + +gUnknown_0850DA9C:: @ 850DA9C + .incbin "baserom.gba", 0x50da9c, 0x4 + +gUnknown_0850DAA0:: @ 850DAA0 + .incbin "baserom.gba", 0x50daa0, 0x8 + +gUnknown_0850DAA8:: @ 850DAA8 + .incbin "baserom.gba", 0x50daa8, 0x8 + +gUnknown_0850DAB0:: @ 850DAB0 + .incbin "baserom.gba", 0x50dab0, 0x8 + +gUnknown_0850DAB8:: @ 850DAB8 + .incbin "baserom.gba", 0x50dab8, 0x8 + +gUnknown_0850DAC0:: @ 850DAC0 + .incbin "baserom.gba", 0x50dac0, 0xc + +gUnknown_0850DACC:: @ 850DACC + .incbin "baserom.gba", 0x50dacc, 0x9 + +gUnknown_0850DAD5:: @ 850DAD5 + .incbin "baserom.gba", 0x50dad5, 0x9 + +gUnknown_0850DADE:: @ 850DADE + .incbin "baserom.gba", 0x50dade, 0x9 + +gUnknown_0850DAE7:: @ 850DAE7 + .incbin "baserom.gba", 0x50dae7, 0x9 + +gUnknown_0850DAF0:: @ 850DAF0 + .incbin "baserom.gba", 0x50daf0, 0x9 + +gUnknown_0850DAF9:: @ 850DAF9 + .incbin "baserom.gba", 0x50daf9, 0x9 + +gUnknown_0850DB02:: @ 850DB02 + .incbin "baserom.gba", 0x50db02, 0x9 + +gUnknown_0850DB0B:: @ 850DB0B + .incbin "baserom.gba", 0x50db0b, 0x9 + +gUnknown_0850DB14:: @ 850DB14 + .incbin "baserom.gba", 0x50db14, 0x9 + +gUnknown_0850DB1D:: @ 850DB1D + .incbin "baserom.gba", 0x50db1d, 0x9 + +gUnknown_0850DB26:: @ 850DB26 + .incbin "baserom.gba", 0x50db26, 0x9 + +gUnknown_0850DB2F:: @ 850DB2F + .incbin "baserom.gba", 0x50db2f, 0x9 + +gUnknown_0850DB38:: @ 850DB38 + .incbin "baserom.gba", 0x50db38, 0x9 + +gUnknown_0850DB41:: @ 850DB41 + .incbin "baserom.gba", 0x50db41, 0x9 + +gUnknown_0850DB4A:: @ 850DB4A + .incbin "baserom.gba", 0x50db4a, 0x9 + +gUnknown_0850DB53:: @ 850DB53 + .incbin "baserom.gba", 0x50db53, 0x9 + +gUnknown_0850DB5C:: @ 850DB5C + .incbin "baserom.gba", 0x50db5c, 0x10 + +gUnknown_0850DB6C:: @ 850DB6C + .incbin "baserom.gba", 0x50db6c, 0x10 + +gUnknown_0850DB7C:: @ 850DB7C + .incbin "baserom.gba", 0x50db7c, 0x24 + +gUnknown_0850DBA0:: @ 850DBA0 + .incbin "baserom.gba", 0x50dba0, 0x5 + +gUnknown_0850DBA5:: @ 850DBA5 + .incbin "baserom.gba", 0x50dba5, 0x5 + +gUnknown_0850DBAA:: @ 850DBAA + .incbin "baserom.gba", 0x50dbaa, 0x5 + +gUnknown_0850DBAF:: @ 850DBAF + .incbin "baserom.gba", 0x50dbaf, 0x5 + +gUnknown_0850DBB4:: @ 850DBB4 + .incbin "baserom.gba", 0x50dbb4, 0x5 + +gUnknown_0850DBB9:: @ 850DBB9 + .incbin "baserom.gba", 0x50dbb9, 0x5 + +gUnknown_0850DBBE:: @ 850DBBE + .incbin "baserom.gba", 0x50dbbe, 0x5 + +gUnknown_0850DBC3:: @ 850DBC3 + .incbin "baserom.gba", 0x50dbc3, 0x5 + +gUnknown_0850DBC8:: @ 850DBC8 + .incbin "baserom.gba", 0x50dbc8, 0x5 + +gUnknown_0850DBCD:: @ 850DBCD + .incbin "baserom.gba", 0x50dbcd, 0x5 + +gUnknown_0850DBD2:: @ 850DBD2 + .incbin "baserom.gba", 0x50dbd2, 0x5 + +gUnknown_0850DBD7:: @ 850DBD7 + .incbin "baserom.gba", 0x50dbd7, 0x5 + +gUnknown_0850DBDC:: @ 850DBDC + .incbin "baserom.gba", 0x50dbdc, 0x5 + +gUnknown_0850DBE1:: @ 850DBE1 + .incbin "baserom.gba", 0x50dbe1, 0x5 + +gUnknown_0850DBE6:: @ 850DBE6 + .incbin "baserom.gba", 0x50dbe6, 0x5 + +gUnknown_0850DBEB:: @ 850DBEB + .incbin "baserom.gba", 0x50dbeb, 0x5 + +gUnknown_0850DBF0:: @ 850DBF0 + .incbin "baserom.gba", 0x50dbf0, 0x5 + +gUnknown_0850DBF5:: @ 850DBF5 + .incbin "baserom.gba", 0x50dbf5, 0x5 + +gUnknown_0850DBFA:: @ 850DBFA + .incbin "baserom.gba", 0x50dbfa, 0x5 + +gUnknown_0850DBFF:: @ 850DBFF + .incbin "baserom.gba", 0x50dbff, 0x5 + +gUnknown_0850DC04:: @ 850DC04 + .incbin "baserom.gba", 0x50dc04, 0x5 + +gUnknown_0850DC09:: @ 850DC09 + .incbin "baserom.gba", 0x50dc09, 0x5 + +gUnknown_0850DC0E:: @ 850DC0E + .incbin "baserom.gba", 0x50dc0e, 0x5 + +gUnknown_0850DC13:: @ 850DC13 + .incbin "baserom.gba", 0x50dc13, 0x5 + +gUnknown_0850DC18:: @ 850DC18 + .incbin "baserom.gba", 0x50dc18, 0x5 + +gUnknown_0850DC1D:: @ 850DC1D + .incbin "baserom.gba", 0x50dc1d, 0x5 + +gUnknown_0850DC22:: @ 850DC22 + .incbin "baserom.gba", 0x50dc22, 0x5 + +gUnknown_0850DC27:: @ 850DC27 + .incbin "baserom.gba", 0x50dc27, 0x8 + +gUnknown_0850DC2F:: @ 850DC2F + .incbin "baserom.gba", 0x50dc2f, 0x10 + +gUnknown_0850DC3F:: @ 850DC3F + .incbin "baserom.gba", 0x50dc3f, 0x11 + +gUnknown_0850DC50:: @ 850DC50 + .incbin "baserom.gba", 0x50dc50, 0x298 + +gUnknown_0850DEE8:: @ 850DEE8 + .incbin "baserom.gba", 0x50dee8, 0xd4 + +gUnknown_0850DFBC:: @ 850DFBC + .incbin "baserom.gba", 0x50dfbc, 0x6 + +gUnknown_0850DFC2:: @ 850DFC2 + .incbin "baserom.gba", 0x50dfc2, 0x61a + +gUnknown_0850E5DC:: @ 850E5DC + .incbin "baserom.gba", 0x50e5dc, 0x8 + +gUnknown_0850E5E4:: @ 850E5E4 + .incbin "baserom.gba", 0x50e5e4, 0x18 + +gUnknown_0850E5FC:: @ 850E5FC + .incbin "baserom.gba", 0x50e5fc, 0x18 + +gUnknown_0850E614:: @ 850E614 + .incbin "baserom.gba", 0x50e614, 0x10 + +gUnknown_0850E624:: @ 850E624 + .incbin "baserom.gba", 0x50e624, 0x10 + +gUnknown_0850E634:: @ 850E634 + .incbin "baserom.gba", 0x50e634, 0x10 + +gUnknown_0850E644:: @ 850E644 + .incbin "baserom.gba", 0x50e644, 0x10 + +gUnknown_0850E654:: @ 850E654 + .incbin "baserom.gba", 0x50e654, 0xc + +gUnknown_0850E660:: @ 850E660 + .incbin "baserom.gba", 0x50e660, 0x4 + +gUnknown_0850E664:: @ 850E664 + .incbin "baserom.gba", 0x50e664, 0x10 + +gUnknown_0850E674:: @ 850E674 + .incbin "baserom.gba", 0x50e674, 0xe0 + +gUnknown_0850E754:: @ 850E754 + .incbin "baserom.gba", 0x50e754, 0x14 + +gUnknown_0850E768:: @ 850E768 + .incbin "baserom.gba", 0x50e768, 0xa + +gUnknown_0850E772:: @ 850E772 + .incbin "baserom.gba", 0x50e772, 0x48 + +gUnknown_0850E7BA:: @ 850E7BA + .incbin "baserom.gba", 0x50e7ba, 0x7a + +gUnknown_0850E834:: @ 850E834 + .incbin "baserom.gba", 0x50e834, 0xc + +gUnknown_0850E840:: @ 850E840 + .incbin "baserom.gba", 0x50e840, 0x6 + +gUnknown_0850E846:: @ 850E846 + .incbin "baserom.gba", 0x50e846, 0x4 + +gUnknown_0850E84A:: @ 850E84A + .incbin "baserom.gba", 0x50e84a, 0x6 + +gUnknown_0850E850:: @ 850E850 + .incbin "baserom.gba", 0x50e850, 0x2c + +gUnknown_0850E87C:: @ 850E87C + .incbin "baserom.gba", 0x50e87c, 0x1680 + +gUnknown_0850FEFC:: @ 850FEFC + .incbin "baserom.gba", 0x50fefc, 0x280 + +gUnknown_0851017C:: @ 851017C + .incbin "baserom.gba", 0x51017c, 0xa0 + +gUnknown_0851021C:: @ 851021C + .incbin "baserom.gba", 0x51021c, 0xa0 + +gUnknown_085102BC:: @ 85102BC + .incbin "baserom.gba", 0x5102bc, 0x4 + +gUnknown_085102C0:: @ 85102C0 + .incbin "baserom.gba", 0x5102c0, 0x14 + +gUnknown_085102D4:: @ 85102D4 + .incbin "baserom.gba", 0x5102d4, 0xc + +gUnknown_085102E0:: @ 85102E0 + .incbin "baserom.gba", 0x5102e0, 0x68 + +gUnknown_08510348:: @ 8510348 + .incbin "baserom.gba", 0x510348, 0x20 + +gUnknown_08510368:: @ 8510368 + .incbin "baserom.gba", 0x510368, 0x20 + +gUnknown_08510388:: @ 8510388 + .incbin "baserom.gba", 0x510388, 0x20 + +gUnknown_085103A8:: @ 85103A8 + .incbin "baserom.gba", 0x5103a8, 0x20 + +gUnknown_085103C8:: @ 85103C8 + .incbin "baserom.gba", 0x5103c8, 0x34 + +gUnknown_085103FC:: @ 85103FC + .incbin "baserom.gba", 0x5103fc, 0x8 + +gUnknown_08510404:: @ 8510404 + .incbin "baserom.gba", 0x510404, 0x4 + +gUnknown_08510408:: @ 8510408 + .incbin "baserom.gba", 0x510408, 0x14 + +gUnknown_0851041C:: @ 851041C + .incbin "baserom.gba", 0x51041c, 0x4 + +gUnknown_08510420:: @ 8510420 + .incbin "baserom.gba", 0x510420, 0xa4 + +gUnknown_085104C4:: @ 85104C4 + .incbin "baserom.gba", 0x5104c4, 0x2c + +gUnknown_085104F0:: @ 85104F0 + .incbin "baserom.gba", 0x5104f0, 0x18 + +gUnknown_08510508:: @ 8510508 + .incbin "baserom.gba", 0x510508, 0x8 + +gUnknown_08510510:: @ 8510510 + .incbin "baserom.gba", 0x510510, 0x20 + +gUnknown_08510530:: @ 8510530 + .incbin "baserom.gba", 0x510530, 0x8 + +gUnknown_08510538:: @ 8510538 + .incbin "baserom.gba", 0x510538, 0x8 + +gUnknown_08510540:: @ 8510540 + .incbin "baserom.gba", 0x510540, 0x68 + +gUnknown_085105A8:: @ 85105A8 + .incbin "baserom.gba", 0x5105a8, 0x4 + +gUnknown_085105AC:: @ 85105AC + .incbin "baserom.gba", 0x5105ac, 0x10 + +gUnknown_085105BC:: @ 85105BC + .incbin "baserom.gba", 0x5105bc, 0x1a8 + +gUnknown_08510764:: @ 8510764 + .incbin "baserom.gba", 0x510764, 0xb60 + +gUnknown_085112C4:: @ 85112C4 + .incbin "baserom.gba", 0x5112c4, 0x908 + +gUnknown_08511BCC:: @ 8511BCC + .incbin "baserom.gba", 0x511bcc, 0x9a8 + +gUnknown_08512574:: @ 8512574 + .incbin "baserom.gba", 0x512574, 0x8e0 + +gUnknown_08512E54:: @ 8512E54 + .incbin "baserom.gba", 0x512e54, 0x320 + +gUnknown_08513174:: @ 8513174 + .incbin "baserom.gba", 0x513174, 0x510 + +gUnknown_08513684:: @ 8513684 + .incbin "baserom.gba", 0x513684, 0x210 + +gUnknown_08513894:: @ 8513894 + .incbin "baserom.gba", 0x513894, 0xb50 + +gUnknown_085143E4:: @ 85143E4 + .incbin "baserom.gba", 0x5143e4, 0x210 + +gUnknown_085145F4:: @ 85145F4 + .incbin "baserom.gba", 0x5145f4, 0x810 + +gUnknown_08514E04:: @ 8514E04 + .incbin "baserom.gba", 0x514e04, 0x540 + +gUnknown_08515344:: @ 8515344 + .incbin "baserom.gba", 0x515344, 0x20 + +gUnknown_08515364:: @ 8515364 + .incbin "baserom.gba", 0x515364, 0x20 + +gUnknown_08515384:: @ 8515384 + .incbin "baserom.gba", 0x515384, 0x30 + +gUnknown_085153B4:: @ 85153B4 + .incbin "baserom.gba", 0x5153b4, 0x30 + +gUnknown_085153E4:: @ 85153E4 + .incbin "baserom.gba", 0x5153e4, 0x10 + +gUnknown_085153F4:: @ 85153F4 + .incbin "baserom.gba", 0x5153f4, 0x410 + +gUnknown_08515804:: @ 8515804 + .incbin "baserom.gba", 0x515804, 0x20 + +gUnknown_08515824:: @ 8515824 + .incbin "baserom.gba", 0x515824, 0x140 + +gUnknown_08515964:: @ 8515964 + .incbin "baserom.gba", 0x515964, 0x428 + +gUnknown_08515D8C:: @ 8515D8C + .incbin "baserom.gba", 0x515d8c, 0x430 + +gUnknown_085161BC:: @ 85161BC + .incbin "baserom.gba", 0x5161bc, 0x20 + +gUnknown_085161DC:: @ 85161DC + .incbin "baserom.gba", 0x5161dc, 0x320 + +gUnknown_085164FC:: @ 85164FC + .incbin "baserom.gba", 0x5164fc, 0x310 + +gUnknown_0851680C:: @ 851680C + .incbin "baserom.gba", 0x51680c, 0x310 + +gUnknown_08516B1C:: @ 8516B1C + .incbin "baserom.gba", 0x516b1c, 0x210 + +gUnknown_08516D2C:: @ 8516D2C + .incbin "baserom.gba", 0x516d2c, 0x110 + +gUnknown_08516E3C:: @ 8516E3C + .incbin "baserom.gba", 0x516e3c, 0xc08 + +gUnknown_08517A44:: @ 8517A44 + .incbin "baserom.gba", 0x517a44, 0xc + +gUnknown_08517A50:: @ 8517A50 + .incbin "baserom.gba", 0x517a50, 0x1ac + +gUnknown_08517BFC:: @ 8517BFC + .incbin "baserom.gba", 0x517bfc, 0x10 + +gUnknown_08517C0C:: @ 8517C0C + .incbin "baserom.gba", 0x517c0c, 0x428 + +gUnknown_08518034:: @ 8518034 + .incbin "baserom.gba", 0x518034, 0x268 + +gUnknown_0851829C:: @ 851829C + .incbin "baserom.gba", 0x51829c, 0x8028 + +gUnknown_085202C4:: @ 85202C4 + .incbin "baserom.gba", 0x5202c4, 0x45a0 + +gUnknown_08524864:: @ 8524864 + .incbin "baserom.gba", 0x524864, 0xc + +gUnknown_08524870:: @ 8524870 + .incbin "baserom.gba", 0x524870, 0xc + +gUnknown_0852487C:: @ 852487C + .incbin "baserom.gba", 0x52487c, 0x10 + +gDummyPaletteStructTemplate:: @ 852488C + .2byte 0xFFFF + .space 9 + .byte 0x20 + .space 4 + + .align 2 +gUnknown_0852489C:: @ 852489C + .incbin "baserom.gba", 0x52489c, 0x20 + +gUnknown_085248BC:: @ 85248BC + .incbin "baserom.gba", 0x5248bc, 0x288 + +gUnknown_08524B44:: @ 8524B44 + .incbin "baserom.gba", 0x524b44, 0x1d0 + +gUnknown_08524D14:: @ 8524D14 + .incbin "baserom.gba", 0x524d14, 0x270 + +gUnknown_08524F84:: @ 8524F84 + .incbin "baserom.gba", 0x524f84, 0x308 + +gUnknown_0852528C:: @ 852528C + .incbin "baserom.gba", 0x52528c, 0x120 + +gUnknown_085253AC:: @ 85253AC + .incbin "baserom.gba", 0x5253ac, 0x270 + +gUnknown_0852561C:: @ 852561C + .incbin "baserom.gba", 0x52561c, 0x270 + +gUnknown_0852588C:: @ 852588C + .incbin "baserom.gba", 0x52588c, 0x308 + +gUnknown_08525B94:: @ 8525B94 + .incbin "baserom.gba", 0x525b94, 0x120 + +gUnknown_08525CB4:: @ 8525CB4 + .incbin "baserom.gba", 0x525cb4, 0xa0 + +gUnknown_08525D54:: @ 8525D54 + .incbin "baserom.gba", 0x525d54, 0x144 + +gUnknown_08525E98:: @ 8525E98 + .incbin "baserom.gba", 0x525e98, 0xc0 + +gUnknown_08525F58:: @ 8525F58 + .incbin "baserom.gba", 0x525f58, 0x20 + +gUnknown_08525F78:: @ 8525F78 + .incbin "baserom.gba", 0x525f78, 0x10 + +gUnknown_08525F88:: @ 8525F88 + .incbin "baserom.gba", 0x525f88, 0x4 + +gUnknown_08525F8C:: @ 8525F8C + .incbin "baserom.gba", 0x525f8c, 0x4 + +gUnknown_08525F90:: @ 8525F90 + .incbin "baserom.gba", 0x525f90, 0x30 + +gUnknown_08525FC0:: @ 8525FC0 + .incbin "baserom.gba", 0x525fc0, 0x18f80 + +gUnknown_0853EF40:: @ 853EF40 + .incbin "baserom.gba", 0x53ef40, 0x8 + +gUnknown_0853EF48:: @ 853EF48 + .incbin "baserom.gba", 0x53ef48, 0x18 + +gUnknown_0853EF60:: @ 853EF60 + .incbin "baserom.gba", 0x53ef60, 0xf8 + +gTitleScreenRayquazaTiles:: @ 853F058 + .incbin "graphics/title_screen/rayquaza.4bpp.lz" + + .align 2 +gUnknown_0853F83C:: @ 853F83C + .incbin "baserom.gba", 0x53f83c, 0x450 + +gTitleScreenCloudsTiles:: @ 853FC8C + .incbin "graphics/title_screen/clouds.4bpp.lz" + + .align 2 +gUnknown_0853FF70:: @ 853FF70 + .incbin "baserom.gba", 0x53ff70, 0xa8 + +gUnknown_08540018:: @ 8540018 + .incbin "baserom.gba", 0x540018, 0x18 + +gUnknown_08540030:: @ 8540030 + .incbin "baserom.gba", 0x540030, 0x18 + +gUnknown_08540048:: @ 8540048 + .incbin "baserom.gba", 0x540048, 0x90 + +gUnknown_085400D8:: @ 85400D8 + .incbin "baserom.gba", 0x5400d8, 0x18 + +gUnknown_085400F0:: @ 85400F0 + .incbin "baserom.gba", 0x5400f0, 0x10 + +gUnknown_08540100:: @ 8540100 + .incbin "baserom.gba", 0x540100, 0x24 + +gUnknown_08540124:: @ 8540124 + .incbin "baserom.gba", 0x540124, 0x18 + +gUnknown_0854013C:: @ 854013C + .incbin "baserom.gba", 0x54013c, 0x10 + +gUnknown_0854014C:: @ 854014C + .incbin "baserom.gba", 0x54014c, 0xc000 + +gUnknown_0854C14C:: @ 854C14C + .incbin "baserom.gba", 0x54c14c, 0x4 + +gUnknown_0854C150:: @ 854C150 + .incbin "baserom.gba", 0x54c150, 0xf0 + +gUnknown_0854C240:: @ 854C240 + .incbin "baserom.gba", 0x54c240, 0x10 + +gUnknown_0854C250:: @ 854C250 + .incbin "baserom.gba", 0x54c250, 0x20 + +gUnknown_0854C270:: @ 854C270 + .incbin "baserom.gba", 0x54c270, 0x20 + +gUnknown_0854C290:: @ 854C290 + .incbin "baserom.gba", 0x54c290, 0x20 + +gUnknown_0854C2B0:: @ 854C2B0 + .incbin "baserom.gba", 0x54c2b0, 0x820 + +gUnknown_0854CAD0:: @ 854CAD0 + .incbin "baserom.gba", 0x54cad0, 0x3080 + +gUnknown_0854FB50:: @ 854FB50 + .incbin "baserom.gba", 0x54fb50, 0xc + +gUnknown_0854FB5C:: @ 854FB5C + .incbin "baserom.gba", 0x54fb5c, 0x1c + +gUnknown_0854FB78:: @ 854FB78 + .incbin "baserom.gba", 0x54fb78, 0x18 + +gUnknown_0854FB90:: @ 854FB90 + .incbin "baserom.gba", 0x54fb90, 0x9c + +gUnknown_0854FC2C:: @ 854FC2C + .incbin "baserom.gba", 0x54fc2c, 0x18 + +gUnknown_0854FC44:: @ 854FC44 + .incbin "baserom.gba", 0x54fc44, 0x8 + +gUnknown_0854FC4C:: @ 854FC4C + .incbin "baserom.gba", 0x54fc4c, 0x8 + +gUnknown_0854FC54:: @ 854FC54 + .incbin "baserom.gba", 0x54fc54, 0x38 + +gUnknown_0854FC8C:: @ 854FC8C + .incbin "baserom.gba", 0x54fc8c, 0x8c + +gUnknown_0854FD18:: @ 854FD18 + .incbin "baserom.gba", 0x54fd18, 0x18 + +gUnknown_0854FD30:: @ 854FD30 + .incbin "baserom.gba", 0x54fd30, 0x8 + +gUnknown_0854FD38:: @ 854FD38 + .incbin "baserom.gba", 0x54fd38, 0x20 + +gUnknown_0854FD58:: @ 854FD58 + .incbin "baserom.gba", 0x54fd58, 0x18 + +gUnknown_0854FD70:: @ 854FD70 + .incbin "baserom.gba", 0x54fd70, 0x1c + +gUnknown_0854FD8C:: @ 854FD8C + .incbin "baserom.gba", 0x54fd8c, 0x38 + +gUnknown_0854FDC4:: @ 854FDC4 + .incbin "baserom.gba", 0x54fdc4, 0x18 + +gUnknown_0854FDDC:: @ 854FDDC + .incbin "baserom.gba", 0x54fddc, 0x8 + +gUnknown_0854FDE4:: @ 854FDE4 + .incbin "baserom.gba", 0x54fde4, 0xc + +gUnknown_0854FDF0:: @ 854FDF0 + .incbin "baserom.gba", 0x54fdf0, 0x8 + +gUnknown_0854FDF8:: @ 854FDF8 + .incbin "baserom.gba", 0x54fdf8, 0x8 + +gUnknown_0854FE00:: @ 854FE00 + .incbin "baserom.gba", 0x54fe00, 0x44 + +gUnknown_0854FE44:: @ 854FE44 + .incbin "baserom.gba", 0x54fe44, 0x18 + +gUnknown_0854FE5C:: @ 854FE5C + .incbin "baserom.gba", 0x54fe5c, 0x4 + +gUnknown_0854FE60:: @ 854FE60 + .incbin "baserom.gba", 0x54fe60, 0x4 + +gUnknown_0854FE64:: @ 854FE64 + .incbin "baserom.gba", 0x54fe64, 0x14 + +gUnknown_0854FE78:: @ 854FE78 + .incbin "baserom.gba", 0x54fe78, 0x4 + +gUnknown_0854FE7C:: @ 854FE7C + .incbin "baserom.gba", 0x54fe7c, 0xc + +gUnknown_0854FE88:: @ 854FE88 + .incbin "baserom.gba", 0x54fe88, 0x8 + +gUnknown_0854FE90:: @ 854FE90 + .incbin "baserom.gba", 0x54fe90, 0x8 + +gUnknown_0854FE98:: @ 854FE98 + .incbin "baserom.gba", 0x54fe98, 0xc + +gUnknown_0854FEA4:: @ 854FEA4 + .incbin "baserom.gba", 0x54fea4, 0x3 + +gUnknown_0854FEA7:: @ 854FEA7 + .incbin "baserom.gba", 0x54fea7, 0x5 + +gUnknown_0854FEAC:: @ 854FEAC + .incbin "baserom.gba", 0x54feac, 0x48 + +gUnknown_0854FEF4:: @ 854FEF4 + .incbin "baserom.gba", 0x54fef4, 0x48 + +gUnknown_0854FF3C:: @ 854FF3C + .incbin "baserom.gba", 0x54ff3c, 0x48 + +gUnknown_0854FF84:: @ 854FF84 + .incbin "baserom.gba", 0x54ff84, 0x48 + +gUnknown_0854FFCC:: @ 854FFCC + .incbin "baserom.gba", 0x54ffcc, 0x48 + +gUnknown_08550014:: @ 8550014 + .incbin "baserom.gba", 0x550014, 0x48 + +gUnknown_0855005C:: @ 855005C + .incbin "baserom.gba", 0x55005c, 0x48 + +gUnknown_085500A4:: @ 85500A4 + .incbin "baserom.gba", 0x5500a4, 0x4e0 + +gUnknown_08550584:: @ 8550584 + .incbin "baserom.gba", 0x550584, 0x10 + +gUnknown_08550594:: @ 8550594 + .incbin "baserom.gba", 0x550594, 0x8 + +gUnknown_0855059C:: @ 855059C + .incbin "baserom.gba", 0x55059c, 0x190 + +gUnknown_0855072C:: @ 855072C + .incbin "baserom.gba", 0x55072c, 0x10 + +gUnknown_0855073C:: @ 855073C + .incbin "baserom.gba", 0x55073c, 0x30 + +gUnknown_0855076C:: @ 855076C + .incbin "baserom.gba", 0x55076c, 0x48 + +gUnknown_085507B4:: @ 85507B4 + .incbin "baserom.gba", 0x5507b4, 0x18 + +gUnknown_085507CC:: @ 85507CC + .incbin "baserom.gba", 0x5507cc, 0x18 + +@ 85507E4 + .include "data/wild_mons.inc" + + .incbin "baserom.gba", 0x55370c, 0x188 + +gUnknown_08553894:: @ 8553894 + .incbin "baserom.gba", 0x553894, 0x180 + +gUnknown_08553A14:: @ 8553A14 + .incbin "baserom.gba", 0x553a14, 0x64 + +gUnknown_08553A78:: @ 8553A78 + .incbin "baserom.gba", 0x553a78, 0x4 + +gUnknown_08553A7C:: @ 8553A7C + .incbin "baserom.gba", 0x553a7c, 0x14 + + .align 2 +gNewGameBirchPic:: @ 8553A90 + .incbin "graphics/birch_speech/birch.4bpp" + + .incbin "baserom.gba", 0x554290, 0x66c0 + + .align 2 +gNewGameBirchPalette:: @ 855A950 + .incbin "graphics/birch_speech/birch.gbapal" + + .align 2 + .incbin "baserom.gba", 0x55a970, 0x20 + + .align 2 +gFieldEffectObjectPalette4:: @ 855A990 + .incbin "graphics/map_objects/palettes/field_effect_object_palette_04.gbapal" + + .incbin "baserom.gba", 0x55a9b0, 0x480 + + .align 2 +gFieldEffectObjectPalette5:: @ 855AE30 + .incbin "graphics/map_objects/palettes/field_effect_object_palette_05.gbapal" + +gUnknown_0855AE50:: @ 855AE50 + .incbin "baserom.gba", 0x55ae50, 0x200 + +gUnknown_0855B050:: @ 855B050 + .incbin "baserom.gba", 0x55b050, 0x20 + +gUnknown_0855B070:: @ 855B070 + .incbin "baserom.gba", 0x55b070, 0x280 + +gUnknown_0855B2F0:: @ 855B2F0 + .incbin "baserom.gba", 0x55b2f0, 0x80 + +gUnknown_0855B370:: @ 855B370 + .incbin "baserom.gba", 0x55b370, 0x20 + +gUnknown_0855B390:: @ 855B390 + .incbin "baserom.gba", 0x55b390, 0x280 + +gUnknown_0855B610:: @ 855B610 + .incbin "baserom.gba", 0x55b610, 0x20 + +gUnknown_0855B630:: @ 855B630 + .incbin "baserom.gba", 0x55b630, 0xbc0 + +gUnknown_0855C1F0:: @ 855C1F0 + .incbin "baserom.gba", 0x55c1f0, 0x20 + + .align 2 +@ TODO: something else uses these too +gNewGameBirchOamAttributes:: @ 855C210 + .4byte OAM_SIZE_64x64 + .2byte 0 + + .align 2 + .incbin "baserom.gba", 0x55c218, 0x10 + + .align 2 +gNewGameBirchPicTable:: @ 855C228 + obj_tiles gNewGameBirchPic, 0x800 + + .align 2 +gNewGameBirchObjectPaletteInfo:: @ 855C230 + obj_pal gNewGameBirchPalette, 0x1006 + + .align 2 +gNewGameBirchImageAnim:: @ 855C238 + obj_image_anim_frame 0, 1 + obj_image_anim_end + + .align 2 +gNewGameBirchImageAnimTable:: @ 855C240 + .4byte gNewGameBirchImageAnim + + .align 2 +gNewGameBirchObjectTemplate:: @ 855C244 + .2byte 0xFFFF @ tiles tag + .2byte 0x1006 @ palette tag + .4byte gNewGameBirchOamAttributes + .4byte gNewGameBirchImageAnimTable + .4byte gNewGameBirchPicTable + .4byte gDummyObjectRotScalAnimTable + .4byte DummyObjectCallback + + .align 2 +gFieldEffectObjectPaletteInfo4:: @ 855C25C + obj_pal gFieldEffectObjectPalette4, 0x1007 + + .align 2 +gFieldEffectObjectPaletteInfo5:: @ 855C264 + obj_pal gFieldEffectObjectPalette5, 0x1010 + + .incbin "baserom.gba", 0x55c26c, 0x40 + +gUnknown_0855C2AC:: @ 855C2AC + .incbin "baserom.gba", 0x55c2ac, 0x18 + +gUnknown_0855C2C4:: @ 855C2C4 + .incbin "baserom.gba", 0x55c2c4, 0x40 + +gUnknown_0855C304:: @ 855C304 + .incbin "baserom.gba", 0x55c304, 0x18 + +gUnknown_0855C31C:: @ 855C31C + .incbin "baserom.gba", 0x55c31c, 0x18 + +gUnknown_0855C334:: @ 855C334 + .incbin "baserom.gba", 0x55c334, 0x18 + +gUnknown_0855C34C:: @ 855C34C + .incbin "baserom.gba", 0x55c34c, 0x18 + +gUnknown_0855C364:: @ 855C364 + .incbin "baserom.gba", 0x55c364, 0x10 + +gUnknown_0855C374:: @ 855C374 + .incbin "baserom.gba", 0x55c374, 0x10 + +gUnknown_0855C384:: @ 855C384 + .incbin "baserom.gba", 0x55c384, 0x20 + +gUnknown_0855C3A4:: @ 855C3A4 + .incbin "baserom.gba", 0x55c3a4, 0x18 + +gUnknown_0855C3BC:: @ 855C3BC + .incbin "baserom.gba", 0x55c3bc, 0x4 + +gUnknown_0855C3C0:: @ 855C3C0 + .incbin "baserom.gba", 0x55c3c0, 0x4 + +gUnknown_0855C3C4:: @ 855C3C4 + .incbin "baserom.gba", 0x55c3c4, 0x4 + +gUnknown_0855C3C8:: @ 855C3C8 + .incbin "baserom.gba", 0x55c3c8, 0x1c + +gUnknown_0855C3E4:: @ 855C3E4 + .incbin "baserom.gba", 0x55c3e4, 0x18 + +gUnknown_0855C3FC:: @ 855C3FC + .incbin "baserom.gba", 0x55c3fc, 0x1c + +gUnknown_0855C418:: @ 855C418 + .incbin "baserom.gba", 0x55c418, 0x14 + +gUnknown_0855C42C:: @ 855C42C + .incbin "baserom.gba", 0x55c42c, 0xc + +gUnknown_0855C438:: @ 855C438 + .incbin "baserom.gba", 0x55c438, 0x18 + +gUnknown_0855C450:: @ 855C450 + .incbin "baserom.gba", 0x55c450, 0x10 + +gUnknown_0855C460:: @ 855C460 + .incbin "baserom.gba", 0x55c460, 0x14 + +gUnknown_0855C474:: @ 855C474 + .incbin "baserom.gba", 0x55c474, 0x8 + +gUnknown_0855C47C:: @ 855C47C + .incbin "baserom.gba", 0x55c47c, 0x8 + +gUnknown_0855C484:: @ 855C484 + .incbin "baserom.gba", 0x55c484, 0x8 + +gUnknown_0855C48C:: @ 855C48C + .incbin "baserom.gba", 0x55c48c, 0x10 + +gUnknown_0855C49C:: @ 855C49C + .incbin "baserom.gba", 0x55c49c, 0xc + +gUnknown_0855C4A8:: @ 855C4A8 + .incbin "baserom.gba", 0x55c4a8, 0x1c + +gUnknown_0855C4C4:: @ 855C4C4 + .incbin "baserom.gba", 0x55c4c4, 0x1c + +gUnknown_0855C4E0:: @ 855C4E0 + .incbin "baserom.gba", 0x55c4e0, 0x14 + +gUnknown_0855C4F4:: @ 855C4F4 + .incbin "baserom.gba", 0x55c4f4, 0x54 + +gUnknown_0855C548:: @ 855C548 + .incbin "baserom.gba", 0x55c548, 0x8 + +gUnknown_0855C550:: @ 855C550 + .incbin "baserom.gba", 0x55c550, 0x1c + +gUnknown_0855C56C:: @ 855C56C + .incbin "baserom.gba", 0x55c56c, 0x24 + +gUnknown_0855C590:: @ 855C590 + .incbin "baserom.gba", 0x55c590, 0x5c + +gUnknown_0855C5EC:: @ 855C5EC + .incbin "baserom.gba", 0x55c5ec, 0x18 + +gUnknown_0855C604:: @ 855C604 + .incbin "baserom.gba", 0x55c604, 0x60 + +gUnknown_0855C664:: @ 855C664 + .incbin "baserom.gba", 0x55c664, 0x1c + +gUnknown_0855C680:: @ 855C680 + .incbin "baserom.gba", 0x55c680, 0x18 + +gUnknown_0855C698:: @ 855C698 + .incbin "baserom.gba", 0x55c698, 0x8 + +gUnknown_0855C6A0:: @ 855C6A0 + .incbin "baserom.gba", 0x55c6a0, 0x4 + +gUnknown_0855C6A4:: @ 855C6A4 + .incbin "baserom.gba", 0x55c6a4, 0x336 + +gUnknown_0855C9DA:: @ 855C9DA + .incbin "baserom.gba", 0x55c9da, 0x304 + +gUnknown_0855CCDE:: @ 855CCDE + .incbin "baserom.gba", 0x55ccde, 0x4b6 + +gUnknown_0855D194:: @ 855D194 + .incbin "baserom.gba", 0x55d194, 0x18 + +gUnknown_0855D1AC:: @ 855D1AC + .incbin "baserom.gba", 0x55d1ac, 0x18 + +gUnknown_0855D1C4:: @ 855D1C4 + .incbin "baserom.gba", 0x55d1c4, 0x18 + +gUnknown_0855D1DC:: @ 855D1DC + .incbin "baserom.gba", 0x55d1dc, 0x18 + +gUnknown_0855D1F4:: @ 855D1F4 + .incbin "baserom.gba", 0x55d1f4, 0x18 + +gUnknown_0855D20C:: @ 855D20C + .incbin "baserom.gba", 0x55d20c, 0x18 + +gUnknown_0855D224:: @ 855D224 + .incbin "baserom.gba", 0x55d224, 0x18 + +gUnknown_0855D23C:: @ 855D23C + .incbin "baserom.gba", 0x55d23c, 0x18 + +gUnknown_0855D254:: @ 855D254 + .incbin "baserom.gba", 0x55d254, 0x18 + +gUnknown_0855D26C:: @ 855D26C + .incbin "baserom.gba", 0x55d26c, 0x10 + +gUnknown_0855D27C:: @ 855D27C + .incbin "baserom.gba", 0x55d27c, 0x10 + +gUnknown_0855D28C:: @ 855D28C + .incbin "baserom.gba", 0x55d28c, 0x5 + +gUnknown_0855D291:: @ 855D291 + .incbin "baserom.gba", 0x55d291, 0x7 + +gUnknown_0855D298:: @ 855D298 + .incbin "baserom.gba", 0x55d298, 0x10 + +gUnknown_0855D2A8:: @ 855D2A8 + .incbin "baserom.gba", 0x55d2a8, 0x10 + +gUnknown_0855D2B8:: @ 855D2B8 + .incbin "baserom.gba", 0x55d2b8, 0x6 + +gUnknown_0855D2BE:: @ 855D2BE + .incbin "baserom.gba", 0x55d2be, 0x40 + +gUnknown_0855D2FE:: @ 855D2FE + .incbin "baserom.gba", 0x55d2fe, 0xe + +gUnknown_0855D30C:: @ 855D30C + .string "$" + +@ 855D30D + .include "data/text/pokedex_text.inc" + +@ 856B5B0 + .include "data/pokedex_entries.inc" + +gUnknown_0856E610:: @ 856E610 + .incbin "baserom.gba", 0x56e610, 0x20 + +gUnknown_0856E630:: @ 856E630 + .incbin "baserom.gba", 0x56e630, 0x10 + +gUnknown_0856E640:: @ 856E640 + .incbin "baserom.gba", 0x56e640, 0x28 + +gUnknown_0856E668:: @ 856E668 + .incbin "baserom.gba", 0x56e668, 0x8 + +gUnknown_0856E670:: @ 856E670 + .incbin "baserom.gba", 0x56e670, 0x18 + +gUnknown_0856E688:: @ 856E688 + .incbin "baserom.gba", 0x56e688, 0xc + +@ 856E694 + .include "data/graphics/pokemon/mon_footprint_table.inc" + +gUnknown_0856ED08:: @ 856ED08 + .incbin "baserom.gba", 0x56ed08, 0x28 + +gUnknown_0856ED30:: @ 856ED30 + .incbin "baserom.gba", 0x56ed30, 0x18 + +gUnknown_0856ED48:: @ 856ED48 + .incbin "baserom.gba", 0x56ed48, 0x54 + +gUnknown_0856ED9C:: @ 856ED9C + .incbin "baserom.gba", 0x56ed9c, 0x1c + +gUnknown_0856EDB8:: @ 856EDB8 + .incbin "baserom.gba", 0x56edb8, 0x1c + +gUnknown_0856EDD4:: @ 856EDD4 + .incbin "baserom.gba", 0x56edd4, 0x1c + +gUnknown_0856EDF0:: @ 856EDF0 + .incbin "baserom.gba", 0x56edf0, 0x1c + +gUnknown_0856EE0C:: @ 856EE0C + .incbin "baserom.gba", 0x56ee0c, 0x18 + +gUnknown_0856EE24:: @ 856EE24 + .incbin "baserom.gba", 0x56ee24, 0x38 + +gUnknown_0856EE5C:: @ 856EE5C + .incbin "baserom.gba", 0x56ee5c, 0x58 + +gUnknown_0856EEB4:: @ 856EEB4 + .incbin "baserom.gba", 0x56eeb4, 0x60 + +gUnknown_0856EF14:: @ 856EF14 + .incbin "baserom.gba", 0x56ef14, 0x98 + +gUnknown_0856EFAC:: @ 856EFAC + .incbin "baserom.gba", 0x56efac, 0x2 + +gUnknown_0856EFAE:: @ 856EFAE + .incbin "baserom.gba", 0x56efae, 0x6 + +gUnknown_0856EFB4:: @ 856EFB4 + .incbin "baserom.gba", 0x56efb4, 0x14 + +gUnknown_0856EFC8:: @ 856EFC8 + .incbin "baserom.gba", 0x56efc8, 0x30 + +gUnknown_0856EFF8:: @ 856EFF8 + .incbin "baserom.gba", 0x56eff8, 0x10 + +gUnknown_0856F008:: @ 856F008 + .incbin "baserom.gba", 0x56f008, 0x10 + +gUnknown_0856F018:: @ 856F018 + .incbin "baserom.gba", 0x56f018, 0x494 + +gUnknown_0856F4AC:: @ 856F4AC + .incbin "baserom.gba", 0x56f4ac, 0x20 + +gUnknown_0856F4CC:: @ 856F4CC + .incbin "baserom.gba", 0x56f4cc, 0x20 + +gUnknown_0856F4EC:: @ 856F4EC + .incbin "baserom.gba", 0x56f4ec, 0x20 + +gUnknown_0856F50C:: @ 856F50C + .incbin "baserom.gba", 0x56f50c, 0x20 + +gUnknown_0856F52C:: @ 856F52C + .incbin "baserom.gba", 0x56f52c, 0x20 + +gUnknown_0856F54C:: @ 856F54C + .incbin "baserom.gba", 0x56f54c, 0x20 + +gUnknown_0856F56C:: @ 856F56C + .incbin "baserom.gba", 0x56f56c, 0x20 + +gUnknown_0856F58C:: @ 856F58C + .incbin "baserom.gba", 0x56f58c, 0x20 + +gUnknown_0856F5AC:: @ 856F5AC + .incbin "baserom.gba", 0x56f5ac, 0x20 + +gUnknown_0856F5CC:: @ 856F5CC + .incbin "baserom.gba", 0x56f5cc, 0x248 + +gUnknown_0856F814:: @ 856F814 + .incbin "baserom.gba", 0x56f814, 0x2a0 + +gUnknown_0856FAB4:: @ 856FAB4 + .incbin "baserom.gba", 0x56fab4, 0x10 + +gUnknown_0856FAC4:: @ 856FAC4 + .incbin "baserom.gba", 0x56fac4, 0x20 + +gUnknown_0856FAE4:: @ 856FAE4 + .incbin "baserom.gba", 0x56fae4, 0x14 + +gUnknown_0856FAF8:: @ 856FAF8 + .incbin "baserom.gba", 0x56faf8, 0x14 + +gUnknown_0856FB0C:: @ 856FB0C + .incbin "baserom.gba", 0x56fb0c, 0x3 + +gUnknown_0856FB0F:: @ 856FB0F + .incbin "baserom.gba", 0x56fb0f, 0x9 + +gUnknown_0856FB18:: @ 856FB18 + .incbin "baserom.gba", 0x56fb18, 0x8 + +gUnknown_0856FB20:: @ 856FB20 + .incbin "baserom.gba", 0x56fb20, 0x8 + +gUnknown_0856FB28:: @ 856FB28 + .incbin "baserom.gba", 0x56fb28, 0x18 + +gUnknown_0856FB40:: @ 856FB40 + .incbin "baserom.gba", 0x56fb40, 0x8 + +gUnknown_0856FB48:: @ 856FB48 + .incbin "baserom.gba", 0x56fb48, 0x2 + +gUnknown_0856FB4A:: @ 856FB4A + .incbin "baserom.gba", 0x56fb4a, 0x2 + +gUnknown_0856FB4C:: @ 856FB4C + .incbin "baserom.gba", 0x56fb4c, 0x9 + +gUnknown_0856FB55:: @ 856FB55 + .incbin "baserom.gba", 0x56fb55, 0x2 + +gUnknown_0856FB57:: @ 856FB57 + .incbin "baserom.gba", 0x56fb57, 0x5 + +gUnknown_0856FB5C:: @ 856FB5C + .incbin "baserom.gba", 0x56fb5c, 0xc + +gUnknown_0856FB68:: @ 856FB68 + .incbin "baserom.gba", 0x56fb68, 0x6 + +gUnknown_0856FB6E:: @ 856FB6E + .incbin "baserom.gba", 0x56fb6e, 0x6 + +gUnknown_0856FB74:: @ 856FB74 + .incbin "baserom.gba", 0x56fb74, 0x4 + +gUnknown_0856FB78:: @ 856FB78 + .incbin "baserom.gba", 0x56fb78, 0x44 + +gUnknown_0856FBBC:: @ 856FBBC + .incbin "baserom.gba", 0x56fbbc, 0x1244 + +gUnknown_08570E00:: @ 8570E00 + .incbin "baserom.gba", 0x570e00, 0x260 + +gUnknown_08571060:: @ 8571060 + .incbin "baserom.gba", 0x571060, 0x260 + +gUnknown_085712C0:: @ 85712C0 + .incbin "baserom.gba", 0x5712c0, 0x38 + +gUnknown_085712F8:: @ 85712F8 + .incbin "baserom.gba", 0x5712f8, 0xe8 + +gUnknown_085713E0:: @ 85713E0 + .incbin "baserom.gba", 0x5713e0, 0x8 + +gUnknown_085713E8:: @ 85713E8 + .incbin "baserom.gba", 0x5713e8, 0xc + +gUnknown_085713F4:: @ 85713F4 + .incbin "baserom.gba", 0x5713f4, 0xc + +gUnknown_08571400:: @ 8571400 + .incbin "baserom.gba", 0x571400, 0x28 + +gUnknown_08571428:: @ 8571428 + .incbin "baserom.gba", 0x571428, 0x20 + +gUnknown_08571448:: @ 8571448 + .incbin "baserom.gba", 0x571448, 0x3 + +gUnknown_0857144B:: @ 857144B + .incbin "baserom.gba", 0x57144b, 0x3 + +gUnknown_0857144E:: @ 857144E + .incbin "baserom.gba", 0x57144e, 0x6 + +gUnknown_08571454:: @ 8571454 + .incbin "baserom.gba", 0x571454, 0x68 + +gUnknown_085714BC:: @ 85714BC + .incbin "baserom.gba", 0x5714bc, 0x18 + +gUnknown_085714D4:: @ 85714D4 + .incbin "baserom.gba", 0x5714d4, 0x10 + +gUnknown_085714E4:: @ 85714E4 + .incbin "baserom.gba", 0x5714e4, 0xd0 + +gUnknown_085715B4:: @ 85715B4 + .incbin "baserom.gba", 0x5715b4, 0x30 + +gUnknown_085715E4:: @ 85715E4 + .incbin "baserom.gba", 0x5715e4, 0x18 + +gUnknown_085715FC:: @ 85715FC + .incbin "baserom.gba", 0x5715fc, 0x18 + +gUnknown_08571614:: @ 8571614 + .incbin "baserom.gba", 0x571614, 0x3c + +gUnknown_08571650:: @ 8571650 + .incbin "baserom.gba", 0x571650, 0x70 + +gUnknown_085716C0:: @ 85716C0 + .incbin "baserom.gba", 0x5716c0, 0x28 + +gUnknown_085716E8:: @ 85716E8 + .incbin "baserom.gba", 0x5716e8, 0x28 + +gUnknown_08571710:: @ 8571710 + .incbin "baserom.gba", 0x571710, 0x24 + +gUnknown_08571734:: @ 8571734 + .incbin "baserom.gba", 0x571734, 0x3 + +gUnknown_08571737:: @ 8571737 + .incbin "baserom.gba", 0x571737, 0x5 + +gUnknown_0857173C:: @ 857173C + .incbin "baserom.gba", 0x57173c, 0x20 + +gUnknown_0857175C:: @ 857175C + .incbin "baserom.gba", 0x57175c, 0x800 + +gUnknown_08571F5C:: @ 8571F5C + .incbin "baserom.gba", 0x571f5c, 0x180 + +gUnknown_085720DC:: @ 85720DC + .incbin "baserom.gba", 0x5720dc, 0x98 + +gUnknown_08572174:: @ 8572174 + .incbin "baserom.gba", 0x572174, 0x12c + +gUnknown_085722A0:: @ 85722A0 + .incbin "baserom.gba", 0x5722a0, 0xfc + +gUnknown_0857239C:: @ 857239C + .incbin "baserom.gba", 0x57239c, 0x40 + +gUnknown_085723DC:: @ 85723DC + .incbin "baserom.gba", 0x5723dc, 0x20 + +gUnknown_085723FC:: @ 85723FC + .incbin "baserom.gba", 0x5723fc, 0x20 + +gUnknown_0857241C:: @ 857241C + .incbin "baserom.gba", 0x57241c, 0x20 + +gUnknown_0857243C:: @ 857243C + .incbin "baserom.gba", 0x57243c, 0x20 + +gUnknown_0857245C:: @ 857245C + .incbin "baserom.gba", 0x57245c, 0x48 + +gUnknown_085724A4:: @ 85724A4 + .incbin "baserom.gba", 0x5724a4, 0x18 + +gUnknown_085724BC:: @ 85724BC + .incbin "baserom.gba", 0x5724bc, 0x238 + +gUnknown_085726F4:: @ 85726F4 + .incbin "baserom.gba", 0x5726f4, 0x20 + +gUnknown_08572714:: @ 8572714 + .incbin "baserom.gba", 0x572714, 0x20 + +gUnknown_08572734:: @ 8572734 + .incbin "baserom.gba", 0x572734, 0x10 + +gUnknown_08572744:: @ 8572744 + .incbin "baserom.gba", 0x572744, 0x8 + +gUnknown_0857274C:: @ 857274C + .incbin "baserom.gba", 0x57274c, 0x8 + +gUnknown_08572754:: @ 8572754 + .incbin "baserom.gba", 0x572754, 0x18 + +gUnknown_0857276C:: @ 857276C + .incbin "baserom.gba", 0x57276c, 0xf8 + +gUnknown_08572864:: @ 8572864 + .incbin "baserom.gba", 0x572864, 0x58 + +gUnknown_085728BC:: @ 85728BC + .incbin "baserom.gba", 0x5728bc, 0x18 + +gUnknown_085728D4:: @ 85728D4 + .incbin "baserom.gba", 0x5728d4, 0x48 + +gUnknown_0857291C:: @ 857291C + .incbin "baserom.gba", 0x57291c, 0x4c58 + +gUnknown_08577574:: @ 8577574 + .incbin "baserom.gba", 0x577574, 0x44 + +gUnknown_085775B8:: @ 85775B8 + .incbin "baserom.gba", 0x5775b8, 0x398c + +gUnknown_0857AF44:: @ 857AF44 + .incbin "baserom.gba", 0x57af44, 0xc0 + +gUnknown_0857B004:: @ 857B004 + .incbin "baserom.gba", 0x57b004, 0x7c + +gUnknown_0857B080:: @ 857B080 + .incbin "baserom.gba", 0x57b080, 0x28 + +gUnknown_0857B0A8:: @ 857B0A8 + .incbin "baserom.gba", 0x57b0a8, 0x38 + +gUnknown_0857B0E0:: @ 857B0E0 + .incbin "baserom.gba", 0x57b0e0, 0x8b8 + +gUnknown_0857B998:: @ 857B998 + .incbin "baserom.gba", 0x57b998, 0xc + +gUnknown_0857B9A4:: @ 857B9A4 + .incbin "baserom.gba", 0x57b9a4, 0x18 + +gUnknown_0857B9BC:: @ 857B9BC + .incbin "baserom.gba", 0x57b9bc, 0x28 + +gUnknown_0857B9E4:: @ 857B9E4 + .incbin "baserom.gba", 0x57b9e4, 0x18 + +gUnknown_0857B9FC:: @ 857B9FC + .incbin "baserom.gba", 0x57b9fc, 0x54 + +gUnknown_0857BA50:: @ 857BA50 + .incbin "baserom.gba", 0x57ba50, 0x18 + +gUnknown_0857BA68:: @ 857BA68 + .incbin "baserom.gba", 0x57ba68, 0x18 + +gUnknown_0857BA80:: @ 857BA80 + .incbin "baserom.gba", 0x57ba80, 0x9c + +gUnknown_0857BB1C:: @ 857BB1C + .incbin "baserom.gba", 0x57bb1c, 0x8 + +gUnknown_0857BB24:: @ 857BB24 + .incbin "baserom.gba", 0x57bb24, 0x14c + +gUnknown_0857BC70:: @ 857BC70 + .incbin "baserom.gba", 0x57bc70, 0x18 + +gUnknown_0857BC88:: @ 857BC88 + .incbin "baserom.gba", 0x57bc88, 0x20 + +@ 857BCA8 + .include "data/graphics/pokemon/mon_icon_table.inc" + +@ 857C388 + .include "data/graphics/pokemon/mon_icon_palette_indices.inc" + +@ 857C540 + .include "data/graphics/pokemon/mon_icon_palette_table.inc" + +gUnknown_0857C570:: @ 857C570 + .incbin "baserom.gba", 0x57c570, 0x44 + +gUnknown_0857C5B4:: @ 857C5B4 + .incbin "baserom.gba", 0x57c5b4, 0x34 + +gUnknown_0857C5E8:: @ 857C5E8 + .incbin "baserom.gba", 0x57c5e8, 0x8 + +gUnknown_0857C5F0:: @ 857C5F0 + .incbin "baserom.gba", 0x57c5f0, 0x18 + +gUnknown_0857C608:: @ 857C608 + .incbin "baserom.gba", 0x57c608, 0x2 + +gUnknown_0857C60A:: @ 857C60A + .incbin "baserom.gba", 0x57c60a, 0x5a + + .align 2 +gFieldEffectObjectPaletteInfo6:: @ 857C664 + obj_pal gFieldEffectObjectPalette6, 0x1000 + +gUnknown_0857C66C:: @ 857C66C + .incbin "baserom.gba", 0x57c66c, 0x18 + +gUnknown_0857C684:: @ 857C684 + .incbin "baserom.gba", 0x57c684, 0x1680 + +gUnknown_0857DD04:: @ 857DD04 + .incbin "baserom.gba", 0x57dd04, 0x1680 + +gUnknown_0857F384:: @ 857F384 + .incbin "baserom.gba", 0x57f384, 0xc0 + +gUnknown_0857F444:: @ 857F444 + .incbin "baserom.gba", 0x57f444, 0x20 + +gUnknown_0857F464:: @ 857F464 + .incbin "baserom.gba", 0x57f464, 0xe0 + +gUnknown_0857F544:: @ 857F544 + .incbin "baserom.gba", 0x57f544, 0x5f0 + +gUnknown_0857FB34:: @ 857FB34 + .incbin "baserom.gba", 0x57fb34, 0x8 + +gUnknown_0857FB3C:: @ 857FB3C + .incbin "baserom.gba", 0x57fb3c, 0x8 + +gUnknown_0857FB44:: @ 857FB44 + .incbin "baserom.gba", 0x57fb44, 0x8 + +gUnknown_0857FB4C:: @ 857FB4C + .incbin "baserom.gba", 0x57fb4c, 0x4c + +gUnknown_0857FB98:: @ 857FB98 + .incbin "baserom.gba", 0x57fb98, 0x4 + +gUnknown_0857FB9C:: @ 857FB9C + .incbin "baserom.gba", 0x57fb9c, 0x4 + +gUnknown_0857FBA0:: @ 857FBA0 + .incbin "baserom.gba", 0x57fba0, 0x8 + +gUnknown_0857FBA8:: @ 857FBA8 + .incbin "baserom.gba", 0x57fba8, 0x8 + +gUnknown_0857FBB0:: @ 857FBB0 + .incbin "baserom.gba", 0x57fbb0, 0x3c + +gUnknown_0857FBEC:: @ 857FBEC + .incbin "baserom.gba", 0x57fbec, 0x90 + +gUnknown_0857FC7C:: @ 857FC7C + .incbin "baserom.gba", 0x57fc7c, 0x18 + +@ 857FC94 + .include "data/graphics/berries/berry_pic_table.inc" + +gUnknown_0857FDEC:: @ 857FDEC + .incbin "baserom.gba", 0x57fdec, 0x8 + +gUnknown_0857FDF4:: @ 857FDF4 + .incbin "baserom.gba", 0x57fdf4, 0x1c + +gUnknown_0857FE10:: @ 857FE10 + .incbin "baserom.gba", 0x57fe10, 0x90 + +@ 857FEA0 + .include "data/text/item_descriptions.inc" + +@ 85839A0 + .include "data/items.inc" + +gUnknown_08587A6C:: @ 8587A6C + .incbin "baserom.gba", 0x587a6c, 0x4 + +gUnknown_08587A70:: @ 8587A70 + .incbin "baserom.gba", 0x587a70, 0x4 + +gUnknown_08587A74:: @ 8587A74 + .incbin "baserom.gba", 0x587a74, 0x5c + +gUnknown_08587AD0:: @ 8587AD0 + .incbin "baserom.gba", 0x587ad0, 0x18 + +gUnknown_08587AE8:: @ 8587AE8 + .incbin "baserom.gba", 0x587ae8, 0x20 + +gUnknown_08587B08:: @ 8587B08 + .incbin "baserom.gba", 0x587b08, 0x10 + +gUnknown_08587B18:: @ 8587B18 + .incbin "baserom.gba", 0x587b18, 0x68 + +gUnknown_08587B80:: @ 8587B80 + .incbin "baserom.gba", 0x587b80, 0x30 + +gUnknown_08587BB0:: @ 8587BB0 + .incbin "baserom.gba", 0x587bb0, 0x8 + +gUnknown_08587BB8:: @ 8587BB8 + .incbin "baserom.gba", 0x587bb8, 0x10 + +gUnknown_08587BC8:: @ 8587BC8 + .incbin "baserom.gba", 0x587bc8, 0x20 + +gUnknown_08587BE8:: @ 8587BE8 + .incbin "baserom.gba", 0x587be8, 0x18 + +gUnknown_08587C00:: @ 8587C00 + .incbin "baserom.gba", 0x587c00, 0x8 + +gUnknown_08587C08:: @ 8587C08 + .incbin "baserom.gba", 0x587c08, 0x8 + +gUnknown_08587C10:: @ 8587C10 + .incbin "baserom.gba", 0x587c10, 0x8 + +gUnknown_08587C18:: @ 8587C18 + .incbin "baserom.gba", 0x587c18, 0x18 + +gUnknown_08587C30:: @ 8587C30 + .incbin "baserom.gba", 0x587c30, 0x20 + +@ 8587C50 + .include "data/text/contest_text_pointers.inc" + +@ 8587D5C + .incbin "baserom.gba", 0x587d5c, 0x34 + +gUnknown_08587D90:: @ 8587D90 + .incbin "baserom.gba", 0x587d90, 0x80 + +gUnknown_08587E10:: @ 8587E10 + .incbin "baserom.gba", 0x587e10, 0xf8 + +gUnknown_08587F08:: @ 8587F08 + .incbin "baserom.gba", 0x587f08, 0x14 + +gUnknown_08587F1C:: @ 8587F1C + .incbin "baserom.gba", 0x587f1c, 0x18 + +gUnknown_08587F34:: @ 8587F34 + .incbin "baserom.gba", 0x587f34, 0x10 + +gUnknown_08587F44:: @ 8587F44 + .incbin "baserom.gba", 0x587f44, 0x60 + +gUnknown_08587FA4:: @ 8587FA4 + .incbin "baserom.gba", 0x587fa4, 0x100 + +gUnknown_085880A4:: @ 85880A4 + .incbin "baserom.gba", 0x5880a4, 0x1740 + +gUnknown_085897E4:: @ 85897E4 + .incbin "baserom.gba", 0x5897e4, 0xc0 + +gUnknown_085898A4:: @ 85898A4 + .incbin "baserom.gba", 0x5898a4, 0x60 + +gUnknown_08589904:: @ 8589904 + .incbin "baserom.gba", 0x589904, 0x20 + +gUnknown_08589924:: @ 8589924 + .incbin "baserom.gba", 0x589924, 0x68 + +gUnknown_0858998C:: @ 858998C + .incbin "baserom.gba", 0x58998c, 0x60 + +gUnknown_085899EC:: @ 85899EC + .incbin "baserom.gba", 0x5899ec, 0x1c + +gUnknown_08589A08:: @ 8589A08 + .incbin "baserom.gba", 0x589a08, 0x8 + +gUnknown_08589A10:: @ 8589A10 + .incbin "baserom.gba", 0x589a10, 0x18 + +gUnknown_08589A28:: @ 8589A28 + .incbin "baserom.gba", 0x589a28, 0x10 + +gUnknown_08589A38:: @ 8589A38 + .incbin "baserom.gba", 0x589a38, 0x10 + +gUnknown_08589A48:: @ 8589A48 + .incbin "baserom.gba", 0x589a48, 0x18 + +gUnknown_08589A60:: @ 8589A60 + .incbin "baserom.gba", 0x589a60, 0x10 + +gUnknown_08589A70:: @ 8589A70 + .incbin "baserom.gba", 0x589a70, 0x38 + +gUnknown_08589AA8:: @ 8589AA8 + .incbin "baserom.gba", 0x589aa8, 0x8 + +gUnknown_08589AB0:: @ 8589AB0 + .incbin "baserom.gba", 0x589ab0, 0x3 + +gUnknown_08589AB3:: @ 8589AB3 + .incbin "baserom.gba", 0x589ab3, 0x7 + +gUnknown_08589ABA:: @ 8589ABA + .incbin "baserom.gba", 0x589aba, 0x6 + +gUnknown_08589AC0:: @ 8589AC0 + .incbin "baserom.gba", 0x589ac0, 0x6 + +gUnknown_08589AC6:: @ 8589AC6 + .incbin "baserom.gba", 0x589ac6, 0x6 + +gUnknown_08589ACC:: @ 8589ACC + .incbin "baserom.gba", 0x589acc, 0x6 + +gUnknown_08589AD2:: @ 8589AD2 + .incbin "baserom.gba", 0x589ad2, 0x6 + +gUnknown_08589AD8:: @ 8589AD8 + .incbin "baserom.gba", 0x589ad8, 0x6 + +gUnknown_08589ADE:: @ 8589ADE + .incbin "baserom.gba", 0x589ade, 0x6 + +@ 8589AE4 + .include "data/text/berry_descriptions.inc" + +@ 858A670 + .include "data/berries.inc" + +gUnknown_0858AB24:: @ 858AB24 + .incbin "baserom.gba", 0x58ab24, 0xac + +gUnknown_0858ABD0:: @ 858ABD0 + .incbin "baserom.gba", 0x58abd0, 0xb90 + +gUnknown_0858B760:: @ 858B760 + .incbin "baserom.gba", 0x58b760, 0x390 + +gUnknown_0858BAF0:: @ 858BAF0 + .incbin "baserom.gba", 0x58baf0, 0x78 + +gUnknown_0858BB68:: @ 858BB68 + .incbin "baserom.gba", 0x58bb68, 0x8 + +gUnknown_0858BB70:: @ 858BB70 + .incbin "baserom.gba", 0x58bb70, 0x10 + +gUnknown_0858BB80:: @ 858BB80 + .incbin "baserom.gba", 0x58bb80, 0x1c + +gUnknown_0858BB9C:: @ 858BB9C + .incbin "baserom.gba", 0x58bb9c, 0x10 + +gUnknown_0858BBAC:: @ 858BBAC + .incbin "baserom.gba", 0x58bbac, 0x10 + +gUnknown_0858BBBC:: @ 858BBBC + .incbin "baserom.gba", 0x58bbbc, 0x10 + +gUnknown_0858BBCC:: @ 858BBCC + .incbin "baserom.gba", 0x58bbcc, 0x14 + +gUnknown_0858BBE0:: @ 858BBE0 + .incbin "baserom.gba", 0x58bbe0, 0xc + +gUnknown_0858BBEC:: @ 858BBEC + .incbin "baserom.gba", 0x58bbec, 0x18c + +gUnknown_0858BD78:: @ 858BD78 + .incbin "baserom.gba", 0x58bd78, 0x40 + +gUnknown_0858BDB8:: @ 858BDB8 + .incbin "baserom.gba", 0x58bdb8, 0x10 + +gUnknown_0858BDC8:: @ 858BDC8 + .incbin "baserom.gba", 0x58bdc8, 0x38 + +gUnknown_0858BE00:: @ 858BE00 + .incbin "baserom.gba", 0x58be00, 0x10 + +gUnknown_0858BE10:: @ 858BE10 + .incbin "baserom.gba", 0x58be10, 0x30 + +gUnknown_0858BE40:: @ 858BE40 + .incbin "baserom.gba", 0x58be40, 0x60 + +gUnknown_0858BEA0:: @ 858BEA0 + .incbin "baserom.gba", 0x58bea0, 0x3 + +gUnknown_0858BEA3:: @ 858BEA3 + .incbin "baserom.gba", 0x58bea3, 0x18 + +gUnknown_0858BEBB:: @ 858BEBB + .incbin "baserom.gba", 0x58bebb, 0x3 + +gUnknown_0858BEBE:: @ 858BEBE + .incbin "baserom.gba", 0x58bebe, 0x3 + +gUnknown_0858BEC1:: @ 858BEC1 + .incbin "baserom.gba", 0x58bec1, 0x3 + +gUnknown_0858BEC4:: @ 858BEC4 + .incbin "baserom.gba", 0x58bec4, 0x10 + +gUnknown_0858BED4:: @ 858BED4 + .incbin "baserom.gba", 0x58bed4, 0x8 + +gUnknown_0858BEDC:: @ 858BEDC + .incbin "baserom.gba", 0x58bedc, 0x8 + +gUnknown_0858BEE4:: @ 858BEE4 + .incbin "baserom.gba", 0x58bee4, 0x4 + +gUnknown_0858BEE8:: @ 858BEE8 + .incbin "baserom.gba", 0x58bee8, 0x10 + +gUnknown_0858BEF8:: @ 858BEF8 + .incbin "baserom.gba", 0x58bef8, 0x6 + +gUnknown_0858BEFE:: @ 858BEFE + .incbin "baserom.gba", 0x58befe, 0x6 + +gUnknown_0858BF04:: @ 858BF04 + .incbin "baserom.gba", 0x58bf04, 0x14 + +gUnknown_0858BF18:: @ 858BF18 + .incbin "baserom.gba", 0x58bf18, 0x10 + +gUnknown_0858BF28:: @ 858BF28 + .incbin "baserom.gba", 0x58bf28, 0xc + +gUnknown_0858BF34:: @ 858BF34 + .incbin "baserom.gba", 0x58bf34, 0xa + +gUnknown_0858BF3E:: @ 858BF3E + .incbin "baserom.gba", 0x58bf3e, 0xa + +gUnknown_0858BF48:: @ 858BF48 + .incbin "baserom.gba", 0x58bf48, 0x8 + +gUnknown_0858BF50:: @ 858BF50 + .incbin "baserom.gba", 0x58bf50, 0x8 + +gUnknown_0858BF58:: @ 858BF58 + .incbin "baserom.gba", 0x58bf58, 0x14 + +gUnknown_0858BF6C:: @ 858BF6C + .incbin "baserom.gba", 0x58bf6c, 0x8 + +gUnknown_0858BF74:: @ 858BF74 + .incbin "baserom.gba", 0x58bf74, 0x14 + +gUnknown_0858BF88:: @ 858BF88 + .incbin "baserom.gba", 0x58bf88, 0x4 + +gUnknown_0858BF8C:: @ 858BF8C + .incbin "baserom.gba", 0x58bf8c, 0xc + +gUnknown_0858BF98:: @ 858BF98 + .incbin "baserom.gba", 0x58bf98, 0xc + +gUnknown_0858BFA4:: @ 858BFA4 + .incbin "baserom.gba", 0x58bfa4, 0x34 + +gUnknown_0858BFD8:: @ 858BFD8 + .incbin "baserom.gba", 0x58bfd8, 0x78 + +gUnknown_0858C050:: @ 858C050 + .incbin "baserom.gba", 0x58c050, 0x8 + +gUnknown_0858C058:: @ 858C058 + .incbin "baserom.gba", 0x58c058, 0x18 + +gUnknown_0858C070:: @ 858C070 + .incbin "baserom.gba", 0x58c070, 0x8 + +gUnknown_0858C078:: @ 858C078 + .incbin "baserom.gba", 0x58c078, 0x48 + +gUnknown_0858C0C0:: @ 858C0C0 + .incbin "baserom.gba", 0x58c0c0, 0x18 + +gUnknown_0858C0D8:: @ 858C0D8 + .incbin "baserom.gba", 0x58c0d8, 0x18 + +gUnknown_0858C0F0:: @ 858C0F0 + .incbin "baserom.gba", 0x58c0f0, 0x18 + +gUnknown_0858C108:: @ 858C108 + .incbin "baserom.gba", 0x58c108, 0x18 + +gUnknown_0858C120:: @ 858C120 + .incbin "baserom.gba", 0x58c120, 0x18 + +gUnknown_0858C138:: @ 858C138 + .incbin "baserom.gba", 0x58c138, 0x18 + +gUnknown_0858C150:: @ 858C150 + .incbin "baserom.gba", 0x58c150, 0x18 + +gUnknown_0858C168:: @ 858C168 + .incbin "baserom.gba", 0x58c168, 0x18 + +gUnknown_0858C180:: @ 858C180 + .incbin "baserom.gba", 0x58c180, 0x18 + +gUnknown_0858C198:: @ 858C198 + .incbin "baserom.gba", 0x58c198, 0x30 + +gUnknown_0858C1C8:: @ 858C1C8 + .incbin "baserom.gba", 0x58c1c8, 0x68 + +gUnknown_0858C230:: @ 858C230 + .incbin "baserom.gba", 0x58c230, 0x5c + +gUnknown_0858C28C:: @ 858C28C + .incbin "baserom.gba", 0x58c28c, 0x18 + +gUnknown_0858C2A4:: @ 858C2A4 + .incbin "baserom.gba", 0x58c2a4, 0x8 + +gUnknown_0858C2AC:: @ 858C2AC + .incbin "baserom.gba", 0x58c2ac, 0x8 + +@ 858C2B4 + .include "data/contest_moves.inc" + +@ 858CDCC + .include "data/contest_effects.inc" + +@ A lookup table with a 1 for each combo starter ID and a 0 for ID 0, +@ which means "not a combo starter move". +gComboStarterLookupTable:: @ 858CE8C + .byte 0 + .rept 62 + .byte 1 + .endr + + .align 2 +@ 858CECC + .include "data/contest_effect_function_table.inc" + +gUnknown_0858CF8C:: @ 858CF8C + .incbin "baserom.gba", 0x58cf8c, 0x2 + +gUnknown_0858CF8E:: @ 858CF8E + .incbin "baserom.gba", 0x58cf8e, 0x6 + +gUnknown_0858CF94:: @ 858CF94 + .incbin "baserom.gba", 0x58cf94, 0x24 + +gUnknown_0858CFB8:: @ 858CFB8 + .incbin "baserom.gba", 0x58cfb8, 0x6 + +gUnknown_0858CFBE:: @ 858CFBE + .incbin "baserom.gba", 0x58cfbe, 0xe + +gUnknown_0858CFCC:: @ 858CFCC + .incbin "baserom.gba", 0x58cfcc, 0x1c + +gUnknown_0858CFE8:: @ 858CFE8 + .incbin "baserom.gba", 0x58cfe8, 0x60 + +gUnknown_0858D048:: @ 858D048 + .incbin "baserom.gba", 0x58d048, 0x10 + +gUnknown_0858D058:: @ 858D058 + .incbin "baserom.gba", 0x58d058, 0x8 + +gUnknown_0858D060:: @ 858D060 + .incbin "baserom.gba", 0x58d060, 0xc + +gUnknown_0858D06C:: @ 858D06C + .incbin "baserom.gba", 0x58d06c, 0x10 + +gUnknown_0858D07C:: @ 858D07C + .incbin "baserom.gba", 0x58d07c, 0x18 + +gUnknown_0858D094:: @ 858D094 + .incbin "baserom.gba", 0x58d094, 0x3c + +gUnknown_0858D0D0:: @ 858D0D0 + .incbin "baserom.gba", 0x58d0d0, 0xe + +gUnknown_0858D0DE:: @ 858D0DE + .incbin "baserom.gba", 0x58d0de, 0xe + +gUnknown_0858D0EC:: @ 858D0EC + .incbin "baserom.gba", 0x58d0ec, 0x1c + +gUnknown_0858D108:: @ 858D108 + .incbin "baserom.gba", 0x58d108, 0x14 + +gUnknown_0858D11C:: @ 858D11C + .incbin "baserom.gba", 0x58d11c, 0x14 + +gUnknown_0858D130:: @ 858D130 + .incbin "baserom.gba", 0x58d130, 0x14 + +gUnknown_0858D144:: @ 858D144 + .incbin "baserom.gba", 0x58d144, 0xc + +gUnknown_0858D150:: @ 858D150 + .incbin "baserom.gba", 0x58d150, 0x20 + +gUnknown_0858D170:: @ 858D170 + .incbin "baserom.gba", 0x58d170, 0x18 + +gUnknown_0858D188:: @ 858D188 + .incbin "baserom.gba", 0x58d188, 0x14 + +gUnknown_0858D19C:: @ 858D19C + .incbin "baserom.gba", 0x58d19c, 0x4 + +gUnknown_0858D1A0:: @ 858D1A0 + .incbin "baserom.gba", 0x58d1a0, 0x30 + +gUnknown_0858D1D0:: @ 858D1D0 + .incbin "baserom.gba", 0x58d1d0, 0x34 + +gUnknown_0858D204:: @ 858D204 + .incbin "baserom.gba", 0x58d204, 0x24 + +gUnknown_0858D228:: @ 858D228 + .incbin "baserom.gba", 0x58d228, 0x18 + +gUnknown_0858D240:: @ 858D240 + .incbin "baserom.gba", 0x58d240, 0x3c + +gUnknown_0858D27C:: @ 858D27C + .incbin "baserom.gba", 0x58d27c, 0x84 + +gUnknown_0858D300:: @ 858D300 + .incbin "baserom.gba", 0x58d300, 0x20 + +gUnknown_0858D320:: @ 858D320 + .incbin "baserom.gba", 0x58d320, 0x18 + +gUnknown_0858D338:: @ 858D338 + .incbin "baserom.gba", 0x58d338, 0x4c + +gUnknown_0858D384:: @ 858D384 + .incbin "baserom.gba", 0x58d384, 0x10 + +gUnknown_0858D394:: @ 858D394 + .incbin "baserom.gba", 0x58d394, 0x1c + +gUnknown_0858D3B0:: @ 858D3B0 + .incbin "baserom.gba", 0x58d3b0, 0x8 + +gUnknown_0858D3B8:: @ 858D3B8 + .incbin "baserom.gba", 0x58d3b8, 0xc + +gUnknown_0858D3C4:: @ 858D3C4 + .incbin "baserom.gba", 0x58d3c4, 0x2c + +gUnknown_0858D3F0:: @ 858D3F0 + .incbin "baserom.gba", 0x58d3f0, 0x1c + +gUnknown_0858D40C:: @ 858D40C + .incbin "baserom.gba", 0x58d40c, 0xc + +gUnknown_0858D418:: @ 858D418 + .incbin "baserom.gba", 0x58d418, 0x10 + +gUnknown_0858D428:: @ 858D428 + .incbin "baserom.gba", 0x58d428, 0x34 + +gUnknown_0858D45C:: @ 858D45C + .incbin "baserom.gba", 0x58d45c, 0x38 + +gUnknown_0858D494:: @ 858D494 + .incbin "baserom.gba", 0x58d494, 0x4 + +gUnknown_0858D498:: @ 858D498 + .incbin "baserom.gba", 0x58d498, 0x1c + +gUnknown_0858D4B4:: @ 858D4B4 + .incbin "baserom.gba", 0x58d4b4, 0x30 + +gUnknown_0858D4E4:: @ 858D4E4 + .incbin "baserom.gba", 0x58d4e4, 0x40 + +gUnknown_0858D524:: @ 858D524 + .incbin "baserom.gba", 0x58d524, 0x4c + +gUnknown_0858D570:: @ 858D570 + .incbin "baserom.gba", 0x58d570, 0x24 + +gUnknown_0858D594:: @ 858D594 + .incbin "baserom.gba", 0x58d594, 0xac + +gUnknown_0858D640:: @ 858D640 + .incbin "baserom.gba", 0x58d640, 0x2c + +gUnknown_0858D66C:: @ 858D66C + .incbin "baserom.gba", 0x58d66c, 0x24 + +gUnknown_0858D690:: @ 858D690 + .incbin "baserom.gba", 0x58d690, 0x20 + +gUnknown_0858D6B0:: @ 858D6B0 + .incbin "baserom.gba", 0x58d6b0, 0x20 + +gUnknown_0858D6D0:: @ 858D6D0 + .incbin "baserom.gba", 0x58d6d0, 0x128 + +gUnknown_0858D7F8:: @ 858D7F8 + .incbin "baserom.gba", 0x58d7f8, 0x18 + +gUnknown_0858D810:: @ 858D810 + .incbin "baserom.gba", 0x58d810, 0x40 + +gUnknown_0858D850:: @ 858D850 + .incbin "baserom.gba", 0x58d850, 0x10 + +gUnknown_0858D860:: @ 858D860 + .incbin "baserom.gba", 0x58d860, 0x18 + +gUnknown_0858D878:: @ 858D878 + .incbin "baserom.gba", 0x58d878, 0x8 + +gUnknown_0858D880:: @ 858D880 + .incbin "baserom.gba", 0x58d880, 0x8 + +gUnknown_0858D888:: @ 858D888 + .incbin "baserom.gba", 0x58d888, 0x10 + +gUnknown_0858D898:: @ 858D898 + .incbin "baserom.gba", 0x58d898, 0x30 + +gUnknown_0858D8C8:: @ 858D8C8 + .incbin "baserom.gba", 0x58d8c8, 0x18 + +gUnknown_0858D8E0:: @ 858D8E0 + .incbin "baserom.gba", 0x58d8e0, 0x8 + +gUnknown_0858D8E8:: @ 858D8E8 + .incbin "baserom.gba", 0x58d8e8, 0x4 + +gUnknown_0858D8EC:: @ 858D8EC + .incbin "baserom.gba", 0x58d8ec, 0x4 + +gUnknown_0858D8F0:: @ 858D8F0 + .incbin "baserom.gba", 0x58d8f0, 0x80 + +gUnknown_0858D970:: @ 858D970 + .incbin "baserom.gba", 0x58d970, 0x2a8 + + .align 2 +gFieldEffectObjectPalette7:: @ 858DC18 + .incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal" + + .incbin "baserom.gba", 0x58dc38, 0x580 + + .align 2 +gFieldEffectObjectPalette8:: @ 858E1B8 + .incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal" + + .incbin "baserom.gba", 0x58e1d8, 0x428 + +gUnknown_0858E600:: @ 858E600 + .incbin "baserom.gba", 0x58e600, 0x18 + +gUnknown_0858E618:: @ 858E618 + .incbin "baserom.gba", 0x58e618, 0x18 + +gUnknown_0858E630:: @ 858E630 + .incbin "baserom.gba", 0x58e630, 0x18 + + .align 2 +gFieldEffectObjectPaletteInfo7:: @ 858E648 + obj_pal gFieldEffectObjectPalette7, 0x1003 + + .align 2 +gFieldEffectObjectPaletteInfo8:: @ 858E650 + obj_pal gFieldEffectObjectPalette8, 0x1008 + + .incbin "baserom.gba", 0x58e658, 0x34 + +gUnknown_0858E68C:: @ 858E68C + .incbin "baserom.gba", 0x58e68c, 0x18 + + .align 2 +@ This uses one of the secret base palettes, so there is no +@ "field_effect_object_palette_09.pal" file. +gFieldEffectObjectPaletteInfo9:: @ 858E6A4 + obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E + + .incbin "baserom.gba", 0x58e6ac, 0x1b8 + +gUnknown_0858E864:: @ 858E864 + .incbin "baserom.gba", 0x58e864, 0x1c + +gUnknown_0858E880:: @ 858E880 + .incbin "baserom.gba", 0x58e880, 0x18 + +gUnknown_0858E898:: @ 858E898 + .incbin "baserom.gba", 0x58e898, 0x13 + +gUnknown_0858E8AB:: @ 858E8AB + .incbin "baserom.gba", 0x58e8ab, 0x2 + +gUnknown_0858E8AD:: @ 858E8AD + .incbin "baserom.gba", 0x58e8ad, 0x3 + +gUnknown_0858E8B0:: @ 858E8B0 + .incbin "baserom.gba", 0x58e8b0, 0x40 + +gUnknown_0858E8F0:: @ 858E8F0 + .incbin "baserom.gba", 0x58e8f0, 0x3468 + +gUnknown_08591D58:: @ 8591D58 + .incbin "baserom.gba", 0x591d58, 0x270 + +gUnknown_08591FC8:: @ 8591FC8 + .incbin "baserom.gba", 0x591fc8, 0x18 + +gUnknown_08591FE0:: @ 8591FE0 + .incbin "baserom.gba", 0x591fe0, 0x18 + +gUnknown_08591FF8:: @ 8591FF8 + .incbin "baserom.gba", 0x591ff8, 0x10 + +gUnknown_08592008:: @ 8592008 + .incbin "baserom.gba", 0x592008, 0x10 + +gUnknown_08592018:: @ 8592018 + .incbin "baserom.gba", 0x592018, 0x10 + +gUnknown_08592028:: @ 8592028 + .incbin "baserom.gba", 0x592028, 0x10 + +gUnknown_08592038:: @ 8592038 + .incbin "baserom.gba", 0x592038, 0x20 + +gUnknown_08592058:: @ 8592058 + .incbin "baserom.gba", 0x592058, 0x20 + +gUnknown_08592078:: @ 8592078 + .incbin "baserom.gba", 0x592078, 0x60 + +gUnknown_085920D8:: @ 85920D8 + .incbin "baserom.gba", 0x5920d8, 0xc + +gUnknown_085920E4:: @ 85920E4 + .incbin "baserom.gba", 0x5920e4, 0x4 + +gUnknown_085920E8:: @ 85920E8 + .incbin "baserom.gba", 0x5920e8, 0x128 + +gUnknown_08592210:: @ 8592210 + .incbin "baserom.gba", 0x592210, 0x4f0 + +gUnknown_08592700:: @ 8592700 + .incbin "baserom.gba", 0x592700, 0x78 + +gUnknown_08592778:: @ 8592778 + .incbin "baserom.gba", 0x592778, 0x100 + +gUnknown_08592878:: @ 8592878 + .incbin "baserom.gba", 0x592878, 0x458 + +gUnknown_08592CD0:: @ 8592CD0 + .incbin "baserom.gba", 0x592cd0, 0x1ec + +gUnknown_08592EBC:: @ 8592EBC + .incbin "baserom.gba", 0x592ebc, 0x30 + +gUnknown_08592EEC:: @ 8592EEC + .incbin "baserom.gba", 0x592eec, 0x134 + +gUnknown_08593020:: @ 8593020 + .incbin "baserom.gba", 0x593020, 0xf4 + +gUnknown_08593114:: @ 8593114 + .incbin "baserom.gba", 0x593114, 0x29c + +gUnknown_085933B0:: @ 85933B0 + .incbin "baserom.gba", 0x5933b0, 0xf0 + +gUnknown_085934A0:: @ 85934A0 + .incbin "baserom.gba", 0x5934a0, 0x148 + +gUnknown_085935E8:: @ 85935E8 + .incbin "baserom.gba", 0x5935e8, 0x20 + +gUnknown_08593608:: @ 8593608 + .incbin "baserom.gba", 0x593608, 0x9c + +gUnknown_085936A4:: @ 85936A4 + .incbin "baserom.gba", 0x5936a4, 0x20c + +gUnknown_085938B0:: @ 85938B0 + .incbin "baserom.gba", 0x5938b0, 0x2c + +gUnknown_085938DC:: @ 85938DC + .incbin "baserom.gba", 0x5938dc, 0x18 + +gUnknown_085938F4:: @ 85938F4 + .incbin "baserom.gba", 0x5938f4, 0x5c + +gUnknown_08593950:: @ 8593950 + .incbin "baserom.gba", 0x593950, 0x38 + +gUnknown_08593988:: @ 8593988 + .incbin "baserom.gba", 0x593988, 0x210 + +gUnknown_08593B98:: @ 8593B98 + .incbin "baserom.gba", 0x593b98, 0x1488 + +gUnknown_08595020:: @ 8595020 + .incbin "baserom.gba", 0x595020, 0x248 + +gUnknown_08595268:: @ 8595268 + .incbin "baserom.gba", 0x595268, 0xa8 + +gUnknown_08595310:: @ 8595310 + .incbin "baserom.gba", 0x595310, 0x2a4 + +gUnknown_085955B4:: @ 85955B4 + .incbin "baserom.gba", 0x5955b4, 0x18 + +gUnknown_085955CC:: @ 85955CC + .incbin "baserom.gba", 0x5955cc, 0x2 + +gUnknown_085955CE:: @ 85955CE + .incbin "baserom.gba", 0x5955ce, 0xb6 + +gUnknown_08595684:: @ 8595684 + .incbin "baserom.gba", 0x595684, 0x10 + +gUnknown_08595694:: @ 8595694 + .incbin "baserom.gba", 0x595694, 0x2c + +gUnknown_085956C0:: @ 85956C0 + .incbin "baserom.gba", 0x5956c0, 0x168 + +gUnknown_08595828:: @ 8595828 + .incbin "baserom.gba", 0x595828, 0x18 + +gUnknown_08595840:: @ 8595840 + .incbin "baserom.gba", 0x595840, 0x18 + +gUnknown_08595858:: @ 8595858 + .incbin "baserom.gba", 0x595858, 0x50 + +gUnknown_085958A8:: @ 85958A8 + .incbin "baserom.gba", 0x5958a8, 0x158 + +gUnknown_08595A00:: @ 8595A00 + .incbin "baserom.gba", 0x595a00, 0x30 + +gUnknown_08595A30:: @ 8595A30 + .incbin "baserom.gba", 0x595a30, 0x138 + +gUnknown_08595B68:: @ 8595B68 + .incbin "baserom.gba", 0x595b68, 0xf4 + +gUnknown_08595C5C:: @ 8595C5C + .incbin "baserom.gba", 0x595c5c, 0x2c + +gUnknown_08595C88:: @ 8595C88 + .incbin "baserom.gba", 0x595c88, 0x2c + +gUnknown_08595CB4:: @ 8595CB4 + .incbin "baserom.gba", 0x595cb4, 0x78 + +gUnknown_08595D2C:: @ 8595D2C + .incbin "baserom.gba", 0x595d2c, 0xa14 + +gUnknown_08596740:: @ 8596740 + .incbin "baserom.gba", 0x596740, 0x1c + +gUnknown_0859675C:: @ 859675C + .incbin "baserom.gba", 0x59675c, 0x20 + +gUnknown_0859677C:: @ 859677C + .incbin "baserom.gba", 0x59677c, 0x18 + +gUnknown_08596794:: @ 8596794 + .incbin "baserom.gba", 0x596794, 0xd0 + +gUnknown_08596864:: @ 8596864 + .incbin "baserom.gba", 0x596864, 0x35c + +gUnknown_08596BC0:: @ 8596BC0 + .incbin "baserom.gba", 0x596bc0, 0x50 + +gUnknown_08596C10:: @ 8596C10 + .incbin "baserom.gba", 0x596c10, 0x18 + +gUnknown_08596C28:: @ 8596C28 + .incbin "baserom.gba", 0x596c28, 0x18 + +gUnknown_08596C40:: @ 8596C40 + .incbin "baserom.gba", 0x596c40, 0x178 + +gUnknown_08596DB8:: @ 8596DB8 + .incbin "baserom.gba", 0x596db8, 0x78 + +gUnknown_08596E30:: @ 8596E30 + .incbin "baserom.gba", 0x596e30, 0x528 + +gUnknown_08597358:: @ 8597358 + .incbin "baserom.gba", 0x597358, 0x30 + +gUnknown_08597388:: @ 8597388 + .incbin "baserom.gba", 0x597388, 0x60 + +gUnknown_085973E8:: @ 85973E8 + .incbin "baserom.gba", 0x5973e8, 0x30 + +gUnknown_08597418:: @ 8597418 + .incbin "baserom.gba", 0x597418, 0x2 + +gUnknown_0859741A:: @ 859741A + .incbin "baserom.gba", 0x59741a, 0x4 + +gUnknown_0859741E:: @ 859741E + .incbin "baserom.gba", 0x59741e, 0x6 + +gUnknown_08597424:: @ 8597424 + .incbin "baserom.gba", 0x597424, 0x28 + +gUnknown_0859744C:: @ 859744C + .incbin "baserom.gba", 0x59744c, 0x10 + +gUnknown_0859745C:: @ 859745C + .incbin "baserom.gba", 0x59745c, 0xc + +gUnknown_08597468:: @ 8597468 + .incbin "baserom.gba", 0x597468, 0x34 + +gUnknown_0859749C:: @ 859749C + .incbin "baserom.gba", 0x59749c, 0x1c + +gUnknown_085974B8:: @ 85974B8 + .incbin "baserom.gba", 0x5974b8, 0x8 + +gUnknown_085974C0:: @ 85974C0 + .incbin "baserom.gba", 0x5974c0, 0x70 + +gUnknown_08597530:: @ 8597530 + .incbin "baserom.gba", 0x597530, 0x20 + +gUnknown_08597550:: @ 8597550 + .incbin "baserom.gba", 0x597550, 0x1f8 + +gUnknown_08597748:: @ 8597748 + .incbin "baserom.gba", 0x597748, 0x1c + +gUnknown_08597764:: @ 8597764 + .incbin "baserom.gba", 0x597764, 0x8 + +gUnknown_0859776C:: @ 859776C + .incbin "baserom.gba", 0x59776c, 0x3a8 + +gUnknown_08597B14:: @ 8597B14 + .incbin "baserom.gba", 0x597b14, 0x20 + +gUnknown_08597B34:: @ 8597B34 + .incbin "baserom.gba", 0x597b34, 0x20 + +gUnknown_08597B54:: @ 8597B54 + .incbin "baserom.gba", 0x597b54, 0xc8 + +gUnknown_08597C1C:: @ 8597C1C + .incbin "baserom.gba", 0x597c1c, 0x8 + +gUnknown_08597C24:: @ 8597C24 + .incbin "baserom.gba", 0x597c24, 0xc + +gUnknown_08597C30:: @ 8597C30 + .incbin "baserom.gba", 0x597c30, 0x24 + +gUnknown_08597C54:: @ 8597C54 + .incbin "baserom.gba", 0x597c54, 0x10 + +gUnknown_08597C64:: @ 8597C64 + .incbin "baserom.gba", 0x597c64, 0x20 + +gUnknown_08597C84:: @ 8597C84 + .incbin "baserom.gba", 0x597c84, 0x8 + +gUnknown_08597C8C:: @ 8597C8C + .incbin "baserom.gba", 0x597c8c, 0x4 + +gUnknown_08597C90:: @ 8597C90 + .incbin "baserom.gba", 0x597c90, 0x10 + +gUnknown_08597CA0:: @ 8597CA0 + .incbin "baserom.gba", 0x597ca0, 0x20 + +gUnknown_08597CC0:: @ 8597CC0 + .incbin "baserom.gba", 0x597cc0, 0x28 + +gUnknown_08597CE8:: @ 8597CE8 + .incbin "baserom.gba", 0x597ce8, 0x20 + +gUnknown_08597D08:: @ 8597D08 + .incbin "baserom.gba", 0x597d08, 0x10 + +gUnknown_08597D18:: @ 8597D18 + .incbin "baserom.gba", 0x597d18, 0x50 + +gUnknown_08597D68:: @ 8597D68 + .incbin "baserom.gba", 0x597d68, 0x68 + +gUnknown_08597DD0:: @ 8597DD0 + .incbin "baserom.gba", 0x597dd0, 0x20 + +gUnknown_08597DF0:: @ 8597DF0 + .incbin "baserom.gba", 0x597df0, 0x40 + +gUnknown_08597E30:: @ 8597E30 + .incbin "baserom.gba", 0x597e30, 0x18 + +gUnknown_08597E48:: @ 8597E48 + .incbin "baserom.gba", 0x597e48, 0x18 + +gUnknown_08597E60:: @ 8597E60 + .incbin "baserom.gba", 0x597e60, 0xc + +gUnknown_08597E6C:: @ 8597E6C + .incbin "baserom.gba", 0x597e6c, 0x30 + +@ 8597E9C + .include "data/text/easy_chat/easy_chat_groups.inc" + +@ 859D0B4 + .include "data/text/easy_chat/easy_chat_words_by_letter.inc" + +@ 859E5D4 + .include "data/text/easy_chat/easy_chat_group_name_pointers.inc" + +gUnknown_0859E62C:: @ 859E62C + .incbin "baserom.gba", 0x59e62c, 0x8 + +gUnknown_0859E634:: @ 859E634 + .incbin "baserom.gba", 0x59e634, 0xc + +gUnknown_0859E640:: @ 859E640 + .incbin "baserom.gba", 0x59e640, 0xc + +gUnknown_0859E64C:: @ 859E64C + .incbin "baserom.gba", 0x59e64c, 0xc + +gUnknown_0859E658:: @ 859E658 + .incbin "baserom.gba", 0x59e658, 0x4 + +gUnknown_0859E65C:: @ 859E65C + .incbin "baserom.gba", 0x59e65c, 0x20 + +gUnknown_0859E67C:: @ 859E67C + .incbin "baserom.gba", 0x59e67c, 0x800 + +gUnknown_0859EE7C:: @ 859EE7C + .incbin "baserom.gba", 0x59ee7c, 0x8 + +gUnknown_0859EE84:: @ 859EE84 + .incbin "baserom.gba", 0x59ee84, 0x58 + +gUnknown_0859EEDC:: @ 859EEDC + .incbin "baserom.gba", 0x59eedc, 0x38 + +gUnknown_0859EF14:: @ 859EF14 + .incbin "baserom.gba", 0x59ef14, 0x8 + +gUnknown_0859EF1C:: @ 859EF1C + .incbin "baserom.gba", 0x59ef1c, 0x88 + +gUnknown_0859EFA4:: @ 859EFA4 + .incbin "baserom.gba", 0x59efa4, 0x40 + +gUnknown_0859EFE4:: @ 859EFE4 + .incbin "baserom.gba", 0x59efe4, 0xc + +gUnknown_0859EFF0:: @ 859EFF0 + .incbin "baserom.gba", 0x59eff0, 0x20 + +gUnknown_0859F010:: @ 859F010 + .incbin "baserom.gba", 0x59f010, 0x20 + +gUnknown_0859F030:: @ 859F030 + .incbin "baserom.gba", 0x59f030, 0x18 + +gUnknown_0859F048:: @ 859F048 + .incbin "baserom.gba", 0x59f048, 0x230 + +gUnknown_0859F278:: @ 859F278 + .incbin "baserom.gba", 0x59f278, 0x10 + +gUnknown_0859F288:: @ 859F288 + .incbin "baserom.gba", 0x59f288, 0x8 + +gUnknown_0859F290:: @ 859F290 + .incbin "baserom.gba", 0x59f290, 0xc + +gUnknown_0859F29C:: @ 859F29C + .incbin "baserom.gba", 0x59f29c, 0x10 + +gUnknown_0859F2AC:: @ 859F2AC + .incbin "baserom.gba", 0x59f2ac, 0x4 + +gUnknown_0859F2B0:: @ 859F2B0 + .incbin "baserom.gba", 0x59f2b0, 0x8 + +gUnknown_0859F2B8:: @ 859F2B8 + .incbin "baserom.gba", 0x59f2b8, 0xfc + +gUnknown_0859F3B4:: @ 859F3B4 + .incbin "baserom.gba", 0x59f3b4, 0xa4 + +gUnknown_0859F458:: @ 859F458 + .incbin "baserom.gba", 0x59f458, 0xbc + +gUnknown_0859F514:: @ 859F514 + .incbin "baserom.gba", 0x59f514, 0x8 + +gUnknown_0859F51C:: @ 859F51C + .incbin "baserom.gba", 0x59f51c, 0x8 + +gUnknown_0859F524:: @ 859F524 + .incbin "baserom.gba", 0x59f524, 0x10 + +gUnknown_0859F534:: @ 859F534 + .incbin "baserom.gba", 0x59f534, 0x8 + +gUnknown_0859F53C:: @ 859F53C + .incbin "baserom.gba", 0x59f53c, 0xd0 + +gUnknown_0859F60C:: @ 859F60C + .incbin "baserom.gba", 0x59f60c, 0x44 + +gUnknown_0859F650:: @ 859F650 + .incbin "baserom.gba", 0x59f650, 0xec + +gUnknown_0859F73C:: @ 859F73C + .incbin "baserom.gba", 0x59f73c, 0x40 + +gUnknown_0859F77C:: @ 859F77C + .incbin "baserom.gba", 0x59f77c, 0xd64 + +gUnknown_085A04E0:: @ 85A04E0 + .incbin "baserom.gba", 0x5a04e0, 0x34c + +gUnknown_085A082C:: @ 85A082C + .incbin "baserom.gba", 0x5a082c, 0x20 + +gUnknown_085A084C:: @ 85A084C + .incbin "baserom.gba", 0x5a084c, 0x80 + +gUnknown_085A08CC:: @ 85A08CC + .incbin "baserom.gba", 0x5a08cc, 0x20 + +gUnknown_085A08EC:: @ 85A08EC + .incbin "baserom.gba", 0x5a08ec, 0x80 + +gUnknown_085A096C:: @ 85A096C + .incbin "baserom.gba", 0x5a096c, 0x1a4 + +@ 85A0B10 + .include "data/region_map_entries.inc" + +gUnknown_085A1B24:: @ 85A1B24 + .incbin "baserom.gba", 0x5a1b24, 0x60 + +gUnknown_085A1B84:: @ 85A1B84 + .incbin "baserom.gba", 0x5a1b84, 0x6 + +gUnknown_085A1B8A:: @ 85A1B8A + .incbin "baserom.gba", 0x5a1b8a, 0x22 + +gUnknown_085A1BAC:: @ 85A1BAC + .incbin "baserom.gba", 0x5a1bac, 0x20 + +gUnknown_085A1BCC:: @ 85A1BCC + .incbin "baserom.gba", 0x5a1bcc, 0x34 + +gUnknown_085A1C00:: @ 85A1C00 + .incbin "baserom.gba", 0x5a1c00, 0x8 + +gUnknown_085A1C08:: @ 85A1C08 + .incbin "baserom.gba", 0x5a1c08, 0x18 + +gUnknown_085A1C20:: @ 85A1C20 + .incbin "baserom.gba", 0x5a1c20, 0x10 + +gUnknown_085A1C30:: @ 85A1C30 + .incbin "baserom.gba", 0x5a1c30, 0x4 + +gUnknown_085A1C34:: @ 85A1C34 + .incbin "baserom.gba", 0x5a1c34, 0x4 + +gUnknown_085A1C38:: @ 85A1C38 + .incbin "baserom.gba", 0x5a1c38, 0x20 + +gUnknown_085A1C58:: @ 85A1C58 + .incbin "baserom.gba", 0x5a1c58, 0x38 + +gUnknown_085A1C90:: @ 85A1C90 + .incbin "baserom.gba", 0x5a1c90, 0xd8 + +gUnknown_085A1D68:: @ 85A1D68 + .incbin "baserom.gba", 0x5a1d68, 0xd4 + +gUnknown_085A1E3C:: @ 85A1E3C + .incbin "baserom.gba", 0x5a1e3c, 0xa0 + +gUnknown_085A1EDC:: @ 85A1EDC + .incbin "baserom.gba", 0x5a1edc, 0x8 + +gUnknown_085A1EE4:: @ 85A1EE4 + .incbin "baserom.gba", 0x5a1ee4, 0xc + +gUnknown_085A1EF0:: @ 85A1EF0 + .incbin "baserom.gba", 0x5a1ef0, 0x20 + +gUnknown_085A1F10:: @ 85A1F10 + .incbin "baserom.gba", 0x5a1f10, 0x8 + +gUnknown_085A1F18:: @ 85A1F18 + .incbin "baserom.gba", 0x5a1f18, 0x64 + +gUnknown_085A1F7C:: @ 85A1F7C + .incbin "baserom.gba", 0x5a1f7c, 0x18 + +gUnknown_085A1F94:: @ 85A1F94 + .incbin "baserom.gba", 0x5a1f94, 0x3c74 + +gUnknown_085A5C08:: @ 85A5C08 + .incbin "baserom.gba", 0x5a5c08, 0x1 + +gUnknown_085A5C09:: @ 85A5C09 + .incbin "baserom.gba", 0x5a5c09, 0x1b + +gUnknown_085A5C24:: @ 85A5C24 + .incbin "baserom.gba", 0x5a5c24, 0xf04 + +gUnknown_085A6B28:: @ 85A6B28 + .incbin "baserom.gba", 0x5a6b28, 0x20 + +gUnknown_085A6B48:: @ 85A6B48 + .incbin "baserom.gba", 0x5a6b48, 0x20 + +gUnknown_085A6B68:: @ 85A6B68 + .incbin "baserom.gba", 0x5a6b68, 0x10 + +gUnknown_085A6B78:: @ 85A6B78 + .incbin "baserom.gba", 0x5a6b78, 0x18 + +gUnknown_085A6B90:: @ 85A6B90 + .incbin "baserom.gba", 0x5a6b90, 0x20 + +gUnknown_085A6BB0:: @ 85A6BB0 + .incbin "baserom.gba", 0x5a6bb0, 0x20 + +gUnknown_085A6BD0:: @ 85A6BD0 + .incbin "baserom.gba", 0x5a6bd0, 0x18 + +gUnknown_085A6BE8:: @ 85A6BE8 + .incbin "baserom.gba", 0x5a6be8, 0x5c8 + +gUnknown_085A71B0:: @ 85A71B0 + .incbin "baserom.gba", 0x5a71b0, 0xa0 + +gUnknown_085A7250:: @ 85A7250 + .incbin "baserom.gba", 0x5a7250, 0x3c + +gUnknown_085A728C:: @ 85A728C + .incbin "baserom.gba", 0x5a728c, 0x18 + +gUnknown_085A72A4:: @ 85A72A4 + .incbin "baserom.gba", 0x5a72a4, 0x18 + +gUnknown_085A72BC:: @ 85A72BC + .incbin "baserom.gba", 0x5a72bc, 0x8 + +gUnknown_085A72C4:: @ 85A72C4 + .incbin "baserom.gba", 0x5a72c4, 0x8 + +gUnknown_085A72CC:: @ 85A72CC + .incbin "baserom.gba", 0x5a72cc, 0x8 + +gUnknown_085A72D4:: @ 85A72D4 + .incbin "baserom.gba", 0x5a72d4, 0x10 + +gUnknown_085A72E4:: @ 85A72E4 + .incbin "baserom.gba", 0x5a72e4, 0x8 + +gUnknown_085A72EC:: @ 85A72EC + .incbin "baserom.gba", 0x5a72ec, 0x8 + +gUnknown_085A72F4:: @ 85A72F4 + .incbin "baserom.gba", 0x5a72f4, 0x54 + +gUnknown_085A7348:: @ 85A7348 + .incbin "baserom.gba", 0x5a7348, 0x8 + +gUnknown_085A7350:: @ 85A7350 + .incbin "baserom.gba", 0x5a7350, 0x88 + +gUnknown_085A73D8:: @ 85A73D8 + .incbin "baserom.gba", 0x5a73d8, 0x8 + +gUnknown_085A73E0:: @ 85A73E0 + .incbin "baserom.gba", 0x5a73e0, 0x24 + +gUnknown_085A7404:: @ 85A7404 + .incbin "baserom.gba", 0x5a7404, 0x18 + +gUnknown_085A741C:: @ 85A741C + .incbin "baserom.gba", 0x5a741c, 0x8 + +gUnknown_085A7424:: @ 85A7424 + .incbin "baserom.gba", 0x5a7424, 0x10 + +gUnknown_085A7434:: @ 85A7434 + .incbin "baserom.gba", 0x5a7434, 0x10 + +gUnknown_085A7444:: @ 85A7444 + .incbin "baserom.gba", 0x5a7444, 0x8 + +gUnknown_085A744C:: @ 85A744C + .incbin "baserom.gba", 0x5a744c, 0x4 + +gUnknown_085A7450:: @ 85A7450 + .incbin "baserom.gba", 0x5a7450, 0x74 + +gUnknown_085A74C4:: @ 85A74C4 + .incbin "baserom.gba", 0x5a74c4, 0xc + +gUnknown_085A74D0:: @ 85A74D0 + .incbin "baserom.gba", 0x5a74d0, 0x14 + +gUnknown_085A74E4:: @ 85A74E4 + .incbin "baserom.gba", 0x5a74e4, 0xc + +gUnknown_085A74F0:: @ 85A74F0 + .incbin "baserom.gba", 0x5a74f0, 0xc + +gUnknown_085A74FC:: @ 85A74FC + .incbin "baserom.gba", 0x5a74fc, 0xc + +gUnknown_085A7508:: @ 85A7508 + .incbin "baserom.gba", 0x5a7508, 0xc + +gUnknown_085A7514:: @ 85A7514 + .incbin "baserom.gba", 0x5a7514, 0xc + +gUnknown_085A7520:: @ 85A7520 + .incbin "baserom.gba", 0x5a7520, 0xc + +gUnknown_085A752C:: @ 85A752C + .incbin "baserom.gba", 0x5a752c, 0xc + +gUnknown_085A7538:: @ 85A7538 + .incbin "baserom.gba", 0x5a7538, 0xc + +gUnknown_085A7544:: @ 85A7544 + .incbin "baserom.gba", 0x5a7544, 0xc + +gUnknown_085A7550:: @ 85A7550 + .incbin "baserom.gba", 0x5a7550, 0x8 + +gUnknown_085A7558:: @ 85A7558 + .incbin "baserom.gba", 0x5a7558, 0x10 + +gUnknown_085A7568:: @ 85A7568 + .incbin "baserom.gba", 0x5a7568, 0x2 + +gUnknown_085A756A:: @ 85A756A + .incbin "baserom.gba", 0x5a756a, 0xa + +gUnknown_085A7574:: @ 85A7574 + .incbin "baserom.gba", 0x5a7574, 0x4c + +gUnknown_085A75C0:: @ 85A75C0 + .incbin "baserom.gba", 0x5a75c0, 0x4 + +gUnknown_085A75C4:: @ 85A75C4 + .incbin "baserom.gba", 0x5a75c4, 0x8 + +gUnknown_085A75CC:: @ 85A75CC + .incbin "baserom.gba", 0x5a75cc, 0x8 + +gUnknown_085A75D4:: @ 85A75D4 + .incbin "baserom.gba", 0x5a75d4, 0x3c + +gUnknown_085A7610:: @ 85A7610 + .incbin "baserom.gba", 0x5a7610, 0x4 + +gUnknown_085A7614:: @ 85A7614 + .incbin "baserom.gba", 0x5a7614, 0x2 + +gUnknown_085A7616:: @ 85A7616 + .incbin "baserom.gba", 0x5a7616, 0x8 + +gUnknown_085A761E:: @ 85A761E + .incbin "baserom.gba", 0x5a761e, 0x8 + +gUnknown_085A7626:: @ 85A7626 + .incbin "baserom.gba", 0x5a7626, 0x8 + +gUnknown_085A762E:: @ 85A762E + .incbin "baserom.gba", 0x5a762e, 0x10 + +gUnknown_085A763E:: @ 85A763E + .incbin "baserom.gba", 0x5a763e, 0x10 + +gUnknown_085A764E:: @ 85A764E + .incbin "baserom.gba", 0x5a764e, 0x10 + +gUnknown_085A765E:: @ 85A765E + .incbin "baserom.gba", 0x5a765e, 0x10 + +gUnknown_085A766E:: @ 85A766E + .incbin "baserom.gba", 0x5a766e, 0x3f + +gUnknown_085A76AD:: @ 85A76AD + .incbin "baserom.gba", 0x5a76ad, 0x7 + +gUnknown_085A76B4:: @ 85A76B4 + .incbin "baserom.gba", 0x5a76b4, 0xc + +gUnknown_085A76C0:: @ 85A76C0 + .incbin "baserom.gba", 0x5a76c0, 0x12 + +gUnknown_085A76D2:: @ 85A76D2 + .incbin "baserom.gba", 0x5a76d2, 0x12 + +gUnknown_085A76E4:: @ 85A76E4 + .incbin "baserom.gba", 0x5a76e4, 0x1e + +gUnknown_085A7702:: @ 85A7702 + .incbin "baserom.gba", 0x5a7702, 0x66 + +gUnknown_085A7768:: @ 85A7768 + .incbin "baserom.gba", 0x5a7768, 0x66 + +gUnknown_085A77CE:: @ 85A77CE + .incbin "baserom.gba", 0x5a77ce, 0xa + +gUnknown_085A77D8:: @ 85A77D8 + .incbin "baserom.gba", 0x5a77d8, 0x14 + +gUnknown_085A77EC:: @ 85A77EC + .incbin "baserom.gba", 0x5a77ec, 0xa + +gUnknown_085A77F6:: @ 85A77F6 + .incbin "baserom.gba", 0x5a77f6, 0x8 + +gUnknown_085A77FE:: @ 85A77FE + .incbin "baserom.gba", 0x5a77fe, 0x6 + +gUnknown_085A7804:: @ 85A7804 + .incbin "baserom.gba", 0x5a7804, 0xa + +gUnknown_085A780E:: @ 85A780E + .incbin "baserom.gba", 0x5a780e, 0x8 + +gUnknown_085A7816:: @ 85A7816 + .incbin "baserom.gba", 0x5a7816, 0x12 + +gUnknown_085A7828:: @ 85A7828 + .incbin "baserom.gba", 0x5a7828, 0x12 + +gUnknown_085A783A:: @ 85A783A + .incbin "baserom.gba", 0x5a783a, 0x8e + +gUnknown_085A78C8:: @ 85A78C8 + .incbin "baserom.gba", 0x5a78c8, 0x13c + +gUnknown_085A7A04:: @ 85A7A04 + .incbin "baserom.gba", 0x5a7a04, 0x1c + +gUnknown_085A7A20:: @ 85A7A20 + .incbin "baserom.gba", 0x5a7a20, 0x2c0 + +gUnknown_085A7CE0:: @ 85A7CE0 + .incbin "baserom.gba", 0x5a7ce0, 0x18 + +gUnknown_085A7CF8:: @ 85A7CF8 + .incbin "baserom.gba", 0x5a7cf8, 0x18 + +gUnknown_085A7D10:: @ 85A7D10 + .incbin "baserom.gba", 0x5a7d10, 0x18 + +gUnknown_085A7D28:: @ 85A7D28 + .incbin "baserom.gba", 0x5a7d28, 0x18 + +gUnknown_085A7D40:: @ 85A7D40 + .incbin "baserom.gba", 0x5a7d40, 0x18 + +gUnknown_085A7D58:: @ 85A7D58 + .incbin "baserom.gba", 0x5a7d58, 0x18 + +gUnknown_085A7D70:: @ 85A7D70 + .incbin "baserom.gba", 0x5a7d70, 0x18 + +gUnknown_085A7D88:: @ 85A7D88 + .incbin "baserom.gba", 0x5a7d88, 0x18 + +gUnknown_085A7DA0:: @ 85A7DA0 + .incbin "baserom.gba", 0x5a7da0, 0x18 + +gUnknown_085A7DB8:: @ 85A7DB8 + .incbin "baserom.gba", 0x5a7db8, 0x18 + +gUnknown_085A7DD0:: @ 85A7DD0 + .incbin "baserom.gba", 0x5a7dd0, 0x18 + +gUnknown_085A7DE8:: @ 85A7DE8 + .incbin "baserom.gba", 0x5a7de8, 0x18 + +gUnknown_085A7E00:: @ 85A7E00 + .incbin "baserom.gba", 0x5a7e00, 0x18 + +gUnknown_085A7E18:: @ 85A7E18 + .incbin "baserom.gba", 0x5a7e18, 0x18 + +gUnknown_085A7E30:: @ 85A7E30 + .incbin "baserom.gba", 0x5a7e30, 0x168 + +gUnknown_085A7F98:: @ 85A7F98 + .incbin "baserom.gba", 0x5a7f98, 0x28 + +gUnknown_085A7FC0:: @ 85A7FC0 + .incbin "baserom.gba", 0x5a7fc0, 0x20 + +gUnknown_085A7FE0:: @ 85A7FE0 + .incbin "baserom.gba", 0x5a7fe0, 0x14 + +gUnknown_085A7FF4:: @ 85A7FF4 + .incbin "baserom.gba", 0x5a7ff4, 0x1c + +gUnknown_085A8010:: @ 85A8010 + .incbin "baserom.gba", 0x5a8010, 0x18 + +gUnknown_085A8028:: @ 85A8028 + .incbin "baserom.gba", 0x5a8028, 0x14 + +gUnknown_085A803C:: @ 85A803C + .incbin "baserom.gba", 0x5a803c, 0x228 + +gUnknown_085A8264:: @ 85A8264 + .incbin "baserom.gba", 0x5a8264, 0x68 + +gUnknown_085A82CC:: @ 85A82CC + .incbin "baserom.gba", 0x5a82cc, 0x68 + +gUnknown_085A8334:: @ 85A8334 + .incbin "baserom.gba", 0x5a8334, 0xb0 + +gUnknown_085A83E4:: @ 85A83E4 + .incbin "baserom.gba", 0x5a83e4, 0x24 + +gUnknown_085A8408:: @ 85A8408 + .incbin "baserom.gba", 0x5a8408, 0x14 + +gUnknown_085A841C:: @ 85A841C + .incbin "baserom.gba", 0x5a841c, 0x14 + +gUnknown_085A8430:: @ 85A8430 + .incbin "baserom.gba", 0x5a8430, 0x5 + +gUnknown_085A8435:: @ 85A8435 + .incbin "baserom.gba", 0x5a8435, 0x6 + +gUnknown_085A843B:: @ 85A843B + .incbin "baserom.gba", 0x5a843b, 0x65 + +gUnknown_085A84A0:: @ 85A84A0 + .incbin "baserom.gba", 0x5a84a0, 0xc + +gUnknown_085A84AC:: @ 85A84AC + .incbin "baserom.gba", 0x5a84ac, 0x64 + +gUnknown_085A8510:: @ 85A8510 + .incbin "baserom.gba", 0x5a8510, 0x10 + +gUnknown_085A8520:: @ 85A8520 + .incbin "baserom.gba", 0x5a8520, 0x4 + +gUnknown_085A8524:: @ 85A8524 + .incbin "baserom.gba", 0x5a8524, 0x20 + +gUnknown_085A8544:: @ 85A8544 + .incbin "baserom.gba", 0x5a8544, 0x48 + +gUnknown_085A858C:: @ 85A858C + .incbin "baserom.gba", 0x5a858c, 0x1154 + +gUnknown_085A96E0:: @ 85A96E0 + .incbin "baserom.gba", 0x5a96e0, 0x1b8 + +gUnknown_085A9898:: @ 85A9898 + .incbin "baserom.gba", 0x5a9898, 0x4 + +gUnknown_085A989C:: @ 85A989C + .incbin "baserom.gba", 0x5a989c, 0x200 + +gUnknown_085A9A9C:: @ 85A9A9C + .incbin "baserom.gba", 0x5a9a9c, 0x1084 + +gUnknown_085AAB20:: @ 85AAB20 + .incbin "baserom.gba", 0x5aab20, 0xc30 + +gUnknown_085AB750:: @ 85AB750 + .incbin "baserom.gba", 0x5ab750, 0xb38 + +gUnknown_085AC288:: @ 85AC288 + .incbin "baserom.gba", 0x5ac288, 0xfb8 + +gUnknown_085AD240:: @ 85AD240 + .incbin "baserom.gba", 0x5ad240, 0x1130 + +gUnknown_085AE370:: @ 85AE370 + .incbin "baserom.gba", 0x5ae370, 0x604 + +gUnknown_085AE974:: @ 85AE974 + .incbin "baserom.gba", 0x5ae974, 0x50c + +gUnknown_085AEE80:: @ 85AEE80 + .incbin "baserom.gba", 0x5aee80, 0x50c + +gUnknown_085AF38C:: @ 85AF38C + .incbin "baserom.gba", 0x5af38c, 0x50c + +gUnknown_085AF898:: @ 85AF898 + .incbin "baserom.gba", 0x5af898, 0x50c + +gUnknown_085AFDA4:: @ 85AFDA4 + .incbin "baserom.gba", 0x5afda4, 0x50c + +gUnknown_085B02B0:: @ 85B02B0 + .incbin "baserom.gba", 0x5b02b0, 0x524 + +gUnknown_085B07D4:: @ 85B07D4 + .incbin "baserom.gba", 0x5b07d4, 0x14 + +gUnknown_085B07E8:: @ 85B07E8 + .incbin "baserom.gba", 0x5b07e8, 0x4 + +gUnknown_085B07EC:: @ 85B07EC + .incbin "baserom.gba", 0x5b07ec, 0x8 + +gUnknown_085B07F4:: @ 85B07F4 + .incbin "baserom.gba", 0x5b07f4, 0x3c + +gUnknown_085B0830:: @ 85B0830 + .incbin "baserom.gba", 0x5b0830, 0x8 + +gUnknown_085B0838:: @ 85B0838 + .incbin "baserom.gba", 0x5b0838, 0x4 + + @ todo, label functions from battle_ai.c +sBattleAICmdTable:: @ 85B083C + .4byte 0x08131179 + .4byte 0x081311b9 + .4byte 0x081311f9 + .4byte 0x08131239 + .4byte 0x08131279 + .4byte 0x081312bd + .4byte 0x08131325 + .4byte 0x0813138d + .4byte 0x081313f5 + .4byte 0x0813145d + .4byte 0x081314d1 + .4byte 0x08131545 + .4byte 0x081315b9 + .4byte 0x0813162d + .4byte 0x0813169d + .4byte 0x0813170d + .4byte 0x08131789 + .4byte 0x08131805 + .4byte 0x08131841 + .4byte 0x0813187d + .4byte 0x081318b9 + .4byte 0x081318f5 + .4byte 0x08131949 + .4byte 0x0813199d + .4byte 0x081319f1 + .4byte 0x08131a45 + .4byte 0x08131a89 + .4byte 0x08131acd + .4byte 0x08131b35 + .4byte 0x08131ba1 + .4byte 0x08131c0d + .4byte 0x08131c7d + .4byte 0x08131ced + .4byte 0x08131d5d + .4byte 0x08131d81 + .4byte 0x08131f1d + .4byte 0x08131f49 + .4byte 0x0813214d + .4byte 0x081321a5 + .4byte 0x081321e1 + .4byte 0x0813221d + .4byte 0x08132269 + .4byte 0x081322b5 + .4byte 0x081322b9 + .4byte 0x081322bd + .4byte 0x081323b9 + .4byte 0x081323d5 + .4byte 0x08132401 + .4byte 0x08132615 + .4byte 0x08132701 + .4byte 0x081327d1 + .4byte 0x081327d5 + .4byte 0x081327d9 + .4byte 0x081328b9 + .4byte 0x08132995 + .4byte 0x08132a01 + .4byte 0x08132a4d + .4byte 0x08132a99 + .4byte 0x08132b01 + .4byte 0x08132b69 + .4byte 0x08132bd1 + .4byte 0x08132c39 + .4byte 0x08132d35 + .4byte 0x08132e19 + .4byte 0x08132f49 + .4byte 0x08133021 + .4byte 0x08133119 + .4byte 0x081331fd + .4byte 0x08133285 + .4byte 0x08133315 + .4byte 0x08133329 + .4byte 0x08133389 + .4byte 0x0813339d + .4byte 0x08133495 + .4byte 0x081334ed + .4byte 0x08133539 + .4byte 0x08133585 + .4byte 0x081335ad + .4byte 0x081335f9 + .4byte 0x08133625 + .4byte 0x08133651 + .4byte 0x0813367d + .4byte 0x081336c9 + .4byte 0x081336cd + .4byte 0x081336d1 + .4byte 0x081336d5 + .4byte 0x081336d9 + .4byte 0x081336dd + .4byte 0x081336e1 + .4byte 0x08133711 + .4byte 0x08133731 + .4byte 0x08133755 + .4byte 0x0813382d + .4byte 0x0813387d + .4byte 0x081338cd + .4byte 0x08131eb5 + .4byte 0x0813251d + .4byte 0x0813391d + .4byte 0x08133415 + +gUnknown_085B09C8:: @ 85B09C8 + .incbin "baserom.gba", 0x5b09c8, 0x1c + +gUnknown_085B09E4:: @ 85B09E4 + .incbin "baserom.gba", 0x5b09e4, 0x10 + +gUnknown_085B09F4:: @ 85B09F4 + .incbin "baserom.gba", 0x5b09f4, 0x4 + +gUnknown_085B09F8:: @ 85B09F8 + .incbin "baserom.gba", 0x5b09f8, 0x8 + +gUnknown_085B0A00:: @ 85B0A00 + .incbin "baserom.gba", 0x5b0a00, 0x2 + +gUnknown_085B0A02:: @ 85B0A02 + .incbin "baserom.gba", 0x5b0a02, 0x7e + +gUnknown_085B0A80:: @ 85B0A80 + .incbin "baserom.gba", 0x5b0a80, 0x18c + +gUnknown_085B0C0C:: @ 85B0C0C + .incbin "baserom.gba", 0x5b0c0c, 0x1f8 + +gUnknown_085B0E04:: @ 85B0E04 + .incbin "baserom.gba", 0x5b0e04, 0xfc8 + +gUnknown_085B1DCC:: @ 85B1DCC + .incbin "baserom.gba", 0x5b1dcc, 0x10 + +gUnknown_085B1DDC:: @ 85B1DDC + .incbin "baserom.gba", 0x5b1ddc, 0x8 + +gUnknown_085B1DE4:: @ 85B1DE4 + .incbin "baserom.gba", 0x5b1de4, 0x8 + +gUnknown_085B1DEC:: @ 85B1DEC + .incbin "baserom.gba", 0x5b1dec, 0x6 + +gUnknown_085B1DF2:: @ 85B1DF2 + .incbin "baserom.gba", 0x5b1df2, 0x6 + +gUnknown_085B1DF8:: @ 85B1DF8 + .incbin "baserom.gba", 0x5b1df8, 0x8 + +gUnknown_085B1E00:: @ 85B1E00 + .incbin "baserom.gba", 0x5b1e00, 0xc + +gUnknown_085B1E0C:: @ 85B1E0C + .incbin "baserom.gba", 0x5b1e0c, 0x1c + +gUnknown_085B1E28:: @ 85B1E28 + .incbin "baserom.gba", 0x5b1e28, 0xa8 + +gUnknown_085B1ED0:: @ 85B1ED0 + .incbin "baserom.gba", 0x5b1ed0, 0x8 + +gUnknown_085B1ED8:: @ 85B1ED8 + .incbin "baserom.gba", 0x5b1ed8, 0x10 + +gUnknown_085B1EE8:: @ 85B1EE8 + .incbin "baserom.gba", 0x5b1ee8, 0x10 + +gUnknown_085B1EF8:: @ 85B1EF8 + .incbin "baserom.gba", 0x5b1ef8, 0x18 + +gUnknown_085B1F10:: @ 85B1F10 + .incbin "baserom.gba", 0x5b1f10, 0x18 + +gUnknown_085B1F28:: @ 85B1F28 + .incbin "baserom.gba", 0x5b1f28, 0x18 + +gUnknown_085B1F40:: @ 85B1F40 + .incbin "baserom.gba", 0x5b1f40, 0x294 + +gUnknown_085B21D4:: @ 85B21D4 + .incbin "baserom.gba", 0x5b21d4, 0x8 + +gUnknown_085B21DC:: @ 85B21DC + .incbin "baserom.gba", 0x5b21dc, 0x18 + +gUnknown_085B21F4:: @ 85B21F4 + .incbin "baserom.gba", 0x5b21f4, 0x8 + +gUnknown_085B21FC:: @ 85B21FC + .incbin "baserom.gba", 0x5b21fc, 0xc + +gUnknown_085B2208:: @ 85B2208 + .incbin "baserom.gba", 0x5b2208, 0x10 + +gUnknown_085B2218:: @ 85B2218 + .incbin "baserom.gba", 0x5b2218, 0x38 + +gUnknown_085B2250:: @ 85B2250 + .incbin "baserom.gba", 0x5b2250, 0x18 + +gUnknown_085B2268:: @ 85B2268 + .incbin "baserom.gba", 0x5b2268, 0x38 + +gUnknown_085B22A0:: @ 85B22A0 + .incbin "baserom.gba", 0x5b22a0, 0x18 + +gUnknown_085B22B8:: @ 85B22B8 + .incbin "baserom.gba", 0x5b22b8, 0x18 + +gUnknown_085B22D0:: @ 85B22D0 + .incbin "baserom.gba", 0x5b22d0, 0x2d0 + +gUnknown_085B25A0:: @ 85B25A0 + .incbin "baserom.gba", 0x5b25a0, 0x80 + +gUnknown_085B2620:: @ 85B2620 + .incbin "baserom.gba", 0x5b2620, 0xc + +gUnknown_085B262C:: @ 85B262C + .incbin "baserom.gba", 0x5b262c, 0x3c + +gUnknown_085B2668:: @ 85B2668 + .incbin "baserom.gba", 0x5b2668, 0x30 + +gUnknown_085B2698:: @ 85B2698 + .incbin "baserom.gba", 0x5b2698, 0x3 + +gUnknown_085B269B:: @ 85B269B + .incbin "baserom.gba", 0x5b269b, 0x2 + +gUnknown_085B269D:: @ 85B269D + .incbin "baserom.gba", 0x5b269d, 0x2 + +gUnknown_085B269F:: @ 85B269F + .incbin "baserom.gba", 0x5b269f, 0x5 + +gUnknown_085B26A4:: @ 85B26A4 + .incbin "baserom.gba", 0x5b26a4, 0x4c + +gUnknown_085B26F0:: @ 85B26F0 + .incbin "baserom.gba", 0x5b26f0, 0x4 + +gUnknown_085B26F4:: @ 85B26F4 + .incbin "baserom.gba", 0x5b26f4, 0x8 + +gUnknown_085B26FC:: @ 85B26FC + .incbin "baserom.gba", 0x5b26fc, 0x8 + +gUnknown_085B2704:: @ 85B2704 + .incbin "baserom.gba", 0x5b2704, 0x18 + +gUnknown_085B271C:: @ 85B271C + .incbin "baserom.gba", 0x5b271c, 0x4 + +gUnknown_085B2720:: @ 85B2720 + .incbin "baserom.gba", 0x5b2720, 0x28 + +gUnknown_085B2748:: @ 85B2748 + .incbin "baserom.gba", 0x5b2748, 0x60 + +gUnknown_085B27A8:: @ 85B27A8 + .incbin "baserom.gba", 0x5b27a8, 0x8 + +gUnknown_085B27B0:: @ 85B27B0 + .incbin "baserom.gba", 0x5b27b0, 0x18 + +gUnknown_085B27C8:: @ 85B27C8 + .incbin "baserom.gba", 0x5b27c8, 0x88 + +gUnknown_085B2850:: @ 85B2850 + .incbin "baserom.gba", 0x5b2850, 0x20 + +gUnknown_085B2870:: @ 85B2870 + .incbin "baserom.gba", 0x5b2870, 0x20 + +gUnknown_085B2890:: @ 85B2890 + .incbin "baserom.gba", 0x5b2890, 0x10 + +gUnknown_085B28A0:: @ 85B28A0 + .incbin "baserom.gba", 0x5b28a0, 0x10 + +gUnknown_085B28B0:: @ 85B28B0 + .incbin "baserom.gba", 0x5b28b0, 0x1e0 + +gUnknown_085B2A90:: @ 85B2A90 + .incbin "baserom.gba", 0x5b2a90, 0xb4 + +gUnknown_085B2B44:: @ 85B2B44 + .incbin "baserom.gba", 0x5b2b44, 0x18 + +gUnknown_085B2B5C:: @ 85B2B5C + .incbin "baserom.gba", 0x5b2b5c, 0x4 + +gUnknown_085B2B60:: @ 85B2B60 + .incbin "baserom.gba", 0x5b2b60, 0x8 + +gUnknown_085B2B68:: @ 85B2B68 + .incbin "baserom.gba", 0x5b2b68, 0x10 + +gUnknown_085B2B78:: @ 85B2B78 + .incbin "baserom.gba", 0x5b2b78, 0x6 + +gUnknown_085B2B7E:: @ 85B2B7E + .incbin "baserom.gba", 0x5b2b7e, 0xa + +gUnknown_085B2B88:: @ 85B2B88 + .incbin "baserom.gba", 0x5b2b88, 0xc + +gUnknown_085B2B94:: @ 85B2B94 + .incbin "baserom.gba", 0x5b2b94, 0xc + +gUnknown_085B2BA0:: @ 85B2BA0 + .incbin "baserom.gba", 0x5b2ba0, 0xc + +gUnknown_085B2BAC:: @ 85B2BAC + .incbin "baserom.gba", 0x5b2bac, 0x8 + +gUnknown_085B2BB4:: @ 85B2BB4 + .incbin "baserom.gba", 0x5b2bb4, 0x40 + +gUnknown_085B2BF4:: @ 85B2BF4 + .incbin "baserom.gba", 0x5b2bf4, 0x12 + +gUnknown_085B2C06:: @ 85B2C06 + .incbin "baserom.gba", 0x5b2c06, 0x12 + +gUnknown_085B2C18:: @ 85B2C18 + .incbin "baserom.gba", 0x5b2c18, 0x9 + +gUnknown_085B2C21:: @ 85B2C21 + .incbin "baserom.gba", 0x5b2c21, 0x9 + +gUnknown_085B2C2A:: @ 85B2C2A + .incbin "baserom.gba", 0x5b2c2a, 0x26 + +gUnknown_085B2C50:: @ 85B2C50 + .incbin "baserom.gba", 0x5b2c50, 0x78 + +gUnknown_085B2CC8:: @ 85B2CC8 + .incbin "baserom.gba", 0x5b2cc8, 0x14 + +gUnknown_085B2CDC:: @ 85B2CDC + .incbin "baserom.gba", 0x5b2cdc, 0x14 + +gUnknown_085B2CF0:: @ 85B2CF0 + .incbin "baserom.gba", 0x5b2cf0, 0x340 + +gUnknown_085B3030:: @ 85B3030 + .incbin "baserom.gba", 0x5b3030, 0x10 + +gUnknown_085B3040:: @ 85B3040 + .incbin "baserom.gba", 0x5b3040, 0x64 + +gUnknown_085B30A4:: @ 85B30A4 + .incbin "baserom.gba", 0x5b30a4, 0x30 + +gUnknown_085B30D4:: @ 85B30D4 + .incbin "baserom.gba", 0x5b30d4, 0x30 + +gUnknown_085B3104:: @ 85B3104 + .incbin "baserom.gba", 0x5b3104, 0x18 + +gUnknown_085B311C:: @ 85B311C + .incbin "baserom.gba", 0x5b311c, 0x8 + +gUnknown_085B3124:: @ 85B3124 + .incbin "baserom.gba", 0x5b3124, 0x8 + +gUnknown_085B312C:: @ 85B312C + .incbin "baserom.gba", 0x5b312c, 0x16 + +gUnknown_085B3142:: @ 85B3142 + .incbin "baserom.gba", 0x5b3142, 0xc + +gUnknown_085B314E:: @ 85B314E + .incbin "baserom.gba", 0x5b314e, 0xe + +gUnknown_085B315C:: @ 85B315C + .incbin "baserom.gba", 0x5b315c, 0x14 + +gUnknown_085B3170:: @ 85B3170 + .incbin "baserom.gba", 0x5b3170, 0x2c + +gUnknown_085B319C:: @ 85B319C + .incbin "baserom.gba", 0x5b319c, 0x18 + +gUnknown_085B31B4:: @ 85B31B4 + .incbin "baserom.gba", 0x5b31b4, 0x1c + +gUnknown_085B31D0:: @ 85B31D0 + .incbin "baserom.gba", 0x5b31d0, 0x28 + +gUnknown_085B31F8:: @ 85B31F8 + .incbin "baserom.gba", 0x5b31f8, 0x14 + +gUnknown_085B320C:: @ 85B320C + .incbin "baserom.gba", 0x5b320c, 0x14 + +gUnknown_085B3220:: @ 85B3220 + .incbin "baserom.gba", 0x5b3220, 0x8 + +gUnknown_085B3228:: @ 85B3228 + .incbin "baserom.gba", 0x5b3228, 0x2c + +gUnknown_085B3254:: @ 85B3254 + .incbin "baserom.gba", 0x5b3254, 0x2c + +gUnknown_085B3280:: @ 85B3280 + .incbin "baserom.gba", 0x5b3280, 0x160 + +gUnknown_085B33E0:: @ 85B33E0 + .incbin "baserom.gba", 0x5b33e0, 0x16 + +gUnknown_085B33F6:: @ 85B33F6 + .incbin "baserom.gba", 0x5b33f6, 0xa + +gUnknown_085B3400:: @ 85B3400 + .incbin "baserom.gba", 0x5b3400, 0x10 + +gUnknown_085B3410:: @ 85B3410 + .incbin "baserom.gba", 0x5b3410, 0x10 + +gUnknown_085B3420:: @ 85B3420 + .incbin "baserom.gba", 0x5b3420, 0x24 + +gUnknown_085B3444:: @ 85B3444 + .incbin "baserom.gba", 0x5b3444, 0x2c + +gUnknown_085B3470:: @ 85B3470 + .incbin "baserom.gba", 0x5b3470, 0x4 + +gUnknown_085B3474:: @ 85B3474 + .incbin "baserom.gba", 0x5b3474, 0x8 + +gUnknown_085B347C:: @ 85B347C + .incbin "baserom.gba", 0x5b347c, 0x8 + +gUnknown_085B3484:: @ 85B3484 + .incbin "baserom.gba", 0x5b3484, 0xc0 + +gUnknown_085B3544:: @ 85B3544 + .incbin "baserom.gba", 0x5b3544, 0x20 + +gUnknown_085B3564:: @ 85B3564 + .incbin "baserom.gba", 0x5b3564, 0x800 + +gUnknown_085B3D64:: @ 85B3D64 + .incbin "baserom.gba", 0x5b3d64, 0x8 + +gUnknown_085B3D6C:: @ 85B3D6C + .incbin "baserom.gba", 0x5b3d6c, 0x10 + +gUnknown_085B3D7C:: @ 85B3D7C + .incbin "baserom.gba", 0x5b3d7c, 0x8 + +gUnknown_085B3D84:: @ 85B3D84 + .incbin "baserom.gba", 0x5b3d84, 0x8 + +gUnknown_085B3D8C:: @ 85B3D8C + .incbin "baserom.gba", 0x5b3d8c, 0x8 + +gUnknown_085B3D94:: @ 85B3D94 + .incbin "baserom.gba", 0x5b3d94, 0x20 + +gUnknown_085B3DB4:: @ 85B3DB4 + .incbin "baserom.gba", 0x5b3db4, 0x134 + +gUnknown_085B3EE8:: @ 85B3EE8 + .incbin "baserom.gba", 0x5b3ee8, 0x2 + +gUnknown_085B3EEA:: @ 85B3EEA + .incbin "baserom.gba", 0x5b3eea, 0x6 + +gUnknown_085B3EF0:: @ 85B3EF0 + .incbin "baserom.gba", 0x5b3ef0, 0xc + +gUnknown_085B3EFC:: @ 85B3EFC + .incbin "baserom.gba", 0x5b3efc, 0x1c + +gUnknown_085B3F18:: @ 85B3F18 + .incbin "baserom.gba", 0x5b3f18, 0x100 + +gUnknown_085B4018:: @ 85B4018 + .incbin "baserom.gba", 0x5b4018, 0x4 + +gUnknown_085B401C:: @ 85B401C + .incbin "baserom.gba", 0x5b401c, 0x8 + +gUnknown_085B4024:: @ 85B4024 + .incbin "baserom.gba", 0x5b4024, 0x10 + +gUnknown_085B4034:: @ 85B4034 + .incbin "baserom.gba", 0x5b4034, 0xb8 + +gUnknown_085B40EC:: @ 85B40EC + .incbin "baserom.gba", 0x5b40ec, 0x10 + +gUnknown_085B40FC:: @ 85B40FC + .incbin "baserom.gba", 0x5b40fc, 0x38 + +gUnknown_085B4134:: @ 85B4134 + .incbin "baserom.gba", 0x5b4134, 0x6f8 + +gUnknown_085B482C:: @ 85B482C + .incbin "baserom.gba", 0x5b482c, 0x4e4 + +gUnknown_085B4D10:: @ 85B4D10 + .incbin "baserom.gba", 0x5b4d10, 0x4d4 + +gUnknown_085B51E4:: @ 85B51E4 + .incbin "baserom.gba", 0x5b51e4, 0x6a0 + +gUnknown_085B5884:: @ 85B5884 + .incbin "baserom.gba", 0x5b5884, 0x40 + +gUnknown_085B58C4:: @ 85B58C4 + .incbin "baserom.gba", 0x5b58c4, 0x5 + +gUnknown_085B58C9:: @ 85B58C9 + .incbin "baserom.gba", 0x5b58c9, 0x10 + +gUnknown_085B58D9:: @ 85B58D9 + .incbin "baserom.gba", 0x5b58d9, 0x323 + +gUnknown_085B5BFC:: @ 85B5BFC + .incbin "baserom.gba", 0x5b5bfc, 0x200 + +gUnknown_085B5DFC:: @ 85B5DFC + .incbin "baserom.gba", 0x5b5dfc, 0x1a4 + +gUnknown_085B5FA0:: @ 85B5FA0 + .incbin "baserom.gba", 0x5b5fa0, 0x1a0 + +gUnknown_085B6140:: @ 85B6140 + .incbin "baserom.gba", 0x5b6140, 0xc + +gUnknown_085B614C:: @ 85B614C + .incbin "baserom.gba", 0x5b614c, 0x8 + +gUnknown_085B6154:: @ 85B6154 + .incbin "baserom.gba", 0x5b6154, 0xc + +gUnknown_085B6160:: @ 85B6160 + .incbin "baserom.gba", 0x5b6160, 0x184 + +gUnknown_085B62E4:: @ 85B62E4 + .incbin "baserom.gba", 0x5b62e4, 0x4 + +gUnknown_085B62E8:: @ 85B62E8 + .incbin "baserom.gba", 0x5b62e8, 0x5c + +gUnknown_085B6344:: @ 85B6344 + .incbin "baserom.gba", 0x5b6344, 0x4 + +gUnknown_085B6348:: @ 85B6348 + .incbin "baserom.gba", 0x5b6348, 0x40 + +gUnknown_085B6388:: @ 85B6388 + .incbin "baserom.gba", 0x5b6388, 0x68 + +gUnknown_085B63F0:: @ 85B63F0 + .incbin "baserom.gba", 0x5b63f0, 0x18 + +gUnknown_085B6408:: @ 85B6408 + .incbin "baserom.gba", 0x5b6408, 0x8 + +gUnknown_085B6410:: @ 85B6410 + .incbin "baserom.gba", 0x5b6410, 0x8 + +gUnknown_085B6418:: @ 85B6418 + .incbin "baserom.gba", 0x5b6418, 0x6 + +gUnknown_085B641E:: @ 85B641E + .incbin "baserom.gba", 0x5b641e, 0x4 + +gUnknown_085B6422:: @ 85B6422 + .incbin "baserom.gba", 0x5b6422, 0xa + +gUnknown_085B642C:: @ 85B642C + .incbin "baserom.gba", 0x5b642c, 0x10 + +gUnknown_085B643C:: @ 85B643C + .incbin "baserom.gba", 0x5b643c, 0xc + +gUnknown_085B6448:: @ 85B6448 + .incbin "baserom.gba", 0x5b6448, 0xf3c + +gUnknown_085B7384:: @ 85B7384 + .incbin "baserom.gba", 0x5b7384, 0x98 + +gUnknown_085B741C:: @ 85B741C + .incbin "baserom.gba", 0x5b741c, 0x6c + +gUnknown_085B7488:: @ 85B7488 + .incbin "baserom.gba", 0x5b7488, 0x8 + +gUnknown_085B7490:: @ 85B7490 + .incbin "baserom.gba", 0x5b7490, 0x78 + +gUnknown_085B7508:: @ 85B7508 + .incbin "baserom.gba", 0x5b7508, 0x60 + +gUnknown_085B7568:: @ 85B7568 + .incbin "baserom.gba", 0x5b7568, 0x48 + +gUnknown_085B75B0:: @ 85B75B0 + .incbin "baserom.gba", 0x5b75b0, 0x60 + +gUnknown_085B7610:: @ 85B7610 + .incbin "baserom.gba", 0x5b7610, 0x140 + +gUnknown_085B7750:: @ 85B7750 + .incbin "baserom.gba", 0x5b7750, 0x94 + +gUnknown_085B77E4:: @ 85B77E4 + .incbin "baserom.gba", 0x5b77e4, 0x18 + +gUnknown_085B77FC:: @ 85B77FC + .incbin "baserom.gba", 0x5b77fc, 0x18 + +gUnknown_085B7814:: @ 85B7814 + .incbin "baserom.gba", 0x5b7814, 0x18 + +gUnknown_085B782C:: @ 85B782C + .incbin "baserom.gba", 0x5b782c, 0x18 + +gUnknown_085B7844:: @ 85B7844 + .incbin "baserom.gba", 0x5b7844, 0x20 + +gUnknown_085B7864:: @ 85B7864 + .incbin "baserom.gba", 0x5b7864, 0xc4 + +gUnknown_085B7928:: @ 85B7928 + .incbin "baserom.gba", 0x5b7928, 0x20 + +gUnknown_085B7948:: @ 85B7948 + .incbin "baserom.gba", 0x5b7948, 0x8 + +gUnknown_085B7950:: @ 85B7950 + .incbin "baserom.gba", 0x5b7950, 0x28 + +gUnknown_085B7978:: @ 85B7978 + .incbin "baserom.gba", 0x5b7978, 0x80 + +gUnknown_085B79F8:: @ 85B79F8 + .incbin "baserom.gba", 0x5b79f8, 0x18 + +gUnknown_085B7A10:: @ 85B7A10 + .incbin "baserom.gba", 0x5b7a10, 0x30 + +gUnknown_085B7A40:: @ 85B7A40 + .incbin "baserom.gba", 0x5b7a40, 0x7c + +gUnknown_085B7ABC:: @ 85B7ABC + .incbin "baserom.gba", 0x5b7abc, 0x30 + +gUnknown_085B7AEC:: @ 85B7AEC + .incbin "baserom.gba", 0x5b7aec, 0x18 + +gUnknown_085B7B04:: @ 85B7B04 + .incbin "baserom.gba", 0x5b7b04, 0x6 + +gUnknown_085B7B0A:: @ 85B7B0A + .incbin "baserom.gba", 0x5b7b0a, 0x8 + +gUnknown_085B7B12:: @ 85B7B12 + .incbin "baserom.gba", 0x5b7b12, 0x8 + +gUnknown_085B7B1A:: @ 85B7B1A + .incbin "baserom.gba", 0x5b7b1a, 0x14 + +gUnknown_085B7B2E:: @ 85B7B2E + .incbin "baserom.gba", 0x5b7b2e, 0x18 + +gUnknown_085B7B46:: @ 85B7B46 + .incbin "baserom.gba", 0x5b7b46, 0x2 + +gUnknown_085B7B48:: @ 85B7B48 + .incbin "baserom.gba", 0x5b7b48, 0x8d0 + +gUnknown_085B8418:: @ 85B8418 + .incbin "baserom.gba", 0x5b8418, 0x20 + +gUnknown_085B8438:: @ 85B8438 + .incbin "baserom.gba", 0x5b8438, 0x338 + +gUnknown_085B8770:: @ 85B8770 + .incbin "baserom.gba", 0x5b8770, 0x480 + +gUnknown_085B8BF0:: @ 85B8BF0 + .incbin "baserom.gba", 0x5b8bf0, 0x20 + +gUnknown_085B8C10:: @ 85B8C10 + .incbin "baserom.gba", 0x5b8c10, 0x20 + +gUnknown_085B8C30:: @ 85B8C30 + .incbin "baserom.gba", 0x5b8c30, 0x2 + +gUnknown_085B8C32:: @ 85B8C32 + .incbin "baserom.gba", 0x5b8c32, 0x36 + +gUnknown_085B8C68:: @ 85B8C68 + .incbin "baserom.gba", 0x5b8c68, 0x18 + +gUnknown_085B8C80:: @ 85B8C80 + .incbin "baserom.gba", 0x5b8c80, 0x10 + +gUnknown_085B8C90:: @ 85B8C90 + .incbin "baserom.gba", 0x5b8c90, 0x528 + +gUnknown_085B91B8:: @ 85B91B8 + .incbin "baserom.gba", 0x5b91b8, 0x178 + +gUnknown_085B9330:: @ 85B9330 + .incbin "baserom.gba", 0x5b9330, 0x580 + +gUnknown_085B98B0:: @ 85B98B0 + .incbin "baserom.gba", 0x5b98b0, 0x240 + +gUnknown_085B9AF0:: @ 85B9AF0 + .incbin "baserom.gba", 0x5b9af0, 0x11e0 + +gUnknown_085BACD0:: @ 85BACD0 + .incbin "baserom.gba", 0x5bacd0, 0x1e0 + +gUnknown_085BAEB0:: @ 85BAEB0 + .incbin "baserom.gba", 0x5baeb0, 0x20 + +gUnknown_085BAED0:: @ 85BAED0 + .incbin "baserom.gba", 0x5baed0, 0x378 + +gUnknown_085BB248:: @ 85BB248 + .incbin "baserom.gba", 0x5bb248, 0x25c + +gUnknown_085BB4A4:: @ 85BB4A4 + .incbin "baserom.gba", 0x5bb4a4, 0x48c + +gUnknown_085BB930:: @ 85BB930 + .incbin "baserom.gba", 0x5bb930, 0x2e4 + +gUnknown_085BBC14:: @ 85BBC14 + .incbin "baserom.gba", 0x5bbc14, 0x6a0 + +gUnknown_085BC2B4:: @ 85BC2B4 + .incbin "baserom.gba", 0x5bc2b4, 0x20 + +gUnknown_085BC2D4:: @ 85BC2D4 + .incbin "baserom.gba", 0x5bc2d4, 0x20 + +gUnknown_085BC2F4:: @ 85BC2F4 + .incbin "baserom.gba", 0x5bc2f4, 0x20 + +gUnknown_085BC314:: @ 85BC314 + .incbin "baserom.gba", 0x5bc314, 0x800 + +gUnknown_085BCB14:: @ 85BCB14 + .incbin "baserom.gba", 0x5bcb14, 0x800 + +gUnknown_085BD314:: @ 85BD314 + .incbin "baserom.gba", 0x5bd314, 0x820 + +gUnknown_085BDB34:: @ 85BDB34 + .incbin "baserom.gba", 0x5bdb34, 0x6b4 + +gUnknown_085BE1E8:: @ 85BE1E8 + .incbin "baserom.gba", 0x5be1e8, 0x334 + +gUnknown_085BE51C:: @ 85BE51C + .incbin "baserom.gba", 0x5be51c, 0x56c + +gUnknown_085BEA88:: @ 85BEA88 + .incbin "baserom.gba", 0x5bea88, 0x318 + +gUnknown_085BEDA0:: @ 85BEDA0 + .incbin "baserom.gba", 0x5beda0, 0x140 + +gUnknown_085BEEE0:: @ 85BEEE0 + .incbin "baserom.gba", 0x5beee0, 0x1c0 + +gUnknown_085BF0A0:: @ 85BF0A0 + .incbin "baserom.gba", 0x5bf0a0, 0x200 + +gUnknown_085BF2A0:: @ 85BF2A0 + .incbin "baserom.gba", 0x5bf2a0, 0x200 + +gUnknown_085BF4A0:: @ 85BF4A0 + .incbin "baserom.gba", 0x5bf4a0, 0xa0 + +gUnknown_085BF540:: @ 85BF540 + .incbin "baserom.gba", 0x5bf540, 0x160 + +gUnknown_085BF6A0:: @ 85BF6A0 + .incbin "baserom.gba", 0x5bf6a0, 0x7540 + +gUnknown_085C6BE0:: @ 85C6BE0 + .incbin "baserom.gba", 0x5c6be0, 0x1000 + +gUnknown_085C7BE0:: @ 85C7BE0 + .incbin "baserom.gba", 0x5c7be0, 0x20 + +gUnknown_085C7C00:: @ 85C7C00 + .incbin "baserom.gba", 0x5c7c00, 0x68c + +gUnknown_085C828C:: @ 85C828C + .incbin "baserom.gba", 0x5c828c, 0x2ec + +gUnknown_085C8578:: @ 85C8578 + .incbin "baserom.gba", 0x5c8578, 0x20 + +gUnknown_085C8598:: @ 85C8598 + .incbin "baserom.gba", 0x5c8598, 0x15c + +gUnknown_085C86F4:: @ 85C86F4 + .incbin "baserom.gba", 0x5c86f4, 0x100 + +gUnknown_085C87F4:: @ 85C87F4 + .incbin "baserom.gba", 0x5c87f4, 0xb0 + +gUnknown_085C88A4:: @ 85C88A4 + .incbin "baserom.gba", 0x5c88a4, 0x84 + +gUnknown_085C8928:: @ 85C8928 + .incbin "baserom.gba", 0x5c8928, 0x20 + +gUnknown_085C8948:: @ 85C8948 + .incbin "baserom.gba", 0x5c8948, 0xa8 + +gUnknown_085C89F0:: @ 85C89F0 + .incbin "baserom.gba", 0x5c89f0, 0xa8 + +gUnknown_085C8A98:: @ 85C8A98 + .incbin "baserom.gba", 0x5c8a98, 0x10 + +gUnknown_085C8AA8:: @ 85C8AA8 + .incbin "baserom.gba", 0x5c8aa8, 0xc + +gUnknown_085C8AB4:: @ 85C8AB4 + .incbin "baserom.gba", 0x5c8ab4, 0x8 + +gUnknown_085C8ABC:: @ 85C8ABC + .incbin "baserom.gba", 0x5c8abc, 0x8 + +gUnknown_085C8AC4:: @ 85C8AC4 + .incbin "baserom.gba", 0x5c8ac4, 0x1c + +gUnknown_085C8AE0:: @ 85C8AE0 + .incbin "baserom.gba", 0x5c8ae0, 0x1c + +gUnknown_085C8AFC:: @ 85C8AFC + .incbin "baserom.gba", 0x5c8afc, 0x18 + +gUnknown_085C8B14:: @ 85C8B14 + .incbin "baserom.gba", 0x5c8b14, 0x18 + +gUnknown_085C8B2C:: @ 85C8B2C + .incbin "baserom.gba", 0x5c8b2c, 0x18 + +gUnknown_085C8B44:: @ 85C8B44 + .incbin "baserom.gba", 0x5c8b44, 0x18 + +gUnknown_085C8B5C:: @ 85C8B5C + .incbin "baserom.gba", 0x5c8b5c, 0x20 + +gUnknown_085C8B7C:: @ 85C8B7C + .incbin "baserom.gba", 0x5c8b7c, 0xc + +gUnknown_085C8B88:: @ 85C8B88 + .incbin "baserom.gba", 0x5c8b88, 0x4 + +gUnknown_085C8B8C:: @ 85C8B8C + .incbin "baserom.gba", 0x5c8b8c, 0xa + +gUnknown_085C8B96:: @ 85C8B96 + .incbin "baserom.gba", 0x5c8b96, 0x6 + +gUnknown_085C8B9C:: @ 85C8B9C + .incbin "baserom.gba", 0x5c8b9c, 0x1c + +gUnknown_085C8BB8:: @ 85C8BB8 + .incbin "baserom.gba", 0x5c8bb8, 0x8 + +gUnknown_085C8BC0:: @ 85C8BC0 + .incbin "baserom.gba", 0x5c8bc0, 0xc + +gUnknown_085C8BCC:: @ 85C8BCC + .incbin "baserom.gba", 0x5c8bcc, 0x28 + +gUnknown_085C8BF4:: @ 85C8BF4 + .incbin "baserom.gba", 0x5c8bf4, 0x6 + +gUnknown_085C8BFA:: @ 85C8BFA + .incbin "baserom.gba", 0x5c8bfa, 0x14 + +gUnknown_085C8C0E:: @ 85C8C0E + .incbin "baserom.gba", 0x5c8c0e, 0x16 + +gUnknown_085C8C24:: @ 85C8C24 + .incbin "baserom.gba", 0x5c8c24, 0x1c + +gUnknown_085C8C40:: @ 85C8C40 + .incbin "baserom.gba", 0x5c8c40, 0x4 + +gUnknown_085C8C44:: @ 85C8C44 + .incbin "baserom.gba", 0x5c8c44, 0x4 + +gUnknown_085C8C48:: @ 85C8C48 + .incbin "baserom.gba", 0x5c8c48, 0xc + +gUnknown_085C8C54:: @ 85C8C54 + .incbin "baserom.gba", 0x5c8c54, 0x10 + +gUnknown_085C8C64:: @ 85C8C64 + .incbin "baserom.gba", 0x5c8c64, 0x2 + +gUnknown_085C8C66:: @ 85C8C66 + .incbin "baserom.gba", 0x5c8c66, 0x6 + +gUnknown_085C8C6C:: @ 85C8C6C + .incbin "baserom.gba", 0x5c8c6c, 0xc + +gUnknown_085C8C78:: @ 85C8C78 + .incbin "baserom.gba", 0x5c8c78, 0x8 + +gUnknown_085C8C80:: @ 85C8C80 + .incbin "baserom.gba", 0x5c8c80, 0x4 + +gUnknown_085C8C84:: @ 85C8C84 + .incbin "baserom.gba", 0x5c8c84, 0xb4 + +gUnknown_085C8D38:: @ 85C8D38 + .incbin "baserom.gba", 0x5c8d38, 0x8 + +gUnknown_085C8D40:: @ 85C8D40 + .incbin "baserom.gba", 0x5c8d40, 0x20 + +gUnknown_085C8D60:: @ 85C8D60 + .incbin "baserom.gba", 0x5c8d60, 0x2c + +gUnknown_085C8D8C:: @ 85C8D8C + .incbin "baserom.gba", 0x5c8d8c, 0x14 + +gUnknown_085C8DA0:: @ 85C8DA0 + .incbin "baserom.gba", 0x5c8da0, 0x10 + +gUnknown_085C8DB0:: @ 85C8DB0 + .incbin "baserom.gba", 0x5c8db0, 0xc + +gUnknown_085C8DBC:: @ 85C8DBC + .incbin "baserom.gba", 0x5c8dbc, 0x14 + +gUnknown_085C8DD0:: @ 85C8DD0 + .incbin "baserom.gba", 0x5c8dd0, 0x46 + +gUnknown_085C8E16:: @ 85C8E16 + .incbin "baserom.gba", 0x5c8e16, 0xe + +gUnknown_085C8E24:: @ 85C8E24 + .incbin "baserom.gba", 0x5c8e24, 0x44 + +gUnknown_085C8E68:: @ 85C8E68 + .incbin "baserom.gba", 0x5c8e68, 0x6c + + .align 2 +gFieldEffectObjectPalette10:: @ 85C8ED4 + .incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal" + + .align 2 +gFieldEffectObjectPaletteInfo10:: @ 85C8EF4 + obj_pal gFieldEffectObjectPalette10, 0x1009 + + .incbin "baserom.gba", 0x5c8efc, 0xe0 + +gUnknown_085C8FDC:: @ 85C8FDC + .incbin "baserom.gba", 0x5c8fdc, 0x14 + +gUnknown_085C8FF0:: @ 85C8FF0 + .incbin "baserom.gba", 0x5c8ff0, 0x30 + +gUnknown_085C9020:: @ 85C9020 + .incbin "baserom.gba", 0x5c9020, 0x4b0 + +gUnknown_085C94D0:: @ 85C94D0 + .incbin "baserom.gba", 0x5c94d0, 0x500 + +gUnknown_085C99D0:: @ 85C99D0 + .incbin "baserom.gba", 0x5c99d0, 0x18 + +gUnknown_085C99E8:: @ 85C99E8 + .incbin "baserom.gba", 0x5c99e8, 0x10 + +gUnknown_085C99F8:: @ 85C99F8 + .incbin "baserom.gba", 0x5c99f8, 0x10 + +gUnknown_085C9A08:: @ 85C9A08 + .incbin "baserom.gba", 0x5c9a08, 0x14 + +gUnknown_085C9A1C:: @ 85C9A1C + .incbin "baserom.gba", 0x5c9a1c, 0x14 + +gUnknown_085C9A30:: @ 85C9A30 + .incbin "baserom.gba", 0x5c9a30, 0x23 + +gUnknown_085C9A53:: @ 85C9A53 + .incbin "baserom.gba", 0x5c9a53, 0x41 + +gUnknown_085C9A94:: @ 85C9A94 + .incbin "baserom.gba", 0x5c9a94, 0xe4 diff --git a/include/play_time.h b/include/play_time.h new file mode 100644 index 000000000..49091f4b1 --- /dev/null +++ b/include/play_time.h @@ -0,0 +1,10 @@ +#ifndef GUARD_PLAY_TIME_H +#define GUARD_PLAY_TIME_H + +void PlayTimeCounter_Reset(void); +void PlayTimeCounter_Start(void); +void PlayTimeCounter_Stop(void); +void PlayTimeCounter_Update(void); +void PlayTimeCounter_SetToMax(void); + +#endif // GUARD_PLAY_TIME_H diff --git a/include/trig.h b/include/trig.h new file mode 100644 index 000000000..a2f98a3e6 --- /dev/null +++ b/include/trig.h @@ -0,0 +1,11 @@ +#ifndef GUARD_TRIG_H +#define GUARD_TRIG_H + +extern const s16 gSineTable[]; + +s16 Sin(s16 index, s16 amplitude); +s16 Cos(s16 index, s16 amplitude); +s16 Sin2(u16 angle); +s16 Cos2(u16 angle); + +#endif // GUARD_TRIG_H diff --git a/ld_script.txt b/ld_script.txt index 6d1f167a1..17bb67db2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -64,7 +64,7 @@ SECTIONS { asm/calculate_base_damage.o(.text); asm/pokemon_2.o(.text); asm/pokemon_3.o(.text); - asm/trig.o(.text); + src/trig.o(.text); src/rng.o(.text); asm/util.o(.text); src/blend_palette.o(.text); @@ -74,7 +74,7 @@ SECTIONS { asm/load_save.o(.text); asm/trade.o(.text); asm/berry_blender.o(.text); - asm/play_time.o(.text); + src/play_time.o(.text); asm/new_game.o(.text); asm/rom4.o(.text); asm/fieldmap.o(.text); @@ -262,6 +262,8 @@ SECTIONS { data/sprite.o(.rodata); src/string_util.o(.rodata); data/data2.o(.rodata); + src/trig.o(.rodata); + data/data3.o(.rodata); data/battle_message.o(.rodata); data/cable_car.o(.rodata); data/save.o(.rodata); diff --git a/src/battle_ai.c b/src/battle_ai.c index 37960f401..7c4b7604d 100644 --- a/src/battle_ai.c +++ b/src/battle_ai.c @@ -9,10 +9,10 @@ #define AIScriptRead8(ptr) ((ptr)[0]) #define AIScriptReadPtr(ptr) (u8*) AIScriptRead32(ptr) -#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gUnknown_020244A8->ai)) -#define UNK_2016A00_STRUCT ((struct UnknownStruct2 *)(gUnknown_020244A8->unk18)) -#define UNK_2016C00_STRUCT ((struct UnknownStruct4 *)(gUnknown_020244A8->unk1C)) -#define UNK_BATTLE_STRUCT ((struct UnknownStruct1 *)(gUnknown_020244A8)) +#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gBattleResources->ai)) +#define UNK_2016A00_STRUCT ((struct UnknownStruct2 *)(gBattleResources->unk18)) +#define UNK_2016C00_STRUCT ((struct UnknownStruct4 *)(gBattleResources->unk1C)) +#define UNK_BATTLE_STRUCT ((struct UnknownStruct1 *)(gBattleResources)) #define AI_ACTION_UNK1 0x0001 #define AI_ACTION_UNK2 0x0002 @@ -158,7 +158,7 @@ struct UnknownStruct5 u8 filler17[0x4]; }; -extern struct UnknownStruct5 gUnknown_020242BC[]; +extern struct UnknownStruct5 gDisableStructs[]; /* gAIScriptPtr is a pointer to the next battle AI cmd command to read. @@ -170,38 +170,38 @@ AI scripts. extern u8 *gAIScriptPtr; extern u32 gBattleTypeFlags; -extern u8 gUnknown_02024064; +extern u8 gActiveBank; extern struct BattlePokemon gBattleMons[]; -extern u16 gUnknown_020241EA; -extern u8 gEnemyMonIndex; -extern u8 gUnknown_02024210; +extern u16 gCurrentMove; +extern u8 gBankTarget; +extern u8 gAbsentBankFlags; extern u16 gUnknown_02024248[]; -extern u8 *gUnknown_0202449C; -extern struct UnknownStruct1 *gUnknown_020244A8; +extern u8 *gBattleStruct; +extern struct UnknownStruct1 *gBattleResources; extern u16 gUnknown_02038BCA; extern u16 gUnknown_02038BCC; extern u8 gPlayerMonIndex; extern struct Trainer gTrainers[]; extern const u32 gBitTable[]; extern u8 *gUnknown_082DBEF8[]; -extern u32 gUnknown_020242AC[]; +extern u32 gStatuses3[]; extern u16 gUnknown_0202428E[]; extern struct BattleMove gBattleMoves[]; extern u8 gUnknown_03005D10[]; -extern u8 gUnknown_0202406E[][2]; +extern u8 gBattlePartyID[][2]; extern struct BaseStats gBaseStats[]; extern u16 gUnknown_02024400; -extern u8 gUnknown_02024474[]; +extern u8 gBattleScripting[]; extern u8 gBattleMoveFlags; extern int gBattleMoveDamage; extern u8 gCritMultiplier; extern u16 gBattleWeather; -extern u8 battle_get_per_side_status(u8); +extern u8 GetBankIdentity(u8); extern u8 b_first_side(u8, u8, u8); -extern u8 battle_get_side_with_given_state(u8); +extern u8 GetBankByPlayerAI(u8); extern void move_effectiveness_something(u16, u8, u8); -extern u8 itemid_get_x12(); +extern u8 ItemId_GetHoldEffect(); extern void b_mc_stack_push(u8 *); extern bool8 b_mc_stack_pop_cursor(void); extern void sub_8046E7C(u8, u8); @@ -212,7 +212,7 @@ extern const BattleAICmdFunc sBattleAICmdTable[]; extern u8 sub_803FECC(); extern u16 Random(); -extern u8 battle_side_get_owner(); +extern u8 GetBankSide(); extern u32 sub_8186438(); extern u32 sub_81A6FB4(); @@ -225,7 +225,7 @@ void BattleAI_DoAIProcessing(void); void BattleAI_HandleItemUseBeforeAISetup(u8 a) { s32 i; - u8 *data = (u8 *)gUnknown_020244A8->unk18; + u8 *data = (u8 *)gBattleResources->unk18; for (i = 0; (u32)i < 0x54; i++) data[i] = 0; @@ -235,8 +235,8 @@ void BattleAI_HandleItemUseBeforeAISetup(u8 a) { if (gTrainers[gUnknown_02038BCA].items[i] != 0) { - gUnknown_020244A8->unk18->unk48[gUnknown_020244A8->unk18->unk50] = gTrainers[gUnknown_02038BCA].items[i]; - gUnknown_020244A8->unk18->unk50++; + gBattleResources->unk18->unk48[gBattleResources->unk18->unk50] = gTrainers[gUnknown_02038BCA].items[i]; + gBattleResources->unk18->unk50++; } } } @@ -264,7 +264,7 @@ void BattleAI_SetupAIData(u8 a) a >>= 1; } - r6 = sub_803FECC(gUnknown_02024064, 0, 0xFF); + r6 = sub_803FECC(gActiveBank, 0, 0xFF); for (i = 0; i < 4; i++) { @@ -273,18 +273,18 @@ void BattleAI_SetupAIData(u8 a) AI_THINKING_STRUCT->unk18[i] = 100 - (Random() % 16); } - gUnknown_020244A8->unk1C->unk20 = 0; - gPlayerMonIndex = gUnknown_02024064; + gBattleResources->unk1C->unk20 = 0; + gPlayerMonIndex = gActiveBank; if (gBattleTypeFlags & 1) { - gEnemyMonIndex = (Random() & 2) + ((u32)battle_side_get_owner(gUnknown_02024064) ^ 1); - if (gUnknown_02024210 & gBitTable[gEnemyMonIndex]) - gEnemyMonIndex ^= 2; + gBankTarget = (Random() & 2) + ((u32)GetBankSide(gActiveBank) ^ 1); + if (gAbsentBankFlags & gBitTable[gBankTarget]) + gBankTarget ^= 2; } else { //_08130A60 - gEnemyMonIndex = gPlayerMonIndex ^ 1; + gBankTarget = gPlayerMonIndex ^ 1; } //_08130A68 if (gBattleTypeFlags & 0x1000000) @@ -309,7 +309,7 @@ void BattleAI_SetupAIData(u8 a) u8 sub_8130BA4(void) { - u16 r4 = gUnknown_020241EA; + u16 r4 = gCurrentMove; u8 ret; if (!(gBattleTypeFlags & 1)) @@ -317,7 +317,7 @@ u8 sub_8130BA4(void) else ret = sub_8130CF4(); - gUnknown_020241EA = r4; + gCurrentMove = r4; return ret; } @@ -404,11 +404,11 @@ u8 sub_8130CF4(void) else { if (gBattleTypeFlags & 0x20000) - BattleAI_SetupAIData(gUnknown_0202449C[0x92] >> 4); + BattleAI_SetupAIData(gBattleStruct[0x92] >> 4); else BattleAI_SetupAIData(0xF); //_08130D76 - gEnemyMonIndex = i; + gBankTarget = i; if ((i & 1) != (gPlayerMonIndex & 1)) sub_8131074(); //_08130D90 @@ -488,8 +488,8 @@ u8 sub_8130CF4(void) r4_2 = 1; } } - gEnemyMonIndex = sp8[Random() % r4_2]; - return spC[gEnemyMonIndex]; + gBankTarget = sp8[Random() % r4_2]; + return spC[gBankTarget]; } #else __attribute__((naked)) @@ -543,7 +543,7 @@ _08130D48:\n\ ands r0, r1\n\ cmp r0, 0\n\ beq _08130D70\n\ - ldr r0, =gUnknown_0202449C\n\ + ldr r0, =gBattleStruct\n\ ldr r0, [r0]\n\ adds r0, 0x92\n\ ldrb r0, [r0]\n\ @@ -555,7 +555,7 @@ _08130D70:\n\ movs r0, 0xF\n\ bl BattleAI_SetupAIData\n\ _08130D76:\n\ - ldr r0, =gEnemyMonIndex\n\ + ldr r0, =gBankTarget\n\ mov r1, r8\n\ strb r1, [r0]\n\ movs r1, 0x1\n\ @@ -568,7 +568,7 @@ _08130D76:\n\ beq _08130D90\n\ bl sub_8131074\n\ _08130D90:\n\ - ldr r2, =gUnknown_020244A8\n\ + ldr r2, =gBattleResources\n\ ldr r0, [r2]\n\ ldr r0, [r0, 0x14]\n\ movs r1, 0\n\ @@ -731,7 +731,7 @@ _08130EC4:\n\ strb r0, [r2]\n\ movs r4, 0x1\n\ mov r8, r4\n\ - ldr r6, =gEnemyMonIndex\n\ + ldr r6, =gBankTarget\n\ ldr r3, [sp, 0x18]\n\ mov r1, sp\n\ adds r1, 0x2\n\ @@ -838,12 +838,12 @@ void sub_8131074(void) for (i = 0; i < 4; i++) { - if (gUnknown_020244A8->unk18->unk0[gEnemyMonIndex][i] == gUnknown_02024248[gEnemyMonIndex]) + if (gBattleResources->unk18->unk0[gBankTarget][i] == gUnknown_02024248[gBankTarget]) break; - if (gUnknown_020244A8->unk18->unk0[gEnemyMonIndex][i] != gUnknown_02024248[gEnemyMonIndex] //HACK: This redundant condition is a hack to make the asm match. - && gUnknown_020244A8->unk18->unk0[gEnemyMonIndex][i] == 0) + if (gBattleResources->unk18->unk0[gBankTarget][i] != gUnknown_02024248[gBankTarget] //HACK: This redundant condition is a hack to make the asm match. + && gBattleResources->unk18->unk0[gBankTarget][i] == 0) { - gUnknown_020244A8->unk18->unk0[gEnemyMonIndex][i] = gUnknown_02024248[gEnemyMonIndex]; + gBattleResources->unk18->unk0[gBankTarget][i] = gUnknown_02024248[gBankTarget]; break; } } @@ -854,27 +854,27 @@ void sub_81310F0(u8 a) s32 i; for (i = 0; i < 4; i++) - gUnknown_020244A8->unk18->unk0[a][i] = 0; + gBattleResources->unk18->unk0[a][i] = 0; } -void b_history__record_ability_usage_of_player(u8 a, u8 b) +void RecordAbilityBattle(u8 a, u8 b) { - gUnknown_020244A8->unk18->unk40[a] = b; + gBattleResources->unk18->unk40[a] = b; } void sub_8131130(u8 a) { - gUnknown_020244A8->unk18->unk40[a] = 0; + gBattleResources->unk18->unk40[a] = 0; } void b_history__record_item_x12_of_player(u8 a, u8 b) { - gUnknown_020244A8->unk18->unk44[a] = b; + gBattleResources->unk18->unk44[a] = b; } void sub_8131160(u8 a) { - gUnknown_020244A8->unk18->unk44[a] = 0; + gBattleResources->unk18->unk44[a] = 0; } void BattleAICmd_if_random_less_than(void) @@ -934,7 +934,7 @@ void BattleAICmd_if_hp_less_than(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) < gAIScriptPtr[2]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); @@ -949,7 +949,7 @@ void BattleAICmd_if_hp_more_than(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) > gAIScriptPtr[2]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); @@ -964,7 +964,7 @@ void BattleAICmd_if_hp_equal(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) == gAIScriptPtr[2]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); @@ -979,7 +979,7 @@ void BattleAICmd_if_hp_not_equal(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; if ((u32)(100 * gBattleMons[index].hp / gBattleMons[index].maxHP) != gAIScriptPtr[2]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); @@ -995,7 +995,7 @@ void BattleAICmd_if_status(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); @@ -1013,7 +1013,7 @@ void BattleAICmd_if_not_status(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); @@ -1031,7 +1031,7 @@ void BattleAICmd_if_status2(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); @@ -1049,7 +1049,7 @@ void BattleAICmd_if_not_status2(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); @@ -1067,11 +1067,11 @@ void BattleAICmd_if_status3(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); - if ((gUnknown_020242AC[index] & arg) != 0) + if ((gStatuses3[index] & arg) != 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -1085,11 +1085,11 @@ void BattleAICmd_if_not_status3(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; arg = AIScriptRead32(gAIScriptPtr + 2); - if ((gUnknown_020242AC[index] & arg) == 0) + if ((gStatuses3[index] & arg) == 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -1103,9 +1103,9 @@ void BattleAICmd_if_status4(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; - arg1 = battle_get_per_side_status(index) & 1; + arg1 = GetBankIdentity(index) & 1; arg2 = AIScriptRead32(gAIScriptPtr + 2); if ((gUnknown_0202428E[arg1] & arg2) != 0) @@ -1122,9 +1122,9 @@ void BattleAICmd_if_not_status4(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; - arg1 = battle_get_per_side_status(index) & 1; + arg1 = GetBankIdentity(index) & 1; arg2 = AIScriptRead32(gAIScriptPtr + 2); if ((gUnknown_0202428E[arg1] & arg2) == 0) @@ -1337,13 +1337,13 @@ void BattleAICmd_get_type(void) AI_THINKING_STRUCT->funcResult = gBattleMons[gPlayerMonIndex].type1; break; case 0: // enemy primary type - AI_THINKING_STRUCT->funcResult = gBattleMons[gEnemyMonIndex].type1; + AI_THINKING_STRUCT->funcResult = gBattleMons[gBankTarget].type1; break; case 3: // player secondary type AI_THINKING_STRUCT->funcResult = gBattleMons[gPlayerMonIndex].type2; break; case 2: // enemy secondary type - AI_THINKING_STRUCT->funcResult = gBattleMons[gEnemyMonIndex].type2; + AI_THINKING_STRUCT->funcResult = gBattleMons[gBankTarget].type2; break; case 4: // type of move being pointed to AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].type; @@ -1361,11 +1361,11 @@ u8 sub_8131E70(u8 index) return gPlayerMonIndex; case 0: default: - return gEnemyMonIndex; + return gBankTarget; case 3: return gPlayerMonIndex ^ 2; case 2: - return gEnemyMonIndex ^ 2; + return gBankTarget ^ 2; } } @@ -1406,7 +1406,7 @@ void BattleAICmd_is_most_powerful_move(void) ldrh r1, [r0]\n\ ldr r5, =0x0000ffff\n\ ldr r6, =gBattleMoves\n\ - ldr r2, =gUnknown_020244A8\n\ + ldr r2, =gBattleResources\n\ cmp r1, r5\n\ beq _08131F86\n\ ldr r0, [r2]\n\ @@ -1452,10 +1452,10 @@ _08131FAC:\n\ ldr r0, =gUnknown_02024400\n\ movs r1, 0\n\ strh r1, [r0]\n\ - ldr r0, =gUnknown_0202449C\n\ + ldr r0, =gBattleStruct\n\ ldr r0, [r0]\n\ strb r1, [r0, 0x13]\n\ - ldr r0, =gUnknown_02024474\n\ + ldr r0, =gBattleScripting\n\ movs r2, 0x1\n\ strb r2, [r0, 0xE]\n\ ldr r0, =gBattleMoveFlags\n\ @@ -1529,10 +1529,10 @@ _08132014:\n\ ldrb r0, [r1, 0x1]\n\ cmp r0, 0x1\n\ bls _081320C0\n\ - ldr r5, =gUnknown_020241EA\n\ + ldr r5, =gCurrentMove\n\ strh r2, [r5]\n\ ldrb r0, [r7]\n\ - ldr r4, =gEnemyMonIndex\n\ + ldr r4, =gBankTarget\n\ ldrb r1, [r4]\n\ bl sub_8046E7C\n\ ldrh r0, [r5]\n\ @@ -1542,7 +1542,7 @@ _08132014:\n\ mov r4, sp\n\ add r4, r8\n\ ldr r2, =gBattleMoveDamage\n\ - ldr r0, =gUnknown_020244A8\n\ + ldr r0, =gBattleResources\n\ ldr r0, [r0]\n\ ldr r0, [r0, 0x14]\n\ adds r0, 0x18\n\ @@ -1571,7 +1571,7 @@ _081320C8:\n\ b _08131FD0\n\ _081320D0:\n\ movs r6, 0\n\ - ldr r2, =gUnknown_020244A8\n\ + ldr r2, =gBattleResources\n\ ldr r0, [r2]\n\ ldr r0, [r0, 0x14]\n\ ldrb r0, [r0, 0x1]\n\ @@ -1640,7 +1640,7 @@ void BattleAICmd_get_move(void) if (gAIScriptPtr[1] == USER) AI_THINKING_STRUCT->funcResult = gUnknown_02024248[gPlayerMonIndex]; else - AI_THINKING_STRUCT->funcResult = gUnknown_02024248[gEnemyMonIndex]; + AI_THINKING_STRUCT->funcResult = gUnknown_02024248[gBankTarget]; gAIScriptPtr += 2; } @@ -1663,7 +1663,7 @@ void BattleAICmd_if_arg_not_equal(void) void BattleAICmd_if_would_go_first(void) { - if (b_first_side(gPlayerMonIndex, gEnemyMonIndex, 1) == gAIScriptPtr[1]) + if (b_first_side(gPlayerMonIndex, gBankTarget, 1) == gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1671,7 +1671,7 @@ void BattleAICmd_if_would_go_first(void) void BattleAICmd_if_would_not_go_first(void) { - if (b_first_side(gPlayerMonIndex, gEnemyMonIndex, 1) != gAIScriptPtr[1]) + if (b_first_side(gPlayerMonIndex, gBankTarget, 1) != gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1697,9 +1697,9 @@ void BattleAICmd_count_alive_pokemon(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; - if (battle_side_get_owner(index) == 0) + if (GetBankSide(index) == 0) party = gPlayerParty; else party = gEnemyParty; @@ -1707,14 +1707,14 @@ void BattleAICmd_count_alive_pokemon(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { u32 status; - var = gUnknown_0202406E[index][0]; - status = battle_get_per_side_status(index) ^ 2; - var2 = gUnknown_0202406E[battle_get_side_with_given_state(status)][0]; + var = gBattlePartyID[index][0]; + status = GetBankIdentity(index) ^ 2; + var2 = gBattlePartyID[GetBankByPlayerAI(status)][0]; } else { - var = gUnknown_0202406E[index][0]; - var2 = gUnknown_0202406E[index][0]; + var = gBattlePartyID[index][0]; + var2 = gBattlePartyID[index][0]; } for (i = 0; i < 6; i++) @@ -1750,9 +1750,9 @@ void BattleAICmd_get_ability(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; - if(gUnknown_02024064 != index) + if(gActiveBank != index) { if(UNK_2016A00_STRUCT->unk40[index] != 0) { @@ -1898,7 +1898,7 @@ void tai60_unk(void) cmp r0, 0x2\n\ bne _081325BC\n\ _0813253A:\n\ - ldr r0, =gUnknown_020244A8\n\ + ldr r0, =gBattleResources\n\ ldr r4, [r0]\n\ ldr r1, [r4, 0x18]\n\ adds r1, 0x40\n\ @@ -1968,7 +1968,7 @@ _081325BC:\n\ adds r0, r1\n\ adds r0, 0x20\n\ ldrb r3, [r0]\n\ - ldr r6, =gUnknown_020244A8\n\ + ldr r6, =gBattleResources\n\ _081325CA:\n\ cmp r3, 0\n\ bne _081325E8\n\ @@ -2015,8 +2015,8 @@ void BattleAICmd_get_highest_possible_damage(void) s32 i; gUnknown_02024400 = 0; - gUnknown_0202449C[0x13] = 0; - gUnknown_02024474[0xE] = 1; + gBattleStruct[0x13] = 0; + gBattleScripting[0xE] = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; AI_THINKING_STRUCT->funcResult = 0; @@ -2024,11 +2024,11 @@ void BattleAICmd_get_highest_possible_damage(void) for (i = 0; i < 4; i++) { gBattleMoveDamage = 40; - gUnknown_020241EA = gBattleMons[gPlayerMonIndex].moves[i]; + gCurrentMove = gBattleMons[gPlayerMonIndex].moves[i]; - if (gUnknown_020241EA) + if (gCurrentMove) { - move_effectiveness_something(gUnknown_020241EA, gPlayerMonIndex, gEnemyMonIndex); + move_effectiveness_something(gCurrentMove, gPlayerMonIndex, gBankTarget); // reduce by 1/3. if (gBattleMoveDamage == 120) @@ -2055,15 +2055,15 @@ void BattleAICmd_if_damage_bonus(void) u8 damageVar; gUnknown_02024400 = 0; - gUnknown_0202449C[0x13] = 0; - gUnknown_02024474[0xE] = 1; + gBattleStruct[0x13] = 0; + gBattleScripting[0xE] = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; gBattleMoveDamage = 40; - gUnknown_020241EA = AI_THINKING_STRUCT->moveConsidered; + gCurrentMove = AI_THINKING_STRUCT->moveConsidered; - move_effectiveness_something(gUnknown_020241EA, gPlayerMonIndex, gEnemyMonIndex); + move_effectiveness_something(gCurrentMove, gPlayerMonIndex, gBankTarget); if (gBattleMoveDamage == 120) gBattleMoveDamage = 80; @@ -2107,11 +2107,11 @@ void BattleAICmd_if_status_in_party(void) index = gPlayerMonIndex; break; default: - index = gEnemyMonIndex; + index = gBankTarget; break; } - party = (battle_side_get_owner(index) == 0) ? gPlayerParty : gEnemyParty; + party = (GetBankSide(index) == 0) ? gPlayerParty : gEnemyParty; statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2); @@ -2144,11 +2144,11 @@ void BattleAICmd_if_status_not_in_party(void) index = gPlayerMonIndex; break; default: - index = gEnemyMonIndex; + index = gBankTarget; break; } - party = (battle_side_get_owner(index) == 0) ? gPlayerParty : gEnemyParty; + party = (GetBankSide(index) == 0) ? gPlayerParty : gEnemyParty; statusToCompareTo = AIScriptRead32(gAIScriptPtr + 2); @@ -2204,7 +2204,7 @@ void BattleAICmd_if_stat_level_less_than(void) if (gAIScriptPtr[1] == USER) party = gPlayerMonIndex; else - party = gEnemyMonIndex; + party = gBankTarget; if (gBattleMons[party].statStages[gAIScriptPtr[2]] < gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); @@ -2219,7 +2219,7 @@ void BattleAICmd_if_stat_level_more_than(void) if (gAIScriptPtr[1] == USER) party = gPlayerMonIndex; else - party = gEnemyMonIndex; + party = gBankTarget; if (gBattleMons[party].statStages[gAIScriptPtr[2]] > gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); @@ -2234,7 +2234,7 @@ void BattleAICmd_if_stat_level_equal(void) if (gAIScriptPtr[1] == USER) party = gPlayerMonIndex; else - party = gEnemyMonIndex; + party = gBankTarget; if (gBattleMons[party].statStages[gAIScriptPtr[2]] == gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); @@ -2249,7 +2249,7 @@ void BattleAICmd_if_stat_level_not_equal(void) if (gAIScriptPtr[1] == USER) party = gPlayerMonIndex; else - party = gEnemyMonIndex; + party = gBankTarget; if (gBattleMons[party].statStages[gAIScriptPtr[2]] != gAIScriptPtr[3]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4); @@ -2266,13 +2266,13 @@ void BattleAICmd_if_can_faint(void) } gUnknown_02024400 = 0; - gUnknown_0202449C[0x13] = 0; - gUnknown_02024474[0xE] = 1; + gBattleStruct[0x13] = 0; + gBattleScripting[0xE] = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; - gUnknown_020241EA = AI_THINKING_STRUCT->moveConsidered; - sub_8046E7C(gPlayerMonIndex, gEnemyMonIndex); - move_effectiveness_something(gUnknown_020241EA, gPlayerMonIndex, gEnemyMonIndex); + gCurrentMove = AI_THINKING_STRUCT->moveConsidered; + sub_8046E7C(gPlayerMonIndex, gBankTarget); + move_effectiveness_something(gCurrentMove, gPlayerMonIndex, gBankTarget); gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->unk18[AI_THINKING_STRUCT->movesetIndex] / 100; @@ -2280,7 +2280,7 @@ void BattleAICmd_if_can_faint(void) if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - if (gBattleMons[gEnemyMonIndex].hp <= gBattleMoveDamage) + if (gBattleMons[gBankTarget].hp <= gBattleMoveDamage) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -2295,19 +2295,19 @@ void BattleAICmd_if_cant_faint(void) } gUnknown_02024400 = 0; - gUnknown_0202449C[0x13] = 0; - gUnknown_02024474[0xE] = 1; + gBattleStruct[0x13] = 0; + gBattleScripting[0xE] = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; - gUnknown_020241EA = AI_THINKING_STRUCT->moveConsidered; - sub_8046E7C(gPlayerMonIndex, gEnemyMonIndex); - move_effectiveness_something(gUnknown_020241EA, gPlayerMonIndex, gEnemyMonIndex); + gCurrentMove = AI_THINKING_STRUCT->moveConsidered; + sub_8046E7C(gPlayerMonIndex, gBankTarget); + move_effectiveness_something(gCurrentMove, gPlayerMonIndex, gBankTarget); gBattleMoveDamage = gBattleMoveDamage * AI_THINKING_STRUCT->unk18[AI_THINKING_STRUCT->movesetIndex] / 100; // this macro is missing the damage 0 = 1 assumption. - if (gBattleMons[gEnemyMonIndex].hp > gBattleMoveDamage) + if (gBattleMons[gBankTarget].hp > gBattleMoveDamage) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -2365,7 +2365,7 @@ void BattleAICmd_if_has_move(void) case 2: for (i = 0; i < 4; i++) { - if (UNK_2016A00_STRUCT->unk0[gEnemyMonIndex][i] == *temp_ptr) + if (UNK_2016A00_STRUCT->unk0[gBankTarget][i] == *temp_ptr) break; } if (i == 4) @@ -2409,7 +2409,7 @@ void BattleAICmd_if_dont_have_move(void) case 2: for (i = 0; i < 4; i++) { - if (UNK_2016A00_STRUCT->unk0[gEnemyMonIndex][i] == *temp_ptr) + if (UNK_2016A00_STRUCT->unk0[gBankTarget][i] == *temp_ptr) break; } if (i != 4) @@ -2447,7 +2447,7 @@ void BattleAICmd_if_move_effect(void) case 2: // _08133090 for (i = 0; i < 4; i++) { - if (gBattleMons[gPlayerMonIndex].moves[i] != 0 && gBattleMoves[UNK_2016A00_STRUCT->unk0[gEnemyMonIndex][i]].effect == gAIScriptPtr[2]) + if (gBattleMons[gPlayerMonIndex].moves[i] != 0 && gBattleMoves[UNK_2016A00_STRUCT->unk0[gBankTarget][i]].effect == gAIScriptPtr[2]) break; } if (i == 4) @@ -2480,7 +2480,7 @@ void BattleAICmd_if_not_move_effect(void) case 2: // _08133188 for (i = 0; i < 4; i++) { - if (UNK_2016A00_STRUCT->unk0[gEnemyMonIndex][i] && gBattleMoves[UNK_2016A00_STRUCT->unk0[gEnemyMonIndex][i]].effect == gAIScriptPtr[2]) + if (UNK_2016A00_STRUCT->unk0[gBankTarget][i] && gBattleMoves[UNK_2016A00_STRUCT->unk0[gBankTarget][i]].effect == gAIScriptPtr[2]) break; } if (i != 4) @@ -2498,11 +2498,11 @@ void BattleAICmd_if_last_move_did_damage(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; if (gAIScriptPtr[2] == 0) { - if (gUnknown_020242BC[index].unk4 == 0) + if (gDisableStructs[index].unk4 == 0) { gAIScriptPtr += 7; return; @@ -2515,7 +2515,7 @@ void BattleAICmd_if_last_move_did_damage(void) gAIScriptPtr += 7; return; } - else if (gUnknown_020242BC[index].unk6 != 0) + else if (gDisableStructs[index].unk6 != 0) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3); return; @@ -2528,7 +2528,7 @@ void BattleAICmd_if_encored(void) switch (gAIScriptPtr[1]) { case 0: // _08109348 - if (gUnknown_020242BC[gUnknown_02024064].unk4 == AI_THINKING_STRUCT->moveConsidered) + if (gDisableStructs[gActiveBank].unk4 == AI_THINKING_STRUCT->moveConsidered) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -2536,7 +2536,7 @@ void BattleAICmd_if_encored(void) gAIScriptPtr += 6; return; case 1: // _08109370 - if (gUnknown_020242BC[gUnknown_02024064].unk6 == AI_THINKING_STRUCT->moveConsidered) + if (gDisableStructs[gActiveBank].unk6 == AI_THINKING_STRUCT->moveConsidered) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -2556,7 +2556,7 @@ void BattleAICmd_flee(void) void BattleAICmd_if_random_100(void) { - u8 safariFleeRate = gUnknown_0202449C[0x7B] * 5; // safari flee rate, from 0-20 + u8 safariFleeRate = gBattleStruct[0x7B] * 5; // safari flee rate, from 0-20 if ((u8)(Random() % 100) < safariFleeRate) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); @@ -2577,14 +2577,14 @@ void BattleAICmd_get_hold_effect(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; - if (gUnknown_02024064 != index) + if (gActiveBank != index) { - AI_THINKING_STRUCT->funcResult = itemid_get_x12(UNK_2016A00_STRUCT->unk44[index]); + AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(UNK_2016A00_STRUCT->unk44[index]); } else - AI_THINKING_STRUCT->funcResult = itemid_get_x12(gBattleMons[index].item); + AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(gBattleMons[index].item); gAIScriptPtr += 2; } @@ -2617,7 +2617,7 @@ void BattleAICmd_get_gender(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; AI_THINKING_STRUCT->funcResult = pokemon_species_get_gender_info(gBattleMons[index].species, gBattleMons[index].personality); @@ -2631,9 +2631,9 @@ void BattleAICmd_is_first_turn(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; - AI_THINKING_STRUCT->funcResult = gUnknown_020242BC[index].unk16; + AI_THINKING_STRUCT->funcResult = gDisableStructs[index].unk16; gAIScriptPtr += 2; } @@ -2645,9 +2645,9 @@ void BattleAICmd_get_stockpile_count(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; - AI_THINKING_STRUCT->funcResult = gUnknown_020242BC[index].unk9; + AI_THINKING_STRUCT->funcResult = gDisableStructs[index].unk9; gAIScriptPtr += 2; } @@ -2666,10 +2666,10 @@ void BattleAICmd_get_item(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; // this hack and a half matches. whatever. i dont care. someone else fix this mess later. PS: still cant fix this. - AI_THINKING_STRUCT->funcResult = gUnknown_0202449C[0xB8 + (index * 2)]; + AI_THINKING_STRUCT->funcResult = gBattleStruct[0xB8 + (index * 2)]; gAIScriptPtr += 2; } @@ -2702,9 +2702,9 @@ void BattleAICmd_get_protect_count(void) if (gAIScriptPtr[1] == USER) index = gPlayerMonIndex; else - index = gEnemyMonIndex; + index = gBankTarget; - AI_THINKING_STRUCT->funcResult = gUnknown_020242BC[index].unk8; + AI_THINKING_STRUCT->funcResult = gDisableStructs[index].unk8; gAIScriptPtr += 2; } @@ -2755,7 +2755,7 @@ void BattleAICmd_if_level_cond(void) switch (gAIScriptPtr[1]) { case 0: // greater than - if (gBattleMons[gPlayerMonIndex].level > gBattleMons[gEnemyMonIndex].level) + if (gBattleMons[gPlayerMonIndex].level > gBattleMons[gBankTarget].level) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -2763,7 +2763,7 @@ void BattleAICmd_if_level_cond(void) gAIScriptPtr += 6; return; case 1: // less than - if (gBattleMons[gPlayerMonIndex].level < gBattleMons[gEnemyMonIndex].level) + if (gBattleMons[gPlayerMonIndex].level < gBattleMons[gBankTarget].level) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -2771,7 +2771,7 @@ void BattleAICmd_if_level_cond(void) gAIScriptPtr += 6; return; case 2: // equal - if (gBattleMons[gPlayerMonIndex].level == gBattleMons[gEnemyMonIndex].level) + if (gBattleMons[gPlayerMonIndex].level == gBattleMons[gBankTarget].level) { gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); return; @@ -2783,7 +2783,7 @@ void BattleAICmd_if_level_cond(void) void BattleAICmd_if_taunted(void) { - if (gUnknown_020242BC[gEnemyMonIndex].taunt != 0) + if (gDisableStructs[gBankTarget].taunt != 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -2791,7 +2791,7 @@ void BattleAICmd_if_taunted(void) void BattleAICmd_if_not_taunted(void) { - if (gUnknown_020242BC[gEnemyMonIndex].taunt == 0) + if (gDisableStructs[gBankTarget].taunt == 0) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -2799,7 +2799,7 @@ void BattleAICmd_if_not_taunted(void) void tai5E_unk(void) { - if((gPlayerMonIndex & 1) == (gEnemyMonIndex & 1)) + if((gPlayerMonIndex & 1) == (gBankTarget & 1)) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 1); else gAIScriptPtr += 5; diff --git a/src/play_time.c b/src/play_time.c new file mode 100644 index 000000000..444c2c86c --- /dev/null +++ b/src/play_time.c @@ -0,0 +1,73 @@ +#include "global.h" +#include "play_time.h" + +enum +{ + STOPPED, + RUNNING, + MAXED_OUT +}; + +static u8 sPlayTimeCounterState; + +void PlayTimeCounter_Reset() +{ + sPlayTimeCounterState = STOPPED; + + gSaveBlock2Ptr->playTimeHours = 0; + gSaveBlock2Ptr->playTimeMinutes = 0; + gSaveBlock2Ptr->playTimeSeconds = 0; + gSaveBlock2Ptr->playTimeVBlanks = 0; +} + +void PlayTimeCounter_Start() +{ + sPlayTimeCounterState = RUNNING; + + if (gSaveBlock2Ptr->playTimeHours > 999) + PlayTimeCounter_SetToMax(); +} + +void PlayTimeCounter_Stop() +{ + sPlayTimeCounterState = STOPPED; +} + +void PlayTimeCounter_Update() +{ + if (sPlayTimeCounterState == RUNNING) + { + gSaveBlock2Ptr->playTimeVBlanks++; + + if (gSaveBlock2Ptr->playTimeVBlanks > 59) + { + gSaveBlock2Ptr->playTimeVBlanks = 0; + gSaveBlock2Ptr->playTimeSeconds++; + + if (gSaveBlock2Ptr->playTimeSeconds > 59) + { + gSaveBlock2Ptr->playTimeSeconds = 0; + gSaveBlock2Ptr->playTimeMinutes++; + + if (gSaveBlock2Ptr->playTimeMinutes > 59) + { + gSaveBlock2Ptr->playTimeMinutes = 0; + gSaveBlock2Ptr->playTimeHours++; + + if (gSaveBlock2Ptr->playTimeHours > 999) + PlayTimeCounter_SetToMax(); + } + } + } + } +} + +void PlayTimeCounter_SetToMax() +{ + sPlayTimeCounterState = MAXED_OUT; + + gSaveBlock2Ptr->playTimeHours = 999; + gSaveBlock2Ptr->playTimeMinutes = 59; + gSaveBlock2Ptr->playTimeSeconds = 59; + gSaveBlock2Ptr->playTimeVBlanks = 59; +} diff --git a/src/trig.c b/src/trig.c new file mode 100644 index 000000000..e16a69e63 --- /dev/null +++ b/src/trig.c @@ -0,0 +1,549 @@ +#include "global.h" +#include "trig.h" + +// Converts a number to Q8.8 fixed-point format +#define Q_8_8(n) ((s16)((n) * 256)) + +// Converts a number to Q4.12 fixed-point format +#define Q_4_12(n) ((s16)((n) * 4096)) + +// Values of sin(x*(π/128)) as Q8.8 fixed-point numbers from x = 0 to x = 319 +const s16 gSineTable[] = +{ + Q_8_8(0), // sin(0*(π/128)) + Q_8_8(0.0234375), // sin(1*(π/128)) + Q_8_8(0.046875), // sin(2*(π/128)) + Q_8_8(0.0703125), // sin(3*(π/128)) + Q_8_8(0.09765625), // sin(4*(π/128)) + Q_8_8(0.12109375), // sin(5*(π/128)) + Q_8_8(0.14453125), // sin(6*(π/128)) + Q_8_8(0.16796875), // sin(7*(π/128)) + Q_8_8(0.19140625), // sin(8*(π/128)) + Q_8_8(0.21875), // sin(9*(π/128)) + Q_8_8(0.2421875), // sin(10*(π/128)) + Q_8_8(0.265625), // sin(11*(π/128)) + Q_8_8(0.2890625), // sin(12*(π/128)) + Q_8_8(0.3125), // sin(13*(π/128)) + Q_8_8(0.3359375), // sin(14*(π/128)) + Q_8_8(0.359375), // sin(15*(π/128)) + Q_8_8(0.37890625), // sin(16*(π/128)) + Q_8_8(0.40234375), // sin(17*(π/128)) + Q_8_8(0.42578125), // sin(18*(π/128)) + Q_8_8(0.44921875), // sin(19*(π/128)) + Q_8_8(0.46875), // sin(20*(π/128)) + Q_8_8(0.4921875), // sin(21*(π/128)) + Q_8_8(0.51171875), // sin(22*(π/128)) + Q_8_8(0.53125), // sin(23*(π/128)) + Q_8_8(0.5546875), // sin(24*(π/128)) + Q_8_8(0.57421875), // sin(25*(π/128)) + Q_8_8(0.59375), // sin(26*(π/128)) + Q_8_8(0.61328125), // sin(27*(π/128)) + Q_8_8(0.6328125), // sin(28*(π/128)) + Q_8_8(0.65234375), // sin(29*(π/128)) + Q_8_8(0.66796875), // sin(30*(π/128)) + Q_8_8(0.6875), // sin(31*(π/128)) + Q_8_8(0.70703125), // sin(32*(π/128)) + Q_8_8(0.72265625), // sin(33*(π/128)) + Q_8_8(0.73828125), // sin(34*(π/128)) + Q_8_8(0.75390625), // sin(35*(π/128)) + Q_8_8(0.76953125), // sin(36*(π/128)) + Q_8_8(0.78515625), // sin(37*(π/128)) + Q_8_8(0.80078125), // sin(38*(π/128)) + Q_8_8(0.81640625), // sin(39*(π/128)) + Q_8_8(0.828125), // sin(40*(π/128)) + Q_8_8(0.84375), // sin(41*(π/128)) + Q_8_8(0.85546875), // sin(42*(π/128)) + Q_8_8(0.8671875), // sin(43*(π/128)) + Q_8_8(0.87890625), // sin(44*(π/128)) + Q_8_8(0.890625), // sin(45*(π/128)) + Q_8_8(0.90234375), // sin(46*(π/128)) + Q_8_8(0.9140625), // sin(47*(π/128)) + Q_8_8(0.921875), // sin(48*(π/128)) + Q_8_8(0.9296875), // sin(49*(π/128)) + Q_8_8(0.94140625), // sin(50*(π/128)) + Q_8_8(0.94921875), // sin(51*(π/128)) + Q_8_8(0.953125), // sin(52*(π/128)) + Q_8_8(0.9609375), // sin(53*(π/128)) + Q_8_8(0.96875), // sin(54*(π/128)) + Q_8_8(0.97265625), // sin(55*(π/128)) + Q_8_8(0.98046875), // sin(56*(π/128)) + Q_8_8(0.984375), // sin(57*(π/128)) + Q_8_8(0.98828125), // sin(58*(π/128)) + Q_8_8(0.9921875), // sin(59*(π/128)) + Q_8_8(0.9921875), // sin(60*(π/128)) + Q_8_8(0.99609375), // sin(61*(π/128)) + Q_8_8(0.99609375), // sin(62*(π/128)) + Q_8_8(0.99609375), // sin(63*(π/128)) + Q_8_8(1), // sin(64*(π/128)) + Q_8_8(0.99609375), // sin(65*(π/128)) + Q_8_8(0.99609375), // sin(66*(π/128)) + Q_8_8(0.99609375), // sin(67*(π/128)) + Q_8_8(0.9921875), // sin(68*(π/128)) + Q_8_8(0.9921875), // sin(69*(π/128)) + Q_8_8(0.98828125), // sin(70*(π/128)) + Q_8_8(0.984375), // sin(71*(π/128)) + Q_8_8(0.98046875), // sin(72*(π/128)) + Q_8_8(0.97265625), // sin(73*(π/128)) + Q_8_8(0.96875), // sin(74*(π/128)) + Q_8_8(0.9609375), // sin(75*(π/128)) + Q_8_8(0.953125), // sin(76*(π/128)) + Q_8_8(0.94921875), // sin(77*(π/128)) + Q_8_8(0.94140625), // sin(78*(π/128)) + Q_8_8(0.9296875), // sin(79*(π/128)) + Q_8_8(0.921875), // sin(80*(π/128)) + Q_8_8(0.9140625), // sin(81*(π/128)) + Q_8_8(0.90234375), // sin(82*(π/128)) + Q_8_8(0.890625), // sin(83*(π/128)) + Q_8_8(0.87890625), // sin(84*(π/128)) + Q_8_8(0.8671875), // sin(85*(π/128)) + Q_8_8(0.85546875), // sin(86*(π/128)) + Q_8_8(0.84375), // sin(87*(π/128)) + Q_8_8(0.828125), // sin(88*(π/128)) + Q_8_8(0.81640625), // sin(89*(π/128)) + Q_8_8(0.80078125), // sin(90*(π/128)) + Q_8_8(0.78515625), // sin(91*(π/128)) + Q_8_8(0.76953125), // sin(92*(π/128)) + Q_8_8(0.75390625), // sin(93*(π/128)) + Q_8_8(0.73828125), // sin(94*(π/128)) + Q_8_8(0.72265625), // sin(95*(π/128)) + Q_8_8(0.70703125), // sin(96*(π/128)) + Q_8_8(0.6875), // sin(97*(π/128)) + Q_8_8(0.66796875), // sin(98*(π/128)) + Q_8_8(0.65234375), // sin(99*(π/128)) + Q_8_8(0.6328125), // sin(100*(π/128)) + Q_8_8(0.61328125), // sin(101*(π/128)) + Q_8_8(0.59375), // sin(102*(π/128)) + Q_8_8(0.57421875), // sin(103*(π/128)) + Q_8_8(0.5546875), // sin(104*(π/128)) + Q_8_8(0.53125), // sin(105*(π/128)) + Q_8_8(0.51171875), // sin(106*(π/128)) + Q_8_8(0.4921875), // sin(107*(π/128)) + Q_8_8(0.46875), // sin(108*(π/128)) + Q_8_8(0.44921875), // sin(109*(π/128)) + Q_8_8(0.42578125), // sin(110*(π/128)) + Q_8_8(0.40234375), // sin(111*(π/128)) + Q_8_8(0.37890625), // sin(112*(π/128)) + Q_8_8(0.359375), // sin(113*(π/128)) + Q_8_8(0.3359375), // sin(114*(π/128)) + Q_8_8(0.3125), // sin(115*(π/128)) + Q_8_8(0.2890625), // sin(116*(π/128)) + Q_8_8(0.265625), // sin(117*(π/128)) + Q_8_8(0.2421875), // sin(118*(π/128)) + Q_8_8(0.21875), // sin(119*(π/128)) + Q_8_8(0.19140625), // sin(120*(π/128)) + Q_8_8(0.16796875), // sin(121*(π/128)) + Q_8_8(0.14453125), // sin(122*(π/128)) + Q_8_8(0.12109375), // sin(123*(π/128)) + Q_8_8(0.09765625), // sin(124*(π/128)) + Q_8_8(0.0703125), // sin(125*(π/128)) + Q_8_8(0.046875), // sin(126*(π/128)) + Q_8_8(0.0234375), // sin(127*(π/128)) + Q_8_8(0), // sin(128*(π/128)) + Q_8_8(-0.0234375), // sin(129*(π/128)) + Q_8_8(-0.046875), // sin(130*(π/128)) + Q_8_8(-0.0703125), // sin(131*(π/128)) + Q_8_8(-0.09765625), // sin(132*(π/128)) + Q_8_8(-0.12109375), // sin(133*(π/128)) + Q_8_8(-0.14453125), // sin(134*(π/128)) + Q_8_8(-0.16796875), // sin(135*(π/128)) + Q_8_8(-0.19140625), // sin(136*(π/128)) + Q_8_8(-0.21875), // sin(137*(π/128)) + Q_8_8(-0.2421875), // sin(138*(π/128)) + Q_8_8(-0.265625), // sin(139*(π/128)) + Q_8_8(-0.2890625), // sin(140*(π/128)) + Q_8_8(-0.3125), // sin(141*(π/128)) + Q_8_8(-0.3359375), // sin(142*(π/128)) + Q_8_8(-0.359375), // sin(143*(π/128)) + Q_8_8(-0.37890625), // sin(144*(π/128)) + Q_8_8(-0.40234375), // sin(145*(π/128)) + Q_8_8(-0.42578125), // sin(146*(π/128)) + Q_8_8(-0.44921875), // sin(147*(π/128)) + Q_8_8(-0.46875), // sin(148*(π/128)) + Q_8_8(-0.4921875), // sin(149*(π/128)) + Q_8_8(-0.51171875), // sin(150*(π/128)) + Q_8_8(-0.53125), // sin(151*(π/128)) + Q_8_8(-0.5546875), // sin(152*(π/128)) + Q_8_8(-0.57421875), // sin(153*(π/128)) + Q_8_8(-0.59375), // sin(154*(π/128)) + Q_8_8(-0.61328125), // sin(155*(π/128)) + Q_8_8(-0.6328125), // sin(156*(π/128)) + Q_8_8(-0.65234375), // sin(157*(π/128)) + Q_8_8(-0.66796875), // sin(158*(π/128)) + Q_8_8(-0.6875), // sin(159*(π/128)) + Q_8_8(-0.70703125), // sin(160*(π/128)) + Q_8_8(-0.72265625), // sin(161*(π/128)) + Q_8_8(-0.73828125), // sin(162*(π/128)) + Q_8_8(-0.75390625), // sin(163*(π/128)) + Q_8_8(-0.76953125), // sin(164*(π/128)) + Q_8_8(-0.78515625), // sin(165*(π/128)) + Q_8_8(-0.80078125), // sin(166*(π/128)) + Q_8_8(-0.81640625), // sin(167*(π/128)) + Q_8_8(-0.828125), // sin(168*(π/128)) + Q_8_8(-0.84375), // sin(169*(π/128)) + Q_8_8(-0.85546875), // sin(170*(π/128)) + Q_8_8(-0.8671875), // sin(171*(π/128)) + Q_8_8(-0.87890625), // sin(172*(π/128)) + Q_8_8(-0.890625), // sin(173*(π/128)) + Q_8_8(-0.90234375), // sin(174*(π/128)) + Q_8_8(-0.9140625), // sin(175*(π/128)) + Q_8_8(-0.921875), // sin(176*(π/128)) + Q_8_8(-0.9296875), // sin(177*(π/128)) + Q_8_8(-0.94140625), // sin(178*(π/128)) + Q_8_8(-0.94921875), // sin(179*(π/128)) + Q_8_8(-0.953125), // sin(180*(π/128)) + Q_8_8(-0.9609375), // sin(181*(π/128)) + Q_8_8(-0.96875), // sin(182*(π/128)) + Q_8_8(-0.97265625), // sin(183*(π/128)) + Q_8_8(-0.98046875), // sin(184*(π/128)) + Q_8_8(-0.984375), // sin(185*(π/128)) + Q_8_8(-0.98828125), // sin(186*(π/128)) + Q_8_8(-0.9921875), // sin(187*(π/128)) + Q_8_8(-0.9921875), // sin(188*(π/128)) + Q_8_8(-0.99609375), // sin(189*(π/128)) + Q_8_8(-0.99609375), // sin(190*(π/128)) + Q_8_8(-0.99609375), // sin(191*(π/128)) + Q_8_8(-1), // sin(192*(π/128)) + Q_8_8(-0.99609375), // sin(193*(π/128)) + Q_8_8(-0.99609375), // sin(194*(π/128)) + Q_8_8(-0.99609375), // sin(195*(π/128)) + Q_8_8(-0.9921875), // sin(196*(π/128)) + Q_8_8(-0.9921875), // sin(197*(π/128)) + Q_8_8(-0.98828125), // sin(198*(π/128)) + Q_8_8(-0.984375), // sin(199*(π/128)) + Q_8_8(-0.98046875), // sin(200*(π/128)) + Q_8_8(-0.97265625), // sin(201*(π/128)) + Q_8_8(-0.96875), // sin(202*(π/128)) + Q_8_8(-0.9609375), // sin(203*(π/128)) + Q_8_8(-0.953125), // sin(204*(π/128)) + Q_8_8(-0.94921875), // sin(205*(π/128)) + Q_8_8(-0.94140625), // sin(206*(π/128)) + Q_8_8(-0.9296875), // sin(207*(π/128)) + Q_8_8(-0.921875), // sin(208*(π/128)) + Q_8_8(-0.9140625), // sin(209*(π/128)) + Q_8_8(-0.90234375), // sin(210*(π/128)) + Q_8_8(-0.890625), // sin(211*(π/128)) + Q_8_8(-0.87890625), // sin(212*(π/128)) + Q_8_8(-0.8671875), // sin(213*(π/128)) + Q_8_8(-0.85546875), // sin(214*(π/128)) + Q_8_8(-0.84375), // sin(215*(π/128)) + Q_8_8(-0.828125), // sin(216*(π/128)) + Q_8_8(-0.81640625), // sin(217*(π/128)) + Q_8_8(-0.80078125), // sin(218*(π/128)) + Q_8_8(-0.78515625), // sin(219*(π/128)) + Q_8_8(-0.76953125), // sin(220*(π/128)) + Q_8_8(-0.75390625), // sin(221*(π/128)) + Q_8_8(-0.73828125), // sin(222*(π/128)) + Q_8_8(-0.72265625), // sin(223*(π/128)) + Q_8_8(-0.70703125), // sin(224*(π/128)) + Q_8_8(-0.6875), // sin(225*(π/128)) + Q_8_8(-0.66796875), // sin(226*(π/128)) + Q_8_8(-0.65234375), // sin(227*(π/128)) + Q_8_8(-0.6328125), // sin(228*(π/128)) + Q_8_8(-0.61328125), // sin(229*(π/128)) + Q_8_8(-0.59375), // sin(230*(π/128)) + Q_8_8(-0.57421875), // sin(231*(π/128)) + Q_8_8(-0.5546875), // sin(232*(π/128)) + Q_8_8(-0.53125), // sin(233*(π/128)) + Q_8_8(-0.51171875), // sin(234*(π/128)) + Q_8_8(-0.4921875), // sin(235*(π/128)) + Q_8_8(-0.46875), // sin(236*(π/128)) + Q_8_8(-0.44921875), // sin(237*(π/128)) + Q_8_8(-0.42578125), // sin(238*(π/128)) + Q_8_8(-0.40234375), // sin(239*(π/128)) + Q_8_8(-0.37890625), // sin(240*(π/128)) + Q_8_8(-0.359375), // sin(241*(π/128)) + Q_8_8(-0.3359375), // sin(242*(π/128)) + Q_8_8(-0.3125), // sin(243*(π/128)) + Q_8_8(-0.2890625), // sin(244*(π/128)) + Q_8_8(-0.265625), // sin(245*(π/128)) + Q_8_8(-0.2421875), // sin(246*(π/128)) + Q_8_8(-0.21875), // sin(247*(π/128)) + Q_8_8(-0.19140625), // sin(248*(π/128)) + Q_8_8(-0.16796875), // sin(249*(π/128)) + Q_8_8(-0.14453125), // sin(250*(π/128)) + Q_8_8(-0.12109375), // sin(251*(π/128)) + Q_8_8(-0.09765625), // sin(252*(π/128)) + Q_8_8(-0.0703125), // sin(253*(π/128)) + Q_8_8(-0.046875), // sin(254*(π/128)) + Q_8_8(-0.0234375), // sin(255*(π/128)) + Q_8_8(0), // sin(256*(π/128)) + Q_8_8(0.0234375), // sin(257*(π/128)) + Q_8_8(0.046875), // sin(258*(π/128)) + Q_8_8(0.0703125), // sin(259*(π/128)) + Q_8_8(0.09765625), // sin(260*(π/128)) + Q_8_8(0.12109375), // sin(261*(π/128)) + Q_8_8(0.14453125), // sin(262*(π/128)) + Q_8_8(0.16796875), // sin(263*(π/128)) + Q_8_8(0.19140625), // sin(264*(π/128)) + Q_8_8(0.21875), // sin(265*(π/128)) + Q_8_8(0.2421875), // sin(266*(π/128)) + Q_8_8(0.265625), // sin(267*(π/128)) + Q_8_8(0.2890625), // sin(268*(π/128)) + Q_8_8(0.3125), // sin(269*(π/128)) + Q_8_8(0.3359375), // sin(270*(π/128)) + Q_8_8(0.359375), // sin(271*(π/128)) + Q_8_8(0.37890625), // sin(272*(π/128)) + Q_8_8(0.40234375), // sin(273*(π/128)) + Q_8_8(0.42578125), // sin(274*(π/128)) + Q_8_8(0.44921875), // sin(275*(π/128)) + Q_8_8(0.46875), // sin(276*(π/128)) + Q_8_8(0.4921875), // sin(277*(π/128)) + Q_8_8(0.51171875), // sin(278*(π/128)) + Q_8_8(0.53125), // sin(279*(π/128)) + Q_8_8(0.5546875), // sin(280*(π/128)) + Q_8_8(0.57421875), // sin(281*(π/128)) + Q_8_8(0.59375), // sin(282*(π/128)) + Q_8_8(0.61328125), // sin(283*(π/128)) + Q_8_8(0.6328125), // sin(284*(π/128)) + Q_8_8(0.65234375), // sin(285*(π/128)) + Q_8_8(0.66796875), // sin(286*(π/128)) + Q_8_8(0.6875), // sin(287*(π/128)) + Q_8_8(0.70703125), // sin(288*(π/128)) + Q_8_8(0.72265625), // sin(289*(π/128)) + Q_8_8(0.73828125), // sin(290*(π/128)) + Q_8_8(0.75390625), // sin(291*(π/128)) + Q_8_8(0.76953125), // sin(292*(π/128)) + Q_8_8(0.78515625), // sin(293*(π/128)) + Q_8_8(0.80078125), // sin(294*(π/128)) + Q_8_8(0.81640625), // sin(295*(π/128)) + Q_8_8(0.828125), // sin(296*(π/128)) + Q_8_8(0.84375), // sin(297*(π/128)) + Q_8_8(0.85546875), // sin(298*(π/128)) + Q_8_8(0.8671875), // sin(299*(π/128)) + Q_8_8(0.87890625), // sin(300*(π/128)) + Q_8_8(0.890625), // sin(301*(π/128)) + Q_8_8(0.90234375), // sin(302*(π/128)) + Q_8_8(0.9140625), // sin(303*(π/128)) + Q_8_8(0.921875), // sin(304*(π/128)) + Q_8_8(0.9296875), // sin(305*(π/128)) + Q_8_8(0.94140625), // sin(306*(π/128)) + Q_8_8(0.94921875), // sin(307*(π/128)) + Q_8_8(0.953125), // sin(308*(π/128)) + Q_8_8(0.9609375), // sin(309*(π/128)) + Q_8_8(0.96875), // sin(310*(π/128)) + Q_8_8(0.97265625), // sin(311*(π/128)) + Q_8_8(0.98046875), // sin(312*(π/128)) + Q_8_8(0.984375), // sin(313*(π/128)) + Q_8_8(0.98828125), // sin(314*(π/128)) + Q_8_8(0.9921875), // sin(315*(π/128)) + Q_8_8(0.9921875), // sin(316*(π/128)) + Q_8_8(0.99609375), // sin(317*(π/128)) + Q_8_8(0.99609375), // sin(318*(π/128)) + Q_8_8(0.99609375), // sin(319*(π/128)) +}; + +// values of sin(x) as Q4.12 fixed-point numbers from x = 0° to x = 179° +const s16 gSineDegreeTable[] = +{ + Q_4_12(0), // sin(0°) + Q_4_12(0.017333984375), // sin(1°) + Q_4_12(0.034912109375), // sin(2°) + Q_4_12(0.05224609375), // sin(3°) + Q_4_12(0.06982421875), // sin(4°) + Q_4_12(0.087158203125), // sin(5°) + Q_4_12(0.1044921875), // sin(6°) + Q_4_12(0.121826171875), // sin(7°) + Q_4_12(0.13916015625), // sin(8°) + Q_4_12(0.156494140625), // sin(9°) + Q_4_12(0.173583984375), // sin(10°) + Q_4_12(0.19091796875), // sin(11°) + Q_4_12(0.2080078125), // sin(12°) + Q_4_12(0.224853515625), // sin(13°) + Q_4_12(0.241943359375), // sin(14°) + Q_4_12(0.2587890625), // sin(15°) + Q_4_12(0.275634765625), // sin(16°) + Q_4_12(0.29248046875), // sin(17°) + Q_4_12(0.30908203125), // sin(18°) + Q_4_12(0.32568359375), // sin(19°) + Q_4_12(0.342041015625), // sin(20°) + Q_4_12(0.3583984375), // sin(21°) + Q_4_12(0.37451171875), // sin(22°) + Q_4_12(0.390625), // sin(23°) + Q_4_12(0.40673828125), // sin(24°) + Q_4_12(0.422607421875), // sin(25°) + Q_4_12(0.4384765625), // sin(26°) + Q_4_12(0.4541015625), // sin(27°) + Q_4_12(0.469482421875), // sin(28°) + Q_4_12(0.48486328125), // sin(29°) + Q_4_12(0.5), // sin(30°) + Q_4_12(0.51513671875), // sin(31°) + Q_4_12(0.530029296875), // sin(32°) + Q_4_12(0.544677734375), // sin(33°) + Q_4_12(0.55908203125), // sin(34°) + Q_4_12(0.573486328125), // sin(35°) + Q_4_12(0.587890625), // sin(36°) + Q_4_12(0.601806640625), // sin(37°) + Q_4_12(0.61572265625), // sin(38°) + Q_4_12(0.62939453125), // sin(39°) + Q_4_12(0.642822265625), // sin(40°) + Q_4_12(0.656005859375), // sin(41°) + Q_4_12(0.669189453125), // sin(42°) + Q_4_12(0.681884765625), // sin(43°) + Q_4_12(0.694580078125), // sin(44°) + Q_4_12(0.70703125), // sin(45°) + Q_4_12(0.71923828125), // sin(46°) + Q_4_12(0.7314453125), // sin(47°) + Q_4_12(0.7431640625), // sin(48°) + Q_4_12(0.754638671875), // sin(49°) + Q_4_12(0.76611328125), // sin(50°) + Q_4_12(0.777099609375), // sin(51°) + Q_4_12(0.7880859375), // sin(52°) + Q_4_12(0.798583984375), // sin(53°) + Q_4_12(0.80908203125), // sin(54°) + Q_4_12(0.819091796875), // sin(55°) + Q_4_12(0.8291015625), // sin(56°) + Q_4_12(0.838623046875), // sin(57°) + Q_4_12(0.84814453125), // sin(58°) + Q_4_12(0.857177734375), // sin(59°) + Q_4_12(0.865966796875), // sin(60°) + Q_4_12(0.87451171875), // sin(61°) + Q_4_12(0.883056640625), // sin(62°) + Q_4_12(0.89111328125), // sin(63°) + Q_4_12(0.898681640625), // sin(64°) + Q_4_12(0.90625), // sin(65°) + Q_4_12(0.91357421875), // sin(66°) + Q_4_12(0.92041015625), // sin(67°) + Q_4_12(0.92724609375), // sin(68°) + Q_4_12(0.93359375), // sin(69°) + Q_4_12(0.939697265625), // sin(70°) + Q_4_12(0.945556640625), // sin(71°) + Q_4_12(0.951171875), // sin(72°) + Q_4_12(0.956298828125), // sin(73°) + Q_4_12(0.961181640625), // sin(74°) + Q_4_12(0.9658203125), // sin(75°) + Q_4_12(0.97021484375), // sin(76°) + Q_4_12(0.974365234375), // sin(77°) + Q_4_12(0.97802734375), // sin(78°) + Q_4_12(0.981689453125), // sin(79°) + Q_4_12(0.98486328125), // sin(80°) + Q_4_12(0.98779296875), // sin(81°) + Q_4_12(0.990234375), // sin(82°) + Q_4_12(0.992431640625), // sin(83°) + Q_4_12(0.994384765625), // sin(84°) + Q_4_12(0.99609375), // sin(85°) + Q_4_12(0.99755859375), // sin(86°) + Q_4_12(0.99853515625), // sin(87°) + Q_4_12(0.999267578125), // sin(88°) + Q_4_12(0.999755859375), // sin(89°) + Q_4_12(1), // sin(90°) + Q_4_12(0.999755859375), // sin(91°) + Q_4_12(0.999267578125), // sin(92°) + Q_4_12(0.99853515625), // sin(93°) + Q_4_12(0.99755859375), // sin(94°) + Q_4_12(0.99609375), // sin(95°) + Q_4_12(0.994384765625), // sin(96°) + Q_4_12(0.992431640625), // sin(97°) + Q_4_12(0.990234375), // sin(98°) + Q_4_12(0.98779296875), // sin(99°) + Q_4_12(0.98486328125), // sin(100°) + Q_4_12(0.981689453125), // sin(101°) + Q_4_12(0.97802734375), // sin(102°) + Q_4_12(0.974365234375), // sin(103°) + Q_4_12(0.97021484375), // sin(104°) + Q_4_12(0.9658203125), // sin(105°) + Q_4_12(0.961181640625), // sin(106°) + Q_4_12(0.956298828125), // sin(107°) + Q_4_12(0.951171875), // sin(108°) + Q_4_12(0.945556640625), // sin(109°) + Q_4_12(0.939697265625), // sin(110°) + Q_4_12(0.93359375), // sin(111°) + Q_4_12(0.92724609375), // sin(112°) + Q_4_12(0.92041015625), // sin(113°) + Q_4_12(0.91357421875), // sin(114°) + Q_4_12(0.90625), // sin(115°) + Q_4_12(0.898681640625), // sin(116°) + Q_4_12(0.89111328125), // sin(117°) + Q_4_12(0.883056640625), // sin(118°) + Q_4_12(0.87451171875), // sin(119°) + Q_4_12(0.865966796875), // sin(120°) + Q_4_12(0.857177734375), // sin(121°) + Q_4_12(0.84814453125), // sin(122°) + Q_4_12(0.838623046875), // sin(123°) + Q_4_12(0.8291015625), // sin(124°) + Q_4_12(0.819091796875), // sin(125°) + Q_4_12(0.80908203125), // sin(126°) + Q_4_12(0.798583984375), // sin(127°) + Q_4_12(0.7880859375), // sin(128°) + Q_4_12(0.777099609375), // sin(129°) + Q_4_12(0.76611328125), // sin(130°) + Q_4_12(0.754638671875), // sin(131°) + Q_4_12(0.7431640625), // sin(132°) + Q_4_12(0.7314453125), // sin(133°) + Q_4_12(0.71923828125), // sin(134°) + Q_4_12(0.70703125), // sin(135°) + Q_4_12(0.694580078125), // sin(136°) + Q_4_12(0.681884765625), // sin(137°) + Q_4_12(0.669189453125), // sin(138°) + Q_4_12(0.656005859375), // sin(139°) + Q_4_12(0.642822265625), // sin(140°) + Q_4_12(0.62939453125), // sin(141°) + Q_4_12(0.61572265625), // sin(142°) + Q_4_12(0.601806640625), // sin(143°) + Q_4_12(0.587890625), // sin(144°) + Q_4_12(0.573486328125), // sin(145°) + Q_4_12(0.55908203125), // sin(146°) + Q_4_12(0.544677734375), // sin(147°) + Q_4_12(0.530029296875), // sin(148°) + Q_4_12(0.51513671875), // sin(149°) + Q_4_12(0.5), // sin(150°) + Q_4_12(0.48486328125), // sin(151°) + Q_4_12(0.469482421875), // sin(152°) + Q_4_12(0.4541015625), // sin(153°) + Q_4_12(0.4384765625), // sin(154°) + Q_4_12(0.422607421875), // sin(155°) + Q_4_12(0.40673828125), // sin(156°) + Q_4_12(0.390625), // sin(157°) + Q_4_12(0.37451171875), // sin(158°) + Q_4_12(0.3583984375), // sin(159°) + Q_4_12(0.342041015625), // sin(160°) + Q_4_12(0.32568359375), // sin(161°) + Q_4_12(0.30908203125), // sin(162°) + Q_4_12(0.29248046875), // sin(163°) + Q_4_12(0.275634765625), // sin(164°) + Q_4_12(0.2587890625), // sin(165°) + Q_4_12(0.241943359375), // sin(166°) + Q_4_12(0.224853515625), // sin(167°) + Q_4_12(0.2080078125), // sin(168°) + Q_4_12(0.19091796875), // sin(169°) + Q_4_12(0.173583984375), // sin(170°) + Q_4_12(0.156494140625), // sin(171°) + Q_4_12(0.13916015625), // sin(172°) + Q_4_12(0.121826171875), // sin(173°) + Q_4_12(0.1044921875), // sin(174°) + Q_4_12(0.087158203125), // sin(175°) + Q_4_12(0.06982421875), // sin(176°) + Q_4_12(0.05224609375), // sin(177°) + Q_4_12(0.034912109375), // sin(178°) + Q_4_12(0.017333984375), // sin(179°) +}; + +// amplitude * sin(index*(π/128)) +s16 Sin(s16 index, s16 amplitude) +{ + return (amplitude * gSineTable[index]) >> 8; +} + +// amplitude * cos(index*(π/128)) +s16 Cos(s16 index, s16 amplitude) +{ + return (amplitude * gSineTable[index + 64]) >> 8; +} + +// angle in degrees +s16 Sin2(u16 angle) +{ + s32 angleMod = angle % 180; + s32 negate = ((angle / 180) & 1); + s16 value = gSineDegreeTable[angleMod]; + + if (negate) + return -value; + else + return value; +} + +// angle in degrees +s16 Cos2(u16 angle) +{ + return Sin2(angle + 90); +} diff --git a/sym_bss.txt b/sym_bss.txt index f1af7b63e..57c8a145f 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -163,8 +163,9 @@ gUnknown_03000E04: @ 3000E04 gUnknown_03000E06: @ 3000E06 .space 0x2 -gUnknown_03000E08: @ 3000E08 - .space 0x4 + .include "src/play_time.o" + +.align 2 gUnknown_03000E0C: @ 3000E0C .space 0x4 diff --git a/sym_common.txt b/sym_common.txt index d6f32ee4b..c2f995837 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -228,7 +228,7 @@ gUnknown_03005D46: @ 3005D46 gUnknown_03005D54: @ 3005D54 .space 0xC -gUnknown_03005D60: @ 3005D60 +gBattleBankFunc: @ 3005D60 .space 0x10 gUnknown_03005D70: @ 3005D70 diff --git a/sym_ewram.txt b/sym_ewram.txt index 225215462..4db652d0c 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -16,7 +16,7 @@ gTempTextPrinter: @ 202018C gTextPrinters: @ 20201B0 .space 0x480 -gUnknown_02020630: @ 2020630 +gSprites: @ 2020630 .space 0x8 gUnknown_02020638: @ 2020638 @@ -303,7 +303,7 @@ gUnknown_02022E2A: @ 2022E2A gUnknown_02022E2C: @ 2022E2C .space 0x12C -gUnknown_02022F58: @ 2022F58 +gBattleTextBuff1: @ 2022F58 .space 0x2 gUnknown_02022F5A: @ 2022F5A @@ -312,7 +312,7 @@ gUnknown_02022F5A: @ 2022F5A gUnknown_02022F5C: @ 2022F5C .space 0xC -gUnknown_02022F68: @ 2022F68 +gBattleTextBuff2: @ 2022F68 .space 0x2 gUnknown_02022F6A: @ 2022F6A @@ -345,7 +345,7 @@ gUnknown_0202305C: @ 202305C gUnknown_02023060: @ 2023060 .space 0x4 -gUnknown_02023064: @ 2023064 +gBattleBufferA: @ 2023064 .space 0x2 gUnknown_02023066: @ 2023066 @@ -357,37 +357,37 @@ gUnknown_02023067: @ 2023067 gUnknown_02023068: @ 2023068 .space 0x7FC -gUnknown_02023864: @ 2023864 +gBattleBufferB: @ 2023864 .space 0x4 gUnknown_02023868: @ 2023868 .space 0x7FC -gUnknown_02024064: @ 2024064 +gActiveBank: @ 2024064 .space 0x4 -gUnknown_02024068: @ 2024068 +gBattleExecBuffer: @ 2024068 .space 0x4 -gUnknown_0202406C: @ 202406C +gNoOfAllBanks: @ 202406C .space 0x2 -gUnknown_0202406E: @ 202406E +gBattlePartyID: @ 202406E .space 0x8 -gUnknown_02024076: @ 2024076 +gBanksBySide: @ 2024076 .space 0x4 gUnknown_0202407A: @ 202407A .space 0x4 -gUnknown_0202407E: @ 202407E +gTurnOrder: @ 202407E .space 0x4 gUnknown_02024082: @ 2024082 .space 0x1 -gUnknown_02024083: @ 2024083 +gFightStateTracker: @ 2024083 .space 0x1 gBattleMons: @ 2024084 @@ -417,22 +417,22 @@ gUnknown_020240D0: @ 20240D0 gUnknown_020240D4: @ 20240D4 .space 0x110 -gUnknown_020241E4: @ 20241E4 +gBankSpriteIds: @ 20241E4 .space 0x4 -gUnknown_020241E8: @ 20241E8 +gCurrMovePos: @ 20241E8 .space 0x1 gUnknown_020241E9: @ 20241E9 .space 0x1 -gUnknown_020241EA: @ 20241EA +gCurrentMove: @ 20241EA .space 0x2 gUnknown_020241EC: @ 20241EC .space 0x2 -gUnknown_020241EE: @ 20241EE +gRandomMove: @ 20241EE .space 0x2 gBattleMoveDamage: @ 20241F0 @@ -447,13 +447,13 @@ gUnknown_020241F8: @ 20241F8 gUnknown_02024208: @ 2024208 .space 0x2 -gUnknown_0202420A: @ 202420A +gLastUsedAbility: @ 202420A .space 0x1 -gUnknown_0202420B: @ 202420B +gBankAttacker: @ 202420B .space 0x1 -gEnemyMonIndex: @ 202420C +gBankTarget: @ 202420C .space 0x1 gUnknown_0202420D: @ 202420D @@ -465,7 +465,7 @@ gUnknown_0202420E: @ 202420E gUnknown_0202420F: @ 202420F .space 0x1 -gUnknown_02024210: @ 2024210 +gAbsentBankFlags: @ 2024210 .space 0x1 gCritMultiplier: @ 2024211 @@ -474,7 +474,7 @@ gCritMultiplier: @ 2024211 gUnknown_02024212: @ 2024212 .space 0x2 -gUnknown_02024214: @ 2024214 +gBattlescriptCurrInstr: @ 2024214 .space 0x8 gUnknown_0202421C: @ 202421C @@ -513,7 +513,7 @@ gUnknown_02024274: @ 2024274 gBattleMoveFlags: @ 202427C .space 0x4 -gUnknown_02024280: @ 2024280 +gHitMarker: @ 2024280 .space 0x4 gUnknown_02024284: @ 2024284 @@ -528,13 +528,13 @@ gUnknown_0202428C: @ 202428C gUnknown_0202428E: @ 202428E .space 0x6 -gUnknown_02024294: @ 2024294 +gSideTimers: @ 2024294 .space 0x18 -gUnknown_020242AC: @ 20242AC +gStatuses3: @ 20242AC .space 0x10 -gUnknown_020242BC: @ 20242BC +gDisableStructs: @ 20242BC .space 0x70 gUnknown_0202432C: @ 202432C @@ -546,19 +546,19 @@ gUnknown_0202432E: @ 202432E gUnknown_02024330: @ 2024330 .space 0x2 -gUnknown_02024332: @ 2024332 +gBattleCommunication: @ 2024332 .space 0x1 gUnknown_02024333: @ 2024333 .space 0x7 -gUnknown_0202433A: @ 202433A +gBattleOutcome: @ 202433A .space 0x2 -gUnknown_0202433C: @ 202433C +gProtectStructs: @ 202433C .space 0x40 -gUnknown_0202437C: @ 202437C +gSpecialStatuses: @ 202437C .space 0x50 gBattleWeather: @ 20243CC @@ -579,13 +579,13 @@ gUnknown_02024400: @ 2024400 gUnknown_02024402: @ 2024402 .space 0x2 -gUnknown_02024404: @ 2024404 +gEnigmaBerries: @ 2024404 .space 0x8 gUnknown_0202440C: @ 202440C .space 0x68 -gUnknown_02024474: @ 2024474 +gBattleScripting: @ 2024474 .space 0x4 gUnknown_02024478: @ 2024478 @@ -594,7 +594,7 @@ gUnknown_02024478: @ 2024478 gUnknown_02024488: @ 2024488 .space 0x14 -gUnknown_0202449C: @ 202449C +gBattleStruct: @ 202449C .space 0x4 gUnknown_020244A0: @ 20244A0 @@ -603,7 +603,7 @@ gUnknown_020244A0: @ 20244A0 gUnknown_020244A4: @ 20244A4 .space 0x4 -gUnknown_020244A8: @ 20244A8 +gBattleResources: @ 20244A8 .space 0x4 gUnknown_020244AC: @ 20244AC @@ -618,7 +618,7 @@ gUnknown_020244B4: @ 20244B4 gUnknown_020244B8: @ 20244B8 .space 0x1 -gUnknown_020244B9: @ 20244B9 +gDoingBattleAnim: @ 20244B9 .space 0x3 gUnknown_020244BC: @ 20244BC @@ -639,7 +639,7 @@ gUnknown_020244D8: @ 20244D8 gUnknown_020244DC: @ 20244DC .space 0x4 -gUnknown_020244E0: @ 20244E0 +gBattleMovePower: @ 20244E0 .space 0x2 gUnknown_020244E2: @ 20244E2 @@ -1245,7 +1245,7 @@ gUnknown_02039DD0: @ 2039DD0 gUnknown_02039DD4: @ 2039DD4 .space 0x4 -gUnknown_02039DD8: @ 2039DD8 +gBagItems: @ 2039DD8 .space 0x28 gUnknown_02039E00: @ 2039E00 |